u1s1-cli 1.11.7 → 1.12.0

package/dist/feedback.js

@@ -1,24 +1,30 @@
 import { readJsonResponseCapped } from "./api.js";
-import { loadConfig, PROVIDER_ID, resolvePreferredModel, VERSION } from "./config.js";
+import { activeSite, loadConfig, PROVIDER_ID, resolvePreferredModel, VERSION } from "./config.js";
 import { authorizedFetch, hasDeviceCredential } from "./device-auth.js";
+import { tr } from "./i18n.js";
 import { askLine } from "./prompt.js";
 import { lastRequestId } from "./request-trace.js";
+import { siteLinks, siteOf } from "./site.js";
 /**
  * `u1s1 feedback [text]` / 会话内 `/feedback`:一条命令直接建工单,并附上
  * 版本、平台、最近一次请求编号等诊断快照(运营清单 E4),不用再手写邮件。
  * 走 POST /v1/support/tickets(设备签名),201 返回 {id, url}。
  */
 export const FEEDBACK_CATEGORIES = ["question", "bug", "billing", "suggestion", "other"];
-const CATEGORY_LABELS = {
-    question: "提问",
-    bug: "故障",
-    billing: "计费",
-    suggestion: "建议",
-    other: "其他",
-};
+// 用时求值:模块加载时还不知道站点/语言
+const categoryLabels = () => ({
+    question: tr("提问", "question"),
+    bug: tr("故障", "bug"),
+    billing: tr("计费", "billing"),
+    suggestion: tr("建议", "suggestion"),
+    other: tr("其他", "other"),
+});
 export const FEEDBACK_SUBJECT_MAX = 50;
 export const FEEDBACK_MESSAGE_MAX = 4_000;
-export const SUPPORT_URL = "https://u1s1.io/dashboard#sec-support";
+/** 当前站点仪表盘的工单/留言区,提交失败或服务端没回链接时的兜底入口。 */
+export function supportUrl(site = activeSite()) {
+    return siteLinks(site).support;
+}
 const MAX_TICKET_RESPONSE_BYTES = 64 * 1024;
 /** `--bug` 等旗标可放在任意位置,其余 token 拼成正文。 */
 export function parseFeedbackArgs(args) {
@@ -32,7 +38,7 @@ export function parseFeedbackArgs(args) {
             continue;
         }
         if (arg.startsWith("--"))
-            throw new Error(`不认识的 feedback 参数:${arg}(可用 --bug --question --suggestion --billing)`);
+            throw new Error(tr(`不认识的 feedback 参数:${arg}(可用 --bug --question --suggestion --billing)`, `Unknown feedback option: ${arg} (use --bug --question --suggestion --billing)`));
         words.push(arg);
     }
     return { category, text: words.join(" ").trim() };
@@ -41,7 +47,7 @@ export function parseFeedbackArgs(args) {
 export function buildFeedbackRequest(input) {
     const message = input.text.replace(/\r\n?/g, "\n").trim();
     if (!message)
-        throw new Error("反馈内容不能为空");
+        throw new Error(tr("反馈内容不能为空", "Feedback can't be empty"));
     const firstLine = message.split("\n").find((l) => l.trim())?.replace(/\s+/g, " ").trim() ?? message;
     const subject = firstLine.length > FEEDBACK_SUBJECT_MAX
         ? `${firstLine.slice(0, FEEDBACK_SUBJECT_MAX - 1)}…`
@@ -86,12 +92,12 @@ export async function submitFeedback(cfg, body) {
         });
     }
     catch {
-        throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`);
+        throw new Error(tr(`连不上 ${cfg.baseUrl},检查一下网络?`, `Can't reach ${cfg.baseUrl}. Check your network?`));
     }
     const value = await readJsonResponseCapped(resp, MAX_TICKET_RESPONSE_BYTES).catch(() => null);
     const data = value && typeof value === "object" && !Array.isArray(value) ? value : null;
     if (resp.status === 201 || resp.status === 200)
-        return createdOutcome(resp.status, data);
+        return createdOutcome(resp.status, data, siteOf(cfg));
     return {
         ok: false,
         status: resp.status,
@@ -99,11 +105,11 @@ export async function submitFeedback(cfg, body) {
         retryAfterSeconds: retryAfterSeconds(resp, data),
     };
 }
