@bastani/atomic 0.6.6-1 → 0.6.7-0

package/src/commands/cli/session.test.ts

@@ -288,6 +288,8 @@ const tmuxMocks = {
   spawnMuxAttach: mock(() => ({ exited: Promise.resolve(0) }) as never),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   select: mock<(...args: any[]) => Promise<string | symbol>>(() => Promise.resolve("my-session")),
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  multiselect: mock<(...args: any[]) => Promise<string[] | symbol>>(() => Promise.resolve([])),
   killSession: mock<(name: string) => void>(() => {}),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   confirm: mock<(...args: any[]) => Promise<boolean | symbol>>(() => Promise.resolve(true)),
@@ -309,6 +311,7 @@ function resetTmuxMocks(): void {
   tmuxMocks.detachAndAttachAtomic.mockReset();
   tmuxMocks.spawnMuxAttach.mockReset().mockReturnValue({ exited: Promise.resolve(0) } as never);
   tmuxMocks.select.mockReset().mockResolvedValue("my-session");
+  tmuxMocks.multiselect.mockReset().mockResolvedValue([]);
   tmuxMocks.killSession.mockReset();
   tmuxMocks.confirm.mockReset().mockResolvedValue(true);
 }
@@ -628,24 +631,29 @@ describe("sessionKillCommand", () => {
     }
   });
 
