541aedf refactor(status): remove impossible ephemeral recent state · vev

M internal/usecase/daemon/recent_sessions.go +3 -5


@@ -11,7 +11,6 @@ import (
11	11		type recentSession struct {
12	12		id domain.SessionID
13	13		name string
14		-	ephemeral bool
15	14		attention bool
16	15		mruAt uint64
17	16		}

@@ -34,10 +33,9 @@ func (d Daemon) recentSessions(current session) []recentSession {
34	33		continue
35	34		}
36	35		entry := recentSession{
37		-	id: sess.id,
38		-	name: sess.name,
39		-	ephemeral: sess.ephemeral,
40		-	mruAt: sess.mruAt.Load(),
	36	+	id: sess.id,
	37	+	name: sess.name,
	38	+	mruAt: sess.mruAt.Load(),
41	39		}
42	40		for _, tb := range sess.tabs {
43	41		if tb.attention {

 type recentSession struct {
 	id        domain.SessionID
 	name      string
-	ephemeral bool
 	attention bool
 	mruAt     uint64
 }
 			continue
 		}
 		entry := recentSession{
-			id:        sess.id,
+			id:    sess.id,
-			name:      sess.name,
+			name:  sess.name,
-			ephemeral: sess.ephemeral,
+			mruAt: sess.mruAt.Load(),
-			mruAt:     sess.mruAt.Load(),
 		}
 		for _, tb := range sess.tabs {
 			if tb.attention {

M internal/usecase/daemon/status.go +5 -22


@@ -93,7 +93,7 @@ func drawStatusBarState(row []renderer.Cell, state barState, styles themeStyles)
93	93		fittedMRU := fitMRU(state.mru, len(row), x, rightText)
94	94		for i, sess := range fittedMRU {
95	95		style := mruStyle(styles.statusBar, state.theme, i, len(fittedMRU))
96		-	drawStatusSessionEntry(row, &x, sess.name, sess.ephemeral, sess.attention, style, state.attentionFrame)
	96	+	drawStatusSessionEntry(row, &x, sess.name, sess.attention, style, state.attentionFrame)
97	97		}
98	98		}
99	99		drawRightPlainText(row, rightText, x, styles.statusBar)

@@ -102,7 +102,6 @@ func drawStatusBarState(row []renderer.Cell, state barState, styles themeStyles)
102	102		type rankedRecent struct {
103	103		rank int
104	104		name string
105		-	ephemeral bool
106	105		attention bool
107	106		selected bool
108	107		}

@@ -111,11 +110,7 @@ func drawRankedStatusSessionEntry(row []renderer.Cell, x *int, sess rankedRecent
111	110		prefixStyle := style
112	111		prefixStyle.Bold = true
113	112		writeStatusText(row, x, " "+strconv.Itoa(sess.rank)+":", prefixStyle)
114		-	name := sess.name
115		-	if sess.ephemeral {
116		-	name += "*"
117		-	}
118		-	writeStatusText(row, x, name, style)
	113	+	writeStatusText(row, x, sess.name, style)
119	114		if sess.attention {
120	115		writeStatusText(row, x, " ", style)
121	116		writeBell(row, x, attentionFrame, style)

@@ -123,10 +118,7 @@ func drawRankedStatusSessionEntry(row []renderer.Cell, x *int, sess rankedRecent
123	118		writeStatusText(row, x, " ", style)
124	119		}
125	120
126		-	func drawStatusSessionEntry(row []renderer.Cell, x *int, name string, ephemeral, attention bool, style renderer.Style, attentionFrame int) {
127		-	if ephemeral {
128		-	name += "*"
129		-	}
	121	+	func drawStatusSessionEntry(row []renderer.Cell, x *int, name string, attention bool, style renderer.Style, attentionFrame int) {
130	122		writeStatusText(row, x, " "+name, style)
131	123		if attention {
132	124		writeStatusText(row, x, " ", style)

@@ -228,7 +220,6 @@ func rankedRecentForHints(hints *palette.ContextualHints, recent []recentSession
228	220		// recent was copied with the hint under paletteMu, so this only enriches
229	221		// the render snapshot and never performs a live domain lookup.
230	222		if i < len(recent) {
231		-	entry.ephemeral = recent[i].ephemeral
232	223		entry.attention = recent[i].attention
233	224		}
234	225		entries = append(entries, entry)

@@ -364,11 +355,7 @@ func fitRankedRecent(entries []rankedRecent, rowLen, leftUsed int, feedback stri
364	355		return nil
365	356		}
366	357		cost := func(e rankedRecent) int {
367		-	name := e.name
368		-	if e.ephemeral {
369		-	name += "*"
370		-	}
371		-	width := 2 + statusTextWidth(strconv.Itoa(e.rank)+":") + statusTextWidth(name)
	358	+	width := 2 + statusTextWidth(strconv.Itoa(e.rank)+":") + statusTextWidth(e.name)
372	359		if e.attention {
373	360		width += 1 + renderer.RuneWidth(ui.AttentionGlyph)
374	361		}

@@ -396,11 +383,7 @@ func fitMRU(entries []recentSession, rowLen, leftUsed int, feedback string) []re
396	383		return nil
397	384		}
398	385		cost := func(e recentSession) int {
399		-	name := e.name
400		-	if e.ephemeral {
401		-	name += "*"
402		-	}
403		-	n := 2 + statusTextWidth(name)
	386	+	n := 2 + statusTextWidth(e.name)
404	387		if e.attention {
405	388		n += 1 + renderer.RuneWidth(ui.AttentionGlyph)
406	389		}

 		fittedMRU := fitMRU(state.mru, len(row), x, rightText)
 		for i, sess := range fittedMRU {
 			style := mruStyle(styles.statusBar, state.theme, i, len(fittedMRU))
-			drawStatusSessionEntry(row, &x, sess.name, sess.ephemeral, sess.attention, style, state.attentionFrame)
+			drawStatusSessionEntry(row, &x, sess.name, sess.attention, style, state.attentionFrame)
 		}
 	}
 	drawRightPlainText(row, rightText, x, styles.statusBar)
 type rankedRecent struct {
 	rank      int
 	name      string
-	ephemeral bool
 	attention bool
 	selected  bool
 }
 	prefixStyle := style
 	prefixStyle.Bold = true
 	writeStatusText(row, x, " "+strconv.Itoa(sess.rank)+":", prefixStyle)
-	name := sess.name
+	writeStatusText(row, x, sess.name, style)
-	if sess.ephemeral {
-		name += "*"
-	}
-	writeStatusText(row, x, name, style)
 	if sess.attention {
 		writeStatusText(row, x, " ", style)
 		writeBell(row, x, attentionFrame, style)
 	writeStatusText(row, x, " ", style)
 }
-func drawStatusSessionEntry(row []renderer.Cell, x *int, name string, ephemeral, attention bool, style renderer.Style, attentionFrame int) {
+func drawStatusSessionEntry(row []renderer.Cell, x *int, name string, attention bool, style renderer.Style, attentionFrame int) {
-	if ephemeral {
-		name += "*"
-	}
 	writeStatusText(row, x, " "+name, style)
 	if attention {
 		writeStatusText(row, x, " ", style)
 		// recent was copied with the hint under paletteMu, so this only enriches
 		// the render snapshot and never performs a live domain lookup.
 		if i < len(recent) {
-			entry.ephemeral = recent[i].ephemeral
 			entry.attention = recent[i].attention
 		}
 		entries = append(entries, entry)
 		return nil
 	}
 	cost := func(e rankedRecent) int {
-		name := e.name
+		width := 2 + statusTextWidth(strconv.Itoa(e.rank)+":") + statusTextWidth(e.name)
-		if e.ephemeral {
-			name += "*"
-		}
-		width := 2 + statusTextWidth(strconv.Itoa(e.rank)+":") + statusTextWidth(name)
 		if e.attention {
 			width += 1 + renderer.RuneWidth(ui.AttentionGlyph)
 		}
 		return nil
 	}
 	cost := func(e recentSession) int {
-		name := e.name
+		n := 2 + statusTextWidth(e.name)
-		if e.ephemeral {
-			name += "*"
-		}
-		n := 2 + statusTextWidth(name)
 		if e.attention {
 			n += 1 + renderer.RuneWidth(ui.AttentionGlyph)
 		}

M internal/usecase/daemon/status_test.go +5 -5


@@ -978,7 +978,7 @@ func TestBarStateForContextualRecentUsesSnapshotAndNormalUsesLiveMRU(t *testing.
978	978		done := make(chan struct{})
979	979		d.mu.Lock()
980	980		go func() {
981		-	contextual = d.barStateForPaletteHints(sess, "", &hints, []recentSession{{name: "captured", ephemeral: true, attention: true}})
	981	+	contextual = d.barStateForPaletteHints(sess, "", &hints, []recentSession{{name: "captured", attention: true}})
982	982		close(done)
983	983		}()
984	984		select {

@@ -990,7 +990,7 @@ func TestBarStateForContextualRecentUsesSnapshotAndNormalUsesLiveMRU(t *testing.
990	990		d.mu.Unlock()
991	991
992	992		require.Empty(t, contextual.mru, "contextual composition must not read the live MRU")
993		-	require.Equal(t, []rankedRecent{{rank: 1, name: "captured", ephemeral: true, attention: true, selected: true}}, contextual.rankedRecent)
	993	+	require.Equal(t, []rankedRecent{{rank: 1, name: "captured", attention: true, selected: true}}, contextual.rankedRecent)
994	994
995	995		normal := d.barStateFor(sess, "")
996	996		require.Len(t, normal.mru, 1)

@@ -1128,20 +1128,20 @@ func TestCapturePrimaryRenderStatePreservesContextualMRUModeThroughScratchReuse(
1128	1128		require.Contains(t, draw(normalAfterPopulated), "vty")
1129	1129		}
1130	1130
1131		-	func TestStatusBarRendersMRUNamesEphemeralAndInlineBell(t *testing.T) {
	1131	+	func TestStatusBarRendersMRUNamesAndInlineBell(t *testing.T) {
1132	1132		state := barState{
1133	1133		status: statusSnapshot{session: "cur"},
1134	1134		attentionFrame: 1,
1135	1135		mru: []recentSession{
1136	1136		{name: "fresh"},
1137		-	{name: "tmp", ephemeral: true, attention: true},
	1137	+	{name: "tmp", attention: true},
1138	1138		},
1139	1139		}
1140	1140		row := make([]renderer.Cell, 24)
1141	1141
1142	1142		drawStatusBarState(row, state, resolveThemeStyles(nil))
1143	1143
1144		-	require.Equal(t, " cur fresh tmp*  ", rowText(row))
	1144	+	require.Equal(t, " cur fresh tmp  ", rowText(row))
1145	1145		for _, c := range row {
1146	1146		if c.Rune == ui.AttentionGlyph {
1147	1147		require.True(t, c.Style.Bold)


@@ -978,7 +978,7 @@ func TestBarStateForContextualRecentUsesSnapshotAndNormalUsesLiveMRU(t *testing.
978		done := make(chan struct{})	978		done := make(chan struct{})
979		d.mu.Lock()	979		d.mu.Lock()
980		go func() {	980		go func() {
981	-	contextual = d.barStateForPaletteHints(sess, "", &hints, []recentSession{{name: "captured", ephemeral: true, attention: true}})	981	+	contextual = d.barStateForPaletteHints(sess, "", &hints, []recentSession{{name: "captured", attention: true}})
982		close(done)	982		close(done)
983		}()	983		}()
984		select {	984		select {

@@ -990,7 +990,7 @@ func TestBarStateForContextualRecentUsesSnapshotAndNormalUsesLiveMRU(t *testing.
990		d.mu.Unlock()	990		d.mu.Unlock()
991			991
992		require.Empty(t, contextual.mru, "contextual composition must not read the live MRU")	992		require.Empty(t, contextual.mru, "contextual composition must not read the live MRU")
993	-	require.Equal(t, []rankedRecent{{rank: 1, name: "captured", ephemeral: true, attention: true, selected: true}}, contextual.rankedRecent)	993	+	require.Equal(t, []rankedRecent{{rank: 1, name: "captured", attention: true, selected: true}}, contextual.rankedRecent)
994			994
995		normal := d.barStateFor(sess, "")	995		normal := d.barStateFor(sess, "")
996		require.Len(t, normal.mru, 1)	996		require.Len(t, normal.mru, 1)

@@ -1128,20 +1128,20 @@ func TestCapturePrimaryRenderStatePreservesContextualMRUModeThroughScratchReuse(
1128		require.Contains(t, draw(normalAfterPopulated), "vty")	1128		require.Contains(t, draw(normalAfterPopulated), "vty")
1129		}	1129		}
1130			1130
1131	-	func TestStatusBarRendersMRUNamesEphemeralAndInlineBell(t *testing.T) {	1131	+	func TestStatusBarRendersMRUNamesAndInlineBell(t *testing.T) {
1132		state := barState{	1132		state := barState{
1133		status: statusSnapshot{session: "cur"},	1133		status: statusSnapshot{session: "cur"},
1134		attentionFrame: 1,	1134		attentionFrame: 1,
1135		mru: []recentSession{	1135		mru: []recentSession{
1136		{name: "fresh"},	1136		{name: "fresh"},
1137	-	{name: "tmp", ephemeral: true, attention: true},	1137	+	{name: "tmp", attention: true},
1138		},	1138		},
1139		}	1139		}
1140		row := make([]renderer.Cell, 24)	1140		row := make([]renderer.Cell, 24)
1141			1141
1142		drawStatusBarState(row, state, resolveThemeStyles(nil))	1142		drawStatusBarState(row, state, resolveThemeStyles(nil))
1143			1143
1144	-	require.Equal(t, " cur fresh tmp*  ", rowText(row))	1144	+	require.Equal(t, " cur fresh tmp  ", rowText(row))
1145		for _, c := range row {	1145		for _, c := range row {
1146		if c.Rune == ui.AttentionGlyph {	1146		if c.Rune == ui.AttentionGlyph {
1147		require.True(t, c.Style.Bold)	1147		require.True(t, c.Style.Bold)