flower-trellis 0.5.4 → 0.5.5

package/enhancements/MANIFEST.json

@@ -1,5 +1,5 @@
 {
-  "syncedAt": "2026-07-29T14:45:40.104Z",
+  "syncedAt": "2026-07-29T23:45:58.845Z",
   "syncedFrom": "vendor/skill-garden",
   "sourceCommit": "2aca31ca35fe6adb7d1e1932a0f201018f458188",
   "common": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flower-trellis",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "一键安装/升级 Trellis 并自动融合 skill-garden 强化包(默认 Claude + agents)",
   "type": "module",
   "bin": {
@@ -68,9 +68,9 @@
     "commit-and-tag-version": "^12.7.3"
   },
   "flowerReleaseNotes": {
-    "version": "0.5.4",
+    "version": "0.5.5",
     "source": "CHANGELOG.md",
-    "body": "### ✨ 新功能 Features\n\n* **cli:** 优化 init 与 update 交互体验 ([1248456](https://github.com/SilentFlower/flower-trellis/commit/12484563bb9f5b7f6842879c38adca02c9697584))\n* **craft-rpa:** 同步网络采集与页面控制升级 ([4827e20](https://github.com/SilentFlower/flower-trellis/commit/4827e2043a2123ba331ff82c0b59ce03cbb29f6c))\n\n\n### 🐛 修复 Bug Fixes\n\n* **workflow:** 防止发布请求误触 trellis-release ([e3e4add](https://github.com/SilentFlower/flower-trellis/commit/e3e4addd953059bdaa5135ac527432f4c0f8838a))",
+    "body": "### 🐛 修复 Bug Fixes\n\n* **cli:** 修复 Windows PTY 交互状态泄漏 ([e14ffc9](https://github.com/SilentFlower/flower-trellis/commit/e14ffc922e052120a0b0993420e0b2bb5c11a8f2))\n* **cli:** 修复 Windows 完成页退出挂起 ([ae2fd30](https://github.com/SilentFlower/flower-trellis/commit/ae2fd30ed9e0f378ec34a60ad1167766979539ce))",
     "truncated": false
   },
   "optionalDependencies": {

package/src/cli.js

@@ -7,6 +7,7 @@ import { readManifest } from "./lib/manifest.js";
 import { ProjectStore } from "./plugin/state/project-store.js";
 import { runTrellis } from "./lib/trellis-runner.js";
 import { parseCliArgs } from "./lib/cli-args.js";
+import { installWindowsTerminalInputRecovery } from "./lib/terminal-state.js";
 
 /**
  * flower-trellis CLI 主入口。
@@ -105,6 +106,9 @@ init / update 启动时会顺带检测 flower-trellis 自身是否有新版(联
 }
 
 async function main() {
+  // 新进程先修复旧版或异常退出遗留的 ConPTY 输入模式，退出时再兜底恢复一次。
+  installWindowsTerminalInputRecovery();
+
   // Ctrl+C:父进程也立即退出,绝不在子进程被取消后继续叠加
   process.on("SIGINT", () => process.exit(130));
 

package/src/lib/command-completion.js

@@ -1,4 +1,5 @@
 import { select } from "@inquirer/prompts";
+import { scheduleWindowsTerminalExit } from "./terminal-state.js";
 
 const SUCCESS_LABELS = {
   init: "安装成功",
@@ -16,7 +17,7 @@ const OUTCOME_LABELS = {
  *
  * @param {"init"|"update"} command 命令名
  * @param {string} target 目标项目根目录
- * @param {{passthrough?:string[],interactive?:boolean,outcome?:"success"|"preview",selectPrompt?:Function,output?:{log:(message:string)=>void}}} [options] 交互、结果类型与测试注入
+ * @param {{passthrough?:string[],interactive?:boolean,outcome?:"success"|"preview",selectPrompt?:Function,output?:{log:(message:string)=>void},terminalExit?:object}} [options] 交互、结果类型与测试注入
  * @returns {Promise<void>} 成功状态输出及可选退出确认完成后返回
  */
 export async function showCommandCompletion(command, target, options = {}) {
@@ -35,9 +36,10 @@ export async function showCommandCompletion(command, target, options = {}) {
   if (!interactive) return;
 
   const selectPrompt = options.selectPrompt || select;
-  await selectPrompt({
+  const action = await selectPrompt({
     message: "操作已完成",
     choices: [{ name: "退出", value: "exit" }],
     loop: false,
   });
+  if (action === "exit") scheduleWindowsTerminalExit(options.terminalExit);
 }

package/src/lib/terminal-state.js

@@ -0,0 +1,78 @@
+const WIN32_INPUT_MODE_DISABLE = "\x1b[?9001l";
+const CURSOR_SHOW = "\x1b[?25h";
+
+/**
+ * 关闭 Windows Terminal 的 Win32 输入模式，恢复宿主 CLI 的普通键盘输入。
+ *
+ * ConPTY 子进程会通过 CSI ? 9001 h 请求 Windows Terminal 把按键编码成
+ * Win32 Input Mode 记录。Flower 透传子进程终端输出时必须在边界处关闭该模式，
+ * 否则后续 Inquirer 会收到形如 `CSI Vk;Sc;Uc;Kd;Cs;Rc _` 的残留输入。
+ *
+ * @param {{platform?:string,output?:{isTTY?:boolean,write:(value:string)=>unknown}}} [options] 平台与输出流测试注入
+ * @returns {boolean} 是否写出了终端恢复序列
+ */
+export function disableWindowsTerminalWin32InputMode(options = {}) {
+  const platform = options.platform ?? process.platform;
+  const output = options.output ?? process.stdout;
+  if (platform !== "win32" || !output?.isTTY || typeof output.write !== "function") {
+    return false;
+  }
+  try {
+    output.write(WIN32_INPUT_MODE_DISABLE);
+    return true;
+  } catch {
+    // 终端恢复属于退出期兜底，输出流已关闭时不能覆盖原命令结果。
+    return false;
+  }
+}
+
+/**
+ * 在 CLI 启动时恢复一次 Windows 终端输入，并在进程退出时再次兜底恢复。
+ *
+ * @param {{platform?:string,output?:{isTTY?:boolean,write:(value:string)=>unknown},processEvents?:{once:(event:string,listener:()=>void)=>unknown,off:(event:string,listener:()=>void)=>unknown}}} [options] 平台、输出流与进程事件测试注入
+ * @returns {()=>void} 移除退出期恢复监听的清理函数
+ */
+export function installWindowsTerminalInputRecovery(options = {}) {
+  const processEvents = options.processEvents ?? process;
+  const restore = () => disableWindowsTerminalWin32InputMode(options);
+  restore();
+  processEvents.once("exit", restore);
+  return () => processEvents.off("exit", restore);
+}
+
+/**
+ * 在 Windows 交互完成页选择“退出”后恢复终端，并显式结束 CLI 进程。
+ *
+ * node-pty 的 Windows ConPTY worker 在子进程自然退出后仍可能持有 MessagePort / Socket，
+ * 因此不能只依赖 Node 事件循环自然清空。这里仅在用户已经选择退出时执行，并把实际退出
+ * 延后到下一轮事件循环，让 Inquirer 完成当前输出清理。
+ *
+ * @param {{platform?:string,input?:{isTTY?:boolean,isRaw?:boolean,setRawMode?:(value:boolean)=>unknown,pause?:()=>unknown},output?:{isTTY?:boolean,write:(value:string)=>unknown},schedule?:(callback:()=>void)=>unknown,exitProcess?:(code:number)=>unknown}} [options] 终端、调度器与退出函数测试注入
+ * @returns {boolean} 是否安排了 Windows CLI 显式退出
+ */
+export function scheduleWindowsTerminalExit(options = {}) {
+  const platform = options.platform ?? process.platform;
+  if (platform !== "win32") return false;
+
+  const input = options.input ?? process.stdin;
+  const output = options.output ?? process.stdout;
+  try {
+    if (input?.isTTY && input.isRaw && typeof input.setRawMode === "function") {
+      input.setRawMode(false);
+    }
+    if (typeof input?.pause === "function") input.pause();
+  } catch {
+    // 退出前终端恢复是 best-effort，不能把成功命令改成失败。
+  }
+  try {
+    if (output?.isTTY && typeof output.write === "function") output.write(CURSOR_SHOW);
+  } catch {
+    // 输出流关闭时继续执行 Win32 输入模式恢复与退出。
+  }
+  disableWindowsTerminalWin32InputMode({ platform, output });
+
+  const schedule = options.schedule ?? ((callback) => setTimeout(callback, 0));
+  const exitProcess = options.exitProcess ?? ((code) => process.exit(code));
+  schedule(() => exitProcess(0));
+  return true;
+}

package/src/lib/trellis-runner.js

@@ -5,6 +5,7 @@ import { spawn } from "node:child_process";
 import { createInterface } from "node:readline";
 import figlet from "figlet";
 import * as pty from "node-pty";
+import { disableWindowsTerminalWin32InputMode } from "./terminal-state.js";
 
 /**
  * 定位捆绑的 @mindfoldhq/trellis 可执行 bin 的绝对路径。
@@ -106,22 +107,27 @@ export function runTrellis(args, cwd, opts = {}) {
  *
  * @param {string[]} args
  * @param {string} cwd
- * @param {object} [opts] { stripBanner }
+ * @param {object} [opts] { stripBanner, ptySpawn, stdin, stdout, platform }
  * @returns {Promise<number>} 退出码(信号终止返回 128)
  */
 export function runTrellisPty(args, cwd, opts = {}) {
   const bin = resolveTrellisBin();
+  const stdin = opts.stdin || process.stdin;
+  const stdout = opts.stdout || process.stdout;
+  const platform = opts.platform ?? process.platform;
+  const ptySpawn = opts.ptySpawn || pty.spawn;
   return new Promise((resolve, reject) => {
     let child;
     try {
-      child = pty.spawn(process.execPath, [bin, ...args], {
+      child = ptySpawn(process.execPath, [bin, ...args], {
         name: "xterm-256color",
-        cols: process.stdout.columns || 80,
-        rows: process.stdout.rows || 30,
+        cols: stdout.columns || 80,
+        rows: stdout.rows || 30,
         cwd,
         env: { ...process.env, FORCE_COLOR: "1" },
       });
     } catch (e) {
+      disableWindowsTerminalWin32InputMode({ platform, output: stdout });
       reject(e);
       return;
     }
@@ -130,15 +136,15 @@ export function runTrellisPty(args, cwd, opts = {}) {
     let filtering = !!opts.stripBanner;
     let buf = "";
 
-    child.onData((data) => {
+    const dataSubscription = child.onData((data) => {
       if (!filtering) {
-        process.stdout.write(data);
+        stdout.write(data);
         return;
       }
       // inquirer 开始渲染(隐藏光标)→ 立即停止过滤,整体透传,保住交互菜单
       if (data.includes("\x1b[?25l")) {
         filtering = false;
-        process.stdout.write(buf + data);
+        stdout.write(buf + data);
         buf = "";
         return;
       }
@@ -149,21 +155,21 @@ export function runTrellisPty(args, cwd, opts = {}) {
         const kind = classifyHeaderLine(line, bannerSet);
         if (kind === "skip") continue;
         if (kind === "keep") {
-          process.stdout.write(line + "\r\n");
+          stdout.write(line + "\r\n");
           continue;
         }
         filtering = false; // 正文开始
-        process.stdout.write(line + "\r\n");
+        stdout.write(line + "\r\n");
       }
       if (!filtering && buf) {
-        process.stdout.write(buf);
+        stdout.write(buf);
         buf = "";
       }
     });
 
     // 把真终端的输入转发进 pty(让用户能操作 trellis 的交互菜单)
-    const stdin = process.stdin;
     const wasRaw = !!stdin.isRaw;
+    const wasFlowing = stdin.readableFlowing;
     if (stdin.isTTY) stdin.setRawMode(true);
     stdin.resume();
     const onStdin = (d) => child.write(d.toString("utf8"));
@@ -171,18 +177,22 @@ export function runTrellisPty(args, cwd, opts = {}) {
 
     const onResize = () => {
       try {
-        child.resize(process.stdout.columns || 80, process.stdout.rows || 30);
+        child.resize(stdout.columns || 80, stdout.rows || 30);
       } catch {
         // 忽略 resize 失败
       }
     };
-    process.stdout.on("resize", onResize);
+    stdout.on("resize", onResize);
 
     child.onExit(({ exitCode, signal }) => {
+      // 先停止接收子进程输出，再恢复宿主终端；否则迟到的 9001h 会重新污染父终端。
+      dataSubscription.dispose();
       stdin.off("data", onStdin);
       if (stdin.isTTY) stdin.setRawMode(wasRaw);
-      stdin.pause();
-      process.stdout.off("resize", onResize);
+      if (wasFlowing === true) stdin.resume();
+      else stdin.pause();
+      stdout.off("resize", onResize);
+      disableWindowsTerminalWin32InputMode({ platform, output: stdout });
       if (signal) resolve(128);
       else resolve(exitCode ?? 0);
     });