@bitkyc08/opencodex 2.15.1-preview.20260814 → 2.16.0

package/src/lib/translator-budget.ts

@@ -71,6 +71,40 @@ export interface TranslatorBudget {
 
 const retainedEventOwnership = new WeakMap<object, { budget: TranslatorBudget; bytes: number }>();
 
+/**
+ * Charge one event appended to an incrementally materialized adapter-event batch.
+ * The newest event owns the closing array bracket; moving that byte from the old
+ * tail keeps in-order release accounting equal to the still-retained JSON array.
+ */
+export function retainTranslatedEvent<T extends object>(
+  event: T,
+  budget: TranslatorBudget,
+  previousTail?: object,
+): void {
+  if (retainedEventOwnership.has(event)) {
+    throw new Error("translated event is already retained");
+  }
+  if (previousTail === event) {
+    throw new Error("incremental translated event tail must be a distinct object");
+  }
+  const previousOwnership = previousTail === undefined
+    ? undefined
+    : retainedEventOwnership.get(previousTail);
+  if (
+    previousTail !== undefined
+    && (!previousOwnership || previousOwnership.budget !== budget || previousOwnership.bytes < 2)
+  ) {
+    throw new Error("incremental translated event tail is not retained by this budget");
+  }
+
+  const serializedBytes = Buffer.byteLength(JSON.stringify(event));
+  budget.chargeRetained(serializedBytes + (previousTail === undefined ? 2 : 1), {
+    kind: "retained_collectors",
+  });
+  if (previousOwnership) previousOwnership.bytes -= 1;
+  retainedEventOwnership.set(event, { budget, bytes: serializedBytes + 2 });
+}
+
 /**
  * Charge a materialized adapter-event batch and attach its lease to the events themselves.
  * A copied event array (for example terminal-guard collection) preserves the event objects, so

package/src/oauth/index.ts

@@ -879,6 +879,9 @@ function isLegacyCommandCodeStaticCatalog(provider: OcxProviderConfig): boolean
 }
 
 function isLegacyAntigravityStaticCatalog(provider: OcxProviderConfig): boolean {
+  // A fingerprint of the shape version 1 actually shipped, NOT of the current registry.
+  // These literals must stay frozen as the model list moves on: matching them is how we
+  // know the row is the untouched v1 seed rather than a user's own selection.
   return provider.liveModels === false
     && provider.adapter === "google"
     && provider.baseUrl === "https://daily-cloudcode-pa.googleapis.com"

package/src/providers/antigravity-models.ts

@@ -6,14 +6,43 @@ import { isValidModelDiscoveryModelId, MODEL_DISCOVERY_MAX_MODELS } from "./mode
 // CLI resolves labels against. The ids below separate CCA wire ids, collapsed picker entries,
 // and hidden compatibility aliases for saved selections. The CCA envelope's `model` field must
 // receive the wire id (for example "Gemini 3.1 Pro (High)" => gemini-pro-agent), while the
-// picker exposes collapsed base models only when CCA returns every known tier; otherwise each
-// returned wire id remains visible so an unavailable tier cannot be selected.
+// picker exposes collapsed known base models only when CCA returns every known tier; unknown
+// returned wire ids remain visible so they stay directly routable.
 
 // ── Wire IDs (what CCA :fetchAvailableModels returns) ──
+
+/** Current Antigravity Flash generation. */
+const GEMINI_FLASH_CURRENT = "gemini-3.7-flash";
+
+/**
+ * Retired Flash ids → the reasoning tier they used to encode.
+ *
+ * Google pulls the previous Flash model from CCA almost immediately when the next
+ * one ships, so a saved selection cannot keep pointing at it. A flat alias would
+ * strand the user's tier: `resolveAntigravityEffortWireModel` rule 1 treats any
+ * alias as "the suffix IS the effort" and deliberately sends no thinkingConfig, so
+ * `gemini-3.6-flash-high` would silently become an untiered 3.7 call. Carrying the
+ * level here preserves what the user actually chose.
+ *
+ * 3.7 exposes tiers through `thinkingLevel` on ONE wire id rather than through
+ * suffixed wire ids, which is why the mapping is id → level and not id → id.
+ */
+const RETIRED_FLASH_TIERS: Record<string, string> = {
+  // 3.6 generation.
+  "gemini-3.6-flash": "medium", // bare base carried a medium default
+  "gemini-3.6-flash-low": "low",
+  "gemini-3.6-flash-medium": "medium",
+  "gemini-3.6-flash-high": "high",
+  // 3.5 generation — these already pointed at 3.6 wire ids, which are now dead too.
+  "gemini-3.5-flash-extra-low": "low",
+  "gemini-3.5-flash-low": "medium",
+  "gemini-3.5-flash-mid": "medium",
+  "gemini-3.5-flash-high": "high",
+  "gemini-3-flash-agent": "high",
+};
+
 const ANTIGRAVITY_WIRE_MODELS = [
-  "gemini-3.6-flash-low",
-  "gemini-3.6-flash-medium",
-  "gemini-3.6-flash-high",
+  "gemini-3.7-flash",
   "gemini-3.1-pro-low",
   "gemini-pro-agent",
   "gemini-3.1-flash-image",
@@ -23,9 +52,6 @@ const ANTIGRAVITY_WIRE_MODELS = [
 ];
 
 const ANTIGRAVITY_PICKER_MODEL_BY_WIRE_ID: Record<string, string> = {
-  "gemini-3.6-flash-low": "gemini-3.6-flash",
-  "gemini-3.6-flash-medium": "gemini-3.6-flash",
-  "gemini-3.6-flash-high": "gemini-3.6-flash",
   "gemini-3.1-pro-low": "gemini-3.1-pro",
   "gemini-pro-agent": "gemini-3.1-pro",
 };
@@ -37,11 +63,46 @@ const ANTIGRAVITY_WIRE_IDS_BY_PICKER_MODEL: Record<string, string[]> = Object.en
   return out;
 }, {});
 
