@oh-my-pi/pi-catalog 18.11.0 → 18.11.2

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 ## [Unreleased]
 
+## [18.11.2] - 2026-10-16
+
+### Added
+
+- Added `keep-bundled-names` catalog attribute to preserve static model display names during discovery
+- Updated `openai-codex` provider configuration to prevent model name regressions during live discovery
+
+### Changed
+
+- GPT Image models (`gpt-image-*`, `chatgpt-image-*`) now classify as their own `gpt-image` family instead of `gpt` or `chatgpt`, so GPT chat-model rules no longer apply to them ([#14619](https://github.com/can1357/oh-my-pi/pull/14619) by [@jimhester](https://github.com/jimhester))
+
+### Fixed
+
+- Fixed OpenCode Zen Gemini 4 Argon failing with an unsupported protocol; it now uses the native Gemini endpoint ([#15977](https://github.com/can1357/oh-my-pi/issues/15977)).
+
+## [18.11.1] - 2026-10-15
+
+### Fixed
+
+- Enabled long prompt-cache retention (`ttl: "1h"`) for Claude models on `google-vertex` ([#15505](https://github.com/can1357/oh-my-pi/pull/15505) by [@hpost](https://github.com/hpost))
+- Fixed Gemini 4 Argon on Google Vertex and the Gemini API failing every request with "Thinking budget is not supported for this model": Gemini 4 now sends `thinkingLevel` instead of `thinkingBudget`, and Argon offers only the low, medium, and high levels Google accepts ([#15643](https://github.com/can1357/oh-my-pi/pull/15643) by [@kevcube](https://github.com/kevcube))
+- Fixed the Antigravity model selector offering roster rows the backend marks disabled (`disabled: true`, e.g. `gemini-4-argon-disabled` on accounts without Argon access), which answered `Cloud Code Assist API error (404): Requested entity was not found.`; discovery now skips them the way it already skips `isInternal` rows ([#15684](https://github.com/can1357/oh-my-pi/pull/15684) by [@CharleoYang](https://github.com/CharleoYang))
+- Removed Google Antigravity's Gemini 3.5 Flash and its `gemini-3-flash` alias from the model list; Antigravity retired them and answers every request with a retirement notice instead of a reply ([#15445](https://github.com/can1357/oh-my-pi/pull/15445) by [@will-bogusz](https://github.com/will-bogusz))
+- Fixed `xai-oauth` Grok 4.20 models (`grok-4.20-0309-reasoning`, `-non-reasoning`, `grok-4.20-multi-agent-0309`) advertising a 2M context window when the SuperGrok API rejects prompts over 1M; auto-compaction and context usage now work from the 1M window ([#15443](https://github.com/can1357/oh-my-pi/pull/15443) by [@will-bogusz](https://github.com/will-bogusz))
+- Fixed trailing-dot `localhost.` and `*.local.` custom endpoints losing local-backend compatibility settings ([#15798](https://github.com/can1357/oh-my-pi/issues/15798)).
+
 ## [18.11.0] - 2026-10-14
 
 ### Added

package/dist/types/compat/axes.d.ts

@@ -16,7 +16,7 @@ export type AxisShape = "scalar" | "array" | "object";
 /** Axis namespace: request-wire compat, thinking control surface, or catalog metadata. */
 export type AxisSet = "wire" | "thinking" | "catalog";
 /** Resolved compat record families a wire axis may be assigned onto. */
-export type CompatRecordName = "openai" | "openai-responses" | "anthropic" | "bedrock" | "devin" | "google" | "request";
+export type CompatRecordName = "openai" | "openai-responses" | "anthropic" | "bedrock" | "devin" | "google" | "request" | "ollama";
 /** One axis definition: resolved key, namespace, shape, and applicability. */
 export interface AxisDef {
     /** Resolved camelCase field the directive assigns. */

package/dist/types/compat/types.d.ts

@@ -634,6 +634,8 @@ export interface CompiledProvider {
     dynamicModelsAuthoritative?: boolean;
     /** Generator backfills never copy reasoning/input/limits from same-id rows on other hosts. */
     skipCrossProviderReferenceFills?: boolean;
+    /** Runtime discovery keeps a bundled row's display name instead of the live one. */
+    keepBundledNames?: boolean;
     /** Present only for providers enrolled in `generate-models.ts` discovery. */
     discovery?: CompiledProviderDiscovery;
     /** Non-chat model kinds mapped to their runtime transport APIs. */

package/dist/types/discovery/antigravity.d.ts

@@ -18,6 +18,13 @@ export interface AntigravityDiscoveryApiModel {
     apiProvider?: string;
     modelProvider?: string;
     isInternal?: boolean;
+    /**
+     * Set for roster rows the backend lists but refuses to serve on this
+     * account (e.g. `gemini-4-argon-disabled`, `tagTitle: "Unavailable"`,
+     * `model: MODEL_PLACEHOLDER_M421`); a request against such an id answers
+     * `Cloud Code Assist API error (404): Requested entity was not found.`
+     */
+    disabled?: boolean;
     supportsVideo?: boolean;
 }
 /**

package/dist/types/model-manager.d.ts

@@ -51,6 +51,12 @@ export interface ModelManagerOptions<TApi extends Api = Api, TModelsDevPayload =
      * a zero discovery price is treated as unknown and the bundled rate is kept.
      */
     dynamicCostAuthoritative?: boolean;
+    /**
+     * When true, a static row's display name wins over the cached or live row
+     * for the same id, so a model keeps one name before and after discovery.
+     * Set from the provider's `keep-bundled-names` catalog entry.
+     */
+    keepStaticNames?: boolean;
     /**
      * When true, a fresh cache never satisfies an online-eligible refresh: the
      * dynamic fetch always runs (an explicit `"offline"` strategy is still

package/dist/types/types.d.ts

@@ -1100,10 +1100,16 @@ export type ResolvedGoogleCompat = Required<Omit<GoogleCompat, "streamFirstEvent
     maxImageDimension?: number;
     maxImagePayloadBytes?: number;
 };
+/** Ollama chat history compatibility resolved by the catalog. */
+export interface OllamaCompat {
+    /** Omit assistant thinking when the deployment rejects it in history. */
+    stripThinkingHistory?: boolean;
+}
+export type ResolvedOllamaCompat = Required<OllamaCompat>;
 /** Sparse, user-authored compat overrides for a given API (models.json / config vocabulary). */
-export type CompatConfigOf<TApi extends Api> = TApi extends "openai-completions" | "openrouter" | "openai-responses" | "azure-openai-responses" | "openai-codex-responses" ? OpenAICompat : TApi extends "anthropic-messages" ? AnthropicCompat : TApi extends "bedrock-converse-stream" ? BedrockCompat : TApi extends "devin-agent" ? DevinCompat : TApi extends "google-generative-ai" | "google-vertex" | "google-gemini-cli" ? GoogleCompat : undefined;
+export type CompatConfigOf<TApi extends Api> = TApi extends "openai-completions" | "openrouter" | "openai-responses" | "azure-openai-responses" | "openai-codex-responses" ? OpenAICompat : TApi extends "anthropic-messages" ? AnthropicCompat : TApi extends "bedrock-converse-stream" ? BedrockCompat : TApi extends "devin-agent" ? DevinCompat : TApi extends "google-generative-ai" | "google-vertex" | "google-gemini-cli" ? GoogleCompat : TApi extends "ollama-chat" ? OllamaCompat : undefined;
 /** Resolved compat for a given API: complete record, materialized once by `buildModel`. */
-export type CompatOf<TApi extends Api> = TApi extends "openrouter" ? ResolvedOpenRouterCompat : TApi extends "openai-completions" ? ResolvedOpenAICompat : TApi extends "openai-responses" | "azure-openai-responses" | "openai-codex-responses" ? ResolvedOpenAIResponsesCompat : TApi extends "anthropic-messages" ? ResolvedAnthropicCompat : TApi extends "bedrock-converse-stream" ? ResolvedBedrockCompat : TApi extends "devin-agent" ? ResolvedDevinCompat : TApi extends "google-generative-ai" | "google-vertex" | "google-gemini-cli" ? ResolvedGoogleCompat : undefined;
+export type CompatOf<TApi extends Api> = TApi extends "openrouter" ? ResolvedOpenRouterCompat : TApi extends "openai-completions" ? ResolvedOpenAICompat : TApi extends "openai-responses" | "azure-openai-responses" | "openai-codex-responses" ? ResolvedOpenAIResponsesCompat : TApi extends "anthropic-messages" ? ResolvedAnthropicCompat : TApi extends "bedrock-converse-stream" ? ResolvedBedrockCompat : TApi extends "devin-agent" ? ResolvedDevinCompat : TApi extends "google-generative-ai" | "google-vertex" | "google-gemini-cli" ? ResolvedGoogleCompat : TApi extends "ollama-chat" ? ResolvedOllamaCompat : undefined;
 /** Provider-native compaction endpoint configuration for one model. */
 export interface RemoteCompactionConfig<TApi extends Api = Api> {
     /** Enables provider-native compaction for providers not enabled by built-in policy. */
@@ -1230,6 +1236,8 @@ export interface Model<TApi extends Api = Api> {
     requiresGlyphTokenization?: boolean;
     /** Whether this model requires Cursor's tool-schema combiner projection. */
     requiresCursorToolSchemaProjection?: boolean;
+    /** Whether advertised tool schemas occupy every model request's context (false for deferred catalogs). */
+    toolSchemasInContext?: boolean;
     /** Whether this model requires tool-result images hoisted into sibling user content blocks. */
     requiresToolResultImageHoisting?: boolean;
     /**
@@ -1493,7 +1501,7 @@ export interface Model<TApi extends Api = Api> {
  * vocabulary of `buildModel`. Identical to `Model` except `compat` carries the
  * sparse override shape and nothing is resolved yet.
  */
-export interface ModelSpec<TApi extends Api = Api> extends Omit<Model<TApi>, "compat" | "identity" | "compatConfig" | "requiresGlyphTokenization" | "requiresCursorToolSchemaProjection" | "requiresToolResultImageHoisting" | "supportsAssistantPrefill" | "supportsComputerUseConfig"> {
+export interface ModelSpec<TApi extends Api = Api> extends Omit<Model<TApi>, "compat" | "identity" | "compatConfig" | "requiresGlyphTokenization" | "requiresCursorToolSchemaProjection" | "toolSchemasInContext" | "requiresToolResultImageHoisting" | "supportsAssistantPrefill" | "supportsComputerUseConfig"> {
     /** Sparse compatibility overrides; resolved into `Model.compat` by `buildModel`. */
     compat?: CompatConfigOf<TApi>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-catalog",
-	"version": "18.11.0",
+	"version": "18.11.2",
 	"description": "Model catalog for omp: bundled model database, provider discovery descriptors, model identity, classification, and equivalence",
 	"keywords": [
 		"ai",
@@ -93,12 +93,12 @@
 		"gen:proto": "bun scripts/generate-protocols.ts"
 	},
 	"dependencies": {
-		"@oh-my-pi/omptype": "18.11.0",
-		"@oh-my-pi/pi-utils": "18.11.0"
+		"@oh-my-pi/omptype": "18.11.2",
+		"@oh-my-pi/pi-utils": "18.11.2"
 	},
 	"devDependencies": {
 		"@bgotink/kdl": "0.4.0",
-		"@oh-my-pi/pi-ai": "18.11.0",
+		"@oh-my-pi/pi-ai": "18.11.2",
 		"@types/bun": "^1.3.14"
 	},
 	"engines": {

package/src/build.ts

@@ -115,6 +115,11 @@ function applyCatalogAssignments<TApi extends Api>(model: Model<TApi>, catalog:
 	} else {
 		delete model.requiresCursorToolSchemaProjection;
 	}
+	if (catalog.toolSchemasInContext === false) {
+		model.toolSchemasInContext = false;
+	} else {
+		delete model.toolSchemasInContext;
+	}
 	const requiresToolResultImageHoisting = catalog.requiresToolResultImageHoisting;
 	if (requiresToolResultImageHoisting === true) {
 		model.requiresToolResultImageHoisting = true;

package/src/compat/axes.ts

@@ -20,7 +20,15 @@ export type AxisShape = "scalar" | "array" | "object";
 export type AxisSet = "wire" | "thinking" | "catalog";
 
 /** Resolved compat record families a wire axis may be assigned onto. */
-export type CompatRecordName = "openai" | "openai-responses" | "anthropic" | "bedrock" | "devin" | "google" | "request";
+export type CompatRecordName =
+	| "openai"
+	| "openai-responses"
+	| "anthropic"
+	| "bedrock"
+	| "devin"
+	| "google"
+	| "request"
+	| "ollama";
 
 /** One axis definition: resolved key, namespace, shape, and applicability. */
 export interface AxisDef {
@@ -251,7 +259,7 @@ export const AXES: Readonly<Record<string, AxisDef>> = {
 	"requires-thinking-enabled": wire("requiresThinkingEnabled", ["anthropic"]),
 	"requires-tool-result-id": wire("requiresToolResultId", ["anthropic"]),
 	"signing-endpoint": wire("signingEndpoint", ["anthropic"]),
-	"strip-thinking-history": wire("stripThinkingHistory", ["anthropic"]),
+	"strip-thinking-history": wire("stripThinkingHistory", ["anthropic", "ollama"]),
 	"supports-context-management": wire("supportsContextManagement", ["anthropic"]),
 	"supports-output-effort": wire("supportsOutputEffort", ["anthropic"]),
 	"supports-eager-tool-input-streaming": wire("supportsEagerToolInputStreaming", ["anthropic"]),
@@ -340,6 +348,7 @@ export const AXES: Readonly<Record<string, AxisDef>> = {
 		values: ["freeform", "function"],
 	},
 	"requires-native-tools": { key: "requiresNativeTools", set: "catalog", shape: "scalar", values: [true, false] },
+	"tool-schemas-in-context": { key: "toolSchemasInContext", set: "catalog", shape: "scalar", values: [true, false] },
 	"requires-tool-free-history-for-tool-opt-out": {
 		key: "requiresToolFreeHistoryForToolOptOut",
 		set: "catalog",
@@ -595,6 +604,7 @@ export const AXES: Readonly<Record<string, AxisDef>> = {
 
 /** Records applicable to each API family; used by `resolve.ts` when applying wire axes. */
 export const API_COMPAT_RECORDS: Readonly<Record<string, readonly CompatRecordName[]>> = {
+	"ollama-chat": ["ollama"],
 	"openai-completions": ["openai"],
 	openrouter: ["openai", "openai-responses"],
 	"openai-responses": ["openai-responses"],

package/src/compat/resolve.ts

@@ -27,6 +27,7 @@ import type {
 	ResolvedBedrockCompat,
 	ResolvedDevinCompat,
 	ResolvedGoogleCompat,
+	ResolvedOllamaCompat,
 	ResolvedOpenAICompat,
 	ResolvedOpenAIResponsesCompat,
 	ResolvedOpenAISharedCompat,
@@ -276,6 +277,7 @@ function hasLocalLoopbackBaseUrl(baseUrl: string | undefined): boolean {
 	let hostname: string;
 	try {
 		hostname = new URL(baseUrl).hostname.toLowerCase();
+		if (hostname.endsWith(".")) hostname = hostname.slice(0, -1);
 	} catch {
 		return false;
 	}
@@ -973,6 +975,13 @@ function resolveBedrockPolicy(spec: ModelSpec<"bedrock-converse-stream">, axes:
 	return compat;
 }
 
+function resolveOllamaPolicy(spec: ModelSpec<"ollama-chat">, axes: ResolvedAxes): ResolvedOllamaCompat {
+	const compat: ResolvedOllamaCompat = { stripThinkingHistory: false };
+	applyWireAxes(compat, axes.wire, "ollama-chat");
+	applyCompatOverrides(compat, spec.compat);
+	return compat;
+}
+
 function resolveDevinPolicy(spec: ModelSpec<"devin-agent">, axes: ResolvedAxes): ResolvedDevinCompat {
 	const compat: ResolvedDevinCompat = {
 		trustExplicitThinkingOnly: true,
@@ -1039,7 +1048,8 @@ function defaultThinkingMode<TApi extends Api>(spec: ModelSpec<TApi>, facts: Ide
 		case "google-generative-ai":
 		case "google-gemini-cli":
 		case "google-vertex":
-			return facts.is("gemini") && facts.revMajor() === 3 ? "google-level" : "budget";
+			// Gemini 3+ `google-level` is a `thinking-mode` rule in classes/gemini.kdl.
+			return "budget";
 		case "anthropic-messages":
 			if (facts.is("minimax") && facts.family("m2", "m3")) return "anthropic-adaptive";
 			if (facts.is("glm") && facts.revGte("5.2") && (spec.provider === "umans" || spec.provider === "zai")) {
@@ -1378,6 +1388,8 @@ export function resolveModelPolicy(input: ModelSpec<Api>, route?: ResolveRoute):
 		compat = resolveAnthropicPolicy(spec, facts, axes);
 	} else if (specUsesApi(spec, "bedrock-converse-stream")) {
 		compat = resolveBedrockPolicy(spec, axes);
+	} else if (specUsesApi(spec, "ollama-chat")) {
+		compat = resolveOllamaPolicy(spec, axes);
 	} else if (specUsesApi(spec, "devin-agent")) {
 		compat = resolveDevinPolicy(spec, axes);
 	} else if (

package/src/compat/rules/README.md

@@ -403,6 +403,7 @@ provider "sakana" {
     dynamic-models-authoritative #true            // discovery replaces bundled rows
     allow-unauthenticated #true                   // runtime manager without a key
     skip-cross-provider-reference-fills #true     // generator never backfills from same-id rows elsewhere
+    keep-bundled-names #true                      // discovery never renames a bundled row
     discovery label="Sakana AI" oauth-provider="sakana" allow-unauthenticated=#true {
         env "SAKANA_GEN_KEY"                      // generation-time keys; defaults to the provider env
     }

package/src/compat/rules/classes/gemini.kdl

@@ -66,13 +66,15 @@ class "gemini" {
 			}
 		}
 	}
-	// Gemini 3.7+ Flash native thinkingLevel does not accept `minimal`
-	// (400 THINKING_LEVEL_MINIMAL; observed on 3.7 and 3.8). Only the direct
+	// Gemini 3.7+ Flash and Gemini 4 Argon native thinkingLevel does not accept
+	// `minimal` (400 THINKING_LEVEL_MINIMAL; observed on Flash 3.7 and 3.8, and
+	// documented for Argon and Argon Cyber Permissive). Only the direct
 	// google-level transports emit `thinkingLevel` on the wire, so the tier is
 	// dropped there; budget (anthropic-messages) and reasoning_effort resellers
 	// never send the rejected value and keep the four-tier ladder. The collapsed
 	// google-antigravity / google-gemini-cli variants remap minimal -> LOW and
 	// carry their own explicit ladder, so they are unaffected.
+	// https://docs.cloud.google.com/gemini-enterprise-agent-platform/models/gemini/4-argon
 	// https://ai.google.dev/gemini-api/docs/generate-content/thinking#thinking-levels
 	on "google" "google-vertex" "opencode-zen" {
 		family "flash" {
@@ -80,6 +82,13 @@ class "gemini" {
 				thinking-efforts "low" "medium" "high"
 			}
 		}
+		// Exact ids: a revision-wide rule would tie with the Pro low/high ladder.
+		// Gemini API discovery has no bundled Argon reference and infers
+		// `reasoning: false` from the id; repair it so the ladder is selectable.
+		models "gemini-4-argon" "gemini-4-argon-cyber-permissive" {
+			thinking-upgrade-neutral #true
+			thinking-efforts "low" "medium" "high"
+		}
 	}
 	// Gemini 4 Argon's introductory list price ($2/$10, $0.10 cached) ends
 	// 2026-11-30; from 2026-12-01 Google bills $4/$20, $0.20 cached, on the
@@ -116,6 +125,13 @@ class "gemini" {
 		// Replaces the Gemini 3+ mandatory-reasoning fallback.
 		thinking-requires-effort #true
 	}
+	// Gemini 3+ takes `thinkingLevel` on the native Google transports; Gemini 4
+	// rejects `thinkingBudget` outright (400 "Use thinking level instead").
+	on-api "google-generative-ai" "google-gemini-cli" "google-vertex" {
+		revision ">=3" {
+			thinking-mode "google-level"
+		}
+	}
 	// Public Gemini requires the bypass sentinel on every unsigned call and
 	// supports function-part ids. Scope by adapter so custom providers using
 	// the same wire protocol inherit both contracts. The Cloud Code Assist

package/src/compat/rules/providers/google-vertex.kdl

@@ -28,6 +28,10 @@ provider "google-vertex" {
 		}
 	}
 	class "anthropic" {
+		// Vertex rawPredict honors `cache_control.ttl: "1h"` (writes bill to
+		// `ephemeral_1h_input_tokens`, entries outlive 5m) without any beta; the
+		// `extended-cache-ttl-2025-04-11` beta is rejected in `anthropic_beta`.
+		supports-long-cache-retention #true
 		revision ">=4.5 <4.6" {
 			thinking-efforts "minimal" "low" "medium" "high" "xhigh"
 		}

package/src/compat/rules/providers/native-tools.kdl

@@ -1,4 +1,7 @@
 // Cursor always exposes server-owned native operations, even with an empty tool catalog.
 on-api "cursor-agent" {
 	requires-native-tools #true
+	// MCP schemas live in Cursor's server-side catalog and enter model context
+	// only when dynamically selected, not as a fixed cost on every turn.
+	tool-schemas-in-context #false
 }

package/src/compat/rules/providers/ollama-cloud.kdl

@@ -5,6 +5,8 @@ provider "ollama-cloud" {
 	env "OLLAMA_CLOUD_API_KEY"
 	discovery label="Ollama Cloud" oauth-provider="ollama-cloud"
 
+	// Legacy deployments can reject assistant thinking history (#1000).
+	strip-thinking-history #true
 	thinking-mode "effort"
 	// Same runtime as local Ollama: a trailing assistant turn is continued verbatim.
 	supports-assistant-prefill #true
@@ -20,7 +22,12 @@ provider "ollama-cloud" {
 		thinking-efforts "minimal" "low" "medium" "high"
 	}
 	// residue: taxonomy ranks and exact globs do not isolate these models.
+	// #9693 verifies thinking history for these GLM-5.2 wire IDs only.
 	models "glm-5.2" {
+		strip-thinking-history #false
 		thinking-efforts "high" "max"
 	}
+	models "glm-5.2:cloud" {
+		strip-thinking-history #false
+	}
 }

package/src/compat/rules/providers/openai-codex.kdl

@@ -4,6 +4,11 @@ provider "openai-codex" {
 	default-model "gpt-5.5"
 	env "OPENAI_CODEX_OAUTH_TOKEN"
 	dynamic-models-authoritative #true
+	// Codex `/models` `display_name` is a title-cased slug (`GPT-6.1-Sol`,
+	// `GPT-5.6-Luna`) while the generator names bundled rows from the shared
+	// reference (`GPT-6.1 Sol`); without this the composer chip flips spelling
+	// once live discovery lands.
+	keep-bundled-names #true
 	kind-apis {
 		image "openai-codex-responses"
 	}

package/src/compat/rules/providers/openrouter.kdl

@@ -119,6 +119,9 @@ provider "openrouter" {
 	models "~typesafe/*" "typesafe/*" {
 		kind "judge"
 	}
+	models "~typesafe/jev-latest" "typesafe/jev-1.13" "typesafe/jev-1.14" {
+		input-modalities "text" "image"
+	}
 	models "cohere/rerank-v3.5" {
 		kind "rerank"
 	}

package/src/compat/rules/providers/typesafe.kdl

@@ -14,6 +14,9 @@ provider "typesafe" {
 			supports-tools #false
 		}
 	}
+	models "jev-latest" "jev-preview" "jev-1.13.0" "jev-1.14.0" {
+		input-modalities "text" "image"
+	}
 
 	models "*" {
 		kind "judge"

package/src/compat/rules/providers/xai-oauth.kdl

@@ -15,8 +15,9 @@ provider "xai-oauth" {
 
 	// Source of truth for the xai-oauth chat picker. Declaration order is headline order.
 	// Context windows from hermes-agent/agent/model_metadata.py:205-220
-	// ("Values sourced from models.dev (2026-04)"). grok-build is xAI's
-	// coding-fine-tuned chat model; 512K context per user spec (2026-05-17).
+	// ("Values sourced from models.dev (2026-04)") unless a row says otherwise.
+	// grok-build is xAI's coding-fine-tuned chat model; 512K context per user
+	// spec (2026-05-17).
 	//
 	// xai-oauth's /v1/models exposes no per-request output limit on the OAuth
 	// (Grok Build / SuperGrok) surface, so maxTokens mirrors contextWindow. The
@@ -68,25 +69,27 @@ provider "xai-oauth" {
 			cost input=0 output=0 cache-read=0 cache-write=0
 			limits context=500000 max-tokens=500000
 		}
-		// Text-only per the bundled catalog.
+		// grok-4.20-*-0309: api.x.ai rejects prompts over 1M tokens on this surface
+		// ([input_too_large] "... > 1000000 tokens", all three ids, 2026-10-12).
+		// Multi-agent is text-only per the bundled catalog.
 		model "grok-4.20-multi-agent-0309" name="Grok 4.20 (Multi-Agent)" {
 			reasoning #true
 			input "text"
 			cost input=0 output=0 cache-read=0 cache-write=0
-			limits context=2000000 max-tokens=2000000
+			limits context=1000000 max-tokens=1000000
 		}
 		model "grok-4.20-0309-reasoning" name="Grok 4.20 (Reasoning)" {
 			reasoning #true
 			input "text" "image"
 			cost input=0 output=0 cache-read=0 cache-write=0
-			limits context=2000000 max-tokens=2000000
+			limits context=1000000 max-tokens=1000000
 			supports-reasoning-effort #false
 		}
 		model "grok-4.20-0309-non-reasoning" name="Grok 4.20 (Non-Reasoning)" {
 			reasoning #false
 			input "text" "image"
 			cost input=0 output=0 cache-read=0 cache-write=0
-			limits context=2000000 max-tokens=2000000
+			limits context=1000000 max-tokens=1000000
 		}
 		// Cursor's "Composer 2.5 Fast" exposed via SuperGrok: non-reasoning,
 		// text-only, 200K context (mirrors Cursor's composer-* catalog entries).

package/src/compat/rules/runtime/behavior.kdl

@@ -173,6 +173,10 @@ behavior {
 	// serve; the dedicated tool surfaces route them instead.
 	exclude-models provider="xai-oauth" exact="grok-imagine-image-quality" exact="grok-imagine-image-2.0" \
 		prefix="grok-imagine-video" prefix="grok-stt-" prefix="grok-voice-"
+	// Antigravity still advertises the Gemini 3.5 Flash wire ids, but every
+	// request to them answers with a retirement notice instead of a reply.
+	// `gemini-3-flash` is the family's recycled alias and routes to the same ids.
+	exclude-models provider="google-antigravity" exact="gemini-3.5-flash" exact="gemini-3-flash"
 	// Meta's /v1/models lists image generation and transcription SKUs beside
 	// the Muse Spark chat models, and SAM segmentation beside them.
 	exclude-models provider="meta" prefix="muse-image-" prefix="muse-voice-" prefix="sam-"
@@ -258,6 +262,8 @@ behavior {
 	// at /responses (#10610, #12030). The Muse prefix covers gateway-first
 	// revisions; exact ids stay as cache-migration identity.
 	api-routes provider="opencode-zen" {
+		// Paid Argon is served only on Zen's native Google endpoint (#15977).
+		route "google-generative-ai" exact="gemini-4-argon"
 		route "anthropic-messages" exact="union-alpha"
 		route "openai-responses" prefix="muse-spark-" exact="muse-spark-1.3-contributor-free" exact="gpt-6-astra"
 		route "openai-completions" exact="minimax-m3" exact="minimax-m3-free"
@@ -349,7 +355,6 @@ behavior {
 	// Google); price rows at their first-party equivalents, Vertex before
 	// Anthropic for Claude ids. Aliases map ids whose peer ships differently.
 	pricing-peer provider="google-antigravity" peers="google" "google-vertex" "anthropic" {
-		alias "gemini-3-flash" peer-id="gemini-3-flash-preview"
 		alias "gemini-3-pro" peer-id="gemini-3-pro-preview"
 		alias "gemini-3.1-pro" peer-id="gemini-3.1-pro-preview"
 		alias "claude-opus-4-5" peer-id="claude-opus-4-5@20251101"

package/src/compat/rules/taxonomy/openai.kdl

@@ -16,6 +16,8 @@ class "openai" {
 
 	family "gpt" glob="gpt-*"
 	family "chatgpt" glob="chatgpt-*"
+	family "gpt-image" glob="gpt-image-*"
+	family "gpt-image" glob="chatgpt-image-*"
 	family "o-series" glob="o1"
 	family "o-series" glob="o1-*"
 	family "o-series" glob="o1.*"