u1s1-cli 1.11.7 → 1.12.0

package/dist/login.js

@@ -2,8 +2,10 @@ import { createRequire } from "node:module";
 import { hostname, platform } from "node:os";
 import { fetchMe, readJsonResponseCapped } from "./api.js";
 import { printConsoleBanner } from "./brand.js";
-import { loadConfig, saveConfig } from "./config.js";
+import { loadConfig, loadFileConfig, saveConfig } from "./config.js";
 import { generateDeviceKeyPair, hasDeviceCredential } from "./device-auth.js";
+import { isEnglish, tr } from "./i18n.js";
+import { isSiteUrl, parseSiteArg, siteLinks, siteOf, SITES } from "./site.js";
 const require = createRequire(import.meta.url);
 const VERSION = require("../package.json").version;
 const MAX_DEVICE_AUTH_RESPONSE_BYTES = 64 * 1024;
@@ -32,7 +34,7 @@ function tryOpenBrowser(url) {
         .catch(() => { });
 }
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
-/** baseUrl 形如 https://api.u1s1.io/v1;auth 路由挂在同一域名的根路径。 */
+/** baseUrl 形如 https://api.<站点主域>/v1;auth 路由挂在同一域名的根路径。 */
 export function apiOrigin(cfg) {
     return cfg.baseUrl.replace(/\/v1\/?$/, "");
 }
@@ -140,44 +142,92 @@ export async function pollDeviceLogin(origin, start, outcome) {
         outcome.reason = "timeout";
     return null;
 }
