Skip to content

Commit 934fba4

Browse files
committed
fix: preserve usage freshness across cached and delayed reads
1 parent f7c1571 commit 934fba4

10 files changed

Lines changed: 162 additions & 44 deletions

File tree

‎apps/mobile/src/features/usage/usageLimitsRefresh.ts‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,31 @@ export async function refreshEnvironmentLimits(
4242
// one every few minutes per environment.
4343
const limitsAutoRefreshAtom = Atom.family((environmentId: EnvironmentId) =>
4444
Atom.make((get) => {
45-
const refresh = () => {
46-
void refreshEnvironmentLimits(get.registry, environmentId, { automatic: true });
45+
let disposed = false;
46+
let pending = false;
47+
let timer: ReturnType<typeof setTimeout> | undefined;
48+
const refresh = async () => {
49+
if (!isAppActive() || pending || disposed) return;
50+
pending = true;
51+
clearTimeout(timer);
52+
try {
53+
await refreshEnvironmentLimits(get.registry, environmentId, { automatic: true });
54+
} finally {
55+
pending = false;
56+
if (!disposed)
57+
timer = setTimeout(() => {
58+
void refresh();
59+
}, 5 * 60_000);
60+
}
4761
};
48-
refresh();
49-
const unsubscribe = subscribeAppState(refresh);
50-
const timer = setInterval(refresh, 5 * 60_000);
62+
void refresh();
63+
const unsubscribe = subscribeAppState(() => {
64+
void refresh();
65+
});
5166
get.addFinalizer(() => {
67+
disposed = true;
5268
unsubscribe();
53-
clearInterval(timer);
69+
clearTimeout(timer);
5470
});
5571
}).pipe(Atom.withLabel(`mobile:limits-auto-refresh:${environmentId}`)),
5672
);

‎apps/mobile/src/features/usage/useInstanceLimitsRefresh.ts‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,42 @@ export function useInstanceLimitsRefresh(
1717
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- quota demand follows the native panel and app lifecycle
1818
useEffect(() => {
1919
if (!visible || !focused) return;
20+
let disposed = false;
21+
let pending = false;
22+
let timer: ReturnType<typeof setTimeout> | undefined;
2023
const refresh = () => {
21-
if (!isAppActive()) return;
22-
void runAtomCommand(
23-
registry,
24-
serverEnvironment.refreshProviders,
25-
{ environmentId, input: { instanceId, usage: true } },
26-
{ reportFailure: false },
27-
);
28-
if (driver)
29-
void runAtomCommand(
24+
if (!isAppActive() || pending || disposed) return;
25+
pending = true;
26+
clearTimeout(timer);
27+
const completed = () => {
28+
pending = false;
29+
if (!disposed) timer = setTimeout(refresh, 5 * 60_000);
30+
};
31+
void Promise.all([
32+
runAtomCommand(
3033
registry,
3134
serverEnvironment.refreshProviders,
32-
{ environmentId, input: { usageSources: true, usageProviders: [driver] } },
35+
{ environmentId, input: { instanceId, usage: true } },
3336
{ reportFailure: false },
34-
);
37+
),
38+
driver
39+
? runAtomCommand(
40+
registry,
41+
serverEnvironment.refreshProviders,
42+
{ environmentId, input: { usageSources: true, usageProviders: [driver] } },
43+
{ reportFailure: false },
44+
)
45+
: undefined,
46+
]).then(completed, completed);
3547
};
36-
refresh();
37-
const unsubscribe = subscribeAppState(refresh);
38-
const timer = setInterval(refresh, 5 * 60_000);
48+
void refresh();
49+
const unsubscribe = subscribeAppState(() => {
50+
void refresh();
51+
});
3952
return () => {
53+
disposed = true;
4054
unsubscribe();
41-
clearInterval(timer);
55+
clearTimeout(timer);
4256
};
4357
}, [registry, environmentId, instanceId, driver, visible, focused]);
4458
}

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

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,13 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
374374
it.effect("publishes session metadata and native commands without another health probe", () =>
375375
Effect.scoped(
376376
Effect.gen(function* () {
377-
const harness = yield* makeHarness();
377+
let usageReads = 0;
378+
const harness = yield* makeHarness({
379+
probeUsage: Effect.sync(() => {
380+
usageReads++;
381+
return { checkedAt: "2026-01-01T00:00:00.000Z", windows: [] };
382+
}),
383+
});
378384
yield* harness.initialize;
379385
const nextReady = yield* Stream.toPull(
380386
harness.provider.snapshot.streamChanges.pipe(
@@ -392,6 +398,8 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
392398
auth: { status: "authenticated", type: "oauth-personal" },
393399
supportsTextGeneration: true,
394400
});
401+
expect(snapshot.usageLimits?.unavailable?.reason).toBe("probeFailed");
402+
expect(usageReads).toBe(0);
395403
expect(snapshot.models).toEqual(buildAntigravityModelsFromSession(sessionSetupResult));
396404
expect(snapshot.slashCommands).toEqual(expectedCommands);
397405
expect((yield* harness.provider.snapshotForCwd("/workspace")).slashCommands).toEqual(
@@ -718,7 +726,10 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
718726
};
719727
const usage = yield* Ref.make(limits);
720728
const harness = yield* makeHarness({ probeUsage: Ref.get(usage) });
721-
const published = yield* harness.nextPublish((snapshot) => !!snapshot.usageLimits);
729+
const published = yield* harness.nextPublish(
730+
(snapshot) =>
731+
snapshot.usageLimits !== undefined && snapshot.usageLimits.unavailable === undefined,
732+
);
722733
yield* harness.initialize;
723734
expect((yield* published)?.usageLimits).toEqual(limits);
724735
// The second health check is the one the failed background read triggers.
@@ -805,14 +816,17 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
805816
Effect.andThen(Deferred.await(readResult)),
806817
),
807818
});
808-
const published = yield* harness.nextPublish((snapshot) => !!snapshot.usageLimits);
819+
const published = yield* harness.nextPublish(
820+
(snapshot) =>
821+
snapshot.usageLimits !== undefined && snapshot.usageLimits.unavailable === undefined,
822+
);
809823
yield* harness.initialize;
810824
yield* Deferred.await(readStarted);
811825
yield* harness.provider.onSessionStarted(started, "/workspace");
812826
yield* harness.provider.onSessionStarted(started, "/other");
813827
const ready = yield* harness.provider.snapshot.getSnapshot;
814828
expect(ready).toMatchObject({ status: "ready", auth: { status: "authenticated" } });
815-
expect(ready.usageLimits).toBeUndefined();
829+
expect(ready.usageLimits?.unavailable?.reason).toBe("probeFailed");
816830
expect(yield* Ref.get(reads)).toBe(1);
817831
const limits = {
818832
checkedAt: "2026-10-09T12:00:00.000Z",
@@ -838,7 +852,10 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
838852
Deferred.succeed(oldReadStarted, undefined).pipe(Effect.andThen(Effect.never)),
839853
);
840854
const harness = yield* makeHarness({ probeUsage: Ref.get(usage).pipe(Effect.flatten) });
841-
const published = yield* harness.nextPublish((snapshot) => !!snapshot.usageLimits);
855+
const published = yield* harness.nextPublish(
856+
(snapshot) =>
857+
snapshot.usageLimits !== undefined && snapshot.usageLimits.unavailable === undefined,
858+
);
842859
yield* harness.initialize;
843860
yield* Deferred.await(oldReadStarted);
844861
yield* Ref.set(usage, Effect.succeed(newLimits));
@@ -853,7 +870,7 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
853870
} satisfies ServerProviderUsageLimits;
854871
yield* Ref.set(usage, Effect.succeed(failed));
855872
const republished = yield* harness.nextPublish(
856-
(snapshot) => snapshot.usageLimits?.unavailable?.reason === "probeFailed",
873+
(snapshot) => snapshot.usageLimits?.checkedAt === failed.checkedAt,
857874
);
858875
yield* harness.provider.onSignedIn;
859876
expect((yield* harness.provider.snapshot.getSnapshot).usageLimits).toBeUndefined();

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { UsagePolling } from "@t3tools/provider-core/server/usageLimits";
1+
import {
2+
UsagePolling,
3+
makeUnavailableUsageLimits,
4+
} from "@t3tools/provider-core/server/usageLimits";
25
import {
36
ANTIGRAVITY_DEFAULT_MODEL,
47
ProviderDriverKind,
@@ -180,6 +183,10 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
180183
const authUncheckedMessage = usesCredentials
181184
? `Antigravity is installed. Connect with ${options.auth.label} to load models.`
182185
: AUTH_UNCHECKED_MESSAGE;
186+
const pendingUsage = (checkedAt: string) =>
187+
options.probeUsage
188+
? makeUnavailableUsageLimits({ checkedAt, reason: "probeFailed" })
189+
: undefined;
183190
const checkedAt = DateTime.formatIso(yield* DateTime.now);
184191
const initialDraft = {
185192
...buildServerProvider({
@@ -197,6 +204,7 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
197204
version: null,
198205
status: "warning",
199206
auth: { status: "unknown", ...(options.auth ? { type: options.auth.type } : {}) },
207+
...(options.probeUsage ? { usageLimits: pendingUsage(checkedAt)! } : {}),
200208
message: settings.enabled
201209
? "Checking Antigravity availability."
202210
: "Antigravity is disabled in T3 Code settings.",
@@ -386,6 +394,7 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
386394
installed: true,
387395
status: "ready",
388396
version: started.initializeResult.agentInfo?.version || draft.version,
397+
usageLimits: draft.usageLimits ?? pendingUsage(updatedAt),
389398
auth: {
390399
status: "authenticated",
391400
type: options.auth?.type ?? "oauth-personal",

‎apps/server/src/usage/cliproxyApi.test.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,16 @@ describe("CLIProxyAPI built-in management API", () => {
220220
expect(first.map((account) => account.usageLimits.windows[0]?.usedPercent)).toEqual([
221221
25, 25,
222222
]);
223-
yield* api.readAccounts(config, ["claudeAgent"]);
223+
yield* TestClock.adjust("1 minute");
224+
const cached = yield* api.readAccounts(config, ["claudeAgent"]);
225+
expect(cached.map((account) => account.usageLimits.checkedAt)).toEqual(
226+
first.map((account) => account.usageLimits.checkedAt),
227+
);
224228
expect(
225229
test.requests.filter((request) => request.body?.url?.endsWith("/api/oauth/usage")),
226230
).toHaveLength(2);
227231
limited = true;
228-
yield* TestClock.adjust("5 minutes");
232+
yield* TestClock.adjust("4 minutes");
229233
const stale = yield* api.readAccounts(config, ["claudeAgent"]);
230234
expect(stale.map((account) => account.usageLimits)).toEqual(
231235
first.map((account) => ({ ...account.usageLimits, stale: true })),

‎apps/server/src/usage/cliproxyApi.ts‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,9 @@ export const makeCliproxyApi = Effect.gen(function* () {
320320
() => new UsageLimitSourceError({ detail: "Could not read the usage request." }),
321321
),
322322
Effect.flatMap(({ hub, account, url }) => apiCallUncached(hub, account, url)),
323+
Effect.flatMap((body) =>
324+
Effect.map(DateTime.now, (now) => ({ body, checkedAt: DateTime.formatIso(now) })),
325+
),
323326
),
324327
{ capacity: 128, timeToLive: () => Duration.minutes(5) },
325328
);
@@ -330,7 +333,7 @@ export const makeCliproxyApi = Effect.gen(function* () {
330333
data?: unknown,
331334
) {
332335
if (data !== undefined) return yield* apiCallUncached(hub, account, url, data);
333-
return yield* Cache.get(usageCache, yield* encodeJson({ hub, account, url }));
336+
return (yield* Cache.get(usageCache, yield* encodeJson({ hub, account, url }))).body;
334337
});
335338

336339
const lastGoodLimits = new Map<string, ServerProviderUsageLimits>();
@@ -350,7 +353,10 @@ export const makeCliproxyApi = Effect.gen(function* () {
350353
};
351354
const read = Effect.gen(function* () {
352355
if (account.provider === "claude") {
353-
const body = yield* apiCall(hub, account, "https://api.anthropic.com/api/oauth/usage");
356+
const { body, checkedAt } = yield* Cache.get(
357+
usageCache,
358+
yield* encodeJson({ hub, account, url: "https://api.anthropic.com/api/oauth/usage" }),
359+
);
354360
const usage = yield* decodeClaudeUsage(body);
355361
const model_scoped = (usage.limits ?? []).flatMap((limit) =>
356362
limit.kind === "weekly_scoped" && limit.scope?.model && typeof limit.percent === "number"
@@ -382,7 +388,10 @@ export const makeCliproxyApi = Effect.gen(function* () {
382388
}).limits,
383389
};
384390
}
385-
const body = yield* apiCall(hub, account, `${CODEX_BASE}/usage`);
391+
const { body, checkedAt } = yield* Cache.get(
392+
usageCache,
393+
yield* encodeJson({ hub, account, url: `${CODEX_BASE}/usage` }),
394+
);
386395
const usage = yield* decodeCodexUsage(body);
387396
const toWindow = (window: typeof CodexWindow.Type | null | undefined) =>
388397
window

‎apps/web/src/components/usage/UsagePage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ export function UsagePage() {
354354
.sort()
355355
.join(",");
356356
const autoRefreshLimits = useEffectEvent(() => {
357-
void refreshLimits();
357+
return refreshLimits();
358358
});
359359
useLiveRefresh(() => autoRefreshLimits(), {
360360
enabled: showingLimits && connectedLimitsEnvironments !== "",

‎apps/web/src/hooks/useLiveRefresh.browser.test.tsx‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,45 @@ import { act, fakeTimers, render } from "../../test/render";
44
import { LIVE_REFRESH_MIN_INTERVAL_MS, useLiveRefresh } from "./useLiveRefresh";
55

66
function Probe(props: {
7-
readonly refresh: () => void;
7+
readonly refresh: () => void | Promise<unknown>;
88
readonly viewKey: string;
99
readonly enabled?: boolean;
1010
readonly intervalMs?: number | null;
1111
readonly refreshOnShow?: boolean;
12+
readonly refreshWhileIdle?: boolean;
1213
}) {
1314
useLiveRefresh(props.refresh, {
1415
key: props.viewKey,
1516
enabled: props.enabled ?? true,
1617
...(props.intervalMs !== undefined ? { intervalMs: props.intervalMs } : {}),
18+
refreshWhileIdle: props.refreshWhileIdle ?? false,
1719
...(props.refreshOnShow !== undefined ? { refreshOnShow: props.refreshOnShow } : {}),
1820
});
1921
return null;
2022
}
2123

2224
describe("useLiveRefresh", () => {
25+
it("schedules usage intervals after a slow refresh completes", async () => {
26+
let complete!: () => void;
27+
const pending = new Promise<void>((resolve) => {
28+
complete = resolve;
29+
});
30+
const refresh = vi.fn().mockReturnValueOnce(pending);
31+
using _timers = fakeTimers({ now: 3_000_000 });
32+
// A bare hook probe; nothing here navigates.
33+
await using _screen = await render(
34+
<Probe refresh={refresh} viewKey="slow-usage" refreshOnShow refreshWhileIdle />,
35+
{ router: false },
36+
);
37+
expect(refresh).toHaveBeenCalledTimes(1);
38+
await act(() => vi.advanceTimersByTime(1000));
39+
await act(() => complete());
40+
await act(() => vi.advanceTimersByTime(299_000));
41+
expect(refresh).toHaveBeenCalledTimes(1);
42+
await act(() => vi.advanceTimersByTime(1000));
43+
expect(refresh).toHaveBeenCalledTimes(2);
44+
});
45+
2346
it.each([true, false])(
2447
"refreshes a hidden mount on arrival with refreshOnShow=%s",
2548
async (refreshOnShow) => {

‎apps/web/src/hooks/useLiveRefresh.ts‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function watchInteraction(resume: () => void): () => void {
7171
}
7272

7373
export function useLiveRefresh(
74-
refresh: (() => void) | null,
74+
refresh: (() => void | Promise<unknown>) | null,
7575
options: {
7676
readonly enabled?: boolean;
7777
readonly key?: string;
@@ -96,15 +96,31 @@ export function useLiveRefresh(
9696
const runRefresh = useEffectEvent((viewId: string, now: number) => {
9797
if (refresh === null) return;
9898
lastRefreshedAtByView.set(viewId, now);
99-
refresh();
99+
return refresh();
100100
});
101101
const fallbackViewId = useId();
102102
const viewId = key ?? fallbackViewId;
103103

104104
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- refresh interval tied to page visibility and user interaction listeners
105105
useEffect(() => {
106106
if (!enabled) return;
107-
const read = (now: number) => runRefresh(viewId, now);
107+
let timer: ReturnType<typeof setInterval> | undefined;
108+
let disposed = false;
109+
let pending = false;
110+
const read = (now: number) => {
111+
if (refreshWhileIdle && pending) return;
112+
const result = runRefresh(viewId, now);
113+
if (!refreshWhileIdle) return;
114+
pending = true;
115+
clearInterval(timer);
116+
const completed = () => {
117+
pending = false;
118+
if (disposed) return;
119+
lastRefreshedAtByView.set(viewId, Date.now());
120+
syncTimer();
121+
};
122+
void Promise.resolve(result).then(completed, completed);
123+
};
108124
const visible = () => document.visibilityState === "visible";
109125
const onArrival = () => {
110126
const now = Date.now();
@@ -129,13 +145,17 @@ export function useLiveRefresh(
129145
})
130146
) {
131147
read(now);
132-
}
148+
} else if (refreshWhileIdle) syncTimer();
133149
};
134150

135-
let timer: ReturnType<typeof setInterval> | undefined;
136151
const syncTimer = () => {
137152
clearInterval(timer);
138-
timer = visible() && intervalMs !== null ? setInterval(onInterval, intervalMs) : undefined;
153+
timer =
154+
visible() && intervalMs !== null && !pending
155+
? refreshWhileIdle
156+
? setTimeout(onInterval, intervalMs)
157+
: setInterval(onInterval, intervalMs)
158+
: undefined;
139159
};
140160
const onVisibilityChange = () => {
141161
onArrival();
@@ -157,6 +177,7 @@ export function useLiveRefresh(
157177
window.addEventListener("focus", onArrival);
158178
document.addEventListener("visibilitychange", onVisibilityChange);
159179
return () => {
180+
disposed = true;
160181
clearInterval(timer);
161182
window.removeEventListener("focus", onArrival);
162183
document.removeEventListener("visibilitychange", onVisibilityChange);

0 commit comments

Comments
 (0)