Handle cli cleanup with proper listeners for sigkill etc.

Author: jahooma

cli/src/components/project-picker-screen.tsx

@@ -7,7 +7,6 @@ import { MultilineInput } from './multiline-input'
 import { SelectableList } from './selectable-list'
 import { TerminalLink } from './terminal-link'
 import { useDirectoryBrowser } from '../hooks/use-directory-browser'
-import { cleanupRenderer } from '../utils/renderer-cleanup'
 import { useLogo } from '../hooks/use-logo'
 import { usePathTabCompletion } from '../hooks/use-path-tab-completion'
 import { useSearchableList } from '../hooks/use-searchable-list'
@@ -267,7 +266,6 @@ export const ProjectPickerScreen: React.FC<ProjectPickerScreenProps> = ({
       }
       // Ctrl+C always quits
       if (key.name === 'c' && key.ctrl) {
-        cleanupRenderer()
         process.exit(0)
         return true
       }

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

@@ -2,7 +2,6 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 
 import { getCurrentChatId } from '../project-files'
 import { flushAnalytics } from '../utils/analytics'
-import { cleanupRenderer } from '../utils/renderer-cleanup'
 import { withTimeout } from '../utils/terminal-color-detection'
 
 import type { InputValue } from '../state/chat-store'
@@ -70,7 +69,6 @@ export const useExitHandler = ({
     }
 
     withTimeout(flushAnalytics(), EXIT_FLUSH_TIMEOUT_MS, undefined).then(() => {
-      cleanupRenderer()
       process.exit(0)
     })
     return true
@@ -85,7 +83,6 @@ export const useExitHandler = ({
 
       withTimeout(flushAnalytics(), EXIT_FLUSH_TIMEOUT_MS, undefined).finally(
         () => {
-          cleanupRenderer()
           process.exit(0)
         },
       )

cli/src/hooks/use-login-keyboard-handlers.ts

@@ -1,8 +1,6 @@
 import { useKeyboard } from '@opentui/react'
 import { useCallback } from 'react'
 
-import { cleanupRenderer } from '../utils/renderer-cleanup'
-
 import type { KeyEvent } from '@opentui/core'
 
 interface UseLoginKeyboardHandlersParams {
@@ -45,7 +43,6 @@ export function useLoginKeyboardHandlers({
           ) {
             key.preventDefault()
           }
-          cleanupRenderer()
           process.exit(0)
         }
 

cli/src/index.tsx

@@ -28,7 +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 { installProcessCleanupHandlers } from './utils/renderer-cleanup'
 import { detectTerminalTheme } from './utils/terminal-color-detection'
 import { setOscDetectedTheme } from './utils/theme-system'
 
@@ -309,7 +309,7 @@ async function main(): Promise<void> {
     backgroundColor: 'transparent',
     exitOnCtrlC: false,
   })
-  registerRendererForCleanup(renderer)
+  installProcessCleanupHandlers(renderer)
   createRoot(renderer).render(
     <QueryClientProvider client={queryClient}>
       <AppWithAsyncAuth />

cli/src/utils/renderer-cleanup.ts

@@ -1,32 +1,88 @@
 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
+let renderer: CliRenderer | null = null
+let handlersInstalled = false
 
 /**
- * Register the renderer for cleanup on exit.
- * Call this after creating the renderer in index.tsx.
+ * Clean up the renderer by calling destroy().
+ * This resets terminal state to prevent garbled output after exit.
  */
-export function registerRendererForCleanup(renderer: CliRenderer): void {
-  registeredRenderer = renderer
+function cleanup(): void {
+  if (renderer && !renderer.isDestroyed) {
+    try {
+      renderer.destroy()
+    } catch {
+      // Ignore errors during cleanup - we're exiting anyway
+    }
+    renderer = null
+  }
 }
 
 /**
- * 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.
+ * Install process-level signal handlers to ensure terminal cleanup on all exit scenarios.
+ * Call this once after creating the renderer in index.tsx.
+ *
+ * This handles:
+ * - SIGTERM (kill)
+ * - SIGHUP (terminal hangup)
+ * - SIGINT (Ctrl+C)
+ * - beforeExit / exit events
+ * - uncaughtException / unhandledRejection
+ *
+ * Note: SIGKILL cannot be caught - it's an immediate termination signal.
  */
-export function cleanupRenderer(): void {
-  if (registeredRenderer && !registeredRenderer.isDestroyed) {
+export function installProcessCleanupHandlers(cliRenderer: CliRenderer): void {
+  if (handlersInstalled) return
+  handlersInstalled = true
+  renderer = cliRenderer
+
+  const cleanupAndExit = (exitCode: number) => {
+    cleanup()
+    process.exit(exitCode)
+  }
+
+  // SIGTERM - Default kill signal (e.g., `kill <pid>`)
+  process.on('SIGTERM', () => {
+    cleanupAndExit(0)
+  })
+
+  // SIGHUP - Terminal hangup (e.g., closing the terminal window)
+  process.on('SIGHUP', () => {
+    cleanupAndExit(0)
+  })
+
+  // SIGINT - Ctrl+C
+  process.on('SIGINT', () => {
+    cleanupAndExit(0)
+  })
+
+  // beforeExit - Called when the event loop is empty and about to exit
+  process.on('beforeExit', () => {
+    cleanup()
+  })
+
+  // exit - Last chance to run synchronous cleanup code
+  process.on('exit', () => {
+    cleanup()
+  })
+
+  // uncaughtException - Safety net for unhandled errors
+  process.on('uncaughtException', (error) => {
     try {
-      registeredRenderer.destroy()
+      console.error('Uncaught exception:', error)
     } catch {
-      // Ignore errors during cleanup - we're exiting anyway
+      // Ignore logging errors
     }
-    registeredRenderer = null
-  }
+    cleanupAndExit(1)
+  })
+
+  // unhandledRejection - Safety net for unhandled promise rejections
+  process.on('unhandledRejection', (reason) => {
+    try {
+      console.error('Unhandled rejection:', reason)
+    } catch {
+      // Ignore logging errors
+    }
+    cleanupAndExit(1)
+  })
 }