fix(tui): keep both reload clears when merging the parent

A rebuild must clear the rehydrated-approval hold, or the next idle
check still treats the session as resuming. Interrupt and session
rotation also clear a deferred reload before buildAgent awaits, so a
connect during that build can still set the flag. Initial and
mcp-tools-changed builds leave pendingReload for reloadIfIdle.

Author: TheGreatAxios

src/tui/runner/exit.test.ts

@@ -1153,6 +1153,43 @@ describe("reload-if-idle waits for the reactor's message run", () => {
     await services.sessionOps.awaitTail();
     expect(builds()).toBe(3);
   });
+
+  test("a pending reload held for an open run does not survive interrupt", async () => {
+    const { state, services, builds } = await lifecycleWithOpenRun();
+    state.pendingReload = true;
+    defined(state.reloadIfIdle, "reloadIfIdle")();
+    await services.sessionOps.awaitTail();
+    expect(builds()).toBe(1);
+    expect(state.pendingReload).toBe(true);
+    defined(state.interrupt, "interrupt")();
+    await services.sessionOps.awaitTail();
+    expect(state.pendingReload).toBe(false);
+    expect(builds()).toBe(2);
+    await runWhileAgentBusy(state, async () => undefined);
+    expect(builds()).toBe(2);
+    expect(state.pendingReload).toBe(false);
+  });
+
+  test("a pending reload held for an open run does not survive session rotation", async () => {
+    const { state, services, builds } = await lifecycleWithOpenRun();
+    const dirs = stubRotationDirs();
+    try {
+      state.pendingReload = true;
+      defined(state.reloadIfIdle, "reloadIfIdle")();
+      await services.sessionOps.awaitTail();
+      expect(builds()).toBe(1);
+      expect(state.pendingReload).toBe(true);
+      defined(state.newSession, "newSession")();
+      await services.sessionOps.awaitTail();
+      expect(state.pendingReload).toBe(false);
+      expect(builds()).toBe(2);
+      await runWhileAgentBusy(state, async () => undefined);
+      expect(builds()).toBe(2);
+      expect(state.pendingReload).toBe(false);
+    } finally {
+      for (const spy of dirs) spy.mockRestore();
+    }
+  });
 });
 
 // An interrupt can hit close() mid-teardown and leak the workdir lock (see

src/tui/runner/exit.ts

@@ -499,6 +499,13 @@ export async function createRunLifecycle(
     // mid-run by interrupt or rotation) can never emit its end.
     openMessageRuns.clear();
     resumingOutsideRun = false;
+    // Those rebuilds already construct the agent a deferred reload was
+    // waiting on. Clear before the await so a connect that lands during
+    // buildAgent can still mark tools this build did not see. Initial and
+    // reload builds leave the flag to reloadIfIdle.
+    if (reason === "interrupt" || reason === "session-rotation") {
+      state.pendingReload = false;
+    }
     state.currentAgent = await services.buildAgent();
   };
   const agentBusy = (): boolean =>