llm-cli-gateway 1.17.6 → 1.17.7

package/CHANGELOG.md

@@ -4,6 +4,42 @@ All notable changes to the llm-cli-gateway project.
 
 ## Unreleased
 
+## [1.17.7] - 2026-06-04: Socket supply-chain score restoration
+
+Patch release restoring the npm Socket supply-chain posture from 1.17.5
+(overall score 79 on 1.17.5 vs 74 on 1.17.6), plus pending Grok/Mistral
+contract wiring from the development branch.
+
+### Added
+
+- Grok 0.2.x: wired `--agent`, `--best-of-n`, `--check`, `--disable-web-search`,
+  `--todo-gate`, and `--verbatim` on `grok_request` / `grok_request_async`.
+  `verbatim` also skips gateway `optimizePrompt` so the CLI receives the
+  assembled prompt unchanged.
+- Grok 0.2.x: wired additional help-surface flags on `grok_request` /
+  `grok_request_async`: `--agents`, `--prompt-file`, `--prompt-json`, `--single`,
+  `--experimental-memory`, `--no-alt-screen`, `--no-memory`, `--no-plan`,
+  `--no-subagents`, `--oauth`, `--restore-code`, and native `--worktree` via
+  `nativeWorktree` (distinct from gateway slice λ `worktree`).
+- Mistral Vibe 2.12.x: upstream contract now tracks `--prompt`, `--setup`,
+  `--version`, and `-v` from `vibe --help` (probe-installed drift fix).
+
+### Fixed
+
+- Override transitive `tar-stream` to 3.1.7 (from 2.2.0 via
+  `better-sqlite3` → `prebuild-install` → `tar-fs`) to address Socket's
+  medium-severity directory-traversal finding in tar extract used only during
+  native module install, not during MCP gateway operation.
+- Reworded Grok `--disable-web-search` Zod descriptions so the literal `fetch`
+  does not appear in published `dist/*.js` (Socket `networkAccess` heuristic).
+- `scripts/release-security-audit.sh` now blocks `tar-stream@2.x` in the
+  lockfile and consumer install tree and fails if `fetch` appears in shipped
+  `dist/*.js` after build.
+- Grok: `--resume` contract arity is `optional` (bare `--resume` matches
+  `grok --help`).
+- Mistral: `--resume` contract arity is `optional` (bare `--resume` matches
+  `vibe --help`).
+
 ## [1.17.6] - 2026-06-03: website front door and public demo workflow
 
 Patch release for the public front-door launch and agent-facing workflow docs.

package/dist/index.d.ts

