diff --git a/packages/core/src/github-copilot/models.ts b/packages/core/src/github-copilot/models.ts index 50b7ce32493..9b8f10ffd9d 100644 --- a/packages/core/src/github-copilot/models.ts +++ b/packages/core/src/github-copilot/models.ts @@ -133,7 +133,7 @@ function usable(model: RemoteModel): model is UsableModel { } function build(id: Model.ID, remote: UsableModel, baseURL: string, previous?: Model.Info) { - const route = routeFor(remote.id, endpoint(remote.supported_endpoints)) + const route = routeFor(remote.id, endpoint(remote.supported_endpoints), baseURL) const image = (remote.capabilities.supports.vision ?? false) || (remote.capabilities.limits.vision?.supported_media_types ?? []).some((item) => item.startsWith("image/")) @@ -159,7 +159,7 @@ function build(id: Model.ID, remote: UsableModel, baseURL: string, previous?: Mo family: previous?.family ?? Model.Family.make(remote.capabilities.family), name: previous?.name ?? remote.name, package: route.package, - settings: Provider.mergeOverlay(previous?.settings, { baseURL: route.baseURL(baseURL) }), + settings: Provider.mergeOverlay(previous?.settings, { baseURL: route.baseURL }), headers: previous?.headers, body: previous?.body, capabilities: { @@ -200,13 +200,13 @@ const PACKAGES = { } as const satisfies Record /** The native package and base URL for the Copilot API that serves a model. */ -export function routeFor(modelID: string, advertised: Endpoint | undefined) { +export function routeFor(modelID: string, advertised: Endpoint | undefined, root: string) { const selected = advertised ?? fallbackEndpoint(modelID) return { endpoint: selected, package: PACKAGES[selected], // Copilot serves Anthropic Messages under /v1 and its OpenAI APIs at the root. - baseURL: (root: string) => (selected === "messages" ? `${root}/v1` : root), + baseURL: selected === "messages" ? `${root}/v1` : root, } } diff --git a/packages/core/src/plugin/provider/github-copilot.ts b/packages/core/src/plugin/provider/github-copilot.ts index bc851ae5154..b11f89f3b80 100644 --- a/packages/core/src/plugin/provider/github-copilot.ts +++ b/packages/core/src/plugin/provider/github-copilot.ts @@ -234,11 +234,10 @@ export const GithubCopilotPlugin = define({ : model.package === "@opencode/ai/providers/openai" ? "responses" : undefined, + loaded.baseURL ?? baseURL(), ) model.package = route.package - model.settings = Provider.mergeOverlay(model.settings, { - baseURL: route.baseURL(loaded.baseURL ?? baseURL()), - }) + model.settings = Provider.mergeOverlay(model.settings, { baseURL: route.baseURL }) }) } })