From 2197805b3da1b2efdce323e884594c9459eadcdb Mon Sep 17 00:00:00 2001
From: "paseo-bot[bot]" <266920839+paseo-bot[bot]@users.noreply.github.com>
Date: Thu, 29 Oct 2026 03:37:17 +0000
Subject: [PATCH] test(terminal): isolate record reader contention on exit

---
 .../src/terminal/terminal-worker-process.ts   |  1 +
 .../terminal/worker-terminal-manager.test.ts  | 28 +++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/terminal/terminal-worker-process.ts b/packages/server/src/terminal/terminal-worker-process.ts
index 8bf306d2e5..576993da30 100644
--- a/packages/server/src/terminal/terminal-worker-process.ts
+++ b/packages/server/src/terminal/terminal-worker-process.ts
@@ -223,6 +223,7 @@ function runWorker(argv: string[]): void {
       ...record,
       terminals: record.terminals.filter((entry) => sessionsById.has(entry.id)),
     };
+    console.error("CI terminal record write attempted");
     try {
       writeTerminalWorkerRecord(args.paseoHome, record);
     } catch (error) {
diff --git a/packages/server/src/terminal/worker-terminal-manager.test.ts b/packages/server/src/terminal/worker-terminal-manager.test.ts
index 4206678913..65eb079839 100644
--- a/packages/server/src/terminal/worker-terminal-manager.test.ts
+++ b/packages/server/src/terminal/worker-terminal-manager.test.ts
@@ -2,7 +2,9 @@ import { afterEach, expect, it } from "vitest";
 import { isPlatform } from "../test-utils/platform.js";
 import { EventEmitter } from "node:events";
 import {
+  closeSync,
   existsSync,
+  openSync,
   mkdirSync,
   mkdtempSync,
   readdirSync,
@@ -44,6 +46,7 @@ import {
   readTerminalWorkerRecord,
   terminalWorkerDirectory,
   terminalWorkerLogPath,
+  terminalWorkerRecordPath,
   type TerminalWorkerRecord,
 } from "./terminal-worker-record.js";
 import { TERMINAL_WORKER_PROTOCOL_OVERRIDE_ENV } from "./terminal-worker-protocol.js";
@@ -766,9 +769,9 @@ async function recordedTerminalPids(paseoHome: string): Promise<Map<string, numb
   return pids;
 }
 
-it.each(Array.from({ length: process.platform === "win32" ? 20 : 1 }, (_, index) => index))(
-  "never adopts a live worker's terminals after a kill cleanup it could not finish, even once the worker rewrites its record (diagnostic %i)",
-  async () => {
+it.each([false, true])(
+  "never adopts a live worker's terminals after a kill cleanup it could not finish, even once the worker rewrites its record (held reader: %s)",
+  async (holdReader) => {
     const paseoHome = createTemporaryHome();
     const cwd = mkdtempSync(join(tmpdir(), "worker-terminal-manager-unfinished-kill-"));
     temporaryDirs.push(cwd);
@@ -797,6 +800,7 @@ it.each(Array.from({ length: process.platform === "win32" ? 20 : 1 }, (_, index)
     const pids = await recordedTerminalPids(paseoHome);
     const endingPid = pids.get(ending.id)!;
     const remainingPid = pids.get(remaining.id)!;
+    const [record] = await workerRecords(paseoHome);
 
     // A kill cleanup whose process table read fails signals nothing and leaves the worker live.
     const inspector = createTerminalWorkerProcessInspector();
@@ -809,9 +813,16 @@ it.each(Array.from({ length: process.platform === "win32" ? 20 : 1 }, (_, index)
     await first.detach();
     expect((await readUnconfirmedTerminalCleanup(paseoHome)).length).toBeGreaterThan(0);
 
-    // One terminal ends on its own: the live worker rewrites its record from memory.
-    writeFileSync(exitRequestPath, "");
+    // Diagnostic: keep the same read handle the poller uses open across the exit write.
+    const recordFd = holdReader
+      ? openSync(terminalWorkerRecordPath(paseoHome, record!.pid), "r")
+      : null;
+    const attemptsBeforeExit =
+      readFileSync(terminalWorkerLogPath(paseoHome), "utf8").match(
+        /CI terminal record write attempted/g,
+      )?.length ?? 0;
     try {
+      writeFileSync(exitRequestPath, "");
       await waitForCondition(
         async () => !(await recordedTerminalPids(paseoHome)).has(ending.id),
         10000,
@@ -819,12 +830,19 @@ it.each(Array.from({ length: process.platform === "win32" ? 20 : 1 }, (_, index)
     } catch (error) {
       const workerLog = readFileSync(terminalWorkerLogPath(paseoHome), "utf8");
       console.error("CI terminal exit diagnostics", {
+        holdReader,
+        attemptsAfterExit:
+          (workerLog.match(/CI terminal record write attempted/g)?.length ?? 0) -
+          attemptsBeforeExit,
+        uncaughtExceptionLogged: workerLog.includes("Terminal worker uncaught exception"),
         exitObserved: existsSync(exitObservedPath),
         endingAlive: isProcessAlive(endingPid),
         remainingAlive: isProcessAlive(remainingPid),
         recordWriteErrors: workerLog.match(/CI terminal record write failed: \w+/g) ?? [],
       });
       throw error;
+    } finally {
+      if (recordFd !== null) closeSync(recordFd);
     }
     expect((await readUnconfirmedTerminalCleanup(paseoHome)).length).toBeGreaterThan(0);