Skip to content
TypeScript

perf(shared): scan usage-limit support once per provider catalog (#32179)

luke984fe2d45e06
diff --git a/packages/shared/src/usageLimits.test.ts b/packages/shared/src/usageLimits.test.ts
index 72a17323386..236a8baa13a 100644
--- a/packages/shared/src/usageLimits.test.ts
+++ b/packages/shared/src/usageLimits.test.ts
@@ -1412,6 +1412,17 @@ describe("/usage-limits", () => {
expect(
withUsageLimitsCommands([selected], [])[0]?.slashCommands.map((command) => command.name),
).toEqual(["usage-limits"]);
+ const unrelated = provider({ driver: ProviderDriverKind.make("claudeAgent") });
+ const disabled = provider({ ...unrelated, enabled: false, usageLimits: limits });
+ const mixed = withUsageLimitsCommands([selected, withWorkspace, unrelated, disabled], []);
+ expect(mixed.map((entry) => entry.slashCommands.map((command) => command.name))).toEqual([
+ ["usage-limits"],
+ ["usage-limits"],
+ [],
+ [],
+ ]);
+ expect(mixed[2]).toBe(unrelated);
+ expect(mixed[3]).toBe(disabled);
});
});
diff --git a/packages/shared/src/usageLimits.ts b/packages/shared/src/usageLimits.ts
index 869f676acae..1707deb735a 100644
--- a/packages/shared/src/usageLimits.ts
+++ b/packages/shared/src/usageLimits.ts
@@ -729,8 +729,15 @@ export function withUsageLimitsCommands(
providers: readonly ServerProvider[],
sources: UsageLimitSourceSnapshots,
): ServerProvider[] {
+ const supportedDrivers = new Set([
+ ...providersWithLimits(providers).map((provider) => provider.driver),
+ ...sources.flatMap((source) => source.accounts.map((account) => account.driver)),
+ ]);
+ const unreadableSource = sources.some(
+ (source) => source.error !== undefined && source.accounts.length === 0,
+ );
return providers.map((provider) => {
- if (!hasProviderUsageLimits(provider.driver, providers, sources)) return provider;
+ if (!unreadableSource && !supportedDrivers.has(provider.driver)) return provider;
const commands = (items: readonly ServerProviderSlashCommand[]) => [
...items.filter((command) => command.name !== USAGE_LIMITS_COMMAND.name),
USAGE_LIMITS_COMMAND,