u1s1-cli 1.2.7 → 1.2.9

package/dist/api.js

@@ -3,6 +3,11 @@ import { authorizedFetch } from "./device-auth.js";
 /** 401:凭证失效(设备被移除/换过钥匙),调用方应引导重新登录而不是继续硬跑。 */
 export class AuthError extends Error {
 }
+/** 网关错误壳统一是 { error: { message } };解析不出来时回退到状态码提示。 */
+async function errorMessageFromResponse(resp, fallback) {
+    const body = (await resp.json().catch(() => null));
+    return body?.error?.message ?? fallback;
+}
 export async function fetchModels(cfg) {
     let resp;
     try {
@@ -17,7 +22,7 @@ export async function fetchModels(cfg) {
     if (resp.status === 401)
         throw new AuthError("登录已失效,请重新运行 u1s1 login");
     if (!resp.ok)
-        throw new Error(`服务端返回 ${resp.status},稍后再试`);
+        throw new Error(await errorMessageFromResponse(resp, `服务端返回 ${resp.status},稍后再试`));
     const body = (await resp.json());
     return { models: body.data, features: body.features ?? {}, announcement: body.announcement };
 }
@@ -37,7 +42,7 @@ export async function fetchUserEndpoints(cfg) {
         throw new Error(`连不上 ${cfg.baseUrl}`);
     }
     if (!resp.ok)
-        throw new Error(`服务端返回 ${resp.status}`);
+        throw new Error(await errorMessageFromResponse(resp, `服务端返回 ${resp.status}`));
     const body = (await resp.json());
     return Array.isArray(body.endpoints) ? body.endpoints : [];
 }
@@ -76,10 +81,8 @@ export async function searchWeb(cfg, input) {
     }
     if (resp.status === 401)
         throw new Error("登录已失效,请重新运行 u1s1 login");
-    if (!resp.ok) {
-        const body = (await resp.json().catch(() => null));
-        throw new Error(body?.error?.message ?? `搜索服务返回 ${resp.status},稍后再试`);
-    }
+    if (!resp.ok)
+        throw new Error(await errorMessageFromResponse(resp, `搜索服务返回 ${resp.status},稍后再试`));
     return (await resp.json());
 }
 /** web_fetch 直连失败时的回退:网关用 Cloudflare Browser Rendering 渲染后转 markdown。 */
@@ -103,10 +106,8 @@ export async function renderPage(cfg, url, signal) {
     }
     if (resp.status === 401)
         throw new Error("登录已失效,请重新运行 u1s1 login");
-    if (!resp.ok) {
-        const body = (await resp.json().catch(() => null));
-        throw new Error(body?.error?.message ?? `渲染服务返回 ${resp.status}`);
-    }
+    if (!resp.ok)
+        throw new Error(await errorMessageFromResponse(resp, `渲染服务返回 ${resp.status}`));
     return (await resp.json());
 }
 const IMAGE_URL_HEADER = "x-u1s1-image-url";
@@ -178,10 +179,8 @@ export async function generateImage(cfg, req, signal) {
     }
     if (resp.status === 401)
         throw new Error("登录已失效,请重新运行 u1s1 login");
