test(catalog): hand the pinned transport back the stubbed fetch

#697 moved provider model discovery onto the pinned outbound transport,
which resolves and pins the peer address instead of reading
`globalThis.fetch`. Catalog tests that stub the global therefore escaped
their stub and tried real DNS, failing with
DestinationDnsResolutionError — 25 failures across four files after the
merge.

`providerOutboundGet` already supports a caller-owned executor via
`provider.fetch`; #697 used it in two spots. Extend that to the rest:
a shared `withStubbedProviderFetch` helper attaches an executor that
defers to whatever `globalThis.fetch` is installed at call time, so a
test may still swap its stub after building the config.

This changes test wiring only. Production discovery keeps the pinned
transport with no injected executor, which is the security property
#697 added. The suite also gets faster — codex-catalog.test.ts drops
from ~33s to ~2.5s now that four cases no longer wait on real DNS
timeouts.

Author: lidge-jun

tests/codex-catalog.test.ts

@@ -2,7 +2,8 @@ import { afterEach, describe, expect, spyOn, test } from "bun:test";
 import { existsSync, mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { augmentRoutedModelsWithJawcodeMetadata, augmentRoutedModelsWithRegistryOpenAiApiRows, buildCatalogEntries, buildComboCatalogOmission, catalogModelSlug, clampCatalogModelsToCodexSupport, clampEntryToCodexSupportedEfforts, clampedDefaultEffort, comboCatalogOmissionReason, deriveComboCatalogModel, exactComboCatalogSlugs, filterCatalogVisibleModels, filterSupportedNativeSlugs, gatherRoutedModels, isDatedVariantId, isMediaGenerationModelId, loadBundledCodexCatalog, materializeBundledCodexCatalog, mergeCatalogEntriesForSync, NATIVE_OPENAI_MODELS, normalizeRoutedCatalogEntry, resetCatalogRuntimeStateForTests, resetOpenAiApiCatalogWarningStateForTests, shouldExposeRoutedModel } from "../src/codex/catalog";
+import { augmentRoutedModelsWithJawcodeMetadata, augmentRoutedModelsWithRegistryOpenAiApiRows, buildCatalogEntries, buildComboCatalogOmission, catalogModelSlug, clampCatalogModelsToCodexSupport, clampEntryToCodexSupportedEfforts, clampedDefaultEffort, comboCatalogOmissionReason, deriveComboCatalogModel, exactComboCatalogSlugs, filterCatalogVisibleModels, filterSupportedNativeSlugs, gatherRoutedModels as gatherRoutedModelsDirect, isDatedVariantId, isMediaGenerationModelId, loadBundledCodexCatalog, materializeBundledCodexCatalog, mergeCatalogEntriesForSync, NATIVE_OPENAI_MODELS, normalizeRoutedCatalogEntry, resetCatalogRuntimeStateForTests, resetOpenAiApiCatalogWarningStateForTests, shouldExposeRoutedModel } from "../src/codex/catalog";
+import { withStubbedProviderFetch } from "./helpers/catalog-provider-fetch";
 import {
   CURSOR_STATIC_MODELS,
   filterCursorConfiguredModelsByLiveDiscovery,
@@ -27,6 +28,14 @@ import { handleManagementAPI } from "../src/server/management-api";
 
 const originalFetch = globalThis.fetch;
 
+/**
+ * Discovery runs on the pinned outbound transport, which does not read
+ * `globalThis.fetch`. These tests stub that global, so every config gets the
+ * caller-owned executor that hands control back to the stub.
+ */
+const gatherRoutedModels: typeof gatherRoutedModelsDirect = (config, options) =>
+  gatherRoutedModelsDirect(withStubbedProviderFetch(config), options);
+
 afterEach(() => {
   globalThis.fetch = originalFetch;
   clearModelCache();
@@ -86,6 +95,7 @@ async function liveModelCountAfterDiscovery(provider: string, models: string[] |
         apiKey: "k",
         liveModels: true,
         models: ["configured-fallback"],
+        fetch: ((input: RequestInfo | URL) => globalThis.fetch(input)) as typeof fetch,
       },
     },
   } as unknown as Parameters<typeof handleManagementAPI>[2];

tests/google-models-listing.test.ts

@@ -1,8 +1,13 @@
 import { afterEach, describe, expect, spyOn, test } from "bun:test";
-import { gatherRoutedModels } from "../src/codex/catalog";
+import { gatherRoutedModels as gatherRoutedModelsDirect } from "../src/codex/catalog";
 import { buildModelsRequest } from "../src/oauth";
 import { clearModelCache, getStaleCached } from "../src/codex/model-cache";
 import type { OcxConfig, OcxProviderConfig } from "../src/types";
+import { withStubbedProviderFetch } from "./helpers/catalog-provider-fetch";
+
+/** Discovery runs on the pinned transport; hand it back the stubbed global. */
+const gatherRoutedModels: typeof gatherRoutedModelsDirect = (config, options) =>
+  gatherRoutedModelsDirect(withStubbedProviderFetch(config), options);
 
 const originalFetch = globalThis.fetch;
 

tests/helpers/catalog-provider-fetch.ts

@@ -0,0 +1,25 @@
+/**
+ * Provider-model discovery now runs on the pinned outbound transport
+ * (`providerOutboundGet`), which resolves and pins the peer address instead of
+ * calling `globalThis.fetch`. Catalog tests that stub `globalThis.fetch` would
+ * otherwise hit real DNS and fail with DestinationDnsResolutionError.
+ *
+ * `providerOutboundGet` honors a caller-owned executor via `provider.fetch`, so
+ * these helpers hand the current `globalThis.fetch` back to the transport. The
+ * indirection matters: the stub is read at call time, so a test may install or
+ * replace its stub after building the config.
+ */
+
+/** A caller-owned executor that defers to whatever `globalThis.fetch` is installed. */
+export const stubbedProviderFetch = ((input: RequestInfo | URL, init?: RequestInit) =>
+  globalThis.fetch(input, init)) as typeof fetch;
+
+/** Attach {@link stubbedProviderFetch} to every provider in a test config. */
+export function withStubbedProviderFetch<T extends { providers?: Record<string, unknown> }>(config: T): T {
+  for (const provider of Object.values(config.providers ?? {})) {
+    if (provider && typeof provider === "object" && !("fetch" in provider)) {
+      (provider as { fetch?: typeof fetch }).fetch = stubbedProviderFetch;
+    }
+  }
+  return config;
+}

tests/opencode-cli.test.ts

@@ -247,6 +247,8 @@ describe("ocx opencode proxy model catalog", () => {
           baseUrl: "https://proxyenv.test/v1",
           apiKey: `\${${ENV_KEY}}`,
           models: ["static-fallback"],
+          // Discovery runs on the pinned transport; hand it back the stub above.
+          fetch: ((input: RequestInfo | URL, init?: RequestInit) => globalThis.fetch(input, init)) as typeof fetch,
         },
       },
     } as OcxConfig;

tests/vertex-catalog.test.ts

@@ -1,7 +1,12 @@
 import { afterEach, describe, expect, spyOn, test } from "bun:test";
-import { gatherRoutedModels } from "../src/codex/catalog";
+import { gatherRoutedModels as gatherRoutedModelsDirect } from "../src/codex/catalog";
 import { clearModelCache, markModelsFetchFailure, setCached } from "../src/codex/model-cache";
 import type { OcxConfig } from "../src/types";
+import { withStubbedProviderFetch } from "./helpers/catalog-provider-fetch";
+
+/** Discovery runs on the pinned transport; hand it back the stubbed global. */
+const gatherRoutedModels: typeof gatherRoutedModelsDirect = (config, options) =>
+  gatherRoutedModelsDirect(withStubbedProviderFetch(config), options);
 
 const originalFetch = globalThis.fetch;
 let warn: ReturnType<typeof spyOn> | undefined;