Merge branch 'closing-processes'

Author: shkm

src/App.tsx

@@ -173,6 +173,7 @@ function App() {
     setActiveTab: setActiveSessionTab,
     reorderTabs: reorderSessionTabs,
     incrementCounter: incrementSessionCounter,
+    setPtyId: setSessionPtyId,
     removePtyId: removeSessionPtyId,
     setLastActiveTabId,
     updateTabLabel: updateSessionTabLabel,
@@ -3358,6 +3359,7 @@ function App() {
                   onScratchCwdChange={handleScratchCwdChange}
                   onClearNotification={clearNotification}
                   onTabTitleChange={updateSessionTabLabel}
+                  onPtyIdReady={setSessionPtyId}
                 />
               </div>
             </Panel>

src/components/MainPane/MainPane.tsx

@@ -40,6 +40,8 @@ interface MainPaneProps {
   onClearNotification?: (sessionId: string) => void;
   onCwdChange?: (sessionId: string, cwd: string) => void;
   onTabTitleChange?: (sessionId: string, tabId: string, title: string) => void;
+  /** Called when a tab's PTY is spawned (for cleanup tracking) */
+  onPtyIdReady?: (tabId: string, ptyId: string) => void;
 
   // Legacy props for backward compatibility during migration
   openWorktreeIds?: Set<string>;
@@ -92,6 +94,7 @@ export function MainPane({
   onClearNotification,
   onCwdChange,
   onTabTitleChange,
+  onPtyIdReady,
   // Legacy props
   onWorktreeNotification,
   onWorktreeThinkingChange,
@@ -363,6 +366,7 @@ export function MainPane({
                   onFocus={() => onFocus(session.id, tab.id)}
                   onTitleChange={handleTitleChange}
                   onClose={() => onCloseSessionTab(tab.id)}
+                  onPtyIdReady={(ptyId) => onPtyIdReady?.(tab.id, ptyId)}
                 />
               );
             } else {
@@ -383,6 +387,7 @@ export function MainPane({
                   onThinkingChange={handleThinkingChange}
                   onCwdChange={handleCwdChange}
                   onTitleChange={handleTitleChange}
+                  onPtyIdReady={(ptyId) => onPtyIdReady?.(tab.id, ptyId)}
                 />
               );
             }

src/components/MainPane/MainTerminal.tsx

@@ -51,9 +51,11 @@ interface MainTerminalProps {
   onCwdChange?: (cwd: string) => void;
   /** Called when terminal title changes (via OSC escape codes) */
   onTitleChange?: (title: string) => void;
+  /** Called when PTY is spawned with the PTY ID (for cleanup tracking) */
+  onPtyIdReady?: (ptyId: string) => void;
 }
 
-export function MainTerminal({ entityId, sessionId, type = 'main', isActive, shouldAutoFocus, focusTrigger, terminalConfig, activityTimeout = 250, initialCwd, onFocus, onNotification, onThinkingChange, onCwdChange, onTitleChange }: MainTerminalProps) {
+export function MainTerminal({ entityId, sessionId, type = 'main', isActive, shouldAutoFocus, focusTrigger, terminalConfig, activityTimeout = 250, initialCwd, onFocus, onNotification, onThinkingChange, onCwdChange, onTitleChange, onPtyIdReady }: MainTerminalProps) {
   // Use sessionId for spawn if provided, otherwise fall back to entityId (for backward compatibility)
   const spawnId = sessionId ?? entityId;
   const containerRef = useRef<HTMLDivElement>(null);
@@ -220,6 +222,12 @@ export function MainTerminal({ entityId, sessionId, type = 'main', isActive, sho
     onTitleChangeRef.current = onTitleChange;
   }, [onTitleChange]);
 
+  // Store onPtyIdReady in ref so spawn handlers can access the latest version
+  const onPtyIdReadyRef = useRef(onPtyIdReady);
+  useEffect(() => {
+    onPtyIdReadyRef.current = onPtyIdReady;
+  }, [onPtyIdReady]);
+
   // Progress indicator logic:
   // - Activity (output/title): start timer, reset on more activity, turn off when timer expires
   // - OSC 9 progress: explicit start/stop (no timeout)
@@ -470,7 +478,12 @@ export function MainTerminal({ entityId, sessionId, type = 'main', isActive, sho
 
       spawnedAtRef.current = Date.now();
       // Pass initialCwd for scratch terminals to start in the specified directory
-      await spawnRef.current(spawnId, type, cols, rows, type === 'scratch' ? initialCwd : undefined);
+      const newPtyId = await spawnRef.current(spawnId, type, cols, rows, type === 'scratch' ? initialCwd : undefined);
+
+      // Notify parent of the PTY ID for cleanup tracking
+      if (newPtyId && isMounted) {
+        onPtyIdReadyRef.current?.(newPtyId);
+      }
 
       // For project type, mark as ready immediately (no startup delay like main command)
       if (type === 'project' && isMounted) {
@@ -543,7 +556,12 @@ export function MainTerminal({ entityId, sessionId, type = 'main', isActive, sho
     const cols = terminal.cols;
     const rows = terminal.rows;
     spawnedAtRef.current = Date.now();
-    await spawn(spawnId, currentMode, cols, rows);
+    const newPtyId = await spawn(spawnId, currentMode, cols, rows);
+
+    // Notify parent of the new PTY ID for cleanup tracking
+    if (newPtyId) {
+      onPtyIdReadyRef.current?.(newPtyId);
+    }
   }, [spawn, spawnId, currentMode]);
 
   // Launch shell handler for when the user wants a shell instead of the main command
@@ -571,7 +589,12 @@ export function MainTerminal({ entityId, sessionId, type = 'main', isActive, sho
     const cols = terminal.cols;
     const rows = terminal.rows;
     spawnedAtRef.current = Date.now();
-    await spawn(spawnId, 'shell', cols, rows);
+    const newPtyId = await spawn(spawnId, 'shell', cols, rows);
+
+    // Notify parent of the new PTY ID for cleanup tracking
+    if (newPtyId) {
+      onPtyIdReadyRef.current?.(newPtyId);
+    }
   }, [spawn, spawnId]);
 
   // Store resize function in ref to avoid dependency issues