@bastani/atomic 0.5.5 → 0.5.6-0

package/src/commands/cli/session.ts

@@ -0,0 +1,265 @@
+/**
+ * Session CLI commands — shared between `atomic chat session` and
+ * `atomic workflow session`, and the top-level `atomic session` picker.
+ *
+ * Wraps tmux -L atomic list-sessions / attach-session so users can
+ * inspect and reconnect to running atomic sessions without touching
+ * tmux directly.
+ */
+
+import { select, isCancel, cancel } from "@clack/prompts";
+import { createPainter, type PaletteKey } from "../../theme/colors.ts";
+import {
+  listSessions as _listSessions,
+  isTmuxInstalled as _isTmuxInstalled,
+  isInsideAtomicSocket as _isInsideAtomicSocket,
+  isInsideTmux as _isInsideTmux,
+  sessionExists as _sessionExists,
+  switchClient as _switchClient,
+  spawnMuxAttach as _spawnMuxAttach,
+  detachAndAttachAtomic as _detachAndAttachAtomic,
+  SOCKET_NAME,
+} from "../../sdk/workflows/index.ts";
+import type { TmuxSession, SessionType } from "../../sdk/runtime/tmux.ts";
+import type { Subprocess } from "bun";
+
+/** Scope controls which session types a command shows. */
+export type SessionScope = "chat" | "workflow" | "all";
+
+/** Injectable tmux dependencies for command functions. */
+export interface SessionDeps {
+  isTmuxInstalled: () => boolean;
+  sessionExists: (name: string) => boolean;
+  listSessions: () => TmuxSession[];
+  isInsideAtomicSocket: () => boolean;
+  isInsideTmux: () => boolean;
+  switchClient: (name: string) => void;
+  spawnMuxAttach: (name: string) => Subprocess;
+  detachAndAttachAtomic: (name: string) => void;
+  /** Prompt function for the session picker — defaults to @clack/prompts select. */
+  select: typeof select;
+  isCancel: typeof isCancel;
+}
+
+/** Default deps — wire through to the real implementations. */
+const defaultDeps: SessionDeps = {
+  isTmuxInstalled: _isTmuxInstalled,
+  sessionExists: _sessionExists,
+  listSessions: _listSessions,
+  isInsideAtomicSocket: _isInsideAtomicSocket,
+  isInsideTmux: _isInsideTmux,
+  switchClient: _switchClient,
+  spawnMuxAttach: _spawnMuxAttach,
+  detachAndAttachAtomic: _detachAndAttachAtomic,
+  select,
+  isCancel,
+};
+
+// ─── Rendering ──────────────────────────────────────────────────────────────
+
+/**
+ * Render the session list as a printable string.
+ *
+ * Layout mirrors the workflow list style — data-first count header,
+ * session rows with metadata, dim footer hint.
+ */
+export function renderSessionList(sessions: TmuxSession[]): string {
+  const paint = createPainter();
+  const lines: string[] = [];
+
+  if (sessions.length === 0) {
+    lines.push("");
+    lines.push("  " + paint("text", "no sessions running", { bold: true }));
+    lines.push("");
+    lines.push("  " + paint("dim", "start one with"));
+    lines.push("    " + paint("accent", "atomic chat -a <agent>"));
+    lines.push("    " + paint("accent", "atomic workflow -n <name> -a <agent>"));
+    lines.push("");
+    return lines.join("\n") + "\n";
+  }
+
+  const count = sessions.length;
+  const noun = count === 1 ? "session" : "sessions";
+  lines.push("");
+  lines.push(
+    "  " + paint("text", String(count), { bold: true }) + " " + paint("dim", noun) +
+    paint("dim", ` on tmux -L ${SOCKET_NAME}`),
+  );
+  lines.push("");
+
+  for (const s of sessions) {
+    const status: PaletteKey = s.attached ? "success" : "dim";
+    const indicator = s.attached ? "●" : "○";
+    const age = formatAge(s.created);
+    const agentBadge = s.agent ? "  " + paint("accent", `[${s.agent}]`) : "";
+
+    lines.push(
+      "  " +
+      paint(status, indicator) + " " +
+      paint("text", s.name, { bold: true }) +
+      agentBadge +
+      paint("dim", "  " + age) +
+      (s.attached ? "  " + paint("success", "attached") : ""),
+    );
+  }
+
+  lines.push("");
+  lines.push("  " + paint("dim", "connect: atomic session connect <name>"));
+  lines.push("");
+
+  return lines.join("\n") + "\n";
+}
+
+/**
+ * Format an ISO timestamp (or raw string) as a human-readable relative age.
+ */
+function formatAge(isoOrRaw: string): string {
+  const d = new Date(isoOrRaw);
+  if (Number.isNaN(d.getTime())) return isoOrRaw;
+
+  const diffMs = Date.now() - d.getTime();
+  if (diffMs < 0) return "just now";
+
+  const seconds = Math.floor(diffMs / 1000);
+  if (seconds < 60) return "just now";
+  const minutes = Math.floor(seconds / 60);
+  if (minutes < 60) return `${minutes}m ago`;
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24) return `${hours}h ago`;
+  const days = Math.floor(hours / 24);
+  return `${days}d ago`;
+}
+
+// ─── Filtering ─────────────────────────────────────────────────────────────
+
+/** Map a SessionScope to the SessionType it allows (undefined = no filter). */
+const SCOPE_TO_TYPE: Record<SessionScope, SessionType | undefined> = {
+  chat: "chat",
+  workflow: "workflow",
+  all: undefined,
+};
+
+/** Filter sessions by scope (chat-only, workflow-only, or all). */
+export function filterByScope(sessions: TmuxSession[], scope: SessionScope): TmuxSession[] {
+  const required = SCOPE_TO_TYPE[scope];
+  if (!required) return sessions;
+  return sessions.filter((s) => s.type === required);
+}
+
+/** Filter sessions to only those matching at least one of the given agents. */
+export function filterByAgent(sessions: TmuxSession[], agents: string[]): TmuxSession[] {
+  if (agents.length === 0) return sessions;
+  const allowed = new Set(agents.map((a) => a.toLowerCase()));
+  return sessions.filter((s) => s.agent !== undefined && allowed.has(s.agent.toLowerCase()));
+}
+
+// ─── Session list command ───────────────────────────────────────────────────
+
+export async function sessionListCommand(agents: string[] = [], scope: SessionScope = "all", deps: SessionDeps = defaultDeps): Promise<number> {
+  if (!deps.isTmuxInstalled()) {
+    const paint = createPainter();
+    process.stdout.write(
+      "\n  " + paint("text", "no sessions running", { bold: true }) +
+      "\n\n  " + paint("dim", "tmux is not installed") + "\n\n",
+    );
+    return 0;
+  }
+
+  const sessions = filterByAgent(filterByScope(deps.listSessions(), scope), agents);
+  process.stdout.write(renderSessionList(sessions));
+  return 0;
+}
+
+// ─── Session connect command ────────────────────────────────────────────────
+
+/**
+ * Connect to a named session. Handles the three tmux contexts:
+ * already on atomic socket → switch-client, inside other tmux → detach+attach,
+ * outside tmux → spawn attach.
+ */
+export async function sessionConnectCommand(sessionName: string, deps: SessionDeps = defaultDeps): Promise<number> {
+  const paint = createPainter();
+
+  if (!deps.isTmuxInstalled()) {
+    process.stderr.write(
+      paint("error", "Error: tmux is not installed.") + "\n",
+    );
+    return 1;
+  }
+
+  if (!deps.sessionExists(sessionName)) {
+    process.stderr.write(
+      paint("error", `Error: session '${sessionName}' not found.`) + "\n",
+    );
+    const sessions = deps.listSessions();
+    if (sessions.length > 0) {
+      process.stderr.write(
+        "\n" + paint("dim", "Available sessions:") + "\n",
+      );
+      for (const s of sessions) {
+        process.stderr.write(
+          "  " + paint("dim", "○") + " " + paint("text", s.name) + "\n",
+        );
+      }
+      process.stderr.write("\n");
+    }
+    return 1;
+  }
+
+  if (deps.isInsideAtomicSocket()) {
+    deps.switchClient(sessionName);
+    return 0;
+  }
+
+  if (deps.isInsideTmux()) {
+    deps.detachAndAttachAtomic(sessionName);
+    return 0;
+  }
+
+  const proc = deps.spawnMuxAttach(sessionName);
+  return await proc.exited;
+}
+
+// ─── Interactive session picker ─────────────────────────────────────────────
+
+/**
+ * Show an fzf-style interactive picker for all running atomic sessions.
+ * Used by `atomic session connect` (no args).
+ */
+export async function sessionPickerCommand(agents: string[] = [], scope: SessionScope = "all", deps: SessionDeps = defaultDeps): Promise<number> {
+  const paint = createPainter();
+
+  if (!deps.isTmuxInstalled()) {
+    process.stderr.write(
+      paint("error", "Error: tmux is not installed.") + "\n",
+    );
+    return 1;
+  }
+
+  const sessions = filterByAgent(filterByScope(deps.listSessions(), scope), agents);
+
+  if (sessions.length === 0) {
+    process.stdout.write(renderSessionList(sessions));
+    return 0;
+  }
+
+  const selected = await deps.select({
+    message: "Connect to session",
+    options: sessions.map((s) => {
+      const age = formatAge(s.created);
+      const tag = s.attached ? " (attached)" : "";
+      return {
+        value: s.name,
+        label: s.name,
+        hint: `${age}${tag}`,
+      };
+    }),
+  });
+
+  if (deps.isCancel(selected)) {
+    cancel("Cancelled.");
+    return 0;
+  }
+
+  return sessionConnectCommand(selected as string, deps);
+}

