8b8c982 Merge pull request #72 from bnema/feature/tab-label-styling · vev-vt

M README.md +1 -1


@@ -222,7 +222,7 @@ Each tab also owns one independent floating terminal. It prewarms asynchronously
222	222
223	223		While visible, the floating terminal receives ordinary input, bracketed paste, mouse input, clipboard-path injection, and scrollback/copy mode. Global vev bindings remain active, and a bare Esc is passed to the floating application. `Alt+f` and `FLT` toggle visibility; there is no separate floating-pane close command.
224	224
225		-	The top bar shows each tab as `name (title)`, where the name is the tab's rename or number and the title is the focused pane's `ProcessName: ProcessTerminalTitle`. Set `tabs.terminal-title = off` to drop the `ProcessTerminalTitle` half from tab labels (top bar and session picker) and show only the process name; floating and stacked pane title bars are unaffected. Labels share the row width: when everything fits they render in full, otherwise unused space flows from short tabs to long ones and long labels are ellipsized, degrading to the bare tab name when space runs out. The bottom bar shows the active session followed by recent sessions, fading toward older entries. Ephemeral sessions are marked with ``, for example `0`.
	225	+	The top bar shows each tab as `name (title)`, where the name is the tab's rename or number and the title is the focused pane's `ProcessName: ProcessTerminalTitle`. On truecolor clients the name renders bold and the parenthesized title slightly muted (in both the top bar and the session picker), derived from the client's reported theme; other terminals render plain labels. Set `tabs.terminal-title = off` to drop the `ProcessTerminalTitle` half from tab labels (top bar and session picker) and show only the process name; floating and stacked pane title bars are unaffected. Labels share the row width: when everything fits they render in full, otherwise unused space flows from short tabs to long ones and long labels are ellipsized, degrading to the bare tab name when space runs out. The bottom bar shows the active session followed by recent sessions, fading toward older entries. Ephemeral sessions are marked with ``, for example `0`.
226	226
227	227		## Scrollback mode and copy
228	228


@@ -222,7 +222,7 @@ Each tab also owns one independent floating terminal. It prewarms asynchronously
222			222
223		While visible, the floating terminal receives ordinary input, bracketed paste, mouse input, clipboard-path injection, and scrollback/copy mode. Global vev bindings remain active, and a bare Esc is passed to the floating application. `Alt+f` and `FLT` toggle visibility; there is no separate floating-pane close command.	223		While visible, the floating terminal receives ordinary input, bracketed paste, mouse input, clipboard-path injection, and scrollback/copy mode. Global vev bindings remain active, and a bare Esc is passed to the floating application. `Alt+f` and `FLT` toggle visibility; there is no separate floating-pane close command.
224			224
225	-	The top bar shows each tab as `name (title)`, where the name is the tab's rename or number and the title is the focused pane's `ProcessName: ProcessTerminalTitle`. Set `tabs.terminal-title = off` to drop the `ProcessTerminalTitle` half from tab labels (top bar and session picker) and show only the process name; floating and stacked pane title bars are unaffected. Labels share the row width: when everything fits they render in full, otherwise unused space flows from short tabs to long ones and long labels are ellipsized, degrading to the bare tab name when space runs out. The bottom bar shows the active session followed by recent sessions, fading toward older entries. Ephemeral sessions are marked with ``, for example `0`.	225	+	The top bar shows each tab as `name (title)`, where the name is the tab's rename or number and the title is the focused pane's `ProcessName: ProcessTerminalTitle`. On truecolor clients the name renders bold and the parenthesized title slightly muted (in both the top bar and the session picker), derived from the client's reported theme; other terminals render plain labels. Set `tabs.terminal-title = off` to drop the `ProcessTerminalTitle` half from tab labels (top bar and session picker) and show only the process name; floating and stacked pane title bars are unaffected. Labels share the row width: when everything fits they render in full, otherwise unused space flows from short tabs to long ones and long labels are ellipsized, degrading to the bare tab name when space runs out. The bottom bar shows the active session followed by recent sessions, fading toward older entries. Ephemeral sessions are marked with ``, for example `0`.
226			226
227		## Scrollback mode and copy	227		## Scrollback mode and copy
228			228

M internal/usecase/daemon/attention_test.go +7 -6


@@ -14,6 +14,7 @@ import (
14	14		"github.com/bnema/vev/internal/ports"
15	15		portsmocks "github.com/bnema/vev/internal/ports/mocks"
16	16		"github.com/bnema/vev/internal/usecase/keys"
	17	+	"github.com/bnema/vev/internal/usecase/ui"
17	18		"github.com/bnema/vev/pkg/renderer"
18	19		)
19	20