+const ANTIGRAVITY_DISCOVERY_EFFORTS = ["low", "medium", "high"] as const;
+
+function pickerModelIdForDiscoveredWireId(
+  wireId: string,
+  available: ReadonlyMap<string, Record<string, unknown>>,
+): string {
+  const explicitPickerId = Object.hasOwn(ANTIGRAVITY_PICKER_MODEL_BY_WIRE_ID, wireId)
+    ? ANTIGRAVITY_PICKER_MODEL_BY_WIRE_ID[wireId]
+    : undefined;
+  if (explicitPickerId) {
+    const requiredWireIds = Object.hasOwn(ANTIGRAVITY_WIRE_IDS_BY_PICKER_MODEL, explicitPickerId)
+      ? ANTIGRAVITY_WIRE_IDS_BY_PICKER_MODEL[explicitPickerId] ?? []
+      : [];
+    if (requiredWireIds.every(id => available.has(id))) return explicitPickerId;
+  }
+
+  // CCA uses a single `-tiered` row for models whose effort levels ride on the
+  // request's thinkingLevel field. Keep this generic so new tiered models do not
+  // require another provider-specific ID mapping.
+  if (wireId.endsWith("-tiered")) {
+    const baseId = wireId.slice(0, -"-tiered".length);
+    if (isKnownAntigravityPickerModelId(baseId)) return baseId;
+  }
+
+  const effortMatch = /^(.*)-(low|medium|high)$/.exec(wireId);
+  if (effortMatch) {
+    const baseId = effortMatch[1]!;
+    if (isKnownAntigravityPickerModelId(baseId)
+      && ANTIGRAVITY_DISCOVERY_EFFORTS.every(effort => available.has(`${baseId}-${effort}`))) {
+      return baseId;
+    }
+  }
+  return wireId;
+}
+
 // ── Effort ladders per collapsed base model ──
 // Gemini models: effort → wire model suffix (official agy UI pattern).
 // Claude Opus: effort → thinkingConfig.thinkingLevel (CLIProxyAPI proven pattern).
 export const ANTIGRAVITY_MODEL_EFFORTS: Record<string, string[]> = {
-  "gemini-3.6-flash": ["low", "medium", "high"],
+  "gemini-3.7-flash": ["low", "medium", "high"],
   "gemini-3.1-pro": ["low", "high"],
   "claude-sonnet-4-6": ["low", "medium", "high", "max"],
   "claude-opus-4-6-thinking": ["low", "medium", "high", "max"],
@@ -49,11 +110,6 @@ export const ANTIGRAVITY_MODEL_EFFORTS: Record<string, string[]> = {
 
 // ── Effort → wire model map for Gemini base models ──
 const ANTIGRAVITY_EFFORT_WIRE_MAP: Record<string, Record<string, string>> = {
-  "gemini-3.6-flash": {
-    low: "gemini-3.6-flash-low",
-    medium: "gemini-3.6-flash-medium",
-    high: "gemini-3.6-flash-high",
-  },
   "gemini-3.1-pro": {
     low: "gemini-3.1-pro-low",
     high: "gemini-pro-agent",
@@ -62,11 +118,20 @@ const ANTIGRAVITY_EFFORT_WIRE_MAP: Record<string, Record<string, string>> = {
 
 // ── Default effort per Gemini base model ──
 const ANTIGRAVITY_DEFAULT_EFFORT: Record<string, string> = {
-  "gemini-3.6-flash": "medium",
   "gemini-3.1-pro": "high",
 };
 
-const ANTIGRAVITY_THINKING_LEVELS = new Set(["minimal", "low", "medium", "high"]);
+/**
+ * Gemini base models whose efforts ride on `thinkingLevel` against a single wire id
+ * instead of suffixed wire ids, with the level applied when the caller names none.
+ */
+const ANTIGRAVITY_THINKING_LEVEL_MODELS: Record<string, string> = {
+  "gemini-3.7-flash": "medium",
+};
+
+// `minimal` is deliberately absent: Google documents it as unsupported for the current
+// Flash generation, where it is an error rather than a quieter tier.
+const ANTIGRAVITY_THINKING_LEVELS = new Set(["low", "medium", "high"]);
 
 function resolveAntigravityThinkingLevel(effort: string): string | undefined {
   if (effort === "xhigh" || effort === "max" || effort === "ultra") return "high";
@@ -83,16 +148,17 @@ const ANTIGRAVITY_VISIBLE_MODEL_ALIASES: Record<string, string> = {
 // Wire suffix IDs are identity aliases — they resolve to themselves so saved configs
 // with explicit suffixes (e.g. gemini-3.6-flash-low) continue to work.
 const ANTIGRAVITY_COMPATIBILITY_MODEL_ALIASES: Record<string, string> = {
-  "gemini-3.6-flash-low": "gemini-3.6-flash-low",
-  "gemini-3.6-flash-medium": "gemini-3.6-flash-medium",
-  "gemini-3.6-flash-high": "gemini-3.6-flash-high",
   "gemini-3.1-pro-low": "gemini-3.1-pro-low",
   "gemini-pro-agent": "gemini-pro-agent",
-  "gemini-3.5-flash-extra-low": "gemini-3.6-flash-low",
-  "gemini-3.5-flash-low": "gemini-3.6-flash-medium",
-  "gemini-3.5-flash-mid": "gemini-3.6-flash-medium",
-  "gemini-3.5-flash-high": "gemini-3.6-flash-high",
-  "gemini-3-flash-agent": "gemini-3.6-flash-high",
+  // ── Retired Flash generations ──
+  // Google takes the previous Antigravity Flash model offline almost immediately
+  // once its successor ships, so 3.6 (and the 3.5 ids that used to land on it)
+  // route to 3.7. These stay in the alias map — not only in the tier map below —
+  // because `parseAntigravityAvailableModels` uses THIS map to keep a stale CCA
+  // payload from republishing a dead wire id as a picker row.
+  ...Object.fromEntries(
+    Object.keys(RETIRED_FLASH_TIERS).map(retired => [retired, GEMINI_FLASH_CURRENT]),
+  ),
 };
 
 export const ANTIGRAVITY_MODEL_ALIASES: Record<string, string> = {
@@ -102,7 +168,7 @@ export const ANTIGRAVITY_MODEL_ALIASES: Record<string, string> = {
 
 // Picker-visible: collapsed base models only.
 export const ANTIGRAVITY_MODELS = [
-  "gemini-3.6-flash",
+  GEMINI_FLASH_CURRENT,
   "gemini-3.1-pro",
   "gemini-3.1-flash-image",
   "claude-sonnet-4-6",
@@ -110,11 +176,13 @@ export const ANTIGRAVITY_MODELS = [
   "gpt-oss-120b-medium",
 ];
 
+function isKnownAntigravityPickerModelId(value: string): boolean {
+  return isValidModelDiscoveryModelId(value) && ANTIGRAVITY_MODELS.includes(value);
+}
+
 // Context windows from the upstream `:fetchAvailableModels` maxTokens per model.
 const ANTIGRAVITY_WIRE_MODEL_CONTEXT_WINDOWS: Record<string, number> = {
-  "gemini-3.6-flash-low": 1_048_576,
-  "gemini-3.6-flash-medium": 1_048_576,
-  "gemini-3.6-flash-high": 1_048_576,
+  "gemini-3.7-flash": 1_048_576,
   "gemini-3.1-pro-low": 1_048_576,
   "gemini-pro-agent": 1_048_576,
   "gemini-3.1-flash-image": 1_048_576,
@@ -125,7 +193,7 @@ const ANTIGRAVITY_WIRE_MODEL_CONTEXT_WINDOWS: Record<string, number> = {
 
 export const ANTIGRAVITY_MODEL_CONTEXT_WINDOWS: Record<string, number> = {
   // Collapsed base IDs — explicit entries for the picker.
-  "gemini-3.6-flash": 1_048_576,
+  "gemini-3.7-flash": 1_048_576,
   "gemini-3.1-pro": 1_048_576,
   // Wire IDs and aliases via derivation.
   ...ANTIGRAVITY_WIRE_MODEL_CONTEXT_WINDOWS,
@@ -138,7 +206,11 @@ export const ANTIGRAVITY_MODEL_CONTEXT_WINDOWS: Record<string, number> = {
 };
 
 export const ANTIGRAVITY_MODEL_INPUT_MODALITIES: Record<string, string[]> = {
-  "gemini-3.6-flash": ["text", "image"],
+  // Google documents 3.7 Flash as also accepting video, audio and PDF, but this proxy
+  // carries only text and image parts (`OcxImageContent`, src/types.ts) and the Codex
+  // catalog normalizes `input_modalities` against a closed enum. Advertising a modality
+  // the wire cannot carry would be a promise we break at request time.
+  "gemini-3.7-flash": ["text", "image"],
   "gemini-3.1-pro": ["text", "image"],
   "gemini-3.1-flash-image": ["text", "image"],
   "claude-sonnet-4-6": ["text", "image"],
@@ -189,6 +261,7 @@ export function parseAntigravityAvailableModels(
       if (!Array.isArray(modelIds)) return null;
       for (const id of modelIds) {
         if (!isValidModelDiscoveryModelId(id)
+          || !Object.hasOwn(models, id)
           || !antigravityRecord(models[id])
           || ids.length >= limit) return null;
         ids.push(id);
@@ -202,6 +275,19 @@ export function parseAntigravityAvailableModels(
     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);
+  const flashTieredIds = tieredModelIds?.flash;
+  if (Array.isArray(flashTieredIds)) {
+    for (const id of flashTieredIds) {
+      if (!isValidModelDiscoveryModelId(id)
+        || !Object.hasOwn(models, id)
+        || !antigravityRecord(models[id])
+        || ids.length >= limit) return null;
+      ids.push(id);
+    }
+  }
 
   const available = new Map<string, Record<string, unknown>>();
   for (const wireId of ids) {
@@ -209,17 +295,17 @@ export function parseAntigravityAvailableModels(
     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.
-    if (ANTIGRAVITY_MODEL_ALIASES[wireId] && ANTIGRAVITY_MODEL_ALIASES[wireId] !== wireId) continue;
+    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 pickerId = ANTIGRAVITY_PICKER_MODEL_BY_WIRE_ID[wireId];
-    const completePickerSet = pickerId !== undefined
-      && ANTIGRAVITY_WIRE_IDS_BY_PICKER_MODEL[pickerId]!.every(id => available.has(id));
-    const id = completePickerSet ? pickerId! : wireId;
+    const id = pickerModelIdForDiscoveredWireId(wireId, available);
     if (seen.has(id)) continue;
     seen.add(id);
     out.push({
@@ -232,7 +318,9 @@ export function parseAntigravityAvailableModels(
 }
 
 export function resolveAntigravityWireModelId(modelId: string): string {
-  return ANTIGRAVITY_MODEL_ALIASES[modelId] ?? modelId;
+  return Object.hasOwn(ANTIGRAVITY_MODEL_ALIASES, modelId)
+    ? ANTIGRAVITY_MODEL_ALIASES[modelId]
+    : modelId;
 }
 
 /**
@@ -244,6 +332,11 @@ export function isAntigravitySuffixModelId(modelId: string): boolean {
   return !(ANTIGRAVITY_MODELS as string[]).includes(modelId);
 }
 
+/** The reasoning tier a retired Flash id used to encode, if it is one. */
+export function retiredAntigravityFlashTier(modelId: string): string | undefined {
+  return Object.hasOwn(RETIRED_FLASH_TIERS, modelId) ? RETIRED_FLASH_TIERS[modelId] : undefined;
+}
+
 /**
  * Resolve a picker-visible base model + optional reasoning effort to the CCA wire model ID.
  *
@@ -258,11 +351,32 @@ export function resolveAntigravityEffortWireModel(
   modelId: string,
   effort?: string,
 ): { wireModelId: string; thinkingLevel?: string } {
+  // 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.
+  const retiredTier = retiredAntigravityFlashTier(modelId);
+  if (retiredTier) {
+    return {
+      wireModelId: GEMINI_FLASH_CURRENT,
+      thinkingLevel: effort ? resolveAntigravityThinkingLevel(effort) ?? retiredTier : retiredTier,
+    };
+  }
+
   // Rule 1: suffix/compat alias — suffix IS the effort.
   if (isAntigravitySuffixModelId(modelId)) {
     return { wireModelId: resolveAntigravityWireModelId(modelId) };
   }
 
+  // Rule 1b: single-wire-id Gemini model whose tiers ride on thinkingLevel. Without
+  // this the model falls to rule 5 and silently loses reasoning control entirely.
+  const defaultLevel = ANTIGRAVITY_THINKING_LEVEL_MODELS[modelId];
+  if (defaultLevel) {
+    return {
+      wireModelId: modelId,
+      thinkingLevel: effort ? resolveAntigravityThinkingLevel(effort) ?? defaultLevel : defaultLevel,
+    };
+  }
+
   // Rule 2/3: mapped Gemini base model.
   const effortMap = ANTIGRAVITY_EFFORT_WIRE_MAP[modelId];
   if (effortMap) {
@@ -301,6 +415,12 @@ const ANTIGRAVITY_USAGE_BASE_BY_ID: Record<string, string> = (() => {
     // If alias is itself a base/wire already mapped, keep that mapping.
     else if (rev[wire]) rev[alias] = rev[wire]!;
   }
+  // Retired ids keep their OWN identity for usage aggregation, overriding the alias
+  // pass above. Routing sends new 3.6 calls to 3.7, but a usage row written months ago
+  // records a model the user actually called: relabelling it would move historical spend
+  // onto a model that did not exist then, and away from the 3.6 price row that still
+  // prices it correctly. Retirement changes what we CALL, not what we RECORD.
+  for (const retired of Object.keys(RETIRED_FLASH_TIERS)) rev[retired] = retired;
   // Visible aliases that only appear in ANTIGRAVITY_VISIBLE_MODEL_ALIASES are already
   // included via ANTIGRAVITY_MODEL_ALIASES. Identity bases without effort maps remain.
   return rev;

package/src/providers/model-rename-migration.ts

@@ -26,6 +26,22 @@ export interface ModelRename {
   to: string;
   /** Why the vendor retired it, for the startup warning and future readers. */
   reason: string;
+  /**
+   * Drop the retired key from `modelReasoningEffortMap` instead of renaming it.
+   *
+   * Renaming preserves the VALUE, which is right for records whose values describe the
+   * model — a context window or an effort ladder survives a rename — and wrong for the
+   * one record whose values are themselves wire ids. An effort map saved as
+   * `high -> gemini-3.6-flash-high` would keep naming a dead wire id under the new key,
+   * and the adapter maps effort BEFORE resolving CCA routing, so that value arrives as
+   * an unrecognised effort and silently degrades to the default tier.
+   *
+   * Only that one record is dropped. Emptying the others would be worse than the bug:
+   * catalog enrichment treats an existing `{}` as "already populated" and will not
+   * restore the registry's records, so the migrated user would keep routing correctly
+   * but lose the reasoning picker entirely.
+   */
+  dropReasoningEffortMap?: boolean;
 }
 
 /**
@@ -46,6 +62,22 @@ export const MODEL_RENAMES: readonly ModelRename[] = [
     to: "qwen3.8-max",
     reason: "Alibaba shipped Qwen3.8-Max as stable and documents the preview endpoint as liable to be taken offline once preview concludes",
   },
+  // Antigravity Flash generations. Google takes the previous Flash model off Cloud Code
+  // Assist almost immediately when the next ships, so a saved 3.6 (or older 3.5) id is a
+  // dead selection rather than a merely outdated one. Routing already redirects these ids
+  // at request time; this migration repairs the saved config so the picker, the allowlist
+  // and the capability maps stop naming a model the backend no longer serves.
+  ...(["gemini-3.6-flash", "gemini-3.6-flash-low", "gemini-3.6-flash-medium", "gemini-3.6-flash-high",
+    "gemini-3.5-flash-extra-low", "gemini-3.5-flash-low", "gemini-3.5-flash-mid", "gemini-3.5-flash-high",
+    "gemini-3-flash-agent"] as const).map(from => ({
+    provider: "google-antigravity",
+    from,
+    to: "gemini-3.7-flash",
+    reason: "Google retires the previous Antigravity Flash generation from Cloud Code Assist when its successor ships, so the saved id no longer resolves to a live model",
+    // The retired Flash tiers were wire ids, so any saved per-model record keyed by one
+    // may also hold one as a value. 3.7 expresses tiers as thinkingLevel names instead.
+    dropReasoningEffortMap: true,
+  })),
 ];
 
 /** Provider fields that key metadata by model id. */
@@ -61,6 +93,12 @@ const MODEL_KEYED_RECORDS = [
 /** Provider fields that are flat lists of model ids. */
 const MODEL_ID_LISTS = [
   "models",
+  // A retired id left here is worse than a stale label: `filterCatalogModels` treats
+  // `selectedModels` as an exact-match allowlist, so a user who allowlisted only the
+  // retired model gets NO replacement row at all — the model silently vanishes from
+  // their catalog instead of being renamed. OAuth reconciliation does not cover this
+  // field, so the rename has to.
+  "selectedModels",
   "noVisionModels",
   "noReasoningModels",
   "noTemperatureModels",
@@ -102,6 +140,19 @@ function renameInRecord(value: unknown, from: string, to: string): Record<string
   return next;
 }
 
+/** Drop the retired key entirely, leaving any entry already saved under the new id. */
+function dropFromRecord(value: unknown, from: string): Record<string, unknown> | null {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  const record = value as Record<string, unknown>;
+  if (!(from in record)) return null;
+  const next: Record<string, unknown> = {};
+  for (const [key, entry] of Object.entries(record)) {
+    if (key === from) continue;
+    next[key] = entry;
+  }
+  return next;
+}
+
 /**
  * `provider/model` rows in the top-level `disabledModels` list.
  *
@@ -179,7 +230,9 @@ export function projectModelRenames(
       touched = true;
     }
     for (const field of MODEL_KEYED_RECORDS) {
-      const next = renameInRecord(row[field], rename.from, rename.to);
+      const next = rename.dropReasoningEffortMap && field === "modelReasoningEffortMap"
+        ? dropFromRecord(row[field], rename.from)
+        : renameInRecord(row[field], rename.from, rename.to);
       if (!next) continue;
       row[field] = next;
       touched = true;

package/src/providers/registry.ts

@@ -1451,7 +1451,7 @@ export const PROVIDER_REGISTRY: readonly ProviderRegistryEntry[] = [
   // 2026-07-10: defaultModel is frozen pending Vertex-specific Tier-2 evidence; Gemini API
   // evidence from ai.google.dev does not establish Vertex publisher availability.
   { id: "google-vertex", label: "Google Vertex AI", adapter: "google", baseUrl: "https://aiplatform.googleapis.com", authKind: "key", dashboardUrl: "https://console.cloud.google.com/vertex-ai", defaultModel: "gemini-3-pro", googleMode: "vertex", jawcodeBundle: "google", extraMetadataAliases: ["gemini-vertex"] },
-  { id: "google-antigravity", label: "Google Antigravity", adapter: "google", baseUrl: "https://daily-cloudcode-pa.googleapis.com", authKind: "oauth", dashboardUrl: "https://antigravity.google", models: ANTIGRAVITY_MODELS, liveModels: true, defaultModel: "gemini-3.6-flash", modelContextWindows: ANTIGRAVITY_MODEL_CONTEXT_WINDOWS, modelInputModalities: ANTIGRAVITY_MODEL_INPUT_MODALITIES, modelReasoningEfforts: ANTIGRAVITY_MODEL_EFFORTS, googleMode: "cloud-code-assist", jawcodeBundle: "google", extraMetadataAliases: ["antigravity", "gemini-antigravity"] },
+  { id: "google-antigravity", label: "Google Antigravity", adapter: "google", baseUrl: "https://daily-cloudcode-pa.googleapis.com", authKind: "oauth", dashboardUrl: "https://antigravity.google", models: ANTIGRAVITY_MODELS, liveModels: true, defaultModel: "gemini-3.7-flash", modelContextWindows: ANTIGRAVITY_MODEL_CONTEXT_WINDOWS, modelInputModalities: ANTIGRAVITY_MODEL_INPUT_MODALITIES, modelReasoningEfforts: ANTIGRAVITY_MODEL_EFFORTS, googleMode: "cloud-code-assist", jawcodeBundle: "google", extraMetadataAliases: ["antigravity", "gemini-antigravity"] },
   { id: "azure-openai", label: "Azure OpenAI", adapter: "azure-openai", baseUrl: "https://{resource}.openai.azure.com/openai", authKind: "key", featured: true, dashboardUrl: "https://portal.azure.com" },
   { id: "ollama", label: "Ollama (local)", adapter: "openai-chat", baseUrl: "http://localhost:11434/v1", authKind: "local", allowPrivateNetworkByDefault: true, allowBaseUrlOverride: true, featured: true, note: "Local — key usually blank" },
   { id: "vllm", label: "vLLM (local)", adapter: "openai-chat", baseUrl: "http://localhost:8000/v1", authKind: "local", allowPrivateNetworkByDefault: true, allowBaseUrlOverride: true, featured: true, note: "Local — key usually blank" },

package/src/routing/compatibility/assemble.ts

@@ -5,73 +5,22 @@ import type { PolicyCandidateEvidence } from "../evaluator";
 import { policyCandidateHealthEvidence } from "../health";
 import type { NormalizedRoutingProfile } from "../profile";
 import { quotaEvidenceForCandidate } from "../quota";
-import {
-  compatibilitySuiteKey,
-  loadCompatibilityCatalogSnapshot,
-  type CompatibilityCatalogSnapshot,
-} from "./catalog";
-import { findVerdictForSuite, loadCompatibilityEvidenceSnapshot } from "./reader";
-import {
-  resolvePolicyCompatibilitySubjects,
-  type ResolvedPolicyCompatibilitySubjects,
-} from "./subject";
-import type { CandidateCompatibilityEvidence } from "./types";
+import { resolveCompatibilityEvidenceProvider, type CoreEvidenceOptions } from "./provider-slot";
 
 export type RoutedProviderResolver = (
   providerName: string,
   provider: OcxProviderConfig,
 ) => OcxProviderConfig;
 
-export interface AssemblePolicyEvidenceOptions {
-  configDir?: string;
-  routedProviderConfig: RoutedProviderResolver;
-  resolveSubjects?: typeof resolvePolicyCompatibilitySubjects;
-  loadEvidenceSnapshot?: typeof loadCompatibilityEvidenceSnapshot;
-  loadCatalogSnapshot?: typeof loadCompatibilityCatalogSnapshot;
-}
-
-function attachCompatibilityEvidence(
-  resolved: ResolvedPolicyCompatibilitySubjects | undefined,
-  snapshot: ReturnType<typeof loadCompatibilityEvidenceSnapshot>,
-  catalog: CompatibilityCatalogSnapshot,
-  profile: NonNullable<NormalizedRoutingProfile["compatibility"]>,
-): CandidateCompatibilityEvidence {
-  const subjectIds = resolved?.subjectIds ?? {};
-  const suites: CandidateCompatibilityEvidence["suites"] = [];
-
-  for (const requirement of profile.requiredSuites) {
-    const subjectId = subjectIds[requirement.evidenceLayer];
-    if (!subjectId) continue;
-    const metadata = catalog.get(compatibilitySuiteKey(requirement.evidenceLayer, requirement.suiteId));
-    if (!metadata) continue;
-    const row = findVerdictForSuite(
-      snapshot,
-      subjectId,
-      requirement.evidenceLayer,
-      requirement.suiteId,
-      metadata.suiteVersion,
-      metadata.suiteManifestDigest,
-    );
-    if (!row) continue;
-    suites.push({
-      subjectId,
-      suiteId: row.suiteId,
-      evidenceLayer: requirement.evidenceLayer,
-      suiteVersion: row.suiteVersion,
-      suiteManifestDigest: row.suiteManifestDigest,
-      verdict: row.verdict,
-      asOf: row.asOf,
-      maxAgeMs: metadata.maxAgeMs,
-      notes: row.notes,
-    });
-  }
-
-  return {
-    subjectIds: { ...subjectIds },
-    projectionAvailable: snapshot.projectionAvailable,
-    suites,
-  };
-}
+/**
+ * Options the core assembler needs. Provider-specific test seams (subject resolution,
+ * catalog and projection loading) belong to the compatibility provider, not here -- keeping
+ * them out is what stops the core assembler from naming Lab-backed contracts.
+ *
+ * The provider reads its own seams off the same object, so callers may still pass a
+ * `LabCompatibilityProviderOptions`; that type extends this one.
+ */
+export type AssemblePolicyEvidenceOptions = CoreEvidenceOptions;
 
 /**
  * Assemble production policy candidate evidence including compatibility snapshots.
@@ -89,55 +38,20 @@ export function assemblePolicyCandidateEvidence(
   const hasCompatibilityRequirements = Boolean(
     compatibilityPolicy && compatibilityPolicy.requiredSuites.length > 0,
   );
-  const resolvedByCandidate = new Map<string, ResolvedPolicyCompatibilitySubjects>();
-  let catalog: CompatibilityCatalogSnapshot = new Map();
-  let snapshot: ReturnType<typeof loadCompatibilityEvidenceSnapshot> = {
-    projectionAvailable: true,
-    projectionIncompatible: false,
-    bySubject: new Map(),
-  };
-
-  if (hasCompatibilityRequirements && compatibilityPolicy) {
-    const resolveSubjects = options.resolveSubjects ?? resolvePolicyCompatibilitySubjects;
-    const loadCatalog = options.loadCatalogSnapshot ?? loadCompatibilityCatalogSnapshot;
-    const loadEvidence = options.loadEvidenceSnapshot ?? loadCompatibilityEvidenceSnapshot;
-    catalog = loadCatalog(compatibilityPolicy.requiredSuites);
-    const subjectIds = new Set<string>();
-
-    for (const candidate of profile.candidates) {
-      const provider = config.providers[candidate.provider];
-      if (!provider) continue;
-      try {
-        const routed = options.routedProviderConfig(candidate.provider, provider);
-        const resolved = resolveSubjects(
-          config,
-          candidate.provider,
-          candidate.model,
-          routed,
-          options.configDir,
-        );
-        resolvedByCandidate.set(`${candidate.provider}/${candidate.model}`, resolved);
-        for (const subjectId of Object.values(resolved.subjectIds)) {
-          if (subjectId) subjectIds.add(subjectId);
-        }
-      } catch {
-        // Subject construction failure is handled per required layer as unknown.
-      }
-    }
-
-    snapshot = loadEvidence([...subjectIds], options.configDir);
-  }
+  // Compatibility evidence is supplied by an opt-in subsystem. With no provider registered
+  // -- every install without compatibility-gated profiles -- the evaluator sees no
+  // compatibility evidence and scores on capability, health, quota, and cost exactly as it
+  // did before compatibility policy existed.
+  const compatibilityProvider = hasCompatibilityRequirements && compatibilityPolicy
+    ? resolveCompatibilityEvidenceProvider()
+    : null;
+  const compatibilityByCandidate = compatibilityProvider && compatibilityPolicy
+    ? compatibilityProvider(config, profile, compatibilityPolicy, options)
+    : null;
 
   return profile.candidates.map(candidate => {
     const key = `${candidate.provider}/${candidate.model}`;
-    const compatibility = hasCompatibilityRequirements && compatibilityPolicy
-      ? attachCompatibilityEvidence(
-        resolvedByCandidate.get(key),
-        snapshot,
-        catalog,
-        compatibilityPolicy,
-      )
-      : undefined;
+    const compatibility = compatibilityByCandidate?.get(key);
 
     return {
       provider: candidate.provider,