From 84893eb666dee7ba1fcaf69cc878cd4e9f2b8097 Mon Sep 17 00:00:00 2001
From: Brennan Benson <brennanbenson@Brennans-MacBook-Pro.local>
Date: Sun, 12 Jul 2026 20:03:13 -0700
Subject: [PATCH] align teardown tests with main ownership

---
 src/main/ssh/ssh-relay-generation-reattach.test.ts    |  2 +-
 .../src/lib/launch-agent-background-session.test.ts   | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/ssh/ssh-relay-generation-reattach.test.ts b/src/main/ssh/ssh-relay-generation-reattach.test.ts
index 403fa16af5f..f47841a8498 100644
--- a/src/main/ssh/ssh-relay-generation-reattach.test.ts
+++ b/src/main/ssh/ssh-relay-generation-reattach.test.ts
@@ -122,7 +122,7 @@ describe('SSH relay generation reattach', () => {
     expect(attachForReconnect).not.toHaveBeenCalled()
     expect(mockStore.markSshRemotePtyLease).toHaveBeenCalledWith(
       'target-1',
-      'pty-recycled',
+      'ssh:target-1@@relay-old@@pty-recycled',
       'expired'
     )
     expect(mockWindow.webContents.send).toHaveBeenCalledWith('pty:exit', {
diff --git a/src/renderer/src/lib/launch-agent-background-session.test.ts b/src/renderer/src/lib/launch-agent-background-session.test.ts
index de5d96b5eca..b68af1033a3 100644
--- a/src/renderer/src/lib/launch-agent-background-session.test.ts
+++ b/src/renderer/src/lib/launch-agent-background-session.test.ts
@@ -476,7 +476,7 @@ describe('launchAgentBackgroundSession', () => {
     expect(mockUpdateTabPtyId).not.toHaveBeenCalled()
   })
 
-  it('retains exact PTY retry ownership when cleanup after local spawn fails', async () => {
+  it('delegates exact PTY retry ownership to main when cleanup after local spawn fails', async () => {
     mockRegisterEagerPtyBuffer.mockImplementationOnce(() => {
       throw new Error('subscription setup failed')
     })
@@ -496,7 +496,7 @@ describe('launchAgentBackgroundSession', () => {
 
     expect(mockKill).toHaveBeenCalledWith('pty-1', { expectedTabId: 'tab-1' })
     retryRetainedPtyKills()
-    await vi.waitFor(() => expect(mockKill).toHaveBeenCalledTimes(2))
+    expect(mockKill).toHaveBeenCalledTimes(1)
     expect(mockCloseTab).toHaveBeenCalledWith('tab-1', { recordInteraction: false })
   })
 
@@ -809,9 +809,8 @@ describe('launchAgentBackgroundSession', () => {
     })
     mockRuntimeEnvironmentSubscribe.mockRejectedValueOnce(new Error('subscription failed'))
     const { launchAgentBackgroundSession } = await import('./launch-agent-background-session')
-    const { retryRetainedRuntimeTerminalCloses } = await import(
-      './runtime-terminal-close-retry-ownership'
-    )
+    const { retryRetainedRuntimeTerminalCloses } =
+      await import('./runtime-terminal-close-retry-ownership')
 
     await expect(
       launchAgentBackgroundSession({
@@ -828,7 +827,7 @@ describe('launchAgentBackgroundSession', () => {
       timeoutMs: undefined
     })
     retryRetainedRuntimeTerminalCloses()
-    await vi.waitFor(() => expect(closeAttempts).toBe(2))
+    expect(closeAttempts).toBe(1)
     expect(state.clearTabPtyId).toHaveBeenCalledWith('tab-1', 'remote:env-1@@terminal-1')
     expect(state.clearAgentLaunchConfig).toHaveBeenCalledWith(expect.stringMatching(/^tab-1:/))
     expect(mockCloseTab).toHaveBeenCalledWith('tab-1', { recordInteraction: false })