Skip to content
This repository was archived by the owner on Oct 10, 2026. It is now read-only.

Commit ecbb640

Browse files
author
aaditagrawal
committed
fix(server): preserve legacy Claude config dir layout for CLAUDE_CONFIG_DIR
Persisted homePath values historically meant a HOME override (Claude used $HOME/.claude). Map those to CLAUDE_CONFIG_DIR via resolveClaudeConfigDir, and key continuation/cache by the effective config directory including the default ~/.claude.
1 parent ca317a0 commit ecbb640

6 files changed

Lines changed: 76 additions & 22 deletions

File tree

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

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
makeClaudeCapabilitiesCacheKey,
1010
makeClaudeContinuationGroupKey,
1111
makeClaudeEnvironment,
12+
resolveClaudeConfigDir,
1213
resolveClaudeHomePath,
1314
} from "./ClaudeHome.ts";
1415

@@ -17,35 +18,57 @@ it.layer(NodeServices.layer)("ClaudeHome", (it) => {
1718
it.effect("uses the process home when no Claude home override is configured", () =>
1819
Effect.gen(function* () {
1920
const path = yield* Path.Path;
20-
const resolved = path.resolve(NodeOS.homedir());
21+
const resolvedHome = path.resolve(NodeOS.homedir());
22+
const defaultConfigDir = path.join(resolvedHome, ".claude");
2123

22-
expect(yield* resolveClaudeHomePath({ homePath: "" })).toBe(resolved);
24+
expect(yield* resolveClaudeHomePath({ homePath: "" })).toBe(resolvedHome);
25+
expect(yield* resolveClaudeConfigDir({ homePath: "" })).toBe(defaultConfigDir);
2326
expect(yield* makeClaudeEnvironment({ homePath: "" })).toBe(process.env);
2427
}),
2528
);
2629

27-
it.effect("resolves configured Claude HOME and stamps continuation/cache keys with it", () =>
30+
it.effect("preserves legacy HOME layouts under $HOME/.claude for CLAUDE_CONFIG_DIR", () =>
2831
Effect.gen(function* () {
2932
const path = yield* Path.Path;
3033
const homePath = "~/.claude-work";
31-
const resolved = path.resolve(NodeOS.homedir(), ".claude-work");
34+
const resolvedHome = path.resolve(NodeOS.homedir(), ".claude-work");
35+
const configDir = path.join(resolvedHome, ".claude");
3236

33-
expect(yield* resolveClaudeHomePath({ homePath })).toBe(resolved);
34-
expect((yield* makeClaudeEnvironment({ homePath })).CLAUDE_CONFIG_DIR).toBe(resolved);
35-
expect(yield* makeClaudeContinuationGroupKey({ homePath })).toBe(`claude:home:${resolved}`);
37+
expect(yield* resolveClaudeHomePath({ homePath })).toBe(resolvedHome);
38+
expect(yield* resolveClaudeConfigDir({ homePath })).toBe(configDir);
39+
expect((yield* makeClaudeEnvironment({ homePath })).CLAUDE_CONFIG_DIR).toBe(configDir);
40+
expect(yield* makeClaudeContinuationGroupKey({ homePath })).toBe(`claude:home:${configDir}`);
3641
expect(yield* makeClaudeCapabilitiesCacheKey({ binaryPath: "claude", homePath })).toBe(
37-
`claude\0${resolved}`,
42+
`claude\0${configDir}`,
3843
);
3944
}),
4045
);
4146

42-
it.effect("keeps continuation compatible across instances with the same Claude HOME", () =>
47+
it.effect("treats paths that already end with .claude as the config dir", () =>
4348
Effect.gen(function* () {
4449
const path = yield* Path.Path;
45-
const resolved = path.resolve(NodeOS.homedir());
50+
const homePath = "~/.claude";
51+
const configDir = path.resolve(NodeOS.homedir(), ".claude");
52+
53+
expect(yield* resolveClaudeConfigDir({ homePath })).toBe(configDir);
54+
expect((yield* makeClaudeEnvironment({ homePath })).CLAUDE_CONFIG_DIR).toBe(configDir);
55+
expect(yield* makeClaudeContinuationGroupKey({ homePath })).toBe(`claude:home:${configDir}`);
56+
}),
57+
);
58+
59+
it.effect("keys continuation by the effective default config directory", () =>
60+
Effect.gen(function* () {
61+
const path = yield* Path.Path;
62+
const defaultConfigDir = path.resolve(path.join(NodeOS.homedir(), ".claude"));
4663

4764
expect(yield* makeClaudeContinuationGroupKey({ homePath: "" })).toBe(
48-
`claude:home:${resolved}`,
65+
`claude:home:${defaultConfigDir}`,
66+
);
67+
expect(yield* makeClaudeContinuationGroupKey({ homePath: "~/.claude" })).toBe(
68+
`claude:home:${defaultConfigDir}`,
69+
);
70+
expect(yield* makeClaudeContinuationGroupKey({ homePath: "~" })).toBe(
71+
`claude:home:${defaultConfigDir}`,
4972
);
5073
}),
5174
);

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

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,30 @@ import * as Path from "effect/Path";
66

77
import { expandHomePath } from "../../pathExpansion.ts";
88

9+
/**
10+
* Effective Claude config directory for `CLAUDE_CONFIG_DIR` and
11+
* continuation/cache keys.
12+
*
13+
* Persisted `homePath` values historically meant a HOME override (Claude used
14+
* `$HOME/.claude`). Paths whose basename is already `.claude` are treated as
15+
* the config dir itself. An empty `homePath` maps to the default `~/.claude`.
16+
*/
17+
export const resolveClaudeConfigDir = Effect.fn("resolveClaudeConfigDir")(function* (
18+
config: Pick<ClaudeSettings, "homePath">,
19+
): Effect.fn.Return<string, never, Path.Path> {
20+
const path = yield* Path.Path;
21+
const homePath = config.homePath.trim();
22+
if (homePath.length === 0) {
23+
return path.resolve(path.join(NodeOS.homedir(), ".claude"));
24+
}
25+
const resolvedHomePath = path.resolve(expandHomePath(homePath));
26+
if (path.basename(resolvedHomePath) === ".claude") {
27+
return resolvedHomePath;
28+
}
29+
// Legacy HOME override layout: config lived under `$HOME/.claude`.
30+
return path.join(resolvedHomePath, ".claude");
31+
});
32+
933
export const resolveClaudeHomePath = Effect.fn("resolveClaudeHomePath")(function* (
1034
config: Pick<ClaudeSettings, "homePath">,
1135
): Effect.fn.Return<string, never, Path.Path> {
@@ -21,7 +45,7 @@ export const makeClaudeEnvironment = Effect.fn("makeClaudeEnvironment")(function
2145
const resolvedBaseEnv = baseEnv ?? process.env;
2246
const homePath = config.homePath.trim();
2347
if (homePath.length === 0) return resolvedBaseEnv;
24-
const resolvedHomePath = yield* resolveClaudeHomePath(config);
48+
const configDir = yield* resolveClaudeConfigDir(config);
2549
return {
2650
...resolvedBaseEnv,
2751
// Isolate this instance's config via CLAUDE_CONFIG_DIR rather than HOME.
@@ -30,22 +54,26 @@ export const makeClaudeEnvironment = Effect.fn("makeClaudeEnvironment")(function
3054
// OAuth credentials and reports "Not logged in". CLAUDE_CONFIG_DIR points
3155
// Claude Code at its config dir directly while leaving HOME (and the
3256
// keychain) intact.
33-
CLAUDE_CONFIG_DIR: resolvedHomePath,
57+
//
58+
// Persisted homePath values historically meant a HOME override, so Claude
59+
// used `$HOME/.claude`. When the configured path is not already a `.claude`
60+
// config dir, append `.claude` to preserve that layout.
61+
CLAUDE_CONFIG_DIR: configDir,
3462
};
3563
});
3664

3765
export const makeClaudeContinuationGroupKey = Effect.fn("makeClaudeContinuationGroupKey")(
3866
function* (config: Pick<ClaudeSettings, "homePath">): Effect.fn.Return<string, never, Path.Path> {
39-
const resolvedHomePath = yield* resolveClaudeHomePath(config);
40-
return `claude:home:${resolvedHomePath}`;
67+
const configDir = yield* resolveClaudeConfigDir(config);
68+
return `claude:home:${configDir}`;
4169
},
4270
);
4371

4472
export const makeClaudeCapabilitiesCacheKey = Effect.fn("makeClaudeCapabilitiesCacheKey")(
4573
function* (
4674
config: Pick<ClaudeSettings, "binaryPath" | "homePath">,
4775
): Effect.fn.Return<string, never, Path.Path> {
48-
const resolvedHomePath = yield* resolveClaudeHomePath(config);
49-
return `${config.binaryPath}\0${resolvedHomePath}`;
76+
const configDir = yield* resolveClaudeConfigDir(config);
77+
return `${config.binaryPath}\0${configDir}`;
5078
},
5179
);

‎apps/server/src/provider/Layers/ClaudeAdapter.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ describe("ClaudeAdapterLive", () => {
437437
const createInput = harness.getLastCreateQueryInput();
438438
assert.equal(
439439
createInput?.options.env?.CLAUDE_CONFIG_DIR,
440-
NodePath.join(NodeOS.homedir(), ".claude-work"),
440+
NodePath.join(NodeOS.homedir(), ".claude-work", ".claude"),
441441
);
442442
}).pipe(
443443
Effect.provideService(Random.Random, makeDeterministicRandomService()),

‎apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,9 @@ describe("ProviderInstanceRegistryLive — all drivers slice", () => {
382382
expect(claudeSnapshot.instanceId).toBe(claudeId);
383383
expect(claudeSnapshot.driver).toBe(claudeDriverKind);
384384
expect(claudeSnapshot.enabled).toBe(false);
385-
expect(claudeSnapshot.continuation?.groupKey).toBe("claude:home:/home/julius/.claude-work");
385+
expect(claudeSnapshot.continuation?.groupKey).toBe(
386+
"claude:home:/home/julius/.claude-work/.claude",
387+
);
386388

387389
const cursorSnapshot = yield* cursor!.snapshot.getSnapshot;
388390
expect(cursorSnapshot.instanceId).toBe(cursorId);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1869,7 +1869,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
18691869
assert.strictEqual(status.status, "ready");
18701870
assert.deepStrictEqual(
18711871
recorded.commands.map((command) => command.env?.CLAUDE_CONFIG_DIR),
1872-
[claudeConfigDir],
1872+
[`${claudeConfigDir}/.claude`],
18731873
);
18741874
}).pipe(Effect.provide(recorded.layer));
18751875
});

‎apps/server/src/textGeneration/ClaudeTextGeneration.test.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,8 @@ it.layer(ClaudeTextGenerationTestLayer)("ClaudeTextGeneration", (it) => {
289289
it.effect("runs Claude text generation with the configured CLAUDE_CONFIG_DIR", () =>
290290
Effect.gen(function* () {
291291
const path = yield* Path.Path;
292-
const claudeConfigDir = path.join(process.cwd(), ".claude-work-test");
292+
const claudeHomePath = path.join(process.cwd(), ".claude-work-test");
293+
const claudeConfigDir = path.join(claudeHomePath, ".claude");
293294
return yield* withFakeClaudeEnv(
294295
{
295296
// @effect-diagnostics-next-line preferSchemaOverJson:off
@@ -299,7 +300,7 @@ it.layer(ClaudeTextGenerationTestLayer)("ClaudeTextGeneration", (it) => {
299300
},
300301
}),
301302
configDirMustBe: claudeConfigDir,
302-
claudeConfig: { homePath: claudeConfigDir },
303+
claudeConfig: { homePath: claudeHomePath },
303304
},
304305
(textGeneration) =>
305306
Effect.gen(function* () {

0 commit comments

Comments
 (0)