@bitkyc08/opencodex 2.26.0 → 2.27.0

package/src/generated/compatibility-version.json

@@ -10,7 +10,7 @@
     },
     {
       "path": "package.json",
-      "sha256": "6f5cf9089f862aa882d31d789900771e9be0157832471cf91cc5fc2069a4b3c6"
+      "sha256": "f51abeea3f3868735b479d9b97b58e7cbdc452e9e5cc4937dfa794a40d9e10c7"
     },
     {
       "path": "scripts/model-metadata.source.json",
@@ -34,7 +34,7 @@
     },
     {
       "path": "src/adapters/anthropic.ts",
-      "sha256": "afd6f5ef9fab45811c67067bdb6731fc8efa3abb7bc2a7bee109445ca9c06467"
+      "sha256": "1d332a1ca8a265bd1e2f534fafed109c5fffc0b60fabd721b52e374c36482230"
     },
     {
       "path": "src/adapters/azure.ts",
@@ -42,7 +42,7 @@
     },
     {
       "path": "src/adapters/base.ts",
-      "sha256": "24c1f585b7d6523e4b83f275e58d1228721952ed90f4d3c002250a10a3346dbe"
+      "sha256": "e3371fb84f8af57cc772bb3b79b1b5af08a6158cb7bdb815b4c8fafb5eaf91e5"
     },
     {
       "path": "src/adapters/client-fingerprint.ts",
@@ -54,7 +54,7 @@
     },
     {
       "path": "src/adapters/command-code.ts",
-      "sha256": "9b4a9eb9ab8c37541d0478ee50d28ea94b9dee127f75fbc85004ca264af67aaa"
+      "sha256": "de5e96d0c8d15ae11c7db6332b73387fe56d12ea38b87e8f2a9d8b805c3dc94d"
     },
     {
       "path": "src/adapters/cursor.ts",
@@ -70,7 +70,7 @@
     },
     {
       "path": "src/adapters/cursor/cursor-errors.ts",
-      "sha256": "aa27cf53056f48c4ed4ccc2262d5a84c0b96b79a3a77db5be7ca27256dfba9c4"
+      "sha256": "0b84e2a511c90a66d68b6a995cdc8c6a1fdcfe3a0337b06cd14b93d2e18d66c9"
     },
     {
       "path": "src/adapters/cursor/discovery.ts",
@@ -110,7 +110,7 @@
     },
     {
       "path": "src/adapters/cursor/live-transport.ts",
-      "sha256": "bc198c05ee076de046e67a58b32ab8fce4d95466204bf6f7c999c2dd754e59a5"
+      "sha256": "ec9d1312299bdf29460813effa8871e52d51a2ebf803f54820031952b693b806"
     },
     {
       "path": "src/adapters/cursor/mcp-config.ts",
@@ -222,7 +222,7 @@
     },
     {
       "path": "src/adapters/google.ts",
-      "sha256": "2519534dbf0366c695fc4f9618068ba1e6938182e5e929d295a05d6bad19ac40"
+      "sha256": "e773b9fc6481ad14b075ceebf4fa950405fe9d775454408d8df37044b17a5aaf"
     },
     {
       "path": "src/adapters/identity.ts",
@@ -286,7 +286,7 @@
     },
     {
       "path": "src/adapters/openai-chat.ts",
-      "sha256": "d5d5d11129918b1862f80024ef3f84b0c39d005177792838aa0289a9a7427b96"
+      "sha256": "da14137945b5df7764ef9c40e24b0ebce284bf2d91acf620921041eeff61e7cb"
     },
     {
       "path": "src/adapters/openai-responses-url.ts",
@@ -314,7 +314,7 @@
     },
     {
       "path": "src/adapters/tool-catalog-nudge.ts",
-      "sha256": "9750e8b4ce000ac452482141bfe27add3577341cc30d1403c05a509bee11044c"
+      "sha256": "1958bac97f4072669e398ca123f7e035fde883fc583aa63b7104c8a7c38f5250"
     },
     {
       "path": "src/adapters/upstream-http-error.ts",
@@ -322,7 +322,7 @@
     },
     {
       "path": "src/bridge.ts",
-      "sha256": "6027aa6b1bb8f05b99c5419cd6d55832622ce3a9ff5fa33e531ea54207f9ba90"
+      "sha256": "0397dbcf209d86d074223cd81b3d66c900a76f1d482713b67c08acc88b077a0e"
     },
     {
       "path": "src/chat/inbound.ts",
@@ -478,7 +478,7 @@
     },
     {
       "path": "src/cli/doctor.ts",
-      "sha256": "fa21147f61cfaf78e5b23e22638cf679e939d54e5377f9a37d4973dbd0b828b3"
+      "sha256": "ce42bf3a086291ff48d4456f16b77cfc77100e0996cff32983ef137235a4b7cb"
     },
     {
       "path": "src/cli/export-command.ts",
@@ -486,7 +486,7 @@
     },
     {
       "path": "src/cli/help.ts",
-      "sha256": "ba2f6e629dabc3e8f58a69963cae267cc188d9acad6460828c7eb3e570b6497c"
+      "sha256": "70385569ae5922bdbff7a3bb2bca81fbb5c913a54440fc30ad19433151764517"
     },
     {
       "path": "src/cli/index.ts",
@@ -522,7 +522,7 @@
     },
     {
       "path": "src/cli/models.ts",
-      "sha256": "a7ddece988af02fc1ebbf4f97bbed882ab70713048c65b094b62bba42b99036f"
+      "sha256": "2fc87036bf9fcce60d90a55dfcf5f91487a038cfb3bad8956ead28ec9058c858"
     },
     {
       "path": "src/cli/observe.ts",
@@ -638,7 +638,7 @@
     },
     {
       "path": "src/codex/app-server-processes.ts",
-      "sha256": "0218c4e432ad02a814d818e04fc5ba8c36864f8fcfd592ef674f9c476e56cb77"
+      "sha256": "74d7a0e50b11a977270faffd481b9996abaea3d1239bc09e477b85d3c13b83c5"
     },
     {
       "path": "src/codex/app-server-restart-service.ts",
@@ -654,7 +654,7 @@
     },
     {
       "path": "src/codex/auth-context.ts",
-      "sha256": "7fe1b5593315309532b6f25d53de17ccf4f01677366f1e69c0b94f83e0c6329a"
+      "sha256": "4ee0af8ad36c280e74055ed0b6a4652e3f56f1aa76b97d95d97ddd67e9f91465"
     },
     {
       "path": "src/codex/autostart-health.ts",
@@ -682,7 +682,7 @@
     },
     {
       "path": "src/codex/catalog/aggregation.ts",
-      "sha256": "71ccd782c527179ae5ffd324bdb966e1f6b838d1e87ef4c6f115bb8d76bb7684"
+      "sha256": "4c3ee463d05c005b0127926d756f81e7d01adbbd68be3130724410c428bda6f7"
     },
     {
       "path": "src/codex/catalog/bundled.ts",
@@ -710,15 +710,15 @@
     },
     {
       "path": "src/codex/catalog/parsing.ts",
-      "sha256": "18f9a24b0770c52d203f8acc446e43e7fba9e42408cc29b612470acd1f0fee8b"
+      "sha256": "fcc5e9dd4a6d8bffcc1aa30f5ffb4f1808c6aac986d1a5542305b946e44546e7"
     },
     {
       "path": "src/codex/catalog/provider-fetch.ts",
-      "sha256": "a943c7b1d879f4e3da3211043e636583f5be7f7357ac9d71db93bb49c25dccd3"
+      "sha256": "2f79fd574e5bbd1da13b42d68013c0137a0718fa2234ad877e3ca3118494cd46"
     },
     {
       "path": "src/codex/catalog/sync.ts",
-      "sha256": "e965307acfa331e50e4ce5f9df5232c6016168219b84c45565ec98cfc70d7aab"
+      "sha256": "c0fa454b88d4efa4109039a33510cbdc0e547499d6d521debb2f7f2f614c0dfe"
     },
     {
       "path": "src/codex/codex-write-lock.ts",
@@ -826,7 +826,7 @@
     },
     {
       "path": "src/codex/log-guard/path-safety.ts",
-      "sha256": "8df1c28dafbe16417dcc474fe06c63ec0d6b8367d47971569b4a80a17a614e16"
+      "sha256": "4c967fe1e04202d44d2e23df99d0f8935350025c3c28e7d23546821218616e9a"
     },
     {
       "path": "src/codex/log-guard/policy.ts",
@@ -902,7 +902,7 @@
     },
     {
       "path": "src/codex/native-profile-startup.ts",
-      "sha256": "1417a440aa78a84f04c4e45dbcd6c3d47c04270844275292b9dbd1bf9b6c8146"
+      "sha256": "2a21187577eb53bb818c5170ba49aa7ba43df203c700fbb435deb5a7ac8c413b"
     },
     {
       "path": "src/codex/native-profile-store.ts",
@@ -1002,7 +1002,7 @@
     },
     {
       "path": "src/codex/user-identity.ts",
-      "sha256": "9641f00a7213ea6cb85cdc38adcbab1615815ca1eda878d5bfc3513e023243c7"
+      "sha256": "ada727e575a421b2571bd4af616a5707042d686e2a36b3847c35c6c128d122b6"
     },
     {
       "path": "src/codex/warmup.ts",
@@ -1038,7 +1038,11 @@
     },
     {
       "path": "src/config.ts",
-      "sha256": "47a45addede39075329436bc21c271908a05d961c34a131241f86db1a9183620"
+      "sha256": "503fa58079502d808a568a1f11ac757208efae01307f7ac55783493cbc4ab7c8"
+    },
+    {
+      "path": "src/config/provider-name.ts",
+      "sha256": "3b19ad53e350808174a5e40fc1c873054e8b869c3ae463d984ee608e9d5bbcb3"
     },
     {
       "path": "src/generated/model-metadata.ts",
@@ -1082,7 +1086,7 @@
     },
     {
       "path": "src/images/loop.ts",
-      "sha256": "ef661e3dac6da842d62d681899e0e4e797182b7d3f690550edd713aa98bc8df5"
+      "sha256": "c5b684bfd9aea1553cdb84e66af89d61fa5eee02bc45ae19996a071fca5c3892"
     },
     {
       "path": "src/images/plan.ts",
@@ -1826,7 +1830,7 @@
     },
     {
       "path": "src/lib/state-store-registrations.ts",
-      "sha256": "ded3bb3afd740d5b3e551a71bb910e25eab68d6546c7b635cc270f82a0b700e2"
+      "sha256": "3bfa6dd9ce8e2211ad65db0957d0767fddce95567ac531a2b5c0d9659fe7b26f"
     },
     {
       "path": "src/lib/state-store-sweeper.ts",
@@ -2030,7 +2034,7 @@
     },
     {
       "path": "src/providers/antigravity-models.ts",
-      "sha256": "7ad7659f17b3782bbf114e46cdfefba7d8894d4d5f71332f30865c07bcbd3076"
+      "sha256": "81535ac49237b29eac0197350a3e11b09006dec8b7a20c03cf582b201f8b0350"
     },
     {
       "path": "src/providers/api-keys.ts",
@@ -2054,7 +2058,7 @@
     },
     {
       "path": "src/providers/derive.ts",
-      "sha256": "928ce1accf9505c0cea8edd0f07af35236f6763beac8e03b9178c15e5486b1d8"
+      "sha256": "62ba3d34ca466b56fa5dc9c8efa911ac7e02f0f2d65863bafda5a5b778b94653"
     },
     {
       "path": "src/providers/fastwire.ts",
@@ -2134,7 +2138,7 @@
     },
     {
       "path": "src/providers/registry.ts",
-      "sha256": "4cf5a3638f38b615c8b2f5bab22aeec1e07c6538b5f51739c00da978eac707d8"
+      "sha256": "336fd0d6d81354a69b8c577e162dd73dd69e196b13ef82d51720897fc16d9fa5"
     },
     {
       "path": "src/providers/request-pacing.ts",
@@ -2142,7 +2146,7 @@
     },
     {
       "path": "src/providers/service-tier.ts",
-      "sha256": "3090e35a061cb40f76e271728845c4a38309a2679f4a755de6813603bf8f9631"
+      "sha256": "ebfb65e1e4983d60504a91ed4c97bb5df541b6307bbec1436f9999e2ff524545"
     },
     {
       "path": "src/providers/slug-codec.ts",
@@ -2174,7 +2178,7 @@
     },
     {
       "path": "src/responses/parser.ts",
-      "sha256": "a0fb93855724c9308d3423890decc13c9c4bbc6d2ec9abd09793edc3df0e9d26"
+      "sha256": "ad950568ee4f921b33a94acfaf214ddabe31c9701f6e7d4d73923f34a1b466e3"
     },
     {
       "path": "src/responses/provider-opaque-metadata.ts",
@@ -2198,7 +2202,7 @@
     },
     {
       "path": "src/responses/state.ts",
-      "sha256": "761a96f2839ee22f7cea11f037424a13bd1dedb0f747f1bc35a81c91ca9b0bbd"
+      "sha256": "701ce7f64b4e647bb2b1ebf79620addab5eaf1284855e9c5c50d446144d455fa"
     },
     {
       "path": "src/responses/thought-signature-replay.ts",
@@ -2214,7 +2218,7 @@
     },
     {
       "path": "src/router.ts",
-      "sha256": "25b244da940b140d379f3cb2ded590519690436c08459fa356972bce95aa2b9f"
+      "sha256": "9eb5c0ea04fcb51150d91308138d3fab25dd19a85bc7bb273295c7924e1b128e"
     },
     {
       "path": "src/routing/analytics.ts",
@@ -2230,7 +2234,7 @@
     },
     {
       "path": "src/routing/compatibility/behavior.ts",
-      "sha256": "8227f4e7a177bd628e8226ea6e4fa88d8f2a4a6c1e919989fab9c8bbf1724508"
+      "sha256": "e7006c3aebe1d36b6d7a9cd97f287599fc231ba0ddb7163c7a502ac67ad6d84f"
     },
     {
       "path": "src/routing/compatibility/catalog.ts",
@@ -2298,7 +2302,7 @@
     },
     {
       "path": "src/routing/profile.ts",
-      "sha256": "5e8cd20b9f8a9c0ef3537c96158b59e93c13593ad07841e18b71ee36923bb867"
+      "sha256": "3ce7c68aff2b8b646d48c5c14b10336f0cf699df46ccd7abe0bbaf97fb939e06"
     },
     {
       "path": "src/routing/quota.ts",
@@ -2366,7 +2370,7 @@
     },
     {
       "path": "src/server/index.ts",
-      "sha256": "3d0cbcbb1a2e99d1cba0b26f316ceedc56fa29d9cb2e535d22bebee1b9539b60"
+      "sha256": "a7276cdfd8dd11936c52c5235378d2ea7bc8d47ee64ba8ef07a5738cb34bcb28"
     },
     {
       "path": "src/server/lifecycle.ts",
@@ -2474,7 +2478,7 @@
     },
     {
       "path": "src/server/management/shared.ts",
-      "sha256": "0f8c6ae6d1e88d1b060ee964271df1b52bb92808c2916b0a9949eda5a0134736"
+      "sha256": "20d037194bf445da81fc3e266885344c5c3f8e252cabe46d11c4de68a71748ab"
     },
     {
       "path": "src/server/management/sidebar-routes.ts",
@@ -2598,7 +2602,7 @@
     },
     {
       "path": "src/server/responses/collaboration.ts",
-      "sha256": "bfeef4d9bf5538d850446d5805769779518b62f8ef33693ecfd1c48f8545093e"
+      "sha256": "415d0d0f754e8cf5c511628d2801fb3ca7b31e68356d0b6a2832d5582d555dda"
     },
     {
       "path": "src/server/responses/compact.ts",
@@ -2606,7 +2610,7 @@
     },
     {
       "path": "src/server/responses/core.ts",
-      "sha256": "bc67a30bfccd34b1781acdd96a0277a39ce9271a217bfd25f06e9f391e0095ee"
+      "sha256": "1d3e6811caa5bd45bc89673102a53663308f9dea7d8054ff1f7aaa65428e5840"
     },
     {
       "path": "src/server/responses/empty-completion-guard.ts",
@@ -2622,7 +2626,7 @@
     },
     {
       "path": "src/server/responses/input-admission.ts",
-      "sha256": "cb04a5dea34d8e997c842626bad39d02baf1c64e6bcf614227bf3d49a2270131"
+      "sha256": "b1f22e78cc089c5f950807f7ffc4b669e1d84ddfced448421ab1539dda749e55"
     },
     {
       "path": "src/server/responses/pacing-overload.ts",
@@ -2690,11 +2694,11 @@
     },
     {
       "path": "src/service-manager-probe.ts",
-      "sha256": "debddd154561e93532edb423bf53dc917c6619ea980d7061368c22a512b29200"
+      "sha256": "72531f30feb9d9979758b39d90092c5589c541d85b1b0e858d3644d59303aade"
     },
     {
       "path": "src/service.ts",
-      "sha256": "5f30baf3c2b3ef7ecc709de3810eec3bbbf26ba8dea236119ecc15bf9530c857"
+      "sha256": "a9babc47b0d3fd5e3f1fcd31f9be8438071ebad6d86fa716f52cecfc4d4a14e3"
     },
     {
       "path": "src/stall-timeout.ts",
@@ -2766,11 +2770,35 @@
     },
     {
       "path": "src/tray/windows.ts",
-      "sha256": "dafcac7e9d79ebdbb0afc33607b6342a9e41243245ef1f7be1f4ced4b3e65474"
+      "sha256": "710652e095d176bdfef69d8926949dcba8b652e7eb3e008376d90375af6ccc26"
     },
     {
       "path": "src/types.ts",
-      "sha256": "f8f1f93aeacaf40799f1af471836cc9118b68abfc8aaa872d06a3aec78418d44"
+      "sha256": "080ba71673e40c75d7b83d99a59b19ef3309cf7089f0f6888db01e99b52c6afb"
+    },
+    {
+      "path": "src/types/accounts.ts",
+      "sha256": "8037e50f3e8660279b085e3cf252a757ae01269925f96144ae972c5ac514bff0"
+    },
+    {
+      "path": "src/types/config.ts",
+      "sha256": "99feba50e45494608d13af6affb5db2389480ebbf02376e0cd324f7a493a3f6b"
+    },
+    {
+      "path": "src/types/provider.ts",
+      "sha256": "f164d467b022826f1ce73ee9e2809d7bb79fcd1257742296a41b9472a7af6424"
+    },
+    {
+      "path": "src/types/request.ts",
+      "sha256": "1f690d581676005a86a280dc80104687c41c58f1639f9770fd4d26f6c9ba7781"
+    },
+    {
+      "path": "src/types/tools.ts",
+      "sha256": "eb4b0526fcdf2ce220d731ed0eb4da539681262d13f6b3fec06e0d80a0429e8b"
+    },
+    {
+      "path": "src/types/wire.ts",
+      "sha256": "ce5d1a7fabef76c800b469bea4a08db0e45259e54e19b60b7b00fbfb85d28973"
     },
     {
       "path": "src/update/badge.ts",
@@ -2822,7 +2850,7 @@
     },
     {
       "path": "src/usage/cost.ts",
-      "sha256": "f9a731f1967985e78f3ca07c4326a6bdde1c5651e19c9cf37f0c48e54df766b5"
+      "sha256": "ccd83889f7cbed904d70c01fc37ea86e0d9761571d7e5bcda4f17c9093800883"
     },
     {
       "path": "src/usage/debug.ts",
@@ -2894,7 +2922,7 @@
     },
     {
       "path": "src/web-search/loop.ts",
-      "sha256": "a9c911108de03ec2ef1dce18d221b255f6015ce05a7949c38a33b1b6ac1fbff2"
+      "sha256": "bac74547ac57eff8b4b9b4e5a9880f4371f59f72827d6f182ceeef68b23a5a9d"
     },
     {
       "path": "src/web-search/parse.ts",

package/src/images/loop.ts

@@ -676,13 +676,20 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
     }
   }
 
