Skip to content

Commit ad8f203

Browse files
committed
fix(core): restore Copilot request authentication
1 parent 15efcf9 commit ad8f203

4 files changed

Lines changed: 101 additions & 15 deletions

File tree

‎packages/core/src/github-copilot/models.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ type UsableModel = RemoteModel & {
7070
}
7171
}
7272

73+
export const Package = {
74+
OpenAI: "@ai-sdk/github-copilot",
75+
Anthropic: "@ai-sdk/github-copilot/anthropic",
76+
} as const
77+
7378
export async function get(baseURL: string, headers: RequestInit["headers"], existing: readonly Model.Info[]) {
7479
const response = await fetch(`${baseURL}/models`, {
7580
headers,
@@ -141,7 +146,7 @@ function build(id: Model.ID, remote: UsableModel, baseURL: string, previous?: Mo
141146
providerID: Provider.ID.githubCopilot,
142147
family: previous?.family ?? Model.Family.make(remote.capabilities.family),
143148
name: previous?.name ?? remote.name,
144-
package: Provider.aisdk(messages ? "@ai-sdk/anthropic" : "@ai-sdk/github-copilot"),
149+
package: Provider.aisdk(messages ? Package.Anthropic : Package.OpenAI),
145150
settings: Provider.mergeOverlay(previous?.settings, {
146151
baseURL: messages ? `${baseURL}/v1` : baseURL,
147152
...(endpoint ? { endpoint } : {}),

‎packages/core/src/plugin/provider/github-copilot.ts‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import type { PluginInternal } from "../internal"
1515
const clientID = "Ov23li8tweQw6odWQebz"
1616
const apiVersion = "2026-06-01"
1717
const userApiVersion = "2025-04-01"
18+
const copilotVersion = "0.26.7"
19+
const editorVersion = "vscode/1.99.3"
1820
const pollingSafetyMargin = 3000
1921
const methodID = Integration.MethodID.make("device")
2022

@@ -197,6 +199,22 @@ export const GithubCopilotPlugin = define({
197199
yield* ctx.catalog.transform((evt) => {
198200
const item = evt.provider.get(Provider.ID.githubCopilot)
199201
if (!item) return
202+
evt.provider.update(item.provider.id, (provider) => {
203+
if (Provider.packageName(provider.package) === "@ai-sdk/openai-compatible") {
204+
provider.package = Provider.aisdk(CopilotModels.Package.OpenAI)
205+
}
206+
})
207+
for (const model of item.models.values()) {
208+
evt.model.update(item.provider.id, model.id, (draft) => {
209+
const packageName = Provider.packageName(draft.package)
210+
if (packageName === "@ai-sdk/openai-compatible") {
211+
draft.package = Provider.aisdk(CopilotModels.Package.OpenAI)
212+
}
213+
if (packageName === "@ai-sdk/anthropic") {
214+
draft.package = Provider.aisdk(CopilotModels.Package.Anthropic)
215+
}
216+
})
217+
}
200218
if (loaded.models) {
201219
for (const id of item.models.keys()) {
202220
if (!loaded.models.has(Model.ID.make(id))) evt.model.remove(item.provider.id, id)
@@ -230,14 +248,14 @@ export const GithubCopilotPlugin = define({
230248
"sdk",
231249
Effect.fn(function* (evt) {
232250
if (evt.model.providerID !== Provider.ID.githubCopilot) return
233-
if (evt.package !== "@ai-sdk/github-copilot" && evt.package !== "@ai-sdk/anthropic") return
251+
if (evt.package !== CopilotModels.Package.OpenAI && evt.package !== CopilotModels.Package.Anthropic) return
252+
const anthropic = evt.package === CopilotModels.Package.Anthropic
234253
evt.options.fetch = copilotFetch(
235254
typeof evt.options.apiKey === "string" ? evt.options.apiKey : undefined,
236255
evt.options.fetch,
237-
evt.package === "@ai-sdk/anthropic",
238-
ctx.app,
256+
anthropic,
239257
)
240-
if (evt.package === "@ai-sdk/anthropic") {
258+
if (anthropic) {
241259
evt.options.headers = {
242260
...evt.options.headers,
243261
"anthropic-beta": "interleaved-thinking-2025-05-14",
@@ -316,12 +334,7 @@ function request(url: string, init: RequestInit) {
316334

317335
type Fetch = (input: Parameters<typeof fetch>[0], init?: RequestInit) => Promise<Response>
318336

319-
export function copilotFetch(
320-
token: string | undefined,
321-
upstream: Fetch | undefined,
322-
anthropic: boolean,
323-
app: App.Info,
324-
): Fetch {
337+
export function copilotFetch(token: string | undefined, upstream: Fetch | undefined, anthropic: boolean): Fetch {
325338
const send = upstream ?? fetch
326339
return async (input, init) => {
327340
const requestHeaders = new Headers(init?.headers)
@@ -330,7 +343,10 @@ export function copilotFetch(
330343
requestHeaders.delete("x-api-key")
331344
requestHeaders.set("Authorization", `Bearer ${token}`)
332345
}
333-
requestHeaders.set("User-Agent", App.useragent(app))
346+
requestHeaders.set("User-Agent", `GitHubCopilotChat/${copilotVersion}`)
347+
requestHeaders.set("Editor-Version", editorVersion)
348+
requestHeaders.set("Editor-Plugin-Version", `copilot-chat/${copilotVersion}`)
349+
requestHeaders.set("Copilot-Integration-Id", "vscode-chat")
334350
requestHeaders.set("Openai-Intent", "conversation-edits")
335351
requestHeaders.set("X-GitHub-Api-Version", apiVersion)
336352
if (anthropic) requestHeaders.set("anthropic-beta", "interleaved-thinking-2025-05-14")

‎packages/core/test/github-copilot/models.test.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,18 @@ test("defensively syncs advertised Copilot models", async () => {
4242
supports: { tool_calls: false },
4343
},
4444
},
45+
{
46+
model_picker_enabled: true,
47+
id: "claude-sonnet",
48+
name: "Claude Sonnet",
49+
version: "claude-sonnet-2026-06-01",
50+
supported_endpoints: ["/v1/messages"],
51+
capabilities: {
52+
family: "claude",
53+
limits: { max_output_tokens: 16000, max_prompt_tokens: 180000 },
54+
supports: { tool_calls: true },
55+
},
56+
},
4557
{ model_picker_enabled: true, id: "incomplete" },
4658
],
4759
}),
@@ -68,6 +80,7 @@ test("defensively syncs advertised Copilot models", async () => {
6880
Model.VariantID.make("high"),
6981
])
7082
expect(models.get(Model.ID.make("utility"))?.enabled).toBe(false)
83+
expect(models.get(Model.ID.make("claude-sonnet"))?.package).toBe(Provider.aisdk(CopilotModels.Package.Anthropic))
7184
expect(models.has(Model.ID.make("stale"))).toBe(false)
7285
expect(models.has(Model.ID.make("incomplete"))).toBe(false)
7386
} finally {

‎packages/core/test/plugin/provider-github-copilot.test.ts‎

Lines changed: 55 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import { AISDK } from "@opencode-ai/core/aisdk"
2-
import { App } from "@opencode-ai/core/app"
32
import { describe, expect, test } from "bun:test"
43
import { Effect } from "effect"
54
import { Catalog } from "@opencode-ai/core/catalog"
65
import { Model } from "@opencode-ai/core/model"
76
import { Plugin } from "@opencode-ai/core/plugin"
87
import { PluginHost } from "@opencode-ai/core/plugin/host"
98
import { copilotBaseURL, copilotFetch, GithubCopilotPlugin } from "@opencode-ai/core/plugin/provider/github-copilot"
9+
import { CopilotModels } from "@opencode-ai/core/github-copilot/models"
1010
import { Provider } from "@opencode-ai/core/provider"
1111
import { Integration } from "@opencode-ai/core/integration"
12+
import { Credential } from "@opencode-ai/core/credential"
13+
import { ModelResolver } from "@opencode-ai/core/model-resolver"
1214
import type { LanguageModelV3 } from "@ai-sdk/provider"
1315
import { testEffect } from "../lib/effect"
1416
import { PluginTestLayer } from "./fixture"
@@ -98,7 +100,6 @@ describe("GithubCopilotPlugin", () => {
98100
return Response.json({ ok: true })
99101
},
100102
false,
101-
App.make({ name: "test", version: "1.2.3", channel: "beta" }),
102103
)
103104
yield* Effect.promise(() =>
104105
send("https://api.githubcopilot.com/chat/completions", {
@@ -114,7 +115,10 @@ describe("GithubCopilotPlugin", () => {
114115
expect(requests[0]?.get("x-initiator")).toBe("user")
115116
expect(requests[0]?.get("copilot-vision-request")).toBe("true")
116117
expect(requests[0]?.get("x-github-api-version")).toBe("2026-06-01")
117-
expect(requests[0]?.get("user-agent")).toBe("opencode/beta/1.2.3/test")
118+
expect(requests[0]?.get("user-agent")).toBe("GitHubCopilotChat/0.26.7")
119+
expect(requests[0]?.get("editor-version")).toBe("vscode/1.99.3")
120+
expect(requests[0]?.get("editor-plugin-version")).toBe("copilot-chat/0.26.7")
121+
expect(requests[0]?.get("copilot-integration-id")).toBe("vscode-chat")
118122
}),
119123
)
120124

@@ -146,6 +150,54 @@ describe("GithubCopilotPlugin", () => {
146150
}),
147151
)
148152

153+
it.effect("routes all Copilot protocols through Copilot-owned SDK hooks", () =>
154+
Effect.gen(function* () {
155+
const catalog = yield* Catalog.Service
156+
yield* catalog.transform((draft) => {
157+
draft.provider.update(Provider.ID.githubCopilot, (provider) => {
158+
provider.package = Provider.aisdk("@ai-sdk/openai-compatible")
159+
})
160+
draft.model.update(Provider.ID.githubCopilot, Model.ID.make("claude-sonnet"), (model) => {
161+
model.package = Provider.aisdk("@ai-sdk/anthropic")
162+
})
163+
})
164+
yield* addPlugin()
165+
166+
expect(required(yield* catalog.provider.get(Provider.ID.githubCopilot)).package).toBe(
167+
Provider.aisdk(CopilotModels.Package.OpenAI),
168+
)
169+
expect(
170+
required(yield* catalog.model.get(Provider.ID.githubCopilot, Model.ID.make("claude-sonnet"))).package,
171+
).toBe(Provider.aisdk(CopilotModels.Package.Anthropic))
172+
173+
const fallback = yield* ModelResolver.fromCatalogModel(
174+
Model.Info.make({
175+
...Model.Info.default(Provider.ID.openai, Model.ID.make("fallback")),
176+
package: Provider.aisdk("@ai-sdk/openai"),
177+
settings: { baseURL: "https://openai.example/v1" },
178+
}),
179+
)
180+
const resolved = yield* ModelResolver.fromCatalogModel(
181+
required(yield* catalog.model.get(Provider.ID.githubCopilot, Model.ID.make("claude-sonnet"))),
182+
Credential.OAuth.make({
183+
type: "oauth",
184+
methodID: Integration.MethodID.make("device"),
185+
refresh: "github-token",
186+
access: "github-token",
187+
expires: 0,
188+
}),
189+
{
190+
loadAISDK: (runtime) =>
191+
Effect.sync(() => {
192+
expect(runtime.settings?.apiKey).toBe("github-token")
193+
return fallback
194+
}),
195+
},
196+
)
197+
expect(resolved).toBe(fallback)
198+
}),
199+
)
200+
149201
it.effect("selects languageModel when responses and chat are absent", () =>
150202
Effect.gen(function* () {
151203
const plugin = yield* Plugin.Service

0 commit comments

Comments
 (0)