u1s1-cli 1.2.0 → 1.2.1

package/dist/api.d.ts

@@ -63,6 +63,9 @@ export interface ModelsResponse {
     features: ApiFeatures;
     announcement?: ApiAnnouncement | null;
 }
+/** 401:凭证失效(设备被移除/换过钥匙),调用方应引导重新登录而不是继续硬跑。 */
+export declare class AuthError extends Error {
+}
 export declare function fetchModels(cfg: CliConfig): Promise<ModelsResponse>;
 export interface ApiEndpoint {
     id: string;

package/dist/api.js

@@ -1,17 +1,21 @@
 import { apiEndpointToCustom, loadEndpointsCache, saveEndpointsCache, setCustomEndpoints, VERSION, } from "./config.js";
 import { authorizedFetch } from "./device-auth.js";
+/** 401:凭证失效(设备被移除/换过钥匙),调用方应引导重新登录而不是继续硬跑。 */
+export class AuthError extends Error {
+}
 export async function fetchModels(cfg) {
     let resp;
     try {
         resp = await authorizedFetch(cfg, `${cfg.baseUrl}/models`, {
             headers: { "x-u1s1-version": VERSION },
+            signal: AbortSignal.timeout(15_000),
         });
     }
     catch {
         throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`);
     }
     if (resp.status === 401)
-        throw new Error("这把 Key 不对或已失效,去 https://u1s1.io/dashboard 看看");
+        throw new AuthError("登录已失效,请重新运行 u1s1 login");
     if (!resp.ok)
         throw new Error(`服务端返回 ${resp.status},稍后再试`);
     const body = (await resp.json());
@@ -26,6 +30,7 @@ export async function fetchUserEndpoints(cfg) {
     try {
         resp = await authorizedFetch(cfg, `${cfg.baseUrl}/endpoints`, {
             headers: { "x-u1s1-version": VERSION },
+            signal: AbortSignal.timeout(15_000),
         });
     }
     catch {
@@ -63,14 +68,14 @@ export async function searchWeb(cfg, query, maxResults, signal) {
                 "content-type": "application/json",
             },
             body: JSON.stringify({ query, max_results: maxResults }),
-            signal,
+            signal: signal ?? AbortSignal.timeout(60_000),
         });
     }
     catch {
         throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`);
     }
     if (resp.status === 401)
-        throw new Error("这把 Key 不对或已失效,去 https://u1s1.io/dashboard 看看");
+        throw new Error("登录已失效,请重新运行 u1s1 login");
     if (!resp.ok) {
         const body = (await resp.json().catch(() => null));
         throw new Error(body?.error?.message ?? `搜索服务返回 ${resp.status},稍后再试`);
@@ -90,14 +95,14 @@ export async function renderPage(cfg, url, signal) {
                 "content-type": "application/json",
             },
             body: JSON.stringify({ url }),
-            signal,
+            signal: signal ?? AbortSignal.timeout(90_000),
         });
     }
     catch {
         throw new Error(`连不上 ${cfg.baseUrl}`);
     }
     if (resp.status === 401)
-        throw new Error("这把 Key 不对或已失效,去 https://u1s1.io/dashboard 看看");
+        throw new Error("登录已失效,请重新运行 u1s1 login");
     if (!resp.ok) {
         const body = (await resp.json().catch(() => null));
         throw new Error(body?.error?.message ?? `渲染服务返回 ${resp.status}`);
@@ -117,7 +122,7 @@ export async function generateImage(cfg, req, signal) {
                 "content-type": "application/json",
             },
             body: JSON.stringify(req),
-            signal,
+            signal: signal ?? AbortSignal.timeout(180_000),
         });
     }
     catch (e) {
@@ -126,7 +131,7 @@ export async function generateImage(cfg, req, signal) {
         throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`);
     }
     if (resp.status === 401)
-        throw new Error("这把 Key 不对或已失效,去 https://u1s1.io/dashboard 看看");
+        throw new Error("登录已失效,请重新运行 u1s1 login");
     if (!resp.ok) {
         const body = (await resp.json().catch(() => null));
         throw new Error(body?.error?.message ?? `图片生成服务返回 ${resp.status},稍后再试`);
@@ -140,13 +145,14 @@ export async function fetchMe(cfg) {
     try {
         resp = await authorizedFetch(cfg, `${cfg.baseUrl}/me`, {
             headers: { "x-u1s1-version": VERSION },
+            signal: AbortSignal.timeout(15_000),
         });
     }
     catch {
         throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`);
     }
     if (resp.status === 401)
