@iislee/opencodex 2.11.0 → 2.31.0

package/src/providers/antigravity-models.ts

@@ -1,16 +1,56 @@
+import { isValidModelDiscoveryModelId, MODEL_DISCOVERY_MAX_MODELS } from "./model-discovery-limits";
+import { isModelCacheGenerationCurrent } from "../codex/model-cache";
+
 // Google Antigravity (Cloud Code Assist) bundled model list.
 //
 // Single source of truth: the Antigravity `:fetchAvailableModels` backend, the same one the `agy`
 // 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 with reasoning-effort routing.
+// 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";
+
+/**
+ * Wire ID that CCA actually accepts for the current Flash generation.
+ * Google renamed the model to include a `-tiered` suffix; the picker-visible
+ * ID stays `gemini-3.7-flash` (stripped by `pickerModelIdForDiscoveredWireId`).
+ */
+const GEMINI_FLASH_WIRE_ID = "gemini-3.7-flash-tiered";
+
+/**
+ * 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-tiered",
   "gemini-3.1-pro-low",
   "gemini-pro-agent",
   "gemini-3.1-flash-image",
@@ -19,11 +59,91 @@ const ANTIGRAVITY_WIRE_MODELS = [
   "gpt-oss-120b-medium",
 ];
 
+const ANTIGRAVITY_PICKER_MODEL_BY_WIRE_ID: Record<string, string> = {
+  "gemini-3.1-pro-low": "gemini-3.1-pro",
+  "gemini-pro-agent": "gemini-3.1-pro",
+};
+
+const ANTIGRAVITY_WIRE_IDS_BY_PICKER_MODEL: Record<string, string[]> = Object.entries(
+  ANTIGRAVITY_PICKER_MODEL_BY_WIRE_ID,
+).reduce<Record<string, string[]>>((out, [wireId, pickerId]) => {
+  (out[pickerId] ??= []).push(wireId);
+  return out;
+}, {});
+
+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,
+  info: Record<string, unknown>,
+  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;
+    }
+  }
+
+  // Display labels are a LAST resort, never a first one. CCA labels a tier row
+  // "Gemini 3.7 Flash (High)", which slugs to `gemini-3.7-flash-high` — a per-tier
+  // picker row that re-splits exactly the ladder the collapse rules above just
+  // joined, and that carries no effort ladder of its own. Consulting the label
+  // first (the #1897 regression) turned every collapsed base model back into three
+  // suffix rows and stripped reasoning-effort control from the picker.
+  //
+  // The label still earns its keep where nothing else can speak: an id Google has
+  // renamed on the wire while keeping a stable public name.
+  const displayModelId = antigravityDisplayModelId(info.displayName, wireId);
+  if (displayModelId && !collapsesIntoKnownPickerModel(displayModelId)) return displayModelId;
+
+  return wireId;
+}
+
+/**
+ * Whether a display-derived id is really a tier of a picker-visible base model.
+ *
+ * `gemini-3.7-flash-high` looks like a model id and is not one: it is the "high"
+ * rung of `gemini-3.7-flash`, whose ladder lives in ANTIGRAVITY_MODEL_EFFORTS.
+ * Publishing it as its own row is what breaks effort selection.
+ */
+function collapsesIntoKnownPickerModel(candidateId: string): boolean {
+  const effortMatch = /^(.*)-(low|medium|high)$/.exec(candidateId);
+  const baseId = effortMatch?.[1];
+  return baseId !== undefined && isKnownAntigravityPickerModelId(baseId);
+}
+
 // ── 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"],
@@ -31,24 +151,60 @@ 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",
   },
 };
 
