@bitkyc08/opencodex 2.86.0 → 2.87.0

package/src/codex/catalog/parsing.ts

@@ -2,10 +2,16 @@ import type { VendorContextInference } from "./vendor-context";
 import { isCodexControlPlaneModel } from "../control-plane-models";
 import { execFileSync } from "node:child_process";
 import { createHash } from "node:crypto";
-import { copyFileSync, existsSync, mkdirSync, readFileSync, realpathSync } from "node:fs";
+import { copyFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
 import { delimiter, dirname, join, resolve } from "node:path";
-import { atomicWriteFile, expandUserPath, getConfigDir, loadConfig, ultraFastTierEnabled, websocketsEnabled } from "../../config";
-import { CODEX_CONFIG_PATH, CODEX_MODELS_CACHE_PATH, DEFAULT_CATALOG_PATH, readRootTomlString, resolveCodexConfigPath } from "../paths";
+import { atomicWriteFile, getConfigDir, loadConfig, ultraFastTierEnabled, websocketsEnabled } from "../../config";
+import {
+  activeCodexConfigPath,
+  activeCodexModelsCachePath,
+  isDefaultCatalogPath,
+  readCodexCatalogPath,
+  readRootTomlString,
+} from "../paths";
 import { clearModelCache, DEFAULT_MODEL_CACHE_TTL_MS, getFreshCached, getStaleCached, isModelsFetchCoolingDown, markModelsFetchFailure, setCached } from "../model-cache";
 import { buildModelsRequest, resolveModelsAuthToken } from "../../oauth";
 import type { OcxConfig, OcxProviderConfig } from "../../types";
@@ -33,7 +39,7 @@ import { redactSecretString } from "../../lib/redact";
 import upstreamModelsSnapshot from "../data/upstream-models.json";
 
 
-import { NATIVE_OPENAI_CONTEXT_OVERRIDES, SUPPORTED_NATIVE_OPENAI_SLUGS, UPSTREAM_NATIVE_ENTRIES, hasNativeOpenAiCapabilityMetadata, nativeMultiAgentVersion, nativeOpenAiAutoCompactTokenLimit, nativeOpenAiContextWindow, nativeOpenAiMaxInputTokens, type NativeContextLimitsInput } from "./metadata";
+import { NATIVE_OPENAI_CONTEXT_OVERRIDES, SUPPORTED_NATIVE_OPENAI_SLUGS, UPSTREAM_NATIVE_ENTRIES, hasNativeOpenAiCapabilityMetadata, nativeMultiAgentVersion, nativeOpenAiAutoCompactTokenLimit, nativeOpenAiConfiguredContextLimit, nativeOpenAiContextWindow, nativeOpenAiMaxInputTokens, type NativeContextLimitsInput } from "./metadata";
 import { clampAutoCompactTokenLimit } from "../../providers/auto-compact-budget";
 import { trustedAccountBoundNativeCatalogSlug } from "./account-models";
 import { CODEX_NATIVE_ALIAS_CATALOG_KIND } from "./kinds";
@@ -50,46 +56,22 @@ export function catalogBackupPathFor(catalogPath: string): string {
   return join(getConfigDir(), `catalog-backup-${id}.json`);
 }
 
-export function samePath(a: string, b: string): boolean {
-  const left = resolve(a);
-  const right = resolve(b);
-  return process.platform === "win32" ? left.toLowerCase() === right.toLowerCase() : left === right;
-}
-
-export function activeCodexHome(): string | null {
-  const raw = process.env.CODEX_HOME?.trim();
-  if (!raw) return null;
-  const path = resolve(expandUserPath(raw));
-  try {
-    return realpathSync.native(path);
-  } catch {
-    return path;
-  }
-}
-
-export function activeCodexConfigPath(): string {
-  const home = activeCodexHome();
-  return home ? join(home, "config.toml") : CODEX_CONFIG_PATH;
-}
-
-export function activeDefaultCatalogPath(): string {
-  const home = activeCodexHome();
-  return home ? join(home, "opencodex-catalog.json") : DEFAULT_CATALOG_PATH;
-}
-
-export function activeCodexModelsCachePath(): string {
-  const home = activeCodexHome();
-  return home ? join(home, "models_cache.json") : CODEX_MODELS_CACHE_PATH;
-}
-
-export function resolveActiveCodexConfigPath(path: string): string {
-  const home = activeCodexHome();
-  return home ? resolve(home, path) : resolveCodexConfigPath(path);
-}
-
-export function isDefaultCatalogPath(path: string): boolean {
-  return samePath(path, activeDefaultCatalogPath());
-}
+/**
+ * Active-home path resolution now lives in `../paths`, next to the constants it
+ * falls back to. It is re-exported here so existing importers keep working; new
+ * code that only needs a path should import from `../paths` directly.
+ */
+export {
+  samePath,
+  activeCodexHome,
+  activeCodexConfigPath,
+  activeDefaultCatalogPath,
+  activeCodexModelsCachePath,
+  resolveActiveCodexConfigPath,
+  isDefaultCatalogPath,
+  readCodexCatalogPath,
+  readCodexCatalogPathForHome,
+} from "../paths";
 
 /** Stable nonsemantic ownership marker for rows projected from config.customModels. */
 export const CODEX_CUSTOM_MODEL_CATALOG_KIND = "custom-model-v1";
@@ -254,40 +236,6 @@ export function shouldExposeRoutedModel(model: CatalogModel): boolean {
   return !isMediaGenerationModelId(model.id);
 }
 
-export function readCodexCatalogPath(): string {
-  const home = activeCodexHome();
-  if (home) return readCodexCatalogPathForHome(home);
-  try {
-    const configPath = activeCodexConfigPath();
-    if (existsSync(configPath)) {
-      const toml = readFileSync(configPath, "utf-8");
-      const path = readRootTomlString(toml, "model_catalog_json");
-      if (path) return resolveActiveCodexConfigPath(path);
-    }
-  } catch { /* ignore */ }
-  return activeDefaultCatalogPath();
-}
-
-/**
- * Resolve the configured catalog without consulting ambient CODEX_HOME again.
- *
- * `configText` is for a caller that has already read that same `config.toml` under
- * its own constraints - the prompt-text probe reads it bounded, on the request
- * thread - so resolving the catalog does not cost a second, unbounded read of the
- * file the caller is holding. Omitting it keeps the original behaviour.
- */
-export function readCodexCatalogPathForHome(codexHome: string, configText?: string): string {
-  try {
-    const configPath = join(codexHome, "config.toml");
-    if (configText !== undefined || existsSync(configPath)) {
-      const toml = configText ?? readFileSync(configPath, "utf-8");
-      const path = readRootTomlString(toml, "model_catalog_json");
-      if (path) return resolve(codexHome, path);
-    }
-  } catch { /* ignore */ }
-  return join(codexHome, "opencodex-catalog.json");
-}
-
 /**
  * Read the configured auto-review model from the root of Codex's config.toml (issue #1225).
  * Stamped onto catalog entries as `auto_review_model_override` during sync so the auto-review
@@ -506,7 +454,7 @@ export function isNativeOpenAiEntry(entry: RawEntry): boolean {
  * Narrow any already-resolved native window by the user levers.
  *
  * Used for the fields the accessors do not own (`max_context_window`, and preserved rows
- * that carry no static override) so every field on a row lands at the same width.
+ * that carry no static override). The advertised maximum may exceed the default window.
  */
 function narrowNativeMaxContextWindow(
   slug: string,
@@ -514,12 +462,7 @@ function narrowNativeMaxContextWindow(
   limits?: NativeContextLimitsInput,
 ): number | undefined {
   if (typeof value !== "number" || value <= 0) return value;
-  const resolved = nativeOpenAiContextWindow(slug, limits);
-  const authoritative = nativeOpenAiContextWindow(slug);
-  // The accessor pair tells us how far the levers moved this slug; apply the same delta to a
-  // field the accessor does not model, without ever raising it.
-  if (resolved === undefined || authoritative === undefined) return value;
-  return Math.min(value, Math.max(resolved, 1));
+  return applyProviderContextCap(value, nativeOpenAiConfiguredContextLimit(slug, limits));
 }
 
 export function applyNativeOpenAiContextOverride(entry: RawEntry, limits?: NativeContextLimitsInput): void {
@@ -636,7 +579,8 @@ export function ensureStrictCatalogFields(
   if (
     typeof entry.max_context_window !== "number"
     || entry.max_context_window <= 0
-    || ((options.isRouted === true || !isNativeOpenAiEntry(entry)) && entry.max_context_window > contextWindow)
+    || ((options.isRouted === true || (!isNativeOpenAiEntry(entry)
+      && trustedAccountBoundNativeCatalogSlug(entry) === undefined)) && entry.max_context_window > contextWindow)
   ) {
     entry.max_context_window = contextWindow;
   }

package/src/codex/catalog/provider-models.ts

@@ -117,7 +117,7 @@ import type {
   CatalogTrustedOpenAiApiPolicySnapshot,
 } from "../convergence-types";
 import type { CapturedProviderGather, CatalogGatherProviderAuthOutcome, CatalogGatherProviderModelOutcome, ModelsAuthResolution, ModelsAuthResolver } from "./gather-capture";
-import { QUIET_AUTHORITATIVE_CATALOG_PROVIDERS, applyConfigHintsToCachedModels, applyProviderConfigHints, boundedOwnedBy, catalogHintsFromModelsApiItem, catalogHintsFromProviderConfig } from "./model-hints";
+import { QUIET_AUTHORITATIVE_CATALOG_PROVIDERS, applyConfigHintsToCachedModels, applyProviderConfigHints, boundedOwnedBy, catalogHintsFromModelsApiItem, catalogHintsFromProviderConfig, withVisionSidecarInput } from "./model-hints";
 import { mergeConfiguredModelsIntoLiveCatalog, shouldExposeProviderModel, warnDroppedConfiguredIdsOnce } from "./model-visibility";
 import { captureModelsRequest, captureProviderGather, materializeCapturedHeaders } from "./gather-capture";
 
@@ -168,7 +168,7 @@ export function observedModelsAuthResolver(
     },
   };
 }
-/** Project captured discovery through config hints and retention; Auto-only Copilot exposes only Auto. */
+/** Project provider evidence without synthetic sidecar image input, which belongs to each gather. */
 export async function fetchProviderModelsWithAuth(
   captured: CapturedProviderGather,
   ttlMs: number,
@@ -211,7 +211,7 @@ export async function fetchProviderModelsWithAuth(
   const configured: CatalogModel[] = configuredIds.map(id => ({
     id,
     provider: name,
-    ...catalogHintsFromProviderConfig(name, prov, id, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir),
+    ...catalogHintsFromProviderConfig(name, prov, id, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false),
   }));
   const withConfiguredRetention = (
     models: CatalogModel[],
@@ -228,6 +228,7 @@ export async function fetchProviderModelsWithAuth(
       retainComboTargets: options?.retainComboTargets,
       metadataModelIdCaseFold,
       metadataConfigDir,
+      includeVisionSidecar: false,
     });
     if (
       options?.warnDrops === true
@@ -260,7 +261,7 @@ export async function fetchProviderModelsWithAuth(
       }
       return observed(ids.map(id => {
         const hints = catalogHintsFromProviderConfig(name, prov, id, contextCap,
-          metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir);
+          metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false);
         const observedWindow = kiroObservedContextWindow(id);
         return { id, provider: name, ...hints,
           ...(observedWindow !== undefined
@@ -296,7 +297,7 @@ export async function fetchProviderModelsWithAuth(
         model => applyProviderConfigHints(name, prov, {
         id: model.id, provider: name,
         ...catalogHintsFromModelsApiItem(name, model as ProviderModelsApiItem),
-      }, contextCap, metadataModelIdCaseFold, captured.effectiveAlias));
+      }, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, undefined, false));
       if (!isCurrentCacheGeneration()) return observed(configured, "degraded");
       markProviderDiscoveryOk(name, picker.length);
       // Retain callable manual/combo selectors, but do not advertise named selection
@@ -326,7 +327,7 @@ export async function fetchProviderModelsWithAuth(
     : [{
       id: prov.defaultModel,
       provider: name,
-      ...catalogHintsFromProviderConfig(name, prov, prov.defaultModel, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir),
+      ...catalogHintsFromProviderConfig(name, prov, prov.defaultModel, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false),
     }];
   const vertexDefaultSeed = seedVertexDefault ? configured[0] : undefined;
   const withVertexDefaultSeed = (models: CatalogModel[]): CatalogModel[] => (
@@ -348,13 +349,13 @@ export async function fetchProviderModelsWithAuth(
     const fresh = getFreshCached(name, ttlMs, Date.now(), authorityIdentity);
     if (fresh) {
       return observed(withConfiguredRetention(
-        applyConfigHintsToCachedModels(name, prov, fresh, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir),
+        applyConfigHintsToCachedModels(name, prov, fresh, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false),
       ), "authoritative");
     }
     const scopedStale = getStaleCached(name, authorityIdentity);
     if (isModelsFetchCoolingDown(name, undefined, undefined, authorityIdentity) && scopedStale) {
       return observed(withConfiguredRetention(
-        applyConfigHintsToCachedModels(name, prov, scopedStale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir),
+        applyConfigHintsToCachedModels(name, prov, scopedStale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false),
       ), "degraded");
     }
     const live = await fetchCodeBuddyModels(profile, apiKey);
@@ -362,7 +363,7 @@ export async function fetchProviderModelsWithAuth(
       const discovered = live.models.map(id => ({
         id,
         provider: name,
-        ...catalogHintsFromProviderConfig(name, prov, id, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir),
+        ...catalogHintsFromProviderConfig(name, prov, id, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false),
       }));
       const forCache = withConfiguredRetention(discovered, { retainComboTargets: false });
       if (!setCached(name, forCache, Date.now(), cacheGeneration, authorityIdentity)) {
@@ -378,7 +379,7 @@ export async function fetchProviderModelsWithAuth(
     }
     const stale = getStaleCached(name, authorityIdentity);
     return observed(withConfiguredRetention(
-      stale ? applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir) : configured,
+      stale ? applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false) : configured,
     ), "degraded");
   }
   if (name === "zed" && prov.adapter === "zed") {
@@ -391,14 +392,14 @@ export async function fetchProviderModelsWithAuth(
     const cached = getFreshCached(name, ttlMs, Date.now(), authorityIdentity);
     if (cached) {
       return observed(
-        withConfiguredRetention(applyConfigHintsToCachedModels(name, prov, cached, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir)),
+        withConfiguredRetention(applyConfigHintsToCachedModels(name, prov, cached, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false)),
         "authoritative",
       );
     }
     const stale = getStaleCached(name, authorityIdentity);
     if (isModelsFetchCoolingDown(name, undefined, undefined, authorityIdentity) && stale) {
       return observed(
-        withConfiguredRetention(applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir)),
+        withConfiguredRetention(applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false)),
         "degraded",
       );
     }
@@ -418,7 +419,7 @@ export async function fetchProviderModelsWithAuth(
           ...(model.maxOutputTokens ? { maxOutputTokens: model.maxOutputTokens } : {}),
           ...(model.supportsImages ? { inputModalities: ["text", "image"] } : {}),
           ...(reasoningEfforts?.length ? { reasoningEfforts } : {}),
-          ...catalogHintsFromProviderConfig(name, prov, model.id, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir),
+          ...catalogHintsFromProviderConfig(name, prov, model.id, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false),
         } as CatalogModel;
       });
       const forCache = withConfiguredRetention(discovered, { retainComboTargets: false });
@@ -433,7 +434,7 @@ export async function fetchProviderModelsWithAuth(
         markProviderDiscoveryFailed(name, { reason: "provider" });
       }
       return observed(
-        withConfiguredRetention(stale ? applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir) : configured),
+        withConfiguredRetention(stale ? applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false) : configured),
         "degraded",
       );
     }
@@ -449,13 +450,13 @@ export async function fetchProviderModelsWithAuth(
     const fresh = getFreshCached(name, ttlMs, Date.now(), authorityIdentity);
     if (fresh) {
       return observed(withConfiguredRetention(
-        applyConfigHintsToCachedModels(name, prov, fresh, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir),
+        applyConfigHintsToCachedModels(name, prov, fresh, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false),
       ), "authoritative");
     }
     const scopedStale = getStaleCached(name, authorityIdentity);
     if (isModelsFetchCoolingDown(name) && scopedStale) {
       return observed(withConfiguredRetention(
-        applyConfigHintsToCachedModels(name, prov, scopedStale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir),
+        applyConfigHintsToCachedModels(name, prov, scopedStale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false),
       ), "degraded");
     }
     const live = await fetchQoderModels(profile, apiKey);
@@ -463,7 +464,7 @@ export async function fetchProviderModelsWithAuth(
       const discovered = live.models.map(id => ({
         id,
         provider: name,
-        ...catalogHintsFromProviderConfig(name, prov, id, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir),
+        ...catalogHintsFromProviderConfig(name, prov, id, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false),
       }));
       const forCache = withConfiguredRetention(discovered, { retainComboTargets: false });
       if (!setCached(name, forCache, Date.now(), cacheGeneration, authorityIdentity)) {
@@ -479,7 +480,7 @@ export async function fetchProviderModelsWithAuth(
     }
     const stale = getStaleCached(name, authorityIdentity);
     return observed(withConfiguredRetention(
-      stale ? applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir) : configured,
+      stale ? applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false) : configured,
     ), "degraded");
   }
   if (prov.adapter === "devin") {
@@ -494,7 +495,7 @@ export async function fetchProviderModelsWithAuth(
     const cachedDevin = getFreshCached(name, ttlMs, Date.now(), authorityIdentity);
     if (cachedDevin) {
       return observed(
-        withConfiguredRetention(applyConfigHintsToCachedModels(name, prov, cachedDevin, undefined, undefined, undefined, metadataConfigDir)),
+        withConfiguredRetention(applyConfigHintsToCachedModels(name, prov, cachedDevin, undefined, undefined, undefined, metadataConfigDir, false)),
         "authoritative",
       );
     }
@@ -502,7 +503,7 @@ export async function fetchProviderModelsWithAuth(
       const cooling = getStaleCached(name, authorityIdentity);
       return observed(
         withConfiguredRetention(
-          cooling ? applyConfigHintsToCachedModels(name, prov, cooling, undefined, undefined, undefined, metadataConfigDir) : configured,
+          cooling ? applyConfigHintsToCachedModels(name, prov, cooling, undefined, undefined, undefined, metadataConfigDir, false) : configured,
         ),
         "degraded",
       );
@@ -540,11 +541,11 @@ export async function fetchProviderModelsWithAuth(
           ...(liveResult.defaultEfforts[id] ? { defaultReasoningEffort: liveResult.defaultEfforts[id] } : {}),
           // The account catalog's per-base supportsImages vote collapses to one
           // modalities value. It spreads before the hints so exact
-          // modelCapabilities declarations, the legacy modelInputModalities
-          // record and the vision-sidecar rewrite keep winning — the live
-          // value survives only when none of them applies.
+          // modelCapabilities declarations and the legacy modelInputModalities
+          // record keep winning. Sidecar advertisement is added after discovery;
+          // the live value survives only when no explicit declaration applies.
           ...(liveResult.inputModalities[id]?.length ? { inputModalities: liveResult.inputModalities[id] } : {}),
-          ...catalogHintsFromProviderConfig(name, prov, id, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir),
+          ...catalogHintsFromProviderConfig(name, prov, id, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false),
         } as CatalogModel;
       });
       const forCache = withConfiguredRetention(result, { retainComboTargets: false });
@@ -560,7 +561,7 @@ export async function fetchProviderModelsWithAuth(
     }
     const stale = getStaleCached(name, authorityIdentity);
     return observed(
-      withConfiguredRetention(stale ? applyConfigHintsToCachedModels(name, prov, stale, undefined, undefined, undefined, metadataConfigDir) : configured),
+      withConfiguredRetention(stale ? applyConfigHintsToCachedModels(name, prov, stale, undefined, undefined, undefined, metadataConfigDir, false) : configured),
       "degraded",
     );
   }
@@ -577,7 +578,7 @@ export async function fetchProviderModelsWithAuth(
     const cachedCursor = getFreshCached(name, ttlMs, Date.now(), authorityIdentity);
     if (cachedCursor) {
       return observed(
-        withConfiguredRetention(applyConfigHintsToCachedModels(name, prov, cachedCursor, undefined, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir)),
+        withConfiguredRetention(applyConfigHintsToCachedModels(name, prov, cachedCursor, undefined, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false)),
         "authoritative",
       );
     }
@@ -585,7 +586,7 @@ export async function fetchProviderModelsWithAuth(
       const cooling = getStaleCached(name, authorityIdentity);
       return observed(
         withConfiguredRetention(
-          cooling ? applyConfigHintsToCachedModels(name, prov, cooling, undefined, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir) : configured,
+          cooling ? applyConfigHintsToCachedModels(name, prov, cooling, undefined, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false) : configured,
         ),
         "degraded",
       );
@@ -631,7 +632,7 @@ export async function fetchProviderModelsWithAuth(
     const staleCursor = getStaleCached(name, authorityIdentity);
     return observed(
       withConfiguredRetention(
-        staleCursor ? applyConfigHintsToCachedModels(name, prov, staleCursor, undefined, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir) : configured,
+        staleCursor ? applyConfigHintsToCachedModels(name, prov, staleCursor, undefined, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false) : configured,
       ),
       "degraded",
     );
@@ -649,7 +650,7 @@ export async function fetchProviderModelsWithAuth(
   if (fresh) {
     return observed(
       withConfiguredRetention(
-        withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, fresh, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir)),
+        withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, fresh, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false)),
       ),
       "authoritative",
     ); // dedups Codex's frequent /v1/models polling within the TTL
@@ -661,7 +662,7 @@ export async function fetchProviderModelsWithAuth(
     return observed(
       withConfiguredRetention(
         stale
-          ? withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir))
+          ? withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false))
           : failedDiscoveryConfigured,
       ),
       "degraded",
@@ -706,7 +707,7 @@ export async function fetchProviderModelsWithAuth(
     return {
       models: withConfiguredRetention(
         stale
-          ? withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir))
+          ? withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, stale, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false))
           : failedDiscoveryConfigured,
       ),
       fallback: stale ? "stale" : "configured",
@@ -797,7 +798,7 @@ export async function fetchProviderModelsWithAuth(
         ...(model.contextWindow ? { contextWindow: model.contextWindow } : {}),
         ...(model.inputModalities ? { inputModalities: model.inputModalities } : {}),
       }));
-      const live = applyConfigHintsToCachedModels(name, prov, upstream, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir);
+      const live = applyConfigHintsToCachedModels(name, prov, upstream, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false);
       const forCache = azureMetadata ? upstream : withConfiguredRetention(live, { retainComboTargets: false });
       if (!isCurrentCacheGeneration()) {
         return observed(withConfiguredRetention(configured), "degraded");
@@ -878,7 +879,7 @@ export async function fetchProviderModelsWithAuth(
       };
     })
       .filter(m => shouldExposeProviderModel(name, m.id));
-    const live = applyConfigHintsToCachedModels(name, prov, upstream, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir);
+    const live = applyConfigHintsToCachedModels(name, prov, upstream, contextCap, metadataModelIdCaseFold, captured.effectiveAlias, metadataConfigDir, false);
     // Capture the count BEFORE the alias/configured augmentation below pushes extra rows into
     // `live`; otherwise configured entries would be reported as discovered ones.
     const liveModelCount = live.length;
@@ -925,6 +926,7 @@ export async function fetchProviderModelsWithAuth(
   }
 }
 
