llm-cli-gateway 2.11.1 → 2.12.0

package/dist/job-store.d.ts

@@ -73,7 +73,46 @@ export interface OrphanedJobSnapshot {
     transport: JobTransport;
     httpStatus: number | null;
 }
-export declare class SqliteJobStore implements JobStore {
+export interface ValidationRunLink {
+    provider: string;
+    jobId: string;
+    correlationId: string;
+}
+export interface ValidationRunRecord {
+    validationId: string;
+    ownerPrincipal: string;
+    intent: string;
+    createdAt: string;
+    requestJson: string;
+    providerLinks: ValidationRunLink[];
+    judgeLink: ValidationRunLink | null;
+    status: "running" | "finalized";
+}
+export interface ValidationReceiptRecord {
+    validationId: string;
+    ownerPrincipal: string;
+    mintedAt: string;
+    schemaVersion: string;
+    reportJson: string;
+    canonicalSha256: string;
+    prevSha256: string | null;
+    seq: number | null;
+    signature: string | null;
+    models: string[];
+    hasMaterialDisagreement: boolean;
+    confidence: string;
+}
+export interface ValidationRunStore {
+    recordValidationRun(run: ValidationRunRecord): void;
+    getValidationRun(validationId: string): ValidationRunRecord | null;
+    setValidationJudgeLink(validationId: string, judgeLink: ValidationRunLink): void;
+    setValidationRunStatus(validationId: string, status: ValidationRunRecord["status"]): void;
+    getValidationRunIdByJobId(jobId: string): string | null;
+    recordValidationReceipt(receipt: ValidationReceiptRecord): void;
+    getValidationReceipt(validationId: string): ValidationReceiptRecord | null;
+}
+export declare function isValidationRunStore(store: unknown): store is ValidationRunStore;
+export declare class SqliteJobStore implements JobStore, ValidationRunStore {
     private logger;
     private db;
     private retentionMs;
@@ -122,6 +161,14 @@ export declare class SqliteJobStore implements JobStore {
         orphaned: Array<OrphanedJobSnapshot>;
     };
     evictExpired(): number;
+    recordValidationRun(run: ValidationRunRecord): void;
+    private linkRunJob;
+    getValidationRunIdByJobId(jobId: string): string | null;
+    getValidationRun(validationId: string): ValidationRunRecord | null;
+    setValidationJudgeLink(validationId: string, judgeLink: ValidationRunLink): void;
+    setValidationRunStatus(validationId: string, status: ValidationRunRecord["status"]): void;
+    recordValidationReceipt(receipt: ValidationReceiptRecord): void;
+    getValidationReceipt(validationId: string): ValidationReceiptRecord | null;
     close(): void;
 }
 export declare const JobStoreClass: typeof SqliteJobStore;

package/dist/job-store.js

@@ -83,6 +83,13 @@ function ensureJobsTransportColumns(db) {
         db.exec("ALTER TABLE jobs ADD COLUMN payload_json TEXT");
     }
 }