+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.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"]);
+
+/**
+ * Picker-visible model IDs whose CCA wire ID differs (the `-tiered` rename).
+ * Models not listed here use themselves as the wire ID.
+ */
+const ANTIGRAVITY_PICKER_TO_WIRE: Record<string, string> = {
+  "gemini-3.7-flash": GEMINI_FLASH_WIRE_ID,
+};
+
+/** Map a picker-visible base model to its CCA wire ID. Identity when no mapping exists. */
+function pickerToWireId(pickerId: string): string {
+  return ANTIGRAVITY_PICKER_TO_WIRE[pickerId] ?? pickerId;
+}
 
 function resolveAntigravityThinkingLevel(effort: string): string | undefined {
   if (effort === "xhigh" || effort === "max" || effort === "ultra") return "high";
@@ -65,16 +221,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_WIRE_ID]),
+  ),
 };
 
 export const ANTIGRAVITY_MODEL_ALIASES: Record<string, string> = {
@@ -84,7 +241,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",
@@ -92,22 +249,24 @@ 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-tiered": 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,
-  "claude-sonnet-4-6": 200_000,
-  "claude-opus-4-6-thinking": 1_000_000,
+  "claude-sonnet-4-6": 250_000,
+  "claude-opus-4-6-thinking": 250_000,
   "gpt-oss-120b-medium": 131_072,
 };
 
 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,
@@ -119,8 +278,281 @@ export const ANTIGRAVITY_MODEL_CONTEXT_WINDOWS: Record<string, number> = {
   ),
 };
 
