u1s1-cli 1.15.1 → 1.16.0

package/dist/agents/pi.js

@@ -20,7 +20,7 @@ import { deployHintText, markNudge, shouldShowDeployHint } from "../nudges.js";
 import { createGatewayTelemetry } from "../telemetry.js";
 import { installCommand, siteLinks, siteOf } from "../site.js";
 import { lang, tr } from "../i18n.js";
-const PACKAGE_NAME = "u1s1-cli";
+import { globalUpdateCommand, latestVersionUrl } from "../update.js";
 /** 启动时检测到的可自动安装的新版;TUI 退出后才装(见 installPendingUpdate)。 */
 let pendingUpdate;
 /**
@@ -36,7 +36,7 @@ let pendingUpdate;
 async function checkForUpdate() {
     let latest;
     try {
-        const url = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
+        const url = latestVersionUrl();
         const res = await fetch(url, {
             headers: { Accept: "application/json" },
             signal: AbortSignal.timeout(5_000),
@@ -82,9 +82,7 @@ async function checkForUpdate() {
         : userAgent.startsWith("yarn") ? "yarn"
             : userAgent.startsWith("bun") ? "bun"
                 : "npm";
-    const installCmd = pm === "npm"
-        ? `npm install -g --loglevel=error ${PACKAGE_NAME}@latest`
-        : `${pm} add -g ${PACKAGE_NAME}@latest`;
+    const installCmd = globalUpdateCommand(pm);
     pendingUpdate = { latest, installCmd };
     setUpdateNotice(tr(`⬆ 发现新版 v${latest},退出后自动更新`, `⬆ v${latest} available, will update on exit`));
 }

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/config.d.ts

@@ -1,13 +1,23 @@
 import { type webcrypto } from "node:crypto";
-import { type Site } from "./site.js";
+import { type Site, type SiteId } from "./site.js";
 export declare const VERSION: string;
+/**
+ * npm 上同一份构建发两个包(scripts/make-cli-npm-packages.mjs):u1s1-cli 默认国际站,
+ * u1s1-cli-cn 默认中国站,只差 package.json 的 name 和 u1s1.defaultSite。仓库、便携包、
+ * 桌面版内嵌的 package.json 不带标记,按中国站(老行为)。升级/查新版都用自己的包名。
+ */
+export declare const PACKAGE_NAME: string;
+export declare const PACKAGE_DEFAULT_SITE: SiteId;
 /**
  * 便携包安装(install.sh / install.ps1):包根旁边带自己的 node 运行时,
  * npm 更新碰不到这份拷贝,升级只能整包重装。npm 全局安装的包在 node_modules
  * 下,按父目录名先排除,避免撞上恰好叫 node 的目录误判。
  */
 export declare function isPortableInstall(): boolean;
-/** 默认连中国站;国际站由安装脚本写入 baseUrl 或 `u1s1 login --site global` 切换。 */
+/**
+ * 本机还没有 ~/.u1s1/config.json 时连的站(包标记决定)。配置文件已存在但没写 baseUrl 的
+ * 一律是中国站:中国站历来不写 baseUrl,翻默认站不能把存量用户和他们的凭证带去国际站。
+ */
 export declare const DEFAULT_BASE_URL: string;
 export declare const PROVIDER_ID = "u1s1";
 export declare const THINKING_LEVELS: readonly ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