-        throw new Error("这把 Key 不对或已失效,去 https://u1s1.io/dashboard 看看");
+        throw new Error("登录已失效,请重新运行 u1s1 login");
     if (!resp.ok)
         throw new Error(`服务端返回 ${resp.status},稍后再试`);
     return (await resp.json());

package/dist/deploy.js

@@ -1,4 +1,4 @@
-import { existsSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { basename, join, relative, resolve, sep } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { VERSION, u1s1Dir } from "./config.js";
@@ -21,9 +21,17 @@ function readDeploys() {
     }
 }
 function rememberSite(dir, site) {
-    const all = readDeploys();
-    all[dir] = site;
-    writeFileSync(deploysFile, JSON.stringify(all, null, 2) + "\n");
+    // 记录失败不致命(比如纯环境变量登录时 ~/.u1s1 不存在):下次部署重新问名字而已,
+    // 绝不能因为这里抛错吞掉「部署成功 + 网址」的输出
+    try {
+        mkdirSync(u1s1Dir, { recursive: true });
+        const all = readDeploys();
+        all[dir] = site;
+        writeFileSync(deploysFile, JSON.stringify(all, null, 2) + "\n");
+    }
+    catch {
+        // ignore
+    }
 }
 /** 找要部署的目录:显式参数 > 含 index.html 的构建产物目录 > 当前目录本身。 */
 function resolveSiteDir(explicit) {
@@ -122,6 +130,7 @@ async function api(cfg, method, path, body) {
             method,
             headers: { "x-u1s1-version": VERSION, "content-type": "application/json" },
             body: body === undefined ? undefined : JSON.stringify(body),
+            signal: AbortSignal.timeout(30_000),
         });
     }
     catch {
@@ -145,6 +154,7 @@ async function uploadAll(cfg, start, files) {
             method: "PUT",
             headers: { "x-u1s1-version": VERSION, "content-type": "application/octet-stream" },
             body: readFileSync(f.abs),
+            signal: AbortSignal.timeout(120_000),
         });
         let resp = await put().catch(() => null);
         if (!resp?.ok)
@@ -160,8 +170,13 @@ async function uploadAll(cfg, start, files) {
         for (let f = queue.shift(); f; f = queue.shift())
             await uploadOne(f);
     });
