guard tui exit (#16640)

packages/opencode/src/cli/cmd/tui/app.tsx

@@ -111,7 +111,6 @@ export function tui(input: {
   fetch?: typeof fetch
   headers?: RequestInit["headers"]
   events?: EventSource
-  onExit?: () => Promise<void>
 }) {
   // promise to prevent immediate exit
   return new Promise<void>(async (resolve) => {
@@ -126,7 +125,6 @@ export function tui(input: {
 
     const onExit = async () => {
       unguard?.()
-      await input.onExit?.()
       resolve()
     }
 

packages/opencode/src/cli/cmd/tui/context/exit.tsx

@@ -15,6 +15,7 @@ export const { use: useExit, provider: ExitProvider } = createSimpleContext({
   init: (input: { onExit?: () => Promise<void> }) => {
     const renderer = useRenderer()
     let message: string | undefined
+    let task: Promise<void> | undefined
     const store = {
       set: (value?: string) => {
         const prev = message
@@ -29,20 +30,24 @@ export const { use: useExit, provider: ExitProvider } = createSimpleContext({
       get: () => message,
     }
     const exit: Exit = Object.assign(
-      async (reason?: unknown) => {
+      (reason?: unknown) => {
-        // Reset window title before destroying renderer
+        if (task) return task
-        renderer.setTerminalTitle("")
+        task = (async () => {
-        renderer.destroy()
+          // Reset window title before destroying renderer
-        win32FlushInputBuffer()
+          renderer.setTerminalTitle("")
-        if (reason) {
+          renderer.destroy()
-          const formatted = FormatError(reason) ?? FormatUnknownError(reason)
+          win32FlushInputBuffer()
-          if (formatted) {
+          if (reason) {
-            process.stderr.write(formatted + "\n")
+            const formatted = FormatError(reason) ?? FormatUnknownError(reason)
+            if (formatted) {
+              process.stderr.write(formatted + "\n")
+            }
           }
-        }
+          const text = store.get()
-        const text = store.get()
+          if (text) process.stdout.write(text + "\n")
-        if (text) process.stdout.write(text + "\n")
+          await input.onExit?.()
-        await input.onExit?.()
+        })()
+        return task
       },
       {
         message: store,