fix(cmux): distinguish stopped agent sessions

Author: Ynakatsuka

home/dot_local/bin/executable_cmux-agent-board-state

@@ -17,17 +17,17 @@ if [[ -z "$surface_id" ]]; then
 fi
 
 working_marker=$'\342\201\240\342\200\213\342\201\240'
-idle_marker=$'\342\201\240\342\200\214\342\201\240'
+stopped_marker=$'\342\201\240\342\200\214\342\201\240'
 input_marker=$'\342\201\240\342\200\215\342\201\240'
 
 case "$state" in
   working) marker="$working_marker" ;;
-  # Existing sessions can retain the former Stop hook until they restart.
-  stopped | idle) marker="$idle_marker" ;;
+  stopped) marker="$stopped_marker" ;;
+  idle) marker="" ;;
   input) marker="$input_marker" ;;
   clear) marker="" ;;
   *)
-    echo "usage: cmux-agent-board-state {working|stopped|input|clear}" >&2
+    echo "usage: cmux-agent-board-state {working|stopped|idle|input|clear}" >&2
     exit 2
     ;;
 esac
@@ -54,7 +54,7 @@ current_surface_title="$({
 
 workspace_has_marker=false
 if [[ "$current_workspace_title" == *"$working_marker"*
-  || "$current_workspace_title" == *"$idle_marker"*
+  || "$current_workspace_title" == *"$stopped_marker"*
   || "$current_workspace_title" == *"$input_marker"* ]]; then
   workspace_has_marker=true
 fi
@@ -68,15 +68,15 @@ fi
 
 if [[ -z "$marker"
   && "$current_surface_title" != *"$working_marker"
-  && "$current_surface_title" != *"$idle_marker"
+  && "$current_surface_title" != *"$stopped_marker"
   && "$current_surface_title" != *"$input_marker"
   && "$workspace_has_marker" == false ]]; then
   echo '{}'
   exit 0
 fi
 
 clean_surface_title="${current_surface_title//$working_marker/}"
-clean_surface_title="${clean_surface_title//$idle_marker/}"
+clean_surface_title="${clean_surface_title//$stopped_marker/}"
 clean_surface_title="${clean_surface_title//$input_marker/}"
 
 next_surface_title="${clean_surface_title}${marker}"
@@ -90,7 +90,7 @@ fi
 
 if [[ "$workspace_has_marker" == true ]]; then
   clean_workspace_title="${current_workspace_title//$working_marker/}"
-  clean_workspace_title="${clean_workspace_title//$idle_marker/}"
+  clean_workspace_title="${clean_workspace_title//$stopped_marker/}"
   clean_workspace_title="${clean_workspace_title//$input_marker/}"
   cmux workspace-action \
     --workspace "$workspace_id" \

home/dot_local/share/cmux/agent-board.swift

@@ -44,7 +44,7 @@ func managedTitleState(_ title: String) -> String {
     // Keep these zero-width markers literal. cmux 0.64.22 does not expand
     // Unicode escape sequences in interpreted sidebar string literals.
     if title.hasSuffix("⁠​⁠") { return "working" }
-    if title.hasSuffix("⁠‌⁠") { return "idle" }
+    if title.hasSuffix("⁠‌⁠") { return "stopped" }
     if title.hasSuffix("⁠‍⁠") { return "input" }
     return ""
 }
@@ -91,6 +91,13 @@ func agentState(_ workspace) -> String {
         return "done"
     }
 
+    let hasStoppedTab = workspace.tabs.contains {
+        managedTitleState($0.title) == "stopped"
+    }
+    if hasStoppedTab || legacyTitleState == "stopped" {
+        return "stopped"
+    }
+
     if label.contains("idle") {
         return "idle"
     }
@@ -103,6 +110,7 @@ func stateTint(_ state: String) -> String {
     if state == "working" { return "#30D158" }
     if state == "done" { return "#54A8FF" }
     if state == "idle" { return "#8E8E93" }
+    if state == "stopped" { return "#FF9F0A" }
     return "#636366"
 }
 

scripts/test-cmux-agent-board-state.sh

@@ -48,7 +48,7 @@ run_state() {
 }
 
 working_marker=$'\342\201\240\342\200\213\342\201\240'
-idle_marker=$'\342\201\240\342\200\214\342\201\240'
+stopped_marker=$'\342\201\240\342\200\214\342\201\240'
 input_marker=$'\342\201\240\342\200\215\342\201\240'
 
 run_state working >/dev/null
@@ -69,11 +69,11 @@ grep -Fq -- "tab-action --surface surface-id --action rename --title surface${in
 grep -Fq -- 'workspace-action --workspace workspace-id --action rename --title workspace' "$calls_file"
 
 : >"$calls_file"
-MOCK_SURFACE_TITLE="surface${idle_marker}" run_state clear >/dev/null
+MOCK_SURFACE_TITLE="surface${stopped_marker}" run_state clear >/dev/null
 grep -Fq -- 'tab-action --surface surface-id --action rename --title surface' "$calls_file"
 
 : >"$calls_file"
-MOCK_WORKSPACE_TITLE="workspace${idle_marker}" run_state clear >/dev/null
+MOCK_WORKSPACE_TITLE="workspace${stopped_marker}" run_state clear >/dev/null
 grep -Fq -- 'workspace-action --workspace workspace-id --action rename --title workspace' "$calls_file"
 if grep -Fq 'tab-action' "$calls_file"; then
   printf 'marker-free surface was unexpectedly renamed during workspace migration\n' >&2
@@ -82,11 +82,11 @@ fi
 
 : >"$calls_file"
 run_state stopped >/dev/null
-grep -Fq -- "tab-action --surface surface-id --action rename --title surface${idle_marker}" "$calls_file"
+grep -Fq -- "tab-action --surface surface-id --action rename --title surface${stopped_marker}" "$calls_file"
 
 : >"$calls_file"
-run_state idle >/dev/null
-grep -Fq -- "tab-action --surface surface-id --action rename --title surface${idle_marker}" "$calls_file"
+MOCK_SURFACE_TITLE="surface${working_marker}" run_state idle >/dev/null
+grep -Fq -- "tab-action --surface surface-id --action rename --title surface" "$calls_file"
 
 shell_home="$test_dir/home"
 shell_calls="$test_dir/shell-calls"
@@ -165,7 +165,7 @@ jq -e '
      end))
 ' <<<"$rendered_codex_hooks" >/dev/null
 
-grep -Fq "if title.hasSuffix(\"${idle_marker}\") { return \"idle\" }" "$SIDEBAR"
+grep -Fq "if title.hasSuffix(\"${stopped_marker}\") { return \"stopped\" }" "$SIDEBAR"
 python3 - "$SIDEBAR" <<'PY'
 import pathlib
 import sys
@@ -175,7 +175,9 @@ agent_state = source.split("func agentState", 1)[1].split("func stateTint", 1)[0
 tab_state = source.split("func tabState", 1)[1].split("func workspaceRow", 1)[0]
 assert agent_state.rstrip().endswith('return "idle"\n}')
 assert "workspace.tabs.contains" in agent_state
+assert 'managedTitleState($0.title) == "stopped"' in agent_state
 assert "managedTitleState(tab.title)" in tab_state
+assert 'if state == "stopped" { return "#FF9F0A" }' in source
 assert "workspaceStatusText" not in source
 assert "workspaceMemoText" not in source
 assert "cmux-workspace-note" not in source