u1s1-cli 1.2.6 → 1.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {

package/scripts/patch-pi.js

@@ -1,103 +1,173 @@
 /**
- * postinstall 补丁：给 @earendil-works/pi-coding-agent 打「精简 UI」补丁。
+ * Apply u1s1 runtime patches to pi during postinstall.
  *
- * 为什么存在：仓库里用 pnpm patch（patches/*.patch）对开发态生效，但终端用户
- * 是 `npm i -g u1s1-cli` 装的，npm 不认 pnpm 的补丁机制。这个脚本在用户安装后
- * 对 node_modules 里的 pi 做同样的字符串替换，保证空行修复对所有安装方式生效。
+ * The repository applies patches/*.patch through pnpm for development, while
+ * global `npm i -g u1s1-cli` installations do not understand pnpm patches.
+ * This script applies the same compact-UI and Windows TUI fixes to installed
+ * dependencies so both installation paths behave identically.
  *
- * 特性：
- * - 纯 Node 实现，不依赖 patch(1)，Windows 可跑
- * - 幂等：已打过（含 pnpm patch 打过）直接跳过
- * - 永不让安装失败：任何异常只提示，exit 0
+ * Properties:
+ * - Pure Node implementation with no patch(1) dependency, including Windows
+ * - Idempotent across pnpm-patched and previously patched installations
+ * - Never fails installation; mismatches only emit a notice and exit 0
  */
 
-import { readFileSync, writeFileSync, existsSync } from "node:fs";
+import { readFileSync, writeFileSync, existsSync, realpathSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { createRequire } from "node:module";
 
 const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), "..");
 
