u1s1-cli 1.11.7 → 1.12.0

package/dist/index.js

@@ -4,7 +4,7 @@ import { writeFileSync } from "node:fs";
 import { cleanupBrandThemes, endpointKeyEnv, endpointProviderEntry, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, ensureWorkflowPromptTemplate, scrubForeignProviderEnv, toProviderModels, writeAnnouncementsExtension, writeAttributionExtension, writeMcpExtension, writeCompactUiExtension, writeErrorHumanizeExtension, writeWebToolsExtension, } from "./agent-setup.js";
 import { Text } from "@earendil-works/pi-tui";
 import { printConsoleBanner } from "./brand.js";
-import { agentDir, apiModelToDef, CUSTOM_ENDPOINTS, isPortableInstall, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, readCompactionBudgetSetting, readCompactionReserveTokens, readSettings, refValid, resolvePreferredModel, setModelsFromApi, VERSION, } from "./config.js";
+import { activeSite, agentDir, apiModelToDef, CUSTOM_ENDPOINTS, isPortableInstall, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, readCompactionBudgetSetting, readCompactionReserveTokens, readSettings, refValid, resolvePreferredModel, setModelsFromApi, VERSION, } from "./config.js";
 import { registerLoopCommand } from "./loop.js";
 import { ensureSearchTools } from "./search-tools.js";
 import { ensureUsableShell } from "./shell-doctor.js";
@@ -12,8 +12,10 @@ import { applyBrandUi, setAnnouncement, setUpdateNotice } from "./style.js";
 import { AccessDeniedError, AuthError, fetchModels, loadCustomEndpoints, readJsonResponseCapped } from "./api.js";
 import { ensureSigningProxy } from "./device-auth.js";
 import { installChildEnvGuard } from "./secret-env.js";
-import { DEPLOY_HINT_TEXT, markNudge, shouldShowDeployHint } from "./nudges.js";
+import { deployHintText, markNudge, shouldShowDeployHint } from "./nudges.js";
 import { createGatewayTelemetry } from "./telemetry.js";
+import { installCommand, siteLinks, siteOf } from "./site.js";
+import { isEnglish, lang, tr } from "./i18n.js";
 const PACKAGE_NAME = "u1s1-cli";
 /** 启动时检测到的可自动安装的新版;TUI 退出后才装(见 installPendingUpdate)。 */
 let pendingUpdate;