-  const toolNsMap = new Map<string, { namespace: string; name: string }>();
+  const toolNsMap = new Map<string, { namespace: string; name: string; freeform?: true }>();
   const freeform = new Set<string>();
   const toolSearch = new Set<string>();
-  const toolAllowed = toolChoiceToolPredicate(parsed.options.toolChoice);
-  for (const t of parsed.context.tools ?? []) {
+  const requestedTools = parsed.context.tools ?? [];
+  const toolAllowed = toolChoiceToolPredicate(parsed.options.toolChoice, requestedTools);
+  for (const t of requestedTools) {
     if (!toolAllowed(t)) continue;
-    if (t.namespace) toolNsMap.set(namespacedToolName(t.namespace, t.name), { namespace: t.namespace, name: t.name });
+    if (t.namespace) {
+      toolNsMap.set(namespacedToolName(t.namespace, t.name), {
+        namespace: t.namespace,
+        name: t.name,
+        ...(t.freeform ? { freeform: true } : {}),
+      });
+    }
     if (t.freeform) freeform.add(t.name);
     if (t.toolSearch) toolSearch.add(t.name);
   }

package/src/lib/state-store-registrations.ts

@@ -35,7 +35,7 @@ import { listLiveOAuthAccountKeys, reconcileOAuthReauthState } from "../oauth/st
 import { reconcileGuardianBackoff } from "../oauth/token-guardian";
 import { sweepExpiredApiKeyCooldowns } from "../providers/key-failover";
 import { reconcileProviderRequestPacing } from "../providers/request-pacing";
-import { sweepExpiredResponseStates } from "../responses/state";
+import { sweepAbandonedResponseStateTemps, sweepExpiredResponseStates } from "../responses/state";
 import { sweepExpiredAntigravityReplay } from "../adapters/google-antigravity-replay";
 import { reconcileProviderAccountQuotaRows } from "../providers/quota";
 import { reconcileRouterWarningMemos } from "../router";
@@ -84,7 +84,13 @@ export const STATE_STORE_REGISTRATIONS = [
   },
   { name: "anthropic-routing-health", sweepExpired: sweepExpiredAnthropicRoutingHealth },
   { name: "xai-refresh-verdicts", sweepExpired: sweepExpiredXaiPermanentFailureVerdicts },
-  { name: "responses-continuation", sweepExpired: sweepExpiredResponseStates },
+  {
+    name: "responses-continuation",
+    sweepExpired: sweepExpiredResponseStates,
+    // Disk reclaim rides the liveness tick, not the TTL tick: sweepExpiredOnWrite puts
+    // sweepExpired on hot write paths, where a directory scan does not belong.
+    sweepLiveness: sweepAbandonedResponseStateTemps,
+  },
   { name: "antigravity-replay", sweepExpired: sweepExpiredAntigravityReplay },
   { name: "config-warning-memos", reconcileGeneration: (context: GenerationContext) => reconcileConfigWarningMemos(context.generation) },
   { name: "catalog-warning-memos", reconcileGeneration: (context: GenerationContext) => reconcileCatalogWarningMemos(context.generation) },

package/src/providers/antigravity-models.ts

@@ -72,6 +72,12 @@ const ANTIGRAVITY_WIRE_IDS_BY_PICKER_MODEL: Record<string, string[]> = Object.en
 }, {});
 
 const ANTIGRAVITY_DISCOVERY_EFFORTS = ["low", "medium", "high"] as const;
