Skip to content

Commit afa9012

Browse files
saphidclaude
andcommitted
fix(claude): forks after a rollback stop at the pinned conversation head
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent c61ecd1 commit afa9012

2 files changed

Lines changed: 16 additions & 1 deletion

File tree

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6350,9 +6350,15 @@ describe("ClaudeAdapterV2 background wake turns", () => {
63506350

63516351
it.effect("never records a subagent uuid for a turn with no main-thread assistant message", () =>
63526352
Effect.gen(function* () {
6353+
const forkCalls: Array<ClaudeAdapterV2.ClaudeAgentSdkSessionForkInput> = [];
63536354
const harness = yield* makeWakeHarnessWithOptions({
63546355
close: (sdkMessages) => Queue.shutdown(sdkMessages),
63556356
freshQueueOnReopen: true,
6357+
forkSession: (input) =>
6358+
Effect.sync(() => {
6359+
forkCalls.push(input);
6360+
return { sessionId: "forked-after-compact-rollback" };
6361+
}),
63566362
});
63576363
const now = yield* DateTime.now;
63586364
const subagentUuid = "00000000-0000-4000-8000-000000000644";
@@ -6433,6 +6439,14 @@ describe("ClaudeAdapterV2 background wake turns", () => {
64336439
pastSilentTurn.providerThread.nativeConversationHeadRef?.nativeId,
64346440
earlierCursor,
64356441
);
6442+
// Forks omit rolled-back turns, which Claude's transcript still holds past the pinned head.
6443+
yield* harness.runtime.forkThread({
6444+
sourceProviderThread: pastSilentTurn.providerThread,
6445+
sourceProviderTurns: turnsAcrossSilent.slice(0, 2),
6446+
providerTurnId: providerTurn.id,
6447+
targetThreadId: ThreadId.make("thread-claude-fork-after-compact-rollback"),
6448+
});
6449+
assert.equal(forkCalls[0]?.options.upToMessageId, earlierCursor);
64366450
const interruptedBeforeCompact = yield* rollbackTo(
64376451
[
64386452
{

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2070,7 +2070,8 @@ const resolveClaudeForkUpToMessageId = Effect.fn("ClaudeAdapterV2.resolveForkUpT
20702070
.slice(boundaryIndex + 1)
20712071
.filter(isTerminalProviderTurn);
20722072
if (terminalTurnsAfterBoundary.length === 0) {
2073-
return undefined;
2073+
// Rollback pins the head but leaves the rolled-back turns in Claude's transcript.
2074+
return yield* getNativeConversationHeadId(input.sourceProviderThread);
20742075
}
20752076

20762077
return yield* new ProviderAdapter.ProviderAdapterForkThreadError({

0 commit comments

Comments
 (0)