u1s1-cli 1.12.0 → 1.13.0

package/dist/agent-setup.d.ts

@@ -14,6 +14,16 @@ export declare function ensureBrandPrompt(shell: ShellDoctorResult): void;
  * them while a diverged user value becomes user-owned.
  */
 export declare function applyModelThinkingDefaults(settings: Record<string, unknown>, models: ModelDef[]): boolean;
+/**
+ * pi 内置 codemode 默认不开,u1s1 给每个用户开一次(`+codemode` 只加不替换默认工具)。
+ * 标记写下后不再碰:用户在 defaultTools 里删掉或写 -codemode 都算用户的选择。
+ */
+export declare function applyCodemodeDefault(settings: Record<string, unknown>): boolean;
+/**
+ * pi 1.0 内置 llama.cpp 扩展(本地模型 provider + /llama),u1s1 走网关用不上,默认关一次。
+ * 用户在 extensions 里自己写过 builtin:llama.cpp 的任何开关就不动;标记写下后同样不再碰。
+ */
+export declare function applyLlamaDisabledDefault(settings: Record<string, unknown>): boolean;
 /** Defaults that don't overwrite values the user already set. */
 export declare function ensureDefaultSettings(models?: ModelDef[]): void;
 /** ≤0.4.0 wrote u1s1-dark/u1s1-light into the pi themes dir; remove them. */
@@ -56,9 +66,10 @@ export declare function writeErrorHumanizeExtension(): void;
  */
 export declare function writeAnnouncementsExtension(): void;
 /**
- * 生成「自定义 MCP 服务」扩展到 <agentDir>/extensions/u1s1-mcp.js。
- * 读 ~/.u1s1/mcp.json,把每个服务的工具注册成 mcp_<服务>_<工具>;逻辑在 mcp/extension.ts,
- * 这里只负责投影(Desktop App 共享)。没配置任何服务时扩展直接返回,零开销。
+ * 生成「自定义 MCP 服务」扩展到 <agentDir>/extensions/u1s1-mcp.js,只给没有内置 MCP 的
+ * 旧引擎用(Desktop App 的 pi-web-ui 还是 0.83):读 agent/mcp.json,把工具注册成
+ * mcp_<服务>_<工具>,逻辑在 mcp/extension.ts。pi ≥0.99 有 pi.registerMcpServer,说明内置
+ * MCP 会读同一份配置,扩展直接让位。投影前先把 ≤1.12 的 ~/.u1s1/mcp.json 迁过去。
  * 子会话(spawn_subagent)里不挂 MCP 工具:避免每个子进程都拉起一份服务。
  */
 export declare function writeMcpExtension(): void;

package/dist/agent-setup.js

@@ -3,6 +3,7 @@ import { fileURLToPath } from "node:url";
 import { dirname, join } from "node:path";
 import { activeSite, agentDir, CUSTOM_ENDPOINTS, ENDPOINT_ID_RE, effectiveContextWindow, endpointKeyEnvName, MODELS, readCompactionBudgetSetting, PROVIDER_ID, UNKNOWN_MODEL_COST, VERSION, } from "./config.js";
 import { tr } from "./i18n.js";