-export function resolveAntigravityWireModelId(modelId: string): string {
-  return ANTIGRAVITY_MODEL_ALIASES[modelId] ?? modelId;
+export const ANTIGRAVITY_MODEL_INPUT_MODALITIES: Record<string, string[]> = {
+  // 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"],
+  "claude-opus-4-6-thinking": ["text", "image"],
+  "gpt-oss-120b-medium": ["text"],
+};
+
+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[];
+}
+
+function antigravityRecord(value: unknown): Record<string, unknown> | undefined {
+  return value !== null && typeof value === "object" && !Array.isArray(value)
+    ? value as Record<string, unknown>
+    : undefined;
+}
+
+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 effortModels: ReadonlyMap<string, AntigravityEffortWireModelIds>;
+  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>();
+  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 discoveredAntigravityMapping(
+  baseUrl: string | undefined,
+): DiscoveredWireModelMapping | 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;
+}
+
+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];
+}
+
+/**
+ * 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
+ * callable through the CCA agent envelope and must not be published to the Codex catalog.
+ */
+export function parseAntigravityAvailableModels(
+  payload: unknown,
+  maxModels = MODEL_DISCOVERY_MAX_MODELS,
+): AntigravityAvailableModel[] | null {
+  const limit = Number.isSafeInteger(maxModels) && maxModels > 0
+    ? Math.min(maxModels, MODEL_DISCOVERY_MAX_MODELS)
+    : MODEL_DISCOVERY_MAX_MODELS;
+  const body = antigravityRecord(payload);
+  if (!body) return null;
+  const models = antigravityRecord(body?.models);
+  const sorts = Array.isArray(body?.agentModelSorts) ? body.agentModelSorts : undefined;
+  if (!models || !sorts) return null;
+
+  const ids: string[] = [];
+  for (const sort of sorts) {
+    const groups = antigravityRecord(sort)?.groups;
+    if (!Array.isArray(groups)) return null;
+    for (const group of groups) {
+      const modelIds = antigravityRecord(group)?.modelIds;
+      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);
+      }
+    }
+  }
+  // This model is exposed by Antigravity's agent chat surface even though the discovery
+  // response groups it under image generation, so it never appears in agentModelSorts.
+  if (Array.isArray(body.imageGenerationModelIds)
+    && body.imageGenerationModelIds.includes("gemini-3.1-flash-image")
+    && Object.hasOwn(models, "gemini-3.1-flash-image")
+    && antigravityRecord(models["gemini-3.1-flash-image"])
+    && !ids.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);
+  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;
+      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);
+    }
+  }
+
+  const available = new Map<string, Record<string, unknown>>();
+  for (const wireId of ids) {
+    const info = antigravityRecord(models[wireId]);
+    if (!info || available.has(wireId)) continue;
+    // Compatibility aliases are deliberately routed to NEWER wire ids for saved
+    // selections. CCA keeps serving retired generations (3.5/3.6 Flash tiers) in its
+    // agent list long after they stop being the model anyone should pick, so admitting
+    // them as independently discovered rows republishes exactly the dead tiers the
+    // alias map exists to retire. Routing for a saved id still works — it resolves
+    // through ANTIGRAVITY_MODEL_ALIASES — it just no longer gets its own picker row.
+    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, 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
+      // `["text"]` let routing read it as a confident `image: false` (#1796). The
+      // strict catalog still receives its `["text"]` compatibility default
+      // downstream via ensureStrictCatalogFields; only the routing-evidence
+      // channel stays honest about what was never asserted.
+      ...(info.supportsImages === true
+        ? { inputModalities: ["text", "image"] as string[] }
+        : info.supportsImages === false
+          ? { inputModalities: ["text"] as string[] }
+          : {}),
+    });
+  }
+  return out;
+}
+
+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;
 }
 
 /**
@@ -132,6 +564,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.
  *
@@ -145,10 +582,57 @@ export function isAntigravitySuffixModelId(modelId: string): boolean {
 export function resolveAntigravityEffortWireModel(
   modelId: string,
   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
+  // collapses every effort onto that one rung: `gemini-3.1-pro` low and high both
+  // became `gemini-pro-agent`, and `gemini-3.7-flash` sent thinkingLevel=low against
+  // the `-high` wire id, a request that contradicts itself. Rules 1b/2/3 below own
+  // these models; discovery answers only for ids no rule knows.
+  const hasOwnEffortLadder = Object.hasOwn(ANTIGRAVITY_THINKING_LEVEL_MODELS, modelId)
+    || Object.hasOwn(ANTIGRAVITY_EFFORT_WIRE_MAP, modelId);
+  const discoveredWireModelId = hasOwnEffortLadder
+    ? undefined
+    : 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.
+  const retiredTier = retiredAntigravityFlashTier(modelId);
+  if (retiredTier) {
+    return {
+      wireModelId: GEMINI_FLASH_WIRE_ID,
+      thinkingLevel: effort ? resolveAntigravityThinkingLevel(effort) ?? retiredTier : retiredTier,
+    };
+  }
+
   // 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
+  // this the model falls to rule 5 and silently loses reasoning control entirely.
+  const defaultLevel = ANTIGRAVITY_THINKING_LEVEL_MODELS[modelId];
+  if (defaultLevel) {
+    return {
+      wireModelId: pickerToWireId(modelId),
+      thinkingLevel: effort ? resolveAntigravityThinkingLevel(effort) ?? defaultLevel : defaultLevel,
+    };
   }
 
   // Rule 2/3: mapped Gemini base model.
@@ -168,7 +652,7 @@ export function resolveAntigravityEffortWireModel(
   }
 
   // Rule 5: everything else.
-  return { wireModelId: resolveAntigravityWireModelId(modelId) };
+  return { wireModelId: resolveAntigravityWireModelId(modelId, baseUrl) };
 }
 
 
@@ -189,6 +673,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/base-url-choices.ts

@@ -62,3 +62,13 @@ export function matchBaseUrlChoice(
   }
   return choices.some(c => c.id === "custom") ? "custom" : choices[0]!.id;
 }
+
+/** Moonshot/Kimi API endpoint presets (international default; China selectable). */
+export const MOONSHOT_INTL_BASE_URL = "https://api.moonshot.ai/v1";
+export const MOONSHOT_CN_BASE_URL = "https://api.moonshot.cn/v1";
+
+export const MOONSHOT_BASE_URL_CHOICES: readonly ProviderBaseUrlChoice[] = [
+  { id: "international", label: "International (.ai)", baseUrl: MOONSHOT_INTL_BASE_URL },
+  { id: "china", label: "China (.cn)", baseUrl: MOONSHOT_CN_BASE_URL },
+  { id: "custom", label: "Custom" },
+];