-    await Promise.all(workers);
-    process.stdout.write("\r" + " ".repeat(70) + "\r");
+    try {
+        await Promise.all(workers);
+    }
+    finally {
+        // 失败时也要清掉进度行,否则错误信息糊在「上传中 12/40 …」后面
+        process.stdout.write("\r" + " ".repeat(70) + "\r");
+    }
 }
 async function promptSiteName(def) {
     if (!process.stdin.isTTY)
@@ -201,6 +216,11 @@ export async function deployCommand(cfg, args) {
             console.log("  还没有部署过站点。在网页目录里跑 u1s1 deploy 试试。");
             return;
         }
+        // 服务端给的是 UTC 时间戳,转成本地时间展示
+        const fmtTime = (ts) => {
+            const d = new Date(ts.includes("T") ? ts : `${ts.replace(" ", "T")}Z`);
+            return Number.isNaN(d.getTime()) ? ts : d.toLocaleString("zh-CN", { hour12: false });
+        };
         console.log("");
         for (const s of sites) {
             const visibility = s.visibility === "private" ? "私密" : s.community_listed ? "公开(社区)" : "公开(未展示)";

package/dist/device-auth.js

@@ -154,7 +154,10 @@ export async function ensureSigningProxy(cfg, fallbackClient = "terminal") {
             if (res.headersSent)
                 return void res.destroy(error);
             res.writeHead(502, { "content-type": "application/json" });
-            res.end(JSON.stringify({ error: { message: error instanceof Error ? error.message : "signing proxy failed" } }));
+            // 中文说明放前面给用户看;原始英文错误保留在括号里,pi 的重试分类正则
+            // (fetch failed / timeout 等)和排查都还认得
+            const raw = error instanceof Error ? error.message : "signing proxy failed";
+            res.end(JSON.stringify({ error: { message: `连不上 u1s1 服务器,检查一下网络?(${raw})` } }));
         }
     });
     await new Promise((resolve, reject) => {

package/dist/index.js

@@ -8,7 +8,7 @@ import { registerLoopCommand } from "./loop.js";
 import { ensureSearchTools } from "./search-tools.js";
 import { ensureUsableShell } from "./shell-doctor.js";
 import { applyBrandUi, setAnnouncement, setUpdateNotice } from "./style.js";
-import { fetchModels, loadCustomEndpoints } from "./api.js";
+import { AuthError, fetchModels, loadCustomEndpoints } from "./api.js";
 import { ensureSigningProxy } from "./device-auth.js";
 const PACKAGE_NAME = "u1s1-cli";
 /** 启动时检测到的可自动安装的新版;TUI 退出后才装(见 installPendingUpdate)。 */
@@ -41,8 +41,9 @@ async function checkForUpdate() {
     }
     if (!latest)
         return;
-    const pa = VERSION.split(".").map(Number);
-    const pb = latest.split(".").map(Number);
+    // parseInt 而非 Number:预发布段("0-beta.1")取前导数字,避免 NaN 让比较全军覆没
+    const pa = VERSION.split(".").map((s) => parseInt(s, 10) || 0);
+    const pb = latest.split(".").map((s) => parseInt(s, 10) || 0);
     let newer = false;
     for (let i = 0; i < 3; i++) {
         const diff = (pb[i] ?? 0) - (pa[i] ?? 0);
@@ -89,8 +90,14 @@ function installPendingUpdate() {
         console.log(`✅ 已更新到 v${latest},下次运行 u1s1 生效。`);
     }
     catch {
-        // 失败不挡退出,下次启动还会再试;也可手动 `u1s1 update`
-        console.error("自动更新失败。可稍后手动运行:u1s1 update");
+        // 失败不挡退出,下次启动还会再试。npm 全局目录没写权限时 `u1s1 update` 也会
+        // 走同一条命令再失败一次,所以这里直接给出能跳出循环的路径(官网安装脚本)
+        console.error("自动更新失败(上面是 npm 的报错,常见原因是没有全局安装权限)。");
+        console.error("可以改用官网安装脚本重装,一步到位:");
+        console.error(process.platform === "win32"
+            ? "  powershell -c \"irm https://u1s1.io/releases/install.ps1 | iex\""
+            : "  curl -fsSL https://u1s1.io/releases/install.sh | bash");
+        console.error("不想每次退出都尝试更新的话,可在 ~/.u1s1/agent/settings.json 里设 \"autoUpdate\": false");
     }
 }
 /**
@@ -151,8 +158,28 @@ async function runAgent(cfg, args) {
     // 老网关没有 /v1/image,image_gen 缺失时按关闭处理,不注册生图工具
     let imageGenEnabled = false;
     const endpointsReady = loadCustomEndpoints(cfg);
+    let modelsResp;
     try {
-        const { models, features, announcement } = await fetchModels(cfg);
+        modelsResp = await fetchModels(cfg);
+    }
+    catch (e) {
+        if (e instanceof AuthError) {
+            // 凭证形状还在但服务端已作废(设备被移除/换过钥匙):直接进 TUI 每条消息都会失败,
+            // 不如现在就引导重新登录
+            console.error("  登录已失效(这台设备可能被移除,或账号更换过钥匙),需要重新登录。");
+            const { login } = await import("./login.js");
+            cfg = await login();
+            modelsResp = await fetchModels(cfg).catch((e2) => {
+                console.error("  获取模型列表失败,使用内置列表:", e2.message);
+                return undefined;
+            });
+        }
+        else {
+            console.error("  获取模型列表失败,使用内置列表:", e.message);
+        }
+    }
+    if (modelsResp) {
+        const { models, features, announcement } = modelsResp;
         setModelsFromApi(models.map(apiModelToDef));
         webSearchEnabled = features.web_search !== false;
         webFetchRenderEnabled = features.web_fetch_render === true;
@@ -161,9 +188,6 @@ async function runAgent(cfg, args) {
         if (announcement?.text)
             setAnnouncement(announcement);
     }
-    catch (e) {
-        console.error("  获取模型列表失败,使用内置列表:", e.message);
-    }
     await endpointsReady;
     // pi provider 只支持静态 header；指向本机 signing proxy，由它逐请求附 DPoP proof。
     const signing = await ensureSigningProxy(cfg);
@@ -197,20 +221,23 @@ async function runAgent(cfg, args) {
     // 网页终端(如 Taikula)把 Shift+Enter 发成 ESC+CR(\x1b\r)。pi 在没开 Kitty
     // 协议时把它当成 Alt+Enter:空闲就直接发送,忙碌才排队。先改成 CSI-u 的
     // Shift+Enter,输入框就会换行,真·Alt+Enter(\x1b[13;3u)不受影响。
+    // TUI 里 console.log 会被下一帧重绘吞掉,拦截提示必须走 ui.notify;
+    // session_start 时把 notify 句柄存出来给编辑器拦截用
+    let notifyUi;
     class ShiftEnterEditor extends CustomEditor {
         handleInput(data) {
             // 拦截 /login 和 /logout,不让 pi 弹出内置供应商列表
             if (data === "\r" || data === "\n") {
                 const text = this.getText().trim();
+                const tip = (msg) => (notifyUi ? notifyUi(msg) : console.log(`  ${msg}`));
                 if (text.startsWith("/login")) {
-                    console.log("  切换模型用 /model;要换 u1s1 账号的话,先 /exit 退出,再在终端运行:");
-                    console.log("  u1s1 logout && u1s1 login(浏览器里选要用的账号)");
+                    tip("切换模型用 /model;要换 u1s1 账号:先 /exit 退出,再在终端运行 u1s1 logout && u1s1 login");
                     this.setText("");
                     this.addToHistory?.(text);
                     return;
                 }
                 if (text === "/logout") {
-                    console.log("  退出登录请先 /exit 回到终端,再运行:u1s1 logout");
+                    tip("退出登录请先 /exit 回到终端,再运行:u1s1 logout");
                     this.setText("");
                     this.addToHistory?.(text);
                     return;
@@ -283,6 +310,7 @@ async function runAgent(cfg, args) {
                     persistPreferredModel(loadConfig(), ref.provider, ref.id);
                 });
                 pi.on("session_start", (_event, ctx) => {
+                    notifyUi = (msg) => ctx.ui.notify(msg, "info");
                     const previous = ctx.ui.getEditorComponent();
                     ctx.ui.setEditorComponent((tui, theme, keybindings) => {
                         if (previous) {
@@ -316,6 +344,18 @@ async function run() {
         printConsoleBanner(VERSION);
         console.log(" u1s1 命令:deploy(发布网页,可选 --public / --private)· login / logout · model · usage · update · import · bench");
         console.log("");
+        console.log(" 命令:");
+        console.log("   u1s1 login / logout    登录 / 退出登录");
+        console.log("   u1s1 model             查看或切换默认模型");
+        console.log("   u1s1 usage             查看免费额度和余额");
+        console.log("   u1s1 update            升级到最新版");
+        console.log("   u1s1 deploy            发布网页,可选 --public / --private");
+        console.log("   u1s1 import            导入历史会话");
+        console.log("   u1s1 --version         查看版本");
+        console.log("");
+        console.log(" 对话里输入 / 可以看会话内命令(/model /clear /exit …)");
+        console.log(" 更多帮助 → https://u1s1.io/guide");
+        return;
     }
     if (cmd === "web") {
         console.error("u1s1 web 已下线，请使用 Desktop App：https://u1s1.io/#download");
@@ -347,9 +387,15 @@ async function run() {
     if (cmd === "logout") {
         const { saveConfig } = await import("./config.js");
         const current = loadConfig();
+        if (!current.deviceToken && !current.apiKey) {
+            console.log("当前本来就没有登录。运行 u1s1 即可登录。");
+            return;
+        }
+        let serverRevoked = false;
         if (current.deviceToken) {
             const { authorizedFetch } = await import("./device-auth.js");
-            await authorizedFetch(current, `${current.baseUrl}/device`, { method: "DELETE" }).catch(() => null);
+            const resp = await authorizedFetch(current, `${current.baseUrl}/device`, { method: "DELETE" }).catch(() => null);
+            serverRevoked = resp?.ok ?? false;
         }
         saveConfig({
             ...current,
@@ -359,7 +405,13 @@ async function run() {
             devicePrivateJwk: undefined,
             devicePublicJwk: undefined,
         });
-        console.log("已退出登录。");
+        if (serverRevoked) {
+            console.log("已退出登录,这台设备在服务端的授权也已注销。");
+        }
+        else {
+            console.log("已退出本机登录。");
+            console.log("(没连上服务器注销这台设备;如有需要,可在 https://u1s1.io/dashboard 的设备列表里手动移除。)");
+        }
         return;
     }
     if (cmd === "update") {

package/dist/login.d.ts

@@ -19,8 +19,10 @@ export interface DeviceLoginResult {
     devicePrivateJwk: webcrypto.JsonWebKey;
     devicePublicJwk: webcrypto.JsonWebKey;
 }
-/** 轮询等浏览器批准；只接受带设备凭证的新网关响应。 */
-export declare function pollDeviceLogin(origin: string, start: DeviceStart): Promise<DeviceLoginResult | null>;
+/** 轮询等浏览器批准；只接受带设备凭证的新网关响应。outcome 可带出失败原因。 */
+export declare function pollDeviceLogin(origin: string, start: DeviceStart, outcome?: {
+    reason?: "expired" | "timeout";
+}): Promise<DeviceLoginResult | null>;
 export declare function login(keyArg?: string): Promise<CliConfig>;
 /** Returns a config with a browser-approved, sender-constrained device credential. */
 export declare function ensureAuth(): Promise<CliConfig>;

package/dist/login.js

@@ -34,6 +34,7 @@ export async function startDeviceLogin(origin) {
                 device_name: `${hostname()} (${platform()})`,
                 client_version: VERSION,
             }),
+            signal: AbortSignal.timeout(15_000),
         });
         if (!resp.ok)
             return null;
