u1s1-cli 1.15.2 → 1.16.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/index.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) => {
@@ -284,8 +284,9 @@ const SIMPLE_COMMAND_HELP = {
         "  退出本机登录,并注销这台设备在服务端的授权(连不上服务器时只清本机)。",
     ],
     usage: [
-        "用法: u1s1 usage",
+        "用法: u1s1 usage [--json]",
         "  查看剩余额度:免费包、已购用量包与余额。会话内也可输入 /usage。",
+        "  --json  输出 JSON,给别的程序读(字段见 usage.ts 的 UsageJson)",
     ],
     whoami: [
         "用法: u1s1 whoami",
@@ -309,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/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.2",
+  "version": "1.16.0",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {