u1s1-cli 1.11.8 → 1.13.0

package/dist/mcp/extension.js

@@ -1,4 +1,5 @@
 import { loadMcpConfig, loadMcpToolCache, sameToolList, saveMcpToolCache, } from "./config.js";
+import { tr } from "../i18n.js";
 import { McpClient } from "./client.js";
 import { createMcpToolSet } from "./tools.js";
 /**
@@ -63,7 +64,7 @@ export async function registerMcpServers(pi) {
         catch (err) {
             const message = err instanceof Error ? err.message : String(err);
             result.failed.push({ server, error: message });
-            warnings.push(`MCP 服务 ${server} 连接失败,本次会话不可用:${message.split("\n")[0]}\n  用 u1s1 mcp test ${server} 排查`);
+            warnings.push(tr(`MCP 服务 ${server} 连接失败,本次会话不可用:${message.split("\n")[0]}\n  用 u1s1 mcp test ${server} 排查`, `MCP server ${server} failed to connect and is unavailable this session: ${message.split("\n")[0]}\n  Run u1s1 mcp test ${server} to troubleshoot`));
         }
     }));
     if (cacheDirty) {
@@ -123,6 +124,7 @@ async function refreshCache(config, cache, warn) {
         }
         catch { }
     }
-    if (changed.length)
-        warn(`MCP 服务 ${changed.join("、")} 的工具列表有变化,重新进入会话后生效`);
+    if (changed.length) {
+        warn(tr(`MCP 服务 ${changed.join("、")} 的工具列表有变化,重新进入会话后生效`, `Tool list changed for MCP server ${changed.join(", ")}; takes effect in your next session`));
+    }
 }

package/dist/mcp/tools.d.ts

@@ -9,6 +9,8 @@ import type { McpServerConfig, McpToolInfo } from "./config.js";
  */
 export declare const MCP_MAX_TEXT_CHARS = 100000;
 export declare function mcpToolName(server: string, tool: string): string;
+/** pi 内置 MCP 给模型的工具名(mcp__<服务>__<工具>),u1s1 mcp list/test 展示用。 */
+export declare function piMcpToolName(server: string, tool: string): string;
 export declare function truncateMcpText(text: string, max?: number): string;
 /** 模型 API 只认 object 顶层;$schema 之类元字段去掉,缺 properties 补空 */
 export declare function toParameterSchema(inputSchema: Record<string, unknown>): TSchema;

package/dist/mcp/tools.js

@@ -1,4 +1,5 @@
 import { Text } from "@earendil-works/pi-tui";