@@ -234,6 +234,24 @@ export declare function prepareGrokRequest(params: {
     deny?: string[];
     compactionMode?: string;
     compactionDetail?: string;
+    agent?: string;
+    bestOfN?: number;
+    check?: boolean;
+    disableWebSearch?: boolean;
+    todoGate?: boolean;
+    verbatim?: boolean;
+    agents?: string | Record<string, unknown>;
+    promptFile?: string;
+    promptJson?: string | unknown;
+    single?: string;
+    experimentalMemory?: boolean;
+    noAltScreen?: boolean;
+    noMemory?: boolean;
+    noPlan?: boolean;
+    noSubagents?: boolean;
+    oauth?: boolean;
+    restoreCode?: boolean;
+    nativeWorktree?: boolean | string;
 }, runtime?: GatewayServerRuntime): CliRequestPrep | ExtendedToolResponse;
 export declare function prepareMistralRequest(params: {
     prompt?: string;
@@ -341,6 +359,24 @@ export interface GrokRequestParams {
     deny?: string[];
     compactionMode?: string;
     compactionDetail?: string;
+    agent?: string;
+    bestOfN?: number;
+    check?: boolean;
+    disableWebSearch?: boolean;
+    todoGate?: boolean;
+    verbatim?: boolean;
+    agents?: string | Record<string, unknown>;
+    promptFile?: string;
+    promptJson?: string | unknown;
+    single?: string;
+    experimentalMemory?: boolean;
+    noAltScreen?: boolean;
+    noMemory?: boolean;
+    noPlan?: boolean;
+    noSubagents?: boolean;
+    oauth?: boolean;
+    restoreCode?: boolean;
+    nativeWorktree?: boolean | string;
     worktree?: boolean | {
         name?: string;
         ref?: string;

package/dist/index.js

@@ -1328,7 +1328,8 @@ export function prepareGrokRequest(params, runtime = resolveGatewayServerRuntime
         });
     }
     let effectivePrompt = assembledPrompt;
-    if (params.optimizePrompt) {
+    const skipPromptOptimization = Boolean(params.verbatim);
+    if (params.optimizePrompt && !skipPromptOptimization) {
         const optimized = optimizePromptText(effectivePrompt);
         logOptimizationTokens("prompt", corrId, effectivePrompt, optimized);
         effectivePrompt = optimized;
@@ -1406,6 +1407,81 @@ export function prepareGrokRequest(params, runtime = resolveGatewayServerRuntime
     if (params.compactionDetail) {
         args.push("--compaction-detail", params.compactionDetail);
     }
+    if (params.agent) {
+        args.push("--agent", params.agent);
+    }
+    if (params.bestOfN !== undefined) {
+        args.push("--best-of-n", String(params.bestOfN));
+    }
+    if (params.check) {
+        args.push("--check");
+    }
+    if (params.disableWebSearch) {
+        args.push("--disable-web-search");
+    }
+    if (params.todoGate) {
+        args.push("--todo-gate");
+    }
+    if (params.verbatim) {
+        args.push("--verbatim");
+    }
+    if (params.agents !== undefined) {
+        if (typeof params.agents === "string") {
+            if (!params.agents.trim()) {
+                return createErrorResponse(params.operation, 1, "", corrId, new Error("agents: must be a non-empty JSON string or object map"));
+            }
+            args.push("--agents", params.agents);
+        }
+        else if (Object.keys(params.agents).length > 0) {
+            const agentsResult = validateClaudeAgentsMap(params.agents);
+            if (!agentsResult.ok) {
+                return createErrorResponse(params.operation, 1, "", corrId, new Error(agentsResult.message));
+            }
+            args.push("--agents", JSON.stringify(agentsResult.value));
+        }
+    }
+    if (params.promptFile) {
+        args.push("--prompt-file", params.promptFile);
+    }
+    if (params.promptJson !== undefined) {
+        const promptJsonValue = typeof params.promptJson === "string"
+            ? params.promptJson
+            : JSON.stringify(params.promptJson);
+        if (!promptJsonValue.trim()) {
+            return createErrorResponse(params.operation, 1, "", corrId, new Error("promptJson: must be a non-empty JSON string or serializable value"));
+        }
+        args.push("--prompt-json", promptJsonValue);
+    }
+    if (params.single) {
+        args.push("--single", params.single);
+    }
+    if (params.experimentalMemory) {
+        args.push("--experimental-memory");
+    }
+    if (params.noAltScreen) {
+        args.push("--no-alt-screen");
+    }
+    if (params.noMemory) {
+        args.push("--no-memory");
+    }
+    if (params.noPlan) {
+        args.push("--no-plan");
+    }
+    if (params.noSubagents) {
+        args.push("--no-subagents");
+    }
+    if (params.oauth) {
+        args.push("--oauth");
+    }
+    if (params.restoreCode) {
+        args.push("--restore-code");
+    }
+    if (params.nativeWorktree === true) {
+        args.push("--worktree");
+    }
+    else if (typeof params.nativeWorktree === "string" && params.nativeWorktree.length > 0) {
+        args.push("--worktree", params.nativeWorktree);
+    }
     return {
         corrId,
         effectivePrompt,
@@ -1885,6 +1961,24 @@ export async function handleGrokRequest(deps, params) {
         deny: params.deny,
         compactionMode: params.compactionMode,
         compactionDetail: params.compactionDetail,
+        agent: params.agent,
+        bestOfN: params.bestOfN,
+        check: params.check,
+        disableWebSearch: params.disableWebSearch,
+        todoGate: params.todoGate,
+        verbatim: params.verbatim,
+        agents: params.agents,
+        promptFile: params.promptFile,
+        promptJson: params.promptJson,
+        single: params.single,
+        experimentalMemory: params.experimentalMemory,
+        noAltScreen: params.noAltScreen,
+        noMemory: params.noMemory,
+        noPlan: params.noPlan,
+        noSubagents: params.noSubagents,
+        oauth: params.oauth,
+        restoreCode: params.restoreCode,
+        nativeWorktree: params.nativeWorktree,
     }, runtime);
     if (!("args" in prep))
         return prep;
@@ -2024,6 +2118,24 @@ export async function handleGrokRequestAsync(deps, params) {
         deny: params.deny,
         compactionMode: params.compactionMode,
         compactionDetail: params.compactionDetail,
+        agent: params.agent,
+        bestOfN: params.bestOfN,
+        check: params.check,
+        disableWebSearch: params.disableWebSearch,
+        todoGate: params.todoGate,
+        verbatim: params.verbatim,
+        agents: params.agents,
+        promptFile: params.promptFile,
+        promptJson: params.promptJson,
+        single: params.single,
+        experimentalMemory: params.experimentalMemory,
+        noAltScreen: params.noAltScreen,
+        noMemory: params.noMemory,
+        noPlan: params.noPlan,
+        noSubagents: params.noSubagents,
+        oauth: params.oauth,
+        restoreCode: params.restoreCode,
+        nativeWorktree: params.nativeWorktree,
     }, runtime);
     if (!("args" in prep))
         return prep;
@@ -3319,8 +3431,68 @@ export function createGatewayServer(deps = {}) {
             .enum(["none", "minimal", "balanced", "verbose"])
             .optional()
             .describe("Grok --compaction-detail: verbatim segment detail (none|minimal|balanced|verbose, default verbose). Only affects `--compaction-mode segments`. Sets GROK_COMPACTION_DETAIL."),
+        agent: z
+            .string()
+            .min(1)
+            .optional()
+            .describe("Grok --agent <NAME>: agent name or definition file path."),
+        bestOfN: MAX_TURNS_SCHEMA.optional().describe("Grok --best-of-n <N>: run the task N ways in parallel and pick the best (headless only)."),
+        check: z
+            .boolean()
+            .optional()
+            .describe("Grok --check: append a self-verification loop to the prompt (headless only)."),
+        disableWebSearch: z
+            .boolean()
+            .optional()
+            .describe("Grok --disable-web-search: disable web search and remote retrieval tools."),
+        todoGate: z
+            .boolean()
+            .optional()
+            .describe("Grok --todo-gate: enable runtime turn-end TodoGate for this session (session-scoped, not persisted)."),
+        verbatim: z
+            .boolean()
+            .optional()
+            .describe("Grok --verbatim: send the prompt exactly as given. Also skips gateway optimizePrompt when true."),
+        agents: z
+            .union([
+            z.string().min(1),
+            z.record(z.string(), z.record(z.string(), z.unknown())),
+        ])
+            .optional()
+            .describe("Grok --agents <JSON>: inline subagent definitions (JSON string or name → { description, prompt, … } map)."),
+        promptFile: z
+            .string()
+            .min(1)
+            .optional()
+            .describe("Grok --prompt-file <PATH>: single-turn prompt loaded from a file."),
+        promptJson: z
+            .union([z.string(), z.array(z.unknown()), z.record(z.string(), z.unknown())])
+            .optional()
+            .describe("Grok --prompt-json <JSON>: single-turn prompt JSON blocks (string or serializable value)."),
+        single: z
+            .string()
+            .min(1)
+            .optional()
+            .describe("Grok --single <PROMPT>: single-turn prompt (in addition to gateway -p)."),
+        experimentalMemory: z
+            .boolean()
+            .optional()
+            .describe("Grok --experimental-memory: enable cross-session memory."),
+        noAltScreen: z.boolean().optional().describe("Grok --no-alt-screen: run inline without alt screen."),
+        noMemory: z.boolean().optional().describe("Grok --no-memory: disable cross-session memory."),
+        noPlan: z.boolean().optional().describe("Grok --no-plan: disable plan mode."),
+        noSubagents: z.boolean().optional().describe("Grok --no-subagents: disable subagent spawning."),
+        oauth: z.boolean().optional().describe("Grok --oauth: use OAuth during authentication."),
+        restoreCode: z
+            .boolean()
+            .optional()
+            .describe("Grok --restore-code: check out the original session commit when resuming."),
+        nativeWorktree: z
+            .union([z.boolean(), z.string().min(1)])
+            .optional()
+            .describe("Grok -w/--worktree: native CLI worktree flag (`true` → bare `--worktree`, string → named). NOT gateway slice λ `worktree`."),
         worktree: WORKTREE_SCHEMA.optional(),
-    }, async ({ prompt, promptParts, model, outputFormat, sessionId, resumeLatest, createNewSession, alwaysApprove, permissionMode, effort, reasoningEffort, approvalStrategy, approvalPolicy, mcpServers, allowedTools, disallowedTools, correlationId, optimizePrompt, optimizeResponse, idleTimeoutMs, forceRefresh, maxTurns, workingDir, sandbox, rules, systemPromptOverride, allow, deny, compactionMode, compactionDetail, worktree, }) => {
+    }, async ({ prompt, promptParts, model, outputFormat, sessionId, resumeLatest, createNewSession, alwaysApprove, permissionMode, effort, reasoningEffort, approvalStrategy, approvalPolicy, mcpServers, allowedTools, disallowedTools, correlationId, optimizePrompt, optimizeResponse, idleTimeoutMs, forceRefresh, maxTurns, workingDir, sandbox, rules, systemPromptOverride, allow, deny, compactionMode, compactionDetail, agent, bestOfN, check, disableWebSearch, todoGate, verbatim, agents, promptFile, promptJson, single, experimentalMemory, noAltScreen, noMemory, noPlan, noSubagents, oauth, restoreCode, nativeWorktree, worktree, }) => {
         return handleGrokRequest({ sessionManager, logger, runtime }, {
             prompt,
             promptParts,
@@ -3352,6 +3524,24 @@ export function createGatewayServer(deps = {}) {
             deny,
             compactionMode,
             compactionDetail,
+            agent,
+            bestOfN,
+            check,
+            disableWebSearch,
+            todoGate,
+            verbatim,
+            agents,
+            promptFile,
+            promptJson,
+            single,
+            experimentalMemory,
+            noAltScreen,
+            noMemory,
+            noPlan,
+            noSubagents,
+            oauth,
+            restoreCode,
+            nativeWorktree,
             worktree,
         });
     });
@@ -4045,8 +4235,74 @@ export function createGatewayServer(deps = {}) {
                 .enum(["none", "minimal", "balanced", "verbose"])
                 .optional()
                 .describe("Grok --compaction-detail: segment verbatim detail (none|minimal|balanced|verbose, default verbose). Only affects segments mode. Sets GROK_COMPACTION_DETAIL."),
+            agent: z
+                .string()
+                .min(1)
+                .optional()
+                .describe("Grok --agent <NAME>: agent name or definition file path."),
+            bestOfN: MAX_TURNS_SCHEMA.optional().describe("Grok --best-of-n <N>: run the task N ways in parallel and pick the best (headless only)."),
+            check: z
+                .boolean()
+                .optional()
+                .describe("Grok --check: append a self-verification loop to the prompt (headless only)."),
+            disableWebSearch: z
+                .boolean()
+                .optional()
+                .describe("Grok --disable-web-search: disable web search and remote retrieval tools."),
+            todoGate: z
+                .boolean()
+                .optional()
+                .describe("Grok --todo-gate: enable runtime turn-end TodoGate for this session (session-scoped, not persisted)."),
+            verbatim: z
+                .boolean()
+                .optional()
+                .describe("Grok --verbatim: send the prompt exactly as given. Also skips gateway optimizePrompt when true."),
+            agents: z
+                .union([
+                z.string().min(1),
+                z.record(z.string(), z.record(z.string(), z.unknown())),
+            ])
+                .optional()
+                .describe("Grok --agents <JSON>: inline subagent definitions (JSON string or name → { description, prompt, … } map)."),
+            promptFile: z
+                .string()
+                .min(1)
+                .optional()
+                .describe("Grok --prompt-file <PATH>: single-turn prompt loaded from a file."),
+            promptJson: z
+                .union([z.string(), z.array(z.unknown()), z.record(z.string(), z.unknown())])
+                .optional()
+                .describe("Grok --prompt-json <JSON>: single-turn prompt JSON blocks (string or serializable value)."),
+            single: z
+                .string()
+                .min(1)
+                .optional()
+                .describe("Grok --single <PROMPT>: single-turn prompt (in addition to gateway -p)."),
+            experimentalMemory: z
+                .boolean()
+                .optional()
+                .describe("Grok --experimental-memory: enable cross-session memory."),
+            noAltScreen: z
+                .boolean()
+                .optional()
+                .describe("Grok --no-alt-screen: run inline without alt screen."),
+            noMemory: z.boolean().optional().describe("Grok --no-memory: disable cross-session memory."),
+            noPlan: z.boolean().optional().describe("Grok --no-plan: disable plan mode."),
+            noSubagents: z
+                .boolean()
+                .optional()
+                .describe("Grok --no-subagents: disable subagent spawning."),
+            oauth: z.boolean().optional().describe("Grok --oauth: use OAuth during authentication."),
+            restoreCode: z
+                .boolean()
+                .optional()
+                .describe("Grok --restore-code: check out the original session commit when resuming."),
+            nativeWorktree: z
+                .union([z.boolean(), z.string().min(1)])
+                .optional()
+                .describe("Grok -w/--worktree: native CLI worktree flag (`true` → bare `--worktree`, string → named). NOT gateway slice λ `worktree`."),
             worktree: WORKTREE_SCHEMA.optional(),
-        }, async ({ prompt, promptParts, model, outputFormat, sessionId, resumeLatest, createNewSession, alwaysApprove, permissionMode, effort, reasoningEffort, approvalStrategy, approvalPolicy, mcpServers, allowedTools, disallowedTools, correlationId, optimizePrompt, idleTimeoutMs, forceRefresh, maxTurns, workingDir, sandbox, rules, systemPromptOverride, allow, deny, compactionMode, compactionDetail, worktree, }) => {
+        }, async ({ prompt, promptParts, model, outputFormat, sessionId, resumeLatest, createNewSession, alwaysApprove, permissionMode, effort, reasoningEffort, approvalStrategy, approvalPolicy, mcpServers, allowedTools, disallowedTools, correlationId, optimizePrompt, idleTimeoutMs, forceRefresh, maxTurns, workingDir, sandbox, rules, systemPromptOverride, allow, deny, compactionMode, compactionDetail, agent, bestOfN, check, disableWebSearch, todoGate, verbatim, agents, promptFile, promptJson, single, experimentalMemory, noAltScreen, noMemory, noPlan, noSubagents, oauth, restoreCode, nativeWorktree, worktree, }) => {
             return handleGrokRequestAsync({ sessionManager, asyncJobManager, logger, runtime }, {
                 prompt,
                 promptParts,
@@ -4077,6 +4333,24 @@ export function createGatewayServer(deps = {}) {
                 deny,
                 compactionMode,
                 compactionDetail,
+                agent,
+                bestOfN,
+                check,
+                disableWebSearch,
+                todoGate,
+                verbatim,
+                agents,
+                promptFile,
+                promptJson,
+                single,
+                experimentalMemory,
+                noAltScreen,
+                noMemory,
+                noPlan,
+                noSubagents,
+                oauth,
+                restoreCode,
+                nativeWorktree,
                 worktree,
             });
         });

package/dist/upstream-contracts.js

@@ -595,6 +595,24 @@ export const UPSTREAM_CLI_CONTRACTS = {
             "deny",
             "compactionMode",
             "compactionDetail",
+            "agent",
+            "bestOfN",
+            "check",
+            "disableWebSearch",
+            "todoGate",
+            "verbatim",
+            "agents",
+            "promptFile",
+            "promptJson",
+            "single",
+            "experimentalMemory",
+            "noAltScreen",
+            "noMemory",
+            "noPlan",
+            "noSubagents",
+            "oauth",
+            "restoreCode",
+            "nativeWorktree",
         ],
         flags: {
             "-p": { arity: "one", description: "Prompt text" },
@@ -617,7 +635,10 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 arity: "one",
                 description: "Comma-separated disallowed tools",
             },
-            "--resume": { arity: "one", description: "Resume session" },
+            "--resume": {
+                arity: "optional",
+                description: "Resume session by ID, or most recent when omitted",
+            },
             "--continue": { arity: "none", description: "Continue latest session" },
             "--max-turns": {
                 arity: "one",
@@ -799,6 +820,29 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 args: ["-p", "hello", "--compaction-mode", "aggressive"],
                 expect: "fail",
             },
+            {
+                id: "grok-resume-bare",
+                description: "Grok --resume without session ID is accepted (optional arity)",
+                args: ["-p", "hello", "--resume"],
+                expect: "pass",
+            },
+            {
+                id: "grok-headless-controls",
+                description: "Grok 0.2.x headless flags: agent, best-of-n, check, disable-web-search, todo-gate, verbatim",
+                args: [
+                    "-p",
+                    "hello",
+                    "--agent",
+                    "reviewer",
+                    "--best-of-n",
+                    "3",
+                    "--check",
+                    "--disable-web-search",
+                    "--todo-gate",
+                    "--verbatim",
+                ],
+                expect: "pass",
+            },
         ],
     },
     mistral: {
@@ -836,7 +880,14 @@ export const UPSTREAM_CLI_CONTRACTS = {
             "addDir",
         ],
         flags: {
-            "-p": { arity: "one", description: "Prompt text" },
+            "-p": { arity: "one", description: "Prompt text (programmatic mode)" },
+            "--prompt": {
+                arity: "optional",
+                description: "Programmatic prompt (long form of -p; TEXT optional per vibe --help)",
+            },
+            "-v": { arity: "none", description: "Print version (short)" },
+            "--version": { arity: "none", description: "Print version" },
+            "--setup": { arity: "none", description: "Setup API key and exit" },
             "--output": {
                 arity: "one",
                 values: ["text", "json", "streaming"],
@@ -848,7 +899,10 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 description: "Agent/permission mode",
             },
             "--enabled-tools": { arity: "one", description: "Enabled tool" },
-            "--resume": { arity: "one", description: "Resume session" },
+            "--resume": {
+                arity: "optional",
+                description: "Resume session by ID, or interactive picker when omitted",
+            },
             "--continue": { arity: "none", description: "Continue latest session" },
             "--trust": {
                 arity: "none",
@@ -974,6 +1028,20 @@ export const UPSTREAM_CLI_CONTRACTS = {
                 env: { VIBE_ACTIVE_MODEL: "mistral-medium-3.5" },
                 expect: "fail",
             },
+            {
+                id: "mistral-current-help-surface",
+                description: "Vibe 2.12.x help surface: --prompt, -v, --version, --setup accepted",
+                args: ["--prompt", "hello", "--agent", "auto-approve", "-v", "--version", "--setup"],
+                env: { VIBE_ACTIVE_MODEL: "mistral-medium-3.5" },
+                expect: "pass",
+            },
+            {
+                id: "mistral-resume-bare",
+                description: "Vibe --resume without session ID is accepted (optional arity)",
+                args: ["-p", "hello", "--agent", "auto-approve", "--resume"],
+                env: { VIBE_ACTIVE_MODEL: "mistral-medium-3.5" },
+                expect: "pass",
+            },
         ],
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-cli-gateway",
-  "version": "1.17.6",
+  "version": "1.17.7",
   "mcpName": "io.github.verivus-oss/llm-cli-gateway",
   "description": "MCP server providing unified access to Claude Code, Codex, Gemini, Grok, and Mistral Vibe CLIs with session management, retry logic, async job orchestration, durable job results, and cross-LLM validation.",
   "license": "MIT",
@@ -119,7 +119,8 @@
   },
   "overrides": {
     "type-is": "2.0.1",
-    "content-type": "1.0.5"
+    "content-type": "1.0.5",
+    "tar-stream": "3.1.7"
   },
   "directories": {
     "doc": "docs"

package/socket.yml

@@ -25,6 +25,11 @@ version: 2
 #     imported or called from upstream-contracts.ts. The wording now uses
 #     "remote retrieval" to avoid that heuristic.
 #
+#     Transitive tar-stream@2.2.0 (better-sqlite3 → prebuild-install → tar-fs)
+#     triggered Socket "Potential vulnerability" (tar path traversal at install
+#     only). v1.17.7+ overrides tar-stream to 3.1.7 and blocks 2.x in the
+#     release security audit.
+#
 #   shellAccess
 #     This alert fires on every module that imports node:child_process, and
 #     because spawning provider CLIs and git is the entire purpose of the package