fix: 修复退出软件时的一些问题

.codex/environments/environment.toml

@@ -0,0 +1,11 @@
+# THIS IS AUTOGENERATED. DO NOT EDIT MANUALLY
+version = 1
+name = "EnsoAI"
+
+[setup]
+script = ""
+
+[[actions]]
+name = "运行"
+icon = "run"
+command = "pnpm dev"

src/main/index.ts

@@ -615,6 +615,13 @@ app.on('will-quit', (event) => {
 
   const forceExitTimer = setTimeout(() => {
     console.error('[app] Cleanup timed out, forcing exit');
+    // Best-effort: kill native resources synchronously before forcing exit to
+    // avoid deadlocking during Node addon cleanup (e.g. node-pty on macOS).
+    try {
+      cleanupAllResourcesSync();
+    } catch (err) {
+      console.error('[app] Sync cleanup error:', err);
+    }
     app.exit(0);
   }, FORCE_EXIT_TIMEOUT_MS);
 

src/main/ipc/index.ts

@@ -2,6 +2,7 @@ import { stopAllCodeReviews } from '../services/ai';
 import { disposeClaudeIdeBridge } from '../services/claude/ClaudeIdeBridge';
 import { autoUpdaterService } from '../services/updater/AutoUpdater';
 import { webInspectorServer } from '../services/webInspector';
+import { cleanupExecInPtys, cleanupExecInPtysSync } from '../utils/shell';
 import { registerAgentHandlers } from './agent';
 import { registerAppHandlers } from './app';
 import { registerClaudeConfigHandlers } from './claudeConfig';
@@ -16,12 +17,7 @@ import {
   stopAllFileWatchersSync,
 } from './files';
 import { clearAllGitServices, registerGitHandlers } from './git';
-import {
-  autoStartHapi,
-  cleanupHapi,
-  cleanupHapiSync,
-  registerHapiHandlers,
-} from './hapi';
+import { autoStartHapi, cleanupHapi, cleanupHapiSync, registerHapiHandlers } from './hapi';
 
 export { autoStartHapi };
 
@@ -36,7 +32,7 @@ import {
   destroyAllTerminalsAndWait,
   registerTerminalHandlers,
 } from './terminal';
-import { cleanupTmux, cleanupTmuxSync, registerTmuxHandlers } from './tmux';
+import { cleanupTmuxSync, registerTmuxHandlers } from './tmux';
 import { cleanupTodo, registerTodoHandlers } from './todo';
 import { registerUpdaterHandlers } from './updater';
 import { registerWebInspectorHandlers } from './webInspector';
@@ -69,11 +65,19 @@ export function registerIpcHandlers(): void {
 export async function cleanupAllResources(): Promise<void> {
   const CLEANUP_TIMEOUT = 3000;
 
+  // Ensure any in-flight execInPty commands are terminated before Node shutdown.
+  // Leaving node-pty PTYs alive can deadlock native addon cleanup on macOS.
+  await cleanupExecInPtys(CLEANUP_TIMEOUT);
+
   // Stop Hapi server first (graceful best-effort with timeout)
   await cleanupHapi(CLEANUP_TIMEOUT);
 
-  // Kill tmux enso server (async, fast)
-  cleanupTmux().catch((err) => console.warn('Tmux cleanup warning:', err));
+  // Kill tmux enso server (sync, best-effort). Avoid spawning new PTYs during shutdown.
+  try {
+    cleanupTmuxSync();
+  } catch (err) {
+    console.warn('Tmux cleanup warning:', err);
+  }
 
   // Stop Web Inspector server (sync, fast)
   webInspectorServer.stop();
@@ -132,6 +136,9 @@ export async function cleanupAllResources(): Promise<void> {
 export function cleanupAllResourcesSync(): void {
   console.log('[app] Sync cleanup starting...');
 
+  // Kill any in-flight execInPty commands first (sync)
+  cleanupExecInPtysSync();
+
   // Kill Hapi/Cloudflared processes (sync)
   cleanupHapiSync();
 

src/main/services/terminal/PtyManager.ts

@@ -166,6 +166,10 @@ interface PtySession {
   cwd: string;
   onData: (data: string) => void;
   onExit?: (exitCode: number, signal?: number) => void;
+  // node-pty returns disposables for event subscriptions; keep them so we can
+  // dispose during shutdown and avoid native threads hanging during Node cleanup.
+  dataDisposable: { dispose(): void };
+  exitDisposable?: { dispose(): void };
 }
 
 function findFallbackShell(): string {
@@ -407,21 +411,36 @@ export class PtyManager {
       }
     }
 
-    ptyProcess.onData((data) => {
+    const dataDisposable = ptyProcess.onData((data) => {
       onData(data);
     });
 
     // Store session first so onExit callback can access it
-    const session: PtySession = { pty: ptyProcess, cwd, onData, onExit };
+    const session: PtySession = { pty: ptyProcess, cwd, onData, onExit, dataDisposable };
     this.sessions.set(id, session);
 
-    ptyProcess.onExit(({ exitCode, signal }) => {
+    const exitDisposable = ptyProcess.onExit(({ exitCode, signal }) => {
       // Read onExit from session to allow it to be replaced during cleanup
       const currentSession = this.sessions.get(id);
       const exitHandler = currentSession?.onExit;
+
+      // Dispose subscriptions promptly to release native resources (node-pty TSFN)
+      try {
+        currentSession?.dataDisposable.dispose();
+      } catch {
+        // Ignore
+      }
+      try {
+        currentSession?.exitDisposable?.dispose();
+      } catch {
+        // Ignore
+      }
+
       this.sessions.delete(id);
+      this.activityCache.delete(id);
       exitHandler?.(exitCode, signal);
     });
+    session.exitDisposable = exitDisposable;
 
     return id;
   }
@@ -443,6 +462,17 @@ export class PtyManager {
   destroy(id: string): void {
     const session = this.sessions.get(id);
     if (session) {
+      // Stop delivering data/exit callbacks immediately.
+      try {
+        session.dataDisposable.dispose();
+      } catch {
+        // Ignore
+      }
+      try {
+        session.exitDisposable?.dispose();
+      } catch {
+        // Ignore
+      }
       killProcessTree(session.pty);
       this.sessions.delete(id);
       this.activityCache.delete(id);
@@ -461,14 +491,26 @@ export class PtyManager {
         return;
       }
 
-      const _pid = session.pty.pid;
       let resolved = false;
 
+      // Stop data callbacks during shutdown; we only care about exit.
+      try {
+        session.dataDisposable.dispose();
+      } catch {
+        // Ignore
+      }
+
       // Set up timeout
       const timer = setTimeout(() => {
         if (!resolved) {
           resolved = true;
+          try {
+            session.exitDisposable?.dispose();
+          } catch {
+            // Ignore
+          }
           this.sessions.delete(id);
+          this.activityCache.delete(id);
           resolve();
         }
       }, timeout);
@@ -478,7 +520,6 @@ export class PtyManager {
         if (!resolved) {
           resolved = true;
           clearTimeout(timer);
-          this.sessions.delete(id);
           // Don't call original onExit during cleanup to avoid issues
           resolve();
         }

src/main/utils/processUtils.ts

@@ -66,9 +66,21 @@ export function killProcessTree(
       } catch {
         // pgrep may not exist or fail, continue to kill main process
       }
-      // Kill the main process
+      // Kill the main process.
+      // Prefer target.kill() when available so libraries (e.g. node-pty) can run
+      // their own cleanup logic around termination.
       try {
-        process.kill(pid, signal);
+        if (typeof target !== 'number' && 'kill' in target) {
+          try {
+            target.kill(signal);
+          } catch {
+            // Fallback for ProcessLike implementations that don't support the signal
+            // or throw while process.kill would still work.
+            process.kill(pid, signal);
+          }
+        } else {
+          process.kill(pid, signal);
+        }
       } catch {
         // Ignore - process may have already exited
       }
@@ -128,9 +140,19 @@ export async function killProcessTreeAsync(
         }
       }
 
-      // Kill the main process
+      // Kill the main process.
+      // Prefer target.kill() when available so libraries (e.g. node-pty) can run
+      // their own cleanup logic around termination.
       try {
-        process.kill(pid, signal);
+        if (typeof target !== 'number' && 'kill' in target) {
+          try {
+            target.kill(signal);
+          } catch {
+            process.kill(pid, signal);
+          }
+        } else {
+          process.kill(pid, signal);
+        }
       } catch {
         // Ignore
       }