+/** Preserve the provider-only API's default-enabled projection without widening cached evidence. */
 export async function fetchProviderModels(
   name: string,
   prov: OcxProviderConfig,
@@ -937,5 +939,5 @@ export async function fetchProviderModels(
     ttlMs,
     contextCap,
     refreshingModelsAuthResolver,
-  )).models;
+  )).models.map(model => withVisionSidecarInput(model, captured.provider));
 }

package/src/codex/catalog/routed-gather.ts

@@ -35,7 +35,6 @@ import {
 import type { OcxConfig, OcxProviderConfig } from "../../types";
 import { modelInList } from "../../types";
 import { CODEX_REASONING_LEVELS, codexEffortRank, configuredReasoningEfforts, modelRecordValue, sanitizeCodexReasoningEfforts } from "../../reasoning-effort";
-import { isModelVisionSidecarConsumer } from "../../vision/eligibility";
 import { getModelMetadata, getModelMetadataCaseInsensitive, listModelMetadata, resolveMetadataProvider, type ModelMetadata } from "../../generated/model-metadata";
 import { enrichProviderFromRegistry, shouldCaseFoldMetadataModelId } from "../../providers/derive";
 import {
@@ -103,7 +102,7 @@ import type {
   CatalogTrustedOpenAiApiPolicySnapshot,
 } from "../convergence-types";
 import type { CatalogGatherProviderAuthOutcome, CatalogGatherProviderModelOutcome, GatherFlightCapture, ModelsAuthResolverFactory } from "./gather-capture";
-import { applyProviderConfigHints, configuredAutoCompactTokenLimit, configuredMaxInputTokens, configuredReasoningSummarySupport, modelInputModalities, routedMaxOutputTokens } from "./model-hints";
+import { applyProviderConfigHints, configuredAutoCompactTokenLimit, configuredMaxInputTokens, configuredReasoningSummarySupport, modelInputModalities, routedMaxOutputTokens, withVisionSidecarInput } from "./model-hints";
 import { resolveComboCatalogMember } from "./combo-member";
 import { captureGatherFlight, captureTrustedOpenAiApiPolicy, gatherFlightKey, keyedGatherBytesIdentity, withCanonicalOpenAiForwardAuthDefault } from "./gather-capture";
 import { fetchProviderModelsWithAuth, observedModelsAuthResolver, refreshingModelsAuthResolver } from "./provider-models";
@@ -330,6 +329,7 @@ async function gatherRoutedModelsUncached(
   const localProviderAuthOutcomes = capture.providerAuthOutcomes;
   const resolveAuth = capture.authResolver;
   const ttlMs = config.modelCacheTtlMs ?? DEFAULT_MODEL_CACHE_TTL_MS;
+  const visionSidecarEnabled = config.visionSidecar?.enabled !== false;
   // Persisted provider entries can predate newer registry fields (noVisionModels,
   // modelInputModalities, ...). The ROUTER merges registry seeds at request time
   // (routedProviderConfig), so the proxy behaves correctly — the catalog listing must see the
@@ -337,6 +337,8 @@ async function gatherRoutedModelsUncached(
   // vision-sidecar model advertised text-only, blocking image attachments app-side).
   // Enrich a CLONE: hydrated defaults must never leak into the persisted config.
   const activeProviders = capture.providers;
+  // Use admission-time provider clones for sidecar advertisement, custom rows and combo members.
+  const enrichedByName = new Map(activeProviders.map(provider => [provider.name, provider.provider]));
   const providerResults = await Promise.all(
     activeProviders.map(provider => fetchProviderModelsWithAuth(
       provider,
@@ -378,7 +380,9 @@ async function gatherRoutedModelsUncached(
     config,
     metadataModelIdCaseFoldByProvider,
     metadataConfigDirByProvider,
+    false,
   )
+    .map(model => withVisionSidecarInput(model, enrichedByName.get(model.provider), visionSidecarEnabled))
     // Drop image/video generation models (e.g. Grok image/video) by default. Cursor's static catalog
     // intentionally mirrors Cursor's public model table, including Gemini image preview, so the
     // exposure decision goes through shouldExposeRoutedModel (single choke point).
@@ -482,9 +486,6 @@ async function gatherRoutedModelsUncached(
       ...(custom.codexToolMode !== undefined ? { codexToolMode: custom.codexToolMode } : {}),
     });
   }
-  // Enriched (registry-hydrated) provider clones — shared by combo member synthesis and
-  // custom-model vision-sidecar inheritance so both see the same merged registry view.
-  const enrichedByName = new Map(activeProviders.map(provider => [provider.name, provider.provider]));
   for (const id of listComboIds(config)) {
     const combo = getCombo(config, id);
     if (!combo) continue;
@@ -521,6 +522,7 @@ async function gatherRoutedModelsUncached(
         nativeAliasFallback,
         metadataModelIdCaseFoldByProvider.get(target.provider),
         metadataConfigDirByProvider.get(target.provider),
+        visionSidecarEnabled,
       ))
       .filter((member): member is CatalogModel => member !== undefined);
     const derived = deriveComboCatalogModel(id, combo, members);
@@ -714,7 +716,7 @@ async function gatherRoutedModelsUncached(
     const customContextHints = merged.contextWindow === undefined && effectiveProvider && canInferVendorContext(cm.provider, effectiveProvider)
       ? applyProviderConfigHints(cm.provider, effectiveProvider, { provider: cm.provider, id: cm.modelId },
         providerContextCap(config, cm.provider), metadataModelIdCaseFoldByProvider.get(cm.provider),
-        undefined, metadataConfigDirByProvider.get(cm.provider))
+        undefined, metadataConfigDirByProvider.get(cm.provider), false)
       : undefined;
     const contextResolved: CatalogModel = customContextHints?.contextWindow !== undefined
       ? { ...merged, contextWindow: customContextHints.contextWindow,
@@ -762,13 +764,7 @@ async function gatherRoutedModelsUncached(
       : mergedWithHardBounds;
     const enrichedProvider = enrichedByName.get(cm.provider) ?? rawProvider;
     // Reuse the request-time consumer predicate so custom rows cannot drift from catalog hints.
-    if (enrichedProvider && isModelVisionSidecarConsumer(enrichedProvider, mergedWithAutoCompact.id)) {
-      const current = mergedWithAutoCompact.inputModalities ?? ["text"];
-      if (!current.includes("image")) {
-        return { ...mergedWithAutoCompact, inputModalities: [...current, "image"] };
-      }
-    }
-    return mergedWithAutoCompact;
+    return withVisionSidecarInput(mergedWithAutoCompact, enrichedProvider, visionSidecarEnabled);
   });
   // Custom rows override discovered rows that encode to the same Codex-facing slug. A provider whose
   // captured discovery declares an order (preferFirst) keeps each replacement in the discovered row's
@@ -948,6 +944,7 @@ export function augmentRoutedModelsWithMetadata(
   caps?: Pick<OcxConfig, "providerContextCaps">,
   metadataModelIdCaseFoldByProvider?: ReadonlyMap<string, boolean>,
   metadataConfigDirByProvider?: ReadonlyMap<string, string>,
+  includeVisionSidecar = true,
 ): CatalogModel[] {
   const out = [...models];
   const indexByKey = new Map(out.map((model, index) => [`${model.provider}/${model.id}`, index]));
@@ -977,6 +974,7 @@ export function augmentRoutedModelsWithMetadata(
             metadataModelIdCaseFoldByProvider?.get(provider),
             undefined,
             metadataConfigDirByProvider?.get(provider),
+            includeVisionSidecar,
           )
           : seeded;
         continue;
@@ -1001,6 +999,7 @@ export function augmentRoutedModelsWithMetadata(
             metadataModelIdCaseFoldByProvider?.get(provider),
             undefined,
             metadataConfigDirByProvider?.get(provider),
+            includeVisionSidecar,
           )
           : {}),
       });