@@ -54,7 +55,7 @@ func TestPaintDoesNotAckActiveAttentionOnBlankPulseFrame(t *testing.T) {
54	55
55	56		d.paint(sess, ac, true)
56	57		data := mustOutputData(t, sends)
57		-	require.NotContains(t, string(data), string(attentionGlyph))
	58	+	require.NotContains(t, string(data), string(ui.AttentionGlyph))
58	59
59	60		sess.mu.Lock()
60	61		require.True(t, sess.tabs[0].attention)

@@ -63,7 +64,7 @@ func TestPaintDoesNotAckActiveAttentionOnBlankPulseFrame(t *testing.T) {
63	64		d.setAttentionFrame(1)
64	65		d.paint(sess, ac, true)
65	66		data = mustOutputData(t, sends)
66		-	require.Contains(t, string(data), string(attentionGlyph))
	67	+	require.Contains(t, string(data), string(ui.AttentionGlyph))
67	68
68	69		sess.mu.Lock()
69	70		require.False(t, sess.tabs[0].attention)

@@ -98,7 +99,7 @@ func TestPTYReaderActiveVisibleAgentNotificationRendersBellBeforeAck(t *testing.
98	99
99	100		d.paint(sess, ac, true)
100	101		data := mustOutputData(t, sends)
101		-	require.Contains(t, string(data), string(attentionGlyph))
	102	+	require.Contains(t, string(data), string(ui.AttentionGlyph))
102	103
103	104		sess.mu.Lock()
104	105		require.False(t, sess.tabs[0].attention)

@@ -106,7 +107,7 @@ func TestPTYReaderActiveVisibleAgentNotificationRendersBellBeforeAck(t *testing.
106	107		sess.mu.Unlock()
107	108
108	109		cleared := mustOutputData(t, sends)
109		-	require.NotContains(t, string(cleared), string(attentionGlyph))
	110	+	require.NotContains(t, string(cleared), string(ui.AttentionGlyph))
110	111
111	112		_ = pty.Close()
112	113		d.sessWg.Wait()

@@ -429,13 +430,13 @@ func TestCloseRingingTabRefreshesOtherSessionBottomBar(t *testing.T) {
429	430
430	431		d.paint(sessB, acB, true)
431	432		before := mustOutputData(t, sendsB)
432		-	require.Contains(t, string(before), string(attentionGlyph))
	433	+	require.Contains(t, string(before), string(ui.AttentionGlyph))
433	434
434	435		d.closeTab(sessA, ringing, true)
435	436		_ = mustOutputData(t, sendsA)
436	437
437	438		after := mustOutputData(t, sendsB)
438		-	require.NotContains(t, string(after), string(attentionGlyph))
	439	+	require.NotContains(t, string(after), string(ui.AttentionGlyph))
439	440		}
440	441
441	442		func TestAltAJumpAttentionSelectsOldestLocalTab(t *testing.T) {

 	"github.com/bnema/vev/internal/ports"
 	portsmocks "github.com/bnema/vev/internal/ports/mocks"
 	"github.com/bnema/vev/internal/usecase/keys"
+	"github.com/bnema/vev/internal/usecase/ui"
 	"github.com/bnema/vev/pkg/renderer"
 )
 	d.paint(sess, ac, true)
 	data := mustOutputData(t, sends)
-	require.NotContains(t, string(data), string(attentionGlyph))
+	require.NotContains(t, string(data), string(ui.AttentionGlyph))
 	sess.mu.Lock()
 	require.True(t, sess.tabs[0].attention)
 	d.setAttentionFrame(1)
 	d.paint(sess, ac, true)
 	data = mustOutputData(t, sends)
-	require.Contains(t, string(data), string(attentionGlyph))
+	require.Contains(t, string(data), string(ui.AttentionGlyph))
 	sess.mu.Lock()
 	require.False(t, sess.tabs[0].attention)
 			d.paint(sess, ac, true)
 			data := mustOutputData(t, sends)
-			require.Contains(t, string(data), string(attentionGlyph))
+			require.Contains(t, string(data), string(ui.AttentionGlyph))
 			sess.mu.Lock()
 			require.False(t, sess.tabs[0].attention)
 			sess.mu.Unlock()
 			cleared := mustOutputData(t, sends)
-			require.NotContains(t, string(cleared), string(attentionGlyph))
+			require.NotContains(t, string(cleared), string(ui.AttentionGlyph))
 			_ = pty.Close()
 			d.sessWg.Wait()
 	d.paint(sessB, acB, true)
 	before := mustOutputData(t, sendsB)
-	require.Contains(t, string(before), string(attentionGlyph))
+	require.Contains(t, string(before), string(ui.AttentionGlyph))
 	d.closeTab(sessA, ringing, true)
 	_ = mustOutputData(t, sendsA)
 	after := mustOutputData(t, sendsB)
-	require.NotContains(t, string(after), string(attentionGlyph))
+	require.NotContains(t, string(after), string(ui.AttentionGlyph))
 }
 func TestAltAJumpAttentionSelectsOldestLocalTab(t *testing.T) {

M internal/usecase/daemon/pane_titles.go +10 -2


@@ -72,10 +72,18 @@ func (p *pane) refreshTerminalTitleLocked() {
72	72		// composeTabTitle renders "name (paneTitle)". An empty paneTitle, or one equal
73	73		// to the tab name, collapses to just the name.
74	74		func composeTabTitle(tabName, paneTitle string) string {
	75	+	return tabName + tabTitleDetail(tabName, paneTitle)
	76	+	}
	77	+
	78	+	// tabTitleDetail returns the parenthesized " (paneTitle)" suffix for
	79	+	// tabName/paneTitle, or "" when paneTitle is empty or equals tabName. This is
	80	+	// the single place the name/detail composition rule lives; composeTabTitle
	81	+	// and the picker's TabEntry.Detail both build on it.
	82	+	func tabTitleDetail(tabName, paneTitle string) string {
75	83		if paneTitle == "" \|\| paneTitle == tabName {
76		-	return tabName
	84	+	return ""
77	85		}
78		-	return tabName + " (" + paneTitle + ")"
	86	+	return " (" + paneTitle + ")"
79	87		}
80	88
81	89		// focusedPaneTitle returns the focused pane's display title for tab labels.

 // composeTabTitle renders "name (paneTitle)". An empty paneTitle, or one equal
 // to the tab name, collapses to just the name.
 func composeTabTitle(tabName, paneTitle string) string {
+	return tabName + tabTitleDetail(tabName, paneTitle)
+}
+// tabTitleDetail returns the parenthesized " (paneTitle)" suffix for
+// tabName/paneTitle, or "" when paneTitle is empty or equals tabName. This is
+// the single place the name/detail composition rule lives; composeTabTitle
+// and the picker's TabEntry.Detail both build on it.
+func tabTitleDetail(tabName, paneTitle string) string {
 	if paneTitle == "" || paneTitle == tabName {
-		return tabName
+		return ""
 	}
-	return tabName + " (" + paneTitle + ")"
+	return " (" + paneTitle + ")"
 }
 // focusedPaneTitle returns the focused pane's display title for tab labels.

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


@@ -72,15 +72,18 @@ func (d Daemon) pickerViews(cur session) ([]picker.SessionView, int) {
72	72		curTab := 0
73	73		for _, s := range sessions {
74	74		s.mu.Lock()
75		-	view := picker.SessionView{ID: s.id, Name: s.name, Active: s.active, Tabs: make([]string, len(s.tabs))}
	75	+	view := picker.SessionView{ID: s.id, Name: s.name, Active: s.active, Tabs: make([]picker.TabEntry, len(s.tabs))}
76	76		sessionAttention := false
77	77		for i, tb := range s.tabs {
78		-	label := composeTabTitle(tabDisplayName(tb, i), tb.focusedPaneTitle(includeTerminalTitle))
	78	+	name := tabDisplayName(tb, i)
	79	+	view.Tabs[i] = picker.TabEntry{
	80	+	Name: name,
	81	+	Detail: tabTitleDetail(name, tb.focusedPaneTitle(includeTerminalTitle)),
	82	+	Attention: tb.attention,
	83	+	}
79	84		if tb.attention {
80		-	label = attentionSuffix(label)
81	85		sessionAttention = true
82	86		}
83		-	view.Tabs[i] = label
84	87		}
85	88		if sessionAttention {
86	89		view.Name = attentionSuffix(view.Name)

@@ -95,7 +98,7 @@ func (d Daemon) pickerViews(cur session) ([]picker.SessionView, int) {
95	98		views = append(views, picker.SessionView{
96	99		ID: domain.SessionID("stopped:" + s.name),
97	100		Name: s.name,
98		-	Tabs: []string{""},
	101	+	Tabs: []picker.TabEntry{{}},
99	102		Stopped: true,
100	103		})
101	104		}

@@ -103,7 +106,7 @@ func (d Daemon) pickerViews(cur session) ([]picker.SessionView, int) {
103	106		}
104	107
105	108		func attentionSuffix(label string) string {
106		-	return label + " " + string(attentionGlyph)
	109	+	return label + " " + string(ui.AttentionGlyph)
107	110		}
108	111
109	112		func (d Daemon) handlePickerInput(ac attachedClient, data []byte) {

@@ -490,8 +493,16 @@ func (d Daemon) refreshPicker(ac attachedClient) {
490	493
491	494		func composePickerClientFrame(model *picker.Model, preview picker.Preview, base renderer.Frame, styles ...themeStyles) (renderer.Frame, []renderer.Damage) {
492	495		styleSet := resolveThemeStyles(styles)
493		-	return composeModalClientFrame(base, pickerModal, styleSet, styleSet.selection, func(size domain.Size, styles ...renderer.Style) renderer.Frame {
494		-	return model.Render(size, preview, styles...)
	496	+	renderStyles := picker.RenderStyles{
	497	+	Selection: styleSet.selection,
	498	+	SelectionName: styleSet.pickerSelectionName,
	499	+	SelectionMuted: styleSet.pickerSelectionMuted,
	500	+	Name: styleSet.pickerName,
	501	+	Detail: styleSet.paletteDesc,
	502	+	Base: renderer.DefaultStyle(),
	503	+	}
	504	+	return composeModalClientFrame(base, pickerModal, styleSet, styleSet.selection, func(size domain.Size, _ ...renderer.Style) renderer.Frame {
	505	+	return model.Render(size, preview, renderStyles)
495	506		})
496	507		}
497	508

 	curTab := 0
 	for _, s := range sessions {
 		s.mu.Lock()
-		view := picker.SessionView{ID: s.id, Name: s.name, Active: s.active, Tabs: make([]string, len(s.tabs))}
+		view := picker.SessionView{ID: s.id, Name: s.name, Active: s.active, Tabs: make([]picker.TabEntry, len(s.tabs))}
 		sessionAttention := false
 		for i, tb := range s.tabs {
-			label := composeTabTitle(tabDisplayName(tb, i), tb.focusedPaneTitle(includeTerminalTitle))
+			name := tabDisplayName(tb, i)
+			view.Tabs[i] = picker.TabEntry{
+				Name:      name,
+				Detail:    tabTitleDetail(name, tb.focusedPaneTitle(includeTerminalTitle)),
+				Attention: tb.attention,
+			}
 			if tb.attention {
-				label = attentionSuffix(label)
 				sessionAttention = true
 			}
-			view.Tabs[i] = label
 		}
 		if sessionAttention {
 			view.Name = attentionSuffix(view.Name)
 		views = append(views, picker.SessionView{
 			ID:      domain.SessionID("stopped:" + s.name),
 			Name:    s.name,
-			Tabs:    []string{""},
+			Tabs:    []picker.TabEntry{{}},
 			Stopped: true,
 		})
 	}
 }
 func attentionSuffix(label string) string {
-	return label + " " + string(attentionGlyph)
+	return label + " " + string(ui.AttentionGlyph)
 }
 func (d *Daemon) handlePickerInput(ac *attachedClient, data []byte) {
 func composePickerClientFrame(model *picker.Model, preview picker.Preview, base renderer.Frame, styles ...themeStyles) (renderer.Frame, []renderer.Damage) {
 	styleSet := resolveThemeStyles(styles)
-	return composeModalClientFrame(base, pickerModal, styleSet, styleSet.selection, func(size domain.Size, styles ...renderer.Style) renderer.Frame {
+	renderStyles := picker.RenderStyles{
-		return model.Render(size, preview, styles...)
+		Selection:      styleSet.selection,
+		SelectionName:  styleSet.pickerSelectionName,
+		SelectionMuted: styleSet.pickerSelectionMuted,
+		Name:           styleSet.pickerName,
+		Detail:         styleSet.paletteDesc,
+		Base:           renderer.DefaultStyle(),
+	}
+	return composeModalClientFrame(base, pickerModal, styleSet, styleSet.selection, func(size domain.Size, _ ...renderer.Style) renderer.Frame {
+		return model.Render(size, preview, renderStyles)
 	})
 }

M internal/usecase/daemon/picker_test.go +4 -4


@@ -61,9 +61,9 @@ func TestPickerViewsAddsBellSuffixForAttention(t *testing.T) {
61	61		require.Equal(t, 0, curTab)
62	62		require.Len(t, views, 2)
63	63		require.Equal(t, "alpha", views[0].Name)
64		-	require.Equal(t, []string{"1", "2"}, views[0].Tabs)
	64	+	require.Equal(t, []picker.TabEntry{{Name: "1"}, {Name: "2"}}, views[0].Tabs)
65	65		require.Equal(t, "beta ", views[1].Name)
66		-	require.Equal(t, []string{"shell", "logs "}, views[1].Tabs)
	66	+	require.Equal(t, []picker.TabEntry{{Name: "shell"}, {Name: "logs", Attention: true}}, views[1].Tabs)
67	67		}
68	68
69	69		func TestPickerViewsComposesFocusedPaneTitleWithAttentionSuffix(t *testing.T) {

@@ -88,7 +88,7 @@ func TestPickerViewsComposesFocusedPaneTitleWithAttentionSuffix(t *testing.T) {
88	88		views, _ := d.pickerViews(sess)
89	89
90	90		require.Len(t, views, 1)
91		-	require.Equal(t, []string{"1 (vim)", attentionSuffix("logs (sh)")}, views[0].Tabs)
	91	+	require.Equal(t, []picker.TabEntry{{Name: "1", Detail: " (vim)"}, {Name: "logs", Detail: " (sh)", Attention: true}}, views[0].Tabs)
92	92		}
93	93
94	94		func TestPickerViewsOmitsTerminalTitleWhenTabsConfigDisabled(t *testing.T) {

@@ -112,7 +112,7 @@ func TestPickerViewsOmitsTerminalTitleWhenTabsConfigDisabled(t *testing.T) {
112	112		views, _ := d.pickerViews(sess)
113	113
114	114		require.Len(t, views, 1)
115		-	require.Equal(t, []string{"1 (vim)", "logs (sh)"}, views[0].Tabs)
	115	+	require.Equal(t, []picker.TabEntry{{Name: "1", Detail: " (vim)"}, {Name: "logs", Detail: " (sh)"}}, views[0].Tabs)
116	116		}
117	117
118	118		func TestPickerResumesStoppedSessionWithPersistedTabNames(t *testing.T) {


@@ -61,9 +61,9 @@ func TestPickerViewsAddsBellSuffixForAttention(t *testing.T) {
61		require.Equal(t, 0, curTab)	61		require.Equal(t, 0, curTab)
62		require.Len(t, views, 2)	62		require.Len(t, views, 2)
63		require.Equal(t, "alpha", views[0].Name)	63		require.Equal(t, "alpha", views[0].Name)
64	-	require.Equal(t, []string{"1", "2"}, views[0].Tabs)	64	+	require.Equal(t, []picker.TabEntry{{Name: "1"}, {Name: "2"}}, views[0].Tabs)
65		require.Equal(t, "beta ", views[1].Name)	65		require.Equal(t, "beta ", views[1].Name)
66	-	require.Equal(t, []string{"shell", "logs "}, views[1].Tabs)	66	+	require.Equal(t, []picker.TabEntry{{Name: "shell"}, {Name: "logs", Attention: true}}, views[1].Tabs)
67		}	67		}
68			68
69		func TestPickerViewsComposesFocusedPaneTitleWithAttentionSuffix(t *testing.T) {	69		func TestPickerViewsComposesFocusedPaneTitleWithAttentionSuffix(t *testing.T) {

@@ -88,7 +88,7 @@ func TestPickerViewsComposesFocusedPaneTitleWithAttentionSuffix(t *testing.T) {
88		views, _ := d.pickerViews(sess)	88		views, _ := d.pickerViews(sess)
89			89
90		require.Len(t, views, 1)	90		require.Len(t, views, 1)
91	-	require.Equal(t, []string{"1 (vim)", attentionSuffix("logs (sh)")}, views[0].Tabs)	91	+	require.Equal(t, []picker.TabEntry{{Name: "1", Detail: " (vim)"}, {Name: "logs", Detail: " (sh)", Attention: true}}, views[0].Tabs)
92		}	92		}
93			93
94		func TestPickerViewsOmitsTerminalTitleWhenTabsConfigDisabled(t *testing.T) {	94		func TestPickerViewsOmitsTerminalTitleWhenTabsConfigDisabled(t *testing.T) {

@@ -112,7 +112,7 @@ func TestPickerViewsOmitsTerminalTitleWhenTabsConfigDisabled(t *testing.T) {
112		views, _ := d.pickerViews(sess)	112		views, _ := d.pickerViews(sess)
113			113
114		require.Len(t, views, 1)	114		require.Len(t, views, 1)
115	-	require.Equal(t, []string{"1 (vim)", "logs (sh)"}, views[0].Tabs)	115	+	require.Equal(t, []picker.TabEntry{{Name: "1", Detail: " (vim)"}, {Name: "logs", Detail: " (sh)"}}, views[0].Tabs)
116		}	116		}
117			117
118		func TestPickerResumesStoppedSessionWithPersistedTabNames(t *testing.T) {	118		func TestPickerResumesStoppedSessionWithPersistedTabNames(t *testing.T) {

M internal/usecase/daemon/render.go +31 -5


@@ -370,7 +370,7 @@ func (d Daemon) paintForResizeGeneration(sess session, ac *attachedClient, res
370	370		d.refreshSessionFocusedTitles(sess)
371	371		bars := d.barStateForClient(sess, ac, overlays.copyFeedback)
372	372		bars.theme = ac.getTheme()
373		-	_, attentionVisible := pulseStyle(bars.attentionFrame)
	373	+	attentionVisible := pulseVisible(bars.attentionFrame)
374	374		repaintAttachedClients = sess.ackAttention(tb, attentionVisible)
375	375
376	376		styles := newThemeStyles(ac.getTheme())

@@ -576,16 +576,42 @@ type themeStyles struct {
576	576		selection renderer.Style
577	577		copyStatus renderer.Style
578	578		paletteDesc renderer.Style
	579	+
	580	+	// Top bar tab label segments: name (bold) and parenthesized pane-title
	581	+	// (muted), one pair per base style. No-ops to statusBar/accent on
	582	+	// non-truecolor themes.
	583	+	tabName renderer.Style
	584	+	tabNameActive renderer.Style
	585	+	tabTitle renderer.Style
	586	+	tabTitleActive renderer.Style
	587	+
	588	+	// Session picker row segments. Detail reuses paletteDesc (both are
	589	+	// themeui.MutedTextStyle(t)); pickerName/pickerSelection* are picker-only.
	590	+	pickerName renderer.Style
	591	+	pickerSelectionName renderer.Style
	592	+	pickerSelectionMuted renderer.Style
579	593		}
580	594
581	595		func newThemeStyles(t themeui.Theme) themeStyles {
	596	+	statusBar := themeui.StatusBarStyle(t)
	597	+	accent := themeui.AccentStyle(t)
	598	+	selection := themeui.SelectionStyle(t)
582	599		return themeStyles{
583		-	statusBar: themeui.StatusBarStyle(t),
584		-	accent: themeui.AccentStyle(t),
	600	+	statusBar: statusBar,
	601	+	accent: accent,
585	602		border: themeui.BorderStyle(t),
586		-	selection: themeui.SelectionStyle(t),
587		-	copyStatus: themeui.SelectionStyle(t),
	603	+	selection: selection,
	604	+	copyStatus: selection,
588	605		paletteDesc: themeui.MutedTextStyle(t),
	606	+
	607	+	tabName: themeui.EmphasisStyle(statusBar, t),
	608	+	tabNameActive: themeui.EmphasisStyle(accent, t),
	609	+	tabTitle: themeui.MutedVariantStyle(statusBar, t),
	610	+	tabTitleActive: themeui.MutedVariantStyle(accent, t),
	611	+
	612	+	pickerName: themeui.EmphasisStyle(renderer.DefaultStyle(), t),
	613	+	pickerSelectionName: themeui.EmphasisStyle(selection, t),
	614	+	pickerSelectionMuted: themeui.MutedVariantStyle(selection, t),
589	615		}
590	616		}
591	617


@@ -370,7 +370,7 @@ func (d Daemon) paintForResizeGeneration(sess session, ac *attachedClient, res
370		d.refreshSessionFocusedTitles(sess)	370		d.refreshSessionFocusedTitles(sess)
371		bars := d.barStateForClient(sess, ac, overlays.copyFeedback)	371		bars := d.barStateForClient(sess, ac, overlays.copyFeedback)
372		bars.theme = ac.getTheme()	372		bars.theme = ac.getTheme()
373	-	_, attentionVisible := pulseStyle(bars.attentionFrame)	373	+	attentionVisible := pulseVisible(bars.attentionFrame)
374		repaintAttachedClients = sess.ackAttention(tb, attentionVisible)	374		repaintAttachedClients = sess.ackAttention(tb, attentionVisible)
375			375
376		styles := newThemeStyles(ac.getTheme())	376		styles := newThemeStyles(ac.getTheme())

@@ -576,16 +576,42 @@ type themeStyles struct {
576		selection renderer.Style	576		selection renderer.Style
577		copyStatus renderer.Style	577		copyStatus renderer.Style
578		paletteDesc renderer.Style	578		paletteDesc renderer.Style
			579	+
			580	+	// Top bar tab label segments: name (bold) and parenthesized pane-title
			581	+	// (muted), one pair per base style. No-ops to statusBar/accent on
			582	+	// non-truecolor themes.
			583	+	tabName renderer.Style
			584	+	tabNameActive renderer.Style
			585	+	tabTitle renderer.Style
			586	+	tabTitleActive renderer.Style
			587	+
			588	+	// Session picker row segments. Detail reuses paletteDesc (both are
			589	+	// themeui.MutedTextStyle(t)); pickerName/pickerSelection* are picker-only.
			590	+	pickerName renderer.Style
			591	+	pickerSelectionName renderer.Style
			592	+	pickerSelectionMuted renderer.Style
579		}	593		}
580			594
581		func newThemeStyles(t themeui.Theme) themeStyles {	595		func newThemeStyles(t themeui.Theme) themeStyles {
			596	+	statusBar := themeui.StatusBarStyle(t)
			597	+	accent := themeui.AccentStyle(t)
			598	+	selection := themeui.SelectionStyle(t)
582		return themeStyles{	599		return themeStyles{
583	-	statusBar: themeui.StatusBarStyle(t),	600	+	statusBar: statusBar,
584	-	accent: themeui.AccentStyle(t),	601	+	accent: accent,
585		border: themeui.BorderStyle(t),	602		border: themeui.BorderStyle(t),
586	-	selection: themeui.SelectionStyle(t),	603	+	selection: selection,
587	-	copyStatus: themeui.SelectionStyle(t),	604	+	copyStatus: selection,
588		paletteDesc: themeui.MutedTextStyle(t),	605		paletteDesc: themeui.MutedTextStyle(t),
			606	+
			607	+	tabName: themeui.EmphasisStyle(statusBar, t),
			608	+	tabNameActive: themeui.EmphasisStyle(accent, t),
			609	+	tabTitle: themeui.MutedVariantStyle(statusBar, t),
			610	+	tabTitleActive: themeui.MutedVariantStyle(accent, t),
			611	+
			612	+	pickerName: themeui.EmphasisStyle(renderer.DefaultStyle(), t),
			613	+	pickerSelectionName: themeui.EmphasisStyle(selection, t),
			614	+	pickerSelectionMuted: themeui.MutedVariantStyle(selection, t),
589		}	615		}
590		}	616		}
591			617

M internal/usecase/daemon/status.go +63 -28


@@ -38,26 +38,40 @@ import (
38	38		)
39	39
40	40		const (
41		-	attentionGlyph = ''
42	41		maxMRUSessions = 9
43	42		pulseFrameCount = 30
44	43		pulseFrameInterval = 120 * time.Millisecond
45	44		)
46	45
47		-	func pulseStyle(frame int) (renderer.Style, bool) {
48		-	f := frame % pulseFrameCount
49		-	if f == 0 {
50		-	return renderer.DefaultStyle(), false
	46	+	// pulseVisible reports whether the attention bell glyph is showing (as
	47	+	// opposed to its blank beat) at frame.
	48	+	func pulseVisible(frame int) bool {
	49	+	return frame%pulseFrameCount != 0
	50	+	}
	51	+
	52	+	// pulseStyle returns the style for the attention bell glyph at frame, built
	53	+	// on top of base so the bell always keeps the caller's background (the tab's
	54	+	// accent/statusBar, or a faded MRU entry's blended colors) instead of
	55	+	// punching a default-background hole in a themed bar. On the invisible beat
	56	+	// it returns (base, false) unchanged.
	57	+	func pulseStyle(frame int, base renderer.Style) (renderer.Style, bool) {
	58	+	if !pulseVisible(frame) {
	59	+	return base, false
51	60		}
	61	+	f := frame % pulseFrameCount
52	62		peak := pulseFrameCount / 2
53	63		distance := f - peak
54	64		if distance < 0 {
55	65		distance = -distance
56	66		}
57	67		intensity := 1 - float64(distance)/float64(peak)
58		-	style := renderer.DefaultStyle()
	68	+	style := base
59	69		style.Bold = true
60		-	style.Foreground = 244 + int(intensity*11)
	70	+	if base.HasForegroundRGB && base.HasBackgroundRGB {
	71	+	style.ForegroundRGB = themeui.Blend(base.BackgroundRGB, base.ForegroundRGB, intensity)
	72	+	} else {
	73	+	style.Foreground = 244 + int(intensity*11)
	74	+	}
61	75		return style, true
62	76		}
63	77

@@ -66,16 +80,22 @@ func drawTopBarSnapshot(row []renderer.Cell, status statusSnapshot, frame int, t
66	80		x := 0
67	81		labels := fitTabLabels(status.tabs, len(row), topRight)
68	82		for i, w := range status.tabs {
69		-	style := styles.statusBar
	83	+	baseStyle := styles.statusBar
	84	+	nameStyle := styles.tabName
	85	+	titleStyle := styles.tabTitle
70	86		if w.active {
71		-	style = styles.accent
	87	+	baseStyle = styles.accent
	88	+	nameStyle = styles.tabNameActive
	89	+	titleStyle = styles.tabTitleActive
72	90		}
73		-	writeStatusText(row, &x, " "+labels[i], style)
	91	+	label := labels[i]
	92	+	writeStatusText(row, &x, " "+label.text[:label.nameLen], nameStyle)
74	93		if w.attention {
75		-	writeStatusText(row, &x, " ", style)
76		-	writeBell(row, &x, frame)
	94	+	writeStatusText(row, &x, " ", baseStyle)
	95	+	writeBell(row, &x, frame, baseStyle)
77	96		}
78		-	writeStatusText(row, &x, " ", style)
	97	+	writeStatusText(row, &x, label.text[label.nameLen:], titleStyle)
	98	+	writeStatusText(row, &x, " ", baseStyle)
79	99		}
80	100		drawRightPlainText(row, topRight, x, styles.statusBar)
81	101		}

@@ -117,7 +137,7 @@ func drawStatusSessionEntry(row []renderer.Cell, x *int, name string, ephemeral,
117	137		writeStatusText(row, x, " "+name, style)
118	138		if attention {
119	139		writeStatusText(row, x, " ", style)
120		-	writeBell(row, x, attentionFrame)
	140	+	writeBell(row, x, attentionFrame, style)
121	141		}
122	142		writeStatusText(row, x, " ", style)
123	143		}

@@ -335,7 +355,7 @@ func fitHistoryNav(entries []historyNavSession, rowLen, leftUsed int, feedback s
335	355		}
336	356		n := 2 + statusTextWidth(name)
337	357		if e.attention {
338		-	n += 1 + renderer.RuneWidth(attentionGlyph)
	358	+	n += 1 + renderer.RuneWidth(ui.AttentionGlyph)
339	359		}
340	360		return n
341	361		}

@@ -383,9 +403,18 @@ func fitHistoryNav(entries []historyNavSession, rowLen, leftUsed int, feedback s
383	403		return entries[start:end]
384	404		}
385	405
	406	+	// fittedTabLabel is one tab's drawable label; text[:nameLen] is the tab-name
	407	+	// segment, text[nameLen:] the pane-title segment (possibly empty). nameLen is
	408	+	// always a byte offset landing on a rune boundary, since it is derived from
	409	+	// the byte length of the (possibly truncated) name prefix.
	410	+	type fittedTabLabel struct {
	411	+	text string
	412	+	nameLen int
	413	+	}
	414	+
386	415		// fitTabLabels returns, per tab, the text drawn between its surrounding
387	416		// spaces (attention glyph handled by the caller), guaranteeing all tabs fit.
388		-	func fitTabLabels(tabs []statusTab, rowLen int, rightText string) []string {
	417	+	func fitTabLabels(tabs []statusTab, rowLen int, rightText string) []fittedTabLabel {
389	418		reserve := 1
390	419		if rightText != "" {
391	420		reserve = statusTextWidth(rightText) + 2

@@ -400,15 +429,17 @@ func fitTabLabels(tabs []statusTab, rowLen int, rightText string) []string {
400	429		full[i] = composeTabTitle(t.name, t.paneTitle)
401	430		o := 2
402	431		if t.attention {
403		-	o += 1 + renderer.RuneWidth(attentionGlyph)
	432	+	o += 1 + renderer.RuneWidth(ui.AttentionGlyph)
404	433		}
405	434		overhead[i] = o
406	435		widths[i] = statusTextWidth(full[i])
407	436		total += o + widths[i]
408	437		}
409		-	labels := make([]string, len(tabs))
	438	+	labels := make([]fittedTabLabel, len(tabs))
410	439		if total <= budget {
411		-	copy(labels, full)
	440	+	for i, t := range tabs {
	441	+	labels[i] = fittedTabLabel{text: full[i], nameLen: len(t.name)}
	442	+	}
412	443		return labels
413	444		}
414	445

@@ -430,13 +461,14 @@ func fitTabLabels(tabs []statusTab, rowLen int, rightText string) []string {
430	461		textBudget := share - overhead[i]
431	462		switch {
432	463		case textBudget <= 0:
433		-	labels[i] = ""
	464	+	labels[i] = fittedTabLabel{}
434	465		case widths[i] <= textBudget:
435		-	labels[i] = full[i]
	466	+	labels[i] = fittedTabLabel{text: full[i], nameLen: len(tabs[i].name)}
436	467		case textBudget >= statusTextWidth(tabs[i].name)+4:
437		-	labels[i] = ui.TruncateText(full[i], textBudget)
	468	+	labels[i] = fittedTabLabel{text: ui.TruncateText(full[i], textBudget), nameLen: len(tabs[i].name)}
438	469		default:
439		-	labels[i] = ui.TruncateText(tabs[i].name, textBudget)
	470	+	text := ui.TruncateText(tabs[i].name, textBudget)
	471	+	labels[i] = fittedTabLabel{text: text, nameLen: len(text)}
440	472		}
441	473		consumed := overhead[i] + min(widths[i], max(textBudget, 0))
442	474		remaining -= consumed

@@ -463,7 +495,7 @@ func fitMRU(entries []mruSession, rowLen, leftUsed int, feedback string) []mruSe
463	495		}
464	496		n := 2 + statusTextWidth(name)
465	497		if e.attention {
466		-	n += 1 + renderer.RuneWidth(attentionGlyph)
	498	+	n += 1 + renderer.RuneWidth(ui.AttentionGlyph)
467	499		}
468	500		return n
469	501		}

@@ -521,13 +553,16 @@ func mruStyle(base renderer.Style, t themeui.Theme, i, count int) renderer.Style
521	553		return base
522	554		}
523	555
524		-	func writeBell(row []renderer.Cell, x *int, frame int) {
525		-	style, visible := pulseStyle(frame)
	556	+	// writeBell draws the attention glyph on its visible beat, or a plain cell in
	557	+	// base's style on its blank beat, so the bell never leaves a bare
	558	+	// default-background hole in a themed bar.
	559	+	func writeBell(row []renderer.Cell, x *int, frame int, base renderer.Style) {
	560	+	style, visible := pulseStyle(frame, base)
526	561		if !visible {
527		-	writeStatusText(row, x, " ", renderer.DefaultStyle())
	562	+	writeStatusText(row, x, " ", base)
528	563		return
529	564		}
530		-	writeStatusText(row, x, string(attentionGlyph), style)
	565	+	writeStatusText(row, x, string(ui.AttentionGlyph), style)
531	566		}
532	567
533	568		func writeStatusText(row []renderer.Cell, x *int, text string, style renderer.Style) {

 )
 const (
-	attentionGlyph     = ''
 	maxMRUSessions     = 9
 	pulseFrameCount    = 30
 	pulseFrameInterval = 120 * time.Millisecond
 )
-func pulseStyle(frame int) (renderer.Style, bool) {
+// pulseVisible reports whether the attention bell glyph is showing (as
-	f := frame % pulseFrameCount
+// opposed to its blank beat) at frame.
-	if f == 0 {
+func pulseVisible(frame int) bool {
-		return renderer.DefaultStyle(), false
+	return frame%pulseFrameCount != 0
+}
+// pulseStyle returns the style for the attention bell glyph at frame, built
+// on top of base so the bell always keeps the caller's background (the tab's
+// accent/statusBar, or a faded MRU entry's blended colors) instead of
+// punching a default-background hole in a themed bar. On the invisible beat
+// it returns (base, false) unchanged.
+func pulseStyle(frame int, base renderer.Style) (renderer.Style, bool) {
+	if !pulseVisible(frame) {
+		return base, false
 	}
+	f := frame % pulseFrameCount
 	peak := pulseFrameCount / 2
 	distance := f - peak
 	if distance < 0 {
 		distance = -distance
 	}
 	intensity := 1 - float64(distance)/float64(peak)
-	style := renderer.DefaultStyle()
+	style := base
 	style.Bold = true
-	style.Foreground = 244 + int(intensity*11)
+	if base.HasForegroundRGB && base.HasBackgroundRGB {
+		style.ForegroundRGB = themeui.Blend(base.BackgroundRGB, base.ForegroundRGB, intensity)
+	} else {
+		style.Foreground = 244 + int(intensity*11)
+	}
 	return style, true
 }
 	x := 0
 	labels := fitTabLabels(status.tabs, len(row), topRight)
 	for i, w := range status.tabs {
-		style := styles.statusBar
+		baseStyle := styles.statusBar
+		nameStyle := styles.tabName
+		titleStyle := styles.tabTitle
 		if w.active {
-			style = styles.accent
+			baseStyle = styles.accent
+			nameStyle = styles.tabNameActive
+			titleStyle = styles.tabTitleActive
 		}
-		writeStatusText(row, &x, " "+labels[i], style)
+		label := labels[i]
+		writeStatusText(row, &x, " "+label.text[:label.nameLen], nameStyle)
 		if w.attention {
-			writeStatusText(row, &x, " ", style)
+			writeStatusText(row, &x, " ", baseStyle)
-			writeBell(row, &x, frame)
+			writeBell(row, &x, frame, baseStyle)
 		}
-		writeStatusText(row, &x, " ", style)
+		writeStatusText(row, &x, label.text[label.nameLen:], titleStyle)
+		writeStatusText(row, &x, " ", baseStyle)
 	}
 	drawRightPlainText(row, topRight, x, styles.statusBar)
 }
 	writeStatusText(row, x, " "+name, style)
 	if attention {
 		writeStatusText(row, x, " ", style)
-		writeBell(row, x, attentionFrame)
+		writeBell(row, x, attentionFrame, style)
 	}
 	writeStatusText(row, x, " ", style)
 }
 		}
 		n := 2 + statusTextWidth(name)
 		if e.attention {
-			n += 1 + renderer.RuneWidth(attentionGlyph)
+			n += 1 + renderer.RuneWidth(ui.AttentionGlyph)
 		}
 		return n
 	}
 	return entries[start:end]
 }
+// fittedTabLabel is one tab's drawable label; text[:nameLen] is the tab-name
+// segment, text[nameLen:] the pane-title segment (possibly empty). nameLen is
+// always a byte offset landing on a rune boundary, since it is derived from
+// the byte length of the (possibly truncated) name prefix.
+type fittedTabLabel struct {
+	text    string
+	nameLen int
+}
 // fitTabLabels returns, per tab, the text drawn between its surrounding
 // spaces (attention glyph handled by the caller), guaranteeing all tabs fit.
-func fitTabLabels(tabs []statusTab, rowLen int, rightText string) []string {
+func fitTabLabels(tabs []statusTab, rowLen int, rightText string) []fittedTabLabel {
 	reserve := 1
 	if rightText != "" {
 		reserve = statusTextWidth(rightText) + 2
 		full[i] = composeTabTitle(t.name, t.paneTitle)
 		o := 2
 		if t.attention {
-			o += 1 + renderer.RuneWidth(attentionGlyph)
+			o += 1 + renderer.RuneWidth(ui.AttentionGlyph)
 		}
 		overhead[i] = o
 		widths[i] = statusTextWidth(full[i])
 		total += o + widths[i]
 	}
-	labels := make([]string, len(tabs))
+	labels := make([]fittedTabLabel, len(tabs))
 	if total <= budget {
-		copy(labels, full)
+		for i, t := range tabs {
+			labels[i] = fittedTabLabel{text: full[i], nameLen: len(t.name)}
+		}
 		return labels
 	}
 		textBudget := share - overhead[i]
 		switch {
 		case textBudget <= 0:
-			labels[i] = ""
+			labels[i] = fittedTabLabel{}
 		case widths[i] <= textBudget:
-			labels[i] = full[i]
+			labels[i] = fittedTabLabel{text: full[i], nameLen: len(tabs[i].name)}
 		case textBudget >= statusTextWidth(tabs[i].name)+4:
-			labels[i] = ui.TruncateText(full[i], textBudget)
+			labels[i] = fittedTabLabel{text: ui.TruncateText(full[i], textBudget), nameLen: len(tabs[i].name)}
 		default:
-			labels[i] = ui.TruncateText(tabs[i].name, textBudget)
+			text := ui.TruncateText(tabs[i].name, textBudget)
+			labels[i] = fittedTabLabel{text: text, nameLen: len(text)}
 		}
 		consumed := overhead[i] + min(widths[i], max(textBudget, 0))
 		remaining -= consumed
 		}
 		n := 2 + statusTextWidth(name)
 		if e.attention {
-			n += 1 + renderer.RuneWidth(attentionGlyph)
+			n += 1 + renderer.RuneWidth(ui.AttentionGlyph)
 		}
 		return n
 	}
 	return base
 }
-func writeBell(row []renderer.Cell, x *int, frame int) {
+// writeBell draws the attention glyph on its visible beat, or a plain cell in
-	style, visible := pulseStyle(frame)
+// base's style on its blank beat, so the bell never leaves a bare
+// default-background hole in a themed bar.
+func writeBell(row []renderer.Cell, x *int, frame int, base renderer.Style) {
+	style, visible := pulseStyle(frame, base)
 	if !visible {
-		writeStatusText(row, x, " ", renderer.DefaultStyle())
+		writeStatusText(row, x, " ", base)
 		return
 	}
-	writeStatusText(row, x, string(attentionGlyph), style)
+	writeStatusText(row, x, string(ui.AttentionGlyph), style)
 }
 func writeStatusText(row []renderer.Cell, x *int, text string, style renderer.Style) {

M internal/usecase/daemon/status_test.go +193 -22


@@ -7,6 +7,7 @@ import (
7	7		"sync"
8	8		"testing"
9	9		"time"
	10	+	"unicode/utf8"
10	11
11	12		"github.com/stretchr/testify/require"
12	13

@@ -14,6 +15,7 @@ import (
14	15		"github.com/bnema/vev/internal/ports"
15	16		"github.com/bnema/vev/internal/usecase/layout"
16	17		themeui "github.com/bnema/vev/internal/usecase/theme"
	18	+	"github.com/bnema/vev/internal/usecase/ui"
17	19		"github.com/bnema/vev/pkg/renderer"
18	20		)
19	21

@@ -162,19 +164,19 @@ func TestFitTabLabels(t *testing.T) {
162	164		tabs []statusTab
163	165		rowLen int
164	166		rightText string
165		-	want []string
	167	+	want []fittedTabLabel
166	168		}{
167	169		{
168	170		name: "no tabs",
169	171		tabs: nil,
170	172		rowLen: 10,
171		-	want: []string{},
	173	+	want: []fittedTabLabel{},
172	174		},
173	175		{
174	176		name: "everything fits stays untruncated",
175	177		tabs: []statusTab{{name: "one"}, {name: "two", paneTitle: "shell"}},
176	178		rowLen: 40,
177		-	want: []string{"one", "two (shell)"},
	179	+	want: []fittedTabLabel{{text: "one", nameLen: len("one")}, {text: "two (shell)", nameLen: len("two")}},
178	180		},
179	181		{
180	182		name: "overflow redistributes budget: short tab stays full, long tab gets ellipsis",

@@ -183,26 +185,26 @@ func TestFitTabLabels(t *testing.T) {
183	185		{name: "ed", paneTitle: "verylongtitle"},
184	186		},
185	187		rowLen: 20,
186		-	want: []string{"a", "ed (verylongt…"},
	188	+	want: []fittedTabLabel{{text: "a", nameLen: len("a")}, {text: "ed (verylongt…", nameLen: len("ed")}},
187	189		},
188	190		{
189	191		name: "tight budget degrades to a truncated tab name only",
190	192		tabs: []statusTab{{name: "editor", paneTitle: "some pane title text"}},
191	193		rowLen: 7,
192		-	want: []string{"edi…"},
	194	+	want: []fittedTabLabel{{text: "edi…", nameLen: len("edi…")}},
193	195		},
194	196		{
195	197		name: "non-empty rightText shrinks the budget",
196	198		tabs: []statusTab{{name: "aaaaaaaaaa"}},
197	199		rowLen: 20,
198	200		rightText: "0123456789",
199		-	want: []string{"aaaaa…"},
	201	+	want: []fittedTabLabel{{text: "aaaaa…", nameLen: len("aaaaa…")}},
200	202		},
201	203		{
202	204		name: "single tab wider than the whole row collapses to empty",
203	205		tabs: []statusTab{{name: "reallyverylongtabname"}},
204	206		rowLen: 3,
205		-	want: []string{""},
	207	+	want: []fittedTabLabel{{}},
206	208		},
207	209		}
208	210		for _, tt := range tests {

@@ -220,9 +222,13 @@ func TestFitTabLabels(t *testing.T) {
220	222		for i, tb := range tt.tabs {
221	223		overhead := 2
222	224		if tb.attention {
223		-	overhead += 1 + renderer.RuneWidth(attentionGlyph)
	225	+	overhead += 1 + renderer.RuneWidth(ui.AttentionGlyph)
	226	+	}
	227	+	drawn += overhead + statusTextWidth(got[i].text)
	228	+	require.LessOrEqual(t, got[i].nameLen, len(got[i].text), "nameLen must not exceed the label's byte length")
	229	+	if got[i].nameLen < len(got[i].text) {
	230	+	require.True(t, utf8.RuneStart(got[i].text[got[i].nameLen]), "nameLen must land on a rune boundary")
224	231		}
225		-	drawn += overhead + statusTextWidth(got[i])
226	232		}
227	233		if budget > 0 {
228	234		require.LessOrEqual(t, drawn, budget, "drawn width must not exceed the derived budget")

@@ -231,6 +237,141 @@ func TestFitTabLabels(t *testing.T) {
231	237		}
232	238		}
233	239
	240	+	func TestDrawTopBarSnapshotStylesTabNameAndTitle(t *testing.T) {
	241	+	tabs := []statusTab{
	242	+	{name: "api", paneTitle: "shell"},
	243	+	{name: "logs", active: true, attention: true},
	244	+	{name: "err", paneTitle: "build failed", attention: true},
	245	+	}
	246	+	status := statusSnapshot{tabs: tabs}
	247	+	const rowLen = 60
	248	+
	249	+	t.Run("truecolor theme bolds names, mutes titles, and the bell keeps the base background", func(t *testing.T) {
	250	+	theme := themeui.Theme{
	251	+	Foreground: renderer.RGB{R: 200, G: 200, B: 200},
	252	+	Background: renderer.RGB{R: 10, G: 20, B: 30},
	253	+	HasFG: true,
	254	+	HasBG: true,
	255	+	Known: true,
	256	+	TrueColor: true,
	257	+	}
	258	+	styles := newThemeStyles(theme)
	259	+	require.False(t, styles.tabTitle.Equal(styles.statusBar), "sanity: muted title style must differ from the base style on a truecolor theme")
	260	+	require.False(t, styles.tabTitleActive.Equal(styles.accent), "sanity: muted active-title style must differ from the base accent style")
	261	+
	262	+	labels := fitTabLabels(tabs, rowLen, "")
	263	+
	264	+	// Frame 0 is the bell's blank beat: the attention space and the blank
	265	+	// bell cell must both be exactly the tab's base style (not
	266	+	// renderer.DefaultStyle(), which would punch a hole in a themed bar).
	267	+	// This also pins down segment order: name, then (if attention)
	268	+	// space+bell, then title, then the trailing space.
	269	+	row := make([]renderer.Cell, rowLen)
	270	+	drawTopBarSnapshot(row, status, 0, "", styles)
	271	+	x := 0
	272	+
	273	+	// tab 0: inactive, no attention: name, title, trailing space.
	274	+	nameEnd := x + 1 + labels[0].nameLen
	275	+	for i := x; i < nameEnd; i++ {
	276	+	require.True(t, row[i].Style.Bold, "cell %d: name segment must be bold", i)
	277	+	require.True(t, row[i].Style.Equal(styles.tabName), "cell %d: name segment style mismatch", i)
	278	+	}
	279	+	x = nameEnd
	280	+	titleLen := len(labels[0].text) - labels[0].nameLen
	281	+	titleEnd := x + titleLen
	282	+	for i := x; i < titleEnd; i++ {
	283	+	require.False(t, row[i].Style.Bold, "cell %d: title segment must not be bold", i)
	284	+	require.True(t, row[i].Style.Equal(styles.tabTitle), "cell %d: title segment style mismatch", i)
	285	+	}
	286	+	x = titleEnd
	287	+	require.True(t, row[x].Style.Equal(styles.statusBar), "cell %d: tab 0 trailing space must keep the base style", x)
	288	+	x++
	289	+
	290	+	// tab 1: active, attention, no title: name, attention space+bell (both
	291	+	// base style at frame 0), trailing space.
	292	+	nameEnd = x + 1 + labels[1].nameLen
	293	+	for i := x; i < nameEnd; i++ {
	294	+	require.True(t, row[i].Style.Bold, "cell %d: active name segment must be bold", i)
	295	+	require.True(t, row[i].Style.Equal(styles.tabNameActive), "cell %d: active name segment style mismatch", i)
	296	+	}
	297	+	require.Equal(t, len(labels[1].text), labels[1].nameLen, "tab 1 has no pane title, so its whole label is the name segment")
	298	+	x = nameEnd
	299	+	require.True(t, row[x].Style.Equal(styles.accent), "cell %d: tab 1 attention leading space must keep the active base style", x)
	300	+	x++
	301	+	tab1Bell := x
	302	+	require.True(t, row[x].Style.Equal(styles.accent), "cell %d: tab 1 blank bell must keep the active base style, not DefaultStyle", x)
	303	+	x++
	304	+	require.True(t, row[x].Style.Equal(styles.accent), "cell %d: tab 1 trailing space must keep the active base style", x)
	305	+	x++
	306	+
	307	+	// tab 2: inactive, attention, with title: name, attention space+bell
	308	+	// (both base style at frame 0), title, trailing space.
	309	+	nameEnd = x + 1 + labels[2].nameLen
	310	+	for i := x; i < nameEnd; i++ {
	311	+	require.True(t, row[i].Style.Bold, "cell %d: tab 2 name segment must be bold", i)
	312	+	require.True(t, row[i].Style.Equal(styles.tabName), "cell %d: tab 2 name segment style mismatch", i)
	313	+	}
	314	+	x = nameEnd
	315	+	require.True(t, row[x].Style.Equal(styles.statusBar), "cell %d: tab 2 attention leading space must keep the base style", x)
	316	+	x++
	317	+	tab2Bell := x
	318	+	require.True(t, row[x].Style.Equal(styles.statusBar), "cell %d: tab 2 blank bell must keep the base style, not DefaultStyle", x)
	319	+	x++
	320	+	titleLen = len(labels[2].text) - labels[2].nameLen
	321	+	titleEnd = x + titleLen
	322	+	for i := x; i < titleEnd; i++ {
	323	+	require.False(t, row[i].Style.Bold, "cell %d: tab 2 title segment must not be bold", i)
	324	+	require.True(t, row[i].Style.Equal(styles.tabTitle), "cell %d: tab 2 title segment style mismatch", i)
	325	+	}
	326	+	x = titleEnd
	327	+	require.True(t, row[x].Style.Equal(styles.statusBar), "cell %d: tab 2 trailing space must keep the base style", x)
	328	+
	329	+	// On a visible pulse frame, the bell glyph itself must keep the same
	330	+	// background as its tab's base style.
	331	+	visibleRow := make([]renderer.Cell, rowLen)
	332	+	drawTopBarSnapshot(visibleRow, status, 1, "", styles)
	333	+	require.Equal(t, rune(ui.AttentionGlyph), visibleRow[tab1Bell].Rune)
	334	+	require.True(t, visibleRow[tab1Bell].Style.HasBackgroundRGB)
	335	+	require.Equal(t, styles.accent.BackgroundRGB, visibleRow[tab1Bell].Style.BackgroundRGB, "tab 1's visible bell must keep the active base background")
	336	+	require.Equal(t, rune(ui.AttentionGlyph), visibleRow[tab2Bell].Rune)
	337	+	require.True(t, visibleRow[tab2Bell].Style.HasBackgroundRGB)
	338	+	require.Equal(t, styles.statusBar.BackgroundRGB, visibleRow[tab2Bell].Style.BackgroundRGB, "tab 2's visible bell must keep the plain base background")
	339	+	})
	340	+
	341	+	t.Run("non-usable theme matches the pre-change fallback styles", func(t *testing.T) {
	342	+	styles := resolveThemeStyles(nil)
	343	+	require.True(t, styles.tabName.Equal(styles.statusBar))
	344	+	require.True(t, styles.tabTitle.Equal(styles.statusBar))
	345	+	require.True(t, styles.tabNameActive.Equal(styles.accent))
	346	+	require.True(t, styles.tabTitleActive.Equal(styles.accent))
	347	+
	348	+	row := make([]renderer.Cell, rowLen)
	349	+	drawTopBarSnapshot(row, status, 0, "", styles)
	350	+
	351	+	// " api (shell) " (tab 0) + " logs " (tab 1: name, attention
	352	+	// space+blank bell, trailing space) + " err (build failed) " (tab 2:
	353	+	// name, attention space+blank bell, title, trailing space), then blank
	354	+	// padding to rowLen: byte-for-byte what the pre-change renderer
	355	+	// produced, since every new style field collapses to statusBar/accent.
	356	+	const tab0 = " api (shell) "
	357	+	const tab1 = " logs "
	358	+	const tab2 = " err (build failed) "
	359	+	require.Equal(t, tab0+tab1+tab2+strings.Repeat(" ", rowLen-len(tab0)-len(tab1)-len(tab2)), rowText(row))
	360	+
	361	+	for i, c := range row[:len(tab0)] {
	362	+	require.True(t, c.Style.Equal(styles.statusBar), "cell %d should use the plain base style", i)
	363	+	}
	364	+	tab1Start := len(tab0)
	365	+	for i := tab1Start; i < tab1Start+len(tab1); i++ {
	366	+	require.True(t, row[i].Style.Equal(styles.accent), "cell %d should use the plain accent style, including the blank bell cell", i)
	367	+	}
	368	+	tab2Start := tab1Start + len(tab1)
	369	+	for i := tab2Start; i < tab2Start+len(tab2); i++ {
	370	+	require.True(t, row[i].Style.Equal(styles.statusBar), "cell %d should use the plain base style, including the blank bell cell", i)
	371	+	}
	372	+	})
	373	+	}
	374	+
234	375		func TestTabDisplayName(t *testing.T) {
235	376		tests := []struct {
236	377		name string

@@ -720,20 +861,49 @@ func TestStatusCopyFeedbackRendersOnlyWhenFullyFits(t *testing.T) {
720	861		}
721	862
722	863		func TestAttentionConstants(t *testing.T) {
723		-	require.Equal(t, '', attentionGlyph)
	864	+	require.Equal(t, '', ui.AttentionGlyph)
724	865		require.Equal(t, 30, pulseFrameCount)
725	866		require.Equal(t, 120*time.Millisecond, pulseFrameInterval)
726	867		}
727	868
728		-	func TestPulseStyleHidesAtFrameZeroAndRamps(t *testing.T) {
729		-	_, visible := pulseStyle(0)
730		-	require.False(t, visible)
	869	+	func TestPulseStyleFadesFromBaseAndHidesAtFrameZero(t *testing.T) {
	870	+	rgbBase := renderer.Style{
	871	+	HasForegroundRGB: true, ForegroundRGB: renderer.RGB{R: 200, G: 200, B: 200},
	872	+	HasBackgroundRGB: true, BackgroundRGB: renderer.RGB{R: 10, G: 20, B: 30},
	873	+	}
	874	+	indexedBase := renderer.Style{Foreground: -1, Background: -1, Inverse: true}
	875	+
	876	+	t.Run("invisible frame returns base unchanged", func(t *testing.T) {
	877	+	for _, base := range []renderer.Style{rgbBase, indexedBase} {
	878	+	style, visible := pulseStyle(0, base)
	879	+	require.False(t, visible)
	880	+	require.True(t, style.Equal(base))
	881	+	}
	882	+	})
	883	+
	884	+	t.Run("rgb base blends the glyph foreground from the base background to its foreground, keeping the base background", func(t *testing.T) {
	885	+	low, visible := pulseStyle(1, rgbBase)
	886	+	require.True(t, visible)
	887	+	require.True(t, low.Bold)
	888	+	require.True(t, low.HasBackgroundRGB)
	889	+	require.Equal(t, rgbBase.BackgroundRGB, low.BackgroundRGB, "bell keeps the caller's background so it never punches a hole in a themed bar")
	890	+
	891	+	peak, visible := pulseStyle(pulseFrameCount/2, rgbBase)
	892	+	require.True(t, visible)
	893	+	require.Equal(t, rgbBase.ForegroundRGB, peak.ForegroundRGB, "peak intensity reaches the base foreground exactly")
	894	+	require.NotEqual(t, low.ForegroundRGB, peak.ForegroundRGB, "the glyph should ramp, not jump straight to full intensity")
	895	+	})
	896	+
	897	+	t.Run("non-RGB base falls back to the indexed grey ramp and preserves other base attributes", func(t *testing.T) {
	898	+	low, visible := pulseStyle(1, indexedBase)
	899	+	require.True(t, visible)
	900	+	require.True(t, low.Bold)
	901	+	require.True(t, low.Inverse, "non-color base attributes like inverse must survive")
731	902
732		-	low, visible := pulseStyle(1)
733		-	require.True(t, visible)
734		-	peak, visible := pulseStyle(pulseFrameCount / 2)
735		-	require.True(t, visible)
736		-	require.Greater(t, peak.Foreground, low.Foreground)
	903	+	peak, visible := pulseStyle(pulseFrameCount/2, indexedBase)
	904	+	require.True(t, visible)
	905	+	require.Greater(t, peak.Foreground, low.Foreground)
	906	+	})
737	907		}
738	908
739	909		func TestTopBarRendersAttentionBell(t *testing.T) {

@@ -753,10 +923,11 @@ func TestTopBarRendersAttentionBell(t *testing.T) {
753	923		frame, _ := composeClientFrameWithState(barState{status: sess.statusSegments(true), attentionFrame: 1}, win, true)
754	924
755	925		// Tab 2's label is enriched with its focused pane's title ("sh", the
756		-	// default shell fallback) and truncated to fit alongside the bell.
757		-	require.Contains(t, rowText(frame.Row(0)), "2 (s")
	926	+	// default shell fallback) and truncated to fit alongside the bell. The
	927	+	// bell sits right after the name, before the (title) segment.
	928	+	require.Contains(t, rowText(frame.Row(0)), "2 "+string(ui.AttentionGlyph)+" (s")
758	929		for _, c := range frame.Row(0) {
759		-	if c.Rune == attentionGlyph {
	930	+	if c.Rune == ui.AttentionGlyph {
760	931		require.True(t, c.Style.Bold)
761	932		return
762	933		}

@@ -839,7 +1010,7 @@ func TestStatusBarRendersMRUNamesEphemeralAndInlineBell(t *testing.T) {
839	1010
840	1011		require.Equal(t, " cur fresh tmp*  ", rowText(row))
841	1012		for _, c := range row {
842		-	if c.Rune == attentionGlyph {
	1013	+	if c.Rune == ui.AttentionGlyph {
843	1014		require.True(t, c.Style.Bold)
844	1015		return
845	1016		}


@@ -7,6 +7,7 @@ import (
7		"sync"	7		"sync"
8		"testing"	8		"testing"
9		"time"	9		"time"
			10	+	"unicode/utf8"
10			11
11		"github.com/stretchr/testify/require"	12		"github.com/stretchr/testify/require"
12			13

@@ -14,6 +15,7 @@ import (
14		"github.com/bnema/vev/internal/ports"	15		"github.com/bnema/vev/internal/ports"
15		"github.com/bnema/vev/internal/usecase/layout"	16		"github.com/bnema/vev/internal/usecase/layout"
16		themeui "github.com/bnema/vev/internal/usecase/theme"	17		themeui "github.com/bnema/vev/internal/usecase/theme"
			18	+	"github.com/bnema/vev/internal/usecase/ui"
17		"github.com/bnema/vev/pkg/renderer"	19		"github.com/bnema/vev/pkg/renderer"
18		)	20		)
19			21

@@ -162,19 +164,19 @@ func TestFitTabLabels(t *testing.T) {
162		tabs []statusTab	164		tabs []statusTab
163		rowLen int	165		rowLen int
164		rightText string	166		rightText string
165	-	want []string	167	+	want []fittedTabLabel
166		}{	168		}{
167		{	169		{
168		name: "no tabs",	170		name: "no tabs",
169		tabs: nil,	171		tabs: nil,
170		rowLen: 10,	172		rowLen: 10,
171	-	want: []string{},	173	+	want: []fittedTabLabel{},
172		},	174		},
173		{	175		{
174		name: "everything fits stays untruncated",	176		name: "everything fits stays untruncated",
175		tabs: []statusTab{{name: "one"}, {name: "two", paneTitle: "shell"}},	177		tabs: []statusTab{{name: "one"}, {name: "two", paneTitle: "shell"}},
176		rowLen: 40,	178		rowLen: 40,
177	-	want: []string{"one", "two (shell)"},	179	+	want: []fittedTabLabel{{text: "one", nameLen: len("one")}, {text: "two (shell)", nameLen: len("two")}},
178		},	180		},
179		{	181		{
180		name: "overflow redistributes budget: short tab stays full, long tab gets ellipsis",	182		name: "overflow redistributes budget: short tab stays full, long tab gets ellipsis",

@@ -183,26 +185,26 @@ func TestFitTabLabels(t *testing.T) {
183		{name: "ed", paneTitle: "verylongtitle"},	185		{name: "ed", paneTitle: "verylongtitle"},
184		},	186		},
185		rowLen: 20,	187		rowLen: 20,
186	-	want: []string{"a", "ed (verylongt…"},	188	+	want: []fittedTabLabel{{text: "a", nameLen: len("a")}, {text: "ed (verylongt…", nameLen: len("ed")}},
187		},	189		},
188		{	190		{
189		name: "tight budget degrades to a truncated tab name only",	191		name: "tight budget degrades to a truncated tab name only",
190		tabs: []statusTab{{name: "editor", paneTitle: "some pane title text"}},	192		tabs: []statusTab{{name: "editor", paneTitle: "some pane title text"}},
191		rowLen: 7,	193		rowLen: 7,
192	-	want: []string{"edi…"},	194	+	want: []fittedTabLabel{{text: "edi…", nameLen: len("edi…")}},
193		},	195		},
194		{	196		{
195		name: "non-empty rightText shrinks the budget",	197		name: "non-empty rightText shrinks the budget",
196		tabs: []statusTab{{name: "aaaaaaaaaa"}},	198		tabs: []statusTab{{name: "aaaaaaaaaa"}},
197		rowLen: 20,	199		rowLen: 20,
198		rightText: "0123456789",	200		rightText: "0123456789",
199	-	want: []string{"aaaaa…"},	201	+	want: []fittedTabLabel{{text: "aaaaa…", nameLen: len("aaaaa…")}},
200		},	202		},
201		{	203		{
202		name: "single tab wider than the whole row collapses to empty",	204		name: "single tab wider than the whole row collapses to empty",
203		tabs: []statusTab{{name: "reallyverylongtabname"}},	205		tabs: []statusTab{{name: "reallyverylongtabname"}},
204		rowLen: 3,	206		rowLen: 3,
205	-	want: []string{""},	207	+	want: []fittedTabLabel{{}},
206		},	208		},
207		}	209		}
208		for _, tt := range tests {	210		for _, tt := range tests {

@@ -220,9 +222,13 @@ func TestFitTabLabels(t *testing.T) {
220		for i, tb := range tt.tabs {	222		for i, tb := range tt.tabs {
221		overhead := 2	223		overhead := 2
222		if tb.attention {	224		if tb.attention {
223	-	overhead += 1 + renderer.RuneWidth(attentionGlyph)	225	+	overhead += 1 + renderer.RuneWidth(ui.AttentionGlyph)
			226	+	}
			227	+	drawn += overhead + statusTextWidth(got[i].text)
			228	+	require.LessOrEqual(t, got[i].nameLen, len(got[i].text), "nameLen must not exceed the label's byte length")
			229	+	if got[i].nameLen < len(got[i].text) {
			230	+	require.True(t, utf8.RuneStart(got[i].text[got[i].nameLen]), "nameLen must land on a rune boundary")
224		}	231		}
225	-	drawn += overhead + statusTextWidth(got[i])
226		}	232		}
227		if budget > 0 {	233		if budget > 0 {
228		require.LessOrEqual(t, drawn, budget, "drawn width must not exceed the derived budget")	234		require.LessOrEqual(t, drawn, budget, "drawn width must not exceed the derived budget")

@@ -231,6 +237,141 @@ func TestFitTabLabels(t *testing.T) {
231		}	237		}
232		}	238		}
233			239
			240	+	func TestDrawTopBarSnapshotStylesTabNameAndTitle(t *testing.T) {
			241	+	tabs := []statusTab{
			242	+	{name: "api", paneTitle: "shell"},
			243	+	{name: "logs", active: true, attention: true},
			244	+	{name: "err", paneTitle: "build failed", attention: true},
			245	+	}
			246	+	status := statusSnapshot{tabs: tabs}
			247	+	const rowLen = 60
			248	+
			249	+	t.Run("truecolor theme bolds names, mutes titles, and the bell keeps the base background", func(t *testing.T) {
			250	+	theme := themeui.Theme{
			251	+	Foreground: renderer.RGB{R: 200, G: 200, B: 200},
			252	+	Background: renderer.RGB{R: 10, G: 20, B: 30},
			253	+	HasFG: true,
			254	+	HasBG: true,
			255	+	Known: true,
			256	+	TrueColor: true,
			257	+	}
			258	+	styles := newThemeStyles(theme)
			259	+	require.False(t, styles.tabTitle.Equal(styles.statusBar), "sanity: muted title style must differ from the base style on a truecolor theme")
			260	+	require.False(t, styles.tabTitleActive.Equal(styles.accent), "sanity: muted active-title style must differ from the base accent style")
			261	+
			262	+	labels := fitTabLabels(tabs, rowLen, "")
			263	+
			264	+	// Frame 0 is the bell's blank beat: the attention space and the blank
			265	+	// bell cell must both be exactly the tab's base style (not
			266	+	// renderer.DefaultStyle(), which would punch a hole in a themed bar).
			267	+	// This also pins down segment order: name, then (if attention)
			268	+	// space+bell, then title, then the trailing space.
			269	+	row := make([]renderer.Cell, rowLen)
			270	+	drawTopBarSnapshot(row, status, 0, "", styles)
			271	+	x := 0
			272	+
			273	+	// tab 0: inactive, no attention: name, title, trailing space.
			274	+	nameEnd := x + 1 + labels[0].nameLen
			275	+	for i := x; i < nameEnd; i++ {
			276	+	require.True(t, row[i].Style.Bold, "cell %d: name segment must be bold", i)
			277	+	require.True(t, row[i].Style.Equal(styles.tabName), "cell %d: name segment style mismatch", i)
			278	+	}
			279	+	x = nameEnd
			280	+	titleLen := len(labels[0].text) - labels[0].nameLen
			281	+	titleEnd := x + titleLen
			282	+	for i := x; i < titleEnd; i++ {
			283	+	require.False(t, row[i].Style.Bold, "cell %d: title segment must not be bold", i)
			284	+	require.True(t, row[i].Style.Equal(styles.tabTitle), "cell %d: title segment style mismatch", i)
			285	+	}
			286	+	x = titleEnd
			287	+	require.True(t, row[x].Style.Equal(styles.statusBar), "cell %d: tab 0 trailing space must keep the base style", x)
			288	+	x++
			289	+
			290	+	// tab 1: active, attention, no title: name, attention space+bell (both
			291	+	// base style at frame 0), trailing space.
			292	+	nameEnd = x + 1 + labels[1].nameLen
			293	+	for i := x; i < nameEnd; i++ {
			294	+	require.True(t, row[i].Style.Bold, "cell %d: active name segment must be bold", i)
			295	+	require.True(t, row[i].Style.Equal(styles.tabNameActive), "cell %d: active name segment style mismatch", i)
			296	+	}
			297	+	require.Equal(t, len(labels[1].text), labels[1].nameLen, "tab 1 has no pane title, so its whole label is the name segment")
			298	+	x = nameEnd
			299	+	require.True(t, row[x].Style.Equal(styles.accent), "cell %d: tab 1 attention leading space must keep the active base style", x)
			300	+	x++
			301	+	tab1Bell := x
			302	+	require.True(t, row[x].Style.Equal(styles.accent), "cell %d: tab 1 blank bell must keep the active base style, not DefaultStyle", x)
			303	+	x++
			304	+	require.True(t, row[x].Style.Equal(styles.accent), "cell %d: tab 1 trailing space must keep the active base style", x)
			305	+	x++
			306	+
			307	+	// tab 2: inactive, attention, with title: name, attention space+bell
			308	+	// (both base style at frame 0), title, trailing space.
			309	+	nameEnd = x + 1 + labels[2].nameLen
			310	+	for i := x; i < nameEnd; i++ {
			311	+	require.True(t, row[i].Style.Bold, "cell %d: tab 2 name segment must be bold", i)
			312	+	require.True(t, row[i].Style.Equal(styles.tabName), "cell %d: tab 2 name segment style mismatch", i)
			313	+	}
			314	+	x = nameEnd
			315	+	require.True(t, row[x].Style.Equal(styles.statusBar), "cell %d: tab 2 attention leading space must keep the base style", x)
			316	+	x++
			317	+	tab2Bell := x
			318	+	require.True(t, row[x].Style.Equal(styles.statusBar), "cell %d: tab 2 blank bell must keep the base style, not DefaultStyle", x)
			319	+	x++
			320	+	titleLen = len(labels[2].text) - labels[2].nameLen
			321	+	titleEnd = x + titleLen
			322	+	for i := x; i < titleEnd; i++ {
			323	+	require.False(t, row[i].Style.Bold, "cell %d: tab 2 title segment must not be bold", i)
			324	+	require.True(t, row[i].Style.Equal(styles.tabTitle), "cell %d: tab 2 title segment style mismatch", i)
			325	+	}
			326	+	x = titleEnd
			327	+	require.True(t, row[x].Style.Equal(styles.statusBar), "cell %d: tab 2 trailing space must keep the base style", x)
			328	+
			329	+	// On a visible pulse frame, the bell glyph itself must keep the same
			330	+	// background as its tab's base style.
			331	+	visibleRow := make([]renderer.Cell, rowLen)
			332	+	drawTopBarSnapshot(visibleRow, status, 1, "", styles)
			333	+	require.Equal(t, rune(ui.AttentionGlyph), visibleRow[tab1Bell].Rune)
			334	+	require.True(t, visibleRow[tab1Bell].Style.HasBackgroundRGB)
			335	+	require.Equal(t, styles.accent.BackgroundRGB, visibleRow[tab1Bell].Style.BackgroundRGB, "tab 1's visible bell must keep the active base background")
			336	+	require.Equal(t, rune(ui.AttentionGlyph), visibleRow[tab2Bell].Rune)
			337	+	require.True(t, visibleRow[tab2Bell].Style.HasBackgroundRGB)
			338	+	require.Equal(t, styles.statusBar.BackgroundRGB, visibleRow[tab2Bell].Style.BackgroundRGB, "tab 2's visible bell must keep the plain base background")
			339	+	})
			340	+
			341	+	t.Run("non-usable theme matches the pre-change fallback styles", func(t *testing.T) {
			342	+	styles := resolveThemeStyles(nil)
			343	+	require.True(t, styles.tabName.Equal(styles.statusBar))
			344	+	require.True(t, styles.tabTitle.Equal(styles.statusBar))
			345	+	require.True(t, styles.tabNameActive.Equal(styles.accent))
			346	+	require.True(t, styles.tabTitleActive.Equal(styles.accent))
			347	+
			348	+	row := make([]renderer.Cell, rowLen)
			349	+	drawTopBarSnapshot(row, status, 0, "", styles)
			350	+
			351	+	// " api (shell) " (tab 0) + " logs " (tab 1: name, attention
			352	+	// space+blank bell, trailing space) + " err (build failed) " (tab 2:
			353	+	// name, attention space+blank bell, title, trailing space), then blank
			354	+	// padding to rowLen: byte-for-byte what the pre-change renderer
			355	+	// produced, since every new style field collapses to statusBar/accent.
			356	+	const tab0 = " api (shell) "
			357	+	const tab1 = " logs "
			358	+	const tab2 = " err (build failed) "
			359	+	require.Equal(t, tab0+tab1+tab2+strings.Repeat(" ", rowLen-len(tab0)-len(tab1)-len(tab2)), rowText(row))
			360	+
			361	+	for i, c := range row[:len(tab0)] {
			362	+	require.True(t, c.Style.Equal(styles.statusBar), "cell %d should use the plain base style", i)
			363	+	}
			364	+	tab1Start := len(tab0)
			365	+	for i := tab1Start; i < tab1Start+len(tab1); i++ {
			366	+	require.True(t, row[i].Style.Equal(styles.accent), "cell %d should use the plain accent style, including the blank bell cell", i)
			367	+	}
			368	+	tab2Start := tab1Start + len(tab1)
			369	+	for i := tab2Start; i < tab2Start+len(tab2); i++ {
			370	+	require.True(t, row[i].Style.Equal(styles.statusBar), "cell %d should use the plain base style, including the blank bell cell", i)
			371	+	}
			372	+	})
			373	+	}
			374	+
234		func TestTabDisplayName(t *testing.T) {	375		func TestTabDisplayName(t *testing.T) {
235		tests := []struct {	376		tests := []struct {
236		name string	377		name string

@@ -720,20 +861,49 @@ func TestStatusCopyFeedbackRendersOnlyWhenFullyFits(t *testing.T) {
720		}	861		}
721			862
722		func TestAttentionConstants(t *testing.T) {	863		func TestAttentionConstants(t *testing.T) {
723	-	require.Equal(t, '', attentionGlyph)	864	+	require.Equal(t, '', ui.AttentionGlyph)
724		require.Equal(t, 30, pulseFrameCount)	865		require.Equal(t, 30, pulseFrameCount)
725		require.Equal(t, 120*time.Millisecond, pulseFrameInterval)	866		require.Equal(t, 120*time.Millisecond, pulseFrameInterval)
726		}	867		}
727			868
728	-	func TestPulseStyleHidesAtFrameZeroAndRamps(t *testing.T) {	869	+	func TestPulseStyleFadesFromBaseAndHidesAtFrameZero(t *testing.T) {
729	-	_, visible := pulseStyle(0)	870	+	rgbBase := renderer.Style{
730	-	require.False(t, visible)	871	+	HasForegroundRGB: true, ForegroundRGB: renderer.RGB{R: 200, G: 200, B: 200},
			872	+	HasBackgroundRGB: true, BackgroundRGB: renderer.RGB{R: 10, G: 20, B: 30},
			873	+	}
			874	+	indexedBase := renderer.Style{Foreground: -1, Background: -1, Inverse: true}
			875	+
			876	+	t.Run("invisible frame returns base unchanged", func(t *testing.T) {
			877	+	for _, base := range []renderer.Style{rgbBase, indexedBase} {
			878	+	style, visible := pulseStyle(0, base)
			879	+	require.False(t, visible)
			880	+	require.True(t, style.Equal(base))
			881	+	}
			882	+	})
			883	+
			884	+	t.Run("rgb base blends the glyph foreground from the base background to its foreground, keeping the base background", func(t *testing.T) {
			885	+	low, visible := pulseStyle(1, rgbBase)
			886	+	require.True(t, visible)
			887	+	require.True(t, low.Bold)
			888	+	require.True(t, low.HasBackgroundRGB)
			889	+	require.Equal(t, rgbBase.BackgroundRGB, low.BackgroundRGB, "bell keeps the caller's background so it never punches a hole in a themed bar")
			890	+
			891	+	peak, visible := pulseStyle(pulseFrameCount/2, rgbBase)
			892	+	require.True(t, visible)
			893	+	require.Equal(t, rgbBase.ForegroundRGB, peak.ForegroundRGB, "peak intensity reaches the base foreground exactly")
			894	+	require.NotEqual(t, low.ForegroundRGB, peak.ForegroundRGB, "the glyph should ramp, not jump straight to full intensity")
			895	+	})
			896	+
			897	+	t.Run("non-RGB base falls back to the indexed grey ramp and preserves other base attributes", func(t *testing.T) {
			898	+	low, visible := pulseStyle(1, indexedBase)
			899	+	require.True(t, visible)
			900	+	require.True(t, low.Bold)
			901	+	require.True(t, low.Inverse, "non-color base attributes like inverse must survive")
731			902
732	-	low, visible := pulseStyle(1)	903	+	peak, visible := pulseStyle(pulseFrameCount/2, indexedBase)
733	-	require.True(t, visible)	904	+	require.True(t, visible)
734	-	peak, visible := pulseStyle(pulseFrameCount / 2)	905	+	require.Greater(t, peak.Foreground, low.Foreground)
735	-	require.True(t, visible)	906	+	})
736	-	require.Greater(t, peak.Foreground, low.Foreground)
737		}	907		}
738			908
739		func TestTopBarRendersAttentionBell(t *testing.T) {	909		func TestTopBarRendersAttentionBell(t *testing.T) {

@@ -753,10 +923,11 @@ func TestTopBarRendersAttentionBell(t *testing.T) {
753		frame, _ := composeClientFrameWithState(barState{status: sess.statusSegments(true), attentionFrame: 1}, win, true)	923		frame, _ := composeClientFrameWithState(barState{status: sess.statusSegments(true), attentionFrame: 1}, win, true)
754			924
755		// Tab 2's label is enriched with its focused pane's title ("sh", the	925		// Tab 2's label is enriched with its focused pane's title ("sh", the
756	-	// default shell fallback) and truncated to fit alongside the bell.	926	+	// default shell fallback) and truncated to fit alongside the bell. The
757	-	require.Contains(t, rowText(frame.Row(0)), "2 (s")	927	+	// bell sits right after the name, before the (title) segment.
			928	+	require.Contains(t, rowText(frame.Row(0)), "2 "+string(ui.AttentionGlyph)+" (s")
758		for _, c := range frame.Row(0) {	929		for _, c := range frame.Row(0) {
759	-	if c.Rune == attentionGlyph {	930	+	if c.Rune == ui.AttentionGlyph {
760		require.True(t, c.Style.Bold)	931		require.True(t, c.Style.Bold)
761		return	932		return
762		}	933		}

@@ -839,7 +1010,7 @@ func TestStatusBarRendersMRUNamesEphemeralAndInlineBell(t *testing.T) {
839			1010
840		require.Equal(t, " cur fresh tmp*  ", rowText(row))	1011		require.Equal(t, " cur fresh tmp*  ", rowText(row))
841		for _, c := range row {	1012		for _, c := range row {
842	-	if c.Rune == attentionGlyph {	1013	+	if c.Rune == ui.AttentionGlyph {
843		require.True(t, c.Style.Bold)	1014		require.True(t, c.Style.Bold)
844		return	1015		return
845		}	1016		}

M internal/usecase/picker/model.go +77 -29


@@ -17,11 +17,38 @@ const (
17	17		type SessionView struct {
18	18		ID domain.SessionID
19	19		Name string
20		-	Tabs []string
	20	+	Tabs []TabEntry
21	21		Active int
22	22		Stopped bool
23	23		}
24	24
	25	+	// TabEntry is one tab row; Name is drawn emphasized, Detail muted.
	26	+	type TabEntry struct {
	27	+	Name string // tab display name
	28	+	Detail string // " (paneTitle)" or "", drawn muted
	29	+	Attention bool // draw the attention marker right after Name, before Detail
	30	+	}
	31	+
	32	+	// RenderStyles are the styles Render uses to draw list rows. The zero value
	33	+	// (all renderer.Style{}) is never used directly; Render falls back to
	34	+	// defaultRenderStyles when no RenderStyles is supplied, mirroring the styling
	35	+	// of a non-truecolor client.
	36	+	type RenderStyles struct {
	37	+	Selection renderer.Style // selected row fill + suffixes
	38	+	SelectionName renderer.Style // selected row name segment
	39	+	SelectionMuted renderer.Style // selected row detail segment
	40	+	Name renderer.Style // non-selected name segment
	41	+	Detail renderer.Style // non-selected detail segment
	42	+	Base renderer.Style // non-selected fill + suffixes
	43	+	}
	44	+
	45	+	func defaultRenderStyles() RenderStyles {
	46	+	selection := renderer.DefaultStyle()
	47	+	selection.Inverse = true
	48	+	base := renderer.DefaultStyle()
	49	+	return RenderStyles{Selection: selection, SelectionName: selection, SelectionMuted: selection, Name: base, Detail: base, Base: base}
	50	+	}
	51	+
25	52		type Target struct {
26	53		Session domain.SessionID
27	54		Name string

@@ -46,30 +73,34 @@ type Model struct {
46	73		}
47	74
48	75		type row struct {
49		-	header bool
50		-	label string
51		-	session domain.SessionID
52		-	name string
53		-	tabIndex int
54		-	stopped bool
	76	+	header bool
	77	+	dispName string // display name segment; bold on truecolor
	78	+	detail string // " (paneTitle)" segment, muted; "" for headers
	79	+	attention bool // draw the attention marker right after the name, before detail; tab rows only
	80	+	session domain.SessionID
	81	+	// targetName is the stopped-session lookup name threaded into Target;
	82	+	// distinct from dispName, which is what gets drawn.
	83	+	targetName string
	84	+	tabIndex int
	85	+	stopped bool
55	86		}
56	87
57	88		func New(sessions []SessionView, cur domain.SessionID, curTab int) *Model {
58	89		m := &Model{selected: -1}
59	90		activeSelection := -1
60	91		for _, session := range sessions {
61		-	name := ""
	92	+	targetName := ""
62	93		if session.Stopped {
63		-	name = session.Name
	94	+	targetName = session.Name
64	95		}
65		-	m.rows = append(m.rows, row{header: true, label: session.Name, session: session.ID, name: name, tabIndex: -1, stopped: session.Stopped})
	96	+	m.rows = append(m.rows, row{header: true, dispName: session.Name, session: session.ID, targetName: targetName, tabIndex: -1, stopped: session.Stopped})
66	97		active := session.Active
67	98		if active < 0 \|\| active >= len(session.Tabs) {
68	99		active = 0
69	100		}
70	101		for i, tab := range session.Tabs {
71	102		idx := len(m.rows)
72		-	m.rows = append(m.rows, row{label: tab, session: session.ID, name: name, tabIndex: i, stopped: session.Stopped})
	103	+	m.rows = append(m.rows, row{dispName: tab.Name, detail: tab.Detail, attention: tab.Attention, session: session.ID, targetName: targetName, tabIndex: i, stopped: session.Stopped})
73	104		if session.ID == cur && i == curTab {
74	105		m.selected = idx
75	106		}

@@ -131,7 +162,7 @@ func (m *Model) Selected() (Target, bool) {
131	162		if r.header {
132	163		return Target{}, false
133	164		}
134		-	return Target{Session: r.session, Name: r.name, TabIndex: r.tabIndex, Stopped: r.stopped}, true
	165	+	return Target{Session: r.session, Name: r.targetName, TabIndex: r.tabIndex, Stopped: r.stopped}, true
135	166		}
136	167
137	168		func (m Model) Clone() Model {

@@ -143,15 +174,14 @@ func (m Model) Clone() Model {
143	174		return &clone
144	175		}
145	176
146		-	func (m *Model) Render(inner domain.Size, preview Preview, selectedStyle ...renderer.Style) renderer.Frame {
	177	+	func (m *Model) Render(inner domain.Size, preview Preview, styles ...RenderStyles) renderer.Frame {
147	178		frame := renderer.NewFrame(max(inner.Cols, 0), max(inner.Rows, 0))
148	179		layout := ChooseLayout(inner)
149		-	selection := renderer.DefaultStyle()
150		-	selection.Inverse = true
151		-	if len(selectedStyle) > 0 {
152		-	selection = selectedStyle[0]
	180	+	styleSet := defaultRenderStyles()
	181	+	if len(styles) > 0 {
	182	+	styleSet = styles[0]
153	183		}
154		-	m.renderList(frame, layout.List, selection)
	184	+	m.renderList(frame, layout.List, styleSet)
155	185		blitPreview(frame, layout.Preview, preview)
156	186		return frame
157	187		}

@@ -181,32 +211,50 @@ func (m *Model) firstLeaf() int {
181	211		return -1
182	212		}
183	213
184		-	func (m *Model) renderList(frame renderer.Frame, rect domain.Rect, selection renderer.Style) {
	214	+	// renderList draws each visible row as up to three segments: a name segment
	215	+	// (bold when styles came from a truecolor theme), a base-styled attention
	216	+	// marker right after the name, and a muted detail segment (tab rows only) —
	217	+	// or a base-styled "(stopped)" suffix for stopped session headers. A tight
	218	+	// width ellipsizes the detail segment before eating into the name.
	219	+	func (m *Model) renderList(frame renderer.Frame, rect domain.Rect, styles RenderStyles) {
185	220		if m == nil \|\| rect.Width <= 0 \|\| rect.Height <= 0 {
186	221		return
187	222		}
188	223		visible := min(rect.Height, frame.Height-rect.Y)
189	224		offset := m.scrollOffset(visible)
	225	+	clipX := rect.X + rect.Width
190	226		for y := range visible {
191	227		idx := offset + y
192	228		if idx >= len(m.rows) {
193	229		break
194	230		}
195	231		r := m.rows[idx]
196		-	style := renderer.DefaultStyle()
	232	+	base, nameStyle, detailStyle := styles.Base, styles.Name, styles.Detail
197	233		if idx == m.selected {
198		-	style = selection
199		-	}
200		-	label := r.label
201		-	if r.header && r.stopped {
202		-	label += " (stopped)"
	234	+	base, nameStyle, detailStyle = styles.Selection, styles.SelectionName, styles.SelectionMuted
203	235		}
	236	+	ui.FillRect(frame, domain.Rect{X: rect.X, Y: rect.Y + y, Width: rect.Width, Height: 1}, renderer.Cell{Rune: ' ', Style: base})
	237	+
	238	+	name := r.dispName
204	239		if !r.header {
205		-	label = " " + label
	240	+	name = " " + name
206	241		}
207		-	label = ui.TruncateText(label, rect.Width)
208		-	ui.FillRect(frame, domain.Rect{X: rect.X, Y: rect.Y + y, Width: rect.Width, Height: 1}, renderer.Cell{Rune: ' ', Style: style})
209		-	ui.DrawText(frame, rect.X, rect.Y+y, rect.X+rect.Width, label, style)
	242	+	name = ui.TruncateText(name, rect.Width)
	243	+	x := ui.DrawText(frame, rect.X, rect.Y+y, clipX, name, nameStyle)
	244	+
	245	+	if r.header {
	246	+	if r.stopped {
	247	+	ui.DrawText(frame, x, rect.Y+y, clipX, " (stopped)", base)
	248	+	}
	249	+	continue
	250	+	}
	251	+
	252	+	if r.attention {
	253	+	x = ui.DrawText(frame, x, rect.Y+y, clipX, " "+string(ui.AttentionGlyph), base)
	254	+	}
	255	+
	256	+	detail := ui.TruncateText(r.detail, clipX-x)
	257	+	ui.DrawText(frame, x, rect.Y+y, clipX, detail, detailStyle)
210	258		}
211	259		}
212	260


@@ -17,11 +17,38 @@ const (
17		type SessionView struct {	17		type SessionView struct {
18		ID domain.SessionID	18		ID domain.SessionID
19		Name string	19		Name string
20	-	Tabs []string	20	+	Tabs []TabEntry
21		Active int	21		Active int
22		Stopped bool	22		Stopped bool
23		}	23		}
24			24
			25	+	// TabEntry is one tab row; Name is drawn emphasized, Detail muted.
			26	+	type TabEntry struct {
			27	+	Name string // tab display name
			28	+	Detail string // " (paneTitle)" or "", drawn muted
			29	+	Attention bool // draw the attention marker right after Name, before Detail
			30	+	}
			31	+
			32	+	// RenderStyles are the styles Render uses to draw list rows. The zero value
			33	+	// (all renderer.Style{}) is never used directly; Render falls back to
			34	+	// defaultRenderStyles when no RenderStyles is supplied, mirroring the styling
			35	+	// of a non-truecolor client.
			36	+	type RenderStyles struct {
			37	+	Selection renderer.Style // selected row fill + suffixes
			38	+	SelectionName renderer.Style // selected row name segment
			39	+	SelectionMuted renderer.Style // selected row detail segment
			40	+	Name renderer.Style // non-selected name segment
			41	+	Detail renderer.Style // non-selected detail segment
			42	+	Base renderer.Style // non-selected fill + suffixes
			43	+	}
			44	+
			45	+	func defaultRenderStyles() RenderStyles {
			46	+	selection := renderer.DefaultStyle()
			47	+	selection.Inverse = true
			48	+	base := renderer.DefaultStyle()
			49	+	return RenderStyles{Selection: selection, SelectionName: selection, SelectionMuted: selection, Name: base, Detail: base, Base: base}
			50	+	}
			51	+
25		type Target struct {	52		type Target struct {
26		Session domain.SessionID	53		Session domain.SessionID
27		Name string	54		Name string

@@ -46,30 +73,34 @@ type Model struct {
46		}	73		}
47			74
48		type row struct {	75		type row struct {
49	-	header bool	76	+	header bool
50	-	label string	77	+	dispName string // display name segment; bold on truecolor
51	-	session domain.SessionID	78	+	detail string // " (paneTitle)" segment, muted; "" for headers
52	-	name string	79	+	attention bool // draw the attention marker right after the name, before detail; tab rows only
53	-	tabIndex int	80	+	session domain.SessionID
54	-	stopped bool	81	+	// targetName is the stopped-session lookup name threaded into Target;
			82	+	// distinct from dispName, which is what gets drawn.
			83	+	targetName string
			84	+	tabIndex int
			85	+	stopped bool
55		}	86		}
56			87
57		func New(sessions []SessionView, cur domain.SessionID, curTab int) *Model {	88		func New(sessions []SessionView, cur domain.SessionID, curTab int) *Model {
58		m := &Model{selected: -1}	89		m := &Model{selected: -1}
59		activeSelection := -1	90		activeSelection := -1
60		for _, session := range sessions {	91		for _, session := range sessions {
61	-	name := ""	92	+	targetName := ""
62		if session.Stopped {	93		if session.Stopped {
63	-	name = session.Name	94	+	targetName = session.Name
64		}	95		}
65	-	m.rows = append(m.rows, row{header: true, label: session.Name, session: session.ID, name: name, tabIndex: -1, stopped: session.Stopped})	96	+	m.rows = append(m.rows, row{header: true, dispName: session.Name, session: session.ID, targetName: targetName, tabIndex: -1, stopped: session.Stopped})
66		active := session.Active	97		active := session.Active
67		if active < 0 \|\| active >= len(session.Tabs) {	98		if active < 0 \|\| active >= len(session.Tabs) {
68		active = 0	99		active = 0
69		}	100		}
70		for i, tab := range session.Tabs {	101		for i, tab := range session.Tabs {
71		idx := len(m.rows)	102		idx := len(m.rows)
72	-	m.rows = append(m.rows, row{label: tab, session: session.ID, name: name, tabIndex: i, stopped: session.Stopped})	103	+	m.rows = append(m.rows, row{dispName: tab.Name, detail: tab.Detail, attention: tab.Attention, session: session.ID, targetName: targetName, tabIndex: i, stopped: session.Stopped})
73		if session.ID == cur && i == curTab {	104		if session.ID == cur && i == curTab {
74		m.selected = idx	105		m.selected = idx
75		}	106		}

@@ -131,7 +162,7 @@ func (m *Model) Selected() (Target, bool) {
131		if r.header {	162		if r.header {
132		return Target{}, false	163		return Target{}, false
133		}	164		}
134	-	return Target{Session: r.session, Name: r.name, TabIndex: r.tabIndex, Stopped: r.stopped}, true	165	+	return Target{Session: r.session, Name: r.targetName, TabIndex: r.tabIndex, Stopped: r.stopped}, true
135		}	166		}
136			167
137		func (m Model) Clone() Model {	168		func (m Model) Clone() Model {

@@ -143,15 +174,14 @@ func (m Model) Clone() Model {
143		return &clone	174		return &clone
144		}	175		}
145			176
146	-	func (m *Model) Render(inner domain.Size, preview Preview, selectedStyle ...renderer.Style) renderer.Frame {	177	+	func (m *Model) Render(inner domain.Size, preview Preview, styles ...RenderStyles) renderer.Frame {
147		frame := renderer.NewFrame(max(inner.Cols, 0), max(inner.Rows, 0))	178		frame := renderer.NewFrame(max(inner.Cols, 0), max(inner.Rows, 0))
148		layout := ChooseLayout(inner)	179		layout := ChooseLayout(inner)
149	-	selection := renderer.DefaultStyle()	180	+	styleSet := defaultRenderStyles()
150	-	selection.Inverse = true	181	+	if len(styles) > 0 {
151	-	if len(selectedStyle) > 0 {	182	+	styleSet = styles[0]
152	-	selection = selectedStyle[0]
153		}	183		}
154	-	m.renderList(frame, layout.List, selection)	184	+	m.renderList(frame, layout.List, styleSet)
155		blitPreview(frame, layout.Preview, preview)	185		blitPreview(frame, layout.Preview, preview)
156		return frame	186		return frame
157		}	187		}

@@ -181,32 +211,50 @@ func (m *Model) firstLeaf() int {
181		return -1	211		return -1
182		}	212		}
183			213
184	-	func (m *Model) renderList(frame renderer.Frame, rect domain.Rect, selection renderer.Style) {	214	+	// renderList draws each visible row as up to three segments: a name segment
			215	+	// (bold when styles came from a truecolor theme), a base-styled attention
			216	+	// marker right after the name, and a muted detail segment (tab rows only) —
			217	+	// or a base-styled "(stopped)" suffix for stopped session headers. A tight
			218	+	// width ellipsizes the detail segment before eating into the name.
			219	+	func (m *Model) renderList(frame renderer.Frame, rect domain.Rect, styles RenderStyles) {
185		if m == nil \|\| rect.Width <= 0 \|\| rect.Height <= 0 {	220		if m == nil \|\| rect.Width <= 0 \|\| rect.Height <= 0 {
186		return	221		return
187		}	222		}
188		visible := min(rect.Height, frame.Height-rect.Y)	223		visible := min(rect.Height, frame.Height-rect.Y)
189		offset := m.scrollOffset(visible)	224		offset := m.scrollOffset(visible)
			225	+	clipX := rect.X + rect.Width
190		for y := range visible {	226		for y := range visible {
191		idx := offset + y	227		idx := offset + y
192		if idx >= len(m.rows) {	228		if idx >= len(m.rows) {
193		break	229		break
194		}	230		}
195		r := m.rows[idx]	231		r := m.rows[idx]
196	-	style := renderer.DefaultStyle()	232	+	base, nameStyle, detailStyle := styles.Base, styles.Name, styles.Detail
197		if idx == m.selected {	233		if idx == m.selected {
198	-	style = selection	234	+	base, nameStyle, detailStyle = styles.Selection, styles.SelectionName, styles.SelectionMuted
199	-	}
200	-	label := r.label
201	-	if r.header && r.stopped {
202	-	label += " (stopped)"
203		}	235		}
			236	+	ui.FillRect(frame, domain.Rect{X: rect.X, Y: rect.Y + y, Width: rect.Width, Height: 1}, renderer.Cell{Rune: ' ', Style: base})
			237	+
			238	+	name := r.dispName
204		if !r.header {	239		if !r.header {
205	-	label = " " + label	240	+	name = " " + name
206		}	241		}
207	-	label = ui.TruncateText(label, rect.Width)	242	+	name = ui.TruncateText(name, rect.Width)
208	-	ui.FillRect(frame, domain.Rect{X: rect.X, Y: rect.Y + y, Width: rect.Width, Height: 1}, renderer.Cell{Rune: ' ', Style: style})	243	+	x := ui.DrawText(frame, rect.X, rect.Y+y, clipX, name, nameStyle)
209	-	ui.DrawText(frame, rect.X, rect.Y+y, rect.X+rect.Width, label, style)	244	+
			245	+	if r.header {
			246	+	if r.stopped {
			247	+	ui.DrawText(frame, x, rect.Y+y, clipX, " (stopped)", base)
			248	+	}
			249	+	continue
			250	+	}
			251	+
			252	+	if r.attention {
			253	+	x = ui.DrawText(frame, x, rect.Y+y, clipX, " "+string(ui.AttentionGlyph), base)
			254	+	}
			255	+
			256	+	detail := ui.TruncateText(r.detail, clipX-x)
			257	+	ui.DrawText(frame, x, rect.Y+y, clipX, detail, detailStyle)
210		}	258		}
211		}	259		}
212			260

M internal/usecase/picker/model_test.go +86 -13


@@ -4,14 +4,15 @@ import (
4	4		"testing"
5	5
6	6		"github.com/bnema/vev/internal/domain"
	7	+	"github.com/bnema/vev/internal/usecase/ui"
7	8		"github.com/bnema/vev/pkg/renderer"
8	9		"github.com/stretchr/testify/require"
9	10		)
10	11
11	12		func TestNewFlattensAndSelectsCurrentTab(t *testing.T) {
12	13		m := New([]SessionView{
13		-	{ID: "s1", Name: "one", Tabs: []string{"shell", "logs"}, Active: 0},
14		-	{ID: "s2", Name: "two", Tabs: []string{"api"}, Active: 0},
	14	+	{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "shell"}, {Name: "logs"}}, Active: 0},
	15	+	{ID: "s2", Name: "two", Tabs: []TabEntry{{Name: "api"}}, Active: 0},
15	16		}, "s1", 1)
16	17
17	18		got, ok := m.Selected()

@@ -25,12 +26,12 @@ func TestNewFlattensAndSelectsCurrentTab(t *testing.T) {
25	26		}
26	27
27	28		func TestNewFallsBackToActiveThenFirstLeaf(t *testing.T) {
28		-	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []string{"shell", "logs"}, Active: 1}}, "missing", 0)
	29	+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "shell"}, {Name: "logs"}}, Active: 1}}, "missing", 0)
29	30		got, ok := m.Selected()
30	31		require.True(t, ok)
31	32		require.Equal(t, Target{Session: "s1", TabIndex: 1}, got)
32	33
33		-	m = New([]SessionView{{ID: "s1", Name: "one", Tabs: []string{"shell"}, Active: 4}}, "missing", 0)
	34	+	m = New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "shell"}}, Active: 4}}, "missing", 0)
34	35		got, ok = m.Selected()
35	36		require.True(t, ok)
36	37		require.Equal(t, Target{Session: "s1", TabIndex: 0}, got)

@@ -38,8 +39,8 @@ func TestNewFallsBackToActiveThenFirstLeaf(t *testing.T) {
38	39
39	40		func TestUpDownSkipsHeadersClampsAndCrossesSessions(t *testing.T) {
40	41		m := New([]SessionView{
41		-	{ID: "s1", Name: "one", Tabs: []string{"a", "b"}, Active: 0},
42		-	{ID: "s2", Name: "two", Tabs: []string{"c"}, Active: 0},
	42	+	{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "a"}, {Name: "b"}}, Active: 0},
	43	+	{ID: "s2", Name: "two", Tabs: []TabEntry{{Name: "c"}}, Active: 0},
43	44		}, "s1", 0)
44	45
45	46		m.Up()

@@ -92,8 +93,8 @@ func TestChooseLayoutBoundaries(t *testing.T) {
92	93
93	94		func TestSelectedMapping(t *testing.T) {
94	95		m := New([]SessionView{
95		-	{ID: "alpha", Name: "alpha", Tabs: []string{"one"}, Active: 0},
96		-	{ID: "beta", Name: "beta", Tabs: []string{"two", "three"}, Active: 0},
	96	+	{ID: "alpha", Name: "alpha", Tabs: []TabEntry{{Name: "one"}}, Active: 0},
	97	+	{ID: "beta", Name: "beta", Tabs: []TabEntry{{Name: "two"}, {Name: "three"}}, Active: 0},
97	98		}, "beta", 1)
98	99
99	100		got, ok := m.Selected()

@@ -102,7 +103,7 @@ func TestSelectedMapping(t *testing.T) {
102	103		}
103	104
104	105		func TestStoppedSessionSelectableAndRendered(t *testing.T) {
105		-	m := New([]SessionView{{ID: "stopped:work", Name: "work", Tabs: []string{""}, Stopped: true}}, "", 0)
	106	+	m := New([]SessionView{{ID: "stopped:work", Name: "work", Tabs: []TabEntry{{Name: ""}}, Stopped: true}}, "", 0)
106	107		got, ok := m.Selected()
107	108		require.True(t, ok)
108	109		require.Equal(t, Target{Session: "stopped:work", Name: "work", TabIndex: 0, Stopped: true}, got)

@@ -112,7 +113,7 @@ func TestStoppedSessionSelectableAndRendered(t *testing.T) {
112	113		}
113	114
114	115		func TestRenderPreviewClipsPadsDropsWideRuneAndInvertsSelection(t *testing.T) {
115		-	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []string{"tab"}, Active: 0}}, "s1", 0)
	116	+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "tab"}}, Active: 0}}, "s1", 0)
116	117		preview := Preview{
117	118		Width: 24,
118	119		Height: 1,

@@ -132,7 +133,7 @@ func TestRenderPreviewClipsPadsDropsWideRuneAndInvertsSelection(t *testing.T) {
132	133		}
133	134
134	135		func TestRenderListScrollsSelectionIntoView(t *testing.T) {
135		-	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []string{"a", "b", "c", "d", "e", "f"}, Active: 0}}, "s1", 0)
	136	+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "a"}, {Name: "b"}, {Name: "c"}, {Name: "d"}, {Name: "e"}, {Name: "f"}}, Active: 0}}, "s1", 0)
136	137		for range 5 {
137	138		m.Down()
138	139		}

@@ -144,7 +145,7 @@ func TestRenderListScrollsSelectionIntoView(t *testing.T) {
144	145		}
145	146
146	147		func TestRenderListTruncatesLabelWithEllipsis(t *testing.T) {
147		-	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []string{"a-really-long-focused-pane-tab-label"}, Active: 0}}, "s1", 0)
	148	+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "a-really-long-focused-pane-tab-label"}}, Active: 0}}, "s1", 0)
148	149
149	150		frame := m.Render(domain.Size{Cols: 45, Rows: 5}, Preview{})
150	151

@@ -155,7 +156,7 @@ func TestRenderListTruncatesLabelWithEllipsis(t *testing.T) {
155	156		}
156	157
157	158		func TestRenderListOnlyDoesNotDrawPreview(t *testing.T) {
158		-	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []string{"tab"}, Active: 0}}, "s1", 0)
	159	+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "tab"}}, Active: 0}}, "s1", 0)
159	160		preview := Preview{Width: 1, Height: 1, Rows: [][]renderer.Cell{{cell('x')}}}
160	161
161	162		frame := m.Render(domain.Size{Cols: 23, Rows: 11}, preview)

@@ -164,6 +165,78 @@ func TestRenderListOnlyDoesNotDrawPreview(t *testing.T) {
164	165		require.NotEqual(t, 'x', frame.At(0, 0).Rune)
165	166		}
166	167
	168	+	func TestRenderListDrawsNameAndDetailSegmentsWithDistinctStyles(t *testing.T) {
	169	+	nameStyle := renderer.Style{Bold: true}
	170	+	detailStyle := renderer.Style{Italic: true}
	171	+	baseStyle := renderer.DefaultStyle()
	172	+	selectionStyle := renderer.Style{Inverse: true}
	173	+	selectionNameStyle := renderer.Style{Inverse: true, Bold: true}
	174	+	selectionMutedStyle := renderer.Style{Inverse: true, Italic: true}
	175	+	styles := RenderStyles{
	176	+	Selection: selectionStyle, SelectionName: selectionNameStyle, SelectionMuted: selectionMutedStyle,
	177	+	Name: nameStyle, Detail: detailStyle, Base: baseStyle,
	178	+	}
	179	+
	180	+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{
	181	+	{Name: "alpha", Detail: " (running)"},
	182	+	{Name: "beta", Detail: " (idle)", Attention: true},
	183	+	}, Active: 0}}, "s1", 0)
	184	+
	185	+	frame := m.Render(domain.Size{Cols: 30, Rows: 5}, Preview{}, styles)
	186	+
	187	+	// Row 1 is the selected tab ("alpha"): name uses SelectionName, detail uses SelectionMuted.
	188	+	require.Equal(t, 'a', frame.At(2, 1).Rune)
	189	+	require.True(t, frame.At(2, 1).Style.Equal(selectionNameStyle), "selected name segment style")
	190	+	require.Equal(t, ' ', frame.At(7, 1).Rune)
	191	+	require.True(t, frame.At(7, 1).Style.Equal(selectionMutedStyle), "selected detail segment style")
	192	+	require.Equal(t, '(', frame.At(8, 1).Rune)
	193	+	require.True(t, frame.At(8, 1).Style.Equal(selectionMutedStyle), "selected detail segment style")
	194	+
	195	+	// Row 2 is the non-selected tab ("beta"): name uses Name, then the
	196	+	// attention marker (right after the name, before detail) uses the row's
	197	+	// base style (not muted), then detail uses Detail.
	198	+	require.Equal(t, 'b', frame.At(2, 2).Rune)
	199	+	require.True(t, frame.At(2, 2).Style.Equal(nameStyle), "name segment style")
	200	+	require.Equal(t, ' ', frame.At(6, 2).Rune, "attention marker leading space")
	201	+	require.True(t, frame.At(6, 2).Style.Equal(baseStyle), "attention marker uses the base style, not muted")
	202	+	require.Equal(t, rune(ui.AttentionGlyph), frame.At(7, 2).Rune)
	203	+	require.True(t, frame.At(7, 2).Style.Equal(baseStyle), "attention marker uses the base style, not muted")
	204	+	require.Equal(t, ' ', frame.At(8, 2).Rune)
	205	+	require.True(t, frame.At(8, 2).Style.Equal(detailStyle), "detail segment style")
	206	+	require.Equal(t, '(', frame.At(9, 2).Rune)
	207	+	require.True(t, frame.At(9, 2).Style.Equal(detailStyle), "detail segment style")
	208	+	}
	209	+
	210	+	func TestRenderListTruncatesDetailBeforeName(t *testing.T) {
	211	+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{
	212	+	{Name: "short-name", Detail: " (a very long detail text)"},
	213	+	}, Active: 0}}, "s1", 0)
	214	+
	215	+	frame := m.Render(domain.Size{Cols: 45, Rows: 5}, Preview{})
	216	+	layout := ChooseLayout(domain.Size{Cols: 45, Rows: 5})
	217	+	require.Equal(t, 16, layout.List.Width, "test assumes a narrow list column")
	218	+
	219	+	want := " short-name (a…"
	220	+	for i, r := range want {
	221	+	require.Equal(t, r, frame.At(i, 1).Rune, "cell %d", i)
	222	+	}
	223	+	require.Equal(t, '…', frame.At(layout.List.Width-1, 1).Rune, "detail is ellipsized to fit, the intact name is not touched")
	224	+	require.Equal(t, ' ', frame.At(layout.List.Width, 1).Rune, "nothing drawn past the list width")
	225	+	}
	226	+
	227	+	func TestRenderListTruncatesNameWhenAloneExceedsWidth(t *testing.T) {
	228	+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{
	229	+	{Name: "a-really-long-focused-pane-tab-label", Detail: " (detail)"},
	230	+	}, Active: 0}}, "s1", 0)
	231	+
	232	+	frame := m.Render(domain.Size{Cols: 45, Rows: 5}, Preview{})
	233	+	layout := ChooseLayout(domain.Size{Cols: 45, Rows: 5})
	234	+	require.Equal(t, 16, layout.List.Width, "test assumes a narrow list column")
	235	+
	236	+	require.Equal(t, '…', frame.At(layout.List.Width-1, 1).Rune, "the name segment itself is ellipsized once it alone exceeds the width")
	237	+	require.Equal(t, ' ', frame.At(layout.List.Width, 1).Rune, "nothing drawn past the list width, detail gets no room at all")
	238	+	}
	239	+
167	240		func cell(r rune) renderer.Cell {
168	241		return renderer.Cell{Rune: r, Style: renderer.DefaultStyle()}
169	242		}

 	"testing"
 	"github.com/bnema/vev/internal/domain"
+	"github.com/bnema/vev/internal/usecase/ui"
 	"github.com/bnema/vev/pkg/renderer"
 	"github.com/stretchr/testify/require"
 )
 func TestNewFlattensAndSelectsCurrentTab(t *testing.T) {
 	m := New([]SessionView{
-		{ID: "s1", Name: "one", Tabs: []string{"shell", "logs"}, Active: 0},
+		{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "shell"}, {Name: "logs"}}, Active: 0},
-		{ID: "s2", Name: "two", Tabs: []string{"api"}, Active: 0},
+		{ID: "s2", Name: "two", Tabs: []TabEntry{{Name: "api"}}, Active: 0},
 	}, "s1", 1)
 	got, ok := m.Selected()
 }
 func TestNewFallsBackToActiveThenFirstLeaf(t *testing.T) {
-	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []string{"shell", "logs"}, Active: 1}}, "missing", 0)
+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "shell"}, {Name: "logs"}}, Active: 1}}, "missing", 0)
 	got, ok := m.Selected()
 	require.True(t, ok)
 	require.Equal(t, Target{Session: "s1", TabIndex: 1}, got)
-	m = New([]SessionView{{ID: "s1", Name: "one", Tabs: []string{"shell"}, Active: 4}}, "missing", 0)
+	m = New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "shell"}}, Active: 4}}, "missing", 0)
 	got, ok = m.Selected()
 	require.True(t, ok)
 	require.Equal(t, Target{Session: "s1", TabIndex: 0}, got)
 func TestUpDownSkipsHeadersClampsAndCrossesSessions(t *testing.T) {
 	m := New([]SessionView{
-		{ID: "s1", Name: "one", Tabs: []string{"a", "b"}, Active: 0},
+		{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "a"}, {Name: "b"}}, Active: 0},
-		{ID: "s2", Name: "two", Tabs: []string{"c"}, Active: 0},
+		{ID: "s2", Name: "two", Tabs: []TabEntry{{Name: "c"}}, Active: 0},
 	}, "s1", 0)
 	m.Up()
 func TestSelectedMapping(t *testing.T) {
 	m := New([]SessionView{
-		{ID: "alpha", Name: "alpha", Tabs: []string{"one"}, Active: 0},
+		{ID: "alpha", Name: "alpha", Tabs: []TabEntry{{Name: "one"}}, Active: 0},
-		{ID: "beta", Name: "beta", Tabs: []string{"two", "three"}, Active: 0},
+		{ID: "beta", Name: "beta", Tabs: []TabEntry{{Name: "two"}, {Name: "three"}}, Active: 0},
 	}, "beta", 1)
 	got, ok := m.Selected()
 }
 func TestStoppedSessionSelectableAndRendered(t *testing.T) {
-	m := New([]SessionView{{ID: "stopped:work", Name: "work", Tabs: []string{""}, Stopped: true}}, "", 0)
+	m := New([]SessionView{{ID: "stopped:work", Name: "work", Tabs: []TabEntry{{Name: ""}}, Stopped: true}}, "", 0)
 	got, ok := m.Selected()
 	require.True(t, ok)
 	require.Equal(t, Target{Session: "stopped:work", Name: "work", TabIndex: 0, Stopped: true}, got)
 }
 func TestRenderPreviewClipsPadsDropsWideRuneAndInvertsSelection(t *testing.T) {
-	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []string{"tab"}, Active: 0}}, "s1", 0)
+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "tab"}}, Active: 0}}, "s1", 0)
 	preview := Preview{
 		Width:  24,
 		Height: 1,
 }
 func TestRenderListScrollsSelectionIntoView(t *testing.T) {
-	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []string{"a", "b", "c", "d", "e", "f"}, Active: 0}}, "s1", 0)
+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "a"}, {Name: "b"}, {Name: "c"}, {Name: "d"}, {Name: "e"}, {Name: "f"}}, Active: 0}}, "s1", 0)
 	for range 5 {
 		m.Down()
 	}
 }
 func TestRenderListTruncatesLabelWithEllipsis(t *testing.T) {
-	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []string{"a-really-long-focused-pane-tab-label"}, Active: 0}}, "s1", 0)
+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "a-really-long-focused-pane-tab-label"}}, Active: 0}}, "s1", 0)
 	frame := m.Render(domain.Size{Cols: 45, Rows: 5}, Preview{})
 }
 func TestRenderListOnlyDoesNotDrawPreview(t *testing.T) {
-	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []string{"tab"}, Active: 0}}, "s1", 0)
+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{{Name: "tab"}}, Active: 0}}, "s1", 0)
 	preview := Preview{Width: 1, Height: 1, Rows: [][]renderer.Cell{{cell('x')}}}
 	frame := m.Render(domain.Size{Cols: 23, Rows: 11}, preview)
 	require.NotEqual(t, 'x', frame.At(0, 0).Rune)
 }
