From 2e2ecc5193313fcded1a8b340340d2075fde4db9 Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Sat, 5 Sep 2026 17:26:54 -0700
Subject: [PATCH] test: order restart fixture readiness around daemon recovery
 (#18949)

---
 ...minal-host-restart-background-sync.spec.ts | 21 +++++++++++++++++++
 .../restart-restore-terminal-input.spec.ts    |  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts b/tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts
index 9855d8d92b0..cf2f96e9c84 100644
--- a/tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts
+++ b/tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts
@@ -283,6 +283,24 @@ async function expectTerminalInteractive(
 }
 
 async function moveHostAwayFromWorktree(page: Page, targetWorktreeId: string): Promise<string> {
+  await expect
+    .poll(
+      () =>
+        page.evaluate(async (targetId) => {
+          const state = window.__store?.getState()
+          const target = state?.allWorktrees().find((worktree) => worktree.id === targetId)
+          if (!state || !target) {
+            return false
+          }
+          await state.fetchWorktrees(target.repoId)
+          return window
+            .__store!.getState()
+            .allWorktrees()
+            .some((worktree) => worktree.repoId === target.repoId && worktree.id !== targetId)
+        }, targetWorktreeId),
+      { message: 'Seeded alternate host worktree never loaded' }
+    )
+    .toBe(true)
   const alternateWorktreeId = await page.evaluate((targetId) => {
     const state = window.__store?.getState()
     const alternate = state?.allWorktrees().find((worktree) => worktree.id !== targetId)
@@ -423,6 +441,9 @@ test('foregrounds a preserved daemon PTY after the paired host relaunches', asyn
     expect(reconnectControl.ptyId).not.toBe(target.ptyId)
     await openClientTab(client.page, worktreeId, reconnectControl.webTabId)
     await waitForPaneConnected(client.page, reconnectControl.webTabId)
+    await expect
+      .poll(() => readPaneContent(client!.page, reconnectControl.webTabId), { timeout: 30_000 })
+      .toContain('READY')
     await expectTerminalInteractive(client, reconnectControl, 'y')
   } finally {
     if (client) {
diff --git a/tests/e2e/restart-restore-terminal-input.spec.ts b/tests/e2e/restart-restore-terminal-input.spec.ts
index 1ceed4254c5..79528fabffe 100644
--- a/tests/e2e/restart-restore-terminal-input.spec.ts
+++ b/tests/e2e/restart-restore-terminal-input.spec.ts
@@ -239,7 +239,6 @@ test('restored pane recovers input after the daemon un-wedges', async (// oxlint
 
     const second = await session.launch()
     secondApp = second.app
-    await settleRestoredLaunch(second.page)
 
     // Field-fidelity check, not a hard gate: does the pane paint restored
     // content while its PTY attach cannot complete? That visible-but-dead
@@ -258,6 +257,8 @@ test('restored pane recovers input after the daemon un-wedges', async (// oxlint
     }
     stoppedDaemonPid = null
 
+    // Session readiness requires a daemon response; resume it before waiting for restoration.
+    await settleRestoredLaunch(second.page)
     await expectRestoredPaneAcceptsInput(
       second.page,
       `daemon wedged during relaunch (painted while wedged: ${paintedWhileWedged}, ` +