-  // (h) omitted id, N sessions, user confirms → killSession called for each, return 0
-  test("omitted id prompts and kills all sessions on confirm", async () => {
+  // (h) omitted id, N sessions, user selects sessions and confirms → killSession called for selected, return 0
+  test("omitted id prompts with multiselect and kills selected sessions on confirm", async () => {
     const now = new Date().toISOString();
     tmuxMocks.listSessions.mockReturnValue([
       { name: "session-a", windows: 1, created: now, attached: false, type: "chat" as const, agent: "claude" },
       { name: "session-b", windows: 1, created: now, attached: false, type: "workflow" as const, agent: "opencode" },
       { name: "session-c", windows: 1, created: now, attached: false, type: "chat" as const, agent: "copilot" },
     ]);
+    tmuxMocks.multiselect.mockResolvedValue(["session-a", "session-c"]);
     tmuxMocks.confirm.mockResolvedValue(true);
     const origWrite = process.stdout.write;
     process.stdout.write = (() => true) as typeof process.stdout.write;
     try {
       const code = await sessionKillCommand(undefined, [], "all", makeDeps());
       expect(code).toBe(0);
-      expect(tmuxMocks.killSession).toHaveBeenCalledTimes(3);
+      expect(tmuxMocks.multiselect).toHaveBeenCalledTimes(1);
+      expect(tmuxMocks.multiselect).toHaveBeenCalledWith(expect.objectContaining({
+        message: "Select sessions to kill (Space toggles, Enter continues)",
+      }));
+      expect(tmuxMocks.killSession).toHaveBeenCalledTimes(2);
       expect(tmuxMocks.killSession).toHaveBeenCalledWith("session-a");
-      expect(tmuxMocks.killSession).toHaveBeenCalledWith("session-b");
       expect(tmuxMocks.killSession).toHaveBeenCalledWith("session-c");
+      expect(tmuxMocks.killSession).not.toHaveBeenCalledWith("session-b");
     } finally {
       process.stdout.write = origWrite;
     }
@@ -658,6 +666,7 @@ describe("sessionKillCommand", () => {
       { name: "chat-session", windows: 1, created: now, attached: false, type: "chat" as const, agent: "claude" },
       { name: "wf-session", windows: 1, created: now, attached: false, type: "workflow" as const, agent: "opencode" },
     ]);
+    tmuxMocks.multiselect.mockResolvedValue(["chat-session"]);
     tmuxMocks.confirm.mockResolvedValue(true);
     const origWrite = process.stdout.write;
     process.stdout.write = (() => true) as typeof process.stdout.write;
@@ -679,6 +688,7 @@ describe("sessionKillCommand", () => {
       { name: "chat-session", windows: 1, created: now, attached: false, type: "chat" as const, agent: "claude" },
       { name: "wf-session", windows: 1, created: now, attached: false, type: "workflow" as const, agent: "opencode" },
     ]);
+    tmuxMocks.multiselect.mockResolvedValue(["wf-session"]);
     tmuxMocks.confirm.mockResolvedValue(true);
     const origWrite = process.stdout.write;
     process.stdout.write = (() => true) as typeof process.stdout.write;
@@ -700,6 +710,7 @@ describe("sessionKillCommand", () => {
       { name: "session-x", windows: 1, created: now, attached: false, type: "chat" as const },
       { name: "session-y", windows: 1, created: now, attached: false, type: "workflow" as const },
     ]);
+    tmuxMocks.multiselect.mockResolvedValue(["session-x", "session-y"]);
     tmuxMocks.confirm.mockResolvedValue(false);
     const origWrite = process.stdout.write;
     process.stdout.write = (() => true) as typeof process.stdout.write;
@@ -736,19 +747,81 @@ describe("sessionKillCommand", () => {
     }
   });
 
-  // (m) -y on kill-all: skip prompt and kill every in-scope session
-  test("yes flag skips the prompt for kill-all and kills every in-scope session", async () => {
+  // (m) -y on omitted id: skip confirm after selection and kill selected sessions
+  test("yes flag skips the confirmation prompt after selecting sessions", async () => {
     const now = new Date().toISOString();
     tmuxMocks.listSessions.mockReturnValue([
       { name: "session-a", windows: 1, created: now, attached: false, type: "chat" as const, agent: "claude" },
       { name: "session-b", windows: 1, created: now, attached: false, type: "workflow" as const, agent: "opencode" },
     ]);
+    tmuxMocks.multiselect.mockResolvedValue(["session-b"]);
     const origWrite = process.stdout.write;
     process.stdout.write = (() => true) as typeof process.stdout.write;
     try {
       const code = await sessionKillCommand(undefined, [], "all", makeDeps(), { yes: true });
       expect(code).toBe(0);
       expect(tmuxMocks.confirm).not.toHaveBeenCalled();
+      expect(tmuxMocks.killSession).toHaveBeenCalledTimes(1);
+      expect(tmuxMocks.killSession).toHaveBeenCalledWith("session-b");
+    } finally {
+      process.stdout.write = origWrite;
+    }
+  });
+
+  test("selecting the all option kills every matching session after confirmation", async () => {
+    const now = new Date().toISOString();
+    tmuxMocks.listSessions.mockReturnValue([
+      { name: "session-a", windows: 1, created: now, attached: false, type: "chat" as const, agent: "claude" },
+      { name: "session-b", windows: 1, created: now, attached: false, type: "workflow" as const, agent: "opencode" },
+    ]);
+    tmuxMocks.multiselect.mockResolvedValue(["__atomic_select_all_sessions__"]);
+    tmuxMocks.confirm.mockResolvedValue(true);
+    const origWrite = process.stdout.write;
+    process.stdout.write = (() => true) as typeof process.stdout.write;
+    try {
+      const code = await sessionKillCommand(undefined, [], "all", makeDeps());
+      expect(code).toBe(0);
+      expect(tmuxMocks.killSession).toHaveBeenCalledTimes(2);
+      expect(tmuxMocks.killSession).toHaveBeenCalledWith("session-a");
+      expect(tmuxMocks.killSession).toHaveBeenCalledWith("session-b");
+    } finally {
+      process.stdout.write = origWrite;
+    }
+  });
+
+  test("all flag skips multiselect and confirms every matching session", async () => {
+    const now = new Date().toISOString();
+    tmuxMocks.listSessions.mockReturnValue([
+      { name: "session-a", windows: 1, created: now, attached: false, type: "chat" as const, agent: "claude" },
+      { name: "session-b", windows: 1, created: now, attached: false, type: "workflow" as const, agent: "opencode" },
+    ]);
+    tmuxMocks.confirm.mockResolvedValue(true);
+    const origWrite = process.stdout.write;
+    process.stdout.write = (() => true) as typeof process.stdout.write;
+    try {
+      const code = await sessionKillCommand(undefined, [], "all", makeDeps(), { all: true });
+      expect(code).toBe(0);
+      expect(tmuxMocks.multiselect).not.toHaveBeenCalled();
+      expect(tmuxMocks.confirm).toHaveBeenCalledTimes(1);
+      expect(tmuxMocks.killSession).toHaveBeenCalledTimes(2);
+    } finally {
+      process.stdout.write = origWrite;
+    }
+  });
+
+  test("all and yes flags kill every matching session without prompts", async () => {
+    const now = new Date().toISOString();
+    tmuxMocks.listSessions.mockReturnValue([
+      { name: "session-a", windows: 1, created: now, attached: false, type: "chat" as const, agent: "claude" },
+      { name: "session-b", windows: 1, created: now, attached: false, type: "workflow" as const, agent: "opencode" },
+    ]);
+    const origWrite = process.stdout.write;
+    process.stdout.write = (() => true) as typeof process.stdout.write;
+    try {
+      const code = await sessionKillCommand(undefined, [], "all", makeDeps(), { all: true, yes: true });
+      expect(code).toBe(0);
+      expect(tmuxMocks.multiselect).not.toHaveBeenCalled();
+      expect(tmuxMocks.confirm).not.toHaveBeenCalled();
       expect(tmuxMocks.killSession).toHaveBeenCalledTimes(2);
     } finally {
       process.stdout.write = origWrite;

package/src/commands/cli/session.ts

@@ -7,7 +7,7 @@
  * tmux directly.
  */
 
-import { select, confirm, isCancel, cancel } from "@clack/prompts";
+import { select, multiselect, confirm, isCancel, cancel } from "@clack/prompts";
 import { createPainter, type PaletteKey } from "../../theme/colors.ts";
 import {
   listSessions as _listSessions,
@@ -40,6 +40,8 @@ export interface SessionDeps {
   killSession: (name: string) => void;
   /** Prompt function for the session picker — defaults to @clack/prompts select. */
   select: typeof select;
+  /** Prompt function for the session kill picker — defaults to @clack/prompts multiselect. */
+  multiselect: typeof multiselect;
   /** Prompt function for yes/no confirmations — defaults to @clack/prompts confirm. */
   confirm: typeof confirm;
   isCancel: typeof isCancel;
@@ -57,6 +59,7 @@ const defaultDeps: SessionDeps = {
   detachAndAttachAtomic: _detachAndAttachAtomic,
   killSession: _killSession,
   select,
+  multiselect,
   confirm,
   isCancel,
 };
@@ -273,10 +276,13 @@ export async function sessionPickerCommand(agents: string[] = [], scope: Session
 // ─── Session kill command ────────────────────────────────────────────────────
 
 /**
- * Kill a named session or all sessions matching the given scope and agents.
+ * Kill a named session or selected sessions matching the given scope and agents.
  *
  * - If `sessionId` is provided: confirm and kill that one session.
- * - If `sessionId` is omitted: confirm and kill all sessions in scope.
+ * - If `sessionId` is omitted: pick sessions with a checkbox multi-select,
+ *   then confirm and kill the selected sessions.
+ * - If `all: true` and `sessionId` is omitted: preselect every matching
+ *   session and only ask for confirmation unless `yes: true` is also set.
  *
  * Pass `yes: true` (the `-y/--yes` flag on the CLI) to skip the
  * confirmation prompt — useful for orchestrating agents that need to
@@ -287,9 +293,10 @@ export async function sessionKillCommand(
   agents: string[] = [],
   scope: SessionScope = "all",
   deps: SessionDeps = defaultDeps,
-  options: { yes?: boolean } = {},
+  options: { yes?: boolean; all?: boolean } = {},
 ): Promise<number> {
   const skipConfirm = options.yes === true;
+  const selectAll = options.all === true;
   const paint = createPainter();
 
   if (!deps.isTmuxInstalled()) {
@@ -351,7 +358,7 @@ export async function sessionKillCommand(
     return 0;
   }
 
-  // ── Kill-all path ─────────────────────────────────────────────────────────
+  // ── Multi-kill path ───────────────────────────────────────────────────────
   const targets = filterByAgent(filterByScope(deps.listSessions(), scope), agents);
 
   if (targets.length === 0) {
@@ -359,12 +366,29 @@ export async function sessionKillCommand(
     return 0;
   }
 
-  const noun = targets.length === 1 ? "session" : "sessions";
+  const selectedNames = selectAll
+    ? targets.map((t) => t.name)
+    : await selectSessionsToKill(targets, deps);
+
+  if (deps.isCancel(selectedNames)) {
+    cancel("Cancelled.");
+    return 0;
+  }
+
+  if (selectedNames.length === 0) {
+    process.stdout.write(
+      "\n  " + paint("dim", "No sessions selected.") + "\n\n",
+    );
+    return 0;
+  }
+
+  const selectedTargets = targets.filter((t) => selectedNames.includes(t.name));
+  const noun = selectedTargets.length === 1 ? "session" : "sessions";
   const scopePrefix = scope === "all" ? "" : `${scope} `;
   const answer = skipConfirm
     ? true
     : await deps.confirm({
-        message: `Kill all ${targets.length} ${scopePrefix}${noun}?`,
+        message: `Kill ${selectedTargets.length} ${scopePrefix}${noun}?`,
         initialValue: false,
       });
 
@@ -374,11 +398,11 @@ export async function sessionKillCommand(
   }
 
   if (answer === true) {
-    for (const t of targets) {
+    for (const t of selectedTargets) {
       deps.killSession(t.name);
     }
     process.stdout.write(
-      "\n  " + paint("success", "✓") + " killed " + paint("text", String(targets.length)) + " " + paint("dim", noun) + "\n\n",
+      "\n  " + paint("success", "✓") + " killed " + paint("text", String(selectedTargets.length)) + " " + paint("dim", noun) + "\n\n",
     );
     return 0;
   }
@@ -389,3 +413,35 @@ export async function sessionKillCommand(
   );
   return 0;
 }
+
+const SELECT_ALL_SESSIONS = "__atomic_select_all_sessions__";
+
+async function selectSessionsToKill(
+  targets: TmuxSession[],
+  deps: SessionDeps,
+): Promise<string[] | symbol> {
+  const selected = await deps.multiselect({
+    message: "Select sessions to kill (Space toggles, Enter continues)",
+    options: [
+      {
+        value: SELECT_ALL_SESSIONS,
+        label: "All matching sessions",
+        hint: `selects ${targets.length}`,
+      },
+      ...targets.map((s) => {
+        const age = formatAge(s.created);
+        const tag = s.attached ? "attached" : undefined;
+        return {
+          value: s.name,
+          label: s.name,
+          hint: tag ? `${age}, ${tag}` : age,
+        };
+      }),
+    ],
+    required: false,
+  });
+
+  if (deps.isCancel(selected)) return selected;
+  if (selected.includes(SELECT_ALL_SESSIONS)) return targets.map((t) => t.name);
+  return selected;
+}

package/src/completions/fish.ts

@@ -86,10 +86,12 @@ complete -c atomic -n '__atomic_using_cmd chat; and not __fish_seen_subcommand_f
 # chat session
 complete -c atomic -n '__atomic_using_cmd chat session; and not __fish_seen_subcommand_from list connect kill' -a list -d 'List running sessions'
 complete -c atomic -n '__atomic_using_cmd chat session; and not __fish_seen_subcommand_from list connect kill' -a connect -d 'Attach to a running session'
-complete -c atomic -n '__atomic_using_cmd chat session; and not __fish_seen_subcommand_from list connect kill' -a kill -d 'Kill a running session (omit id to kill all)'
+complete -c atomic -n '__atomic_using_cmd chat session; and not __fish_seen_subcommand_from list connect kill' -a kill -d 'Kill running sessions'
 complete -c atomic -n '__atomic_using_cmd chat session list' -s a -l agent -d 'Filter by agent' -r -a "$agents"
 complete -c atomic -n '__atomic_using_cmd chat session connect' -s a -l agent -d 'Filter by agent' -r -a "$agents"
 complete -c atomic -n '__atomic_using_cmd chat session kill' -s a -l agent -d 'Filter by agent' -r -a "$agents"
+complete -c atomic -n '__atomic_using_cmd chat session kill' -l all -d 'Select all matching sessions'
+complete -c atomic -n '__atomic_using_cmd chat session kill' -s y -l yes -d 'Skip confirmation prompt'
 
 # ── workflow ────────────────────────────────────────────────────────────────
 
@@ -104,19 +106,23 @@ complete -c atomic -n '__atomic_using_cmd workflow list' -s a -l agent -d 'Filte
 # workflow session
 complete -c atomic -n '__atomic_using_cmd workflow session; and not __fish_seen_subcommand_from list connect kill' -a list -d 'List running sessions'
 complete -c atomic -n '__atomic_using_cmd workflow session; and not __fish_seen_subcommand_from list connect kill' -a connect -d 'Attach to a running session'
-complete -c atomic -n '__atomic_using_cmd workflow session; and not __fish_seen_subcommand_from list connect kill' -a kill -d 'Kill a running session (omit id to kill all)'
+complete -c atomic -n '__atomic_using_cmd workflow session; and not __fish_seen_subcommand_from list connect kill' -a kill -d 'Kill running sessions'
 complete -c atomic -n '__atomic_using_cmd workflow session list' -s a -l agent -d 'Filter by agent' -r -a "$agents"
 complete -c atomic -n '__atomic_using_cmd workflow session connect' -s a -l agent -d 'Filter by agent' -r -a "$agents"
 complete -c atomic -n '__atomic_using_cmd workflow session kill' -s a -l agent -d 'Filter by agent' -r -a "$agents"
+complete -c atomic -n '__atomic_using_cmd workflow session kill' -l all -d 'Select all matching sessions'
+complete -c atomic -n '__atomic_using_cmd workflow session kill' -s y -l yes -d 'Skip confirmation prompt'
 
 # ── session (top-level) ────────────────────────────────────────────────────
 
 complete -c atomic -n '__atomic_using_cmd session; and not __fish_seen_subcommand_from list connect kill' -a list -d 'List running sessions'
 complete -c atomic -n '__atomic_using_cmd session; and not __fish_seen_subcommand_from list connect kill' -a connect -d 'Attach to a running session'
-complete -c atomic -n '__atomic_using_cmd session; and not __fish_seen_subcommand_from list connect kill' -a kill -d 'Kill a running session (omit id to kill all)'
+complete -c atomic -n '__atomic_using_cmd session; and not __fish_seen_subcommand_from list connect kill' -a kill -d 'Kill running sessions'
 complete -c atomic -n '__atomic_using_cmd session list' -s a -l agent -d 'Filter by agent' -r -a "$agents"
 complete -c atomic -n '__atomic_using_cmd session connect' -s a -l agent -d 'Filter by agent' -r -a "$agents"
 complete -c atomic -n '__atomic_using_cmd session kill' -s a -l agent -d 'Filter by agent' -r -a "$agents"
+complete -c atomic -n '__atomic_using_cmd session kill' -l all -d 'Select all matching sessions'
+complete -c atomic -n '__atomic_using_cmd session kill' -s y -l yes -d 'Skip confirmation prompt'
 
 # ── config ──────────────────────────────────────────────────────────────────
 

package/src/completions/powershell.ts

@@ -80,7 +80,15 @@ Register-ArgumentCompleter -Native -CommandName atomic -ScriptBlock {
                             $completions = @(
                                 @{ text = 'list';    tip = 'List running sessions' }
                                 @{ text = 'connect'; tip = 'Attach to a running session' }
-                                @{ text = 'kill';    tip = 'Kill a running session (omit id to kill all)' }
+                                @{ text = 'kill';    tip = 'Kill running sessions' }
+                            )
+                        } elseif ($cmds.Count -ge 3 -and $cmds[2] -eq 'kill') {
+                            $completions = @(
+                                @{ text = '-a';      tip = 'Filter by agent' }
+                                @{ text = '--agent'; tip = 'Filter by agent' }
+                                @{ text = '--all';   tip = 'Select all matching sessions' }
+                                @{ text = '-y';      tip = 'Skip confirmation prompt' }
+                                @{ text = '--yes';   tip = 'Skip confirmation prompt' }
                             )
                         } else {
                             $completions = @(
@@ -110,7 +118,15 @@ Register-ArgumentCompleter -Native -CommandName atomic -ScriptBlock {
                             $completions = @(
                                 @{ text = 'list';    tip = 'List running sessions' }
                                 @{ text = 'connect'; tip = 'Attach to a running session' }
-                                @{ text = 'kill';    tip = 'Kill a running session (omit id to kill all)' }
+                                @{ text = 'kill';    tip = 'Kill running sessions' }
+                            )
+                        } elseif ($cmds.Count -ge 3 -and $cmds[2] -eq 'kill') {
+                            $completions = @(
+                                @{ text = '-a';      tip = 'Filter by agent' }
+                                @{ text = '--agent'; tip = 'Filter by agent' }
+                                @{ text = '--all';   tip = 'Select all matching sessions' }
+                                @{ text = '-y';      tip = 'Skip confirmation prompt' }
+                                @{ text = '--yes';   tip = 'Skip confirmation prompt' }
                             )
                         } else {
                             $completions = @(
@@ -125,7 +141,15 @@ Register-ArgumentCompleter -Native -CommandName atomic -ScriptBlock {
                         $completions = @(
                             @{ text = 'list';    tip = 'List running sessions' }
                             @{ text = 'connect'; tip = 'Attach to a running session' }
-                            @{ text = 'kill';    tip = 'Kill a running session (omit id to kill all)' }
+                            @{ text = 'kill';    tip = 'Kill running sessions' }
+                        )
+                    } elseif ($cmds.Count -ge 2 -and $cmds[1] -eq 'kill') {
+                        $completions = @(
+                            @{ text = '-a';      tip = 'Filter by agent' }
+                            @{ text = '--agent'; tip = 'Filter by agent' }
+                            @{ text = '--all';   tip = 'Select all matching sessions' }
+                            @{ text = '-y';      tip = 'Skip confirmation prompt' }
+                            @{ text = '--yes';   tip = 'Skip confirmation prompt' }
                         )
                     } else {
                         $completions = @(

package/src/completions/zsh.ts

@@ -123,17 +123,24 @@ _atomic_session() {
             local -a subs=(
                 'list:List running sessions'
                 'connect:Attach to a running session'
-                'kill:Kill a running session (omit id to kill all)'
+                'kill:Kill running sessions'
             )
             _describe 'subcommand' subs
             ;;
         subargs)
             case "\${words[1]}" in
-                list|connect|kill)
+                list|connect)
                     _arguments \\
                         '*'{-a,--agent}'[Filter by agent]:agent:(claude opencode copilot)' \\
                         '(-h --help)'{-h,--help}'[Show help]'
                     ;;
+                kill)
+                    _arguments \\
+                        '*'{-a,--agent}'[Filter by agent]:agent:(claude opencode copilot)' \\
+                        '--all[Select all matching sessions]' \\
+                        '(-y --yes)'{-y,--yes}'[Skip confirmation prompt]' \\
+                        '(-h --help)'{-h,--help}'[Show help]'
+                    ;;
             esac
             ;;
     esac

package/src/sdk/components/compact-switcher.tsx

@@ -44,6 +44,9 @@ export function CompactSwitcher({ selectedIndex }: CompactSwitcherProps) {
         const isSelected = i === selectedIndex;
         const icon = statusIcon(agent.status);
         const iconColor = statusColor(agent.status, theme);
+        const rowBackground = isSelected
+          ? lerpColor(theme.backgroundElement, theme.primary, 0.12)
+          : theme.backgroundElement;
         const duration =
           agent.startedAt !== null
             ? fmtDuration((agent.endedAt ?? Date.now()) - agent.startedAt)
@@ -56,15 +59,17 @@ export function CompactSwitcher({ selectedIndex }: CompactSwitcherProps) {
             flexDirection="row"
             paddingLeft={1}
             paddingRight={1}
-            backgroundColor={isSelected ? lerpColor(theme.backgroundElement, theme.primary, 0.12) : theme.backgroundElement}
+            backgroundColor={rowBackground}
           >
             <text>
-              <span fg={theme.textDim}>{String(i + 1).padStart(2)} </span>
-              <span fg={iconColor}>{icon} </span>
-              <span fg={isSelected ? theme.text : theme.textMuted}>{agent.name}</span>
+              <span fg={theme.textDim} bg={rowBackground}>{String(i + 1).padStart(2)} </span>
+              <span fg={iconColor} bg={rowBackground}>{icon} </span>
+              <span fg={isSelected ? theme.text : theme.textMuted} bg={rowBackground}>{agent.name}</span>
             </text>
             <box flexGrow={1} />
-            <text fg={theme.textDim}>{duration}</text>
+            <text>
+              <span fg={theme.textDim} bg={rowBackground}>{duration}</span>
+            </text>
           </box>
         );
       })}

package/src/sdk/components/connectors.ts

@@ -10,6 +10,7 @@ export interface ConnectorResult {
   width: number;
   height: number;
   color: string;
+  backgroundColor: string;
 }
 
 /** Fan-out connector: one parent branching down to one or more tree children. */
@@ -39,6 +40,7 @@ export function buildConnector(
       width: 1,
       height: numRows,
       color: theme.borderActive,
+      backgroundColor: theme.background,
     };
   }
 
@@ -85,6 +87,7 @@ export function buildConnector(
     width,
     height: numRows,
     color: theme.borderActive,
+    backgroundColor: theme.background,
   };
 }
 
@@ -152,5 +155,6 @@ export function buildMergeConnector(
     width,
     height: numRows,
     color: theme.borderActive,
+    backgroundColor: theme.background,
   };
 }

package/src/sdk/components/edge.tsx

@@ -2,10 +2,12 @@
 
 import type { ConnectorResult } from "./connectors.ts";
 
-export function Edge({ text, col, row, width, height, color: edgeColor }: ConnectorResult) {
+export function Edge({ text, col, row, width, height, color: edgeColor, backgroundColor }: ConnectorResult) {
   return (
-    <box position="absolute" left={col} top={row} width={width} height={height}>
-      <text fg={edgeColor}>{text}</text>
+    <box position="absolute" left={col} top={row} width={width} height={height} backgroundColor={backgroundColor}>
+      <text>
+        <span fg={edgeColor} bg={backgroundColor}>{text}</span>
+      </text>
     </box>
   );
 }

package/src/sdk/components/graph-theme.ts

@@ -1,7 +1,6 @@
 // ─── Graph Theme ──────────────────────────────────
 
 import type { TerminalTheme } from "../runtime/theme.ts";
-import { lerpColor } from "./color-utils.ts";
 
 export interface GraphTheme {
   background: string;
@@ -24,13 +23,13 @@ export function deriveGraphTheme(t: TerminalTheme): GraphTheme {
     background: t.bg,
     backgroundElement: t.surface,
     text: t.text,
-    textMuted: lerpColor(t.text, t.bg, 0.3),
+    textMuted: t.textMuted,
     textDim: t.dim,
     primary: t.accent,
     success: t.success,
     error: t.error,
     warning: t.warning,
-    info: t.accent,
+    info: t.info,
     mauve: t.mauve,
     border: t.borderDim,
     borderActive: t.border,

package/src/sdk/components/header.tsx

@@ -9,11 +9,21 @@ import {
   TmuxSessionContext,
 } from "./orchestrator-panel-contexts.ts";
 
-function CountBadge({ color, icon, count }: { color: string; icon: string; count: number }) {
+function CountBadge({
+  color,
+  icon,
+  count,
+  backgroundColor,
+}: {
+  color: string;
+  icon: string;
+  count: number;
+  backgroundColor: string;
+}) {
   if (count <= 0) return null;
   return (
     <text>
-      <span fg={color}>{icon} {count}</span>
+      <span fg={color} bg={backgroundColor}>{icon} {count}</span>
     </text>
   );
 }
@@ -55,18 +65,20 @@ export function Header() {
 
       {tmuxSession ? (
         <box paddingLeft={1} alignItems="center">
-          <text fg={theme.text}>
-            <strong>{tmuxSession}</strong>
+          <text>
+            <span fg={theme.text} bg={theme.backgroundElement}>
+              <strong>{tmuxSession}</strong>
+            </span>
           </text>
         </box>
       ) : null}
 
       <box flexGrow={1} justifyContent="flex-end" flexDirection="row" gap={2}>
-        <CountBadge color={theme.success} icon={"\u2713"} count={counts.complete} />
-        <CountBadge color={theme.warning} icon={"\u25CF"} count={counts.running} />
-        <CountBadge color={theme.info} icon={"?"} count={counts.awaiting_input} />
-        <CountBadge color={theme.textDim} icon={"\u25CB"} count={counts.pending} />
-        <CountBadge color={theme.error} icon={"\u2717"} count={counts.error} />
+        <CountBadge color={theme.success} backgroundColor={theme.backgroundElement} icon={"\u2713"} count={counts.complete} />
+        <CountBadge color={theme.warning} backgroundColor={theme.backgroundElement} icon={"\u25CF"} count={counts.running} />
+        <CountBadge color={theme.info} backgroundColor={theme.backgroundElement} icon={"?"} count={counts.awaiting_input} />
+        <CountBadge color={theme.textDim} backgroundColor={theme.backgroundElement} icon={"\u25CB"} count={counts.pending} />
+        <CountBadge color={theme.error} backgroundColor={theme.backgroundElement} icon={"\u2717"} count={counts.error} />
       </box>
     </box>
   );

package/src/sdk/components/node-card.tsx

@@ -28,12 +28,12 @@ export const NodeCard = React.memo(function NodeCard({
   if (isRunning) {
     const t = (Math.sin((pulsePhase / 32) * Math.PI * 2 - Math.PI / 2) + 1) / 2;
     borderCol = focused
-      ? lerpColor(theme.warning, "#ffffff", 0.2)
+      ? lerpColor(theme.warning, theme.text, 0.2)
       : lerpColor(theme.border, theme.warning, t);
   } else if (isAwaitingInput) {
     const t = (Math.sin((pulsePhase / 32) * Math.PI * 2 - Math.PI / 2) + 1) / 2;
     borderCol = focused
-      ? lerpColor(theme.info, "#ffffff", 0.2)
+      ? lerpColor(theme.info, theme.text, 0.2)
       : lerpColor(theme.border, theme.info, t);
   } else if (isPending) {
     borderCol = focused ? sc : theme.borderActive;
@@ -41,8 +41,8 @@ export const NodeCard = React.memo(function NodeCard({
     borderCol = sc;
   }
 
-  // Background: focused nodes get a subtle status-colored tint
-  const bgCol = focused ? lerpColor(theme.background, sc, 0.12) : "transparent";
+  // Keep the card interior aligned with the graph canvas; status color belongs to the border/text.
+  const bgCol = theme.background;
 
   // Duration computed live from start/end timestamps
   const durCol = isPending ? theme.textDim : sc;
@@ -68,15 +68,21 @@ export const NodeCard = React.memo(function NodeCard({
       titleAlignment="center"
     >
       <box alignItems="center">
-        <text fg={durCol}>{duration}</text>
+        <text>
+          <span fg={durCol} bg={bgCol}>{duration}</span>
+        </text>
       </box>
       {isAwaitingInput && (
         <>
           <box alignItems="center">
-            <text fg={theme.info}>waiting for response</text>
+            <text>
+              <span fg={theme.info} bg={bgCol}>waiting for response</span>
+            </text>
           </box>
           <box alignItems="center">
-            <text fg={theme.textDim}>↵ enter to respond</text>
+            <text>
+              <span fg={theme.textDim} bg={bgCol}>↵ enter to respond</span>
+            </text>
           </box>
         </>
       )}