@@ -53,8 +54,8 @@ export async function startDeviceLogin(origin) {
         return null;
     }
 }
-/** 轮询等浏览器批准；只接受带设备凭证的新网关响应。 */
-export async function pollDeviceLogin(origin, start) {
+/** 轮询等浏览器批准；只接受带设备凭证的新网关响应。outcome 可带出失败原因。 */
+export async function pollDeviceLogin(origin, start, outcome) {
     const deadline = Date.now() + start.expires_in * 1000;
     while (Date.now() < deadline) {
         await sleep(start.interval * 1000);
@@ -63,6 +64,7 @@ export async function pollDeviceLogin(origin, start) {
                 method: "POST",
                 headers: { "content-type": "application/json" },
                 body: JSON.stringify({ poll_secret: start.poll_secret }),
+                signal: AbortSignal.timeout(10_000),
             });
             if (!resp.ok)
                 continue;
@@ -76,13 +78,18 @@ export async function pollDeviceLogin(origin, start) {
                     devicePublicJwk: start.public_jwk,
                 };
             }
-            if (data.status === "expired")
+            if (data.status === "expired") {
+                if (outcome)
+                    outcome.reason = "expired";
                 return null;
+            }
         }
         catch {
             // 网络抖一下,下一轮继续
         }
     }