@@ -80,7 +82,7 @@ async function checkForUpdate() {
     const settings = readSettings();
     // 便携版没法用 npm 自更新;autoUpdate 关闭同理只提示。u1s1 update 会给出正确升级方式
     if (settings.autoUpdate === false || isPortableInstall()) {
-        setUpdateNotice(`⬆ 新版 v${latest} 可用 · u1s1 update 升级`);
+        setUpdateNotice(tr(`⬆ 新版 v${latest} 可用 · u1s1 update 升级`, `⬆ v${latest} available · run u1s1 update`));
         return;
     }
     // 检测包管理器
@@ -93,7 +95,7 @@ async function checkForUpdate() {
         ? `npm install -g --loglevel=error ${PACKAGE_NAME}@latest`
         : `${pm} add -g ${PACKAGE_NAME}@latest`;
     pendingUpdate = { latest, installCmd };
-    setUpdateNotice(`⬆ 发现新版 v${latest},退出后自动更新`);
+    setUpdateNotice(tr(`⬆ 发现新版 v${latest},退出后自动更新`, `⬆ v${latest} available, will update on exit`));
 }
 /**
  * TUI 退出后前台安装新版:此刻不再有模型调用和懒加载,重铺 node_modules 才安全。
@@ -105,21 +107,21 @@ function installPendingUpdate() {
     if (!pendingUpdate)
         return;
     const { latest, installCmd } = pendingUpdate;
-    console.log(`\n⬆ 正在更新到 v${latest}…`);
-    console.log("  (可能需要几分钟,期间请不要关闭窗口或按 Ctrl+C,中途打断会装出半截)");
+    console.log(tr(`\n⬆ 正在更新到 v${latest}…`, `\n⬆ Updating to v${latest}…`));
+    console.log(tr("  (可能需要几分钟,期间请不要关闭窗口或按 Ctrl+C,中途打断会装出半截)", "  (This may take a few minutes. Don't close the window or press Ctrl+C; interrupting leaves a broken install.)"));
     try {
         execSync(installCmd, { stdio: "inherit" });
-        console.log(`✅ 已更新到 v${latest},下次运行 u1s1 生效。`);
+        console.log(tr(`✅ 已更新到 v${latest},下次运行 u1s1 生效。`, `✅ Updated to v${latest}. It takes effect the next time you run u1s1.`));
     }
     catch {
         // 失败不挡退出,下次启动还会再试。npm 全局目录没写权限时 `u1s1 update` 也会
         // 走同一条命令再失败一次,所以这里直接给出能跳出循环的路径(官网安装脚本)
-        console.error("自动更新失败(上面是 npm 的报错,常见原因是没有全局安装权限)。");
-        console.error("可以改用官网安装脚本重装,一步到位:");
+        console.error(tr("自动更新失败(上面是 npm 的报错,常见原因是没有全局安装权限)。", "Auto-update failed (npm's error is above; usually missing permission for global installs)."));
+        console.error(tr("可以改用官网安装脚本重装,一步到位:", "Reinstall with the official install script instead:"));
         console.error(process.platform === "win32"
-            ? "  powershell -c \"irm https://u1s1.io/releases/install.ps1 | iex\""
-            : "  curl -fsSL https://u1s1.io/releases/install.sh | bash");
-        console.error("不想每次退出都尝试更新的话,可在 ~/.u1s1/agent/settings.json 里设 \"autoUpdate\": false");
+            ? `  powershell -c "${installCommand(activeSite(), "ps1")}"`
+            : `  ${installCommand(activeSite(), "sh")}`);
+        console.error(tr("不想每次退出都尝试更新的话,可在 ~/.u1s1/agent/settings.json 里设 \"autoUpdate\": false", "To stop trying to update on every exit, set \"autoUpdate\": false in ~/.u1s1/agent/settings.json"));
     }
 }
 /**
@@ -195,22 +197,23 @@ async function runAgent(cfg, args) {
         if (e instanceof AuthError) {
             // 凭证形状还在但服务端已作废(设备被移除/换过钥匙):直接进 TUI 每条消息都会失败,
             // 不如现在就引导重新登录
-            console.error("  登录已失效(这台设备可能被移除,或账号更换过钥匙),需要重新登录。");
+            console.error(tr("  登录已失效(这台设备可能被移除,或账号更换过钥匙),需要重新登录。", "  Your session has expired (this device may have been removed, or the account's keys changed). Please sign in again."));
             const { login } = await import("./login.js");
             cfg = await login();
             modelsResp = await fetchModels(cfg).catch((e2) => {
-                console.error("  获取模型列表失败,使用内置列表:", e2.message);
+                console.error(tr("  获取模型列表失败,使用内置列表:", "  Couldn't fetch the model list; using the built-in list:"), e2.message);
                 return undefined;
             });
         }
         else if (e instanceof AccessDeniedError) {
             // 封禁/停用/设备不受信任:进 TUI 后每条消息都会失败,不如现在就把原因说清楚并退出
             console.error(`  ${e.message}`);
-            console.error("  这个账号当前无法使用 u1s1。如有疑问可发邮件到 contact@u1s1.io,或在 https://u1s1.io/dashboard 提交工单。");
+            const site = siteOf(cfg);
+            console.error(tr(`  这个账号当前无法使用 u1s1。如有疑问可发邮件到 ${site.contactEmail},或在 ${siteLinks(site).dashboard} 提交工单。`, `  This account can't use u1s1 right now. Questions? Email ${site.contactEmail} or open a support ticket at ${siteLinks(site).dashboard}.`));
             process.exit(1);
         }
         else {
-            console.error("  获取模型列表失败,使用内置列表:", e.message);
+            console.error(tr("  获取模型列表失败,使用内置列表:", "  Couldn't fetch the model list; using the built-in list:"), e.message);
         }
     }
     if (modelsResp) {
@@ -291,6 +294,9 @@ async function runAgent(cfg, args) {
         });
     };
     await searchToolsReady;
+    // 界面语言跟站点走(见 i18n.ts)。pi 引擎的补丁文案(patches/)读不到 u1s1 的配置,
+    // 只认 U1S1_LANG;登录/换站都已在上面处理完,这里定下来再加载内核,TUI 与 -p 模式都覆盖
+    process.env["U1S1_LANG"] = lang();
     // Module evaluation can block the event loop for seconds on slow filesystems.
     // Finish startup requests and fallback/login handling before loading the kernel.
     const { CustomEditor, main } = await import("@earendil-works/pi-coding-agent");
@@ -309,13 +315,13 @@ async function runAgent(cfg, args) {
                 const text = this.getText().trim();
                 const tip = (msg) => (notifyUi ? notifyUi(msg) : console.log(`  ${msg}`));
                 if (text.startsWith("/login")) {
-                    tip("切换模型用 /model;要换 u1s1 账号:先 /exit 退出,再在终端运行 u1s1 logout && u1s1 login");
+                    tip(tr("切换模型用 /model;要换 u1s1 账号:先 /exit 退出,再在终端运行 u1s1 logout && u1s1 login", "Use /model to switch models. To switch u1s1 accounts, /exit first, then run u1s1 logout && u1s1 login in your terminal"));
                     this.setText("");
                     this.addToHistory?.(text);
                     return;
                 }
                 if (text === "/logout") {
-                    tip("退出登录请先 /exit 回到终端,再运行:u1s1 logout");
+                    tip(tr("退出登录请先 /exit 回到终端,再运行:u1s1 logout", "To sign out, /exit to your terminal first, then run: u1s1 logout"));
                     this.setText("");
                     this.addToHistory?.(text);
                     return;
@@ -351,28 +357,32 @@ async function runAgent(cfg, args) {
                 });
                 // pi 内置只有 /quit；补一个更常见的 /exit，方便新手退出
                 pi.registerCommand("exit", {
-                    description: "退出 u1s1",
+                    description: tr("退出 u1s1", "Exit u1s1"),
                     handler: async (_args, ctx) => {
                         ctx.shutdown();
                     },
                 });
                 // /help:启动横幅和官网教程都在引导用户输入它,必须真实存在
                 pi.registerEntryRenderer("u1s1-help", (_entry, _opts, theme) => {
+                    const site = siteOf(cfg);
                     const text = [
-                        theme.bold(theme.fg("text", "u1s1 常用操作")),
-                        theme.fg("text", "直接打字说需求,回车发送 · Shift+Enter 换行 · Ctrl+V 贴图 · Esc 中断"),
-                        theme.fg("text", "/model 切换模型(留意免费/价格提示) · /clear 清空上下文开新会话"),
-                        theme.fg("text", "/usage 查剩余额度 · /context 看上下文占用与压缩预算 · /resume 恢复历史会话"),
-                        theme.fg("text", "/feedback 一句话反馈问题或建议(自动附带版本与请求编号建工单)"),
-                        theme.fg("dim", "/compact 手动压缩上下文 · /settings 设置 · /hotkeys 全部快捷键 · /exit 退出"),
-                        theme.fg("dim", "退出后在终端:u1s1 deploy 发布网页 · u1s1 update 升级"),
-                        theme.fg("dim", "匿名使用统计只记会话开始/结束等节点,不含任何内容;U1S1_TELEMETRY=0 可关闭"),
-                        theme.fg("dim", "新手教程 → https://u1s1.io/guides"),
+                        theme.bold(theme.fg("text", tr("u1s1 常用操作", "u1s1 basics"))),
+                        theme.fg("text", tr("直接打字说需求,回车发送 · Shift+Enter 换行 · Ctrl+V 贴图 · Esc 中断", "Type what you need, Enter to send · Shift+Enter newline · Ctrl+V paste image · Esc stop")),
+                        theme.fg("text", tr("/model 切换模型(留意免费/价格提示) · /clear 清空上下文开新会话", "/model switch models (check the price hints) · /clear clear context, start a new session")),
+                        theme.fg("text", tr("/usage 查剩余额度 · /context 看上下文占用与压缩预算 · /resume 恢复历史会话", "/usage remaining balance · /context context usage and compaction budget · /resume past sessions")),
+                        theme.fg("text", tr("/feedback 一句话反馈问题或建议(自动附带版本与请求编号建工单)", "/feedback report a problem or idea (opens a support ticket with version and request IDs)")),
+                        theme.fg("dim", tr("/compact 手动压缩上下文 · /settings 设置 · /hotkeys 全部快捷键 · /exit 退出", "/compact compact context now · /settings settings · /hotkeys all shortcuts · /exit exit")),
+                        // 国际站没有网页托管,不提 u1s1 deploy
+                        theme.fg("dim", site.id === "intl"
+                            ? tr("退出后在终端:u1s1 update 升级", "Back in your terminal: u1s1 update to upgrade")
+                            : tr("退出后在终端:u1s1 deploy 发布网页 · u1s1 update 升级", "Back in your terminal: u1s1 deploy to publish a web page · u1s1 update to upgrade")),
+                        theme.fg("dim", tr("匿名使用统计只记会话开始/结束等节点,不含任何内容;U1S1_TELEMETRY=0 可关闭", "Anonymous usage stats only record events like session start/end, never content; U1S1_TELEMETRY=0 turns them off")),
+                        theme.fg("dim", tr(`新手教程 → ${siteLinks(site).guides}`, `Guides → ${siteLinks(site).guides}`)),
                     ].join("\n");
                     return new Text(text, 1, 0);
                 });
                 pi.registerCommand("help", {
-                    description: "查看常用操作和命令",
+                    description: tr("查看常用操作和命令", "Show common actions and commands"),
                     handler: async () => {
                         pi.appendEntry("u1s1-help");
                     },
@@ -385,7 +395,7 @@ async function runAgent(cfg, args) {
                     return new Text((data.lines ?? []).map((l) => theme.fg("text", l)).join("\n"), 1, 0);
                 });
                 pi.registerCommand("usage", {
-                    description: "查看剩余额度和本月用量",
+                    description: tr("查看剩余额度和本月用量", "Show remaining balance and this month's usage"),
                     handler: async () => {
                         const { usageEntryData } = await import("./usage.js");
                         pi.appendEntry("u1s1-usage", await usageEntryData());
@@ -399,7 +409,7 @@ async function runAgent(cfg, args) {
                     return new Text((data.lines ?? []).map((l) => theme.fg("text", l)).join("\n"), 1, 0);
                 });
                 pi.registerCommand("context", {
-                    description: "查看上下文占用与自动压缩预算",
+                    description: tr("查看上下文占用与自动压缩预算", "Show context usage and the auto-compaction budget"),
                     handler: async (_args, ctx) => {
                         const { contextEntryLines } = await import("./context-usage.js");
                         const settings = readSettings();
@@ -419,7 +429,7 @@ async function runAgent(cfg, args) {
                     return new Text((data.lines ?? []).map((l) => theme.fg("text", l)).join("\n"), 1, 0);
                 });
                 pi.registerCommand("feedback", {
-                    description: "反馈问题或建议(自动附带诊断信息建工单)",
+                    description: tr("反馈问题或建议(自动附带诊断信息建工单)", "Report a problem or idea (opens a support ticket with diagnostics)"),
                     handler: async (cmdArgs, ctx) => {
                         const { feedbackInSession, parseFeedbackArgs } = await import("./feedback.js");
                         let raw = cmdArgs.trim();
@@ -432,7 +442,7 @@ async function runAgent(cfg, args) {
                             return;
                         }
                         if (!parsed.help && !parsed.text && ctx.hasUI) {
-                            const text = (await ctx.ui.input("反馈内容", "一句话说清楚问题或建议"))?.trim();
+                            const text = (await ctx.ui.input(tr("反馈内容", "Feedback"), tr("一句话说清楚问题或建议", "Describe the problem or idea in a sentence")))?.trim();
                             if (!text)
                                 return;
                             raw = `--${parsed.category} ${text}`;
@@ -468,10 +478,10 @@ async function runAgent(cfg, args) {
                         firstTaskDoneSent = true;
                         telemetry.track("first_task_done", { files_written: stats.filesWritten });
                     }
-                    // 每台机器只提示一次;跑过 u1s1 deploy 后永不再提(见 nudges.ts)
-                    if (ctx.hasUI && shouldShowDeployHint()) {
+                    // 每台机器只提示一次;跑过 u1s1 deploy 后永不再提(见 nudges.ts)。国际站没有网页托管,不提示
+                    if (ctx.hasUI && siteOf(cfg).id !== "intl" && shouldShowDeployHint()) {
                         markNudge("deploy_hint_shown");
-                        ctx.ui.notify(DEPLOY_HINT_TEXT, "info");
+                        ctx.ui.notify(deployHintText(), "info");
                     }
                 });
                 // pi 在 session_shutdown 处理完后直接 process.exit,session_end 只能在这里
@@ -486,11 +496,11 @@ async function runAgent(cfg, args) {
                 // TUI 和 Desktop App 共用一份(见 agent-setup.ts)
                 // /clear: 清空当前对话上下文，开始新会话
                 pi.registerCommand("clear", {
-                    description: "清除当前对话上下文，开始新会话",
+                    description: tr("清除当前对话上下文，开始新会话", "Clear the conversation context and start a new session"),
                     handler: async (_args, ctx) => {
                         await ctx.newSession({
                             withSession: async (sessionContext) => {
-                                sessionContext.ui.notify("🗑️ 上下文已清除", "info");
+                                sessionContext.ui.notify(tr("🗑️ 上下文已清除", "🗑️ Context cleared"), "info");
                             },
                         });
                     },
@@ -548,6 +558,10 @@ async function runAgent(cfg, args) {
 }
 function printHelp() {
     printConsoleBanner(VERSION);
+    if (isEnglish()) {
+        printHelpEn();
+        return;
+    }
     console.log(" 命令:");
     console.log("   u1s1                   进入对话界面(最常用,不带参数)");
     console.log("   u1s1 -p \"一句话\"       不进界面直接回答,适合脚本里用");
@@ -556,9 +570,12 @@ function printHelp() {
     console.log("   u1s1 usage             查看剩余额度");
     console.log("   u1s1 whoami            查看当前登录的账号");
     console.log("   u1s1 update            升级到最新版");
-    console.log("   u1s1 deploy            发布网页(--public / --private)");
-    console.log("   u1s1 deploy list       查看已发布的站点");
-    console.log("   u1s1 deploy remove     删除已发布的站点");
+    // 国际站没有网页托管(网关拒绝),不列 deploy
+    if (activeSite().id !== "intl") {
+        console.log("   u1s1 deploy            发布网页(--public / --private)");
+        console.log("   u1s1 deploy list       查看已发布的站点");
+        console.log("   u1s1 deploy remove     删除已发布的站点");
+    }
     console.log("   u1s1 feedback \"一句话\"  反馈问题或建议(自动建工单,--bug/--question…)");
     console.log("   u1s1 import            导入历史会话(import skills 导入技能)");
     console.log("   u1s1 mcp               配置第三方 MCP 服务(add/list/test/remove/import)");
@@ -567,12 +584,45 @@ function printHelp() {
     console.log("");
     console.log(" 对话里输入 /help 看会话内命令(/model /clear /feedback /exit …)");
     console.log(" 匿名使用统计只记会话开始/结束等节点,不含内容;设 U1S1_TELEMETRY=0 关闭");
-    console.log(" 更多帮助 → https://u1s1.io/guides");
+    console.log(` 更多帮助 → ${siteLinks(activeSite()).guides}`);
+}
+/** 英文帮助:命令列按 ASCII 宽度对齐(中文版靠 CJK 双宽,两边不能共用一套空格)。 */
+function printHelpEn() {
+    const commands = [
+        ["u1s1", "Start an interactive session (most common, no arguments)"],
+        ["u1s1 -p \"prompt\"", "Answer once without the UI, handy in scripts"],
+        ["u1s1 login / logout", "Sign in / sign out"],
+        ["u1s1 model", "Show or change the default model"],
+        ["u1s1 usage", "Show your remaining balance"],
+        ["u1s1 whoami", "Show the signed-in account"],
+        ["u1s1 update", "Update to the latest version"],
+    ];
+    if (activeSite().id !== "intl") {
+        commands.push(["u1s1 deploy", "Publish a web page (--public / --private)"], ["u1s1 deploy list", "List published sites"], ["u1s1 deploy remove", "Remove a published site"]);
+    }
+    commands.push(["u1s1 feedback \"text\"", "Send feedback or report a bug (opens a support ticket; --bug/--question…)"], ["u1s1 import", "Import past sessions (import skills to import skills)"], ["u1s1 mcp", "Configure third-party MCP servers (add/list/test/remove/import)"], ["u1s1 bench", "Benchmark model coding ability"], ["u1s1 --version", "Show the version"]);
+    console.log(" Commands:");
+    for (const [cmd, desc] of commands)
+        console.log(`   ${cmd.padEnd(22)} ${desc}`);
+    console.log("");
+    console.log(" In a session, type /help for session commands (/model /clear /feedback /exit …)");
+    console.log(" Anonymous usage stats only record events like session start/end, never content; set U1S1_TELEMETRY=0 to turn them off");
+    console.log(` More help → ${siteLinks(activeSite()).guides}`);
 }
 function wantsHelp(rest) {
     return rest.includes("--help") || rest.includes("-h");
 }
+/** 国际站没有网页托管;只在国际站打印,所以只有英文。 */
+function hostingUnavailableText(site) {
+    return `Site hosting isn't available on ${new URL(site.origin).host}.`;
+}
 async function deployEntry(rest) {
+    // 国际站没有网页托管(网关也会拒绝):在这里挡住,不进 deploy.ts,也不先拽去登录
+    const site = activeSite();
+    if (site.id === "intl") {
+        console.error(hostingUnavailableText(site));
+        process.exit(1);
+    }
     const { deployCommand, printDeployHelp } = await import("./deploy.js");
     // --help 不该先被拽去登录
     if (wantsHelp(rest)) {
@@ -588,7 +638,7 @@ async function whoamiCommand() {
     const { hasDeviceCredential } = await import("./device-auth.js");
     const cfg = loadConfig();
     if (!hasDeviceCredential(cfg)) {
-        console.error("还没登录,先跑 u1s1 login");
+        console.error(tr("还没登录,先跑 u1s1 login", "Not signed in. Run u1s1 login first."));
         process.exit(1);
     }
     const { fetchMe } = await import("./api.js");
@@ -596,6 +646,12 @@ async function whoamiCommand() {
         console.error(e.message);
         process.exit(1);
     });
+    if (isEnglish()) {
+        console.log(me.email ?? "(no email linked)");
+        console.log(`  Server  ${cfg.baseUrl}`);
+        console.log("  Switch accounts: u1s1 logout, then u1s1 login. Check your balance: u1s1 usage");
+        return;
+    }
     console.log(me.email ?? "(未绑定邮箱)");
     console.log(`  服务器  ${cfg.baseUrl}`);
     console.log("  换账号:u1s1 logout 再 u1s1 login;看额度:u1s1 usage");
@@ -604,7 +660,7 @@ async function logoutCommand() {
     const { saveConfig } = await import("./config.js");
     const current = loadConfig();
     if (!current.deviceToken && !current.apiKey) {
-        console.log("当前本来就没有登录。运行 u1s1 即可登录。");
+        console.log(tr("当前本来就没有登录。运行 u1s1 即可登录。", "You're not signed in. Run u1s1 to sign in."));
         return;
     }
     let serverRevoked = false;
@@ -623,19 +679,26 @@ async function logoutCommand() {
         email: undefined,
     });
     if (serverRevoked) {
-        console.log("已退出登录,这台设备在服务端的授权也已注销。");
+        console.log(tr("已退出登录,这台设备在服务端的授权也已注销。", "Signed out. This device's authorization on the server has been revoked too."));
     }
     else {
-        console.log("已退出本机登录。");
-        console.log("(没连上服务器注销这台设备;如有需要,可在 https://u1s1.io/dashboard 的设备列表里手动移除。)");
+        console.log(tr("已退出本机登录。", "Signed out on this machine."));
+        const dashboard = siteLinks(siteOf(current)).dashboard;
+        console.log(tr(`(没连上服务器注销这台设备;如有需要,可在 ${dashboard} 的设备列表里手动移除。)`, `(Couldn't reach the server to revoke this device. If needed, remove it from the device list at ${dashboard}.)`));
     }
 }
 /** 子命令表:每条都按需 import,不带子命令直接进对话界面的路径不多加载任何模块。 */
 const COMMANDS = {
     deploy: deployEntry,
     login: async (rest) => {
-        const { login } = await import("./login.js");
-        await login(rest[0]);
+        const { login, parseLoginArgs } = await import("./login.js");
+        const parsed = parseLoginArgs(rest);
+        if (parsed.error) {
+            console.error(parsed.error);
+            process.exitCode = 1;
+            return;
+        }
+        await login(parsed.key, { site: parsed.site });
     },
     logout: logoutCommand,
     usage: async () => {
@@ -668,7 +731,7 @@ const COMMANDS = {
         await benchCommand(rest);
     },
     web: async () => {
-        console.error("u1s1 web 已下线，请使用 Desktop App：https://u1s1.io/#download");
+        console.error(tr(`u1s1 web 已下线，请使用 Desktop App：${siteLinks(activeSite()).download}`, `u1s1 web has been removed. Use the Desktop App instead: ${siteLinks(activeSite()).download}`));
         process.exitCode = 1;
     },
 };
@@ -683,8 +746,15 @@ function rejectMistypedCommand(cmd, argCount) {
     const near = KNOWN_COMMANDS.find((k) => editDistance(k, cmd) <= (k.length <= 4 ? 1 : 2));
     if (!near)
         return false;
-    console.error(`不认识的命令「${cmd}」,你是不是想运行:u1s1 ${near}`);
-    console.error("查看全部命令:u1s1 --help;直接开始对话:运行 u1s1(不带参数)");
+    // 国际站没有 deploy:拼错的 deploy 照样拦下(不当 prompt 发给模型),但不引导去跑它
+    const site = activeSite();
+    if (near === "deploy" && site.id === "intl") {
+        console.error(hostingUnavailableText(site));
+        process.exitCode = 1;
+        return true;
+    }
+    console.error(tr(`不认识的命令「${cmd}」,你是不是想运行:u1s1 ${near}`, `Unknown command "${cmd}". Did you mean: u1s1 ${near}`));
+    console.error(tr("查看全部命令:u1s1 --help;直接开始对话:运行 u1s1(不带参数)", "See all commands: u1s1 --help. To start a session, run u1s1 with no arguments."));
     process.exitCode = 1;
     return true;
 }
@@ -705,8 +775,9 @@ async function run() {
         return;
     }
     // `u1s1 login --help` 不该真的去登录、`logout --help` 不该真的退出:先看是不是在问用法
-    if (cmd && Object.hasOwn(SIMPLE_COMMAND_HELP, cmd) && wantsHelp(rest)) {
-        for (const line of SIMPLE_COMMAND_HELP[cmd])
+    const simpleHelp = simpleCommandHelp();
+    if (cmd && Object.hasOwn(simpleHelp, cmd) && wantsHelp(rest)) {
+        for (const line of simpleHelp[cmd])
             console.log(line);
         return;
     }
@@ -724,6 +795,9 @@ async function run() {
 }
 const KNOWN_COMMANDS = ["deploy", "login", "logout", "usage", "whoami", "model", "update", "import", "mcp", "bench", "feedback", "help"];
 /** 没有自己 --help 处理的简单子命令:问用法时只打印说明,不执行任何动作。 */
+function simpleCommandHelp() {
+    return isEnglish() ? SIMPLE_COMMAND_HELP_EN : SIMPLE_COMMAND_HELP;
+}
 const SIMPLE_COMMAND_HELP = {
     login: [
         "用法: u1s1 login",
@@ -748,6 +822,31 @@ const SIMPLE_COMMAND_HELP = {
         "  不想每次退出自动更新:在 ~/.u1s1/agent/settings.json 设 \"autoUpdate\": false",
     ],
 };
+/** 英文版只在国际站出现:那边没有免费包/用量包,usage 只说余额。 */
+const SIMPLE_COMMAND_HELP_EN = {
+    login: [
+        "Usage: u1s1 login",
+        "  Approve this device in your browser to sign in to u1s1; you'll be guided to sign up if you don't have an account.",
+        "  Sign-in info is stored in ~/.u1s1/config.json. Sign out with u1s1 logout.",
+    ],
+    logout: [
+        "Usage: u1s1 logout",
+        "  Sign out on this machine and revoke this device's authorization on the server (only clears local data if the server is unreachable).",
+    ],
+    usage: [
+        "Usage: u1s1 usage",
+        "  Show your remaining balance. In a session you can also type /usage.",
+    ],
+    whoami: [
+        "Usage: u1s1 whoami",
+        "  Print the signed-in account email and server URL. To switch accounts, run u1s1 logout, then u1s1 login.",
+    ],
+    update: [
+        "Usage: u1s1 update",
+        "  Check for and install the latest version: npm installs update via npm, the portable build updates itself in place.",
+        "  To stop auto-updating on exit, set \"autoUpdate\": false in ~/.u1s1/agent/settings.json",
+    ],
+};
 /** 经典 Levenshtein,命令名都很短,O(nm) 足够。 */
 function editDistance(a, b) {
     const dp = Array.from({ length: a.length + 1 }, (_, i) => i);

package/dist/login.d.ts

@@ -1,6 +1,7 @@
 import type { webcrypto } from "node:crypto";
 import { type CliConfig } from "./config.js";
-/** baseUrl 形如 https://api.u1s1.io/v1;auth 路由挂在同一域名的根路径。 */
+import { type SiteId } from "./site.js";
+/** baseUrl 形如 https://api.<站点主域>/v1;auth 路由挂在同一域名的根路径。 */
 export declare function apiOrigin(cfg: CliConfig): string;
 export interface DeviceStart {
     verify_url: string;
@@ -30,6 +31,16 @@ export interface DeviceLoginResult {
 export declare function pollDeviceLogin(origin: string, start: DeviceStart, outcome?: {
     reason?: "expired" | "timeout";
 }): Promise<DeviceLoginResult | null>;
-export declare function login(keyArg?: string): Promise<CliConfig>;
+export interface LoginArgs {
+    /** 老用法 `u1s1 login <key>` 的位置参数(已不再用于登录,只提示改走浏览器批准) */
+    key?: string;
+    site?: SiteId;
+    error?: string;
+}
+/** `u1s1 login [--site cn|global] [key]`;--site 也接受 --site=<值>,global 的别名 intl。 */
+export declare function parseLoginArgs(rest: string[]): LoginArgs;
+export declare function login(keyArg?: string, opts?: {
+    site?: SiteId;
+}): Promise<CliConfig>;
 /** Returns a config with a browser-approved, sender-constrained device credential. */
 export declare function ensureAuth(): Promise<CliConfig>;