@bastani/atomic 0.5.18 → 0.5.19

package/src/commands/cli/init/index.ts

@@ -1,106 +1,23 @@
 /**
  * Automatic project setup — replaces the interactive `atomic init` command.
  *
- * Detects the repo's SCM, applies onboarding files (MCP configs, settings),
- * registers the workspace as trusted, and installs SCM-specific skills.
- *
- * Called transparently during `atomic chat` preflight so users never need
- * to think about initialization.
+ * Applies onboarding files (MCP configs, settings). Called transparently
+ * during `atomic chat` preflight so users never need to think about
+ * initialization.
  */
 
-import { join, resolve } from "node:path";
-import {
-  AGENT_CONFIG,
-  type AgentKey,
-  type SourceControlType,
-  SCM_SKILLS_BY_TYPE,
-  detectScmType,
-} from "../../../services/config/index.ts";
-import { pathExists } from "../../../services/system/copy.ts";
+import type { AgentKey } from "../../../services/config/index.ts";
 import { getConfigRoot } from "../../../services/config/config-path.ts";
-import { getTemplateAgentFolder } from "../../../services/config/atomic-global-config.ts";
-import { upsertTrustedWorkspacePath } from "../../../services/config/settings.ts";
 import { applyManagedOnboardingFiles } from "./onboarding.ts";
-import { installLocalScmSkills, syncProjectScmSkills } from "./scm.ts";
 
 /**
- * Check whether all expected SCM skills are already present on disk.
- */
-async function areScmSkillsInstalled(
-  agentKey: AgentKey,
-  projectRoot: string,
-  scmType: SourceControlType,
-): Promise<boolean> {
-  const skillNames = SCM_SKILLS_BY_TYPE[scmType];
-  const skillsDir = join(projectRoot, AGENT_CONFIG[agentKey].folder, "skills");
-
-  for (const name of skillNames) {
-    if (!(await pathExists(join(skillsDir, name)))) {
-      return false;
-    }
-  }
-  return true;
-}
-
-function isInstalledPackage(): boolean {
-  return import.meta.dir.includes("node_modules");
-}
-
-/**
- * Ensure the project is configured for the given agent.
- *
- * Idempotent — safe to call on every `atomic chat` invocation. Expensive
- * operations (skill installation via `bunx skills add`) are skipped when
- * the skills are already present on disk. Onboarding file merges are
- * always applied since they are cheap and self-healing.
- *
- * Errors in skill installation are swallowed so the agent can still launch.
+ * Ensure the project is configured for the given agent. Idempotent — safe
+ * to call on every `atomic chat` invocation.
  */
 export async function ensureProjectSetup(
   agentKey: AgentKey,
   projectRoot: string,
 ): Promise<void> {
   const configRoot = getConfigRoot();
-  const detectedScm = await detectScmType(projectRoot);
-
-  // Apply onboarding files (idempotent merge, SCM-gated entries handled internally)
   await applyManagedOnboardingFiles(agentKey, projectRoot, configRoot);
-
-  // Register trusted workspace
-  await upsertTrustedWorkspacePath(resolve(projectRoot), agentKey);
-
-  // Install SCM skills if detected and not yet present (best-effort)
-  if (detectedScm) {
-    try {
-      const alreadyInstalled = await areScmSkillsInstalled(
-        agentKey,
-        projectRoot,
-        detectedScm,
-      );
-      if (!alreadyInstalled) {
-        if (isInstalledPackage()) {
-          // npm/bunx install: fetch via the skills CLI
-          await installLocalScmSkills({
-            scmType: detectedScm,
-            agentKey,
-            cwd: projectRoot,
-          });
-        } else {
-          // Source checkout: copy from bundled templates
-          const templateFolder = getTemplateAgentFolder(agentKey);
-          await syncProjectScmSkills({
-            scmType: detectedScm,
-            sourceSkillsDir: join(configRoot, templateFolder, "skills"),
-            targetSkillsDir: join(
-              projectRoot,
-              AGENT_CONFIG[agentKey].folder,
-              "skills",
-            ),
-          });
-        }
-      }
-    } catch {
-      // Skills installation is best-effort — don't block the agent launch
-    }
-  }
 }

