fix(tui): keep parent stdin paused after exit (#93159)

fuller-stack-dev · web-flow · commit 773ffd87a1e1 · 2026-06-15T17:37:43.000+08:00
Keep the setup TUI parent stdin paused after its inherited-stdio child exits so Docker and PTY setup parents terminate cleanly. Align pre/post setup terminal cleanup with the cleanup-then-exit contract and add lifecycle regression coverage. Thanks @fuller-stack-dev.
diff --git a/src/tui/tui-launch.test.ts b/src/tui/tui-launch.test.ts
@@ -1,10 +1,12 @@
 // Covers TUI launch argument and environment construction.
 import type { ChildProcess, SpawnOptions } from "node:child_process";
 import { EventEmitter } from "node:events";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, type MockInstance, vi } from "vitest";
 
 const spawnMock = vi.hoisted(() => vi.fn());
 const detachMock = vi.hoisted(() => vi.fn());
+let pauseSpy: MockInstance;
+let resumeSpy: MockInstance;
 
 vi.mock("node:child_process", () => ({
   spawn: spawnMock,
@@ -42,8 +44,8 @@ describe("launchTuiCli", () => {
     process.execArgv.length = 0;
     spawnMock.mockReset();
     detachMock.mockReset();
-    vi.spyOn(process.stdin, "pause").mockImplementation(() => process.stdin);
-    vi.spyOn(process.stdin, "resume").mockImplementation(() => process.stdin);
+    pauseSpy = vi.spyOn(process.stdin, "pause").mockImplementation(() => process.stdin);
+    resumeSpy = vi.spyOn(process.stdin, "resume").mockImplementation(() => process.stdin);
     vi.spyOn(process.stdin, "isPaused").mockReturnValue(false);
   });
 
@@ -135,6 +137,19 @@ describe("launchTuiCli", () => {
     expect(options.stdio).toBe("inherit");
   });
 
+  it("keeps parent stdin paused after the relaunched TUI exits", async () => {
+    const child = createChildProcess();
+    spawnMock.mockImplementation((_cmd: string, _args: string[], _opts: SpawnOptions) => {
+      queueMicrotask(() => child.emit("exit", 0, null));
+      return child;
+    });
+
+    await launchTuiCli({ deliver: false });
+
+    expect(pauseSpy).toHaveBeenCalledOnce();
+    expect(resumeSpy).not.toHaveBeenCalled();
+  });
+
   it("launches compiled CLI shapes without repeating the current command", async () => {
     process.argv[1] = "setup";
     const child = createChildProcess();
diff --git a/src/tui/tui-launch.ts b/src/tui/tui-launch.ts
@@ -96,10 +96,8 @@ export async function launchTuiCli(
             : {}),
         }
       : process.env;
-  const stdinWasPaused =
-    typeof process.stdin.isPaused === "function" ? process.stdin.isPaused() : false;
-
-  // Pause parent stdin while the child owns the terminal, then restore the previous state.
+  // Pause parent stdin while the inherited-stdio child owns the terminal.
+  // Keep it paused afterward so setup/container parents with stdin_open can exit.
   process.stdin.pause();
 
   await new Promise<void>((resolve, reject) => {
@@ -126,9 +124,5 @@ export async function launchTuiCli(
       }
       resolve();
     });
-  }).finally(() => {
-    if (!stdinWasPaused) {
-      process.stdin.resume();
-    }
   });
 }
diff --git a/src/wizard/setup.finalize.test.ts b/src/wizard/setup.finalize.test.ts
@@ -541,10 +541,10 @@ describe("finalizeSetupWizard", () => {
     ).rejects.toThrow("TUI exited with code 1");
 
     expect(restoreTerminalState).toHaveBeenCalledWith("pre-setup tui", {
-      resumeStdinIfPaused: true,
+      resumeStdinIfPaused: false,
     });
     expect(restoreTerminalState).toHaveBeenCalledWith("post-setup tui", {
-      resumeStdinIfPaused: true,
+      resumeStdinIfPaused: false,
     });
   });
 
diff --git a/src/wizard/setup.finalize.ts b/src/wizard/setup.finalize.ts
@@ -529,7 +529,7 @@ export async function finalizeSetupWizard(
     });
 
     if (hatchChoice === "tui") {
-      restoreTerminalState("pre-setup tui", { resumeStdinIfPaused: true });
+      restoreTerminalState("pre-setup tui", { resumeStdinIfPaused: false });
       try {
         await launchTuiCli({
           local: true,
@@ -538,7 +538,7 @@ export async function finalizeSetupWizard(
           timeoutMs: HATCH_TUI_TIMEOUT_MS,
         });
       } finally {
-        restoreTerminalState("post-setup tui", { resumeStdinIfPaused: true });
+        restoreTerminalState("post-setup tui", { resumeStdinIfPaused: false });
       }
       launchedTui = true;
     } else if (hatchChoice === "web") {
