From 251e299980b3e4d89a45d7c3b8328ec4371d1208 Mon Sep 17 00:00:00 2001
From: Vadym O <bolein95@gmail.com>
Date: Mon, 19 Oct 2026 01:38:42 +0800
Subject: [PATCH 1/2] fix(messages-native): answer a spent Anthropic pool as a
 usage limit with its reset

#6991 made the bridge lane answer a 429 as "All Anthropic OAuth accounts have
reached their usage limit; the first one resets at <time>" once the last pool
account refuses on spent quota and rotation finds no replacement. The managed
native Messages lane rotates through the same pool but, when it runs out,
relays the upstream rate_limit_error ("try again later") unchanged, so Claude
Code on that lane never learns the window is spent or when it reopens.

After rotation ends on a 429, the native lane now asks the same
anthropicPoolUsageLimitAfterRefusal the bridge uses and, when it holds,
answers through the lane's existing AnthropicAccountCooldownError mapping
(429 rate_limit_error, the usage-limit message, Retry-After).

Co-Authored-By: Claude Code <noreply@anthropic.com>
---
 src/server/messages-native.ts                 | 11 +++++++++
 .../messages-native-oauth.test.ts             | 23 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/server/messages-native.ts b/src/server/messages-native.ts
index 192a8d92d23..1c4b9fd5ac0 100644
--- a/src/server/messages-native.ts
+++ b/src/server/messages-native.ts
@@ -849,6 +849,17 @@ export async function handleNativeMessages(options: HandleNativeMessagesOptions)
   }
   releaseRetainedRequest();
 
+  // The last pool account refused on spent quota and rotation found no replacement: answer the
+  // usage limit with its reset (#6991), as the bridge lane does, not the upstream "try again later".
+  const poolUsageLimit = response.status === 429 && oauthBinding
+    ? anthropicRoutingFor(nativeInstance!).anthropicPoolUsageLimitAfterRefusal(Date.now(), oauthBinding.routeDecision, route.modelId)
+    : null;
+  if (poolUsageLimit) {
+    discard(response);
+    cleanupAbort();
+    logCtx.errorCode = "usage_limit_reached";
+    return retainUpstreamMessagesRequestId(localOAuthFailure(poolUsageLimit)!, response.headers);
+  }
   if (!response.ok) {
     let bodyText = "";
     try {
diff --git a/tests/claude-integration/messages-native-oauth.test.ts b/tests/claude-integration/messages-native-oauth.test.ts
index 07e980157d1..2a620838ab1 100644
--- a/tests/claude-integration/messages-native-oauth.test.ts
+++ b/tests/claude-integration/messages-native-oauth.test.ts
@@ -819,6 +819,29 @@ test("shared quota exhaustion is bounded and never resends an already-tried alte
   expect(new Set(sent.map(entry => entry.headers.get("authorization"))).size).toBe(sent.length);
 });
 
+test("a pool whose every account refuses on spent quota answers the usage limit and its reset (#6991 parity)", async () => {
+  await seed(2);
+  const config = fixtureConfig();
+  config.anthropicAccountPool = { enabled: true };
+  const resetSeconds = Math.floor(Date.now() / 1000) + 7_200;
+  config.providers.anthropic!.fetch = (async (input, init) => {
+    sent.push({ url: String(input), headers: new Headers(init?.headers), body: JSON.parse(String(init?.body)) });
+    return Response.json({ type: "error", error: { type: "rate_limit_error", message: "fixture window spent" } }, {
+      status: 429,
+      headers: { "anthropic-ratelimit-unified-7d-status": "rejected", "anthropic-ratelimit-unified-7d-reset": String(resetSeconds), "retry-after": "7200" },
+    });
+  }) as typeof fetch;
+  const { response, text, row } = await send(config, { ...BODY, stream: false });
+  expect(response.status).toBe(429);
+  expect(sent).toHaveLength(2);
+  expect(JSON.parse(text).error).toMatchObject({
+    type: "rate_limit_error",
+    message: `All Anthropic OAuth accounts have reached their usage limit; the first one resets at ${new Date(resetSeconds * 1000).toISOString()}`,
+  });
+  expect(Number(response.headers.get("retry-after"))).toBeGreaterThan(7_000);
+  expect(row.protocolTrace?.mode).toBe("native");
+});
+
 test("family lease releases when spend admission refuses without a physical send", async () => {
   await seed(1);
   const config = fixtureConfig();

From ba62d33ab993cacefe33f61fe638290f0b75a40d Mon Sep 17 00:00:00 2001
From: Vadym O <bolein95@gmail.com>
Date: Mon, 19 Oct 2026 02:22:37 +0800
Subject: [PATCH 2/2] test(messages-native): pin request-id retention on the
 pooled usage-limit answer

Co-Authored-By: Claude Code <noreply@anthropic.com>
---
 tests/claude-integration/messages-native-oauth.test.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/claude-integration/messages-native-oauth.test.ts b/tests/claude-integration/messages-native-oauth.test.ts
index 2a620838ab1..2a639c4686f 100644
--- a/tests/claude-integration/messages-native-oauth.test.ts
+++ b/tests/claude-integration/messages-native-oauth.test.ts
@@ -828,7 +828,10 @@ test("a pool whose every account refuses on spent quota answers the usage limit
     sent.push({ url: String(input), headers: new Headers(init?.headers), body: JSON.parse(String(init?.body)) });
     return Response.json({ type: "error", error: { type: "rate_limit_error", message: "fixture window spent" } }, {
       status: 429,
-      headers: { "anthropic-ratelimit-unified-7d-status": "rejected", "anthropic-ratelimit-unified-7d-reset": String(resetSeconds), "retry-after": "7200" },
+      headers: {
+        "anthropic-ratelimit-unified-7d-status": "rejected", "anthropic-ratelimit-unified-7d-reset": String(resetSeconds),
+        "retry-after": "7200", "request-id": "req_fixture_spent",
+      },
     });
   }) as typeof fetch;
   const { response, text, row } = await send(config, { ...BODY, stream: false });
@@ -839,6 +842,7 @@ test("a pool whose every account refuses on spent quota answers the usage limit
     message: `All Anthropic OAuth accounts have reached their usage limit; the first one resets at ${new Date(resetSeconds * 1000).toISOString()}`,
   });
   expect(Number(response.headers.get("retry-after"))).toBeGreaterThan(7_000);
+  expect(response.headers.get("request-id")).toBe("req_fixture_spent");
   expect(row.protocolTrace?.mode).toBe("native");
 });