Skip to content

Commit 1e5f04c

Browse files
committed
fix(opencode): revert from the first removed assistant message
1 parent 2fb99a7 commit 1e5f04c

2 files changed

Lines changed: 44 additions & 26 deletions

File tree

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

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -372,17 +372,8 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {
372372
...(messageID ? { messageID } : {}),
373373
});
374374
if (!messageID) {
375-
runtimeMock.state.messages = [];
376-
return;
375+
throw new Error("Expected messageID");
377376
}
378-
379-
const targetIndex = runtimeMock.state.messages.findIndex(
380-
(entry) => entry.info.id === messageID,
381-
);
382-
runtimeMock.state.messages =
383-
targetIndex >= 0
384-
? runtimeMock.state.messages.slice(0, targetIndex + 1)
385-
: runtimeMock.state.messages;
386377
},
387378
},
388379
event: {
@@ -6316,7 +6307,7 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
63166307
}).pipe(Effect.provide(adapterLayer));
63176308
});
63186309

6319-
it.effect("reverts the full thread when rollback removes every assistant turn", () =>
6310+
it.effect("reverts the first removed assistant message and returns only retained turns", () =>
63206311
Effect.gen(function* () {
63216312
const adapter = yield* OpenCodeAdapter;
63226313
const threadId = asThreadId("thread-rollback-all");
@@ -6337,12 +6328,30 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
63376328
},
63386329
];
63396330

6340-
const snapshot = yield* adapter.rollbackThread(threadId, 2);
6341-
6342-
NodeAssert.deepEqual(runtimeMock.state.revertCalls, [
6343-
{ sessionID: "http://127.0.0.1:9999/session" },
6344-
]);
6345-
NodeAssert.deepEqual(snapshot.turns, []);
6331+
for (const numTurns of [0, 1, 2, 3]) {
6332+
runtimeMock.state.revertCalls.length = 0;
6333+
const snapshot = yield* adapter.rollbackThread(threadId, numTurns);
6334+
NodeAssert.deepEqual(
6335+
runtimeMock.state.revertCalls,
6336+
numTurns === 0
6337+
? []
6338+
: [
6339+
{
6340+
sessionID: "http://127.0.0.1:9999/session",
6341+
messageID: numTurns === 1 ? "assistant-2" : "assistant-1",
6342+
},
6343+
],
6344+
);
6345+
NodeAssert.deepEqual(
6346+
snapshot.turns.map((turn) => turn.id),
6347+
["assistant-1", "assistant-2"].slice(0, Math.max(0, 2 - numTurns)),
6348+
);
6349+
}
6350+
runtimeMock.state.messages = [];
6351+
runtimeMock.state.revertCalls.length = 0;
6352+
const emptySnapshot = yield* adapter.rollbackThread(threadId, 1);
6353+
NodeAssert.deepEqual(runtimeMock.state.revertCalls, []);
6354+
NodeAssert.deepEqual(emptySnapshot.turns, []);
63466355
}),
63476356
);
63486357

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

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3785,16 +3785,25 @@ export function makeOpenCodeAdapter(
37853785
const assistantMessages = (messages.data ?? []).filter(
37863786
(entry) => entry.info.role === "assistant",
37873787
);
3788-
const targetIndex = assistantMessages.length - numTurns - 1;
3789-
const target = targetIndex >= 0 ? assistantMessages[targetIndex] : null;
3790-
yield* runOpenCodeSdk("session.revert", () =>
3791-
context.client.session.revert({
3792-
sessionID: context.openCodeSessionId,
3793-
...(target ? { messageID: target.info.id } : {}),
3794-
}),
3795-
).pipe(Effect.mapError(toRequestError));
3788+
const targetIndex = Math.max(0, assistantMessages.length - numTurns);
3789+
const target = assistantMessages[targetIndex];
3790+
if (target) {
3791+
yield* runOpenCodeSdk("session.revert", () =>
3792+
context.client.session.revert({
3793+
sessionID: context.openCodeSessionId,
3794+
messageID: target.info.id,
3795+
}),
3796+
).pipe(Effect.mapError(toRequestError));
3797+
}
37963798

3797-
return yield* readThread(threadId);
3799+
// OpenCode marks a revert boundary but retains the messages until the next prompt.
3800+
return {
3801+
threadId,
3802+
turns: assistantMessages.slice(0, targetIndex).map((entry) => ({
3803+
id: TurnId.make(entry.info.id),
3804+
items: [entry.info, ...entry.parts],
3805+
})),
3806+
};
37983807
},
37993808
);
38003809

0 commit comments

Comments
 (0)