π OpenHands: AI-Driven Development
fix(acp): warn on Claude OAuth token + ANTHROPIC_API_KEY conflict too (#1279)
simonrosenberg254c7c9570af
diff --git a/__tests__/constants/acp-providers.test.ts b/__tests__/constants/acp-providers.test.tsindex 769d559239..2f0da1006e 100644--- a/__tests__/constants/acp-providers.test.ts+++ b/__tests__/constants/acp-providers.test.ts@@ -208,6 +208,33 @@ describe("getAcpCredentialConflicts", () => {).toEqual([["CLAUDE_CODE_OAUTH_TOKEN", "ANTHROPIC_BASE_URL"]]);});+ it("flags the Claude OAuth token + API key pair when both are set", () => {+ // The SDK strips ANTHROPIC_API_KEY when the OAuth token is active+ // (software-agent-sdk#3588), so the key would be silently ignored.+ expect(+ getAcpCredentialConflicts(+ "claude-code",+ has("CLAUDE_CODE_OAUTH_TOKEN", "ANTHROPIC_API_KEY"),+ ),+ ).toEqual([["CLAUDE_CODE_OAUTH_TOKEN", "ANTHROPIC_API_KEY"]]);+ });++ it("flags both pairs when the token, API key, and base URL are all set", () => {+ expect(+ getAcpCredentialConflicts(+ "claude-code",+ has(+ "CLAUDE_CODE_OAUTH_TOKEN",+ "ANTHROPIC_API_KEY",+ "ANTHROPIC_BASE_URL",+ ),+ ),+ ).toEqual([+ ["CLAUDE_CODE_OAUTH_TOKEN", "ANTHROPIC_API_KEY"],+ ["CLAUDE_CODE_OAUTH_TOKEN", "ANTHROPIC_BASE_URL"],+ ]);+ });+it("stays quiet when only one side is set", () => {expect(getAcpCredentialConflicts("claude-code", has("CLAUDE_CODE_OAUTH_TOKEN")),diff --git a/src/constants/acp-providers.ts b/src/constants/acp-providers.tsindex 641ec3d7bb..126b3f7c24 100644--- a/src/constants/acp-providers.ts+++ b/src/constants/acp-providers.ts@@ -269,13 +269,21 @@ const ACP_RESERVED_CREDENTIALS: Record<string, ACPProviderSecretField[]> = {};/**- * Credential pairs that break each other at runtime, keyed by provider.- * Claude's OAuth token authenticates against Anthropic directly; an- * ``ANTHROPIC_BASE_URL`` set alongside it silently routes requests elsewhere- * and breaks the token's bearer auth (see docs/ACP_AGENTS.md).+ * Credential pairs that break each other at runtime, keyed by provider β+ * mirrors the SDK's ``_ENV_CONFLICT_MAP`` (software-agent-sdk#3588). Claude's+ * OAuth token (``CLAUDE_CODE_OAUTH_TOKEN``) authenticates against Anthropic+ * directly, so when it is set the SDK strips:+ * - ``ANTHROPIC_API_KEY`` β otherwise it takes precedence and silently+ * bypasses the subscription;+ * - ``ANTHROPIC_BASE_URL`` β otherwise it proxies the bearer to an endpoint+ * that rejects it (see docs/ACP_AGENTS.md).+ * Either one set alongside the token is silently ignored at runtime, so warn.*/const ACP_CREDENTIAL_CONFLICTS: Record<string, Array<[string, string]>> = {- "claude-code": [["CLAUDE_CODE_OAUTH_TOKEN", "ANTHROPIC_BASE_URL"]],+ "claude-code": [+ ["CLAUDE_CODE_OAUTH_TOKEN", "ANTHROPIC_API_KEY"],+ ["CLAUDE_CODE_OAUTH_TOKEN", "ANTHROPIC_BASE_URL"],+ ],};/**