The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 09:45 UTC
fix(opencode): keep the answer when a background report lands right after it (#37829)
Julius Marminge committed
Nov 16, 2026 at 16:43 UTC
1fe416ae40412978b1d834a981127f61899d043b
2 files changed
+99
-1
apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
+53
@@ -5113,6 +5113,59 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
5113
}),
5114
);
5115
5116
+ // regression: #37816
5117
+ it.effect("keeps the answer and shows a shell report delivered into the turn after it", () =>
5118
+ Effect.gen(function* () {
5119
+ const { runtime, thread } = yield* resumed([
5120
+ out("session.prompt", { sessionID: SESSION, text: "<any>" }),
5121
+ promptAccepted,
5122
+ event("session.execution.started", { sessionID: SESSION }),
5123
+ event("session.text.ended", {
5124
+ sessionID: SESSION,
5125
+ assistantMessageID: "msg_answer",
5126
+ ordinal: 0,
5127
+ text: "The screenshot is at shots/home.png",
5128
+ }),
5129
+ event("session.inbox.enqueued", {
5130
+ inboxID: "msg_shell_report",
5131
+ sessionID: SESSION,
5132
+ item: {
5133
+ type: "synthetic",
5134
+ payload: {
5135
+ text: '<shell id="sh_dev" state="completed">dev server stopped</shell>',
5136
+ description: "Dev server",
5137
+ metadata: { source: "shell", shellID: "sh_dev", state: "completed" },
5138
+ },
5139
+ delivery: "steer",
5140
+ },
5141
+ }),
5142
+ event("session.inbox.delivered", { sessionID: SESSION, inboxID: "msg_shell_report" }),
5143
+ event("session.text.ended", {
5144
+ sessionID: SESSION,
5145
+ assistantMessageID: "msg_note_reply",
5146
+ ordinal: 0,
5147
+ text: "The dev server I started has stopped.",
5148
+ }),
5149
+ event("session.execution.succeeded", { sessionID: SESSION }),
5150
+ ]);
5151
+ const events = yield* runtime.events.pipe(
5152
+ Stream.takeUntil((event) => event.type === "turn.terminal"),
5153
+ Stream.runCollect,
5154
+ Effect.forkScoped,
5155
+ );
5156
+ yield* runtime.startTurn(turnInput(thread));
5157
+ const items = (yield* Fiber.join(events)).flatMap((event) =>
5158
+ event.type === "turn_item.updated" ? [event.turnItem] : [],
5159
+ );
5160
+ assert.isTrue(items.some((item) => item.type === "notification"));
5161
+ const answer = items.findLast(
5162
+ (item) =>
5163
+ item.type === "assistant_message" && item.text === "The screenshot is at shots/home.png",
5164
+ );
5165
+ assert.equal(answer?.type === "assistant_message" ? answer.phase : null, "final_answer");
5166
+ }),
5167
+ );
5168
+
5169
it.effect("re-registers T3 MCP each turn and drops its instructions when adding fails", () =>
5170
Effect.gen(function* () {
5171
const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
packages/provider-opencode/src/server/v2/adapter.ts
+46
-1
@@ -236,6 +236,8 @@ interface ActiveTurn {
236
readonly texts: Map<string, OpenBlock>;
237
/** The last assistant text this turn completed. */
238
answer: string | undefined;
239
+ /** The completed text no tool has followed yet, which ends the turn unless a steer lands. */
240
+ closingText: OpenBlock | undefined;
241
readonly tools: Map<string, { readonly name: string; input: Record<string, unknown> }>;
242
readonly startedAt: Map<string, DateTime.Utc>;
243
readonly ordinals: Map<string, number>;
@@ -1145,6 +1147,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
1147
kind: "text" | "reasoning",
1148
update: (current: string) => string,
1149
completed = "text" in data,
1150
+ phase?: "final_answer",
1151
) {
1152
const nativeId = `${data.assistantMessageID}:${kind}:${data.ordinal}`;
1153
const updatedAt = yield* DateTime.now;
@@ -1158,7 +1161,10 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
1161
if (completed) turn.texts.delete(nativeId);
1162
else turn.texts.set(nativeId, entry);
1163
if (entry.text.length === 0) return;
1161
- if (completed && kind === "text") turn.answer = entry.text;
1164
+ if (completed && kind === "text") {
1165
+ turn.answer = entry.text;
1166
+ turn.closingText = entry;
1167
+ }
1168
const status = completed ? "completed" : "running";
1169
const completedAt = completed ? updatedAt : null;
1170
const nodeKind = kind === "text" ? "assistant_message" : "reasoning";
@@ -1200,6 +1206,35 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
1206
messageId,
1207
text: entry.text,
1208
streaming: !completed,
1209
+ ...(phase === undefined ? {} : { phase }),
1210
+ },
1211
+ });
1212
+ });
1213
+
1214
+ // Background reports delivered into a running turn never reach a wake, so show them here.
1215
+ const emitDeliveredReport = Effect.fnUntraced(function* (
1216
+ state: ThreadState,
1217
+ turn: ActiveTurn,
1218
+ inboxId: string,
1219
+ report: BackgroundWorkReport,
1220
+ ) {
1221
+ // A report can land right after the answer; the reply to it must not fold the answer away.
1222
+ const answer = turn.closingText;
1223
+ if (answer !== undefined) {
1224
+ const nativeId = `${answer.block.assistantMessageID}:text:${answer.block.ordinal}`;
1225
+ turn.texts.set(nativeId, answer);
1226
+ yield* emitText(state, turn, answer.block, "text", (text) => text, true, "final_answer");
1227
+ turn.closingText = undefined;
1228
+ }
1229
+ const now = yield* DateTime.now;
1230
+ yield* emit({
1231
+ type: "turn_item.updated",
1232
+ driver,
1233
+ turnItem: {
1234
+ ...itemBase(state, turn, inboxId, "completed", now, now, now),
1235
+ nodeId: turn.input.rootNodeId,
1236
+ type: "notification",
1237
+ ...backgroundWorkNotification([report]),
1238
},
1239
});
1240
});
@@ -1549,6 +1584,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
1584
providerTurn,
1585
texts: new Map(),
1586
answer: undefined,
1587
+ closingText: undefined,
1588
tools: new Map(),
1589
startedAt: new Map(),
1590
ordinals: new Map(),
@@ -2746,6 +2782,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
2782
);
2783
}
2784
case "session.tool.input.started":
2785
+ turn.closingText = undefined;
2786
if (event.data.name === "question") return;
2787
if (event.data.name === "subagent") return yield* startCall(state, turn, event.data.id);
2788
turn.tools.set(event.data.id, { name: event.data.name, input: {} });
@@ -3367,6 +3404,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
3404
return yield* onReport(state, event.data.inboxID, event.data.item.payload);
3405
}
3406
if (event.type === "session.inbox.cancelled" || event.type === "session.inbox.delivered") {
3407
+ const report = state.reports.get(event.data.inboxID);
3408
state.reports.delete(event.data.inboxID);
3409
const external = state.externalPrompts.get(event.data.inboxID);
3410
state.externalPrompts.delete(event.data.inboxID);
@@ -3380,6 +3418,12 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
3418
turn !== undefined
3419
) {
3420
yield* emitExternalPrompt(state, turn, event.data.inboxID, external.text);
3421
+ } else if (
3422
+ event.type === "session.inbox.delivered" &&
3423
+ report !== undefined &&
3424
+ turn !== undefined
3425
+ ) {
3426
+ yield* emitDeliveredReport(state, turn, event.data.inboxID, report.report);
3427
}
3428
return;
3429
}
@@ -3513,6 +3557,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
3557
continue;
3558
}
3559
if (part.type !== "tool") continue;
3560
+ turn.closingText = undefined;
3561
if (!turn.tools.has(part.id)) {
3562
turn.tools.set(part.id, { name: part.name, input: {} });
3563
turn.startedAt.set(part.id, yield* DateTime.now);