+func TestRenderListDrawsNameAndDetailSegmentsWithDistinctStyles(t *testing.T) {
+	nameStyle := renderer.Style{Bold: true}
+	detailStyle := renderer.Style{Italic: true}
+	baseStyle := renderer.DefaultStyle()
+	selectionStyle := renderer.Style{Inverse: true}
+	selectionNameStyle := renderer.Style{Inverse: true, Bold: true}
+	selectionMutedStyle := renderer.Style{Inverse: true, Italic: true}
+	styles := RenderStyles{
+		Selection: selectionStyle, SelectionName: selectionNameStyle, SelectionMuted: selectionMutedStyle,
+		Name: nameStyle, Detail: detailStyle, Base: baseStyle,
+	}
+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{
+		{Name: "alpha", Detail: " (running)"},
+		{Name: "beta", Detail: " (idle)", Attention: true},
+	}, Active: 0}}, "s1", 0)
+	frame := m.Render(domain.Size{Cols: 30, Rows: 5}, Preview{}, styles)
+	// Row 1 is the selected tab ("alpha"): name uses SelectionName, detail uses SelectionMuted.
+	require.Equal(t, 'a', frame.At(2, 1).Rune)
+	require.True(t, frame.At(2, 1).Style.Equal(selectionNameStyle), "selected name segment style")
+	require.Equal(t, ' ', frame.At(7, 1).Rune)
+	require.True(t, frame.At(7, 1).Style.Equal(selectionMutedStyle), "selected detail segment style")
+	require.Equal(t, '(', frame.At(8, 1).Rune)
+	require.True(t, frame.At(8, 1).Style.Equal(selectionMutedStyle), "selected detail segment style")
+	// Row 2 is the non-selected tab ("beta"): name uses Name, then the
+	// attention marker (right after the name, before detail) uses the row's
+	// base style (not muted), then detail uses Detail.
+	require.Equal(t, 'b', frame.At(2, 2).Rune)
+	require.True(t, frame.At(2, 2).Style.Equal(nameStyle), "name segment style")
+	require.Equal(t, ' ', frame.At(6, 2).Rune, "attention marker leading space")
+	require.True(t, frame.At(6, 2).Style.Equal(baseStyle), "attention marker uses the base style, not muted")
+	require.Equal(t, rune(ui.AttentionGlyph), frame.At(7, 2).Rune)
+	require.True(t, frame.At(7, 2).Style.Equal(baseStyle), "attention marker uses the base style, not muted")
+	require.Equal(t, ' ', frame.At(8, 2).Rune)
+	require.True(t, frame.At(8, 2).Style.Equal(detailStyle), "detail segment style")
+	require.Equal(t, '(', frame.At(9, 2).Rune)
+	require.True(t, frame.At(9, 2).Style.Equal(detailStyle), "detail segment style")
+}
+func TestRenderListTruncatesDetailBeforeName(t *testing.T) {
+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{
+		{Name: "short-name", Detail: " (a very long detail text)"},
+	}, Active: 0}}, "s1", 0)
+	frame := m.Render(domain.Size{Cols: 45, Rows: 5}, Preview{})
+	layout := ChooseLayout(domain.Size{Cols: 45, Rows: 5})
+	require.Equal(t, 16, layout.List.Width, "test assumes a narrow list column")
+	want := "  short-name (a…"
+	for i, r := range want {
+		require.Equal(t, r, frame.At(i, 1).Rune, "cell %d", i)
+	}
+	require.Equal(t, '…', frame.At(layout.List.Width-1, 1).Rune, "detail is ellipsized to fit, the intact name is not touched")
+	require.Equal(t, ' ', frame.At(layout.List.Width, 1).Rune, "nothing drawn past the list width")
+}
+func TestRenderListTruncatesNameWhenAloneExceedsWidth(t *testing.T) {
+	m := New([]SessionView{{ID: "s1", Name: "one", Tabs: []TabEntry{
+		{Name: "a-really-long-focused-pane-tab-label", Detail: " (detail)"},
+	}, Active: 0}}, "s1", 0)
+	frame := m.Render(domain.Size{Cols: 45, Rows: 5}, Preview{})
+	layout := ChooseLayout(domain.Size{Cols: 45, Rows: 5})
+	require.Equal(t, 16, layout.List.Width, "test assumes a narrow list column")
+	require.Equal(t, '…', frame.At(layout.List.Width-1, 1).Rune, "the name segment itself is ellipsized once it alone exceeds the width")
+	require.Equal(t, ' ', frame.At(layout.List.Width, 1).Rune, "nothing drawn past the list width, detail gets no room at all")
+}
 func cell(r rune) renderer.Cell {
 	return renderer.Cell{Rune: r, Style: renderer.DefaultStyle()}
 }

