fix: always apply Anthropic beta headers wrapper for OAuth token support

hnykda · claude · hnykda · commit efdb349931c0 · 2026-03-09T22:46:25.000+01:00
The `createAnthropicBetaHeadersWrapper` was only applied when `resolveAnthropicBetas` returned non-empty (i.e., when `context1m` or `anthropicBeta` was set in agent extra params). When `context-1m` was configured via model-level headers instead of extra params, the wrapper was never applied, so the critical `oauth-2025-04-20` beta was never injected for OAuth tokens (`sk-ant-oat-*`). This caused Anthropic to reject all requests with HTTP 401 "OAuth authentication is currently not supported." Now the wrapper is always applied for Anthropic providers, ensuring OAuth token detection and beta injection runs unconditionally. Fixes #41444 Related: #19769, #19789 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
diff --git a/src/agents/pi-embedded-runner-extraparams.test.ts b/src/agents/pi-embedded-runner-extraparams.test.ts
@@ -1348,7 +1348,7 @@ describe("applyExtraParamsToAgent", () => {
     });
   });
 
-  it("does not add Anthropic 1M beta header when context1m is not enabled", () => {
+  it("injects pi-ai default betas even when context1m is not enabled", () => {
     const cfg = buildAnthropicModelConfig("anthropic/claude-opus-4-6", {
       temperature: 0.2,
     });
@@ -1358,7 +1358,29 @@ describe("applyExtraParamsToAgent", () => {
       options: { headers: { "X-Custom": "1" } },
     });
 
-    expect(headers).toEqual({ "X-Custom": "1" });
+    expect(headers).toEqual({
+      "X-Custom": "1",
+      "anthropic-beta": "fine-grained-tool-streaming-2025-05-14,interleaved-thinking-2025-05-14",
+    });
+  });
+
+  it("injects OAuth betas for sk-ant-oat tokens even without context1m", () => {
+    const cfg = buildAnthropicModelConfig("anthropic/claude-opus-4-6", {
+      temperature: 0.2,
+    });
+    const headers = runAnthropicHeaderCase({
+      cfg,
+      modelId: "claude-opus-4-6",
+      options: {
+        apiKey: "sk-ant-oat01-test-oauth-token", // pragma: allowlist secret
+        headers: { "X-Custom": "1" },
+      },
+    });
+
+    const betaHeader = headers?.["anthropic-beta"] as string;
+    expect(betaHeader).toContain("oauth-2025-04-20");
+    expect(betaHeader).toContain("claude-code-20250219");
+    expect(betaHeader).not.toContain("context-1m-2025-08-07");
   });
 
   it("skips context1m beta for OAuth tokens but preserves OAuth-required betas", () => {
@@ -1425,14 +1447,17 @@ describe("applyExtraParamsToAgent", () => {
     });
   });
 
-  it("ignores context1m for non-Opus/Sonnet Anthropic models", () => {
+  it("ignores context1m for non-Opus/Sonnet Anthropic models but still injects default betas", () => {
     const cfg = buildAnthropicModelConfig("anthropic/claude-haiku-3-5", { context1m: true });
     const headers = runAnthropicHeaderCase({
       cfg,
       modelId: "claude-haiku-3-5",
       options: { headers: { "X-Custom": "1" } },
     });
-    expect(headers).toEqual({ "X-Custom": "1" });
+    expect(headers).toEqual({
+      "X-Custom": "1",
+      "anthropic-beta": "fine-grained-tool-streaming-2025-05-14,interleaved-thinking-2025-05-14",
+    });
   });
 
   it("forces store=true for direct OpenAI Responses payloads", () => {
diff --git a/src/agents/pi-embedded-runner/extra-params.ts b/src/agents/pi-embedded-runner/extra-params.ts
@@ -359,11 +359,12 @@ export function applyExtraParamsToAgent(
   }
 
   const anthropicBetas = resolveAnthropicBetas(merged, provider, modelId);
-  if (anthropicBetas?.length) {
-    log.debug(
-      `applying Anthropic beta header for ${provider}/${modelId}: ${anthropicBetas.join(",")}`,
-    );
-    agent.streamFn = createAnthropicBetaHeadersWrapper(agent.streamFn, anthropicBetas);
+  if (provider === "anthropic") {
+    const betas = anthropicBetas ?? [];
+    if (betas.length) {
+      log.debug(`applying Anthropic beta header for ${provider}/${modelId}: ${betas.join(",")}`);
+    }
+    agent.streamFn = createAnthropicBetaHeadersWrapper(agent.streamFn, betas);
   }
 
   if (shouldApplySiliconFlowThinkingOffCompat({ provider, modelId, thinkingLevel })) {
