Skip to content
Open
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
22 changes: 22 additions & 0 deletions packages/shared/src/usageLimits.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ describe("new thread model fallback", () => {
["antigravity", ["gemini-weekly"], "antigravity-default", true],
["opencode", ["go_weekly"], "opencode/big-pickle", false],
["opencode", ["go_weekly"], "opencode-go/big-pickle", true],
["claudeAgent", ["seven_day_fable"], "claude-fable-5-1", true],
["claudeAgent", ["seven_day_fable"], "claude-opus-5-5", false],
["claudeAgent", ["seven_day"], "claude-opus-5-5", true],
] as const)("matches %s pools %s to %s", (driver, ids, model, usesFallback) => {
const defaultSelection = { ...selection, model };
expect(
Expand All @@ -151,6 +154,25 @@ describe("new thread model fallback", () => {
}).selection,
).toEqual(usesFallback ? fallback : defaultSelection);
});
it("falls back to another model on the same Claude instance when only its model limit is spent", () => {
const claude = provider({
instanceId: fallback.instanceId,
driver: ProviderDriverKind.make("claudeAgent"),
usageLimits: {
checkedAt: limited.checkedAt,
windows: [{ ...window, id: "seven_day_fable", usedPercent: 100 }],
},
});
const opus = { ...fallback, model: "claude-opus-5-5" };
expect(
resolveNewThreadModelSelection({
...defaults,
defaultSelection: fallback,
fallbackSelection: opus,
providers: [claude],
}).selection,
).toEqual(opus);
});
});

describe("pace", () => {
Expand Down
7 changes: 7 additions & 0 deletions packages/shared/src/usageLimits.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ export function exhaustedUsageWindow(
return exhausted.find(
(window) => !window.id.startsWith("go_") || model.startsWith("opencode-go/"),
);
case "claudeAgent": {
const slug = model.toLowerCase().replace(/[^a-z0-9]+/g, "_");
return exhausted.find((window) => {
const scope = window.id.match(/^seven_day_(.+)$/)?.[1];
return scope === undefined || slug.includes(scope);
});
}
default:
return exhausted[0];
}
Expand Down
Loading