u1s1-cli 1.15.2 → 1.16.1

package/dist/agents/pi.js

@@ -364,17 +364,11 @@ export async function runAgent(cfg, args) {
                     const site = siteOf(cfg);
                     const text = [
                         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}`)),
+                        theme.fg("text", tr("回车发送 · Shift+Enter 换行 · Ctrl+V 贴图 · Esc 中断", "Enter to send · Shift+Enter newline · Ctrl+V paste image · Esc stop")),
+                        theme.fg("text", tr("/model 切换模型 · /clear 新会话 · /resume 历史会话 · /usage 额度", "/model switch models · /clear new session · /resume past sessions · /usage balance")),
+                        theme.fg("text", tr("/feedback 反馈问题 · /context 上下文占用 · /compact 压缩上下文 · /exit 退出", "/feedback report a problem · /context context usage · /compact compact context · /exit exit")),
+                        // 终端命令、匿名统计说明都在 u1s1 --help 里,这里不重复
+                        theme.fg("dim", tr(`/hotkeys 快捷键 · 终端命令 u1s1 --help · 教程 → ${siteLinks(site).guides}`, `/hotkeys shortcuts · terminal: u1s1 --help · Guides → ${siteLinks(site).guides}`)),
                     ].join("\n");
                     return new Text(text, 1, 0);
                 });

package/dist/api.js

@@ -356,7 +356,7 @@ export async function fetchMe(cfg) {
         throw new Error(unreachableMessage(cfg.baseUrl));
     }
     if (resp.status === 401)
-        throw new Error(sessionExpiredMessage());
+        throw new AuthError(sessionExpiredMessage());
     if (!resp.ok)
         throw new Error(await errorMessageFromResponse(resp, tr(`服务端返回 ${resp.status},稍后再试`, `Server returned ${resp.status}. Please try again later.`)));
     const body = await readJsonResponseCapped(resp);

package/dist/brand.d.ts

@@ -21,7 +21,8 @@ export declare function cwdAdvice(cwd: string, dirs?: {
 export declare const HERO_ART: string[];
 /**
  * Startup hero, responsive to terminal width:
- * wide → wordmark with info column beside it; medium → stacked; narrow → one-liner.
+ * wide → wordmark with a short info column beside it; narrow → three compact lines.
+ * 只放每次都要看的:版本(+升级状态)、目录与账号、/help 入口;其余收进 /help。
  */
 export declare function renderBrandHeader(theme: Theme, input: {
     version: string;
@@ -32,11 +33,12 @@ export declare function renderBrandHeader(theme: Theme, input: {
         text: string;
         url?: string;
     };
-    /** 当前目录为空时给可照抄的开场 prompt(见 starterLines)。 */
+    /** 当前目录为空时给一句可照抄的开场 prompt(见 starterLine)。 */
     starterTips?: boolean;
     /** 启动目录不合适时的提醒(见 cwdAdvice)。 */
     cwdWarning?: string;
     /** 登录账号(config.email),跟在 cwd 后面;多账号/换机时一眼看到登的是谁。 */
     account?: string;
 }): string[];
+/** `u1s1 --help`、登录前的一行抬头(大字模只在对话界面的启动横幅里出现)。 */
 export declare function printConsoleBanner(version: string): void;

package/dist/brand.js

@@ -1,7 +1,6 @@
 import { homedir } from "node:os";
 import { join, resolve, sep } from "node:path";
-import { activeSite } from "./config.js";
-import { isEnglish, tr } from "./i18n.js";
+import { tr } from "./i18n.js";
 import { siteLinks } from "./site.js";
 export const BRAND_NAME = "u1s1";
 export const BRAND_CN = "有一说一";
@@ -9,10 +8,6 @@ export const BRAND_CN = "有一说一";
 export function brandTagline() {
     return tr("说人话的 AI 编程搭子", "the plain-spoken AI coding assistant");
 }
-/** 横幅里品牌名后面那一行:中国站「有一说一 · 标语」,国际站只有英文标语。 */
-function brandSubtitle() {
-    return isEnglish() ? "Plain-spoken AI coding assistant" : `${BRAND_CN} · ${brandTagline()}`;
-}
 /**
  * 中国站仪表盘。只为 embed 导出保留(Desktop App 现在只有中国站包,P3 出 intl 包时
  * 改用自带的站点配置);CLI 内部一律按当前站点取 siteLinks(activeSite()).dashboard。
@@ -39,10 +34,10 @@ export function cwdAdvice(cwd, dirs = {}) {
     const here = resolve(cwd);
     const within = (dir) => here === dir || here.startsWith(dir + sep);
     if (within(configDir)) {
-        return tr("当前在 u1s1 的配置目录里(存着登录凭据和设置),模型的文件工具会直接看到它们;建议 /exit 后 cd 到你的项目文件夹再运行 u1s1", "You're inside u1s1's config folder (it holds your sign-in credentials and settings), so the model's file tools can see them. /exit, cd to your project folder, and run u1s1 again.");
+        return tr("当前在 u1s1 配置目录(存着登录凭据),模型能直接读到;建议 /exit 后 cd 到你的项目文件夹再运行", "You're in u1s1's config folder (it holds your credentials), which the model can read. /exit and cd to your project folder first.");
     }
     if (here === home) {
-        return tr("当前在用户主目录,模型找文件会翻遍整个主目录,又慢又容易改错地方;建议 /exit 后 cd 到项目文件夹再运行 u1s1", "You're in your home folder, so the model will search all of it: slow, and easy to edit the wrong files. /exit, cd to a project folder, and run u1s1 again.");
+        return tr("当前在用户主目录,模型找文件会翻遍整个主目录;建议 /exit 后 cd 到项目文件夹再运行", "You're in your home folder, so the model will search all of it. /exit and cd to a project folder first.");
     }
     return undefined;
 }
@@ -79,87 +74,48 @@ function announcementLine(theme, a) {
     const link = a.url ? `  ${theme.fg("dim", a.url)}` : "";
     return `${theme.fg("accent", "📢")} ${theme.fg("accent", a.text)}${link}`;
 }
-/** 空目录首跑引导:不让新手面对空白输入框想 prompt,给几句能照抄的开场白。 */
-function starterLines(theme) {
-    if (isEnglish()) {
-        return [
-            ` ${theme.fg("muted", "Empty folder? Just describe what you want to build, for example:")}`,
-            ` ${theme.fg("text", "\"Build a personal landing page with a short bio\"")}`,
-            ` ${theme.fg("text", "\"Make a birthday card page for a friend with a little animation\"")}`,
-            ` ${theme.fg("text", "\"Write a small tool that renames the photos in this folder by date\"")}`,
-        ];
-    }
-    const lines = [
-        ` ${theme.fg("muted", "这个文件夹还是空的?把想做的直接说出来就行,比如:")}`,
-        ` ${theme.fg("text", "「做一个自我介绍网页,做完帮我发布出去」")}`,
-        ` ${theme.fg("text", "「做一个给朋友的生日祝福页面,要有点小动画」")}`,
-        ` ${theme.fg("text", "「写一个把文件夹里照片按日期重命名的小工具」")}`,
-    ];
-    // 国际站没有网页托管(u1s1 deploy),不提发布
-    if (activeSite().id !== "intl") {
-        lines.push(` ${theme.fg("muted", "网页做好后,输入 /exit 回到终端,运行 u1s1 deploy --public 一键上线,拿到可分享的链接发给朋友")}`);
-    }
-    return lines;
+/** 空目录首跑引导:给一句能照抄的开场白,不让新手对着空白输入框想 prompt。 */
+function starterLine(theme) {
+    return ` ${theme.fg("muted", tr("空文件夹?直接说想做什么,比如:", "Empty folder? Just say what to build, e.g. "))}${theme.fg("text", tr("「做一个自我介绍网页」", "\"a personal landing page with a short bio\""))}`;
 }
+/** 信息列(字模旁)最宽的常规行需要的列数;再窄就退成不带字模的紧凑版。 */
+const INFO_WIDTH = 46;
 /**
  * Startup hero, responsive to terminal width:
- * wide → wordmark with info column beside it; medium → stacked; narrow → one-liner.
+ * wide → wordmark with a short info column beside it; narrow → three compact lines.
+ * 只放每次都要看的:版本(+升级状态)、目录与账号、/help 入口;其余收进 /help。
  */
 export function renderBrandHeader(theme, input) {
     const name = theme.bold(theme.fg("text", `${BRAND_NAME} v${input.version}`)) +
         (input.notice ? `  ${theme.fg("accent", input.notice)}` : "");
-    const brand = theme.fg("muted", brandSubtitle());
     const dir = theme.fg("dim", `cwd: ${formatHomePath(input.cwd)}${input.account ? tr(` · 账号 ${input.account}`, ` · account ${input.account}`) : ""}`);
-    const hints = theme.fg("dim", tr("/help · Ctrl+V 图片 · Shift+Enter 换行 · Esc 中断", "/help · Ctrl+V image · Shift+Enter newline · Esc stop"));
-    const starter = input.starterTips ? starterLines(theme) : [];
-    const warning = input.cwdWarning ? [` ${theme.fg("warning", "⚠")} ${theme.fg("warning", input.cwdWarning)}`] : [];
-    if (input.width < ART_WIDTH + 4) {
-        const lines = [
-            "",
-            ` ${theme.fg("accent", "✻")} ${name}${isEnglish() ? "" : `  ${theme.fg("muted", BRAND_CN)}`}`,
-            `   ${dir}`,
-            `   ${theme.fg("dim", tr("Ctrl+V 粘贴图片", "Ctrl+V to paste images"))}`,
-        ];
+    // Ctrl+V 贴图必须留在横幅上:macOS 上 Cmd+V 贴不了图,不写出来很多人找不到
+    const hints = theme.fg("dim", tr("/help 查看命令 · Ctrl+V 贴图 · Esc 中断", "/help for commands · Ctrl+V image · Esc stop"));
+    const extra = [];
+    if (input.cwdWarning)
+        extra.push(` ${theme.fg("warning", "⚠")} ${theme.fg("warning", input.cwdWarning)}`);
+    if (input.starterTips)
+        extra.push(starterLine(theme));
+    const tail = extra.length ? ["", ...extra] : [];
+    if (input.width < ART_WIDTH + 3 + INFO_WIDTH) {
+        const lines = ["", ` ${theme.fg("accent", "✻")} ${name}`, `   ${dir}`, `   ${hints}`];
         if (input.announcement)
             lines.push(`   ${announcementLine(theme, input.announcement)}`);
-        if (warning.length)
-            lines.push("", ...warning);
-        if (starter.length)
-            lines.push("", ...starter);
-        return [...lines, ""];
+        return [...lines, ...tail, ""];
     }
-    const art = HERO_ART.map((line) => ` ${paintArt(theme, line)}`);
-    // widest info row (hints) needs 46 cols beside the 28-col wordmark (English hints are wider: 56)
-    if (input.width < ART_WIDTH + (isEnglish() ? 56 : 46)) {
-        const lines = ["", ...art, "", ` ${name}  ${brand}`, ` ${dir}`, ` ${hints}`];
-        if (input.announcement)
-            lines.push(` ${announcementLine(theme, input.announcement)}`);
-        if (warning.length)
-            lines.push("", ...warning);
-        if (starter.length)
-            lines.push("", ...starter);
-        return [...lines, ""];
-    }
-    const rows = [...art];
+    const rows = HERO_ART.map((line) => ` ${paintArt(theme, line)}`);
     const gap = "   ";
     rows[1] += `${gap}${name}`;
-    rows[2] += `${gap}${brand}`;
-    rows[3] += `${gap}${dir}`;
-    rows[4] += `${gap}${hints}`;
-    // 公告放信息列末尾(最后一行字模旁),够醒目又不挤掉常规信息
+    rows[2] += `${gap}${dir}`;
+    rows[3] += `${gap}${hints}`;
+    // 公告放信息列末尾(字模旁),够醒目又不挤掉常规信息
     if (input.announcement)
-        rows[5] += `${gap}${announcementLine(theme, input.announcement)}`;
-    if (warning.length)
-        rows.push("", ...warning);
-    if (starter.length)
-        rows.push("", ...starter);
-    return ["", ...rows, ""];
+        rows[4] += `${gap}${announcementLine(theme, input.announcement)}`;
+    return ["", ...rows, ...tail, ""];
 }
+/** `u1s1 --help`、登录前的一行抬头(大字模只在对话界面的启动横幅里出现)。 */
 export function printConsoleBanner(version) {
     console.log("");
-    for (const line of HERO_ART)
-        console.log(` ${line}`);
-    console.log("");
-    console.log(tr(` ${BRAND_NAME} v${version} — ${BRAND_CN}，${brandTagline()}`, ` ${BRAND_NAME} v${version} — ${brandTagline()}`));
+    console.log(tr(` ${BRAND_NAME} v${version} — ${BRAND_CN},${brandTagline()}`, ` ${BRAND_NAME} v${version} — ${brandTagline()}`));
     console.log("");
 }

package/dist/index.js

@@ -3,7 +3,7 @@ import { printConsoleBanner } from "./brand.js";
 import { activeSite, loadConfig, pinLegacySiteBaseUrl, readSettings, VERSION } from "./config.js";
 import { siteLinks, siteOf } from "./site.js";
 import { isEnglish, tr } from "./i18n.js";
-import { isLauncherWord, launcherHelpLines, launcherHelpRows, runLauncher } from "./launcher.js";
+import { isLauncherWord, launcherHelpRow, runLauncher } from "./launcher.js";
 /**
  * Configure the same undici dispatcher used by the embedded kernel before any
  * CLI startup request runs. The kernel keeps this helper in an internal file,
@@ -17,61 +17,40 @@ async function configureStartupHttp() {
     dispatcher.applyHttpProxySettings(readSettings().httpProxy);
     dispatcher.configureHttpDispatcher();
 }
+/** 终端显示宽度:中文等宽字符占 2 列,命令列才能中英文都对齐。 */
+function displayWidth(text) {
+    let w = 0;
+    for (const ch of text)
+        w += /[\u1100-\u115f\u2e80-\ua4cf\uac00-\ud7a3\uf900-\ufaff\ufe30-\ufe4f\uff00-\uff60\uffe0-\uffe6]/.test(ch) ? 2 : 1;
+    return w;
+}
+/**
+ * `u1s1 --help`:只列常用命令,一屏看完;低频命令只报名字,各自 `--help` 看用法。
+ * 会话内命令在对话里 /help 看,这里不重复。
+ */
 function printHelp() {
     printConsoleBanner(VERSION);
-    if (isEnglish()) {
-        printHelpEn();
-        return;
-    }
-    console.log(" 命令:");
-    console.log("   u1s1                   进入对话界面(最常用,不带参数)");
-    console.log("   u1s1 -p \"一句话\"       不进界面直接回答,适合脚本里用");
-    for (const line of launcherHelpLines())
-        console.log(line);
-    console.log("   u1s1 login / logout    登录 / 退出登录");
-    console.log("   u1s1 model             查看或切换默认模型");
-    console.log("   u1s1 usage             查看剩余额度");
-    console.log("   u1s1 whoami            查看当前登录的账号");
-    console.log("   u1s1 update            升级到最新版");
+    const rows = [
+        [tr("u1s1 -p \"一句话\"", "u1s1 -p \"prompt\""), tr("不进界面直接回答(脚本里用)", "Answer once without the UI (for scripts)")],
+        launcherHelpRow(),
+        ["u1s1 login / logout", tr("登录 / 退出", "Sign in / sign out")],
+        ["u1s1 usage", tr("查看剩余额度", "Show your remaining balance")],
+        ["u1s1 model", tr("查看或切换默认模型", "Show or change the default model")],
+        ["u1s1 update", tr("升级到最新版", "Update to the latest version")],
+    ];
     // 国际站没有网页托管(网关拒绝),不列 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)");
-    console.log("   u1s1 bench             模型编码能力评测");
-    console.log("   u1s1 --version         查看版本");
+    if (activeSite().id !== "intl")
+        rows.push(["u1s1 deploy", tr("发布网页(list / remove 管理已发布的)", "Publish a web page (list / remove to manage)")]);
+    rows.push([tr("u1s1 feedback \"一句话\"", "u1s1 feedback \"text\""), tr("反馈问题或建议", "Send feedback or report a bug")]);
+    console.log(tr(" 用法: u1s1 [命令]    不带命令直接进入对话", " Usage: u1s1 [command]    no command starts a session"));
     console.log("");
-    console.log(" 对话里输入 /help 看会话内命令(/model /clear /feedback /exit …)");
-    console.log(" 匿名使用统计只记会话开始/结束等节点,不含内容;设 U1S1_TELEMETRY=0 关闭");
-    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"],
-        ...launcherHelpRows(),
-        ["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}`);
+    for (const [cmd, desc] of rows)
+        console.log(`   ${cmd}${" ".repeat(Math.max(1, 24 - displayWidth(cmd)))}${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}`);
+    console.log(tr(" 其他命令: use · agents · config · whoami · import · mcp · bench · --version", " More: use · agents · config · whoami · import · mcp · bench · --version"));
+    console.log(tr(" 命令后加 --help 看用法;对话里输入 /help 看会话内命令", " Add --help to any command for details; in a session, type /help"));
+    console.log(tr(" 匿名使用统计不含对话内容,设 U1S1_TELEMETRY=0 关闭", " Anonymous usage stats never include content; set U1S1_TELEMETRY=0 to turn them off"));
+    console.log(tr(` 教程 → ${siteLinks(activeSite()).guides}`, ` Guides → ${siteLinks(activeSite()).guides}`));
 }
 function wantsHelp(rest) {
     return rest.includes("--help") || rest.includes("-h");
@@ -110,15 +89,8 @@ 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");
+    // 换账号/看额度的指引在 whoami --help 里,这里只答「登的是谁、连的哪台服务器」
+    console.log(`${me.email ?? tr("(未绑定邮箱)", "(no email linked)")}  ${new URL(cfg.baseUrl).host}`);
 }
 async function logoutCommand() {
     const { saveConfig } = await import("./config.js");
@@ -165,9 +137,9 @@ const COMMANDS = {
         await login(parsed.key, { site: parsed.site });
     },
     logout: logoutCommand,
-    usage: async () => {
+    usage: async (rest) => {
         const { usage } = await import("./usage.js");
-        await usage();
+        await usage(rest);
     },
     whoami: whoamiCommand,
     feedback: async (rest) => {
@@ -223,8 +195,7 @@ function rejectMistypedCommand(cmd, argCount) {
         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."));
+    console.error(tr(`不认识的命令「${cmd}」,是想运行 u1s1 ${near} 吗?(全部命令:u1s1 --help)`, `Unknown command "${cmd}". Did you mean u1s1 ${near}? (All commands: u1s1 --help)`));
     process.exitCode = 1;
     return true;
 }
@@ -284,8 +255,9 @@ const SIMPLE_COMMAND_HELP = {
         "  退出本机登录,并注销这台设备在服务端的授权(连不上服务器时只清本机)。",
     ],
     usage: [
-        "用法: u1s1 usage",
+        "用法: u1s1 usage [--json]",
         "  查看剩余额度:免费包、已购用量包与余额。会话内也可输入 /usage。",
+        "  --json  输出 JSON,给别的程序读(字段见 usage.ts 的 UsageJson)",
     ],
     whoami: [
         "用法: u1s1 whoami",
@@ -309,8 +281,9 @@ const SIMPLE_COMMAND_HELP_EN = {
         "  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",
+        "Usage: u1s1 usage [--json]",
         "  Show your remaining balance. In a session you can also type /usage.",
+        "  --json  Print JSON for other programs to read",
     ],
     whoami: [
         "Usage: u1s1 whoami",

package/dist/launcher.d.ts

@@ -42,7 +42,5 @@ export declare function resolveDispatch(args: readonly string[], ctx: DispatchCo
 export declare function isExistingUser(raw: Record<string, unknown> | undefined, agentSettingsExists: boolean): boolean;
 export declare function runLauncher(args: string[]): Promise<void>;
 export declare function parseSelection(answer: string): AgentChoice | undefined;
-/** `u1s1 --help` 中文版的启动器几行(中文按 CJK 双宽手工对齐)。 */
-export declare function launcherHelpLines(): string[];
-/** 英文版:与 index.ts 的命令表一起按 ASCII 宽度对齐。 */
-export declare function launcherHelpRows(): [string, string][];
+/** `u1s1 --help` 里启动器那一行;use / agents / config 只在「其他命令」里报名字,各自 --help 看用法。 */
+export declare function launcherHelpRow(): [string, string];

package/dist/launcher.js

@@ -82,7 +82,7 @@ export async function runLauncher(args) {
         case "select": {
             const agent = await selectAgent();
             saveDefaultAgent(agent);
-            console.log(tr(`  已记住,以后运行 u1s1 直接进入 ${agent}。随时可以用 u1s1 use <客户端> 修改。`, `  Saved. Running u1s1 now opens ${agent}. Change it any time with u1s1 use <client>.`));
+            console.log(tr(`  已把 ${agent} 设为默认(以后换:u1s1 use <客户端>)`, `  ${agent} is now the default (change it with u1s1 use <client>)`));
             await launch(agent, dispatch.args);
             return;
         }
@@ -110,15 +110,15 @@ async function launch(agent, args) {
 const OPTIONS = [
     {
         agent: "pi",
-        line: () => tr("pi      u1s1 内置的编程助手,中文界面,开箱即用(推荐)", "pi      u1s1's built-in coding assistant, ready to go (recommended)"),
+        line: () => tr("pi      内置,开箱即用(推荐)", "pi      Built in, ready to go (recommended)"),
     },
     {
         agent: "claude",
-        line: () => tr("claude  启动官方 Claude Code(首次使用会从官方渠道下载)", "claude  Launch the official Claude Code (downloaded from the official source on first use)"),
+        line: () => tr("claude  官方 Claude Code,首次使用时下载", "claude  Official Claude Code, downloaded on first use"),
     },
     {
         agent: "codex",
-        line: () => tr("codex   启动官方 Codex CLI(首次使用会从官方渠道下载)", "codex   Launch the official Codex CLI (downloaded from the official source on first use)"),
+        line: () => tr("codex   官方 Codex CLI,首次使用时下载", "codex   Official Codex CLI, downloaded on first use"),
     },
 ];
 export function parseSelection(answer) {
@@ -132,7 +132,7 @@ export function parseSelection(answer) {
 }
 async function selectAgent() {
     console.log("");
-    console.log(tr("  选择要使用的客户端(以后可以用 u1s1 use <客户端> 修改):", "  Choose a client (you can change it later with u1s1 use <client>):"));
+    console.log(tr("  选择客户端:", "  Choose a client:"));
     OPTIONS.forEach((o, i) => console.log(`    ${i + 1}) ${o.line()}`));
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     try {
@@ -211,25 +211,7 @@ function agentsHelpLines() {
     ];
 }
 // ---------------------------------------------------------------- help
-/** `u1s1 --help` 中文版的启动器几行(中文按 CJK 双宽手工对齐)。 */
-export function launcherHelpLines() {
-    return [
-        "   u1s1 pi                进入内置的 Pi",
-        "   u1s1 claude [参数]     启动官方 Claude Code(首次使用会下载)",
-        "   u1s1 codex [参数]      启动官方 Codex CLI(首次使用会下载)",
-        "   u1s1 use <客户端>      设置默认客户端(pi / claude / codex)",
-        "   u1s1 agents            查看各客户端的安装状态、版本与更新",
-        "   u1s1 config            设置默认客户端、各客户端的默认模型、自动更新",
-    ];
-}
-/** 英文版:与 index.ts 的命令表一起按 ASCII 宽度对齐。 */
-export function launcherHelpRows() {
-    return [
-        ["u1s1 pi", "Open the built-in Pi"],
-        ["u1s1 claude [args]", "Launch the official Claude Code (downloaded on first use)"],
-        ["u1s1 codex [args]", "Launch the official Codex CLI (downloaded on first use)"],
-        ["u1s1 use <client>", "Set the default client (pi / claude / codex)"],
-        ["u1s1 agents", "Show each client's install status, version and updates"],
-        ["u1s1 config", "Set the default client, each client's default model and auto-update"],
-    ];
+/** `u1s1 --help` 里启动器那一行;use / agents / config 只在「其他命令」里报名字,各自 --help 看用法。 */
+export function launcherHelpRow() {
+    return ["u1s1 pi|claude|codex", tr("用指定客户端启动,后面的参数原样传入", "Start a specific client; extra args are passed through")];
 }

package/dist/login.js

@@ -211,24 +211,18 @@ export async function login(keyArg, opts = {}) {
                 console.error(tr("  稍等几分钟再运行 u1s1 login 重试即可。", "  Wait a few minutes, then run u1s1 login again."));
         }
         else {
-            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."));
+            console.error(tr("  连不上 u1s1 服务器,检查网络后重试;网络正常的话,运行 u1s1 update 升级后再试。", "  Can't reach the u1s1 server. Check your network and try again; if it's fine, run u1s1 update and retry."));
         }
         process.exit(1);
     }
-    console.log(tr("  用浏览器登录并批准这台设备:", "  Sign in with your browser and approve this device:"));
-    console.log("");
+    console.log(tr("  在浏览器里批准这台设备(没有自动打开的话,复制下面的网址):", "  Approve this device in your browser (if it doesn't open, copy this URL):"));
     console.log(`      ${start.verify_url}`);
-    console.log("");
-    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(tr("  等待浏览器里完成批准……(按 Ctrl+C 取消)", "  Waiting for approval in the browser… (Ctrl+C to cancel)"));
+    console.log(tr("  等待批准…(Ctrl+C 取消)", "  Waiting for approval… (Ctrl+C to cancel)"));
     const waitStartedAt = Date.now();
     const waitTimer = setInterval(() => {
         const mins = Math.round((Date.now() - waitStartedAt) / 60_000);
-        console.log(tr(`  仍在等待批准(已等 ${mins} 分钟),在浏览器里点「批准」后这里会自动继续。`, `  Still waiting for approval (${mins} min so far). Click "Approve" in the browser and this will continue automatically.`));
+        console.log(tr(`  仍在等待批准(已等 ${mins} 分钟)…`, `  Still waiting for approval (${mins} min so far)…`));
     }, 120_000);
     const outcome = {};
     try {
@@ -239,8 +233,7 @@ export async function login(keyArg, opts = {}) {
     }
     if (!credential) {
         if (outcome.reason === "expired" || outcome.reason === "timeout") {
-            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."));
+            console.error(tr("  登录链接已过期,重新运行 u1s1 获取新链接(网页打不开的话检查一下网络)。", "  The sign-in link expired. Run u1s1 again for a new one (if the page won't load, check your network)."));
         }
         else {
             console.error(tr("  没能取得设备凭证,请确认网络正常后重试。", "  Couldn't get a device credential. Check your network and try again."));
@@ -252,8 +245,7 @@ export async function login(keyArg, opts = {}) {
     saveConfig(next);
     const me = await fetchMe(next).catch((e) => {
         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."));
+        console.error(tr(`  暂时没能确认账号信息(${e.message}),稍后直接运行 u1s1 即可,不用重新登录。`, `  Couldn't confirm your account details just now (${e.message}). Just run u1s1 later; no need to sign in again.`));
         process.exit(0);
     });
     const tpu = me.tokens_per_usd ?? 0;

package/dist/model.js

@@ -16,8 +16,9 @@ export async function refreshOfficialModels(cfg, fetcher = fetchModels) {
     }
 }
 export async function modelCommand(nameOrAlias) {
-    // `u1s1 model --help` 不该被当成模型名报错;直接展示列表(自带切换说明)
-    if (nameOrAlias === "--help" || nameOrAlias === "-h")
+    // `u1s1 model --help` 不该被当成模型名报错;直接展示列表(自带切换说明),另加低频的自定义端点说明
+    const wantsHelp = nameOrAlias === "--help" || nameOrAlias === "-h";
+    if (wantsHelp)
         nameOrAlias = undefined;
     const cfg = loadConfig();
     // Fetch both live catalogues before resolving the persisted default.
@@ -53,7 +54,7 @@ export async function modelCommand(nameOrAlias) {
         if (CUSTOM_ENDPOINTS.length) {
             console.log(tr("  端点模型重名时可加限定:u1s1 model 端点名:模型id", "  If endpoint model names clash, qualify them: u1s1 model <endpoint>:<model-id>"));
         }
-        else {
+        else if (wantsHelp) {
             console.log(tr(`  想接自己的 API(含本机 Ollama)?去 ${siteLinks(siteOf(cfg)).dashboard} 配「自定义模型端点」`, `  Want to use your own API (including local Ollama)? Add a custom model endpoint at ${siteLinks(siteOf(cfg)).dashboard}`));
         }
         console.log("");

package/dist/usage.d.ts

@@ -18,4 +18,47 @@ export declare function usageEntryData(): Promise<{
     lines?: string[];
     error?: string;
 }>;
-export declare function usage(): Promise<void>;
+/**
+ * `u1s1 usage --json` 的输出,给别的程序读(比如 Hearth 在界面上显示 u1s1 用量)。
+ * 字段只增不改;要改含义就升 v。金额是美元,Token 是网关记的个数(不是按默认模型折算的约数)。
+ * 不含凭证;email 是登录账号,方便调用方标明是哪个号。
+ */
+export interface UsageJson {
+    v: 1;
+    site: "cn" | "intl";
+    email: string | null;
+    /** 可用余额(美元):用量包网关是按量余额 bonus_balance_usd,老网关是 remaining_usd */
+    balance_usd: number;
+    /** 本月已用(美元) */
+    month_usd: number;
+    /** 美元折默认模型 Token 的比率;老网关没有时为 null */
+    tokens_per_usd: number | null;
+    /** 生效中的用量包,同类同到期日的合成一项;老网关为 null */
+    packages: {
+        kind: string;
+        label: string;
+        /** free:只能用于免费包适用模型;其余为全模型 */
+        scope: string;
+        /** true:每日额度(total 是每天的量,0 点恢复);false:一次性总量 */
+        daily: boolean;
+        total_tokens: number;
+        remaining_tokens: number;
+        expires_at: string | null;
+        count: number;
+    }[] | null;
+    /** 仪表盘、充值入口;支付通道没开放时 topup 为 null */
+    dashboard: string;
+    topup: string | null;
+}
+/** 出错时的 --json 输出:login 没登录 / 登录失效,其余是 failed,message 是给人看的原因 */
+export interface UsageJsonError {
+    v: 1;
+    error: "login" | "failed";
+    message: string;
+}
+export declare function usageJson(me: MeResponse, site: Site): UsageJson;
+export declare function parseUsageArgs(rest: string[]): {
+    json: boolean;
+    error?: string;
+};
+export declare function usage(rest?: string[]): Promise<void>;

package/dist/usage.js

@@ -1,4 +1,4 @@
-import { fetchMe } from "./api.js";
+import { AuthError, fetchMe } from "./api.js";
 import { activeSite, loadConfig } from "./config.js";
 import { hasDeviceCredential } from "./device-auth.js";
 import { isEnglish, tr } from "./i18n.js";
@@ -70,43 +70,33 @@ function groupPackages(packages) {
     }
     return [...groups.values()];
 }
-function packageScopeNote(pkg) {
-    if (pkg.kind === "login_checkin") {
-        return tr("全模型可用", "All models");
-    }
-    if (pkg.scope === "free") {
-        // 只有按日发放的免费包(首月/年度包的每日额度)才 0 点恢复;一次性免费包用完就没了。
-        return pkg.daily_tokens != null
-            ? tr("免费包适用模型 · 每日额度北京时间 0 点恢复", "Free-tier models · daily quota resets at 00:00 Beijing time (UTC+8)")
-            : tr("免费包适用模型", "Free-tier models");
-    }
-    return tr("免费包适用模型", "Free-tier models");
-}
 function packageLabel(pkg) {
     const count = pkg.count > 1 ? ` ×${pkg.count}` : "";
     const label = `${packageLabels()[pkg.kind] ?? pkg.kind}${count}`;
     // 中文靠全角空格对齐到第 13 列;英文标签长短不一,直接跟两个空格
     return isEnglish() ? `${label} ` : label.padEnd(5, "　");
 }
-function packageLines(pkg) {
+/**
+ * 每个包一行:标签、剩余/总量、进度条、到期日。适用范围只在打卡包(全模型可用)上标;
+ * 免费包的适用模型和「0 点恢复」在报告尾部说一次。
+ */
+function packageLine(pkg) {
     const isDaily = pkg.daily_tokens != null;
     const total = isDaily ? (pkg.daily_tokens ?? 0) : (pkg.total_tokens ?? 0);
     const ratio = total > 0 ? pkg.remaining / total : 0;
     const expiry = pkg.expires_at
         ? tr(`${pkg.expires_at.slice(0, 10)} 到期`, `expires ${pkg.expires_at.slice(0, 10)}`)
         : tr("永不过期", "never expires");
-    return [
-        tr(`  ${packageLabel(pkg)} 还剩 ${fmtTokensCn(pkg.remaining)} / ${fmtTokensCn(total)}${isDaily ? "/天" : ""}  ${bar(ratio)}`, `  ${packageLabel(pkg)} ${fmtTokensEn(pkg.remaining)} / ${fmtTokensEn(total)}${isDaily ? "/day" : ""} left  ${bar(ratio)}`),
-        `             ${packageScopeNote(pkg)} · ${expiry}`,
-    ];
+    const scope = pkg.kind === "login_checkin" ? tr(" · 全模型", " · all models") : "";
+    return tr(`  ${packageLabel(pkg)} 还剩 ${fmtTokensCn(pkg.remaining)} / ${fmtTokensCn(total)}${isDaily ? "/天" : ""}  ${bar(ratio)}  ${expiry}${scope}`, `  ${packageLabel(pkg)} ${fmtTokensEn(pkg.remaining)} / ${fmtTokensEn(total)}${isDaily ? "/day" : ""} left  ${bar(ratio)}  ${expiry}${scope}`);
 }
 function packageUsageLines(me, tokensPerUsd, site) {
-    const packages = me.packages ?? [];
+    const packages = groupPackages(me.packages ?? []);
     const lines = [];
     if (packages.length === 0)
         lines.push(tr("  用量包     (无生效中的用量包)", "  Packs        (no active usage packs)"));
-    for (const pkg of groupPackages(packages))
-        lines.push(...packageLines(pkg));
+    for (const pkg of packages)
+        lines.push(packageLine(pkg));
     if (me.bonus_balance_usd > 0) {
         const balance = tokensPerUsd > 0
             ? `${fmtTokens(me.bonus_balance_usd * tokensPerUsd)} Token`
@@ -118,10 +108,10 @@ function packageUsageLines(me, tokensPerUsd, site) {
         : `$${me.mtd_usd.toFixed(2)}`;
     lines.push(tr(`  本月已用   ${monthlyUsage}`, `  This month   ${monthlyUsage}`));
     lines.push("");
-    lines.push(tr("  免费用量包覆盖 DeepSeek Flash、GLM-5.3 Flash、Qwen3.8 Flash 和联网搜索。", "  Free packs cover DeepSeek Flash, GLM-5.3 Flash, Qwen3.8 Flash and web search."));
-    lines.push(tr(`  其他模型不走免费包，可用余额或全模型包 → ${siteLinks(site).dashboard}`, `  Other models use your balance or an all-model pack → ${siteLinks(site).dashboard}`));
-    lines.push(tr("  Token 数按默认模型单价折算,为约数;用更贵的模型时消耗更快。", "  Token counts are estimates at the default model's price; pricier models use them up faster."));
-    lines.push("");
+    // 只有按日发放的免费包(首月/年度包的每日额度)才 0 点恢复;一次性免费包用完就没了,不写恢复
+    const hasDaily = packages.some((pkg) => pkg.scope === "free" && pkg.daily_tokens != null);
+    lines.push(tr("  免费包只覆盖 DeepSeek Flash、GLM-5.3 Flash、Qwen3.8 Flash 和联网搜索", "  Free packs cover DeepSeek Flash, GLM-5.3 Flash, Qwen3.8 Flash and web search"));
+    lines.push(tr(`  ${hasDaily ? "每日额度北京时间 0 点恢复;" : ""}其他模型用余额或全模型包;Token 数为约数`, `  ${hasDaily ? "Daily quotas reset at 00:00 UTC+8; o" : "O"}ther models use your balance or an all-model pack; token counts are estimates`));
     lines.push(...usageCtaLines(me, site));
     return lines;
 }
@@ -156,15 +146,8 @@ function legacyUsageLines(me, tokensPerUsd, site) {
  */
 function intlUsageLines(me, site) {
     const lines = [];
-    for (const pkg of groupPackages(me.packages ?? [])) {
-        const isDaily = pkg.daily_tokens != null;
-        const total = isDaily ? (pkg.daily_tokens ?? 0) : (pkg.total_tokens ?? 0);
-        const ratio = total > 0 ? pkg.remaining / total : 0;
-        const expiry = pkg.expires_at
-            ? tr(`${pkg.expires_at.slice(0, 10)} 到期`, `expires ${pkg.expires_at.slice(0, 10)}`)
-            : tr("永不过期", "never expires");
-        lines.push(tr(`  ${packageLabel(pkg)} 还剩 ${fmtTokensCn(pkg.remaining)} / ${fmtTokensCn(total)}${isDaily ? "/天" : ""}  ${bar(ratio)} · ${expiry}`, `  ${packageLabel(pkg)} ${fmtTokensEn(pkg.remaining)} / ${fmtTokensEn(total)}${isDaily ? "/day" : ""} left  ${bar(ratio)} · ${expiry}`));
-    }
+    for (const pkg of groupPackages(me.packages ?? []))
+        lines.push(packageLine(pkg));
     lines.push(tr(`  余额       $${me.bonus_balance_usd.toFixed(2)}`, `  Balance      $${me.bonus_balance_usd.toFixed(2)}`));
     lines.push(tr(`  本月已用   $${me.mtd_usd.toFixed(2)}`, `  This month   $${me.mtd_usd.toFixed(2)}`));
     lines.push("");
@@ -221,8 +204,70 @@ export async function usageEntryData() {
         return { error: e instanceof Error ? e.message : String(e) };
     }
 }
-export async function usage() {
+export function usageJson(me, site) {
+    const { dashboard, topup } = siteLinks(site);
+    return {
+        v: 1,
+        site: site.id,
+        email: me.email ?? null,
+        balance_usd: me.packages ? me.bonus_balance_usd : me.remaining_usd,
+        month_usd: me.mtd_usd,
+        tokens_per_usd: me.tokens_per_usd && me.tokens_per_usd > 0 ? me.tokens_per_usd : null,
+        packages: me.packages
+            ? groupPackages(me.packages).map((pkg) => {
+                const daily = pkg.daily_tokens != null;
+                return {
+                    kind: pkg.kind,
+                    label: packageLabels()[pkg.kind] ?? pkg.kind,
+                    scope: pkg.scope,
+                    daily,
+                    total_tokens: (daily ? pkg.daily_tokens : pkg.total_tokens) ?? 0,
+                    remaining_tokens: pkg.remaining,
+                    expires_at: pkg.expires_at,
+                    count: pkg.count,
+                };
+            })
+            : null,
+        dashboard,
+        topup: me.pay_enabled === false ? null : topup,
+    };
+}
+export function parseUsageArgs(rest) {
+    let json = false;
+    for (const a of rest) {
+        if (a === "--json")
+            json = true;
+        else
+            return { json, error: tr(`不认识的参数 ${a};用法: u1s1 usage [--json]`, `Unknown option ${a}. Usage: u1s1 usage [--json]`) };
+    }
+    return { json };
+}
+export async function usage(rest = []) {
+    const args = parseUsageArgs(rest);
+    if (args.error) {
+        console.error(args.error);
+        process.exitCode = 1;
+        return;
+    }
     const cfg = loadConfig();
+    if (args.json) {
+        const fail = (error, message) => {
+            console.log(JSON.stringify({ v: 1, error, message }));
+            process.exitCode = 1;
+        };
+        if (!hasDeviceCredential(cfg))
+            return fail("login", tr("还没登录,先跑 u1s1 login", "Not signed in. Run u1s1 login first."));
+        let me;
+        try {
+            me = await fetchMe(cfg);
+        }
+        catch (e) {
+            const message = e instanceof Error ? e.message : String(e);
+            return fail(e instanceof AuthError ? "login" : "failed", message);
+        }
+        console.log(JSON.stringify(usageJson(me, siteOf(cfg))));
+        return;
+    }
     if (!hasDeviceCredential(cfg)) {
         console.error(tr("还没登录,先跑 u1s1 login", "Not signed in. Run u1s1 login first."));
         process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "1.15.2",
+  "version": "1.16.1",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {