Skip to content

Commit 29ab4d4

Browse files
fix: preserve enabled provider defaults
Co-authored-by: maria <[email protected]>
1 parent e16249a commit 29ab4d4

3 files changed

Lines changed: 49 additions & 5 deletions

File tree

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,45 @@ it.layer(NodeServices.layer)("UsageService", (it) => {
105105
),
106106
),
107107
);
108+
109+
it.effect("uses driver defaults when an enabled instance omits config", () =>
110+
Effect.gen(function* () {
111+
const usage = yield* UsageService.UsageService;
112+
const summary = yield* usage.readSummary(summaryInput);
113+
114+
expect(summary.sources.map((source) => source.fingerprint.provider)).toEqual(["codex"]);
115+
}).pipe(
116+
Effect.provide(
117+
UsageService.layer.pipe(
118+
Layer.provideMerge(
119+
Layer.mergeAll(
120+
ServerSettings.ServerSettingsService.layerTest({
121+
providerInstances: {
122+
[ProviderInstanceId.make("claudeAgent")]: {
123+
driver: ProviderDriverKind.make("claudeAgent"),
124+
enabled: false,
125+
config: {},
126+
},
127+
[ProviderInstanceId.make("codex")]: {
128+
driver: ProviderDriverKind.make("codex"),
129+
enabled: false,
130+
config: {},
131+
},
132+
[ProviderInstanceId.make("codex-work")]: {
133+
driver: ProviderDriverKind.make("codex"),
134+
enabled: true,
135+
},
136+
},
137+
}),
138+
ServerConfig.layerTest(process.cwd(), { prefix: "t3-usage-test-" }),
139+
Layer.succeed(
140+
HttpClient.HttpClient,
141+
HttpClient.make(() => Effect.die("unexpected usage pricing request")),
142+
),
143+
),
144+
),
145+
),
146+
),
147+
),
148+
);
108149
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ export const make = Effect.gen(function* () {
234234
settings,
235235
ProviderDriverKind.make("claudeAgent"),
236236
)) {
237-
const config = decodeClaudeSettings(instance.config);
237+
const config = decodeClaudeSettings(instance.config ?? {});
238238
if (Option.isNone(config)) continue;
239239
const claudeHome = yield* resolveClaudeHomePath(config.value);
240240
addDir("claude", yield* resolveClaudeTranscriptDir(claudeHome));
@@ -244,7 +244,7 @@ export const make = Effect.gen(function* () {
244244
settings,
245245
ProviderDriverKind.make("codex"),
246246
)) {
247-
const config = decodeCodexSettings(instance.config);
247+
const config = decodeCodexSettings(instance.config ?? {});
248248
if (Option.isNone(config)) continue;
249249
const codexLayout = yield* resolveCodexHomeLayout(config.value);
250250
addDir("codex", path.join(codexLayout.sharedHomePath, "sessions"));

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ export function UsagePage() {
6262
}
6363
return PROVIDER_ORDER.filter((provider) => enabled.has(provider));
6464
}, [environments, merged.staleEnvironments]);
65+
const skeletonProviders = environments.some((environment) => environment.summary !== null)
66+
? providers
67+
: PROVIDER_ORDER;
6568

6669
// Hold the content until every environment is terminal. Rendering merged
6770
// totals while devices are still answering makes every number on the page
@@ -214,7 +217,7 @@ export function UsagePage() {
214217
{settling ? (
215218
<>
216219
{environments.length > 1 ? <UsageDeviceStrip environments={environments} /> : null}
217-
<UsageSkeleton />
220+
<UsageSkeleton providers={skeletonProviders} />
218221
</>
219222
) : (
220223
<>
@@ -588,7 +591,7 @@ function UsageDeviceStrip({
588591
* Static stand-in with the loaded page's shape. No shimmer; blocks fill in
589592
* exactly once when the last device answers.
590593
*/
591-
function UsageSkeleton() {
594+
function UsageSkeleton({ providers }: { readonly providers: readonly UsageProviderKind[] }) {
592595
return (
593596
<>
594597
<section className="grid gap-6 lg:grid-cols-[minmax(0,16rem)_minmax(0,1fr)]">
@@ -597,7 +600,7 @@ function UsageSkeleton() {
597600
<div className="h-10 w-36 rounded-sm bg-muted" />
598601
<div className="h-4 w-32 rounded-sm bg-muted" />
599602
</div>
600-
{PROVIDER_ORDER.map((provider) => (
603+
{providers.map((provider) => (
601604
<div key={provider} className="flex flex-col gap-1">
602605
<div className="flex min-h-5 items-center justify-between gap-4">
603606
<span className="flex items-center gap-2">

0 commit comments

Comments
 (0)