M internal/usecase/theme/theme.go +36 -0


@@ -337,6 +337,42 @@ func MutedTextStyle(t Theme) renderer.Style {
337	337		return style
338	338		}
339	339
	340	+	// mutedVariantBlend is the fraction MutedVariantStyle blends a style's own
	341	+	// foreground toward its own background, subtler than MutedTextStyle's 0.45
	342	+	// (which blends the theme's global fg/bg instead of a style's own colors).
	343	+	const mutedVariantBlend = 0.4
	344	+
	345	+	// EmphasisStyle returns base with bold applied when the client theme supports
	346	+	// styled output; otherwise base is returned unchanged.
	347	+	func EmphasisStyle(base renderer.Style, t Theme) renderer.Style {
	348	+	if !usable(t) {
	349	+	return base
	350	+	}
	351	+	out := base
	352	+	out.Bold = true
	353	+	return out
	354	+	}
	355	+
	356	+	// MutedVariantStyle fades base's foreground toward its background when both
	357	+	// are RGB and the client theme supports styled output; otherwise base is
	358	+	// returned unchanged. When base has an RGB foreground but no RGB background,
	359	+	// it fades toward t.Background instead.
	360	+	func MutedVariantStyle(base renderer.Style, t Theme) renderer.Style {
	361	+	if !usable(t) \|\| !base.HasForegroundRGB {
	362	+	return base
	363	+	}
	364	+	bg := base.BackgroundRGB
	365	+	if !base.HasBackgroundRGB {
	366	+	if !t.HasBG {
	367	+	return base
	368	+	}
	369	+	bg = t.Background
	370	+	}
	371	+	out := base
	372	+	out.ForegroundRGB = Blend(base.ForegroundRGB, bg, mutedVariantBlend)
	373	+	return out
	374	+	}
	375	+
