From dead0c7cd2fc05421ea365de4c669d6909eb995c Mon Sep 17 00:00:00 2001
From: Brennan Benson <brennanbenson@Brennans-MacBook-Pro.local>
Date: Sun, 12 Jul 2026 17:38:14 -0700
Subject: [PATCH] refactor: centralize background PTY cleanup

---
 .../lib/agent-background-session-cleanup.ts   |  8 +++++++
 .../lib/launch-agent-background-session.ts    | 21 +++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/renderer/src/lib/agent-background-session-cleanup.ts b/src/renderer/src/lib/agent-background-session-cleanup.ts
index dab1945534b..3c07e96ec48 100644
--- a/src/renderer/src/lib/agent-background-session-cleanup.ts
+++ b/src/renderer/src/lib/agent-background-session-cleanup.ts
@@ -1,3 +1,5 @@
+import { killPtyRetainingRetryOwnership } from '@/lib/pty-kill-retry-ownership'
+
 export function runBestEffortAgentBackgroundCleanups(...actions: (() => void)[]): void {
   for (const action of actions) {
     try {
@@ -7,3 +9,9 @@ export function runBestEffortAgentBackgroundCleanups(...actions: (() => void)[])
     }
   }
 }
+
+export function killFailedAgentBackgroundPty(ptyId: string, tabId: string): Promise<void> {
+  return killPtyRetainingRetryOwnership(ptyId, '[pty] Background cleanup failed', {
+    expectedTabId: tabId
+  })
+}
diff --git a/src/renderer/src/lib/launch-agent-background-session.ts b/src/renderer/src/lib/launch-agent-background-session.ts
index 441d3d8edb3..72e5dd8585d 100644
--- a/src/renderer/src/lib/launch-agent-background-session.ts
+++ b/src/renderer/src/lib/launch-agent-background-session.ts
@@ -39,8 +39,7 @@ import { createSshBackgroundStartupDelivery } from '@/lib/ssh-background-startup
 import { shouldUseShellReadyStartupDelivery } from '../../../shared/codex-startup-delivery'
 import { isMainTerminalSideEffectAuthorityForPty } from '@/components/terminal-pane/terminal-side-effect-facts-handler'
 import { resolveLocalWindowsAgentStartupShell } from '../../../shared/windows-terminal-shell'
-import { runBestEffortAgentBackgroundCleanups } from '@/lib/agent-background-session-cleanup'
-import { killPtyRetainingRetryOwnership } from '@/lib/pty-kill-retry-ownership'
+import * as backgroundCleanup from '@/lib/agent-background-session-cleanup'
 
 export async function launchAgentBackgroundSession(
   args: LaunchAgentBackgroundSessionArgs
@@ -312,11 +311,11 @@ export async function launchAgentBackgroundSession(
     // Why: terminal creation and stream subscription are separate remote calls.
     // A failure between them must not strand an invisible runtime terminal.
     exitHandled = true
-    runBestEffortAgentBackgroundCleanups(unsubscribeExit, unsubscribeData)
-    runBestEffortAgentBackgroundCleanups(() => eagerPtyBuffer?.dispose())
-    runBestEffortAgentBackgroundCleanups(() => sshStartupDelivery.clear())
-    runBestEffortAgentBackgroundCleanups(() => store.clearTabPtyId(tab.id, ptyId))
-    runBestEffortAgentBackgroundCleanups(() => store.clearAgentLaunchConfig(paneKey))
+    backgroundCleanup.runBestEffortAgentBackgroundCleanups(unsubscribeExit, unsubscribeData)
+    backgroundCleanup.runBestEffortAgentBackgroundCleanups(() => eagerPtyBuffer?.dispose())
+    backgroundCleanup.runBestEffortAgentBackgroundCleanups(() => sshStartupDelivery.clear())
+    backgroundCleanup.runBestEffortAgentBackgroundCleanups(() => store.clearTabPtyId(tab.id, ptyId))
+    backgroundCleanup.runBestEffortAgentBackgroundCleanups(() => store.clearAgentLaunchConfig(paneKey))
     if (ptyId) {
       try {
         if (runtimeTarget.kind === 'environment' && runtimeTerminalHandle) {
@@ -324,17 +323,13 @@ export async function launchAgentBackgroundSession(
             terminal: runtimeTerminalHandle
           })
         } else if (runtimeTarget.kind === 'local') {
-          await killPtyRetainingRetryOwnership(
-            ptyId,
-            '[pty] Failed to stop PTY after background launch failure',
-            { expectedTabId: tab.id }
-          )
+          await backgroundCleanup.killFailedAgentBackgroundPty(ptyId, tab.id)
         }
       } catch {
         // Best-effort close; retiring the invalid hidden tab must still proceed.
       }
     }
-    runBestEffortAgentBackgroundCleanups(() => store.closeTab(tab.id, { recordInteraction: false }))
+    backgroundCleanup.runBestEffortAgentBackgroundCleanups(() => store.closeTab(tab.id, { recordInteraction: false }))
     throw error
   }
 }