fix: cleanup tui renderer before process.exit()

Author: jahooma

cli/src/hooks/use-exit-handler.ts

@@ -2,6 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 
 import { getCurrentChatId } from '../project-files'
 import { flushAnalytics } from '../utils/analytics'
+import { cleanupRenderer } from '../utils/renderer-cleanup'
 
 import type { InputValue } from '../state/chat-store'
 
@@ -64,7 +65,10 @@ export const useExitHandler = ({
       exitWarningTimeoutRef.current = null
     }
 
-    flushAnalytics().then(() => process.exit(0))
+    flushAnalytics().then(() => {
+      cleanupRenderer()
+      process.exit(0)
+    })
     return true
   }, [inputValue, setInputValue, nextCtrlCWillExit])
 
@@ -77,8 +81,12 @@ export const useExitHandler = ({
 
       const flushed = flushAnalytics()
       if (flushed && typeof (flushed as Promise<void>).finally === 'function') {
-        ;(flushed as Promise<void>).finally(() => process.exit(0))
+        ;(flushed as Promise<void>).finally(() => {
+          cleanupRenderer()
+          process.exit(0)
+        })
       } else {
+        cleanupRenderer()
         process.exit(0)
       }
     }

cli/src/index.tsx

@@ -28,6 +28,7 @@ import { initializeAgentRegistry } from './utils/local-agent-registry'
 import { clearLogFile, logger } from './utils/logger'
 import { shouldShowProjectPicker } from './utils/project-picker'
 import { saveRecentProject } from './utils/recent-projects'
+import { registerRendererForCleanup } from './utils/renderer-cleanup'
 import { detectTerminalTheme } from './utils/terminal-color-detection'
 import { setOscDetectedTheme } from './utils/theme-system'
 
@@ -308,6 +309,7 @@ async function main(): Promise<void> {
     backgroundColor: 'transparent',
     exitOnCtrlC: false,
   })
+  registerRendererForCleanup(renderer)
   createRoot(renderer).render(
     <QueryClientProvider client={queryClient}>
       <AppWithAsyncAuth />

cli/src/utils/renderer-cleanup.ts

@@ -0,0 +1,32 @@
+import type { CliRenderer } from '@opentui/core'
+
+/**
+ * Global reference to the CLI renderer for cleanup on exit.
+ * This allows the exit handler to properly destroy the renderer,
+ * which resets terminal state (mouse tracking, focus reporting, raw mode, etc.)
+ */
+let registeredRenderer: CliRenderer | null = null
+
+/**
+ * Register the renderer for cleanup on exit.
+ * Call this after creating the renderer in index.tsx.
+ */
+export function registerRendererForCleanup(renderer: CliRenderer): void {
+  registeredRenderer = renderer
+}
+
+/**
+ * Cleanup the renderer by calling destroy().
+ * This resets terminal state to prevent garbled output after exit.
+ * Should be called before process.exit() in exit handlers.
+ */
+export function cleanupRenderer(): void {
+  if (registeredRenderer && !registeredRenderer.isDestroyed) {
+    try {
+      registeredRenderer.destroy()
+    } catch {
+      // Ignore errors during cleanup - we're exiting anyway
+    }
+    registeredRenderer = null
+  }
+}