340	376		func DimStyle(style renderer.Style, t Theme) renderer.Style {
341	377		if !usable(t) {
342	378		return style


@@ -337,6 +337,42 @@ func MutedTextStyle(t Theme) renderer.Style {
337	return style	337		return style
338	}	338		}
339		339
		340	+	// mutedVariantBlend is the fraction MutedVariantStyle blends a style's own
		341	+	// foreground toward its own background, subtler than MutedTextStyle's 0.45
		342	+	// (which blends the theme's global fg/bg instead of a style's own colors).
		343	+	const mutedVariantBlend = 0.4
		344	+
		345	+	// EmphasisStyle returns base with bold applied when the client theme supports
		346	+	// styled output; otherwise base is returned unchanged.
		347	+	func EmphasisStyle(base renderer.Style, t Theme) renderer.Style {
		348	+	if !usable(t) {
		349	+	return base
		350	+	}
		351	+	out := base
		352	+	out.Bold = true
		353	+	return out
		354	+	}
		355	+
		356	+	// MutedVariantStyle fades base's foreground toward its background when both
		357	+	// are RGB and the client theme supports styled output; otherwise base is
		358	+	// returned unchanged. When base has an RGB foreground but no RGB background,
		359	+	// it fades toward t.Background instead.
		360	+	func MutedVariantStyle(base renderer.Style, t Theme) renderer.Style {
		361	+	if !usable(t) \|\| !base.HasForegroundRGB {
		362	+	return base
		363	+	}
		364	+	bg := base.BackgroundRGB
		365	+	if !base.HasBackgroundRGB {
		366	+	if !t.HasBG {
		367	+	return base
		368	+	}
		369	+	bg = t.Background
		370	+	}
		371	+	out := base
		372	+	out.ForegroundRGB = Blend(base.ForegroundRGB, bg, mutedVariantBlend)
		373	+	return out
		374	+	}
		375	+
340	func DimStyle(style renderer.Style, t Theme) renderer.Style {	376		func DimStyle(style renderer.Style, t Theme) renderer.Style {
341	if !usable(t) {	377		if !usable(t) {
342	return style	378		return style

M internal/usecase/theme/theme_test.go +98 -0


@@ -388,3 +388,101 @@ func TestStyleHelpersFallbackAndThemed(t *testing.T) {
388	388		t.Fatalf("muted themed=%+v", muted)
389	389		}
390	390		}
	391	+
	392	+	func TestEmphasisStyle(t *testing.T) {
	393	+	usableTheme := Theme{Foreground: renderer.RGB{R: 200, G: 200, B: 200}, Background: renderer.RGB{R: 10, G: 20, B: 30}, HasFG: true, HasBG: true, Known: true, TrueColor: true}
	394	+	base := renderer.Style{HasForegroundRGB: true, ForegroundRGB: renderer.RGB{R: 1, G: 2, B: 3}}
	395	+
	396	+	tests := []struct {
	397	+	name string
	398	+	theme Theme
	399	+	base renderer.Style
	400	+	want renderer.Style
	401	+	}{
	402	+	{
	403	+	name: "usable theme applies bold",
	404	+	theme: usableTheme,
	405	+	base: base,
	406	+	want: renderer.Style{HasForegroundRGB: true, ForegroundRGB: renderer.RGB{R: 1, G: 2, B: 3}, Bold: true},
	407	+	},
	408	+	{
	409	+	name: "unknown theme returns base unchanged",
	410	+	theme: Theme{},
	411	+	base: base,
	412	+	want: base,
	413	+	},
	414	+	{
	415	+	name: "theme missing truecolor returns base unchanged",
	416	+	theme: Theme{Foreground: usableTheme.Foreground, Background: usableTheme.Background, HasFG: true, HasBG: true, Known: true},
	417	+	base: base,
	418	+	want: base,
	419	+	},
	420	+	}
	421	+	for _, tt := range tests {
	422	+	t.Run(tt.name, func(t *testing.T) {
	423	+	if got := EmphasisStyle(tt.base, tt.theme); !got.Equal(tt.want) {
	424	+	t.Fatalf("EmphasisStyle()=%+v want %+v", got, tt.want)
	425	+	}
	426	+	})
	427	+	}
	428	+	}
	429	+
	430	+	func TestMutedVariantStyle(t *testing.T) {
	431	+	usableTheme := Theme{Foreground: renderer.RGB{R: 200, G: 200, B: 200}, Background: renderer.RGB{R: 10, G: 20, B: 30}, HasFG: true, HasBG: true, Known: true, TrueColor: true}
	432	+	rgbBase := renderer.Style{
	433	+	HasForegroundRGB: true, ForegroundRGB: renderer.RGB{R: 100, G: 100, B: 100},
	434	+	HasBackgroundRGB: true, BackgroundRGB: renderer.RGB{R: 0, G: 0, B: 0},
	435	+	}
	436	+	fgOnlyBase := renderer.Style{HasForegroundRGB: true, ForegroundRGB: renderer.RGB{R: 100, G: 100, B: 100}}
	437	+	noRGBBase := renderer.DefaultStyle()
	438	+
	439	+	tests := []struct {
	440	+	name string
	441	+	base renderer.Style
	442	+	theme Theme
	443	+	want renderer.Style
	444	+	}{
	445	+	{
	446	+	name: "usable theme blends fg toward own bg",
	447	+	base: rgbBase,
	448	+	theme: usableTheme,
	449	+	want: renderer.Style{
	450	+	HasForegroundRGB: true, ForegroundRGB: Blend(renderer.RGB{R: 100, G: 100, B: 100}, renderer.RGB{R: 0, G: 0, B: 0}, mutedVariantBlend),
	451	+	HasBackgroundRGB: true, BackgroundRGB: renderer.RGB{R: 0, G: 0, B: 0},
	452	+	},
	453	+	},
	454	+	{
	455	+	name: "non-usable theme returns base unchanged",
	456	+	base: rgbBase,
	457	+	theme: Theme{},
	458	+	want: rgbBase,
	459	+	},
	460	+	{
	461	+	name: "base without RGB background falls back to theme background",
	462	+	base: fgOnlyBase,
	463	+	theme: usableTheme,
	464	+	want: renderer.Style{
	465	+	HasForegroundRGB: true, ForegroundRGB: Blend(renderer.RGB{R: 100, G: 100, B: 100}, usableTheme.Background, mutedVariantBlend),
	466	+	},
	467	+	},
	468	+	{
	469	+	name: "base without RGB background and theme without background returns base unchanged",
	470	+	base: fgOnlyBase,
	471	+	theme: Theme{Known: true, TrueColor: true, HasFG: true},
	472	+	want: fgOnlyBase,
	473	+	},
	474	+	{
	475	+	name: "base without RGB foreground returns base unchanged",
	476	+	base: noRGBBase,
	477	+	theme: usableTheme,
	478	+	want: noRGBBase,
	479	+	},
	480	+	}
	481	+	for _, tt := range tests {
	482	+	t.Run(tt.name, func(t *testing.T) {
	483	+	if got := MutedVariantStyle(tt.base, tt.theme); !got.Equal(tt.want) {
	484	+	t.Fatalf("MutedVariantStyle()=%+v want %+v", got, tt.want)
	485	+	}
	486	+	})
	487	+	}
	488	+	}


@@ -388,3 +388,101 @@ func TestStyleHelpersFallbackAndThemed(t *testing.T) {
388	t.Fatalf("muted themed=%+v", muted)	388		t.Fatalf("muted themed=%+v", muted)
389	}	389		}
390	}	390		}
		391	+
		392	+	func TestEmphasisStyle(t *testing.T) {
		393	+	usableTheme := Theme{Foreground: renderer.RGB{R: 200, G: 200, B: 200}, Background: renderer.RGB{R: 10, G: 20, B: 30}, HasFG: true, HasBG: true, Known: true, TrueColor: true}
		394	+	base := renderer.Style{HasForegroundRGB: true, ForegroundRGB: renderer.RGB{R: 1, G: 2, B: 3}}
		395	+
		396	+	tests := []struct {
		397	+	name string
		398	+	theme Theme
		399	+	base renderer.Style
		400	+	want renderer.Style
		401	+	}{
		402	+	{
		403	+	name: "usable theme applies bold",
		404	+	theme: usableTheme,
		405	+	base: base,
		406	+	want: renderer.Style{HasForegroundRGB: true, ForegroundRGB: renderer.RGB{R: 1, G: 2, B: 3}, Bold: true},
		407	+	},
		408	+	{
		409	+	name: "unknown theme returns base unchanged",
		410	+	theme: Theme{},
		411	+	base: base,
		412	+	want: base,
		413	+	},
		414	+	{
		415	+	name: "theme missing truecolor returns base unchanged",
		416	+	theme: Theme{Foreground: usableTheme.Foreground, Background: usableTheme.Background, HasFG: true, HasBG: true, Known: true},
		417	+	base: base,
		418	+	want: base,
		419	+	},
		420	+	}
		421	+	for _, tt := range tests {
		422	+	t.Run(tt.name, func(t *testing.T) {
		423	+	if got := EmphasisStyle(tt.base, tt.theme); !got.Equal(tt.want) {
		424	+	t.Fatalf("EmphasisStyle()=%+v want %+v", got, tt.want)
		425	+	}
		426	+	})
		427	+	}
		428	+	}
		429	+
		430	+	func TestMutedVariantStyle(t *testing.T) {
		431	+	usableTheme := Theme{Foreground: renderer.RGB{R: 200, G: 200, B: 200}, Background: renderer.RGB{R: 10, G: 20, B: 30}, HasFG: true, HasBG: true, Known: true, TrueColor: true}
		432	+	rgbBase := renderer.Style{
		433	+	HasForegroundRGB: true, ForegroundRGB: renderer.RGB{R: 100, G: 100, B: 100},
		434	+	HasBackgroundRGB: true, BackgroundRGB: renderer.RGB{R: 0, G: 0, B: 0},
		435	+	}
		436	+	fgOnlyBase := renderer.Style{HasForegroundRGB: true, ForegroundRGB: renderer.RGB{R: 100, G: 100, B: 100}}
		437	+	noRGBBase := renderer.DefaultStyle()
		438	+
		439	+	tests := []struct {
		440	+	name string
		441	+	base renderer.Style
		442	+	theme Theme
		443	+	want renderer.Style
		444	+	}{
		445	+	{
		446	+	name: "usable theme blends fg toward own bg",
		447	+	base: rgbBase,
		448	+	theme: usableTheme,
		449	+	want: renderer.Style{
		450	+	HasForegroundRGB: true, ForegroundRGB: Blend(renderer.RGB{R: 100, G: 100, B: 100}, renderer.RGB{R: 0, G: 0, B: 0}, mutedVariantBlend),
		451	+	HasBackgroundRGB: true, BackgroundRGB: renderer.RGB{R: 0, G: 0, B: 0},
		452	+	},
		453	+	},
		454	+	{
		455	+	name: "non-usable theme returns base unchanged",
		456	+	base: rgbBase,
		457	+	theme: Theme{},
		458	+	want: rgbBase,
		459	+	},
		460	+	{
		461	+	name: "base without RGB background falls back to theme background",
		462	+	base: fgOnlyBase,
		463	+	theme: usableTheme,
		464	+	want: renderer.Style{
		465	+	HasForegroundRGB: true, ForegroundRGB: Blend(renderer.RGB{R: 100, G: 100, B: 100}, usableTheme.Background, mutedVariantBlend),
		466	+	},
		467	+	},
		468	+	{
		469	+	name: "base without RGB background and theme without background returns base unchanged",
		470	+	base: fgOnlyBase,
		471	+	theme: Theme{Known: true, TrueColor: true, HasFG: true},
		472	+	want: fgOnlyBase,
		473	+	},
		474	+	{
		475	+	name: "base without RGB foreground returns base unchanged",
		476	+	base: noRGBBase,
		477	+	theme: usableTheme,
		478	+	want: noRGBBase,
		479	+	},
		480	+	}
		481	+	for _, tt := range tests {
		482	+	t.Run(tt.name, func(t *testing.T) {
		483	+	if got := MutedVariantStyle(tt.base, tt.theme); !got.Equal(tt.want) {
		484	+	t.Fatalf("MutedVariantStyle()=%+v want %+v", got, tt.want)
		485	+	}
		486	+	})
		487	+	}
		488	+	}

A internal/usecase/ui/glyphs.go +5 -0

@@ -0,0 +1,5 @@
	1	+	package ui
	2	+
	3	+	// AttentionGlyph is the bell icon drawn beside tab/session labels with a
	4	+	// pending attention event.
	5	+	const AttentionGlyph = ''

@@ -0,0 +1,5 @@
	1	+	package ui
	2	+
	3	+	// AttentionGlyph is the bell icon drawn beside tab/session labels with a
	4	+	// pending attention event.
	5	+	const AttentionGlyph = ''