+export function isValidationRunStore(store) {
+    return (typeof store === "object" &&
+        store !== null &&
+        typeof store.recordValidationRun === "function" &&
+        typeof store.getValidationRun === "function" &&
+        typeof store.recordValidationReceipt === "function");
+}
 export class SqliteJobStore {
     logger;
     db;
@@ -128,6 +135,42 @@ export class SqliteJobStore {
       CREATE INDEX IF NOT EXISTS idx_jobs_status ON jobs(status);
       CREATE INDEX IF NOT EXISTS idx_jobs_expires_at ON jobs(expires_at);
       CREATE INDEX IF NOT EXISTS idx_jobs_request_key_finished ON jobs(request_key, finished_at);
+    `);
+        this.db.exec(`
+      CREATE TABLE IF NOT EXISTS validation_runs (
+        validation_id TEXT PRIMARY KEY,
+        owner_principal TEXT NOT NULL,
+        intent TEXT NOT NULL,
+        created_at TEXT NOT NULL,
+        request_json TEXT NOT NULL,
+        provider_links TEXT NOT NULL,
+        judge_link TEXT,
+        status TEXT NOT NULL
+      );
+      CREATE INDEX IF NOT EXISTS idx_validation_runs_owner ON validation_runs(owner_principal);
+    `);
+        this.db.exec(`
+      CREATE TABLE IF NOT EXISTS validation_run_jobs (
+        job_id TEXT PRIMARY KEY,
+        validation_id TEXT NOT NULL,
+        role TEXT NOT NULL
+      );
+      CREATE INDEX IF NOT EXISTS idx_validation_run_jobs_run ON validation_run_jobs(validation_id);
+      CREATE TABLE IF NOT EXISTS validation_receipts (
+        validation_id TEXT PRIMARY KEY,
+        owner_principal TEXT NOT NULL,
+        minted_at TEXT NOT NULL,
+        schema_version TEXT NOT NULL,
+        report_json TEXT NOT NULL,
+        canonical_sha256 TEXT NOT NULL,
+        prev_sha256 TEXT,
+        seq INTEGER,
+        signature TEXT,
+        models TEXT NOT NULL,
+        has_material_disagreement INTEGER NOT NULL,
+        confidence TEXT NOT NULL
+      );
+      CREATE INDEX IF NOT EXISTS idx_validation_receipts_owner ON validation_receipts(owner_principal);
     `);
         ensureJobsOwnerColumn(this.db);
         ensureJobsTransportColumns(this.db);
@@ -262,6 +305,86 @@ export class SqliteJobStore {
         const result = this.deleteExpiredStmt.run(now);
         return Number(result.changes);
     }
+    recordValidationRun(run) {
+        this.db
+            .prepare(`INSERT OR IGNORE INTO validation_runs
+           (validation_id, owner_principal, intent, created_at, request_json,
+            provider_links, judge_link, status)
+         VALUES (@validation_id, @owner_principal, @intent, @created_at, @request_json,
+                 @provider_links, @judge_link, @status)`)
+            .run({
+            validation_id: run.validationId,
+            owner_principal: run.ownerPrincipal,
+            intent: run.intent,
+            created_at: run.createdAt,
+            request_json: run.requestJson,
+            provider_links: JSON.stringify(run.providerLinks),
+            judge_link: run.judgeLink ? JSON.stringify(run.judgeLink) : null,
+            status: run.status,
+        });
+        for (const link of run.providerLinks) {
+            this.linkRunJob(run.validationId, link.jobId, "provider");
+        }
+    }
+    linkRunJob(validationId, jobId, role) {
+        this.db
+            .prepare(`INSERT OR IGNORE INTO validation_run_jobs (job_id, validation_id, role)
+         VALUES (?, ?, ?)`)
+            .run(jobId, validationId, role);
+    }
+    getValidationRunIdByJobId(jobId) {
+        const row = this.db
+            .prepare(`SELECT validation_id FROM validation_run_jobs WHERE job_id = ?`)
+            .get(jobId);
+        return row?.validation_id ?? null;
+    }
+    getValidationRun(validationId) {
+        const row = this.db
+            .prepare(`SELECT * FROM validation_runs WHERE validation_id = ?`)
+            .get(validationId);
+        return row ? rowToValidationRunRecord(row) : null;
+    }
+    setValidationJudgeLink(validationId, judgeLink) {
+        this.db
+            .prepare(`UPDATE validation_runs SET judge_link = ? WHERE validation_id = ?`)
+            .run(JSON.stringify(judgeLink), validationId);
+        this.linkRunJob(validationId, judgeLink.jobId, "judge");
+    }
+    setValidationRunStatus(validationId, status) {
+        this.db
+            .prepare(`UPDATE validation_runs SET status = ? WHERE validation_id = ?`)
+            .run(status, validationId);
+    }
+    recordValidationReceipt(receipt) {
+        this.db
+            .prepare(`INSERT OR IGNORE INTO validation_receipts
+           (validation_id, owner_principal, minted_at, schema_version, report_json,
+            canonical_sha256, prev_sha256, seq, signature, models,
+            has_material_disagreement, confidence)
+         VALUES (@validation_id, @owner_principal, @minted_at, @schema_version, @report_json,
+                 @canonical_sha256, @prev_sha256, @seq, @signature, @models,
+                 @has_material_disagreement, @confidence)`)
+            .run({
+            validation_id: receipt.validationId,
+            owner_principal: receipt.ownerPrincipal,
+            minted_at: receipt.mintedAt,
+            schema_version: receipt.schemaVersion,
+            report_json: receipt.reportJson,
+            canonical_sha256: receipt.canonicalSha256,
+            prev_sha256: receipt.prevSha256,
+            seq: receipt.seq,
+            signature: receipt.signature,
+            models: JSON.stringify(receipt.models),
+            has_material_disagreement: receipt.hasMaterialDisagreement ? 1 : 0,
+            confidence: receipt.confidence,
+        });
+    }
+    getValidationReceipt(validationId) {
+        const row = this.db
+            .prepare(`SELECT * FROM validation_receipts WHERE validation_id = ?`)
+            .get(validationId);
+        return row ? rowToValidationReceiptRecord(row) : null;
+    }
     close() {
         try {
             this.db.close();
@@ -271,6 +394,67 @@ export class SqliteJobStore {
         }
     }
 }
+function rowToValidationRunRecord(row) {
+    return {
+        validationId: row.validation_id,
+        ownerPrincipal: row.owner_principal,
+        intent: row.intent,
+        createdAt: row.created_at,
+        requestJson: row.request_json,
+        providerLinks: parseLinks(row.provider_links) ?? [],
+        judgeLink: parseLink(row.judge_link),
+        status: row.status,
+    };
+}
+function rowToValidationReceiptRecord(row) {
+    return {
+        validationId: row.validation_id,
+        ownerPrincipal: row.owner_principal,
+        mintedAt: row.minted_at,
+        schemaVersion: row.schema_version,
+        reportJson: row.report_json,
+        canonicalSha256: row.canonical_sha256,
+        prevSha256: row.prev_sha256 ?? null,
+        seq: row.seq ?? null,
+        signature: row.signature ?? null,
+        models: parseStringArray(row.models),
+        hasMaterialDisagreement: Boolean(row.has_material_disagreement),
+        confidence: row.confidence,
+    };
+}
+function parseLinks(value) {
+    if (typeof value !== "string" || value.length === 0)
+        return null;
+    try {
+        const parsed = JSON.parse(value);
+        return Array.isArray(parsed) ? parsed : null;
+    }
+    catch {
+        return null;
+    }
+}
+function parseStringArray(value) {
+    if (typeof value !== "string" || value.length === 0)
+        return [];
+    try {
+        const parsed = JSON.parse(value);
+        return Array.isArray(parsed) ? parsed : [];
+    }
+    catch {
+        return [];
+    }
+}
+function parseLink(value) {
+    if (typeof value !== "string" || value.length === 0)
+        return null;
+    try {
+        const parsed = JSON.parse(value);
+        return parsed && typeof parsed === "object" ? parsed : null;
+    }
+    catch {
+        return null;
+    }
+}
 export const JobStoreClass = SqliteJobStore;
 export class MemoryJobStore {
     rows = new Map();

package/dist/provider-codegen.js

@@ -329,6 +329,9 @@ export const UNGENERATED_GROK_FLAGS = [
     "--agents",
     "--prompt-json",
     "--worktree",
+    "--worktree-ref",
+    "--fork-session",
+    "--json-schema",
     "-p",
     "--resume",
     "--continue",

package/dist/provider-tool-capabilities.js

@@ -49,7 +49,7 @@ export const ACP_CONTRACT = {
         },
         gemini: {
             classification: "absent_watchlist",
-            summary: "Google Antigravity agy 1.0.10 has no ACP surface; watchlist item only.",
+            summary: "Google Antigravity agy 1.0.13 has no ACP surface; watchlist item only.",
         },
         grok_api: {
             classification: "absent_watchlist",
@@ -80,7 +80,7 @@ const ACP_CAPABILITIES = {
     grok: {
         status: "native_smoke_passed",
         mediation: "native",
-        targetVersion: "grok 0.2.60 (474c2bbfc)",
+        targetVersion: "grok 0.2.73 (9ff14c43bb)",
         entrypoint: { command: "grok", args: ["agent", "stdio"] },
         runtimeEnabled: false,
         smokeSupported: true,
@@ -95,7 +95,7 @@ const ACP_CAPABILITIES = {
     codex: {
         status: "adapter_mediated_deferred",
         mediation: "adapter_mediated",
-        targetVersion: "codex-cli 0.141.0",
+        targetVersion: "codex-cli 0.142.4",
         entrypoint: null,
         runtimeEnabled: false,
         smokeSupported: false,
@@ -109,7 +109,7 @@ const ACP_CAPABILITIES = {
     claude: {
         status: "adapter_mediated_deferred",
         mediation: "adapter_mediated",
-        targetVersion: "claude 2.1.185",
+        targetVersion: "claude 2.1.195",
         entrypoint: null,
         runtimeEnabled: false,
         smokeSupported: false,
@@ -123,13 +123,13 @@ const ACP_CAPABILITIES = {
     gemini: {
         status: "absent_watchlist",
         mediation: "none",
-        targetVersion: "agy 1.0.10",
+        targetVersion: "agy 1.0.13",
         entrypoint: null,
         runtimeEnabled: false,
         smokeSupported: false,
         smokeStatus: "unsupported",
         caveats: [
-            "Antigravity agy 1.0.10 has no ACP flag or subcommand.",
+            "Antigravity agy 1.0.13 has no ACP flag or subcommand.",
             "Legacy Gemini CLI ACP evidence does not transfer to agy; kept on the upstream drift watchlist.",
         ],
         docs: ACP_DOCS_REFERENCE,
@@ -148,7 +148,7 @@ const ACP_CAPABILITIES = {
     devin: {
         status: "native_smoke_passed",
         mediation: "native",
-        targetVersion: "devin 2026.7.23 (3bd47f77)",
+        targetVersion: "devin 2026.8.18 (16737566)",
         entrypoint: { command: "devin", args: ["acp"] },
         runtimeEnabled: false,
         smokeSupported: true,

package/dist/upstream-contracts.d.ts

@@ -62,6 +62,7 @@ export interface CliSubcommandContract {
     tokenCost: CliSubcommandTokenCost;
     summary: string;
     conformanceFixtures: readonly CliContractFixture[];
+    helpProbeExitTolerant?: boolean;
 }
 export interface ContractViolation {
     cli: CliType;

package/dist/upstream-contracts.js

@@ -19,9 +19,9 @@ export const ACP_ENTRYPOINT_CONTRACTS = {
         status: "native",
         executable: "grok",
         entrypointArgs: ["agent", "stdio"],
-        targetVersion: "grok 0.2.60 (474c2bbfc)",
+        targetVersion: "grok 0.2.73 (9ff14c43bb)",
         probeArgs: [["agent", "stdio", "--help"]],
-        evidence: "Native ACP via `grok agent stdio`; initialize + session/new smoke passed with isolated leader socket. Second runtime pilot. Bumped for 0.2.60.",
+        evidence: "Native ACP via `grok agent stdio`; initialize + session/new smoke passed with isolated leader socket. Second runtime pilot. Entrypoint re-probed clean at 0.2.73.",
         docsRef: "docs/plans/first-class-acp-gateway-extension.dag.toml#provider_matrix.grok",
     },
     codex: {
@@ -30,10 +30,10 @@ export const ACP_ENTRYPOINT_CONTRACTS = {
         status: "adapter_mediated_deferred",
         executable: "codex",
         entrypointArgs: [],
-        targetVersion: "codex-cli 0.141.0",
+        targetVersion: "codex-cli 0.142.4",
         probeArgs: [],
         adapterCandidates: ["zed-industries/codex-acp", "agentclientprotocol/codex-acp"],
-        evidence: "No native ACP entrypoint at codex-cli 0.141.0. Adapter evidence tracked as documentation only; not native gateway ACP support.",
+        evidence: "No native ACP entrypoint at codex-cli 0.142.4. Adapter evidence tracked as documentation only; not native gateway ACP support.",
         docsRef: "docs/plans/first-class-acp-gateway-extension.dag.toml#provider_matrix.codex",
     },
     claude: {
@@ -42,10 +42,10 @@ export const ACP_ENTRYPOINT_CONTRACTS = {
         status: "adapter_mediated_deferred",
         executable: "claude",
         entrypointArgs: [],
-        targetVersion: "claude 2.1.185",
+        targetVersion: "claude 2.1.195",
         probeArgs: [],
         adapterCandidates: ["Claude Agent SDK ACP adapter"],
-        evidence: "No native Claude Code CLI ACP entrypoint at claude 2.1.185. Adapter ownership/permission bridging unresolved; deferred.",
+        evidence: "No native Claude Code CLI ACP entrypoint at claude 2.1.195. Adapter ownership/permission bridging unresolved; deferred.",
         docsRef: "docs/plans/first-class-acp-gateway-extension.dag.toml#provider_matrix.claude",
     },
     gemini: {
@@ -54,9 +54,9 @@ export const ACP_ENTRYPOINT_CONTRACTS = {
         status: "absent_watchlist",
         executable: "agy",
         entrypointArgs: [],
-        targetVersion: "agy 1.0.10",
+        targetVersion: "agy 1.0.13",
         probeArgs: [],
-        evidence: "agy 1.0.10 has no ACP flag or subcommand. Legacy Gemini CLI ACP evidence does not transfer. Watchlist item.",
+        evidence: "agy 1.0.13 has no ACP flag or subcommand. Legacy Gemini CLI ACP evidence does not transfer. Watchlist item.",
         docsRef: "docs/plans/first-class-acp-gateway-extension.dag.toml#provider_matrix.gemini",
     },
     devin: {
@@ -65,7 +65,7 @@ export const ACP_ENTRYPOINT_CONTRACTS = {
         status: "native",
         executable: "devin",
         entrypointArgs: ["acp"],
-        targetVersion: "devin 2026.7.23 (3bd47f77)",
+        targetVersion: "devin 2026.8.18 (16737566)",
         probeArgs: [["--version"]],
         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",
@@ -107,6 +107,7 @@ function subcommand(commandPath, summary, risk, flags = [], options = {}) {
         summary,
         conformanceFixtures: options.fixtures ?? [],
         acknowledgedUpstreamFlags: options.acknowledgedUpstreamFlags ?? [],
+        ...(options.helpProbeExitTolerant ? { helpProbeExitTolerant: true } : {}),
     };
 }
 function acknowledgeSubcommandFlags(subcommands, flags) {
@@ -307,8 +308,10 @@ export const UPSTREAM_CLI_CONTRACTS = {
             "--allow-dangerously-skip-permissions",
             "--allowed",
             "--ax-screen-reader",
+            "--background",
             "--bare",
             "--betas",
+            "--bg",
             "--brief",
             "--chrome",
             "--dangerously-skip-permissions",
@@ -320,7 +323,6 @@ export const UPSTREAM_CLI_CONTRACTS = {
             "--from-pr",
             "--ide",
             "--include-hook-events",
-            "--mcp-debug",
             "--name",
             "--no-chrome",
             "--plugin-dir",
@@ -419,6 +421,12 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 ],
                 expect: "pass",
             },
+            {
+                id: "claude-background-acknowledged-not-emitted",
+                description: "Claude 2.1.195 advertises --bg/--background (background agent), but the gateway acknowledges them without emitting; caller argv is rejected",
+                args: ["-p", "hello", "--background"],
+                expect: "fail",
+            },
         ],
     },
     codex: {
@@ -899,7 +907,7 @@ export const UPSTREAM_CLI_CONTRACTS = {
             plugins: subcommand(["plugins"], "Alias for Antigravity plugin management.", "writes_local_config", [], {
                 aliases: ["plugin"],
             }),
-            update: subcommand(["update"], "Update Antigravity CLI to the current release.", "writes_local_config", [], { tokenCost: "small" }),
+            update: subcommand(["update"], "Update Antigravity CLI to the current release.", "writes_local_config", [], { tokenCost: "small", helpProbeExitTolerant: true }),
         },
         maxPositionals: 1,
         mcpTools: ["gemini_request", "gemini_request_async"],
@@ -921,6 +929,8 @@ export const UPSTREAM_CLI_CONTRACTS = {
             "attachments",
             "skipTrust",
             "yolo",
+            "project",
+            "newProject",
         ],
         flags: {
             "--print": { arity: "none", description: "Run a single prompt non-interactively" },
@@ -936,14 +946,13 @@ export const UPSTREAM_CLI_CONTRACTS = {
             "--conversation": { arity: "one", description: "Resume a previous conversation by ID" },
             "--continue": { arity: "none", description: "Continue the most recent conversation" },
             "-c": { arity: "none", description: "Short alias for --continue" },
+            "--project": { arity: "one", description: "Antigravity project ID for this session" },
+            "--new-project": {
+                arity: "none",
+                description: "Create a new Antigravity project for this session",
+            },
         },
-        acknowledgedUpstreamFlags: [
-            "--prompt-interactive",
-            "-i",
-            "--print-timeout",
-            "--log-file",
-            "--version",
-        ],
+        acknowledgedUpstreamFlags: ["--log-file", "--print-timeout", "--prompt-interactive"],
         env: {},
         conformanceFixtures: [
             {
@@ -982,6 +991,18 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 args: ["--print", "hello", "-o", "json"],
                 expect: "fail",
             },
+            {
+                id: "gemini-project-wired",
+                description: "Antigravity 1.0.13: --project <ID> is wired",
+                args: ["--print", "hello", "--project", "proj-123"],
+                expect: "pass",
+            },
+            {
+                id: "gemini-new-project-wired",
+                description: "Antigravity 1.0.13: --new-project is wired",
+                args: ["--print", "hello", "--new-project"],
+                expect: "pass",
+            },
         ],
     },
     grok: {
@@ -1073,7 +1094,49 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 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"]),
+            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",
+                    "--effort",
+                    "--experimental-memory",
+                    "--fork-session",
+                    "--json-schema",
+                    "--max-turns",
+                    "--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",
+                ],
+            }),
             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", [
                 "--alpha",
@@ -1088,7 +1151,7 @@ export const UPSTREAM_CLI_CONTRACTS = {
             worktree: subcommand(["worktree"], "Manage Grok worktree sessions.", "writes_local_config", ["--leader-socket"]),
         }, GROK_DEBUG_HELP_FLAGS),
         maxPositionals: 0,
-        acknowledgedUpstreamFlags: GROK_DEBUG_HELP_FLAGS,
+        acknowledgedUpstreamFlags: [...GROK_DEBUG_HELP_FLAGS, "--session-id"],
         mcpTools: ["grok_request", "grok_request_async"],
         mcpParameters: [
             "prompt",
@@ -1133,6 +1196,9 @@ export const UPSTREAM_CLI_CONTRACTS = {
             "restoreCode",
             "leaderSocket",
             "nativeWorktree",
+            "worktreeRef",
+            "forkSession",
+            "jsonSchema",
         ],
         flags: {
             "-p": { arity: "one", description: "Prompt text" },
@@ -1229,6 +1295,18 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 arity: "optional",
                 description: "Start the session in a new git worktree, optionally named",
             },
+            "--worktree-ref": {
+                arity: "one",
+                description: "Git ref to base the worktree on (requires --worktree)",
+            },
+            "--fork-session": {
+                arity: "none",
+                description: "Fork the resumed session into a new session ID",
+            },
+            "--json-schema": {
+                arity: "one",
+                description: "JSON Schema literal constraining structured output (implies json output)",
+            },
             "--compaction-mode": {
                 arity: "one",
                 values: ["summary", "transcript", "segments"],
@@ -1397,6 +1475,35 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 args: ["-p", "hello", "--agent", "reviewer", "--leader-socket", "/tmp/leader.sock"],
                 expect: "pass",
             },
+            {
+                id: "grok-json-schema-wired",
+                description: "Grok 0.2.73: --json-schema <SCHEMA> is wired (structured output, implies json)",
+                args: [
+                    "-p",
+                    "hello",
+                    "--json-schema",
+                    '{"type":"object","properties":{"name":{"type":"string"}}}',
+                ],
+                expect: "pass",
+            },
+            {
+                id: "grok-fork-session-wired",
+                description: "Grok 0.2.73: --fork-session is wired (fork resumed session into a new ID)",
+                args: ["-p", "hello", "--resume", "sess-1", "--fork-session"],
+                expect: "pass",
+            },
+            {
+                id: "grok-worktree-ref-wired",
+                description: "Grok 0.2.73: --worktree-ref <REF> is wired (with --worktree)",
+                args: ["-p", "hello", "--worktree", "--worktree-ref", "main"],
+                expect: "pass",
+            },
+            {
+                id: "grok-session-id-acknowledged-not-emitted",
+                description: "Grok 0.2.73 advertises --session-id, but the gateway owns session-id lifecycle and does not emit it; caller argv is rejected",
+                args: ["-p", "hello", "--session-id", "11111111-1111-1111-1111-111111111111"],
+                expect: "fail",
+            },
         ],
     },
     mistral: {
@@ -2274,7 +2381,7 @@ function probeInstalledCliSubcommands(cli, timeoutMs) {
                 break;
             }
             outputs.push(`${result.stdout ?? ""}\n${result.stderr ?? ""}`);
-            if (result.status !== 0) {
+            if (result.status !== 0 && !sub.helpProbeExitTolerant) {
                 warnings.push(`${contract.executable} ${args.join(" ")} exited with status ${result.status}`);
             }
         }

package/dist/validation-orchestrator.d.ts

@@ -3,11 +3,13 @@ import { type ProviderRuntimeStatus } from "./provider-status.js";
 import type { ApiProviderRuntime } from "./config.js";
 import { type NormalizedValidationResult, type ValidationProvider } from "./validation-normalizer.js";
 import { type ValidationReport } from "./validation-report.js";
+import type { ValidationRunStore } from "./job-store.js";
 import { type ValidationIntent } from "./validation-prompts.js";
 export interface ValidationOrchestratorDeps {
     asyncJobManager: AsyncJobManager;
     getProviderRuntimeStatus?: (provider: ValidationProvider) => ProviderRuntimeStatus;
     apiProviders?: ApiProviderRuntime[];
+    validationRunStore?: ValidationRunStore | null;
 }
 export interface StartValidationInput {
     intent: ValidationIntent;
@@ -21,7 +23,7 @@ export interface StartValidationInput {
 export interface ValidationRunReport {
     success: boolean;
     validationId: string;
-    status: "running" | "partial" | "not_started";
+    status: "running" | "partial" | "not_started" | "completed";
     startedAt: string;
     intent: ValidationIntent;
     originalRequest: {
@@ -32,7 +34,7 @@ export interface ValidationRunReport {
     modelList: ValidationProvider[];
     results: NormalizedValidationResult[];
     synthesis: {
-        status: "not_requested" | "waiting_for_provider_results" | "running" | "skipped";
+        status: "not_requested" | "waiting_for_provider_results" | "running" | "skipped" | "completed";
         judgeModel: ValidationProvider | null;
         rawJobReference: NormalizedValidationResult["rawJobReference"];
         note: string;
@@ -45,5 +47,6 @@ export declare function startJudgeSynthesis(deps: ValidationOrchestratorDeps, in
     question: string;
     providerResults: NormalizedValidationResult[];
     judgeProvider: ValidationProvider;
+    validationId?: string;
 }): ValidationRunReport["synthesis"];
 export declare function collectValidationJobResult(deps: ValidationOrchestratorDeps, provider: ValidationProvider, jobId: string, model: string | null, maxChars?: number): NormalizedValidationResult | null;