@sanlabs/sanbox-cli 0.0.1 → 0.0.4

package/dist/cli.js

@@ -1,77 +1,568 @@
 #!/usr/bin/env node
 import fs from "node:fs/promises";
 import path from "node:path";
-import { flagList, flagNumber, flagString, hasFlag, parseArgs } from "./args.js";
-import { SanboxClient } from "./api.js";
-import { defaultWorkloadId, readConfig } from "./config.js";
-import { printJson, printRun } from "./output.js";
+import { formatActivityJsonl, formatActivityLine, parseActivityView, shouldRenderEvent } from "./activity.js";
+import { ArtifactExistsError, downloadArtifacts } from "./artifacts.js";
+import { booleanFlags, flagList, flagString, hasFlag, parseArgs } from "./args.js";
+import { SanboxApiError, SanboxClient } from "./api.js";
+import { defaultApiUrl, readConfig, readLocalConfig, readTemplateSelection } from "./config.js";
+import { CliError, commandAction, consoleAction } from "./errors.js";
+import { previewInputs } from "./inputs.js";
+import { printError, printJsonlError, printRun, printSuccess, publicRun, publicRunPayload } from "./output.js";
 import { createRun, isTerminalRun, readTasks, runPool, stableBatchId, waitForRun } from "./runs.js";
 import { version } from "./version.js";
+import { WatchInterruptedError, watchEventsUntil, watchRun } from "./watch.js";
 const help = `Sanbox CLI
 
 Environment:
   SANBOX_API_URL   Sanbox API base URL
   SANBOX_ORG       Organization slug
   SANBOX_API_KEY   Org API key
+  SANBOX_TEMPLATE  Explicit template id or slug for run and batch
 
 Commands:
+  sanbox --version
   sanbox auth check [--json]
-  sanbox run --task "..." [--include "app/**"] [--wait] [--json]
-  sanbox run --dossier ./task.zip [--wait] [--json]
-  sanbox batch --tasks tasks.json [--include "app/**"] [--max-parallel 5] [--wait] [--json]
+  sanbox orgs list [--json]
+  sanbox context [--json]
+  sanbox doctor [--json]
+  sanbox model-providers list [--json]
+  sanbox model-providers get <provider-id> [--json]
+  sanbox model-providers models <provider-id> [--json]
+  sanbox templates list [--json]
+  sanbox templates get <template-id> [--json]
+  sanbox templates validate <template-id> [--json]
+  sanbox templates create --name "..." --model-provider <provider-id> --model <model-id> [--llm-budget-usd <amount>] [--web-access] [--json]
+  sanbox run "task" --template <template-id> [--input <path>] [--wait | --watch] [--json | --jsonl]
+  sanbox run --task "..." --template <template-id> [--input <path>] [--wait | --watch] [--json | --jsonl]
+  sanbox batch --tasks tasks.json --template <template-id> [--input <path>] [--max-parallel 5] [--wait] [--json]
+  sanbox runs list [--limit 50] [--json]
   sanbox runs get <run-id> [--json]
   sanbox runs events <run-id> [--after-event-id 0] [--json]
+  sanbox runs messages <run-id> [--json]
+  sanbox runs artifacts <run-id> [--json]
+  sanbox runs download <run-id> --output <directory> [--artifact <path>] [--overwrite] [--json]
+  sanbox runs watch <run-id> [--after-event-id 0] [--view activity|logs|compact] [--jsonl]
   sanbox runs cancel <run-id> [--json]
-  sanbox runs message <run-id> --message "..." [--json]
+  sanbox runs message <run-id> "..." [--wait | --watch] [--json | --jsonl]
+  sanbox init [--force]
   sanbox init agent [--write]
 `;
-const agentInstructions = `# Sanbox Agent Integration
+const runHelp = `Sanbox run
 
-Use Sanbox when a task is independent, long-running, risky to run locally, or can be split into parallel subtasks.
+Usage:
+  sanbox run "Review these files" --template <template-id> --input report.pdf --input data/ --wait
+  sanbox run --task "Review these files" --template <template-id> --input report.pdf --wait --json
 
-Environment expected by the CLI:
-- SANBOX_API_URL
-- SANBOX_ORG
-- SANBOX_API_KEY
+Options:
+  --input <path>                File, directory, or glob to upload. Repeatable.
+  --template <id>               Template id or slug. Required unless SANBOX_TEMPLATE or project config sets it.
+  --external-run-id <id>        Idempotency key for retries.
+  --retention-ttl-seconds <n>   Workspace retention TTL. Default: 86400.
+  --dry-run                     Preview included files without creating a run.
+  --wait                        Poll until terminal status.
+  --watch                       Stream activity until terminal status.
+  --jsonl                       Stream one versioned activity event per line. Implies --watch.
+  --view <name>                 activity, logs, or compact. Default: activity.
+  --after-event-id <id>         Resume after an event cursor. Default: 0.
+  --cancel-on-interrupt         Request run cancellation when Ctrl-C is pressed.
+  --json                        Print JSON.
+`;
+const doctorHelp = `Sanbox doctor
+
+Usage:
+  sanbox doctor [--json]
+
+Checks local configuration, API health, auth, org visibility, and template access.
+SANBOX_API_KEY is still read only from the environment.
+`;
+const modelProvidersHelp = `Sanbox model providers
+
+Usage:
+  sanbox model-providers list [--json]
+  sanbox model-providers get <provider-id> [--json]
+  sanbox model-providers models <provider-id> [--json]
+
+Provider credentials are configured by organization admins in the Sanbox console.
+Model ids are scoped to their provider and are never deduplicated across providers.
+`;
+const templatesHelp = `Sanbox templates
+
+Usage:
+  sanbox templates list [--json]
+  sanbox templates get <template-id> [--json]
+  sanbox templates validate <template-id> [--json]
+  sanbox templates create --name "Code review" --model-provider <provider-id> --model <model-id> [--llm-budget-usd <amount>] [--web-access] [--json]
 
-Useful commands:
+Template creation requires an exact provider id and that provider's exact model id.
+LiteLLM budgets are optional USD amounts and apply separately to each run.
+`;
+const agentInstructions = `# Operate Sanbox Autonomously
+
+Use the \`sanbox\` CLI for focused, isolated, long-running, risky, or parallel work. The canonical
+protocol is https://console.sanbox.cloud/agent.md. This workflow requires CLI 0.0.4 or newer.
+
+Human bootstrap:
+- A human/admin supplies SANBOX_API_KEY and configures provider credentials plus a runnable template.
+- Never print, persist, prompt with, or upload API keys or provider credentials.
+- If the key or a runnable template is unavailable, stop with the exact human action required.
+
+Deterministic startup:
 \`\`\`bash
-sanbox auth check
-sanbox run --task "Investigate one focused task" --include "app/**" --wait --json
-sanbox batch --tasks .sanbox/tasks.json --include "app/**" --max-parallel 5 --wait --json
+sanbox --version
+sanbox orgs list --json
+export SANBOX_ORG=<returned-org-slug>
+sanbox auth check --json
+sanbox context --json
+sanbox templates list --json
+export SANBOX_TEMPLATE=<returned-template-id-or-slug>
+sanbox templates validate "$SANBOX_TEMPLATE" --json
+sanbox doctor --json
+\`\`\`
+
+Never guess opaque IDs. Select a discovered org/template automatically only when exactly one valid
+choice exists; otherwise ask the user. Provider credentials and template administration are
+console-only.
+
+Use --json for request/response commands and --jsonl for streams. Parse the versioned envelope:
+schema_version, ok, command, context, data or error, and next_actions. Execute command actions as
+argv arrays, never shell strings. Exit 0 means command success, 1 local/API failure, 2 readiness or
+waited remote failure, and 130 detached while remote work continues.
+
+Preview and submit each logical task with a stable idempotency key:
+\`\`\`bash
+sanbox run "Investigate one focused task and write output/report.md" --input app/ --dry-run --json
+sanbox run "Investigate one focused task and write output/report.md" \\
+  --template "$SANBOX_TEMPLATE" --external-run-id "<stable-project-task-id>" \\
+  --input app/ --wait --json
+\`\`\`
+
+Reuse the same --external-run-id after ambiguous failures. Retry network errors, HTTP 429, HTTP 5xx,
+and workspace_busy with bounded backoff. Do not retry other 4xx errors unless next_actions directs
+recovery.
+
+Recover and retrieve results:
+\`\`\`bash
+sanbox runs list --limit 50 --json
 sanbox runs get <run-id> --json
-sanbox runs events <run-id> --json
-sanbox runs message <run-id> --message "Summarize the retained output" --json
+sanbox runs events <run-id> --after-event-id <cursor> --json
+sanbox runs watch <run-id> --after-event-id <cursor> --jsonl
+sanbox runs artifacts <run-id> --json
+sanbox runs download <run-id> --output .sanbox/output/<run-id> --json
+\`\`\`
+
+Tasks must put durable files under /workspace/output. Downloads preserve relative paths and report
+byte counts plus SHA-256 digests; existing files require explicit --overwrite.
+
+Continue through the retained workspace:
+\`\`\`bash
+sanbox runs messages <run-id> --json
+sanbox runs message <run-id> "Summarize the retained output" --wait --json
 \`\`\`
 
-Do not put secrets in dossiers. The CLI excludes common env and secret-like filenames by default.
+Follow-up waits are correlated to the returned chat_job.id. Keep dependent follow-ups sequential.
+For independent fan-out, use \`sanbox batch\` with a stable external_run_id per task and keep the
+client alive until submission completes.
+
+Do not claim completion until the run is completed, required artifacts are downloaded and verified,
+and required follow-ups succeeded. Report run/external/template IDs, status, artifact paths/digests,
+and blockers. The CLI excludes common secrets by default; add .sanboxignore for project rules.
 `;
 const cwd = () => process.cwd();
 const makeClient = (flags) => new SanboxClient(readConfig(flags));
