fix(google): surface Vertex defaultModel in catalog when models list is absent (#202)

lidge-jun · lidge-jun · commit 2e07c8bc65dc · 2026-07-22T02:29:38.000+09:00
diff --git a/devlog/_plan/260722_issue_bug_sweep/040_merge_readiness_review.md b/devlog/_plan/260722_issue_bug_sweep/040_merge_readiness_review.md
@@ -27,6 +27,8 @@
 
 ### B1 — #202 Vertex: 진단만, 실제 미노출 미해결 (High)
 
+> **해결됨 (2026-07-22, WP-fix-1)**: `catalog.ts fetchProviderModels`에서 adapter=google·googleMode=vertex·models 없음·defaultModel 있음 4조건일 때 defaultModel을 configured에 시드하고, `withVertexDefaultSeed()`로 5개 캐시 fallback(fresh/cooldown/non-2xx/malformed/thrown) + authoritative-empty 분기 모두에 보존. 회귀 테스트(defaultModel-only + 빈 캐시 fresh/stale)는 수정 전 RED. 리뷰어 2라운드(FAIL→PASS). `bun test tests/vertex-catalog.test.ts` 10 pass, tsc 0.
+
 - 위치: `src/codex/catalog.ts:1243` — `configured`는 `prov.models ?? []`에서만 생성, `defaultModel` fallback 없음.
 - 트리거: 이슈 그대로 `defaultModel`만 있고 `models` 배열이 없는 Vertex provider.
 - 영향: discovery 실패 후 configured가 비어 default Gemini가 여전히 대시보드·`/v1/models`에 미노출.
diff --git a/src/codex/catalog.ts b/src/codex/catalog.ts
@@ -1240,11 +1240,22 @@ function catalogHintsFromModelsApiItem(providerName: string, item: ProviderModel
 async function fetchProviderModels(name: string, prov: OcxProviderConfig, ttlMs: number, contextCap?: number): Promise<CatalogModel[]> {
   if (prov.authMode === "forward") return []; // ChatGPT backend has no /models
   const apiKey = await resolveModelsAuthToken(name, prov);
-  const configured: CatalogModel[] = (prov.models ?? []).map(id => ({
+  const seedVertexDefault = prov.adapter === "google"
+    && prov.googleMode === "vertex"
+    && (prov.models?.length ?? 0) === 0
+    && Boolean(prov.defaultModel);
+  const configuredIds = seedVertexDefault && prov.defaultModel ? [prov.defaultModel] : (prov.models ?? []);
+  const configured: CatalogModel[] = configuredIds.map(id => ({
     id,
     provider: name,
     ...catalogHintsFromProviderConfig(name, prov, id, contextCap),
   }));
+  const vertexDefaultSeed = seedVertexDefault ? configured[0] : undefined;
+  const withVertexDefaultSeed = (models: CatalogModel[]): CatalogModel[] => (
+    vertexDefaultSeed && !models.some(model => model.id === vertexDefaultSeed.id)
+      ? [...models, vertexDefaultSeed]
+      : models
+  );
   if (prov.adapter === "cursor") {
     if (prov.liveModels === false || !apiKey) return configured;
     // Cursor uses a bespoke GetUsableModels RPC (not /models), returning the full effort-suffixed
@@ -1276,12 +1287,12 @@ async function fetchProviderModels(name: string, prov: OcxProviderConfig, ttlMs:
     return configured;
   }
   const fresh = getFreshCached(name, ttlMs);
-  if (fresh) return applyConfigHintsToCachedModels(name, prov, fresh, contextCap); // dedups Codex's frequent /v1/models polling within the TTL
+  if (fresh) return withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, fresh, contextCap)); // dedups Codex's frequent /v1/models polling within the TTL
   if (isModelsFetchCoolingDown(name)) {
     // A recently-failed provider (unreachable API, missing proxy, bad key) must not re-pay the
     // fetch timeout on every catalog poll — the dashboard polls this path per page load.
     const stale = getStaleCached(name);
-    return stale ? applyConfigHintsToCachedModels(name, prov, stale, contextCap) : configured;
+    return stale ? withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, stale, contextCap)) : configured;
   }
   const { url, headers } = buildModelsRequest(prov, apiKey, name);
   const urlClass = new URL(url).hostname.endsWith("aiplatform.googleapis.com")
@@ -1296,7 +1307,7 @@ async function fetchProviderModels(name: string, prov: OcxProviderConfig, ttlMs:
       console.warn(
         `[opencodex] Provider model discovery for "${name}" failed with HTTP ${res.status} [urlClass=${urlClass}, fallback=${fallback}].`,
       );
-      return stale ? applyConfigHintsToCachedModels(name, prov, stale, contextCap) : configured;
+      return stale ? withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, stale, contextCap)) : configured;
     }
     const json = await res.json() as unknown;
     const data = json !== null && typeof json === "object" && !Array.isArray(json)
@@ -1308,7 +1319,7 @@ async function fetchProviderModels(name: string, prov: OcxProviderConfig, ttlMs:
         `[opencodex] Provider model discovery for "${name}" returned malformed 2xx data; using stale/static catalog degradation.`,
       );
       const stale = getStaleCached(name);
-      return stale ? applyConfigHintsToCachedModels(name, prov, stale, contextCap) : configured;
+      return stale ? withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, stale, contextCap)) : configured;
     }
     const items = data;
     const live = items.map(m => applyProviderConfigHints(name, prov, {
@@ -1331,7 +1342,7 @@ async function fetchProviderModels(name: string, prov: OcxProviderConfig, ttlMs:
       if (dated) {
         // Reapply config hints so alias-keyed overrides (modelContextWindows etc.) win.
         live.push(applyProviderConfigHints(name, prov, { ...dated, id: m.id }, contextCap));
-      } else if (shouldRetainConfiguredProviderModel(name, m.id)) {
+      } else if (seedVertexDefault || shouldRetainConfiguredProviderModel(name, m.id)) {
         live.push(m);
       } else {
         droppedConfiguredIds.push(m.id);
@@ -1355,7 +1366,7 @@ async function fetchProviderModels(name: string, prov: OcxProviderConfig, ttlMs:
     console.warn(
       `[opencodex] Provider model discovery for "${name}" threw ${error instanceof Error ? error.name : "unknown"} [urlClass=${urlClass}, fallback=${fallback}].`,
     );
-    return stale ? applyConfigHintsToCachedModels(name, prov, stale, contextCap) : configured;
+    return stale ? withVertexDefaultSeed(applyConfigHintsToCachedModels(name, prov, stale, contextCap)) : configured;
   }
 }
 
diff --git a/tests/vertex-catalog.test.ts b/tests/vertex-catalog.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, describe, expect, spyOn, test } from "bun:test";
 import { gatherRoutedModels } from "../src/codex/catalog";
-import { clearModelCache } from "../src/codex/model-cache";
+import { clearModelCache, markModelsFetchFailure, setCached } from "../src/codex/model-cache";
 import type { OcxConfig } from "../src/types";
 
 const originalFetch = globalThis.fetch;
@@ -28,6 +28,121 @@ function vertexProvider(name: string): OcxConfig {
 }
 
 describe("Vertex catalog configuration", () => {
+  test("defaultModel without models survives failed Vertex discovery", async () => {
+    globalThis.fetch = (() => { throw new TypeError("offline"); }) as typeof fetch;
+    const config: OcxConfig = {
+      providers: {
+        "vertex-default": {
+          adapter: "google",
+          googleMode: "vertex",
+          baseUrl: "https://aiplatform.googleapis.com",
+          apiKey: "test-key",
+          defaultModel: "gemini-2.5-pro",
+        },
+      },
+    };
+
+    const rows = await gatherRoutedModels(config);
+
+    expect(rows).toContainEqual(expect.objectContaining({
+      provider: "vertex-default",
+      id: "gemini-2.5-pro",
+    }));
+  });
+
+  test("defaultModel-only Vertex configuration survives authoritative empty discovery", async () => {
+    globalThis.fetch = (() => Promise.resolve(Response.json({ data: [] }))) as typeof fetch;
+    const config: OcxConfig = {
+      providers: {
+        "vertex-empty": {
+          adapter: "google",
+          googleMode: "vertex",
+          baseUrl: "https://aiplatform.googleapis.com",
+          apiKey: "test-key",
+          defaultModel: "gemini-2.5-pro",
+        },
+      },
+    };
+
+    const rows = await gatherRoutedModels(config);
+
+    expect(rows).toContainEqual(expect.objectContaining({
+      provider: "vertex-empty",
+      id: "gemini-2.5-pro",
+    }));
+  });
+
+  test("defaultModel-only Vertex configuration survives a fresh empty cache", async () => {
+    globalThis.fetch = (() => { throw new Error("must not fetch"); }) as typeof fetch;
+    const provider = "vertex-fresh-empty";
+    setCached(provider, []);
+    const config: OcxConfig = {
+      providers: {
+        [provider]: {
+          adapter: "google",
+          googleMode: "vertex",
+          baseUrl: "https://aiplatform.googleapis.com",
+          apiKey: "test-key",
+          defaultModel: "gemini-2.5-pro",
+        },
+      },
+    };
+
+    const rows = await gatherRoutedModels(config);
+
+    expect(rows).toContainEqual(expect.objectContaining({
+      provider,
+      id: "gemini-2.5-pro",
+    }));
+  });
+
+  test("defaultModel-only Vertex configuration survives an empty stale cache during cooldown", async () => {
+    globalThis.fetch = (() => { throw new Error("must not fetch"); }) as typeof fetch;
+    const provider = "vertex-stale-empty";
+    setCached(provider, [], 0);
+    markModelsFetchFailure(provider);
+    const config: OcxConfig = {
+      modelCacheTtlMs: 1,
+      providers: {
+        [provider]: {
+          adapter: "google",
+          googleMode: "vertex",
+          baseUrl: "https://aiplatform.googleapis.com",
+          apiKey: "test-key",
+          defaultModel: "gemini-2.5-pro",
+        },
+      },
+    };
+
+    const rows = await gatherRoutedModels(config);
+
+    expect(rows).toContainEqual(expect.objectContaining({
+      provider,
+      id: "gemini-2.5-pro",
+    }));
+  });
+
+  test("non-Vertex defaultModel without models is not seeded after discovery failure", async () => {
+    globalThis.fetch = (() => { throw new TypeError("offline"); }) as typeof fetch;
+    const config: OcxConfig = {
+      providers: {
+        "custom-openai": {
+          adapter: "openai-chat",
+          baseUrl: "https://example.invalid/v1",
+          apiKey: "test-key",
+          defaultModel: "typoed-default",
+        },
+      },
+    };
+
+    const rows = await gatherRoutedModels(config);
+
+    expect(rows).not.toContainEqual(expect.objectContaining({
+      provider: "custom-openai",
+      id: "typoed-default",
+    }));
+  });
+
   test("models + liveModels false exposes configured Vertex ids without discovery", async () => {
     globalThis.fetch = (() => { throw new Error("must not fetch"); }) as typeof fetch;
     const config = vertexProvider("vertex-static");
