From 061efc6cf260762677bdbac9261725a2da4fdbea Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Mon, 11 May 2026 20:30:23 -0400
Subject: [PATCH] Fix run JSON output draining (#26955)

---
 packages/opencode/src/cli/cmd/run.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts
index bca89c3cab..7011b51eb9 100644
--- a/packages/opencode/src/cli/cmd/run.ts
+++ b/packages/opencode/src/cli/cmd/run.ts
@@ -719,6 +719,7 @@ export const RunCommand = effectCmd({
               }
             }
           }
+          return error
         }
         const cwd = args.attach ? (directory ?? sess.directory ?? (await current(sdk))) : (directory ?? root)
         const client = args.attach ? attachSDK(cwd) : sdk
@@ -730,10 +731,7 @@ export const RunCommand = effectCmd({
 
         if (!args.interactive) {
           const events = await client.event.subscribe()
-          loop(client, events).catch((e) => {
-            console.error(e)
-            process.exit(1)
-          })
+          const completed = loop(client, events)
 
           if (args.command) {
             await client.session.command({
@@ -744,6 +742,8 @@ export const RunCommand = effectCmd({
               arguments: message,
               variant: args.variant,
             })
+            const error = await completed
+            if (error) process.exitCode = 1
             return
           }
 
@@ -755,6 +755,8 @@ export const RunCommand = effectCmd({
             variant: args.variant,
             parts: [...files, { type: "text", text: message }],
           })
+          const error = await completed
+          if (error) process.exitCode = 1
           return
         }