package/src/commands/cli/workflow.ts

@@ -6,7 +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 --list                         list discoverable workflows
+ *   atomic workflow list [-a <agent>]              list discoverable workflows
  */
 
 import { AGENT_CONFIG, type AgentKey } from "../../services/config/index.ts";

package/src/completions/bash.ts

@@ -0,0 +1,107 @@
+/**
+ * Bash completion script for the atomic CLI.
+ *
+ * Install: eval "$(atomic completions bash)"
+ */
+export const bashCompletionScript = `
+_atomic_completions() {
+    local cur prev words cword
+    _init_completion || return
+
+    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)
+    local cmd1="" cmd2="" cmd3=""
+    local i=1
+    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
+            *)
+                if [[ -z "$cmd1" ]]; then cmd1="$w"
+                elif [[ -z "$cmd2" ]]; then cmd2="$w"
+                elif [[ -z "$cmd3" ]]; then cmd3="$w"
+                fi
+                ;;
+        esac
+        (( i++ ))
+    done
+
+    # Complete flag values
+    case "$prev" in
+        -a|--agent)
+            COMPREPLY=( $(compgen -W "$agents" -- "$cur") )
+            return
+            ;;
+        -s|--scm)
+            COMPREPLY=( $(compgen -W "$scms" -- "$cur") )
+            return
+            ;;
+    esac
+
+    # Top-level (no subcommand yet)
+    if [[ -z "$cmd1" ]]; then
+        COMPREPLY=( $(compgen -W "$commands $global_opts" -- "$cur") )
+        return
+    fi
+
+    case "$cmd1" in
+        init)
+            COMPREPLY=( $(compgen -W "-a --agent -s --scm -h --help" -- "$cur") )
+            ;;
+        chat)
+            if [[ -z "$cmd2" ]]; then
+                COMPREPLY=( $(compgen -W "session -a --agent -h --help" -- "$cur") )
+            elif [[ "$cmd2" == "session" ]]; then
+                if [[ -z "$cmd3" ]]; then
+                    COMPREPLY=( $(compgen -W "list connect -h --help" -- "$cur") )
+                else
+                    COMPREPLY=( $(compgen -W "-a --agent -h --help" -- "$cur") )
+                fi
+            fi
+            ;;
+        workflow)
+            if [[ -z "$cmd2" ]]; then
+                COMPREPLY=( $(compgen -W "list session -n --name -a --agent -h --help" -- "$cur") )
+            elif [[ "$cmd2" == "list" ]]; then
+                COMPREPLY=( $(compgen -W "-a --agent -h --help" -- "$cur") )
+            elif [[ "$cmd2" == "session" ]]; then
+                if [[ -z "$cmd3" ]]; then
+                    COMPREPLY=( $(compgen -W "list connect -h --help" -- "$cur") )
+                else
+                    COMPREPLY=( $(compgen -W "-a --agent -h --help" -- "$cur") )
+                fi
+            fi
+            ;;
+        session)
+            if [[ -z "$cmd2" ]]; then
+                COMPREPLY=( $(compgen -W "list connect -h --help" -- "$cur") )
+            else
+                COMPREPLY=( $(compgen -W "-a --agent -h --help" -- "$cur") )
+            fi
+            ;;
+        config)
+            if [[ -z "$cmd2" ]]; then
+                COMPREPLY=( $(compgen -W "set -h --help" -- "$cur") )
+            elif [[ "$cmd2" == "set" ]]; then
+                if [[ -z "$cmd3" ]]; then
+                    COMPREPLY=( $(compgen -W "telemetry" -- "$cur") )
+                else
+                    case "$cmd3" in
+                        telemetry) COMPREPLY=( $(compgen -W "true false" -- "$cur") ) ;;
+                    esac
+                fi
+            fi
+            ;;
+        completions)
+            COMPREPLY=( $(compgen -W "bash zsh fish powershell" -- "$cur") )
+            ;;
+    esac
+}
+
+complete -F _atomic_completions atomic
+`;

