u1s1-cli 1.11.8 → 1.13.0

package/dist/loop.js

@@ -1,3 +1,4 @@
+import { tr } from "./i18n.js";
 /**
  * /loop —— 会话级定时循环执行提示词(对标 Claude Code 的 /loop)。
  *
@@ -34,12 +35,16 @@ function parseIntervalMs(token) {
 }
 function formatInterval(ms) {
     if (ms >= 3_600_000 && ms % 3_600_000 === 0) {
-        return `${ms / 3_600_000}小时`;
+        return tr(`${ms / 3_600_000}小时`, `${ms / 3_600_000}h`);
     }
     if (ms % 60_000 === 0) {
-        return `${ms / 60_000}分钟`;
+        return tr(`${ms / 60_000}分钟`, `${ms / 60_000}m`);
     }
-    return `${Math.round(ms / 1_000)}秒`;
+    return tr(`${Math.round(ms / 1_000)}秒`, `${Math.round(ms / 1_000)}s`);
+}
+/** 「每5分钟」/ "every 5m" */
+function everyInterval(ms) {
+    return tr(`每${formatInterval(ms)}`, `every ${formatInterval(ms)}`);
 }
 function preview(text) {
     return text.length > PROMPT_PREVIEW_MAX ? `${text.slice(0, PROMPT_PREVIEW_MAX)}…` : text;
@@ -86,7 +91,7 @@ function parseArgs(ui, raw) {
     }
     const prompt = rest.join(" ").trim();
     if (!prompt) {
-        ui.notify("用法: /loop [间隔] <提示词>,如 /loop 5m 检查部署状态;停止用 /loop stop", "error");
+        ui.notify(tr("用法: /loop [间隔] <提示词>,如 /loop 5m 检查部署状态;停止用 /loop stop", "Usage: /loop [interval] <prompt>, e.g. /loop 5m check the build status; /loop stop to stop"), "error");
         return null;
     }
     return { intervalMs: intervalMs ?? DEFAULT_INTERVAL_MS, prompt };
@@ -95,22 +100,22 @@ export function registerLoopCommand(pi) {
     // 会话重置(/clear、新会话)时循环随之消亡——和 Claude Code 的会话级语义一致
     pi.on("session_start", (_event, ctx) => stopLoop(ctx.ui));
     pi.registerCommand("loop", {
-        description: "定时重复执行提示词,如 /loop 5m 检查部署状态;/loop stop 停止",
+        description: tr("定时重复执行提示词,如 /loop 5m 检查部署状态;/loop stop 停止", "Repeat a prompt on an interval, e.g. /loop 5m check the build status; /loop stop to stop"),
         handler: async (args, ctx) => {
             const input = args.trim();
             if (!input) {
                 ctx.ui.notify(timer
-                    ? `🔁 当前循环:每${formatInterval(activeIntervalMs)} · ${preview(activePrompt)}(/loop stop 停止)`
-                    : "用法: /loop [间隔] <提示词>,如 /loop 5m 检查部署状态", "info");
+                    ? tr(`🔁 当前循环:${everyInterval(activeIntervalMs)} · ${preview(activePrompt)}(/loop stop 停止)`, `🔁 Current loop: ${everyInterval(activeIntervalMs)} · ${preview(activePrompt)} (/loop stop to stop)`)
+                    : tr("用法: /loop [间隔] <提示词>,如 /loop 5m 检查部署状态", "Usage: /loop [interval] <prompt>, e.g. /loop 5m check the build status"), "info");
                 return;
             }
             if (/^(stop|off|取消|停止)$/i.test(input)) {
                 if (!timer) {
-                    ctx.ui.notify("没有正在运行的循环", "info");
+                    ctx.ui.notify(tr("没有正在运行的循环", "No loop is running"), "info");
                     return;
                 }
                 stopLoop(ctx.ui);
-                ctx.ui.notify("⏹ 循环已停止", "info");
+                ctx.ui.notify(tr("⏹ 循环已停止", "⏹ Loop stopped"), "info");
                 return;
             }
             const parsed = parseArgs(ctx.ui, input);
@@ -128,14 +133,15 @@ export function registerLoopCommand(pi) {
                     });
                 }
                 catch (e) {
-                    ctx.ui.notify(`loop 执行失败: ${e instanceof Error ? e.message : String(e)}`, "error");
+                    const reason = e instanceof Error ? e.message : String(e);
+                    ctx.ui.notify(tr(`loop 执行失败: ${reason}`, `Loop run failed: ${reason}`), "error");
                 }
             };
             // 第一轮立刻跑:用户写完命令就想看到结果,不该干等一个间隔
             fire();
             timer = setInterval(fire, activeIntervalMs);
-            ctx.ui.setStatus(STATUS_KEY, `🔁 每${formatInterval(activeIntervalMs)} · ${preview(activePrompt)}`);
-            ctx.ui.notify(`🔁 已开始:现在先跑第一轮,之后每${formatInterval(activeIntervalMs)}一次「${preview(activePrompt)}」`, "info");
+            ctx.ui.setStatus(STATUS_KEY, `🔁 ${everyInterval(activeIntervalMs)} · ${preview(activePrompt)}`);
+            ctx.ui.notify(tr(`🔁 已开始:现在先跑第一轮,之后${everyInterval(activeIntervalMs)}一次「${preview(activePrompt)}」`, `🔁 Started: running the first round now, then ${everyInterval(activeIntervalMs)}: "${preview(activePrompt)}"`), "info");
         },
     });
 }

