diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts
index f3781f1abd86..4afa86009642 100644
--- a/packages/opencode/src/cli/cmd/run.ts
+++ b/packages/opencode/src/cli/cmd/run.ts
@@ -582,7 +582,7 @@ export const RunCommand = cmd({
       }
       await share(sdk, sessionID)
 
-      loop().catch((e) => {
+      const done = loop().catch((e) => {
         console.error(e)
         process.exit(1)
       })
@@ -606,6 +606,9 @@ export const RunCommand = cmd({
           parts: [...files, { type: "text", text: message }],
         })
       }
+
+      await done
+      if (error) process.exitCode = 1
     }
 
     if (args.attach) {