Skip to content

fix: remove 0.6s copilot overhead when copilot is not in enabled_providers #37924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quark-zju wants to merge 1 commit into
base: dev
Choose a base branch
from
+20 −2
Open

fix: remove 0.6s copilot overhead when copilot is not in enabled_providers #37924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/opencode/src/provider/provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,6 +1395,7 @@ const layer = Layer.effect(
if (!p || !models) continue

const providerID = ProviderV2.ID.make(p.id)
if (enabled && !enabled.has(providerID)) continue
if (disabled.has(providerID)) continue

const provider = database[providerID]
Expand Down Expand Up @@ -1544,7 +1545,9 @@ const layer = Layer.effect(
for (const plugin of plugins) {
if (!plugin.auth) continue
const providerID = ProviderV2.ID.make(plugin.auth.provider)
if (disabled.has(providerID)) continue
if (!isProviderAllowed(providerID)) continue
const data = database[providerID]
if (!data) continue

const stored = yield* auth.get(providerID).pipe(Effect.orDie)
if (!stored) continue
Expand All @@ -1553,7 +1556,7 @@ const layer = Layer.effect(
const options = yield* Effect.promise(() =>
plugin.auth!.loader!(
() => bridge.promise(auth.get(providerID).pipe(Effect.orDie)) as any,
toPublicInfo(database[plugin.auth!.provider]),
toPublicInfo(data),
),
)
const opts = options ?? {}
Expand Down
15 changes: 15 additions & 0 deletions packages/opencode/test/provider/provider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,21 @@ it.instance(
{ config: { enabled_providers: ["anthropic"] } },
)

it.instance(
"enabled_providers skips auth loaders for filtered providers",
Effect.gen(function* () {
yield* setProcessEnv(
"OPENCODE_AUTH_CONTENT",
JSON.stringify({
google: { type: "oauth", refresh: "dummy", access: "dummy", expires: 9999999999999 },
}),
)
const providers = yield* list
expect(providers[ProviderV2.ID.google]).toBeUndefined()
}),
{ config: { enabled_providers: ["anthropic"] } },
)

it.instance(
"model whitelist filters models for provider",
Effect.gen(function* () {
Expand Down
Loading