f06fef6 feat(picker): show session state as a 256-color dot · vev

M internal/usecase/client/picker_catalogue.go +2 -1


@@ -930,7 +930,8 @@ func pickerSessionDetail(session catalogue.RemoteCatalogSession) string {
930	930		count = strconv.Itoa(n)
931	931		}
932	932		if session.Attached {
933		-	return strings.TrimSpace("● " + count)
	933	+	// "*" marks the attached session; ● is reserved for the status dot.
	934	+	return strings.TrimSpace("* " + count)
934	935		}
935	936		return count
936	937		}

 		count = strconv.Itoa(n)
 	}
 	if session.Attached {
-		return strings.TrimSpace("● " + count)
+		// "*" marks the attached session; ● is reserved for the status dot.
+		return strings.TrimSpace("* " + count)
 	}
 	return count
 }

M internal/usecase/picker/model.go +27 -12


@@ -539,25 +539,37 @@ func (s SortMode) Title() string {
539	539		return " Sessions · recent "
540	540		}
541	541
542		-	func lineStatusBadge(status protocol.PickerLineStatus) string {
	542	+	// statusDot is the one-cell state marker. Every state uses the same dot and
	543	+	// a fixed xterm-256 color, so it reads the same in any terminal and theme:
	544	+	// green up, gray stopped, red down or error, yellow stale, magenta version
	545	+	// mismatch, blue no daemon.
	546	+	const statusDot = "●"
	547	+
	548	+	// lineStatusColor is the xterm-256 index for a status, or -1 for none.
	549	+	func lineStatusColor(status protocol.PickerLineStatus) int {
543	550		switch status {
544	551		case protocol.PickerLineStatusUp:
545		-	return "up"
	552	+	return 71 // green
546	553		case protocol.PickerLineStatusStopped:
547		-	return "down"
548		-	case protocol.PickerLineStatusDown:
549		-	return "off"
	554	+	return 244 // gray
	555	+	case protocol.PickerLineStatusDown, protocol.PickerLineStatusError:
	556	+	return 167 // red
550	557		case protocol.PickerLineStatusStale:
551		-	return "stale"
	558	+	return 179 // yellow
552	559		case protocol.PickerLineStatusVersion:
553		-	return "ver"
554		-	case protocol.PickerLineStatusError:
555		-	return "err"
	560	+	return 170 // magenta
556	561		case protocol.PickerLineStatusNoDaemon:
557		-	return "none"
	562	+	return 67 // blue
558	563		default:
	564	+	return -1
	565	+	}
	566	+	}
	567	+
	568	+	func lineStatusBadge(status protocol.PickerLineStatus) string {
	569	+	if lineStatusColor(status) < 0 {
559	570		return ""
560	571		}
	572	+	return statusDot
561	573		}
562	574
563	575		// renderList draws each visible row as up to three segments: a name segment

@@ -608,7 +620,7 @@ func (m *Model) renderList(frame renderer.Frame, rect domain.Rect, styles Render
608	620		treeX = ui.DrawText(frame, rect.X, rect.Y+y, clipX, r.tree, treeStyle)
609	621		}
610	622		badge := ""
611		-	if r.rendersAsHeader() && !(r.kind() == protocol.PickerLineSession && r.line.Status == protocol.PickerLineStatusUp) {
	623	+	if r.rendersAsHeader() {
612	624		badge = lineStatusBadge(r.line.Status)
613	625		}
614	626		contentClipX := clipX

@@ -645,7 +657,10 @@ func (m *Model) renderList(frame renderer.Frame, rect domain.Rect, styles Render
645	657		}
646	658		if badge != "" {
647	659		badgeX := max(rect.X, clipX-badgeWidth)
648		-	ui.DrawText(frame, badgeX, rect.Y+y, clipX, badge, detailStyle)
	660	+	badgeStyle := base
	661	+	badgeStyle.Foreground = lineStatusColor(r.line.Status)
	662	+	badgeStyle.HasForegroundRGB = false
	663	+	ui.DrawText(frame, badgeX, rect.Y+y, clipX, badge, badgeStyle)
649	664		}
650	665		continue
651	666		}

 	return " Sessions · recent "
 }
-func lineStatusBadge(status protocol.PickerLineStatus) string {
+// statusDot is the one-cell state marker. Every state uses the same dot and
+// a fixed xterm-256 color, so it reads the same in any terminal and theme:
+// green up, gray stopped, red down or error, yellow stale, magenta version
+// mismatch, blue no daemon.
+const statusDot = "●"
+// lineStatusColor is the xterm-256 index for a status, or -1 for none.
+func lineStatusColor(status protocol.PickerLineStatus) int {
 	switch status {
 	case protocol.PickerLineStatusUp:
-		return "up"
+		return 71 // green
 	case protocol.PickerLineStatusStopped:
-		return "down"
+		return 244 // gray
-	case protocol.PickerLineStatusDown:
+	case protocol.PickerLineStatusDown, protocol.PickerLineStatusError:
-		return "off"
+		return 167 // red
 	case protocol.PickerLineStatusStale:
-		return "stale"
+		return 179 // yellow
 	case protocol.PickerLineStatusVersion:
-		return "ver"
+		return 170 // magenta
-	case protocol.PickerLineStatusError:
-		return "err"
 	case protocol.PickerLineStatusNoDaemon:
-		return "none"
+		return 67 // blue
 	default:
+		return -1
+	}
+}
+func lineStatusBadge(status protocol.PickerLineStatus) string {
+	if lineStatusColor(status) < 0 {
 		return ""
 	}
+	return statusDot
 }
 // renderList draws each visible row as up to three segments: a name segment
 			treeX = ui.DrawText(frame, rect.X, rect.Y+y, clipX, r.tree, treeStyle)
 		}
 		badge := ""
