aui-agent-builder 0.3.160 → 0.3.162

package/dist/errors/index.js

@@ -88,7 +88,7 @@ function classifyAPIError(err) {
         return new AuthenticationError(`${verb} failed (${status}).`, {
             suggestion: status === 401
                 ? "Your session may have expired. Run `aui login --environment <custom|production>` to re-authenticate (choose the environment you were already using so you don't switch to production by mistake)."
-                : "You don't have permission for this operation. Check your account role or switch accounts with `aui account --switch`.",
+                : "You don't have permission for this operation. Check your account role, or target a different account with `--account-id` (list them via `aui account --list`).",
             cause: err,
         });
     }
@@ -100,9 +100,16 @@ function classifyAPIError(err) {
         });
     }
     if (status >= 500) {
-        return new CLIError(`The AUI server returned an error (${status}).`, {
+        // Surface any upstream detail the server returned (e.g. an integration's
+        // real status/body wrapped in an Apollo 500). Without this the caller only
+        // sees "The AUI server returned an error (500)" and has to dig through
+        // `apollo trace` to find the actual upstream failure.
+        const detail = extractApiErrorDetail(err.body);
+        return new CLIError(`The AUI server returned an error (${status})${detail ? `: ${detail}` : ""}.`, {
             code: "API_SERVER_ERROR",
-            suggestion: "This is a server-side issue. Please try again in a few moments. If it persists, contact support.",
+            suggestion: detail
+                ? "The detail above is the upstream response. If it points at a config/auth issue (e.g. a 401 or bad key), fix that; otherwise retry shortly or contact support."
+                : "This is a server-side issue. Please try again in a few moments. If it persists, contact support.",
             cause: err,
         });
     }

package/dist/errors/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/errors/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/errors/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -27,6 +27,7 @@ import { integrationTools } from "./commands/integration-tools.js";
 import { integrationToolkits } from "./commands/integration-toolkits.js";
 import { integrationTest } from "./commands/integration-test.js";
 import { integrationMCPTest } from "./commands/integration-mcp-test.js";
+import { integrationMcpUrl } from "./commands/integration-mcp-url.js";
 import { curl } from "./commands/curl.js";
 import { versionMenu, versionList, versionCreate, versionGet, versionPublish, versionActivate, versionArchive, versionUpdate, } from "./commands/version.js";
 import { versionSnapshotMenu, versionSnapshotList, versionSnapshotGet, versionSnapshotDiff, } from "./commands/version-snapshot.js";
@@ -101,7 +102,10 @@ const program = new Command();
 program
     .name("aui")
     .description("◆ AUI Agent Builder — Build, version, and deploy AI agents from your terminal")
-    .version(pkg.version, "-v, -V, --version")
+    // Only `-v` / `-V` are wired as version flags. `--version` is intentionally
+    // omitted because it collides with subcommand options like
+    // `agents --version <id>` and `version` is also a subcommand name.
+    .version(pkg.version, "-v, -V")
     .option("--json", "Output structured JSON to stdout (for scripting/piping)")
     .action(() => {
     const { unmount } = render(createElement(Banner, { version: pkg.version }));
@@ -140,8 +144,10 @@ program
                              subshell — run 'exit' to return.
     agents --create --dir <path>
                              Same, but import the new agent into <path> instead
-    agents --list            List all agents in your account
-    agents --switch          Switch active agent
+    agents --list            List agents for an account (scope: --account-id, else the
+                             project's .auirc; errors outside a folder with no --account-id)
+    agents --switch          Set the SESSION's current agent (the fallback used when you're
+                             not inside an agent folder; .auirc wins inside one)
     agents --delete          Delete an agent or a version (org → account → agent picker)
     agents --delete --network-id <id> [--yes]
                              Delete an entire agent (single API call, all versions)
@@ -180,9 +186,9 @@ program
     apollo                           Overview of the runtime messaging commands
     apollo create-thread             Start a conversation thread (POST /v1/messaging/tasks)
     apollo send-message --task-id <id> --text <msg>
-                                     Send a message; forwards your local files + includes the trace by default (--no-bundle / --no-include-trace to skip)
+                                     Send a message; forwards your local files + includes the trace
     apollo rerun --task-id <id> --interaction-id <id> --text <msg>
-                                     Regenerate from an interaction and replay (--no-bundle, --no-include-trace, --version-id)
+                                     Regenerate from an interaction and replay (--version-id)
     apollo trace --task-id <id> [--interaction-id <id>]
                                      Fetch all interaction traces (or one interaction's trace)
 
@@ -195,7 +201,17 @@ program
     integration tools --slugs <A,B>  Fetch Composio tool descriptors by slug
                                        [--toolkit-versions <v>] [--limit <n>] [--cursor <c>] [--json]
     integration discover --url <url> Discover tools from a manual MCP server
-                                       [--auth-type token --auth-token <tok>] [--json]
+                                       [--transport-type STREAMABLE_HTTP|SSE]
+                                       Canonical auth (same surface as create / mcp-test):
+                                         [--auth-type none|token|bearer_token|api_key|oauth_client_credentials]
+                                         [--auth-token <value>]
+                                         [--auth-header-name <Header>]   ← required for api_key
+                                         [--oauth-url <token-endpoint> --oauth-client-id <id> --oauth-client-secret <secret>]
+                                       [--json]
+    integration mcp-url --toolkit <slug>
+                                     Provision (or reuse) a Composio MCP server (returns { server_id, server_url })
+                                       (--tools a,b | --all-tools) [--server-id <id>]
+                                       [--composio-user-id <id>] [--composio-api-key <key>] [--json]
 
     \x1b[1mCreate (fully non-interactive with --full)\x1b[0m
     integration create --full --name <n> --url <mcp-url> --all-tools
@@ -203,7 +219,7 @@ program
                                        [--auth-type token --auth-token <tok>] [--tools a,b]
     integration create --full --name <n> --toolkit <slug> --all-tools
                                      Native Composio integration (toolkit from the directory)
-                                       [--composio-api-key <key>] [--tools a,b]
+                                       [--composio-api-key <key>] [--tools a,b] [--server-id <id>]
                                        (scope: [--organization-id] [--account-id] [--network-id] [--version-id])
 
     \x1b[1mTest (always JSON, non-interactive)\x1b[0m
@@ -331,9 +347,9 @@ program
     .command("account")
     .alias("accounts")
     .description("Manage accounts (projects) — list, create, switch")
-    .option("--list", "List all accounts")
+    .option("--list", "List all accounts in your org (use the id with `--account-id` on agent commands)")
     .option("--create <name>", "Create a new account")
-    .option("--switch", "Switch active account")
+    .option("--switch [accountId]", "Switch the SESSION's current account (the fallback used by push/pull/rag when not inside an agent folder). Pass an account id to switch non-interactively (works with --json); omit it for an interactive picker (TTY only)")
     .action(async (options) => {
     try {
         await account(options);
@@ -347,15 +363,14 @@ program
     .command("agent")
     .alias("agents")
     .description("Manage agents and versions — list, create, switch, import, delete")
-    .option("--list", "List all agents")
+    .option("--list", "List agents for an account. Scope resolves from --account-id, else the current project's .auirc account; outside a folder with no --account-id it errors (it does NOT use the session's current account)")
     .option("--create", "Create a new agent")
     .option("--full", "Create + version + publish + activate in one step")
-    .option("--draft", "Create + version draft (v1.0) without publishing (this is the default — kept for explicitness)")
     .option("--name <name>", "Agent name (skips name prompt)")
     .option("--category <id>", "Category ID or key (default: General)")
-    .option("-d, --dir <path>", "After --create, auto-import the new agent into this directory (defaults to a new ./<agent-name> folder)")
+    .option("-d, --dir <path>", "After --create, import the new agent into this directory (defaults to a new ./<agent-name> folder). Passing --dir forces the local import even non-interactively (no TTY needed), so scripts and sandboxes get the project on disk.")
     .option("--network-id <networkId>", "Network ID (used by --create or to target --delete)")
-    .option("--account-id <id>", "Account ID (skips org/account selection)")
+    .option("--account-id <id>", "Account ID. Scopes --list (and skips org/account selection on --create). Get ids from `aui account --list`")
     // Creation mode is resolved automatically from the active environment
     // (see commands/util/agent-mode.ts). These explicit overrides are kept
     // functional for automation/back-compat but hidden from help so the
@@ -364,9 +379,9 @@ program
     .addOption(new Option("--bundle-mode", "Create a bundle-mode agent (bundle_mode=true) via the Apollo provisioning endpoint. One call provisions everything server-side: network → agent → first version (import from template) → publish → activate. Not the default; incompatible with --network-id (it creates its own network) and needs a category.").hideHelp())
     .addOption(new Option("--records-mode", "Create with bundle_mode=false (records mode). This is the default for regular agents and is what lets --create auto-create the v1.0 draft.").hideHelp())
     .option("--template", "Create a template (kind=template) at NETWORK_CATEGORY scope. Templates are clone sources other agents bootstrap from via `aui version create --source template`. Requires --category. Cannot be combined with --network-id.")
-    .option("--switch", "Switch active agent (interactive: agent → version)")
+    .option("--switch", "Set the SESSION's current agent + version (interactive picker). This is the fallback used when you're not inside an agent folder; .auirc takes priority inside one")
     .option("--import", "Import an agent from backend")
-    .option("--versions [agentId]", "List versions for an agent (defaults to current)")
+    .option("--versions [agentId]", "List versions for an agent (defaults to current). Accepts an agent-management id OR a network id (the `id` shown by --list) — it auto-resolves to the management id the versions API needs, so it no longer 404s on a network id")
     .option("--use <agentId>", "Select an agent directly by ID")
     .option("--version <versionId>", "Select / target a specific version (used with --use or --delete)")
     .option("--delete", "Delete an agent or version. Interactive: org → account → agent picker. Non-interactive: pair with --network-id, --version, or --agent-id (+ --all-versions)")
@@ -397,6 +412,7 @@ program
     .option("--no-skills", "Skip skill generation entirely")
     .option("--skip-kb-files", "Skip knowledge-base-files schema fetch")
     .option("--with-kb-files", "Also download original binaries (PDF, CSV, …) into each KB folder")
+    .option("--reset-git", "On re-import into an existing dir, wipe local git history and start a fresh baseline commit (default: preserve existing .git and commit on top)")
     .option("--exclude-skills", "Write coding agent configs (.claude/, .cursor/, .opencode/) to current directory instead of --dir")
     .option("--include-evaluate", "Include the evaluate (test_questions) schema")
     .option("--skills-env <env>", "Override environment for Notion skill/doc pages (staging|production|preview|custom)")
@@ -619,16 +635,35 @@ integrationCmd.addHelpText("after", `
   discover          Discover tools exposed by a manual MCP server
                       --url <mcp-url> [--auth-type none|token] [--auth-token <tok>]
                       [--organization-id <id>] [--account-id <id>] [--network-id <id>] [--json]
+  mcp-url           Provision (or reuse) a Composio MCP server; prints { server_id, server_url }
+                      --toolkit <slug> (--tools a,b | --all-tools)
+                      [--server-id <id>] [--composio-user-id <id>] [--composio-api-key <key>]
+                      [--organization-id <id>] [--account-id <id>] [--network-id <id>] [--json]
 
   \x1b[1mCreate (fully non-interactive with --full)\x1b[0m
   create            Create an MCP integration. Manual (your own MCP server) or native (Composio toolkit).
                       Manual:  --name <n> --url <mcp-url> (--tools a,b | --all-tools) --full
-                               [--auth-type token --auth-token <tok>] [--description <d>]
+                               [--description <d>] [--transport-type STREAMABLE_HTTP|SSE]
+                               Auth (canonical MCPAuthentication):
+                                 --auth-type none|token|bearer_token|api_key|oauth_client_credentials
+                                 [--auth-token <value>]          ← settings.authentication.value
+                                 [--auth-header-name <Header>]   ← required for api_key (e.g. X-API-Key)
+                                 [--oauth-url <token-endpoint> --oauth-client-id <id> --oauth-client-secret <secret>]
+                                 [--oauth-method GET|POST]       ← oauth_client_credentials, default POST
+                                 [--oauth-grant-type <grant>]    ← oauth_client_credentials, default client_credentials
+                               The CLI-only alias --auth-type token is collapsed to bearer_token
+                               inside buildAuthFromFlags and never leaks to the wire.
                       Native:  --name <n> --toolkit <slug> (--tools a,b | --all-tools) --full
                                [--composio-api-key <key>] [--composio-auth-scheme <scheme>]
                                [--composio-credentials-file <path>]
                                [--composio-client-id <id> --composio-client-secret <secret>]
                                [--composio-client-bearer-token <token>]
+                               [--transport-type STREAMABLE_HTTP|SSE]
+                               [--server-id <id>]   reuse an existing Composio MCP server name;
+                                                    a 30-char UUID-prefix is minted when omitted.
+                                                    Persisted on the integration as
+                                                    settings.composio.server_id. The provisioned
+                                                    MCP URL is persisted at settings.server_url.
                       Scope:   [--organization-id <id>] [--account-id <id>] [--network-id <id>]
                                [--network-category-id <id>] [--version-id <id>]
                       --full makes it skip every prompt (org/account/agent + confirm); missing
@@ -657,9 +692,11 @@ integrationCmd.addHelpText("after", `
                       Composio: --type composio --toolkit <slug> --tool <name> [--arguments '<json>']
                       Direct:   --type direct --url <mcp-url> --tool <name> [--arguments '<json>']
                                 [--transport-type STREAMABLE_HTTP|SSE]
-                                [--auth-type bearer_token|api_key|none]
-                                [--auth-token <value>]
-                                [--auth-header-name <Header>]   ← required for api_key
+                                Canonical auth (same surface as create / discover):
+                                  [--auth-type none|token|bearer_token|api_key|oauth_client_credentials]
+                                  [--auth-token <value>]
+                                  [--auth-header-name <Header>]   ← required for api_key (e.g. X-API-Key)
+                                  [--oauth-url <token-endpoint> --oauth-client-id <id> --oauth-client-secret <secret>]
                     \x1b[90mRun aui integration mcp-test --help for auth examples + output shape.\x1b[0m
 
 \x1b[90m  Run aui integration <command> --help for the full options of each command.\x1b[0m
@@ -669,10 +706,12 @@ integrationCmd
     .description("Create a new MCP integration (interactive or non-interactive)")
     .option("--name <name>", "Integration name")
     .option("--description <description>", "Integration description")
-    .option("--url <url>", "MCP server URL")
+    .option("--url <url>", "MCP server URL (DIRECT integrations only)")
     .option("--config-method <method>", "Config method: manual or native (default: manual)")
-    .option("--auth-type <type>", "Authentication method: none or token")
-    .option("--auth-token <token>", "Authentication token (when --auth-type token)")
+    .option("--transport-type <type>", "MCP transport: STREAMABLE_HTTP (default) or SSE. Maps to settings.transport_type.")
+    .option("--auth-type <type>", "MCPAuthType: none | bearer_token | api_key | oauth_client_credentials. The CLI-only alias 'token' is mapped to 'bearer_token' before any wire emission.")
+    .option("--auth-token <token>", "Credential value for the authentication block. Lands at settings.authentication.value (bearer_token / api_key).")
+    .option("--auth-header-name <name>", "HTTP header carrying the credential. Required when --auth-type api_key.")
     .option("--tools <tools>", "Comma-separated list of tool names to include")
     .option("--all-tools", "Include all discovered tools")
     .option("--organization-id <id>", "Organization ID (skip selection)")
@@ -687,6 +726,7 @@ integrationCmd
     .option("--composio-client-id <id>", "BYO OAuth client ID")
     .option("--composio-client-secret <secret>", "BYO OAuth client secret")
     .option("--composio-client-bearer-token <token>", "BYO OAuth bearer token (optional)")
+    .option("--server-id <id>", "Reuse an existing Composio MCP server name for native integrations. When omitted a 30-char UUID-prefix is minted. Persisted on the integration as composio.server_id.")
     .option("--full", "Fully non-interactive: skip selection prompts (use session defaults) and the final confirmation. Missing required flags fail instead of prompting.")
     .action(async (options) => {
     try {
@@ -700,8 +740,15 @@ integrationCmd
     .command("discover")
     .description("Discover available tools from an MCP server")
     .option("--url <url>", "MCP server URL")
-    .option("--auth-type <type>", "Authentication method: none or token")
-    .option("--auth-token <token>", "Authentication token (when --auth-type token)")
+    .option("--transport-type <type>", "MCP transport: STREAMABLE_HTTP (default) or SSE")
+    .option("--auth-type <type>", "MCPAuthType: none | bearer_token | api_key | oauth_client_credentials. The CLI-only alias 'token' is mapped to 'bearer_token' before any wire emission.")
+    .option("--auth-token <token>", "Credential value — lands at authentication.value (bearer_token / api_key).")
+    .option("--auth-header-name <name>", "HTTP header carrying the credential (required for api_key).")
+    .option("--oauth-url <url>", "oauth_client_credentials: token-endpoint URL.")
+    .option("--oauth-method <method>", "oauth_client_credentials: HTTP method — GET or POST. Backend default: POST.")
+    .option("--oauth-client-id <id>", "oauth_client_credentials: OAuth client id.")
+    .option("--oauth-client-secret <secret>", "oauth_client_credentials: OAuth client secret.")
+    .option("--oauth-grant-type <grant>", "oauth_client_credentials: OAuth grant type. Backend default: client_credentials.")
     .option("--organization-id <id>", "Organization ID")
     .option("--account-id <id>", "Account ID")
     .option("--network-id <id>", "Agent/Network ID")
@@ -750,6 +797,29 @@ integrationCmd
         await handleError(e);
     }
 });
+integrationCmd
+    .command("mcp-url")
+    .description("Provision (or reuse) a Composio MCP server; prints { server_id, server_url } (non-interactive; supports --json)")
+    // Validated inside the command so missing flags surface through the JSON
+    // error envelope rather than Commander's pre-action exit (same rationale
+    // as `integration tools` / `apollo send-message`).
+    .option("--toolkit <slug>", "Composio toolkit slug (e.g. gmail, notion)")
+    .option("--tools <names>", "Comma-separated allowed tool names")
+    .option("--all-tools", "Include every tool the toolkit exposes (discovered via Composio)")
+    .option("--server-id <id>", "Reuse an existing MCP server name (a 30-char UUID-prefix is minted when omitted)")
+    .option("--composio-user-id <id>", "Composio user id (defaults to the current agent's network-id)")
+    .option("--composio-api-key <key>", "Override Composio API key (otherwise: COMPOSIO_API_KEY env var or backend-issued key)")
+    .option("--organization-id <id>", "Organization ID")
+    .option("--account-id <id>", "Account ID")
+    .option("--network-id <id>", "Agent/Network ID")
+    .action(async (options) => {
+    try {
+        await integrationMcpUrl(options);
+    }
+    catch (e) {
+        await handleError(e);
+    }
+});
 integrationCmd
     .command("test")
     .description("Live-call an integration endpoint: returns test_data (raw), parsed_test_response (after response_parser), and — without --raw — mapped_entities from bundle_mapping (always JSON; fully non-interactive)")
@@ -848,9 +918,15 @@ integrationCmd
     // Direct
     .option("--url <url>", "MCP server URL")
     .option("--transport-type <type>", "Transport: STREAMABLE_HTTP (default) or SSE")
-    .option("--auth-type <type>", "Auth scheme: bearer_token, api_key, oauth_client_credentials, none (case-insensitive)")
-    .option("--auth-token <token>", "Auth token/key value (used with --auth-type)")
-    .option("--auth-header-name <name>", "Header name for api_key auth (e.g. X-API-Key)")
+    .option("--auth-type <type>", "MCPAuthType: none | bearer_token | api_key | oauth_client_credentials (case-insensitive). CLI-only alias 'token' → 'bearer_token'.")
+    .option("--auth-token <token>", "Credential value — lands at authentication.value (bearer_token / api_key).")
+    .option("--auth-header-name <name>", "HTTP header carrying the credential (required for api_key).")
+    // oauth_client_credentials
+    .option("--oauth-url <url>", "oauth_client_credentials: token-endpoint URL.")
+    .option("--oauth-method <method>", "oauth_client_credentials: HTTP method — GET or POST. Backend default: POST.")
+    .option("--oauth-client-id <id>", "oauth_client_credentials: OAuth client id.")
+    .option("--oauth-client-secret <secret>", "oauth_client_credentials: OAuth client secret.")
+    .option("--oauth-grant-type <grant>", "oauth_client_credentials: OAuth grant type. Backend default: client_credentials.")
     // Bundle mapping
     .option("--bundle-mapping <json>", "Full bundle_mapping object {response_mapping, parameters, scope_entities}")
     .option("--response-mapping <json>", "→ bundle_mapping.response_mapping")
@@ -859,15 +935,24 @@ integrationCmd
     .option("--raw", "Skip bundle_mapping — return raw tool response only")
     .addHelpText("after", `
 \x1b[1mAuthentication (DIRECT type)\x1b[0m
-  Auth type is case-insensitive. Accepted values:
+  Auth type is case-insensitive. Accepted values mirror the backend
+  MCPAuthType enum — the same surface accepted by 'integration create'
+  and 'integration discover'.
 
-    none                    No authentication (default when --auth-type is omitted)
-    bearer_token            Sends \`Authorization: Bearer <value>\`
-                              --auth-type bearer_token --auth-token <token>
-    api_key                 Sends a custom header carrying the key
-                              --auth-type api_key --auth-token <key> --auth-header-name <Header-Name>
-    oauth_client_credentials  Client-credentials flow (credentials exchanged server-side)
-                              --auth-type oauth_client_credentials
+    none                       No authentication (default when --auth-type is omitted)
+    token                      CLI-only alias → mapped to bearer_token before any wire emission
+                                 --auth-type token --auth-token <tok>
+    bearer_token               Sends \`Authorization: Bearer <value>\`
+                                 --auth-type bearer_token --auth-token <tok>
+    api_key                    Sends the key in a custom header
+                                 --auth-type api_key --auth-token <key> --auth-header-name <Header-Name>
+    oauth_client_credentials   IA exchanges client credentials for a bearer token per session
+                                 --auth-type oauth_client_credentials
+                                 --oauth-url <token-endpoint>
+                                 --oauth-client-id <id>
+                                 --oauth-client-secret <secret>
+                                 [--oauth-method GET|POST]                (default: POST)
+                                 [--oauth-grant-type <grant>]             (default: client_credentials)
 
 \x1b[1mExamples\x1b[0m
   # Composio — send an email
@@ -885,6 +970,13 @@ integrationCmd
     --auth-type api_key --auth-token <key> --auth-header-name X-API-Key \\
     --tool <tool-name> --arguments '{}' --raw
 
+  # Direct — OAuth client credentials (raw)
+  aui integration mcp-test --type direct --url https://my-mcp.example.com/mcp \\
+    --auth-type oauth_client_credentials \\
+    --oauth-url https://auth.example.com/oauth/token \\
+    --oauth-client-id <client-id> --oauth-client-secret <client-secret> \\
+    --tool <tool-name> --arguments '{}' --raw
+
   # Direct — with bundle_mapping (returns mapped_entities)
   aui integration mcp-test --type direct --url https://my-mcp.example.com/mcp \\
     --auth-type bearer_token --auth-token <token> \\
@@ -938,20 +1030,19 @@ apolloCmd.addHelpText("after", `
                     [--version-id <id>] [--version-tag <tag>] [--json]
   send-message    Send a message and get the agent reply (POST /v1/messaging/messages)
                     --task-id <id> --text <msg>
-                    [--no-bundle] [--no-include-trace] [--agent-id <id>] [--path <dir>] [--json]
+                    [--agent-id <id>] [--path <dir>] [--json]
   rerun           Regenerate a thread from an interaction, then replay (POST /v1/messaging/messages/rerun)
                     --task-id <id> --interaction-id <id> --text <msg>
-                    [--no-bundle] [--no-include-trace] [--version-id <id>] [--version-tag <tag>] [--agent-id <id>] [--path <dir>] [--json]
+                    [--version-id <id>] [--version-tag <tag>] [--agent-id <id>] [--path <dir>] [--json]
   trace           Fetch interaction traces for a thread
                     --task-id <id> [--interaction-id <id>] [--agent-id <id>] [--json]
                     (with --interaction-id: that single interaction's trace)
 
 \x1b[1mNotes\x1b[0m
   • Works for any agent (bundle-mode or records-mode).
-  • send-message & rerun validate + forward your local .aui.json files by default, so the
-    reply reflects your local edits. Pass --no-bundle to use the agent's stored/active config.
-  • send-message & rerun include the trace by default (trace_info on the reply). Pass
-    --no-include-trace to skip it and avoid the extra IA call.
+  • send-message & rerun validate + forward your local .aui.json files, so the
+    reply reflects your local edits.
+  • send-message & rerun always include the trace (trace_info on the reply).
   • create-thread returns a thread id — pass it to the other commands as --task-id.
   • The id returned by send-message is the interaction id for rerun / trace --interaction-id.
 
@@ -978,7 +1069,7 @@ apolloCmd
 });
 apolloCmd
     .command("send-message")
-    .description("Send a user message and get the agent reply (POST /v1/messaging/messages). By default it assembles + validates the local .aui.json files and forwards them as the agent settings bundle, so the reply reflects your local edits. Pass --no-bundle to use the agent's stored/active config instead")
+    .description("Send a user message and get the agent reply (POST /v1/messaging/messages). It assembles + validates the local .aui.json files and forwards them as the agent settings bundle, so the reply reflects your local edits")
     // NOT `requiredOption`: Commander's built-in required check exits
     // before our action runs, bypassing the `--json` error envelope (a
     // production contract consumed by agent-builder-bff). The action
@@ -988,18 +1079,9 @@ apolloCmd
     .option("--task-id <id>", "Thread to send the message to (the id from `create-thread`)")
     .option("--text <text>", "Message text to send")
     .option("--agent-id <id>", "Agent-management ID for the bundle-mode check (defaults to .auirc agent_management_id)")
-    // Trace is ON by default: the response trace_info is populated via a second
-    // IA call (include_trace=true). `--no-include-trace` opts out (Commander
-    // sets options.includeTrace=false). `--include-trace` is kept as a hidden
-    // no-op alias for backward-compat with callers from the pre-default-on era.
-    .option("--no-include-trace", "Skip the trace: do not populate the response trace_info (avoids the second IA call)")
-    .addOption(new Option("--include-trace", "(deprecated; the trace is now included by default)").hideHelp().default(true))
-    // Bundle is ON by default. `--no-bundle` opts out (Commander sets
-    // options.bundle=false). `--with-bundle` is kept as a hidden no-op alias
-    // for backward-compat with callers from the pre-default-on era.
-    .option("--no-bundle", "Skip the local bundle: send the message against the agent's stored/active config instead of your local .aui.json files")
-    .addOption(new Option("--with-bundle", "(deprecated; the bundle is now sent by default)").hideHelp())
-    .option("--path <dir>", "Agent project directory to read files from (defaults to the current project)")
+    // The local bundle is always assembled + validated and sent, and the trace
+    // is always requested (include_trace=true). There is no opt-out.
+    .option("--path <dir>", "Imported agent project directory — must contain .auirc and .aui.json files, not a pre-built bundle (defaults to the current project)")
     .action(async (options) => {
     try {
         await apolloSendMessage(options);
@@ -1010,7 +1092,7 @@ apolloCmd
 });
 apolloCmd
     .command("rerun")
-    .description("Regenerate a thread from an interaction, then replay a message onto the cloned thread (POST /v1/messaging/messages/rerun). By default it forwards your validated local .aui.json bundle; pass --no-bundle to use the agent's stored/active config")
+    .description("Regenerate a thread from an interaction, then replay a message onto the cloned thread (POST /v1/messaging/messages/rerun). It forwards your validated local .aui.json bundle so the reply reflects your local edits")
     // Plain `--option` (not requiredOption) so missing values surface
     // through our ValidationError → JSON error envelope, not Commander's
     // pre-action exit. See the note on `send-message`.
@@ -1020,15 +1102,10 @@ apolloCmd
     .option("--agent-id <id>", "Agent-management ID for the bundle-mode check + agent metadata (defaults to .auirc)")
     .option("--version-id <id>", "Agent version ID to attach as agent metadata (defaults to .auirc version_id)")
     .option("--version-tag <tag>", "Pin the rerun to a specific revision tag, e.g. v8.14 (defaults to .auirc version_tag)")
-    // Bundle is ON by default; `--no-bundle` opts out. `--with-bundle` kept as a
-    // hidden no-op alias for backward-compat. See the note on `send-message`.
-    .option("--no-bundle", "Skip the local bundle: rerun against the agent's stored/active config instead of your local .aui.json files")
-    .addOption(new Option("--with-bundle", "(deprecated; the bundle is now sent by default)").hideHelp())
-    // Trace is ON by default; `--no-include-trace` opts out. `--include-trace`
-    // kept as a hidden no-op alias for backward-compat. See `send-message`.
-    .option("--no-include-trace", "Skip the trace: do not populate trace_info on the replayed message (avoids the second IA call)")
-    .addOption(new Option("--include-trace", "(deprecated; the trace is now included by default)").hideHelp().default(true))
-    .option("--path <dir>", "Agent project directory to read files from (defaults to the current project)")
+    // The local bundle is always assembled + validated and sent, and the trace
+    // is always requested (include_trace=true). There is no opt-out. See the
+    // note on `send-message`.
+    .option("--path <dir>", "Imported agent project directory — must contain .auirc and .aui.json files, not a pre-built bundle (defaults to the current project)")
     .action(async (options) => {
     try {
         await apolloRerun(options);
@@ -1183,19 +1260,26 @@ versionCmd
 });
 versionCmd
     .command("create")
-    .description("Create a new draft version")
-    // No default here — the command auto-picks per agent mode:
-    //   bundle-mode  → defaults to `version` (clones the active
-    //                  version, since `agent-scope` is records-only).
-    //   records-mode → defaults to `agent-scope` (historical default).
-    .option("--source <type>", "Source: agent-scope | version | template (auto by agent mode if omitted)")
-    .option("--from <versionId>", "Clone from this version ID (when --source=version)")
+    .description("Create a new draft version (single step, no prompts). Auto-detects the agent's storage mode and seeds the draft accordingly:\n" +
+    "  • bundle  agent → forks the agent's ACTIVE version (source=version)\n" +
+    "  • records agent → snapshots the agent's current live scope (source=agent-scope)\n" +
+    "Targets this project's agent from .auirc unless --agent-id is given. To fork from a SPECIFIC version, pass --source version --from <id>.")
+    // The command auto-picks the source per agent mode when --source is omitted:
+    //   bundle-mode  → `version`     (clones the ACTIVE version; `agent-scope`
+    //                                 would 422 for blob-mode agents).
+    //   records-mode → `agent-scope` (snapshots the live scope).
+    // To fork from a specific version on a records agent you must pass BOTH
+    // `--source version --from <id>` (a bare `--from` defaults to agent-scope
+    // and is ignored). On a bundle agent `--from <id>` works on its own since
+    // the source already defaults to `version`.
+    .option("--source <type>", "agent-scope | version | template. Omit to auto-pick by agent mode (bundle→version, records→agent-scope).")
+    .option("--from <versionId>", "Fork the new draft from this specific version ID. Bundle agents: works on its own. Records agents: pair with `--source version`. Omit to fork from the agent's ACTIVE version (bundle) / snapshot the live scope (records).")
     .option("--from-template <templateAgentId>", "Clone from this template agent's bundle (when --source=template; requires kind=template, bundle-mode)")
     .option("--use", "Update .auirc to point at the new draft (so `aui push` targets it)")
     .option("--label <label>", "Version label")
-    .option("--tags <tags>", "Comma-separated tags")
-    .option("--notes <notes>", "Version notes")
-    .option("--agent-id <id>", "Agent ID (defaults to current)")
+    .option("--tags <tags>", "Comma-separated tags (e.g. prod,stable)")
+    .option("--notes <notes>", "Version notes / changelog for this draft")
+    .option("--agent-id <id>", "Target a specific agent by agent-management ID (defaults to the project's .auirc agent)")
     .action(async (options) => {
     try {
         await versionCreate(options);