From 7a0b719cf128386c9ee61c505ba8d0ad1e2e1dd2 Mon Sep 17 00:00:00 2001 From: shivam <91240327+shivamhwp@users.noreply.github.com> Date: Fri, 20 Nov 2026 15:08:39 +0000 Subject: [PATCH 1/2] fix(server): a custom endpoint no longer shows the local login's usage limits get_usage reads the local Claude login, which a custom ANTHROPIC_BASE_URL may not route its requests through, so the instance showed another account's limits as valid. Publish unavailable limits for a custom endpoint instead. Co-Authored-By: Claude Haiku 5.5 --- apps/server/src/provider/ClaudeProvider.ts | 29 +++++---- .../src/provider/ProviderRegistry.test.ts | 40 ++++++++++++ ...m-endpoint-shows-unavailable-limits.e2e.ts | 63 +++++++++++++++++++ 3 files changed, 121 insertions(+), 11 deletions(-) create mode 100644 scripts/scenarios/claude-custom-endpoint-shows-unavailable-limits.e2e.ts diff --git a/apps/server/src/provider/ClaudeProvider.ts b/apps/server/src/provider/ClaudeProvider.ts index b657a2b813feb..51c363eabb3d7 100644 --- a/apps/server/src/provider/ClaudeProvider.ts +++ b/apps/server/src/provider/ClaudeProvider.ts @@ -868,17 +868,24 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")( apiKeySource: capabilities.apiKeySource, }); const usageCheckedAt = capabilities.usageCheckedAt ?? checkedAt; - const usageLimits = !capabilities.usage - ? makeUnavailableUsageLimits({ checkedAt, reason: "probeFailed" }) - : scopedLimitNames - ? yield* recordClaudeUsageResponse(scopedLimitNames, { - response: capabilities.usage, - checkedAt: usageCheckedAt, - }) - : claudeUsageResponseToLimits({ - response: capabilities.usage, - checkedAt: usageCheckedAt, - }).limits; + // get_usage reads the local login, which a custom endpoint may not route its requests through. + const usageLimits = customApiEndpoint + ? makeUnavailableUsageLimits({ + checkedAt, + reason: "unsupported", + message: "Usage limits aren't available for a custom API endpoint.", + }) + : !capabilities.usage + ? makeUnavailableUsageLimits({ checkedAt, reason: "probeFailed" }) + : scopedLimitNames + ? yield* recordClaudeUsageResponse(scopedLimitNames, { + response: capabilities.usage, + checkedAt: usageCheckedAt, + }) + : claudeUsageResponseToLimits({ + response: capabilities.usage, + checkedAt: usageCheckedAt, + }).limits; const resetCredits = resolveResetCredits && capabilities.subscriptionType && diff --git a/apps/server/src/provider/ProviderRegistry.test.ts b/apps/server/src/provider/ProviderRegistry.test.ts index e4ec16b77dde0..4973c5d5eed3f 100644 --- a/apps/server/src/provider/ProviderRegistry.test.ts +++ b/apps/server/src/provider/ProviderRegistry.test.ts @@ -318,6 +318,12 @@ type TestClaudeCapabilities = { readonly apiProvider: string | undefined; readonly slashCommands: ReadonlyArray; readonly models?: ReadonlyArray; + readonly usage?: { + readonly rate_limits_available: boolean; + readonly rate_limits?: { + readonly seven_day?: { readonly utilization: number; readonly resets_at: string | null }; + }; + }; }; function claudeCapabilities(overrides: Partial = {}) { @@ -4677,6 +4683,40 @@ it.layer( ), ); + it.effect("does not report the local login's limits for a custom endpoint", () => + Effect.gen(function* () { + const environment = yield* mergeProviderInstanceEnvironment([], { + ANTHROPIC_BASE_URL: "https://hub.example.ts.net:8317", + }); + const status = yield* checkClaudeProviderStatus( + defaultClaudeSettings, + claudeCapabilities({ + tokenSource: "none", + apiKeySource: "none", + apiProvider: "firstParty", + usage: { + rate_limits_available: true, + rate_limits: { + seven_day: { utilization: 0, resets_at: "2026-11-26T06:00:00Z" }, + }, + }, + }), + environment, + ); + assert.strictEqual(status.auth.type, "customEndpoint"); + assert.strictEqual(status.usageLimits?.unavailable?.reason, "unsupported"); + assert.deepStrictEqual(status.usageLimits?.windows, []); + }).pipe( + Effect.provide( + layerMockSpawner((args) => { + const joined = args.join(" "); + if (joined === "--version") return { stdout: "1.0.0\n", stderr: "", code: 0 }; + throw new Error(`Unexpected args: ${joined}`); + }), + ), + ), + ); + it.effect.each([ { settings: { env: { ANTHROPIC_BASE_URL: "https://hub.example.ts.net:8317" } }, diff --git a/scripts/scenarios/claude-custom-endpoint-shows-unavailable-limits.e2e.ts b/scripts/scenarios/claude-custom-endpoint-shows-unavailable-limits.e2e.ts new file mode 100644 index 0000000000000..299f0c28aca25 --- /dev/null +++ b/scripts/scenarios/claude-custom-endpoint-shows-unavailable-limits.e2e.ts @@ -0,0 +1,63 @@ +// @effect-diagnostics nodeBuiltinImport:off - the scenario writes a fake Claude CLI and its settings. +import * as NodeFSP from "node:fs/promises"; +import * as NodePath from "node:path"; + +import { expect } from "e2e"; + +import { APP_DIR, T3_HOME } from "../e2e.config.ts"; +import { test, WEB } from "./t3.ts"; + +test( + "A Claude instance behind a custom endpoint shows Unavailable, not the local login's limits", + WEB, + async ({ t3, app, screen, browser }) => { + await t3.project("demo"); + // The fixture answers get_usage with a signed-in login's limits, as the real CLI does. + const fixture = NodePath.join( + APP_DIR, + "apps/server/src/provider/testing/ProviderInstanceRegistryLive.fixture.mjs", + ); + const fakeClaude = NodePath.join(T3_HOME, "bin/fake-claude"); + const settingsPath = NodePath.join(T3_HOME, "userdata/settings.json"); + const originalSettings = await NodeFSP.readFile(settingsPath, "utf8"); + const settings = JSON.parse(originalSettings); + try { + await NodeFSP.writeFile(fakeClaude, `#!/bin/sh\nexec node "${fixture}" "$@"\n`, { + mode: 0o755, + }); + settings.providerInstances.claudeAgent = { + driver: "claudeAgent", + enabled: true, + config: { binaryPath: fakeClaude }, + environment: [ + { name: "ANTHROPIC_BASE_URL", value: "https://hub.example.test", sensitive: false }, + ], + }; + settings.defaultModelSelection = { instanceId: "claudeAgent", model: "sonnet" }; + await NodeFSP.writeFile(settingsPath, JSON.stringify(settings)); + + // The usage item is off by default and lives in the browser's client settings, so turn it on in Settings. + await t3.open("/settings/appearance"); + await screen.getByRole("button", /Thread details: \d+ of \d+ on/).tap(); + await screen.getByRole("menuitemcheckbox", "Usage limits").tap(); + await browser.keyboard.press("Escape"); + + await t3.open(); + // The usage card belongs to a thread, not the draft, so start one on the Claude instance. + await screen.getByRole("textbox").fill("Which limits apply to this thread?"); + await screen.getByRole("textbox").press("Enter"); + await expect( + screen.getByText("Which limits apply to this thread?", { exact: false }).first(), + ).toBeVisible(); + // The thread details panel is open by default, so the usage row is already on screen. + await app.screenshot("usage-card"); + await expect(screen.getByRole("link", "Limits: Unavailable")).toBeVisible({ + timeout: 60_000, + }); + await app.screenshot("usage-unavailable"); + } finally { + await NodeFSP.writeFile(settingsPath, originalSettings); + await NodeFSP.rm(fakeClaude, { force: true }); + } + }, +); From 6343a65552118863fc672a1caec87f22d68ac3b2 Mon Sep 17 00:00:00 2001 From: shivam <91240327+shivamhwp@users.noreply.github.com> Date: Fri, 20 Nov 2026 16:22:56 +0000 Subject: [PATCH 2/2] test(server): type the custom-endpoint usage fixture with the SDK's usage response The local usage shape did not match the SDK type, so the typed helper rejected every checkClaudeProviderStatus call in the file. Co-Authored-By: Claude Haiku 5.5 --- apps/server/src/provider/ProviderRegistry.test.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/apps/server/src/provider/ProviderRegistry.test.ts b/apps/server/src/provider/ProviderRegistry.test.ts index 4973c5d5eed3f..88082e8839ed0 100644 --- a/apps/server/src/provider/ProviderRegistry.test.ts +++ b/apps/server/src/provider/ProviderRegistry.test.ts @@ -6,7 +6,7 @@ import * as CodexManagedTokenBroker from "./CodexManagedTokenBroker.ts"; import * as ServerEnvironment from "../environment/ServerEnvironment.ts"; import * as NodeCrypto from "@effect/platform-node/NodeCrypto"; import * as NodeServices from "@effect/platform-node/NodeServices"; -import type { ModelInfo } from "@anthropic-ai/claude-agent-sdk"; +import type { ModelInfo, SDKControlGetUsageResponse } from "@anthropic-ai/claude-agent-sdk"; import { describe, it, assert, expect } from "@effect/vitest"; import * as DateTime from "effect/DateTime"; import * as Deferred from "effect/Deferred"; @@ -318,12 +318,7 @@ type TestClaudeCapabilities = { readonly apiProvider: string | undefined; readonly slashCommands: ReadonlyArray; readonly models?: ReadonlyArray; - readonly usage?: { - readonly rate_limits_available: boolean; - readonly rate_limits?: { - readonly seven_day?: { readonly utilization: number; readonly resets_at: string | null }; - }; - }; + readonly usage?: Pick; }; function claudeCapabilities(overrides: Partial = {}) {