@bitkyc08/opencodex 2.24.2 → 2.25.0

package/src/generated/compatibility-version.json

@@ -10,7 +10,7 @@
     },
     {
       "path": "package.json",
-      "sha256": "6eddddb2ce07468a1c26f394225a047ae265a21e7457f38ad6500a62c2f63b66"
+      "sha256": "94bdcc17454ccace4e7e201babb428a1c187fe748194ff6a837df22dfe36cd50"
     },
     {
       "path": "scripts/model-metadata.source.json",
@@ -34,7 +34,7 @@
     },
     {
       "path": "src/adapters/anthropic.ts",
-      "sha256": "2b565b0a8e84ab143b3a159e9f9cf65d368f2b7e27f41fadb827e28bd76b5a40"
+      "sha256": "afd6f5ef9fab45811c67067bdb6731fc8efa3abb7bc2a7bee109445ca9c06467"
     },
     {
       "path": "src/adapters/azure.ts",
@@ -46,11 +46,15 @@
     },
     {
       "path": "src/adapters/client-fingerprint.ts",
-      "sha256": "6494cb40aefb337db3584489d1544d7ae623445dd3c81e5e34a30c77312f4e69"
+      "sha256": "70c6e0bf49d942e352396bd6c2983a1456b6ee96497537f4175674e99627223b"
+    },
+    {
+      "path": "src/adapters/cline-pass-deepseek-v4-tool-replay.ts",
+      "sha256": "da664327db4e0bae8ab689230deec415ad3f6d0f18c596dcc5b94c8a8d08a345"
     },
     {
       "path": "src/adapters/command-code.ts",
-      "sha256": "7430d87c3c34961ab02873584605738c65fbf7aca2f87f2a0dcc800c048a0761"
+      "sha256": "9b4a9eb9ab8c37541d0478ee50d28ea94b9dee127f75fbc85004ca264af67aaa"
     },
     {
       "path": "src/adapters/cursor.ts",
@@ -66,7 +70,7 @@
     },
     {
       "path": "src/adapters/cursor/cursor-errors.ts",
-      "sha256": "456766d2be7d4859707c7ae666000f74d81357bde59a2b283027ee256d395b9e"
+      "sha256": "aa27cf53056f48c4ed4ccc2262d5a84c0b96b79a3a77db5be7ca27256dfba9c4"
     },
     {
       "path": "src/adapters/cursor/discovery.ts",
@@ -94,7 +98,7 @@
     },
     {
       "path": "src/adapters/cursor/live-models.ts",
-      "sha256": "48d7e9bf63f512086ba5ec5324e355776948802dec29f30d9403e23d1b5cc6f9"
+      "sha256": "d1ded09df979a490d7b4fb2afb87829561fbc021bdc6f67ad0d122febd9b21e4"
     },
     {
       "path": "src/adapters/cursor/live-smoke-gate.ts",
@@ -102,7 +106,7 @@
     },
     {
       "path": "src/adapters/cursor/live-transport.ts",
-      "sha256": "247e48058e2d22e282d2d49652cde998c5d13f36197898562510d99746993711"
+      "sha256": "c614a08f47c3a71d443484002a978a67afb2169a2eeae540291fcc383ff2a969"
     },
     {
       "path": "src/adapters/cursor/mcp-config.ts",
@@ -146,7 +150,7 @@
     },
     {
       "path": "src/adapters/cursor/native-exec.ts",
-      "sha256": "0a9599735b9d3fc1d623b6595f9044818c161370dd87ae4d17d2e6bae344f01f"
+      "sha256": "3824d4ad75f039019fff8749900cc0b2daff6de0c41bb7a64f76eb5e57dd25a6"
     },
     {
       "path": "src/adapters/cursor/protobuf-events.ts",
@@ -154,11 +158,11 @@
     },
     {
       "path": "src/adapters/cursor/protobuf-request.ts",
-      "sha256": "0d82660ab54e2bc0b29c7b4524bf1a56a55c14c08ce11ed8dc0da4c69ed805bd"
+      "sha256": "28e352e4b0080fc09508bf87cce884ecbecb9d1f414e343a9068145affd223d9"
     },
     {
       "path": "src/adapters/cursor/request-builder.ts",
-      "sha256": "ec30a9988cf25a8bc51b2bb286ce25033b6a86591e5036d8d24b74e79b824704"
+      "sha256": "ecfed9de726cd21126f3a90dac958bd8bba6d9feee5cb48966d3c3cf274b31fd"
     },
     {
       "path": "src/adapters/cursor/thread-continuity.ts",
@@ -166,7 +170,7 @@
     },
     {
       "path": "src/adapters/cursor/tool-definitions.ts",
-      "sha256": "b0e77a16aeb85466052774491c8a4cf3ba3cc5c25bf5c60315efa5a9959d626e"
+      "sha256": "632535cff0fb7f893b76631344129d13e45aa40c8e3e062ab0010c57e24448e9"
     },
     {
       "path": "src/adapters/cursor/transport-retry.ts",
@@ -186,7 +190,7 @@
     },
     {
       "path": "src/adapters/google-antigravity-wire.ts",
-      "sha256": "1fa3361241026926754656cf8300ce513fefac86020d796cb985018192499797"
+      "sha256": "671fc197b9ab46800b64a4d51dec8b80c82e9cf841bb2c244f1087a8de592009"
     },
     {
       "path": "src/adapters/google-errors.ts",
@@ -210,7 +214,7 @@
     },
     {
       "path": "src/adapters/google.ts",
-      "sha256": "fe8f2df66b0df49927c1e9d261ac122020dd56b3a7bca6f77a3fabf34c8183bd"
+      "sha256": "e87a1a968d8cb8e2d20e2ca27a6168f4e97b215ca1c9ef3ac46d907c78e760b5"
     },
     {
       "path": "src/adapters/identity.ts",
@@ -278,7 +282,7 @@
     },
     {
       "path": "src/adapters/openai-responses-url.ts",
-      "sha256": "b3acd48b0b8fcda9f2ebedb51ebfd619e1c1d1adaeca2f6965db853e6ffdc6e4"
+      "sha256": "ff38228d2033b9f73dbb011b1d5eb3ac09795519ae8b57958d7d8f6253b4d5e4"
     },
     {
       "path": "src/adapters/openai-responses.ts",
@@ -286,7 +290,7 @@
     },
     {
       "path": "src/adapters/registry.ts",
-      "sha256": "9a56ee08197bdd5b6ea12fcb847d2a89b60a600ee2536a010f4836784115d2d8"
+      "sha256": "74cef1012f4b481109d1ec5119d49c7634237166f5e73424399feada3d03c963"
     },
     {
       "path": "src/adapters/responses-tool-schema.ts",
@@ -302,7 +306,7 @@
     },
     {
       "path": "src/adapters/tool-catalog-nudge.ts",
-      "sha256": "d315b8113a492794ee1321fd3c69638e52af47b8060682e331243cba10167cef"
+      "sha256": "9750e8b4ce000ac452482141bfe27add3577341cc30d1403c05a509bee11044c"
     },
     {
       "path": "src/adapters/upstream-http-error.ts",
@@ -310,7 +314,7 @@
     },
     {
       "path": "src/bridge.ts",
-      "sha256": "63ccf86cb645d70b1e735633e082b483e41507a443a851d4b1ea76436a9a1e3d"
+      "sha256": "5bbfd25c2778989f47c422e57d550b46a6570f9d599e8eee8b189c86fd0cb70c"
     },
     {
       "path": "src/chat/inbound.ts",
@@ -626,7 +630,7 @@
     },
     {
       "path": "src/codex/app-server-processes.ts",
-      "sha256": "28c7fb91d8fd5c2332738e512b9d87c53ea09843191c145b0801d912e124fe9e"
+      "sha256": "0218c4e432ad02a814d818e04fc5ba8c36864f8fcfd592ef674f9c476e56cb77"
     },
     {
       "path": "src/codex/app-server-restart-service.ts",
@@ -702,7 +706,7 @@
     },
     {
       "path": "src/codex/catalog/provider-fetch.ts",
-      "sha256": "bfb4a4c32de3a514190c8bf4fcb660312a64a8e7d32ef9ac83106f999f8c639d"
+      "sha256": "d800963913619d3e02db4fb616795cac93c336ac18a18c6e24e873e71a6d2255"
     },
     {
       "path": "src/codex/catalog/sync.ts",
@@ -1022,7 +1026,7 @@
     },
     {
       "path": "src/config.ts",
-      "sha256": "3552e7f943e5bcd6af57acfbe0bd2316d9ab4a060e32e6ca01adac97d27960d4"
+      "sha256": "2297577079aed2e89e4603050402629fea2df094978ff24c0db5102ca8da91ae"
     },
     {
       "path": "src/generated/model-metadata.ts",
@@ -1854,7 +1858,7 @@
     },
     {
       "path": "src/lib/windows-elevation.ts",
-      "sha256": "b0aab4ba8c7fe82e101669545881634ed75b59ca024522ad21e8c613c7a6cf99"
+      "sha256": "168ec95934c25036ec9056f83f89427a82ee2bcd83d098bd4419fcb27051e4ec"
     },
     {
       "path": "src/lib/windows-secret-acl.ts",
@@ -1926,7 +1930,7 @@
     },
     {
       "path": "src/oauth/google-antigravity.ts",
-      "sha256": "a46a2aa7c5aafc51d631e1d02d84f90e2b6fc32c8000c7a84dd1c5a76018635c"
+      "sha256": "ca475ef54f4ed2a36734b560fd29686a33dd11aa45643fe36a9fd3c92c1a6678"
     },
     {
       "path": "src/oauth/health.ts",
@@ -2002,7 +2006,7 @@
     },
     {
       "path": "src/providers/antigravity-models.ts",
-      "sha256": "1382f985bf4fdf525fb4425d5040e7244460f441f492b22ddc493226e5b778d1"
+      "sha256": "3b70505caffbf4b42a1574f8824aa3250d3caee5db820f45b45945381dd0298d"
     },
     {
       "path": "src/providers/api-keys.ts",
@@ -2026,7 +2030,7 @@
     },
     {
       "path": "src/providers/derive.ts",
-      "sha256": "c099e125978b81ac4415d2ba5fb0dd69c1f974e21301b992811b63dfb3c0b94d"
+      "sha256": "babec953990d4045c3861c102a4ed3e2c4654b03b6d707d179bfeefeefd5e9c8"
     },
     {
       "path": "src/providers/free-directory.ts",
@@ -2142,7 +2146,7 @@
     },
     {
       "path": "src/responses/parser.ts",
-      "sha256": "e8fffd98b5bac31773dff5c22c65ef5cf39d535c578ec708700aa6d25e2d9e71"
+      "sha256": "f84fcb37def007781eb71081d3148f4b0f72eca6aebcea7e7a1a67808d014d69"
     },
     {
       "path": "src/responses/provider-opaque-metadata.ts",
@@ -2154,7 +2158,7 @@
     },
     {
       "path": "src/responses/reasoning-replay-cache.ts",
-      "sha256": "28fa9e047741251734d3c39a6183e2465cae3c610e31de4f2a1bd4e4333e8e00"
+      "sha256": "c81d1e2173c4c48215468989dafa4ec74a9a01ab1bbbb4556d5d25ccf63739d3"
     },
     {
       "path": "src/responses/schema.ts",
@@ -2170,15 +2174,19 @@
     },
     {
       "path": "src/responses/thought-signature-replay.ts",
-      "sha256": "fa1a7c06af55241083f7fb31638e12630c444c72a3d9879ce02ca7bdef2fb705"
+      "sha256": "dc2464036c9d0c78764ac7b2e97e86b77449dd31e9f98cf0c29b5a7d60134976"
     },
     {
       "path": "src/responses/tool-groups.ts",
       "sha256": "b2750b33ec7bb5a7f76f27584bf99372fac4f253dd287849b2f3f9821db574cd"
     },
