instar 1.3.214 → 1.3.215

package/dist/providers/adapters/gemini-cli/transport/oneShotCompletion.js

@@ -16,10 +16,12 @@
  *     unbounded Buffer.concat.
  */
 import { CapabilityFlag } from '../../../capabilities.js';
-import { AbortError } from '../../../errors.js';
+import { AbortError, QuotaError } from '../../../errors.js';
 import { GEMINI_CLI_ID, mapExecError } from '../errors.js';
 import { resolveCliModelFlag } from '../models.js';
+import { decideGeminiCapacityPolicy, getGeminiCapacityGate, recordGeminiCapacityDeferral, } from '../observability/geminiCapacityPolicy.js';
 import { buildGeminiChildEnv, buildGeminiOneShotArgv, spawnGeminiAndWait, } from './geminiSpawn.js';
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 class GeminiCliOneShotCompletion {
     config;
     capability = CapabilityFlag.OneShotCompletion;
@@ -29,42 +31,72 @@ class GeminiCliOneShotCompletion {
     async evaluate(prompt, options) {
         const timeoutMs = options?.timeoutMs ?? this.config.defaultOneShotTimeoutMs ?? 60_000;
         const model = resolveCliModelFlag(options?.model ?? this.config.defaultModel);
+        let currentModel = model;
+        const gate = getGeminiCapacityGate();
+        if (!gate.allow) {
+            throw new QuotaError(`Gemini capacity deferred until ${new Date(gate.deferredUntil ?? Date.now()).toISOString()}` +
+                (gate.reason ? `: ${gate.reason}` : ''), GEMINI_CLI_ID, { retryAfterMs: gate.retryAfterMs, limitKind: 'unknown' });
+        }
         // System prompt is prepended to the user prompt (Gemini's one-shot `-p`
         // takes a single string; there's no separate system flag on this path).
         const effectivePrompt = options?.system
             ? `${options.system}\n\n${prompt}`
             : prompt;
-        // CANONICAL argv — the only form this primitive ever emits.
-        // --approval-mode default is pinned here; the prompt is exactly one slot.
-        const args = buildGeminiOneShotArgv(model, effectivePrompt);
         const childEnv = buildGeminiChildEnv();
         const abortSignal = options?.signal;
         if (abortSignal?.aborted) {
             throw new AbortError('Aborted before start', GEMINI_CLI_ID);
         }
         try {
-            const result = await spawnGeminiAndWait(this.config.geminiPath, args, {
-                timeoutMs,
-                env: childEnv,
-                ...(abortSignal ? { signal: abortSignal } : {}),
-                ...(this.config.maxOutputBytes !== undefined
-                    ? { maxOutputBytes: this.config.maxOutputBytes }
-                    : {}),
-            });
-            if (result.exitCode !== 0) {
-                // Benign `Loaded cached credentials` stderr line is NOT a failure when
-                // exit is 0; here exit is non-zero so surface the stderr.
-                throw mapExecError(new Error(`Gemini exited ${result.exitCode}`), result.stderr);
+            let attempt = 0;
+            // eslint-disable-next-line no-constant-condition
+            while (true) {
+                const args = buildGeminiOneShotArgv(currentModel, effectivePrompt);
+                const result = await spawnGeminiAndWait(this.config.geminiPath, args, {
+                    timeoutMs,
+                    env: childEnv,
+                    ...(abortSignal ? { signal: abortSignal } : {}),
+                    ...(this.config.maxOutputBytes !== undefined
+                        ? { maxOutputBytes: this.config.maxOutputBytes }
+                        : {}),
+                });
+                if (result.exitCode !== 0) {
+                    // Benign `Loaded cached credentials` stderr line is NOT a failure when
+                    // exit is 0; here exit is non-zero so surface the stderr.
+                    const mapped = mapExecError(new Error(`Gemini exited ${result.exitCode}`), result.stderr);
+                    const capacity = decideGeminiCapacityPolicy({
+                        errorMessage: `${mapped.message}\n${result.stderr}`,
+                        attempt,
+                        model: currentModel,
+                        config: this.config.capacityPolicy,
+                    });
+                    if (capacity.action === 'retry' && capacity.retryAfterMs !== undefined) {
+                        currentModel = capacity.model;
+                        attempt += 1;
+                        await sleep(capacity.retryAfterMs);
+                        continue;
+                    }
+                    if (capacity.action === 'defer' && capacity.retryAfterMs !== undefined) {
+                        recordGeminiCapacityDeferral({
+                            retryAfterMs: capacity.retryAfterMs,
+                            reason: capacity.reason ?? mapped.message,
+                        });
+                        throw new QuotaError(`${capacity.reason}: ${mapped.message}`, GEMINI_CLI_ID, { retryAfterMs: capacity.retryAfterMs, limitKind: 'unknown', cause: mapped });
+                    }
+                    throw mapped;
+                }
+                return {
+                    text: result.stdout.trim(),
+                    usage: null,
+                    providerSpecific: {
+                        [GEMINI_CLI_ID]: { model, approvalMode: 'default', truncated: result.truncated },
+                    },
+                };
             }
-            return {
-                text: result.stdout.trim(),
-                usage: null,
-                providerSpecific: {
-                    [GEMINI_CLI_ID]: { model, approvalMode: 'default', truncated: result.truncated },
-                },
-            };
         }
         catch (err) {
+            if (err instanceof QuotaError)
+                throw err;
             const error = err;
             if (error.name === 'AbortError' || abortSignal?.aborted) {
                 throw new AbortError('Aborted during execution', GEMINI_CLI_ID, err);

package/dist/providers/adapters/gemini-cli/transport/oneShotCompletion.js.map

@@ -1 +1 @@
-{"version":3,"file":"oneShotCompletion.js","sourceRoot":"","sources":["../../../../../src/providers/adapters/gemini-cli/transport/oneShotCompletion.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAOH,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,0BAA0B;IAGD;IAFpB,UAAU,GAAG,cAAc,CAAC,iBAAiB,CAAC;IAEvD,YAA6B,MAAuB;QAAvB,WAAM,GAAN,MAAM,CAAiB;IAAG,CAAC;IAExD,KAAK,CAAC,QAAQ,CACZ,MAAc,EACd,OAAkC;QAElC,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,uBAAuB,IAAI,MAAM,CAAC;QACtF,MAAM,KAAK,GAAG,mBAAmB,CAAC,OAAO,EAAE,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAE9E,wEAAwE;QACxE,wEAAwE;QACxE,MAAM,eAAe,GAAG,OAAO,EAAE,MAAM;YACrC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,OAAO,MAAM,EAAE;YAClC,CAAC,CAAC,MAAM,CAAC;QAEX,4DAA4D;QAC5D,0EAA0E;QAC1E,MAAM,IAAI,GAAG,sBAAsB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAE5D,MAAM,QAAQ,GAAG,mBAAmB,EAAE,CAAC;QAEvC,MAAM,WAAW,GAAG,OAAO,EAAE,MAAM,CAAC;QACpC,IAAI,WAAW,EAAE,OAAO,EAAE,CAAC;YACzB,MAAM,IAAI,UAAU,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC;QAC9D,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE;gBACpE,SAAS;gBACT,GAAG,EAAE,QAAQ;gBACb,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/C,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,KAAK,SAAS;oBAC1C,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;oBAChD,CAAC,CAAC,EAAE,CAAC;aACR,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;gBAC1B,uEAAuE;gBACvE,0DAA0D;gBAC1D,MAAM,YAAY,CAChB,IAAI,KAAK,CAAC,iBAAiB,MAAM,CAAC,QAAQ,EAAE,CAA8B,EAC1E,MAAM,CAAC,MAAM,CACd,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;gBAC1B,KAAK,EAAE,IAAI;gBACX,gBAAgB,EAAE;oBAChB,CAAC,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE;iBACjF;aACF,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,GAA+B,CAAC;YAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,WAAW,EAAE,OAAO,EAAE,CAAC;gBACxD,MAAM,IAAI,UAAU,CAAC,0BAA0B,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;YACvE,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,CAAE,KAA8B,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;YACpE,MAAM,YAAY,CAChB,KAKC,EACD,MAAM,CACP,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,uBAAuB,CAAC,MAAuB;IAC7D,OAAO,IAAI,0BAA0B,CAAC,MAAM,CAAC,CAAC;AAChD,CAAC"}
+{"version":3,"file":"oneShotCompletion.js","sourceRoot":"","sources":["../../../../../src/providers/adapters/gemini-cli/transport/oneShotCompletion.ts"],"names":[],"mappings":"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"}

package/dist/server/routes.js

@@ -15424,7 +15424,7 @@ export function createRoutes(ctx) {
             const KNOWN_FRAMEWORKS = ['claude-code', 'codex-cli', 'gemini-cli'];
             const KNOWN_MODELS = [
                 'opus-4.7', 'sonnet-4.6', 'haiku-4.5',
-                'gpt-5.3-codex', 'gemini-2.5-pro', 'deepseek-v4',
+                'gpt-5.3-codex', 'gemini-2.5-flash', 'gemini-2.5-pro', 'deepseek-v4',
             ];
             const classifier = new TaskClassifier({ intelligence: stubIntelligence });
             const overrideDetector = new OverrideDetector({