fix(desktop): close a finished run's leftover pane before forgetting its record

Author: waleedlatif1

apps/desktop/src/main/terminal/index.ts

@@ -537,8 +537,12 @@ export class TerminalService {
     const pending = this.pendingRuns.get(terminalId)
     if (!pending) return
     for (const handle of pending) {
-      // A finished run needs no record; an untracked one is never stopped, so is not kept either.
-      if (isRunComplete(handle)) this.forgetRun(handle)
+      // A finished run's pane may still be open (`remain-on-exit`): it is closed, while still the
+      // run's, before the record goes. Without the shell's environment the record stays, and the
+      // next sweep closes it. An untracked run is never stopped, so it is not kept either.
+      if (isRunComplete(handle) && env) {
+        void closeRunPane(handle, env).finally(() => this.forgetRun(handle))
+      }
       if (env && handle.runId !== null && !isRunComplete(handle)) this.orphanedRuns.set(handle, env)
       this.releaseRun(handle)
     }

apps/desktop/src/main/terminal/service.test.ts

@@ -669,9 +669,10 @@ describe('agent commands in tmux', () => {
     }
   })
 
-  it('forgets a run that finished before its terminal closed', async () => {
+  it('closes and then forgets a run that finished before its terminal closed', async () => {
     tmuxFake.on = true
     tmuxFake.statusPaths.clear()
+    tmuxFake.open.clear()
     const scratch = mkdtempSync(join(tmpdir(), 'sim-ledger-'))
     const ledgerDir = join(scratch, 'terminal-runs')
     try {
@@ -684,9 +685,14 @@ describe('agent commands in tmux', () => {
       const [[, statusPath = ''] = []] = [...tmuxFake.statusPaths]
       writeFileSync(statusPath, '0')
 
+      const [pane = ''] = [...tmuxFake.statusPaths.keys()]
+      // Its dead pane is still open, as with `remain-on-exit`.
+      expect(tmuxFake.open.has(pane)).toBe(true)
+
       terminal.closeTerminal(activeTerminalId as string)
 
-      expect(createRunLedger(ledgerDir).list()).toEqual([])
+      await vi.waitFor(() => expect(createRunLedger(ledgerDir).list()).toEqual([]))
+      expect(tmuxFake.open.has(pane)).toBe(false)
     } finally {
       tmuxFake.on = false
       rmSync(scratch, { recursive: true, force: true })