llm-cli-gateway 1.5.24 → 1.5.26

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to the llm-cli-gateway project.
 
+## [1.5.26] - 2026-05-25
+
+### Fixed
+
+- Make `upstream_contracts --probe-installed` use the same extended provider PATH and Windows shim resolver as request execution and `doctor --json`, avoiding false `ENOENT` diagnostics for npm-installed CLIs such as Gemini.
+
+## [1.5.25] - 2026-05-25
+
+### Fixed
+
+- Stop passing unsupported Gemini `--session-id` arguments for fresh or `createNewSession` requests. The gateway now lets Gemini CLI create fresh sessions with its own default behavior and only emits `--resume` for explicit resume requests, fixing Gemini CLI 0.43 exit-code-1 failures misreported as spawn errors.
+
 ## [1.5.24] - 2026-05-25
 
 ### Fixed

package/dist/index.js

@@ -1253,9 +1253,8 @@ export async function handleGeminiRequest(deps, params) {
     }, runtime);
     deps.logger.info(`[${corrId}] gemini_request invoked with model=${prep.resolvedModel || "default"}, approvalMode=${params.approvalMode}, prompt length=${params.prompt.length}`);
     try {
-        // U27: Session arg planning. For fresh sessions, emit `--session-id <uuid>`
-        // so the gateway and Gemini agree on the session identifier from turn 1.
-        // For resume flows, fall back to `--resume <id>` (existing behavior).
+        // Gemini CLI 0.43 supports `--resume`, but not a supported fresh
+        // `--session-id` flag. Fresh sessions emit no session flag.
         const sessionPlan = resolveGeminiSessionPlan({
             sessionId: params.sessionId,
             resumeLatest: params.resumeLatest,
@@ -1263,7 +1262,7 @@ export async function handleGeminiRequest(deps, params) {
         });
         args.push(...sessionPlan.args);
         const userProvidedSession = sessionPlan.resumed;
-        const effectiveSessionIdHint = sessionPlan.emittedSessionId ?? params.sessionId;
+        const effectiveSessionIdHint = sessionPlan.resumed ? params.sessionId : undefined;
         const result = await awaitJobOrDefer("gemini", args, corrId, resolveIdleTimeout("gemini", params.idleTimeoutMs), params.outputFormat, params.forceRefresh, runtime);
         // Deferred — job still running, return async reference
         if (isDeferredResponse(result)) {
@@ -1286,9 +1285,9 @@ export async function handleGeminiRequest(deps, params) {
             return createErrorResponse("gemini", code, stderr, corrId);
         }
         wasSuccessful = true;
-        // U27 Post-success session I/O. Mirror the gateway store 1:1 to whatever
-        // session id Gemini is using (either the user-supplied resume id or the
-        // deterministic --session-id we emitted).
+        // Post-success session I/O for explicit resume flows. Fresh Gemini sessions
+        // are owned by the CLI because the current CLI has no supported fresh
+        // session-id flag the gateway can inject.
         let effectiveSessionId = effectiveSessionIdHint;
         if (effectiveSessionId) {
             const existing = await deps.sessionManager.getSession(effectiveSessionId);
@@ -1368,7 +1367,7 @@ export async function handleGeminiRequestAsync(deps, params) {
         return prep;
     const { corrId, args, requestedMcpServers, approvalDecision } = prep;
     try {
-        // U27: Session arg planning with deterministic --session-id for fresh sessions.
+        // Gemini CLI 0.43 supports `--resume`, but fresh sessions emit no session flag.
         const sessionPlan = resolveGeminiSessionPlan({
             sessionId: params.sessionId,
             resumeLatest: params.resumeLatest,
@@ -1376,7 +1375,7 @@ export async function handleGeminiRequestAsync(deps, params) {
         });
         args.push(...sessionPlan.args);
         // Pre-start session I/O (async handlers: prevent orphaned jobs)
-        let effectiveSessionId = sessionPlan.emittedSessionId ?? params.sessionId;
+        let effectiveSessionId = sessionPlan.resumed ? params.sessionId : undefined;
         if (effectiveSessionId) {
             const existing = await deps.sessionManager.getSession(effectiveSessionId);
             if (!existing) {

package/dist/request-helpers.d.ts

@@ -457,14 +457,6 @@ export interface CodexForkRequestInput {
 export declare function prepareCodexForkRequest(input: CodexForkRequestInput): {
     args: string[];
 };
-/**
- * Strict UUID v4 regex. Gemini's CLI is reportedly stricter about session id
- * shape than the gateway's internal handles, so caller-supplied IDs (and IDs
- * generated by `crypto.randomUUID()`) are validated against this regex before
- * being emitted as `--session-id <uuid>`.
- */
-export declare const GEMINI_SESSION_ID_REGEX: RegExp;
-export declare function isValidGeminiSessionId(id: string): boolean;
 /**
  * Prepend `@<abs-path>` tokens to a Gemini prompt so the CLI's attachment
  * resolver picks them up. Each path MUST be absolute and exist on disk.
@@ -520,34 +512,21 @@ export interface GeminiHighImpactFlagsResult {
  */
 export declare function prepareGeminiHighImpactFlags(input: GeminiHighImpactFlagsInput): GeminiHighImpactFlagsResult;
 /**
- * Result of resolving Gemini's session-id emission strategy.
- *
- * U27 introduces deterministic `--session-id <uuid>` emission for fresh
- * sessions, mapping the gateway-side session ID 1:1 to Gemini's authoritative
- * store. The existing `--resume <id>` flow is preserved for user-supplied
- * session IDs.
+ * Result of resolving Gemini's session strategy.
  */
 export interface GeminiSessionPlan {
-    /** Flag pair to inject into argv (one of `["--session-id", uuid]`, `["--resume", id]`, `["--resume", "latest"]`, or `[]`). */
+    /** Flag pair to inject into argv (one of `["--resume", id]`, `["--resume", "latest"]`, or `[]`). */
     args: string[];
-    /** The UUID emitted via `--session-id`, if any. Gateway should persist this. */
-    emittedSessionId?: string;
     /** True iff `--resume <id>` was emitted with a user-supplied id. */
     resumed: boolean;
 }
 /**
- * Resolve Gemini session-id args. When a fresh session is being established
- * (either `createNewSession: true`, or no sessionId/resumeLatest set), emit
- * `--session-id <uuid>` so the gateway and Gemini agree on the session
- * identifier from the first turn.
- *
- * Falls back to `--resume <id>` when the caller supplies a sessionId, and
- * `--resume latest` for `resumeLatest` (existing behavior preserved).
+ * Resolve Gemini session args. Gemini CLI 0.43 exposes `--resume` but not a
+ * supported `--session-id` flag for fresh sessions, so new-session requests
+ * intentionally emit no session flag and let the CLI create its own session.
  */
 export declare function resolveGeminiSessionPlan(opts: {
     sessionId?: string;
     resumeLatest?: boolean;
     createNewSession?: boolean;
-    /** Override generator for deterministic tests. Must produce a v4 UUID. */
-    generateId?: () => string;
 }): GeminiSessionPlan;

package/dist/request-helpers.js

@@ -580,16 +580,6 @@ export function prepareCodexForkRequest(input) {
 //──────────────────────────────────────────────────────────────────────────────
 // U27: Gemini high-impact features
 //──────────────────────────────────────────────────────────────────────────────
-/**
- * Strict UUID v4 regex. Gemini's CLI is reportedly stricter about session id
- * shape than the gateway's internal handles, so caller-supplied IDs (and IDs
- * generated by `crypto.randomUUID()`) are validated against this regex before
- * being emitted as `--session-id <uuid>`.
- */
-export const GEMINI_SESSION_ID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-export function isValidGeminiSessionId(id) {
-    return GEMINI_SESSION_ID_REGEX.test(id);
-}
 /**
  * Prepend `@<abs-path>` tokens to a Gemini prompt so the CLI's attachment
  * resolver picks them up. Each path MUST be absolute and exist on disk.
@@ -674,16 +664,11 @@ export function prepareGeminiHighImpactFlags(input) {
     return { args, missingPolicyPath: null, missingPolicyField: null };
 }
 /**
- * Resolve Gemini session-id args. When a fresh session is being established
- * (either `createNewSession: true`, or no sessionId/resumeLatest set), emit
- * `--session-id <uuid>` so the gateway and Gemini agree on the session
- * identifier from the first turn.
- *
- * Falls back to `--resume <id>` when the caller supplies a sessionId, and
- * `--resume latest` for `resumeLatest` (existing behavior preserved).
+ * Resolve Gemini session args. Gemini CLI 0.43 exposes `--resume` but not a
+ * supported `--session-id` flag for fresh sessions, so new-session requests
+ * intentionally emit no session flag and let the CLI create its own session.
  */
 export function resolveGeminiSessionPlan(opts) {
-    const gen = opts.generateId ?? randomUUID;
     if (opts.sessionId && !opts.createNewSession) {
         validateSessionId(opts.sessionId);
         return {
@@ -694,14 +679,5 @@ export function resolveGeminiSessionPlan(opts) {
     if (opts.resumeLatest && !opts.createNewSession) {
         return { args: ["--resume", "latest"], resumed: false };
     }
-    // Fresh session — emit deterministic --session-id
-    const candidate = gen();
-    if (!isValidGeminiSessionId(candidate)) {
-        throw new Error(`Generated session id "${candidate}" does not match Gemini's UUID v4 format`);
-    }
-    return {
-        args: ["--session-id", candidate],
-        emittedSessionId: candidate,
-        resumed: false,
-    };
+    return { args: [], resumed: false };
 }

package/dist/upstream-contracts.d.ts

@@ -50,6 +50,8 @@ export declare function assertUpstreamCliEnv(cli: CliType, env: Record<string, s
 export interface InstalledCliContractProbe {
     cli: CliType;
     executable: string;
+    resolvedCommand?: string;
+    resolvedArgs?: string[];
     available: boolean;
     checkedHelpCommands: string[][];
     missingFlags: string[];

package/dist/upstream-contracts.js

@@ -1,4 +1,5 @@
 import { spawnSync } from "node:child_process";
+import { envWithExtendedPath, getExtendedPath, resolveCommandForSpawn } from "./executor.js";
 const PERMISSION_MODES = [
     "default",
     "acceptEdits",
@@ -234,7 +235,6 @@ export const UPSTREAM_CLI_CONTRACTS = {
             "--policy": { arity: "one", description: "Policy file path" },
             "--admin-policy": { arity: "one", description: "Admin policy file path" },
             "-o": { arity: "one", values: ["json"], description: "Output format" },
-            "--session-id": { arity: "one", description: "Fresh session UUID" },
             "--resume": { arity: "one", description: "Resume session" },
         },
         env: {},
@@ -535,16 +535,29 @@ export function probeInstalledCliContract(cli, timeoutMs = 5_000) {
     const contract = UPSTREAM_CLI_CONTRACTS[cli];
     const outputs = [];
     const warnings = [];
+    let resolvedCommand;
+    let resolvedArgs;
     for (const helpArgs of contract.helpArgs) {
-        const result = spawnSync(contract.executable, helpArgs, {
+        const extendedPath = getExtendedPath();
+        const env = envWithExtendedPath(process.env, extendedPath);
+        const resolved = resolveCommandForSpawn(contract.executable, helpArgs, {
+            envPath: extendedPath,
+        });
+        resolvedCommand ??= resolved.command;
+        resolvedArgs ??= resolved.args;
+        const result = spawnSync(resolved.command, resolved.args, {
             encoding: "utf8",
             timeout: timeoutMs,
             maxBuffer: 1024 * 1024,
+            env,
+            windowsHide: true,
         });
         if (result.error) {
             return {
                 cli,
                 executable: contract.executable,
+                resolvedCommand: resolved.command,
+                resolvedArgs: resolved.args,
                 available: false,
                 checkedHelpCommands: contract.helpArgs,
                 missingFlags: [],
@@ -561,6 +574,8 @@ export function probeInstalledCliContract(cli, timeoutMs = 5_000) {
     return {
         cli,
         executable: contract.executable,
+        resolvedCommand,
+        resolvedArgs,
         available: true,
         checkedHelpCommands: contract.helpArgs,
         missingFlags,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-cli-gateway",
-  "version": "1.5.24",
+  "version": "1.5.26",
   "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",