Skip to content

Commit 9695da9

Browse files
committed
fix(usage): do not scan ~/projects when Claude transcripts are missing
1 parent d23b181 commit 9695da9

3 files changed

Lines changed: 137 additions & 5 deletions

File tree

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

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ import * as ServerSettings from "../serverSettings.ts";
3838
import { resolveClaudeHomePath } from "../provider/Drivers/ClaudeHome.ts";
3939
import { resolveCodexHomeLayout } from "../provider/Drivers/CodexHomeLayout.ts";
4040
import { UsageAggregator } from "./usageAggregation.ts";
41+
import {
42+
isClaudeHomeExplicitOverride,
43+
resolveClaudeTranscriptDirPath,
44+
} from "./usageClaudeTranscriptDir.ts";
4145
import { parseRateTable, type RateTable } from "./usagePricing.ts";
4246
import {
4347
listTranscriptFiles,
@@ -185,16 +189,22 @@ export const make = Effect.gen(function* () {
185189
});
186190

187191
/**
188-
* Claude's config dir is the home itself when overridden, but a default
189-
* install nests transcripts under `~/.claude/projects`. Probe both.
192+
* Default installs nest transcripts under `~/.claude/projects`. A custom
193+
* CLAUDE_CONFIG_DIR uses `<home>/projects` only when that nested path is
194+
* absent. Never fall back to `~/projects` for the OS home.
190195
*/
191-
const resolveClaudeTranscriptDir = (homePath: string) =>
196+
const resolveClaudeTranscriptDir = (homePath: string, homeIsExplicitOverride: boolean) =>
192197
Effect.gen(function* () {
193198
const nested = path.join(homePath, ".claude", "projects");
194199
const nestedExists = yield* fileSystem
195200
.exists(nested)
196201
.pipe(Effect.catchCause(() => Effect.succeed(false)));
197-
return nestedExists ? nested : path.join(homePath, "projects");
202+
return resolveClaudeTranscriptDirPath({
203+
homePath,
204+
join: path.join,
205+
nestedProjectsExists: nestedExists,
206+
homeIsExplicitOverride,
207+
});
198208
});
199209

200210
/** Resolves the transcript directory for each provider. */
@@ -216,7 +226,10 @@ export const make = Effect.gen(function* () {
216226
);
217227

218228
const claudeHome = yield* resolveClaudeHomePath(settings.providers.claudeAgent);
219-
const claudeDir = yield* resolveClaudeTranscriptDir(claudeHome);
229+
const claudeDir = yield* resolveClaudeTranscriptDir(
230+
claudeHome,
231+
isClaudeHomeExplicitOverride(settings.providers.claudeAgent.homePath),
232+
);
220233
const codexLayout = yield* resolveCodexHomeLayout(settings.providers.codex);
221234

222235
return [
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
// @effect-diagnostics nodeBuiltinImport:off
2+
import * as NodePath from "node:path";
3+
4+
import { describe, expect, it } from "@effect/vitest";
5+
6+
import {
7+
isClaudeHomeExplicitOverride,
8+
resolveClaudeTranscriptDirPath,
9+
} from "./usageClaudeTranscriptDir.ts";
10+
11+
function resolve(input: {
12+
homePath: string;
13+
nestedProjectsExists: boolean;
14+
homeIsExplicitOverride: boolean;
15+
}): string {
16+
return resolveClaudeTranscriptDirPath({
17+
...input,
18+
join: NodePath.join,
19+
});
20+
}
21+
22+
describe("resolveClaudeTranscriptDirPath", () => {
23+
it("keeps the default home on ~/.claude/projects when the nested dir is missing", () => {
24+
const homePath = "/Users/alice";
25+
const resolved = resolve({
26+
homePath,
27+
nestedProjectsExists: false,
28+
homeIsExplicitOverride: false,
29+
});
30+
31+
expect(resolved).toBe(NodePath.join(homePath, ".claude", "projects"));
32+
expect(resolved).not.toBe(NodePath.join(homePath, "projects"));
33+
});
34+
35+
it("uses ~/.claude/projects when it exists on the default home", () => {
36+
const homePath = "/Users/alice";
37+
expect(
38+
resolve({
39+
homePath,
40+
nestedProjectsExists: true,
41+
homeIsExplicitOverride: false,
42+
}),
43+
).toBe(NodePath.join(homePath, ".claude", "projects"));
44+
});
45+
46+
it("uses <override>/projects when a custom home has no nested projects dir", () => {
47+
const homePath = "/opt/claude-config";
48+
expect(
49+
resolve({
50+
homePath,
51+
nestedProjectsExists: false,
52+
homeIsExplicitOverride: true,
53+
}),
54+
).toBe(NodePath.join(homePath, "projects"));
55+
});
56+
57+
it("prefers <override>/.claude/projects when a custom home nests the same way", () => {
58+
const homePath = "/opt/claude-config";
59+
expect(
60+
resolve({
61+
homePath,
62+
nestedProjectsExists: true,
63+
homeIsExplicitOverride: true,
64+
}),
65+
).toBe(NodePath.join(homePath, ".claude", "projects"));
66+
});
67+
68+
it("treats empty or whitespace configured homePath as the default, not an override", () => {
69+
const homePath = "/Users/alice";
70+
for (const configured of ["", " ", "\t", "\n", " \t\n "]) {
71+
expect(isClaudeHomeExplicitOverride(configured)).toBe(false);
72+
expect(
73+
resolve({
74+
homePath,
75+
nestedProjectsExists: false,
76+
homeIsExplicitOverride: isClaudeHomeExplicitOverride(configured),
77+
}),
78+
).toBe(NodePath.join(homePath, ".claude", "projects"));
79+
}
80+
});
81+
});
82+
83+
describe("isClaudeHomeExplicitOverride", () => {
84+
it("is true only when the configured homePath is non-empty after trim", () => {
85+
expect(isClaudeHomeExplicitOverride("~/.claude-work")).toBe(true);
86+
expect(isClaudeHomeExplicitOverride(" /custom/claude ")).toBe(true);
87+
expect(isClaudeHomeExplicitOverride("")).toBe(false);
88+
expect(isClaudeHomeExplicitOverride(" ")).toBe(false);
89+
});
90+
});
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/**
2+
* Pure choice of Claude Code's on-disk transcript directory.
3+
*
4+
* Used by `UsageService` so a missing default `~/.claude/projects` is reported
5+
* as missing instead of walking the user's `~/projects` tree.
6+
*
7+
* @module usageClaudeTranscriptDir
8+
*/
9+
10+
export function isClaudeHomeExplicitOverride(configuredHomePath: string): boolean {
11+
return configuredHomePath.trim().length > 0;
12+
}
13+
14+
/**
15+
* Default installs nest transcripts under `<home>/.claude/projects`. A custom
16+
* CLAUDE_CONFIG_DIR uses `<home>/projects` only when that nested path is
17+
* absent. The OS home never falls back to `<home>/projects`.
18+
*/
19+
export function resolveClaudeTranscriptDirPath(input: {
20+
readonly homePath: string;
21+
readonly join: (a: string, b: string, ...rest: string[]) => string;
22+
readonly nestedProjectsExists: boolean;
23+
readonly homeIsExplicitOverride: boolean;
24+
}): string {
25+
const nested = input.join(input.homePath, ".claude", "projects");
26+
if (input.nestedProjectsExists) return nested;
27+
if (input.homeIsExplicitOverride) return input.join(input.homePath, "projects");
28+
return nested;
29+
}

0 commit comments

Comments
 (0)