llm-cli-gateway 2.16.0 → 2.17.1

package/dist/token-estimator.js

@@ -0,0 +1,59 @@
+const CJK_RE = /[\u3000-\u303f\u3040-\u309f\u30a0-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uff00-\uffef\uac00-\ud7af]/g;
+const CODE_SYMBOL_RE = /[{}[\]()<>;=+\-*/\\|&%$#@`~]/g;
+const CODE_KEYWORD_RE = /\b(function|const|let|var|return|import|export|class|def|public|private|static|void|for|while|switch|case)\b/;
+const DIVISOR_BY_TYPE = new Map([
+    ["prose", 4],
+    ["code", 3],
+    ["cjk", 1.5],
+]);
+const FAMILY_MULTIPLIERS = new Map([
+    ["openai", 1.0],
+    ["o200k", 1.0],
+    ["cl100k", 1.02],
+    ["claude", 1.08],
+    ["gemini", 0.98],
+    ["sentencepiece", 0.98],
+    ["grok", 1.0],
+    ["mistral", 1.05],
+]);
+export function classifyContent(text) {
+    if (!text)
+        return "prose";
+    const nonSpace = text.replace(/\s+/g, "").length;
+    if (nonSpace === 0)
+        return "prose";
+    const cjkMatches = text.match(CJK_RE);
+    const cjkCount = cjkMatches ? cjkMatches.length : 0;
+    if (cjkCount / nonSpace >= 0.2)
+        return "cjk";
+    const trimmed = text.trim();
+    const looksJson = /^[[{]/.test(trimmed) && /[}\]]/.test(trimmed) && /[:,]/.test(trimmed);
+    const symbolMatches = trimmed.match(CODE_SYMBOL_RE);
+    const symbolCount = symbolMatches ? symbolMatches.length : 0;
+    const symbolRatio = symbolCount / nonSpace;
+    const hasKeyword = CODE_KEYWORD_RE.test(trimmed);
+    if (looksJson || symbolRatio >= 0.08 || (hasKeyword && symbolRatio >= 0.03)) {
+        return "code";
+    }
+    return "prose";
+}
+function familyMultiplier(family) {
+    if (!family)
+        return 1;
+    const f = family.toLowerCase();
+    for (const [key, multiplier] of FAMILY_MULTIPLIERS) {
+        if (f === key || f.includes(key))
+            return multiplier;
+    }
+    return 1;
+}
+export function estimateInputTokens(text, opts) {
+    if (!text)
+        return 0;
+    const type = classifyContent(text);
+    const divisor = DIVISOR_BY_TYPE.get(type) ?? 4;
+    const base = text.length / divisor;
+    const familyMult = familyMultiplier(opts?.family);
+    const k = opts?.calibrationK ?? 1;
+    return Math.ceil(base * familyMult * k);
+}

package/dist/upstream-contracts.d.ts

@@ -1,5 +1,6 @@
 import { type CliType } from "./provider-definitions.js";
 export type CliFlagArity = "none" | "one" | "optional" | "variadic";
+export type CliPositionalLimit = number | "variadic";
 export interface CliFlagContract {
     arity: CliFlagArity;
     values?: readonly string[];
@@ -52,12 +53,13 @@ export interface CliSubcommandContract {
     commandPath: readonly string[];
     helpArgs: readonly string[][];
     flags: Record<string, CliFlagContract>;
-    maxPositionals: number;
+    maxPositionals: CliPositionalLimit;
     acknowledgedUpstreamFlags?: readonly string[];
     aliases?: readonly string[];
     children?: Record<string, CliSubcommandContract>;
     risk: CliSubcommandRisk;
     exposure: CliSubcommandExposure;
+    adminProjection?: "not_exposed";
     tier: CliSubcommandTier;
     tokenCost: CliSubcommandTokenCost;
     summary: string;
@@ -122,6 +124,7 @@ export interface AcpEntrypointContract {
     docsRef: string;
 }
 export declare const ACP_ENTRYPOINT_CONTRACTS: Record<CliType, AcpEntrypointContract>;
+export declare const CLAUDE_WIRE_PERMISSION_MODES: readonly ["acceptEdits", "auto", "bypassPermissions", "manual", "dontAsk", "plan"];
 export declare const UPSTREAM_CLI_CONTRACTS: Record<CliType, CliContract>;
 export declare function validateUpstreamCliArgs(cli: CliType, args: readonly string[]): ContractValidationResult;
 export declare function assertUpstreamCliArgs(cli: CliType, args: readonly string[]): void;

package/dist/upstream-contracts.js

@@ -67,7 +67,7 @@ export const ACP_ENTRYPOINT_CONTRACTS = {
         executable: "devin",
         entrypointArgs: ["acp"],
         targetVersion: PROVIDER_TARGET_VERSIONS.devin,
-        probeArgs: [["--version"]],
+        probeArgs: [["acp", "--help"]],
         evidence: 'Native ACP entrypoint `devin acp` (stdio JSON-RPC). Slice D1 manual initialize + session/new smoke passed (protocolVersion 1, agent "Affogato", session created). Third native runtime pilot; routing stays config-gated.',
         docsRef: "docs/plans/first-class-acp-gateway-extension.dag.toml#provider_matrix.devin",
     },
@@ -83,13 +83,21 @@ export const ACP_ENTRYPOINT_CONTRACTS = {
         docsRef: "docs/plans/first-class-acp-gateway-extension.dag.toml#provider_matrix.cursor",
     },
 };
-const PERMISSION_MODES = [
-    "default",
+export const CLAUDE_WIRE_PERMISSION_MODES = [
     "acceptEdits",
+    "auto",
+    "bypassPermissions",
+    "manual",
+    "dontAsk",
     "plan",
+];
+const GROK_PERMISSION_MODES = [
+    "default",
+    "acceptEdits",
     "auto",
     "dontAsk",
     "bypassPermissions",
+    "plan",
 ];
 const EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
 function scFlag(name, arity = "optional") {
@@ -114,6 +122,7 @@ function subcommand(commandPath, summary, risk, flags = [], options = {}) {
         children: options.children ?? {},
         risk,
         exposure: options.exposure ?? "tracked_only",
+        ...(options.adminProjection ? { adminProjection: options.adminProjection } : {}),
         tier: options.tier ?? "catalog",
         tokenCost: options.tokenCost ?? "small",
         summary,
@@ -150,6 +159,10 @@ export const UPSTREAM_CLI_CONTRACTS = {
             doctor: subcommand(["doctor"], "Run Claude Code diagnostic checks.", "read_only", [], {
                 tier: "diagnostic",
             }),
+            gateway: subcommand(["gateway"], "Run Claude enterprise auth and telemetry gateway mode.", "starts_server", ["--config"], {
+                exposure: "not_exposed",
+                flagArities: { "--config": "one" },
+            }),
             mcp: subcommand(["mcp"], "Manage Claude MCP server configuration.", "writes_local_config"),
             plugin: subcommand(["plugin"], "Manage Claude plugins.", "writes_local_config", [], {
                 aliases: ["plugins"],
@@ -244,7 +257,7 @@ export const UPSTREAM_CLI_CONTRACTS = {
             },
             "--output-format": {
                 arity: "one",
-                values: ["json", "stream-json"],
+                values: ["text", "json", "stream-json"],
                 description: "Machine-readable output format",
             },
             "--include-partial-messages": {
@@ -259,7 +272,7 @@ export const UPSTREAM_CLI_CONTRACTS = {
             "--disallowed-tools": { arity: "variadic", description: "Disallowed tool names/patterns" },
             "--permission-mode": {
                 arity: "one",
-                values: PERMISSION_MODES,
+                values: CLAUDE_WIRE_PERMISSION_MODES,
                 description: "Claude permission mode",
             },
             "--mcp-config": { arity: "one", description: "MCP config path" },
@@ -392,6 +405,18 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 args: ["-p", "hello"],
                 expect: "pass",
             },
+            {
+                id: "claude-permission-mode-manual",
+                description: "Claude 2.1.207 accepts the manual permission mode literal",
+                args: ["-p", "hello", "--permission-mode", "manual"],
+                expect: "pass",
+            },
+            {
+                id: "claude-permission-mode-default-gateway-only",
+                description: "Gateway default is represented by omitting the upstream flag",
+                args: ["-p", "hello", "--permission-mode", "default"],
+                expect: "fail",
+            },
             {
                 id: "claude-unsupported-flag",
                 description: "Unsupported flag is rejected before spawn",
@@ -404,6 +429,12 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 args: ["-p", "hello", "--fallback-model", "claude-haiku-4-5-20251001"],
                 expect: "pass",
             },
+            {
+                id: "claude-output-format-text",
+                description: "Claude 2.1.207 accepts explicit text output format",
+                args: ["-p", "hello", "--output-format", "text"],
+                expect: "pass",
+            },
             {
                 id: "claude-json-schema",
                 description: "Phase 4 slice η: --json-schema accepts inline JSON literal",
@@ -508,8 +539,8 @@ export const UPSTREAM_CLI_CONTRACTS = {
         upstream: "OpenAI Codex CLI",
         upstreamMetadata: {
             sourceUrls: [
-                "https://github.com/openai/codex/releases",
-                "https://developers.openai.com/codex/changelog",
+                "https://api.github.com/repos/openai/codex/releases/latest",
+                "https://learn.chatgpt.com/docs/changelog/rss.xml",
             ],
             packageName: "@openai/codex",
             repo: "https://github.com/openai/codex",
@@ -668,6 +699,76 @@ export const UPSTREAM_CLI_CONTRACTS = {
             ], { exposure: "not_exposed" }),
             debug: subcommand(["debug"], "Run Codex debugging utilities.", "read_only", ["--config", "--disable", "--enable"], { tier: "diagnostic" }),
             apply: subcommand(["apply"], "Apply a Codex patch to the workspace.", "destructive", ["--config", "--disable", "--enable"], { exposure: "not_exposed" }),
+            resume: subcommand(["resume"], "Resume a saved interactive Codex session.", "executes_agent", [
+                "--add-dir",
+                "--all",
+                "--ask-for-approval",
+                "--cd",
+                "--config",
+                "--dangerously-bypass-approvals-and-sandbox",
+                "--dangerously-bypass-hook-trust",
+                "--disable",
+                "--enable",
+                "--image",
+                "--include-non-interactive",
+                "--last",
+                "--local-provider",
+                "--model",
+                "--no-alt-screen",
+                "--oss",
+                "--profile",
+                "--remote",
+                "--remote-auth-token-env",
+                "--sandbox",
+                "--search",
+                "--strict-config",
+                "--version",
+            ], {
+                exposure: "not_exposed",
+                maxPositionals: 2,
+                flagArities: {
+                    "--all": "none",
+                    "--dangerously-bypass-approvals-and-sandbox": "none",
+                    "--dangerously-bypass-hook-trust": "none",
+                    "--include-non-interactive": "none",
+                    "--last": "none",
+                    "--no-alt-screen": "none",
+                    "--oss": "none",
+                    "--search": "none",
+                    "--strict-config": "none",
+                    "--version": "none",
+                },
+            }),
+            delete: subcommand(["delete"], "Permanently delete a saved Codex session.", "destructive", [
+                "--add-dir",
+                "--cd",
+                "--config",
+                "--dangerously-bypass-approvals-and-sandbox",
+                "--dangerously-bypass-hook-trust",
+                "--disable",
+                "--enable",
+                "--force",
+                "--image",
+                "--local-provider",
+                "--model",
+                "--oss",
+                "--profile",
+                "--remote",
+                "--remote-auth-token-env",
+                "--sandbox",
+                "--strict-config",
+            ], {
+                exposure: "not_exposed",
+                adminProjection: "not_exposed",
+                maxPositionals: 1,
+                flagArities: {
+                    "--dangerously-bypass-approvals-and-sandbox": "none",
+                    "--dangerously-bypass-hook-trust": "none",
+                    "--force": "none",
+                    "--oss": "none",
+                    "--strict-config": "none",
+                },
+            }),
             archive: subcommand(["archive"], "Archive Codex session state.", "writes_local_config", [
                 "--add-dir",
                 "--cd",
@@ -960,7 +1061,7 @@ export const UPSTREAM_CLI_CONTRACTS = {
         upstreamMetadata: {
             sourceUrls: [
                 "https://antigravity.google/docs/cli-overview",
-                "https://github.com/google-antigravity/antigravity-cli/releases",
+                "https://api.github.com/repos/google-antigravity/antigravity-cli/releases/latest",
             ],
             repo: "https://github.com/google-antigravity/antigravity-cli",
             installDocsUrl: "https://antigravity.google/docs/cli-getting-started",
@@ -969,6 +1070,11 @@ export const UPSTREAM_CLI_CONTRACTS = {
         },
         helpArgs: [["--help"]],
         subcommands: {
+            agent: subcommand(["agent"], "List available Antigravity agents.", "read_only", [], {
+                aliases: ["agents"],
+                tier: "inspect",
+                tokenCost: "tiny",
+            }),
             changelog: subcommand(["changelog"], "Show Antigravity CLI changelog and release notes.", "read_only", [], { tokenCost: "small" }),
             install: subcommand(["install"], "Configure Antigravity CLI environment paths and shell settings.", "writes_local_config", ["--dir", "--skip-aliases", "--skip-path"], {
                 flagArities: { "--dir": "one", "--skip-aliases": "none", "--skip-path": "none" },
@@ -1033,7 +1139,7 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 description: "Print-mode wait timeout as a Go duration string (e.g. 5m0s)",
             },
         },
-        acknowledgedUpstreamFlags: ["--log-file", "--mode", "--prompt-interactive"],
+        acknowledgedUpstreamFlags: ["--agent", "--log-file", "--mode", "--prompt-interactive"],
         env: {},
         conformanceFixtures: [
             {
@@ -1048,6 +1154,12 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 args: ["--print", "hello", "--not-a-gemini-flag"],
                 expect: "fail",
             },
+            {
+                id: "gemini-agent-selection-acknowledged-not-emitted",
+                description: "Antigravity 1.1.1 advertises --agent, but gateway request argv stays closed until its security model is explicitly wired",
+                args: ["--print", "hello", "--agent", "reviewer"],
+                expect: "fail",
+            },
             {
                 id: "gemini-antigravity-workspace-flags",
                 description: "Antigravity workspace and sandbox flags are accepted",
@@ -1181,49 +1293,9 @@ export const UPSTREAM_CLI_CONTRACTS = {
             sessions: subcommand(["sessions"], "Inspect Grok sessions.", "read_only", ["--leader-socket"], {
                 tier: "inspect",
             }),
-            setup: subcommand(["setup"], "Configure Grok CLI local setup.", "writes_local_config", ["--leader-socket"], { exposure: "not_exposed" }),
-            ssh: subcommand(["ssh"], "Manage Grok SSH integration.", "network", ["--leader-socket"], {
-                acknowledgedUpstreamFlags: [
-                    "--agent",
-                    "--agents",
-                    "--allow",
-                    "--always-approve",
-                    "--best-of-n",
-                    "--check",
-                    "--continue",
-                    "--cwd",
-                    "--deny",
-                    "--disable-web-search",
-                    "--disallowed-tools",
-                    "--experimental-memory",
-                    "--fork-session",
-                    "--json-schema",
-                    "--max-turns",
-                    "--minimal",
-                    "--model",
-                    "--no-alt-screen",
-                    "--no-memory",
-                    "--no-plan",
-                    "--no-subagents",
-                    "--oauth",
-                    "--output-format",
-                    "--permission-mode",
-                    "--prompt-file",
-                    "--prompt-json",
-                    "--reasoning-effort",
-                    "--restore-code",
-                    "--resume",
-                    "--rules",
-                    "--sandbox",
-                    "--session-id",
-                    "--single",
-                    "--system-prompt-override",
-                    "--tools",
-                    "--verbatim",
-                    "--version",
-                    "--worktree",
-                    "--worktree-ref",
-                ],
+            setup: subcommand(["setup"], "Configure Grok CLI local setup.", "writes_local_config", ["--json", "--leader-socket"], {
+                exposure: "not_exposed",
+                flagArities: { "--json": "none", "--leader-socket": "one" },
             }),
             trace: subcommand(["trace"], "Inspect Grok trace data.", "read_only", ["--json", "--leader-socket", "--local", "--output"], { tier: "diagnostic" }),
             update: subcommand(["update"], "Update the Grok CLI binary.", "updates_binary", [
@@ -1237,9 +1309,20 @@ export const UPSTREAM_CLI_CONTRACTS = {
             ], { exposure: "not_exposed" }),
             version: subcommand(["version"], "Print Grok version information.", "read_only", ["--json", "--leader-socket"], { tier: "diagnostic" }),
             worktree: subcommand(["worktree"], "Manage Grok worktree sessions.", "writes_local_config", ["--leader-socket"]),
+            wrap: subcommand(["wrap"], "Run an arbitrary command inside a local clipboard-forwarding PTY.", "destructive", ["--leader-socket"], {
+                exposure: "not_exposed",
+                tier: "execute_candidate",
+                maxPositionals: "variadic",
+                flagArities: { "--leader-socket": "one" },
+            }),
         }, GROK_DEBUG_HELP_FLAGS),
         maxPositionals: 0,
-        acknowledgedUpstreamFlags: [...GROK_DEBUG_HELP_FLAGS, "--minimal", "--session-id"],
+        acknowledgedUpstreamFlags: [
+            ...GROK_DEBUG_HELP_FLAGS,
+            "--fullscreen",
+            "--minimal",
+            "--session-id",
+        ],
         mcpTools: ["grok_request", "grok_request_async"],
         mcpParameters: [
             "prompt",
@@ -1299,7 +1382,7 @@ export const UPSTREAM_CLI_CONTRACTS = {
             "--always-approve": { arity: "none", description: "Approve tool use automatically" },
             "--permission-mode": {
                 arity: "one",
-                values: PERMISSION_MODES,
+                values: GROK_PERMISSION_MODES,
                 description: "Permission mode",
             },
             "--effort": { arity: "one", values: EFFORT_LEVELS, description: "Reasoning effort" },
@@ -1648,6 +1731,7 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 description: "Agent/permission mode (builtin, install-gated, or custom agent name)",
             },
             "--enabled-tools": { arity: "one", description: "Enabled tool" },
+            "--disabled-tools": { arity: "one", description: "Disabled tool" },
             "--resume": {
                 arity: "optional",
                 description: "Resume session by ID, or interactive picker when omitted",
@@ -1681,17 +1765,11 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 description: "Additional writable workspace directory (Phase 4 slice ζ; repeat once per directory)",
             },
         },
-        acknowledgedUpstreamFlags: [
-            "--auto-approve",
-            "--check-upgrade",
-            "--disabled-tools",
-            "--worktree",
-            "--yolo",
-        ],
+        acknowledgedUpstreamFlags: ["--auto-approve", "--check-upgrade", "--worktree", "--yolo"],
         env: {
             VIBE_ACTIVE_MODEL: {
                 arity: "one",
-                pattern: /^[^\s\u0000-\u001f\u007f]+$/,
+                pattern: /^[^\s\p{Cc}]+$/u,
                 description: "Active model selector; Vibe uses env instead of a --model flag",
             },
         },
@@ -1813,11 +1891,11 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 expect: "fail",
             },
             {
-                id: "mistral-disabled-tools-rejected",
-                description: "Vibe 2.19.1 adds --disabled-tools (denylist counterpart to --enabled-tools); the gateway does not emit it (disallowedTools is accepted but ignored) and rejects raw --disabled-tools as caller argv",
+                id: "mistral-disabled-tools",
+                description: "Vibe 2.19.1 --disabled-tools denylist is accepted once per tool",
                 args: ["-p", "hello", "--disabled-tools", "shell"],
                 env: { VIBE_ACTIVE_MODEL: "mistral-medium-3.5" },
-                expect: "fail",
+                expect: "pass",
             },
             {
                 id: "mistral-resume-bare",
@@ -1833,14 +1911,63 @@ export const UPSTREAM_CLI_CONTRACTS = {
         executable: "devin",
         upstream: "Cognition Devin CLI",
         upstreamMetadata: {
-            sourceUrls: ["https://cli.devin.ai/docs/reference/commands", "https://docs.devin.ai/cli"],
+            sourceUrls: [
+                "https://cli.devin.ai/docs/reference/commands",
+                "https://docs.devin.ai/cli",
+                "https://docs.devin.ai/cli/changelog/stable",
+            ],
             packageName: "devin",
             installDocsUrl: "https://docs.devin.ai/cli",
             releaseChannel: "vendor",
             watchCategories: ["flags", "subcommands", "permission-modes", "acp-entrypoint"],
         },
         helpArgs: [["--help"]],
-        subcommands: {},
+        subcommands: {
+            acp: subcommand(["acp"], "Run the Devin Agent Client Protocol server over stdio.", "starts_server", ["--agent-type"], {
+                exposure: "not_exposed",
+                flagArities: { "--agent-type": "one" },
+            }),
+            auth: subcommand(["auth"], "Manage Devin authentication state.", "auth", [], {
+                exposure: "not_exposed",
+                maxPositionals: "variadic",
+            }),
+            cloud: subcommand(["cloud"], "Manage Devin Cloud environments, sandboxes, and builds.", "network", [], { exposure: "not_exposed", maxPositionals: "variadic" }),
+            list: subcommand(["list"], "List Devin sessions in the current directory.", "read_only", ["--format"], {
+                aliases: ["ls"],
+                tier: "inspect",
+                flagArities: { "--format": "one" },
+            }),
+            mcp: subcommand(["mcp"], "Manage Devin MCP server connections.", "writes_local_config", [], {
+                exposure: "not_exposed",
+                maxPositionals: "variadic",
+            }),
+            plugins: subcommand(["plugins"], "Manage Devin plugins.", "writes_local_config", [], {
+                exposure: "not_exposed",
+                maxPositionals: "variadic",
+            }),
+            rules: subcommand(["rules"], "Manage Devin always-on agent rules.", "writes_local_config", [], { exposure: "not_exposed", maxPositionals: "variadic" }),
+            sandbox: subcommand(["sandbox"], "Manage Devin process sandboxing.", "writes_local_config", [], { exposure: "not_exposed", maxPositionals: "variadic" }),
+            setup: subcommand(["setup"], "Run Devin interactive setup.", "writes_local_config", ["--force-manual-token-flow"], {
+                exposure: "not_exposed",
+                flagArities: { "--force-manual-token-flow": "none" },
+            }),
+            shell: subcommand(["shell"], "Integrate Devin with the local shell.", "writes_local_config", [], { exposure: "not_exposed", maxPositionals: "variadic" }),
+            skills: subcommand(["skills"], "Manage Devin skills.", "writes_local_config", [], {
+                exposure: "not_exposed",
+                maxPositionals: "variadic",
+            }),
+            uninstall: subcommand(["uninstall"], "Uninstall Devin and remove local data.", "destructive", ["--clean", "--force"], {
+                exposure: "not_exposed",
+                flagArities: { "--clean": "none", "--force": "none" },
+            }),
+            update: subcommand(["update"], "Check for or install Devin CLI updates.", "updates_binary", ["--force"], {
+                exposure: "not_exposed",
+                flagArities: { "--force": "none" },
+            }),
+            version: subcommand(["version"], "Print Devin version information.", "read_only", [], {
+                tier: "diagnostic",
+            }),
+        },
         maxPositionals: 0,
         mcpTools: ["devin_request", "devin_request_async"],
         mcpParameters: [
@@ -1865,8 +1992,8 @@ export const UPSTREAM_CLI_CONTRACTS = {
             "--model": { arity: "one", description: "AI model for this session" },
             "--permission-mode": {
                 arity: "one",
-                values: ["auto", "smart", "dangerous"],
-                description: "Permission mode (auto = read-only auto-approve; smart = additionally auto-runs safe actions per fast model; dangerous = approve all)",
+                values: ["auto", "accept-edits", "smart", "dangerous"],
+                description: "Permission mode (auto = read-only auto-approve; accept-edits = also auto-approve workspace edits; smart = additionally auto-runs safe actions per fast model; dangerous = approve all)",
             },
             "--prompt-file": { arity: "one", description: "Load the initial prompt from a file" },
             "--config": { arity: "one", description: "Config file path" },
@@ -1917,6 +2044,12 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 args: ["-p", "hello", "--permission-mode", "auto"],
                 expect: "pass",
             },
+            {
+                id: "devin-permission-mode-accept-edits",
+                description: "Valid --permission-mode 'accept-edits' accepted",
+                args: ["-p", "hello", "--permission-mode", "accept-edits"],
+                expect: "pass",
+            },
             {
                 id: "devin-permission-mode-smart",
                 description: "Valid --permission-mode 'smart' accepted",
@@ -2007,7 +2140,57 @@ export const UPSTREAM_CLI_CONTRACTS = {
             ],
         },
         helpArgs: [["--help"]],
-        subcommands: {},
+        subcommands: {
+            about: subcommand(["about"], "Display Cursor Agent version, system, and account information.", "read_only", ["--format"], { tier: "diagnostic", flagArities: { "--format": "one" } }),
+            agent: subcommand(["agent"], "Start an interactive Cursor Agent session.", "executes_agent", [], { exposure: "not_exposed", maxPositionals: "variadic" }),
+            "create-chat": subcommand(["create-chat"], "Create a new Cursor chat and return its ID.", "network", [], { exposure: "not_exposed" }),
+            "generate-rule": subcommand(["generate-rule"], "Generate a Cursor rule through interactive prompts.", "writes_local_config", [], { aliases: ["rule"], exposure: "not_exposed", maxPositionals: "variadic" }),
+            "install-shell-integration": subcommand(["install-shell-integration"], "Install Cursor shell integration.", "writes_local_config", [], { exposure: "not_exposed" }),
+            login: subcommand(["login"], "Authenticate with Cursor.", "auth", [], {
+                exposure: "not_exposed",
+            }),
+            logout: subcommand(["logout"], "Clear Cursor authentication state.", "auth", [], {
+                exposure: "not_exposed",
+            }),
+            ls: subcommand(["ls"], "Resume a Cursor chat session.", "executes_agent", [], {
+                exposure: "not_exposed",
+                maxPositionals: "variadic",
+            }),
+            mcp: subcommand(["mcp"], "Manage Cursor MCP server configuration.", "writes_local_config", [], { exposure: "not_exposed", maxPositionals: "variadic" }),
+            models: subcommand(["models"], "List Cursor account models.", "read_only", [], {
+                tier: "inspect",
+            }),
+            resume: subcommand(["resume"], "Resume the latest Cursor chat.", "executes_agent", [], {
+                exposure: "not_exposed",
+                maxPositionals: "variadic",
+            }),
+            status: subcommand(["status"], "View Cursor authentication status.", "read_only", ["--format"], {
+                aliases: ["whoami"],
+                tier: "inspect",
+                flagArities: { "--format": "one" },
+            }),
+            "uninstall-shell-integration": subcommand(["uninstall-shell-integration"], "Remove Cursor shell integration.", "writes_local_config", [], { exposure: "not_exposed" }),
+            update: subcommand(["update"], "Update Cursor Agent.", "updates_binary", [], {
+                exposure: "not_exposed",
+            }),
+            worker: subcommand(["worker"], "Start a private Cursor cloud worker for local agent runs.", "starts_server", [
+                "--auth-token-file",
+                "--data-dir",
+                "--debug",
+                "--idle-release-timeout",
+                "--label",
+                "--labels-file",
+                "--management-addr",
+                "--name",
+                "--pool",
+                "--pool-name",
+                "--single-use",
+                "--worker-dir",
+            ], {
+                exposure: "not_exposed",
+                flagArities: { "--debug": "none", "--single-use": "none" },
+            }),
+        },
         maxPositionals: 1,
         mcpTools: ["cursor_request", "cursor_request_async"],
         mcpParameters: [
@@ -2297,6 +2480,7 @@ export function serializeCliSubcommandContract(cli, contract) {
         })),
         risk: contract.risk,
         exposure: contract.exposure,
+        adminProjection: contract.adminProjection ?? null,
         tier: contract.tier,
         tokenCost: contract.tokenCost,
         summary: contract.summary,
@@ -2441,7 +2625,7 @@ export function validateUpstreamCliSubcommandArgs(cli, commandPath, args) {
             });
         }
     }
-    if (positionals.length > contract.maxPositionals) {
+    if (contract.maxPositionals !== "variadic" && positionals.length > contract.maxPositionals) {
         violations.push({
             cli,
             message: `${cli} subcommand "${subcommandKey(commandPath)}" has ${positionals.length} positional values; upstream subcommand contract allows ${contract.maxPositionals}`,

package/dist/validation-receipt.js

@@ -230,7 +230,7 @@ export function eagerMintFromJobId(deps, jobId) {
     const store = deps.validationRunStore;
     if (!store)
         return;
-    let validationId = null;
+    let validationId;
     try {
         validationId = store.getValidationRunIdByJobId(jobId);
     }

package/dist/validation-tools.d.ts

@@ -1,9 +1,15 @@
 import { z } from "zod/v3";
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import type { AsyncJobManager } from "./async-job-manager.js";
+import { PerformanceMetrics } from "./metrics.js";
+import { type LeastCostConfig } from "./config.js";
+import type { FlightRecorderQuery } from "./flight-recorder.js";
 import { type ValidationOrchestratorDeps } from "./validation-orchestrator.js";
 export interface ValidationToolDeps extends ValidationOrchestratorDeps {
     asyncJobManager: AsyncJobManager;
+    leastCost?: LeastCostConfig;
+    performanceMetrics?: PerformanceMetrics;
+    flightRecorder?: FlightRecorderQuery;
 }
 export declare function buildValidationSchemas(deps: ValidationToolDeps): {
     providerSchema: z.ZodEnum<[string, ...string[]]>;