@yansigit/opencodex 2.31.3 → 2.33.0

package/src/adapters/cursor.ts

@@ -208,6 +208,14 @@ export function createCursorAdapter(provider: OcxProviderConfig, deps: CursorAda
         };
 
         const runOnce = async (activeRequest: ReturnType<typeof createCursorRequest>) => {
+          const effort = _parsed.options.reasoning;
+          const isHeavyReasoning = effort === "high"
+            || effort === "max"
+            || effort === "xhigh"
+            || activeRequest.modelId.includes("grok-4.6")
+            || activeRequest.modelId.includes("kimi-k3")
+            || activeRequest.modelId.includes("opus-4-8");
+          const heartbeatOnlyMs = isHeavyReasoning ? 300_000 : 180_000;
           await runCursorTurnWithRetry(
             makeTransport,
             {
@@ -216,6 +224,7 @@ export function createCursorAdapter(provider: OcxProviderConfig, deps: CursorAda
               translatorBudget: incoming.translatorBudget,
               requestDeclaresFullAccess: cursorRequestDeclaresFullAccess(activeRequest),
               sessionId: activeRequest.conversationId,
+              streamHeartbeatOnlyFailMs: heartbeatOnlyMs,
               ...(incoming.providerFetch ? { fetch: incoming.providerFetch } : {}),
             },
             activeRequest,

package/src/adapters/google-antigravity-replay.ts

@@ -38,9 +38,9 @@ const REPLAY_TTL_MS = 60 * 60 * 1000; // 1h
 export const ANTIGRAVITY_REPLAY_MAX_ENTRIES = 10_240;
 const REPLAY_EVICT_BATCH = 128;
 const REPLAY_MAX_CALLS_PER_SESSION = 256;
-export const ANTIGRAVITY_REPLAY_MAX_BYTES_PER_SESSION = 2 * 1024 * 1024;
+export const ANTIGRAVITY_REPLAY_MAX_BYTES_PER_SESSION = 8 * 1024 * 1024;
 export const ANTIGRAVITY_REPLAY_MAX_TOTAL_BYTES = 64 * 1024 * 1024;
-const REPLAY_MAX_SIGNATURE_BYTES = 64 * 1024;
+const REPLAY_MAX_SIGNATURE_BYTES = 1024 * 1024;
 /** Fixed 64-hex outer key length, counted once per session entry. */
 const REPLAY_SESSION_KEY_BYTES = 64;
 const REPLAY_SNAPSHOT_FILE = "antigravity-replay.json";

package/src/adapters/google-antigravity-wire.ts

@@ -11,6 +11,13 @@ import { antigravityUserAgent } from "./client-fingerprint";
  */
 export const ANTIGRAVITY_REQUEST_UA = antigravityUserAgent();
 
+/**
+ * Bypass sentinel for Google Cloud Code Assist (Antigravity).
+ * When a historical functionCall part lacks a thought_signature, Antigravity rejects
+ * the request with HTTP 400 unless this sentinel is provided.
+ */
+export const ANTIGRAVITY_SIGNATURE_BYPASS_SENTINEL = "skip_thought_signature_validator";
+
 /**
  * Whether a stored `OcxToolCall.thoughtSignature` is a REAL upstream Gemini signature versus a
  * foreign id that must not be forwarded to Gemini/Antigravity.

package/src/adapters/google-errors.ts

@@ -2,7 +2,10 @@ import { parseUpstreamJsonPayload, safeUpstreamErrorString, sanitizeUpstreamErro
 
 /** Pull the human detail out of the Google API error envelope `{error:{message,status,code}}`. */
 function googleErrorDetail(payloadText: string): { message?: string; status?: string } {
-  const trimmed = payloadText.trim();
+  let trimmed = payloadText.trim();
+  if (trimmed.startsWith("data:")) {
+    trimmed = trimmed.replace(/^data:\s*/, "").trim();
+  }
   if (!trimmed || (!trimmed.startsWith("{") && !trimmed.startsWith("["))) {
     return { message: trimmed || undefined };
   }
@@ -18,7 +21,8 @@ function googleErrorDetail(payloadText: string): { message?: string; status?: st
 const ANTIGRAVITY_GEO_BLOCKED_MARKER = "user location is not supported for the api use";
 
 export function isAntigravityGeoBlockedBody(payloadText: string): boolean {
-  return payloadText.toLowerCase().includes(ANTIGRAVITY_GEO_BLOCKED_MARKER);
+  const lower = payloadText.toLowerCase();
+  return lower.includes(ANTIGRAVITY_GEO_BLOCKED_MARKER) || lower.includes("location is not supported");
 }
 
 function classifyGoogle(label: string, status: number | undefined, enumStatus: string | undefined, text: string): string {

package/src/adapters/google-http.ts

@@ -7,7 +7,7 @@ import {
 } from "./google-errors";
 import { isGoogleMixedBuiltinToolError, repairGoogleInvalidRequestBody, stripGoogleBuiltinToolsFromWireBody } from "./google-wire-compiler";
 import { normalizeUpstreamHttpErrorResponse, readDisplaySafeErrorPayloadText } from "./upstream-http-error";
-import { recordAntigravityCooldown } from "../oauth/antigravity-routing";
+import { recordAntigravityCooldown, recordAntigravitySyntheticFailure } from "../oauth/antigravity-routing";
 import {
   antigravityHostCandidates,
   canonicalAntigravityHttpsHost,
@@ -178,6 +178,7 @@ function responseWithBufferedBody(
 async function prepareCcaSseResponse(
   response: Response,
   fetchPeer: (() => Promise<Response>) | undefined,
+  accountId?: string,
 ): Promise<Response> {
   if (!response.body) return fetchPeer ? fetchPeer() : response;
   const reader = response.body.getReader();
@@ -209,6 +210,13 @@ async function prepareCcaSseResponse(
             return failoverOrPassthrough();
           }
           if (probe === "quota_exhausted" || probe === "geo_blocked") {
+            if (accountId) {
+              recordAntigravitySyntheticFailure(accountId, {
+                code: probe === "quota_exhausted" ? 429 : 403,
+                status: probe === "quota_exhausted" ? "RESOURCE_EXHAUSTED" : "PERMISSION_DENIED",
+                message: probe === "quota_exhausted" ? "quota exceeded" : "user location is not supported",
+              });
+            }
             const status = probe === "quota_exhausted" ? 429 : 403;
             return passthrough(undefined, status);
           }
@@ -237,6 +245,13 @@ async function prepareCcaSseResponse(
           return failoverOrPassthrough();
         }
         if (probe === "quota_exhausted" || probe === "geo_blocked") {
+          if (accountId) {
+            recordAntigravitySyntheticFailure(accountId, {
+              code: probe === "quota_exhausted" ? 429 : 403,
+              status: probe === "quota_exhausted" ? "RESOURCE_EXHAUSTED" : "PERMISSION_DENIED",
+              message: probe === "quota_exhausted" ? "quota exceeded" : "user location is not supported",
+            });
+          }
           const status = probe === "quota_exhausted" ? 429 : 403;
           return passthrough(overflow, status);
         }
@@ -262,6 +277,8 @@ function isUnavailableResponse(response: Response): boolean {
 export interface GoogleRetryOptions {
   /** Repair-and-replay structurally invalid 400 bodies (Vertex/Antigravity behavior). */
   repairInvalid400?: boolean;
+  /** Let the Responses layer own Antigravity's single same-account 429 replay. */
+  retry429?: boolean;
 }
 
 async function normalizeFinalGoogleError(label: string, res: Response, signal?: AbortSignal): Promise<Response> {
@@ -291,13 +308,15 @@ async function recordAntigravityHttpCooldown(
   if (response.status === 429) {
     recordAntigravityCooldown(
       accountId,
-      isQuotaExhaustedBody(payloadText) ? "quota_exhausted" : "rate_limited",
-      retryAfterMs(response.headers.get("retry-after")),
+      response.headers.get("retry-after"),
+      Date.now(),
+      isQuotaExhaustedBody(payloadText) ? "quota" : "rate-limit",
+      "synthetic",
     );
     return true;
   }
-  if (isAntigravityGeoBlockedBody(payloadText)) {
-    recordAntigravityCooldown(accountId, "geo_blocked");
+  if (response.status === 403 || isAntigravityGeoBlockedBody(payloadText)) {
+    recordAntigravityCooldown(accountId, response.headers.get("retry-after"), Date.now(), "geoblock", "synthetic");
     return true;
   }
   return false;
@@ -318,6 +337,7 @@ async function fetchGoogleWithRetryInternal(
   opts: GoogleRetryOptions = {},
 ): Promise<Response> {
   const repairInvalid400 = opts.repairInvalid400 ?? true;
+  const retry429 = opts.retry429 ?? true;
   const timeoutMs = ctx.timeoutMs ?? 200_000;
   const executor = ctx.executor ?? globalThis.fetch;
   let activeRequest = request;
@@ -369,7 +389,7 @@ async function fetchGoogleWithRetryInternal(
             opts,
           )
           : undefined;
-        return prepareCcaSseResponse(res, fetchPeer);
+        return prepareCcaSseResponse(res, fetchPeer, ctx.accountId);
       }
       if (res.status === 400 && repairInvalid400 && !compatibilityReplayUsed) {
         let payloadText = "";
@@ -397,6 +417,9 @@ async function fetchGoogleWithRetryInternal(
           continue;
         }
       }
+      if (res.status === 429 && !retry429) {
+        return ctx.returnRawErrors ? res : normalizeFinalGoogleError(label, res, ctx.abortSignal);
+      }
       if (!retryableGoogleStatus(res.status) || attempt === GOOGLE_RETRY_ATTEMPTS - 1) {
         return ctx.returnRawErrors ? res : normalizeFinalGoogleError(label, res, ctx.abortSignal);
       }
@@ -466,5 +489,5 @@ export function fetchVertexWithRetry(request: AdapterRequest, ctx: AdapterFetchC
 
 /** Antigravity (Cloud Code Assist) retry wrapper. */
 export function fetchAntigravityWithRetry(request: AdapterRequest, ctx: AdapterFetchContext = {}): Promise<Response> {
-  return fetchGoogleWithRetry("Antigravity", request, ctx);
+  return fetchGoogleWithRetry("Antigravity", request, ctx, { retry429: false });
 }

package/src/adapters/google-truncation.ts

@@ -12,6 +12,11 @@ export function vertexTruncationErrorMessage(reason?: string): string {
   return `Vertex AI response truncated upstream before the turn completed${suffix}`;
 }
 
+export function googleTruncationErrorMessage(reason?: string): string {
+  const suffix = reason ? ` (${redactSecretString(reason).slice(0, 160)})` : "";
+  return `Google AI Studio response truncated upstream before the turn completed${suffix}`;
+}
+
 /**
  * Whether a finished turn must fail closed. A truncation reason arriving mid tool call always
  * does. MALFORMED_FUNCTION_CALL fails closed even with zero started calls: the malformed call

package/src/adapters/google-wire-compiler.ts

@@ -5,6 +5,15 @@ type JsonObject = Record<string, unknown>;
 
 const GOOGLE_TOOL_NAME = /^[A-Za-z_][A-Za-z0-9_-]{0,63}$/;
 const GOOGLE_THINKING_LEVELS = new Set(["minimal", "low", "medium", "high"]);
+const GOOGLE_SAFETY_CATEGORIES = new Set([
+  "HARM_CATEGORY_HATE_SPEECH", "HARM_CATEGORY_SEXUALLY_EXPLICIT", "HARM_CATEGORY_DANGEROUS_CONTENT",
+  "HARM_CATEGORY_HARASSMENT", "HARM_CATEGORY_CIVIC_INTEGRITY", "HARM_CATEGORY_JAILBREAK",
+]);
+const GOOGLE_SAFETY_THRESHOLDS = new Set([
+  "HARM_BLOCK_THRESHOLD_UNSPECIFIED", "BLOCK_LOW_AND_ABOVE", "BLOCK_MEDIUM_AND_ABOVE",
+  "BLOCK_ONLY_HIGH", "BLOCK_NONE", "OFF",
+]);
+const GOOGLE_CACHED_CONTENT = /^(?:cachedContents\/[^/?#\s]+|projects\/[^/?#\s]+\/locations\/[^/?#\s]+\/cachedContents\/[^/?#\s]+)$/;
 
 function isObject(value: unknown): value is JsonObject {
   return !!value && typeof value === "object" && !Array.isArray(value);
@@ -158,12 +167,18 @@ function compileGenerationConfig(value: unknown): JsonObject | undefined {
     ))].slice(0, 5);
     if (stopSequences.length > 0) out.stopSequences = stopSequences;
   }
-  if (isObject(value.thinkingConfig) && typeof value.thinkingConfig.thinkingLevel === "string") {
-    const raw = value.thinkingConfig.thinkingLevel.toLowerCase();
-    const thinkingLevel = GOOGLE_THINKING_LEVELS.has(raw)
-      ? raw
-      : (["xhigh", "max", "ultra"].includes(raw) ? "high" : undefined);
-    if (thinkingLevel) out.thinkingConfig = { thinkingLevel };
+  if (isObject(value.thinkingConfig)) {
+    const config: JsonObject = {};
+    if (typeof value.thinkingConfig.thinkingBudget === "number"
+      && Number.isSafeInteger(value.thinkingConfig.thinkingBudget)
+      && value.thinkingConfig.thinkingBudget >= -1) config.thinkingBudget = value.thinkingConfig.thinkingBudget;
+    if (typeof value.thinkingConfig.includeThoughts === "boolean") config.includeThoughts = value.thinkingConfig.includeThoughts;
+    if (typeof value.thinkingConfig.thinkingLevel === "string") {
+      const raw = value.thinkingConfig.thinkingLevel.toLowerCase();
+      const thinkingLevel = GOOGLE_THINKING_LEVELS.has(raw) ? raw : (["xhigh", "max", "ultra"].includes(raw) ? "high" : undefined);
+      if (thinkingLevel && config.thinkingBudget === undefined) config.thinkingLevel = thinkingLevel;
+    }
+    if (Object.keys(config).length > 0) out.thinkingConfig = config;
   }
   if (Array.isArray(value.responseModalities)) {
     const valid = value.responseModalities.filter((m): m is string => typeof m === "string" && ["TEXT", "IMAGE", "AUDIO"].includes(m));
@@ -180,6 +195,20 @@ function compileGenerationConfig(value: unknown): JsonObject | undefined {
   return Object.keys(out).length > 0 ? out : undefined;
 }
 
+function compileSafetySettings(value: unknown): unknown[] | undefined {
+  if (!Array.isArray(value) || value.length > 16) return undefined;
+  const seen = new Set<string>();
+  const out: JsonObject[] = [];
+  for (const setting of value) {
+    if (!isObject(setting) || typeof setting.category !== "string" || !GOOGLE_SAFETY_CATEGORIES.has(setting.category)
+      || typeof setting.threshold !== "string" || !GOOGLE_SAFETY_THRESHOLDS.has(setting.threshold)
+      || seen.has(setting.category)) return undefined;
+    seen.add(setting.category);
+    out.push({ category: setting.category, threshold: setting.threshold });
+  }
+  return out.length > 0 ? out : undefined;
+}
+
 function compileToolConfig(value: unknown, toWireName: (name: string) => string): JsonObject | undefined {
   if (!isObject(value) || !isObject(value.functionCallingConfig)) return undefined;
   const raw = value.functionCallingConfig;
@@ -216,6 +245,9 @@ export function compileGoogleWireBody(input: unknown): {
   if (generationConfig) body.generationConfig = generationConfig;
   const toolConfig = compileToolConfig(source.toolConfig, names.toWire);
   if (toolConfig) body.toolConfig = toolConfig;
+  const safetySettings = compileSafetySettings(source.safetySettings);
+  if (safetySettings) body.safetySettings = safetySettings;
+  if (typeof source.cachedContent === "string" && GOOGLE_CACHED_CONTENT.test(source.cachedContent)) body.cachedContent = source.cachedContent;
   if (typeof source.sessionId === "string" && source.sessionId.length > 0) body.sessionId = source.sessionId;
   return { body, restoreToolName: names.fromWire };
 }