Skip to content

Commit 11a9802

Browse files
committed
fix(server): preserve rewind boundaries and bundle Claude history worker
1 parent 93e086b commit 11a9802

6 files changed

Lines changed: 330 additions & 141 deletions

File tree

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { forkSession, getSessionMessages } from "@anthropic-ai/claude-agent-sdk";
2+
import * as Schema from "effect/Schema";
3+
4+
// A separate process gives SDK history helpers the provider's environment without
5+
// mutating the server's environment. This entry is bundled alongside the server.
6+
const [method, sessionId, rawOptions] = process.argv.slice(2);
7+
const options = Schema.decodeSync(
8+
Schema.fromJsonString(
9+
Schema.Struct({
10+
dir: Schema.optionalKey(Schema.String),
11+
includeSystemMessages: Schema.optionalKey(Schema.Boolean),
12+
upToMessageId: Schema.optionalKey(Schema.String),
13+
}),
14+
),
15+
)(rawOptions ?? "{}");
16+
if (!sessionId) throw new Error("Claude history session id is required.");
17+
const result =
18+
method === "getSessionMessages"
19+
? await getSessionMessages(sessionId, options)
20+
: method === "forkSession"
21+
? await forkSession(sessionId, options)
22+
: (() => {
23+
throw new Error("Unknown Claude history operation.");
24+
})();
25+
process.stdout.write(JSON.stringify(result));

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

Lines changed: 139 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -6262,19 +6262,23 @@ describe("ClaudeAdapterLive", () => {
62626262
);
62636263
});
62646264

