u1s1-cli 1.14.6 → 1.15.1

package/scripts/patch-pi.js

@@ -13,49 +13,102 @@
  */
 
 import { readFileSync, writeFileSync, existsSync, realpathSync } from "node:fs";
-import { join, dirname, resolve, sep } from "node:path";
+import { basename, join, dirname, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
-import { createRequire } from "node:module";
 
 const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), "..");
 
-// 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;
+// Only patch the pi copies this CLI actually loads at runtime. Earlier versions also walked every
+// ancestor node_modules up to the filesystem root and patched whatever pi they found there (a
+// user's own `npm i -g` pi next to u1s1-cli, ~/node_modules, the main checkout above a worktree).
+// Node's package lookup stops at the first node_modules/<name> folder from the importer upward,
+// so that one folder is the only copy that can ever load; everything above it is someone else's.
+function realDir(dir) {
   try {
-    found.add(realpathSync(candidate));
+    return realpathSync(dir);
   } catch {
-    found.add(candidate);
+    return dir;
   }
 }
 
-// Tests set U1S1_PATCH_PI_SCAN_ROOT so fixtures under the OS temp dir never touch stray installs above them.
+// Tests and tooling (pi-upgrade.mjs) set U1S1_PATCH_PI_SCAN_ROOT: the lookup never leaves that
+// directory and anything resolved outside it is ignored, so fixtures under the OS temp dir stay
+// isolated even when no copy exists inside them.
 const scanRoot = process.env.U1S1_PATCH_PI_SCAN_ROOT ? realpathSync(resolve(process.env.U1S1_PATCH_PI_SCAN_ROOT)) : undefined;
+const insideScanRoot = (dir) => !scanRoot || dir === scanRoot || dir.startsWith(scanRoot + sep);
 
-function findPackageDirs(packageName) {
-  const found = new Set();
+function readPackageName(dir) {
   try {
-    const req = createRequire(join(pkgRoot, "package.json"));
-    addPackageDir(found, dirname(req.resolve(`${packageName}/package.json`)));
+    return JSON.parse(readFileSync(join(dir, "package.json"), "utf8")).name;
   } catch {
-    // The package may block package.json through exports; the upward scan below still finds it.
+    return undefined;
   }
+}
+
+// From a file inside a package (its resolved entry point) up to the package root.
+function packageRootOf(file, packageName) {
+  let dir = dirname(file);
+  while (true) {
+    if (readPackageName(dir) === packageName) return dir;
+    const parent = dirname(dir);
+    if (parent === dir || basename(dir) === "node_modules") return undefined;
+    dir = parent;
+  }
+}
+
+// Node's package folder lookup (node_modules of fromDir, then of each ancestor; first folder wins),
+// for when the entry point can't be resolved: fixtures without dist/index.js, a broken install.
+function nearestPackageDir(packageName, fromDir) {
   const [scope, name] = packageName.split("/");
-  let dir = pkgRoot;
+  let dir = fromDir;
   while (true) {
-    addPackageDir(found, join(dir, "node_modules", scope, name));
+    const candidate = join(dir, "node_modules", scope, name);
+    if (existsSync(join(candidate, "package.json"))) return candidate;
     const parent = dirname(dir);
-    if (parent === dir || resolve(dir) === scanRoot) break;
+    if (parent === dir || dir === scanRoot) return undefined;
     dir = parent;
   }
-  return [...found].filter((d) => !scanRoot || d === scanRoot || d.startsWith(scanRoot + sep));
 }
 
+// The CLI loads pi with ESM import from its own package, and import.meta.resolve runs that same
+// resolver. pi-coding-agent's exports hides package.json (and only has an "import" condition, so
+// require.resolve can't see it either): fall back to resolving the entry point and walking up.
+function resolveFromCli(packageName) {
+  if (typeof import.meta.resolve !== "function") return undefined;
+  for (const spec of [`${packageName}/package.json`, packageName]) {
+    try {
+      const root = packageRootOf(realDir(fileURLToPath(import.meta.resolve(spec))), packageName);
+      if (root) return root;
+    } catch {
+      // Blocked by exports or entry file missing; try the next form.
+    }
+  }
+  return undefined;
+}
+
+// The package directory Node loads for `import(packageName)` from fromDir, or undefined.
+// Deliberately not require.resolve: it also consults NODE_PATH and global folders ESM never reads.
+function resolvePackageDir(packageName, fromDir) {
+  const resolved = fromDir === pkgRoot ? resolveFromCli(packageName) : undefined;
+  const nearest = resolved ? undefined : nearestPackageDir(packageName, fromDir);
+  const dir = resolved ?? (nearest && realDir(nearest));
+  return dir && insideScanRoot(dir) ? dir : undefined;
+}
+
+function findPackageDirs(packageName) {
+  const dir = resolvePackageDir(packageName, pkgRoot);
+  return dir ? [dir] : [];
+}
+
+// pi-coding-agent loads its own pi-tui (nested node_modules, a pnpm sibling in .pnpm, or a hoisted
+// copy), which can differ from the one the CLI resolves directly; patch both.
 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"));
+    const nested = join(codingAgentDir, "node_modules", "@earendil-works", "pi-tui");
+    if (existsSync(join(nested, "package.json"))) found.add(realDir(nested));
+    const own = resolvePackageDir("@earendil-works/pi-tui", codingAgentDir);
+    if (own) found.add(own);
   }
   return [...found];
 }
