u1s1-cli 1.7.0 → 1.8.0

package/dist/nudges.js

@@ -37,4 +37,4 @@ export function shouldShowDeployHint(file = nudgesFile) {
     const state = readNudges(file);
     return state.deploy_hint_shown === undefined && state.deploy_done === undefined;
 }
-export const DEPLOY_HINT_TEXT = "做好了想给朋友看？运行 u1s1 deploy 一键上线";
+export const DEPLOY_HINT_TEXT = "做好了想给朋友看？输入 /exit 回到终端,运行 u1s1 deploy 一键上线";

package/dist/update.js

@@ -147,6 +147,7 @@ async function portableSelfUpdate(latest) {
         process.exit(0);
     }
     console.log(`正在下载安装脚本并升级到 v${latest}…`);
+    console.log("(可能需要几分钟,期间请不要关闭窗口)");
     let script;
     try {
         const download = await downloadInstallScript();

package/dist/usage.d.ts

@@ -1,7 +1,11 @@
 import { type MeResponse } from "./api.js";
 export declare const TOPUP_URL = "https://u1s1.io/dashboard#usage-topup-card";
-/** 报告尾巴的两条行动入口:邀请(永久加量)与充值(撞线用户的直接出口,运营清单 A2)。 */
-export declare function usageCtaLines(): string[];
+/**
+ * 报告尾巴的两条行动入口:邀请(永久加量)与充值(撞线用户的直接出口,运营清单 A2)。
+ * 支付通道关闭时充值是死路(仪表盘会报「支付通道未开放」),改说即将上线并指向
+ * 仪表盘的加量包/打卡入口;老网关没有 pay_enabled 字段,按开放处理。
+ */
+export declare function usageCtaLines(me?: Pick<MeResponse, "pay_enabled">): string[];
 /** 额度报告正文(不含首尾空行),终端 `u1s1 usage` 和会话内 /usage 共用。 */
 export declare function usageReportLines(me: MeResponse): string[];
 /** 会话内 /usage 用:拉取额度并打包成 entry data,错误转成中文提示而不是抛出。 */

package/dist/usage.js

@@ -94,7 +94,7 @@ function packageUsageLines(me, tokensPerUsd) {
     lines.push("  其他模型(如 DeepSeek V4 Pro)不走免费包，可用余额或全模型包 → https://u1s1.io/dashboard");
     lines.push("  Token 数按默认模型单价折算,为约数;用更贵的模型时消耗更快。");
     lines.push("");
-    lines.push(...usageCtaLines());
+    lines.push(...usageCtaLines(me));
     return lines;
 }
 function legacyUsageLines(me, tokensPerUsd) {
@@ -118,15 +118,22 @@ function legacyUsageLines(me, tokensPerUsd) {
         lines.push(`  本月成本   $${me.mtd_usd.toFixed(2)}`);
     }
     lines.push("");
-    lines.push(...usageCtaLines());
+    lines.push(...usageCtaLines(me));
     return lines;
 }
 export const TOPUP_URL = "https://u1s1.io/dashboard#usage-topup-card";
-/** 报告尾巴的两条行动入口:邀请(永久加量)与充值(撞线用户的直接出口,运营清单 A2)。 */
-export function usageCtaLines() {
+/**
+ * 报告尾巴的两条行动入口:邀请(永久加量)与充值(撞线用户的直接出口,运营清单 A2)。
+ * 支付通道关闭时充值是死路(仪表盘会报「支付通道未开放」),改说即将上线并指向
+ * 仪表盘的加量包/打卡入口;老网关没有 pay_enabled 字段,按开放处理。
+ */
+export function usageCtaLines(me) {
+    const payClosed = me?.pay_enabled === false;
     return [
         "  免费额度每天自动恢复；邀请朋友双方各得永久加量 → https://u1s1.io/dashboard",
-        `  额度不够用?充值 → ${TOPUP_URL}`,
+        payClosed
+            ? "  充值通道即将开放；额度不够先到仪表盘领加量包、每日打卡 → https://u1s1.io/dashboard"
+            : `  额度不够用?充值 → ${TOPUP_URL}`,
     ];
 }
 /** 额度报告正文(不含首尾空行),终端 `u1s1 usage` 和会话内 /usage 共用。 */

package/dist/web.js

@@ -1,7 +1,7 @@
 import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { cleanupBrandThemes, endpointKeyEnv, ensureAuthCredential, ensureBrandPrompt, ensureWorkflowPromptTemplate, ensureDefaultSettings, ensureProviderModels, scrubForeignProviderEnv, writeAttributionExtension, writeWebToolsExtension, } from "./agent-setup.js";
+import { cleanupBrandThemes, endpointKeyEnv, ensureAuthCredential, ensureBrandPrompt, ensureWorkflowPromptTemplate, ensureDefaultSettings, ensureProviderModels, scrubForeignProviderEnv, writeAttributionExtension, writeMcpExtension, writeWebToolsExtension, } from "./agent-setup.js";
 import { agentDir, apiModelToDef, MODELS, resolvePreferredModel, setModelsFromApi, u1s1Dir, writeAgentDefaultModel, } from "./config.js";
 import { ensureSearchTools } from "./search-tools.js";
 import { ensureUsableShell } from "./shell-doctor.js";
@@ -98,6 +98,8 @@ export async function prepareWebEnv(cfg) {
     });
     // OpenRouter 应用归因：直连流量计入 u1s1 的公开排行（与 TUI 同源）
     writeAttributionExtension();
+    // 自定义 MCP 服务的工具(与 TUI 同源)
+    writeMcpExtension();
     // Desktop App 新会话从 settings.json 的 defaultModel 取模型(TUI 是每次传 --model),
     // 确保它有值;resolvePreferredModel 优先尊重已有的 in-session 选择,不会回退覆盖。
     const pref = resolvePreferredModel(cfg);

package/package.json

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

package/scripts/patch-pi.js

@@ -271,6 +271,156 @@ function patchCompactUi() {
   }
 }
 
+// ---- TUI 零散英文汉化(与 pnpm coding-agent patch 同步,patch-pi.test.ts 校验双轨一致) ----
+// 新手最常撞见的几句:Esc 中断后的 "Operation aborted"、每条报错前缀 "Error:"、
+// 每轮都在转的 "Working..."、选择器脚注的 "navigate/select/cancel"、/model 列表只显示 id
+// 看不到免费/价格提示、/settings 整页英文。行为不变,只换文案;选择器改为渲染 name(带提示)。
+const ASSISTANT_TEXT_REPLACEMENTS = [
+  ['theme.fg("error", "Response was truncated before completion.")', 'theme.fg("error", "回复超出单次长度上限被截断了,输入「继续」可以接着写。")'],
+  [': "Operation aborted";', ': "已中断";'],
+  ['const errorMsg = message.errorMessage || "Unknown error";', 'const errorMsg = message.errorMessage || "未知错误(反复出现可运行 u1s1 feedback 反馈)";'],
+  ['theme.fg("error", `Error: ${errorMsg}`)', 'theme.fg("error", `出错:${errorMsg}`)'],
+];
+const WORKING_TEXT_REPLACEMENTS = [
+  ['defaultWorkingMessage = "Working...";', 'defaultWorkingMessage = "思考中…";'],
+  ['defaultHiddenThinkingLabel = "Thinking...";', 'defaultHiddenThinkingLabel = "思考中…";'],
+];
+// 脚注提示(↑↓ navigate · enter select · esc cancel …)在十几个组件里各写各的,
+// 在 keyHint/rawKeyHint 出口处统一查表翻译,新组件加进来也能覆盖到。
+const KEY_HINT_REPLACEMENTS = [
+  [
+    'export function keyHint(keybinding, description) {',
+    'const U1S1_HINTS = { cancel: "取消", "to cancel": "取消", "to cancel,": "取消,", navigate: "上下选择", submit: "提交", "to submit": "提交", save: "保存", select: "选择", confirm: "确认", scope: "切换范围", "to expand": "展开", "to collapse": "收起", "to run bash": "直接跑命令", "to run bash (no context)": "跑命令(不进上下文)", toggle: "切换", "cycle inherit/+/-": "循环 继承/+/-", "for commands": "输入命令", commands: "命令", bash: "命令", close: "关闭", "to close": "关闭", "to attach": "拖入文件即附加", "skip setup": "跳过设置", "switch mode": "切换模式", newline: "换行", "to delete to end": "删到行尾", sort: "排序", named: "只看已命名", rename: "重命名", delete: "删除", "to exit": "退出", "to cycle models": "切换模型", "external editor": "外部编辑器", "clear/exit": "清空/退出" };\nconst u1s1Hint = (d) => U1S1_HINTS[d] ?? d;\nexport function keyHint(keybinding, description) {',
+  ],
+  { from: 'theme.fg("muted", ` ${description}`)', to: 'theme.fg("muted", ` ${u1s1Hint(description)}`)', expected: 2 },
+];
+const MODEL_SELECTOR_REPLACEMENTS = [
+  // 两处 modelText(有/无两空格缩进)同一规则覆盖;测试的空白折叠匹配不认双空格
+  { from: '${item.id}`;', to: '${item.model.name || item.id}`;', expected: 2 },
+  ['Model Name: ${selected.model.name}`)', '模型 ID: ${selected.model.id}`)'],
+  ['No matching models")', '没有匹配的模型")'],
+  ['theme.fg("muted", " · default")', 'theme.fg("muted", " · 默认")'],
+  ['const allText = this.scope === "all" ? theme.fg("accent", "all") : theme.fg("muted", "all");', 'const allText = this.scope === "all" ? theme.fg("accent", "全部") : theme.fg("muted", "全部");'],
+  ['const scopedText = this.scope === "scoped" ? theme.fg("accent", "scoped") : theme.fg("muted", "scoped");', 'const scopedText = this.scope === "scoped" ? theme.fg("accent", "已配置") : theme.fg("muted", "已配置");'],
+  ['theme.fg("muted", "Scope: ")', 'theme.fg("muted", "范围: ")'],
+  ['theme.fg("muted", " (all/scoped)")', 'theme.fg("muted", " (全部/已配置)")'],
+  ['refreshStatusMessage = "Refreshing model catalogs…";', 'refreshStatusMessage = "正在刷新模型列表…";'],
+  ['"Model catalogs refreshed."', '"模型列表已刷新。"'],
+  ['const hintText = "Only showing models from configured providers. Use /login to add providers.";', 'const hintText = "只显示已配置渠道的模型。";'],
+];
+const SETTINGS_REPLACEMENTS = [
+  ['off: "No reasoning",', 'off: "不推理",'],
+  ['minimal: "Very brief reasoning (~1k tokens)",', 'minimal: "极简推理(约 1k token)",'],
+  ['low: "Light reasoning (~2k tokens)",', 'low: "轻度推理(约 2k token)",'],
+  ['medium: "Moderate reasoning (~8k tokens)",', 'medium: "中等推理(约 8k token)",'],
+  ['high: "Deep reasoning (~16k tokens)",', 'high: "深度推理(约 16k token)",'],
+  ['xhigh: "Extra-high reasoning (~32k tokens)",', 'xhigh: "超深推理(约 32k token)",'],
+  ['max: "Maximum reasoning",', 'max: "最大推理",'],
+  ['ask: "Ask",', 'ask: "每次询问",'],
+  ['always: "Always trust",', 'always: "始终信任",'],
+  ['never: "Never trust",', 'never: "从不信任",'],
+  ['new SelectSubmenu("Theme", "Select a theme, or choose Automatic to follow terminal appearance."', 'new SelectSubmenu("主题", "选择一个主题,或选「自动」跟随终端明暗。"'],
+  ['label: "Automatic",', 'label: "自动",'],
+  ['description: "Use separate themes for light and dark terminal appearance",', 'description: "终端明暗各用一套主题",'],
+  ['theme.fg("accent", "Automatic Theme")', 'theme.fg("accent", "自动主题")'],
+  ['theme.fg("muted", "Choose themes for terminal light and dark appearance.")', 'theme.fg("muted", "分别为终端的浅色/深色外观选主题。")'],
+  ['theme.fg("muted", "Light/dark detection requires terminal support.")', 'theme.fg("muted", "明暗检测需要终端支持。")'],
+  ['label: "Light theme",', 'label: "浅色主题",'],
+  ['description: "Theme to use in automatic mode when the terminal is light",', 'description: "自动模式下终端为浅色时使用的主题",'],
+  ['label: "Dark theme",', 'label: "深色主题",'],
+  ['description: "Theme to use in automatic mode when the terminal is dark",', 'description: "自动模式下终端为深色时使用的主题",'],
+  ['label: "Apply",', 'label: "应用",'],
+  ['description: "Save and go back",', 'description: "保存并返回",'],
+  ['label: "Change mode",', 'label: "切换模式",'],
+  ['description: "Switch to one theme for light and dark",', 'description: "明暗共用一个主题",'],
+  ['label: "Auto-compact",', 'label: "自动压缩上下文",'],
+  ['description: "Automatically compact context when it gets too large",', 'description: "上下文过长时自动压缩",'],
+  ['label: "Steering mode",', 'label: "插话模式",'],
+  ['description: "Enter while streaming queues steering messages. \'one-at-a-time\': deliver one, wait for response. \'all\': deliver all at once.",', 'description: "回复进行中按 Enter 发送插话。one-at-a-time:发一条等回复;all:一次全发。",'],
+  ['label: "Follow-up mode",', 'label: "追问模式",'],
+  ['description: `${followUpKey} queues follow-up messages until agent stops. \'one-at-a-time\': deliver one, wait for response. \'all\': deliver all at once.`,', 'description: `${followUpKey} 把追问排队到本轮结束再发。one-at-a-time:发一条等回复;all:一次全发。`,'],
+  ['label: "Transport",', 'label: "传输方式",'],
+  ['description: "Preferred transport for providers that support multiple transports",', 'description: "支持多种传输方式的渠道优先用哪种",'],
+  ['label: "HTTP idle timeout",', 'label: "HTTP 空闲超时",'],
+  ['description: "Maximum idle gap while waiting for HTTP headers or body chunks. Disable for local models that pause longer than five minutes.",', 'description: "等待响应头或数据块的最长空闲间隔;本地模型停顿超过五分钟可关闭。",'],
+  ['label: "Hide thinking",', 'label: "隐藏思考过程",'],
+  ['description: "Hide thinking blocks in assistant responses",', 'description: "不显示回复里的思考块",'],
+  ['label: "Mermaid diagrams",', 'label: "Mermaid 图表",'],
+  ['description: "Render Mermaid code blocks as Unicode diagrams",', 'description: "把 Mermaid 代码块渲染成字符图",'],
+  ['label: "Cache miss notices",', 'label: "缓存未命中提示",'],
+  ['description: "Show transcript notices for significant prompt-cache misses and compaction costs",', 'description: "提示明显的提示词缓存未命中与压缩开销",'],
+  ['label: "Collapse changelog",', 'label: "折叠更新日志",'],
+  ['description: "Show condensed changelog after updates",', 'description: "更新后只显示精简的更新日志",'],
+  ['label: "Quiet startup",', 'label: "安静启动",'],
+  ['description: "Disable verbose printing at startup",', 'description: "启动时不打印冗长信息",'],
+  ['label: "Install telemetry",', 'label: "安装统计",'],
+  ['description: "Send an anonymous version/update ping after changelog-detected updates",', 'description: "更新后匿名上报一次版本信息",'],
+  ['label: "Default project trust",', 'label: "默认项目信任",'],
+  ['description: "Fallback behavior when no extension or saved trust decision decides project trust",', 'description: "没有扩展或已保存决定时,项目信任的兜底行为",'],
+  ['label: "Double-escape action",', 'label: "双击 Esc 动作",'],
+  ['description: "Action when pressing Escape twice with empty editor",', 'description: "输入框为空时连按两次 Esc 的动作",'],
+  ['label: "Tree filter mode",', 'label: "会话树筛选",'],
+  ['description: "Default filter when opening /tree",', 'description: "打开 /tree 时的默认筛选",'],
+  ['label: "Warnings",', 'label: "警告提示",'],
+  ['description: "Enable or disable individual warnings",', 'description: "逐项开关各类警告",'],
+  ['label: "Default thinking level per model",', 'label: "各模型默认推理强度",'],
+  ['description: `Override the default thinking level for specific models. ${cycleThinkingKey} cycles in-session.`,', 'description: `按模型覆盖默认推理强度;会话内用 ${cycleThinkingKey} 切换。`,'],
+  ['description: "Select a model to configure",', 'description: "选择要设置的模型",'],
+  ['label: "No models available",', 'label: "没有可用模型",'],
+  ['description: "Log in to a provider or configure an API key first",', 'description: "请先登录",'],
+  ['description: "Select default thinking level for this model",', 'description: "选择这个模型的默认推理强度",'],
+  ['label: "(clear override)",', 'label: "(清除覆盖)",'],
+  ['description: `Revert to global default (${config.thinkingLevel})`,', 'description: `恢复为全局默认(${config.thinkingLevel})`,'],
+  ['label: "TUI mode",', 'label: "界面模式",'],
+  ['description: "Interface layout; fullscreen mode is experimental",', 'description: "界面布局;全屏模式为实验功能",'],
+  ['label: "Fullscreen exit output",', 'label: "退出全屏时的输出",'],
+  ['description: "Print the transcript or only a session resume hint when exiting fullscreen mode",', 'description: "退出全屏时打印完整对话,还是只留一条恢复会话提示",'],
+  ['label: "Fullscreen scrollbar",', 'label: "全屏滚动条",'],
+  ['description: "Scrollbar behavior in fullscreen mode; has no effect in regular mode",', 'description: "全屏模式下的滚动条行为;普通模式无效",'],
+  ['label: "Fullscreen copy on select",', 'label: "全屏选中即复制",'],
+  ['description: "Automatically copy selected text in fullscreen mode; disable to copy selections with Ctrl+X",', 'description: "全屏模式下选中文字自动复制;关闭后用 Ctrl+X 复制",'],
+  ['label: "Theme",', 'label: "主题",'],
+  ['description: "Color theme for the interface",', 'description: "界面配色主题",'],
+];
+
+const TUI_TEXT_TARGETS = [
+  [["modes", "interactive", "components", "assistant-message.js"], ASSISTANT_TEXT_REPLACEMENTS, "回复状态文案"],
+  [["modes", "interactive", "interactive-mode.js"], WORKING_TEXT_REPLACEMENTS, "工作中提示"],
+  [["modes", "interactive", "components", "keybinding-hints.js"], KEY_HINT_REPLACEMENTS, "按键脚注"],
+  [["modes", "interactive", "components", "model-selector.js"], MODEL_SELECTOR_REPLACEMENTS, "模型选择器"],
+  [["modes", "interactive", "components", "settings-selector.js"], SETTINGS_REPLACEMENTS, "设置菜单"],
+];
+
+function patchTuiText() {
+  for (const piDir of findPackageDirs("@earendil-works/pi-coding-agent")) {
+    for (const [parts, rules, label] of TUI_TEXT_TARGETS) {
+      const target = join(piDir, "dist", ...parts);
+      try {
+        let text = readFileSync(target, "utf8");
+        let applied = 0;
+        for (const rule of rules) {
+          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 < rules.length) {
+          console.log(
+            `[u1s1] 提示: pi 版本可能已更新，${label}汉化补丁只应用了 ${applied}/${rules.length} 处（不影响使用）`,
+          );
+        }
+        writeFileSync(target, text);
+      } catch {
+        continue;
+      }
+    }
+  }
+}
+
 function patchMainScreenAutowrap() {
   const tuiDirs = findTuiDirs();
   if (tuiDirs.length === 0) {
@@ -329,6 +479,7 @@ try {
   patchSlashCommands();
   patchExtensionError();
   patchHotkeys();
+  patchTuiText();
   patchMainScreenAutowrap();
 } catch (err) {
   console.log(`[u1s1] 提示: pi 运行时补丁未生效（${err?.message ?? err}），不影响安装`);