@bastani/atomic 0.5.34 → 0.6.0

package/src/cli.ts

@@ -26,85 +26,17 @@ import { VERSION } from "./version.ts";
 import { COLORS } from "./theme/colors.ts";
 import { AGENT_CONFIG, type AgentKey } from "./services/config/index.ts";
 import { SUPPORTED_SHELLS, type Shell } from "./completions/index.ts";
-
-// ─── Session subcommand factory ─────────────────────────────────────────────
-
-/**
- * Build a `session` subcommand group with `list` and `connect` children.
- * Reused under `chat`, `workflow`, and at the top level.
- */
-/** Commander collect helper: accumulates repeated `-a` values into an array. */
-function collectAgent(value: string, previous: string[]): string[] {
-    return [...previous, value];
-}
-
-function addSessionSubcommand(parent: Command, scope: "chat" | "workflow" | "all" = "all") {
-    const sessionCmd = parent
-        .command("session")
-        .description("Manage running tmux sessions");
-
-    sessionCmd
-        .command("list")
-        .description("List running sessions on the atomic tmux socket")
-        .option(
-            "-a, --agent <name>",
-            `Filter by agent backend (${Object.keys(AGENT_CONFIG).join(", ")}); repeatable`,
-            collectAgent,
-            [] as string[],
-        )
-        .action(async (localOpts) => {
-            const { sessionListCommand } = await import("./commands/cli/session.ts");
-            const exitCode = await sessionListCommand(localOpts.agent, scope);
-            process.exit(exitCode);
-        });
-
-    sessionCmd
-        .command("connect")
-        .description("Attach to a running session (interactive picker when no id given)")
-        .argument("[session_id]", "Session name to connect to")
-        .option(
-            "-a, --agent <name>",
-            `Filter picker by agent backend (${Object.keys(AGENT_CONFIG).join(", ")}); repeatable`,
-            collectAgent,
-            [] as string[],
-        )
-        .action(async (sessionId, localOpts) => {
-            if (sessionId) {
-                const { sessionConnectCommand } = await import("./commands/cli/session.ts");
-                const exitCode = await sessionConnectCommand(sessionId);
-                process.exit(exitCode);
-            } else {
-                const { sessionPickerCommand } = await import("./commands/cli/session.ts");
-                const exitCode = await sessionPickerCommand(localOpts.agent, scope);
-                process.exit(exitCode);
-            }
-        });
-
-    sessionCmd
-        .command("kill")
-        .description("Kill a running session (omit id to kill all)")
-        .argument("[session_id]", "Session name to kill (omit to kill all)")
-        .option(
-            "-a, --agent <name>",
-            `Filter by agent backend (${Object.keys(AGENT_CONFIG).join(", ")}); repeatable`,
-            collectAgent,
-            [] as string[],
-        )
-        .option("-y, --yes", "Skip the confirmation prompt (for non-interactive callers like agents)")
-        .action(async (sessionId, localOpts) => {
-            const { sessionKillCommand } = await import("./commands/cli/session.ts");
-            const exitCode = await sessionKillCommand(
-                sessionId,
-                localOpts.agent,
-                scope,
-                undefined,
-                { yes: localOpts.yes === true },
-            );
-            process.exit(exitCode);
-        });
-
-    return sessionCmd;
-}
+import { workflowCommand } from "./commands/cli/workflow.ts";
+import { addSessionSubcommand } from "./sdk/management-commands.ts";
+
+// Orchestrator re-entry is handled transparently by `runCli` in `main()`
+// below — no explicit guard needed. The `atomic workflow` command exposes
+// the builtin workflow CLI, which `runCli` uses to resolve re-entry keys.
+//
+// Session subcommand builders live in `./sdk/management-commands.ts` so the
+// exact same `session list | connect | kill` surface is shipped by every
+// `createWorkflowCli()` user CLI — sessions live on the shared atomic tmux
+// socket, so there's one implementation.
 
 // ─── Program ────────────────────────────────────────────────────────────────
 
@@ -200,24 +132,19 @@ Examples:
 
     // ── Workflow command ─────────────────────────────────────────────────────
     //
-    // Three shapes:
-    //   1. `atomic workflow -a <agent>`                 — interactive picker
-    //   2. `atomic workflow -n <name> -a <agent> ...`   — named run
-    //   3. `atomic workflow list [-a <agent>]`          — list workflows
+    // The base Command (with -n, -a, -d flags and workflow dispatch) is
+    // produced by the SDK dispatcher. Subcommands (list, inputs, status,
+    // session) are attached here so they live under `atomic workflow *`.
     //