6265-
it.effect(
6266-
"forks Claude history at the retained turn and resets to a fresh session at zero",
6267-
() => {
6268-
const forkCalls: Array<Parameters<NonNullable<ClaudeAdapterLiveOptions["forkSession"]>>> = [];
6269-
const harness = makeHarness({
6270-
forkSession: async (...args) => {
6271-
forkCalls.push(args);
6272-
return { sessionId: "550e8400-e29b-41d4-a716-446655440020" };
6273-
},
6274-
getSessionMessages: async () => [
6265+
it.effect("rewinds a steered Claude turn after recovery and preserves fork boundaries", () => {
6266+
const forkCalls: Array<Parameters<NonNullable<ClaudeAdapterLiveOptions["forkSession"]>>> = [];
6267+
let firstTurnId = "";
6268+
let secondTurnId = "";
6269+
let missingBoundary = false;
6270+
const harness = makeHarness({
6271+
forkSession: async (...args) => {
6272+
forkCalls.push(args);
6273+
return { sessionId: "550e8400-e29b-41d4-a716-446655440020" };
6274+
},
6275+
getSessionMessages: async (sessionId) => {
6276+
const history: Awaited<
6277+
ReturnType<NonNullable<ClaudeAdapterLiveOptions["getSessionMessages"]>>
6278+
> = [
62756279
{
62766280
type: "user",
6277-
uuid: "user-1",
6281+
uuid: firstTurnId,
62786282
session_id: "550e8400-e29b-41d4-a716-446655440010",
62796283
parent_tool_use_id: null,
62806284
parent_agent_id: null,
@@ -6306,7 +6310,7 @@ describe("ClaudeAdapterLive", () => {
63066310
},
63076311
{
63086312
type: "user",
6309-
uuid: "user-2",
6313+
uuid: secondTurnId,
63106314
session_id: "550e8400-e29b-41d4-a716-446655440010",
63116315
parent_tool_use_id: null,
63126316
parent_agent_id: null,
@@ -6320,100 +6324,141 @@ describe("ClaudeAdapterLive", () => {
63206324
parent_agent_id: null,
63216325
message: { content: [] },
63226326
},
6323-
],
6324-
});
6325-
return Effect.gen(function* () {
6326-
const adapter = yield* ClaudeAdapter;
6327+
{
6328+
type: "user",
6329+
uuid: "steer",
6330+
session_id: sessionId,
6331+
parent_tool_use_id: null,
6332+
parent_agent_id: null,
6333+
message: { content: "steer the second turn" },
6334+
},
6335+
{
6336+
type: "assistant",
6337+
uuid: "assistant-steer",
6338+
session_id: sessionId,
6339+
parent_tool_use_id: null,
6340+
parent_agent_id: null,
6341+
message: { content: [] },
6342+
},
6343+
];
6344+
return sessionId.endsWith("0020")
6345+
? history.slice(0, 4).map((message) => ({ ...message, uuid: `fork-${message.uuid}` }))
6346+
: missingBoundary
6347+
? history.filter((message) => message.uuid !== secondTurnId)
6348+
: history;
6349+
},
6350+
});
6351+
return Effect.gen(function* () {
6352+
const adapter = yield* ClaudeAdapter;
63276353

6328-
const session = yield* adapter.startSession({
6329-
threadId: THREAD_ID,
6330-
provider: ProviderDriverKind.make("claudeAgent"),
6331-
runtimeMode: "full-access",
6332-
});
6354+
const session = yield* adapter.startSession({
6355+
threadId: THREAD_ID,
6356+
provider: ProviderDriverKind.make("claudeAgent"),
6357+
runtimeMode: "full-access",
6358+
});
63336359

6334-
const firstTurn = yield* adapter.sendTurn({
6335-
threadId: session.threadId,
6336-
input: "first",
6337-
attachments: [],
6338-
});
6360+
const firstTurn = yield* adapter.sendTurn({
6361+
threadId: session.threadId,
6362+
input: "first",
6363+
attachments: [],
6364+
});
6365+
firstTurnId = firstTurn.turnId;
63396366

6340-
const firstCompletedFiber = yield* Stream.filter(
6341-
adapter.streamEvents,
6342-
(event) => event.type === "turn.completed",
6343-
).pipe(Stream.runHead, Effect.forkChild);
6367+
const firstCompletedFiber = yield* Stream.filter(
6368+
adapter.streamEvents,
6369+
(event) => event.type === "turn.completed",
6370+
).pipe(Stream.runHead, Effect.forkChild);
63446371

6345-
harness.query.emit({
6346-
type: "result",
6347-
subtype: "success",
6348-
is_error: false,
6349-
errors: [],
6350-
session_id: "550e8400-e29b-41d4-a716-446655440010",
6351-
uuid: "result-first",
6352-
} as unknown as SDKMessage);
6372+
harness.query.emit({
6373+
type: "result",
6374+
subtype: "success",
6375+
is_error: false,
6376+
errors: [],
6377+
session_id: "550e8400-e29b-41d4-a716-446655440010",
6378+
uuid: "result-first",
6379+
} as unknown as SDKMessage);
63536380

6354-
const firstCompleted = yield* Fiber.join(firstCompletedFiber);
6355-
assert.equal(firstCompleted._tag, "Some");
6356-
if (firstCompleted._tag === "Some" && firstCompleted.value.type === "turn.completed") {
6357-
assert.equal(String(firstCompleted.value.turnId), String(firstTurn.turnId));
6358-
}
6381+
const firstCompleted = yield* Fiber.join(firstCompletedFiber);
6382+
assert.equal(firstCompleted._tag, "Some");
6383+
if (firstCompleted._tag === "Some" && firstCompleted.value.type === "turn.completed") {
6384+
assert.equal(String(firstCompleted.value.turnId), String(firstTurn.turnId));
6385+
}
63596386

6360-
const secondTurn = yield* adapter.sendTurn({
6361-
threadId: session.threadId,
6362-
input: "second",
6363-
attachments: [],
6364-
});
6387+
const secondTurn = yield* adapter.sendTurn({
6388+
threadId: session.threadId,
6389+
input: "second",
6390+
attachments: [],
6391+
});
6392+
secondTurnId = secondTurn.turnId;
6393+
const steer = yield* adapter.sendTurn({
6394+
threadId: session.threadId,
6395+
input: "steer the second turn",
6396+
attachments: [],
6397+
});
6398+
assert.equal(steer.turnId, secondTurn.turnId);
63656399

6366-
const secondCompletedFiber = yield* Stream.filter(
6367-
adapter.streamEvents,
6368-
(event) => event.type === "turn.completed",
6369-
).pipe(Stream.runHead, Effect.forkChild);
6400+
const secondCompletedFiber = yield* Stream.filter(
6401+
adapter.streamEvents,
6402+
(event) => event.type === "turn.completed",
6403+
).pipe(Stream.runHead, Effect.forkChild);
63706404

6371-
harness.query.emit({
6372-
type: "result",
6373-
subtype: "success",
6374-
is_error: false,
6375-
errors: [],
6376-
session_id: "550e8400-e29b-41d4-a716-446655440010",
6377-
uuid: "result-second",
6378-
} as unknown as SDKMessage);
6405+
harness.query.emit({
6406+
type: "result",
6407+
subtype: "success",
6408+
is_error: false,
6409+
errors: [],
6410+
session_id: "550e8400-e29b-41d4-a716-446655440010",
6411+
uuid: "result-second",
6412+
} as unknown as SDKMessage);
63796413

6380-
const secondCompleted = yield* Fiber.join(secondCompletedFiber);
6381-
assert.equal(secondCompleted._tag, "Some");
6382-
if (secondCompleted._tag === "Some" && secondCompleted.value.type === "turn.completed") {
6383-
assert.equal(String(secondCompleted.value.turnId), String(secondTurn.turnId));
6384-
}
6414+
const secondCompleted = yield* Fiber.join(secondCompletedFiber);
6415+
assert.equal(secondCompleted._tag, "Some");
6416+
if (secondCompleted._tag === "Some" && secondCompleted.value.type === "turn.completed") {
6417+
assert.equal(String(secondCompleted.value.turnId), String(secondTurn.turnId));
6418+
}
63856419

6386-
const threadBeforeRollback = yield* adapter.readThread(session.threadId);
6387-
assert.equal(threadBeforeRollback.turns.length, 2);
6420+
const threadBeforeRollback = yield* adapter.readThread(session.threadId);
6421+
assert.equal(threadBeforeRollback.turns.length, 2);
6422+
const cursor = (yield* adapter.listSessions())[0]?.resumeCursor;
6423+
yield* adapter.stopSession(session.threadId);
6424+
yield* adapter.startSession({
6425+
threadId: session.threadId,
6426+
runtimeMode: "full-access",
6427+
resumeCursor: cursor,
6428+
});
6429+
missingBoundary = true;
6430+
const unavailable = yield* adapter.rollbackThread(session.threadId, 1).pipe(Effect.flip);
6431+
assert.match(unavailable.message, /exact Claude turn boundary is unavailable/);
6432+
assert.equal(forkCalls.length, 0);
6433+
missingBoundary = false;
63886434

6389-
const rolledBack = yield* adapter.rollbackThread(session.threadId, 1);
6390-
assert.equal(rolledBack.turns.length, 1);
6391-
assert.equal(rolledBack.turns[0]?.id, firstTurn.turnId);
6435+
yield* adapter.rollbackThread(session.threadId, 1);
6436+
assert.equal(harness.query.closeCalls, 1);
6437+
const forkOptions = harness.getLastCreateQueryInput()?.options;
6438+
assert.deepEqual(forkCalls, [
6439+
["550e8400-e29b-41d4-a716-446655440010", { upToMessageId: "assistant-1-final" }],
6440+
]);
6441+
assert.equal(forkOptions?.resume, "550e8400-e29b-41d4-a716-446655440020");
6442+
assert.equal(forkOptions?.resumeSessionAt, undefined);
6443+
assert.equal(forkOptions?.forkSession, undefined);
6444+
assert.deepEqual((yield* adapter.listSessions())[0]?.resumeCursor, {
6445+
threadId: session.threadId,
6446+
resume: "550e8400-e29b-41d4-a716-446655440020",
6447+
turnCount: 1,
6448+
turnStartMessageIds: [`fork-${firstTurnId}`],
6449+
});
63926450

6393-
const threadAfterRollback = yield* adapter.readThread(session.threadId);
6394-
assert.equal(threadAfterRollback.turns.length, 1);
6395-
assert.equal(threadAfterRollback.turns[0]?.id, firstTurn.turnId);
6396-
assert.equal(harness.query.closeCalls, 1);
6397-
const forkOptions = harness.getLastCreateQueryInput()?.options;
6398-
assert.deepEqual(forkCalls, [
6399-
["550e8400-e29b-41d4-a716-446655440010", { upToMessageId: "assistant-1-final" }],
6400-
]);
6401-
assert.equal(forkOptions?.resume, "550e8400-e29b-41d4-a716-446655440020");
6402-
assert.equal(forkOptions?.resumeSessionAt, undefined);
6403-
assert.equal(forkOptions?.forkSession, undefined);
6404-
6405-
yield* adapter.rollbackThread(session.threadId, 2);
6406-
const resetOptions = harness.getLastCreateQueryInput()?.options;
6407-
assert.equal(resetOptions?.resume, undefined);
6408-
assert.equal(resetOptions?.resumeSessionAt, undefined);
6409-
assert.equal(resetOptions?.forkSession, undefined);
6410-
assert.ok(resetOptions?.sessionId);
6411-
}).pipe(
6412-
Effect.provideService(Random.Random, makeDeterministicRandomService()),
6413-
Effect.provide(harness.layer),
6414-
);
6415-
},
6416-
);
6451+
yield* adapter.rollbackThread(session.threadId, 2);
6452+
const resetOptions = harness.getLastCreateQueryInput()?.options;
6453+
assert.equal(resetOptions?.resume, undefined);
6454+
assert.equal(resetOptions?.resumeSessionAt, undefined);
6455+
assert.equal(resetOptions?.forkSession, undefined);
6456+
assert.ok(resetOptions?.sessionId);
6457+
}).pipe(
6458+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
6459+
Effect.provide(harness.layer),
6460+
);
6461+
});
64176462

64186463
it.effect("updates model on sendTurn when model override is provided", () => {
64196464
const harness = makeHarness();

0 commit comments

Comments
 (0)