package/src/commands/cli/workflow-command.test.ts

@@ -174,13 +174,19 @@ function captureOutput(): CapturedOutput {
 // so the env var must already be set by the time workflow.ts gets imported.
 
 let originalNoColor: string | undefined;
+let originalAtomicAgent: string | undefined;
 beforeAll(() => {
   originalNoColor = process.env.NO_COLOR;
   process.env.NO_COLOR = "1";
+  // Snapshot once so tests can freely set/unset ATOMIC_AGENT without
+  // leaking into unrelated suites in the same bun-test process.
+  originalAtomicAgent = process.env.ATOMIC_AGENT;
 });
 afterAll(() => {
   if (originalNoColor === undefined) delete process.env.NO_COLOR;
   else process.env.NO_COLOR = originalNoColor;
+  if (originalAtomicAgent === undefined) delete process.env.ATOMIC_AGENT;
+  else process.env.ATOMIC_AGENT = originalAtomicAgent;
 });
 
 // ─── Temp workspace plumbing ────────────────────────────────────────────────
@@ -192,6 +198,12 @@ let tempDir: string;
 
 beforeEach(async () => {
   tempDir = await mkdtemp(join(tmpdir(), "atomic-workflow-cmd-test-"));
+  // Clear ATOMIC_AGENT by default — `workflowCommand` falls back to this
+  // env var when `-a` is omitted, and we don't want the ambient env (e.g.
+  // a developer running tests from inside an atomic chat pane) to silently
+  // change the agent any given test sees. Tests that need it explicitly
+  // set it themselves.
+  delete process.env.ATOMIC_AGENT;
   // Reset every mock to its default pass-through / no-op so tests are
   // independent — no leftover state from prior overrides. `mockClear` wipes
   // call history; `mockImplementation` replaces the queued implementation
@@ -634,6 +646,41 @@ describe("workflowCommand named-mode success paths", () => {
     expect(executeWorkflowMock.mock.calls[0]![0].inputs).toEqual({});
   });
 
+  test("detach flag is threaded through to the executor", async () => {
+    await writeCompiledWorkflow({ name: "detached", agent: "copilot" });
+
+    const cap = captureOutput();
+    const code = await workflowCommand({
+      name: "detached",
+      agent: "copilot",
+      detach: true,
+      passthroughArgs: ["run", "in", "bg"],
+      cwd: tempDir,
+    });
+    cap.restore();
+
+    expect(code).toBe(0);
+    expect(executeWorkflowMock).toHaveBeenCalledTimes(1);
+    expect(executeWorkflowMock.mock.calls[0]![0].detach).toBe(true);
+  });
+
+  test("detach defaults to false when not provided", async () => {
+    await writeCompiledWorkflow({ name: "default-attach", agent: "copilot" });
+
+    const cap = captureOutput();
+    const code = await workflowCommand({
+      name: "default-attach",
+      agent: "copilot",
+      passthroughArgs: [],
+      cwd: tempDir,
+    });
+    cap.restore();
+
+    expect(code).toBe(0);
+    expect(executeWorkflowMock).toHaveBeenCalledTimes(1);
+    expect(executeWorkflowMock.mock.calls[0]![0].detach).toBe(false);
+  });
+
   test("structured workflow resolves flags and calls executor with merged inputs", async () => {
     await writeCompiledWorkflow({
       name: "struct-run",
@@ -714,6 +761,105 @@ export default defineWorkflow({
   });
 });
 
+// ─── ATOMIC_AGENT env var inference ────────────────────────────────────────
+
+describe("workflowCommand ATOMIC_AGENT inference", () => {
+  // Top-level beforeEach already clears ATOMIC_AGENT; tests that need it
+  // set it explicitly and rely on the next test's clear to reset.
+
+  test("infers -a from ATOMIC_AGENT when omitted", async () => {
+    // Agents spawned inside an atomic chat/workflow pane inherit
+    // ATOMIC_AGENT. Re-passing their own provider back through `-a` is
+    // boilerplate we can eliminate.
+    await writeCompiledWorkflow({ name: "inferred", agent: "claude" });
+    process.env.ATOMIC_AGENT = "claude";
+
+    const cap = captureOutput();
+    const code = await workflowCommand({
+      name: "inferred",
+      // no agent passed
+      passthroughArgs: ["go"],
+      cwd: tempDir,
+    });
+    cap.restore();
+
+    expect(code).toBe(0);
+    expect(executeWorkflowMock).toHaveBeenCalledTimes(1);
+    expect(executeWorkflowMock.mock.calls[0]![0].agent).toBe("claude");
+  });
+
+  test("forces detach=true when ATOMIC_AGENT is set", async () => {
+    // Attaching from inside the atomic socket would switch-client the
+    // caller's own terminal onto the new workflow session — hijacking the
+    // very pane the agent is running in. Force detach so the command
+    // returns immediately and the caller can attach on their own terms.
+    await writeCompiledWorkflow({ name: "auto-detach", agent: "copilot" });
+    process.env.ATOMIC_AGENT = "copilot";
+
+    const cap = captureOutput();
+    const code = await workflowCommand({
+      name: "auto-detach",
+      agent: "copilot",
+      // detach intentionally omitted
+      passthroughArgs: [],
+      cwd: tempDir,
+    });
+    cap.restore();
+
+    expect(code).toBe(0);
+    expect(executeWorkflowMock.mock.calls[0]![0].detach).toBe(true);
+  });
+
+  test("explicit -a wins over ATOMIC_AGENT", async () => {
+    // Users running on Claude who want to invoke a Copilot workflow must
+    // be able to override — the env var is a fallback, not a pin.
+    await writeCompiledWorkflow({ name: "override", agent: "copilot" });
+    process.env.ATOMIC_AGENT = "claude";
+
+    const cap = captureOutput();
+    const code = await workflowCommand({
+      name: "override",
+      agent: "copilot",
+      passthroughArgs: [],
+      cwd: tempDir,
+    });
+    cap.restore();
+
+    expect(code).toBe(0);
+    expect(executeWorkflowMock.mock.calls[0]![0].agent).toBe("copilot");
+  });
+
+  test("no ATOMIC_AGENT + no -a still errors", async () => {
+    // Baseline: outside an atomic session, `-a` is still required.
+    const cap = captureOutput();
+    const code = await workflowCommand({
+      name: "anything",
+      cwd: tempDir,
+    });
+    cap.restore();
+
+    expect(code).toBe(1);
+    expect(cap.stderr).toContain("Missing agent");
+  });
+
+  test("empty ATOMIC_AGENT is treated as unset", async () => {
+    // Shells sometimes export empty strings; don't let that poison the
+    // agent fallback with an empty value that fails validation with a
+    // misleading "unknown agent ''" message.
+    process.env.ATOMIC_AGENT = "";
+
+    const cap = captureOutput();
+    const code = await workflowCommand({
+      name: "anything",
+      cwd: tempDir,
+    });
+    cap.restore();
+
+    expect(code).toBe(1);
+    expect(cap.stderr).toContain("Missing agent");
+  });
+});
+
 // ─── Prereq checks (runPrereqChecks) ───────────────────────────────────────
 
 describe("workflowCommand prereq checks", () => {

package/src/commands/cli/workflow.ts

@@ -6,6 +6,7 @@
  *   atomic workflow -n <name> -a <agent> <prompt>  free-form workflow
  *   atomic workflow -n <name> -a <agent> --<field>=<value> ...
  *                                                  structured-input workflow
+ *   atomic workflow -n <name> -a <agent> -d <args> run detached (background)
  *   atomic workflow list [-a <agent>]              list discoverable workflows
  */
 
@@ -174,6 +175,12 @@ export async function workflowCommand(options: {
   name?: string;
   agent?: string;
   list?: boolean;
+  /**
+   * When true, create the tmux session and return immediately without
+   * attaching. Callers can use `atomic workflow session connect <id>`
+   * to attach later. Useful for scripting / background automation.
+   */
+  detach?: boolean;
   /**
    * Everything commander parked in `cmd.args` — a mix of positional
    * prompt tokens and unknown `--<name>` flags that the
@@ -191,6 +198,23 @@ export async function workflowCommand(options: {
   const passthroughArgs = options.passthroughArgs ?? [];
   const cwd = options.cwd;
 
+  // `ATOMIC_AGENT` is set by `atomic chat` and `atomic workflow` on the tmux
+  // session they create, so every pane in that session inherits it. Its
+  // presence is a reliable signal that this command is being invoked from
+  // inside an atomic-managed session (i.e., the caller is an agent running
+  // in a chat or a workflow pane rather than a plain shell). We use that in
+  // two places:
+  //   1. If `-a` was omitted, fall back to ATOMIC_AGENT so agents don't have
+  //      to pass their own provider back to themselves.
+  //   2. Force `detach = true`, because attaching from inside the atomic
+  //      socket would `switch-client` the caller's own terminal onto the new
+  //      session — i.e., the agent would hijack the user's view. Detach is
+  //      always the safe choice here; the CLI prints attach hints so the
+  //      user can switch to the workflow whenever they want.
+  const atomicAgentEnv = process.env.ATOMIC_AGENT;
+  const insideAtomicSession = atomicAgentEnv !== undefined && atomicAgentEnv !== "";
+  const detach = insideAtomicSession ? true : (options.detach ?? false);
+
   // ── List mode ──
   // `merge: false` keeps local and global entries independent so the
   // list can show both copies of a non-reserved name when they coexist
@@ -211,7 +235,11 @@ export async function workflowCommand(options: {
   }
 
   // ── Agent validation (required for every non-list branch) ──
-  if (!options.agent) {
+  // Explicit `-a` wins; otherwise fall back to the ATOMIC_AGENT env var so
+  // workflows launched from inside an atomic chat/workflow session don't
+  // need to re-specify the provider they're already running under.
+  const agentInput = options.agent ?? atomicAgentEnv;
+  if (!agentInput) {
     console.error(
       `${COLORS.red}Error: Missing agent. Use -a <agent>.${COLORS.reset}`,
     );
@@ -219,14 +247,14 @@ export async function workflowCommand(options: {
   }
 
   const validAgents = Object.keys(AGENT_CONFIG);
-  if (!validAgents.includes(options.agent)) {
+  if (!validAgents.includes(agentInput)) {
     console.error(
-      `${COLORS.red}Error: Unknown agent '${options.agent}'.${COLORS.reset}`,
+      `${COLORS.red}Error: Unknown agent '${agentInput}'.${COLORS.reset}`,
     );
     console.error(`Valid agents: ${validAgents.join(", ")}`);
     return 1;
   }
-  const agent = options.agent as AgentKey;
+  const agent = agentInput as AgentKey;
 
   // ── Preflight checks (shared between picker and named modes) ──
   const preflightCode = await runPrereqChecks(agent);
@@ -234,11 +262,11 @@ export async function workflowCommand(options: {
 
   // ── Picker mode: -a <agent>, no -n ──
   if (!options.name) {
-    return runPickerMode(agent, passthroughArgs, cwd);
+    return runPickerMode(agent, passthroughArgs, cwd, detach);
   }
 
   // ── Named mode: -n <name> -a <agent> [args...] ──
-  return runNamedMode(options.name, agent, passthroughArgs, cwd);
+  return runNamedMode(options.name, agent, passthroughArgs, cwd, detach);
 }
 
 // ─── Shared helpers ─────────────────────────────────────────────────────────
@@ -313,6 +341,7 @@ async function runLoadedWorkflow(args: {
   agent: AgentKey;
   inputs: Record<string, string>;
   workflowFile: string;
+  detach: boolean;
 }): Promise<number> {
   try {
     await executeWorkflow({
@@ -320,6 +349,7 @@ async function runLoadedWorkflow(args: {
       agent: args.agent,
       inputs: args.inputs,
       workflowFile: args.workflowFile,
+      detach: args.detach,
     });
     return 0;
   } catch (error) {
@@ -341,6 +371,7 @@ async function runPickerMode(
   agent: AgentKey,
   passthroughArgs: string[],
   cwd: string | undefined,
+  detach: boolean,
 ): Promise<number> {
   if (passthroughArgs.length > 0) {
     console.error(
@@ -386,7 +417,7 @@ async function runPickerMode(
     return 0;
   }
 
-  return runResolvedSelection(result.workflow, agent, result.inputs);
+  return runResolvedSelection(result.workflow, agent, result.inputs, detach);
 }
 
 /**
@@ -399,6 +430,7 @@ async function runResolvedSelection(
   workflow: WorkflowWithMetadata,
   agent: AgentKey,
   inputs: Record<string, string>,
+  detach: boolean,
 ): Promise<number> {
   const loaded = await WorkflowLoader.loadWorkflow(workflow, {
     warn(warnings) {
@@ -417,6 +449,7 @@ async function runResolvedSelection(
     agent,
     inputs,
     workflowFile: workflow.path,
+    detach,
   });
 }
 
@@ -427,6 +460,7 @@ async function runNamedMode(
   agent: AgentKey,
   passthroughArgs: string[],
   cwd: string | undefined,
+  detach: boolean,
 ): Promise<number> {
   // Find the workflow
   const discovered = await findWorkflow(name, agent, cwd);
@@ -517,6 +551,7 @@ async function runNamedMode(
       agent,
       inputs: resolvedInputs,
       workflowFile: discovered.path,
+      detach,
     });
   }
 
@@ -543,6 +578,7 @@ async function runNamedMode(
     agent,
     inputs,
     workflowFile: discovered.path,
+    detach,
   });
 }
 

package/src/completions/bash.ts

@@ -10,7 +10,6 @@ _atomic_completions() {
 
     local commands="init chat workflow session config completions"
     local agents="claude opencode copilot"
-    local scms="github sapling"
     local global_opts="-y --yes --no-banner -v --version -h --help"
 
     # Walk the words to find the command chain (skip flags and their values)
@@ -19,8 +18,8 @@ _atomic_completions() {
     while [[ $i -lt $cword ]]; do
         local w="\${words[$i]}"
         case "$w" in
-            -a|--agent|-s|--scm|-n|--name) (( i++ )) ;;  # skip flag value
-            -*)                            ;;              # skip other flags
+            -a|--agent|-n|--name) (( i++ )) ;;  # skip flag value
+            -*)                   ;;              # skip other flags
             *)
                 if [[ -z "$cmd1" ]]; then cmd1="$w"
                 elif [[ -z "$cmd2" ]]; then cmd2="$w"
@@ -37,10 +36,6 @@ _atomic_completions() {
             COMPREPLY=( $(compgen -W "$agents" -- "$cur") )
             return
             ;;
-        -s|--scm)
-            COMPREPLY=( $(compgen -W "$scms" -- "$cur") )
-            return
-            ;;
     esac
 
     # Top-level (no subcommand yet)
@@ -51,7 +46,7 @@ _atomic_completions() {
 
     case "$cmd1" in
         init)
-            COMPREPLY=( $(compgen -W "-a --agent -s --scm -h --help" -- "$cur") )
+            COMPREPLY=( $(compgen -W "-a --agent -h --help" -- "$cur") )
             ;;
         chat)
             if [[ -z "$cmd2" ]]; then

package/src/completions/fish.ts

@@ -11,7 +11,6 @@ complete -c atomic -f
 # ── Helpers ─────────────────────────────────────────────────────────────────
 
 set -l agents claude opencode copilot
-set -l scms github sapling
 
 # Condition helpers — true when the command line matches a specific depth.
 # "__fish_seen_subcommand_from X" is true once token X has appeared.
@@ -36,7 +35,7 @@ function __atomic_using_cmd
                     set idx (math $idx + 1)
                     # Skip flag value for known value-flags
                     switch $tokens[(math $idx - 1)]
-                        case -a --agent -s --scm -n --name
+                        case -a --agent -n --name
                             set idx (math $idx + 1)
                     end
                 case '*'
@@ -78,7 +77,6 @@ complete -c atomic -n __atomic_no_subcommand -a completions -d 'Output shell com
 # ── init ────────────────────────────────────────────────────────────────────
 
 complete -c atomic -n '__atomic_using_cmd init' -s a -l agent -d 'Agent to configure' -r -a "$agents"
-complete -c atomic -n '__atomic_using_cmd init' -s s -l scm -d 'Source control system' -r -a "$scms"
 
 # ── chat ────────────────────────────────────────────────────────────────────
 

package/src/completions/powershell.ts

@@ -12,7 +12,6 @@ Register-ArgumentCompleter -Native -CommandName atomic -ScriptBlock {
         Where-Object { $_ -ne '' }
 
     $agents  = @('claude', 'opencode', 'copilot')
-    $scms    = @('github', 'sapling')
     $shells  = @('bash', 'zsh', 'fish', 'powershell')
 
     # Parse command chain, skipping flags and their values
@@ -23,7 +22,7 @@ Register-ArgumentCompleter -Native -CommandName atomic -ScriptBlock {
         $t = $tokens[$i]
         if ($skipNext) { $skipNext = $false; continue }
         if ($t -match '^-') {
-            if ($t -match '^(-a|--agent|-s|--scm|-n|--name)$') { $skipNext = $true }
+            if ($t -match '^(-a|--agent|-n|--name)$') { $skipNext = $true }
             $prevToken = $t
             continue
         }
@@ -47,19 +46,6 @@ Register-ArgumentCompleter -Native -CommandName atomic -ScriptBlock {
         }
         return
     }
-    if ($prevFullToken -match '^(-s|--scm)$' -or $lastToken -match '^(-s|--scm)$') {
-        if ($lastToken -match '^(-s|--scm)$') {
-            $scms | ForEach-Object {
-                [System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_)
-            }
-            return
-        }
-        $scms | Where-Object { $_ -like "$wordToComplete*" } | ForEach-Object {
-            [System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_)
-        }
-        return
-    }
-
     $completions = @()
 
     switch ($cmds.Count) {
@@ -80,8 +66,6 @@ Register-ArgumentCompleter -Native -CommandName atomic -ScriptBlock {
                     $completions = @(
                         @{ text = '-a';      tip = 'Agent to configure' }
                         @{ text = '--agent'; tip = 'Agent to configure' }
-                        @{ text = '-s';      tip = 'Source control system' }
-                        @{ text = '--scm';   tip = 'Source control system' }
                     )
                 }
                 'chat' {

package/src/completions/zsh.ts

@@ -8,7 +8,6 @@ export const zshCompletionScript = `
 
 _atomic() {
     local -a agents=('claude' 'opencode' 'copilot')
-    local -a scms=('github' 'sapling')
 
     _arguments -C \\
         '(-y --yes)'{-y,--yes}'[Auto-confirm all prompts]' \\
@@ -35,7 +34,6 @@ _atomic() {
                 init)
                     _arguments \\
                         '(-a --agent)'{-a,--agent}'[Agent to configure]:agent:(claude opencode copilot)' \\
-                        '(-s --scm)'{-s,--scm}'[Source control system]:scm:(github sapling)' \\
                         '(-h --help)'{-h,--help}'[Show help]'
                     ;;
                 chat)

package/src/scripts/bundle-configs.ts

@@ -25,14 +25,6 @@ const HOME = homedir();
 /** Source repo for the global skills install. */
 const SKILLS_REPO = "https://github.com/flora131/atomic.git";
 
-/** Skills excluded from the global install (VCS-specific commit/PR helpers). */
-const EXCLUDED_SKILLS = [
-  "gh-commit",
-  "gh-create-pr",
-  "sl-commit",
-  "sl-submit-diff",
-];
-
 /** Agent CLI flags accepted by `bunx skills`. */
 const AGENT_FLAGS = ["claude-code", "opencode", "github-copilot"];
 
@@ -62,11 +54,7 @@ async function installGlobalSkills(): Promise<void> {
   console.log("Installing global skills…");
 
   const agentArgs = AGENT_FLAGS.flatMap((a) => ["-a", a]);
-
   await $`bunx skills add ${SKILLS_REPO} --skill "*" -g ${agentArgs} -y`;
-
-  const removeArgs = EXCLUDED_SKILLS.flatMap((s) => ["--skill", s]);
-  await $`bunx skills remove ${removeArgs} -g ${agentArgs} -y`;
 }
 
 async function copyBundledAgents(): Promise<void> {

package/src/sdk/components/attached-statusline.tsx

@@ -0,0 +1,33 @@
+/** @jsxImportSource @opentui/react */
+/**
+ * Footer rendered inside each agent tmux window. Lives in a 1-row bottom
+ * pane created by the executor after the agent window is spawned. Mirrors
+ * the orchestrator Statusline style — colored badge on the left, dimmed
+ * keyboard hints on the right.
+ */
+
+import type { GraphTheme } from "./graph-theme.ts";
+
+export function AttachedStatusline({ name, theme }: { name: string; theme: GraphTheme }) {
+  return (
+    <box height={1} flexDirection="row" backgroundColor={theme.backgroundElement}>
+      <box backgroundColor={theme.primary} paddingLeft={1} paddingRight={1} alignItems="center">
+        <text fg={theme.backgroundElement}>
+          <strong>{name}</strong>
+        </text>
+      </box>
+
+      <box flexGrow={1} />
+
+      <box paddingRight={2} alignItems="center">
+        <text>
+          <span fg={theme.text}>ctrl+g</span>
+          <span fg={theme.textMuted}> graph</span>
+          <span fg={theme.textDim}> {"\u00B7"} </span>
+          <span fg={theme.text}>{"ctrl+\\"}</span>
+          <span fg={theme.textMuted}> next</span>
+        </text>
+      </box>
+    </box>
+  );
+}

package/src/sdk/components/header.tsx

@@ -1,8 +1,13 @@
 /** @jsxImportSource @opentui/react */
 
-import { useMemo } from "react";
+import { useContext, useMemo } from "react";
 import type { SessionStatus } from "./orchestrator-panel-types.ts";
-import { useStore, useGraphTheme, useStoreVersion } from "./orchestrator-panel-contexts.ts";
+import {
+  useStore,
+  useGraphTheme,
+  useStoreVersion,
+  TmuxSessionContext,
+} from "./orchestrator-panel-contexts.ts";
 
 function CountBadge({ color, icon, count }: { color: string; icon: string; count: number }) {
   if (count <= 0) return null;
@@ -16,6 +21,7 @@ function CountBadge({ color, icon, count }: { color: string; icon: string; count
 export function Header() {
   const store = useStore();
   const theme = useGraphTheme();
+  const tmuxSession = useContext(TmuxSessionContext);
   const storeVersion = useStoreVersion(store);
 
   const counts = useMemo(() => {
@@ -47,6 +53,14 @@ export function Header() {
         </span>
       </text>
 
+      {tmuxSession ? (
+        <box paddingLeft={1} alignItems="center">
+          <text fg={theme.text}>
+            <strong>{tmuxSession}</strong>
+          </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} />