Skip to content

Commit 22c9753

Browse files
committed
fix(server): preserve usage refresh state across surfaces
1 parent 51a9a88 commit 22c9753

16 files changed

Lines changed: 405 additions & 226 deletions

File tree

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

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { UsagePolling, UsageAfterReset } from "@t3tools/provider-core/server/usageLimits";
12
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
23
import * as NodeServices from "@effect/platform-node/NodeServices";
34
import { describe, expect, it } from "@effect/vitest";
@@ -167,6 +168,13 @@ const makeHarness = Effect.fn("makeAntigravityProviderHarness")(function* (
167168
);
168169
const initialize = Deferred.succeed(initialProbe, initializeResult).pipe(
169170
Effect.andThen(initialUpdate),
171+
Effect.andThen(
172+
Effect.flatMap(UsagePolling, (visible) =>
173+
visible && options.probeUsage
174+
? (provider.snapshot.refreshUsage ?? Effect.void)
175+
: Effect.void,
176+
),
177+
),
170178
Effect.asVoid,
171179
);
172180
// Subscribe before the trigger; yield the returned pull to await the publish.
@@ -732,7 +740,10 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
732740
});
733741
yield* harness.provider.snapshot.refresh;
734742
yield* Deferred.await(failedReadApplied);
735-
expect((yield* harness.provider.snapshot.getSnapshot).usageLimits).toEqual(limits);
743+
expect((yield* harness.provider.snapshot.getSnapshot).usageLimits).toEqual({
744+
...limits,
745+
stale: true,
746+
});
736747
yield* harness.provider.onSignedOut;
737748
expect((yield* harness.provider.snapshot.getSnapshot).usageLimits).toBeUndefined();
738749
yield* Ref.set(usage, {
@@ -746,6 +757,9 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
746757
yield* harness.provider.snapshot.refresh;
747758
expect((yield* unsupported)?.usageLimits?.windows).toEqual([]);
748759
}),
760+
).pipe(
761+
Effect.provideService(UsagePolling, true),
762+
Effect.provideService(UsageAfterReset, true),
749763
),
750764
);
751765

@@ -776,7 +790,7 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
776790
yield* Fiber.join(refresh);
777791
expect((yield* harness.provider.snapshot.getSnapshot).usageLimits).toBeUndefined();
778792
}),
779-
),
793+
).pipe(Effect.provideService(UsagePolling, true), Effect.provideService(UsageAfterReset, true)),
780794
);
781795

782796
it.effect("reports ready and starts sessions while one shared quota read is pending", () =>
@@ -809,7 +823,7 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
809823
yield* Deferred.succeed(readResult, limits);
810824
expect((yield* published)?.usageLimits).toEqual(limits);
811825
}),
812-
),
826+
).pipe(Effect.provideService(UsagePolling, true), Effect.provideService(UsageAfterReset, true)),
813827
);
814828

815829
it.effect("a quota read for the previous account is dropped after a new sign-in", () =>
@@ -846,6 +860,6 @@ it.layer(layerTest)("Antigravity provider snapshots", (it) => {
846860
yield* harness.provider.onSessionStarted(started);
847861
expect((yield* republished)?.usageLimits).toEqual(failed);
848862
}),
849-
),
863+
).pipe(Effect.provideService(UsagePolling, true), Effect.provideService(UsageAfterReset, true)),
850864
);
851865
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { UsagePolling } from "@t3tools/provider-core/server/usageLimits";
21
import { pipe } from "effect/Function";
32
import * as DateTime from "effect/DateTime";
43
import * as Duration from "effect/Duration";
@@ -750,6 +749,7 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
750749
> = probeCodexAppServerProvider,
751750
environment?: NodeJS.ProcessEnv,
752751
managedAuth?: ServerProvider["auth"],
752+
skipUsage = false,
753753
): Effect.fn.Return<
754754
ServerProviderDraft,
755755
ServerSettingsError,
@@ -782,7 +782,7 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
782782
launchArgs: resolveCodexLaunchArgs(codexSettings.launchArgs, resolvedEnvironment),
783783
cwd: process.cwd(),
784784
environment: resolvedEnvironment,
785-
skipNativeUsage: Boolean(managedAuth) || !(yield* UsagePolling),
785+
...(managedAuth || skipUsage ? { skipNativeUsage: true } : {}),
786786
}).pipe(
787787
// Process teardown can outlast the work budget without discarding a completed snapshot.
788788
Effect.timeoutOption(Duration.millis(CODEX_AUTH_PROBE_TIMEOUT_MS)),

‎apps/server/src/provider/Drivers/ClaudeDriver.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,7 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv, Path.
173173
modelCatalog,
174174
);
175175

