Skip to content

Commit 8e89fe1

Browse files
fix(server): usage no longer waits on Muse home discovery (pingdotgg#30859)
1 parent 1b42b16 commit 8e89fe1

6 files changed

Lines changed: 233 additions & 65 deletions

File tree

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

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { vi } from "vite-plus/test";
1212
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
1313
import * as NodeServices from "@effect/platform-node/NodeServices";
1414
import * as HostProcess from "@t3tools/shared/HostProcess";
15+
import { SpawnExecutableResolution } from "@t3tools/shared/shell";
1516
import { mergeUsage } from "@t3tools/shared/usageMerge";
1617
import {
1718
EnvironmentId,
@@ -1120,7 +1121,7 @@ describe("UsageService", () => {
11201121
};
11211122
const muse = (summary: UsageSummary) =>
11221123
summary.buckets.filter((bucket) => bucket.provider === "muse");
1123-
const first = yield* service.readSummary(window);
1124+
const first = yield* service.readSummary({ ...window, awaitRefresh: true });
11241125
const buckets = muse(first);
11251126
assert.strictEqual(
11261127
buckets.reduce((sum, b) => sum + b.records, 0),
@@ -1202,6 +1203,7 @@ describe("UsageService", () => {
12021203
assert.closeTo(repriced?.costUsd ?? NaN, 0.000486, 1e-12);
12031204
}).pipe(
12041205
Effect.scoped,
1206+
Effect.provideService(SpawnExecutableResolution, (command: string) => command),
12051207
Effect.provide(
12061208
layerService({
12071209
prefix: "usage-muse",
@@ -1235,6 +1237,66 @@ describe("UsageService", () => {
12351237
}).pipe(Effect.scoped),
12361238
);
12371239

1240+
it.live("returns other providers' usage while Muse home discovery is still pending", () =>
1241+
Effect.gen(function* () {
1242+
const { transcript, settings, home } = yield* setup;
1243+
yield* Effect.promise(() => NodeFSP.writeFile(transcript, claudeLine(1, 5)));
1244+
const museStarted = yield* Deferred.make<void>();
1245+
const museReady = yield* Deferred.make<MuseSdk.MuseSdkHost>();
1246+
const museHome = NodePath.join(home, "muse");
1247+
yield* Effect.promise(() =>
1248+
NodeFSP.mkdir(NodePath.join(museHome, "sessions"), { recursive: true }),
1249+
);
1250+
using _create = vi
1251+
.spyOn(MuseSdk, "createMuseSdkHostEffect")
1252+
.mockImplementation(() =>
1253+
Deferred.succeed(museStarted, undefined).pipe(Effect.andThen(Deferred.await(museReady))),
1254+
);
1255+
const museSources = (summary: UsageSummary) =>
1256+
summary.sources
1257+
.filter((source) => source.fingerprint.provider === "muse")
1258+
.map((source) => [source.fingerprint.resolvedHomePath, source.status, source.refreshing]);
1259+
const [pending, refreshed] = yield* Effect.gen(function* () {
1260+
const service = yield* UsageService.make;
1261+
const read = yield* Effect.forkChild(service.readSummary(WINDOW));
1262+
yield* Deferred.await(museStarted);
1263+
const pending = yield* Fiber.join(read);
1264+
const refresh = yield* Effect.forkChild(
1265+
service.readSummary({ ...WINDOW, awaitRefresh: true }),
1266+
);
1267+
yield* Deferred.succeed(museReady, {
1268+
initializeResult: { grantedCapabilities: [], museHome },
1269+
close: async () => {},
1270+
} as unknown as MuseSdk.MuseSdkHost);
1271+
return [pending, yield* Fiber.join(refresh)] as const;
1272+
}).pipe(
1273+
Effect.scoped,
1274+
Effect.provideService(SpawnExecutableResolution, (command: string) => command),
1275+
Effect.provide(
1276+
layerService({
1277+
prefix: "usage-muse-pending",
1278+
home,
1279+
settings: {
1280+
...settings,
1281+
providerInstances: {
1282+
...settings.providerInstances,
1283+
[ProviderInstanceId.make("muse")]: {
1284+
driver: ProviderDriverKind.make("muse"),
1285+
enabled: false,
1286+
},
1287+
},
1288+
},
1289+
}),
1290+
),
1291+
);
1292+
assert.strictEqual(totalOutputTokens(pending), 5);
1293+
assert.deepStrictEqual(museSources(pending), [["muse", "ok", true]]);
1294+
assert.deepStrictEqual(museSources(refreshed), [
1295+
[NodePath.join(museHome, "sessions"), "ok", undefined],
1296+
]);
1297+
}).pipe(Effect.scoped),
1298+
);
1299+
12381300
it.live("reports missing Pi history and skips malformed records without losing valid usage", () =>
12391301
Effect.gen(function* () {
12401302
const { home, settings } = yield* setup;

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

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -330,16 +330,25 @@ export const make = Effect.gen(function* () {
330330
const resolveTranscriptDirs = Effect.fn("UsageService.resolveTranscriptDirs")(function* (
331331
settings: ServerSettingsValue,
332332
retentionCutoffMs: number,
333+
awaitRefresh: boolean,
333334
) {
334335
const dirs: Array<TranscriptSource> = [];
336+
const pending: Array<ScannedDir> = [];
335337
const seen = new Set<string>();
336338
for (const { driver, reader } of transcriptReaders) {
337339
const { provider, format } = reader;
338340
const directories = yield* Effect.forEach(
339341
yield* usageInstances(driver, settings),
340-
(instance) => reader.directories(instance),
342+
(instance) => reader.directories(instance, { awaitRefresh }),
341343
);
342-
for (const { dir: directory, fileName } of directories.flat()) {
344+
for (const { dir: directory, fileName, refreshing } of directories.flat()) {
345+
if (refreshing) {
346+
const key = `${provider}\0${directory}`;
347+
if (seen.has(key)) continue;
348+
seen.add(key);
349+
pending.push({ provider, dir: directory, volumeId: "", files: [], refreshing });
350+
continue;
351+
}
343352
const sourceKey = provider + "\0" + directory;
344353
const previous = sourceCache.get(sourceKey);
345354
const dir = yield* fileSystem
@@ -375,7 +384,7 @@ export const make = Effect.gen(function* () {
375384
});
376385
}
377386
}
378-
return dirs;
387+
return { dirs, pending };
379388
});
380389

381390
// Share first loads so concurrent readers cannot scan against a still-empty cache.
@@ -654,9 +663,11 @@ export const make = Effect.gen(function* () {
654663
retentionCutoffMs: number,
655664
awaitRefresh: boolean,
656665
) {
657-
const dirs = yield* resolveTranscriptDirs(settings, retentionCutoffMs).pipe(
658-
Effect.provideContext(readerContext),
659-
);
666+
const { dirs, pending } = yield* resolveTranscriptDirs(
667+
settings,
668+
retentionCutoffMs,
669+
awaitRefresh,
670+
).pipe(Effect.provideContext(readerContext));
660671

661672
const scans = Effect.forEach(
662673
scanReaders,
@@ -690,7 +701,7 @@ export const make = Effect.gen(function* () {
690701
[Effect.forEach(dirs, (dir) => scanTranscriptDir(dir, windowStartMs)), scans],
691702
{ concurrency: "unbounded" },
692703
);
693-
const scanned: readonly ScannedDir[] = [...transcripts, ...scanDirs.flat()];
704+
const scanned: readonly ScannedDir[] = [...transcripts, ...pending, ...scanDirs.flat()];
694705
return scanned;
695706
});
696707

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,16 @@ export type ProviderUsageReader<Config, R> =
111111
readonly resolveServiceTiers?: (
112112
records: readonly UsageRecord[],
113113
) => Effect.Effect<ReadonlyMap<UsageRecord, UsageSpeed>, never, R>;
114+
/** A `refreshing` entry is not scanned; it reports its source as still being located. */
114115
readonly directories: (
115116
instance: ProviderUsageInstance<Config>,
117+
options: { readonly awaitRefresh: boolean },
116118
) => Effect.Effect<
117-
ReadonlyArray<{ readonly dir: string; readonly fileName?: string }>,
119+
ReadonlyArray<{
120+
readonly dir: string;
121+
readonly fileName?: string;
122+
readonly refreshing?: true;
123+
}>,
118124
never,
119125
R
120126
>;

‎packages/provider-muse/src/server/MuseUsageHome.ts‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,32 @@ import * as Duration from "effect/Duration";
44
import * as Effect from "effect/Effect";
55
import * as Exit from "effect/Exit";
66
import * as Layer from "effect/Layer";
7+
import * as Option from "effect/Option";
8+
9+
import * as HostProcess from "@t3tools/shared/HostProcess";
10+
import { SpawnExecutableResolution } from "@t3tools/shared/shell";
711

812
import { createMuseSdkHostEffect, MuseSdkError } from "./sdk.ts";
913

1014
export class MuseUsageHome extends Context.Service<
1115
MuseUsageHome,
1216
{
17+
/** None while discovery is still running and `awaitRefresh` is false. */
1318
readonly resolve: (input: {
1419
readonly binaryPath: string;
1520
readonly environment: NodeJS.ProcessEnv;
16-
}) => Effect.Effect<string | undefined>;
21+
readonly awaitRefresh: boolean;
22+
}) => Effect.Effect<Option.Option<string | undefined>>;
1723
}
1824
>()("@t3tools/provider-muse/server/MuseUsageHome") {}
1925

2026
const make = Effect.gen(function* () {
27+
const scope = yield* Effect.scope;
2128
const cache = yield* Cache.makeWith(
22-
Effect.fn("MuseUsageHome.initialize")(function* (
23-
input: Parameters<MuseUsageHome["Service"]["resolve"]>[0],
24-
) {
29+
Effect.fn("MuseUsageHome.initialize")(function* (input: {
30+
readonly binaryPath: string;
31+
readonly environment: NodeJS.ProcessEnv;
32+
}) {
2533
return yield* Effect.scoped(
2634
Effect.gen(function* () {
2735
const host = yield* Effect.acquireRelease(
@@ -35,7 +43,7 @@ const make = Effect.gen(function* () {
3543
);
3644
return host.initializeResult.museHome;
3745
}),
38-
);
46+
).pipe(Effect.orElseSucceed(() => undefined));
3947
}),
4048
{
4149
capacity: 32,
@@ -45,15 +53,27 @@ const make = Effect.gen(function* () {
4553
},
4654
);
4755
const resolve: MuseUsageHome["Service"]["resolve"] = Effect.fn("MuseUsageHome.resolve")(
48-
function* ({ binaryPath, environment }) {
56+
function* ({ binaryPath, environment, awaitRefresh }) {
4957
// Cache keys compare structurally. Omitted and undefined variables both
5058
// disappear from the child process environment and must share an entry.
51-
return yield* Cache.get(cache, {
59+
const key = {
5260
binaryPath,
5361
environment: Object.fromEntries(
5462
Object.entries(environment).filter(([, value]) => value !== undefined),
5563
),
56-
}).pipe(Effect.orElseSucceed(() => undefined));
64+
};
65+
const settled = yield* Cache.getSuccess(cache, key);
66+
if (Option.isSome(settled)) return settled;
67+
// Spawn failures surface asynchronously; without this a missing CLI would report as pending.
68+
const resolveExecutable = yield* SpawnExecutableResolution;
69+
if (resolveExecutable(binaryPath, yield* HostProcess.Platform, environment) === undefined) {
70+
return Option.some(undefined);
71+
}
72+
if (awaitRefresh) return Option.some(yield* Cache.get(cache, key));
73+
// Awaited in the layer scope so a departing caller cannot cancel discovery.
74+
yield* Effect.forkIn(Cache.get(cache, key), scope, { startImmediately: true });
75+
// A lookup that settled synchronously needs no refresh.
76+
return yield* Cache.getSuccess(cache, key);
5777
},
5878
);
5979
return MuseUsageHome.of({ resolve });

0 commit comments

Comments
 (0)