Skip to content

Commit 543ee27

Browse files
fix(server): fork Claude threads after project root changes (#22836)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 7e45dcd commit 543ee27

7 files changed

Lines changed: 70 additions & 26 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts‎

Lines changed: 60 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2442,27 +2442,69 @@ describe("ClaudeAdapterV2 attachments", () => {
24422442
});
24432443

24442444
describe("ClaudeAdapterV2 native fork", () => {
2445-
it.effect("forks at the source assistant cursor and resumes the forked session", () =>
2445+
it.effect("forks a session from its original directory after the workspace root changes", () =>
24462446
Effect.scoped(
24472447
Effect.gen(function* () {
24482448
const fileSystem = yield* FileSystem.FileSystem;
24492449
const idAllocator = yield* IdAllocator.IdAllocatorV2;
24502450
const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
24512451
prefix: "t3-claude-v2-fork-attachments-",
24522452
});
2453+
const configDir = yield* fileSystem.makeTempDirectoryScoped({
2454+
prefix: "t3-claude-root-change-",
2455+
});
2456+
const sourceSessionId = "11111111-1111-4111-8111-111111111111";
2457+
const sourceCursor = "aaaaaaaa-0000-4000-8000-000000000002";
2458+
const projectDir = NodePath.join(configDir, "projects", "-old-workspace");
2459+
yield* fileSystem.makeDirectory(projectDir, { recursive: true });
2460+
const entry = (uuid: string, parentUuid: string | null, message: unknown) => ({
2461+
type: parentUuid === null ? "user" : "assistant",
2462+
uuid,
2463+
parentUuid,
2464+
sessionId: sourceSessionId,
2465+
cwd: "/old-workspace",
2466+
isSidechain: false,
2467+
timestamp: "2026-10-01T00:00:00.000Z",
2468+
message,
2469+
});
2470+
yield* fileSystem.writeFileString(
2471+
NodePath.join(projectDir, `${sourceSessionId}.jsonl`),
2472+
[
2473+
entry("aaaaaaaa-0000-4000-8000-000000000001", null, { role: "user", content: "hello" }),
2474+
entry(sourceCursor, "aaaaaaaa-0000-4000-8000-000000000001", {
2475+
role: "assistant",
2476+
content: [{ type: "text", text: "inherited answer" }],
2477+
}),
2478+
]
2479+
.map((line) => JSON.stringify(line))
2480+
.join("\n"),
2481+
);
2482+
const realRunner = yield* ClaudeAdapterV2.ClaudeAgentSdkQueryRunner.pipe(
2483+
Effect.provide(
2484+
ClaudeAdapterV2.layerQueryRunner.pipe(
2485+
Layer.provide(PortScanner.layerTest),
2486+
Layer.provide(
2487+
Layer.succeed(ProviderEventLoggers.ProviderEventLoggers, {
2488+
native: undefined,
2489+
canonical: undefined,
2490+
}),
2491+
),
2492+
),
2493+
),
2494+
);
24532495
const openedQueries: Array<ClaudeAdapterV2.ClaudeAgentSdkQueryOpenInput> = [];
24542496
const forkCalls: Array<ClaudeAdapterV2.ClaudeAgentSdkSessionForkInput> = [];
24552497
const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
24562498
instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
24572499
settings: DEFAULT_CLAUDE_SETTINGS,
2458-
environment: { CLAUDE_CONFIG_DIR: "/custom/claude-home" },
2500+
environment: { CLAUDE_CONFIG_DIR: configDir },
24592501
attachmentsDir,
24602502
fileSystem,
24612503
path: yield* Path.Path,
24622504
random: yield* SecureRandom.SecureRandom,
24632505
idAllocator,
24642506
queryRunner: {
2465-
allocateSessionId: Effect.succeed("source-native-session"),
2507+
allocateSessionId: Effect.succeed(sourceSessionId),
24662508
open: (input) =>
24672509
Effect.sync(() => {
24682510
openedQueries.push(input);
@@ -2483,9 +2525,9 @@ describe("ClaudeAdapterV2 native fork", () => {
24832525
};
24842526
}),
24852527
forkSession: (input) =>
2486-
Effect.sync(() => {
2528+
Effect.gen(function* () {
24872529
forkCalls.push(input);
2488-
return { sessionId: "forked-native-session" };
2530+
return yield* realRunner.forkSession(input);
24892531
}),
24902532
subagentLaunchToolUseId: () => Effect.succeed(null),
24912533
assertComplete: Effect.void,
@@ -2531,7 +2573,7 @@ describe("ClaudeAdapterV2 native fork", () => {
25312573
runAttemptId: RunAttemptId.make("run-attempt-claude-source"),
25322574
nativeTurnRef: {
25332575
driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
2534-
nativeId: "assistant-message-cursor",
2576+
nativeId: sourceCursor,
25352577
strength: "weak",
25362578
},
25372579
ordinal: 1,
@@ -2546,17 +2588,22 @@ describe("ClaudeAdapterV2 native fork", () => {
25462588

25472589
assert.deepEqual(forkCalls, [
25482590
{
2549-
sessionId: "source-native-session",
2591+
sessionId: sourceSessionId,
25502592
options: {
2551-
dir: "/workspace",
2552-
upToMessageId: "assistant-message-cursor",
2593+
upToMessageId: sourceCursor,
25532594
},
2554-
environment: { CLAUDE_CONFIG_DIR: "/custom/claude-home" },
2595+
environment: { CLAUDE_CONFIG_DIR: configDir },
25552596
threadId: targetThreadId,
25562597
providerSessionId,
25572598
},
25582599
]);
2559-
assert.equal(forkedProviderThread.nativeThreadRef?.nativeId, "forked-native-session");
2600+
const forkedSessionId = forkedProviderThread.nativeThreadRef?.nativeId;
2601+
assert.isString(forkedSessionId);
2602+
assert.notEqual(forkedSessionId, sourceSessionId);
2603+
const forkedTranscript = yield* fileSystem.readFileString(
2604+
NodePath.join(projectDir, `${forkedSessionId}.jsonl`),
2605+
);
2606+
assert.include(forkedTranscript, "inherited answer");
25602607
assert.equal(forkedProviderThread.forkedFrom?.providerThreadId, sourceProviderThread.id);
25612608
assert.equal(forkedProviderThread.forkedFrom?.providerTurnId, providerTurnId);
25622609

@@ -2616,8 +2663,9 @@ describe("ClaudeAdapterV2 native fork", () => {
26162663
}),
26172664
});
26182665

2619-
assert.equal(openedQueries[0]?.options.resume, "forked-native-session");
2666+
assert.equal(openedQueries[0]?.options.resume, forkedSessionId);
26202667
assert.equal(openedQueries[0]?.options.sessionId, undefined);
2668+
assert.equal(openedQueries[0]?.options.cwd, NodePath.resolve("/workspace"));
26212669
}).pipe(
26222670
Effect.provide(
26232671
Layer.mergeAll(

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.testkit.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2175,15 +2175,11 @@ async function recordClaudeForkSessionQuery(input: {
21752175
type: "session.fork",
21762176
sessionId: input.sessionId,
21772177
options: {
2178-
dir: sanitizedReplayCwd(input.scenario),
21792178
upToMessageId,
21802179
},
21812180
},
21822181
});
2183-
const forked = await forkSession(input.sessionId, {
2184-
dir: input.cwd,
2185-
upToMessageId,
2186-
});
2182+
const forked = await forkSession(input.sessionId, { upToMessageId });
21872183
forkedNativeSessionIds.push(forked.sessionId);
21882184
input.entries.push({
21892185
type: "emit_inbound",

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12342,10 +12342,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1234212342
const sourceNativeThreadId = yield* getNativeThreadId(forkInput.sourceProviderThread);
1234312343
yield* closeLiveQueryForNativeThread(sourceNativeThreadId);
1234412344
const upToMessageId = yield* resolveClaudeForkUpToMessageId(forkInput);
12345-
const forkOptions: ForkSessionOptions = {
12346-
...(input.runtimePolicy.cwd === null ? {} : { dir: input.runtimePolicy.cwd }),
12347-
...(upToMessageId === undefined ? {} : { upToMessageId }),
12348-
};
12345+
// A moved project still has its transcript under the original cwd.
12346+
// Let the SDK find the session by ID within this Claude home.
12347+
const forkOptions: ForkSessionOptions =
12348+
upToMessageId === undefined ? {} : { upToMessageId };
1234912349
const forked = yield* queryRunner.forkSession({
1235012350
sessionId: sourceNativeThreadId,
1235112351
options: forkOptions,

‎apps/server/src/orchestration-v2/testkit/fixtures/thread_fork_native/claude_transcript.ndjson‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{"type":"emit_inbound","label":"rate_limit_event","frame":{"type":"rate_limit_event","rate_limit_info":{"status":"allowed"},"uuid":"84451d3f-e7ba-4d80-aea3-4fbc442f4b3b","session_id":"8d0dafab-45d3-45eb-abef-41b9e55d5ff9"}}
99
{"type":"emit_inbound","label":"result","frame":{"type":"result","subtype":"success","is_error":false,"api_error_status":null,"duration_ms":2066,"duration_api_ms":1815,"num_turns":1,"result":"source fork seed ok","stop_reason":"end_turn","session_id":"8d0dafab-45d3-45eb-abef-41b9e55d5ff9","total_cost_usd":0.01172175,"usage":{"input_tokens":3,"cache_creation_input_tokens":2339,"cache_read_input_tokens":9455,"output_tokens":7,"server_tool_use":{"web_search_requests":0,"web_fetch_requests":0},"service_tier":"standard","cache_creation":{"ephemeral_1h_input_tokens":2339,"ephemeral_5m_input_tokens":0},"inference_geo":"","iterations":[{"input_tokens":3,"output_tokens":7,"cache_read_input_tokens":9455,"cache_creation_input_tokens":2339,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":2339},"type":"message"}],"speed":"standard"},"modelUsage":{"claude-sonnet-4-6":{"inputTokens":3,"outputTokens":7,"cacheReadInputTokens":9455,"cacheCreationInputTokens":2339,"webSearchRequests":0,"costUSD":0.01172175,"contextWindow":200000,"maxOutputTokens":32000}},"permission_denials":[],"terminal_reason":"completed","fast_mode_state":"off","uuid":"892cdc1f-e2d5-440d-ae57-ca27d32f63f1"}}
1010
{"type":"runtime_exit","status":"success"}
11-
{"type":"expect_outbound","label":"session.fork","frame":{"type":"session.fork","sessionId":"8d0dafab-45d3-45eb-abef-41b9e55d5ff9","options":{"dir":"/tmp/claude-replay-thread_fork_native","upToMessageId":"68baa075-b7d4-4689-866b-96bd51e570c3"}}}
11+
{"type":"expect_outbound","label":"session.fork","frame":{"type":"session.fork","sessionId":"8d0dafab-45d3-45eb-abef-41b9e55d5ff9","options":{"upToMessageId":"68baa075-b7d4-4689-866b-96bd51e570c3"}}}
1212
{"type":"emit_inbound","label":"session.forked","frame":{"type":"session.forked","sessionId":"7e7ad6ec-db4a-4510-85ff-59df35cf7fad"}}
1313
{"type":"expect_outbound","label":"query.open:fork","frame":{"type":"query.open","options":{"model":"claude-sonnet-4-6","tools":{"type":"preset","preset":"claude_code"},"permissionMode":"bypassPermissions","allowDangerouslySkipPermissions":true,"resume":"7e7ad6ec-db4a-4510-85ff-59df35cf7fad","settings":{"showThinkingSummaries":true}}}}
1414
{"type":"expect_outbound","label":"prompt.offer:2","frame":{"type":"prompt.offer","message":{"type":"user","message":{"role":"user","content":"Respond with the following text: fork native ok"},"parent_tool_use_id":null}}}

‎apps/server/src/orchestration-v2/testkit/fixtures/thread_fork_native_fork_local_rollback/claude_transcript.ndjson‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{"type":"emit_inbound","label":"rate_limit_event","frame":{"type":"rate_limit_event","rate_limit_info":{"status":"allowed","resetsAt":1779846000,"rateLimitType":"five_hour","overageStatus":"rejected","overageDisabledReason":"org_level_disabled","isUsingOverage":false},"uuid":"94e56646-7610-4a7a-8245-9301469861ae","session_id":"273fe17b-65fb-451f-ad99-ff19d323852d"}}
99
{"type":"emit_inbound","label":"result","frame":{"type":"result","subtype":"success","is_error":false,"api_error_status":null,"duration_ms":2928,"duration_api_ms":1977,"num_turns":1,"result":"fork local source alpha","stop_reason":"end_turn","session_id":"273fe17b-65fb-451f-ad99-ff19d323852d","total_cost_usd":0.0036539999999999997,"usage":{"input_tokens":3,"cache_creation_input_tokens":0,"cache_read_input_tokens":11800,"output_tokens":7,"server_tool_use":{"web_search_requests":0,"web_fetch_requests":0},"service_tier":"standard","cache_creation":{"ephemeral_1h_input_tokens":0,"ephemeral_5m_input_tokens":0},"inference_geo":"","iterations":[{"input_tokens":3,"output_tokens":7,"cache_read_input_tokens":11800,"cache_creation_input_tokens":0,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":0},"type":"message"}],"speed":"standard"},"modelUsage":{"claude-sonnet-4-6":{"inputTokens":3,"outputTokens":7,"cacheReadInputTokens":11800,"cacheCreationInputTokens":0,"webSearchRequests":0,"costUSD":0.0036539999999999997,"contextWindow":200000,"maxOutputTokens":32000}},"permission_denials":[],"terminal_reason":"completed","fast_mode_state":"off","uuid":"684990a5-0d00-4928-a332-fdc2c66769c6"}}
1010
{"type":"runtime_exit","status":"success"}
11-
{"type":"expect_outbound","label":"session.fork","frame":{"type":"session.fork","sessionId":"273fe17b-65fb-451f-ad99-ff19d323852d","options":{"dir":"/tmp/claude-replay-thread_fork_native_fork_local_rollback","upToMessageId":"7659a146-b729-47b6-aac2-8fc0c0981e92"}}}
11+
{"type":"expect_outbound","label":"session.fork","frame":{"type":"session.fork","sessionId":"273fe17b-65fb-451f-ad99-ff19d323852d","options":{"upToMessageId":"7659a146-b729-47b6-aac2-8fc0c0981e92"}}}
1212
{"type":"emit_inbound","label":"session.forked","frame":{"type":"session.forked","sessionId":"c9784d72-7e4f-4994-8c21-2e7e670ff91c"}}
1313
{"type":"expect_outbound","label":"query.open:fork","frame":{"type":"query.open","options":{"model":"claude-sonnet-4-6","tools":{"type":"preset","preset":"claude_code"},"permissionMode":"bypassPermissions","allowDangerouslySkipPermissions":true,"resume":"c9784d72-7e4f-4994-8c21-2e7e670ff91c","settings":{"showThinkingSummaries":true}}}}
1414
{"type":"expect_outbound","label":"prompt.offer:fork-first","frame":{"type":"prompt.offer","message":{"type":"user","message":{"role":"user","content":"For this fork-local rollback fixture, respond with exactly: fork local first"},"parent_tool_use_id":null}}}

‎apps/server/src/orchestration-v2/testkit/fixtures/thread_fork_native_prior_turn/claude_transcript.ndjson‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{"type":"emit_inbound","label":"assistant","frame":{"type":"assistant","message":{"model":"claude-sonnet-4-6","id":"msg_0181K4CdzyVanM6Px26CQP7L","type":"message","role":"assistant","content":[{"type":"text","text":"fork boundary beta"}],"stop_reason":null,"stop_sequence":null,"stop_details":null,"usage":{"input_tokens":3,"cache_creation_input_tokens":23,"cache_read_input_tokens":11797,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":23},"output_tokens":1,"service_tier":"standard","inference_geo":"not_available"},"context_management":null},"parent_tool_use_id":null,"session_id":"a91391e1-0de3-4107-a7c9-db7b1bbd8b99","uuid":"c517b74b-9537-4260-afcb-186c4056c0a4"}}
1313
{"type":"emit_inbound","label":"result","frame":{"type":"result","subtype":"success","is_error":false,"api_error_status":null,"duration_ms":2545,"duration_api_ms":3001,"num_turns":1,"result":"fork boundary beta","stop_reason":"end_turn","session_id":"a91391e1-0de3-4107-a7c9-db7b1bbd8b99","total_cost_usd":0.01544235,"usage":{"input_tokens":3,"cache_creation_input_tokens":23,"cache_read_input_tokens":11797,"output_tokens":6,"server_tool_use":{"web_search_requests":0,"web_fetch_requests":0},"service_tier":"standard","cache_creation":{"ephemeral_1h_input_tokens":23,"ephemeral_5m_input_tokens":0},"inference_geo":"","iterations":[{"input_tokens":3,"output_tokens":6,"cache_read_input_tokens":11797,"cache_creation_input_tokens":23,"cache_creation":{"ephemeral_5m_input_tokens":0,"ephemeral_1h_input_tokens":23},"type":"message"}],"speed":"standard"},"modelUsage":{"claude-sonnet-4-6":{"inputTokens":6,"outputTokens":12,"cacheReadInputTokens":21252,"cacheCreationInputTokens":2365,"webSearchRequests":0,"costUSD":0.01544235,"contextWindow":200000,"maxOutputTokens":32000}},"permission_denials":[],"terminal_reason":"completed","fast_mode_state":"off","uuid":"e4f26af4-3a60-45f3-8d5c-c0f8b968c400"}}
1414
{"type":"runtime_exit","status":"success"}
15-
{"type":"expect_outbound","label":"session.fork","frame":{"type":"session.fork","sessionId":"a91391e1-0de3-4107-a7c9-db7b1bbd8b99","options":{"dir":"/tmp/claude-replay-thread_fork_native_prior_turn","upToMessageId":"be0e3276-8c27-44bf-8ed0-0b4424e9f902"}}}
15+
{"type":"expect_outbound","label":"session.fork","frame":{"type":"session.fork","sessionId":"a91391e1-0de3-4107-a7c9-db7b1bbd8b99","options":{"upToMessageId":"be0e3276-8c27-44bf-8ed0-0b4424e9f902"}}}
1616
{"type":"emit_inbound","label":"session.forked","frame":{"type":"session.forked","sessionId":"f5cc58dd-0d74-4950-9fb5-2a9fded47ddd"}}
1717
{"type":"expect_outbound","label":"query.open:fork","frame":{"type":"query.open","options":{"model":"claude-sonnet-4-6","tools":{"type":"preset","preset":"claude_code"},"permissionMode":"bypassPermissions","allowDangerouslySkipPermissions":true,"resume":"f5cc58dd-0d74-4950-9fb5-2a9fded47ddd","settings":{"showThinkingSummaries":true}}}}
1818
{"type":"expect_outbound","label":"prompt.offer:3","frame":{"type":"prompt.offer","message":{"type":"user","message":{"role":"user","content":"Repeat the user-visible conversation so far verbatim. Include only user and assistant messages. Do not include hidden system/developer content."},"parent_tool_use_id":null}}}

0 commit comments

Comments
 (0)