Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

fix(opencode): revert from the first removed assistant message (#212)

Leo60f601f85848
diff --git a/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts b/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts
index f50fa2987..9a611a554 100644
--- a/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts
+++ b/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts
@@ -71,6 +71,7 @@ const runtimeMock = {
abortImplementation: null as ((sessionID: string) => Promise<void>) | null,
closeCalls: [] as string[],
revertCalls: [] as Array<{ sessionID: string; messageID?: string }>,
+ revertMessageID: undefined as string | undefined,
promptCalls: [] as Array<unknown>,
promptAsyncError: null as Error | null,
closeError: null as Error | null,
@@ -102,6 +103,7 @@ const runtimeMock = {
this.state.abortImplementation = null;
this.state.closeCalls.length = 0;
this.state.revertCalls.length = 0;
+ this.state.revertMessageID = undefined;
this.state.promptCalls.length = 0;
this.state.promptAsyncError = null;
this.state.closeError = null;
@@ -191,6 +193,9 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {
return {
data: {
id: sessionID,
+ ...(runtimeMock.state.revertMessageID
+ ? { revert: { messageID: runtimeMock.state.revertMessageID } }
+ : {}),
...(directory ? { directory } : {}),
...(parentID ? { parentID } : {}),
},
@@ -230,17 +235,16 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {
...(messageID ? { messageID } : {}),
});
if (!messageID) {
- runtimeMock.state.messages = [];
- return;
+ throw new Error("Expected messageID");
+ }
+ let lastUserID: string | undefined;
+ for (const entry of runtimeMock.state.messages) {
+ if (entry.info.role === "user") lastUserID = entry.info.id;
+ if (entry.info.id === messageID && entry.parts.length > 0) {
+ runtimeMock.state.revertMessageID = lastUserID ?? messageID;
+ break;
+ }
}
-
- const targetIndex = runtimeMock.state.messages.findIndex(
- (entry) => entry.info.id === messageID,
- );
- runtimeMock.state.messages =
- targetIndex >= 0
- ? runtimeMock.state.messages.slice(0, targetIndex + 1)
- : runtimeMock.state.messages;
},
},
event: {
@@ -1045,7 +1049,7 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
}).pipe(Effect.provide(adapterLayer));
});
- it.effect("reverts the full thread when rollback removes every assistant turn", () =>
+ it.effect("reverts the first removed assistant message and returns only retained turns", () =>
Effect.gen(function* () {
const adapter = yield* OpenCodeAdapter;
const threadId = asThreadId("thread-rollback-all");
@@ -1056,22 +1060,62 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
});
runtimeMock.state.messages = [
+ { info: { id: "user-1", role: "user" }, parts: [] },
{
info: { id: "assistant-1", role: "assistant" },
- parts: [],
+ parts: [{ id: "part-1", type: "text", text: "first answer" }],
},
+ { info: { id: "user-2", role: "user" }, parts: [] },
{
info: { id: "assistant-2", role: "assistant" },
- parts: [],
+ parts: [{ id: "part-2", type: "text", text: "second answer" }],
},
];
- const snapshot = yield* adapter.rollbackThread(threadId, 2);
-
- NodeAssert.deepEqual(runtimeMock.state.revertCalls, [
- { sessionID: "http://127.0.0.1:9999/session" },
- ]);
- NodeAssert.deepEqual(snapshot.turns, []);
+ for (const numTurns of [0, 1, 2, 3]) {
+ runtimeMock.state.revertMessageID = undefined;
+ runtimeMock.state.revertCalls.length = 0;
+ const snapshot = yield* adapter.rollbackThread(threadId, numTurns);
+ NodeAssert.deepEqual(
+ runtimeMock.state.revertCalls,
+ numTurns === 0
+ ? []
+ : [
+ {
+ sessionID: "http://127.0.0.1:9999/session",
+ messageID: numTurns === 1 ? "assistant-2" : "assistant-1",
+ },
+ ],
+ );
+ NodeAssert.deepEqual(
+ snapshot.turns.map((turn) => turn.id),
+ ["assistant-1", "assistant-2"].slice(0, Math.max(0, 2 - numTurns)),
+ );
+ }
+ runtimeMock.state.revertMessageID = undefined;
+ for (const remaining of [1, 0]) {
+ const snapshot = yield* adapter.rollbackThread(threadId, 1);
+ NodeAssert.equal(snapshot.turns.length, remaining);
+ NodeAssert.deepEqual((yield* adapter.readThread(threadId)).turns, snapshot.turns);
+ }
+ NodeAssert.deepEqual(
+ runtimeMock.state.revertCalls.slice(-2).map((call) => call.messageID),
+ ["assistant-2", "assistant-1"],
+ );
+ runtimeMock.state.revertMessageID = undefined;
+ runtimeMock.state.messages = runtimeMock.state.messages.filter(
+ (entry) => entry.info.id !== "user-2",
+ );
+ const sharedUserSnapshot = yield* adapter.rollbackThread(threadId, 1);
+ NodeAssert.equal(runtimeMock.state.revertMessageID, "user-1");
+ NodeAssert.deepEqual(sharedUserSnapshot.turns, []);
+ NodeAssert.deepEqual((yield* adapter.readThread(threadId)).turns, []);
+
+ runtimeMock.state.messages = [];
+ runtimeMock.state.revertCalls.length = 0;
+ const emptySnapshot = yield* adapter.rollbackThread(threadId, 1);
+ NodeAssert.deepEqual(runtimeMock.state.revertCalls, []);
+ NodeAssert.deepEqual(emptySnapshot.turns, []);
}),
);
diff --git a/apps/server/src/provider/Layers/OpenCodeAdapter.ts b/apps/server/src/provider/Layers/OpenCodeAdapter.ts
index 9152e0808..41b9b955e 100644
--- a/apps/server/src/provider/Layers/OpenCodeAdapter.ts
+++ b/apps/server/src/provider/Layers/OpenCodeAdapter.ts
@@ -2056,6 +2056,9 @@ export function makeOpenCodeAdapter(
const readThread: OpenCodeAdapterShape["readThread"] = Effect.fn("readThread")(
function* (threadId) {
const context = yield* ensureSessionContext(sessions, threadId);
+ const session = yield* runOpenCodeSdk("session.get", () =>
+ context.client.session.get({ sessionID: context.openCodeSessionId }),
+ ).pipe(Effect.mapError(toRequestError));
const messages = yield* runOpenCodeSdk("session.messages", () =>
context.client.session.messages({
sessionID: context.openCodeSessionId,
@@ -2064,6 +2067,7 @@ export function makeOpenCodeAdapter(
const turns: Array<OpenCodeTurnSnapshot> = [];
for (const entry of messages.data ?? []) {
+ if (entry.info.id === session.data?.revert?.messageID) break;
if (entry.info.role === "assistant") {
turns.push({
id: TurnId.make(entry.info.id),
@@ -2082,25 +2086,21 @@ export function makeOpenCodeAdapter(
const rollbackThread: OpenCodeAdapterShape["rollbackThread"] = Effect.fn("rollbackThread")(
function* (threadId, numTurns) {
const context = yield* ensureSessionContext(sessions, threadId);
- const messages = yield* runOpenCodeSdk("session.messages", () =>
- context.client.session.messages({
- sessionID: context.openCodeSessionId,
- }),
- ).pipe(Effect.mapError(toRequestError));
-
- const assistantMessages = (messages.data ?? []).filter(
- (entry) => entry.info.role === "assistant",
- );
- const targetIndex = assistantMessages.length - numTurns - 1;
- const target = targetIndex >= 0 ? assistantMessages[targetIndex] : null;
- yield* runOpenCodeSdk("session.revert", () =>
- context.client.session.revert({
- sessionID: context.openCodeSessionId,
- ...(target ? { messageID: target.info.id } : {}),
- }),
- ).pipe(Effect.mapError(toRequestError));
+ const snapshot = yield* readThread(threadId);
+ const targetIndex = Math.max(0, snapshot.turns.length - numTurns);
+ const target = snapshot.turns[targetIndex];
+ if (target) {
+ yield* runOpenCodeSdk("session.revert", () =>
+ context.client.session.revert({
+ sessionID: context.openCodeSessionId,
+ messageID: target.id,
+ }),
+ ).pipe(Effect.mapError(toRequestError));
+ // Native revert can move the boundary to the preceding user message.
+ return yield* readThread(threadId);
+ }
- return yield* readThread(threadId);
+ return snapshot;
},
);
diff --git a/docs/internals/providers.md b/docs/internals/providers.md
index 25fda48f7..f3640aca5 100644
--- a/docs/internals/providers.md
+++ b/docs/internals/providers.md
@@ -74,6 +74,11 @@ A process-wide permit serializes the full inventory sequence, including retries,
provider checks and separately constructed OpenCode runtimes, because they share one SQLite database.
OpenCode Go stays on the Mastra controller and does not use this CLI probe path.
+Legacy OpenCode rollback targets the first removed assistant message and then reads the native
+revert boundary. OpenCode keeps reverted messages in the transcript until the next prompt, so
+`readThread` stops at `session.revert.messageID` rather than slicing the local copy. OpenCode Go
+stays on Mastra and does not use this adapter path.
+
## Raw protocol observation
The [ACP protocol](../../packages/effect-acp/src/protocol.ts) and