@@ -67,35 +120,9 @@ function findTuiDirs() {
 // 不抽成文件内 helper:规则逐条独立应用,helper 那条没打上而用到它的打上了会直接 ReferenceError。
 // 旧版安装打的是纯中文替换,zhOnly(to) 能还原出那个旧结果,applyTextRules 会把它升级成双语版。
 
-// 内置斜杠命令描述(dist/core/slash-commands.js)。模块加载时求值:CLI 在动态 import pi 之前就设好了 U1S1_LANG。
-const SLASH_COMMANDS_REPLACEMENTS = [
-  ['{ name: "settings", description: "Open settings menu" },', '{ name: "settings", description: process.env.U1S1_LANG === "en" ? "Open settings menu" : "打开设置菜单" },'],
-  ['{ name: "model", description: "Select model (opens selector UI)", argumentHint: "<provider/model>" },', '{ name: "model", description: process.env.U1S1_LANG === "en" ? "Select model (opens selector UI)" : "切换模型(列表里有免费/价格提示)", argumentHint: "<provider/model>" },'],
-  ['{ name: "tree", description: "Navigate session tree (switch branches)" },', '{ name: "tree", description: process.env.U1S1_LANG === "en" ? "Navigate session tree (switch branches)" : "查看会话分支树,切换分支" },'],
-  ['{ name: "thinking", description: "Set thinking level", argumentHint: "<level>" },', '{ name: "thinking", description: process.env.U1S1_LANG === "en" ? "Set thinking level" : "调整思考强度(想得越深越费额度)", argumentHint: "<level>" },'],
-  ['{ name: "scoped-models", description: "Enable/disable models for Ctrl+P cycling" },', '{ name: "scoped-models", description: process.env.U1S1_LANG === "en" ? "Enable/disable models for Ctrl+P cycling" : "设置 Ctrl+P 轮换的模型范围" },'],
-  ['{ name: "export", description: "Export session (HTML default, or specify path: .html/.jsonl)" },', '{ name: "export", description: process.env.U1S1_LANG === "en" ? "Export session (HTML default, or specify path: .html/.jsonl)" : "导出会话(默认 HTML,也可指定 .html/.jsonl 路径)" },'],
-  ['{ name: "import", description: "Import and resume a session from a JSONL file" },', '{ name: "import", description: process.env.U1S1_LANG === "en" ? "Import and resume a session from a JSONL file" : "从 JSONL 文件导入并继续会话" },'],
-  ['{ name: "share", description: "Share session as a secret GitHub gist" },', '{ name: "share", description: process.env.U1S1_LANG === "en" ? "Share session as a secret GitHub gist" : "把会话分享为 GitHub 私密 gist" },'],
-  // /bug 会把诊断信息上传给 Pi 上游开发者,u1s1 用户的问题应走 /feedback 到我们这边,从候选列表里去掉
-  ['{ name: "bug", description: "Report a bug to the Pi developers", argumentHint: "<description>" },', ''],
-  ['{ name: "copy", description: "Copy last agent message to clipboard" },', '{ name: "copy", description: process.env.U1S1_LANG === "en" ? "Copy last agent message to clipboard" : "复制上一条回复到剪贴板" },'],
-  ['{ name: "name", description: "Set session display name" },', '{ name: "name", description: process.env.U1S1_LANG === "en" ? "Set session display name" : "给当前会话起个名字" },'],
-  ['{ name: "session", description: "Show session info and stats" },', '{ name: "session", description: process.env.U1S1_LANG === "en" ? "Show session info and stats" : "查看会话信息与统计" },'],
-  ['{ name: "changelog", description: "Show changelog entries" },', '{ name: "changelog", description: process.env.U1S1_LANG === "en" ? "Show changelog entries" : "查看引擎更新日志(英文)" },'],
-  ['{ name: "hotkeys", description: "Show all keyboard shortcuts" },', '{ name: "hotkeys", description: process.env.U1S1_LANG === "en" ? "Show all keyboard shortcuts" : "查看全部快捷键" },'],
-  ['{ name: "fork", description: "Create a new fork from a previous user message" },', '{ name: "fork", description: process.env.U1S1_LANG === "en" ? "Create a new fork from a previous user message" : "从之前某条消息分叉出一个新会话" },'],
-  ['{ name: "clone", description: "Duplicate the current session at the current position" },', '{ name: "clone", description: process.env.U1S1_LANG === "en" ? "Duplicate the current session at the current position" : "复制当前会话再继续" },'],
-  ['{ name: "trust", description: "Save project trust decision for future sessions" },', '{ name: "trust", description: process.env.U1S1_LANG === "en" ? "Save project trust decision for future sessions" : "记住对这个项目目录的信任选择" },'],
-  // /login /logout 管的是 pi 自己的渠道登录,u1s1 账号要退出 TUI 用 u1s1 login/logout,英文也照这个意思写
-  ['{ name: "login", description: "Configure provider authentication", argumentHint: "<provider>" },', '{ name: "login", description: process.env.U1S1_LANG === "en" ? "To switch u1s1 accounts, /exit and run u1s1 login" : "换 u1s1 账号请先 /exit,再运行 u1s1 login", argumentHint: "<provider>" },'],
-  ['{ name: "logout", description: "Remove provider authentication" },', '{ name: "logout", description: process.env.U1S1_LANG === "en" ? "To sign out, /exit and run u1s1 logout" : "退出登录请先 /exit,再运行 u1s1 logout" },'],
-  ['{ name: "new", description: "Start a new session" },', '{ name: "new", description: process.env.U1S1_LANG === "en" ? "Start a new session" : "开始新会话" },'],
-  ['{ name: "compact", description: "Manually compact the session context" },', '{ name: "compact", description: process.env.U1S1_LANG === "en" ? "Manually compact the session context" : "压缩会话上下文,腾出空间继续聊" },'],
-  ['{ name: "resume", description: "Resume a different session" },', '{ name: "resume", description: process.env.U1S1_LANG === "en" ? "Resume a different session" : "恢复或切换到其他会话" },'],
-  ['{ name: "reload", description: "Reload keybindings, extensions, skills, prompts, themes, and context files" },', '{ name: "reload", description: process.env.U1S1_LANG === "en" ? "Reload keybindings, extensions, skills, prompts, themes, and context files" : "重新加载扩展、技能、主题等资源" },'],
-  ['{ name: "quit", description: `Quit ${APP_NAME}` },', '{ name: "quit", description: process.env.U1S1_LANG === "en" ? `Quit ${APP_NAME}` : `退出 ${APP_NAME}` },'],
-];
+// 内置斜杠命令的补全描述(SLASH_COMMANDS 24 条)和工作提示(WORKING 2 条)已改由 u1s1 扩展实现,
+// 见 src/pi-ui-text.ts;手动输入 /bug 的拦截仍在下面的 BUG_REPORT。这里不再碰那两个位置:从旧版原地升级时
+// node_modules 里的 Pi 可能还留着旧补丁(双语或纯中文),扩展按命令名 + 现有描述匹配,三种状态都换成当前语言的文案。
 
 // 扩展报错一句话 + 默认不刷堆栈(dist/modes/interactive/interactive-mode.js)。
 // 小白看到一屏 JS 堆栈只会以为程序坏了;一句话 + 下一步(重启 / u1s1 feedback)就够。
@@ -151,7 +178,7 @@ const HOTKEYS_REPLACEMENTS = [
 ];
 
 // 新手最常撞见的几句:Esc 中断后的 "Operation aborted"、每条报错前缀 "Error:"、
-// 每轮都在转的 "Working..."、选择器脚注的 "navigate/select/cancel"、/model 列表只显示 id
+// 选择器脚注的 "navigate/select/cancel"、/model 列表只显示 id
 // 看不到免费/价格提示、/settings 整页英文。行为不变,只换文案;选择器改为渲染 name(带提示)。
 const ASSISTANT_TEXT_REPLACEMENTS = [
   ['theme.fg("error", "Response was truncated before completion.")', 'theme.fg("error", process.env.U1S1_LANG === "en" ? "Response was truncated before completion. Type \\"continue\\" to pick up where it left off." : "回复超出单次长度上限被截断了,输入「继续」可以接着写。")'],
@@ -159,10 +186,6 @@ const ASSISTANT_TEXT_REPLACEMENTS = [
   ['const errorMsg = message.errorMessage || "Unknown error";', 'const errorMsg = message.errorMessage || (process.env.U1S1_LANG === "en" ? "Unknown error (if it keeps happening, run u1s1 feedback)" : "未知错误(反复出现可运行 u1s1 feedback 反馈)");'],
   ['theme.fg("error", `Error: ${errorMsg}`)', 'theme.fg("error", process.env.U1S1_LANG === "en" ? `Error: ${errorMsg}` : `出错:${errorMsg}`)'],
 ];
-const WORKING_TEXT_REPLACEMENTS = [
-  ['defaultWorkingMessage = "Working";', 'defaultWorkingMessage = process.env.U1S1_LANG === "en" ? "Working" : "思考中…";'],
-  ['defaultHiddenThinkingLabel = "Thinking...";', 'defaultHiddenThinkingLabel = process.env.U1S1_LANG === "en" ? "Thinking..." : "思考中…";'],
-];
 // 脚注提示(↑↓ navigate · enter select · esc cancel …)在十几个组件里各写各的,
 // 在 keyHint/rawKeyHint 出口处统一查表翻译,新组件加进来也能覆盖到;英文直接用原文。
 const KEY_HINT_REPLACEMENTS = [
@@ -389,11 +412,9 @@ const CODEMODE_RENDER_REPLACEMENTS = [
 ];
 
 const TUI_TEXT_TARGETS = [
-  [["core", "slash-commands.js"], SLASH_COMMANDS_REPLACEMENTS, "命令描述"],
   [["modes", "interactive", "components", "assistant-message.js"], ASSISTANT_TEXT_REPLACEMENTS, "回复状态文案"],
   [["modes", "interactive", "interactive-mode.js"], EXTENSION_ERROR_REPLACEMENTS, "扩展报错"],
   [["modes", "interactive", "interactive-mode.js"], HOTKEYS_REPLACEMENTS, "/hotkeys"],
-  [["modes", "interactive", "interactive-mode.js"], WORKING_TEXT_REPLACEMENTS, "工作中提示"],
   [["modes", "interactive", "interactive-mode.js"], BUG_REPORT_REPLACEMENTS, "/bug 入口"],
   [["modes", "interactive", "interactive-mode.js"], LOGIN_PROVIDER_REPLACEMENTS, "/login 渠道"],
   [["modes", "interactive", "components", "keybinding-hints.js"], KEY_HINT_REPLACEMENTS, "按键脚注"],

package/scripts/pi-patch-report.mjs

@@ -0,0 +1,224 @@
+#!/usr/bin/env node
+/**
+ * Report how many of u1s1's Pi patches still fit a given Pi install.
+ *
+ * Checks both patch tracks against already-installed packages, fully offline:
+ *   1. patches/@earendil-works__pi-{coding-agent,tui}@*.patch (pnpm, dev installs) — per hunk
+ *   2. packages/cli/scripts/patch-pi.js (postinstall, npm -g installs) — per replacement rule
+ *
+ * Each item is classified against the target file:
+ *   applied   the patched text is already there (pnpm/postinstall already ran)
+ *   clean     the original text is there exactly as the patch expects
+ *   fuzzy     (hunks only) the removed lines are there but surrounding context changed
+ *   count     (rules only) the source text is there, but not `expected` times (patch-pi.js skips it)
+ *   missing   neither — the upstream code changed; the item has to be redone by hand
+ *
+ * Usage:
+ *   node scripts/pi-patch-report.mjs [--pi <pi-coding-agent dir>] [--tui <pi-tui dir>] [--patch <file>]... [--patch-pi <file>] [--json] [--verbose]
+ * Defaults resolve both packages from packages/cli/node_modules and use every patches/@earendil-works__pi-*.patch
+ * and the patch-pi.js next to this script. Point --pi/--tui at unpacked tarballs (npm pack) to test another version.
+ * Exit code: 0 when every item is applied/clean, 1 otherwise (usable as a CI gate before attempting an upgrade).
+ */
+
+import { existsSync, readdirSync, readFileSync, realpathSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const here = dirname(fileURLToPath(import.meta.url));
+const cliRoot = join(here, "..");
+const repoRoot = join(cliRoot, "..", "..");
+
+const args = process.argv.slice(2);
+const opt = (name) => {
+  const i = args.indexOf(name);
+  return i >= 0 ? args[i + 1] : undefined;
+};
+const optAll = (name) => args.flatMap((a, i) => (a === name ? [args[i + 1]] : []));
+const json = args.includes("--json");
+const verbose = args.includes("--verbose");
+
+const resolvePkg = (name) => {
+  const dir = join(cliRoot, "node_modules", "@earendil-works", name);
+  return existsSync(dir) ? realpathSync(dir) : undefined;
+};
+const piDir = opt("--pi") ? resolve(opt("--pi")) : resolvePkg("pi-coding-agent");
+const tuiDir = opt("--tui") ? resolve(opt("--tui")) : resolvePkg("pi-tui");
+if (!piDir || !tuiDir) {
+  console.error("pi-coding-agent / pi-tui not found; pass --pi and --tui");
+  process.exit(2);
+}
+const version = (dir) => JSON.parse(readFileSync(join(dir, "package.json"), "utf8")).version;
+
+const read = (file) => {
+  try {
+    return readFileSync(file, "utf8");
+  } catch {
+    return undefined;
+  }
+};
+const count = (text, needle) => (needle === "" ? 0 : text.split(needle).length - 1);
+
+// ---------- track 1: pnpm patches, per hunk ----------
+function parsePatch(text) {
+  const hunks = [];
+  let file;
+  let hunk;
+  for (const line of text.split("\n")) {
+    if (line.startsWith("diff --git ")) {
+      file = line.split(" ")[2].replace(/^a\//, "");
+      hunk = undefined;
+      continue;
+    }
+    if (line.startsWith("--- ") || line.startsWith("+++ ") || line.startsWith("index ")) continue;
+    const m = line.match(/^@@ -(\d+)(?:,\d+)? \+\d+(?:,\d+)? @@/);
+    if (m) {
+      hunk = { file, oldStart: Number(m[1]), lines: [] };
+      hunks.push(hunk);
+      continue;
+    }
+    if (hunk && /^[ +-]/.test(line)) hunk.lines.push(line);
+    else if (hunk && line === "") hunk.lines.push(" ");
+  }
+  for (const h of hunks) {
+    // trailing blank context produced by the final newline is noise
+    while (h.lines.length && h.lines[h.lines.length - 1] === " ") h.lines.pop();
+    h.old = h.lines.filter((l) => l[0] !== "+").map((l) => l.slice(1)).join("\n");
+    h.new = h.lines.filter((l) => l[0] !== "-").map((l) => l.slice(1)).join("\n");
+    h.removed = h.lines.filter((l) => l[0] === "-").map((l) => l.slice(1));
+    h.added = h.lines.filter((l) => l[0] === "+").map((l) => l.slice(1));
+    h.bytes = h.lines.reduce((n, l) => n + Buffer.byteLength(l) + 1, 0);
+  }
+  return hunks;
+}
+
+function classifyHunk(h, text) {
+  if (text === undefined) return "missing-file";
+  if (count(text, h.new) >= 1 && h.added.length) return "applied";
+  if (count(text, h.old) === 1) return "clean";
+  // removed lines still present as one contiguous block (context drifted)
+  if (h.removed.length && count(text, h.removed.join("\n")) === 1) return "fuzzy";
+  // pure insertion: anchor on the context line right before the first '+'
+  if (!h.removed.length) {
+    const i = h.lines.findIndex((l) => l[0] === "+");
+    const before = h.lines.slice(0, i).filter((l) => l[0] === " ").map((l) => l.slice(1));
+    const after = h.lines.slice(i).filter((l) => l[0] === " ").map((l) => l.slice(1));
+    const anchor = [before.at(-1), after[0]].filter((l) => l && l.trim()).join("\n");
+    if (anchor && count(text, anchor) === 1) return "fuzzy";
+  }
+  return "missing";
+}
+
+const patchFiles = optAll("--patch").length
+  ? optAll("--patch").map((p) => resolve(p))
+  : readdirSync(join(repoRoot, "patches"))
+      .filter((f) => f.startsWith("@earendil-works__pi-") && f.endsWith(".patch"))
+      .map((f) => join(repoRoot, "patches", f));
+
+const hunkResults = [];
+for (const patchFile of patchFiles) {
+  const base = patchFile.split("/").pop();
+  for (const h of parsePatch(readFileSync(patchFile, "utf8"))) {
+    // pnpm names patches after the package; other file names fall back to whichever package has the file
+    const target = base.includes("pi-tui") ? tuiDir : base.includes("pi-coding-agent") ? piDir : existsSync(join(piDir, h.file)) ? piDir : tuiDir;
+    hunkResults.push({
+      patch: base,
+      file: h.file,
+      line: h.oldStart,
+      bytes: h.bytes,
+      status: classifyHunk(h, read(join(target, h.file))),
+      firstChange: (h.removed[0] ?? h.added[0] ?? "").trim().slice(0, 90),
+    });
+  }
+}
+
+// ---------- track 2: patch-pi.js, per rule ----------
+const patchPiSource = readFileSync(opt("--patch-pi") ? resolve(opt("--patch-pi")) : join(here, "patch-pi.js"), "utf8");
+// patch-pi.js runs on import and calls process.exit, so lift the rule tables out of its source (same as test/patch-pi.test.ts)
+const tables = {};
+for (const m of patchPiSource.matchAll(/const ([A-Z_]+_REPLACEMENTS) = (\[[\s\S]*?\n\s*\]);/g)) {
+  tables[m[1]] = new Function(`return ${m[2]};`)();
+}
+const targetsMatch = patchPiSource.match(/const TUI_TEXT_TARGETS = (\[[\s\S]*?\n\]);/);
+const textTargets = new Function(...Object.keys(tables), `return ${targetsMatch[1]};`)(...Object.values(tables));
+const autowrapMatch = patchPiSource.match(/const rules = (\[[\s\S]*?\n\s*\]);/);
+const autowrapRules = new Function(`return ${autowrapMatch[1]};`)();
+
+const zhOnlyMatch = patchPiSource.match(/function zhOnly\(to\) \{[\s\S]*?\n\}/);
+const zhOnly = new Function(`${zhOnlyMatch[0]}\nreturn zhOnly;`)();
+
+function classifyRule(rule, text) {
+  const { from, to, expected = 1, legacy } = Array.isArray(rule) ? { from: rule[0], to: rule[1] } : rule;
+  if (text === undefined) return "missing-file";
+  if (to === "") return count(text, from) === 0 ? "applied(deleted)" : count(text, from) === expected ? "clean" : "count";
+  if (text.includes(to)) return "applied";
+  const old = legacy ?? zhOnly(to);
+  if (old !== to && count(text, old) === expected) return "applied(legacy)";
+  const n = count(text, from);
+  if (n === expected) return "clean";
+  return n > 0 ? "count" : "missing";
+}
+
+const tableName = (rules) => Object.keys(tables).find((k) => tables[k] === rules);
+const ruleResults = [];
+for (const [parts, rules, label] of textTargets) {
+  const text = read(join(piDir, "dist", ...parts));
+  rules.forEach((rule, i) => {
+    const from = Array.isArray(rule) ? rule[0] : rule.from;
+    const to = Array.isArray(rule) ? rule[1] : rule.to;
+    ruleResults.push({
+      table: tableName(rules),
+      label,
+      index: i,
+      file: `dist/${parts.join("/")}`,
+      bytes: Buffer.byteLength(from) + Buffer.byteLength(to),
+      status: classifyRule(rule, text),
+      from: from.trim().slice(0, 90),
+    });
+  });
+}
+{
+  const text = read(join(tuiDir, "dist", "tui-main-screen.js"));
+  // patch-pi.js short-circuits the whole autowrap group when DISABLE_AUTOWRAP is already declared
+  const done = text?.includes('const DISABLE_AUTOWRAP = "\\x1b[?7l";');
+  autowrapRules.forEach((rule, i) => {
+    ruleResults.push({
+      table: "AUTOWRAP(rules)",
+      label: "Windows 重绘",
+      index: i,
+      file: "pi-tui/dist/tui-main-screen.js",
+      bytes: Buffer.byteLength(rule.from) + Buffer.byteLength(rule.to),
+      status: done ? "applied" : classifyRule(rule, text),
+      from: rule.from.trim().slice(0, 90),
+    });
+  });
+}
+
+// ---------- output ----------
+const ok = (s) => s === "clean" || s.startsWith("applied");
+const tally = (items) => {
+  const t = {};
+  for (const { status } of items) t[status] = (t[status] ?? 0) + 1;
+  return t;
+};
+const summary = {
+  piCodingAgent: { dir: piDir, version: version(piDir) },
+  piTui: { dir: tuiDir, version: version(tuiDir) },
+  hunks: { total: hunkResults.length, ok: hunkResults.filter((r) => ok(r.status)).length, byStatus: tally(hunkResults) },
+  rules: { total: ruleResults.length, ok: ruleResults.filter((r) => ok(r.status)).length, byStatus: tally(ruleResults) },
+};
+
+if (json) {
+  console.log(JSON.stringify({ summary, hunks: hunkResults, rules: ruleResults }, null, 2));
+} else {
+  console.log(`pi-coding-agent ${summary.piCodingAgent.version}  (${piDir})`);
+  console.log(`pi-tui          ${summary.piTui.version}  (${tuiDir})`);
+  console.log(`\npnpm hunks: ${summary.hunks.ok}/${summary.hunks.total} ok  ${JSON.stringify(summary.hunks.byStatus)}`);
+  for (const r of hunkResults) {
+    if (verbose || !ok(r.status)) console.log(`  ${r.status.padEnd(12)} ${r.file}:${r.line}  ${r.firstChange}`);
+  }
+  console.log(`\npatch-pi.js rules: ${summary.rules.ok}/${summary.rules.total} ok  ${JSON.stringify(summary.rules.byStatus)}`);
+  for (const r of ruleResults) {
+    if (verbose || !ok(r.status)) console.log(`  ${r.status.padEnd(12)} ${r.table}[${r.index}] ${r.file}  ${r.from}`);
+  }
+}
+process.exit(summary.hunks.ok === summary.hunks.total && summary.rules.ok === summary.rules.total ? 0 : 1);