Skip to content

Commit 8e2e05a

Browse files
committed
fix(server): validate retained Claude fork message bodies
1 parent e01ece5 commit 8e2e05a

2 files changed

Lines changed: 101 additions & 4 deletions

File tree

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

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7032,6 +7032,92 @@ describe("ClaudeAdapterLive", () => {
70327032
);
70337033
});
70347034

7035+
for (const scenario of [
7036+
"restores conversation messages between retained turns",
7037+
"changes retained assistant content without changing its role",
7038+
] as const) {
7039+
it.effect(`rejects a Claude fork that ${scenario}`, () => {
7040+
const turnIds: Array<string> = [];
7041+
const harness = makeHarness({
7042+
forkSession: async () => ({ sessionId: CLAUDE_FORK_SESSION_ID }),
7043+
getSessionMessages: async (sessionId) => {
7044+
const history = turnIds.flatMap((turnId, index) => [
7045+
claudeHistoryMessage({
7046+
type: "user",
7047+
uuid: turnId,
7048+
content: `prompt ${index + 1}`,
7049+
}),
7050+
claudeHistoryMessage({
7051+
type: "assistant",
7052+
uuid: `assistant-${index + 1}`,
7053+
content: [{ type: "text", text: `reply ${index + 1}` }],
7054+
}),
7055+
]);
7056+
if (sessionId !== CLAUDE_FORK_SESSION_ID) return history;
7057+
const forkHistory = history.slice(0, 4).map((message) => ({
7058+
...message,
7059+
uuid: `fork-${message.uuid}`,
7060+
session_id: sessionId,
7061+
}));
7062+
if (scenario === "restores conversation messages between retained turns") {
7063+
forkHistory.splice(
7064+
2,
7065+
0,
7066+
claudeHistoryMessage({
7067+
type: "user",
7068+
uuid: "fork-restored-steer",
7069+
sessionId,
7070+
content: "earlier steer omitted by compaction",
7071+
}),
7072+
claudeHistoryMessage({
7073+
type: "assistant",
7074+
uuid: "fork-restored-reply",
7075+
sessionId,
7076+
content: [{ type: "text", text: "earlier steering reply" }],
7077+
}),
7078+
);
7079+
} else {
7080+
forkHistory[1] = claudeHistoryMessage({
7081+
type: "assistant",
7082+
uuid: "fork-assistant-1",
7083+
sessionId,
7084+
content: [{ type: "text", text: "different retained reply" }],
7085+
});
7086+
}
7087+
return forkHistory;
7088+
},
7089+
});
7090+
return Effect.gen(function* () {
7091+
const adapter = yield* ClaudeAdapter;
7092+
const session = yield* adapter.startSession({
7093+
threadId: THREAD_ID,
7094+
provider: ProviderDriverKind.make("claudeAgent"),
7095+
runtimeMode: "full-access",
7096+
});
7097+
for (let index = 0; index < 3; index++) {
7098+
const turn = yield* sendCompletedClaudeTurn(
7099+
adapter,
7100+
harness,
7101+
session.threadId,
7102+
`prompt ${index + 1}`,
7103+
);
7104+
turnIds.push(turn.turnId);
7105+
}
7106+
const cursorBeforeRollback = (yield* adapter.listSessions())[0]?.resumeCursor;
7107+
const queryCountBeforeRollback = harness.queries.length;
7108+
7109+
const error = yield* adapter.rollbackThread(session.threadId, 1).pipe(Effect.flip);
7110+
assert.match(error.message, /did not preserve the retained turn boundaries/);
7111+
assert.equal(harness.queries.length, queryCountBeforeRollback);
7112+
assert.equal(harness.queries.at(-1)?.closeCalls, 0);
7113+
assert.deepEqual((yield* adapter.listSessions())[0]?.resumeCursor, cursorBeforeRollback);
7114+
}).pipe(
7115+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
7116+
Effect.provide(harness.layer),
7117+
);
7118+
});
7119+
}
7120+
70357121
it.effect("updates model on sendTurn when model override is provided", () => {
70367122
const harness = makeHarness();
70377123
return Effect.gen(function* () {

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* @module ClaudeAdapterLive
99
*/
1010

11+
import { isDeepStrictEqual } from "node:util";
1112
import {
1213
type CanUseTool,
1314
query,
@@ -191,12 +192,22 @@ const remapClaudeForkTurnBoundaries = (
191192
if (retainedConversation.length === 0) {
192193
return retainedBoundaries.every((id) => id === null) ? [...retainedBoundaries] : undefined;
193194
}
194-
const lastRetained = retainedConversation.at(-1);
195-
const lastFork = forkConversation.at(-1);
196-
if (lastRetained === undefined || lastFork === undefined || lastFork.type !== lastRetained.type) {
195+
const offset = forkConversation.length - retainedConversation.length;
196+
// Forks preserve message bodies. Matching roles alone can mistake a restored
197+
// steering message for a retained turn when compaction changes the chain.
198+
if (
199+
offset < 0 ||
200+
retainedConversation.some((message, index) => {
201+
const forkMessage = forkConversation[index + offset];
202+
return (
203+
forkMessage === undefined ||
204+
forkMessage.type !== message.type ||
205+
!isDeepStrictEqual(forkMessage.message, message.message)
206+
);
207+
})
208+
) {
197209
return undefined;
198210
}
199-
const offset = forkConversation.length - retainedConversation.length;
200211
const remapped = retainedBoundaries.map((originalId) => {
201212
if (originalId === null) return null;
202213
const originalIndex = conversationIndexForUuid(messages, originalId);

0 commit comments

Comments
 (0)