Skip to content

Commit 2d44dc9

Browse files
committed
fix(server): retain background usageLimits during session enrichment
1 parent a3987b1 commit 2d44dc9

3 files changed

Lines changed: 15 additions & 10 deletions

File tree

‎apps/server/src/provider/Layers/AntigravityProvider.test.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -705,9 +705,7 @@ it.layer(testLayer)("Antigravity provider snapshots", (it) => {
705705
}
706706
return {
707707
checkedAt: "2026-09-09T02:00:00.000Z",
708-
windows: [
709-
{ id: "new_session", kind: "session", label: "New", usedPercent: 10 },
710-
],
708+
windows: [{ id: "new_session", kind: "session", label: "New", usedPercent: 10 }],
711709
};
712710
}),
713711
});
@@ -720,9 +718,7 @@ it.layer(testLayer)("Antigravity provider snapshots", (it) => {
720718
),
721719
);
722720

723-
const fiber1 = yield* harness.provider
724-
.onSessionStarted(started)
725-
.pipe(Effect.forkChild);
721+
const fiber1 = yield* harness.provider.onSessionStarted(started).pipe(Effect.forkChild);
726722
yield* Deferred.await(session1Gate);
727723

728724
const session2Started: AcpSessionRuntimeStartResult = {
@@ -748,4 +744,3 @@ it.layer(testLayer)("Antigravity provider snapshots", (it) => {
748744
),
749745
);
750746
});
751-

‎apps/server/src/provider/Layers/AntigravityProvider.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
135135
settings: AntigravitySettings,
136136
options: AntigravityProviderOptions,
137137
) {
138+
const scope = yield* Effect.scope;
138139
const checkedAt = DateTime.formatIso(yield* DateTime.now);
139140
const initialDraft = {
140141
...buildServerProvider({
@@ -321,7 +322,7 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
321322
)
322323
: Effect.void,
323324
),
324-
Effect.forkChild,
325+
Effect.forkIn(scope),
325326
);
326327
}
327328
});

‎apps/server/src/provider/makeManagedServerProvider.ts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,17 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
8585
return [null, state] as const;
8686
}
8787
// Enrichment derives from the snapshot it was handed; a runtime usage
88-
// update that landed since must not be reverted by it.
89-
const merged = withUsageLimits(nextSnapshot, state.snapshot.usageLimits);
88+
// update that landed since must not be reverted by it unless the enriched
89+
// snapshot carries a fresher usageLimits timestamp or cleared it on sign-out.
90+
const usageLimits =
91+
nextSnapshot.usageLimits &&
92+
(!state.snapshot.usageLimits ||
93+
nextSnapshot.usageLimits.checkedAt >= state.snapshot.usageLimits.checkedAt)
94+
? nextSnapshot.usageLimits
95+
: nextSnapshot.auth.status === "unauthenticated"
96+
? undefined
97+
: state.snapshot.usageLimits;
98+
const merged = withUsageLimits(nextSnapshot, usageLimits);
9099
if (Equal.equals(state.snapshot, merged)) {
91100
return [null, state] as const;
92101
}

0 commit comments

Comments
 (0)