feat: support custom baseURL via opencode.json and ANTHROPIC_BASE_URL… #229
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1201,3 +1201,285 @@ describe("refreshIfNeeded — token expiry", () => { | |
| ) | ||
| }) | ||
| }) | ||
|
|
||
| describe("custom baseURL support via provider.options.baseURL and ANTHROPIC_BASE_URL env", () => { | ||
| it("uses default baseURL when no config or env var is set", async () => { | ||
| const originalSetInterval = globalThis.setInterval | ||
| const originalHome = process.env.HOME | ||
| const originalFetch = globalThis.fetch | ||
| const originalEnv = process.env.ANTHROPIC_BASE_URL | ||
|
|
||
| delete process.env.ANTHROPIC_BASE_URL | ||
| const tempHome = await mkdtemp(join(tmpdir(), "opencode-claude-auth-baseurl-")) | ||
| process.env.HOME = tempHome | ||
| Date.now = () => 1_700_000_000_000 | ||
| globalThis.setInterval = (() => ({ unref() {} })) as unknown as typeof setInterval | ||
|
|
||
| let forwardedInput: RequestInfo | URL | undefined | ||
|
|
||
| try { | ||
| const { helpersModule } = await loadHelpersWithCountingKeychain( | ||
| Date.now() + 10 * 60_000, | ||
| ) | ||
| globalThis.fetch = (async (input: RequestInfo | URL) => { | ||
| forwardedInput = input | ||
| return new Response("ok") | ||
| }) as typeof fetch | ||
|
|
||
| const plugin = await helpersModule.default({} as never) | ||
| const typedPlugin = plugin as { auth?: { loader?: TestAuthLoader } } | ||
| const authConfig = await typedPlugin.auth!.loader!( | ||
| async () => ({ | ||
| type: "oauth", | ||
| refresh: "refresh", | ||
| access: "access", | ||
| expires: Date.now() + 60_000, | ||
| }), | ||
| { models: {} }, | ||
| ) | ||
|
|
||
| await authConfig.fetch("https://api.anthropic.com/v1/messages", { | ||
| method: "POST", | ||
| body: JSON.stringify({ model: "claude-haiku-4-5", messages: [] }), | ||
| }) | ||
|
|
||
| assert.equal( | ||
| String(forwardedInput), | ||
| "https://api.anthropic.com/v1/messages?beta=true", | ||
| "Should use default baseURL when no override is set", | ||
| ) | ||
| } finally { | ||
| rmSync(tempHome, { recursive: true, force: true }) | ||
| globalThis.setInterval = originalSetInterval | ||
| globalThis.fetch = originalFetch | ||
| if (typeof originalHome === "string") { | ||
| process.env.HOME = originalHome | ||
| } else { | ||
| delete process.env.HOME | ||
| } | ||
| if (typeof originalEnv === "string") { | ||
| process.env.ANTHROPIC_BASE_URL = originalEnv | ||
| } else { | ||
| delete process.env.ANTHROPIC_BASE_URL | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| it("uses provider.options.baseURL when provided", async () => { | ||
| const originalSetInterval = globalThis.setInterval | ||
| const originalHome = process.env.HOME | ||
| const originalFetch = globalThis.fetch | ||
|
|
||
| const tempHome = await mkdtemp(join(tmpdir(), "opencode-claude-auth-baseurl-")) | ||
| process.env.HOME = tempHome | ||
| Date.now = () => 1_700_000_000_000 | ||
| globalThis.setInterval = (() => ({ unref() {} })) as unknown as typeof setInterval | ||
|
|
||
| try { | ||
| const { helpersModule } = await loadHelpersWithCountingKeychain( | ||
| Date.now() + 10 * 60_000, | ||
| ) | ||
| globalThis.fetch = (async () => new Response("ok")) as typeof fetch | ||
|
|
||
| const plugin = await helpersModule.default({} as never) | ||
| const typedPlugin = plugin as { auth?: { loader?: TestAuthLoader } } | ||
|
|
||
| const customProvider = { | ||
| models: { "claude-haiku-4-5": { cost: 0 } }, | ||
| options: { baseURL: "https://proxy.example.com/v1" }, | ||
| } as unknown as { models: Record<string, { cost?: unknown }> } | ||
|
|
||
| const authConfigWithBaseURL = await typedPlugin.auth!.loader!( | ||
| async () => ({ | ||
| type: "oauth", | ||
| refresh: "refresh", | ||
| access: "access", | ||
| expires: Date.now() + 60_000, | ||
| }), | ||
| customProvider, | ||
| ) | ||
|
|
||
| assert.equal( | ||
| (authConfigWithBaseURL as { baseURL?: string }).baseURL, | ||
| "https://proxy.example.com/v1", | ||
| "Should use provider.options.baseURL when provided", | ||
| ) | ||
| } finally { | ||
| rmSync(tempHome, { recursive: true, force: true }) | ||
| globalThis.setInterval = originalSetInterval | ||
| globalThis.fetch = originalFetch | ||
| if (typeof originalHome === "string") { | ||
| process.env.HOME = originalHome | ||
| } else { | ||
| delete process.env.HOME | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| it("uses ANTHROPIC_BASE_URL env var when set and no provider.options.baseURL", async () => { | ||
| const originalSetInterval = globalThis.setInterval | ||
| const originalHome = process.env.HOME | ||
| const originalFetch = globalThis.fetch | ||
| const originalEnv = process.env.ANTHROPIC_BASE_URL | ||
|
|
||
| process.env.ANTHROPIC_BASE_URL = "https://gateway.example.com/anthropic/v1" | ||
| const tempHome = await mkdtemp(join(tmpdir(), "opencode-claude-auth-baseurl-")) | ||
| process.env.HOME = tempHome | ||
| Date.now = () => 1_700_000_000_000 | ||
| globalThis.setInterval = (() => ({ unref() {} })) as unknown as typeof setInterval | ||
|
|
||
| try { | ||
| const { helpersModule } = await loadHelpersWithCountingKeychain( | ||
| Date.now() + 10 * 60_000, | ||
| ) | ||
| globalThis.fetch = (async () => new Response("ok")) as typeof fetch | ||
|
|
||
| const plugin = await helpersModule.default({} as never) | ||
| const typedPlugin = plugin as { auth?: { loader?: TestAuthLoader } } | ||
| const authConfig = await typedPlugin.auth!.loader!( | ||
| async () => ({ | ||
| type: "oauth", | ||
| refresh: "refresh", | ||
| access: "access", | ||
| expires: Date.now() + 60_000, | ||
| }), | ||
| { models: {} }, | ||
| ) | ||
|
|
||
| assert.equal( | ||
| (authConfig as { baseURL?: string }).baseURL, | ||
| "https://gateway.example.com/anthropic/v1", | ||
| "Should use ANTHROPIC_BASE_URL when env var is set", | ||
| ) | ||
| } finally { | ||
| rmSync(tempHome, { recursive: true, force: true }) | ||
| globalThis.setInterval = originalSetInterval | ||
| globalThis.fetch = originalFetch | ||
| if (typeof originalHome === "string") { | ||
| process.env.HOME = originalHome | ||
| } else { | ||
| delete process.env.HOME | ||
| } | ||
| if (typeof originalEnv === "string") { | ||
| process.env.ANTHROPIC_BASE_URL = originalEnv | ||
| } else { | ||
| delete process.env.ANTHROPIC_BASE_URL | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| it("prioritizes provider.options.baseURL over ANTHROPIC_BASE_URL env var", async () => { | ||
| const originalSetInterval = globalThis.setInterval | ||
| const originalHome = process.env.HOME | ||
| const originalFetch = globalThis.fetch | ||
| const originalEnv = process.env.ANTHROPIC_BASE_URL | ||
|
|
||
| process.env.ANTHROPIC_BASE_URL = "https://gateway.example.com/anthropic/v1" | ||
| const tempHome = await mkdtemp(join(tmpdir(), "opencode-claude-auth-baseurl-")) | ||
| process.env.HOME = tempHome | ||
| Date.now = () => 1_700_000_000_000 | ||
| globalThis.setInterval = (() => ({ unref() {} })) as unknown as typeof setInterval | ||
|
|
||
| try { | ||
| const { helpersModule } = await loadHelpersWithCountingKeychain( | ||
| Date.now() + 10 * 60_000, | ||
| ) | ||
| globalThis.fetch = (async () => new Response("ok")) as typeof fetch | ||
|
|
||
| const plugin = await helpersModule.default({} as never) | ||
| const typedPlugin = plugin as { auth?: { loader?: TestAuthLoader } } | ||
|
|
||
| const customProvider = { | ||
| models: { "claude-haiku-4-5": { cost: 0 } }, | ||
| options: { baseURL: "https://config-priority.example.com/v1" }, | ||
| } as unknown as { models: Record<string, { cost?: unknown }> } | ||
|
|
||
| const authConfig = await typedPlugin.auth!.loader!( | ||
| async () => ({ | ||
| type: "oauth", | ||
| refresh: "refresh", | ||
| access: "access", | ||
| expires: Date.now() + 60_000, | ||
| }), | ||
| customProvider, | ||
| ) | ||
|
|
||
| assert.equal( | ||
| (authConfig as { baseURL?: string }).baseURL, | ||
| "https://config-priority.example.com/v1", | ||
| "Should prioritize provider.options.baseURL over ANTHROPIC_BASE_URL", | ||
| ) | ||
| } finally { | ||
| rmSync(tempHome, { recursive: true, force: true }) | ||
| globalThis.setInterval = originalSetInterval | ||
| globalThis.fetch = originalFetch | ||
| if (typeof originalHome === "string") { | ||
| process.env.HOME = originalHome | ||
| } else { | ||
| delete process.env.HOME | ||
| } | ||
| if (typeof originalEnv === "string") { | ||
| process.env.ANTHROPIC_BASE_URL = originalEnv | ||
| } else { | ||
| delete process.env.ANTHROPIC_BASE_URL | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| it("does not double the /v1 path segment", async () => { | ||
| const originalSetInterval = globalThis.setInterval | ||
| const originalHome = process.env.HOME | ||
| const originalFetch = globalThis.fetch | ||
| const originalEnv = process.env.ANTHROPIC_BASE_URL | ||
|
|
||
| process.env.ANTHROPIC_BASE_URL = "https://proxy.example.com/v1" | ||
| const tempHome = await mkdtemp(join(tmpdir(), "opencode-claude-auth-baseurl-")) | ||
| process.env.HOME = tempHome | ||
| Date.now = () => 1_700_000_000_000 | ||
| globalThis.setInterval = (() => ({ unref() {} })) as unknown as typeof setInterval | ||
|
|
||
| try { | ||
| const { helpersModule } = await loadHelpersWithCountingKeychain( | ||
| Date.now() + 10 * 60_000, | ||
| ) | ||
| globalThis.fetch = (async () => new Response("ok")) as typeof fetch | ||
|
|
||
| const plugin = await helpersModule.default({} as never) | ||
| const typedPlugin = plugin as { auth?: { loader?: TestAuthLoader } } | ||
| const authConfig = await typedPlugin.auth!.loader!( | ||
| async () => ({ | ||
| type: "oauth", | ||
| refresh: "refresh", | ||
| access: "access", | ||
| expires: Date.now() + 60_000, | ||
| }), | ||
| { models: {} }, | ||
| ) | ||
|
|
||
| const baseURL = (authConfig as { baseURL?: string }).baseURL | ||
| assert.ok( | ||
| baseURL && !baseURL.includes("/v1/v1"), | ||
| `baseURL should not contain doubled /v1 path: ${baseURL}`, | ||
| ) | ||
| assert.equal( | ||
| baseURL, | ||
| "https://proxy.example.com/v1", | ||
| "baseURL should be correctly set from ANTHROPIC_BASE_URL env var", | ||
| ) | ||
| } finally { | ||
| rmSync(tempHome, { recursive: true, force: true }) | ||
| globalThis.setInterval = originalSetInterval | ||
| globalThis.fetch = originalFetch | ||
| if (typeof originalHome === "string") { | ||
| process.env.HOME = originalHome | ||
| } else { | ||
| delete process.env.HOME | ||
| } | ||
| if (typeof originalEnv === "string") { | ||
| process.env.ANTHROPIC_BASE_URL = originalEnv | ||
| } else { | ||
| delete process.env.ANTHROPIC_BASE_URL | ||
| } | ||
| } | ||
| }) | ||
| }) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -318,9 +318,14 @@ const plugin: Plugin = async () => { | |
| modelCount: Object.keys(provider.models).length, | ||
| }) | ||
|
|
||
| const effectiveBaseURL = | ||
| provider.options?.baseURL || | ||
| process.env.ANTHROPIC_BASE_URL || | ||
| "https://api.anthropic.com/v1" | ||
|
|
||
| return { | ||
| apiKey: "", | ||
| baseURL: effectiveBaseURL, | ||
|
Comment on lines
+321
to
+328
There was a problem hiding this comment.
The README and PR description prominently state that Prompt To Fix With AIThis is a comment left during a code review.
Path: src/index.ts
Line: 321-328
Comment:
**Custom headers from `provider.options.headers` are documented but not forwarded**
The README and PR description prominently state that `provider.anthropic.options.headers` entries are "automatically forwarded to all API requests" (useful for `X-Gateway-Key` etc.). However, only `provider.options?.baseURL` is consumed here — `provider.options?.headers` is never read. `buildRequestHeaders` takes its input only from the `init` argument supplied by the framework, not from provider config headers. Any user who configures headers in `opencode.json` expecting them to reach the proxy will receive a silent failure.
How can I resolve this? If you propose a fix, please make it concise. |
||
| async fetch(input: RequestInfo | URL, init?: RequestInit) { | ||
| const latest = getCachedCredentials() | ||
| if (!latest) { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The table entry for
ANTHROPIC_BASE_URLsays "Takes precedence over config file," but the code and the priority section above it both say the opposite:provider.anthropic.options.baseURLwins over the env var. A user reading only the table will believe they can override a config-file URL with the env var, try it, and find it silently doesn't work.Prompt To Fix With AI