-    // `allowUnknownOption` + `allowExcessArguments` let unknown flags and
-    // positional tokens land in `cmd.args`, forwarded as `passthroughArgs`
-    // so the command layer can parse them against the workflow's schema.
-    const workflowCmd = program
-        .command("workflow")
+    // `enablePositionalOptions()` on the dispatcher is what makes
+    // `atomic workflow list -a claude` route `-a` to the `list`
+    // subcommand instead of the parent dispatcher (which *also* declares
+    // `-a/--agent` for the dispatch path). Without it, Commander would
+    // greedily bind the flag to the parent and the subcommand would
+    // never see it.
+    workflowCommand
         .description("Run a multi-session agent workflow")
-        .option("-n, --name <name>", "Workflow name (matches directory under .atomic/workflows/<name>/)")
-        .option("-a, --agent <name>", `Agent to use (${agentChoices})`)
-        .option("-d, --detach", "Start the workflow in the background without attaching (auto-enabled when launched from inside an atomic chat/workflow session to avoid hijacking it). Attach later with 'atomic workflow session connect <id>'.")
-        .allowUnknownOption()
-        .allowExcessArguments(true)
         .enablePositionalOptions()
-        .passThroughOptions()
         .addHelpText(
             "after",
             `
@@ -235,27 +162,22 @@ Examples:
   $ atomic workflow session list                    List running sessions
   $ atomic workflow session connect <id>            Attach to a session
   $ atomic workflow session kill [id] -y            Kill a workflow session (or all), no prompt`,
-        )
-        .action(async (localOpts, cmd) => {
-            const { workflowCommand } = await import("./commands/cli/workflow.ts");
-            const exitCode = await workflowCommand({
-                name: localOpts.name,
-                agent: localOpts.agent,
-                detach: localOpts.detach,
-                passthroughArgs: cmd.args,
-            });
-            process.exit(exitCode);
-        });
+        );
+
+    program.addCommand(workflowCommand);
 
     // Workflow list subcommand: atomic workflow list [-a <agent>]
-    workflowCmd
+    // Prints the builtin registry. `-a` filters to one agent so users
+    // can narrow to workflows runnable with their configured provider.
+    workflowCommand
         .command("list")