+    {
+      "path": "src/responses/truncated-stop-reason.ts",
+      "sha256": "44a1876c045a63f9275410fb9169d2c47ce0c1de309e9cc00a0f51c72698a6dd"
+    },
     {
       "path": "src/router.ts",
-      "sha256": "f365eb302f068368ce2966a7232b2ddd8ce1fc00ad2751df46feb06009633a07"
+      "sha256": "26a672d4df978dd7c9764d7533ccc54a9bded6daf4a90fa3ebf41e126d106f67"
     },
     {
       "path": "src/routing/analytics.ts",
@@ -2422,7 +2430,7 @@
     },
     {
       "path": "src/server/management/provider-routes.ts",
-      "sha256": "5671232af392b8ba84ecc516c99d33b3cd294bfbd3fd9c5df04cf99b32d04049"
+      "sha256": "1a2217a7cdaee6945ef90221f7b9344fc6d3a04e7750092b6c716bb2acbcef47"
     },
     {
       "path": "src/server/management/request-history-routes.ts",
@@ -2510,7 +2518,7 @@
     },
     {
       "path": "src/server/request-log.ts",
-      "sha256": "e7111d92152cdedf0e771d719bddee0150124d14bcac13610662dcbed3b75869"
+      "sha256": "17c4594009bbacdd95465933ab48b0a5a31e85d80e16de86a1fd1638b2c46510"
     },
     {
       "path": "src/server/responses-custom-tool-repair.ts",
@@ -2566,7 +2574,7 @@
     },
     {
       "path": "src/server/responses/core.ts",
-      "sha256": "fbb0b59c9a67f10d97ec28ac48b7c2c168c7ec359f43c336a11913148ae1a11a"
+      "sha256": "1a2fd4ea5e0b1f9b2208cd0365986a465039f262bfd43f9dca56dc43780e6e8a"
     },
     {
       "path": "src/server/responses/empty-completion-guard.ts",
@@ -2726,7 +2734,7 @@
     },
     {
       "path": "src/types.ts",
-      "sha256": "a2b31962f7d7f54f60b1cb9ed1066eeb5b0fb267cd0d3e4053eea6501b53046e"
+      "sha256": "d740769ad835349fbc1d92d1c4186be92d2dca5d9902d0f9bc3eac251644655e"
     },
     {
       "path": "src/update/badge.ts",

package/src/lib/windows-elevation.ts

@@ -640,15 +640,21 @@ export function runWindowsElevatedScheduledTaskRegistration(
   xml: string,
 ): Promise<number> {
   const xmlBase64 = Buffer.from(xml, "utf16le").toString("base64");
+  const powerShellPath = windowsPowerShell();
+  const powerShellDirectory = powerShellPath.replace(/[\\/][^\\/]+$/, "");
+  const scheduledTasksModule = `${powerShellDirectory}\\Modules\\ScheduledTasks\\ScheduledTasks.psd1`;
   const inner = [
     `$taskName = ${psSingleQuote(taskName)}`,
     `$xmlBase64 = ${psSingleQuote(xmlBase64)}`,
     "$xml = [Text.Encoding]::Unicode.GetString([Convert]::FromBase64String($xmlBase64))",
-    "Register-ScheduledTask -TaskName $taskName -Xml $xml -Force -ErrorAction Stop | Out-Null",
+    `$module = Microsoft.PowerShell.Core\\Import-Module -Name ${psSingleQuote(scheduledTasksModule)} -PassThru -Force -ErrorAction Stop`,
+    "$registerTask = $module.ExportedCommands['Register-ScheduledTask']",
+    "if ($null -eq $registerTask) { throw 'Trusted ScheduledTasks module does not export Register-ScheduledTask.' }",
+    "& $registerTask -TaskName $taskName -Xml $xml -Force -ErrorAction Stop | Out-Null",
   ].join("; ");
   const encodedCommand = Buffer.from(inner, "utf16le").toString("base64");
   const script = [
-    `$p = Start-Process -FilePath ${psSingleQuote(windowsPowerShell())}`,
+    `$p = Start-Process -FilePath ${psSingleQuote(powerShellPath)}`,
     ` -ArgumentList ${psSingleQuote(buildWindowsElevatedArgumentList([
       "-NoProfile",
       "-NonInteractive",

package/src/oauth/google-antigravity.ts

@@ -12,7 +12,7 @@
 import { OAuthCallbackFlow, type OAuthCallbackFlowOptions } from "./callback-server";
 import { generatePKCE } from "./pkce";
 import type { OAuthController, OAuthCredentials } from "./types";
-import { antigravityUserAgent, ANTIGRAVITY_GOOG_API_CLIENT_UA } from "../adapters/client-fingerprint";
+import { antigravityUserAgent, ANTIGRAVITY_GOOG_API_CLIENT_UA, ANTIGRAVITY_IDE_VERSION } from "../adapters/client-fingerprint";
 
 const CLIENT_ID = process.env.GOOGLE_ANTIGRAVITY_CLIENT_ID
   || "1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com";
@@ -111,7 +111,12 @@ async function onboardProject(accessToken: string, signal?: AbortSignal): Promis
     const response = await fetch(`${DAILY_API}/${API_VERSION}:onboardUser`, {
       method: "POST",
       headers: { Authorization: `Bearer ${accessToken}`, Accept: "*/*", "Content-Type": "application/json", "User-Agent": antigravityUserAgent(), "x-goog-api-client": ANTIGRAVITY_GOOG_API_CLIENT_UA },
-      body: JSON.stringify({ tier_id: "free-tier", metadata: { ide_type: "ANTIGRAVITY", ide_name: "antigravity", ide_version: antigravityUserAgent() } }),
+      // `ide_version` is a version, not a User-Agent. `antigravityUserAgent()` returns the whole
+      // header — `antigravity/ide/2.5.5 (aidev_client; os_type=...; arch=...)` — so onboarding was
+      // sending a parenthesized UA string in a field the real client fills with `2.5.5`. It is a
+      // fingerprint mismatch rather than a crash, which is why nothing failed: the request still
+      // succeeds, it just does not look like Antigravity.
+      body: JSON.stringify({ tier_id: "free-tier", metadata: { ide_type: "ANTIGRAVITY", ide_name: "antigravity", ide_version: ANTIGRAVITY_IDE_VERSION } }),
       signal: requestSignal(signal),
     });
     if (!response.ok) {

package/src/providers/antigravity-models.ts

@@ -1,4 +1,5 @@
 import { isValidModelDiscoveryModelId, MODEL_DISCOVERY_MAX_MODELS } from "./model-discovery-limits";
+import { isModelCacheGenerationCurrent } from "../codex/model-cache";
 
 // Google Antigravity (Cloud Code Assist) bundled model list.
 //
@@ -74,8 +75,12 @@ const ANTIGRAVITY_DISCOVERY_EFFORTS = ["low", "medium", "high"] as const;
 
 function pickerModelIdForDiscoveredWireId(
   wireId: string,
+  info: Record<string, unknown>,
   available: ReadonlyMap<string, Record<string, unknown>>,
 ): string {
+  const displayModelId = antigravityDisplayModelId(info.displayName, wireId);
+  if (displayModelId) return displayModelId;
+
   const explicitPickerId = Object.hasOwn(ANTIGRAVITY_PICKER_MODEL_BY_WIRE_ID, wireId)
     ? ANTIGRAVITY_PICKER_MODEL_BY_WIRE_ID[wireId]
     : undefined;
@@ -240,6 +245,8 @@ export const ANTIGRAVITY_MODEL_INPUT_MODALITIES: Record<string, string[]> = {
 
 export interface AntigravityAvailableModel {
   id: string;
+  /** CCA model id used by the agent envelope when `id` comes from display metadata. */
+  wireModelId: string;
   contextWindow?: number;
   inputModalities?: string[];
 }
@@ -254,6 +261,100 @@ function antigravityPositiveInteger(value: unknown): number | undefined {
   return typeof value === "number" && Number.isSafeInteger(value) && value > 0 ? value : undefined;
 }
 
+interface DiscoveredWireModelMapping {
+  readonly models: ReadonlyMap<string, string>;
+  readonly generation?: { provider: string; cacheGeneration: string };
+}
+
+const discoveredWireModelsByBaseUrl = new Map<string, DiscoveredWireModelMapping>();
+
+/**
+ * Strip trailing slashes without a backtracking regex.
+ *
+ * `/\/+$/` is polynomial-ReDoS on attacker-influenceable input (CodeQL js/polynomial-redos):
+ * a long run of slashes makes the engine retry every suffix. The base URL comes from provider
+ * config, which is not hostile in the ordinary case — but "not hostile today" is a property of
+ * the caller, not of this function, and a linear scan costs nothing.
+ */
+function stripTrailingSlashes(value: string): string {
+  let end = value.length;
+  while (end > 0 && value.charCodeAt(end - 1) === 47) end -= 1;
+  return end === value.length ? value : value.slice(0, end);
+}
+
+function antigravityBaseUrlKey(baseUrl: string | undefined): string | undefined {
+  if (typeof baseUrl !== "string" || !baseUrl.trim()) return undefined;
+  const trimmed = stripTrailingSlashes(baseUrl.trim());
+  try {
+    const url = new URL(trimmed);
+    url.hash = "";
+    url.search = "";
+    return stripTrailingSlashes(url.toString()).toLowerCase();
+  } catch {
+    return trimmed.toLowerCase();
+  }
+}
+
+/** Remember the wire ids returned by one live CCA discovery for request routing. */
+export function registerAntigravityDiscoveredWireModels(
+  baseUrl: string | undefined,
+  models: readonly AntigravityAvailableModel[],
+  generation?: { provider: string; cacheGeneration: string },
+): void {
+  const key = antigravityBaseUrlKey(baseUrl);
+  if (!key) return;
+  const wireModels = new Map<string, string>();
+  for (const model of models) wireModels.set(model.id, model.wireModelId);
+  discoveredWireModelsByBaseUrl.set(key, {
+    models: wireModels,
+    ...(generation ? { generation } : {}),
+  });
+}
+
+function discoveredAntigravityWireModelId(
+  modelId: string,
+  baseUrl: string | undefined,
+): string | undefined {
+  const key = antigravityBaseUrlKey(baseUrl);
+  if (!key) return undefined;
+  const mapping = discoveredWireModelsByBaseUrl.get(key);
+  if (!mapping) return undefined;
+  if (mapping.generation
+    && !isModelCacheGenerationCurrent(mapping.generation.provider, mapping.generation.cacheGeneration)) {
+    discoveredWireModelsByBaseUrl.delete(key);
+    return undefined;
+  }
+  return mapping.models.get(modelId);
+}
+
+/**
+ * Convert the CCA display label used by `agy` into its public model selector.
+ *
+ * The wire id is authoritative for requests, while the label is authoritative for the
+ * user-facing selector when Google has renamed or re-tiered a model. Keep both instead
+ * of maintaining a provider-specific list of known model names.
+ */
+function antigravityDisplayModelId(displayName: unknown, wireId: string): string | undefined {
+  if (typeof displayName !== "string") return undefined;
+  const label = displayName.trim();
+  if (!label || label.length > 512) return undefined;
+  const slug = (replaceDots: boolean): string => label
+    .normalize("NFKC")
+    .toLowerCase()
+    .replace(replaceDots ? /\./g : /\s+/g, replaceDots ? "-" : " ")
+    .replace(/[^a-z0-9.-]+/g, "-")
+    .replace(/-+/g, "-")
+    .replace(/^-|-$/g, "");
+  const preserved = slug(false);
+  const compact = slug(true);
+  if (!isValidModelDiscoveryModelId(preserved) && !isValidModelDiscoveryModelId(compact)) return undefined;
+  if (preserved === wireId || compact === wireId
+    || preserved === `${wireId}-thinking` || compact === `${wireId}-thinking`) {
+    return wireId;
+  }
+  return isValidModelDiscoveryModelId(preserved) ? preserved : compact;
+}
+
 /**
  * Extract the CCA models that are valid for agent requests. The endpoint also returns tab,
  * command, commit-message, transcription, and standalone image-generation models; those are not
@@ -288,13 +389,6 @@ export function parseAntigravityAvailableModels(
       }
     }
   }
-  // This model is exposed by Antigravity's agent chat surface even though it is grouped under
-  // image generation in the discovery response.
-  if (Array.isArray(body.imageGenerationModelIds)
-    && body.imageGenerationModelIds.includes("gemini-3.1-flash-image")) {
-    if (ids.length >= limit) return null;
-    ids.push("gemini-3.1-flash-image");
-  }
   // Newer CCA responses identify tiered Flash models through this index instead of
   // adding their synthetic wire ids to agentModelSorts.
   const tieredModelIds = antigravityRecord(body.tieredModelIds);
@@ -305,6 +399,12 @@ export function parseAntigravityAvailableModels(
         || !Object.hasOwn(models, id)
         || !antigravityRecord(models[id])
         || ids.length >= limit) return null;
+      const baseId = id.endsWith("-tiered") ? id.slice(0, -"-tiered".length) : id;
+      if (ids.some(agentId =>
+        agentId === id
+        || agentId === baseId
+        || ANTIGRAVITY_DISCOVERY_EFFORTS.some(effort => agentId === `${baseId}-${effort}`)
+      )) continue;
       ids.push(id);
     }
   }
@@ -313,23 +413,18 @@ export function parseAntigravityAvailableModels(
   for (const wireId of ids) {
     const info = antigravityRecord(models[wireId]);
     if (!info || available.has(wireId)) continue;
-    // Legacy compatibility aliases are deliberately routed to newer wire ids for saved
-    // selections. They are not safe as independently discovered picker rows.
-    const alias = Object.hasOwn(ANTIGRAVITY_MODEL_ALIASES, wireId)
-      ? ANTIGRAVITY_MODEL_ALIASES[wireId]
-      : undefined;
-    if (alias && alias !== wireId) continue;
     available.set(wireId, info);
   }
 
   const out: AntigravityAvailableModel[] = [];
   const seen = new Set<string>();
   for (const [wireId, info] of available) {
-    const id = pickerModelIdForDiscoveredWireId(wireId, available);
+    const id = pickerModelIdForDiscoveredWireId(wireId, info, available);
     if (seen.has(id)) continue;
     seen.add(id);
     out.push({
       id,
+      wireModelId: wireId,
       ...(antigravityPositiveInteger(info.maxTokens) ? { contextWindow: antigravityPositiveInteger(info.maxTokens) } : {}),
       // Tri-state, deliberately not a ternary: `true` asserts image support,
       // `false` asserts against it, and ABSENT is unknown. Collapsing absent into
@@ -347,7 +442,9 @@ export function parseAntigravityAvailableModels(
   return out;
 }
 
-export function resolveAntigravityWireModelId(modelId: string): string {
+export function resolveAntigravityWireModelId(modelId: string, baseUrl?: string): string {
+  const discovered = discoveredAntigravityWireModelId(modelId, baseUrl);
+  if (discovered) return discovered;
   return Object.hasOwn(ANTIGRAVITY_MODEL_ALIASES, modelId)
     ? ANTIGRAVITY_MODEL_ALIASES[modelId]
     : modelId;
@@ -380,7 +477,19 @@ export function retiredAntigravityFlashTier(modelId: string): string | undefined
 export function resolveAntigravityEffortWireModel(
   modelId: string,
   effort?: string,
+  baseUrl?: string,
 ): { wireModelId: string; thinkingLevel?: string } {
+  const discoveredWireModelId = discoveredAntigravityWireModelId(modelId, baseUrl);
+  if (discoveredWireModelId && (discoveredWireModelId !== modelId || isAntigravitySuffixModelId(modelId))) {
+    const defaultLevel = ANTIGRAVITY_THINKING_LEVEL_MODELS[modelId];
+    return {
+      wireModelId: discoveredWireModelId,
+      ...(defaultLevel
+        ? { thinkingLevel: effort ? resolveAntigravityThinkingLevel(effort) ?? defaultLevel : defaultLevel }
+        : {}),
+    };
+  }
+
   // Rule 0: retired Flash id — Google has taken the wire id offline, so route to the
   // current generation and carry the tier the retired id encoded. This runs BEFORE the
   // suffix check because those ids are aliases, and rule 1 would drop the tier.
@@ -394,7 +503,7 @@ export function resolveAntigravityEffortWireModel(
 
   // Rule 1: suffix/compat alias — suffix IS the effort.
   if (isAntigravitySuffixModelId(modelId)) {
-    return { wireModelId: resolveAntigravityWireModelId(modelId) };
+    return { wireModelId: resolveAntigravityWireModelId(modelId, baseUrl) };
   }
 
   // Rule 1b: single-wire-id Gemini model whose tiers ride on thinkingLevel. Without
@@ -424,7 +533,7 @@ export function resolveAntigravityEffortWireModel(
   }
 
   // Rule 5: everything else.
-  return { wireModelId: resolveAntigravityWireModelId(modelId) };
+  return { wireModelId: resolveAntigravityWireModelId(modelId, baseUrl) };
 }
 
 

package/src/providers/derive.ts

@@ -393,6 +393,14 @@ function enrichReasoningSummariesByDestination(prov: OcxProviderConfig): void {
   applyReasoningSummaryDefaults(prov, destination?.modelSupportsReasoningSummaries);
 }
 
+/** Repair the exact low-only ClinePass ladder generated by older key-login presets. */
+export function hasLegacyClinePassReasoningEfforts(name: string, prov: OcxProviderConfig): boolean {
+  return name === "cline-pass"
+    && prov.reasoningWireFormat === "gateway-object"
+    && prov.reasoningEfforts?.length === 1
+    && prov.reasoningEfforts[0] === "low";
+}
+
 export function enrichProviderFromRegistry(name: string, prov: OcxProviderConfig): void {
   const entry = PROVIDER_REGISTRY.find(row => row.id === name);
   if (!entry || !providerMatchesRegistryTransportWithStaticGuards(name, prov)) {
@@ -426,7 +434,9 @@ export function enrichProviderFromRegistry(name: string, prov: OcxProviderConfig
   if (seed.modelInputModalities) prov.modelInputModalities = fillRecordOfArrays(seed.modelInputModalities, prov.modelInputModalities);
   if (prov.defaultMaxOutputTokens === undefined && seed.defaultMaxOutputTokens !== undefined) prov.defaultMaxOutputTokens = seed.defaultMaxOutputTokens;
   if (!prov.modelMaxOutputTokens && seed.modelMaxOutputTokens) prov.modelMaxOutputTokens = { ...seed.modelMaxOutputTokens };
-  if (!prov.reasoningEfforts && seed.reasoningEfforts) prov.reasoningEfforts = [...seed.reasoningEfforts];
+  if ((!prov.reasoningEfforts || hasLegacyClinePassReasoningEfforts(name, prov)) && seed.reasoningEfforts) {
+    prov.reasoningEfforts = [...seed.reasoningEfforts];
+  }
   if (!prov.modelReasoningEfforts && seed.modelReasoningEfforts) prov.modelReasoningEfforts = cloneRecordOfArrays(seed.modelReasoningEfforts);
   if (!prov.modelDefaultReasoningEfforts && seed.modelDefaultReasoningEfforts) prov.modelDefaultReasoningEfforts = { ...seed.modelDefaultReasoningEfforts };
   if (!prov.reasoningEffortMap && seed.reasoningEffortMap) prov.reasoningEffortMap = { ...seed.reasoningEffortMap };

package/src/responses/parser.ts

@@ -171,6 +171,10 @@ function buildTools(tools: unknown[] | undefined): OcxTool[] | undefined {
   };
   for (const t of tools) {
     if (!isObj(t)) continue;
+    if (t.type === "function" && isObj(t.function) && typeof t.function.name === "string" && t.function.name.length > 0) {
+      pushFn(t.function as Record<string, unknown>);
+      continue;
+    }
     if (t.type === "function" && typeof t.name === "string") {
       pushFn(t);
     } else if (t.type === "namespace" && Array.isArray(t.tools)) {

package/src/responses/reasoning-replay-cache.ts

@@ -19,7 +19,7 @@
  * long-lived proxy cannot grow without limit.
  */
 
-import { createHmac, randomBytes } from "node:crypto";
+import { createHash, createHmac, randomBytes } from "node:crypto";
 import type {
   OcxProviderConfig,
   OcxReasoningReplayIdentity,
@@ -108,6 +108,21 @@ export function reasoningReplayDestinationIdentity(baseUrl: string | undefined):
   return `destination:${processLocalIdentity("destination", canonical)}`;
 }
 
+/**
+ * The same destination identity, but stable across restarts.
+ *
+ * The process-local form above is keyed by `randomBytes(32)` minted at module load, which
+ * is correct for an in-memory cache and fatal for a durable one: every key would change on
+ * restart and the store would silently stop matching anything. A plain digest of the same
+ * canonical URL is equally non-reversible for this purpose — the input is a configured
+ * endpoint, not a secret — and needs no persisted salt or new on-disk state.
+ */
+export function durableReplayDestinationIdentity(baseUrl: string | undefined): string | undefined {
+  if (!nonEmpty(baseUrl)) return undefined;
+  const canonical = baseUrl.trim().replace(/\/+$/, "");
+  return `destination:${createHash("sha256").update("destination\0").update(canonical).digest("hex")}`;
+}
+
 /** Produce a non-reversible process-local identity for credential material. */
 export function reasoningReplayCredentialIdentity(
   kind: "key" | "oauth" | "codex",

package/src/responses/thought-signature-replay.ts

@@ -27,6 +27,11 @@ import type { OcxProviderOpaqueToolCallMetadata, OcxReasoningReplayScopeRef } fr
 import { isCarryableSignature, responsesExtraContentFromProviderMetadata } from "./provider-opaque-metadata";
 
 const STORE_FILE_NAME = "thought-signature-replay.json";
+/**
+ * Bumped whenever `keyFor` changes shape. v3 added the durable destination identity, so a
+ * v2 file's keys can never match and are dropped on load instead of aging out invisibly.
+ */
+const STORE_VERSION = 3;
 
 /** Bound on remembered entries; real signatures are a few hundred bytes, so this stays small. */
 const MAX_ENTRIES = 16_384;
@@ -83,6 +88,11 @@ function keyFor(callId: string, scope: OcxReasoningReplayScopeRef | undefined):
   return JSON.stringify([
     scope.clientThreadId,
     identity.providerName,
+    // Destination, unlike the credential identity, has a restart-stable form: it is a
+    // configured endpoint rather than a secret, so a plain digest works where the
+    // reasoning cache's randomBytes-keyed HMAC cannot. Without it, one provider NAME
+    // serving two endpoints shares signatures across both.
+    identity.providerDestinationDurableIdentity ?? "destination:unknown",
     identity.adapterName,
     identity.modelId,
     callId,
@@ -103,6 +113,12 @@ function load(): void {
     if (typeof parsed !== "object" || parsed === null || !Array.isArray((parsed as { entries?: unknown }).entries)) {
       return;
     }
+    // The version was written but never read, so a key-shape change could not be
+    // announced — old entries simply went dead and aged out on TTL, which is silent and
+    // indistinguishable from a store that is not working. Reading it makes a shape change
+    // an explicit drop: entries keyed by an older scheme are discarded on load rather than
+    // lingering as permanent misses.
+    if ((parsed as { version?: unknown }).version !== STORE_VERSION) return;
     const nowMs = Date.now();
     for (const entry of (parsed as { entries: unknown[] }).entries) {
       if (typeof entry !== "object" || entry === null) continue;
@@ -141,7 +157,7 @@ function persist(): Promise<void> {
   persistChain = persistChain
     .then(async () => {
       const snapshot = JSON.stringify({
-        version: 2,
+        version: STORE_VERSION,
         entries: [...entries].map(([key, entry]) => ({ key, sig: entry.sig, savedAt: entry.savedAt })),
       });
       await atomicWriteFileAsync(storePath(), snapshot);