-    if (!resp.ok) {
-        const body = (await resp.json().catch(() => null));
-        throw new Error(body?.error?.message ?? `图片生成服务返回 ${resp.status},稍后再试`);
-    }
+    if (!resp.ok)
+        throw new Error(await errorMessageFromResponse(resp, `图片生成服务返回 ${resp.status},稍后再试`));
     return readGeneratedImageResponse(resp);
 }
 export async function fetchMe(cfg) {
@@ -200,6 +199,6 @@ export async function fetchMe(cfg) {
     if (resp.status === 401)
         throw new Error("登录已失效,请重新运行 u1s1 login");
     if (!resp.ok)
-        throw new Error(`服务端返回 ${resp.status},稍后再试`);
+        throw new Error(await errorMessageFromResponse(resp, `服务端返回 ${resp.status},稍后再试`));
     return (await resp.json());
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {
@@ -42,8 +42,8 @@
   "license": "MIT",
   "homepage": "https://u1s1.io",
   "dependencies": {
-    "@earendil-works/pi-coding-agent": "0.84.3",
-    "@earendil-works/pi-tui": "0.84.3",
+    "@earendil-works/pi-coding-agent": "0.84.4",
+    "@earendil-works/pi-tui": "0.84.4",
     "typebox": "1.3.7"
   },
   "devDependencies": {

package/scripts/patch-pi.js

@@ -12,7 +12,7 @@
  * - 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";
@@ -21,21 +21,40 @@ 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 findPackageDir(packageName) {
+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(`${packageName}/package.json`));
+    addPackageDir(found, dirname(req.resolve(`${packageName}/package.json`)));
   } catch {
-    const [scope, name] = packageName.split("/");
-    let dir = pkgRoot;
-    while (true) {
-      const candidate = join(dir, "node_modules", scope, name);
-      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];
+}
+
+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];
 }
 
 // Each tuple is [original, replacement], matching the pnpm coding-agent patch.
@@ -58,88 +77,90 @@ const COMPACT_UI_REPLACEMENTS = [
 ];
 
 function patchCompactUi() {
-  const piDir = findPackageDir("@earendil-works/pi-coding-agent");
-  const target = piDir
-    ? join(piDir, "dist", "modes", "interactive", "components", "assistant-message.js")
-    : null;
-  if (!target) {
+  const piDirs = findPackageDirs("@earendil-works/pi-coding-agent");
+  if (piDirs.length === 0) {
     console.log("[u1s1] 提示: 未找到 @earendil-works/pi-coding-agent，精简 UI 空行补丁未应用（不影响使用）");
     return;
   }
-  try {
-    let text = readFileSync(target, "utf8");
-    if (text.includes("!this.hideThinkingBlock && c.thinking.trim()")) 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;
 
-    let applied = 0;
-    for (const [from, to] of COMPACT_UI_REPLACEMENTS) {
-      if (text.includes(to)) {
+      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++;
-        continue;
       }
-      if (!text.includes(from)) continue;
-      text = text.split(from).join(to);
-      applied++;
-    }
 
-    if (applied < COMPACT_UI_REPLACEMENTS.length) {
-      console.log(
-        `[u1s1] 提示: pi 版本可能已更新，精简 UI 空行补丁只应用了 ${applied}/${COMPACT_UI_REPLACEMENTS.length} 处（不影响使用）`,
-      );
+      if (applied < COMPACT_UI_REPLACEMENTS.length) {
+        console.log(
+          `[u1s1] 提示: pi 版本可能已更新，精简 UI 空行补丁只应用了 ${applied}/${COMPACT_UI_REPLACEMENTS.length} 处（不影响使用）`,
+        );
+      }
+      writeFileSync(target, text);
+    } catch {
+      continue;
     }
-    writeFileSync(target, text);
-  } catch {
-    return;
   }
 }
 
 function patchMainScreenAutowrap() {
-  const tuiDir = findPackageDir("@earendil-works/pi-tui");
-  const target = tuiDir ? join(tuiDir, "dist", "tui-main-screen.js") : null;
-  if (!target) {
+  const tuiDirs = findTuiDirs();
+  if (tuiDirs.length === 0) {
     console.log("[u1s1] 提示: 未找到 @earendil-works/pi-tui，Windows 重绘补丁未应用（不影响安装）");
     return;
   }
-  try {
-    let text = readFileSync(target, "utf8");
-    if (text.includes('const DISABLE_AUTOWRAP = "\\x1b[?7l";')) 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";
+      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;
-    }
+          expected: 1,
+        },
+        {
+          from: 'output.append("\\x1b[?2026h");',
+          to: 'output.append("\\x1b[?2026h" + DISABLE_AUTOWRAP);',
+          expected: 3,
+        },
+        {
+          from: 'output.append("\\x1b[?2026l");',
+          to: 'output.append(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;
+      }
 
-    if (applied !== expected) {
-      console.log(`[u1s1] 提示: pi-tui 版本可能已更新，Windows 重绘补丁只应用了 ${applied}/${expected} 处（不影响安装）`);
-      return;
+      if (applied !== expected) {
+        console.log(`[u1s1] 提示: pi-tui 版本可能已更新，Windows 重绘补丁只应用了 ${applied}/${expected} 处（不影响安装）`);
+        continue;
+      }
+      writeFileSync(target, text);
+    } catch {
+      continue;
     }
-    writeFileSync(target, text);
-  } catch {
-    return;
   }
 }