Collapse Go and Zen catalog bindings into one parameterized module

Author: TheGreatAxios

src/config.test.ts

@@ -43,12 +43,10 @@ import {
 } from "../packages/zen/src/index.js";
 import {
   prefetchGoModels,
-  resetGoModelDiscoveryForTests,
-} from "./provider/opencode-go-models.js";
-import {
   prefetchZenModels,
+  resetGoModelDiscoveryForTests,
   resetZenModelDiscoveryForTests,
-} from "./provider/zen-models.js";
+} from "./provider/model-catalogs.js";
 import {
   generateSessionId,
   initSessionDir,

src/config/index.ts

@@ -57,12 +57,12 @@ import {
 } from "../provider/grok-responses.js";
 import { BIFROST_PROVIDER } from "../provider/bifrost-adapter.js";
 import { isOllamaProviderId, ollamaOpenAIBaseURL } from "../provider/ollama.js";
-import { selectableGoModelIds } from "../provider/opencode-go-models.js";
+import { selectableGoModelIds } from "../provider/model-catalogs.js";
 import {
   OPENCODE_GO_MESSAGES_PROVIDER,
   ZEN_MESSAGES_PROVIDER,
 } from "../provider/anthropic-session-adapter.js";
-import { selectableZenModelIds } from "../provider/zen-models.js";
+import { selectableZenModelIds } from "../provider/model-catalogs.js";
 import {
   OPENAI_RESPONSES_PROVIDER,
   OPENAI_SESSION_ID_OPTION,

src/provider/identity-divergence.test.ts

@@ -33,12 +33,10 @@ import {
 import { OAUTH_SURFACES } from "../tui/provider/choices.js";
 import {
   resetGoModelDiscoveryForTests,
-  selectableGoModelIds,
-} from "./opencode-go-models.js";
-import {
   resetZenModelDiscoveryForTests,
+  selectableGoModelIds,
   selectableZenModelIds,
-} from "./zen-models.js";
+} from "./model-catalogs.js";
 
 // CL-5691: provider/model identity unification. FIRST_CLASS_PROVIDERS is the
 // canonical static registry; the Codex/xAI live-fetch fallbacks stay separate

src/provider/model-catalogs.ts

@@ -0,0 +1,59 @@
+import {
+  OPENCODE_GO_BASE_URL,
+  OPENCODE_GO_MODEL_IDS,
+} from "../../packages/opencode-go/src/index.js";
+import {
+  ZEN_DEFAULT_BASE_URL,
+  ZEN_MODEL_IDS,
+} from "../../packages/zen/src/index.js";
+import {
+  createBoundedModelCatalog,
+  type CatalogDiscoveryState,
+} from "./bounded-model-catalog.js";
+
+// Bound live /models so a huge or hostile catalog cannot blow process memory.
+export const MAX_GO_CATALOG_BYTES = 256 * 1024;
+export const MAX_GO_CATALOG_MODELS = 1024;
+export const MAX_ZEN_CATALOG_BYTES = 256 * 1024;
+export const MAX_ZEN_CATALOG_MODELS = 1024;
+
+export type GoDiscoveryState = CatalogDiscoveryState;
+export type ZenDiscoveryState = CatalogDiscoveryState;
+
+const goCatalog = createBoundedModelCatalog({
+  baseURL: OPENCODE_GO_BASE_URL,
+  seedIds: OPENCODE_GO_MODEL_IDS,
+  catalogLabel: "OpenCode Go",
+  maxBytes: MAX_GO_CATALOG_BYTES,
+  maxModels: MAX_GO_CATALOG_MODELS,
+});
+
+const zenCatalog = createBoundedModelCatalog({
+  baseURL: ZEN_DEFAULT_BASE_URL,
+  seedIds: ZEN_MODEL_IDS,
+  catalogLabel: "OpenCode Zen",
+  maxBytes: MAX_ZEN_CATALOG_BYTES,
+  maxModels: MAX_ZEN_CATALOG_MODELS,
+});
+
+/** Discover public OpenCode Go models without leaking transport or parsing failures. */
+export const discoverGoModels = goCatalog.discoverModels;
+
+/** Sync picker ids: last successful live list, else the packaged seed. Never empty. */
+export const selectableGoModelIds = goCatalog.selectableModelIds;
+
+/** Join or start a live fetch; the snapshot is the cache, inflight is only a mutex. */
+export const prefetchGoModels = goCatalog.prefetchModels;
+
+export const resetGoModelDiscoveryForTests = goCatalog.resetDiscoveryForTests;
+
+/** Discover public OpenCode Zen models without leaking transport or parsing failures. */
+export const discoverZenModels = zenCatalog.discoverModels;
+
+/** Sync picker ids: last successful live list, else the packaged seed. Never empty. */
+export const selectableZenModelIds = zenCatalog.selectableModelIds;
+
+/** Join or start a live fetch; the snapshot is the cache, inflight is only a mutex. */
+export const prefetchZenModels = zenCatalog.prefetchModels;
+
+export const resetZenModelDiscoveryForTests = zenCatalog.resetDiscoveryForTests;

src/provider/opencode-go-models.ts

@@ -7,7 +7,7 @@ import { defined } from "../../tests/helpers/defined.js";
 
 import { OAuthProviderScopeError } from "../auth/oauth-scope-check.js";
 import { OPENCODE_GO_MODEL_IDS } from "../../packages/opencode-go/src/index.js";
-import { resetGoModelDiscoveryForTests } from "../provider/opencode-go-models.js";
+import { resetGoModelDiscoveryForTests } from "../provider/model-catalogs.js";
 import {
   loadLocalSettings,
   loadSettings,

src/provider/zen-models.ts

@@ -16,8 +16,10 @@ import {
 import { XAI_BASE_URL, XAI_DEFAULT_MODELS } from "../../auth/xai/constants.js";
 import { codexProviderName } from "../../config/codex-providers.js";
 import { xaiProviderName } from "../../config/xai-providers.js";
-import { selectableGoModelIds } from "../../provider/opencode-go-models.js";
-import { selectableZenModelIds } from "../../provider/zen-models.js";
+import {
+  selectableGoModelIds,
+  selectableZenModelIds,
+} from "../../provider/model-catalogs.js";
 import { isZenProviderId } from "../../../packages/zen/src/index.js";
 import { buildModelsFirstCatalog } from "../model-catalog.js";
 import type { ResidualCatalogEntry } from "../residuals.js";

src/tui/provider-setup.test.ts

@@ -24,8 +24,10 @@ import {
   discoverOllamaModels as discoverOllamaModelsRequest,
   isOllamaProviderId,
 } from "../../provider/ollama.js";
-import { prefetchGoModels as prefetchGoModelsRequest } from "../../provider/opencode-go-models.js";
-import { prefetchZenModels as prefetchZenModelsRequest } from "../../provider/zen-models.js";
+import {
+  prefetchGoModels as prefetchGoModelsRequest,
+  prefetchZenModels as prefetchZenModelsRequest,
+} from "../../provider/model-catalogs.js";
 import { isZenProviderId } from "../../../packages/zen/src/index.js";
 import { resolveSideMargin } from "../geometry/zones.js";
 import {

src/tui/provider/choices.ts

@@ -20,8 +20,10 @@ import type {
   discoverOllamaModels as discoverOllamaModelsRequest,
   OllamaDiscoveryState,
 } from "../../provider/ollama.js";
-import type { prefetchGoModels as prefetchGoModelsRequest } from "../../provider/opencode-go-models.js";
-import type { prefetchZenModels as prefetchZenModelsRequest } from "../../provider/zen-models.js";
+import type {
+  prefetchGoModels as prefetchGoModelsRequest,
+  prefetchZenModels as prefetchZenModelsRequest,
+} from "../../provider/model-catalogs.js";
 import type { ResidualCatalogEntry } from "../residuals.js";
 import type { OverlayList } from "../shell/internals.js";
 import type { SetupStep } from "./steps.js";