u1s1-cli 0.9.2 → 0.9.3

package/dist/brand.js

@@ -46,8 +46,9 @@ function paintArt(theme, line) {
  * Startup hero, responsive to terminal width:
  * wide → wordmark with info column beside it; medium → stacked; narrow → one-liner.
  */
-export function renderBrandHeader(theme, version, cwd, width) {
-    const name = theme.bold(theme.fg("text", `${BRAND_NAME} v${version}`));
+export function renderBrandHeader(theme, version, cwd, width, notice) {
+    const name = theme.bold(theme.fg("text", `${BRAND_NAME} v${version}`)) +
+        (notice ? `  ${theme.fg("accent", notice)}` : "");
     const brand = theme.fg("muted", `${BRAND_CN} · ${BRAND_TAGLINE}`);
     const dir = theme.fg("dim", `cwd: ${formatHomePath(cwd)}`);
     const hints = theme.fg("dim", "/help 看命令 · Shift+Enter 换行 · Esc 中断");

package/dist/config.js

@@ -1,9 +1,24 @@
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { basename, dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
 const require = createRequire(import.meta.url);
 export const VERSION = require("../package.json").version;
+/**
+ * 便携包安装(install.sh / install.ps1):包根旁边带自己的 node 运行时,
+ * npm 更新碰不到这份拷贝,升级只能整包重装。npm 全局安装的包在 node_modules
+ * 下,按父目录名先排除,避免撞上恰好叫 node 的目录误判。
+ */
+export function isPortableInstall() {
+    const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), ".."); // dist/.. = 包根
+    if (basename(dirname(pkgRoot)) === "node_modules")
+        return false;
+    const portableNode = process.platform === "win32"
+        ? join(pkgRoot, "..", "node", "node.exe")
+        : join(pkgRoot, "..", "node", "bin", "node");
+    return existsSync(portableNode);
+}
 export const DEFAULT_BASE_URL = "https://api.u1s1.io/v1";
 export const PROVIDER_ID = "u1s1";
 /** Make a short alias from a model id by stripping common prefixes. */

package/dist/index.js

@@ -3,18 +3,16 @@ import { spawnSync } from "node:child_process";
 import { writeFileSync } from "node:fs";
 import { cleanupBrandThemes, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, writeWebToolsExtension, } from "./agent-setup.js";
 import { printConsoleBanner } from "./brand.js";
-import { agentDir, apiModelToDef, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, readSettings, resolvePreferredModel, setModelsFromApi, VERSION, } from "./config.js";
-import { applyBrandUi } from "./style.js";
+import { agentDir, apiModelToDef, isPortableInstall, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, readSettings, resolvePreferredModel, setModelsFromApi, VERSION, } from "./config.js";
+import { applyBrandUi, setUpdateNotice } from "./style.js";
 import { fetchModels } from "./api.js";
 const PACKAGE_NAME = "u1s1-cli";
 /**
- * 启动时自动检查 npm 最新版，发现更新就静默安装。
- * 不阻塞启动流程，失败也不报错（留到手动 `u1s1 update`）。
+ * 启动时自动检查 npm 最新版:autoUpdate 开着就静默安装,关着也在启动横幅的
+ * 版本号后面提示一句(u1s1 vX.Y.Z 后跟升级状态,见 setUpdateNotice)。
+ * 不阻塞启动流程,失败也不报错(留到手动 `u1s1 update`)。
  */
 async function checkAndAutoUpdate() {
-    const settings = readSettings();
-    if (settings.autoUpdate === false)
-        return;
     let latest;
     try {
         const url = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
@@ -46,6 +44,12 @@ async function checkAndAutoUpdate() {
     }
     if (!newer)
         return;
+    const settings = readSettings();
+    // 便携版没法用 npm 自更新;autoUpdate 关闭同理只提示。u1s1 update 会给出正确升级方式
+    if (settings.autoUpdate === false || isPortableInstall()) {
+        setUpdateNotice(`⬆ 新版 v${latest} 可用 · u1s1 update 升级`);
+        return;
+    }
     // 检测包管理器
     const userAgent = process.env.npm_config_user_agent ?? "";
     const pm = userAgent.startsWith("pnpm") ? "pnpm"
@@ -55,14 +59,17 @@ async function checkAndAutoUpdate() {
     const installCmd = pm === "npm"
         ? `npm install -g ${PACKAGE_NAME}@latest`
         : `${pm} add -g ${PACKAGE_NAME}@latest`;
+    setUpdateNotice(`⬆ 发现新版 v${latest},自动更新中…`);
     try {
-        // 用同步 execSync 确保安装完成后再进交互
-        const { execSync } = await import("node:child_process");
-        execSync(installCmd, { stdio: "pipe", timeout: 60_000 });
-        console.log(`  ✨ 已自动更新到 v${latest}，下次启动生效`);
+        // 异步安装:execSync 会卡死事件循环,TUI 打字会冻住
+        const { exec } = await import("node:child_process");
+        const { promisify } = await import("node:util");
+        await promisify(exec)(installCmd, { timeout: 60_000 });
+        setUpdateNotice(`✨ 已更新到 v${latest},重启后生效`);
     }
     catch {
         // 自动更新失败不阻塞，用户可手动 `u1s1 update`
+        setUpdateNotice(`⬆ 新版 v${latest} 可用 · u1s1 update 升级`);
     }
 }
 /**

package/dist/style.js

@@ -2,6 +2,16 @@ import { basename } from "node:path";
 import { truncateToWidth } from "@earendil-works/pi-tui";
 import { readSettings } from "./config.js";
 import { renderBrandHeader } from "./brand.js";
+/**
+ * 启动横幅版本号后面的升级状态(如「发现新版 v0.9.3,自动更新中…」)。
+ * checkAndAutoUpdate 异步写入;横幅已挂载时主动触发一次重绘,否则等首帧渲染。
+ */
+let updateNotice = "";
+let refreshHeader;
+export function setUpdateNotice(notice) {
+    updateNotice = notice;
+    refreshHeader?.();
+}
 /**
  * Brand chrome is just the startup hero + window title; everything else
  * (tool rows, thinking blocks, spinner) stays Pi's default UI.
@@ -13,13 +23,16 @@ export function applyBrandUi(pi, version) {
         // 检查设置:关掉就不显示启动横幅
         const settings = readSettings();
         if (settings.showStartupBanner !== false) {
-            ctx.ui.setHeader((_tui, theme) => ({
-                render(width) {
-                    // pi-tui crashes on lines wider than the terminal, so truncate defensively.
-                    return renderBrandHeader(theme, version, process.cwd(), width).map((line) => truncateToWidth(line, width));
-                },
-                invalidate() { },
-            }));
+            ctx.ui.setHeader((tui, theme) => {
+                refreshHeader = () => tui.requestRender();
+                return {
+                    render(width) {
+                        // pi-tui crashes on lines wider than the terminal, so truncate defensively.
+                        return renderBrandHeader(theme, version, process.cwd(), width, updateNotice).map((line) => truncateToWidth(line, width));
+                    },
+                    invalidate() { },
+                };
+            });
         }
         ctx.ui.setTitle(`u1s1 — ${basename(process.cwd())}`);
     });

package/dist/update.js

@@ -1,8 +1,15 @@
 import { execSync } from "node:child_process";
 import { createRequire } from "node:module";
+import { isPortableInstall } from "./config.js";
 const require = createRequire(import.meta.url);
-export const VERSION = require("../package.json").version;
+const pkg = require("../package.json");
+export const VERSION = pkg.version;
 export const PACKAGE_NAME = "u1s1-cli";
+/** engines.node 里要求的最低版本(如 ">=22.19.0" → "22.19.0");解析不出返回 undefined。 */
+function requiredNodeVersion() {
+    const m = /(\d+\.\d+\.\d+)/.exec(pkg.engines?.node ?? "");
+    return m?.[1];
+}
 /** Detect the package manager that installed u1s1. */
 export function detectPackageManager() {
     // Check common global install locations for clues
@@ -53,11 +60,38 @@ export async function update() {
         console.log(`当前 v${VERSION} 已是最新版本 ✓`);
         return;
     }
-    const pm = detectPackageManager();
     console.log(`发现新版本 v${latest} (当前 v${VERSION})`);
+    // 便携版:npm 装到全局目录,但 PATH 先命中便携目录,怎么更都还是旧版。
+    // 唯一正确的升级方式是重跑官网安装命令整包替换,这里不再碰 npm。
+    if (isPortableInstall()) {
+        const isWin = process.platform === "win32";
+        console.log("");
+        console.log("你装的是便携版(自带 Node),npm 更新不了它。升级分两步:");
+        console.log("  1. 关闭所有 u1s1 窗口");
+        console.log(isWin
+            ? "  2. 打开 PowerShell 运行: irm https://u1s1.io/releases/install.ps1 | iex"
+            : "  2. 在终端运行: curl -fsSL https://u1s1.io/releases/install.sh | bash");
+        return;
+    }
+    const pm = detectPackageManager();
+    // 系统 Node 低于新版要求时,先说人话:推荐官网安装命令(便携包自带合适的
+    // Node,不用自己折腾)。npm 更新仍继续——引擎不匹配只是警告,装上大概率能跑。
+    const required = requiredNodeVersion();
+    if (required && compareVersions(process.versions.node, required) < 0) {
+        const cmd = process.platform === "win32"
+            ? "irm https://u1s1.io/releases/install.ps1 | iex   (在 PowerShell 里运行)"
+            : "curl -fsSL https://u1s1.io/releases/install.sh | bash";
+        console.log("");
+        console.log(`⚠ 你电脑的 Node.js 是 v${process.versions.node},新版 u1s1 建议 v${required} 或更新。`);
+        console.log("  推荐用官网安装命令重装,自带合适的 Node,一步到位:");
+        console.log(`    ${cmd}`);
+        console.log("  下面仍会继续用 npm 更新;更新后如果运行异常,再用上面的命令重装即可。");
+        console.log("");
+    }
     console.log(`正在用 ${pm} 更新 ${PACKAGE_NAME}…`);
     try {
-        const installCmd = pm === "npm" ? `npm install -g ${PACKAGE_NAME}@latest` : `${pm} add -g ${PACKAGE_NAME}@latest`;
+        // npm 压掉 EBADENGINE 等警告墙,对新手只有噪音;出错时 error 仍会显示
+        const installCmd = pm === "npm" ? `npm install -g --loglevel=error ${PACKAGE_NAME}@latest` : `${pm} add -g ${PACKAGE_NAME}@latest`;
         execSync(installCmd, { stdio: "inherit" });
         console.log(`\n✅ 已更新到 v${latest}，重启 u1s1 后生效。`);
     }

package/dist/usage.js

@@ -4,6 +4,21 @@ function bar(ratio, width = 24) {
     const filled = Math.round(Math.max(0, Math.min(1, ratio)) * width);
     return "█".repeat(filled) + "░".repeat(width - filled);
 }
+// 与官网 app.js 的 fmtTokensCn 保持一致:万/亿单位,2 位有效数字
+function fmtTokensCn(tokens) {
+    const t = Number(tokens);
+    if (!Number.isFinite(t) || t <= 0)
+        return "0";
+    const sig2 = (n) => {
+        const m = Math.pow(10, Math.max(0, String(Math.round(n)).length - 2));
+        return Math.round(n / m) * m;
+    };
+    if (t >= 1e8)
+        return (Math.round((t / 1e8) * 10) / 10).toLocaleString("en-US") + " 亿";
+    if (t >= 1e4)
+        return sig2(t / 1e4).toLocaleString("en-US") + " 万";
+    return sig2(t).toLocaleString("en-US");
+}
 export async function usage() {
     const cfg = loadConfig();
     if (!cfg.apiKey) {
@@ -14,16 +29,28 @@ export async function usage() {
         console.error(e.message);
         process.exit(1);
     });
-    const remain = me.remaining_usd;
     const freeRemain = me.daily_free_remaining_usd;
     const freeTotal = me.daily_free_usd;
     const freeRatio = freeTotal > 0 ? freeRemain / freeTotal : 0;
+    const tpu = me.tokens_per_usd ?? 0;
     console.log("");
     console.log(`  账号       ${me.email ?? "(未绑定邮箱)"}`);
-    console.log(`  今日免费   $${freeRemain} / $${freeTotal}  ${bar(freeRatio)}`);
-    console.log("             DeepSeek V4 Flash · 北京时间 0 点恢复");
-    console.log(`  永久余额   $${remain}`);
-    console.log(`  本月成本   $${me.mtd_usd}`);
+    if (tpu > 0) {
+        const tok = (usd) => `${fmtTokensCn(usd * tpu)} Token`;
+        console.log(`  今日免费   还剩 ${fmtTokensCn(freeRemain * tpu)} / ${tok(freeTotal)}  ${bar(freeRatio)}`);
+        console.log("             DeepSeek V4 Flash · 北京时间 0 点恢复");
+        console.log(`  永久余额   ${tok(me.remaining_usd)}`);
+        console.log(`  本月已用   约 ${tok(me.mtd_usd)}($${me.mtd_usd.toFixed(2)})`);
+        console.log("");
+        console.log("  Token 数按默认模型单价折算,为约数;用更贵的模型时消耗更快。");
+    }
+    else {
+        // 老网关没下发 tokens_per_usd,退回金额显示
+        console.log(`  今日免费   $${freeRemain} / $${freeTotal}  ${bar(freeRatio)}`);
+        console.log("             DeepSeek V4 Flash · 北京时间 0 点恢复");
+        console.log(`  永久余额   $${me.remaining_usd}`);
+        console.log(`  本月成本   $${me.mtd_usd}`);
+    }
     console.log("");
     console.log("  免费额度每天自动恢复；邀请朋友双方各得永久加量 → https://u1s1.io/dashboard");
     console.log("");

package/package.json

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