+type AntigravityDiscoveryEffort = typeof ANTIGRAVITY_DISCOVERY_EFFORTS[number];
+type AntigravityEffortWireModelIds = Partial<Record<AntigravityDiscoveryEffort, string>>;
+
+function isAntigravityDiscoveryEffort(value: string): value is AntigravityDiscoveryEffort {
+  return (ANTIGRAVITY_DISCOVERY_EFFORTS as readonly string[]).includes(value);
+}
 
 function pickerModelIdForDiscoveredWireId(
   wireId: string,
@@ -151,6 +157,25 @@ const ANTIGRAVITY_EFFORT_WIRE_MAP: Record<string, Record<string, string>> = {
   },
 };
 
+function completeDiscoveredEffortWireModelIds(
+  pickerId: string,
+  available: ReadonlyMap<string, Record<string, unknown>>,
+): AntigravityEffortWireModelIds | undefined {
+  const explicitEffortMap = ANTIGRAVITY_EFFORT_WIRE_MAP[pickerId];
+  if (explicitEffortMap && Object.values(explicitEffortMap).every(wireId => available.has(wireId))) {
+    return { ...explicitEffortMap };
+  }
+
+  if (!isKnownAntigravityPickerModelId(pickerId)) return undefined;
+  const suffixEffortMap: AntigravityEffortWireModelIds = {};
+  for (const effort of ANTIGRAVITY_DISCOVERY_EFFORTS) {
+    const wireId = `${pickerId}-${effort}`;
+    if (!available.has(wireId)) return undefined;
+    suffixEffortMap[effort] = wireId;
+  }
+  return suffixEffortMap;
+}
+
 // ── Default effort per Gemini base model ──
 const ANTIGRAVITY_DEFAULT_EFFORT: Record<string, string> = {
   "gemini-3.1-pro": "high",
@@ -270,6 +295,8 @@ export interface AntigravityAvailableModel {
   id: string;
   /** CCA model id used by the agent envelope when `id` comes from display metadata. */
   wireModelId: string;
+  /** Complete effort-to-wire mapping retained for collapsed discovered tier sets. */
+  effortWireModelIds?: AntigravityEffortWireModelIds;
   contextWindow?: number;
   inputModalities?: string[];
 }
@@ -286,6 +313,7 @@ function antigravityPositiveInteger(value: unknown): number | undefined {
 
 interface DiscoveredWireModelMapping {
   readonly models: ReadonlyMap<string, string>;
+  readonly effortModels: ReadonlyMap<string, AntigravityEffortWireModelIds>;
   readonly generation?: { provider: string; cacheGeneration: string };
 }
 
@@ -327,17 +355,21 @@ export function registerAntigravityDiscoveredWireModels(
   const key = antigravityBaseUrlKey(baseUrl);
   if (!key) return;
   const wireModels = new Map<string, string>();
-  for (const model of models) wireModels.set(model.id, model.wireModelId);
+  const effortModels = new Map<string, AntigravityEffortWireModelIds>();
+  for (const model of models) {
+    wireModels.set(model.id, model.wireModelId);
+    if (model.effortWireModelIds) effortModels.set(model.id, { ...model.effortWireModelIds });
+  }
   discoveredWireModelsByBaseUrl.set(key, {
     models: wireModels,
+    effortModels,
     ...(generation ? { generation } : {}),
   });
 }
 
-function discoveredAntigravityWireModelId(
-  modelId: string,
+function discoveredAntigravityMapping(
   baseUrl: string | undefined,
-): string | undefined {
+): DiscoveredWireModelMapping | undefined {
   const key = antigravityBaseUrlKey(baseUrl);
   if (!key) return undefined;
   const mapping = discoveredWireModelsByBaseUrl.get(key);
@@ -347,7 +379,35 @@ function discoveredAntigravityWireModelId(
     discoveredWireModelsByBaseUrl.delete(key);
     return undefined;
   }
-  return mapping.models.get(modelId);
+  return mapping;
+}
+
+function discoveredAntigravityWireModelId(
+  modelId: string,
+  baseUrl: string | undefined,
+): string | undefined {
+  return discoveredAntigravityMapping(baseUrl)?.models.get(modelId);
+}
+
+function discoveredAntigravityEffortWireModelId(
+  modelId: string,
+  effort: string | undefined,
+  baseUrl: string | undefined,
+): string | undefined {
+  const effortMap = discoveredAntigravityMapping(baseUrl)?.effortModels.get(modelId);
+  if (!effortMap) return undefined;
+
+  const requestedEffort = effort ? resolveAntigravityThinkingLevel(effort) : undefined;
+  if (requestedEffort && isAntigravityDiscoveryEffort(requestedEffort) && effortMap[requestedEffort]) {
+    return effortMap[requestedEffort];
+  }
+
+  const defaultEffort = ANTIGRAVITY_DEFAULT_EFFORT[modelId]
+    ?? ANTIGRAVITY_THINKING_LEVEL_MODELS[modelId];
+  if (defaultEffort && isAntigravityDiscoveryEffort(defaultEffort) && effortMap[defaultEffort]) {
+    return effortMap[defaultEffort];
+  }
+  return Object.values(effortMap)[0];
 }
 
 /**
@@ -465,9 +525,11 @@ export function parseAntigravityAvailableModels(
     const id = pickerModelIdForDiscoveredWireId(wireId, info, available);
     if (seen.has(id)) continue;
     seen.add(id);
+    const effortWireModelIds = completeDiscoveredEffortWireModelIds(id, available);
     out.push({
       id,
       wireModelId: wireId,
+      ...(effortWireModelIds ? { effortWireModelIds } : {}),
       ...(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
@@ -522,6 +584,9 @@ export function resolveAntigravityEffortWireModel(
   effort?: string,
   baseUrl?: string,
 ): { wireModelId: string; thinkingLevel?: string } {
+  const discoveredEffortWireModelId = discoveredAntigravityEffortWireModelId(modelId, effort, baseUrl);
+  if (discoveredEffortWireModelId) return { wireModelId: discoveredEffortWireModelId };
+
   // A collapsed picker row reports ONE representative wire id (whichever tier CCA
   // listed first), so live discovery cannot describe a ladder — it can only name a
   // single rung. Letting it answer for a base model we already have a ladder for

package/src/providers/derive.ts

@@ -3,6 +3,7 @@ import { cloneFastWire } from "./fastwire";
 import {
   PROVIDER_REGISTRY,
   registryEntryForProviderDestination,
+  registryModelServiceTierCapabilityApplies,
   type ProviderRegistryEntry,
 } from "./registry";
 import {
@@ -377,6 +378,15 @@ function applyServiceTierModelDefaults(
   };
 }
 
+function serviceTierModelDefaultsFor(
+  entry: ProviderRegistryEntry | undefined,
+  prov: OcxProviderConfig,
+): Readonly<Record<string, boolean>> | undefined {
+  return entry && registryModelServiceTierCapabilityApplies(entry, prov)
+    ? entry.modelSupportsServiceTier
+    : undefined;
+}
+
 /**
  * Last-resort enrichment for a provider whose NAME matches no registry id.
  *
@@ -412,7 +422,7 @@ export function enrichProviderFromRegistry(name: string, prov: OcxProviderConfig
     // which vendor endpoint is this row talking to — and is already restricted to fixed key
     // destinations, so a templated or overridable base URL cannot be claimed by it.
     enrichReasoningSummariesByDestination(prov);
-    applyServiceTierModelDefaults(prov, registryEntryForProviderDestination(prov)?.modelSupportsServiceTier);
+    applyServiceTierModelDefaults(prov, serviceTierModelDefaultsFor(registryEntryForProviderDestination(prov), prov));
     return;
   }
   const explicitDirectReasoning: DirectReasoningEffortOverrides = {
@@ -466,7 +476,7 @@ export function enrichProviderFromRegistry(name: string, prov: OcxProviderConfig
   if (prov.supportsServiceTier === undefined && entry.supportsServiceTier !== undefined) prov.supportsServiceTier = entry.supportsServiceTier;
   if (prov.preserveResponsesReasoningContent === undefined && entry.preserveResponsesReasoningContent !== undefined) prov.preserveResponsesReasoningContent = entry.preserveResponsesReasoningContent;
   applyReasoningSummaryDefaults(prov, entry.modelSupportsReasoningSummaries);
-  applyServiceTierModelDefaults(prov, entry.modelSupportsServiceTier);
+  applyServiceTierModelDefaults(prov, serviceTierModelDefaultsFor(entry, prov));
   // Registry-only repair policy (#938): fill only when the runtime provider has
   // no explicit policy, and deep-clone so saved/user values never alias the
   // registry constant.