diff --git a/packages/provider-core/src/server/usageLimits.ts b/packages/provider-core/src/server/usageLimits.ts index 7d1f6e6a910e9..c9521a2149063 100644 --- a/packages/provider-core/src/server/usageLimits.ts +++ b/packages/provider-core/src/server/usageLimits.ts @@ -36,6 +36,7 @@ export function makeUnavailableUsageLimits(input: { readonly checkedAt: string; readonly reason: "unsupported" | "probeFailed"; readonly message?: string; + readonly externalUsage?: ServerProviderUsageLimits["externalUsage"]; }): ServerProviderUsageLimits { return { checkedAt: input.checkedAt, @@ -44,6 +45,7 @@ export function makeUnavailableUsageLimits(input: { reason: input.reason, ...(input.message ? { message: input.message } : {}), }, + ...(input.externalUsage ? { externalUsage: input.externalUsage } : {}), }; } diff --git a/packages/provider-cursor/src/server/usageLimits.test.ts b/packages/provider-cursor/src/server/usageLimits.test.ts index e969106812e6e..9934c6e83dee6 100644 --- a/packages/provider-cursor/src/server/usageLimits.test.ts +++ b/packages/provider-cursor/src/server/usageLimits.test.ts @@ -124,7 +124,11 @@ describe("Cursor usage limits", () => { ), ); if (token) expect(limits.windows[0]?.usedPercent).toBe(10); - else expect(limits.unavailable?.reason).toBe("unsupported"); + else + expect(limits.unavailable).toEqual({ + reason: "unsupported", + message: "Cursor usage requires a CLI login or CURSOR_AUTH_TOKEN.", + }); } }), ); diff --git a/packages/provider-cursor/src/server/usageLimits.ts b/packages/provider-cursor/src/server/usageLimits.ts index 48ab708554206..1ac4881df9ec2 100644 --- a/packages/provider-cursor/src/server/usageLimits.ts +++ b/packages/provider-cursor/src/server/usageLimits.ts @@ -85,7 +85,13 @@ export const readCursorUsageLimits = Effect.fn("readCursorUsageLimits")(function } token = yield* exchangeCursorApiKey(apiKey); } - if (!token) return makeUnavailableUsageLimits({ checkedAt, reason: "unsupported" }); + if (!token) { + return makeUnavailableUsageLimits({ + checkedAt, + reason: "unsupported", + message: "Cursor usage requires a CLI login or CURSOR_AUTH_TOKEN.", + }); + } const client = yield* HttpClient.HttpClient; const response = yield* client.execute( HttpClientRequest.post(`${endpoint}/aiserver.v1.DashboardService/GetCurrentPeriodUsage`).pipe( diff --git a/packages/provider-grok/src/server/usageLimits.test.ts b/packages/provider-grok/src/server/usageLimits.test.ts new file mode 100644 index 0000000000000..8286f84bfda8f --- /dev/null +++ b/packages/provider-grok/src/server/usageLimits.test.ts @@ -0,0 +1,34 @@ +import { describe, expect, it } from "@effect/vitest"; +import { NodeServices } from "@effect/platform-node"; +import * as Effect from "effect/Effect"; +import * as FileSystem from "effect/FileSystem"; +import * as HttpClient from "effect/http/HttpClient"; +import { readGrokAccount } from "./usageLimits.ts"; + +describe("Grok usage limits", () => { + it.effect("explains that API keys do not report subscription limits", () => + Effect.gen(function* () { + const fs = yield* FileSystem.FileSystem; + const home = yield* fs.makeTempDirectoryScoped({ prefix: "grok-limits-" }); + const { usageLimits } = yield* readGrokAccount({ + HOME: home, + XAI_API_KEY: "xai-test-key", + }); + expect(usageLimits.unavailable).toEqual({ + reason: "unsupported", + message: + "Grok subscription limits need a default `grok login` session. API keys and custom authentication do not report them.", + }); + expect(usageLimits.externalUsage).toEqual({ + label: "xAI console", + url: "https://console.x.ai", + }); + }).pipe( + Effect.provideService( + HttpClient.HttpClient, + HttpClient.make(() => Effect.die("API-key Grok must not request usage limits")), + ), + Effect.provide(NodeServices.layer), + ), + ); +}); diff --git a/packages/provider-grok/src/server/usageLimits.ts b/packages/provider-grok/src/server/usageLimits.ts index d7e97518761fe..5fa77d85ee453 100644 --- a/packages/provider-grok/src/server/usageLimits.ts +++ b/packages/provider-grok/src/server/usageLimits.ts @@ -174,7 +174,16 @@ export const readGrokAccount = Effect.fn("readGrokAccount")(function* ( const email = credential.value?.email?.trim() || undefined; const token = credential.value?.key?.trim(); if (!token) { - return { email, usageLimits: makeUnavailableUsageLimits({ checkedAt, reason: "unsupported" }) }; + return { + email, + usageLimits: makeUnavailableUsageLimits({ + checkedAt, + reason: "unsupported", + message: + "Grok subscription limits need a default `grok login` session. API keys and custom authentication do not report them.", + externalUsage: { label: "xAI console", url: "https://console.x.ai" }, + }), + }; } const usageLimits = yield* Effect.gen(function* () { const client = yield* HttpClient.HttpClient; diff --git a/packages/shared/src/usageLimits.test.ts b/packages/shared/src/usageLimits.test.ts index b66001ca19244..3d7f9f7f87caa 100644 --- a/packages/shared/src/usageLimits.test.ts +++ b/packages/shared/src/usageLimits.test.ts @@ -1804,6 +1804,32 @@ describe("external usage settings", () => { expect(collectLimitNotices(presentations)).toEqual([]); }); + it("surfaces unsupported accounts that only have an actionable message", () => { + const cursor = provider({ + instanceId: ProviderInstanceId.make("cursor"), + driver: ProviderDriverKind.make("cursor"), + displayName: "Cursor", + usageLimits: { + checkedAt: "2026-09-03T11:00:00.000Z", + windows: [], + unavailable: { + reason: "unsupported", + message: "Enable Cursor account usage in T3 Code to read its Keychain login.", + }, + }, + }); + const presentations = new Map([ + [ + EnvironmentId.make("a"), + { entry: { target: { label: "A" } }, serverConfig: { providers: [cursor] } }, + ], + ]); + expect(collectLimitNotices(presentations)).toEqual([ + "Cursor: Enable Cursor account usage in T3 Code to read its Keychain login.", + ]); + expect(collectExternalUsageLinks(presentations)).toEqual([]); + }); + it("shows a notice once when environments with one label report the same failure", () => { const failing = provider({ usageLimits: { diff --git a/packages/shared/src/usageLimits.ts b/packages/shared/src/usageLimits.ts index 6fe6c70a89a4f..824bc159b4380 100644 --- a/packages/shared/src/usageLimits.ts +++ b/packages/shared/src/usageLimits.ts @@ -433,7 +433,13 @@ export function collectLimitNotices(presentations: LimitPresentations): readonly for (const presentation of presentations.values()) { const environmentLabel = presentation.entry.target.label; for (const provider of providersWithLimits(presentation.serverConfig?.providers ?? [])) { - if (provider.usageLimits?.unavailable?.reason === "unsupported") continue; + // ChatGPT-style unsupported+externalUsage already has a link row; skip the notice. + if ( + provider.usageLimits?.unavailable?.reason === "unsupported" && + (provider.usageLimits.externalUsage || !provider.usageLimits.unavailable.message) + ) { + continue; + } const notice = provider.usageLimits ? limitsNotice(provider.usageLimits) : null; const name = provider.displayName?.trim() || String(provider.driver); if (notice) notices.add(`${label(environmentLabel, name)}: ${notice}`);