bun-workspaces 1.8.1 → 1.9.0

package/src/affected/index.mjs

@@ -0,0 +1,7 @@
+export * from "./fileAffectedWorkspaces.mjs";
+export * from "./gitAffectedFiles.mjs";
+export * from "./gitAffectedWorkspaces.mjs";
+export * from "./affectedBaseRef.mjs";
+export * from "./externalDependencyChanges.mjs";
+
+export {};

package/src/ai/mcp/serverState.mjs

@@ -1,4 +1,4 @@
-import { createFileSystemProject } from "../../project/implementations/fileSystemProject.mjs";
+import { createFileSystemProject } from "../../project/implementations/fileSystemProject/index.mjs";
 
 const SERVER_STATE = {
   workingDirectory: null,

package/src/cli/commands/commandHandlerUtils.mjs

@@ -3,12 +3,17 @@ import { BunWorkspacesError } from "../../internal/core/error/index.mjs";
 import { createLogger, logger } from "../../internal/logger/index.mjs";
 import { getCliCommandConfig } from "../../2392.mjs";
 
-/** Splits workspace patterns by whitespace, but allows escaping spaces via backslash */ const splitWorkspacePatterns =
-  (workspacePatterns) =>
-    workspacePatterns
-      .split(/(?<!\\)\s+/)
-      .filter(Boolean)
-      .map((pattern) => pattern.replace(/\\\s/g, " "));
+/**
+ * Splits a multi-value CLI arg on whitespace (any of space/tab/newline). A
+ * literal space inside a value can be preserved by escaping it with a
+ * backslash (e.g. `path/with\ space`). Used for `--files` and
+ * `--workspace-patterns`, both of which accept output of `$(bw ...)`
+ * substitutions, which are typically newline-separated.
+ */ const splitWhitespaceArg = (raw) =>
+  raw
+    .split(/(?<!\\)\s+/)
+    .filter(Boolean)
+    .map((value) => value.replace(/\\\s/g, " "));
 const createWorkspaceInfoLines = (workspace) => [
   `Workspace: ${workspace.name}${workspace.isRoot ? " (root)" : ""}`,
   ` - Aliases: ${workspace.aliases.join(", ")}`,
@@ -85,5 +90,5 @@ export {
   createWorkspaceInfoLines,
   handleGlobalCommand,
   handleProjectCommand,
-  splitWorkspacePatterns,
+  splitWhitespaceArg,
 };

package/src/cli/commands/commands.mjs

@@ -7,8 +7,9 @@ import {
   tagInfo,
   workspaceInfo,
 } from "./handleSimpleCommands.mjs";
+import { listAffected } from "./listAffected.mjs";
 import { mcpServer } from "./mcp.mjs";
-import { runScript } from "./runScript/index.mjs";
+import { runAffected, runScript } from "./runScript/index.mjs";
 
 const defineGlobalCommands = (context) => {
   doctor(context);
@@ -22,6 +23,8 @@ const defineProjectCommands = (context) => {
   tagInfo(context);
   mcpServer(context);
   runScript(context);
+  listAffected(context);
+  runAffected(context);
 };
 
 export { defineGlobalCommands, defineProjectCommands };

package/src/cli/commands/handleSimpleCommands.mjs

@@ -7,7 +7,7 @@ import {
   createWorkspaceInfoLines,
   handleGlobalCommand,
   handleProjectCommand,
-  splitWorkspacePatterns,
+  splitWhitespaceArg,
 } from "./commandHandlerUtils.mjs";
 import { isJSONObject } from "../../8257.mjs";
 
@@ -51,7 +51,7 @@ const listWorkspaces = handleProjectCommand(
     }
     const patterns = positionalWorkspacePatterns?.length
       ? positionalWorkspacePatterns
-      : splitWorkspacePatterns(options.workspacePatterns ?? "");
+      : splitWhitespaceArg(options.workspacePatterns ?? "");
     const workspaces = patterns?.length
       ? project.findWorkspacesByPattern(...patterns)
       : project.workspaces;

package/src/cli/commands/listAffected.mjs

@@ -0,0 +1,184 @@
+import path from "path";
+import { logger } from "../../internal/logger/index.mjs";
+import {
+  commandOutputLogger,
+  createJsonLines,
+  handleProjectCommand,
+  splitWhitespaceArg,
+} from "./commandHandlerUtils.mjs";
+
+const SHORT_SHA_LENGTH = 7;
+const shortSha = (sha) => sha.slice(0, SHORT_SHA_LENGTH);
+const formatGitHeader = (metadata) => {
+  if (metadata.diffSource !== "git" || !metadata.git) return null;
+  const { baseRef, headRef, baseSha, headSha } = metadata.git;
+  return [
+    `Git base ref: \x1b[1m${baseRef}\x1b[0m (${shortSha(baseSha)})`,
+    `Git head ref: \x1b[1m${headRef}\x1b[0m (${shortSha(headSha)})`,
+  ].join("\n");
+};
+const formatDependencyChain = (dependency) => {
+  const segments = dependency.chain.map((entry, index) => {
+    if (index === 0 || !entry.edgeSource) return entry.workspaceName;
+    return `\x1b[90m--[${entry.edgeSource}]->\x1b[0m ${entry.workspaceName}`;
+  });
+  return segments.join(" ");
+};
+const formatSourceMarker = (change) =>
+  change.source === "devDependencies" ? " (dev)" : "";
+const formatExternalDepEntryShort = (change) =>
+  `${change.name}${formatSourceMarker(change)}`;
+const formatExternalDepEntryDetailed = (change) => {
+  const versions =
+    change.baseVersion === null && change.headVersion === null
+      ? "lockfile changed; precise diff unavailable"
+      : `${change.baseVersion ?? "(absent)"} -> ${change.headVersion ?? "(absent)"}`;
+  return `${change.name}${formatSourceMarker(change)} \x1b[90m[${versions}]\x1b[0m`;
+};
+const createWorkspaceSummaryLines = (result) => {
+  const { workspace, affectedReasons } = result;
+  const lines = [
+    `\x1b[1mWorkspace: ${workspace.name}\x1b[0m`,
+    `Path: ${workspace.path}`,
+  ];
+  lines.push(
+    `\x1b[96mChanged input files:\x1b[0m ${affectedReasons.changedFiles.length}`,
+  );
+  if (affectedReasons.dependencies.length) {
+    lines.push(
+      `\x1b[96mAffected dependencies:\x1b[0m ${affectedReasons.dependencies.map(({ dependencyName }) => dependencyName).join(", ")}`,
+    );
+  } else {
+    lines.push(`\x1b[96mAffected dependencies:\x1b[0m (none)`);
+  }
+  if (affectedReasons.externalDependencies.length) {
+    lines.push(
+      `\x1b[96mChanged external dependencies:\x1b[0m ${affectedReasons.externalDependencies.map(formatExternalDepEntryShort).join(", ")}`,
+    );
+  } else {
+    lines.push(`\x1b[96mChanged external dependencies:\x1b[0m (none)`);
+  }
+  return lines;
+};
+const createWorkspaceDetailedLines = (result) => {
+  const { workspace, affectedReasons } = result;
+  const lines = [
+    `\x1b[1mWorkspace: ${workspace.name}\x1b[0m`,
+    `Path: ${workspace.path}`,
+  ];
+  if (affectedReasons.changedFiles.length) {
+    lines.push("\x1b[96mChanged input files:\x1b[0m");
+    for (const file of affectedReasons.changedFiles) {
+      const reasons = file.gitReasons
+        ?.filter((reason) => reason !== "diff")
+        .join(", ");
+      lines.push(
+        ` - ${path.relative(workspace.path, file.projectFilePath)} \x1b[90m(input: ${JSON.stringify(file.inputMatch)})${reasons ? ` [${reasons}]` : ""}\x1b[0m`,
+      );
+    }
+  } else {
+    lines.push("\x1b[96mChanged input files:\x1b[0m (none)");
+  }
+  if (affectedReasons.dependencies.length) {
+    lines.push("\x1b[96mAffected dependencies:\x1b[0m");
+    for (const dependency of affectedReasons.dependencies) {
+      lines.push(` - ${dependency.dependencyName}`);
+      lines.push(`   chain: ${formatDependencyChain(dependency)}`);
+    }
+  } else {
+    lines.push("\x1b[96mAffected dependencies:\x1b[0m (none)");
+  }
+  if (affectedReasons.externalDependencies.length) {
+    lines.push("\x1b[96mChanged external dependencies:\x1b[0m");
+    for (const change of affectedReasons.externalDependencies) {
+      lines.push(` - ${formatExternalDepEntryDetailed(change)}`);
+    }
+  } else {
+    lines.push("\x1b[96mChanged external dependencies:\x1b[0m (none)");
+  }
+  return lines;
+};
+const listAffected = handleProjectCommand(
+  "listAffected",
+  async ({ project }, options) => {
+    logger.debug(`Options: ${JSON.stringify(options)}`);
+    if (options.files !== undefined && (options.base || options.head)) {
+      logger.error(
+        "CLI syntax error: --files cannot be used with --base or --head",
+      );
+      process.exit(1);
+      return;
+    }
+    if (options.detailed && !options.explain) {
+      logger.error("CLI syntax error: --detailed requires --explain");
+      process.exit(1);
+      return;
+    }
+    const determineOptions =
+      options.files !== undefined
+        ? {
+            diffSource: "fileList",
+            changedFiles: splitWhitespaceArg(options.files),
+            script: options.script,
+            ignoreWorkspaceDependencies:
+              options.ignoreWorkspaceDeps || undefined,
+            ignoreExternalDependencies: options.ignoreExternalDeps || undefined,
+          }
+        : {
+            diffSource: "git",
+            script: options.script,
+            ignoreWorkspaceDependencies:
+              options.ignoreWorkspaceDeps || undefined,
+            ignoreExternalDependencies: options.ignoreExternalDeps || undefined,
+            diffOptions: {
+              baseRef: options.base,
+              headRef: options.head,
+              ignoreUntracked: options.ignoreUntracked || undefined,
+              ignoreUnstaged: options.ignoreUnstaged || undefined,
+              ignoreStaged: options.ignoreStaged || undefined,
+              ignoreUncommitted: options.ignoreUncommitted || undefined,
+            },
+          };
+    const result = await project.determineAffectedWorkspaces(determineOptions);
+    const affectedResults = result.workspaceResults.filter(
+      ({ isAffected }) => isAffected,
+    );
+    if (options.json) {
+      const payload = options.explain
+        ? result
+        : affectedResults.map(({ workspace }) => workspace.name);
+      commandOutputLogger.info(createJsonLines(payload, options).join("\n"));
+      return;
+    }
+    if (!options.explain) {
+      if (affectedResults.length) {
+        commandOutputLogger.info(
+          affectedResults.map(({ workspace }) => workspace.name).join("\n"),
+        );
+      } else {
+        logger.info("No affected workspaces");
+      }
+      return;
+    }
+    const lines = [""];
+    const gitHeader = formatGitHeader(result.metadata);
+    if (gitHeader) lines.push(gitHeader, "");
+    if (!affectedResults.length) {
+      lines.push("No affected workspaces");
+    } else {
+      const renderWorkspace = options.detailed
+        ? createWorkspaceDetailedLines
+        : createWorkspaceSummaryLines;
+      for (const workspaceResult of affectedResults) {
+        lines.push(...renderWorkspace(workspaceResult), "");
+      }
+      if (!options.detailed) {
+        // gray
+        lines.push("\x1b[90mPass --detailed for more info\x1b[0m");
+      }
+    }
+    commandOutputLogger.info(lines.join("\n"));
+  },
+);
+
+export { listAffected };

package/src/cli/commands/runScript/handleRunAffected.mjs

@@ -0,0 +1,99 @@
+import { logger } from "../../../internal/logger/index.mjs";
+import {
+  handleProjectCommand,
+  splitWhitespaceArg,
+} from "../commandHandlerUtils.mjs";
+import { handleScriptRunFlow } from "./scriptRunFlow.mjs";
+
+const runAffected = handleProjectCommand(
+  "runAffected",
+  async (
+    {
+      project,
+      postTerminatorArgs,
+      outputWriters,
+      terminalWidth,
+      terminalHeight,
+    },
+    positionalScript,
+    options,
+  ) => {
+    options.inlineName = options.inlineName?.trim();
+    options.args = options.args?.trim();
+    options.jsonOutfile = options.jsonOutfile?.trim();
+    options.parallel =
+      typeof options.parallel === "string"
+        ? options.parallel.trim()
+        : options.parallel;
+    if (positionalScript && options.script) {
+      logger.error(
+        "CLI syntax error: Cannot use both inline script positional and --script|-S option",
+      );
+      process.exit(1);
+      return;
+    }
+    const script = options.script || positionalScript;
+    if (postTerminatorArgs.length && options.args) {
+      logger.error(
+        "CLI syntax error: Cannot use both --args and inline script args after --",
+      );
+      process.exit(1);
+      return;
+    }
+    const scriptArgs = postTerminatorArgs.length
+      ? postTerminatorArgs
+      : options.args;
+    if (options.files !== undefined && (options.base || options.head)) {
+      logger.error(
+        "CLI syntax error: --files cannot be used with --base or --head",
+      );
+      process.exit(1);
+      return;
+    }
+    const affectedOptions =
+      options.files !== undefined
+        ? {
+            diffSource: "fileList",
+            changedFiles: splitWhitespaceArg(options.files),
+            ignoreWorkspaceDependencies:
+              options.ignoreWorkspaceDeps || undefined,
+            ignoreExternalDependencies: options.ignoreExternalDeps || undefined,
+          }
+        : {
+            diffSource: "git",
+            ignoreWorkspaceDependencies:
+              options.ignoreWorkspaceDeps || undefined,
+            ignoreExternalDependencies: options.ignoreExternalDeps || undefined,
+            diffOptions: {
+              baseRef: options.base,
+              headRef: options.head,
+              ignoreUntracked: options.ignoreUntracked || undefined,
+              ignoreUnstaged: options.ignoreUnstaged || undefined,
+              ignoreStaged: options.ignoreStaged || undefined,
+              ignoreUncommitted: options.ignoreUncommitted || undefined,
+            },
+          };
+    logger.debug(
+      `Command: Run ${options.inline ? "inline " : ""}script ${JSON.stringify(script)} across affected workspaces (${affectedOptions.diffSource})`,
+    );
+    logger.debug(`Options: ${JSON.stringify(options)}`);
+    await handleScriptRunFlow({
+      project,
+      context: {
+        outputWriters,
+        terminalWidth,
+        terminalHeight,
+      },
+      script,
+      scriptArgs,
+      cliOptions: options,
+      runner: (scriptOptions) =>
+        project.runAffectedWorkspaceScript({
+          affectedOptions,
+          scriptOptions,
+        }),
+    });
+  },
+);
+
+export { runAffected };

package/src/cli/commands/runScript/handleRunScript.mjs

@@ -1,21 +1,9 @@
-import fs from "fs";
-import path from "path";
-import { expandHomePath } from "../../../internal/core/index.mjs";
 import { logger } from "../../../internal/logger/index.mjs";
 import {
   handleProjectCommand,
-  splitWorkspacePatterns,
+  splitWhitespaceArg,
 } from "../commandHandlerUtils.mjs";
-import {
-  getDefaultOutputStyle,
-  validateOutputStyle,
-} from "./output/outputStyle.mjs";
-import {
-  createScriptEvent,
-  createScriptEventTarget,
-  renderGroupedOutput,
-} from "./output/renderGroupedOutput.mjs";
-import { renderPlainOutput } from "./output/renderPlainOutput.mjs";
+import { handleScriptRunFlow } from "./scriptRunFlow.mjs";
 
 const runScript = handleProjectCommand(
   "runScript",
@@ -62,200 +50,29 @@ const runScript = handleProjectCommand(
     }
     const workspacePatterns = positionalWorkspacePatterns?.length
       ? positionalWorkspacePatterns
-      : splitWorkspacePatterns(options.workspacePatterns ?? "");
+      : splitWhitespaceArg(options.workspacePatterns ?? "");
     logger.debug(
       `Command: Run ${options.inline ? "inline " : ""}script ${JSON.stringify(script)} for ${workspacePatterns.length ? "workspaces " + workspacePatterns.join(", ") : "all workspaces"}`,
     );
     logger.debug(`Options: ${JSON.stringify(options)}`);
-    const outputStyle = options.outputStyle
-      ? validateOutputStyle(options.outputStyle)
-      : getDefaultOutputStyle();
-    logger.debug(`Effective output style: ${outputStyle}`);
-    const scriptEventTarget = createScriptEventTarget();
-    const { output, summary, workspaces } = project.runScriptAcrossWorkspaces({
-      workspacePatterns: workspacePatterns.length
-        ? workspacePatterns
-        : undefined,
-      script,
-      inline: options.inline
-        ? options.inlineName || options.shell
-          ? {
-              scriptName: options.inlineName,
-              shell: options.shell,
-            }
-          : true
-        : undefined,
-      args: scriptArgs,
-      dependencyOrder: options.depOrder,
-      ignoreDependencyFailure: options.ignoreDepFailure,
-      ignoreOutput: outputStyle === "none",
-      onScriptEvent: (event, { workspace, exitResult }) => {
-        setTimeout(() =>
-          // place at end of call stack so listeners in render func receive event
-          scriptEventTarget.dispatchEvent(
-            createScriptEvent[event]({
-              workspace,
-              exitResult,
-            }),
-          ),
-        );
+    await handleScriptRunFlow({
+      project,
+      context: {
+        outputWriters,
+        terminalWidth,
+        terminalHeight,
       },
-      parallel:
-        typeof options.parallel === "boolean" ||
-        typeof options.parallel === "undefined"
-          ? undefined
-          : options.parallel === "true"
-            ? true
-            : options.parallel === "false"
-              ? false
-              : {
-                  max: options.parallel,
-                },
-    });
-    const scriptName = options.inline
-      ? options.inlineName || "(inline)"
-      : script;
-    logger.debug(`Script name: ${scriptName}`);
-    const stripDisruptiveControls = workspaces.length > 1 || !!options.parallel;
-    logger.debug(`Strip disruptive controls: ${stripDisruptiveControls}`);
-    let groupedLines = "auto";
-    if (options.groupedLines) {
-      if (options.groupedLines === "all") {
-        groupedLines = "all";
-      } else if (options.groupedLines === "auto") {
-        groupedLines = "auto";
-      } else {
-        const parsedGroupedLines = parseInt(options.groupedLines);
-        if (parsedGroupedLines <= 0 || isNaN(parsedGroupedLines)) {
-          logger.error(
-            `Invalid max grouped lines value: ${options.groupedLines}. Must be a positive number or "all".`,
-          );
-          process.exit(1);
-          return;
-        }
-        groupedLines = parsedGroupedLines;
-      }
-    }
-    logger.debug(`Effective grouped lines: ${JSON.stringify(groupedLines)}`);
-    if (!options.prefix) {
-      logger.warn(
-        "--no-prefix is deprecated and will be removed in a future version. Use --output-style=plain instead.",
-      );
-      if (!options.outputStyle) {
-        options.outputStyle = "plain";
-      }
-    }
-    const outputStyleHandlers = {
-      grouped: () =>
-        renderGroupedOutput(
-          workspaces,
-          output,
-          summary,
-          scriptEventTarget,
-          groupedLines,
-          outputWriters,
-          terminalWidth,
-          terminalHeight,
-        ),
-      prefixed: () =>
-        renderPlainOutput(output, outputWriters, {
-          prefix: true,
-          stripDisruptiveControls,
-        }),
-      plain: () =>
-        renderPlainOutput(output, outputWriters, {
-          prefix: false,
-          stripDisruptiveControls,
+      script,
+      scriptArgs,
+      cliOptions: options,
+      runner: (scriptOptions) =>
+        project.runScriptAcrossWorkspaces({
+          ...scriptOptions,
+          workspacePatterns: workspacePatterns.length
+            ? workspacePatterns
+            : undefined,
         }),
-      none: async () => {
-        // no-op
-      },
-    };
-    await outputStyleHandlers[outputStyle]();
-    const exitResults = await summary;
-    exitResults.scriptResults.forEach(
-      ({ success, metadata: { workspace }, exitCode }) => {
-        const isSkipped = exitCode === -1;
-        if (isSkipped) {
-          logger.info(
-            `➖ ${workspace.name}: ${scriptName} (skipped due to dependency failure)`,
-          );
-        } else {
-          logger.info(
-            `${success ? "✅" : "❌"} ${workspace.name}: ${scriptName}${exitCode ? ` (exited with code ${exitCode})` : ""}`,
-          );
-        }
-      },
-    );
-    const s = exitResults.scriptResults.length === 1 ? "" : "s";
-    const skippedCount = exitResults.scriptResults.filter(
-      ({ exitCode }) => exitCode === -1,
-    ).length;
-    const skippedMessage = skippedCount ? ` (${skippedCount} skipped)` : "";
-    if (exitResults.failureCount) {
-      const message = `${exitResults.failureCount} of ${exitResults.scriptResults.length} script${s} failed${skippedMessage}`;
-      logger.info(message);
-    } else {
-      logger.info(
-        `${exitResults.scriptResults.length} script${s} ran successfully${skippedMessage}`,
-      );
-    }
-    if (options.jsonOutfile) {
-      const fullOutputPath = path.resolve(
-        project.rootDirectory,
-        expandHomePath(options.jsonOutfile),
-      );
-      // Check if can make directory
-      const jsonOutputDir = path.dirname(fullOutputPath);
-      if (!fs.existsSync(jsonOutputDir)) {
-        try {
-          logger.debug(
-            `Creating JSON output file directory "${jsonOutputDir}"`,
-          );
-          fs.mkdirSync(jsonOutputDir, {
-            recursive: true,
-          });
-        } catch (error) {
-          logger.error(
-            `Failed to create JSON output file directory "${jsonOutputDir}": ${error}`,
-          );
-          process.exit(1);
-          return;
-        }
-      } else if (fs.statSync(jsonOutputDir).isFile()) {
-        logger.error(
-          `Given JSON output file directory "${jsonOutputDir}" is an existing file`,
-        );
-        process.exit(1);
-        return;
-      }
-      // Check if can make file
-      if (
-        fs.existsSync(fullOutputPath) &&
-        fs.statSync(fullOutputPath).isDirectory()
-      ) {
-        logger.error(
-          `Given JSON output file path "${fullOutputPath}" is an existing directory`,
-        );
-        process.exit(1);
-        return;
-      }
-      try {
-        logger.debug(`Writing JSON output file "${fullOutputPath}"`);
-        fs.writeFileSync(fullOutputPath, JSON.stringify(exitResults, null, 2));
-      } catch (error) {
-        logger.error(
-          `Failed to write JSON output file "${fullOutputPath}": ${error}`,
-        );
-        process.exit(1);
-        return;
-      }
-      logger.info(`JSON output written to ${fullOutputPath}`);
-    }
-    if (exitResults.failureCount) {
-      process.exit(1);
-      return;
-    }
+    });
   },
 );
 

package/src/cli/commands/runScript/index.mjs

@@ -1,4 +1,5 @@
 export * from "./handleRunScript.mjs";
+export * from "./handleRunAffected.mjs";
 export * from "./output/renderPlainOutput.mjs";
 
 export {};

package/src/cli/commands/runScript/output/renderGroupedOutput.mjs

@@ -9,6 +9,10 @@ import {
 } from "../../../../internal/core/language/string/utf/visibleLength.mjs";
 import { logger } from "../../../../internal/logger/index.mjs";
 import { generatePlainOutputLines } from "./renderPlainOutput.mjs";
+import {
+  initializeTuiTerminalState,
+  resetTuiTerminalState,
+} from "./tuiTerminal.mjs";
 
 class ScriptEventTarget extends TypedEventTarget {}
 const createScriptEventTarget = () => new ScriptEventTarget();
@@ -86,8 +90,10 @@ const renderGroupedOutput = async (
     }
     isInitialized = true;
     logger.debug("Initializing TUI state");
-    outputWriters.stdout(cursorOps.hide());
-    process.stdin.setRawMode?.(true);
+    initializeTuiTerminalState({
+      stdout: outputWriters.stdout,
+      stdin: process.stdin,
+    });
   };
   let isReset = false;
   const resetTuiTerminal = () => {
@@ -96,9 +102,10 @@ const renderGroupedOutput = async (
     }
     isReset = true;
     logger.debug("Resetting TUI state");
-    outputWriters.stdout(cursorOps.show());
-    process.stdin.unref?.();
-    process.stdin.setRawMode?.(false);
+    resetTuiTerminalState({
+      stdout: outputWriters.stdout,
+      stdin: process.stdin,
+    });
   };
   let previousHeight = 0;
   let didFinalRender = false;
@@ -285,8 +292,16 @@ const renderGroupedOutput = async (
   process.stdin.on("data", (data) => {
     // Send to the entire process group (pid=0) so child processes also receive
     // the signal — raw mode prevents the terminal from doing this automatically.
-    if (data[0] === 0x03) process.kill(0, "SIGINT");
-    if (data[0] === 0x1c) process.kill(0, "SIGQUIT");
+    const signal =
+      data[0] === 0x03 ? "SIGINT" : data[0] === 0x1c ? "SIGQUIT" : null;
+    if (!signal) return;
+    // Restore the tty before fanning the signal: once SIGINT lands across
+    // the process group, child cleanup races with our own tcsetattr and
+    // setRawMode reliably returns EIO, leaving the user's terminal stuck
+    // in raw mode. Doing it here, synchronously, while we still own the
+    // tty cleanly, is the only place this can run before the race.
+    resetTuiTerminal();
+    process.kill(0, signal);
   });
   runOnExit((reason) => {
     try {