package/src/completions/fish.ts

@@ -0,0 +1,126 @@
+/**
+ * Fish completion script for the atomic CLI.
+ *
+ * Install: atomic completions fish | source
+ *   or:   atomic completions fish > ~/.config/fish/completions/atomic.fish
+ */
+export const fishCompletionScript = `
+# Disable file completions by default
+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.
+
+function __atomic_no_subcommand
+    not __fish_seen_subcommand_from init chat workflow session config completions
+end
+
+function __atomic_using_cmd
+    set -l cmds $argv
+    set -l tokens (commandline -opc)
+    # Check that the command sequence matches
+    set -l idx 2  # start after 'atomic'
+    for cmd in $cmds
+        if test $idx -gt (count $tokens)
+            return 1
+        end
+        # Skip flags and their values
+        while test $idx -le (count $tokens)
+            switch $tokens[$idx]
+                case '-*'
+                    set idx (math $idx + 1)
+                    # Skip flag value for known value-flags
+                    switch $tokens[(math $idx - 1)]
+                        case -a --agent -s --scm -n --name
+                            set idx (math $idx + 1)
+                    end
+                case '*'
+                    break
+            end
+        end
+        if test $idx -gt (count $tokens)
+            return 1
+        end
+        if test "$tokens[$idx]" != "$cmd"
+            return 1
+        end
+        set idx (math $idx + 1)
+    end
+    return 0
+end
+
+function __atomic_needs_subcmd_of
+    __atomic_using_cmd $argv
+    and not __fish_seen_subcommand_from list connect set
+end
+
+# ── Global options ──────────────────────────────────────────────────────────
+
+complete -c atomic -n __atomic_no_subcommand -s y -l yes -d 'Auto-confirm all prompts'
+complete -c atomic -n __atomic_no_subcommand -l no-banner -d 'Skip ASCII banner display'
+complete -c atomic -n __atomic_no_subcommand -s v -l version -d 'Show version number'
+complete -c atomic -n __atomic_no_subcommand -s h -l help -d 'Show help'
+
+# ── Top-level subcommands ───────────────────────────────────────────────────
+
+complete -c atomic -n __atomic_no_subcommand -a init -d 'Interactive setup with agent selection'
+complete -c atomic -n __atomic_no_subcommand -a chat -d 'Start an interactive chat session'
+complete -c atomic -n __atomic_no_subcommand -a workflow -d 'Run a multi-session agent workflow'
+complete -c atomic -n __atomic_no_subcommand -a session -d 'Manage running tmux sessions'
+complete -c atomic -n __atomic_no_subcommand -a config -d 'Manage atomic configuration'
+complete -c atomic -n __atomic_no_subcommand -a completions -d 'Output shell completion script'
+
+# ── 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 ────────────────────────────────────────────────────────────────────
+
+complete -c atomic -n '__atomic_using_cmd chat; and not __fish_seen_subcommand_from session' -s a -l agent -d 'Agent to chat with' -r -a "$agents"
+complete -c atomic -n '__atomic_using_cmd chat; and not __fish_seen_subcommand_from session' -a session -d 'Manage running chat sessions'
+
+# chat session
+complete -c atomic -n '__atomic_using_cmd chat session; and not __fish_seen_subcommand_from list connect' -a list -d 'List running sessions'
+complete -c atomic -n '__atomic_using_cmd chat session; and not __fish_seen_subcommand_from list connect' -a connect -d 'Attach to a running session'
+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"
+
+# ── workflow ────────────────────────────────────────────────────────────────
+
+complete -c atomic -n '__atomic_using_cmd workflow; and not __fish_seen_subcommand_from list session' -s n -l name -d 'Workflow name' -r
+complete -c atomic -n '__atomic_using_cmd workflow; and not __fish_seen_subcommand_from list session' -s a -l agent -d 'Agent to use' -r -a "$agents"
+complete -c atomic -n '__atomic_using_cmd workflow; and not __fish_seen_subcommand_from list session' -a list -d 'List available workflows'
+complete -c atomic -n '__atomic_using_cmd workflow; and not __fish_seen_subcommand_from list session' -a session -d 'Manage running workflow sessions'
+
+# workflow list
+complete -c atomic -n '__atomic_using_cmd workflow list' -s a -l agent -d 'Filter by agent' -r -a "$agents"
+
+# workflow session
+complete -c atomic -n '__atomic_using_cmd workflow session; and not __fish_seen_subcommand_from list connect' -a list -d 'List running sessions'
+complete -c atomic -n '__atomic_using_cmd workflow session; and not __fish_seen_subcommand_from list connect' -a connect -d 'Attach to a running session'
+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"
+
+# ── session (top-level) ────────────────────────────────────────────────────
+
+complete -c atomic -n '__atomic_using_cmd session; and not __fish_seen_subcommand_from list connect' -a list -d 'List running sessions'
+complete -c atomic -n '__atomic_using_cmd session; and not __fish_seen_subcommand_from list connect' -a connect -d 'Attach to a running session'
+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"
+
+# ── config ──────────────────────────────────────────────────────────────────
+
+complete -c atomic -n '__atomic_using_cmd config; and not __fish_seen_subcommand_from set' -a set -d 'Set a configuration value'
+complete -c atomic -n '__atomic_using_cmd config set; and not __fish_seen_subcommand_from telemetry' -a telemetry -d 'Telemetry setting'
+complete -c atomic -n '__atomic_using_cmd config set telemetry' -a 'true false'
+
+# ── completions ─────────────────────────────────────────────────────────────
+
+complete -c atomic -n '__atomic_using_cmd completions' -a 'bash zsh fish powershell' -d 'Shell type'
+`;

package/src/completions/index.ts

@@ -0,0 +1,7 @@
+export { bashCompletionScript } from "./bash.ts";
+export { zshCompletionScript } from "./zsh.ts";
+export { fishCompletionScript } from "./fish.ts";
+export { powershellCompletionScript } from "./powershell.ts";
+
+export const SUPPORTED_SHELLS = ["bash", "zsh", "fish", "powershell"] as const;
+export type Shell = (typeof SUPPORTED_SHELLS)[number];