176-
// Per-instance capabilities cache: keyed on binary + resolved HOME so
177-
// account-specific probes never share auth metadata across instances.
176+
// Each instance owns its account; health reads must not populate the usage cache.
178177
// A transient miss may reuse the last account once, but its usage windows keep their age.
179178
const lastGoodCapabilities = yield* Ref.make<ClaudeCapabilitiesProbe | undefined>(undefined);
180179
const capabilitiesProbeCache = yield* Cache.makeWith(
@@ -278,7 +277,6 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv, Path.
278277
Effect.map(stampIdentity),
279278
),
280279
checkProvider,
281-
282280
enrichSnapshot: ({ settings, snapshot, publishSnapshot }) =>
283281
resolveMaintenance().pipe(
284282
Effect.flatMap((maintenanceCapabilities) =>

‎apps/server/src/provider/Drivers/CodexDriver.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ it.layer(layerTest)("CodexDriver", (it) => {
253253
expect(restored.auth.email).toBe("[email protected]");
254254
expect(restored.runtimePaths?.homePath).toBe(sharedHome);
255255
expect(restored.runtimePaths?.shadowHomePath).toContain(
256-
`providers/codex/${instanceId}/shadow`,
256+
NodePath.join("providers", "codex", instanceId, "shadow"),
257257
);
258258
const scan = yield* instance.snapshotForCwd!(serverConfig.stateDir).pipe(Effect.exit);
259259
expect(Exit.isFailure(scan)).toBe(true);

‎apps/server/src/provider/Drivers/CodexDriver.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,15 @@ export const CodexDriver: ProviderDriver<
232232
const checkProvider = modelCatalog.refreshInBackground.pipe(
233233
Effect.andThen(
234234
Effect.zipWith(
235-
checkCodexProviderStatus(effectiveConfig, undefined, processEnv),
235+
Effect.flatMap(UsagePolling, (includeUsage) =>
236+
checkCodexProviderStatus(
237+
effectiveConfig,
238+
undefined,
239+
processEnv,
240+
undefined,
241+
!includeUsage,
242+
),
243+
),
236244
currentCatalog,
237245
(draft, catalog) => stampIdentity(applyCodexModelCatalog(draft, catalog)),
238246
{ concurrent: true },

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

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ export class ProviderRegistry extends Context.Service<
5959
provider?: ProviderDriverKind,
6060
) => Effect.Effect<ReadonlyArray<ServerProvider>>;
6161

62+
readonly refreshUsage: (
63+
instanceId?: ProviderInstanceId,
64+
) => Effect.Effect<ReadonlyArray<ServerProvider>>;
65+
6266
/** Unknown instance ids return the cached list without error. */
6367
readonly refreshInstance: (
6468
instanceId: ProviderInstanceId,
@@ -602,13 +606,17 @@ export const layer = Layer.effect(
602606
.getInstance(instance.instanceId)
603607
.pipe(Effect.map((current) => current === instance));
604608

605-
const refreshOneSource = Effect.fn("refreshOneSource")(function* (instance: ProviderInstance) {
609+
const refreshOneSource = Effect.fn("refreshOneSource")(function* (
610+
instance: ProviderInstance,
611+
usage = false,
612+
) {
606613
const providerSource = buildSnapshotSource(instance);
607614
// Enrichment can publish a newer snapshot before refresh returns its pre-enrichment probe.
608-
const probe = yield* providerSource.refresh.pipe(
609-
Effect.andThen(providerSource.getSnapshot),
610-
Effect.exit,
611-
);
615+
const probe = yield* (
616+
usage
617+
? (instance.snapshot.refreshUsage ?? Effect.void).pipe(Effect.orDie)
618+
: providerSource.refresh
619+
).pipe(Effect.andThen(providerSource.getSnapshot), Effect.exit);
612620
// Settings can replace or remove the instance mid-probe; its late result or failure is stale.
613621
if (!(yield* isCurrentInstance(instance))) {
614622
return yield* Ref.get(providersRef);
@@ -619,6 +627,20 @@ export const layer = Layer.effect(
619627
);
620628
});
621629

630+
const refreshUsage = Effect.fn("ProviderRegistry.refreshUsage")(function* (
631+
instanceId?: ProviderInstanceId,
632+
) {
633+
const instances = yield* instanceRegistry.listInstances;
634+
yield* Effect.forEach(
635+
instances.filter(
636+
(instance) => instanceId === undefined || instance.instanceId === instanceId,
637+
),
638+
(instance) => refreshOneSource(instance, true),
639+
{ concurrency: "unbounded" },
640+
);
641+
return yield* Ref.get(providersRef);
642+
});
643+
622644
type RefreshAllCompletion = Deferred.Deferred<ReadonlyArray<ServerProvider>>;
623645
const refreshAllInFlightRef = yield* Ref.make<Option.Option<RefreshAllCompletion>>(
624646
Option.none(),
@@ -1071,6 +1093,7 @@ export const layer = Layer.effect(
10711093

10721094
return {
10731095
getProviders: Ref.get(providersRef),
1096+
refreshUsage,
10741097
refresh: (provider?: ProviderDriverKind) =>
10751098
refresh(provider).pipe(Effect.catchCause(recoverRefreshFailure)),
10761099
refreshInstance: (instanceId: ProviderInstanceId) =>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ function makeRegistry(
196196
const registry: ProviderRegistry.ProviderRegistry["Service"] = {
197197
getProviders: Ref.get(providersRef),
198198
refresh: () => Ref.get(providersRef),
199+
refreshUsage: () => Ref.get(providersRef),
199200
refreshInstance: () => Ref.get(providersRef),
200201
reloadSecretsAndRefresh: () => Ref.get(providersRef),
201202
refreshAfterUpdate: () => {

‎apps/server/src/provider/testUtils/providerRegistryMock.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const makeProviderRegistryMock = (
1010
): ProviderRegistry.ProviderRegistry["Service"] => ({
1111
getProviders: Effect.succeed(providers),
1212
refresh: () => Effect.succeed(providers),
13+
refreshUsage: () => Effect.succeed(providers),
1314
refreshInstance: () => Effect.succeed(providers),
1415
reloadSecretsAndRefresh: () => Effect.succeed(providers),
1516
refreshAfterUpdate: () => Effect.succeed(providers),

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

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { UsageProviderFilter } from "@t3tools/provider-core/server/usageLimits";
12
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
23
import { expect, it } from "@effect/vitest";
34
import { SecretProviderId, ServerConfigStreamEvent, UsageLimitSourceId } from "@t3tools/contracts";
@@ -12,6 +13,11 @@ import * as BackgroundPolicy from "../background/BackgroundPolicy.ts";
1213
import * as ServerSettings from "../serverSettings.ts";
1314
import * as UsageLimitSources from "./UsageLimitSources.ts";
1415

16+
const encodeSourceBody = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
17+
const decodeSourceRequest = Schema.decodeUnknownSync(
18+
Schema.fromJsonString(Schema.Struct({ auth_index: Schema.String, url: Schema.String })),
19+
);
20+
1521
const encodeConfigEvent = Schema.encodeSync(ServerConfigStreamEvent);
1622

1723
it.effect("keeps malformed source URLs encodable for config subscribers", () =>
@@ -156,3 +162,68 @@ it.effect("reads a management key from its secret provider", () => {
156162
Effect.scoped,
157163
);
158164
});
165+
166+
it.effect("retains another window's account when provider-filtered usage refreshes finish", () =>
167+
Effect.gen(function* () {
168+
const sources = yield* UsageLimitSources.make;
169+
yield* sources.refresh.pipe(Effect.provideService(UsageProviderFilter, ["claudeAgent"]));
170+
expect((yield* sources.current)[0]?.accounts.map((account) => account.driver)).toEqual([
171+
"claudeAgent",
172+
]);
173+
yield* sources.refresh.pipe(Effect.provideService(UsageProviderFilter, ["codex"]));
174+
expect((yield* sources.current)[0]?.accounts.map((account) => account.driver).sort()).toEqual([
175+
"claudeAgent",
176+
"codex",
177+
]);
178+
}).pipe(
179+
Effect.provide([
180+
ServerSettings.layerTest({
181+
usageLimitSources: {
182+
[UsageLimitSourceId.make("hub")]: {
183+
kind: "cliproxy",
184+
url: "https://hub.test",
185+
managementKey: "key",
186+
enabled: true,
187+
},
188+
},
189+
}),
190+
Layer.succeed(SecretResolver.SecretResolver, {
191+
read: () => Effect.succeed([]),
192+
invalidate: () => Effect.void,
193+
}),
194+
Layer.succeed(
195+
HttpClient.HttpClient,
196+
HttpClient.make((request) =>
197+
Effect.sync(() => {
198+
if (request.url.endsWith("/auth-files"))
199+
return HttpClientResponse.fromWeb(
200+
request,
201+
Response.json({
202+
files: [
203+
{ id: "claude", auth_index: "claude", provider: "claude" },
204+
{ id: "codex", auth_index: "codex", provider: "codex" },
205+
],
206+
}),
207+
);
208+
const input = decodeSourceRequest(
209+
request.body._tag === "Uint8Array"
210+
? new TextDecoder().decode(request.body.body)
211+
: "{}",
212+
);
213+
const body = input.url.endsWith("/rate-limit-reset-credits")
214+
? { credits: [] }
215+
: input.auth_index === "claude"
216+
? { five_hour: { utilization: 20, resets_at: null } }
217+
: { rate_limit: { primary_window: { used_percent: 20 } } };
218+
return HttpClientResponse.fromWeb(
219+
request,
220+
Response.json({ status_code: 200, body: encodeSourceBody(body) }),
221+
);
222+
}),
223+
),
224+
),
225+
NodeCrypto.layer,
226+
]),
227+
Effect.scoped,
228+
),
229+
);

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ export const make = Effect.gen(function* () {
8585
return { ...base, accounts: [], error: missingManagementKey(config) };
8686
}
8787
const accountKey = `${id}\0${config.url}\0${managementKey}`;
88+
const providers = yield* UsageProviderFilter;
8889
const accounts = yield* api
89-
.readAccounts({ url: config.url, managementKey }, yield* UsageProviderFilter)
90+
.readAccounts({ url: config.url, managementKey }, providers)
9091
.pipe(Effect.result);
9192
if (accounts._tag === "Failure") {
9293
yield* Effect.logDebug("usage limit source read failed", { id, cause: accounts.failure });
@@ -96,8 +97,15 @@ export const make = Effect.gen(function* () {
9697
error: accounts.failure.detail,
9798
};
9899
}
99-
lastGoodSources.set(accountKey, accounts.success);
100-
return { ...base, accounts: accounts.success };
100+
const retained =
101+
providers === undefined
102+
? []
103+
: (lastGoodSources.get(accountKey) ?? []).filter(
104+
(account) => !providers.includes(account.driver),
105+
);
106+
const merged = [...retained, ...accounts.success];
107+
lastGoodSources.set(accountKey, merged);
108+
return { ...base, accounts: merged };
101109
});
102110

103111
const publish = Effect.fn("UsageLimitSources.publish")(function* (

0 commit comments

Comments
 (0)