Skip to content
TypeScript

fix(opencode): a command that exits non-zero is stored as failed, not completed (#29824)

Alex Southwell0992f5169683
diff --git a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
index 10006c532e9..f9819070fd8 100644
--- a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
@@ -2759,6 +2759,56 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
}).pipe(Effect.scoped),
);
+ it.effect("stores a shell command that exits non-zero as failed", () =>
+ Effect.gen(function* () {
+ const tool = { sessionID: SESSION, assistantMessageID: "msg_assistant", id: "call-exit" };
+ const { runtime, thread } = yield* resumed([
+ out("session.prompt", { sessionID: SESSION, text: "<any>" }),
+ promptAccepted,
+ event("session.tool.input.started", { ...tool, name: "shell" }),
+ event("session.tool.called", { ...tool, input: { command: "vp test" }, executed: false }),
+ {
+ type: "emit_inbound",
+ frame: {
+ type: "sdk.event",
+ event: {
+ id: "evt_toolsuccess_call-exit",
+ created: 1,
+ type: "session.tool.success",
+ data: {
+ ...tool,
+ content: [{ type: "text", text: "1 failed\n" }],
+ metadata: { status: "completed", truncated: false, exit: 1 },
+ executed: false,
+ },
+ durable: { aggregateID: SESSION, seq: 1, version: 2 },
+ },
+ },
+ },
+ event("session.execution.succeeded", { sessionID: SESSION }),
+ ]);
+ const events = yield* runtime.events.pipe(
+ Stream.takeUntil((event) => event.type === "turn.terminal"),
+ Stream.runCollect,
+ Effect.forkScoped,
+ );
+ yield* runtime.startTurn(turnInput(thread));
+ const collected = yield* Fiber.join(events);
+ const item = collected
+ .flatMap((event) => (event.type === "turn_item.updated" ? [event.turnItem] : []))
+ .findLast((item) => item.nativeItemRef?.nativeId?.endsWith(tool.id));
+ assert.equal(item?.type, "command_execution");
+ assert.equal(item?.status, "failed");
+ assert.equal(item?.type === "command_execution" ? item.exitCode : null, 1);
+ assert.equal(
+ collected
+ .flatMap((event) => (event.type === "node.updated" ? [event.node] : []))
+ .findLast((node) => node.id === item?.nodeId)?.status,
+ "failed",
+ );
+ }).pipe(Effect.scoped),
+ );
+
it.effect("re-registers T3 MCP each turn and drops its instructions when adding fails", () =>
Effect.gen(function* () {
const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
diff --git a/packages/provider-opencode/src/server/adapter.test.ts b/packages/provider-opencode/src/server/adapter.test.ts
index 4ff3c3efd0d..49cc166f805 100644
--- a/packages/provider-opencode/src/server/adapter.test.ts
+++ b/packages/provider-opencode/src/server/adapter.test.ts
@@ -803,6 +803,30 @@ describe("OpenCodeAdapterV2", () => {
}),
);
}
+ yield* Effect.promise(() =>
+ nativeEvents.push({
+ type: "message.part.updated",
+ properties: {
+ sessionID: nativeSessionId,
+ part: {
+ id: "part-exit",
+ sessionID: nativeSessionId,
+ messageID: "late-assistant",
+ type: "tool",
+ callID: "call-exit",
+ tool: "bash",
+ state: {
+ status: "completed",
+ input: { command: "vp test" },
+ output: "1 failed\n",
+ title: "Run tests",
+ metadata: { output: "1 failed\n", exit: 1, truncated: false },
+ time: { start: 4, end: 5 },
+ },
+ },
+ },
+ }),
+ );
yield* Effect.promise(() =>
nativeEvents.push({
type: "message.part.updated",
@@ -877,14 +901,21 @@ describe("OpenCodeAdapterV2", () => {
const commands = items.filter((item) => item.type === "command_execution");
assert.deepEqual(
commands.map((item) => item.status),
- ["pending", "running", "completed", "failed"],
+ ["pending", "running", "completed", "failed", "failed"],
);
assert.deepEqual(
commands.map((item) => item.input),
- ["pwd", "pwd", "pwd", "pwd"],
+ ["pwd", "pwd", "pwd", "pwd", "vp test"],
);
assert.equal(commands[2]?.output, "/repo\n");
assert.equal(commands[3]?.output, "Command failed");
+ assert.equal(commands[4]?.exitCode, 1);
+ assert.equal(
+ events
+ .flatMap((event) => (event.type === "node.updated" ? [event.node] : []))
+ .findLast((node) => node.id === commands[4]?.nodeId)?.status,
+ "failed",
+ );
assert.isTrue(
events.some(
(event) =>
diff --git a/packages/provider-opencode/src/server/adapter.ts b/packages/provider-opencode/src/server/adapter.ts
index 14b203b6087..d0c646fa051 100644
--- a/packages/provider-opencode/src/server/adapter.ts
+++ b/packages/provider-opencode/src/server/adapter.ts
@@ -80,7 +80,7 @@ import {
makeSubagentChildThread,
subagentThreadTitle,
} from "@t3tools/provider-core/server/subagentProjection";
-import { openCodeToolTurnItem } from "./toolItems.ts";
+import { openCodeCommandFailed, openCodeToolTurnItem } from "./toolItems.ts";
export const OPENCODE_PROVIDER = ProviderDriverKind.make("opencode");
export const OPENCODE_DEFAULT_INSTANCE_ID = defaultInstanceIdForDriver(OPENCODE_PROVIDER);
@@ -742,7 +742,9 @@ function toolStatus(part: ToolPart): {
case "running":
return { node: "running", item: "running" };
case "completed":
- return { node: "completed", item: "completed" };
+ return openCodeCommandFailed(part.tool, part.state.metadata)
+ ? { node: "failed", item: "failed" }
+ : { node: "completed", item: "completed" };
case "error":
return { node: "failed", item: "failed" };
}
diff --git a/packages/provider-opencode/src/server/toolItems.ts b/packages/provider-opencode/src/server/toolItems.ts
index d7652c89bbc..c4188914e5b 100644
--- a/packages/provider-opencode/src/server/toolItems.ts
+++ b/packages/provider-opencode/src/server/toolItems.ts
@@ -81,6 +81,16 @@ function nativeReadOutput(output: string): string {
return envelope === null ? output : envelope[1] + body.slice(envelope[0].length);
}
+/** OpenCode's shell tool succeeds when the command exits non-zero. */
+export function openCodeCommandFailed(toolName: string, completedMetadata: unknown): boolean {
+ const exitCode = recordNumber(completedMetadata, "exit", "exitCode");
+ return (
+ openCodeToolProjectionKind(toolName) === "command_execution" &&
+ exitCode !== undefined &&
+ exitCode !== 0
+ );
+}
+
export function openCodeToolTurnItem(
base: ToolItemBase,
tool: {
diff --git a/packages/provider-opencode/src/server/v2/adapter.ts b/packages/provider-opencode/src/server/v2/adapter.ts
index a6f7af44964..81871b4b698 100644
--- a/packages/provider-opencode/src/server/v2/adapter.ts
+++ b/packages/provider-opencode/src/server/v2/adapter.ts
@@ -87,7 +87,7 @@ import {
import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
import { turnScopedSelectionTransition } from "@t3tools/provider-core/server/selectionTransition";
import { OPENCODE_PROVIDER, openCodePermissionRequestKind } from "../adapter.ts";
-import { openCodeToolTurnItem } from "../toolItems.ts";
+import { openCodeCommandFailed, openCodeToolTurnItem } from "../toolItems.ts";
const OpenCode2ProviderCapabilities = {
sessions: {
@@ -1004,12 +1004,16 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
const startedAt = turn.startedAt.get(id) ?? updatedAt;
const completedAt = status === "running" ? null : updatedAt;
const nativeId = `${turn.scope}${id}`;
- yield* emitNode(state, turn, nativeId, "tool_call", status, startedAt, completedAt);
+ const settled =
+ status === "completed" && openCodeCommandFailed(tool.name, result?.metadata)
+ ? "failed"
+ : status;
+ yield* emitNode(state, turn, nativeId, "tool_call", settled, startedAt, completedAt);
yield* emit({
type: "turn_item.updated",
driver,
turnItem: openCodeToolTurnItem(
- itemBase(state, turn, nativeId, status, startedAt, completedAt, updatedAt),
+ itemBase(state, turn, nativeId, settled, startedAt, completedAt, updatedAt),
{
name: tool.name,
input: tool.input,