-export async function login(keyArg) {
-    const cfg = loadConfig();
+/** `u1s1 login [--site cn|global] [key]`;--site 也接受 --site=<值>,global 的别名 intl。 */
+export function parseLoginArgs(rest) {
+    const out = {};
+    for (let i = 0; i < rest.length; i++) {
+        const arg = rest[i];
+        if (arg === "--site" || arg.startsWith("--site=")) {
+            const raw = arg === "--site" ? rest[++i] : arg.slice("--site=".length);
+            const site = parseSiteArg(raw);
+            if (!site) {
+                return { error: tr(`--site 只接受 cn 或 global(收到:${raw ?? "空"})`, `--site accepts cn or global (got: ${raw ?? "nothing"})`) };
+            }
+            out.site = site;
+        }
+        else if (out.key === undefined) {
+            out.key = arg;
+        }
+    }
+    return out;
+}
+/**
+ * `--site` 切站:把配置里的 baseUrl 换成该站 apiBase 并落盘,再走该站的设备登录。
+ * 两站账号不通,换到另一个站时本机旧凭证已无用,一并清掉(不是同一站就不动)。
+ * U1S1_BASE_URL 仍优先:设了它本次照旧连它,--site 只写进配置文件。
+ */
+function applySiteChoice(cfg, site) {
+    const target = SITES[site];
+    const envBase = process.env["U1S1_BASE_URL"];
+    // 原来就在这个站(含历史主域 api.u1s1.io)才保留凭证;另一站或自定义网关的凭证在目标站无效
+    const switching = !isSiteUrl(envBase ? loadFileConfig().baseUrl : cfg.baseUrl, site);
+    const cleared = switching
+        ? { apiKey: undefined, deviceToken: undefined, deviceId: undefined, devicePrivateJwk: undefined, devicePublicJwk: undefined, email: undefined }
+        : {};
+    if (envBase) {
+        saveConfig({ ...cfg, ...cleared, baseUrl: target.apiBase });
+        // 环境变量优先,界面语言仍跟 U1S1_BASE_URL 所在站
+        console.log(tr(`  已把 ${target.origin} 写入配置;但环境变量 U1S1_BASE_URL 优先,本次仍连 ${envBase}。`, `  Saved ${target.origin} to your config, but U1S1_BASE_URL takes precedence; still connecting to ${envBase} this time.`));
+        return { ...cfg, ...cleared };
+    }
+    const next = { ...cfg, ...cleared, baseUrl: target.apiBase };
+    // saveConfig 之后界面语言已换成目标站的(resetLang),下面起按新站语言说话
+    saveConfig(next);
+    if (switching) {
+        console.log(tr(`  已切换到 ${target.origin}(两站账号不通,需要在该站重新登录)。`, `  Switched to ${target.origin}. Accounts aren't shared between sites, so please sign in here.`));
+    }
+    return next;
+}
+export async function login(keyArg, opts = {}) {
+    let cfg = loadConfig();
     let credential;
+    if (opts.site)
+        cfg = applySiteChoice(cfg, opts.site);
     if (keyArg?.trim()) {
-        console.log("  API Key 不能证明请求来自 u1s1 客户端，将改用浏览器批准本机设备。");
+        console.log(tr("  API Key 不能证明请求来自 u1s1 客户端，将改用浏览器批准本机设备。", "  An API key can't prove requests come from the u1s1 client; approving this device in the browser instead."));
     }
     printConsoleBanner(VERSION);
     const origin = apiOrigin(cfg);
     const failure = {};
     // 慢网下这一步最长 15 秒,横幅之后一片安静像是卡死;先说一声在连
-    console.log("  正在连接 u1s1 服务器…");
+    console.log(tr("  正在连接 u1s1 服务器…", "  Connecting to the u1s1 server…"));
     const start = await startDeviceLogin(origin, failure);
     if (!start) {
         if (failure.message) {
             // 服务器有明确说法(限流/风控等),原样转达,别伪装成网络问题
-            console.error(`  服务器没有接受登录请求:${failure.message}`);
+            console.error(tr(`  服务器没有接受登录请求:${failure.message}`, `  The server rejected the sign-in request: ${failure.message}`));
             if (failure.status === 429)
-                console.error("  稍等几分钟再运行 u1s1 login 重试即可。");
+                console.error(tr("  稍等几分钟再运行 u1s1 login 重试即可。", "  Wait a few minutes, then run u1s1 login again."));
         }
         else {
-            console.error("  连不上 u1s1 服务器,请检查网络后重试。");
-            console.error("  如果网络正常,可能是 u1s1 版本太旧,运行 u1s1 update 升级后再试。");
+            console.error(tr("  连不上 u1s1 服务器,请检查网络后重试。", "  Can't reach the u1s1 server. Check your network and try again."));
+            console.error(tr("  如果网络正常,可能是 u1s1 版本太旧,运行 u1s1 update 升级后再试。", "  If your network is fine, your u1s1 may be too old; run u1s1 update and try again."));
         }
         process.exit(1);
     }
-    console.log("  用浏览器登录并批准这台设备:");
+    console.log(tr("  用浏览器登录并批准这台设备:", "  Sign in with your browser and approve this device:"));
     console.log("");
     console.log(`      ${start.verify_url}`);
     console.log("");
-    console.log("  正在尝试打开浏览器;如果没有自动打开,把上面这行网址复制到浏览器打开。");
-    console.log("  批准后,本机会用设备私钥为每次 API 请求签名。");
+    console.log(tr("  正在尝试打开浏览器;如果没有自动打开,把上面这行网址复制到浏览器打开。", "  Opening your browser; if it doesn't open, copy the URL above into your browser."));
+    console.log(tr("  批准后,本机会用设备私钥为每次 API 请求签名。", "  Once approved, this machine signs every API request with its device key."));
     tryOpenBrowser(start.verify_url);
     console.log("");
-    console.log("  等待浏览器里完成批准……(按 Ctrl+C 取消)");
+    console.log(tr("  等待浏览器里完成批准……(按 Ctrl+C 取消)", "  Waiting for approval in the browser… (Ctrl+C to cancel)"));
     const waitStartedAt = Date.now();
     const waitTimer = setInterval(() => {
         const mins = Math.round((Date.now() - waitStartedAt) / 60_000);
-        console.log(`  仍在等待批准(已等 ${mins} 分钟),在浏览器里点「批准」后这里会自动继续。`);
+        console.log(tr(`  仍在等待批准(已等 ${mins} 分钟),在浏览器里点「批准」后这里会自动继续。`, `  Still waiting for approval (${mins} min so far). Click "Approve" in the browser and this will continue automatically.`));
     }, 120_000);
     const outcome = {};
     try {
@@ -188,11 +238,11 @@ export async function login(keyArg) {
     }
     if (!credential) {
         if (outcome.reason === "expired" || outcome.reason === "timeout") {
-            console.error("  一直没等到浏览器里的批准,这个登录链接已失效。");
-            console.error("  重新运行 u1s1 会生成新的登录链接;网页打不开的话检查一下网络。");
+            console.error(tr("  一直没等到浏览器里的批准,这个登录链接已失效。", "  No approval arrived from the browser and this sign-in link has expired."));
+            console.error(tr("  重新运行 u1s1 会生成新的登录链接;网页打不开的话检查一下网络。", "  Run u1s1 again for a new sign-in link; if the page won't load, check your network."));
         }
         else {
-            console.error("  没能取得设备凭证,请确认网络正常后重试。");
+            console.error(tr("  没能取得设备凭证,请确认网络正常后重试。", "  Couldn't get a device credential. Check your network and try again."));
         }
         process.exit(1);
     }
@@ -200,34 +250,41 @@ export async function login(keyArg) {
     // 浏览器批准已经成功,先把凭证落盘;后面的账号信息确认失败也不用重走登录
     saveConfig(next);
     const me = await fetchMe(next).catch((e) => {
-        console.log("  ✓ 设备已批准,登录凭证已保存。");
-        console.error(`  只是暂时没连上服务器确认账号信息(${e.message})。`);
-        console.error("  稍后直接运行 u1s1 即可,不需要重新登录。");
+        console.log(tr("  ✓ 设备已批准,登录凭证已保存。", "  ✓ Device approved and credentials saved."));
+        console.error(tr(`  只是暂时没连上服务器确认账号信息(${e.message})。`, `  Couldn't confirm your account details just now (${e.message}).`));
+        console.error(tr("  稍后直接运行 u1s1 即可,不需要重新登录。", "  Just run u1s1 later; no need to sign in again."));
         process.exit(0);
     });
     const tpu = me.tokens_per_usd ?? 0;
     let quotaNote;
-    if (me.free_claim) {
+    if (siteOf(next).id === "intl") {
+        // 国际站没有免费包/每日免费额度,只报按量余额(USD)
+        quotaNote = tr(`余额 $${me.bonus_balance_usd.toFixed(2)}`, `balance $${me.bonus_balance_usd.toFixed(2)}`);
+    }
+    else if (me.free_claim) {
         // 新网关且免费包可领/可续,登录成功时顺手提醒
+        const dashboard = siteLinks(siteOf(next)).dashboard;
         quotaNote =
             me.free_claim === "first"
-                ? "有免费用量包可领,去 https://u1s1.io/dashboard 查看"
-                : "免费用量包状态有更新,去 https://u1s1.io/dashboard 查看";
+                ? tr(`有免费用量包可领,去 ${dashboard} 查看`, `a free usage pack is available — see ${dashboard}`)
+                : tr(`免费用量包状态有更新,去 ${dashboard} 查看`, `your free usage pack status changed — see ${dashboard}`);
     }
     else if (tpu > 0) {
         const tok = (usd) => {
             const t = usd * tpu;
+            if (isEnglish())
+                return t >= 1e6 ? `${Math.round((t / 1e6) * 10) / 10}M` : `${Math.round(t / 1e3)}K`;
             if (t >= 1e8)
                 return `${Math.round((t / 1e8) * 10) / 10} 亿`;
             return `${Math.round(t / 1e4).toLocaleString("en-US")} 万`;
         };
-        quotaNote = `今日免费还剩约 ${tok(me.daily_free_remaining_usd)} Token`;
+        quotaNote = tr(`今日免费还剩约 ${tok(me.daily_free_remaining_usd)} Token`, `about ${tok(me.daily_free_remaining_usd)} free tokens left today`);
     }
     else {
         // 老网关:没有 tokens_per_usd,退回金额显示
-        quotaNote = `今日免费还剩 $${me.daily_free_remaining_usd.toFixed(2)},永久余额 $${me.remaining_usd.toFixed(2)}`;
+        quotaNote = tr(`今日免费还剩 $${me.daily_free_remaining_usd.toFixed(2)},永久余额 $${me.remaining_usd.toFixed(2)}`, `$${me.daily_free_remaining_usd.toFixed(2)} free left today, balance $${me.remaining_usd.toFixed(2)}`);
     }
-    console.log(`  ✓ 登录成功${me.email ? `(${me.email})` : ""},${quotaNote}。`);
+    console.log(tr(`  ✓ 登录成功${me.email ? `(${me.email})` : ""},${quotaNote}。`, `  ✓ Signed in${me.email ? ` as ${me.email}` : ""}; ${quotaNote}.`));
     // 邮箱记进 config,启动横幅直接显示「账号」,不用再问「我现在登的是哪个号」
     const withAccount = { ...next, email: me.email ?? undefined };
     saveConfig(withAccount);

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) {