Claude Code. Any Model. The most powerful AI coding agent now speaks every language.
fix(discovery): list models from the route registry's host
Jack Rudenkoaf4b098a50aa
diff --git a/packages/cli/src/providers/model-discovery-registry.test.ts b/packages/cli/src/providers/model-discovery-registry.test.tsnew file mode 100644index 00000000..b1c2aad6--- /dev/null+++ b/packages/cli/src/providers/model-discovery-registry.test.ts@@ -0,0 +1,114 @@+import { expect, test } from "bun:test";+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";+import { tmpdir } from "node:os";+import { join } from "node:path";+import type { DiskCacheV3 } from "./all-models-cache.js";+import { resolveRouteProfile } from "./connection-resolver.js";++const fixturePath = new URL(+ "../test-fixtures/catalog-v3/wire-g-20261012101007285-7770c36e.json",+ import.meta.url+).pathname;+const fixture: DiskCacheV3 = JSON.parse(readFileSync(fixturePath, "utf8"));+test.each([+ ["opencode-zen", undefined],+ ["opencode-zen-go", undefined],+ ["opencode-zen-go", "https://override.invalid/proxy"],+] as const)("%s discovery honors its descriptor and base override %s", (provider, override) => {+ const home = mkdtempSync(join(tmpdir(), "discovery-registry-"));+ try {+ mkdirSync(join(home, ".claudish"));+ writeFileSync(join(home, ".claudish/cloud-models-catalog-v3.json"), JSON.stringify(fixture));+ const child = Bun.spawnSync(+ [+ process.execPath,+ "--eval",+ `+ const { discoverProviderModelsCatalog } = await import(${JSON.stringify(new URL("./model-discovery.ts", import.meta.url).pathname)});+ const calls = [];+ const originalFetch = globalThis.fetch;+ globalThis.fetch = async (url, init) => {+ calls.push({url: String(url), headers: Object.fromEntries(new Headers(init.headers))});+ return Response.json({data: [{id: "test-chat"}]});+ };+ try { console.log(JSON.stringify({result: await discoverProviderModelsCatalog(${JSON.stringify(provider)}), calls})); }+ finally { globalThis.fetch = originalFetch; }+ `,+ ],+ {+ env: {+ PATH: process.env.PATH,+ HOME: home,+ CLAUDISH_DISABLE_CATALOG_WARM: "1",+ CLAUDISH_DISABLE_KEYCHAIN: "1",+ CLAUDISH_DISABLE_OP: "1",+ OPENCODE_GO_API_KEY: "fake",+ ...(override ? { OPENCODE_GO_BASE_URL: override } : {}),+ },+ stdout: "pipe",+ stderr: "pipe",+ }+ );+ expect(child.exitCode, child.stderr.toString()).toBe(0);+ const result = JSON.parse(child.stdout.toString());+ if (provider === "opencode-zen") {+ expect(result.result).toEqual({ kind: "unsupported", reason: "no-descriptor" });+ expect(result.calls).toEqual([]);+ return;+ }+ const profile = resolveRouteProfile("opencode-zen-go", fixturePath)!.profile;+ const registryBase = profile.apis["chat-completions"]!.baseUrl;+ expect(result.result.kind, JSON.stringify(result)).toBe("served");+ expect(result.calls).toHaveLength(1);+ expect(result.calls[0].url).toBe(override ? `${override}/v1/models` : `${registryBase}/models`);+ expect(result.calls[0].headers.authorization).toBe("Bearer fake");+ expect(result.result.kind).toBe("served");+ } finally {+ rmSync(home, { recursive: true, force: true });+ }+});++test("Kimi discovery uses the registry host instead of the definition host", () => {+ const home = mkdtempSync(join(tmpdir(), "discovery-registry-kimi-"));+ try {+ mkdirSync(join(home, ".claudish"));+ writeFileSync(join(home, ".claudish/cloud-models-catalog-v3.json"), JSON.stringify(fixture));+ const child = Bun.spawnSync(+ [+ process.execPath,+ "--eval",+ `+ const { discoverProviderModelsCatalog } = await import(${JSON.stringify(new URL("./model-discovery.ts", import.meta.url).pathname)});+ const calls = [];+ const originalFetch = globalThis.fetch;+ globalThis.fetch = async (url, init) => {+ calls.push({url: String(url), headers: Object.fromEntries(new Headers(init.headers))});+ return Response.json({data: [{id: "k3"}]});+ };+ try { console.log(JSON.stringify({result: await discoverProviderModelsCatalog("kimi-coding"), calls})); }+ finally { globalThis.fetch = originalFetch; }+ `,+ ],+ {+ env: {+ PATH: process.env.PATH,+ HOME: home,+ CLAUDISH_DISABLE_CATALOG_WARM: "1",+ CLAUDISH_DISABLE_KEYCHAIN: "1",+ CLAUDISH_DISABLE_OP: "1",+ KIMI_CODING_API_KEY: "fake",+ },+ stdout: "pipe",+ stderr: "pipe",+ }+ );+ expect(child.exitCode, child.stderr.toString()).toBe(0);+ const result = JSON.parse(child.stdout.toString());+ expect(result.result.kind, JSON.stringify(result)).toBe("served");+ expect(result.calls).toHaveLength(1);+ expect(result.calls[0].url).toBe("https://api.kimi.ai/coding/v1/models");+ expect(result.calls[0].headers.authorization).toBe("Bearer fake");+ } finally {+ rmSync(home, { recursive: true, force: true });+ }+});diff --git a/packages/cli/src/providers/model-discovery.test.ts b/packages/cli/src/providers/model-discovery.test.tsindex 6dd0539d..482aadcb 100644--- a/packages/cli/src/providers/model-discovery.test.ts+++ b/packages/cli/src/providers/model-discovery.test.ts@@ -9,6 +9,9 @@*/import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";+import { tmpdir } from "node:os";+import { join } from "node:path";import { credentials } from "../auth/credentials/authority.js";import {@@ -23,7 +26,6 @@ import {} from "./model-discovery.js";import type { ProviderDefinition } from "./provider-definitions.js";import { clearRuntimeRegistry, registerRuntimeProvider } from "./runtime-providers.js";-import { OpenAIProviderTransport } from "./transport/openai.js";const realFetch = globalThis.fetch;const realGetRequestAuth = credentials.getRequestAuth;@@ -502,45 +504,62 @@ describe("rankDiscoveredModels", () => {describe("OpenAI-compatible probe discovery", () => {test("uses an authenticated dynamic models catalog and advances past excluded models", async () => {- const provider: ProviderDefinition = {- name: "account-scoped-openai-probe-test",- displayName: "Account Scoped Probe Test",- transport: "openai",- baseUrl: "https://account-scoped.invalid",- apiPath: "/v1/chat/completions",- apiKeyEnvVar: "ACCOUNT_SCOPED_PROBE_TEST_KEY",- apiKeyDescription: "Offline test key",- apiKeyUrl: "https://account-scoped.invalid/key",- shortcuts: [],- legacyPrefixes: [],- modelDiscovery: { path: "/v1/models", format: "openai-models-list" },- createHandler: { kind: "none", reason: "virtual", note: "Offline test fixture" },- isDirectApi: true,- };- registerRuntimeProvider(provider);- stubJsonResponse({- data: [- { id: "grok-4.5", context_length: 500_000 },- { id: "grok-4.6", context_length: 1_000_000 },- { id: "grok-imagine-image", context_length: 2_000_000 },- ],- });-- const transport = new OpenAIProviderTransport(- {- name: provider.name,- baseUrl: provider.baseUrl,- apiPath: provider.apiPath,- apiKeyEnvVar: provider.apiKeyEnvVar,- prefixes: [],- },- "<discover>",- ""- );-- expect(await transport.discoverProbeModel()).toEqual({ model: "grok-4.6" });- expect(await transport.discoverProbeModel(new Set(["grok-4.6"]))).toEqual({- model: "grok-4.5",- });+ // The probe filter requires published chat metadata; isolate its default+ // cache in a child rather than depending on the developer's cloud cache.+ const home = mkdtempSync(join(tmpdir(), "probe-discovery-"));+ try {+ mkdirSync(join(home, ".claudish"));+ const fixture = readFileSync(+ new URL(+ "../test-fixtures/catalog-v3/wire-g-20261012101007285-7770c36e.json",+ import.meta.url+ ),+ "utf8"+ );+ writeFileSync(join(home, ".claudish/cloud-models-catalog-v3.json"), fixture);+ const child = Bun.spawnSync(+ [+ process.execPath,+ "--eval",+ `+ const { registerRuntimeProvider } = await import(${JSON.stringify(new URL("./runtime-providers.ts", import.meta.url).pathname)});+ const { OpenAIProviderTransport } = await import(${JSON.stringify(new URL("./transport/openai.ts", import.meta.url).pathname)});+ const { credentials } = await import(${JSON.stringify(new URL("../auth/credentials/authority.ts", import.meta.url).pathname)});+ const provider = { name: "account-scoped-openai-probe-test", displayName: "Account Scoped Probe Test", transport: "openai", baseUrl: "https://account-scoped.invalid", apiPath: "/v1/chat/completions", apiKeyEnvVar: "ACCOUNT_SCOPED_PROBE_TEST_KEY", apiKeyDescription: "Test", apiKeyUrl: "https://example.invalid", shortcuts: [], legacyPrefixes: [], modelDiscovery: { path: "/v1/models", format: "openai-models-list" }, createHandler: {kind: "none", reason: "virtual", note: "test"}, isDirectApi: true };+ registerRuntimeProvider(provider);+ const originalFetch = globalThis.fetch, originalAuth = credentials.getRequestAuth;+ credentials.getRequestAuth = async () => ({headers: {Authorization: "Bearer fake"}});+ const calls = [];+ globalThis.fetch = async (url, init) => {+ calls.push({ url, headers: Object.fromEntries(new Headers(init.headers)) });+ return Response.json({data: [{id: "grok-4.7", context_length: 1000000}, {id: "grok-build-0.1", context_length: 500000}, {id: "mai-voice-2.1", context_length: 2000000}]});+ };+ try {+ const transport = new OpenAIProviderTransport({...provider, prefixes: []}, "<discover>", "");+ console.log(JSON.stringify({first: await transport.discoverProbeModel(), second: await transport.discoverProbeModel(new Set(["grok-4.7"])), calls}));+ } finally { globalThis.fetch = originalFetch; credentials.getRequestAuth = originalAuth; }+ `,+ ],+ {+ env: {+ PATH: process.env.PATH,+ HOME: home,+ CLAUDISH_DISABLE_KEYCHAIN: "1",+ CLAUDISH_DISABLE_OP: "1",+ CLAUDISH_DISABLE_CATALOG_WARM: "1",+ },+ stdout: "pipe",+ stderr: "pipe",+ }+ );+ expect(child.exitCode, child.stderr.toString()).toBe(0);+ const result = JSON.parse(child.stdout.toString());+ expect(result.first).toEqual({ model: "grok-4.7" });+ expect(result.second).toEqual({ model: "grok-build-0.1" });+ expect(result.calls).toHaveLength(1);+ expect(result.calls[0].headers.authorization).toBe("Bearer fake");+ } finally {+ rmSync(home, { recursive: true, force: true });+ }});});diff --git a/packages/cli/src/providers/model-discovery.ts b/packages/cli/src/providers/model-discovery.tsindex d3a253f1..a784d2ba 100644--- a/packages/cli/src/providers/model-discovery.ts+++ b/packages/cli/src/providers/model-discovery.ts@@ -29,6 +29,7 @@import { credentials } from "../auth/credentials/authority.js";import { log } from "../logger.js";import { VERSION } from "../version.js";+import { resolveRouteProfile } from "./connection-resolver.js";import { compareByReleaseDateDesc } from "./model-ordering.js";import type { ModelOffer, ModelsCatalogAxis, ModelsCatalogEntry } from "./model-resolvers/types.js";import { getProviderByName } from "./provider-definitions.js";@@ -396,6 +397,27 @@ export function invalidateModelDiscovery(provider?: string): void {}}+/**+ * The model-list URL for a catalog-routed provider: its route profile's base+ * URL in the route registry plus `/models` — the host its requests use, so+ * discovery moves with the registry (OpenCode moved Zen to+ * `opencode.ai/inference/v1` on 2026-10-12). Every registry base already ends+ * in the API's version root. `undefined` — keep the definition's URL — when+ * the user overrode the base URL, or no registry is cached.+ */+function registryModelsEndpoint(+ providerName: string,+ def: { baseUrlEnvVars?: string[] }+): string | undefined {+ if ((def.baseUrlEnvVars ?? []).some((envVar) => process.env[envVar])) return undefined;+ const profile = resolveRouteProfile(providerName)?.profile;+ const base =+ profile?.apis["chat-completions"]?.baseUrl ??+ profile?.apis.responses?.baseUrl ??+ profile?.apis["anthropic-messages"]?.baseUrl;+ return base ? `${base.replace(/\/+$/, "")}/models` : undefined;+}+/*** Resolve a provider's base URL: env override (in catalog order), else the* catalog default. Mirrors localBaseUrl() but works for remote providers too.@@ -646,7 +668,7 @@ export async function discoverProviderModelsCatalog(detail: `no base URL resolved — check ${overrides || "the provider's baseUrl"}`,});}- const endpoint = `${baseUrl}${descriptor.path}`;+ const endpoint = registryModelsEndpoint(providerName, def) ?? `${baseUrl}${descriptor.path}`;// Auth via the credential authority — it owns OAuth-vs-API-key precedence// (Kimi Coding prefers an OAuth token over a stale KIMI_CODING_API_KEY) and