-		if r.rendersAsHeader() && !(r.kind() == protocol.PickerLineSession && r.line.Status == protocol.PickerLineStatusUp) {
+		if r.rendersAsHeader() {
 			badge = lineStatusBadge(r.line.Status)
 		}
 		contentClipX := clipX
 			}
 			if badge != "" {
 				badgeX := max(rect.X, clipX-badgeWidth)
-				ui.DrawText(frame, badgeX, rect.Y+y, clipX, badge, detailStyle)
+				badgeStyle := base
+				badgeStyle.Foreground = lineStatusColor(r.line.Status)
+				badgeStyle.HasForegroundRGB = false
+				ui.DrawText(frame, badgeX, rect.Y+y, clipX, badge, badgeStyle)
 			}
 			continue
 		}

M internal/usecase/picker/model_test.go +6 -3


@@ -299,8 +299,11 @@ func TestRenderDrawsStatusBadgesAndStoppedRows(t *testing.T) {
299	299		frame := m.Render(domain.Size{Cols: 60, Rows: 8}, Preview{})
300	300		require.Equal(t, 60, frame.Width)
301	301		require.Equal(t, 8, frame.Height)
302		-	require.NotRegexp(t, `\bup\s*$`, strings.TrimRight(rowText(frame.Row(0)), " "), "live sessions carry no badge")
303		-	require.Regexp(t, `down\s*$`, strings.TrimRight(rowText(frame.Row(1)), " "))
	302	+	for row, want := range map[int]int{0: 71, 1: 244} {
	303	+	text := []rune(strings.TrimRight(rowText(frame.Row(row)), " "))
	304	+	require.Equal(t, '●', text[len(text)-1])
	305	+	require.Equal(t, want, frame.At(len(text)-1, row).Style.Foreground, "row %d dot color", row)
	306	+	}
304	307		}
305	308
306	309		func TestRenderShowsNoDaemonBadgeAndCreateHint(t *testing.T) {

@@ -310,7 +313,7 @@ func TestRenderShowsNoDaemonBadgeAndCreateHint(t *testing.T) {
310	313		Dim: true, Focusable: true, Actions: protocol.PickerCanNavigate,
311	314		}}, Config{Intent: protocol.PickerIntentNavigation})
312	315		frame := m.Render(domain.Size{Cols: 80, Rows: 8}, Preview{})
313		-	require.Contains(t, rowText(frame.Row(0)), "none")
	316	+	require.Contains(t, rowText(frame.Row(0)), "●")
314	317		require.Contains(t, rowText(frame.Row(7)), "no daemon")
315	318		require.Contains(t, rowText(frame.Row(7)), "Enter to create a session")
316	319		require.NotContains(t, rowText(frame.Row(7)), "Enter unavailable")

 	frame := m.Render(domain.Size{Cols: 60, Rows: 8}, Preview{})
 	require.Equal(t, 60, frame.Width)
 	require.Equal(t, 8, frame.Height)
-	require.NotRegexp(t, `\bup\s*$`, strings.TrimRight(rowText(frame.Row(0)), " "), "live sessions carry no badge")
+	for row, want := range map[int]int{0: 71, 1: 244} {
-	require.Regexp(t, `down\s*$`, strings.TrimRight(rowText(frame.Row(1)), " "))
+		text := []rune(strings.TrimRight(rowText(frame.Row(row)), " "))
+		require.Equal(t, '●', text[len(text)-1])
+		require.Equal(t, want, frame.At(len(text)-1, row).Style.Foreground, "row %d dot color", row)
+	}
 }
 func TestRenderShowsNoDaemonBadgeAndCreateHint(t *testing.T) {
 		Dim: true, Focusable: true, Actions: protocol.PickerCanNavigate,
 	}}, Config{Intent: protocol.PickerIntentNavigation})
 	frame := m.Render(domain.Size{Cols: 80, Rows: 8}, Preview{})
-	require.Contains(t, rowText(frame.Row(0)), "none")
+	require.Contains(t, rowText(frame.Row(0)), "●")
 	require.Contains(t, rowText(frame.Row(7)), "no daemon")
 	require.Contains(t, rowText(frame.Row(7)), "Enter to create a session")
 	require.NotContains(t, rowText(frame.Row(7)), "Enter unavailable")