fix(cli): drain run JSON events before exit

Author: kitlangton

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
         }
 

packages/opencode/src/session/processor.ts

@@ -365,6 +365,38 @@ export const layer: Layer.Layer<
         }
       })
 
+      const finishText = Effect.fn("SessionProcessor.finishText")(function* (
+        providerMetadata?: Extract<StreamEvent, { type: "text-end" }>["providerMetadata"],
+      ) {
+        if (!ctx.currentText) return
+        // oxlint-disable-next-line no-self-assign -- reactivity trigger
+        ctx.currentText.text = ctx.currentText.text
+        ctx.currentText.text = (yield* plugin.trigger(
+          "experimental.text.complete",
+          {
+            sessionID: ctx.sessionID,
+            messageID: ctx.assistantMessage.id,
+            partID: ctx.currentText.id,
+          },
+          { text: ctx.currentText.text },
+        )).text
+        if (!ctx.assistantMessage.summary) {
+          // TODO(v2): Temporary dual-write while migrating session messages to v2 events.
+          if (Flag.OPENCODE_EXPERIMENTAL_EVENT_SYSTEM) {
+            yield* sync.run(SessionEvent.Text.Ended.Sync, {
+              sessionID: ctx.sessionID,
+              text: ctx.currentText.text,
+              timestamp: DateTime.makeUnsafe(Date.now()),
+            })
+          }
+        }
+        const end = Date.now()
+        ctx.currentText.time = { start: ctx.currentText.time?.start ?? end, end }
+        if (providerMetadata) ctx.currentText.metadata = providerMetadata
+        yield* session.updatePart(ctx.currentText)
+        ctx.currentText = undefined
+      })
+
       const handleEvent = Effect.fnUntraced(function* (value: StreamEvent) {
         switch (value.type) {
           case "request-start":
@@ -696,38 +728,11 @@ export const layer: Layer.Layer<
             return
 
           case "text-end":
-            if (!ctx.currentText) return
-            // oxlint-disable-next-line no-self-assign -- reactivity trigger
-            ctx.currentText.text = ctx.currentText.text
-            ctx.currentText.text = (yield* plugin.trigger(
-              "experimental.text.complete",
-              {
-                sessionID: ctx.sessionID,
-                messageID: ctx.assistantMessage.id,
-                partID: ctx.currentText.id,
-              },
-              { text: ctx.currentText.text },
-            )).text
-            if (!ctx.assistantMessage.summary) {
-              // TODO(v2): Temporary dual-write while migrating session messages to v2 events.
-              if (Flag.OPENCODE_EXPERIMENTAL_EVENT_SYSTEM) {
-                yield* sync.run(SessionEvent.Text.Ended.Sync, {
-                  sessionID: ctx.sessionID,
-                  text: ctx.currentText.text,
-                  timestamp: DateTime.makeUnsafe(Date.now()),
-                })
-              }
-            }
-            {
-              const end = Date.now()
-              ctx.currentText.time = { start: ctx.currentText.time?.start ?? end, end }
-            }
-            if (value.providerMetadata) ctx.currentText.metadata = value.providerMetadata
-            yield* session.updatePart(ctx.currentText)
-            ctx.currentText = undefined
+            yield* finishText(value.providerMetadata)
             return
 
           case "request-finish":
+            yield* finishText()
             if (!ctx.assistantMessage.finish) yield* finishStep(value)
             return
         }