package/dist/mcp/client.js

@@ -1,5 +1,6 @@
 import { spawn } from "node:child_process";
 import { VERSION } from "../config.js";
+import { tr } from "../i18n.js";
 /**
  * 极简 MCP 客户端:只做 initialize / tools/list / tools/call 三件事,
  * 支持 stdio(本机进程,按行 JSON-RPC)和 Streamable HTTP(POST JSON,
@@ -29,8 +30,8 @@ function withTimeout(promise, timeoutMs, signal, what) {
             signal?.removeEventListener("abort", onAbort);
             fn(v);
         };
-        const onAbort = () => finish(reject)(new McpError(`${what} 已取消`));
-        const timer = setTimeout(() => finish(reject)(new McpError(`${what} 超过 ${Math.round(timeoutMs / 1000)}s 未响应`)), timeoutMs);
+        const onAbort = () => finish(reject)(new McpError(tr(`${what} 已取消`, `${what} was canceled`)));
+        const timer = setTimeout(() => finish(reject)(new McpError(tr(`${what} 超过 ${Math.round(timeoutMs / 1000)}s 未响应`, `${what} timed out after ${Math.round(timeoutMs / 1000)}s`))), timeoutMs);
         promise.then(finish(resolve), finish(reject));
         if (signal?.aborted)
             onAbort();
@@ -92,12 +93,12 @@ class StdioTransport {
             // spawn 失败(ENOENT 等)不会再有 exit 事件
             if (child.pid === undefined)
                 process.removeListener("exit", onParentExit);
-            this.fail(new McpError(`启动 ${this.command} 失败:${err.message}`));
+            this.fail(new McpError(tr(`启动 ${this.command} 失败:${err.message}`, `Failed to start ${this.command}: ${err.message}`)));
         });
         child.on("exit", (code, sig) => {
             process.removeListener("exit", onParentExit);
             const tail = this.stderrTail.slice(-5).join("\n");
-            this.fail(new McpError(`MCP 服务进程已退出(${sig ?? `code ${code ?? 0}`})${tail ? `\n${tail}` : ""}`));
+            this.fail(new McpError(`${tr("MCP 服务进程已退出", "MCP server process exited")}(${sig ?? `code ${code ?? 0}`})${tail ? `\n${tail}` : ""}`));
         });
     }
     fail(err) {
@@ -146,7 +147,7 @@ class StdioTransport {
             throw this.exited;
         const stdin = this.child?.stdin;
         if (!stdin || stdin.destroyed)
-            throw new McpError("MCP 服务进程 stdin 已关闭");
+            throw new McpError(tr("MCP 服务进程 stdin 已关闭", "MCP server process stdin is closed"));
         stdin.write(`${JSON.stringify(msg)}\n`);
     }
     request(msg, timeoutMs, signal) {
@@ -161,7 +162,7 @@ class StdioTransport {
                 reject(err);
             }
         });
-        return withTimeout(promise, timeoutMs, signal, msg.method ?? "请求").finally(() => this.pending.delete(id));
+        return withTimeout(promise, timeoutMs, signal, msg.method ?? tr("请求", "request")).finally(() => this.pending.delete(id));
     }
     async notify(msg) {
         this.write(msg);
@@ -170,7 +171,7 @@ class StdioTransport {
         const child = this.child;
         if (!child)
             return;
-        this.fail(new McpError("MCP 连接已关闭"));
+        this.fail(new McpError(tr("MCP 连接已关闭", "MCP connection closed")));
         try {
             child.stdin?.end();
         }
@@ -252,10 +253,10 @@ class HttpTransport {
         }
         catch (err) {
             if (signal?.aborted)
-                throw new McpError(`${msg.method ?? "请求"} 已取消`);
+                throw new McpError(tr(`${msg.method ?? "请求"} 已取消`, `${msg.method ?? "request"} was canceled`));
             if (ctrl.signal.aborted)
-                throw new McpError(`${msg.method ?? "请求"} 超过 ${Math.round(timeoutMs / 1000)}s 未响应`);
-            throw new McpError(`连接 ${this.url} 失败:${err.message}`);
+                throw new McpError(tr(`${msg.method ?? "请求"} 超过 ${Math.round(timeoutMs / 1000)}s 未响应`, `${msg.method ?? "request"} timed out after ${Math.round(timeoutMs / 1000)}s`));
+            throw new McpError(tr(`连接 ${this.url} 失败:${err.message}`, `Failed to connect to ${this.url}: ${err.message}`));
         }
         finally {
             clearTimeout(timer);
@@ -270,7 +271,7 @@ class HttpTransport {
         if (!resp.ok) {
             const text = (await resp.text().catch(() => "")).slice(0, 300);
             if (resp.status === 401 || resp.status === 403) {
-                throw new McpError(`服务拒绝访问(HTTP ${resp.status}),请检查 headers 里的鉴权信息${text ? `:${text}` : ""}`, resp.status);
+                throw new McpError(tr(`服务拒绝访问(HTTP ${resp.status}),请检查 headers 里的鉴权信息${text ? `:${text}` : ""}`, `Access denied by server (HTTP ${resp.status}); check the auth headers${text ? `: ${text}` : ""}`), resp.status);
             }
             throw new McpError(`HTTP ${resp.status}${text ? `:${text}` : ""}`, resp.status);
         }
@@ -292,13 +293,13 @@ class HttpTransport {
                     return m;
             }
         }
-        throw new McpError(`服务没有返回 ${msg.method ?? "请求"} 的结果(content-type ${ctype || "unknown"})`);
+        throw new McpError(tr(`服务没有返回 ${msg.method ?? "请求"} 的结果(content-type ${ctype || "unknown"})`, `Server returned no result for ${msg.method ?? "request"} (content-type ${ctype || "unknown"})`));
     }
     async notify(msg) {
         const resp = await this.post(msg, 10_000);
         // 规范要求 202;有些实现回 200/204,都当成功。鉴权失败要冒出来
         if (resp.status === 401 || resp.status === 403)
-            throw new McpError(`服务拒绝访问(HTTP ${resp.status})`, resp.status);
+            throw new McpError(tr(`服务拒绝访问(HTTP ${resp.status})`, `Access denied by server (HTTP ${resp.status})`), resp.status);
         await resp.body?.cancel().catch(() => { });
     }
     async close() {
@@ -409,7 +410,7 @@ export class McpClient {
     async rpc(method, params, timeoutMs, signal) {
         const transport = this.transport;
         if (!transport)
-            throw new McpError("尚未连接");
+            throw new McpError(tr("尚未连接", "Not connected"));
         const id = this.nextId++;
         const resp = await transport.request({ jsonrpc: "2.0", id, method, params }, timeoutMs, signal);
         if (resp.error) {

package/dist/mcp/command.d.ts

@@ -1,7 +1,7 @@
 import { type McpServerConfig } from "./config.js";
 /**
- * `u1s1 mcp` 子命令:管理自定义 MCP 服务。
- * add 时先连一次拉工具清单再落盘,坏配置不会拖慢每次启动。
+ * `u1s1 mcp` 子命令:管理自定义 MCP 服务,写的是 pi 内置 MCP 读的 agent/mcp.json。
+ * add 时先连一次确认能用再落盘;对话里的连接、登录、停用交给 pi 的 /mcp。
  */
 export declare function printMcpHelp(): void;
 export declare class McpUsageError extends Error {

package/dist/mcp/command.js

@@ -2,14 +2,37 @@ import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
 import { formatHomePath } from "../brand.js";
+import { isEnglish, tr } from "../i18n.js";
 import { McpClient } from "./client.js";
-import { loadMcpConfig, loadMcpToolCache, maskSecret, MCP_SERVER_NAME_RE, mcpConfigPath, normalizeServerConfig, parseKeyValue, saveMcpConfig, saveMcpToolCache, } from "./config.js";
-import { mcpToolName } from "./tools.js";
+import { loadMcpConfigDetailed, loadMcpToolCache, maskSecret, MCP_SERVER_NAME_RE, mcpConfigPath, migrateLegacyMcpConfig, normalizeServerConfig, parseKeyValue, saveMcpToolCache, updateMcpServers, } from "./config.js";
+import { piMcpToolName } from "./tools.js";
 /**
- * `u1s1 mcp` 子命令:管理自定义 MCP 服务。
- * add 时先连一次拉工具清单再落盘,坏配置不会拖慢每次启动。
+ * `u1s1 mcp` 子命令:管理自定义 MCP 服务,写的是 pi 内置 MCP 读的 agent/mcp.json。
+ * add 时先连一次确认能用再落盘;对话里的连接、登录、停用交给 pi 的 /mcp。
  */
 export function printMcpHelp() {
+    if (isEnglish()) {
+        console.log("");
+        console.log("  Configure third-party MCP servers so their tools (search, databases, browsers…) are available in chat");
+        console.log("");
+        console.log("  Usage:");
+        console.log("    u1s1 mcp add <name> <command> [args...]  Local command server (stdio), e.g.:");
+        console.log("        u1s1 mcp add tavily --env TAVILY_API_KEY=tvly-xxx npx -y tavily-mcp");
+        console.log("    u1s1 mcp add <name> --url <url>          HTTP server (Streamable HTTP), e.g.:");
+        console.log("        u1s1 mcp add exa --url https://mcp.exa.ai/mcp --header \"Authorization: Bearer xxx\"");
+        console.log("        --env K=V / --header \"K: V\" can be repeated; --force saves even if connecting fails");
+        console.log("    u1s1 mcp list                            List configured servers and their tools");
+        console.log("    u1s1 mcp test <name>                     Connect once and list the tools it provides");
+        console.log("    u1s1 mcp remove <name>                   Remove a server");
+        console.log("    u1s1 mcp import [--dry-run]              Import from Claude Code config (~/.claude.json, project .mcp.json)");
+        console.log("");
+        console.log(`  Config is stored in ${formatHomePath(mcpConfigPath())} (same format as Claude Code's mcpServers; safe to edit by hand).`);
+        console.log("  It stays on this machine and is never uploaded. Tools are available from your next chat, named mcp__<name>__<tool>.");
+        console.log("  In chat, /mcp shows server status and lets you sign in (OAuth), reconnect, or disable a server.");
+        console.log("  Command servers run locally with your permissions; only add sources you trust.");
+        console.log("");
+        return;
+    }
     console.log("");
     console.log("  配置第三方 MCP 服务,让它提供的工具(搜索、数据库、浏览器…)在对话里直接可用");
     console.log("");
@@ -25,7 +48,8 @@ export function printMcpHelp() {
     console.log("    u1s1 mcp import [--dry-run]            从 Claude Code 的配置(~/.claude.json、项目 .mcp.json)导入");
     console.log("");
     console.log(`  配置存在 ${formatHomePath(mcpConfigPath())}(与 Claude Code 的 mcpServers 同格式,可手改),`);
-    console.log("  只在本机,不会上传。下次进对话工具即生效,名字形如 mcp_名称_工具。");
+    console.log("  只在本机,不会上传。下次进对话工具即生效,名字形如 mcp__名称__工具。");
+    console.log("  对话里输入 /mcp 可看连接状态,还能登录(OAuth)、重连、停用服务。");
     console.log("  命令型服务会以你的权限在本机运行,只添加可信来源。");
     console.log("");
 }
@@ -55,12 +79,12 @@ async function probe(name, server) {
 }
 function printTools(name, tools) {
     if (tools.length === 0) {
-        console.log("  (该服务没有提供任何工具)");
+        console.log(tr("  (该服务没有提供任何工具)", "  (this server provides no tools)"));
         return;
     }
     for (const t of tools) {
         const desc = t.description.replace(/\s+/g, " ").trim();
-        console.log(`  · ${mcpToolName(name, t.name)}${desc ? `  ${desc.length > 80 ? `${desc.slice(0, 79)}…` : desc}` : ""}`);
+        console.log(`  · ${piMcpToolName(name, t.name)}${desc ? `  ${desc.length > 80 ? `${desc.slice(0, 79)}…` : desc}` : ""}`);
     }
 }
 function cacheTools(name, tools, serverName) {
@@ -86,24 +110,24 @@ function applyAddOption(arg, args, cursor, opts) {
     else if (arg === "--url" || arg.startsWith("--url=")) {
         opts.url = optionValue(arg, "--url=", args, cursor);
         if (!opts.url)
-            fail("--url 后面要跟地址");
+            fail(tr("--url 后面要跟地址", "--url requires a URL"));
     }
     else if (arg === "--env" || arg === "-e" || arg.startsWith("--env=")) {
         const raw = optionValue(arg, "--env=", args, cursor);
         const kv = raw ? parseKeyValue(raw, "=") : undefined;
         if (!kv)
-            fail(`--env 要写成 KEY=VALUE:${raw ?? ""}`);
+            fail(tr(`--env 要写成 KEY=VALUE:${raw ?? ""}`, `--env must be KEY=VALUE: ${raw ?? ""}`));
         opts.env[kv[0]] = kv[1];
     }
     else if (arg === "--header" || arg === "-H" || arg.startsWith("--header=")) {
         const raw = optionValue(arg, "--header=", args, cursor);
         const kv = raw ? parseKeyValue(raw, ":") : undefined;
         if (!kv)
-            fail(`--header 要写成 "Name: value":${raw ?? ""}`);
+            fail(tr(`--header 要写成 "Name: value":${raw ?? ""}`, `--header must be "Name: value": ${raw ?? ""}`));
         opts.headers[kv[0]] = kv[1];
     }
     else if (arg.startsWith("-") && arg.length > 1) {
-        fail(`不认识的选项 ${arg}(命令自己的参数请放在命令后面,或用 -- 隔开)`);
+        fail(tr(`不认识的选项 ${arg}(命令自己的参数请放在命令后面,或用 -- 隔开)`, `Unknown option ${arg} (put the command's own arguments after the command, or separate them with --)`));
     }
     else {
         opts.command = arg;
@@ -113,26 +137,26 @@ function applyAddOption(arg, args, cursor, opts) {
 function serverFromAddOptions(name, opts) {
     const { url, command, force } = opts;
     if (url && command)
-        fail("--url 和命令只能二选一");
+        fail(tr("--url 和命令只能二选一", "Use either --url or a command, not both"));
     if (url) {
         if (!/^https?:\/\//i.test(url))
-            fail(`--url 必须是 http(s) 地址:${url}`);
+            fail(tr(`--url 必须是 http(s) 地址:${url}`, `--url must be an http(s) URL: ${url}`));
         if (Object.keys(opts.env).length)
-            fail("HTTP 型服务不支持 --env,鉴权请用 --header");
+            fail(tr("HTTP 型服务不支持 --env,鉴权请用 --header", "HTTP servers don't support --env; use --header for auth"));
         return { name, server: { type: "http", url, headers: opts.headers }, force };
     }
     if (!command)
-        fail("请给出启动命令(如 npx -y some-mcp-server)或 --url 地址");
+        fail(tr("请给出启动命令(如 npx -y some-mcp-server)或 --url 地址", "Provide a start command (e.g. npx -y some-mcp-server) or --url"));
     if (Object.keys(opts.headers).length)
-        fail("命令型服务不支持 --header,请用 --env 传密钥");
+        fail(tr("命令型服务不支持 --header,请用 --env 传密钥", "Command servers don't support --header; pass secrets with --env"));
     return { name, server: { type: "stdio", command, args: opts.commandArgs, env: opts.env }, force };
 }
 export function parseAddArgs(args) {
     const name = args[0];
     if (!name || name.startsWith("-"))
-        fail("请给服务起个名字,例:u1s1 mcp add tavily npx -y tavily-mcp");
+        fail(tr("请给服务起个名字,例:u1s1 mcp add tavily npx -y tavily-mcp", "Give the server a name, e.g. u1s1 mcp add tavily npx -y tavily-mcp"));
     if (!MCP_SERVER_NAME_RE.test(name))
-        fail(`服务名只能用小写字母、数字、- 和 _,且以字母或数字开头(最长 32 位):${name}`);
+        fail(tr(`服务名只能用小写字母、数字、- 和 _,且以字母或数字开头(最长 32 位):${name}`, `Server names may only use lowercase letters, digits, - and _, must start with a letter or digit, and be at most 32 characters: ${name}`));
     const opts = { commandArgs: [], env: {}, headers: {}, force: false };
     const cursor = { i: 1 };
     for (; cursor.i < args.length; cursor.i++) {
@@ -145,7 +169,7 @@ export function parseAddArgs(args) {
             opts.command = args[cursor.i + 1];
             opts.commandArgs.push(...args.slice(cursor.i + 2));
             if (opts.command === undefined)
-                fail("-- 后面要跟命令");
+                fail(tr("-- 后面要跟命令", "-- must be followed by a command"));
             break;
         }
         applyAddOption(a, args, cursor, opts);
@@ -154,10 +178,10 @@ export function parseAddArgs(args) {
 }
 async function addCommand(args) {
     const { name, server, force } = parseAddArgs(args);
-    const config = loadMcpConfig();
-    const existed = Boolean(config.mcpServers[name]);
-    console.log(`${existed ? "更新" : "添加"} MCP 服务 ${name}:${describeServer(server)}`);
-    console.log("连接中…");
+    const { config, disabled } = loadMcpConfigDetailed();
+    const existed = Boolean(config.mcpServers[name]) || disabled.includes(name);
+    console.log(tr(`${existed ? "更新" : "添加"} MCP 服务 ${name}:${describeServer(server)}`, `${existed ? "Updating" : "Adding"} MCP server ${name}: ${describeServer(server)}`));
+    console.log(tr("连接中…", "Connecting…"));
     let tools = [];
     let serverName;
     let probed = false;
@@ -167,54 +191,69 @@ async function addCommand(args) {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        if (!force)
-            fail(`连接失败,未保存:${message}\n  确认命令/地址和密钥无误后重试;想先保存加 --force`);
-        console.error(`⚠ 连接失败:${message}\n  已按 --force 保存,进对话前请用 u1s1 mcp test ${name} 确认可用`);
+        if (!force) {
+            // 无 headers 的 HTTP 服务被拒,多半是要 OAuth 登录:先存下,进对话在 /mcp 里登
+            const oauthHint = server.type === "http" && !Object.keys(server.headers).length && /HTTP 40[13]/.test(message)
+                ? tr("\n  如果这个服务用浏览器登录(OAuth),加 --force 保存,进对话后输入 /mcp 选它登录", "\n  If this server signs in through the browser (OAuth), add --force to save it, then sign in from /mcp in chat")
+                : "";
+            fail(tr(`连接失败,未保存:${message}\n  确认命令/地址和密钥无误后重试;想先保存加 --force${oauthHint}`, `Connection failed; nothing saved: ${message}\n  Check the command/URL and keys, then retry. To save anyway, add --force${oauthHint}`));
+        }
+        console.error(tr(`⚠ 连接失败:${message}\n  已按 --force 保存,进对话前请用 u1s1 mcp test ${name} 确认可用`, `⚠ Connection failed: ${message}\n  Saved anyway (--force). Run u1s1 mcp test ${name} before using it in chat`));
     }
-    config.mcpServers[name] = server;
-    saveMcpConfig(config);
+    updateMcpServers({ [name]: server });
     if (probed) {
         cacheTools(name, tools, serverName);
-        console.log(`✓ 已连接${serverName ? ` ${serverName}` : ""},提供 ${tools.length} 个工具:`);
+        console.log(tr(`✓ 已连接${serverName ? ` ${serverName}` : ""},提供 ${tools.length} 个工具:`, `✓ Connected${serverName ? ` to ${serverName}` : ""}, ${tools.length} tool(s):`));
         printTools(name, tools);
     }
     else {
         dropCache(name);
     }
-    console.log(`✓ 已保存到 ${formatHomePath(mcpConfigPath())},下次进入对话即可使用`);
-    if (server.type === "stdio")
-        console.log("  提示:命令型服务会以你的权限在本机运行,只添加可信来源。");
+    console.log(tr(`✓ 已保存到 ${formatHomePath(mcpConfigPath())},下次进入对话即可使用`, `✓ Saved to ${formatHomePath(mcpConfigPath())}; available from your next chat`));
+    if (server.type === "stdio") {
+        console.log(tr("  提示:命令型服务会以你的权限在本机运行,只添加可信来源。", "  Note: command servers run locally with your permissions; only add sources you trust."));
+    }
 }
 function listCommand() {
-    const config = loadMcpConfig();
+    const { config, invalid, disabled } = loadMcpConfigDetailed();
     const names = Object.keys(config.mcpServers);
-    if (names.length === 0) {
-        console.log("还没有配置 MCP 服务。用 u1s1 mcp add 添加,或 u1s1 mcp import 从 Claude Code 导入。");
+    if (names.length === 0 && disabled.length === 0 && invalid.length === 0) {
+        console.log(tr("还没有配置 MCP 服务。用 u1s1 mcp add 添加,或 u1s1 mcp import 从 Claude Code 导入。", "No MCP servers configured yet. Add one with u1s1 mcp add, or import from Claude Code with u1s1 mcp import."));
         return;
     }
     const cache = loadMcpToolCache();
-    console.log(`已配置 ${names.length} 个 MCP 服务(${formatHomePath(mcpConfigPath())}):`);
+    const total = names.length + disabled.length + invalid.length;
+    console.log(tr(`已配置 ${total} 个 MCP 服务(${formatHomePath(mcpConfigPath())}):`, `${total} MCP server(s) configured (${formatHomePath(mcpConfigPath())}):`));
     for (const name of names) {
         const server = config.mcpServers[name];
         const cached = cache.servers[name];
         console.log("");
         console.log(`${name}  [${server.type}]  ${describeServer(server)}`);
         if (!cached) {
-            console.log("  工具清单尚未获取(进对话时会自动连一次;也可 u1s1 mcp test 看看)");
+            console.log(tr(`  还没检测过工具清单,u1s1 mcp test ${name} 看看`, `  Tool list not checked yet; run u1s1 mcp test ${name}`));
             continue;
         }
-        console.log(`  ${cached.tools.length} 个工具(${cached.fetchedAt.slice(0, 16).replace("T", " ")} 获取):`);
+        const fetched = cached.fetchedAt.slice(0, 16).replace("T", " ");
+        console.log(tr(`  ${cached.tools.length} 个工具(${fetched} 检测):`, `  ${cached.tools.length} tool(s) (checked ${fetched}):`));
         printTools(name, cached.tools);
     }
+    for (const name of disabled) {
+        console.log("");
+        console.log(tr(`${name}  [已停用,对话里 /mcp 可重新启用]`, `${name}  [disabled; re-enable it from /mcp in chat]`));
+    }
+    for (const name of invalid) {
+        console.log("");
+        console.log(tr(`${name}  [配置无效,请检查这一条]`, `${name}  [invalid entry; please check it]`));
+    }
 }
 async function testCommand(name) {
     if (!name)
-        fail("用法:u1s1 mcp test 名称");
-    const config = loadMcpConfig();
+        fail(tr("用法:u1s1 mcp test 名称", "Usage: u1s1 mcp test <name>"));
+    const { config } = loadMcpConfigDetailed();
     const server = config.mcpServers[name];
     if (!server)
-        fail(`没有叫 ${name} 的 MCP 服务,u1s1 mcp list 看看已有的`);
-    console.log(`连接 ${name}:${describeServer(server)}`);
+        fail(tr(`没有叫 ${name} 的 MCP 服务,u1s1 mcp list 看看已有的`, `No MCP server named ${name}; run u1s1 mcp list to see configured servers`));
+    console.log(tr(`连接 ${name}:${describeServer(server)}`, `Connecting to ${name}: ${describeServer(server)}`));
     const started = Date.now();
     let tools;
     let serverName;
@@ -222,22 +261,23 @@ async function testCommand(name) {
         ({ tools, serverName } = await probe(name, server));
     }
     catch (err) {
-        fail(`连接失败:${err instanceof Error ? err.message : String(err)}`);
+        const message = err instanceof Error ? err.message : String(err);
+        fail(tr(`连接失败:${message}`, `Connection failed: ${message}`));
     }
     cacheTools(name, tools, serverName);
-    console.log(`✓ 连接成功${serverName ? `(${serverName})` : ""},${Date.now() - started} ms,提供 ${tools.length} 个工具:`);
+    const ms = Date.now() - started;
+    console.log(tr(`✓ 连接成功${serverName ? `(${serverName})` : ""},${ms} ms,提供 ${tools.length} 个工具:`, `✓ Connected${serverName ? ` (${serverName})` : ""} in ${ms} ms, ${tools.length} tool(s):`));
     printTools(name, tools);
 }
 function removeCommand(name) {
     if (!name)
-        fail("用法:u1s1 mcp remove 名称");
-    const config = loadMcpConfig();
-    if (!config.mcpServers[name])
-        fail(`没有叫 ${name} 的 MCP 服务`);
-    delete config.mcpServers[name];
-    saveMcpConfig(config);
+        fail(tr("用法:u1s1 mcp remove 名称", "Usage: u1s1 mcp remove <name>"));
+    const { config, disabled } = loadMcpConfigDetailed();
+    if (!config.mcpServers[name] && !disabled.includes(name))
+        fail(tr(`没有叫 ${name} 的 MCP 服务`, `No MCP server named ${name}`));
+    updateMcpServers({ [name]: undefined });
     dropCache(name);
-    console.log(`✓ 已删除 ${name}`);
+    console.log(tr(`✓ 已删除 ${name}`, `✓ Removed ${name}`));
 }
 /** Claude Code 的 MCP 配置:~/.claude.json(用户级 + 各项目)与项目 .mcp.json */
 export function collectClaudeMcpServers(home = homedir(), cwd = process.cwd()) {
@@ -253,11 +293,11 @@ export function collectClaudeMcpServers(home = homedir(), cwd = process.cwd()) {
                 continue;
             const server = normalizeServerConfig(raw);
             if (!server) {
-                unsupported.push(`${name}(${source})`);
+                unsupported.push(tr(`${name}(${source})`, `${name} (${source})`));
                 continue;
             }
             if (!MCP_SERVER_NAME_RE.test(name)) {
-                unsupported.push(`${name}(${source},名字不合规)`);
+                unsupported.push(tr(`${name}(${source},名字不合规)`, `${name} (${source}, invalid name)`));
                 continue;
             }
             seen.add(key);
@@ -282,7 +322,7 @@ export function collectClaudeMcpServers(home = homedir(), cwd = process.cwd()) {
     if (projects && typeof projects === "object") {
         const entry = projects[resolve(cwd)];
         if (entry && typeof entry === "object")
-            take(entry["mcpServers"], "~/.claude.json 项目配置");
+            take(entry["mcpServers"], tr("~/.claude.json 项目配置", "~/.claude.json project config"));
     }
     take(user?.["mcpServers"], "~/.claude.json");
     return { candidates, unsupported };
@@ -291,32 +331,30 @@ async function importCommand(args) {
     const dryRun = args.includes("--dry-run");
     const { candidates, unsupported } = collectClaudeMcpServers();
     for (const u of unsupported)
-        console.log(`⚠ 跳过 ${u}:只支持命令型(stdio)和 HTTP 型服务`);
+        console.log(tr(`⚠ 跳过 ${u}:只支持命令型(stdio)和 HTTP 型服务`, `⚠ Skipped ${u}: only command (stdio) and HTTP servers are supported`));
     if (candidates.length === 0) {
-        console.log("没有在 Claude Code 的配置里找到可导入的 MCP 服务。");
+        console.log(tr("没有在 Claude Code 的配置里找到可导入的 MCP 服务。", "No importable MCP servers found in Claude Code's config."));
         return;
     }
-    const config = loadMcpConfig();
-    console.log(`找到 ${candidates.length} 个 MCP 服务:`);
+    const { config, disabled } = loadMcpConfigDetailed();
+    console.log(tr(`找到 ${candidates.length} 个 MCP 服务:`, `Found ${candidates.length} MCP server(s):`));
     for (const c of candidates) {
-        const tag = config.mcpServers[c.name] ? "(已存在,将覆盖)" : "";
+        const tag = config.mcpServers[c.name] || disabled.includes(c.name) ? tr("(已存在,将覆盖)", "(exists, will be overwritten)") : "";
         console.log(`  ${c.name}  ${describeServer(c.server)}  ← ${c.source} ${tag}`);
     }
     if (dryRun) {
-        console.log("--dry-run:未写盘");
+        console.log(tr("--dry-run:未写盘", "--dry-run: nothing written"));
         return;
     }
-    for (const c of candidates)
-        config.mcpServers[c.name] = c.server;
-    saveMcpConfig(config);
-    console.log(`✓ 已保存到 ${formatHomePath(mcpConfigPath())}`);
+    updateMcpServers(Object.fromEntries(candidates.map((c) => [c.name, c.server])));
+    console.log(tr(`✓ 已保存到 ${formatHomePath(mcpConfigPath())}`, `✓ Saved to ${formatHomePath(mcpConfigPath())}`));
     let failed = 0;
     for (const c of candidates) {
-        process.stdout.write(`连接 ${c.name}… `);
+        process.stdout.write(tr(`连接 ${c.name}… `, `Connecting to ${c.name}… `));
         try {
             const { tools, serverName } = await probe(c.name, c.server);
             cacheTools(c.name, tools, serverName);
-            console.log(`✓ ${tools.length} 个工具`);
+            console.log(tr(`✓ ${tools.length} 个工具`, `✓ ${tools.length} tool(s)`));
         }
         catch (err) {
             failed += 1;
@@ -324,12 +362,14 @@ async function importCommand(args) {
             console.log(`✗ ${(err instanceof Error ? err.message : String(err)).split("\n")[0]}`);
         }
     }
-    if (failed)
-        console.log(`${failed} 个服务连接失败,进对话前请用 u1s1 mcp test 名称 排查(失败的服务不会影响其他工具)`);
+    if (failed) {
+        console.log(tr(`${failed} 个服务连接失败,进对话前请用 u1s1 mcp test 名称 排查(失败的服务不会影响其他工具)`, `${failed} server(s) failed to connect; run u1s1 mcp test <name> before chatting (failed servers don't affect other tools)`));
+    }
 }
 export async function mcpCommand(args) {
     const sub = args[0];
     try {
+        migrateLegacyMcpConfig();
         if (!sub || sub === "help" || sub === "-h" || sub === "--help") {
             printMcpHelp();
             return;
@@ -344,7 +384,7 @@ export async function mcpCommand(args) {
             return removeCommand(args[1]);
         if (sub === "import")
             return await importCommand(args.slice(1));
-        fail(`不认识的子命令 ${sub},u1s1 mcp --help 看用法`);
+        fail(tr(`不认识的子命令 ${sub},u1s1 mcp --help 看用法`, `Unknown subcommand ${sub}; see u1s1 mcp --help`));
     }
     catch (err) {
         if (err instanceof McpUsageError) {

package/dist/mcp/config.d.ts

@@ -1,7 +1,8 @@
 /**
- * 自定义 MCP 服务配置:~/.u1s1/mcp.json,形状与 Claude Code 的 mcpServers 一致,
- * 方便手改或从别的工具照抄。里面可能有 API Key(env / headers),所以走
- * writePrivateFile(0600),并且永远不上传、不进遥测。
+ * 自定义 MCP 服务配置:~/.u1s1/agent/mcp.json,即 pi 内置 MCP 读的用户级配置,
+ * 形状与 Claude Code 的 mcpServers 一致,方便手改或从别的工具照抄。里面可能有
+ * API Key(env / headers),所以走 writePrivateFile(0600),并且永远不上传、不进遥测。
+ * pi 的 /mcp 会往条目里写 exposure、enabled 等字段,这里改写时逐条保留原样。
  */
 export interface McpStdioServer {
     type: "stdio";
@@ -32,9 +33,11 @@ export interface McpToolCache {
     version: 1;
     servers: Record<string, McpCachedServer>;
 }
-/** 服务名同时用作工具名前缀,限成模型 API 都接受的字符。 */
+/** u1s1 mcp add 收的服务名:比 pi 的规则更严,工具名前缀短且全小写。 */
 export declare const MCP_SERVER_NAME_RE: RegExp;
 export declare function mcpConfigPath(): string;
+/** ≤1.12 的配置位置,启动时迁到 mcpConfigPath()。 */
+export declare function legacyMcpConfigPath(): string;
 export declare function mcpCachePath(): string;
 /**
  * 把一条 mcpServers 记录规整成内部形状。兼容 Claude Code 的写法:
@@ -42,13 +45,26 @@ export declare function mcpCachePath(): string;
  * SSE 传输)不支持,返回 undefined 让调用方提示。
  */
 export declare function normalizeServerConfig(raw: unknown): McpServerConfig | undefined;
+/** enabled:false(在 /mcp 里停用)的服务不进 config,名字放进 disabled。 */
 export declare function parseMcpConfig(raw: unknown): {
     config: McpConfig;
     invalid: string[];
+    disabled: string[];
 };
 export declare function loadMcpConfig(path?: string): McpConfig;
-/** 写盘时保留用户手写的其他顶层字段,只换 mcpServers。 */
-export declare function saveMcpConfig(config: McpConfig, path?: string): void;
+export declare function loadMcpConfigDetailed(path?: string): ReturnType<typeof parseMcpConfig>;
+/**
+ * 改写 mcpServers:value 为 undefined 即删除。其余顶层字段与没动到的条目原样保留;
+ * 覆盖已有条目时只换传输字段(命令/地址/env/headers),description、exposure 等留着。
+ */
+export declare function updateMcpServers(changes: Record<string, McpServerConfig | undefined>, path?: string): void;
+/**
+ * 把 ≤1.12 的 ~/.u1s1/mcp.json 并进 pi 读的 agent/mcp.json(同名以新文件为准),
+ * 旧文件改名留底。条目原样搬(补上 direct,保持原来工具直接给模型),格式本来就一致;
+ * sse 等 pi 不支持的条目由 pi 报错跳过。
+ * 返回搬过去的服务名;没有旧文件时什么也不做。
+ */
+export declare function migrateLegacyMcpConfig(legacyPath?: string, path?: string): string[];
 export declare function loadMcpToolCache(path?: string): McpToolCache;
 export declare function saveMcpToolCache(cache: McpToolCache, path?: string): void;
 /** 工具列表是否变化(名称 + 参数结构),用来决定要不要提示重启。 */