@bastani/atomic 0.5.5 → 0.5.6-0

package/src/cli.ts

@@ -5,20 +5,86 @@
  * Built with Commander.js for robust argument parsing and type-safe options.
  *
  * Usage:
- *   atomic                          Interactive setup (same as 'atomic init')
- *   atomic init                     Interactive setup with agent selection
- *   atomic init -a <agent>          Setup specific agent (skip selection)
- *   atomic init -s <scm>             Setup specific SCM (github, sapling)
- *   atomic chat -a <agent>          Start interactive chat with an agent
- *   atomic config set <key> <value> Set configuration value
- *   atomic --version                Show version
- *   atomic --help                   Show help
+ *   atomic                                    Interactive setup (same as 'atomic init')
+ *   atomic init                               Interactive setup with agent selection
+ *   atomic init -a <agent>                    Setup specific agent (skip selection)
+ *   atomic init -s <scm>                      Setup specific SCM (github, sapling)
+ *   atomic chat -a <agent>                    Start interactive chat with an agent
+ *   atomic chat session list                  List running chat/workflow sessions
+ *   atomic chat session connect <id>          Attach to a session
+ *   atomic workflow list                      List available workflows
+ *   atomic workflow session list              List running sessions
+ *   atomic workflow session connect <id>      Attach to a session
+ *   atomic session list                       List all running sessions
+ *   atomic session connect [id]               Interactive session picker
+ *   atomic config set <key> <value>           Set configuration value
+ *   atomic --version                          Show version
+ *   atomic --help                             Show help
  */
 
 import { Command } from "@commander-js/extra-typings";
 import { VERSION } from "./version.ts";
 import { COLORS } from "./theme/colors.ts";
 import { AGENT_CONFIG, type AgentKey, SCM_CONFIG, type SourceControlType } 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);