+    if (outcome)
+        outcome.reason = "timeout";
     return null;
 }
 export async function login(keyArg) {
@@ -94,26 +101,51 @@ export async function login(keyArg) {
     printConsoleBanner(VERSION);
     const origin = apiOrigin(cfg);
     const start = await startDeviceLogin(origin);
-    if (start) {
-        console.log("  用浏览器登录并批准这台设备:");
-        console.log("");
-        console.log(`      ${start.verify_url}`);
-        console.log("");
-        console.log("  已经帮你打开浏览器了;如果没打开,把上面这行网址复制到浏览器打开。");
-        console.log("  批准后，本机会用设备私钥为每次 API 请求签名。");
-        tryOpenBrowser(start.verify_url);
-        credential = (await pollDeviceLogin(origin, start)) ?? undefined;
+    if (!start) {
+        console.error("  连不上 u1s1 服务器,请检查网络后重试。");
+        console.error("  如果网络正常,可能是 u1s1 版本太旧,运行 u1s1 update 升级后再试。");
+        process.exit(1);
+    }
+    console.log("  用浏览器登录并批准这台设备:");
+    console.log("");
+    console.log(`      ${start.verify_url}`);
+    console.log("");
+    console.log("  正在尝试打开浏览器;如果没有自动打开,把上面这行网址复制到浏览器打开。");
+    console.log("  批准后,本机会用设备私钥为每次 API 请求签名。");
+    tryOpenBrowser(start.verify_url);
+    console.log("");
+    console.log("  等待浏览器里完成批准……(按 Ctrl+C 取消)");
+    const waitStartedAt = Date.now();
+    const waitTimer = setInterval(() => {
+        const mins = Math.round((Date.now() - waitStartedAt) / 60_000);
+        console.log(`  仍在等待批准(已等 ${mins} 分钟),在浏览器里点「批准」后这里会自动继续。`);
+    }, 120_000);
+    const outcome = {};
+    try {
+        credential = (await pollDeviceLogin(origin, start, outcome)) ?? undefined;
+    }
+    finally {
+        clearInterval(waitTimer);
     }
     if (!credential) {
-        console.error("  没能取得设备凭证。请确认网络正常并升级到最新版 u1s1 后重试。");
+        if (outcome.reason === "expired" || outcome.reason === "timeout") {
+            console.error("  一直没等到浏览器里的批准,这个登录链接已失效。");
+            console.error("  重新运行 u1s1 会生成新的登录链接;网页打不开的话检查一下网络。");
+        }
+        else {
+            console.error("  没能取得设备凭证,请确认网络正常后重试。");
+        }
         process.exit(1);
     }
     const next = { ...cfg, ...credential };
+    // 浏览器批准已经成功,先把凭证落盘;后面的账号信息确认失败也不用重走登录
+    saveConfig(next);
     const me = await fetchMe(next).catch((e) => {
-        console.error(`  验证失败:${e.message}`);
-        process.exit(1);
+        console.log("  ✓ 设备已批准,登录凭证已保存。");
+        console.error(`  只是暂时没连上服务器确认账号信息(${e.message})。`);
+        console.error("  稍后直接运行 u1s1 即可,不需要重新登录。");
+        process.exit(0);
     });
-    saveConfig(next);
     const tpu = me.tokens_per_usd ?? 0;
     let quotaNote;
     if (me.free_claim) {
@@ -134,7 +166,7 @@ export async function login(keyArg) {
     }
     else {
         // 老网关:没有 tokens_per_usd,退回金额显示
-        quotaNote = `今日免费还剩 $${me.daily_free_remaining_usd},永久余额 $${me.remaining_usd}`;
+        quotaNote = `今日免费还剩 $${me.daily_free_remaining_usd.toFixed(2)},永久余额 $${me.remaining_usd.toFixed(2)}`;
     }
     console.log(`  ✓ 登录成功${me.email ? `(${me.email})` : ""},${quotaNote}。`);
     return next;

package/dist/search-tools.js

@@ -137,14 +137,11 @@ export async function ensureSearchTools(cfg) {
         const missing = TOOLS.filter((t) => !existsSync(join(binDir, t.bin + ext)) && !inPath(t.pathNames));
         if (missing.length === 0)
             return;
-        console.log(`  正在安装搜索组件(${missing.map((t) => t.bin).join("/")})…`);
+        // 这是新手首启最早看到的输出之一:说清是首次准备、不用管;fd/rg 等术语不外露
+        console.log("  首次运行,正在准备文件搜索组件(只需一次)…");
         const results = await Promise.allSettled(missing.map((t) => install(t, cfg.baseUrl, t.bin + ext)));
-        for (let i = 0; i < results.length; i++) {
-            const r = results[i];
-            if (r.status === "rejected") {
-                const msg = r.reason instanceof Error ? r.reason.message : String(r.reason);
-                console.error(`  ${missing[i].bin} 安装失败(${msg}),稍后将尝试 GitHub 直连`);
-            }
+        if (results.some((r) => r.status === "rejected")) {
+            console.log("  部分搜索组件暂时没装上,不影响使用,之后会自动重试。");
         }
     }
     catch {

package/dist/tools.d.ts

@@ -28,6 +28,16 @@ export declare function createSubagentTool(getParentModel: () => ParentModelRef)
     model: Type.TOptional<Type.TString>;
     timeout_minutes: Type.TOptional<Type.TNumber>;
 }>, unknown, any> & import("@earendil-works/pi-coding-agent").ToolDefinition<any, any, any>;
+/**
+ * 下载方舟返回的同一个临时 URL。fetch() 拿到响应头后,body 仍可能在
+ * arrayBuffer() 阶段以 Undici `terminated` 断流,所以两步必须放在同一个
+ * try/retry 中。重试下载不会再次调用生图接口,也不会重复计费。
+ */
+export declare function downloadGeneratedImage(url: string, signal: AbortSignal, options?: {
+    attempts?: number;
+    retryDelayMs?: number;
+    fetchImpl?: typeof fetch;
+}): Promise<Uint8Array>;
 /** 生图工具:走 u1s1 网关代理火山方舟 Seedream,上游 key 不落到用户机器上。 */
 export declare function createImageTool(cfg: Pick<CliConfig, "baseUrl" | "apiKey">): import("@earendil-works/pi-coding-agent").ToolDefinition<Type.TObject<{
     prompt: Type.TString;

package/dist/tools.js

@@ -246,6 +246,9 @@ export function createSubagentTool(getParentModel) {
 }
 /** 生图链路 = 网关排队 + 方舟生成(2K 实测 ~10s,4K 更久)+ 下载落盘。 */
 const IMAGE_TIMEOUT_MS = 150_000;
+/** 生图已经计费后只重试同一个临时 URL,绝不能靠重新生图补偿下载断流。 */
+const IMAGE_DOWNLOAD_ATTEMPTS = 3;
+const IMAGE_DOWNLOAD_RETRY_DELAY_MS = 500;
 /** 方舟单张参考图原图上限 10MB。 */
 const MAX_REF_IMAGE_BYTES = 10 * 1024 * 1024;
 const REF_IMAGE_MIME = {
@@ -285,6 +288,57 @@ function resolveSavePath(savePath, urlExt) {
         path = `${base}-${i}${urlExt}`;
     return path;
 }
+function errorDetail(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const cause = error instanceof Error ? error.cause : undefined;
+    const code = cause && typeof cause === "object" && "code" in cause && typeof cause.code === "string" ? cause.code : "";
+    return code && !message.includes(code) ? `${message} (${code})` : message;
+}
+async function abortableDelay(ms, signal) {
+    if (ms <= 0)
+        return;
+    if (signal.aborted)
+        throw signal.reason;
+    await new Promise((resolveDelay, rejectDelay) => {
+        const onAbort = () => {
+            clearTimeout(timer);
+            rejectDelay(signal.reason);
+        };
+        const timer = setTimeout(() => {
+            signal.removeEventListener("abort", onAbort);
+            resolveDelay();
+        }, ms);
+        signal.addEventListener("abort", onAbort, { once: true });
+    });
+}
+/**
+ * 下载方舟返回的同一个临时 URL。fetch() 拿到响应头后,body 仍可能在
+ * arrayBuffer() 阶段以 Undici `terminated` 断流,所以两步必须放在同一个
+ * try/retry 中。重试下载不会再次调用生图接口,也不会重复计费。
+ */
+export async function downloadGeneratedImage(url, signal, options = {}) {
+    const attempts = Math.max(1, Math.floor(options.attempts ?? IMAGE_DOWNLOAD_ATTEMPTS));
+    const retryDelayMs = Math.max(0, options.retryDelayMs ?? IMAGE_DOWNLOAD_RETRY_DELAY_MS);
+    const fetchImpl = options.fetchImpl ?? fetch;
+    let lastError;
+    for (let attempt = 1; attempt <= attempts; attempt++) {
+        try {
+            const resp = await fetchImpl(url, { signal });
+            if (!resp.ok)
+                throw new Error(`HTTP ${resp.status}`);
+            return new Uint8Array(await resp.arrayBuffer());
+        }
+        catch (error) {
+            if (signal.aborted)
+                throw error;
+            lastError = error;
+            if (attempt < attempts)
+                await abortableDelay(retryDelayMs * attempt, signal);
+        }
+    }
+    throw new Error(`图片已经生成,但下载失败(同一地址已重试 ${attempts} 次): ${errorDetail(lastError)}。` +
+        `不要重新调用 generate_image,可在 24 小时内手动下载: ${url}`, { cause: lastError });
+}
 /** 生图工具:走 u1s1 网关代理火山方舟 Seedream,上游 key 不落到用户机器上。 */
 export function createImageTool(cfg) {
     return defineTool({
@@ -320,18 +374,7 @@ export function createImageTool(cfg) {
             const abort = signal ? AbortSignal.any([signal, timeout]) : timeout;
             const images = (params.images ?? []).map(refImageToPayload);
             const result = await generateImage(cfg, { prompt: params.prompt, images: images.length ? images : undefined, size: params.size }, abort);
-            let resp;
-            try {
-                resp = await fetch(result.url, { signal: abort });
-            }
-            catch (e) {
-                if (signal?.aborted)
-                    throw e;
-                throw new Error(`图片生成成功但下载失败: ${e.message}`);
-            }
-            if (!resp.ok)
-                throw new Error(`图片生成成功但下载失败: HTTP ${resp.status}`);
-            const bytes = new Uint8Array(await resp.arrayBuffer());
+            const bytes = await downloadGeneratedImage(result.url, abort);
             const urlExt = extname(new URL(result.url).pathname).toLowerCase() || ".jpeg";
             const path = resolveSavePath(params.save_path, urlExt);
             mkdirSync(dirname(path), { recursive: true });

package/dist/update.js

@@ -44,8 +44,9 @@ export async function getLatestVersion() {
     }
 }
 export function compareVersions(a, b) {
-    const pa = a.split(".").map(Number);
-    const pb = b.split(".").map(Number);
+    // parseInt 而非 Number:预发布段("0-beta.1")取前导数字,避免 NaN 让比较恒为「相等」
+    const pa = a.split(".").map((s) => parseInt(s, 10) || 0);
+    const pb = b.split(".").map((s) => parseInt(s, 10) || 0);
     for (let i = 0; i < 3; i++) {
         const diff = (pa[i] ?? 0) - (pb[i] ?? 0);
         if (diff !== 0)
@@ -175,8 +176,13 @@ export async function update() {
         console.log(`\n✅ 已更新到 v${latest}，重启 u1s1 后生效。`);
     }
     catch {
-        console.error("\n自动更新失败。请手动运行:");
-        console.error(`  ${pm === "npm" ? "npm install -g" : `${pm} add -g`} ${PACKAGE_NAME}@latest`);
+        // 再让用户手抄同一条命令多半还是失败(最常见是全局目录没写权限),
+        // 直接给能跳出循环的路:官网安装脚本(装进用户目录,不需要管理员权限)
+        console.error("\n更新失败(上面是包管理器的报错,常见原因是全局目录没有写权限)。");
+        console.error("推荐改用官网安装脚本重装,不需要管理员权限,一步到位:");
+        console.error(process.platform === "win32"
+            ? "  irm https://u1s1.io/releases/install.ps1 | iex   (在 PowerShell 里运行)"
+            : "  curl -fsSL https://u1s1.io/releases/install.sh | bash");
         process.exit(1);
     }
 }

package/dist/usage.js

@@ -77,10 +77,10 @@ export async function usage() {
             console.log(`             ${scopeNote} · ${p.expires_at ? `${p.expires_at.slice(0, 10)} 到期` : "永不过期"}`);
         }
         if (me.bonus_balance_usd > 0) {
-            const balText = tpu > 0 ? `${fmtTokensCn(me.bonus_balance_usd * tpu)} Token` : `$${me.bonus_balance_usd}`;
+            const balText = tpu > 0 ? `${fmtTokensCn(me.bonus_balance_usd * tpu)} Token` : `$${me.bonus_balance_usd.toFixed(2)}`;
             console.log(`  余额(按量) ${balText}`);
         }
-        console.log(`  本月已用   约 ${tpu > 0 ? `${fmtTokensCn(me.mtd_usd * tpu)} Token` : ""}($${me.mtd_usd.toFixed(2)})`);
+        console.log(`  本月已用   ${tpu > 0 ? `约 ${fmtTokensCn(me.mtd_usd * tpu)} Token($${me.mtd_usd.toFixed(2)})` : `$${me.mtd_usd.toFixed(2)}`}`);
         console.log("");
         if (me.free_claim === "first") {
             console.log("  → 你有免费用量包没领:首月每天 1 亿 Token,去 https://u1s1.io/dashboard 点「领取」");
@@ -106,10 +106,10 @@ export async function usage() {
     }
     else {
         // 老网关没下发 tokens_per_usd,退回金额显示
-        console.log(`  今日免费   $${freeRemain} / $${freeTotal}  ${bar(freeRatio)}`);
+        console.log(`  今日免费   $${freeRemain.toFixed(2)} / $${freeTotal.toFixed(2)}  ${bar(freeRatio)}`);
         console.log("             DeepSeek V4 Flash · 北京时间 0 点恢复");
-        console.log(`  永久余额   $${me.remaining_usd}`);
-        console.log(`  本月成本   $${me.mtd_usd}`);
+        console.log(`  永久余额   $${me.remaining_usd.toFixed(2)}`);
+        console.log(`  本月成本   $${me.mtd_usd.toFixed(2)}`);
     }
     console.log("");
     console.log("  免费额度每天自动恢复；邀请朋友双方各得永久加量 → https://u1s1.io/dashboard");

package/package.json

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