-        .description("List available workflows")
-        .option("-a, --agent <name>", `Filter by agent (${agentChoices})`)
+        .description("List available workflows (optionally filter by agent)")
+        .option("-a, --agent <name>", `Filter by agent backend (${agentChoices})`)
         .action(async (localOpts) => {
-            const { workflowCommand } = await import("./commands/cli/workflow.ts");
-            const exitCode = await workflowCommand({
-                list: true,
+            const { workflowListCommand } = await import(
+                "./commands/cli/workflow-list.ts"
+            );
+            const exitCode = await workflowListCommand({
                 agent: localOpts.agent,
             });
             process.exit(exitCode);
@@ -264,7 +186,7 @@ Examples:
     // Workflow inputs subcommand: atomic workflow inputs <name> -a <agent>
     // Exposes the declared input schema so an orchestrating agent can build
     // a valid `atomic workflow -n ...` invocation without reading source.
-    workflowCmd
+    workflowCommand
         .command("inputs")
         .description("Print a workflow's declared input schema (JSON by default)")
         .argument("<name>", "Workflow name")
@@ -285,7 +207,7 @@ Examples:
     // Workflow status subcommand: atomic workflow status [<id>]
     // Returns one of in_progress | error | completed | needs_review.
     // Defaults to JSON so agents can parse it without screen-scraping.
-    workflowCmd
+    workflowCommand
         .command("status")
         .description(
             "Query workflow status (in_progress, error, completed, needs_review)",
@@ -304,7 +226,7 @@ Examples:
         });
 
     // Workflow session subcommands: atomic workflow session list / connect
-    addSessionSubcommand(workflowCmd, "workflow");
+    addSessionSubcommand(workflowCommand, "workflow");
 
     // ── Top-level session command ───────────────────────────────────────────
     addSessionSubcommand(program);
@@ -410,39 +332,58 @@ Install completions for your shell:
 export const program = createProgram();
 
 /**
- * Main entry point for the CLI
+ * Main entry point for the CLI.
+ *
+ * `runCli` handles detached orchestrator re-entry transparently — when the
+ * process is spawned by a tmux orchestrator pane (ATOMIC_ORCHESTRATOR_MODE
+ * set), it resolves the workflow against the builtin CLI's registry
+ * and drives it via `runOrchestrator`, skipping bootstrap + argv parsing.
+ * Otherwise, it runs the provided CLI callback (bootstrap + parseAsync).
  */
 async function main(): Promise<void> {
     try {
-        // Bootstrap `~/.atomic/settings.json` on every invocation if absent,
-        // so users always have a file to edit with JSON Schema intellisense
-        // wired up. Idempotent; swallows FS errors internally.
-        const { ensureGlobalAtomicSettings } = await import("./services/config/settings.ts");
-        await ensureGlobalAtomicSettings();
-
-        // Sync tooling deps and global skills on first launch after install
-        // or upgrade. Runs at most once per version bump (gated on a marker
-        // file under ~/.atomic). Skipped for `--version` / `--help` so info
-        // paths stay instant.
-        const argv = process.argv.slice(2);
-        const isInfoCommand =
-            argv.includes("--version") ||
-            argv.includes("-v") ||
-            argv.includes("--help") ||
-            argv.includes("-h") ||
-            argv[0] === "completions" ||
-            argv[0] === "_footer" ||
-            argv[0] === "_claude-stop-hook" ||
-            argv[0] === "_claude-ask-hook" ||
-            argv[0] === "_claude-session-start-hook";
-
-        if (!isInfoCommand) {
-            const { autoSyncIfStale } = await import("./services/system/auto-sync.ts");
-            await autoSyncIfStale();
-        }
-
-        // Parse and execute the command
-        await program.parseAsync();
+        const { createWorkflowCli } = await import("./sdk/workflow-cli.ts");
+        const { runCli } = await import("./sdk/commander.ts");
+        const { createBuiltinRegistry } = await import(
+            "./sdk/workflows/builtin-registry.ts"
+        );
+
+        const builtinCli = createWorkflowCli(createBuiltinRegistry());
+
+        await runCli([builtinCli], async () => {
+            // Bootstrap `~/.atomic/settings.json` on every invocation if absent,
+            // so users always have a file to edit with JSON Schema intellisense
+            // wired up. Idempotent; swallows FS errors internally.
+            const { ensureGlobalAtomicSettings } = await import(
+                "./services/config/settings.ts"
+            );
+            await ensureGlobalAtomicSettings();
+
+            // Sync tooling deps and global skills on first launch after install
+            // or upgrade. Runs at most once per version bump (gated on a marker
+            // file under ~/.atomic). Skipped for `--version` / `--help` so info
+            // paths stay instant.
+            const argv = process.argv.slice(2);
+            const isInfoCommand =
+                argv.includes("--version") ||
+                argv.includes("-v") ||
+                argv.includes("--help") ||
+                argv.includes("-h") ||
+                argv[0] === "completions" ||
+                argv[0] === "_footer" ||
+                argv[0] === "_claude-stop-hook" ||
+                argv[0] === "_claude-ask-hook" ||
+                argv[0] === "_claude-session-start-hook";
+
+            if (!isInfoCommand) {
+                const { autoSyncIfStale } = await import(
+                    "./services/system/auto-sync.ts"
+                );
+                await autoSyncIfStale();
+            }
+
+            await program.parseAsync();
+        });
     } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         console.error(`${COLORS.red}Error: ${message}${COLORS.reset}`);

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

@@ -145,10 +145,20 @@ function buildLauncherScript(
   const envLines = envEntries.map(
     ([key, value]) => `export ${key}="${escBash(value)}"`,
   );
+  // Pre-silence the tty before exec'ing the agent. copilot and opencode
+  // write terminal-capability probes (CSI ?Pn $p, OSC 4;0;?, CSI c) to
+  // stdout at startup; under tmux the DECRPM / OSC 4 / DA1 replies arrive
+  // on stdin a few ms later. If the agent hasn't enabled raw mode yet,
+  // the tty driver echoes those replies back to the screen as garbage
+  // (e.g. `^[[?1016;2$y^[[?2004;1$y^[]4;0;rgb:...`). Disabling echo and
+  // canonical mode here means the driver drops them silently; the agent's
+  // own termios setup then takes over once it's ready. Redirected stdin
+  // (no tty) harmlessly no-ops the stty call.
   const script = [
     "#!/bin/bash",
     `cd "${escBash(projectRoot)}"`,
     ...envLines,
+    "stty -echo -icanon 2>/dev/null || true",
     `exec "${escBash(cmd)}" ${quotedArgs}`,
   ].join("\n");
   return { script, ext: "sh" };