-function createdOutcome(status, data) {
+function createdOutcome(status, data, site) {
     const id = typeof data?.id === "string" || typeof data?.id === "number" ? String(data.id) : "";
     if (!id)
-        return { ok: false, status, message: "服务端工单响应格式不正确" };
-    const url = typeof data?.url === "string" && data.url.startsWith("https://") ? data.url : SUPPORT_URL;
+        return { ok: false, status, message: tr("服务端工单响应格式不正确", "Unexpected support ticket response from the server") };
+    const url = typeof data?.url === "string" && data.url.startsWith("https://") ? data.url : supportUrl(site);
     return { ok: true, id, url };
 }
 /** 优先 Retry-After 头,其次响应体里的 retry_after;都没有就不给等待时长。 */
@@ -117,32 +123,40 @@ function retryAfterSeconds(resp, data) {
 function failureMessage(status, data) {
     if (typeof data?.error?.message === "string")
         return data.error.message.slice(0, 500);
-    return status === 401 ? "登录已失效,请重新运行 u1s1 login" : `服务端返回 ${status},稍后再试`;
+    return status === 401
+        ? tr("登录已失效,请重新运行 u1s1 login", "Your session has expired. Run u1s1 login to sign in again.")
+        : tr(`服务端返回 ${status},稍后再试`, `Server returned ${status}. Please try again later.`);
 }
 /** 结果措辞,终端与会话内共用(每项一行)。 */
-export function feedbackOutcomeLines(outcome) {
+export function feedbackOutcomeLines(outcome, site = activeSite()) {
     if (outcome.ok) {
         return [
-            `✅ 反馈已提交,工单编号 ${outcome.id}。`,
-            `进度与回复在这里看:${outcome.url}`,
-            "我们通常会在 24 小时内回复到你的注册邮箱。",
+            tr(`✅ 反馈已提交,工单编号 ${outcome.id}。`, `✅ Feedback sent. Ticket #${outcome.id}.`),
+            tr(`进度与回复在这里看:${outcome.url}`, `Track progress and replies here: ${outcome.url}`),
+            tr("我们通常会在 24 小时内回复到你的注册邮箱。", "We usually reply to your account email within 24 hours."),
         ];
     }
     if (outcome.status === 429) {
         const wait = outcome.retryAfterSeconds
-            ? `请等 ${Math.ceil(outcome.retryAfterSeconds / 60) || 1} 分钟后再试`
-            : "请稍等几分钟再试";
-        return [`提交太频繁了,${wait}。`, `等不及的话直接到后台留言:${SUPPORT_URL}`];
+            ? tr(`请等 ${Math.ceil(outcome.retryAfterSeconds / 60) || 1} 分钟后再试`, `please wait ${Math.ceil(outcome.retryAfterSeconds / 60) || 1} min and try again`)
+            : tr("请稍等几分钟再试", "please wait a few minutes and try again");
+        return [
+            tr(`提交太频繁了,${wait}。`, `Too many submissions; ${wait}.`),
+            tr(`等不及的话直接到后台留言:${supportUrl(site)}`, `Or leave a message on the dashboard: ${supportUrl(site)}`),
+        ];
     }
-    return [`提交失败:${outcome.message}`, `可以直接到后台留言:${SUPPORT_URL}`];
+    return [
+        tr(`提交失败:${outcome.message}`, `Submission failed: ${outcome.message}`),
+        tr(`可以直接到后台留言:${supportUrl(site)}`, `You can leave a message on the dashboard instead: ${supportUrl(site)}`),
+    ];
 }
 export function printFeedbackHelp() {
     console.log("");
-    console.log("  u1s1 feedback [--bug|--question|--suggestion|--billing] [一句话描述]");
+    console.log(tr("  u1s1 feedback [--bug|--question|--suggestion|--billing] [一句话描述]", "  u1s1 feedback [--bug|--question|--suggestion|--billing] [short description]"));
     console.log("");
-    console.log("    不带描述时会问你一行;分类不写默认「其他」。");
-    console.log("    会自动附上版本、平台、最近一次报错的请求编号,方便我们定位。");
-    console.log(`    也可以在后台留言:${SUPPORT_URL}`);
+    console.log(tr("    不带描述时会问你一行;分类不写默认「其他」。", "    Without a description you'll be asked for one line; the category defaults to \"other\"."));
+    console.log(tr("    会自动附上版本、平台、最近一次报错的请求编号,方便我们定位。", "    Your version, platform and the request ID of the last error are attached automatically to help us debug."));
+    console.log(tr(`    也可以在后台留言:${supportUrl()}`, `    You can also leave a message on the dashboard: ${supportUrl()}`));
     console.log("");
 }
 /** 终端命令入口。 */
@@ -154,16 +168,16 @@ export async function feedbackCommand(args) {
     }
     const cfg = loadConfig();
     if (!hasDeviceCredential(cfg)) {
-        console.error("还没登录,先跑 u1s1 login");
+        console.error(tr("还没登录,先跑 u1s1 login", "Not signed in. Run u1s1 login first."));
         process.exitCode = 1;
         return;
     }
     let text = parsed.text;
     if (!text) {
-        text = await askLine(`  想反馈什么?(${CATEGORY_LABELS[parsed.category]},一行说清即可):`);
+        text = await askLine(tr(`  想反馈什么?(${categoryLabels()[parsed.category]},一行说清即可):`, `  What's your feedback? (${categoryLabels()[parsed.category]}, one line is enough): `));
     }
     if (!text) {
-        console.error("反馈内容不能为空。用法:u1s1 feedback \"一句话描述\"");
+        console.error(tr("反馈内容不能为空。用法:u1s1 feedback \"一句话描述\"", "Feedback can't be empty. Usage: u1s1 feedback \"short description\""));
         process.exitCode = 1;
         return;
     }
@@ -174,7 +188,7 @@ export async function feedbackCommand(args) {
     });
     const outcome = await submitFeedback(cfg, body);
     console.log("");
-    for (const line of feedbackOutcomeLines(outcome))
+    for (const line of feedbackOutcomeLines(outcome, siteOf(cfg)))
         console.log(`  ${line}`);
     console.log("");
     if (!outcome.ok)
@@ -187,22 +201,29 @@ export async function feedbackCommand(args) {
 export async function feedbackInSession(rawArgs, model) {
     const parsed = parseFeedbackArgs(rawArgs.split(/\s+/).filter(Boolean));
     if (parsed.help) {
-        return ["/feedback [--bug|--question|--suggestion|--billing] 一句话描述", `或到后台留言:${SUPPORT_URL}`];
+        return [
+            tr("/feedback [--bug|--question|--suggestion|--billing] 一句话描述", "/feedback [--bug|--question|--suggestion|--billing] short description"),
+            tr(`或到后台留言:${supportUrl()}`, `Or leave a message on the dashboard: ${supportUrl()}`),
+        ];
     }
     const cfg = loadConfig();
     if (!hasDeviceCredential(cfg))
-        return ["还没登录,先在终端运行 u1s1 login"];
-    if (!parsed.text)
-        return ["反馈内容不能为空,例如:/feedback --bug 生成的网页打不开"];
+        return [tr("还没登录,先在终端运行 u1s1 login", "Not signed in. Run u1s1 login in your terminal first.")];
+    if (!parsed.text) {
+        return [tr("反馈内容不能为空,例如:/feedback --bug 生成的网页打不开", "Feedback can't be empty, e.g. /feedback --bug the generated page won't open")];
+    }
     const body = buildFeedbackRequest({
         text: parsed.text,
         category: parsed.category,
         diagnostics: collectDiagnostics({ model, surface: "session" }),
     });
     try {
-        return feedbackOutcomeLines(await submitFeedback(cfg, body));
+        return feedbackOutcomeLines(await submitFeedback(cfg, body), siteOf(cfg));
     }
     catch (e) {
-        return [e instanceof Error ? e.message : String(e), `可以直接到后台留言:${SUPPORT_URL}`];
+        return [
+            e instanceof Error ? e.message : String(e),
+            tr(`可以直接到后台留言:${supportUrl(siteOf(cfg))}`, `You can leave a message on the dashboard instead: ${supportUrl(siteOf(cfg))}`),
+        ];
     }
 }

package/dist/i18n.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 界面语言跟站点走:国际站(u1s1.dev)英文,中国站中文;不提供语言切换
+ * (运营者 2026-10-01 定「国际版只要英文」)。站点按下载渠道定,见 site.ts。
+ *
+ * 文案就地写成 tr("中文", "English"),不做 key 表:两种语言挨着,改一处顺手改另一处。
+ * 模块顶层常量不能直接调 tr —— 那时配置可能还没读,要写成函数在用时求值。
+ *
+ * 本模块不 import 任何本地模块:config.ts 在加载时用 setLangResolver 注册「按当前站点
+ * 判定」,saveConfig 后 resetLang(),`u1s1 login --site` 切站后同进程立即换语言。
+ */
+export type Lang = "zh" | "en";
+export declare function setLangResolver(fn: () => Lang): void;
+/** 配置变了(换站)后调用,下次 lang() 重新判定。 */
+export declare function resetLang(): void;
+/**
+ * 当前界面语言。U1S1_LANG=en|zh 可强制(测试用;CLI 拉起 pi 前也写它,
+ * 让 pi 补丁里的文案跟着走,见 patches/ 与 scripts/patch-pi.js)。
+ */
+export declare function lang(): Lang;
+export declare function isEnglish(): boolean;
+export declare function tr(zh: string, en: string): string;

package/dist/i18n.js

@@ -0,0 +1,46 @@
+/**
+ * 界面语言跟站点走:国际站(u1s1.dev)英文,中国站中文;不提供语言切换
+ * (运营者 2026-10-01 定「国际版只要英文」)。站点按下载渠道定,见 site.ts。
+ *
+ * 文案就地写成 tr("中文", "English"),不做 key 表:两种语言挨着,改一处顺手改另一处。
+ * 模块顶层常量不能直接调 tr —— 那时配置可能还没读,要写成函数在用时求值。
+ *
+ * 本模块不 import 任何本地模块:config.ts 在加载时用 setLangResolver 注册「按当前站点
+ * 判定」,saveConfig 后 resetLang(),`u1s1 login --site` 切站后同进程立即换语言。
+ */
+let resolver;
+let cached;
+export function setLangResolver(fn) {
+    resolver = fn;
+    cached = undefined;
+}
+/** 配置变了(换站)后调用,下次 lang() 重新判定。 */
+export function resetLang() {
+    cached = undefined;
+}
+/**
+ * 当前界面语言。U1S1_LANG=en|zh 可强制(测试用;CLI 拉起 pi 前也写它,
+ * 让 pi 补丁里的文案跟着走,见 patches/ 与 scripts/patch-pi.js)。
+ */
+export function lang() {
+    const forced = process.env["U1S1_LANG"];
+    if (forced === "en" || forced === "zh")
+        return forced;
+    if (cached)
+        return cached;
+    if (!resolver)
+        return "zh"; // config.ts 还没加载:不缓存,免得把默认值钉死
+    try {
+        cached = resolver();
+    }
+    catch {
+        cached = "zh";
+    }
+    return cached;
+}
+export function isEnglish() {
+    return lang() === "en";
+}
+export function tr(zh, en) {
+    return lang() === "en" ? en : zh;
+}

package/dist/import/index.js

@@ -1,5 +1,6 @@
 import { join } from "node:path";
 import { formatHomePath } from "../brand.js";
+import { isEnglish, tr } from "../i18n.js";
 import { agentDir } from "../config.js";
 import { claudeAdapter, hydrateClaudeSession } from "./claude.js";
 import { codexAdapter, hydrateCodexSession } from "./codex.js";
@@ -65,7 +66,7 @@ function parseSourceArg(raw) {
     };
     const id = aliases[raw.toLowerCase()];
     if (!id) {
-        console.error(`  不认识来源「${raw}」,可选: claude / codex / all`);
+        console.error(tr(`  不认识来源「${raw}」,可选: claude / codex / all`, `  Unknown source "${raw}"; choose claude / codex / all`));
         process.exit(1);
     }
     return [id];
@@ -88,7 +89,7 @@ function parseFlags(args) {
         else if (a === "--cwd") {
             const next = args[++i];
             if (!next) {
-                console.error("  --cwd 后面要跟一个目录");
+                console.error(tr("  --cwd 后面要跟一个目录", "  --cwd requires a directory"));
                 process.exit(1);
             }
             cwd = next;
@@ -97,20 +98,20 @@ function parseFlags(args) {
             const next = args[++i];
             const n = Number(next);
             if (!Number.isFinite(n) || n <= 0) {
-                console.error("  --limit 要是正整数");
+                console.error(tr("  --limit 要是正整数", "  --limit must be a positive integer"));
                 process.exit(1);
             }
             limit = Math.floor(n);
         }
         else if (a.startsWith("-")) {
-            console.error(`  不认识参数 ${a}`);
+            console.error(tr(`  不认识参数 ${a}`, `  Unknown option ${a}`));
             process.exit(1);
         }
         else if (!sourceRaw) {
             sourceRaw = a;
         }
         else {
-            console.error(`  多余参数 ${a}`);
+            console.error(tr(`  多余参数 ${a}`, `  Unexpected argument ${a}`));
             process.exit(1);
         }
     }
@@ -123,6 +124,24 @@ function parseFlags(args) {
     };
 }
 function printHelp() {
+    if (isEnglish()) {
+        console.log("");
+        console.log("  Import past conversations and skills from Claude Code / Codex into u1s1");
+        console.log("");
+        console.log("  Usage:");
+        console.log("    u1s1 import              Import conversations for the current directory");
+        console.log("    u1s1 import claude       Claude Code only");
+        console.log("    u1s1 import codex        Codex only");
+        console.log("    u1s1 import --all        Import every conversation found on this machine");
+        console.log("    u1s1 import --cwd <dir>  Project directory (default: current directory)");
+        console.log("    u1s1 import --dry-run    Show what would be imported without writing anything");
+        console.log("    u1s1 import --force      Re-import conversations already imported");
+        console.log("    u1s1 import skills       Import skills (SKILL.md) from Claude Code / Codex and others; see u1s1 import skills -h");
+        console.log("");
+        console.log("  After importing, run u1s1 in that project and type /resume to see them.");
+        console.log("");
+        return;
+    }
     console.log("");
     console.log("  把 Claude Code / Codex 的历史对话和技能导入 u1s1");
     console.log("");
@@ -179,65 +198,82 @@ function pendingSessions(sessions, index, force) {
     return { pending, alreadyImported };
 }
 function printNoSessions(opts) {
-    const where = opts.cwd ? `当前目录 ${formatHomePath(opts.cwd)}` : "这台电脑";
     const who = opts.sources.map(sourceLabel).join(" / ");
     console.log("");
-    console.log(`  在${where}没找到 ${who} 的历史对话。`);
+    if (isEnglish()) {
+        const where = opts.cwd ? `the current directory ${formatHomePath(opts.cwd)}` : "this computer";
+        console.log(`  No ${who} conversations found in ${where}.`);
+    }
+    else {
+        const where = opts.cwd ? `当前目录 ${formatHomePath(opts.cwd)}` : "这台电脑";
+        console.log(`  在${where}没找到 ${who} 的历史对话。`);
+    }
     if (opts.cwd)
-        console.log("  想全盘扫一遍可以: u1s1 import --all");
+        console.log(tr("  想全盘扫一遍可以: u1s1 import --all", "  To scan everything: u1s1 import --all"));
     console.log("");
 }
 async function printSessionPreview({ sessions, pending, alreadyImported, opts, }) {
     console.log("");
-    console.log(`  找到 ${sessions.length} 段对话`
-        + (opts.cwd ? `（${formatHomePath(opts.cwd)}）` : "")
-        + (alreadyImported ? `，其中 ${alreadyImported} 段以前导过` : "")
-        + "。");
+    console.log(isEnglish()
+        ? `  Found ${sessions.length} conversation(s)`
+            + (opts.cwd ? ` (${formatHomePath(opts.cwd)})` : "")
+            + (alreadyImported ? `, ${alreadyImported} already imported` : "")
+            + "."
+        : `  找到 ${sessions.length} 段对话`
+            + (opts.cwd ? `（${formatHomePath(opts.cwd)}）` : "")
+            + (alreadyImported ? `，其中 ${alreadyImported} 段以前导过` : "")
+            + "。");
     const preview = await Promise.all(pending.slice(0, 12).map(hydrateSession));
     for (const session of preview) {
-        const title = session.title ? oneLine(session.title, 56) : "(无标题)";
+        const title = session.title ? oneLine(session.title, 56) : tr("(无标题)", "(untitled)");
         console.log(`    · [${sourceLabel(session.source)}] ${title}`);
         if (!opts.cwd && session.cwd)
             console.log(`      ${formatHomePath(session.cwd)}`);
     }
     if (pending.length > preview.length) {
-        console.log(`    …还有 ${pending.length - preview.length} 段`);
+        console.log(tr(`    …还有 ${pending.length - preview.length} 段`, `    …and ${pending.length - preview.length} more`));
     }
 }
 async function shouldCancelImport(pending, opts, assumeYes) {
     if (pending.length === 0) {
         console.log("");
-        console.log("  没有新的可导。想重导一遍就加 --force。");
+        console.log(tr("  没有新的可导。想重导一遍就加 --force。", "  Nothing new to import. Add --force to re-import."));
         console.log("");
         return true;
     }
     if (opts.dryRun) {
         console.log("");
-        console.log(`  预演结束,以上 ${pending.length} 段还没真正导入。`);
+        console.log(tr(`  预演结束,以上 ${pending.length} 段还没真正导入。`, `  Dry run complete; the ${pending.length} conversation(s) above were not imported.`));
         console.log("");
         return true;
     }
-    if (assumeYes || await confirm(`  导入这 ${pending.length} 段?(回车=好 / n=取消) `)) {
+    if (assumeYes || await confirm(tr(`  导入这 ${pending.length} 段?(回车=好 / n=取消) `, `  Import these ${pending.length}? (Enter = yes / n = cancel) `))) {
         return false;
     }
-    console.log("  已取消。");
+    console.log(tr("  已取消。", "  Canceled."));
     return true;
 }
 function printImportSummary(summary) {
     console.log("");
-    console.log(`  ✓ 导入 ${summary.imported} 段`
-        + (summary.skipped ? `，跳过 ${summary.skipped}` : "")
-        + (summary.empty ? `，空对话 ${summary.empty}` : "")
-        + (summary.errors ? `，失败 ${summary.errors}` : "")
-        + "。");
+    console.log(isEnglish()
+        ? `  ✓ Imported ${summary.imported}`
+            + (summary.skipped ? `, skipped ${summary.skipped}` : "")
+            + (summary.empty ? `, empty ${summary.empty}` : "")
+            + (summary.errors ? `, failed ${summary.errors}` : "")
+            + "."
+        : `  ✓ 导入 ${summary.imported} 段`
+            + (summary.skipped ? `，跳过 ${summary.skipped}` : "")
+            + (summary.empty ? `，空对话 ${summary.empty}` : "")
+            + (summary.errors ? `，失败 ${summary.errors}` : "")
+            + "。");
     if (summary.imported > 0) {
-        console.log("  进对应项目跑 u1s1,输入 /resume 就能接着聊。");
+        console.log(tr("  进对应项目跑 u1s1,输入 /resume 就能接着聊。", "  Run u1s1 in that project and type /resume to pick up where you left off."));
     }
     for (const item of summary.items) {
         if (item.status === "error")
-            console.log(`    × ${item.title}: ${item.detail ?? "失败"}`);
+            console.log(`    × ${item.title}: ${item.detail ?? tr("失败", "failed")}`);
         else if (item.status === "skipped" && item.detail)
-            console.log(`    · 跳过 ${item.title}: ${item.detail}`);
+            console.log(tr(`    · 跳过 ${item.title}: ${item.detail}`, `    · Skipped ${item.title}: ${item.detail}`));
     }
     console.log("");
 }
@@ -292,7 +328,7 @@ function runImport(sessions, index, opts) {
                     title,
                     cwd: session.cwd,
                     status: "skipped",
-                    detail: `原始记录太大(${formatBytes(size)}),先跳过`,
+                    detail: tr(`原始记录太大(${formatBytes(size)}),先跳过`, `source log too large (${formatBytes(size)}), skipped`),
                 });
                 skipped += 1;
                 continue;
@@ -305,7 +341,7 @@ function runImport(sessions, index, opts) {
                     title,
                     cwd: converted.cwd,
                     status: "skipped",
-                    detail: "不属于当前目录",
+                    detail: tr("不属于当前目录", "not in the current directory"),
                 });
                 skipped += 1;
                 continue;