Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/provider-core/src/server/usageLimits.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -44,6 +45,7 @@ export function makeUnavailableUsageLimits(input: {
reason: input.reason,
...(input.message ? { message: input.message } : {}),
},
...(input.externalUsage ? { externalUsage: input.externalUsage } : {}),
};
}

Expand Down
6 changes: 5 additions & 1 deletion packages/provider-cursor/src/server/usageLimits.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
});
}
}),
);
Expand Down
8 changes: 7 additions & 1 deletion packages/provider-cursor/src/server/usageLimits.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
34 changes: 34 additions & 0 deletions packages/provider-grok/src/server/usageLimits.test.ts
Original file line number Diff line number Diff line change
@@ -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),
),
);
});
11 changes: 10 additions & 1 deletion packages/provider-grok/src/server/usageLimits.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
26 changes: 26 additions & 0 deletions packages/shared/src/usageLimits.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
8 changes: 7 additions & 1 deletion packages/shared/src/usageLimits.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);
Expand Down
Loading