fix(picker): snapshot session fields under the session lock before sorting

commit: 1521b5b10f7facc5fa9b2cb78a65fdd84c86c1c1
author: brice · 2mo ago · 2026-07-29 15:35 UTC
parent: d2bbb2e
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

1 file · +19 -8

M internal/usecase/daemon/picker.go +19 -8


@@ -87,17 +87,28 @@ func (d Daemon) pickerViews(cur session) ([]picker.SessionView, picker.SourceF
87	87		}
88	88		}
89	89		d.mu.Unlock()
90		-	// Snapshot mruAt once: comparators must not observe concurrent touchMRU
91		-	// updates mid-sort.
92		-	mru := make(map[*session]uint64, len(sessions))
	90	+	// Snapshot mruAt, name, and ephemeral once: comparators must not observe
	91	+	// concurrent touchMRU updates or a renameSession mutation (which mutates
	92	+	// name/ephemeral under sess.mu) mid-sort.
	93	+	type pickerSortSnapshot struct {
	94	+	mruAt uint64
	95	+	name string
	96	+	ephemeral bool
	97	+	}
	98	+	snap := make(map[*session]pickerSortSnapshot, len(sessions))
93	99		for _, s := range sessions {
94		-	mru[s] = s.mruAt.Load()
	100	+	mruAt := s.mruAt.Load()
	101	+	s.mu.Lock()
	102	+	name := s.name
	103	+	ephemeral := s.ephemeral
	104	+	s.mu.Unlock()
	105	+	snap[s] = pickerSortSnapshot{mruAt: mruAt, name: name, ephemeral: ephemeral}
95	106		}
96	107		sort.Slice(sessions, func(i, j int) bool {
97		-	if mru[sessions[i]] != mru[sessions[j]] {
98		-	return mru[sessions[i]] > mru[sessions[j]]
	108	+	if snap[sessions[i]].mruAt != snap[sessions[j]].mruAt {
	109	+	return snap[sessions[i]].mruAt > snap[sessions[j]].mruAt
99	110		}
100		-	return sessions[i].name < sessions[j].name
	111	+	return snap[sessions[i]].name < snap[sessions[j]].name
101	112		})
102	113		sort.Slice(stopped, func(i, j int) bool {
103	114		if stopped[i].lastUsedSeq != stopped[j].lastUsedSeq {

@@ -109,7 +120,7 @@ func (d Daemon) pickerViews(cur session) ([]picker.SessionView, picker.SourceF
109	120		// Stable partition: named sessions first, ephemeral after, each keeping
110	121		// its MRU order from the sort above.
111	122		sort.SliceStable(sessions, func(i, j int) bool {
112		-	return !sessions[i].ephemeral && sessions[j].ephemeral
	123	+	return !snap[sessions[i]].ephemeral && snap[sessions[j]].ephemeral
113	124		})
114	125		}
115	126

 		}
 	}
 	d.mu.Unlock()
-	// Snapshot mruAt once: comparators must not observe concurrent touchMRU
+	// Snapshot mruAt, name, and ephemeral once: comparators must not observe
-	// updates mid-sort.
+	// concurrent touchMRU updates or a renameSession mutation (which mutates
-	mru := make(map[*session]uint64, len(sessions))
+	// name/ephemeral under sess.mu) mid-sort.
+	type pickerSortSnapshot struct {
+		mruAt     uint64
+		name      string
+		ephemeral bool
+	}
+	snap := make(map[*session]pickerSortSnapshot, len(sessions))
 	for _, s := range sessions {
-		mru[s] = s.mruAt.Load()
+		mruAt := s.mruAt.Load()
+		s.mu.Lock()
+		name := s.name
+		ephemeral := s.ephemeral
+		s.mu.Unlock()
+		snap[s] = pickerSortSnapshot{mruAt: mruAt, name: name, ephemeral: ephemeral}
 	}
 	sort.Slice(sessions, func(i, j int) bool {
-		if mru[sessions[i]] != mru[sessions[j]] {
+		if snap[sessions[i]].mruAt != snap[sessions[j]].mruAt {
-			return mru[sessions[i]] > mru[sessions[j]]
+			return snap[sessions[i]].mruAt > snap[sessions[j]].mruAt
 		}
-		return sessions[i].name < sessions[j].name
+		return snap[sessions[i]].name < snap[sessions[j]].name
 	})
 	sort.Slice(stopped, func(i, j int) bool {
 		if stopped[i].lastUsedSeq != stopped[j].lastUsedSeq {
 		// Stable partition: named sessions first, ephemeral after, each keeping
 		// its MRU order from the sort above.
 		sort.SliceStable(sessions, func(i, j int) bool {
-			return !sessions[i].ephemeral && sessions[j].ephemeral
+			return !snap[sessions[i]].ephemeral && snap[sessions[j]].ephemeral
 		})
 	}