+import { migrateLegacyMcpConfig } from "./mcp/config.js";
 /**
  * 系统提示里的品牌人设。中国站面向编程新手、兜底语言中文(保持原文一字不差);
  * 国际站面向开发者、兜底语言英文。按站点而不是界面语言判定,用时求值(配置可能晚于 import 才读)。
@@ -85,6 +86,8 @@ function bundledPiVersion() {
     }
 }
 const THINKING_DEFAULTS_MARKER = "u1s1ModelThinkingDefaults";
+const CODEMODE_DEFAULT_MARKER = "u1s1CodemodeDefault";
+const LLAMA_DISABLED_MARKER = "u1s1LlamaDisabledDefault";
 function recordValue(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value)
         ? value
@@ -128,6 +131,37 @@ export function applyModelThinkingDefaults(settings, models) {
     }
     return changed;
 }
+/**
+ * pi 内置 codemode 默认不开,u1s1 给每个用户开一次(`+codemode` 只加不替换默认工具)。
+ * 标记写下后不再碰:用户在 defaultTools 里删掉或写 -codemode 都算用户的选择。
+ */
+export function applyCodemodeDefault(settings) {
+    if (settings[CODEMODE_DEFAULT_MARKER] === true)
+        return false;
+    const tools = Array.isArray(settings["defaultTools"])
+        ? settings["defaultTools"].filter((t) => typeof t === "string")
+        : [];
+    if (!tools.some((t) => t.replace(/^[+-]/, "") === "codemode"))
+        settings["defaultTools"] = [...tools, "+codemode"];
+    settings[CODEMODE_DEFAULT_MARKER] = true;
+    return true;
+}
+/**
+ * pi 1.0 内置 llama.cpp 扩展(本地模型 provider + /llama),u1s1 走网关用不上,默认关一次。
+ * 用户在 extensions 里自己写过 builtin:llama.cpp 的任何开关就不动;标记写下后同样不再碰。
+ */
+export function applyLlamaDisabledDefault(settings) {
+    if (settings[LLAMA_DISABLED_MARKER] === true)
+        return false;
+    const entries = Array.isArray(settings["extensions"])
+        ? settings["extensions"].filter((e) => typeof e === "string")
+        : [];
+    if (!entries.some((e) => e.replace(/^[+!-]/, "") === "builtin:llama.cpp")) {
+        settings["extensions"] = [...entries, "-builtin:llama.cpp"];
+    }
+    settings[LLAMA_DISABLED_MARKER] = true;
+    return true;
+}
 /** Defaults that don't overwrite values the user already set. */
 export function ensureDefaultSettings(models = []) {
     mkdirSync(agentDir, { recursive: true });
@@ -176,6 +210,15 @@ export function ensureDefaultSettings(models = []) {
         settings["autoUpdate"] = true;
         changed = true;
     }
+    // pi 1.0 起默认全屏;u1s1 的精简 UI 与滚动习惯按常规模式调的,未选过的用户保持常规
+    if (!("tuiMode" in settings)) {
+        settings["tuiMode"] = "regular";
+        changed = true;
+    }
+    if (applyCodemodeDefault(settings))
+        changed = true;
+    if (applyLlamaDisabledDefault(settings))
+        changed = true;
     if (applyModelThinkingDefaults(settings, models))
         changed = true;
     // ≤0.4.0 shipped branded themes and forced them as default; the files are
@@ -353,12 +396,19 @@ export function writeAnnouncementsExtension() {
         `}\n`);
 }
 /**
- * 生成「自定义 MCP 服务」扩展到 <agentDir>/extensions/u1s1-mcp.js。
- * 读 ~/.u1s1/mcp.json,把每个服务的工具注册成 mcp_<服务>_<工具>;逻辑在 mcp/extension.ts,
- * 这里只负责投影(Desktop App 共享)。没配置任何服务时扩展直接返回,零开销。
+ * 生成「自定义 MCP 服务」扩展到 <agentDir>/extensions/u1s1-mcp.js,只给没有内置 MCP 的
+ * 旧引擎用(Desktop App 的 pi-web-ui 还是 0.83):读 agent/mcp.json,把工具注册成
+ * mcp_<服务>_<工具>,逻辑在 mcp/extension.ts。pi ≥0.99 有 pi.registerMcpServer,说明内置
+ * MCP 会读同一份配置,扩展直接让位。投影前先把 ≤1.12 的 ~/.u1s1/mcp.json 迁过去。
  * 子会话(spawn_subagent)里不挂 MCP 工具:避免每个子进程都拉起一份服务。
  */
 export function writeMcpExtension() {
+    try {
+        migrateLegacyMcpConfig();
+    }
+    catch {
+        // 迁移失败不挡启动:旧文件还在,下次再试
+    }
     const dir = join(agentDir, "extensions");
     mkdirSync(dir, { recursive: true });
     const url = new URL("./mcp/extension.js", import.meta.url).href;
@@ -366,6 +416,7 @@ export function writeMcpExtension() {
     writeFileSync(join(dir, "u1s1-mcp.js"), `// 由 u1s1 每次启动自动生成,请勿手改\n` +
         `export default async function (pi) {\n` +
         `  if (process.env.U1S1_IN_SUBAGENT === "1") return;\n` +
+        `  if (typeof pi.registerMcpServer === "function") return;\n` +
         `  let registerMcpServers;\n` +
         `  try {\n` +
         `    registerMcpServers = (await import(${JSON.stringify(url)})).registerMcpServers;\n` +

package/dist/index.js

@@ -260,7 +260,7 @@ async function runAgent(cfg, args) {
     writeAnnouncementsExtension();
     // OpenRouter 应用归因：直连流量计入 u1s1 的公开排行
     writeAttributionExtension();
-    // 自定义 MCP 服务的工具(~/.u1s1/mcp.json,同样投影,Desktop 共享)
+    // 自定义 MCP 服务:TUI 用 pi 内置 MCP 读 agent/mcp.json;这里迁旧配置,并给 Desktop 的旧引擎投影兜底扩展
     writeMcpExtension();
     ensureTmuxKeyboardProtocol();
     // must be set before pi reads them (getAgentDir() reads at call time);

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

@@ -4,11 +4,11 @@ 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()) {
@@ -27,7 +27,8 @@ export function printMcpHelp() {
         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("  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;
@@ -47,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("");
 }
@@ -82,7 +84,7 @@ function printTools(name, tools) {
     }
     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) {
@@ -176,8 +178,8 @@ export function parseAddArgs(args) {
 }
 async function addCommand(args) {
     const { name, server, force } = parseAddArgs(args);
-    const config = loadMcpConfig();
-    const existed = Boolean(config.mcpServers[name]);
+    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 = [];
@@ -190,12 +192,15 @@ async function addCommand(args) {
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         if (!force) {
-            fail(tr(`连接失败,未保存:${message}\n  确认命令/地址和密钥无误后重试;想先保存加 --force`, `Connection failed; nothing saved: ${message}\n  Check the command/URL and keys, then retry. To save anyway, add --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(tr(`✓ 已连接${serverName ? ` ${serverName}` : ""},提供 ${tools.length} 个工具:`, `✓ Connected${serverName ? ` to ${serverName}` : ""}, ${tools.length} tool(s):`));
@@ -210,32 +215,41 @@ async function addCommand(args) {
     }
 }
 function listCommand() {
-    const config = loadMcpConfig();
+    const { config, invalid, disabled } = loadMcpConfigDetailed();
     const names = Object.keys(config.mcpServers);
-    if (names.length === 0) {
+    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(tr(`已配置 ${names.length} 个 MCP 服务(${formatHomePath(mcpConfigPath())}):`, `${names.length} MCP server(s) configured (${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(tr("  工具清单尚未获取(进对话时会自动连一次;也可 u1s1 mcp test 看看)", "  Tool list not fetched yet (fetched automatically when you start a chat, or run u1s1 mcp test)"));
+            console.log(tr(`  还没检测过工具清单,u1s1 mcp test ${name} 看看`, `  Tool list not checked yet; run u1s1 mcp test ${name}`));
             continue;
         }
         const fetched = cached.fetchedAt.slice(0, 16).replace("T", " ");
-        console.log(tr(`  ${cached.tools.length} 个工具(${fetched} 获取):`, `  ${cached.tools.length} tool(s) (fetched ${fetched}):`));
+        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(tr("用法:u1s1 mcp test 名称", "Usage: u1s1 mcp test <name>"));
-    const config = loadMcpConfig();
+    const { config } = loadMcpConfigDetailed();
     const server = config.mcpServers[name];
     if (!server)
         fail(tr(`没有叫 ${name} 的 MCP 服务,u1s1 mcp list 看看已有的`, `No MCP server named ${name}; run u1s1 mcp list to see configured servers`));
@@ -258,11 +272,10 @@ async function testCommand(name) {
 function removeCommand(name) {
     if (!name)
         fail(tr("用法:u1s1 mcp remove 名称", "Usage: u1s1 mcp remove <name>"));
-    const config = loadMcpConfig();
-    if (!config.mcpServers[name])
+    const { config, disabled } = loadMcpConfigDetailed();
+    if (!config.mcpServers[name] && !disabled.includes(name))
         fail(tr(`没有叫 ${name} 的 MCP 服务`, `No MCP server named ${name}`));
-    delete config.mcpServers[name];
-    saveMcpConfig(config);
+    updateMcpServers({ [name]: undefined });
     dropCache(name);
     console.log(tr(`✓ 已删除 ${name}`, `✓ Removed ${name}`));
 }
@@ -323,19 +336,17 @@ async function importCommand(args) {
         console.log(tr("没有在 Claude Code 的配置里找到可导入的 MCP 服务。", "No importable MCP servers found in Claude Code's config."));
         return;
     }
-    const config = loadMcpConfig();
+    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] ? tr("(已存在,将覆盖)", "(exists, will be overwritten)") : "";
+        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(tr("--dry-run:未写盘", "--dry-run: nothing written"));
         return;
     }
-    for (const c of candidates)
-        config.mcpServers[c.name] = c.server;
-    saveMcpConfig(config);
+    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) {
@@ -358,6 +369,7 @@ async function importCommand(args) {
 export async function mcpCommand(args) {
     const sub = args[0];
     try {
+        migrateLegacyMcpConfig();
         if (!sub || sub === "help" || sub === "-h" || sub === "--help") {
             printMcpHelp();
             return;

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;
 /** 工具列表是否变化(名称 + 参数结构),用来决定要不要提示重启。 */

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

@@ -13,6 +13,10 @@ 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;

package/package.json

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

package/scripts/patch-pi.js

@@ -193,7 +193,7 @@ const HOTKEYS_REPLACEMENTS = [
   ["| Copy selection or last assistant message |", '| ${process.env.U1S1_LANG === "en" ? "Copy selection or last assistant message" : "复制选中内容或最近一条回复"} |'],
   ["| Queue follow-up message |", '| ${process.env.U1S1_LANG === "en" ? "Queue follow-up message" : "把消息排到当前回复之后"} |'],
   ["| Restore queued messages |", '| ${process.env.U1S1_LANG === "en" ? "Restore queued messages" : "取回排队中的消息"} |'],
-  ["| Paste image or text from clipboard |", '| ${process.env.U1S1_LANG === "en" ? "Paste image or text from clipboard" : "从剪贴板粘贴图片或文本"} |'],
+  ["| Paste files on macOS, images, or text from clipboard |", '| ${process.env.U1S1_LANG === "en" ? "Paste files on macOS, images, or text from clipboard" : "从剪贴板粘贴图片、文本或(macOS)文件"} |'],
   ["| Slash commands |", '| ${process.env.U1S1_LANG === "en" ? "Slash commands (/help for common actions)" : "斜杠命令(/help 看常用操作)"} |'],
   ["| Run bash command |", '| ${process.env.U1S1_LANG === "en" ? "Run bash command" : "运行终端命令"} |'],
   ["| Run bash command (excluded from context) |", '| ${process.env.U1S1_LANG === "en" ? "Run bash command (excluded from context)" : "运行终端命令(结果不进上下文)"} |'],
@@ -249,8 +249,9 @@ const SETTINGS_REPLACEMENTS = [
   ['ask: "Ask",', 'ask: process.env.U1S1_LANG === "en" ? "Ask" : "每次询问",'],
   ['always: "Always trust",', 'always: process.env.U1S1_LANG === "en" ? "Always trust" : "始终信任",'],
   ['never: "Never trust",', 'never: process.env.U1S1_LANG === "en" ? "Never trust" : "从不信任",'],
-  ['new SelectSubmenu("Theme", "Select a theme, or choose Automatic to follow terminal appearance."', 'new SelectSubmenu(process.env.U1S1_LANG === "en" ? "Theme" : "主题", process.env.U1S1_LANG === "en" ? "Select a theme, or choose Automatic to follow terminal appearance." : "选择一个主题,或选「自动」跟随终端明暗。"'],
-  ['label: "  Automatic",', 'label: process.env.U1S1_LANG === "en" ? "  Automatic" : "  自动",'],
+  ['new SelectSubmenu("Theme", "Select a theme, or choose automatic to follow terminal appearance."', 'new SelectSubmenu(process.env.U1S1_LANG === "en" ? "Theme" : "主题", process.env.U1S1_LANG === "en" ? "Select a theme, or choose automatic to follow terminal appearance." : "选择一个主题,或选「自动」跟随终端明暗。"'],
+  ['{ description: "Theme created from your terminal\'s colors" }', '{ description: process.env.U1S1_LANG === "en" ? "Theme created from your terminal\'s colors" : "按终端自身配色生成的主题" }'],
+  ['label: "  automatic",', 'label: process.env.U1S1_LANG === "en" ? "  automatic" : "  自动",'],
   ['description: "Use separate themes for light and dark terminal appearance",', 'description: process.env.U1S1_LANG === "en" ? "Use separate themes for light and dark terminal appearance" : "终端明暗各用一套主题",'],
   ['theme.fg("accent", "Automatic Theme")', 'theme.fg("accent", process.env.U1S1_LANG === "en" ? "Automatic Theme" : "自动主题")'],
   ['theme.fg("muted", "Choose themes for terminal light and dark appearance.")', 'theme.fg("muted", process.env.U1S1_LANG === "en" ? "Choose themes for terminal light and dark appearance." : "分别为终端的浅色/深色外观选主题。")'],
@@ -284,7 +285,7 @@ const SETTINGS_REPLACEMENTS = [
   ['label: "Collapse changelog",', 'label: process.env.U1S1_LANG === "en" ? "Collapse changelog" : "折叠更新日志",'],
   ['description: "Show condensed changelog after updates",', 'description: process.env.U1S1_LANG === "en" ? "Show condensed changelog after updates" : "更新后只显示精简的更新日志",'],
   ['label: "Quiet startup",', 'label: process.env.U1S1_LANG === "en" ? "Quiet startup" : "安静启动",'],
-  ['description: "Disable verbose printing at startup",', 'description: process.env.U1S1_LANG === "en" ? "Disable verbose printing at startup" : "启动时不打印冗长信息",'],
+  ['description: "Disable verbose printing at startup (header: keep only the startup header)",', 'description: process.env.U1S1_LANG === "en" ? "Disable verbose printing at startup (header: keep only the startup header)" : "启动时不打印冗长信息(header:只保留启动标题)",'],
   ['label: "Install telemetry",', 'label: process.env.U1S1_LANG === "en" ? "Install telemetry" : "安装统计",'],
   ['description: "Send an anonymous version/update ping after changelog-detected updates",', 'description: process.env.U1S1_LANG === "en" ? "Send an anonymous version/update ping after changelog-detected updates" : "更新后匿名上报一次版本信息",'],
   ['label: "Default project trust",', 'label: process.env.U1S1_LANG === "en" ? "Default project trust" : "默认项目信任",'],
@@ -305,13 +306,15 @@ const SETTINGS_REPLACEMENTS = [
   ['label: "  (clear override)",', 'label: process.env.U1S1_LANG === "en" ? "  (clear override)" : "  (清除覆盖)",'],
   ['description: `Revert to global default (${config.thinkingLevel})`,', 'description: process.env.U1S1_LANG === "en" ? `Revert to global default (${config.thinkingLevel})` : `恢复为全局默认(${config.thinkingLevel})`,'],
   ['label: "TUI mode",', 'label: process.env.U1S1_LANG === "en" ? "TUI mode" : "界面模式",'],
-  ['description: "Interface layout; fullscreen mode is experimental",', 'description: process.env.U1S1_LANG === "en" ? "Interface layout; fullscreen mode is experimental" : "界面布局;全屏模式为实验功能",'],
+  ['description: "Interface layout; regular mode uses the terminal\'s normal scrollback",', 'description: process.env.U1S1_LANG === "en" ? "Interface layout; regular mode uses the terminal\'s normal scrollback" : "界面布局;regular 模式保留终端原生的滚动记录",'],
   ['label: "Fullscreen exit output",', 'label: process.env.U1S1_LANG === "en" ? "Fullscreen exit output" : "退出全屏时的输出",'],
   ['description: "Print the transcript or only a session resume hint when exiting fullscreen mode",', 'description: process.env.U1S1_LANG === "en" ? "Print the transcript or only a session resume hint when exiting fullscreen mode" : "退出全屏时打印完整对话,还是只留一条恢复会话提示",'],
   ['label: "Fullscreen scrollbar",', 'label: process.env.U1S1_LANG === "en" ? "Fullscreen scrollbar" : "全屏滚动条",'],
   ['description: "Scrollbar behavior in fullscreen mode; has no effect in regular mode",', 'description: process.env.U1S1_LANG === "en" ? "Scrollbar behavior in fullscreen mode; has no effect in regular mode" : "全屏模式下的滚动条行为;普通模式无效",'],
   ['label: "Fullscreen copy on select",', 'label: process.env.U1S1_LANG === "en" ? "Fullscreen copy on select" : "全屏选中即复制",'],
   ['description: "Automatically copy selected text in fullscreen mode; disable to copy selections with Ctrl+X",', 'description: process.env.U1S1_LANG === "en" ? "Automatically copy selected text in fullscreen mode; disable to copy selections with Ctrl+X" : "全屏模式下选中文字自动复制;关闭后用 Ctrl+X 复制",'],
+  ['label: "Fullscreen wheel scrolling",', 'label: process.env.U1S1_LANG === "en" ? "Fullscreen wheel scrolling" : "全屏滚轮速度",'],
+  ['description: "Lines per mouse-wheel event in fullscreen mode; \'auto\' speeds up fast wheel spins where the terminal does not",', 'description: process.env.U1S1_LANG === "en" ? "Lines per mouse-wheel event in fullscreen mode; \'auto\' speeds up fast wheel spins where the terminal does not" : "全屏模式下滚轮每格滚动的行数;auto 在快速滚动时自动加速",'],
   ['label: "Theme",', 'label: process.env.U1S1_LANG === "en" ? "Theme" : "主题",'],
   ['description: "Color theme for the interface",', 'description: process.env.U1S1_LANG === "en" ? "Color theme for the interface" : "界面配色主题",'],
 ];
@@ -325,6 +328,103 @@ const BUG_REPORT_REPLACEMENTS = [
   ["`If this looks like a ${APP_NAME} bug, /bug sends a report to the developers.`", 'process.env.U1S1_LANG === "en" ? "If this looks like a u1s1 bug, report it with /feedback." : "如果这看起来是 u1s1 自身的问题,可以用 /feedback 反馈。"'],
 ];
 
+// /login 去掉 Pi 自家渠道(dist/modes/interactive/interactive-mode.js):
+// Radius(Pi 开发方的付费服务,登录后还会往 mcp.json 写它的 MCP)和 OpenAI 的「Sign in with ChatGPT」。
+// u1s1 用户在 /login 里点进去只会配上与 u1s1 账号无关的第三方渠道;菜单、/login radius、/login openai 都走这个列表。
+const LOGIN_PROVIDER_REPLACEMENTS = [
+  [
+    "const authStatus = this.session.modelRuntime.getProviderAuthStatus(provider.id);",
+    'if (provider.id === "radius") continue;\n            const authStatus = this.session.modelRuntime.getProviderAuthStatus(provider.id);',
+  ],
+  ['if ((!authType || authType === "oauth") && provider.auth.oauth) {', 'if ((!authType || authType === "oauth") && provider.auth.oauth && provider.id !== "openai") {'],
+];
+
+// Pi 0.99 起内置的 MCP 扩展(dist/extensions/mcp/):/mcp 管理面板、登录、状态与提示。
+// 只换给人看的文案;mcp_servers 系统提示段、工具描述等给模型看的保持英文。
+// "Sign-in cancelled." 既是返回值又被 === 比较,两处必须一起换。
+const MCP_TEXT_REPLACEMENTS = [
+  ['codemode: "called from codemode scripts, which find them with searchTools()",', 'codemode: process.env.U1S1_LANG === "en" ? "called from codemode scripts, which find them with searchTools()" : "由 codemode 脚本调用(脚本用 searchTools() 查找)",'],
+  ['deferred: "not declared until tool_search loads them, then called directly; no codemode needed",', 'deferred: process.env.U1S1_LANG === "en" ? "not declared until tool_search loads them, then called directly; no codemode needed" : "先不告诉模型,tool_search 找到后再直接调用;不需要 codemode",'],
+  ['direct: "declared to the model like built-in tools",', 'direct: process.env.U1S1_LANG === "en" ? "declared to the model like built-in tools" : "像内置工具一样直接提供给模型",'],
+  ['return "disabled";', 'return process.env.U1S1_LANG === "en" ? "disabled" : "已停用";'],
+  ['return "starting";', 'return process.env.U1S1_LANG === "en" ? "starting" : "启动中";'],
+  ['return "needs sign-in";', 'return process.env.U1S1_LANG === "en" ? "needs sign-in" : "需要登录";'],
+  ['return withError ? `failed: ${firstLine(connection.error ?? "unknown error")}` : "failed";', 'return withError ? (process.env.U1S1_LANG === "en" ? `failed: ${firstLine(connection.error ?? "unknown error")}` : `连接失败:${firstLine(connection.error ?? "未知错误")}`) : (process.env.U1S1_LANG === "en" ? "failed" : "连接失败");'],
+  ['const resourceCount = count > 0 ? ` · ${count} resource${count === 1 ? "" : "s"}` : "";', 'const resourceCount = count > 0 ? (process.env.U1S1_LANG === "en" ? ` · ${count} resource${count === 1 ? "" : "s"}` : ` · ${count} 个资源`) : "";'],
+  ['return `connected · ${tools.length} tool${tools.length === 1 ? "" : "s"}${resourceCount}`;', 'return process.env.U1S1_LANG === "en" ? `connected · ${tools.length} tool${tools.length === 1 ? "" : "s"}${resourceCount}` : `已连接 · ${tools.length} 个工具${resourceCount}`;'],
+  ['return "connecting…";', 'return process.env.U1S1_LANG === "en" ? "connecting…" : "连接中…";'],
+  ['const MCP_USAGE = "Usage: /mcp, /mcp login [server], /mcp logout [server], /mcp reconnect [server]";', 'const MCP_USAGE = process.env.U1S1_LANG === "en" ? "Usage: /mcp, /mcp login [server], /mcp logout [server], /mcp reconnect [server]" : "用法:/mcp、/mcp login [服务名]、/mcp logout [服务名]、/mcp reconnect [服务名]";'],
+  ['ctx.ui.notify(`MCP tools are only reachable from the codemode or tool_search tool, but neither is active${reason}; they cannot be called.`, "warning");', 'ctx.ui.notify(process.env.U1S1_LANG === "en" ? `MCP tools are only reachable from the codemode or tool_search tool, but neither is active${reason}; they cannot be called.` : `MCP 工具只能经 codemode 或 tool_search 调用,但两者都没开启${reason},暂时用不了。`, "warning");'],
+  { from: '`config: ${error}`', to: '(process.env.U1S1_LANG === "en" ? `config: ${error}` : `配置错误:${error}`)', expected: 2 },
+  ['ctx.ui.notify(`MCP servers need attention:\\n${lines.map((line) => `  ${line}`).join("\\n")}\\nRun /mcp to fix.`, "warning");', 'ctx.ui.notify(process.env.U1S1_LANG === "en" ? `MCP servers need attention:\\n${lines.map((line) => `  ${line}`).join("\\n")}\\nRun /mcp to fix.` : `MCP 服务需要处理:\\n${lines.map((line) => `  ${line}`).join("\\n")}\\n输入 /mcp 处理。`, "warning");'],
+  ['return `Could not update ${server.entry.source}: ${errorMessage(error)}`;', 'return process.env.U1S1_LANG === "en" ? `Could not update ${server.entry.source}: ${errorMessage(error)}` : `无法写入 ${server.entry.source}:${errorMessage(error)}`;'],
+  ['return `MCP server "${server.entry.name}" does not use OAuth.`;', 'return process.env.U1S1_LANG === "en" ? `MCP server "${server.entry.name}" does not use OAuth.` : `MCP 服务「${server.entry.name}」不用 OAuth 登录。`;'],
+  ['return "Sign-in cancelled.";', 'return process.env.U1S1_LANG === "en" ? "Sign-in cancelled." : "已取消登录。";'],
+  ['failure === "Sign-in cancelled." ? "info" : "error"', 'failure === (process.env.U1S1_LANG === "en" ? "Sign-in cancelled." : "已取消登录。") ? "info" : "error"'],
+  ['return `Sign-in failed: ${errorMessage(error)}`;', 'return process.env.U1S1_LANG === "en" ? `Sign-in failed: ${errorMessage(error)}` : `登录失败:${errorMessage(error)}`;'],
+  ['return `Signed in, but ${errorMessage(error)}`;', 'return process.env.U1S1_LANG === "en" ? `Signed in, but ${errorMessage(error)}` : `已登录,但连接失败:${errorMessage(error)}`;'],
+  ['return `MCP server "${server.entry.name}" is disabled.`;', 'return process.env.U1S1_LANG === "en" ? `MCP server "${server.entry.name}" is disabled.` : `MCP 服务「${server.entry.name}」已停用。`;'],
+  { from: '`overridden: ${line}`', to: '(process.env.U1S1_LANG === "en" ? `overridden: ${line}` : `被覆盖:${line}`)', expected: 2 },
+  // 面板脚注经 keyHint 走按键脚注的对照表;close/select/save 已在表里,这两个表里没有,就地换
+  ['confirmLabel: "manage",', 'confirmLabel: process.env.U1S1_LANG === "en" ? "manage" : "管理",'],
+  { from: 'Label: "back",', to: 'Label: process.env.U1S1_LANG === "en" ? "back" : "返回",', expected: 5 },
+  ['title: "MCP servers",', 'title: process.env.U1S1_LANG === "en" ? "MCP servers" : "MCP 服务",'],
+  // 空列表引导到 u1s1 mcp add(CLI 命令),英文同义
+  { from: '`No MCP servers configured. Add them to ${resolve(getAgentDir(), "mcp.json")} or .pi/mcp.json.`', to: '(process.env.U1S1_LANG === "en" ? `No MCP servers configured. Add one with u1s1 mcp add, or edit ${resolve(getAgentDir(), "mcp.json")}.` : `还没有配置 MCP 服务。用 u1s1 mcp add 添加,或直接编辑 ${resolve(getAgentDir(), "mcp.json")}。`)', expected: 2 },
+  ['empty: "This server is no longer configured.",', 'empty: process.env.U1S1_LANG === "en" ? "This server is no longer configured." : "这个服务已不在配置里了。",'],
+  ['? "for this session"', '? (process.env.U1S1_LANG === "en" ? "for this session" : "仅本次会话")'],
+  ['? `saved to the ${entry.scope} mcp.json`', '? (process.env.U1S1_LANG === "en" ? `saved to the ${entry.scope} mcp.json` : `保存到 mcp.json(${entry.scope})`)'],
+  [': "saved to mcp.json";', ': (process.env.U1S1_LANG === "en" ? "saved to mcp.json" : "保存到 mcp.json");'],
+  ['label: "Enable", description: saved', 'label: process.env.U1S1_LANG === "en" ? "Enable" : "启用", description: saved'],
+  ['label: "Sign in", description: "opens the browser"', 'label: process.env.U1S1_LANG === "en" ? "Sign in" : "登录", description: process.env.U1S1_LANG === "en" ? "opens the browser" : "会打开浏览器"'],
+  ['label: "Tools", description: `${connection.tools.length} offered`', 'label: process.env.U1S1_LANG === "en" ? "Tools" : "工具", description: process.env.U1S1_LANG === "en" ? `${connection.tools.length} offered` : `共 ${connection.tools.length} 个`'],
+  ['label: "Reconnect" }', 'label: process.env.U1S1_LANG === "en" ? "Reconnect" : "重新连接" }'],
+  ['label: "Sign out", description: "deletes the stored credentials"', 'label: process.env.U1S1_LANG === "en" ? "Sign out" : "退出登录", description: process.env.U1S1_LANG === "en" ? "deletes the stored credentials" : "删除已保存的登录凭据"'],
+  ['label: "Exposure", description: exposureOf(entry)', 'label: process.env.U1S1_LANG === "en" ? "Exposure" : "暴露方式", description: exposureOf(entry)'],
+  ['label: "Disable", description: saved', 'label: process.env.U1S1_LANG === "en" ? "Disable" : "停用", description: saved'],
+  ['`State: ${describeState(server, false)}`', '(process.env.U1S1_LANG === "en" ? `State: ${describeState(server, false)}` : `状态:${describeState(server, false)}`)'],
+  { from: '`MCP server ${name}`', to: '(process.env.U1S1_LANG === "en" ? `MCP server ${name}` : `MCP 服务 ${name}`)', expected: 3 },
+  ['title: `Tools of ${server.entry.name}`,', 'title: process.env.U1S1_LANG === "en" ? `Tools of ${server.entry.name}` : `${server.entry.name} 的工具`,'],
+  ['details: `Exposure ${exposure}: ${exposure === "hidden" ? "unreachable" : EXPOSURE_DESCRIPTIONS[exposure]}${overridden ? "\\nSome tools override it with toolExposure." : ""}`,', 'details: process.env.U1S1_LANG === "en" ? `Exposure ${exposure}: ${exposure === "hidden" ? "unreachable" : EXPOSURE_DESCRIPTIONS[exposure]}${overridden ? "\\nSome tools override it with toolExposure." : ""}` : `暴露方式 ${exposure}:${exposure === "hidden" ? "不可调用" : EXPOSURE_DESCRIPTIONS[exposure]}${overridden ? "\\n部分工具用 toolExposure 单独设置了。" : ""}`,'],
+  ['empty: "The server offers no tools.",', 'empty: process.env.U1S1_LANG === "en" ? "The server offers no tools." : "这个服务没有提供工具。",'],
+  ['title: `Exposure of ${server.entry.name}`,', 'title: process.env.U1S1_LANG === "en" ? `Exposure of ${server.entry.name}` : `${server.entry.name} 的暴露方式`,'],
+  ['? `Applies to this session; the server is registered by ${server.entry.source}.`', '? (process.env.U1S1_LANG === "en" ? `Applies to this session; the server is registered by ${server.entry.source}.` : `仅本次会话生效;这个服务由 ${server.entry.source} 注册。`)'],
+  [': `Saved to ${server.entry.source}.`,', ': (process.env.U1S1_LANG === "en" ? `Saved to ${server.entry.source}.` : `保存到 ${server.entry.source}。`),'],
+  ['const title = `Sign in to ${name}`;', 'const title = process.env.U1S1_LANG === "en" ? `Sign in to ${name}` : `登录 ${name}`;'],
+  ['ui.status(title, "Contacting the authorization server…");', 'ui.status(title, process.env.U1S1_LANG === "en" ? "Contacting the authorization server…" : "正在联系授权服务器…");'],
+  ['ui.status(title, "Connecting…");', 'ui.status(title, process.env.U1S1_LANG === "en" ? "Connecting…" : "连接中…");'],
+  ['"Reconnecting…"', '(process.env.U1S1_LANG === "en" ? "Reconnecting…" : "重新连接中…")'],
+  ['action === "enable" ? "Connecting…" : "Disconnecting…"', 'action === "enable" ? (process.env.U1S1_LANG === "en" ? "Connecting…" : "连接中…") : (process.env.U1S1_LANG === "en" ? "Disconnecting…" : "断开中…")'],
+  ['ctx.ui.notify(`No MCP server named "${name}".`, "error");', 'ctx.ui.notify(process.env.U1S1_LANG === "en" ? `No MCP server named "${name}".` : `没有叫「${name}」的 MCP 服务。`, "error");'],
+  ['ctx.ui.select("MCP server", ', 'ctx.ui.select(process.env.U1S1_LANG === "en" ? "MCP server" : "选择 MCP 服务", '],
+  ['none: "No enabled MCP server uses OAuth. Only HTTP servers without an Authorization header do.",', 'none: process.env.U1S1_LANG === "en" ? "No enabled MCP server uses OAuth. Only HTTP servers without an Authorization header do." : "没有用 OAuth 登录的已启用 MCP 服务(只有没配 Authorization 头的 HTTP 服务才用)。",'],
+  ['ctx.ui.notify(`Signing in to MCP server "${name}" requires interactive mode.`, "error");', 'ctx.ui.notify(process.env.U1S1_LANG === "en" ? `Signing in to MCP server "${name}" requires interactive mode.` : `登录 MCP 服务「${name}」需要在交互界面里进行。`, "error");'],
+  ['process.platform === "darwin" ? "Cmd+click to open" : "Ctrl+click to open"', 'process.platform === "darwin" ? (process.env.U1S1_LANG === "en" ? "Cmd+click to open" : "Cmd+点击打开") : (process.env.U1S1_LANG === "en" ? "Ctrl+click to open" : "Ctrl+点击打开")'],
+  ['ctx.ui.notify(`Sign in to MCP server "${name}" in your browser:\\n${lines}`, "info");', 'ctx.ui.notify(process.env.U1S1_LANG === "en" ? `Sign in to MCP server "${name}" in your browser:\\n${lines}` : `请在浏览器里登录 MCP 服务「${name}」:\\n${lines}`, "info");'],
+  ['ctx.ui.input(`Waiting for sign-in to "${name}". If the browser cannot reach this machine, paste the URL it was redirected to.`,', 'ctx.ui.input(process.env.U1S1_LANG === "en" ? `Waiting for sign-in to "${name}". If the browser cannot reach this machine, paste the URL it was redirected to.` : `等待登录「${name}」。浏览器连不到这台机器的话,把它跳转到的网址粘贴进来。`,'],
+  ['ctx.ui.notify(`Signed in to MCP server "${name}" (${server.connection?.tools.length ?? 0} tools).`, "info");', 'ctx.ui.notify(process.env.U1S1_LANG === "en" ? `Signed in to MCP server "${name}" (${server.connection?.tools.length ?? 0} tools).` : `已登录 MCP 服务「${name}」(${server.connection?.tools.length ?? 0} 个工具)。`, "info");'],
+  { from: '`MCP failed to load: ${errorMessage(error)}`', to: '(process.env.U1S1_LANG === "en" ? `MCP failed to load: ${errorMessage(error)}` : `MCP 加载失败:${errorMessage(error)}`)', expected: 2 },
+  ['ctx.ui.notify("MCP servers are still connecting; their tools become available once connected.", "info");', 'ctx.ui.notify(process.env.U1S1_LANG === "en" ? "MCP servers are still connecting; their tools become available once connected." : "MCP 服务还在连接,连上后工具就能用了。", "info");'],
+  ['description: "Manage MCP servers: sign in, reconnect, enable or disable, and change exposure",', 'description: process.env.U1S1_LANG === "en" ? "Manage MCP servers: sign in, reconnect, enable or disable, and change exposure" : "管理 MCP 服务:登录、重连、启用/停用、调整暴露方式",'],
+  ['? `Signed out of MCP server "${server.entry.name}".`', '? (process.env.U1S1_LANG === "en" ? `Signed out of MCP server "${server.entry.name}".` : `已退出 MCP 服务「${server.entry.name}」的登录。`)'],
+  [': `No stored credentials for MCP server "${server.entry.name}".`, "info");', ': (process.env.U1S1_LANG === "en" ? `No stored credentials for MCP server "${server.entry.name}".` : `MCP 服务「${server.entry.name}」没有保存的登录凭据。`), "info");'],
+  ['none: "No enabled MCP server to reconnect.",', 'none: process.env.U1S1_LANG === "en" ? "No enabled MCP server to reconnect." : "没有可重连的已启用 MCP 服务。",'],
+  ['ctx.ui.notify(`Reconnected to MCP server "${server.entry.name}" (${describeState(server)}).`, "info");', 'ctx.ui.notify(process.env.U1S1_LANG === "en" ? `Reconnected to MCP server "${server.entry.name}" (${describeState(server)}).` : `已重新连接 MCP 服务「${server.entry.name}」(${describeState(server)})。`, "info");'],
+];
+// /mcp 面板外框与登录页(dist/extensions/mcp/ui.js)
+const MCP_UI_REPLACEMENTS = [
+  ['frame(theme, "MCP servers", [new Text(theme.fg("muted", "Loading…"), 1, 1)])', 'frame(theme, process.env.U1S1_LANG === "en" ? "MCP servers" : "MCP 服务", [new Text(theme.fg("muted", process.env.U1S1_LANG === "en" ? "Loading…" : "加载中…"), 1, 1)])'],
+  ['menu.empty ?? "Nothing to show."', 'menu.empty ?? (process.env.U1S1_LANG === "en" ? "Nothing to show." : "没有内容。")'],
+  ['process.platform === "darwin" ? "Cmd+click to open" : "Ctrl+click to open"', 'process.platform === "darwin" ? (process.env.U1S1_LANG === "en" ? "Cmd+click to open" : "Cmd+点击打开") : (process.env.U1S1_LANG === "en" ? "Ctrl+click to open" : "Ctrl+点击打开")'],
+  ['theme.fg("muted", "Approve access in your browser. If it did not open, visit:")', 'theme.fg("muted", process.env.U1S1_LANG === "en" ? "Approve access in your browser. If it did not open, visit:" : "请在浏览器里同意授权。浏览器没自动打开的话,访问:")'],
+  ['theme.fg("muted", "If the browser runs on another machine, paste the URL it was redirected to:")', 'theme.fg("muted", process.env.U1S1_LANG === "en" ? "If the browser runs on another machine, paste the URL it was redirected to:" : "浏览器在另一台机器上的话,把它跳转到的网址粘贴到这里:")'],
+];
+// codemode 工具结果(dist/extensions/codemode/renderer.js)的固定文案
+const CODEMODE_RENDER_REPLACEMENTS = [
+  ['theme.fg("muted", `Model calls: ${formatCost(total)}`)', 'theme.fg("muted", process.env.U1S1_LANG === "en" ? `Model calls: ${formatCost(total)}` : `模型调用:${formatCost(total)}`)'],
+  ['theme.fg("muted", `Full output: ${fullOutputPath}`)', 'theme.fg("muted", process.env.U1S1_LANG === "en" ? `Full output: ${fullOutputPath}` : `完整输出:${fullOutputPath}`)'],
+];
+
 const TUI_TEXT_TARGETS = [
   [["core", "slash-commands.js"], SLASH_COMMANDS_REPLACEMENTS, "命令描述"],
   [["modes", "interactive", "components", "assistant-message.js"], ASSISTANT_TEXT_REPLACEMENTS, "回复状态文案"],
@@ -332,9 +432,13 @@ const TUI_TEXT_TARGETS = [
   [["modes", "interactive", "interactive-mode.js"], HOTKEYS_REPLACEMENTS, "/hotkeys"],
   [["modes", "interactive", "interactive-mode.js"], WORKING_TEXT_REPLACEMENTS, "工作中提示"],
   [["modes", "interactive", "interactive-mode.js"], BUG_REPORT_REPLACEMENTS, "/bug 入口"],
+  [["modes", "interactive", "interactive-mode.js"], LOGIN_PROVIDER_REPLACEMENTS, "/login 渠道"],
   [["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, "设置菜单"],
+  [["extensions", "mcp", "index.js"], MCP_TEXT_REPLACEMENTS, "/mcp 面板"],
+  [["extensions", "mcp", "ui.js"], MCP_UI_REPLACEMENTS, "/mcp 界面"],
+  [["extensions", "codemode", "renderer.js"], CODEMODE_RENDER_REPLACEMENTS, "codemode 结果"],
 ];
 
 /**