@cursor/bdk 0.2.8 → 0.2.10

package/dist/bin/agent-serve.js

@@ -11,19 +11,11 @@
  *   agent-sdk trajectory --events <file.ndjson>
  *   agent-sdk init      [dir] [--json]
  *   agent-sdk convert-automation <url> [--dir <path>] [--json]
+ *   agent-sdk migrate   [--dir .] [--no-wait] [--json]
  *   agent-sdk eval        [--dir .] [evalId...]
  *   agent-sdk validate   [--dir .]
  *   agent-sdk slack     <subcommand>
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { spawn } from "node:child_process";
 import { readFile } from "node:fs/promises";
 import { resolve } from "node:path";
@@ -85,6 +77,8 @@ Usage:
                           [--slug <slug>] [--team <id>] [--text]
   ${CLI} init        [dir] [--template <name>] [--var id=value]... [--json]
   ${CLI} convert-automation <url> [--dir <path>] [--json]
+  ${CLI} migrate     [--dir <path>] [--repo <url>] [--ref <ref>] [--path <agentPath>]
+                          [--no-wait] [--json]
   ${CLI} install-skills [--print] [--json]
   ${CLI} mcp         --prod [--slug <slug>] [--team <id>] [--dir <path>]
                           | --url <baseUrl> [--bearer-token <t>]
