feat(picker): grouped sort mode toggled with s

commit: 9683889c770b4094dc9f9227bbbec69533e790e2
author: brice · 2mo ago · 2026-07-29 13:38 UTC
parent: d415bc0
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

4 files · +125 -2

M internal/usecase/daemon/daemon.go +3 -0


@@ -79,6 +79,9 @@ type Daemon struct {
79	79		// reusing a lifecycle identity.
80	80		lastAllocatedCreatedAt int64
81	81		mruSeq atomic.Uint64
	82	+	// pickerSort is the picker ordering mode for this daemon's lifetime
	83	+	// (pickerSortMode); not persisted across restarts.
	84	+	pickerSort atomic.Uint32
82	85		// closing marks that shutdown has irreversibly begun. It is set under mu,
83	86		// atomically with the event that makes shutdown inevitable (the registry
84	87		// emptying in killSession, or shutdownAll starting), and checked by route


@@ -79,6 +79,9 @@ type Daemon struct {
79	// reusing a lifecycle identity.	79		// reusing a lifecycle identity.
80	lastAllocatedCreatedAt int64	80		lastAllocatedCreatedAt int64
81	mruSeq atomic.Uint64	81		mruSeq atomic.Uint64
		82	+	// pickerSort is the picker ordering mode for this daemon's lifetime
		83	+	// (pickerSortMode); not persisted across restarts.
		84	+	pickerSort atomic.Uint32
82	// closing marks that shutdown has irreversibly begun. It is set under mu,	85		// closing marks that shutdown has irreversibly begun. It is set under mu,
83	// atomically with the event that makes shutdown inevitable (the registry	86		// atomically with the event that makes shutdown inevitable (the registry
84	// emptying in killSession, or shutdownAll starting), and checked by route	87		// emptying in killSession, or shutdownAll starting), and checked by route

M internal/usecase/daemon/move_picker.go +14 -1


@@ -137,7 +137,20 @@ func (d Daemon) previewTarget(target picker.Target, intent pickerIntent) (sess
137	137		return sess, sess.tabs[target.TabIndex]
138	138		}
139	139
	140	+	type pickerRefreshOptions struct {
	141	+	// preserveSelection keeps the currently selected target selected across the
	142	+	// rebuild even for navigate intent (used by the sort toggle).
	143	+	preserveSelection bool
	144	+	// nearestRow, when >= 0, selects the row occupying this index after the
	145	+	// rebuild (used after deletes). -1 disables it.
	146	+	nearestRow int
	147	+	}
	148	+
140	149		func (d Daemon) refreshPicker(ac attachedClient) {
	150	+	d.refreshPickerOpts(ac, pickerRefreshOptions{nearestRow: -1})
	151	+	}
	152	+
	153	+	func (d Daemon) refreshPickerOpts(ac attachedClient, opts pickerRefreshOptions) {
141	154		sess := ac.currentSession()
142	155		if sess == nil {
143	156		return

@@ -150,7 +163,7 @@ func (d Daemon) refreshPicker(ac attachedClient) {
150	163		}
151	164		intent, source := rt.pickerIntent, rt.pickerSource
152	165		current := picker.SourceFilter{}
153		-	if intent != pickerNavigate {
	166	+	if intent != pickerNavigate \|\| opts.preserveSelection {
154	167		selected, _ := rt.picker.Selected()
155	168		current = picker.SourceFilter{Session: selected.Session, Incarnation: selected.Incarnation, TabID: selected.TabID}
156	169		}

 	return sess, sess.tabs[target.TabIndex]
 }
+type pickerRefreshOptions struct {
+	// preserveSelection keeps the currently selected target selected across the
+	// rebuild even for navigate intent (used by the sort toggle).
+	preserveSelection bool
+	// nearestRow, when >= 0, selects the row occupying this index after the
+	// rebuild (used after deletes). -1 disables it.
+	nearestRow int
+}
 func (d *Daemon) refreshPicker(ac *attachedClient) {
+	d.refreshPickerOpts(ac, pickerRefreshOptions{nearestRow: -1})
+}
+func (d *Daemon) refreshPickerOpts(ac *attachedClient, opts pickerRefreshOptions) {
 	sess := ac.currentSession()
 	if sess == nil {
 		return
 	}
 	intent, source := rt.pickerIntent, rt.pickerSource
 	current := picker.SourceFilter{}
-	if intent != pickerNavigate {
+	if intent != pickerNavigate || opts.preserveSelection {
 		selected, _ := rt.picker.Selected()
 		current = picker.SourceFilter{Session: selected.Session, Incarnation: selected.Incarnation, TabID: selected.TabID}
 	}

M internal/usecase/daemon/picker.go +32 -1


@@ -16,6 +16,22 @@ import (
16	16
17	17		var pickerModal = ui.Modal{WidthPct: 80, HeightPct: 80, MinWidth: 24, MinHeight: 8, Title: " Sessions ", Anchor: domain.AnchorCenter, Margins: ui.Margins{}}
18	18
	19	+	// pickerSortMode orders the picker's live sessions. It lives for the daemon's
	20	+	// lifetime only and is never persisted.
	21	+	type pickerSortMode uint32
	22	+
	23	+	const (
	24	+	pickerSortRecent pickerSortMode = iota
	25	+	pickerSortGrouped
	26	+	)
	27	+
	28	+	func pickerTitle(mode pickerSortMode) string {
	29	+	if mode == pickerSortGrouped {
	30	+	return " Sessions · grouped "
	31	+	}
	32	+	return " Sessions · recent "
	33	+	}
	34	+
19	35		// enterPicker preserves the existing navigation entry point. Navigation always
20	36		// publishes its model, including an empty one; only move entry can fail for a
21	37		// missing destination.

@@ -72,6 +88,13 @@ func (d Daemon) pickerViews(cur session) ([]picker.SessionView, picker.SourceF
72	88		}
73	89		return stopped[i].name < stopped[j].name
74	90		})
	91	+	if pickerSortMode(d.pickerSort.Load()) == pickerSortGrouped {
	92	+	// Stable partition: named sessions first, ephemeral after, each keeping
	93	+	// its MRU order from the sort above.
	94	+	sort.SliceStable(sessions, func(i, j int) bool {
	95	+	return !sessions[i].ephemeral && sessions[j].ephemeral
	96	+	})
	97	+	}
75	98
76	99		for _, s := range sessions {
77	100		d.refreshSessionFocusedTitles(s)

@@ -130,7 +153,7 @@ func (d Daemon) pickerViews(cur session) ([]picker.SessionView, picker.SourceF
130	153
131	154		func (d Daemon) newPickerModel(cur session, intent pickerIntent, source moveSourceLocator, current picker.SourceFilter) *picker.Model {
132	155		views, attachedCurrent := d.pickerViews(cur)
133		-	if intent == pickerNavigate {
	156	+	if intent == pickerNavigate && current == (picker.SourceFilter{}) {
134	157		current = attachedCurrent
135	158		}
136	159		return picker.New(views, picker.SelectionConfig{

@@ -189,6 +212,8 @@ func (d Daemon) handlePickerInput(ac attachedClient, data []byte, effects ...*
189	212		switch b {
190	213		case 'x':
191	214		return listInputResult{action: b, stop: true}
	215	+	case 's':
	216	+	return listInputResult{action: b, stop: true}
192	217		case '\r', '\n':
193	218		return listInputResult{action: b, exit: true}
194	219		default:

@@ -205,6 +230,12 @@ func (d Daemon) handlePickerInput(ac attachedClient, data []byte, effects ...*
205	230		intent, source = rt.pickerIntent, rt.pickerSource
206	231		rt.pickerMu.Unlock()
207	232
	233	+	if result.action == 's' {
	234	+	d.pickerSort.Store(d.pickerSort.Load() ^ 1)
	235	+	d.refreshPickerOpts(ac, pickerRefreshOptions{preserveSelection: true, nearestRow: -1})
	236	+	d.invalidateRender(sess, ac, true, "picker.go")
	237	+	return
	238	+	}
208	239		if result.action == 'x' {
209	240		var effect *roleEffectTicket
210	241		if len(effects) != 0 {

 var pickerModal = ui.Modal{WidthPct: 80, HeightPct: 80, MinWidth: 24, MinHeight: 8, Title: " Sessions ", Anchor: domain.AnchorCenter, Margins: ui.Margins{}}
+// pickerSortMode orders the picker's live sessions. It lives for the daemon's
+// lifetime only and is never persisted.
+type pickerSortMode uint32
+const (
+	pickerSortRecent pickerSortMode = iota
+	pickerSortGrouped
+)
+func pickerTitle(mode pickerSortMode) string {
+	if mode == pickerSortGrouped {
+		return " Sessions · grouped "
+	}
+	return " Sessions · recent "
+}
 // enterPicker preserves the existing navigation entry point. Navigation always
 // publishes its model, including an empty one; only move entry can fail for a
 // missing destination.
 		}
 		return stopped[i].name < stopped[j].name
 	})
+	if pickerSortMode(d.pickerSort.Load()) == pickerSortGrouped {
+		// 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
+		})
+	}
 	for _, s := range sessions {
 		d.refreshSessionFocusedTitles(s)
 func (d *Daemon) newPickerModel(cur *session, intent pickerIntent, source moveSourceLocator, current picker.SourceFilter) *picker.Model {
 	views, attachedCurrent := d.pickerViews(cur)
-	if intent == pickerNavigate {
+	if intent == pickerNavigate && current == (picker.SourceFilter{}) {
 		current = attachedCurrent
 	}
 	return picker.New(views, picker.SelectionConfig{
 		switch b {
 		case 'x':
 			return listInputResult{action: b, stop: true}
+		case 's':
+			return listInputResult{action: b, stop: true}
 		case '\r', '\n':
 			return listInputResult{action: b, exit: true}
 		default:
 	intent, source = rt.pickerIntent, rt.pickerSource
 	rt.pickerMu.Unlock()
+	if result.action == 's' {
+		d.pickerSort.Store(d.pickerSort.Load() ^ 1)
+		d.refreshPickerOpts(ac, pickerRefreshOptions{preserveSelection: true, nearestRow: -1})
+		d.invalidateRender(sess, ac, true, "picker.go")
+		return
+	}
 	if result.action == 'x' {
 		var effect *roleEffectTicket
 		if len(effects) != 0 {

M internal/usecase/daemon/picker_test.go +76 -0


@@ -158,6 +158,82 @@ func TestPickerViewsMRUTieBreaksAlphabetically(t *testing.T) {
158	158		require.Equal(t, "bravo", views[1].Name)
159	159		}
160	160
	161	+	func TestPickerViewsGroupedModePutsNamedBeforeEphemeral(t *testing.T) {
	162	+	d := newTestDaemon(t, nil, stubClock{})
	163	+	d.pickerSort.Store(uint32(pickerSortGrouped))
	164	+	eph := &session{id: "eph", name: "1", ephemeral: true, tabs: []*tab{{}}}
	165	+	eph.mruAt.Store(5)
	166	+	named := &session{id: "named", name: "work", tabs: []*tab{{}}}
	167	+	named.mruAt.Store(2)
	168	+	named2 := &session{id: "named2", name: "notes", tabs: []*tab{{}}}
	169	+	named2.mruAt.Store(3)
	170	+	d.sessions[eph.id] = eph
	171	+	d.sessions[named.id] = named
	172	+	d.sessions[named2.id] = named2
	173	+	d.stopped["halted"] = stoppedSession{name: "halted", createdAt: 9, lastUsedSeq: 9}
	174	+
	175	+	views, _ := d.pickerViews(named)
	176	+
	177	+	names := make([]string, 0, len(views))
	178	+	for _, v := range views {
	179	+	names = append(names, v.Name)
	180	+	}
	181	+	// Named (MRU-desc) → ephemeral (MRU-desc) → stopped, even though the
	182	+	// ephemeral session has the highest mruAt.
	183	+	require.Equal(t, []string{"notes", "work", "1", "halted"}, names)
	184	+	}
	185	+
	186	+	func TestPickerSortToggleFlipsModeAndKeepsSelection(t *testing.T) {
	187	+	d, sess, ac, sends, releases := newManualTabSession(t, 2)
	188	+	defer releaseAll(releases)
	189	+	sess.mu.Lock()
	190	+	sess.client = ac
	191	+	secondTabID := domain.TabStableID(sess.tabs[1].stableID)
	192	+	sess.mu.Unlock()
	193	+	sess.mruAt.Store(1)
	194	+	// A second live session, ephemeral and more recently used: recent mode lists
	195	+	// it first, grouped mode moves it below the named session.
	196	+	eph := &session{id: "eph", name: "1", ephemeral: true, tabs: []*tab{{}}}
	197	+	eph.mruAt.Store(5)
	198	+	d.mu.Lock()
	199	+	d.sessions[eph.id] = eph
	200	+	d.mu.Unlock()
	201	+
	202	+	d.enterPicker(sess, ac)
	203	+	awaitFrame(t, sends, ports.MsgOutput)
	204	+	// Move off the attached session's active tab: a navigate rebuild snaps back
	205	+	// to it unless the toggle preserves the selection.
	206	+	d.handleInput(sess, ac, []byte("j"))
	207	+	awaitFrame(t, sends, ports.MsgOutput)
	208	+	ac.overlays.pickerMu.Lock()
	209	+	before, ok := ac.overlays.picker.Selected()
	210	+	ac.overlays.pickerMu.Unlock()
	211	+	require.True(t, ok)
	212	+	require.Equal(t, secondTabID, before.TabID)
	213	+
	214	+	d.handleInput(sess, ac, []byte("s"))
	215	+	awaitFrame(t, sends, ports.MsgOutput)
	216	+
	217	+	require.Equal(t, uint32(pickerSortGrouped), d.pickerSort.Load())
	218	+	require.True(t, ac.overlays.pickerActive())
	219	+	ac.overlays.pickerMu.Lock()
	220	+	selected, ok := ac.overlays.picker.Selected()
	221	+	ac.overlays.pickerMu.Unlock()
	222	+	require.True(t, ok)
	223	+	require.Equal(t, before, selected)
	224	+
	225	+	d.handleInput(sess, ac, []byte("s"))
	226	+	awaitFrame(t, sends, ports.MsgOutput)
	227	+
	228	+	require.Equal(t, uint32(pickerSortRecent), d.pickerSort.Load())
	229	+	require.True(t, ac.overlays.pickerActive())
	230	+	ac.overlays.pickerMu.Lock()
	231	+	selected, ok = ac.overlays.picker.Selected()
	232	+	ac.overlays.pickerMu.Unlock()
	233	+	require.True(t, ok)
	234	+	require.Equal(t, before, selected)
	235	+	}
	236	+
161	237		func TestPickerViewsCarryNamedLifecycleIdentity(t *testing.T) {
162	238		d := newTestDaemon(t, nil, stubClock{})
163	239		ctx, cancel := context.WithCancel(d.serveCtx)


@@ -158,6 +158,82 @@ func TestPickerViewsMRUTieBreaksAlphabetically(t *testing.T) {
158	require.Equal(t, "bravo", views[1].Name)	158		require.Equal(t, "bravo", views[1].Name)
159	}	159		}
160		160
		161	+	func TestPickerViewsGroupedModePutsNamedBeforeEphemeral(t *testing.T) {
		162	+	d := newTestDaemon(t, nil, stubClock{})
		163	+	d.pickerSort.Store(uint32(pickerSortGrouped))
		164	+	eph := &session{id: "eph", name: "1", ephemeral: true, tabs: []*tab{{}}}
		165	+	eph.mruAt.Store(5)
		166	+	named := &session{id: "named", name: "work", tabs: []*tab{{}}}
		167	+	named.mruAt.Store(2)
		168	+	named2 := &session{id: "named2", name: "notes", tabs: []*tab{{}}}
		169	+	named2.mruAt.Store(3)
		170	+	d.sessions[eph.id] = eph
		171	+	d.sessions[named.id] = named
		172	+	d.sessions[named2.id] = named2
		173	+	d.stopped["halted"] = stoppedSession{name: "halted", createdAt: 9, lastUsedSeq: 9}
		174	+
		175	+	views, _ := d.pickerViews(named)
		176	+
		177	+	names := make([]string, 0, len(views))
		178	+	for _, v := range views {
		179	+	names = append(names, v.Name)
		180	+	}
		181	+	// Named (MRU-desc) → ephemeral (MRU-desc) → stopped, even though the
		182	+	// ephemeral session has the highest mruAt.
		183	+	require.Equal(t, []string{"notes", "work", "1", "halted"}, names)
		184	+	}
		185	+
		186	+	func TestPickerSortToggleFlipsModeAndKeepsSelection(t *testing.T) {
		187	+	d, sess, ac, sends, releases := newManualTabSession(t, 2)
		188	+	defer releaseAll(releases)
		189	+	sess.mu.Lock()
		190	+	sess.client = ac
		191	+	secondTabID := domain.TabStableID(sess.tabs[1].stableID)
		192	+	sess.mu.Unlock()
		193	+	sess.mruAt.Store(1)
		194	+	// A second live session, ephemeral and more recently used: recent mode lists
		195	+	// it first, grouped mode moves it below the named session.
		196	+	eph := &session{id: "eph", name: "1", ephemeral: true, tabs: []*tab{{}}}
		197	+	eph.mruAt.Store(5)
		198	+	d.mu.Lock()
		199	+	d.sessions[eph.id] = eph
		200	+	d.mu.Unlock()
		201	+
		202	+	d.enterPicker(sess, ac)
		203	+	awaitFrame(t, sends, ports.MsgOutput)
		204	+	// Move off the attached session's active tab: a navigate rebuild snaps back
		205	+	// to it unless the toggle preserves the selection.
		206	+	d.handleInput(sess, ac, []byte("j"))
		207	+	awaitFrame(t, sends, ports.MsgOutput)
		208	+	ac.overlays.pickerMu.Lock()
		209	+	before, ok := ac.overlays.picker.Selected()
		210	+	ac.overlays.pickerMu.Unlock()
		211	+	require.True(t, ok)
		212	+	require.Equal(t, secondTabID, before.TabID)
		213	+
		214	+	d.handleInput(sess, ac, []byte("s"))
		215	+	awaitFrame(t, sends, ports.MsgOutput)
		216	+
		217	+	require.Equal(t, uint32(pickerSortGrouped), d.pickerSort.Load())
		218	+	require.True(t, ac.overlays.pickerActive())
		219	+	ac.overlays.pickerMu.Lock()
		220	+	selected, ok := ac.overlays.picker.Selected()
		221	+	ac.overlays.pickerMu.Unlock()
		222	+	require.True(t, ok)
		223	+	require.Equal(t, before, selected)
		224	+
		225	+	d.handleInput(sess, ac, []byte("s"))
		226	+	awaitFrame(t, sends, ports.MsgOutput)
		227	+
		228	+	require.Equal(t, uint32(pickerSortRecent), d.pickerSort.Load())
		229	+	require.True(t, ac.overlays.pickerActive())
		230	+	ac.overlays.pickerMu.Lock()
		231	+	selected, ok = ac.overlays.picker.Selected()
		232	+	ac.overlays.pickerMu.Unlock()
		233	+	require.True(t, ok)
		234	+	require.Equal(t, before, selected)
		235	+	}
		236	+
161	func TestPickerViewsCarryNamedLifecycleIdentity(t *testing.T) {	237		func TestPickerViewsCarryNamedLifecycleIdentity(t *testing.T) {
162	d := newTestDaemon(t, nil, stubClock{})	238		d := newTestDaemon(t, nil, stubClock{})
163	ctx, cancel := context.WithCancel(d.serveCtx)	239		ctx, cancel := context.WithCancel(d.serveCtx)