@devries-cameron20 / t3code Mirror · read-only / commits / d430dff14f
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 12:15 UTC

fix(usage): keep default-home history after the default account moves (#36727)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Julius Marminge committed Nov 14, 2026 at 20:45 UTC d430dff14f57da1619e39574104a3adeaf2f6d7d
2 files changed +31 -3
apps/server/src/usage/UsageService.test.ts
+29
@@ -214,6 +214,7 @@ const layerService = (input: {
214 Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
215 Layer.provideMerge(Layer.succeed(HostProcess.Platform, input.platform ?? "linux")),
216 Layer.provideMerge(Layer.succeed(HostProcess.Hostname, input.hostname ?? "usage-test-host")),
217 + Layer.provideMerge(Layer.succeed(HostProcess.HomeDirectory, input.home)),
218 Layer.provideMerge(ServerSettings.layerTest(input.settings)),
219 Layer.provideMerge(
220 Layer.succeed(
@@ -2493,6 +2494,34 @@ describe("UsageService", () => {
2494 }),
2495 );
2496
2497 + it.effect("keeps default-home history after the default account moves to a custom home", () =>
2498 + Effect.gen(function* () {
2499 + const { transcript, settings, home } = yield* setup;
2500 + const defaultHome = NodePath.join(home, "default-claude");
2501 + const defaultProjects = NodePath.join(defaultHome, "projects", "proj");
2502 + yield* Effect.promise(async () => {
2503 + await NodeFSP.writeFile(transcript, claudeLine(1, 5));
2504 + await NodeFSP.mkdir(defaultProjects, { recursive: true });
2505 + await NodeFSP.writeFile(
2506 + NodePath.join(defaultProjects, "earlier.jsonl"),
2507 + claudeLine(2, 7, "claude-fable-5", "earlier-session"),
2508 + );
2509 + });
2510 + const summary = yield* UsageService.make.pipe(
2511 + Effect.flatMap((service) => service.readSummary(WINDOW)),
2512 + Effect.provide(
2513 + layerService({
2514 + prefix: "usage-service-default-home-test",
2515 + home,
2516 + environment: { CLAUDE_CONFIG_DIR: defaultHome },
2517 + settings,
2518 + }),
2519 + ),
2520 + );
2521 + assert.strictEqual(totalOutputTokens(summary), 12);
2522 + }),
2523 + );
2524 +
2525 it.effect(
2526 "uses explicit account settings before environment and default homes, then refreshes them",
2527 () =>
apps/server/src/usage/UsageService.ts
+2 -3
@@ -360,9 +360,8 @@ export const make = Effect.gen(function* () {
360 > = Object.entries(settings.providerInstances)
361 .filter(([, instance]) => instance.driver === driver.driverKind)
362 .map(([id, instance]) => [ProviderInstanceId.make(id), instance, true] as const);
363 - if (!Object.hasOwn(settings.providerInstances, driver.driverKind)) {
364 - entries.push([ProviderInstanceId.make(driver.driverKind), {}, false]);
365 - }
363 + // History in the driver's default home stays counted after every instance moves elsewhere; readers dedupe shared directories.
364 + entries.push([ProviderInstanceId.make(driver.driverKind), {}, false]);
365 const decodeConfig = Schema.decodeUnknownOption(driver.configSchema);
366 return yield* Effect.forEach(
367 entries,