@@ -206,6 +200,11 @@ Commands:
               resolved at runtime (manage authorization in Cursor, dashboard
               -> MCP). Review the project, then run \`validate\` / \`dev\`.
               Warnings never fail the command.
+  migrate     Early-alpha projects only: start a Cursor cloud agent that
+              moves the project from hosted architecture v1 to v2 with the
+              bdk-migrate-v2 skill and opens a pull request. Reads the
+              pushed ref; --repo/--ref/--path are inferred like deploy.
+              Waits for the pull request unless --no-wait. Never deploys.
   install-skills
               Refresh the BDK skills for coding agents in
               ~/.cursor/skills/bdk and print where they landed.
@@ -384,7 +383,8 @@ Options:
                      path without writing them.
   --no-wait          deploy/stop/eval: return right after the request is
                      accepted instead of polling until a terminal status.
-                     For eval, prints the runId (--url only).
+                     For eval, prints the runId (--url only). migrate: print
+                     the cloud agent URL and exit.
   --cancel-runs      stop: also cancel this install's active Agent SDK v2
                      session runs and reminder clocks, and mark factory
                      creating/active sessions failed (not every tenant).
@@ -441,12 +441,13 @@ Options:
   --repo             serve --cursor-events: repo to subscribe to (repeatable).
                      github forward: owner/repo to forward from (inferred from
                      the git remote when omitted; last wins).
-                     deploy: https git repo URL (optional; inferred from
-                     git remote origin when omitted).
-  --ref              deploy: git ref to build (optional; inferred from the
-                     current branch when omitted).
-  --path             deploy: agent dir relative to repo root (optional;
-                     inferred from --dir vs git toplevel when omitted).
+                     deploy/migrate: https git repo URL (optional; inferred
+                     from git remote origin when omitted).
+  --ref              deploy/migrate: git ref to build or migrate (optional;
+                     inferred from the current branch when omitted).
+  --path             deploy/migrate: agent dir relative to repo root
+                     (optional; inferred from --dir vs git toplevel when
+                     omitted).
   --all              deploy: every child agent under a multi-agent --dir
                      (skips the interactive picker; mutually exclusive with
                      --slug).
@@ -489,812 +490,832 @@ function writeStdout(text) {
         });
     });
 }
-function main(argv) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        var _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
-        const [command, ...restIn] = argv;
-        if (command === undefined || command === "help" || command === "--help" || command === "-h") {
-            // Await the write: HELP is larger than a pipe buffer, and process.exit
-            // after main() would otherwise truncate --help under execFile / CI.
-            yield writeStdout(HELP);
-            return command === undefined ? 1 : 0;
-        }
-        if (command === "version" || command === "--version" || command === "-V") {
-            yield writeStdout(formatCliVersion({ json: restIn.includes("--json") }));
-            return 0;
+async function main(argv) {
+    const [command, ...restIn] = argv;
+    if (command === undefined || command === "help" || command === "--help" || command === "-h") {
+        // Await the write: HELP is larger than a pipe buffer, and process.exit
+        // after main() would otherwise truncate --help under execFile / CI.
+        await writeStdout(HELP);
+        return command === undefined ? 1 : 0;
+    }
+    if (command === "version" || command === "--version" || command === "-V") {
+        await writeStdout(formatCliVersion({ json: restIn.includes("--json") }));
+        return 0;
+    }
+    // `session --events` means "dump raw events" (boolean). Rewrite so it does
+    // not collide with run/trajectory's `--events <file.ndjson>` string flag.
+    const rest = command === "session" ? restIn.map(arg => (arg === "--events" ? "--raw-events" : arg)) : restIn;
+    const { values, positionals } = parseArgs({
+        args: rest,
+        allowPositionals: true,
+        options: {
+            dir: { type: "string", default: "." },
+            template: { type: "string" },
+            var: { type: "string", multiple: true },
+            port: { type: "string" },
+            host: { type: "string" },
+            mode: { type: "string" },
+            dev: { type: "boolean", default: false },
+            "api-key": { type: "string" },
+            "key-name": { type: "string" },
+            "state-root": { type: "string" },
+            "bearer-token": { type: "string" },
+            "allow-anonymous": { type: "boolean", default: false },
+            "allow-anonymous-cursor-github": { type: "boolean", default: false },
+            "allow-anonymous-cursor-account-mcp": { type: "boolean", default: false },
+            "allow-anonymous-grokbot": { type: "boolean", default: false },
+            "cursor-scm-proxy": { type: "boolean", default: false },
+            "no-schedules": { type: "boolean", default: false },
+            "no-control-plane": { type: "boolean", default: false },
+            "no-playground": { type: "boolean", default: false },
+            "no-docs": { type: "boolean", default: false },
+            url: { type: "string" },
+            prod: { type: "boolean", default: false },
+            message: { type: "string", multiple: true },
+            input: { type: "string" },
+            "messages-file": { type: "string" },
+            "session-id": { type: "string" },
+            session: { type: "string" },
+            resume: { type: "boolean", default: false },
+            "continuation-token": { type: "string" },
+            events: { type: "string" },
+            "no-events": { type: "boolean", default: false },
+            slug: { type: "string" },
+            "timeout-ms": { type: "string" },
+            tag: { type: "string", multiple: true },
+            list: { type: "boolean", default: false },
+            verbose: { type: "boolean", default: false },
+            text: { type: "boolean", default: false },
+            "no-color": { type: "boolean", default: false },
+            "no-stream": { type: "boolean", default: false },
+            once: { type: "boolean", default: false },
+            "raw-events": { type: "boolean", default: false },
+            json: { type: "boolean", default: false },
+            name: { type: "string" },
+            env: { type: "string" },
+            "public-url": { type: "string" },
+            "cloud-tools-url": { type: "string" },
+            "mount-path": { type: "string" },
+            "base-url": { type: "string" },
+            print: { type: "boolean", default: false },
+            store: { type: "boolean", default: false },
+            remote: { type: "boolean", default: false },
+            transport: { type: "string" },
+            prefix: { type: "string" },
+            "no-prefix": { type: "boolean", default: false },
+            "channel-posts": { type: "boolean", default: false },
+            "slack-team": { type: "string" },
+            icon: { type: "string" },
+            force: { type: "boolean", default: false },
+            manual: { type: "boolean", default: false },
+            repo: { type: "string", multiple: true },
+            org: { type: "string" },
+            "cursor-events": { type: "boolean", default: false },
+            secret: { type: "string" },
+            channel: { type: "string", multiple: true },
+            install: { type: "boolean", default: false },
+            "no-install": { type: "boolean", default: false },
+            action: { type: "string" },
+            conclusion: { type: "string" },
+            context: { type: "string" },
+            comment: { type: "string" },
+            "dry-run": { type: "boolean", default: false },
+            "as-of": { type: "string" },
+            component: { type: "string" },
+            out: { type: "string" },
+            team: { type: "string" },
+            "no-wait": { type: "boolean", default: false },
+            "cancel-runs": { type: "boolean", default: false },
+            ref: { type: "string" },
+            release: { type: "string" },
+            path: { type: "string" },
+            all: { type: "boolean", default: false },
+            "cursor-events-repo": { type: "string", multiple: true },
+            "allow-domain": { type: "string", multiple: true },
+            // Hidden Anysphere-only flag; omitted from help.
+            "multi-tenant": { type: "boolean", default: false },
+            "from-argv": { type: "boolean", default: false },
+            strict: { type: "boolean", default: false },
+            junit: { type: "string" },
+            artifacts: { type: "string" },
+            "no-artifacts": { type: "boolean", default: false },
+            "skip-report": { type: "boolean", default: false },
+            "max-concurrency": { type: "string" },
+            version: { type: "boolean", short: "V", default: false },
+        },
+    });
+    const dir = values.dir ?? ".";
+    if (values.version === true) {
+        await writeStdout(formatCliVersion({ json: values.json === true }));
+        return 0;
+    }
+    // Best-effort, cached, and silent on failure. `update` does its own fresh
+    // lookup, --json runs stay quiet for machine consumers, and `mcp` skips it
+    // so MCP client spawns stay fast (stdout there is the protocol wire).
+    if (command !== "update" &&
+        command !== "mcp" &&
+        values.json !== true &&
+        !isServeRestartWorker()) {
+        await warnIfOutdated();
+    }
+    switch (command) {
+        case "slack": {
+            const { cmdSlack } = await import("../internal/cli-slack.js");
+            const env = values.env === "dev" || values.env === "prod" || values.env === "both"
+                ? values.env
+                : undefined;
+            return cmdSlack(positionals[0], {
+                dir,
+                name: values.name,
+                env,
+                json: values.json,
+                print: values.print,
+                prefix: values.prefix,
+                noPrefix: values["no-prefix"],
+                channelPosts: values["channel-posts"],
+                channels: values.channel,
+                slackTeam: values["slack-team"],
+                prod: values.prod,
+                team: values.team,
+                apiKey: values["api-key"],
+                icon: values.icon,
+                force: values.force,
+                manual: values.manual,
+                install: values.install,
+                noInstall: values["no-install"],
+                iconSource: positionals[0] === "icon" ? positionals[1] : undefined,
+            });
         }
-        // `session --events` means "dump raw events" (boolean). Rewrite so it does
-        // not collide with run/trajectory's `--events <file.ndjson>` string flag.
-        const rest = command === "session" ? restIn.map(arg => (arg === "--events" ? "--raw-events" : arg)) : restIn;
-        const { values, positionals } = parseArgs({
-            args: rest,
-            allowPositionals: true,
-            options: {
-                dir: { type: "string", default: "." },
-                template: { type: "string" },
-                var: { type: "string", multiple: true },
-                port: { type: "string" },
-                host: { type: "string" },
-                mode: { type: "string" },
-                dev: { type: "boolean", default: false },
-                "api-key": { type: "string" },
-                "key-name": { type: "string" },
-                "state-root": { type: "string" },
-                "bearer-token": { type: "string" },
-                "allow-anonymous": { type: "boolean", default: false },
-                "allow-anonymous-cursor-github": { type: "boolean", default: false },
-                "allow-anonymous-cursor-account-mcp": { type: "boolean", default: false },
-                "allow-anonymous-grokbot": { type: "boolean", default: false },
-                "cursor-scm-proxy": { type: "boolean", default: false },
-                "no-schedules": { type: "boolean", default: false },
-                "no-control-plane": { type: "boolean", default: false },
-                "no-playground": { type: "boolean", default: false },
-                "no-docs": { type: "boolean", default: false },
-                url: { type: "string" },
-                prod: { type: "boolean", default: false },
-                message: { type: "string", multiple: true },
-                input: { type: "string" },
-                "messages-file": { type: "string" },
-                "session-id": { type: "string" },
-                session: { type: "string" },
-                resume: { type: "boolean", default: false },
-                "continuation-token": { type: "string" },
-                events: { type: "string" },
-                "no-events": { type: "boolean", default: false },
-                slug: { type: "string" },
-                "timeout-ms": { type: "string" },
-                tag: { type: "string", multiple: true },
-                list: { type: "boolean", default: false },
-                verbose: { type: "boolean", default: false },
-                text: { type: "boolean", default: false },
-                "no-color": { type: "boolean", default: false },
-                "no-stream": { type: "boolean", default: false },
-                once: { type: "boolean", default: false },
-                "raw-events": { type: "boolean", default: false },
-                json: { type: "boolean", default: false },
-                name: { type: "string" },
-                env: { type: "string" },
-                "public-url": { type: "string" },
-                "cloud-tools-url": { type: "string" },
-                "mount-path": { type: "string" },
-                "base-url": { type: "string" },
-                print: { type: "boolean", default: false },
-                store: { type: "boolean", default: false },
-                remote: { type: "boolean", default: false },
-                transport: { type: "string" },
-                prefix: { type: "string" },
-                "no-prefix": { type: "boolean", default: false },
-                "channel-posts": { type: "boolean", default: false },
-                "slack-team": { type: "string" },
-                icon: { type: "string" },
-                force: { type: "boolean", default: false },
-                manual: { type: "boolean", default: false },
-                repo: { type: "string", multiple: true },
-                org: { type: "string" },
-                "cursor-events": { type: "boolean", default: false },
-                secret: { type: "string" },
-                channel: { type: "string", multiple: true },
-                install: { type: "boolean", default: false },
-                "no-install": { type: "boolean", default: false },
-                action: { type: "string" },
-                conclusion: { type: "string" },
-                context: { type: "string" },
-                comment: { type: "string" },
-                "dry-run": { type: "boolean", default: false },
-                "as-of": { type: "string" },
-                component: { type: "string" },
-                out: { type: "string" },
-                team: { type: "string" },
-                "no-wait": { type: "boolean", default: false },
-                "cancel-runs": { type: "boolean", default: false },
-                ref: { type: "string" },
-                release: { type: "string" },
-                path: { type: "string" },
-                all: { type: "boolean", default: false },
-                "cursor-events-repo": { type: "string", multiple: true },
-                "allow-domain": { type: "string", multiple: true },
-                // Hidden Anysphere-only flag; omitted from help.
-                "multi-tenant": { type: "boolean", default: false },
-                "from-argv": { type: "boolean", default: false },
-                strict: { type: "boolean", default: false },
-                junit: { type: "string" },
-                artifacts: { type: "string" },
-                "no-artifacts": { type: "boolean", default: false },
-                "skip-report": { type: "boolean", default: false },
-                "max-concurrency": { type: "string" },
-                version: { type: "boolean", short: "V", default: false },
-            },
-        });
-        const dir = (_l = values.dir) !== null && _l !== void 0 ? _l : ".";
-        if (values.version === true) {
-            yield writeStdout(formatCliVersion({ json: values.json === true }));
-            return 0;
+        case "github": {
+            const port = values.port === undefined ? undefined : Number.parseInt(values.port, 10);
+            if (port !== undefined && (Number.isNaN(port) || port < 0 || port > 65535)) {
+                process.stderr.write(`invalid --port: ${values.port}\n`);
+                return 1;
+            }
+            const { cmdGithub } = await import("../internal/cli-github.js");
+            return cmdGithub(positionals[0], {
+                dir,
+                slug: values.slug,
+                // `--channel` is repeatable for `slack doctor`; the github
+                // subcommands target a single channel, so the last one wins.
+                channel: values.channel?.at(-1),
+                host: values.host,
+                port,
+                url: values.url,
+                events: values.events,
+                // `--repo` is repeatable for `serve --cursor-events`; the github
+                // subcommands target a single repo, so the last one wins.
+                repo: values.repo?.at(-1),
+                org: values.org,
+                secret: values.secret,
+                install: values.install,
+                json: values.json,
+                prUrl: positionals[1],
+                action: values.action,
+                conclusion: values.conclusion,
+                context: values.context,
+                comment: values.comment,
+                dryRun: values["dry-run"],
+                out: values.out,
+            });
         }
-        // Best-effort, cached, and silent on failure. `update` does its own fresh
-        // lookup, --json runs stay quiet for machine consumers, and `mcp` skips it
-        // so MCP client spawns stay fast (stdout there is the protocol wire).
-        if (command !== "update" &&
-            command !== "mcp" &&
-            values.json !== true &&
-            !isServeRestartWorker()) {
-            yield warnIfOutdated();
+        case "gitlab": {
+            const port = values.port === undefined ? undefined : Number.parseInt(values.port, 10);
+            if (port !== undefined && (Number.isNaN(port) || port < 0 || port > 65535)) {
+                process.stderr.write(`invalid --port: ${values.port}\n`);
+                return 1;
+            }
+            const { cmdGitlab } = await import("../internal/cli-gitlab.js");
+            return cmdGitlab(positionals[0], {
+                dir,
+                slug: values.slug,
+                channel: values.channel?.at(-1),
+                host: values.host,
+                port,
+                url: values.url,
+                events: values.events,
+                secret: values.secret,
+                json: values.json,
+                mrUrl: positionals[1],
+                action: values.action,
+                conclusion: values.conclusion,
+                comment: values.comment,
+                dryRun: values["dry-run"],
+                out: values.out,
+            });
         }
-        switch (command) {
-            case "slack": {
-                const { cmdSlack } = yield import("../internal/cli-slack.js");
-                const env = values.env === "dev" || values.env === "prod" || values.env === "both"
-                    ? values.env
-                    : undefined;
-                return cmdSlack(positionals[0], {
-                    dir,
-                    name: values.name,
-                    env,
-                    json: values.json,
-                    print: values.print,
-                    prefix: values.prefix,
-                    noPrefix: values["no-prefix"],
-                    channelPosts: values["channel-posts"],
-                    channels: values.channel,
-                    slackTeam: values["slack-team"],
-                    prod: values.prod,
-                    team: values.team,
-                    apiKey: values["api-key"],
-                    icon: values.icon,
-                    force: values.force,
-                    manual: values.manual,
-                    install: values.install,
-                    noInstall: values["no-install"],
-                    iconSource: positionals[0] === "icon" ? positionals[1] : undefined,
-                });
+        case "bitbucket": {
+            const port = values.port === undefined ? undefined : Number.parseInt(values.port, 10);
+            if (port !== undefined && (Number.isNaN(port) || port < 0 || port > 65535)) {
+                process.stderr.write(`invalid --port: ${values.port}\n`);
+                return 1;
             }
-            case "github": {
-                const port = values.port === undefined ? undefined : Number.parseInt(values.port, 10);
-                if (port !== undefined && (Number.isNaN(port) || port < 0 || port > 65535)) {
-                    process.stderr.write(`invalid --port: ${values.port}\n`);
+            const { cmdBitbucket } = await import("../internal/cli-bitbucket.js");
+            return cmdBitbucket(positionals[0], {
+                dir,
+                slug: values.slug,
+                channel: values.channel?.at(-1),
+                host: values.host,
+                port,
+                url: values.url,
+                events: values.events,
+                secret: values.secret,
+                json: values.json,
+                prUrl: positionals[1],
+                comment: values.comment,
+                dryRun: values["dry-run"],
+                out: values.out,
+            });
+        }
+        case "init": {
+            return cmdInit({
+                dir,
+                initTarget: positionals[0],
+                template: values.template,
+                vars: values.var,
+                json: values.json,
+            });
+        }
+        case "convert-automation": {
+            const { cmdConvertAutomation } = await import("../internal/cli-convert-automation.js");
+            const dirFlagPassed = rest.includes("--dir") || rest.some(arg => arg.startsWith("--dir="));
+            return cmdConvertAutomation({
+                url: positionals[0],
+                // Default target is ./<automation-name-slug>, not the cwd.
+                dir: dirFlagPassed ? dir : undefined,
+                json: values.json,
+                apiKey: values["api-key"],
+            });
+        }
+        case "migrate": {
+            const { cmdMigrate } = await import("../internal/cli-migrate.js");
+            return cmdMigrate({
+                dir,
+                repo: values.repo?.at(-1),
+                ref: values.ref,
+                path: values.path,
+                noWait: values["no-wait"],
+                json: values.json,
+                apiKey: values["api-key"],
+            });
+        }
+        case "install-skills": {
+            const { cmdInstallSkills } = await import("../internal/cli-skills.js");
+            return cmdInstallSkills({
+                json: values.json,
+                print: values.print,
+            });
+        }
+        case "mcp": {
+            const { cmdMcp } = await import("../internal/cli-mcp.js");
+            const mcpSub = positionals[0];
+            return cmdMcp(mcpSub, {
+                dir,
+                slug: values.slug,
+                team: values.team,
+                apiKey: values["api-key"],
+                url: values.url,
+                prod: values.prod,
+                bearerToken: values["bearer-token"],
+                name: values.name,
+                print: values.print,
+                json: values.json,
+                store: values.store,
+                remote: values.remote,
+                oauthConnection: mcpSub === "oauth" ? positionals[1] : undefined,
+            });
+        }
+        case "login": {
+            const { cmdLogin } = await import("../internal/cli-cursor.js");
+            return cmdLogin({
+                apiKey: values["api-key"],
+                keyName: values["key-name"],
+            });
+        }
+        case "logout": {
+            const { cmdLogout } = await import("../internal/cli-cursor.js");
+            return cmdLogout();
+        }
+        case "whoami": {
+            const { cmdWhoami } = await import("../internal/cli-cursor.js");
+            return cmdWhoami({ json: values.json });
+        }
+        case "update": {
+            return cmdUpdate();
+        }
+        case "deploy": {
+            // `--repo` is repeatable for `serve --cursor-events`; deploy targets a
+            // single source repo, so the last one wins.
+            const repo = values.repo?.at(-1);
+            const dirFlagPassed = rest.includes("--dir") || rest.some(arg => arg.startsWith("--dir="));
+            return cmdDeploy({
+                ...deployOptionsFromValues(values),
+                dir: dirFlagPassed ? dir : undefined,
+                ...(values.slug === undefined ? {} : { slug: values.slug }),
+                all: values.all === true,
+                ...(repo === undefined ? {} : { repo }),
+                ...(values.ref === undefined ? {} : { ref: values.ref }),
+                ...(values.path === undefined ? {} : { path: values.path }),
+                ...(values["cursor-events-repo"] === undefined
+                    ? {}
+                    : { cursorEventsRepos: values["cursor-events-repo"] }),
+                ...(values["allow-domain"] === undefined ? {} : { allowDomains: values["allow-domain"] }),
+                multiTenant: values["multi-tenant"] === true,
+            });
+        }
+        case "manifest": {
+            // Offline extraction of deploy metadata (events, egress, routes,
+            // /v1/info payload) — no VM, no network. Wd-1 of the event-ingress
+            // plan; `deploy` attaches this to the request from Wd-2 on.
+            return cmdManifest({ dir, json: values.json === true });
+        }
+        case "deployments": {
+            return cmdDeployments(deployOptionsFromValues(values));
+        }
+        case "deployment": {
+            return cmdDeploymentStatus(positionals[0], deployOptionsFromValues(values));
+        }
+        case "stop": {
+            return cmdStop(positionals[0], deployOptionsFromValues(values));
+        }
+        case "kill": {
+            return cmdKill(positionals[0], deployOptionsFromValues(values));
+        }
+        case "unlock-deploys": {
+            return cmdUnlockDeploys(positionals[0], deployOptionsFromValues(values));
+        }
+        case "start": {
+            return cmdStart(positionals[0], deployOptionsFromValues(values));
+        }
+        case "cancel-runs": {
+            return cmdCancelRuns(positionals[0], deployOptionsFromValues(values));
+        }
+        case "event-repos": {
+            return cmdEventRepos(positionals[0], values.repo ?? [], deployOptionsFromValues(values));
+        }
+        case "upgrade": {
+            return cmdUpgrade({ slug: positionals[0], release: values.release }, deployOptionsFromValues(values));
+        }
+        case "rollback": {
+            return cmdRollback({ slug: positionals[0], release: values.release }, deployOptionsFromValues(values));
+        }
+        case "delete": {
+            return cmdDelete(positionals[0], deployOptionsFromValues(values));
+        }
+        case "rotate-token": {
+            return cmdRotateToken(positionals[0], deployOptionsFromValues(values));
+        }
+        case "secrets": {
+            const base = deployOptionsFromValues(values);
+            switch (positionals[0]) {
+                case "set":
+                    return cmdSecretsSet(positionals[1], positionals.slice(2), base);
+                case "list":
+                    return cmdSecretsList(positionals[1], base);
+                case "unset":
+                    return cmdSecretsUnset(positionals[1], positionals[2], base);
+                default:
+                    process.stderr.write(`Usage: ${CLI} secrets <set|list|unset> <slug> ... [--team <id>] [--json]\n`);
                     return 1;
-                }
-                const { cmdGithub } = yield import("../internal/cli-github.js");
-                return cmdGithub(positionals[0], {
-                    dir,
-                    slug: values.slug,
-                    // `--channel` is repeatable for `slack doctor`; the github
-                    // subcommands target a single channel, so the last one wins.
-                    channel: (_a = values.channel) === null || _a === void 0 ? void 0 : _a.at(-1),
-                    host: values.host,
-                    port,
-                    url: values.url,
-                    events: values.events,
-                    // `--repo` is repeatable for `serve --cursor-events`; the github
-                    // subcommands target a single repo, so the last one wins.
-                    repo: (_b = values.repo) === null || _b === void 0 ? void 0 : _b.at(-1),
-                    org: values.org,
-                    secret: values.secret,
-                    install: values.install,
-                    json: values.json,
-                    prUrl: positionals[1],
-                    action: values.action,
-                    conclusion: values.conclusion,
-                    context: values.context,
-                    comment: values.comment,
-                    dryRun: values["dry-run"],
-                    out: values.out,
-                });
             }
-            case "gitlab": {
-                const port = values.port === undefined ? undefined : Number.parseInt(values.port, 10);
-                if (port !== undefined && (Number.isNaN(port) || port < 0 || port > 65535)) {
-                    process.stderr.write(`invalid --port: ${values.port}\n`);
+        }
+        case "images": {
+            const base = deployOptionsFromValues(values);
+            switch (positionals[0]) {
+                case "push":
+                    return cmdImagesPush({ image: positionals[1], name: values.name }, base);
+                case "list":
+                    return cmdImagesList(base);
+                case "rm":
+                    return cmdImagesRm(positionals[1], base);
+                default:
+                    process.stderr.write(`Usage: ${CLI} images <push <local-image> --name <name>|list|rm <name>> [--team <id>] [--json]\n`);
                     return 1;
-                }
-                const { cmdGitlab } = yield import("../internal/cli-gitlab.js");
-                return cmdGitlab(positionals[0], {
-                    dir,
-                    slug: values.slug,
-                    channel: (_c = values.channel) === null || _c === void 0 ? void 0 : _c.at(-1),
-                    host: values.host,
-                    port,
-                    url: values.url,
-                    events: values.events,
-                    secret: values.secret,
-                    json: values.json,
-                    mrUrl: positionals[1],
-                    action: values.action,
-                    conclusion: values.conclusion,
-                    comment: values.comment,
-                    dryRun: values["dry-run"],
-                    out: values.out,
-                });
             }
-            case "bitbucket": {
-                const port = values.port === undefined ? undefined : Number.parseInt(values.port, 10);
-                if (port !== undefined && (Number.isNaN(port) || port < 0 || port > 65535)) {
-                    process.stderr.write(`invalid --port: ${values.port}\n`);
-                    return 1;
-                }
-                const { cmdBitbucket } = yield import("../internal/cli-bitbucket.js");
-                return cmdBitbucket(positionals[0], {
-                    dir,
-                    slug: values.slug,
-                    channel: (_d = values.channel) === null || _d === void 0 ? void 0 : _d.at(-1),
-                    host: values.host,
-                    port,
-                    url: values.url,
-                    events: values.events,
-                    secret: values.secret,
-                    json: values.json,
-                    prUrl: positionals[1],
-                    comment: values.comment,
-                    dryRun: values["dry-run"],
-                    out: values.out,
-                });
+        }
+        case "run": {
+            const messages = await loadMessages(values.message, values["messages-file"]);
+            return cmdRun(axFromOptions({
+                dir,
+                messages,
+                sessionId: values["session-id"] ?? values.session,
+                continuationToken: values["continuation-token"],
+                events: values["no-events"] ? false : values.events === undefined ? true : values.events,
+                text: values.text,
+                url: values.url,
+                prod: values.prod,
+                team: values.team,
+                apiKey: values["api-key"],
+                slug: values.slug,
+                bearerToken: values["bearer-token"],
+                stateRoot: values["state-root"],
+                timeoutMs: parseTimeoutMs(values["timeout-ms"]),
+                stream: values["no-stream"] ? false : undefined,
+                dryRun: values["dry-run"],
+                asOf: values["as-of"],
+                componentKey: values.component,
+            }));
+        }
+        case "call": {
+            return cmdCall(axFromOptions({
+                dir,
+                toolName: positionals[0],
+                toolInput: values.input,
+                sessionId: values["session-id"] ?? values.session,
+                url: values.url,
+                prod: values.prod,
+                team: values.team,
+                apiKey: values["api-key"],
+                slug: values.slug,
+                bearerToken: values["bearer-token"],
+                stateRoot: values["state-root"],
+            }));
+        }
+        case "skill": {
+            return cmdSkill(positionals[0], axFromOptions({
+                dir,
+                text: values.text,
+                url: values.url,
+                prod: values.prod,
+                team: values.team,
+                apiKey: values["api-key"],
+                slug: values.slug,
+                bearerToken: values["bearer-token"],
+                stateRoot: values["state-root"],
+            }));
+        }
+        case "trajectory": {
+            if (values.events === undefined) {
+                process.stderr.write("trajectory requires --events <file.ndjson>\n");
+                return 1;
             }
-            case "init": {
-                return cmdInit({
+            return cmdTrajectory(axFromOptions({
+                dir,
+                events: values.events,
+                text: values.text,
+            }));
+        }
+        case "eval": {
+            // Remote status subcommand only when targeting --url. Otherwise the
+            // bare token "status" is a normal eval id (evals/status.eval.ts).
+            if (positionals[0] === "status" && values.url !== undefined) {
+                return cmdEvalStatus(positionals[1], axFromOptions({
                     dir,
-                    initTarget: positionals[0],
-                    template: values.template,
-                    vars: values.var,
-                    json: values.json,
-                });
-            }
-            case "convert-automation": {
-                const { cmdConvertAutomation } = yield import("../internal/cli-convert-automation.js");
-                const dirFlagPassed = rest.includes("--dir") || rest.some(arg => arg.startsWith("--dir="));
-                return cmdConvertAutomation({
-                    url: positionals[0],
-                    // Default target is ./<automation-name-slug>, not the cwd.
-                    dir: dirFlagPassed ? dir : undefined,
                     json: values.json,
-                    apiKey: values["api-key"],
-                });
-            }
-            case "install-skills": {
-                const { cmdInstallSkills } = yield import("../internal/cli-skills.js");
-                return cmdInstallSkills({
-                    json: values.json,
-                    print: values.print,
-                });
-            }
-            case "mcp": {
-                const { cmdMcp } = yield import("../internal/cli-mcp.js");
-                const mcpSub = positionals[0];
-                return cmdMcp(mcpSub, {
-                    dir,
-                    slug: values.slug,
-                    team: values.team,
-                    apiKey: values["api-key"],
                     url: values.url,
                     prod: values.prod,
-                    bearerToken: values["bearer-token"],
-                    name: values.name,
-                    print: values.print,
-                    json: values.json,
-                    store: values.store,
-                    remote: values.remote,
-                    oauthConnection: mcpSub === "oauth" ? positionals[1] : undefined,
-                });
-            }
-            case "login": {
-                const { cmdLogin } = yield import("../internal/cli-cursor.js");
-                return cmdLogin({
-                    apiKey: values["api-key"],
-                    keyName: values["key-name"],
-                });
-            }
-            case "logout": {
-                const { cmdLogout } = yield import("../internal/cli-cursor.js");
-                return cmdLogout();
-            }
-            case "whoami": {
-                const { cmdWhoami } = yield import("../internal/cli-cursor.js");
-                return cmdWhoami({ json: values.json });
-            }
-            case "update": {
-                return cmdUpdate();
-            }
-            case "deploy": {
-                // `--repo` is repeatable for `serve --cursor-events`; deploy targets a
-                // single source repo, so the last one wins.
-                const repo = (_e = values.repo) === null || _e === void 0 ? void 0 : _e.at(-1);
-                const dirFlagPassed = rest.includes("--dir") || rest.some(arg => arg.startsWith("--dir="));
-                return cmdDeploy(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, deployOptionsFromValues(values)), { dir: dirFlagPassed ? dir : undefined }), (values.slug === undefined ? {} : { slug: values.slug })), { all: values.all === true }), (repo === undefined ? {} : { repo })), (values.ref === undefined ? {} : { ref: values.ref })), (values.path === undefined ? {} : { path: values.path })), (values["cursor-events-repo"] === undefined
-                    ? {}
-                    : { cursorEventsRepos: values["cursor-events-repo"] })), (values["allow-domain"] === undefined ? {} : { allowDomains: values["allow-domain"] })), { multiTenant: values["multi-tenant"] === true }));
-            }
-            case "manifest": {
-                // Offline extraction of deploy metadata (events, egress, routes,
-                // /v1/info payload) — no VM, no network. Wd-1 of the event-ingress
-                // plan; `deploy` attaches this to the request from Wd-2 on.
-                return cmdManifest({ dir, json: values.json === true });
-            }
-            case "deployments": {
-                return cmdDeployments(deployOptionsFromValues(values));
-            }
-            case "deployment": {
-                return cmdDeploymentStatus(positionals[0], deployOptionsFromValues(values));
-            }
-            case "stop": {
-                return cmdStop(positionals[0], deployOptionsFromValues(values));
-            }
-            case "kill": {
-                return cmdKill(positionals[0], deployOptionsFromValues(values));
-            }
-            case "unlock-deploys": {
-                return cmdUnlockDeploys(positionals[0], deployOptionsFromValues(values));
-            }
-            case "start": {
-                return cmdStart(positionals[0], deployOptionsFromValues(values));
-            }
-            case "cancel-runs": {
-                return cmdCancelRuns(positionals[0], deployOptionsFromValues(values));
-            }
-            case "event-repos": {
-                return cmdEventRepos(positionals[0], (_m = values.repo) !== null && _m !== void 0 ? _m : [], deployOptionsFromValues(values));
-            }
-            case "upgrade": {
-                return cmdUpgrade({ slug: positionals[0], release: values.release }, deployOptionsFromValues(values));
-            }
-            case "rollback": {
-                return cmdRollback({ slug: positionals[0], release: values.release }, deployOptionsFromValues(values));
-            }
-            case "delete": {
-                return cmdDelete(positionals[0], deployOptionsFromValues(values));
-            }
-            case "rotate-token": {
-                return cmdRotateToken(positionals[0], deployOptionsFromValues(values));
-            }
-            case "secrets": {
-                const base = deployOptionsFromValues(values);
-                switch (positionals[0]) {
-                    case "set":
-                        return cmdSecretsSet(positionals[1], positionals.slice(2), base);
-                    case "list":
-                        return cmdSecretsList(positionals[1], base);
-                    case "unset":
-                        return cmdSecretsUnset(positionals[1], positionals[2], base);
-                    default:
-                        process.stderr.write(`Usage: ${CLI} secrets <set|list|unset> <slug> ... [--team <id>] [--json]\n`);
-                        return 1;
-                }
-            }
-            case "images": {
-                const base = deployOptionsFromValues(values);
-                switch (positionals[0]) {
-                    case "push":
-                        return cmdImagesPush({ image: positionals[1], name: values.name }, base);
-                    case "list":
-                        return cmdImagesList(base);
-                    case "rm":
-                        return cmdImagesRm(positionals[1], base);
-                    default:
-                        process.stderr.write(`Usage: ${CLI} images <push <local-image> --name <name>|list|rm <name>> [--team <id>] [--json]\n`);
-                        return 1;
-                }
-            }
-            case "run": {
-                const messages = yield loadMessages(values.message, values["messages-file"]);
-                return cmdRun(axFromOptions({
-                    dir,
-                    messages,
-                    sessionId: (_o = values["session-id"]) !== null && _o !== void 0 ? _o : values.session,
-                    continuationToken: values["continuation-token"],
-                    events: values["no-events"] ? false : values.events === undefined ? true : values.events,
-                    text: values.text,
-                    url: values.url,
-                    prod: values.prod,
-                    team: values.team,
-                    apiKey: values["api-key"],
                     slug: values.slug,
                     bearerToken: values["bearer-token"],
-                    stateRoot: values["state-root"],
-                    timeoutMs: parseTimeoutMs(values["timeout-ms"]),
-                    stream: values["no-stream"] ? false : undefined,
-                    dryRun: values["dry-run"],
-                    asOf: values["as-of"],
-                    componentKey: values.component,
+                    out: values.out,
                 }));
             }
-            case "call": {
-                return cmdCall(axFromOptions({
+            if (positionals[0] === "cancel" && values.url !== undefined) {
+                return cmdEvalCancel(positionals[1], axFromOptions({
                     dir,
-                    toolName: positionals[0],
-                    toolInput: values.input,
-                    sessionId: (_p = values["session-id"]) !== null && _p !== void 0 ? _p : values.session,
+                    json: values.json,
                     url: values.url,
                     prod: values.prod,
-                    team: values.team,
-                    apiKey: values["api-key"],
                     slug: values.slug,
                     bearerToken: values["bearer-token"],
-                    stateRoot: values["state-root"],
                 }));
             }
-            case "skill": {
-                return cmdSkill(positionals[0], axFromOptions({
-                    dir,
-                    text: values.text,
-                    url: values.url,
-                    prod: values.prod,
-                    team: values.team,
-                    apiKey: values["api-key"],
-                    slug: values.slug,
-                    bearerToken: values["bearer-token"],
-                    stateRoot: values["state-root"],
-                }));
+            return cmdEval(axFromOptions({
+                dir,
+                evalIds: positionals,
+                list: values.list,
+                verbose: values.verbose,
+                json: values.json,
+                tags: values.tag,
+                url: values.url,
+                prod: values.prod,
+                noWait: values["no-wait"],
+                slug: values.slug,
+                bearerToken: values["bearer-token"],
+                stateRoot: values["state-root"],
+                timeoutMs: parseTimeoutMs(values["timeout-ms"]),
+                stream: values["no-stream"] ? false : undefined,
+                strict: values.strict,
+                junit: values.junit,
+                artifacts: values["no-artifacts"] ? false : values.artifacts,
+                skipReport: values["skip-report"],
+                maxConcurrency: parseMaxConcurrency(values["max-concurrency"]),
+                out: values.out,
+            }));
+        }
+        case "chat": {
+            return cmdChat(axFromOptions({
+                dir,
+                messages: values.message,
+                url: values.url,
+                prod: values.prod,
+                team: values.team,
+                apiKey: values["api-key"],
+                slug: values.slug,
+                sessionId: values["session-id"] ?? values.session,
+                resume: values.resume,
+                continuationToken: values["continuation-token"],
+                bearerToken: values["bearer-token"],
+                json: values.json,
+                text: values.text,
+                noColor: values["no-color"],
+            }));
+        }
+        case "resume": {
+            return cmdResume(positionals[0], axFromOptions({
+                dir,
+                messages: values.message,
+                url: values.url,
+                prod: values.prod,
+                team: values.team,
+                apiKey: values["api-key"],
+                slug: values.slug,
+                // Positional wins; --session is accepted as a redundant alias.
+                // No id → resume previous (cmdResume sets resume: true).
+                sessionId: positionals[0] ?? values["session-id"] ?? values.session,
+                continuationToken: values["continuation-token"],
+                bearerToken: values["bearer-token"],
+                json: values.json,
+                text: values.text,
+                noColor: values["no-color"],
+            }));
+        }
+        case "logs": {
+            return cmdLogs(axFromOptions({
+                dir,
+                url: values.url,
+                prod: values.prod,
+                team: values.team,
+                apiKey: values["api-key"],
+                slug: values.slug,
+                bearerToken: values["bearer-token"],
+                sessionId: positionals[0] ?? values["session-id"] ?? values.session,
+                json: values.json,
+                once: values.once,
+            }));
+        }
+        case "sessions": {
+            return cmdSessions(axFromOptions({
+                dir,
+                url: values.url,
+                prod: values.prod,
+                team: values.team,
+                apiKey: values["api-key"],
+                slug: values.slug,
+                bearerToken: values["bearer-token"],
+                json: values.json,
+            }));
+        }
+        case "session": {
+            const messages = await loadMessages(values.message, values["messages-file"]);
+            return cmdSession(positionals[0], axFromOptions({
+                dir,
+                url: values.url,
+                prod: values.prod,
+                team: values.team,
+                apiKey: values["api-key"],
+                slug: values.slug,
+                bearerToken: values["bearer-token"],
+                json: values.json,
+                text: values.text,
+                rawEvents: values["raw-events"],
+                out: values.out,
+                messages,
+                sessionId: values["session-id"] ?? values.session,
+                dryRun: values["dry-run"],
+                asOf: values["as-of"],
+                componentKey: values.component,
+            }));
+        }
+        case "cost": {
+            return cmdCost(positionals[0] ?? values["session-id"] ?? values.session, axFromOptions({
+                dir,
+                url: values.url,
+                prod: values.prod,
+                team: values.team,
+                apiKey: values["api-key"],
+                slug: values.slug,
+                bearerToken: values["bearer-token"],
+                json: values.json,
+            }));
+        }
+        case "playground": {
+            return cmdPlayground(axFromOptions({
+                dir,
+                url: values.url,
+                prod: values.prod,
+                team: values.team,
+                apiKey: values["api-key"],
+                slug: values.slug,
+                bearerToken: values["bearer-token"],
+                sessionId: values["session-id"] ?? values.session,
+                print: values.print,
+            }));
+        }
+        case "docs": {
+            const docsPort = values.port === undefined ? 0 : Number.parseInt(values.port, 10);
+            if (Number.isNaN(docsPort) || docsPort < 0 || docsPort > 65535) {
+                process.stderr.write(`invalid --port: ${values.port}\n`);
+                return 1;
             }
-            case "trajectory": {
-                if (values.events === undefined) {
-                    process.stderr.write("trajectory requires --events <file.ndjson>\n");
-                    return 1;
+            const { cmdDocs } = await import("../internal/cli-docs.js");
+            return cmdDocs({
+                port: docsPort,
+                host: values.host,
+                print: values.print === true,
+            });
+        }
+        case "validate": {
+            const mounts = await loadMounts(dir);
+            let hasError = false;
+            for (const { slug, project } of mounts) {
+                const label = slug === "" ? project.name : `${slug} (${project.name})`;
+                if (project.diagnostics.length === 0) {
+                    process.stdout.write(`ok: ${label} has no diagnostics\n`);
+                    continue;
                 }
-                return cmdTrajectory(axFromOptions({
-                    dir,
-                    events: values.events,
-                    text: values.text,
-                }));
+                process.stdout.write(`${label}:\n${formatDiagnostics(project.diagnostics)}\n`);
+                hasError ||= project.diagnostics.some(d => d.severity === "error");
             }
-            case "eval": {
-                // Remote status subcommand only when targeting --url. Otherwise the
-                // bare token "status" is a normal eval id (evals/status.eval.ts).
-                if (positionals[0] === "status" && values.url !== undefined) {
-                    return cmdEvalStatus(positionals[1], axFromOptions({
-                        dir,
-                        json: values.json,
-                        url: values.url,
-                        prod: values.prod,
-                        slug: values.slug,
-                        bearerToken: values["bearer-token"],
-                        out: values.out,
-                    }));
-                }
-                if (positionals[0] === "cancel" && values.url !== undefined) {
-                    return cmdEvalCancel(positionals[1], axFromOptions({
-                        dir,
-                        json: values.json,
-                        url: values.url,
-                        prod: values.prod,
-                        slug: values.slug,
-                        bearerToken: values["bearer-token"],
-                    }));
-                }
-                return cmdEval(axFromOptions({
-                    dir,
-                    evalIds: positionals,
-                    list: values.list,
-                    verbose: values.verbose,
-                    json: values.json,
-                    tags: values.tag,
-                    url: values.url,
-                    prod: values.prod,
-                    noWait: values["no-wait"],
-                    slug: values.slug,
-                    bearerToken: values["bearer-token"],
-                    stateRoot: values["state-root"],
-                    timeoutMs: parseTimeoutMs(values["timeout-ms"]),
-                    stream: values["no-stream"] ? false : undefined,
-                    strict: values.strict,
-                    junit: values.junit,
-                    artifacts: values["no-artifacts"] ? false : values.artifacts,
-                    skipReport: values["skip-report"],
-                    maxConcurrency: parseMaxConcurrency(values["max-concurrency"]),
-                    out: values.out,
-                }));
+            return hasError ? 1 : 0;
+        }
+        case "info": {
+            const mounts = await loadMounts(dir);
+            if (values.json) {
+                const payload = mounts.length === 1 && mounts[0]?.slug === ""
+                    ? projectInfo(mounts[0].project)
+                    : {
+                        agents: mounts.map(({ slug, project }) => ({
+                            slug,
+                            ...projectInfo(project),
+                        })),
+                    };
+                process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
+                return 0;
             }
-            case "chat": {
-                return cmdChat(axFromOptions({
-                    dir,
-                    messages: values.message,
-                    url: values.url,
-                    prod: values.prod,
-                    team: values.team,
-                    apiKey: values["api-key"],
-                    slug: values.slug,
-                    sessionId: (_q = values["session-id"]) !== null && _q !== void 0 ? _q : values.session,
-                    resume: values.resume,
-                    continuationToken: values["continuation-token"],
-                    bearerToken: values["bearer-token"],
-                    json: values.json,
-                    text: values.text,
-                    noColor: values["no-color"],
-                }));
+            if (mounts.length > 1 || mounts[0]?.slug !== "") {
+                process.stdout.write(`${mounts.length} agents under ${dir}:\n\n`);
+                for (const { slug, project } of mounts) {
+                    const info = projectInfo(project);
+                    process.stdout.write(`  /${slug}  —  ${info.name}  (${formatModel(info.model)}, ${info.tools.length} tools, ${info.channels.length} channels)\n`);
+                }
+                const anyError = mounts.some(m => m.project.diagnostics.some(d => d.severity === "error"));
+                return anyError ? 1 : 0;
             }
-            case "resume": {
-                return cmdResume(positionals[0], axFromOptions({
-                    dir,
-                    messages: values.message,
-                    url: values.url,
-                    prod: values.prod,
-                    team: values.team,
-                    apiKey: values["api-key"],
-                    slug: values.slug,
-                    // Positional wins; --session is accepted as a redundant alias.
-                    // No id → resume previous (cmdResume sets resume: true).
-                    sessionId: (_s = (_r = positionals[0]) !== null && _r !== void 0 ? _r : values["session-id"]) !== null && _s !== void 0 ? _s : values.session,
-                    continuationToken: values["continuation-token"],
-                    bearerToken: values["bearer-token"],
-                    json: values.json,
-                    text: values.text,
-                    noColor: values["no-color"],
-                }));
+            const project = mounts[0]?.project;
+            const info = projectInfo(project);
+            const lines = [];
+            lines.push(`agent: ${info.name}`);
+            lines.push(`model: ${formatModel(info.model)}`);
+            lines.push(`mcp: ${info.mcp.path} (${info.mcp.tools.join(", ")})`);
+            if (info.instructions !== undefined) {
+                lines.push(`instructions: ${info.instructions.chars} chars`);
             }
-            case "logs": {
-                return cmdLogs(axFromOptions({
-                    dir,
-                    url: values.url,
-                    prod: values.prod,
-                    team: values.team,
-                    apiKey: values["api-key"],
-                    slug: values.slug,
-                    bearerToken: values["bearer-token"],
-                    sessionId: (_u = (_t = positionals[0]) !== null && _t !== void 0 ? _t : values["session-id"]) !== null && _u !== void 0 ? _u : values.session,
-                    json: values.json,
-                    once: values.once,
-                }));
+            lines.push(section("tools", info.tools.map(t => `${t.name} — ${t.description}`)));
+            lines.push(section("skills", info.skills.map(s => `${s.name} — ${s.description}`)));
+            lines.push(section("extensions", info.extensions.map(e => {
+                const contributed = [...e.tools, ...e.skills].join(", ") || "(nothing contributed)";
+                const egress = e.hosting?.egressDomains ?? [];
+                return egress.length === 0
+                    ? `${e.name} — ${contributed}`
+                    : `${e.name} — ${contributed}; egress: ${egress.join(", ")}`;
+            })));
+            lines.push(section("MCP connections", info.connections.map(c => `${c.name} — ${c.transport}`)));
+            lines.push(section("subagents", info.subagents.map(s => `${s.name} — ${s.description ?? ""}`)));
+            lines.push(section("channels", info.channels.map(c => `${c.id}: ${c.routes.map(r => `${r.method} ${r.url}`).join(", ") || "(events only)"}`)));
+            lines.push(section("schedules", info.schedules.map(s => `${s.name} (${s.cron}, ${s.kind})`)));
+            lines.push(section("hooks", info.hooks));
+            lines.push(section("hosting egress domains", info.hosting?.egressDomains ?? []));
+            lines.push(section("hosting secret names", info.hosting?.secretNames ?? []));
+            if (info.diagnostics.length > 0) {
+                lines.push(`\ndiagnostics:\n${formatDiagnostics(info.diagnostics)}`);
             }
-            case "sessions": {
-                return cmdSessions(axFromOptions({
-                    dir,
-                    url: values.url,
-                    prod: values.prod,
-                    team: values.team,
-                    apiKey: values["api-key"],
-                    slug: values.slug,
-                    bearerToken: values["bearer-token"],
-                    json: values.json,
-                }));
+            process.stdout.write(`${lines.filter(line => line !== "").join("\n")}\n`);
+            return info.diagnostics.some(d => d.severity === "error") ? 1 : 0;
+        }
+        case "dev":
+        case "serve": {
+            const serveDirResult = resolveServeDir({
+                command,
+                dir,
+                positionals,
+                dirFlagPassed: rest.includes("--dir"),
+            });
+            if (typeof serveDirResult !== "string") {
+                process.stderr.write(serveDirResult.error);
+                return 1;
             }
-            case "session": {
-                const messages = yield loadMessages(values.message, values["messages-file"]);
-                return cmdSession(positionals[0], axFromOptions({
-                    dir,
-                    url: values.url,
-                    prod: values.prod,
-                    team: values.team,
-                    apiKey: values["api-key"],
-                    slug: values.slug,
-                    bearerToken: values["bearer-token"],
-                    json: values.json,
-                    text: values.text,
-                    rawEvents: values["raw-events"],
-                    out: values.out,
-                    messages,
-                    sessionId: (_v = values["session-id"]) !== null && _v !== void 0 ? _v : values.session,
-                    dryRun: values["dry-run"],
-                    asOf: values["as-of"],
-                    componentKey: values.component,
-                }));
+            const serveDir = serveDirResult;
+            const port = values.port === undefined ? undefined : Number.parseInt(values.port, 10);
+            if (port !== undefined && (Number.isNaN(port) || port < 0 || port > 65535)) {
+                process.stderr.write(`invalid --port: ${values.port}\n`);
+                return 1;
             }
-            case "cost": {
-                return cmdCost((_x = (_w = positionals[0]) !== null && _w !== void 0 ? _w : values["session-id"]) !== null && _x !== void 0 ? _x : values.session, axFromOptions({
-                    dir,
-                    url: values.url,
-                    prod: values.prod,
-                    team: values.team,
-                    apiKey: values["api-key"],
-                    slug: values.slug,
-                    bearerToken: values["bearer-token"],
-                    json: values.json,
-                }));
+            if (values["allow-anonymous"] === true && values["bearer-token"] !== undefined) {
+                process.stderr.write("--allow-anonymous and --bearer-token are mutually exclusive\n");
+                return 1;
             }
-            case "playground": {
-                return cmdPlayground(axFromOptions({
-                    dir,
-                    url: values.url,
-                    prod: values.prod,
-                    team: values.team,
-                    apiKey: values["api-key"],
-                    slug: values.slug,
-                    bearerToken: values["bearer-token"],
-                    sessionId: (_y = values["session-id"]) !== null && _y !== void 0 ? _y : values.session,
-                    print: values.print,
-                }));
+            const mode = values.mode;
+            if (mode !== undefined && mode !== "single" && mode !== "multi") {
+                process.stderr.write(`invalid --mode: ${mode} (expected "single" or "multi")\n`);
+                return 1;
             }
-            case "docs": {
-                const docsPort = values.port === undefined ? 0 : Number.parseInt(values.port, 10);
-                if (Number.isNaN(docsPort) || docsPort < 0 || docsPort > 65535) {
-                    process.stderr.write(`invalid --port: ${values.port}\n`);
-                    return 1;
+            const dev = command === "dev" || values.dev === true;
+            const style = stdoutPalette();
+            // Real env wins (loadEnvFile never overrides). Runs inside start()
+            // so dev's Enter-restart picks up tokens written since boot.
+            const loadLocalEnv = () => {
+                const loadedEnvFiles = loadAgentLocalEnv(serveDir);
+                if (loadedEnvFiles.length > 0) {
+                    process.stdout.write(`${style.dim(`env: loaded ${loadedEnvFiles.join(", ")}`)}\n`);
                 }
-                const { cmdDocs } = yield import("../internal/cli-docs.js");
-                return cmdDocs({
-                    port: docsPort,
-                    host: values.host,
-                    print: values.print === true,
+            };
+            const serveOptions = {
+                port,
+                host: values.host,
+                mode: mode,
+                dev,
+                apiKey: values["api-key"],
+                stateRoot: values["state-root"],
+                authToken: values["bearer-token"],
+                allowAnonymous: values["allow-anonymous"] === true ? true : undefined,
+                allowAnonymousCursorGithub: values["allow-anonymous-cursor-github"] === true ? true : undefined,
+                allowAnonymousCursorAccountMcp: values["allow-anonymous-cursor-account-mcp"] === true ? true : undefined,
+                allowAnonymousGrokbot: values["allow-anonymous-grokbot"] === true ? true : undefined,
+                cursorScmProxy: values["cursor-scm-proxy"] === true ? true : undefined,
+                schedules: values["no-schedules"] === true ? false : undefined,
+                noControlPlane: values["no-control-plane"] === true ? true : undefined,
+                playground: values["no-playground"] === true ? false : undefined,
+                docs: values["no-docs"] === true ? false : undefined,
+                publicUrl: values["public-url"],
+                cloudToolsUrl: values["cloud-tools-url"],
+                cursorEvents: values["cursor-events"] === true ? { repos: values.repo ?? [] } : undefined,
+                // Soft boot logs stay secondary to the banner. `dim` is a no-op on
+                // already-styled lines (the MCP warning box).
+                logger: (line) => {
+                    process.stdout.write(`${style.dim(line)}\n`);
+                },
+            };
+            const enterToRestart = process.stdin.isTTY === true;
+            if (enterToRestart && !isServeRestartWorker()) {
+                return runEnterRestartSupervisor({
+                    spawn: (command, args, spawnOptions) => spawn(command, args, spawnOptions),
+                    onRestart: () => {
+                        clearTerminal();
+                    },
                 });
             }
-            case "validate": {
-                const mounts = yield loadMounts(dir);
-                let hasError = false;
-                for (const { slug, project } of mounts) {
-                    const label = slug === "" ? project.name : `${slug} (${project.name})`;
-                    if (project.diagnostics.length === 0) {
-                        process.stdout.write(`ok: ${label} has no diagnostics\n`);
-                        continue;
-                    }
-                    process.stdout.write(`${label}:\n${formatDiagnostics(project.diagnostics)}\n`);
-                    hasError || (hasError = project.diagnostics.some(d => d.severity === "error"));
-                }
-                return hasError ? 1 : 0;
-            }
-            case "info": {
-                const mounts = yield loadMounts(dir);
-                if (values.json) {
-                    const payload = mounts.length === 1 && ((_f = mounts[0]) === null || _f === void 0 ? void 0 : _f.slug) === ""
-                        ? projectInfo(mounts[0].project)
-                        : {
-                            agents: mounts.map(({ slug, project }) => (Object.assign({ slug }, projectInfo(project)))),
-                        };
-                    process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
-                    return 0;
+            const bannerOpts = {
+                noPlayground: values["no-playground"] === true,
+                dev,
+                bearerToken: values["bearer-token"] !== undefined,
+                noSchedules: values["no-schedules"] === true,
+            };
+            const start = async () => {
+                loadLocalEnv();
+                const next = await serve(serveDir, serveOptions);
+                printServeBanner(next, bannerOpts);
+                if (enterToRestart) {
+                    process.stdout.write(style.dim("  press Enter to restart\n"));
                 }
-                if (mounts.length > 1 || ((_g = mounts[0]) === null || _g === void 0 ? void 0 : _g.slug) !== "") {
-                    process.stdout.write(`${mounts.length} agents under ${dir}:\n\n`);
-                    for (const { slug, project } of mounts) {
-                        const info = projectInfo(project);
-                        process.stdout.write(`  /${slug}  —  ${info.name}  (${formatModel(info.model)}, ${info.tools.length} tools, ${info.channels.length} channels)\n`);
-                    }
-                    const anyError = mounts.some(m => m.project.diagnostics.some(d => d.severity === "error"));
-                    return anyError ? 1 : 0;
-                }
-                const project = (_h = mounts[0]) === null || _h === void 0 ? void 0 : _h.project;
-                const info = projectInfo(project);
-                const lines = [];
-                lines.push(`agent: ${info.name}`);
-                lines.push(`model: ${formatModel(info.model)}`);
-                lines.push(`mcp: ${info.mcp.path} (${info.mcp.tools.join(", ")})`);
-                if (info.instructions !== undefined) {
-                    lines.push(`instructions: ${info.instructions.chars} chars`);
-                }
-                lines.push(section("tools", info.tools.map(t => `${t.name} — ${t.description}`)));
-                lines.push(section("skills", info.skills.map(s => `${s.name} — ${s.description}`)));
-                lines.push(section("extensions", info.extensions.map(e => {
-                    var _a;
-                    var _b;
-                    const contributed = [...e.tools, ...e.skills].join(", ") || "(nothing contributed)";
-                    const egress = (_b = (_a = e.hosting) === null || _a === void 0 ? void 0 : _a.egressDomains) !== null && _b !== void 0 ? _b : [];
-                    return egress.length === 0
-                        ? `${e.name} — ${contributed}`
-                        : `${e.name} — ${contributed}; egress: ${egress.join(", ")}`;
-                })));
-                lines.push(section("MCP connections", info.connections.map(c => `${c.name} — ${c.transport}`)));
-                lines.push(section("subagents", info.subagents.map(s => { var _a; return `${s.name} — ${(_a = s.description) !== null && _a !== void 0 ? _a : ""}`; })));
-                lines.push(section("channels", info.channels.map(c => `${c.id}: ${c.routes.map(r => `${r.method} ${r.url}`).join(", ") || "(events only)"}`)));
-                lines.push(section("schedules", info.schedules.map(s => `${s.name} (${s.cron}, ${s.kind})`)));
-                lines.push(section("hooks", info.hooks));
-                lines.push(section("hosting egress domains", (_z = (_j = info.hosting) === null || _j === void 0 ? void 0 : _j.egressDomains) !== null && _z !== void 0 ? _z : []));
-                lines.push(section("hosting secret names", (_0 = (_k = info.hosting) === null || _k === void 0 ? void 0 : _k.secretNames) !== null && _0 !== void 0 ? _0 : []));
-                if (info.diagnostics.length > 0) {
-                    lines.push(`\ndiagnostics:\n${formatDiagnostics(info.diagnostics)}`);
-                }
-                process.stdout.write(`${lines.filter(line => line !== "").join("\n")}\n`);
-                return info.diagnostics.some(d => d.severity === "error") ? 1 : 0;
-            }
-            case "dev":
-            case "serve": {
-                const serveDirResult = resolveServeDir({
-                    command,
-                    dir,
-                    positionals,
-                    dirFlagPassed: rest.includes("--dir"),
-                });
-                if (typeof serveDirResult !== "string") {
-                    process.stderr.write(serveDirResult.error);
-                    return 1;
-                }
-                const serveDir = serveDirResult;
-                const port = values.port === undefined ? undefined : Number.parseInt(values.port, 10);
-                if (port !== undefined && (Number.isNaN(port) || port < 0 || port > 65535)) {
-                    process.stderr.write(`invalid --port: ${values.port}\n`);
-                    return 1;
-                }
-                if (values["allow-anonymous"] === true && values["bearer-token"] !== undefined) {
-                    process.stderr.write("--allow-anonymous and --bearer-token are mutually exclusive\n");
-                    return 1;
-                }
-                const mode = values.mode;
-                if (mode !== undefined && mode !== "single" && mode !== "multi") {
-                    process.stderr.write(`invalid --mode: ${mode} (expected "single" or "multi")\n`);
-                    return 1;
-                }
-                const dev = command === "dev" || values.dev === true;
-                const style = stdoutPalette();
-                // Real env wins (loadEnvFile never overrides). Runs inside start()
-                // so dev's Enter-restart picks up tokens written since boot.
-                const loadLocalEnv = () => {
-                    const loadedEnvFiles = loadAgentLocalEnv(serveDir);
-                    if (loadedEnvFiles.length > 0) {
-                        process.stdout.write(`${style.dim(`env: loaded ${loadedEnvFiles.join(", ")}`)}\n`);
+                return next;
+            };
+            const handle = await start();
+            let closing = false;
+            let restartRequested = false;
+            await new Promise(resolve => {
+                const shutdown = () => {
+                    if (closing) {
+                        return;
                     }
+                    closing = true;
+                    process.stdout.write("\nshutting down (draining running turns)\n");
+                    void handle.close().finally(resolve);
                 };
-                const serveOptions = {
-                    port,
-                    host: values.host,
-                    mode: mode,
-                    dev,
-                    apiKey: values["api-key"],
-                    stateRoot: values["state-root"],
-                    authToken: values["bearer-token"],
-                    allowAnonymous: values["allow-anonymous"] === true ? true : undefined,
-                    allowAnonymousCursorGithub: values["allow-anonymous-cursor-github"] === true ? true : undefined,
-                    allowAnonymousCursorAccountMcp: values["allow-anonymous-cursor-account-mcp"] === true ? true : undefined,
-                    allowAnonymousGrokbot: values["allow-anonymous-grokbot"] === true ? true : undefined,
-                    cursorScmProxy: values["cursor-scm-proxy"] === true ? true : undefined,
-                    schedules: values["no-schedules"] === true ? false : undefined,
-                    noControlPlane: values["no-control-plane"] === true ? true : undefined,
-                    playground: values["no-playground"] === true ? false : undefined,
-                    docs: values["no-docs"] === true ? false : undefined,
-                    publicUrl: values["public-url"],
-                    cloudToolsUrl: values["cloud-tools-url"],
-                    cursorEvents: values["cursor-events"] === true ? { repos: (_1 = values.repo) !== null && _1 !== void 0 ? _1 : [] } : undefined,
-                    // Soft boot logs stay secondary to the banner. `dim` is a no-op on
-                    // already-styled lines (the MCP warning box).
-                    logger: (line) => {
-                        process.stdout.write(`${style.dim(line)}\n`);
-                    },
-                };
-                const enterToRestart = process.stdin.isTTY === true;
-                if (enterToRestart && !isServeRestartWorker()) {
-                    return runEnterRestartSupervisor({
-                        spawn: (command, args, spawnOptions) => spawn(command, args, spawnOptions),
-                        onRestart: () => {
-                            clearTerminal();
-                        },
-                    });
+                process.on("SIGINT", shutdown);
+                process.on("SIGTERM", shutdown);
+                if (!enterToRestart) {
+                    return;
                 }
-                const bannerOpts = {
-                    noPlayground: values["no-playground"] === true,
-                    dev,
-                    bearerToken: values["bearer-token"] !== undefined,
-                    noSchedules: values["no-schedules"] === true,
-                };
-                const start = () => __awaiter(this, void 0, void 0, function* () {
-                    loadLocalEnv();
-                    const next = yield serve(serveDir, serveOptions);
-                    printServeBanner(next, bannerOpts);
-                    if (enterToRestart) {
-                        process.stdout.write(style.dim("  press Enter to restart\n"));
-                    }
-                    return next;
-                });
-                const handle = yield start();
-                let closing = false;
-                let restartRequested = false;
-                yield new Promise(resolve => {
-                    const shutdown = () => {
-                        if (closing) {
-                            return;
-                        }
-                        closing = true;
-                        process.stdout.write("\nshutting down (draining running turns)\n");
-                        void handle.close().finally(resolve);
-                    };
-                    process.on("SIGINT", shutdown);
-                    process.on("SIGTERM", shutdown);
-                    if (!enterToRestart) {
+                process.stdin.resume();
+                process.stdin.on("data", (chunk) => {
+                    const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+                    if (!isEnterOnly(text) || closing) {
                         return;
                     }
-                    process.stdin.resume();
-                    process.stdin.on("data", (chunk) => {
-                        const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
-                        if (!isEnterOnly(text) || closing) {
-                            return;
-                        }
-                        closing = true;
-                        restartRequested = true;
-                        clearTerminal();
-                        process.stdout.write(style.dim("restarting…\n"));
-                        void handle.close().finally(resolve);
-                    });
+                    closing = true;
+                    restartRequested = true;
+                    clearTerminal();
+                    process.stdout.write(style.dim("restarting…\n"));
+                    void handle.close().finally(resolve);
                 });
-                return restartRequested ? ENTER_RESTART_EXIT_CODE : 0;
-            }
-            default: {
-                process.stderr.write(`Unknown command "${command}"\n\n${HELP}`);
-                return 1;
-            }
+            });
+            return restartRequested ? ENTER_RESTART_EXIT_CODE : 0;
         }
-    });
+        default: {
+            process.stderr.write(`Unknown command "${command}"\n\n${HELP}`);
+            return 1;
+        }
+    }
 }
 function deployOptionsFromValues(values) {
     return {
@@ -1351,27 +1372,25 @@ function axFromOptions(partial) {
         out: partial.out,
     };
 }
-function loadMessages(messages, messagesFile) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const out = [];
-        if (messagesFile !== undefined) {
-            const raw = yield readFile(resolve(messagesFile), "utf8");
-            const parsed = JSON.parse(raw);
-            if (!Array.isArray(parsed)) {
-                throw new Error("--messages-file must be a JSON array of strings");
-            }
-            for (const item of parsed) {
-                if (typeof item !== "string") {
-                    throw new Error("--messages-file entries must be strings");
-                }
-                out.push(item);
-            }
+async function loadMessages(messages, messagesFile) {
+    const out = [];
+    if (messagesFile !== undefined) {
+        const raw = await readFile(resolve(messagesFile), "utf8");
+        const parsed = JSON.parse(raw);
+        if (!Array.isArray(parsed)) {
+            throw new Error("--messages-file must be a JSON array of strings");
         }
-        if (messages !== undefined) {
-            out.push(...messages);
+        for (const item of parsed) {
+            if (typeof item !== "string") {
+                throw new Error("--messages-file entries must be strings");
+            }
+            out.push(item);
         }
-        return out;
-    });
+    }
+    if (messages !== undefined) {
+        out.push(...messages);
+    }
+    return out;
 }
 function parseTimeoutMs(value) {
     if (value === undefined) {
@@ -1396,10 +1415,8 @@ function parseMaxConcurrency(value) {
 /**
  * Load mounts the same way `serve` does (multi-agent layout by default).
  */
-function loadMounts(dir) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return resolveAgentMounts(dir);
-    });
+async function loadMounts(dir) {
+    return resolveAgentMounts(dir);
 }
 function section(title, items) {
     if (items.length === 0) {
@@ -1435,8 +1452,6 @@ function resolveServeDir(args) {
     return positionalDir;
 }
 function printServeBanner(handle, opts) {
-    var _a, _b;
-    var _c;
     const c = stdoutPalette();
     const agents = handle.agents;
     // Name the framework build in the boot line: hosted engines install the
@@ -1447,7 +1462,7 @@ function printServeBanner(handle, opts) {
         process.stdout.write(`${agents.length} agents listening ${versionTag}\n`);
     }
     else {
-        const info = projectInfo((_c = (_a = agents[0]) === null || _a === void 0 ? void 0 : _a.project) !== null && _c !== void 0 ? _c : handle.project);
+        const info = projectInfo(agents[0]?.project ?? handle.project);
         process.stdout.write(`${info.name} listening ${versionTag}\n`);
     }
     const playgroundUrl = resolvePlaygroundBannerUrl(handle, opts.noPlayground);
@@ -1462,7 +1477,7 @@ function printServeBanner(handle, opts) {
     // plain `serve`, where operators often curl the HTTP surface directly.
     if (!opts.dev) {
         process.stdout.write(c.dim(`  api  ${handle.url}\n`));
-        if (agents.length > 1 || ((_b = agents[0]) === null || _b === void 0 ? void 0 : _b.slug) !== "") {
+        if (agents.length > 1 || agents[0]?.slug !== "") {
             for (const agent of agents) {
                 const info = projectInfo(agent.project);
                 process.stdout.write(c.dim(`  /${agent.slug}  ${info.name}\n`));
@@ -1544,8 +1559,7 @@ function formatModel(model) {
  */
 function installTransportErrorGuards() {
     const isTransportNoise = (reason) => {
-        var _a;
-        const message = reason instanceof Error ? `${reason.message}\n${(_a = reason.stack) !== null && _a !== void 0 ? _a : ""}` : String(reason);
+        const message = reason instanceof Error ? `${reason.message}\n${reason.stack ?? ""}` : String(reason);
         const code = reason !== null &&
             typeof reason === "object" &&
             "code" in reason &&
@@ -1577,12 +1591,11 @@ function installTransportErrorGuards() {
         log("unhandledRejection", reason);
     });
     process.on("uncaughtException", error => {
-        var _a;
         if (isTransportNoise(error)) {
             log("swallowed uncaughtException", error);
             return;
         }
-        process.stderr.write(`[bdk] uncaughtException: ${(_a = error.stack) !== null && _a !== void 0 ? _a : error.message}\n`);
+        process.stderr.write(`[bdk] uncaughtException: ${error.stack ?? error.message}\n`);
         void flushSessionRunFatal(error).finally(() => {
             process.exit(1);
         });