Skip to content

Commit f566a2f

Browse files
StiensWoutGrok 4.7
andcommitted
fix(provider): clear stale plan override on complete usage reports
Co-authored-by: GPT 6.1 Sol <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Grok 4.7 <[email protected]>
1 parent 03dd7f7 commit f566a2f

2 files changed

Lines changed: 45 additions & 10 deletions

File tree

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,35 @@ describe("makeManagedServerProvider", () => {
768768
).pipe(Effect.provide(layerAlwaysRunTest)),
769769
);
770770

771+
it.effect("drops an earlier plan override after a complete reading without a label", () =>
772+
Effect.scoped(
773+
Effect.gen(function* () {
774+
const usageLimits = {
775+
checkedAt: "2026-04-10T00:00:04.000Z",
776+
windows: [{ id: "session", kind: "session", label: "Session", usedPercent: 70 }],
777+
} as const;
778+
const provider = yield* makeManagedServerProvider<TestSettings>({
779+
resolveMaintenance: () => Effect.succeed(maintenanceCapabilities),
780+
getSettings: Effect.succeed({ enabled: true }),
781+
streamSettings: Stream.empty,
782+
haveSettingsChanged: (previous, next) => previous.enabled !== next.enabled,
783+
initialSnapshot: () => Effect.succeed(initialSnapshot),
784+
checkProvider: Effect.succeed({ ...refreshedSnapshot, usageLimits }),
785+
refreshOnInterval: false,
786+
});
787+
yield* Stream.take(provider.streamChanges, 1).pipe(Stream.runDrain);
788+
yield* provider.applyUsageLimits({ ...usageLimits, complete: true, authLabel: "tier-2" });
789+
assert.strictEqual((yield* provider.refresh).auth.label, "tier-2");
790+
791+
yield* provider.applyUsageLimits({ ...usageLimits, complete: true });
792+
assert.strictEqual((yield* provider.getSnapshot).auth.label, undefined);
793+
const refreshed = yield* provider.refresh;
794+
assert.strictEqual(refreshed.auth.label, undefined);
795+
assert.deepStrictEqual(refreshed.usageLimits, usageLimits);
796+
}),
797+
).pipe(Effect.provide(layerAlwaysRunTest)),
798+
);
799+
771800
it.effect("keeps sparse usage unavailable after probe failure until a full probe recovers", () =>
772801
Effect.scoped(
773802
Effect.gen(function* () {

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,17 +221,19 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
221221
const applyUsageLimits: ManagedServerProvider["applyUsageLimits"] = Effect.fnUntraced(
222222
function* (update) {
223223
const snapshotToPublish = yield* Ref.modify(snapshotStateRef, (state) => {
224-
const usageLimits =
225-
update.complete && update.windows.length > 0
226-
? makeUsageLimits(update)
227-
: applyUsageLimitsUpdate({
228-
previous: state.snapshot.usageLimits,
229-
update,
230-
checkedAt: update.checkedAt,
231-
});
224+
const complete = update.complete && update.windows.length > 0;
225+
const usageLimits = complete
226+
? makeUsageLimits(update)
227+
: applyUsageLimitsUpdate({
228+
previous: state.snapshot.usageLimits,
229+
update,
230+
checkedAt: update.checkedAt,
231+
});
232232
const { auth } = state.snapshot;
233233
const label = update.windows.length > 0 ? update.authLabel : undefined;
234-
const relabel = label !== undefined && label !== auth.label;
234+
const relabel =
235+
(label !== undefined || (complete && state.usageAuthLabel !== undefined)) &&
236+
label !== auth.label;
235237
if (usageLimits === state.snapshot.usageLimits && !relabel) {
236238
return [null, state] as const;
237239
}
@@ -241,7 +243,11 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
241243
);
242244
return [
243245
snapshot,
244-
{ ...state, snapshot, usageAuthLabel: label ?? state.usageAuthLabel },
246+
{
247+
...state,
248+
snapshot,
249+
usageAuthLabel: label ?? (complete ? undefined : state.usageAuthLabel),
250+
},
245251
] as const;
246252
});
247253
if (snapshotToPublish !== null) {

0 commit comments

Comments
 (0)