u1s1-cli 1.5.0 → 1.6.0

package/dist/agent-setup.js

@@ -221,8 +221,10 @@ export function writeWebToolsExtension(cfg, features) {
         `      }\n` +
         `    });\n` +
         `    pi.registerTool(tools.createSubagentTool(getParentModel));\n` +
-        `    const workflow = await import(${JSON.stringify(new URL("./workflow/tool.js", import.meta.url).href)});\n` +
-        `    pi.registerTool(workflow.createRunWorkflowTool(getParentModel));\n` +
+        `    try {\n` +
+        `      const workflow = await import(${JSON.stringify(new URL("./workflow/tool.js", import.meta.url).href)});\n` +
+        `      pi.registerTool(workflow.createRunWorkflowTool(getParentModel));\n` +
+        `    } catch {}\n` +
         `  }\n`;
     // 密钥剥离守卫也从这里装:Desktop App 的 pi 跑在 pi-web-ui 子进程里,没有
     // 启动器代码,只有扩展能替它把 U1S1_API_KEY / U1S1_EP_KEY_* 挡在子进程之外
@@ -232,7 +234,17 @@ export function writeWebToolsExtension(cfg, features) {
         `  (await import(${JSON.stringify(secretEnvUrl)})).installChildEnvGuard();\n` +
         `  if (process.env.U1S1_TOOLS_VIA_EXTENSION !== "1") return;\n` +
         `  const baseUrl = process.env.U1S1_SIGNING_PROXY_URL || ${JSON.stringify(cfg.baseUrl)};\n` +
-        `  const tools = await import(${JSON.stringify(toolsUrl)});\n` +
+        // 升级半途 / 权限问题导致 CLI dist 不可读时,宁可这一会话没有联网工具,
+        // 也不能让扩展加载失败刷英文堆栈(审计 B4);只在 UI 里提示一句中文
+        `  let tools;\n` +
+        `  try {\n` +
+        `    tools = await import(${JSON.stringify(toolsUrl)});\n` +
+        `  } catch {\n` +
+        `    pi.on("session_start", (_event, ctx) => {\n` +
+        `      try { if (ctx.hasUI) ctx.ui.notify("联网工具本次未能加载(程序文件可能正在更新),重启 u1s1 即可恢复", "warning"); } catch {}\n` +
+        `    });\n` +
+        `    return;\n` +
+        `  }\n` +
         searchLine +
         `  pi.registerTool(tools.createFetchTool({ baseUrl, apiKey: process.env.U1S1_API_KEY, renderFallback: ${features.webFetchRender} }));\n` +
         imageLine +
@@ -291,7 +303,12 @@ export function writeAnnouncementsExtension() {
         `  } catch {\n` +
         `    return;\n` +
         `  }\n` +
-        `  const { Text } = await import("@earendil-works/pi-tui");\n` +
+        `  let Text;\n` +
+        `  try {\n` +
+        `    Text = (await import("@earendil-works/pi-tui")).Text;\n` +
+        `  } catch {\n` +
+        `    return;\n` +
+        `  }\n` +
         `  pi.registerEntryRenderer("u1s1-announcement", (entry, _opts, theme) => {\n` +
         `    const d = entry.data ?? {};\n` +
         `    let text = theme.fg("text", theme.bold("📢 " + String(d.text ?? "")));\n` +

package/dist/deploy.d.ts

@@ -1,4 +1,9 @@
 import { type CliConfig } from "./config.js";
+/**
+ * `u1s1 deploy remove` 的站点参数可以是 slug、完整网址或域名:
+ * `my-site` / `https://my-site.u1abc123.u1s1.app/` / `my-site.u1abc123.u1s1.app` 都指向 my-site。
+ */
+export declare function siteReferenceFromInput(input: string): string;
 interface SiteFile {
     path: string;
     abs: string;

package/dist/deploy.js

@@ -38,6 +38,30 @@ function rememberSite(dir, site) {
         // ignore
     }
 }
+/** 站点删掉后把 deploys.json 里指向它的目录记录一并清掉,下次 deploy 重新问名字。 */
+function forgetSite(site) {
+    try {
+        const all = readDeploys();
+        const remaining = Object.fromEntries(Object.entries(all).filter(([, value]) => value !== site));
+        if (Object.keys(remaining).length !== Object.keys(all).length) {
+            writeFileSync(deploysFile, JSON.stringify(remaining, null, 2) + "\n");
+        }
+    }
+    catch {
+        // ignore
+    }
+}
+/**
+ * `u1s1 deploy remove` 的站点参数可以是 slug、完整网址或域名:
+ * `my-site` / `https://my-site.u1abc123.u1s1.app/` / `my-site.u1abc123.u1s1.app` 都指向 my-site。
+ */
+export function siteReferenceFromInput(input) {
+    let value = input.trim().toLowerCase();
+    value = value.replace(/^[a-z]+:\/\//, "");
+    value = value.replace(/[/?#].*$/, "");
+    const firstLabel = value.split(".")[0] ?? "";
+    return firstLabel;
+}
 /** 找要部署的目录:显式参数 > 含 index.html 的构建产物目录 > 当前目录本身。 */
 function resolveSiteDir(explicit) {
     if (explicit) {
@@ -242,6 +266,44 @@ async function listDeployments(cfg) {
     }
     console.log("");
 }
+async function confirmRemoval(url) {
+    const answer = (await askLine(`  确定删除 ${url} 吗?网址会立即失效,站点文件会被清除,无法恢复。输入 y 确认:`)).toLowerCase();
+    return answer === "y" || answer === "yes";
+}
+async function removeDeployment(cfg, args) {
+    const yes = args.some((arg) => arg === "--yes" || arg === "-y");
+    const positional = args.filter((arg) => !arg.startsWith("-"));
+    if (positional.length !== 1) {
+        throw new Error("用法:u1s1 deploy remove <站点名或网址> [--yes]");
+    }
+    const reference = siteReferenceFromInput(positional[0]);
+    if (!reference)
+        throw new Error("站点名不能为空");
+    // 先按列表核对,拿到完整网址给确认提示;名字打错在这里就能提前发现
+    const { sites } = await api(cfg, { method: "GET", path: "/deploy/sites" });
+    const site = sites.find((s) => (s.slug || s.name) === reference || s.name === reference);
+    if (!site) {
+        throw new Error(`没有找到站点「${reference}」。运行 u1s1 deploy list 查看已有站点`);
+    }
+    if (!yes) {
+        if (!process.stdin.isTTY) {
+            throw new Error("非交互环境下删除站点需要加 --yes 明确确认");
+        }
+        if (!(await confirmRemoval(site.url))) {
+            console.log("  已取消,站点保留。");
+            return;
+        }
+    }
+    await api(cfg, {
+        method: "DELETE",
+        path: `/deploy/sites/${encodeURIComponent(site.name)}`,
+    });
+    forgetSite(site.slug || site.name);
+    console.log("");
+    console.log(`  ✓ 已删除 ${site.url}`);
+    console.log("  同一个名字可以再次 u1s1 deploy 重新发布。");
+    console.log("");
+}
 async function selectDeployment(args) {
     const parsed = parseDeployArgs(args);
     let { name, dirArg, visibility } = parsed;
@@ -336,11 +398,13 @@ export function printDeployHelp() {
     console.log("    不带参数时自动找构建产物目录(dist/build/out 等),否则用当前目录。");
     console.log("    首次发布会问项目名和公开/私密,之后记住;再跑一次即为更新。");
     console.log("");
-    console.log("  u1s1 deploy list    查看已发布的站点");
+    console.log("  u1s1 deploy list                    查看已发布的站点");
+    console.log("  u1s1 deploy remove <站点名或网址>    删除站点(会二次确认,--yes 跳过)");
     console.log("");
 }
 export async function deployCommand(cfg, args) {
-    // 参数:[dir] [--name xxx] [--public|--private];u1s1 deploy list 列出已有站点
+    // 参数:[dir] [--name xxx] [--public|--private];u1s1 deploy list 列出已有站点;
+    // u1s1 deploy remove <站点> 删除站点(rm/delete 同义)
     if (args.includes("--help") || args.includes("-h")) {
         printDeployHelp();
         return;
@@ -349,6 +413,10 @@ export async function deployCommand(cfg, args) {
         await listDeployments(cfg);
         return;
     }
+    if (args[0] === "remove" || args[0] === "rm" || args[0] === "delete") {
+        await removeDeployment(cfg, args.slice(1));
+        return;
+    }
     const selection = await selectDeployment(args);
     const { name, start } = await startDeployment(cfg, selection.name);
     validateDeploymentLimits(start, selection.files, selection.totalBytes);

package/dist/error-humanize.d.ts

@@ -1,3 +1,21 @@
+/**
+ * 模型调用失败时,网关的中文说明会被 OpenAI SDK + pi-ai 包成
+ * `429: {"message":"…","type":"…","code":"…"}` 直出到聊天区。
+ * 这里把 JSON 里的 message 提出来当正文,状态码与错误代号收进尾巴。
+ *
+ * 尾巴不是装饰,必须保留:pi 按 errorMessage 正则做三类分类——
+ * - 重试:429/5xx 数字、rate_limit、fetch failed 等(retry.js RETRYABLE)
+ * - 不重试:insufficient_quota(额度用尽时快速失败,不做无谓退避)
+ * - 上下文超长:context_length_exceeded(触发自动压缩而非重试)
+ * 改写后的文本必须与原文落进同一分类,否则会破坏重试/压缩行为。
+ *
+ * 网关会在错误 JSON 里注入 error.request_id(见 gateway request-id.ts),
+ * 拼进尾巴让用户报障时有编号可给,客服凭它直查日志和 usage 记录。
+ *
+ * 额度用尽(reason=exhausted)时网关还带 error.resets_at(免费池刷新时刻,ISO),
+ * 这里换算成「距刷新还有 N 小时 M 分」接在正文后:比「北京时间 0 点」更省用户脑子。
+ */
+export declare function quotaResetHint(resetsAt: unknown, now?: number): string;
 /** 只取错误里的 request_id(纯函数,给 request-trace 记「最近一次请求编号」用)。 */
 export declare function extractRequestId(raw: string): string | undefined;
-export declare function humanizeModelError(raw: string): string | undefined;
+export declare function humanizeModelError(raw: string, now?: number): string | undefined;

package/dist/error-humanize.js

@@ -11,7 +11,24 @@
  *
  * 网关会在错误 JSON 里注入 error.request_id(见 gateway request-id.ts),
  * 拼进尾巴让用户报障时有编号可给,客服凭它直查日志和 usage 记录。
+ *
+ * 额度用尽(reason=exhausted)时网关还带 error.resets_at(免费池刷新时刻,ISO),
+ * 这里换算成「距刷新还有 N 小时 M 分」接在正文后:比「北京时间 0 点」更省用户脑子。
  */
+export function quotaResetHint(resetsAt, now = Date.now()) {
+    if (typeof resetsAt !== "string")
+        return "";
+    const at = Date.parse(resetsAt);
+    if (!Number.isFinite(at))
+        return "";
+    const remainingMinutes = Math.ceil((at - now) / 60_000);
+    if (remainingMinutes <= 0 || remainingMinutes > 48 * 60)
+        return "";
+    const hours = Math.floor(remainingMinutes / 60);
+    const minutes = remainingMinutes % 60;
+    const span = hours > 0 ? `${hours} 小时${minutes > 0 ? ` ${minutes} 分` : ""}` : `${minutes} 分`;
+    return `距免费额度刷新还有 ${span}`;
+}
 function parseErrorPayload(raw) {
     const jsonStart = raw.indexOf("{");
     const jsonEnd = raw.lastIndexOf("}");
@@ -38,7 +55,7 @@ export function extractRequestId(raw) {
     const id = payload?.err["request_id"];
     return typeof id === "string" && id.length > 0 && id.length <= 128 ? id : undefined;
 }
-export function humanizeModelError(raw) {
+export function humanizeModelError(raw, now = Date.now()) {
     const payload = parseErrorPayload(raw);
     if (!payload)
         return undefined;
@@ -55,6 +72,8 @@ export function humanizeModelError(raw) {
         type === "insufficient_quota" || code === "quota_exceeded" ? "insufficient_quota" : code,
         requestId ? `请求编号 ${requestId}` : "",
     ].filter(Boolean);
-    const friendly = tags.length ? `${message} (${tags.join(" · ")})` : message;
+    const resetHint = err["reason"] === "exhausted" ? quotaResetHint(err["resets_at"], now) : "";
+    const body = resetHint ? `${message}〔${resetHint}〕` : message;
+    const friendly = tags.length ? `${body} (${tags.join(" · ")})` : body;
     return friendly === raw ? undefined : friendly;
 }

package/dist/index.js

@@ -349,7 +349,7 @@ async function runAgent(cfg, args) {
                         theme.fg("text", "/model 切换模型(留意免费/价格提示) · /clear 清空上下文开新会话"),
                         theme.fg("text", "/usage 查剩余额度 · /resume 恢复历史会话 · /settings 设置"),
                         theme.fg("text", "/feedback 一句话反馈问题或建议(自动附带版本与请求编号建工单)"),
-                        theme.fg("dim", "/compact 压缩上下文 · /hotkeys 全部快捷键(英文) · /exit 退出"),
+                        theme.fg("dim", "/compact 压缩上下文 · /hotkeys 全部快捷键 · /exit 退出"),
                         theme.fg("dim", "退出后在终端:u1s1 deploy 发布网页 · u1s1 update 升级"),
                         theme.fg("dim", "匿名使用统计只记会话开始/结束等节点,不含任何内容;U1S1_TELEMETRY=0 可关闭"),
                         theme.fg("dim", "新手教程 → https://u1s1.io/guides"),
@@ -527,6 +527,7 @@ async function run() {
         console.log("   u1s1 update            升级到最新版");
         console.log("   u1s1 deploy            发布网页(--public / --private)");
         console.log("   u1s1 deploy list       查看已发布的站点");
+        console.log("   u1s1 deploy remove     删除已发布的站点");
         console.log("   u1s1 feedback \"一句话\"  反馈问题或建议(自动建工单,--bug/--question…)");
         console.log("   u1s1 import            导入历史会话");
         console.log("   u1s1 bench             模型编码能力评测");

package/package.json

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

package/scripts/patch-pi.js

@@ -90,7 +90,7 @@ const SLASH_COMMANDS_REPLACEMENTS = [
   ['{ name: "name", description: "Set session display name" },', '{ name: "name", description: "给当前会话起个名字" },'],
   ['{ name: "session", description: "Show session info and stats" },', '{ name: "session", description: "查看会话信息与统计" },'],
   ['{ name: "changelog", description: "Show changelog entries" },', '{ name: "changelog", description: "查看引擎更新日志(英文)" },'],
-  ['{ name: "hotkeys", description: "Show all keyboard shortcuts" },', '{ name: "hotkeys", description: "查看全部快捷键(英文)" },'],
+  ['{ name: "hotkeys", description: "Show all keyboard shortcuts" },', '{ name: "hotkeys", description: "查看全部快捷键" },'],
   ['{ name: "fork", description: "Create a new fork from a previous user message" },', '{ name: "fork", description: "从之前某条消息分叉出一个新会话" },'],
   ['{ name: "clone", description: "Duplicate the current session at the current position" },', '{ name: "clone", description: "复制当前会话再继续" },'],
   ['{ name: "trust", description: "Save project trust decision for future sessions" },', '{ name: "trust", description: "记住对这个项目目录的信任选择" },'],
@@ -103,6 +103,114 @@ const SLASH_COMMANDS_REPLACEMENTS = [
   ['{ name: "quit", description: `Quit ${APP_NAME}` },', '{ name: "quit", description: `退出 ${APP_NAME}` },'],
 ];
 
+// 扩展报错文案汉化 + 默认不刷堆栈(dist/modes/interactive/interactive-mode.js),与 pnpm coding-agent patch 同步。
+// 小白看到一屏英文 JS 堆栈只会以为程序坏了;一句中文 + 下一步(重启 / u1s1 feedback)就够。
+const EXTENSION_ERROR_REPLACEMENTS = [
+  ['const errorMsg = `Extension "${extensionPath}" error: ${error}`;', 'const errorMsg = `扩展 ${String(extensionPath).split(/[\\\\/]/).pop()} 出错(重启 u1s1 一般可恢复;反复出现请运行 u1s1 feedback 反馈):${error}`;'],
+  ['if (stack) {', 'if (stack && process.env.U1S1_DEBUG_EXTENSIONS === "1") {'],
+];
+
+function patchExtensionError() {
+  for (const piDir of findPackageDirs("@earendil-works/pi-coding-agent")) {
+    const target = join(piDir, "dist", "modes", "interactive", "interactive-mode.js");
+    try {
+      let text = readFileSync(target, "utf8");
+      let applied = 0;
+      for (const [from, to] of EXTENSION_ERROR_REPLACEMENTS) {
+        if (text.includes(to)) {
+          applied++;
+          continue;
+        }
+        if (text.split(from).length !== 2) continue;
+        text = text.replace(from, to);
+        applied++;
+      }
+      if (applied < EXTENSION_ERROR_REPLACEMENTS.length) {
+        console.log(
+          `[u1s1] 提示: pi 版本可能已更新，扩展报错文案补丁只应用了 ${applied}/${EXTENSION_ERROR_REPLACEMENTS.length} 处（不影响使用）`,
+        );
+      }
+      writeFileSync(target, text);
+    } catch {
+      continue;
+    }
+  }
+}
+
+// /hotkeys 快捷键表汉化(dist/modes/interactive/interactive-mode.js),与 pnpm coding-agent patch 同步。
+// 表格由 pi 硬编码英文拼出来,启动横幅/help 都在引导新手输入 /hotkeys,整页英文等于没给。
+// 只译说明列,按键显示(`${cursorUp}` 等)原样保留;表头出现 4 次,用 expected 计数整体替换。
+const HOTKEYS_REPLACEMENTS = [
+  ['"Keyboard Shortcuts"', '"快捷键一览"'],
+  ["**Navigation**", "**移动**"],
+  ["**Editing**", "**编辑**"],
+  ["**Other**", "**其他**"],
+  ["**Extensions**", "**扩展**"],
+  { from: "| Key | Action |", to: "| 按键 | 操作 |", expected: 4 },
+  ["| Move cursor / browse history |", "| 移动光标 / 翻看输入历史 |"],
+  ["| Move by word |", "| 按词移动 |"],
+  ["| Start of line |", "| 跳到行首 |"],
+  ["| End of line |", "| 跳到行尾 |"],
+  ["| Jump forward to character |", "| 向后跳到指定字符 |"],
+  ["| Jump backward to character |", "| 向前跳到指定字符 |"],
+  ["| Scroll by page |", "| 整页滚动 |"],
+  ["| Send message |", "| 发送消息 |"],
+  ['| New line${process.platform === "win32" ? " (Ctrl+Enter on Windows Terminal)" : ""} |', '| 换行${process.platform === "win32" ? "(Windows Terminal 用 Ctrl+Enter)" : ""} |'],
+  ["| Delete word backwards |", "| 删除光标前一个词 |"],
+  ["| Delete word forwards |", "| 删除光标后一个词 |"],
+  ["| Delete to start of line |", "| 删到行首 |"],
+  ["| Delete to end of line |", "| 删到行尾 |"],
+  ["| Paste the most-recently-deleted text |", "| 粘贴最近删除的文本 |"],
+  ["| Cycle through the deleted text after pasting |", "| 粘贴后在更早删除的文本间循环 |"],
+  ["| Undo |", "| 撤销 |"],
+  ["| Path completion / accept autocomplete |", "| 路径补全 / 接受自动补全 |"],
+  ["| Cancel autocomplete / abort streaming |", "| 取消补全 / 中断模型回复 |"],
+  ["| Clear editor (first) / exit (second) |", "| 清空输入框(再按一次退出) |"],
+  ["| Exit (when editor is empty) |", "| 退出(输入框为空时) |"],
+  ["| Suspend to background |", "| 挂起到后台 |"],
+  ["| Cycle thinking level |", "| 切换思考深度 |"],
+  ["| Cycle models |", "| 轮换模型 |"],
+  ["| Open model selector |", "| 打开模型选择器 |"],
+  ["| Toggle tool output expansion |", "| 展开 / 收起工具输出 |"],
+  ["| Toggle thinking block visibility |", "| 显示 / 隐藏思考过程 |"],
+  ["| Edit message in external editor |", "| 用外部编辑器写消息 |"],
+  ["| Copy last assistant message |", "| 复制最近一条回复 |"],
+  ["| Queue follow-up message |", "| 把消息排到当前回复之后 |"],
+  ["| Restore queued messages |", "| 取回排队中的消息 |"],
+  ["| Paste image or text from clipboard |", "| 从剪贴板粘贴图片或文本 |"],
+  ["| Slash commands |", "| 斜杠命令(/help 看常用操作) |"],
+  ["| Run bash command |", "| 运行终端命令 |"],
+  ["| Run bash command (excluded from context) |", "| 运行终端命令(结果不进上下文) |"],
+];
+
+function patchHotkeys() {
+  for (const piDir of findPackageDirs("@earendil-works/pi-coding-agent")) {
+    const target = join(piDir, "dist", "modes", "interactive", "interactive-mode.js");
+    try {
+      let text = readFileSync(target, "utf8");
+      let applied = 0;
+      for (const rule of HOTKEYS_REPLACEMENTS) {
+        const { from, to, expected } = Array.isArray(rule) ? { from: rule[0], to: rule[1], expected: 1 } : rule;
+        if (text.includes(to)) {
+          applied++;
+          continue;
+        }
+        if (text.split(from).length !== expected + 1) continue;
+        text = text.split(from).join(to);
+        applied++;
+      }
+      if (applied < HOTKEYS_REPLACEMENTS.length) {
+        console.log(
+          `[u1s1] 提示: pi 版本可能已更新，/hotkeys 汉化补丁只应用了 ${applied}/${HOTKEYS_REPLACEMENTS.length} 处（不影响使用）`,
+        );
+      }
+      writeFileSync(target, text);
+    } catch {
+      continue;
+    }
+  }
+}
+
 function patchSlashCommands() {
   for (const piDir of findPackageDirs("@earendil-works/pi-coding-agent")) {
     const target = join(piDir, "dist", "core", "slash-commands.js");
@@ -219,6 +327,8 @@ const ENABLE_AUTOWRAP = "\\x1b[?7h";`,
 try {
   patchCompactUi();
   patchSlashCommands();
+  patchExtensionError();
+  patchHotkeys();
   patchMainScreenAutowrap();
 } catch (err) {
   console.log(`[u1s1] 提示: pi 运行时补丁未生效（${err?.message ?? err}），不影响安装`);