-const commandRun = async (flags) => {
-    const client = makeClient(flags);
-    const task = flagString(flags, "task");
-    const dossierPath = flagString(flags, "dossier");
-    if (!task && !dossierPath)
-        throw new Error("--task or --dossier is required.");
-    let payload = await createRun(client, {
-        cwd: cwd(),
-        cliVersion: version,
-        task,
-        dossierPath,
-        include: flagList(flags, "include"),
-        externalRunId: flagString(flags, "external-run-id") || undefined,
-        workloadId: flagString(flags, "workload-id", defaultWorkloadId),
-        retentionTtlSeconds: flagNumber(flags, "retention-ttl-seconds", 86400)
+const makeAuthClient = (flags) => new SanboxClient(readConfig(flags, { requireOrg: false }));
+const jsonContext = (client) => ({
+    api_url: client.config.apiUrl,
+    org: client.config.org
+});
+const localJsonContext = (flags) => {
+    try {
+        const local = readLocalConfig();
+        const apiUrl = String(flags["api-url"] || process.env.SANBOX_API_URL || local.api_url || defaultApiUrl).replace(/\/+$/, "");
+        const org = String(flags.org || process.env.SANBOX_ORG || local.org || "").trim();
+        return { api_url: apiUrl, ...(org ? { org } : {}) };
+    }
+    catch {
+        return {};
+    }
+};
+const consolePathUrl = (client, pathname) => new URL(pathname, `${client.config.apiUrl}/`).toString();
+const consoleUrl = (client) => consolePathUrl(client, "/model-providers");
+const providerConsoleAction = (client) => consoleAction(consoleUrl(client), "Ask an organization admin to configure or repair the model provider in the Sanbox console.");
+const templateAdminConsoleAction = (client) => consoleAction(consolePathUrl(client, "/templates"), "Ask an organization admin to create a template in the Sanbox console.");
+const templateActions = () => [
+    commandAction(["sanbox", "templates", "list", "--json"], "List templates available to the selected organization."),
+    commandAction(["sanbox", "templates", "validate", "<template-id>", "--json"], "Check whether a template is runnable.")
+];
+const runReadinessCodes = new Set([
+    "provider_not_configured",
+    "provider_invalid",
+    "model_not_found_for_provider",
+    "template_provider_missing",
+    "template_not_runnable"
+]);
+const providerReadinessCodes = new Set([
+    "provider_not_configured",
+    "provider_invalid",
+    "model_not_found_for_provider",
+    "template_provider_missing"
+]);
+const runCreationError = (error, client, template) => {
+    if (!(error instanceof SanboxApiError) || !runReadinessCodes.has(error.code))
+        return error;
+    const nextActions = [
+        commandAction(["sanbox", "templates", "validate", template.id, "--json"], "Inspect the selected template's current provider/model blockers."),
+        commandAction(["sanbox", "model-providers", "list", "--json"], "Inspect organization-scoped model-provider status.")
+    ];
+    if (providerReadinessCodes.has(error.code))
+        nextActions.push(providerConsoleAction(client));
+    return new CliError(error.code, error.message, {
+        status: error.status,
+        details: { template_id: template.id },
+        nextActions
     });
+};
+const templateCreationError = (error, client, providerId, modelId) => {
+    if (!(error instanceof SanboxApiError))
+        return error;
+    if (error.code === "provider_not_configured" || error.code === "provider_invalid") {
+        return new CliError(error.code, error.message, {
+            status: error.status,
+            details: { provider_id: providerId, model_id: modelId },
+            nextActions: [
+                commandAction(["sanbox", "model-providers", "get", providerId, "--json"], "Inspect the selected provider's organization-scoped status."),
+                providerConsoleAction(client)
+            ]
+        });
+    }
+    if (error.code === "model_not_found_for_provider") {
+        return new CliError(error.code, error.message, {
+            status: error.status,
+            details: { provider_id: providerId, model_id: modelId },
+            nextActions: [commandAction(["sanbox", "model-providers", "models", providerId, "--json"], "List exact selectable and non-selectable model ids exposed by the selected provider.")]
+        });
+    }
+    if (error.code === "template_name_conflict") {
+        return new CliError(error.code, error.message, {
+            status: error.status,
+            nextActions: [commandAction(["sanbox", "templates", "list", "--json"], "Inspect existing template names and identifiers.")]
+        });
+    }
+    return error;
+};
+const requiredPositional = (value, code, message) => {
+    const normalized = value?.trim();
+    if (!normalized)
+        throw new CliError(code, message);
+    return normalized;
+};
+const providerId = (provider) => String(provider.provider_id || provider.id || "");
+const templateName = (template) => String(template.display_name || template.template_slug || template.id || "");
+const validationRunnable = (validation) => {
+    if (typeof validation.runnable === "boolean")
+        return validation.runnable;
+    const template = validation.template;
+    return Boolean(template && typeof template === "object" && !Array.isArray(template) && template.runnable);
+};
+const formatBytes = (bytes) => {
+    if (bytes < 1024)
+        return `${bytes} B`;
+    if (bytes < 1024 * 1024)
+        return `${(bytes / 1024).toFixed(1)} KB`;
+    return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+};
+const positionalText = (command, startIndex) => command.slice(startIndex).join(" ").trim();
+const runTask = (command, flags) => flagString(flags, "task") || positionalText(command, 1);
+const commonFlags = ["api-url", "org", "json", "help"];
+const flagSets = {
+    "auth.check": commonFlags,
+    "orgs.list": commonFlags,
+    context: [...commonFlags, "template"],
+    doctor: [...commonFlags, "template"],
+    "model-providers.list": commonFlags,
+    "model-providers.get": commonFlags,
+    "model-providers.models": commonFlags,
+    "templates.list": commonFlags,
+    "templates.get": commonFlags,
+    "templates.validate": commonFlags,
+    "templates.create": [...commonFlags, "name", "model-provider", "model", "llm-budget-usd", "web-access"],
+    run: [
+        ...commonFlags, "task", "input", "template", "external-run-id", "retention-ttl-seconds",
+        "dry-run", "wait", "watch", "jsonl", "view", "after-event-id", "cancel-on-interrupt",
+        "poll-interval-ms", "event-page-size", "timeout-seconds", "verbose"
+    ],
+    batch: [
+        ...commonFlags, "tasks", "template", "input", "max-parallel", "wait", "batch-id",
+        "retention-ttl-seconds", "poll-interval-ms", "timeout-seconds"
+    ],
+    "runs.list": [...commonFlags, "limit"],
+    "runs.get": commonFlags,
+    "runs.events": [...commonFlags, "after-event-id"],
+    "runs.messages": commonFlags,
+    "runs.artifacts": commonFlags,
+    "runs.download": [...commonFlags, "output", "artifact", "overwrite"],
+    "runs.watch": [
+        ...commonFlags, "after-event-id", "view", "jsonl", "cancel-on-interrupt",
+        "poll-interval-ms", "event-page-size", "timeout-seconds"
+    ],
+    "runs.cancel": commonFlags,
+    "runs.message": [
+        ...commonFlags, "message", "wait", "watch", "jsonl", "view",
+        "poll-interval-ms", "event-page-size", "timeout-seconds"
+    ],
+    init: [...commonFlags, "force", "template"],
+    "init.agent": [...commonFlags, "write"],
+    version: ["json", "help"]
+};
+const commandKey = (command) => {
+    if (command.length === 0)
+        return "help";
+    if (command[0] === "version")
+        return "version";
+    if (command[0] === "auth")
+        return `auth.${command[1] || ""}`;
+    if (command[0] === "orgs")
+        return `orgs.${command[1] || ""}`;
+    if (command[0] === "model-providers" || command[0] === "templates" || command[0] === "runs") {
+        return `${command[0]}.${command[1] || ""}`;
+    }
+    if (command[0] === "init" && command[1] === "agent")
+        return "init.agent";
+    return command[0];
+};
+const requiredValueFlags = new Set([
+    "api-url", "org", "template", "task", "input", "include", "external-run-id",
+    "retention-ttl-seconds", "tasks", "max-parallel", "batch-id", "poll-interval-ms",
+    "event-page-size", "timeout-seconds", "view", "after-event-id", "limit", "name",
+    "model-provider", "model", "llm-budget-usd", "message", "output", "artifact"
+]);
+const validateFlagValues = (flags) => {
+    for (const flag of requiredValueFlags) {
+        const value = flags[flag];
+        const missing = value === true
+            || (typeof value === "string" && value.trim() === "")
+            || (Array.isArray(value) && value.some((item) => item.trim() === ""));
+        if (missing)
+            throw new CliError("flag_value_required", `--${flag} requires a value.`);
+    }
+    for (const flag of booleanFlags) {
+        if (flags[flag] !== undefined && flags[flag] !== true) {
+            throw new CliError("unexpected_flag_value", `--${flag} does not accept a value.`);
+        }
+    }
+};
+const normalizeInputAlias = (command, flags) => {
+    if (command[0] !== "run" && command[0] !== "batch")
+        return;
+    const legacyInputs = flagList(flags, "include");
+    if (legacyInputs.length === 0)
+        return;
+    flags.input = [...flagList(flags, "input"), ...legacyInputs];
+    delete flags.include;
+    if (!hasFlag(flags, "json") && !hasFlag(flags, "jsonl")) {
+        process.stderr.write("Warning: --include is deprecated; use --input.\n");
+    }
+};
+const validateFlags = (command, flags) => {
+    const key = commandKey(command);
+    if (key === "help") {
+        const unknown = Object.keys(flags).filter((flag) => !["help", "version", "json"].includes(flag));
+        if (unknown.length > 0)
+            throw new CliError("unknown_flag", `Unknown flag: --${unknown[0]}`);
+        return;
+    }
+    const knownRoots = new Set([
+        "auth", "orgs", "context", "doctor", "model-providers", "templates",
+        "run", "batch", "runs", "init", "version"
+    ]);
+    const allowed = flagSets[key] ?? (knownRoots.has(command[0] || "") ? commonFlags : null);
+    if (!allowed)
+        return;
+    const unknown = Object.keys(flags).filter((flag) => !allowed.includes(flag));
+    if (unknown.length > 0) {
+        throw new CliError("unknown_flag", `Unknown flag for ${command.join(" ")}: --${unknown[0]}`);
+    }
+};
+const validatePositionals = (command, flags) => {
+    if (hasFlag(flags, "help"))
+        return;
+    const maximums = {
+        "auth.check": 2,
+        "orgs.list": 2,
+        context: 1,
+        doctor: 1,
+        "model-providers.list": 2,
+        "model-providers.get": 3,
+        "model-providers.models": 3,
+        "templates.list": 2,
+        "templates.get": 3,
+        "templates.validate": 3,
+        "templates.create": 2,
+        batch: 1,
+        "runs.list": 2,
+        "runs.get": 3,
+        "runs.events": 3,
+        "runs.messages": 3,
+        "runs.artifacts": 3,
+        "runs.download": 3,
+        "runs.watch": 3,
+        "runs.cancel": 3,
+        init: 1,
+        "init.agent": 2,
+        version: 1
+    };
+    const maximum = maximums[commandKey(command)];
+    if (maximum !== undefined && command.length > maximum) {
+        throw new CliError("unexpected_argument", `Unexpected positional argument: ${command[maximum]}`);
+    }
+};
+const wantsWatch = (flags) => hasFlag(flags, "watch") || hasFlag(flags, "jsonl");
+const integerFlag = (flags, key, fallback, minimum, maximum) => {
+    if (flags[key] === undefined)
+        return fallback;
+    const value = Number(flagString(flags, key));
+    if (!Number.isSafeInteger(value) || value < minimum || value > maximum) {
+        throw new Error(`--${key} must be an integer between ${minimum} and ${maximum}.`);
+    }
+    return value;
+};
+const validateWatchFlags = (flags) => {
+    if (!wantsWatch(flags))
+        return;
+    if (hasFlag(flags, "json"))
+        throw new Error("--json cannot be combined with --watch or --jsonl.");
+    parseActivityView(flagString(flags, "view", "activity"));
+    integerFlag(flags, "after-event-id", 0, 0, Number.MAX_SAFE_INTEGER);
+    integerFlag(flags, "event-page-size", 200, 1, 500);
+    integerFlag(flags, "poll-interval-ms", 2000, 250, 60_000);
+    integerFlag(flags, "timeout-seconds", 1800, 1, 604_800);
+};
+const watchRunWithOutput = async (client, runId, flags, initialPayload) => {
+    validateWatchFlags(flags);
+    const initial = initialPayload ?? await client.getRun(runId);
+    const view = parseActivityView(flagString(flags, "view", "activity"));
+    const jsonl = hasFlag(flags, "jsonl");
+    const controller = new AbortController();
+    const onInterrupt = () => controller.abort();
+    process.once("SIGINT", onInterrupt);
+    if (!jsonl)
+        process.stdout.write(`Watching run ${runId}. Ctrl-C detaches without canceling.\n`);
+    try {
+        return await watchRun(client, runId, {
+            afterEventId: integerFlag(flags, "after-event-id", 0, 0, Number.MAX_SAFE_INTEGER),
+            pageSize: integerFlag(flags, "event-page-size", 200, 1, 500),
+            pollIntervalMs: integerFlag(flags, "poll-interval-ms", 2000, 250, 60_000),
+            timeoutSeconds: integerFlag(flags, "timeout-seconds", 1800, 1, 604_800),
+            signal: controller.signal,
+            onRetry: ({ error, attempt, delayMs }) => {
+                const message = error instanceof Error ? error.message : String(error);
+                process.stderr.write(`Watch connection lost (${message}); retry ${attempt} in ${delayMs}ms.\n`);
+            },
+            onEvent: (event) => {
+                if (!shouldRenderEvent(event, view))
+                    return;
+                process.stdout.write(`${jsonl ? formatActivityJsonl(event) : formatActivityLine(event, initial.run.created_at)}\n`);
+            }
+        });
+    }
+    catch (error) {
+        if (!(error instanceof WatchInterruptedError))
+            throw error;
+        if (hasFlag(flags, "cancel-on-interrupt")) {
+            await client.cancelRun(runId);
+            process.stderr.write(`Cancellation requested for run ${runId}.\n`);
+        }
+        else {
+            process.stderr.write(`Detached from run ${runId}; the run is still active.\n`);
+        }
+        process.exitCode = 130;
+        return null;
+    }
+    finally {
+        process.off("SIGINT", onInterrupt);
+    }
+};
+const printPreview = (preview, verbose) => {
+    process.stdout.write(`Matched ${preview.files.length} files (${formatBytes(preview.totalBytes)})\n`);
+    process.stdout.write(`Patterns: ${preview.patterns.join(", ")}\n`);
+    const files = verbose ? preview.files : preview.files.slice(0, 30);
+    for (const file of files)
+        process.stdout.write(`  ${file.path} ${formatBytes(file.size)}\n`);
+    if (!verbose && preview.files.length > files.length) {
+        process.stdout.write(`  ... ${preview.files.length - files.length} more files. Use --verbose to list all.\n`);
+    }
+};
+const writeIfNeeded = async (filePath, content, force) => {
+    try {
+        await fs.writeFile(filePath, content, { encoding: "utf8", flag: force ? "w" : "wx" });
+        return "written";
+    }
+    catch (error) {
+        if (error.code === "EEXIST")
+            return "exists";
+        throw error;
+    }
+};
+const commandRun = async (command, flags) => {
+    if (flagString(flags, "task") && positionalText(command, 1)) {
+        throw new CliError("conflicting_arguments", "Use either --task or a positional task, not both.");
+    }
+    const task = runTask(command, flags);
+    if (!task)
+        throw new Error("--task or a positional task is required.");
+    if (hasFlag(flags, "wait") && wantsWatch(flags)) {
+        throw new Error("--wait cannot be combined with --watch or --jsonl.");
+    }
+    validateWatchFlags(flags);
+    if (hasFlag(flags, "dry-run")) {
+        if (wantsWatch(flags))
+            throw new Error("--dry-run cannot be combined with --watch or --jsonl.");
+        const preview = await previewInputs({ cwd: cwd(), inputs: flagList(flags, "input") });
+        if (hasFlag(flags, "json"))
+            printSuccess("run.preview", preview, localJsonContext(flags));
+        else
+            printPreview(preview, hasFlag(flags, "verbose"));
+        return;
+    }
+    const client = makeClient(flags);
+    const template = readTemplateSelection(flags);
+    let payload;
+    try {
+        payload = await createRun(client, {
+            cwd: cwd(),
+            instruction: task,
+            inputs: flagList(flags, "input"),
+            externalRunId: flagString(flags, "external-run-id") || undefined,
+            templateId: template.id,
+            retentionTtlSeconds: integerFlag(flags, "retention-ttl-seconds", 86400, 0, Number.MAX_SAFE_INTEGER)
+        });
+    }
+    catch (error) {
+        throw runCreationError(error, client, template);
+    }
+    if (wantsWatch(flags)) {
+        const watched = await watchRunWithOutput(client, payload.run.id, flags, payload);
+        if (!watched)
+            return;
+        payload = watched;
+        if (!hasFlag(flags, "jsonl"))
+            printRun(payload);
+        if (isTerminalRun(payload.run) && payload.run.status !== "completed")
+            process.exitCode = 2;
+        return;
+    }
     if (hasFlag(flags, "wait")) {
         payload = await waitForRun(client, payload.run.id, {
-            pollIntervalMs: flagNumber(flags, "poll-interval-ms", 2000),
-            timeoutSeconds: flagNumber(flags, "timeout-seconds", 1800)
+            pollIntervalMs: integerFlag(flags, "poll-interval-ms", 2000, 250, 60_000),
+            timeoutSeconds: integerFlag(flags, "timeout-seconds", 1800, 1, 604_800)
         });
     }
-    if (hasFlag(flags, "json"))
-        printJson(payload);
+    if (hasFlag(flags, "json")) {
+        printSuccess("run.create", {
+            ...publicRunPayload(payload),
+            selection: { template_id: template.id, source: template.source }
+        }, jsonContext(client));
+    }
     else
         printRun(payload);
     if (hasFlag(flags, "wait") && isTerminalRun(payload.run) && payload.run.status !== "completed")
@@ -82,32 +573,43 @@ const commandBatch = async (flags) => {
     if (!tasksPath)
         throw new Error("--tasks is required.");
     const client = makeClient(flags);
+    const template = readTemplateSelection(flags);
     const tasks = await readTasks(tasksPath);
     const batchId = flagString(flags, "batch-id") || await stableBatchId(tasksPath);
-    const include = flagList(flags, "include");
-    const maxParallel = flagNumber(flags, "max-parallel", 5);
+    const inputs = flagList(flags, "input");
+    const maxParallel = integerFlag(flags, "max-parallel", 5, 1, 100);
     const wait = hasFlag(flags, "wait");
     const results = await runPool(tasks, maxParallel, async (task, index) => {
-        let payload = await createRun(client, {
-            cwd: cwd(),
-            cliVersion: version,
-            task: task.task,
-            include: task.include || include,
-            externalRunId: task.external_run_id || `sanbox-batch-${batchId}-${index + 1}`,
-            workloadId: flagString(flags, "workload-id", defaultWorkloadId),
-            retentionTtlSeconds: flagNumber(flags, "retention-ttl-seconds", 86400)
-        });
+        let payload;
+        try {
+            payload = await createRun(client, {
+                cwd: cwd(),
+                instruction: task.task,
+                inputs: task.input || inputs,
+                externalRunId: task.external_run_id || `sanbox-batch-${batchId}-${index + 1}`,
+                templateId: template.id,
+                retentionTtlSeconds: integerFlag(flags, "retention-ttl-seconds", 86400, 0, Number.MAX_SAFE_INTEGER)
+            });
+        }
+        catch (error) {
+            throw runCreationError(error, client, template);
+        }
         if (wait) {
             payload = await waitForRun(client, payload.run.id, {
-                pollIntervalMs: flagNumber(flags, "poll-interval-ms", 2000),
-                timeoutSeconds: flagNumber(flags, "timeout-seconds", 1800)
+                pollIntervalMs: integerFlag(flags, "poll-interval-ms", 2000, 250, 60_000),
+                timeoutSeconds: integerFlag(flags, "timeout-seconds", 1800, 1, 604_800)
             });
         }
         return payload;
     });
-    const output = { batch_id: batchId, runs: results.map((result) => result.run), results };
+    const output = {
+        batch_id: batchId,
+        selection: { template_id: template.id, source: template.source },
+        runs: results.map((result) => publicRun(result.run)),
+        results: results.map(publicRunPayload)
+    };
     if (hasFlag(flags, "json"))
-        printJson(output);
+        printSuccess("batch.create", output, jsonContext(client));
     else
         results.forEach(printRun);
     if (wait && results.some((result) => result.run.status !== "completed"))
@@ -123,86 +625,717 @@ const commandAuthCheck = async (flags) => {
     const selected = organizations.find((item) => item.slug === org) || null;
     const output = { ok: Boolean(selected), org, selected, me };
     if (hasFlag(flags, "json"))
-        printJson(output);
+        printSuccess("auth.check", output, jsonContext(client));
     else
         process.stdout.write(selected ? `ok org=${org}\n` : `authenticated, but org ${org} is not visible\n`);
     if (!selected)
         process.exitCode = 2;
 };
+const commandOrganizations = async (command, flags) => {
+    if (command[1] !== "list")
+        throw new CliError("orgs_action_required", "orgs requires the list action.");
+    const client = makeAuthClient(flags);
+    const payload = await client.listOrganizations();
+    if (hasFlag(flags, "json")) {
+        printSuccess("orgs.list", payload, { api_url: client.config.apiUrl });
+        return;
+    }
+    for (const organization of payload.organizations) {
+        process.stdout.write(`${organization.slug}${organization.name ? `\t${organization.name}` : ""}${organization.membership_role ? `\t${organization.membership_role}` : ""}\n`);
+    }
+};
+const commandContext = async (flags) => {
+    const client = makeClient(flags);
+    const selection = readTemplateSelection(flags, { required: false });
+    const [me, providerPayload, templatePayload] = await Promise.all([
+        client.me(),
+        client.listModelProviders(),
+        client.listTemplates()
+    ]);
+    const organizations = Array.isArray(me.organizations)
+        ? me.organizations
+        : [];
+    const selectedOrganization = organizations.find((item) => item.slug === client.config.org) || null;
+    const selectedTemplate = selection
+        ? templatePayload.templates.find((item) => item.id === selection.id || item.template_slug === selection.id) || null
+        : null;
+    const output = {
+        organization: selectedOrganization,
+        authentication: me.auth || null,
+        template_selection: selection
+            ? { id: selection.id, source: selection.source, found: Boolean(selectedTemplate), template: selectedTemplate }
+            : null,
+        model_providers: providerPayload.providers,
+        templates: templatePayload.templates
+    };
+    const nextActions = [];
+    if (!selectedOrganization) {
+        nextActions.push(commandAction(["sanbox", "auth", "check", "--json"], "Verify that the API key can access the selected organization."));
+    }
+    if (!selection) {
+        nextActions.push(commandAction(["sanbox", "templates", "list", "--json"], "List available templates."), commandAction(["sanbox", "context", "--json"], "Select a template for this shell and inspect the resolved context.", { SANBOX_TEMPLATE: "<template-id>" }));
+    }
+    else if (!selectedTemplate) {
+        nextActions.push(commandAction(["sanbox", "templates", "list", "--json"], "Choose a template that exists in this organization."));
+    }
+    if (!selectedOrganization)
+        process.exitCode = 2;
+    if (hasFlag(flags, "json")) {
+        printSuccess("context.get", output, jsonContext(client), nextActions);
+        return;
+    }
+    process.stdout.write(`org=${client.config.org}\n`);
+    process.stdout.write(`template=${selection ? `${selection.id} source=${selection.source}${selectedTemplate ? "" : " missing"}` : "not selected"}\n`);
+    process.stdout.write(`model_providers=${providerPayload.providers.map((item) => providerId(item)).filter(Boolean).join(",") || "none"}\n`);
+    process.stdout.write(`templates=${templatePayload.templates.map((item) => item.template_slug || item.id).join(",") || "none"}\n`);
+};
+const commandModelProviders = async (command, flags) => {
+    const client = makeClient(flags);
+    const action = command[1];
+    if (action === "list") {
+        const payload = await client.listModelProviders();
+        if (hasFlag(flags, "json")) {
+            printSuccess("model_providers.list", payload, jsonContext(client));
+            return;
+        }
+        for (const provider of payload.providers) {
+            const id = providerId(provider);
+            process.stdout.write(`${id}${provider.status ? ` ${provider.status}` : ""}${provider.configured === undefined ? "" : ` configured=${provider.configured}`}\n`);
+        }
+        return;
+    }
+    if (action === "get") {
+        const id = requiredPositional(command[2], "model_provider_required", "model-providers get requires a provider id.");
+        let payload;
+        try {
+            payload = await client.getModelProvider(id);
+        }
+        catch (error) {
+            if (error instanceof SanboxApiError) {
+                throw new CliError("model_provider_not_found", error.message, {
+                    status: error.status,
+                    details: { provider_id: id },
+                    nextActions: [commandAction(["sanbox", "model-providers", "list", "--json"], "List supported providers and their organization-scoped status.")]
+                });
+            }
+            throw error;
+        }
+        const nextActions = payload.provider.configured === false ? [providerConsoleAction(client)] : [];
+        if (hasFlag(flags, "json")) {
+            printSuccess("model_providers.get", payload, jsonContext(client), nextActions);
+            return;
+        }
+        process.stdout.write(`${providerId(payload.provider)}${payload.provider.status ? ` ${payload.provider.status}` : ""}\n`);
+        return;
+    }
+    if (action === "models") {
+        const id = requiredPositional(command[2], "model_provider_required", "model-providers models requires a provider id.");
+        let payload;
+        try {
+            payload = await client.listProviderModels(id);
+        }
+        catch (error) {
+            if (error instanceof SanboxApiError) {
+                throw new CliError("model_provider_unavailable", error.message, {
+                    status: error.status,
+                    details: { provider_id: id },
+                    nextActions: [
+                        commandAction(["sanbox", "model-providers", "get", id, "--json"], "Inspect the provider's organization-scoped status."),
+                        providerConsoleAction(client)
+                    ]
+                });
+            }
+            throw error;
+        }
+        if (hasFlag(flags, "json")) {
+            printSuccess("model_providers.models", payload, jsonContext(client));
+            return;
+        }
+        for (const model of payload.models) {
+            const modelId = String(model.model_id || model.id || "");
+            const displayName = String(model.display_name || model.name || "");
+            process.stdout.write(`${modelId}${displayName && displayName !== modelId ? `\t${displayName}` : ""}${model.selectable === undefined ? "" : `\tselectable=${model.selectable}`}\n`);
+        }
+        return;
+    }
+    throw new CliError("model_providers_action_required", "model-providers requires an action: list, get, or models.");
+};
+const commandTemplates = async (command, flags) => {
+    const client = makeClient(flags);
+    const action = command[1];
+    if (action === "list") {
+        const payload = await client.listTemplates();
+        const nextActions = payload.templates.length === 0
+            ? [
+                commandAction(["sanbox", "context", "--json"], "Inspect the selected organization and current authentication role."),
+                templateAdminConsoleAction(client)
+            ]
+            : [];
+        if (hasFlag(flags, "json")) {
+            printSuccess("templates.list", payload, jsonContext(client), nextActions);
+            return;
+        }
+        for (const template of payload.templates) {
+            process.stdout.write(`${template.id}\t${templateName(template)}\t${template.provider_id || ""}\t${template.model_id || ""}${template.runnable === undefined ? "" : `\trunnable=${template.runnable}`}\n`);
+        }
+        return;
+    }
+    if (action === "get") {
+        const id = requiredPositional(command[2], "template_id_required", "templates get requires a template id or slug.");
+        let payload;
+        try {
+            payload = await client.getTemplate(id);
+        }
+        catch (error) {
+            if (error instanceof SanboxApiError) {
+                throw new CliError("template_not_found", error.message, {
+                    status: error.status,
+                    details: { template_id: id },
+                    nextActions: [commandAction(["sanbox", "templates", "list", "--json"], "List templates available to the selected organization.")]
+                });
+            }
+            throw error;
+        }
+        if (hasFlag(flags, "json")) {
+            printSuccess("templates.get", payload, jsonContext(client), templateActions());
+            return;
+        }
+        process.stdout.write(`${payload.template.id} ${templateName(payload.template)} provider=${payload.template.provider_id || ""} model=${payload.template.model_id || ""}${payload.template.runnable === undefined ? "" : ` runnable=${payload.template.runnable}`}\n`);
+        return;
+    }
+    if (action === "validate") {
+        const id = requiredPositional(command[2], "template_id_required", "templates validate requires a template id or slug.");
+        let payload;
+        try {
+            payload = await client.validateTemplate(id);
+        }
+        catch (error) {
+            if (error instanceof SanboxApiError) {
+                throw new CliError("template_validation_failed", error.message, {
+                    status: error.status,
+                    details: { template_id: id },
+                    nextActions: [commandAction(["sanbox", "templates", "list", "--json"], "List templates available to the selected organization.")]
+                });
+            }
+            throw error;
+        }
+        const runnable = validationRunnable(payload);
+        const nextActions = runnable ? [] : [
+            commandAction(["sanbox", "model-providers", "list", "--json"], "Inspect model-provider configuration for this organization."),
+            providerConsoleAction(client)
+        ];
+        if (hasFlag(flags, "json")) {
+            printSuccess("templates.validate", payload, jsonContext(client), nextActions);
+            return;
+        }
+        process.stdout.write(`${runnable ? "ready" : "blocked"} template=${id}\n`);
+        return;
+    }
+    if (action === "create") {
+        const name = requiredPositional(flagString(flags, "name"), "template_name_required", "templates create requires --name.");
+        const modelProvider = requiredPositional(flagString(flags, "model-provider"), "model_provider_required", "templates create requires --model-provider.");
+        const model = requiredPositional(flagString(flags, "model"), "model_required", "templates create requires --model.");
+        const budgetRaw = flagString(flags, "llm-budget-usd");
+        const parsedBudgetUsd = budgetRaw ? Number(budgetRaw) : undefined;
+        const llmBudgetUsd = parsedBudgetUsd === undefined
+            ? undefined
+            : Math.round(parsedBudgetUsd * 1_000_000) / 1_000_000;
+        if (budgetRaw &&
+            (!Number.isFinite(parsedBudgetUsd) || llmBudgetUsd <= 0 || llmBudgetUsd > 100_000)) {
+            throw new CliError("invalid_llm_budget", "templates create --llm-budget-usd must be at least 0.000001 and no more than 100000.");
+        }
+        let payload;
+        try {
+            payload = await client.createTemplate({
+                name,
+                provider_id: modelProvider,
+                model_id: model,
+                web_access: hasFlag(flags, "web-access"),
+                ...(llmBudgetUsd === undefined ? {} : { llm_budget_usd: llmBudgetUsd })
+            });
+        }
+        catch (error) {
+            throw templateCreationError(error, client, modelProvider, model);
+        }
+        if (hasFlag(flags, "json")) {
+            printSuccess("templates.create", payload, jsonContext(client), [
+                commandAction(["sanbox", "templates", "validate", payload.template.id, "--json"], "Validate the new template before running it."),
+                commandAction(["sanbox", "run", "<task>", "--template", payload.template.id], "Create a run with the new template.")
+            ]);
+            return;
+        }
+        process.stdout.write(`created ${payload.template.id} provider=${payload.template.provider_id || modelProvider} model=${payload.template.model_id || model}` +
+            `${payload.template.llm_budget_usd ? ` budget=$${payload.template.llm_budget_usd}/run` : ""}\n`);
+        return;
+    }
+    throw new CliError("templates_action_required", "templates requires an action: list, get, validate, or create.");
+};
 const commandRuns = async (command, flags) => {
     const client = makeClient(flags);
     const action = command[1];
-    const runId = command[2];
-    if (!action || !runId)
-        throw new Error("runs command requires an action and run id.");
+    if (!action)
+        throw new Error("runs command requires an action.");
+    if (action === "list") {
+        const limit = integerFlag(flags, "limit", 50, 1, 200);
+        const payload = await client.listRuns(limit);
+        if (hasFlag(flags, "json")) {
+            printSuccess("runs.list", { ...payload, runs: payload.runs.map(publicRun) }, jsonContext(client));
+            return;
+        }
+        for (const run of payload.runs) {
+            process.stdout.write(`${run.id}\t${run.status}\t${run.created_at}\t${run.instruction.replace(/\s+/g, " ").slice(0, 100)}\n`);
+        }
+        return;
+    }
+    const runId = requiredPositional(command[2], "run_id_required", `runs ${action} requires a run id.`);
     if (action === "get") {
         const payload = await client.getRun(runId);
         if (hasFlag(flags, "json"))
-            printJson(payload);
+            printSuccess("runs.get", publicRunPayload(payload), jsonContext(client));
         else
             printRun(payload);
         return;
     }
     if (action === "events") {
-        const payload = await client.listEvents(runId, flagNumber(flags, "after-event-id", 0));
+        const payload = await client.listEvents(runId, integerFlag(flags, "after-event-id", 0, 0, Number.MAX_SAFE_INTEGER));
         if (hasFlag(flags, "json"))
-            printJson(payload);
+            printSuccess("runs.events", payload, jsonContext(client));
         else
             payload.events.forEach((event) => process.stdout.write(`${event.id} ${event.level} ${event.kind} ${event.message}\n`));
         return;
     }
+    if (action === "messages") {
+        const payload = await client.listMessages(runId);
+        if (hasFlag(flags, "json")) {
+            printSuccess("runs.messages", payload, jsonContext(client));
+            return;
+        }
+        for (const message of payload.messages) {
+            process.stdout.write(`${message.role}\t${message.created_at}\t${message.message}\n`);
+        }
+        return;
+    }
+    if (action === "artifacts") {
+        const payload = await client.listArtifacts(runId);
+        if (hasFlag(flags, "json")) {
+            printSuccess("runs.artifacts", payload, jsonContext(client));
+            return;
+        }
+        for (const artifact of payload.artifacts) {
+            process.stdout.write(`${artifact.path}\t${artifact.size_bytes}\n`);
+        }
+        return;
+    }
+    if (action === "download") {
+        const outputDirectory = requiredPositional(flagString(flags, "output"), "output_directory_required", "runs download requires --output.");
+        const payload = await client.listArtifacts(runId);
+        const requested = flagList(flags, "artifact");
+        const selected = requested.length === 0
+            ? payload.artifacts
+            : requested.map((artifactPath) => {
+                const artifact = payload.artifacts.find((item) => item.path === artifactPath);
+                if (!artifact) {
+                    throw new CliError("artifact_not_found", `Run ${runId} has no artifact named ${artifactPath}.`, {
+                        details: { run_id: runId, artifact_path: artifactPath },
+                        nextActions: [commandAction(["sanbox", "runs", "artifacts", runId, "--json"], "List exact artifact paths for this run.")]
+                    });
+                }
+                return artifact;
+            });
+        let downloads;
+        try {
+            downloads = await downloadArtifacts(client, runId, selected, outputDirectory, hasFlag(flags, "overwrite"));
+        }
+        catch (error) {
+            if (error instanceof ArtifactExistsError) {
+                throw new CliError("artifact_exists", error.message, {
+                    details: {
+                        run_id: runId,
+                        artifact_path: error.artifactPath,
+                        local_path: error.destination
+                    },
+                    nextActions: [commandAction(["sanbox", "runs", "download", runId, "--output", "<new-output-directory>", "--json"], "Download into a new directory without replacing an existing file.")]
+                });
+            }
+            throw error;
+        }
+        const result = {
+            run_id: runId,
+            output_directory: path.resolve(outputDirectory),
+            downloads
+        };
+        if (hasFlag(flags, "json")) {
+            printSuccess("runs.download", result, jsonContext(client));
+            return;
+        }
+        for (const download of downloads) {
+            process.stdout.write(`${download.path}\t${download.local_path}\t${download.size_bytes}\t${download.sha256}\n`);
+        }
+        return;
+    }
+    if (action === "watch") {
+        validateWatchFlags({ ...flags, watch: true });
+        const payload = await watchRunWithOutput(client, runId, { ...flags, watch: true });
+        if (!payload)
+            return;
+        if (!hasFlag(flags, "jsonl"))
+            printRun(payload);
+        if (isTerminalRun(payload.run) && payload.run.status !== "completed")
+            process.exitCode = 2;
+        return;
+    }
     if (action === "cancel") {
         const payload = await client.cancelRun(runId);
         if (hasFlag(flags, "json"))
-            printJson(payload);
+            printSuccess("runs.cancel", publicRunPayload(payload), jsonContext(client));
         else
             printRun(payload);
         return;
     }
     if (action === "message") {
-        const message = flagString(flags, "message");
+        const flaggedMessage = flagString(flags, "message");
+        const positionalMessage = positionalText(command, 3);
+        if (flaggedMessage && positionalMessage) {
+            throw new CliError("conflicting_arguments", "Use either --message or a positional message, not both.");
+        }
+        const message = flaggedMessage || positionalMessage;
         if (!message)
-            throw new Error("--message is required.");
-        const payload = await client.sendMessage(runId, message);
-        if (hasFlag(flags, "json"))
-            printJson(payload);
-        else
-            printRun(payload);
+            throw new Error("--message or a positional message is required.");
+        if (wantsWatch(flags) && hasFlag(flags, "json")) {
+            throw new Error("--json cannot be combined with --watch or --jsonl.");
+        }
+        if (hasFlag(flags, "wait") && wantsWatch(flags)) {
+            throw new Error("--wait cannot be combined with --watch or --jsonl.");
+        }
+        const submitted = await client.sendMessage(runId, message);
+        if (!hasFlag(flags, "wait") && !wantsWatch(flags)) {
+            if (hasFlag(flags, "json")) {
+                printSuccess("runs.message", {
+                    ...publicRunPayload(submitted),
+                    message: submitted.message,
+                    chat_job: submitted.chat_job
+                }, jsonContext(client));
+            }
+            else
+                process.stdout.write(`queued follow-up for run ${runId}\n`);
+            return;
+        }
+        const chatJobId = submitted.chat_job.id;
+        const belongsToFollowup = (event) => event.payload.chat_job_id === chatJobId;
+        const queuedEventId = submitted.events.reduce((latest, event) => event.kind === "chat.queued" && belongsToFollowup(event) ? Math.max(latest, event.id) : latest, 0);
+        const receivedEventId = [...submitted.events]
+            .reverse()
+            .find((event) => event.kind === "message.received" && belongsToFollowup(event))?.id ?? queuedEventId;
+        const cursor = submitted.events.reduce((latest, event) => Math.max(latest, event.id), 0);
+        const completedInResponse = [...submitted.events]
+            .reverse()
+            .find((event) => (event.kind === "chat.completed" || event.kind === "chat.failed") && belongsToFollowup(event));
+        const view = parseActivityView(flagString(flags, "view", "activity"));
+        const jsonl = hasFlag(flags, "jsonl");
+        const controller = new AbortController();
+        const onInterrupt = () => controller.abort();
+        process.once("SIGINT", onInterrupt);
+        if (wantsWatch(flags) && !jsonl)
+            process.stdout.write(`Watching follow-up for run ${runId}. Ctrl-C detaches.\n`);
+        try {
+            const renderFollowupEvent = (event) => {
+                if (!belongsToFollowup(event))
+                    return;
+                if (!wantsWatch(flags) || !shouldRenderEvent(event, view))
+                    return;
+                process.stdout.write(`${jsonl ? formatActivityJsonl(event) : formatActivityLine(event, submitted.run.created_at)}\n`);
+            };
+            for (const event of submitted.events) {
+                if (event.id >= receivedEventId)
+                    renderFollowupEvent(event);
+            }
+            const terminalEvent = completedInResponse ?? await watchEventsUntil(client, runId, {
+                afterEventId: cursor,
+                pageSize: integerFlag(flags, "event-page-size", 200, 1, 500),
+                pollIntervalMs: integerFlag(flags, "poll-interval-ms", 2000, 250, 60_000),
+                timeoutSeconds: integerFlag(flags, "timeout-seconds", 1800, 1, 604_800),
+                signal: controller.signal,
+                stopWhen: (event) => (event.kind === "chat.completed" || event.kind === "chat.failed") && belongsToFollowup(event),
+                onRetry: ({ error, attempt, delayMs }) => {
+                    const detail = error instanceof Error ? error.message : String(error);
+                    process.stderr.write(`Follow-up connection lost (${detail}); retry ${attempt} in ${delayMs}ms.\n`);
+                },
+                onEvent: renderFollowupEvent
+            });
+            const messages = await client.listMessages(runId);
+            if (hasFlag(flags, "json")) {
+                printSuccess("runs.message", {
+                    ...publicRunPayload(submitted),
+                    message: submitted.message,
+                    chat_job: submitted.chat_job,
+                    messages: messages.messages,
+                    followup_event: terminalEvent
+                }, jsonContext(client));
+            }
+            else if (!jsonl) {
+                const assistant = [...messages.messages].reverse().find((item) => item.role === "assistant" && item.payload.chat_job_id === chatJobId);
+                if (assistant)
+                    process.stdout.write(`${assistant.message}\n`);
+            }
+            if (terminalEvent.kind === "chat.failed")
+                process.exitCode = 2;
+        }
+        catch (error) {
+            if (!(error instanceof WatchInterruptedError))
+                throw error;
+            process.stderr.write(`Detached from follow-up for run ${runId}; processing continues.\n`);
+            process.exitCode = 130;
+        }
+        finally {
+            process.off("SIGINT", onInterrupt);
+        }
         return;
     }
     throw new Error(`Unknown runs action: ${action}`);
 };
+const commandDoctor = async (flags) => {
+    const localConfig = readLocalConfig();
+    const apiUrl = String(flags["api-url"] || process.env.SANBOX_API_URL || localConfig.api_url || defaultApiUrl).replace(/\/+$/, "");
+    const org = String(flags.org || process.env.SANBOX_ORG || localConfig.org || "").trim();
+    const apiKey = process.env.SANBOX_API_KEY || "";
+    const selection = readTemplateSelection(flags, { required: false });
+    const checks = [];
+    const nextActions = [];
+    const add = (name, ok, detail, data) => checks.push({
+        name,
+        ok,
+        detail,
+        ...(data === undefined ? {} : { data })
+    });
+    add("node", Number(process.versions.node.split(".")[0]) >= 20, process.version);
+    add("api_url", Boolean(apiUrl), apiUrl);
+    add("org", Boolean(org), org || "missing SANBOX_ORG, --org, or .sanbox/config.json org");
+    add("api_key", Boolean(apiKey), apiKey ? "present in environment" : "missing SANBOX_API_KEY");
+    if (!org) {
+        nextActions.push(commandAction(["sanbox", "doctor", "--json"], "Select an organization and run the checks again.", { SANBOX_ORG: "<org-slug>" }));
+    }
+    if (!apiKey) {
+        nextActions.push(commandAction(["sanbox", "doctor", "--json"], "Set a Sanbox control-plane API key and run the checks again.", { SANBOX_API_KEY: "<sanbox-api-key>" }));
+    }
+    try {
+        const res = await fetch(`${apiUrl}/health`);
+        add("api_health", res.ok, `${res.status} ${res.statusText}`);
+    }
+    catch (error) {
+        add("api_health", false, error instanceof Error ? error.message : String(error));
+    }
+    if (org && apiKey) {
+        const client = new SanboxClient({ apiUrl, org, apiKey });
+        try {
+            const me = await client.me();
+            const organizations = Array.isArray(me.organizations)
+                ? me.organizations
+                : [];
+            add("auth", true, "authenticated");
+            add("org_visible", organizations.some((item) => item.slug === org), org);
+        }
+        catch (error) {
+            add("auth", false, error instanceof Error ? error.message : String(error));
+        }
+        try {
+            const providers = await client.listModelProviders();
+            add("model_providers", true, providers.providers.map((item) => `${providerId(item)}:${item.status || (item.configured ? "configured" : "not_configured")}`).join(", ") || "none", providers.providers);
+        }
+        catch (error) {
+            add("model_providers", false, error instanceof Error ? error.message : String(error));
+        }
+        if (!selection) {
+            add("template", false, "not selected; use --template, SANBOX_TEMPLATE, or .sanbox/config.json default_template");
+            nextActions.push(...templateActions());
+        }
+        else {
+            try {
+                const template = await client.getTemplate(selection.id);
+                add("template", true, `${template.template.id}; source=${selection.source}`, template.template);
+                try {
+                    const validation = await client.validateTemplate(selection.id);
+                    const runnable = validationRunnable(validation);
+                    add("template_readiness", runnable, runnable ? "ready" : "blocked", validation);
+                    if (!runnable) {
+                        nextActions.push(commandAction(["sanbox", "model-providers", "list", "--json"], "Inspect model-provider status."), providerConsoleAction(client));
+                    }
+                }
+                catch (error) {
+                    add("template_readiness", false, error instanceof Error ? error.message : String(error));
+                }
+            }
+            catch (error) {
+                add("template", false, error instanceof Error ? error.message : String(error));
+                nextActions.push(...templateActions());
+            }
+        }
+    }
+    try {
+        const preview = await previewInputs({ cwd: cwd(), inputs: ["README.md"] });
+        add("input_preview", true, `${preview.files.length} file(s), ${formatBytes(preview.totalBytes)}`);
+    }
+    catch (error) {
+        add("input_preview", false, error instanceof Error ? error.message : String(error));
+    }
+    const output = {
+        ok: checks.every((check) => check.ok),
+        template_selection: selection,
+        checks
+    };
+    if (hasFlag(flags, "json")) {
+        printSuccess("doctor", output, { api_url: apiUrl, ...(org ? { org } : {}) }, nextActions);
+    }
+    else {
+        for (const check of checks) {
+            process.stdout.write(`${check.ok ? "ok" : "fail"} ${check.name}: ${check.detail}\n`);
+        }
+    }
+    if (!output.ok)
+        process.exitCode = 2;
+};
 const commandInit = async (command, flags) => {
-    if (command[1] !== "agent")
-        throw new Error("Only `sanbox init agent` is supported.");
-    if (hasFlag(flags, "write")) {
-        const dir = path.join(cwd(), ".sanbox");
-        await fs.mkdir(dir, { recursive: true });
-        await fs.writeFile(path.join(dir, "agent.md"), agentInstructions, "utf8");
-        process.stdout.write(".sanbox/agent.md written\n");
+    const dir = path.join(cwd(), ".sanbox");
+    if (command[1] === "agent") {
+        if (hasFlag(flags, "write")) {
+            await fs.mkdir(dir, { recursive: true });
+            await fs.writeFile(path.join(dir, "agent.md"), agentInstructions, "utf8");
+            if (hasFlag(flags, "json")) {
+                printSuccess("init.agent", { path: ".sanbox/agent.md", status: "written" }, localJsonContext(flags));
+            }
+            else {
+                process.stdout.write(".sanbox/agent.md written\n");
+            }
+            return;
+        }
+        if (hasFlag(flags, "json")) {
+            printSuccess("init.agent", { instructions: agentInstructions }, localJsonContext(flags));
+        }
+        else {
+            process.stdout.write(agentInstructions);
+        }
         return;
     }
-    process.stdout.write(agentInstructions);
+    if (command[1])
+        throw new Error("init supports no subcommand or `agent`.");
+    const force = hasFlag(flags, "force");
+    const localConfig = readLocalConfig();
+    const apiUrl = String(flags["api-url"] || process.env.SANBOX_API_URL || localConfig.api_url || defaultApiUrl).replace(/\/+$/, "");
+    const org = String(flags.org || process.env.SANBOX_ORG || localConfig.org || "").trim();
+    const template = readTemplateSelection(flags, { required: false });
+    const config = {
+        api_url: apiUrl,
+        org,
+        ...(template ? { default_template: template.id } : {})
+    };
+    const sanboxIgnore = [
+        "# Project-specific Sanbox excludes. Defaults already exclude .git, node_modules, build output, env files, and secret-like names.",
+        "",
+        "# examples:",
+        "# data/private/**",
+        "# tmp/**",
+        ""
+    ].join("\n");
+    await fs.mkdir(dir, { recursive: true });
+    const results = [
+        [".sanbox/config.json", await writeIfNeeded(path.join(dir, "config.json"), `${JSON.stringify(config, null, 2)}\n`, force)],
+        [".sanbox/agent.md", await writeIfNeeded(path.join(dir, "agent.md"), agentInstructions, force)],
+        [".sanboxignore", await writeIfNeeded(path.join(cwd(), ".sanboxignore"), sanboxIgnore, force)]
+    ];
+    if (hasFlag(flags, "json")) {
+        printSuccess("init", {
+            files: results.map(([file, status]) => ({ file, status })),
+            template_selection: template
+        }, { api_url: apiUrl, ...(org ? { org } : {}) }, template ? [] : templateActions());
+    }
+    else {
+        for (const [file, status] of results)
+            process.stdout.write(`${status} ${file}\n`);
+    }
+};
+const helpFor = (command) => {
+    if (command[0] === "run")
+        return runHelp;
+    if (command[0] === "doctor")
+        return doctorHelp;
+    if (command[0] === "model-providers")
+        return modelProvidersHelp;
+    if (command[0] === "templates")
+        return templatesHelp;
+    return help;
 };
-const main = async () => {
-    const { command, flags } = parseArgs(process.argv.slice(2));
-    if (command.length === 0 || hasFlag(flags, "help")) {
+const commandId = (command) => {
+    if (command[0] === "version" || command.length === 0)
+        return "version";
+    if (command[0] === "auth")
+        return "auth.check";
+    if (command[0] === "orgs")
+        return `orgs.${command[1] || "unknown"}`;
+    if (command[0] === "context")
+        return "context.get";
+    if (command[0] === "model-providers")
+        return `model_providers.${command[1] || "unknown"}`;
+    if (command[0] === "templates")
+        return `templates.${command[1] || "unknown"}`;
+    if (command[0] === "run")
+        return "run.create";
+    if (command[0] === "batch")
+        return "batch.create";
+    if (command[0] === "runs")
+        return `runs.${command[1] || "unknown"}`;
+    return command[0] || "help";
+};
+const main = async (command, flags) => {
+    validateFlagValues(flags);
+    normalizeInputAlias(command, flags);
+    validateFlags(command, flags);
+    validatePositionals(command, flags);
+    if (command[0] === "version" || (command.length === 0 && hasFlag(flags, "version"))) {
+        if (hasFlag(flags, "json"))
+            printSuccess("version", { version });
+        else
+            process.stdout.write(`${version}\n`);
+        return;
+    }
+    if (command.length === 0) {
         process.stdout.write(help);
         return;
     }
+    if (hasFlag(flags, "help")) {
+        process.stdout.write(helpFor(command));
+        return;
+    }
     if (command[0] === "auth" && command[1] === "check")
         return commandAuthCheck(flags);
+    if (command[0] === "orgs")
+        return commandOrganizations(command, flags);
+    if (command[0] === "context")
+        return commandContext(flags);
+    if (command[0] === "doctor")
+        return commandDoctor(flags);
+    if (command[0] === "model-providers")
+        return commandModelProviders(command, flags);
+    if (command[0] === "templates")
+        return commandTemplates(command, flags);
     if (command[0] === "run")
-        return commandRun(flags);
+        return commandRun(command, flags);
     if (command[0] === "batch")
         return commandBatch(flags);
     if (command[0] === "runs")
         return commandRuns(command, flags);
     if (command[0] === "init")
         return commandInit(command, flags);
-    throw new Error(`Unknown command: ${command.join(" ")}`);
+    throw new CliError("unknown_command", `Unknown command: ${command.join(" ")}`);
 };
-main().catch((error) => {
-    process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
-    process.exit(1);
+const parsed = parseArgs(process.argv.slice(2));
+main(parsed.command, parsed.flags).catch((error) => {
+    if (hasFlag(parsed.flags, "jsonl")) {
+        printJsonlError(commandId(parsed.command), error, localJsonContext(parsed.flags));
+    }
+    else if (hasFlag(parsed.flags, "json")) {
+        printError(commandId(parsed.command), error, localJsonContext(parsed.flags));
+    }
+    else {
+        process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
+    }
+    process.exitCode = error instanceof CliError ? error.exitCode : 1;
 });