Skip to content

Commit 6714ba0

Browse files
committed
fix(opencode): scope Console budgets to served providers
1 parent 296cea0 commit 6714ba0

8 files changed

Lines changed: 148 additions & 42 deletions

File tree

‎packages/contracts/src/providerUsageLimits.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export const ServerProviderUsageWindow = Schema.Struct({
1616
label: TrimmedNonEmptyString,
1717
/** When present, this limit applies only to these provider model IDs. */
1818
modelIds: Schema.optional(Schema.Array(TrimmedNonEmptyString)),
19+
providerIds: Schema.optional(Schema.Array(TrimmedNonEmptyString)),
1920
usedPercent: Schema.Number.check(Schema.isBetween({ minimum: 0, maximum: 100 })),
2021
resetsAt: Schema.optional(IsoDateTime),
2122
windowDurationMins: Schema.optional(NonNegativeInt),

‎packages/provider-core/src/server/usageLimits.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ describe("applyUsageLimitsUpdate", () => {
3434
});
3535
expect(next).toBe(published);
3636
const scoped = { checkedAt, windows: [{ ...weekly, modelIds: ["opencode/a"] }] };
37+
const providerScoped = { checkedAt, windows: [{ ...weekly, providerIds: ["opencode"] }] };
38+
expect(
39+
applyUsageLimitsUpdate({
40+
previous: providerScoped,
41+
checkedAt,
42+
update: { windows: [{ ...weekly, providerIds: ["console-custom"] }] },
43+
})?.windows[0]?.providerIds,
44+
).toEqual(["console-custom"]);
3745
expect(
3846
applyUsageLimitsUpdate({
3947
previous: scoped,

‎packages/provider-core/src/server/usageLimits.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@ function usageWindowEquals(a: ServerProviderUsageWindow, b: ServerProviderUsageW
9999
b.modelIds !== undefined &&
100100
a.modelIds.length === b.modelIds.length &&
101101
a.modelIds.every((id, index) => id === b.modelIds?.[index]))) &&
102+
(a.providerIds === b.providerIds ||
103+
(a.providerIds !== undefined &&
104+
b.providerIds !== undefined &&
105+
a.providerIds.length === b.providerIds.length &&
106+
a.providerIds.every((id, index) => id === b.providerIds?.[index]))) &&
102107
a.resetsAt === b.resetsAt &&
103108
a.windowDurationMins === b.windowDurationMins
104109
);

‎packages/provider-opencode/src/server/driver.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,7 @@ it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
579579
if (scenario.reason === undefined) {
580580
assert.strictEqual(snapshot?.usageLimits?.windows[0]?.usedPercent, 75);
581581
assert.strictEqual(snapshot?.usageLimits?.externalUsage?.label, "Remote workspace");
582+
assert.deepStrictEqual(snapshot?.usageLimits?.windows[0]?.providerIds, []);
582583
} else {
583584
assert.deepStrictEqual(snapshot?.usageLimits?.windows, []);
584585
}

‎packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,14 +254,29 @@ describe("OpenCode2Client usage limits", () => {
254254
Effect.gen(function* () {
255255
let workspace = "wrk_remote";
256256
const transport = HttpClient.make((request) => {
257-
assert.strictEqual(
258-
request.url,
259-
"https://remote.example/prefix/api/experimental/usage/limits",
260-
);
261257
assert.strictEqual(request.headers.authorization, utf8Basic("remote-password"));
262258
assert.deepStrictEqual(Array.from(request.urlParams), [
263259
["location[directory]", "/remote/project"],
264260
]);
261+
if (request.url === "https://remote.example/prefix/api/provider")
262+
return Effect.succeed(
263+
HttpClientResponse.fromWeb(
264+
request,
265+
Response.json({
266+
data: [
267+
{ id: "opencode", integrationID: "opencode" },
268+
{ id: "console-custom", integrationID: "opencode" },
269+
{ id: "opencode-go", integrationID: "opencode" },
270+
{ id: "anthropic", integrationID: "anthropic" },
271+
{ id: "byok" },
272+
],
273+
}),
274+
),
275+
);
276+
assert.strictEqual(
277+
request.url,
278+
"https://remote.example/prefix/api/experimental/usage/limits",
279+
);
265280
return Effect.succeed(
266281
HttpClientResponse.fromWeb(
267282
request,
@@ -358,6 +373,7 @@ describe("OpenCode2Client usage limits", () => {
358373
assert.include(first?.windows[4]?.label ?? "", "Model A");
359374
assert.deepStrictEqual(first?.windows[4]?.modelIds, ["opencode/a"]);
360375
assert.strictEqual(first?.windows[3]?.modelIds, undefined);
376+
assert.deepStrictEqual(first?.windows[3]?.providerIds, ["opencode", "console-custom"]);
361377
assert.deepStrictEqual(first?.windows[7]?.modelIds, []);
362378
assert.include(first?.windows[7]?.label ?? "", "Most used model");
363379
assert.strictEqual(first?.credentialFingerprint, undefined);

‎packages/provider-opencode/src/server/v2/usageLimits.ts‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@ const ResponseBody = Schema.Struct({
5252
),
5353
});
5454

55+
const Providers = Schema.Struct({
56+
data: Schema.Array(
57+
Schema.Struct({
58+
id: Schema.String,
59+
integrationID: Schema.optionalKey(Schema.String),
60+
}),
61+
),
62+
});
63+
5564
const resetTime = (ms: number) => DateTime.formatIso(DateTime.makeUnsafe(ms));
5665
const budgetPercent = (spent: number, limit: number) =>
5766
limit <= 0 ? 100 : clampPercent((spent / limit) * 100);
@@ -82,6 +91,25 @@ export const readServerUsageLimits = Effect.fn("OpenCode2Client.usageLimits")(fu
8291
message: "No OpenCode Console workspace is signed in.",
8392
});
8493
const { go, budgets, workspace } = body.data;
94+
const consoleProviders = budgets.some(
95+
(budget) => budget.coverage === "all" && budget.per === "set",
96+
)
97+
? yield* HttpClient.get("/api/provider", {
98+
urlParams: { "location[directory]": directory },
99+
}).pipe(
100+
Effect.flatMap(HttpClientResponse.filterStatusOk),
101+
Effect.flatMap(HttpClientResponse.schemaBodyJson(Providers)),
102+
Effect.map((page) =>
103+
page.data
104+
.filter(
105+
(provider) =>
106+
provider.integrationID === "opencode" && provider.id !== "opencode-go",
107+
)
108+
.map((provider) => provider.id),
109+
),
110+
Effect.orElseSucceed(() => []),
111+
)
112+
: [];
85113
const windows: ServerProviderUsageWindow[] = [];
86114
if (go) {
87115
for (const [key, kind, label, duration] of [
@@ -134,7 +162,7 @@ export const readServerUsageLimits = Effect.fn("OpenCode2Client.usageLimits")(fu
134162
? {
135163
modelIds: budget.models.map((model) => `${model.providerID}/${model.modelID}`),
136164
}
137-
: {}),
165+
: { providerIds: consoleProviders }),
138166
usedPercent: budgetPercent(budget.spent, budget.limit),
139167
resetsAt: resetTime(budget.resetsAt),
140168
});

‎packages/shared/src/usageLimits.test.ts‎

Lines changed: 81 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -124,43 +124,87 @@ describe("new thread model fallback", () => {
124124
).toBeDefined();
125125
});
126126
it.each([
127-
["cursor", ["autoPercentUsed"], "claude-opus-5-5", false, undefined],
128-
["cursor", ["autoPercentUsed"], "composer-2.5", false, undefined],
129-
["cursor", ["autoPercentUsed", "apiPercentUsed"], "composer-2.5", true, undefined],
130-
["antigravity", ["gemini-weekly"], "claude-opus-5-5", false, undefined],
131-
["antigravity", ["3p-weekly"], "claude-opus-5-5", true, undefined],
132-
["antigravity", ["gemini-weekly"], "antigravity-default", true, undefined],
133-
["opencode", ["go_weekly"], "opencode/big-pickle", false, undefined],
134-
["opencode", ["go_weekly"], "opencode-go/big-pickle", true, undefined],
135-
["opencode", ["budget_model"], "opencode/other", false, ["opencode/limited"]],
136-
["opencode", ["budget_model"], "opencode/limited", true, ["opencode/limited"]],
137-
["opencode", ["budget_set"], "other/model", false, ["opencode/limited", "opencode/second"]],
138-
["opencode", ["budget_set"], "opencode/second", true, ["opencode/limited", "opencode/second"]],
139-
["opencode", ["budget_empty"], "opencode/other", false, []],
140-
] as const)("matches %s pools %s to %s", (driver, ids, model, usesFallback, modelIds) => {
141-
const defaultSelection = { ...selection, model };
142-
expect(
143-
resolveNewThreadModelSelection({
144-
...defaults,
145-
defaultSelection,
146-
providers: [
147-
provider({
148-
driver: ProviderDriverKind.make(driver),
149-
usageLimits: {
150-
checkedAt: limited.checkedAt,
151-
windows: ids.map((id) => ({
152-
...window,
153-
id,
154-
usedPercent: 100,
155-
...(modelIds === undefined ? {} : { modelIds }),
156-
})),
157-
},
158-
}),
159-
available,
160-
],
161-
}).selection,
162-
).toEqual(usesFallback ? fallback : defaultSelection);
163-
});
127+
["cursor", ["autoPercentUsed"], "claude-opus-5-5", false, undefined, undefined],
128+
["cursor", ["autoPercentUsed"], "composer-2.5", false, undefined, undefined],
129+
["cursor", ["autoPercentUsed", "apiPercentUsed"], "composer-2.5", true, undefined, undefined],
130+
["antigravity", ["gemini-weekly"], "claude-opus-5-5", false, undefined, undefined],
131+
["antigravity", ["3p-weekly"], "claude-opus-5-5", true, undefined, undefined],
132+
["antigravity", ["gemini-weekly"], "antigravity-default", true, undefined, undefined],
133+
["opencode", ["go_weekly"], "opencode/big-pickle", false, undefined, undefined],
134+
["opencode", ["go_weekly"], "opencode-go/big-pickle", true, undefined, undefined],
135+
["opencode", ["budget_model"], "opencode/other", false, ["opencode/limited"], undefined],
136+
["opencode", ["budget_model"], "opencode/limited", true, ["opencode/limited"], undefined],
137+
[
138+
"opencode",
139+
["budget_set"],
140+
"other/model",
141+
false,
142+
["opencode/limited", "opencode/second"],
143+
undefined,
144+
],
145+
[
146+
"opencode",
147+
["budget_set"],
148+
"opencode/second",
149+
true,
150+
["opencode/limited", "opencode/second"],
151+
undefined,
152+
],
153+
["opencode", ["budget_empty"], "opencode/other", false, [], undefined],
154+
[
155+
"opencode",
156+
["budget_all"],
157+
"anthropic/claude",
158+
false,
159+
undefined,
160+
["opencode", "console-custom"],
161+
],
162+
[
163+
"opencode",
164+
["budget_all"],
165+
"opencode-go/model",
166+
false,
167+
undefined,
168+
["opencode", "console-custom"],
169+
],
170+
["opencode", ["budget_all"], "opencode/model", true, undefined, ["opencode", "console-custom"]],
171+
[
172+
"opencode",
173+
["budget_all"],
174+
"console-custom/model",
175+
true,
176+
undefined,
177+
["opencode", "console-custom"],
178+
],
179+
["opencode", ["budget_all"], "opencode/model", false, undefined, []],
180+
] as const)(
181+
"matches %s pools %s to %s",
182+
(driver, ids, model, usesFallback, modelIds, providerIds) => {
183+
const defaultSelection = { ...selection, model };
184+
expect(
185+
resolveNewThreadModelSelection({
186+
...defaults,
187+
defaultSelection,
188+
providers: [
189+
provider({
190+
driver: ProviderDriverKind.make(driver),
191+
usageLimits: {
192+
checkedAt: limited.checkedAt,
193+
windows: ids.map((id) => ({
194+
...window,
195+
id,
196+
usedPercent: 100,
197+
...(modelIds === undefined ? {} : { modelIds }),
198+
...(providerIds === undefined ? {} : { providerIds }),
199+
})),
200+
},
201+
}),
202+
available,
203+
],
204+
}).selection,
205+
).toEqual(usesFallback ? fallback : defaultSelection);
206+
},
207+
);
164208
});
165209

166210
describe("pace", () => {

‎packages/shared/src/usageLimits.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ export function exhaustedUsageWindow(
3232
(window) =>
3333
(window.usedPercent ?? 0) >= 100 &&
3434
(model === undefined || window.modelIds === undefined || window.modelIds.includes(model)) &&
35+
(model === undefined ||
36+
window.providerIds === undefined ||
37+
window.providerIds.includes(model.split("/")[0] ?? "")) &&
3538
(!window.resetsAt ||
3639
!Number.isFinite(Date.parse(window.resetsAt)) ||
3740
Date.parse(window.resetsAt) > now),

0 commit comments

Comments
 (0)