-// npm 会把依赖提升到上层 node_modules（全局安装尤其如此），
-// 所以用模块解析算法定位 pi，而不是拼固定相对路径
-function findPiDir() {
+// npm may hoist dependencies above the package, especially for global installs.
+// Resolve packages through Node first, then walk upward as a fallback.
+function addPackageDir(found, candidate) {
+  if (!existsSync(join(candidate, "package.json"))) return;
+  try {
+    found.add(realpathSync(candidate));
+  } catch {
+    found.add(candidate);
+  }
+}
+
+function findPackageDirs(packageName) {
+  const found = new Set();
   try {
     const req = createRequire(join(pkgRoot, "package.json"));
-    return dirname(req.resolve("@earendil-works/pi-coding-agent/package.json"));
+    addPackageDir(found, dirname(req.resolve(`${packageName}/package.json`)));
   } catch {
-    // 兜底：从包根逐级向上找
-    let dir = pkgRoot;
-    while (true) {
-      const candidate = join(dir, "node_modules", "@earendil-works", "pi-coding-agent");
-      if (existsSync(candidate)) return candidate;
-      const parent = dirname(dir);
-      if (parent === dir) return null;
-      dir = parent;
-    }
+    // The package may block package.json through exports; the upward scan below still finds it.
   }
+  const [scope, name] = packageName.split("/");
+  let dir = pkgRoot;
+  while (true) {
+    addPackageDir(found, join(dir, "node_modules", scope, name));
+    const parent = dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return [...found];
 }
 
-const piDir = findPiDir();
-const target = piDir
-  ? join(piDir, "dist", "modes", "interactive", "components", "assistant-message.js")
-  : null;
+function findTuiDirs() {
+  const found = new Set(findPackageDirs("@earendil-works/pi-tui"));
+  for (const codingAgentDir of findPackageDirs("@earendil-works/pi-coding-agent")) {
+    addPackageDir(found, join(codingAgentDir, "node_modules", "@earendil-works", "pi-tui"));
+  }
+  return [...found];
+}
 
-// 每条 [原文, 替换后]；与 patches/@earendil-works__pi-coding-agent@0.84.2.patch 等效
-const REPLACEMENTS = [
-  // 隐藏的思考块不算「可见内容」（消息开头不再加空行）
+// Each tuple is [original, replacement], matching the pnpm coding-agent patch.
+const COMPACT_UI_REPLACEMENTS = [
+  // Hidden thinking does not count as visible content.
   [
     '|| (c.type === "thinking" && c.thinking.trim())',
     '|| (c.type === "thinking" && !this.hideThinkingBlock && c.thinking.trim())',
   ],
-  // 折叠标签为空字符串时完全跳过（ANSI 包着的空串仍会画出一整行空白）
+  // Skip an empty collapsed-thinking label instead of rendering an ANSI-only row.
   [
     'this.contentContainer.addChild(new Text(theme.italic(theme.fg("thinkingText", this.hiddenThinkingLabel)), this.outputPad, 0));',
     'if (this.hiddenThinkingLabel !== "") { this.contentContainer.addChild(new Text(theme.italic(theme.fg("thinkingText", this.hiddenThinkingLabel)), this.outputPad, 0)); }',
   ],
-  // 思考块完全隐形时，不再加它后面的间隔空行
+  // Do not add spacing after a fully hidden thinking block.
   [
     "if (hasVisibleContentAfter) {",
     'if (hasVisibleContentAfter && !(this.hideThinkingBlock && this.hiddenThinkingLabel === "")) {',
   ],
 ];
 
-try {
-  if (!target) {
+function patchCompactUi() {
+  const piDirs = findPackageDirs("@earendil-works/pi-coding-agent");
+  if (piDirs.length === 0) {
     console.log("[u1s1] 提示: 未找到 @earendil-works/pi-coding-agent，精简 UI 空行补丁未应用（不影响使用）");
-    process.exit(0);
-  }
-  let text;
-  try {
-    text = readFileSync(target, "utf8");
-  } catch {
-    // 找不到 pi 就静默退出（不该发生：postinstall 在依赖装完后跑）
-    process.exit(0);
+    return;
   }
+  for (const piDir of piDirs) {
+    const target = join(piDir, "dist", "modes", "interactive", "components", "assistant-message.js");
+    try {
+      let text = readFileSync(target, "utf8");
+      if (text.includes("!this.hideThinkingBlock && c.thinking.trim()")) continue;
 
-  if (text.includes("!this.hideThinkingBlock && c.thinking.trim()")) {
-    // 已打过（pnpm patch 或上次运行），幂等跳过
-    process.exit(0);
-  }
+      let applied = 0;
+      for (const [from, to] of COMPACT_UI_REPLACEMENTS) {
+        if (text.includes(to)) {
+          applied++;
+          continue;
+        }
+        if (!text.includes(from)) continue;
+        text = text.split(from).join(to);
+        applied++;
+      }
 
-  let applied = 0;
-  for (const [from, to] of REPLACEMENTS) {
-    if (text.includes(to)) {
-      applied++;
+      if (applied < COMPACT_UI_REPLACEMENTS.length) {
+        console.log(
+          `[u1s1] 提示: pi 版本可能已更新，精简 UI 空行补丁只应用了 ${applied}/${COMPACT_UI_REPLACEMENTS.length} 处（不影响使用）`,
+        );
+      }
+      writeFileSync(target, text);
+    } catch {
       continue;
     }
-    if (!text.includes(from)) continue;
-    text = text.split(from).join(to);
-    applied++;
   }
+}
 
-  if (applied < REPLACEMENTS.length) {
-    console.log(
-      `[u1s1] 提示: pi 版本可能已更新，精简 UI 空行补丁只应用了 ${applied}/${REPLACEMENTS.length} 处（不影响使用）`,
-    );
+function patchMainScreenAutowrap() {
+  const tuiDirs = findTuiDirs();
+  if (tuiDirs.length === 0) {
+    console.log("[u1s1] 提示: 未找到 @earendil-works/pi-tui，Windows 重绘补丁未应用（不影响安装）");
+    return;
   }
+  for (const tuiDir of tuiDirs) {
+    const target = join(tuiDir, "dist", "tui-main-screen.js");
+    try {
+      let text = readFileSync(target, "utf8");
+      if (text.includes('const DISABLE_AUTOWRAP = "\\x1b[?7l";')) continue;
+
+      const rules = [
+        {
+          from: 'const KITTY_SEQUENCE_PREFIX = "\\x1b_G";',
+          to: `const KITTY_SEQUENCE_PREFIX = "\\x1b_G";
+// Windows ConPTY eagerly wraps full-width lines, which desynchronizes cursor-row tracking.
+const DISABLE_AUTOWRAP = "\\x1b[?7l";
+const ENABLE_AUTOWRAP = "\\x1b[?7h";`,
+          expected: 1,
+        },
+        {
+          from: 'let buffer = "\\x1b[?2026h";',
+          to: 'let buffer = "\\x1b[?2026h" + DISABLE_AUTOWRAP;',
+          expected: 3,
+        },
+        {
+          from: 'buffer += "\\x1b[?2026l";',
+          to: 'buffer += ENABLE_AUTOWRAP + "\\x1b[?2026l";',
+          expected: 3,
+        },
+      ];
+      let applied = 0;
+      let expected = 0;
+      for (const rule of rules) {
+        expected += rule.expected;
+        const occurrences = text.split(rule.from).length - 1;
+        if (occurrences !== rule.expected) continue;
+        text = text.split(rule.from).join(rule.to);
+        applied += occurrences;
+      }
 
-  writeFileSync(target, text);
+      if (applied !== expected) {
+        console.log(`[u1s1] 提示: pi-tui 版本可能已更新，Windows 重绘补丁只应用了 ${applied}/${expected} 处（不影响安装）`);
+        continue;
+      }
+      writeFileSync(target, text);
+    } catch {
+      continue;
+    }
+  }
+}
+
+try {
+  patchCompactUi();
+  patchMainScreenAutowrap();
 } catch (err) {
-  console.log(`[u1s1] 提示: 精简 UI 空行补丁未生效（${err?.message ?? err}），不影响使用`);
+  console.log(`[u1s1] 提示: pi 运行时补丁未生效（${err?.message ?? err}），不影响安装`);
 }
 process.exit(0);

package/scripts/render-regression.mjs

@@ -12,7 +12,7 @@
  * 运行：node scripts/render-regression.mjs（prepublishOnly 会自动跑）
  */
 
-import { Container, Spacer, Text } from "@earendil-works/pi-tui";
+import { Container, Spacer, Text, TuiMainScreen } from "@earendil-works/pi-tui";
 import { existsSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -48,6 +48,12 @@ function check(name, actual, expected) {
   console.log(`${ok ? "✓" : "✗"} ${name}: ${actual} 行（期望 ${expected}）`);
 }
 
+function checkTrue(name, actual) {
+  const ok = actual === true;
+  if (!ok) failed++;
+  console.log(`${ok ? "✓" : "✗"} ${name}`);
+}
+
 // 与 u1s1-compact-ui 扩展一致的隐藏渲染器
 function hiddenToolDef(orig) {
   return {
@@ -123,9 +129,57 @@ function mkMsg(thinking, text) {
 }
 check("完整一轮对话", chat3.render(80).length, 6);
 
+// ---- 4. Regular-screen frames guard full-width lines against ConPTY eager autowrap ----
+class RecordingTerminal {
+  columns = 40;
+  rows = 10;
+  kittyProtocolActive = false;
+  writes = [];
+  start() {}
+  stop() {}
+  async drainInput() {}
+  write(data) {
+    this.writes.push(data);
+  }
+  moveBy() {}
+  hideCursor() {}
+  showCursor() {}
+  clearLine() {}
+  clearFromCursor() {}
+  clearScreen() {}
+  setTitle() {}
+  setProgress() {}
+}
+
+const terminal = new RecordingTerminal();
+const tui = new TuiMainScreen(terminal);
+const fullWidthComponent = {
+  lines: ["─".repeat(40), "editor line", "─".repeat(40)],
+  render() {
+    return this.lines;
+  },
+  invalidate() {},
+};
+tui.addChild(fullWidthComponent);
+tui.renderNow();
+const initialFrame = terminal.writes.join("");
+checkTrue("Windows 首次绘制关闭并恢复 autowrap", initialFrame.includes("\x1b[?2026h\x1b[?7l") && initialFrame.includes("\x1b[?7h\x1b[?2026l"));
+
+terminal.writes = [];
+fullWidthComponent.lines[1] = "editor line changed";
+tui.renderNow();
+const incrementalFrame = terminal.writes.join("");
+checkTrue("Windows 增量绘制关闭并恢复 autowrap", incrementalFrame.includes("\x1b[?2026h\x1b[?7l") && incrementalFrame.includes("\x1b[?7h\x1b[?2026l"));
+
+terminal.writes = [];
+fullWidthComponent.lines = fullWidthComponent.lines.slice(0, 2);
+tui.renderNow();
+const deletionFrame = terminal.writes.join("");
+checkTrue("Windows 删除行绘制关闭并恢复 autowrap", deletionFrame.includes("\x1b[?2026h\x1b[?7l") && deletionFrame.includes("\x1b[?7h\x1b[?2026l"));
+
 if (failed > 0) {
   console.error(`\n渲染回归测试失败：${failed} 项。多半是 pi 升级后补丁没跟上，或扩展渲染被改动。`);
-  console.error("对照 patches/@earendil-works__pi-coding-agent*.patch 和 agent-setup.ts 里的 writeCompactUiExtension 检查。");
+  console.error("对照 patches/@earendil-works__pi-*.patch、patch-pi.js 和 agent-setup.ts 里的 writeCompactUiExtension 检查。");
   process.exit(1);
 }
 console.log("\n渲染回归测试全部通过 ✓");