@@ -225,12 +235,18 @@ export declare function resolvePreferredModel(cfg: Pick<CliConfig, "model" | "mo
 export declare function loadConfig(): CliConfig;
 /** 只看配置文件、不叠加环境变量覆盖的配置(判断「文件里存的是哪个站」用)。 */
 export declare function loadFileConfig(): CliConfig;
+/**
+ * 配置文件在、却没写 baseUrl(老中国站用户)→ 显式写成中国站固定下来,以后换装
+ * 默认国际站的包也不会把人带走。只补这一个字段,其它原样保留;读不懂的文件不碰。
+ */
+export declare function pinLegacySiteBaseUrl(): void;
 /**
  * 配置文件内容 + 环境变量 → 生效配置。环境变量优先于文件;文件里的历代中国站
  * API 根换成当前中国站 apiBase(migrateStoredBaseUrl),下次 saveConfig 时落盘。
- * env / currentCnApiBase 可注入,供测试模拟 P1 换主域后的迁移。
+ * 都没有 baseUrl 时用 fallback 站(见 fallbackSite)。
+ * env / currentCnApiBase / fallback 可注入,供测试模拟 P1 换主域后的迁移和不同包的默认站。
  */
-export declare function configFromFile(file: Partial<CliConfig>, env?: NodeJS.ProcessEnv, currentCnApiBase?: string): CliConfig;
+export declare function configFromFile(file: Partial<CliConfig>, env?: NodeJS.ProcessEnv, currentCnApiBase?: string, fallback?: SiteId): CliConfig;
 /**
  * 当前生效站点(按 loadConfig().baseUrl 判定,含 U1S1_BASE_URL 覆盖)。手里没有 cfg 的
  * 文案/链接(模块级提示、生成的扩展、错误人话化)用它;有 cfg 的地方直接 siteOf(cfg)。

package/dist/config.js

@@ -7,7 +7,15 @@ import { fileURLToPath } from "node:url";
 import { resetLang, setLangResolver, tr } from "./i18n.js";
 import { migrateStoredBaseUrl, SITES, siteOf } from "./site.js";
 const require = createRequire(import.meta.url);
-export const VERSION = require("../package.json").version;
+const pkg = require("../package.json");
+export const VERSION = pkg.version;
+/**
+ * npm 上同一份构建发两个包(scripts/make-cli-npm-packages.mjs):u1s1-cli 默认国际站,
+ * u1s1-cli-cn 默认中国站,只差 package.json 的 name 和 u1s1.defaultSite。仓库、便携包、
+ * 桌面版内嵌的 package.json 不带标记,按中国站(老行为)。升级/查新版都用自己的包名。
+ */
+export const PACKAGE_NAME = typeof pkg.name === "string" && /^[a-z0-9][a-z0-9._-]*$/.test(pkg.name) ? pkg.name : "u1s1-cli";
+export const PACKAGE_DEFAULT_SITE = pkg.u1s1?.defaultSite === "intl" ? "intl" : "cn";
 /**
  * 便携包安装(install.sh / install.ps1):包根旁边带自己的 node 运行时,
  * npm 更新碰不到这份拷贝,升级只能整包重装。npm 全局安装的包在 node_modules
@@ -22,8 +30,11 @@ export function isPortableInstall() {
         : join(pkgRoot, "..", "node", "bin", "node");
     return existsSync(portableNode);
 }
-/** 默认连中国站;国际站由安装脚本写入 baseUrl 或 `u1s1 login --site global` 切换。 */
-export const DEFAULT_BASE_URL = SITES.cn.apiBase;
+/**
+ * 本机还没有 ~/.u1s1/config.json 时连的站(包标记决定)。配置文件已存在但没写 baseUrl 的
+ * 一律是中国站:中国站历来不写 baseUrl,翻默认站不能把存量用户和他们的凭证带去国际站。
+ */
+export const DEFAULT_BASE_URL = SITES[PACKAGE_DEFAULT_SITE].apiBase;
 export const PROVIDER_ID = "u1s1";
 /**
  * Make a short alias from a model id by stripping common prefixes:厂商前缀
@@ -336,19 +347,39 @@ export function resolvePreferredModel(cfg) {
     }
     return { provider: PROVIDER_ID, id: defaultModelId() };
 }
+/** 配置里没写 baseUrl 时按哪个站:没有配置文件 → 包的默认站;有文件(老中国站用户)→ 中国站。 */
+function fallbackSite() {
+    return existsSync(configFile) ? "cn" : PACKAGE_DEFAULT_SITE;
+}
 export function loadConfig() {
-    return configFromFile((readJsonFile(configFile) ?? {}));
+    return configFromFile((readJsonFile(configFile) ?? {}), process.env, SITES.cn.apiBase, fallbackSite());
 }
 /** 只看配置文件、不叠加环境变量覆盖的配置(判断「文件里存的是哪个站」用)。 */
 export function loadFileConfig() {
-    return configFromFile((readJsonFile(configFile) ?? {}), {});
+    return configFromFile((readJsonFile(configFile) ?? {}), {}, SITES.cn.apiBase, fallbackSite());
+}
+/**
+ * 配置文件在、却没写 baseUrl(老中国站用户)→ 显式写成中国站固定下来,以后换装
+ * 默认国际站的包也不会把人带走。只补这一个字段,其它原样保留;读不懂的文件不碰。
+ */
+export function pinLegacySiteBaseUrl() {
+    const file = readJsonFile(configFile);
+    if (!file || Array.isArray(file) || file.baseUrl)
+        return;
+    try {
+        writePrivateFile(configFile, JSON.stringify({ ...file, baseUrl: SITES.cn.apiBase }, null, 2) + "\n");
+    }
+    catch {
+        // 写不进去也照样按中国站判定(fallbackSite),下次启动再试
+    }
 }
 /**
  * 配置文件内容 + 环境变量 → 生效配置。环境变量优先于文件;文件里的历代中国站
  * API 根换成当前中国站 apiBase(migrateStoredBaseUrl),下次 saveConfig 时落盘。
- * env / currentCnApiBase 可注入,供测试模拟 P1 换主域后的迁移。
+ * 都没有 baseUrl 时用 fallback 站(见 fallbackSite)。
+ * env / currentCnApiBase / fallback 可注入,供测试模拟 P1 换主域后的迁移和不同包的默认站。
  */
-export function configFromFile(file, env = process.env, currentCnApiBase = SITES.cn.apiBase) {
+export function configFromFile(file, env = process.env, currentCnApiBase = SITES.cn.apiBase, fallback = "cn") {
     const envJwk = (name) => {
         const raw = env[name];
         if (!raw)
@@ -366,7 +397,9 @@ export function configFromFile(file, env = process.env, currentCnApiBase = SITES
         deviceId: file.deviceId,
         devicePrivateJwk: envJwk("U1S1_DEVICE_PRIVATE_JWK") || file.devicePrivateJwk,
         devicePublicJwk: envJwk("U1S1_DEVICE_PUBLIC_JWK") || file.devicePublicJwk,
-        baseUrl: env["U1S1_BASE_URL"] || migrateStoredBaseUrl(file.baseUrl, currentCnApiBase) || currentCnApiBase,
+        baseUrl: env["U1S1_BASE_URL"]
+            || migrateStoredBaseUrl(file.baseUrl, currentCnApiBase)
+            || (fallback === "intl" ? SITES.intl.apiBase : currentCnApiBase),
         // 有效性不在这里裁决:端点列表可能还没拉回来,交给 resolvePreferredModel
         model: file.model,
         modelProvider: typeof file.modelProvider === "string" ? file.modelProvider : undefined,

package/dist/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { printConsoleBanner } from "./brand.js";
-import { activeSite, loadConfig, readSettings, VERSION } from "./config.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";
@@ -165,9 +165,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) => {
@@ -229,6 +229,8 @@ function rejectMistypedCommand(cmd, argCount) {
     return true;
 }
 async function run() {
+    // 老中国站配置(有文件没 baseUrl)先钉成中国站,再做任何按站点的判断
+    pinLegacySiteBaseUrl();
     const args = process.argv.slice(2);
     const cmd = args[0];
     const rest = args.slice(1);
@@ -282,8 +284,9 @@ const SIMPLE_COMMAND_HELP = {
         "  退出本机登录,并注销这台设备在服务端的授权(连不上服务器时只清本机)。",
     ],
     usage: [
-        "用法: u1s1 usage",
+        "用法: u1s1 usage [--json]",
         "  查看剩余额度:免费包、已购用量包与余额。会话内也可输入 /usage。",
+        "  --json  输出 JSON,给别的程序读(字段见 usage.ts 的 UsageJson)",
     ],
     whoami: [
         "用法: u1s1 whoami",
@@ -307,8 +310,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/update.d.ts

@@ -1,7 +1,21 @@
+import { PACKAGE_NAME } from "./config.js";
 export declare const VERSION: string;
-export declare const PACKAGE_NAME = "u1s1-cli";
+export { PACKAGE_NAME };
+/** 中国站的 npm 包名;u1s1-cli 自 1.15 起是国际站的包(见 config.ts PACKAGE_NAME)。 */
+export declare const CN_PACKAGE_NAME = "u1s1-cli-cn";
 /** Detect the package manager that installed u1s1. */
 export declare function detectPackageManager(): string;
+/** npm registry 上本包 latest 的元数据地址(两个包各查各的)。 */
+export declare function latestVersionUrl(packageName?: string): string;
+/** 全局升级本包的包管理器参数(execFileSync 用,不经 shell)。 */
+export declare function globalUpdateArgs(pm: string, packageName?: string): string[];
+/** 同上,拼成一行命令(退出后自动更新、给用户看的提示用)。 */
+export declare function globalUpdateCommand(pm: string, packageName?: string): string;
+/**
+ * 装的是默认国际站的 u1s1-cli、连的却是中国站(老用户):提示改装 u1s1-cli-cn,只提示不自动换包。
+ * 两个包都提供 u1s1 命令,要先卸再装,否则 npm 报 bin 冲突。返回要打印的行;不需要提示时为空。
+ */
+export declare function cnPackageHint(pm: string, siteId: string, packageName?: string, defaultSite?: string): string[];
 /** Fetch the latest published version from npm registry. */
 export declare function getLatestVersion(): Promise<string | undefined>;
 export declare function compareVersions(a: string, b: string): number;

package/dist/update.js

@@ -5,14 +5,16 @@ import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { activeSite, isPortableInstall } from "./config.js";
+import { activeSite, isPortableInstall, PACKAGE_DEFAULT_SITE, PACKAGE_NAME } from "./config.js";
 import { tr } from "./i18n.js";
 import { installCommand } from "./site.js";
 import { readJsonResponseCapped, readResponseTextCapped } from "./api.js";
 const require = createRequire(import.meta.url);
 const pkg = require("../package.json");
 export const VERSION = pkg.version;
-export const PACKAGE_NAME = "u1s1-cli";
+export { PACKAGE_NAME };
+/** 中国站的 npm 包名;u1s1-cli 自 1.15 起是国际站的包(见 config.ts PACKAGE_NAME)。 */
+export const CN_PACKAGE_NAME = "u1s1-cli-cn";
 const MAX_NPM_METADATA_BYTES = 64 * 1024;
 const MAX_INSTALL_SCRIPT_BYTES = 1024 * 1024;
 function publishedVersion(value) {
@@ -39,9 +41,39 @@ export function detectPackageManager() {
         return "bun";
     return "npm";
 }
+/** npm registry 上本包 latest 的元数据地址(两个包各查各的)。 */
+export function latestVersionUrl(packageName = PACKAGE_NAME) {
+    return `https://registry.npmjs.org/${packageName}/latest`;
+}
+/** 全局升级本包的包管理器参数(execFileSync 用,不经 shell)。 */
+export function globalUpdateArgs(pm, packageName = PACKAGE_NAME) {
+    return pm === "npm"
+        ? ["install", "-g", "--loglevel=error", `${packageName}@latest`]
+        : ["add", "-g", `${packageName}@latest`];
+}
+/** 同上,拼成一行命令(退出后自动更新、给用户看的提示用)。 */
+export function globalUpdateCommand(pm, packageName = PACKAGE_NAME) {
+    return [pm, ...globalUpdateArgs(pm, packageName)].join(" ");
+}
+/**
+ * 装的是默认国际站的 u1s1-cli、连的却是中国站(老用户):提示改装 u1s1-cli-cn,只提示不自动换包。
+ * 两个包都提供 u1s1 命令,要先卸再装,否则 npm 报 bin 冲突。返回要打印的行;不需要提示时为空。
+ */
+export function cnPackageHint(pm, siteId, packageName = PACKAGE_NAME, defaultSite = PACKAGE_DEFAULT_SITE) {
+    if (siteId !== "cn" || defaultSite !== "intl" || packageName === CN_PACKAGE_NAME)
+        return [];
+    const remove = pm === "npm" ? `npm uninstall -g ${packageName}` : `${pm} remove -g ${packageName}`;
+    const add = pm === "npm" ? `npm install -g ${CN_PACKAGE_NAME}` : `${pm} add -g ${CN_PACKAGE_NAME}`;
+    return [
+        tr(`提示:你连的是中国站。npm 包 ${packageName} 现在默认国际站,中国站专用包是 ${CN_PACKAGE_NAME},建议改装(登录状态和设置都保留):`, `Note: you're on the China site. The npm package ${packageName} now defaults to the international site; the China site package is ${CN_PACKAGE_NAME}. We suggest switching (your sign-in and settings are kept):`),
+        `  ${remove}`,
+        `  ${add}`,
+        tr("  不改装也能照常用,当前仍连中国站。", "  You can keep using this package; it still connects to the China site."),
+    ];
+}
 /** Fetch the latest published version from npm registry. */
 export async function getLatestVersion() {
-    const url = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
+    const url = latestVersionUrl();
     try {
         const res = await fetch(url, {
             headers: { Accept: "application/json" },
@@ -211,6 +243,11 @@ async function portableSelfUpdate(latest) {
     }
 }
 export async function update() {
+    if (!isPortableInstall()) {
+        const hint = cnPackageHint(detectPackageManager(), activeSite().id);
+        if (hint.length)
+            console.log(hint.join("\n") + "\n");
+    }
     console.log(tr("正在检查更新…", "Checking for updates…"));
     const latest = await getLatestVersion();
     if (!latest) {
@@ -246,10 +283,7 @@ export async function update() {
     console.log(tr(`正在用 ${pm} 更新 ${PACKAGE_NAME}…`, `Updating ${PACKAGE_NAME} with ${pm}…`));
     try {
         // npm 压掉 EBADENGINE 等警告墙,对新手只有噪音;出错时 error 仍会显示
-        const args = pm === "npm"
-            ? ["install", "-g", "--loglevel=error", `${PACKAGE_NAME}@latest`]
-            : ["add", "-g", `${PACKAGE_NAME}@latest`];
-        execFileSync(pm, args, { stdio: "inherit" });
+        execFileSync(pm, globalUpdateArgs(pm), { stdio: "inherit" });
         console.log(tr(`\n✅ 已更新到 v${latest}，重启 u1s1 后生效。`, `\n✅ Updated to v${latest}. Restart u1s1 to use it.`));
     }
     catch {

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";
@@ -221,8 +221,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.1",
+  "version": "1.16.0",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {
@@ -25,7 +25,6 @@
     "build": "tsc",
     "dev": "tsx src/index.ts",
     "typecheck": "tsc --noEmit",
-    "prepublishOnly": "npm run build && npm test",
     "test": "U1S1_LANG=zh tsx --test test/*.test.ts && U1S1_LANG=zh node scripts/render-regression.mjs",
     "postinstall": "node scripts/patch-pi.js",
     "package": "bash ../../scripts/package.sh",
@@ -56,5 +55,8 @@
     "@types/node": "^22.20.1",
     "tsx": "^4.23.12",
     "typescript": "^5.9.3"
+  },
+  "u1s1": {
+    "defaultSite": "cn"
   }
 }