+import { tr } from "../i18n.js";
 import { compactResultRender } from "../tools.js";
 import { McpClient } from "./client.js";
 /**
@@ -12,10 +13,14 @@ export function mcpToolName(server, tool) {
     const clean = tool.replace(/[^a-zA-Z0-9_-]+/g, "_").replace(/^_+|_+$/g, "") || "tool";
     return `mcp_${server}_${clean}`.slice(0, MODEL_TOOL_NAME_MAX);
 }
+/** pi 内置 MCP 给模型的工具名(mcp__<服务>__<工具>),u1s1 mcp list/test 展示用。 */
+export function piMcpToolName(server, tool) {
+    return `mcp__${server}__${tool}`.replace(/[^A-Za-z0-9_]/g, "_");
+}
 export function truncateMcpText(text, max = MCP_MAX_TEXT_CHARS) {
     if (text.length <= max)
         return text;
-    return `${text.slice(0, max)}\n\n…（MCP 工具返回内容过长已截断，共 ${text.length} 字符，保留前 ${max} 字符）`;
+    return `${text.slice(0, max)}\n\n${tr(`…（MCP 工具返回内容过长已截断，共 ${text.length} 字符，保留前 ${max} 字符）`, `… (MCP tool output too long, truncated: ${text.length} chars total, first ${max} kept)`)}`;
 }
 /** 模型 API 只认 object 顶层;$schema 之类元字段去掉,缺 properties 补空 */
 export function toParameterSchema(inputSchema) {
@@ -46,12 +51,12 @@ export function createMcpToolSet(server, config, tools, opts = {}) {
         catch (err) {
             const message = err instanceof Error ? err.message : String(err);
             // 进程退出 / 连接断了:丢掉旧客户端,下次调用重新拉起
-            if (/已退出|已关闭|stdin/.test(message)) {
+            if (/已退出|已关闭|exited|closed|stdin/.test(message)) {
                 const old = client;
                 client = new McpClient(server, config, opts);
                 old.close().catch(() => { });
             }
-            throw new Error(`MCP 服务 ${server} 调用 ${tool.name} 失败:${message}`, { cause: err });
+            throw new Error(tr(`MCP 服务 ${server} 调用 ${tool.name} 失败:${message}`, `MCP server ${server}: calling ${tool.name} failed: ${message}`), { cause: err });
         }
     }
     for (const tool of tools) {
@@ -69,14 +74,14 @@ export function createMcpToolSet(server, config, tools, opts = {}) {
             renderResult(result, options, theme, context) {
                 const d = result.details;
                 const args = d?.args ? ` ${d.args}` : "";
-                const n = typeof d?.chars === "number" ? ` · ${d.chars} 字符${d.truncated ? "(已截断)" : ""}` : "";
+                const n = typeof d?.chars === "number" ? ` · ${tr(`${d.chars} 字符`, `${d.chars} chars`)}${d.truncated ? tr("(已截断)", " (truncated)") : ""}` : "";
                 return compactResultRender({ result, options, theme, context, summaryLine: `🔌 ${server}:${tool.name}${args}${n}` });
             },
             async execute(_toolCallId, params, signal) {
                 const args = (params && typeof params === "object" ? params : {});
                 const res = await call(tool, args, signal);
                 if (res.isError)
-                    throw new Error(`MCP 服务 ${server} 的 ${tool.name} 返回错误:${res.text || "(无详情)"}`);
+                    throw new Error(tr(`MCP 服务 ${server} 的 ${tool.name} 返回错误:${res.text || "(无详情)"}`, `MCP server ${server}: ${tool.name} returned an error: ${res.text || "(no details)"}`));
                 const text = res.text || "(empty result)";
                 return {
                     content: [{ type: "text", text: truncateMcpText(text) }],

package/dist/model.js

@@ -1,12 +1,13 @@
 import { fetchModels, loadCustomEndpoints } from "./api.js";
 import { apiModelToDef, CUSTOM_ENDPOINTS, findModel, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, resolvePreferredModel, setModelsFromApi, } from "./config.js";
 import { siteLinks, siteOf } from "./site.js";
+import { tr } from "./i18n.js";
 /** Refresh official models while preserving the built-in list as an explicit offline fallback. */
 export async function refreshOfficialModels(cfg, fetcher = fetchModels) {
     try {
         const { models } = await fetcher(cfg);
         if (models.length === 0)
-            return "线上模型列表为空";
+            return tr("线上模型列表为空", "the online model list is empty");
         setModelsFromApi(models.map(apiModelToDef));
         return null;
     }
@@ -25,7 +26,7 @@ export async function modelCommand(nameOrAlias) {
         loadCustomEndpoints(cfg),
     ]);
     if (officialModelsError) {
-        console.error(`  获取线上模型列表失败，使用内置列表：${officialModelsError}`);
+        console.error(tr(`  获取线上模型列表失败，使用内置列表：${officialModelsError}`, `  Couldn't fetch the online model list; using the built-in list: ${officialModelsError}`));
     }
     const current = resolvePreferredModel(cfg);
     if (!nameOrAlias) {
@@ -34,26 +35,26 @@ export async function modelCommand(nameOrAlias) {
             const mark = current.provider === PROVIDER_ID && m.id === current.id ? "●" : " ";
             console.log(`  ${mark} ${m.aliases[0].padEnd(10)} ${m.name}`);
             // 价格来自网关目录;离线兜底目录不带价格,只列名字与提示
-            const price = m.cost ? `$${m.cost.input}/$${m.cost.output} 每百万 token` : "";
+            const price = m.cost ? tr(`$${m.cost.input}/$${m.cost.output} 每百万 token`, `$${m.cost.input}/$${m.cost.output} per 1M tokens`) : "";
             const detail = [m.note, price].filter(Boolean).join(" · ");
             if (detail)
                 console.log(`               ${detail}`);
         }
         for (const ep of CUSTOM_ENDPOINTS) {
             console.log("");
-            console.log(`  ─ 自定义端点 ${ep.name}(${ep.baseUrl},走本地直连不计费)`);
+            console.log(tr(`  ─ 自定义端点 ${ep.name}(${ep.baseUrl},走本地直连不计费)`, `  ─ Custom endpoint ${ep.name} (${ep.baseUrl}, direct connection, not billed)`));
             for (const m of ep.models) {
                 const mark = current.provider === ep.id && m.id === current.id ? "●" : " ";
                 console.log(`  ${mark} ${m.id.padEnd(10)} ${m.name === m.id ? "" : m.name}`);
             }
         }
         console.log("");
-        console.log("  切换:u1s1 model <model-id>(对话里 /model 同样会记住)");
+        console.log(tr("  切换:u1s1 model <model-id>(对话里 /model 同样会记住)", "  Switch: u1s1 model <model-id> (/model in a session is remembered too)"));
         if (CUSTOM_ENDPOINTS.length) {
-            console.log("  端点模型重名时可加限定:u1s1 model 端点名:模型id");
+            console.log(tr("  端点模型重名时可加限定:u1s1 model 端点名:模型id", "  If endpoint model names clash, qualify them: u1s1 model <endpoint>:<model-id>"));
         }
         else {
-            console.log(`  想接自己的 API(含本机 Ollama)?去 ${siteLinks(siteOf(cfg)).dashboard} 配「自定义模型端点」`);
+            console.log(tr(`  想接自己的 API(含本机 Ollama)?去 ${siteLinks(siteOf(cfg)).dashboard} 配「自定义模型端点」`, `  Want to use your own API (including local Ollama)? Add a custom model endpoint at ${siteLinks(siteOf(cfg)).dashboard}`));
         }
         console.log("");
         return;
@@ -62,14 +63,14 @@ export async function modelCommand(nameOrAlias) {
     if (!m) {
         const custom = CUSTOM_ENDPOINTS.flatMap((e) => e.models.map((x) => x.id));
         const all = [...MODELS.map((x) => x.aliases[0]), ...custom];
-        console.error(`  没有叫「${nameOrAlias}」的模型,可选:${all.join(" / ")}`);
+        console.error(tr(`  没有叫「${nameOrAlias}」的模型,可选:${all.join(" / ")}`, `  No model named "${nameOrAlias}". Available: ${all.join(" / ")}`));
         process.exit(1);
     }
     persistPreferredModel(cfg, m.provider, m.id);
     if (m.provider === PROVIDER_ID) {
-        console.log(`  ✓ 默认模型已切到 ${m.model.name}${m.model.note ? `(${m.model.note})` : ""}`);
+        console.log(tr(`  ✓ 默认模型已切到 ${m.model.name}${m.model.note ? `(${m.model.note})` : ""}`, `  ✓ Default model set to ${m.model.name}${m.model.note ? ` (${m.model.note})` : ""}`));
     }
     else {
-        console.log(`  ✓ 默认模型已切到 ${m.model.name}(自定义端点 ${m.providerName},本地直连不计费)`);
+        console.log(tr(`  ✓ 默认模型已切到 ${m.model.name}(自定义端点 ${m.providerName},本地直连不计费)`, `  ✓ Default model set to ${m.model.name} (custom endpoint ${m.providerName}, direct connection, not billed)`));
     }
 }

package/dist/nudges.d.ts

@@ -1,3 +1,4 @@
+import type { SiteId } from "./site.js";
 /**
  * 「只提示一次」的机器级标记,落在 ~/.u1s1/nudges.json,CLI 与桌面版共用
  * (桌面版经 u1s1-cli/embed 拿到同一份 helper)。值是 ISO 时间戳,便于事后
@@ -16,6 +17,11 @@ export declare const nudgesFile: string;
 export declare function readNudges(file?: string): NudgeState;
 export declare function hasNudge(key: NudgeKey, file?: string): boolean;
 export declare function markNudge(key: NudgeKey, file?: string): void;
-/** 会话里首次写/改文件后要不要提示 deploy:没提示过、也没部署过才提示。 */
-export declare function shouldShowDeployHint(file?: string): boolean;
+/**
+ * 会话里首次写/改文件后要不要提示 deploy:没提示过、也没部署过才提示。
+ * 国际站没有站点托管(网关拒绝 deploy),一律不提示。
+ */
+export declare function shouldShowDeployHint(file?: string, site?: SiteId): boolean;
+/** 老导出,固定中文;新代码用 deployHintText()(按当前语言现取)。 */
 export declare const DEPLOY_HINT_TEXT = "\u505A\u597D\u4E86\u60F3\u7ED9\u670B\u53CB\u770B\uFF1F\u8F93\u5165 /exit \u56DE\u5230\u7EC8\u7AEF,\u8FD0\u884C u1s1 deploy \u4E00\u952E\u4E0A\u7EBF";
+export declare function deployHintText(): string;

package/dist/nudges.js

@@ -1,6 +1,7 @@
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { u1s1Dir } from "./config.js";
+import { activeSite, u1s1Dir } from "./config.js";
+import { tr } from "./i18n.js";
 export const nudgesFile = join(u1s1Dir, "nudges.json");
 export function readNudges(file = nudgesFile) {
     try {
@@ -32,9 +33,27 @@ export function markNudge(key, file = nudgesFile) {
         // ignore
     }
 }
-/** 会话里首次写/改文件后要不要提示 deploy:没提示过、也没部署过才提示。 */
-export function shouldShowDeployHint(file = nudgesFile) {
+/**
+ * 会话里首次写/改文件后要不要提示 deploy:没提示过、也没部署过才提示。
+ * 国际站没有站点托管(网关拒绝 deploy),一律不提示。
+ */
+export function shouldShowDeployHint(file = nudgesFile, site) {
+    let siteId = site;
+    if (!siteId) {
+        try {
+            siteId = activeSite().id;
+        }
+        catch {
+            siteId = "cn";
+        }
+    }
+    if (siteId === "intl")
+        return false;
     const state = readNudges(file);
     return state.deploy_hint_shown === undefined && state.deploy_done === undefined;
 }
+/** 老导出,固定中文;新代码用 deployHintText()(按当前语言现取)。 */
 export const DEPLOY_HINT_TEXT = "做好了想给朋友看？输入 /exit 回到终端,运行 u1s1 deploy 一键上线";
+export function deployHintText() {
+    return tr(DEPLOY_HINT_TEXT, "Want to show it off? Type /exit to return to the terminal, then run u1s1 deploy to publish it.");
+}

package/dist/search-tools.js

@@ -5,6 +5,7 @@ import { join } from "node:path";
 import { Readable, Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { agentDir } from "./config.js";
+import { tr } from "./i18n.js";
 /**
  * 预 seed pi 的搜索组件(fd / ripgrep)到 ~/.u1s1/agent/bin。
  *
@@ -104,7 +105,7 @@ function findBinary(root, name) {
 async function install(tool, baseUrl, binName) {
     const asset = tool.asset(tool.version);
     if (!asset)
-        throw new Error(`不支持的平台 ${platform()}/${arch()}`);
+        throw new Error(tr(`不支持的平台 ${platform()}/${arch()}`, `Unsupported platform ${platform()}/${arch()}`));
     mkdirSync(binDir, { recursive: true });
     const res = await fetch(new URL(`/tools/${asset}`, baseUrl), {
         signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS),
@@ -114,7 +115,7 @@ async function install(tool, baseUrl, binName) {
     const declaredLength = Number(res.headers.get("content-length"));
     if (Number.isFinite(declaredLength) && declaredLength > MAX_TOOL_ARCHIVE_BYTES) {
         void res.body.cancel("tool archive exceeded limit").catch(() => { });
-        throw new Error(`下载文件超过 ${MAX_TOOL_ARCHIVE_BYTES} bytes`);
+        throw new Error(tr(`下载文件超过 ${MAX_TOOL_ARCHIVE_BYTES} bytes`, `Download exceeds ${MAX_TOOL_ARCHIVE_BYTES} bytes`));
     }
     const archive = join(binDir, asset);
     // fd/rg 并行安装,解压目录按工具名+pid 隔离,避免互踩
@@ -130,10 +131,10 @@ async function install(tool, baseUrl, binName) {
         await pipeline(Readable.fromWeb(res.body), limiter, createWriteStream(archive));
         mkdirSync(extractDir, { recursive: true });
         if (!extract(archive, extractDir))
-            throw new Error(`解压失败 ${asset}`);
+            throw new Error(tr(`解压失败 ${asset}`, `Failed to extract ${asset}`));
         const found = findBinary(extractDir, binName);
         if (!found)
-            throw new Error(`包内没有 ${binName}`);
+            throw new Error(tr(`包内没有 ${binName}`, `${binName} not found in the archive`));
         renameSync(found, join(binDir, binName));
         if (platform() !== "win32")
             chmodSync(join(binDir, binName), 0o755);
@@ -151,10 +152,10 @@ export async function ensureSearchTools(cfg) {
         if (missing.length === 0)
             return;
         // 这是新手首启最早看到的输出之一:说清是首次准备、不用管;fd/rg 等术语不外露
-        console.log("  首次运行,正在准备文件搜索组件(只需一次)…");
+        console.log(tr("  首次运行,正在准备文件搜索组件(只需一次)…", "  First run: setting up file search components (one-time)…"));
         const results = await Promise.allSettled(missing.map((t) => install(t, cfg.baseUrl, t.bin + ext)));
         if (results.some((r) => r.status === "rejected")) {
-            console.log("  部分搜索组件暂时没装上,不影响使用,之后会自动重试。");
+            console.log(tr("  部分搜索组件暂时没装上,不影响使用,之后会自动重试。", "  Some search components couldn't be installed yet. You can keep working; we'll retry automatically later."));
         }
     }
     catch {

package/dist/shell-doctor.js

@@ -2,6 +2,7 @@ import { spawn } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join, win32 } from "node:path";
 import { agentDir, agentSettingsFile } from "./config.js";
+import { tr } from "./i18n.js";
 /** System32/Sysnative 的 bash.exe 是 WSL 转发器,不是真 bash(与 pi 同款判断)。 */
 function isWslRelayBash(p) {
     const normalized = p.replace(/\//g, "\\").toLowerCase();
@@ -139,8 +140,8 @@ function persistShellPath(p) {
     return true;
 }
 function adviseInstallGitBash() {
-    console.error("  ⚠ 未找到 Git Bash,将使用 WSL 的 bash:命令会在 WSL 的 Linux 里执行,不是 Windows 本机。");
-    console.error("    建议安装 Git for Windows(PowerShell 运行: winget install --id Git.Git)后重启 u1s1。");
+    console.error(tr("  ⚠ 未找到 Git Bash,将使用 WSL 的 bash:命令会在 WSL 的 Linux 里执行,不是 Windows 本机。", "  ⚠ Git Bash not found; using WSL's bash. Commands will run inside WSL's Linux, not natively on Windows."));
+    console.error(tr("    建议安装 Git for Windows(PowerShell 运行: winget install --id Git.Git)后重启 u1s1。", "    We recommend installing Git for Windows (in PowerShell: winget install --id Git.Git), then restarting u1s1."));
 }
 export async function ensureUsableShell() {
     if (process.platform !== "win32")
@@ -164,7 +165,7 @@ export async function ensureUsableShell() {
         const candidate = await findUsableGitBash();
         if (candidate) {
             persistShellPath(candidate);
-            console.error(`  检测到 Git Bash,命令改回 Windows 本机执行: ${candidate}`);
+            console.error(tr(`  检测到 Git Bash,命令改回 Windows 本机执行: ${candidate}`, `  Found Git Bash; commands will run natively on Windows again: ${candidate}`));
             return { status: "bash", shellPath: candidate };
         }
         adviseInstallGitBash();
@@ -175,7 +176,7 @@ export async function ensureUsableShell() {
     const adopt = (candidate) => {
         persistShellPath(candidate);
         if (typeof configured === "string") {
-            console.error(`  原 shellPath 已失效,自动改用: ${candidate}`);
+            console.error(tr(`  原 shellPath 已失效,自动改用: ${candidate}`, `  The configured shellPath no longer works; switched to: ${candidate}`));
         }
         return { status: "bash", shellPath: candidate };
     };
@@ -195,14 +196,14 @@ export async function ensureUsableShell() {
         return { status: "bash", shellPath: fallback };
     }
     if (fallback) {
-        console.error(`  ⚠ 检测到的 bash(${fallback})无法执行命令,u1s1 的命令工具会全部失败。`);
+        console.error(tr(`  ⚠ 检测到的 bash(${fallback})无法执行命令,u1s1 的命令工具会全部失败。`, `  ⚠ The bash found (${fallback}) can't run commands, so all of u1s1's command tools will fail.`));
         if (isWslRelayBash(fallback)) {
-            console.error("    它是 WSL 转发器,当前默认发行版里没有 /bin/bash(docker-desktop 被设为默认时就会这样)。");
+            console.error(tr("    它是 WSL 转发器,当前默认发行版里没有 /bin/bash(docker-desktop 被设为默认时就会这样)。", "    It's the WSL relay, and the default distro has no /bin/bash (this happens when docker-desktop is the default)."));
         }
     }
     else {
-        console.error("  ⚠ 没找到 bash,u1s1 无法执行命令。");
+        console.error(tr("  ⚠ 没找到 bash,u1s1 无法执行命令。", "  ⚠ No bash found; u1s1 can't run commands."));
     }
-    console.error("    修复:PowerShell 里运行 winget install --id Git.Git 安装 Git for Windows,装完重启 u1s1。");
+    console.error(tr("    修复:PowerShell 里运行 winget install --id Git.Git 安装 Git for Windows,装完重启 u1s1。", "    Fix: in PowerShell, run winget install --id Git.Git to install Git for Windows, then restart u1s1."));
     return { status: "none" };
 }

package/dist/subagent.js

@@ -1,4 +1,5 @@
 import { createAgentSession, DefaultResourceLoader, getAgentDir, hasTrustRequiringProjectResources, ModelRuntime, ProjectTrustStore, SessionManager, SettingsManager, } from "@earendil-works/pi-coding-agent";
+import { tr } from "./i18n.js";
 // ---- 子 agent spawn 基础设施:spawn_subagent 工具与 workflow runner 共用 ----
 /** 同时在跑的子 agent 上限;超额排队,防止打爆网关。 */
 export const SUBAGENT_CONCURRENCY = 4;
@@ -20,7 +21,7 @@ export function resolveStoredProjectTrust(cwd, agentDir = getAgentDir()) {
     return new ProjectTrustStore(agentDir).get(cwd) === true;
 }
 function cancelledError(signal) {
-    return new Error("已取消", { cause: signal.reason });
+    return new Error(tr("已取消", "Cancelled"), { cause: signal.reason });
 }
 /**
  * Run one prompt while preserving the reason that stopped it. AgentSession.abort()
@@ -54,7 +55,7 @@ export async function promptSubagentSession(session, task, options) {
     if (options.signal?.aborted)
         throw cancelledError(options.signal);
     if (timedOut)
-        throw new Error(`子任务超时(${options.timeoutMs}ms)`, { cause: promptError });
+        throw new Error(tr(`子任务超时(${options.timeoutMs}ms)`, `Subtask timed out (${options.timeoutMs}ms)`), { cause: promptError });
     if (promptError)
         throw promptError;
 }
@@ -72,7 +73,7 @@ function extractFinalText(messages) {
         if (text)
             return text;
     }
-    return "(子 agent 结束但没有文本输出)";
+    return tr("(子 agent 结束但没有文本输出)", "(sub-agent finished without any text output)");
 }
 /**
  * 汇总会话内全部 assistant 消息的 token 与费用。
@@ -123,7 +124,7 @@ export async function runSubagent(opts) {
             sharedModelRuntime.getModel(providerId, modelId) ??
                 (slash === -1 ? sharedModelRuntime.getModel("u1s1", opts.model) : undefined);
         if (!model)
-            throw new Error(`找不到模型 "${opts.model}"(可用 /model 查看已配置的模型)`);
+            throw new Error(tr(`找不到模型 "${opts.model}"(可用 /model 查看已配置的模型)`, `Model "${opts.model}" not found (use /model to see configured models)`));
     }
     else if (opts.parentModel) {
         // 继承主会话模型;解析不到(端点被删等)就落回默认,不硬失败