+            }
+        });
+
+    return sessionCmd;
+}
+
+// ─── Program ────────────────────────────────────────────────────────────────
 
 /**
  * Create and configure the main CLI program
@@ -28,6 +94,9 @@ export function createProgram() {
         .name("atomic")
         .description("Configuration management CLI for coding agents")
         .version(VERSION, "-v, --version", "Show version number")
+        // Required so subcommands (workflow list, session connect) can define
+        // their own options without the parent absorbing them first.
+        .enablePositionalOptions()
 
         // Global options available to all commands
         .option("-y, --yes", "Auto-confirm all prompts (non-interactive mode)")
@@ -71,13 +140,15 @@ export function createProgram() {
             });
         });
 
-    // Add chat command (default command when no subcommand is provided)
-    program
+    // ── Chat command (default) ──────────────────────────────────────────────
+    const chatCmd = program
         .command("chat", { isDefault: true })
         .description("Start an interactive chat session with a coding agent")
         .option("-a, --agent <name>", `Agent to chat with (${agentChoices})`)
         .allowUnknownOption()
         .allowExcessArguments(true)
+        .enablePositionalOptions()
+        .passThroughOptions()
         .addHelpText(
             "after",
             `
@@ -88,8 +159,8 @@ Examples:
   $ atomic chat -a copilot                          Start Copilot interactively
   $ atomic chat -a opencode                         Start OpenCode interactively
   $ atomic chat -a claude "fix the bug"             Claude with initial prompt
-  $ atomic chat -a copilot --model gpt-4o           Copilot with custom model
-  $ atomic chat -a claude --verbose                 Forward --verbose to claude`,
+  $ atomic chat session list                        List running sessions
+  $ atomic chat session connect <id>                Attach to a session`,
         )
         .action(async (localOpts, cmd) => {
             const validAgents = Object.keys(AGENT_CONFIG);
@@ -126,48 +197,72 @@ Examples:
             process.exit(exitCode);
         });
 
-    // Add workflow command
+    // Chat session subcommands: atomic chat session list / connect
+    addSessionSubcommand(chatCmd, "chat");
+
+    // ── Workflow command ─────────────────────────────────────────────────────
     //
-    // Two shapes are supported behind a single command:
+    // Three shapes:
     //   1. `atomic workflow -a <agent>`                 — interactive picker
-    //   2. `atomic workflow -n <name> -a <agent> ...`   — named run with
-    //       either a positional prompt (free-form workflows) or
-    //       `--<field>=<value>` flags (structured-input workflows).
+    //   2. `atomic workflow -n <name> -a <agent> ...`   — named run
+    //   3. `atomic workflow list [-a <agent>]`          — list workflows
     //
-    // `allowUnknownOption` + `allowExcessArguments` give us both: unknown
-    // flags and positional tokens land in `cmd.args`, which we forward
-    // as `passthroughArgs` so the command layer can parse them against
-    // the workflow's declared schema.
-    program
+    // `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")
         .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("-l, --list", "List available workflows")
         .allowUnknownOption()
         .allowExcessArguments(true)
+        .enablePositionalOptions()
+        .passThroughOptions()
         .addHelpText(
             "after",
             `
 Examples:
-  $ atomic workflow -l                              List available workflows
+  $ atomic workflow list                            List available workflows
+  $ atomic workflow list -a claude                  List Claude workflows only
   $ atomic workflow -a claude                       Open the interactive picker
   $ atomic workflow -n ralph -a claude "fix bug"    Run a free-form workflow
   $ atomic workflow -n gen-spec -a claude --research_doc=notes.md --focus=standard
-                                                    Run a structured-input workflow`,
+                                                    Run a structured-input workflow
+  $ atomic workflow session list                    List running sessions
+  $ atomic workflow session connect <id>            Attach to a session`,
         )
         .action(async (localOpts, cmd) => {
             const { workflowCommand } = await import("./commands/cli/workflow.ts");
             const exitCode = await workflowCommand({
                 name: localOpts.name,
                 agent: localOpts.agent,
-                list: localOpts.list,
                 passthroughArgs: cmd.args,
             });
             process.exit(exitCode);
         });
 
-    // Add config command for managing CLI settings
+    // Workflow list subcommand: atomic workflow list [-a <agent>]
+    workflowCmd
+        .command("list")
+        .description("List available workflows")
+        .option("-a, --agent <name>", `Filter by agent (${agentChoices})`)
+        .action(async (localOpts) => {
+            const { workflowCommand } = await import("./commands/cli/workflow.ts");
+            const exitCode = await workflowCommand({
+                list: true,
+                agent: localOpts.agent,
+            });
+            process.exit(exitCode);
+        });
+
+    // Workflow session subcommands: atomic workflow session list / connect
+    addSessionSubcommand(workflowCmd, "workflow");
+
+    // ── Top-level session command ───────────────────────────────────────────
+    addSessionSubcommand(program);
+
+    // ── Config command ──────────────────────────────────────────────────────
     const configCmd = program
         .command("config")
         .description("Manage atomic configuration");
@@ -184,6 +279,34 @@ Examples:
             process.exit(exitCode);
         });
 
+    // ── Completions command ────────────────────────────────────────────────
+    program
+        .command("completions")
+        .description("Output shell completion script")
+        .argument("<shell>", `Shell type (${SUPPORTED_SHELLS.join(", ")})`)
+        .addHelpText(
+            "after",
+            `
+Install completions for your shell:
+
+  Bash   eval "$(atomic completions bash)"     # add to ~/.bashrc
+  Zsh    eval "$(atomic completions zsh)"      # add to ~/.zshrc
+  Fish   atomic completions fish | source      # or save to ~/.config/fish/completions/atomic.fish
+  PowerShell  atomic completions powershell | Invoke-Expression  # add to $PROFILE`,
+        )
+        .action(async (shell) => {
+            if (!SUPPORTED_SHELLS.includes(shell as Shell)) {
+                console.error(
+                    `${COLORS.red}Error: Unknown shell '${shell}'${COLORS.reset}`,
+                );
+                console.error(`Supported shells: ${SUPPORTED_SHELLS.join(", ")}`);
+                process.exit(1);
+            }
+            const { completionsCommand } = await import("./commands/cli/completions.ts");
+            const exitCode = completionsCommand(shell as Shell);
+            process.exit(exitCode);
+        });
+
     return program;
 }
 

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

@@ -24,15 +24,18 @@ import {
 } from "../../../services/config/atomic-global-config.ts";
 import { getConfigRoot } from "../../../services/config/config-path.ts";
 import {
+  isInsideAtomicSocket,
   isInsideTmux,
   isTmuxInstalled,
   resetMuxBinaryCache,
 } from "../../../sdk/workflows/index.ts";
 import {
   createSession,
+  detachAndAttachAtomic,
   killSession,
+  setSessionEnv,
   spawnMuxAttach,
-  SOCKET_NAME,
+  switchClient,
 } from "../../../sdk/workflows/index.ts";
 import { ensureTmuxInstalled } from "../../../lib/spawn.ts";
 
@@ -137,11 +140,10 @@ function buildLauncherScript(
 /**
  * Spawn the native agent CLI as an interactive subprocess.
  *
- * When running inside a tmux/psmux session, the agent spawns inline
- * in the current pane with inherited stdio.
- *
- * When running outside tmux, a new tmux session is created and
- * attached so the agent benefits from multiplexer features.
+ * Always creates a new session in the atomic tmux socket and attaches
+ * to it, regardless of whether the user is already inside tmux.
+ * Falls back to direct spawn only when no TTY is available or tmux
+ * cannot be installed.
  *
  * @param options - Chat command configuration options
  * @returns Exit code from the agent process
@@ -175,11 +177,6 @@ export async function chatCommand(options: ChatCommandOptions = {}): Promise<num
   const cmd = [config.cmd, ...args];
   const envVars = config.env_vars;
 
-  // ── Inside tmux: spawn inline in the current pane ──
-  if (isInsideTmux()) {
-    return spawnDirect(cmd, projectRoot, envVars);
-  }
-
   // ── No TTY: tmux attach requires a real terminal ──
   if (!process.stdin.isTTY) {
     return spawnDirect(cmd, projectRoot, envVars);
@@ -202,7 +199,7 @@ export async function chatCommand(options: ChatCommandOptions = {}): Promise<num
 
   // ── Build launcher script for safe arg/cwd handling ──
   const chatId = generateChatId();
-  const windowName = `atomic-chat-${chatId}`;
+  const windowName = `atomic-chat-${agentType}-${chatId}`;
 
   const sessionsDir = join(homedir(), ".atomic", "sessions", "chat");
   await mkdir(sessionsDir, { recursive: true });
@@ -219,11 +216,25 @@ export async function chatCommand(options: ChatCommandOptions = {}): Promise<num
     ? `pwsh -NoProfile -File "${launcherPath}"`
     : `bash "${launcherPath}"`;
 
-  // ── Outside tmux: create a new session and attach ──
+  // ── Create session on the atomic socket and attach ──
   try {
     createSession(windowName, shellCmd, undefined, projectRoot);
+    setSessionEnv(windowName, "ATOMIC_AGENT", agentType);
 
-    console.log(`[atomic] Session: ${windowName} (FYI all atomic sessions run on tmux -L ${SOCKET_NAME})`);
+    if (isInsideAtomicSocket()) {
+      // Already on the atomic server — just switch to the new session.
+      switchClient(windowName);
+      try { await rm(launcherPath, { force: true }); } catch {}
+      return 0;
+    }
+
+    if (isInsideTmux()) {
+      // Inside a different tmux server — detach and replace the client
+      // with an attach to the atomic socket (no nesting).
+      detachAndAttachAtomic(windowName);
+      try { await rm(launcherPath, { force: true }); } catch {}
+      return 0;
+    }
 
     const attachProc = spawnMuxAttach(windowName);
     const exitCode = await attachProc.exited;

package/src/commands/cli/completions.ts

@@ -0,0 +1,24 @@
+import {
+    bashCompletionScript,
+    zshCompletionScript,
+    fishCompletionScript,
+    powershellCompletionScript,
+    type Shell,
+} from "../../completions/index.ts";
+
+const SCRIPTS: Record<Shell, string> = {
+    bash: bashCompletionScript,
+    zsh: zshCompletionScript,
+    fish: fishCompletionScript,
+    powershell: powershellCompletionScript,
+};
+
+/**
+ * Print the shell completion script for the given shell to stdout.
+ * Returns 0 on success, 1 on unknown shell.
+ */
+export function completionsCommand(shell: Shell): number {
+    const script = SCRIPTS[shell];
+    process.stdout.write(script);
+    return 0;
+}