u1s1-cli 0.16.1 → 0.16.3

package/dist/agent-setup.js

@@ -214,7 +214,9 @@ export default async function (pi) {
       renderResult(result, { expanded }, theme, context) {
         if (context.isError) {
           const c = result.content.find((x) => x.type === "text");
-          return new Text(theme.fg("error", "✗ " + oneLine(c && c.type === "text" ? c.text : "error")), 0, 0);
+          const msg = oneLine(c && c.type === "text" ? c.text : "error");
+          // 低调处理：✗ 用警示色，内容用灰色弱化，避免满屏安静时红字过于扎眼
+          return new Text(theme.fg("warning", "✗ ") + theme.fg("muted", msg), 0, 0);
         }
         if (!expanded) return new Text("", 0, 0);
         const c = result.content.find((x) => x.type === "text");

package/dist/update.js

@@ -1,8 +1,9 @@
 import { execSync, spawnSync } from "node:child_process";
-import { mkdtempSync, writeFileSync } from "node:fs";
+import { mkdtempSync, readFileSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
 import { isPortableInstall } from "./config.js";
 const require = createRequire(import.meta.url);
 const pkg = require("../package.json");
@@ -106,13 +107,32 @@ async function portableSelfUpdate(latest) {
     writeFileSync(tmp, script, { mode: 0o755 });
     try {
         execSync(`bash ${JSON.stringify(tmp)}`, { stdio: "inherit" });
-        console.log(`\n✅ 已升级到 v${latest},重新运行 u1s1 生效。`);
     }
     catch {
         console.error("\n自动升级失败。请手动运行:");
         console.error("  curl -fsSL https://u1s1.io/releases/install.sh | bash");
         process.exit(1);
     }
+    // 脚本退出码 0 ≠ 升级成功:安装脚本认的是官网 LATEST 版本源,它若认为
+    // 「已是最新」会原样退出(0.16.x 踩过:LATEST 没随发版同步,脚本说已是
+    // 最新,这里却报✅已升级)。以安装目录里的 VERSION 文件为准二次确认。
+    let installedVer;
+    try {
+        // 包根(~/.u1s1/u1s1-cli)旁边就是 install.sh 写的 VERSION
+        installedVer = readFileSync(join(dirname(fileURLToPath(import.meta.url)), "..", "..", "VERSION"), "utf8").trim();
+    }
+    catch {
+        // 老版布局没这文件,确认不了就不下结论
+    }
+    if (installedVer === latest) {
+        console.log(`\n✅ 已升级到 v${latest},重新运行 u1s1 生效。`);
+    }
+    else {
+        console.error(`\n⚠ 安装脚本跑完了,但没装上 v${latest}(官网版本源可能滞后,当前仍是 v${installedVer ?? VERSION})。`);
+        console.error("  请稍后重试 u1s1 update,或手动运行:");
+        console.error("  curl -fsSL https://u1s1.io/releases/install.sh | bash");
+        process.exit(1);
+    }
 }
 export async function update() {
     console.log("正在检查更新…");

package/package.json

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

package/scripts/patch-pi.js

@@ -11,22 +11,36 @@
  * - 永不让安装失败：任何异常只提示，exit 0
  */
 
-import { readFileSync, writeFileSync } from "node:fs";
+import { readFileSync, writeFileSync, existsSync } 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)), "..");
-const target = join(
-  pkgRoot,
-  "node_modules",
-  "@earendil-works",
-  "pi-coding-agent",
-  "dist",
-  "modes",
-  "interactive",
-  "components",
-  "assistant-message.js",
-);
+
+// npm 会把依赖提升到上层 node_modules（全局安装尤其如此），
+// 所以用模块解析算法定位 pi，而不是拼固定相对路径
+function findPiDir() {
+  try {
+    const req = createRequire(join(pkgRoot, "package.json"));
+    return dirname(req.resolve("@earendil-works/pi-coding-agent/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;
+    }
+  }
+}
+
+const piDir = findPiDir();
+const target = piDir
+  ? join(piDir, "dist", "modes", "interactive", "components", "assistant-message.js")
+  : null;
 
 // 每条 [原文, 替换后]；与 patches/@earendil-works__pi-coding-agent@0.84.2.patch 等效
 const REPLACEMENTS = [
@@ -48,6 +62,10 @@ const REPLACEMENTS = [
 ];
 
 try {
+  if (!target) {
+    console.log("[u1s1] 提示: 未找到 @earendil-works/pi-coding-agent，精简 UI 空行补丁未应用（不影响使用）");
+    process.exit(0);
+  }
   let text;
   try {
     text = readFileSync(target, "utf8");