u1s1-cli 0.12.1 → 0.13.1

package/dist/agent-setup.d.ts

@@ -46,6 +46,7 @@ export declare function toProviderModels(models: ModelDef[]): {
  * 这是 pi 自带 llama provider 的同款兜底,本地服务会忽略 Authorization 头。
  */
 export declare function endpointProviderEntry(ep: CustomEndpoint): Record<string, unknown>;
+export declare function scrubForeignProviderEnv(): void;
 /** 把各端点密钥放进环境(TUI 直接 process.env;web 传给子进程)。 */
 export declare function endpointKeyEnv(): Record<string, string>;
 export declare function ensureProviderModels(cfg: CliConfig): void;

package/dist/agent-setup.js

@@ -160,6 +160,56 @@ export function endpointProviderEntry(ep) {
         models: toProviderModels(ep.models),
     };
 }
+/**
+ * pi 会把环境里的厂商密钥(ANTHROPIC_API_KEY 等)当作「已配置的 provider」,
+ * /model 里冒出一大串没在用的模型(u1s1 又拦了 /login,配了也没法管理)。
+ * u1s1 的口径是:官方模型 + 自定义端点,所以启动 pi 前把这批**纯 LLM 厂商**
+ * 密钥从 pi 进程环境里剔掉。名单来自 pi-ai env-api-keys.ts;刻意保留
+ * AWS_WEB_IDENTITY_TOKEN_FILE / HF_TOKEN / GOOGLE_CLOUD_API_KEY /
+ * CLOUDFLARE_API_KEY 这类通用凭据 —— agent 终端里的其他工具还要用。
+ * 注意 agent 的 Bash 子进程也继承不到被剔的变量;项目 .env 文件不受影响。
+ */
+const FOREIGN_PROVIDER_ENV_KEYS = [
+    "AI_GATEWAY_API_KEY",
+    "ANTHROPIC_API_KEY",
+    "ANTHROPIC_AUTH_TOKEN",
+    "ANTHROPIC_OAUTH_TOKEN",
+    "ANT_LING_API_KEY",
+    "AWS_BEARER_TOKEN_BEDROCK",
+    "AZURE_OPENAI_API_KEY",
+    "BASETEN_API_KEY",
+    "CEREBRAS_API_KEY",
+    "COPILOT_GITHUB_TOKEN",
+    "DEEPSEEK_API_KEY",
+    "FIREWORKS_API_KEY",
+    "GEMINI_API_KEY",
+    "GROQ_API_KEY",
+    "KIMI_API_KEY",
+    "MINIMAX_API_KEY",
+    "MINIMAX_CN_API_KEY",
+    "MISTRAL_API_KEY",
+    "MOONSHOT_API_KEY",
+    "NVIDIA_API_KEY",
+    "OPENAI_API_KEY",
+    "OPENCODE_API_KEY",
+    "OPENROUTER_API_KEY",
+    "QWEN_TOKEN_PLAN_API_KEY",
+    "QWEN_TOKEN_PLAN_CN_API_KEY",
+    "RADIUS_API_KEY",
+    "TOGETHER_API_KEY",
+    "XAI_API_KEY",
+    "XIAOMI_API_KEY",
+    "XIAOMI_TOKEN_PLAN_AMS_API_KEY",
+    "XIAOMI_TOKEN_PLAN_CN_API_KEY",
+    "XIAOMI_TOKEN_PLAN_SGP_API_KEY",
+    "ZAI_API_KEY",
+    "ZAI_CODING_CN_API_KEY",
+];
+export function scrubForeignProviderEnv() {
+    for (const key of FOREIGN_PROVIDER_ENV_KEYS) {
+        delete process.env[key];
+    }
+}
 /** 把各端点密钥放进环境(TUI 直接 process.env;web 传给子进程)。 */
 export function endpointKeyEnv() {
     const env = {};

package/dist/api.d.ts

@@ -14,6 +14,22 @@ export interface MeResponse {
     remaining_usd: number;
     /** USD→默认模型 Token 折算率;老网关没有该字段,展示时需兜底回 $ */
     tokens_per_usd?: number;
+    /** 用量包(新网关);老网关没有该字段,展示时退回 daily_free_* 旧口径 */
+    packages?: MePackage[];
+    /** 可领取的免费包:'first' 首月包 / 'renew' 年度包 / null 已有生效中的 */
+    free_claim?: "first" | "renew" | null;
+}
+export interface MePackage {
+    id: number;
+    kind: string;
+    scope: string;
+    daily_tokens: number | null;
+    total_tokens: number | null;
+    used_today: number;
+    used_tokens: number;
+    remaining: number;
+    expires_at: string | null;
+    note: string | null;
 }
 export interface ApiModel {
     id: string;

package/dist/config.js

@@ -58,7 +58,7 @@ export const MODELS = [
         contextWindow: 1_048_576,
         maxTokens: 384_000,
         cost: { input: 0.14, output: 0.28, cacheRead: 0, cacheWrite: 0 },
-        note: "默认 · 每日 $2 免费,日常写代码首选",
+        note: "默认 · 免费用量包额度内免费,日常写代码首选",
     },
     {
         id: "x-ai/grok-4.6",

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process";
 import { writeFileSync } from "node:fs";
-import { cleanupBrandThemes, endpointKeyEnv, endpointProviderEntry, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, toProviderModels, writeWebToolsExtension, } from "./agent-setup.js";
+import { cleanupBrandThemes, endpointKeyEnv, endpointProviderEntry, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, scrubForeignProviderEnv, toProviderModels, writeWebToolsExtension, } from "./agent-setup.js";
 import { printConsoleBanner } from "./brand.js";
 import { agentDir, apiModelToDef, CUSTOM_ENDPOINTS, isPortableInstall, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, readSettings, refValid, resolvePreferredModel, setModelsFromApi, VERSION, } from "./config.js";
 import { ensureSearchTools } from "./search-tools.js";
@@ -145,6 +145,8 @@ async function runAgent(cfg, args) {
     process.env["U1S1_TOOLS_VIA_EXTENSION"] = "1";
     // 自定义端点的密钥走环境变量引用(models.json 里只有 $VAR,不落明文)
     Object.assign(process.env, endpointKeyEnv());
+    // 剔掉环境里的其他厂商密钥,/model 只展示 u1s1 官方模型 + 自定义端点
+    scrubForeignProviderEnv();
     // hide pi's own "Run pi update" banner; users should run `u1s1 update` instead
     process.env["PI_SKIP_VERSION_CHECK"] = "1";
     await searchToolsReady;

package/dist/login.js

@@ -74,7 +74,7 @@ async function promptForKey() {
         process.exit(1);
     }
     console.log("  需要一把 API Key(免费):");
-    console.log(`  1. 打开 ${DASHBOARD_URL} 注册/登录(30 秒,DeepSeek 每天免费 $2)`);
+    console.log(`  1. 打开 ${DASHBOARD_URL} 注册/登录(30 秒,注册领免费用量包:首月每天 1 亿 Token)`);
     console.log("  2. 复制你的 API Key,粘贴到下面");
     console.log("");
     tryOpenBrowser(DASHBOARD_URL);
@@ -91,7 +91,7 @@ export async function login(keyArg) {
         const origin = apiOrigin(cfg);
         const start = await startDeviceLogin(origin);
         if (start) {
-            console.log("  用浏览器登录(DeepSeek 每天免费 $2):");
+            console.log("  用浏览器登录(注册领免费用量包,首月每天 1 亿 Token):");
             console.log("");
             console.log(`      ${start.verify_url}`);
             console.log("");
@@ -119,7 +119,29 @@ export async function login(keyArg) {
         process.exit(1);
     });
     saveConfig(next);
-    console.log(`  ✓ 登录成功${me.email ? `(${me.email})` : ""},今日免费还剩 $${me.daily_free_remaining_usd},永久余额 $${me.remaining_usd}。`);
+    const tpu = me.tokens_per_usd ?? 0;
+    let quotaNote;
+    if (me.free_claim) {
+        // 新网关且免费包可领/可续,登录成功时顺手提醒
+        quotaNote =
+            me.free_claim === "first"
+                ? "免费用量包还没领,去 https://u1s1.io/dashboard 点「领取」(首月每天 1 亿 Token)"
+                : "免费用量包到期了,去 https://u1s1.io/dashboard 续领(每天 5000 万 Token)";
+    }
+    else if (tpu > 0) {
+        const tok = (usd) => {
+            const t = usd * tpu;
+            if (t >= 1e8)
+                return `${Math.round((t / 1e8) * 10) / 10} 亿`;
+            return `${Math.round(t / 1e4).toLocaleString("en-US")} 万`;
+        };
+        quotaNote = `今日免费还剩约 ${tok(me.daily_free_remaining_usd)} Token`;
+    }
+    else {
+        // 老网关:没有 tokens_per_usd,退回金额显示
+        quotaNote = `今日免费还剩 $${me.daily_free_remaining_usd},永久余额 $${me.remaining_usd}`;
+    }
+    console.log(`  ✓ 登录成功${me.email ? `(${me.email})` : ""},${quotaNote}。`);
     return next;
 }
 /** Returns a config that definitely has an apiKey, prompting the user if needed. */

package/dist/update.js

@@ -1,5 +1,8 @@
-import { execSync } from "node:child_process";
+import { execSync, spawn } from "node:child_process";
+import { mkdtempSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { isPortableInstall } from "./config.js";
 const require = createRequire(import.meta.url);
 const pkg = require("../package.json");
@@ -49,6 +52,55 @@ export function compareVersions(a, b) {
     }
     return 0;
 }
+/**
+ * 便携版原地升级:下载官网安装脚本并替用户执行,整包替换安装目录。
+ *
+ * - Linux/macOS:同进程跑 bash 安装脚本。替换正在运行的文件在 unix 上安全
+ *   (旧 inode 继续存活到进程退出)。
+ * - Windows:正在运行的 node.exe 锁着自己,同进程装不了 —— 弹一个新的
+ *   PowerShell 窗口跑 install.ps1(脚本会先结束安装目录里残留的 node 进程,
+ *   包括本进程,属预期),本进程立刻退出把文件锁让出来。
+ */
+async function portableSelfUpdate(latest) {
+    if (process.platform === "win32") {
+        console.log(`正在打开更新窗口(升级到 v${latest})…`);
+        console.log("更新在新窗口里进行,本窗口会退出;装完后重新打开终端运行 u1s1 即可。");
+        // 命令写进临时 .ps1 再 start,避开 cmd/start 对内联命令的引号地狱;
+        // start 的第一个引号参数是窗口标题,必须占位,否则带空格的路径会被吞掉
+        const tmp = join(mkdtempSync(join(tmpdir(), "u1s1-update-")), "update.ps1");
+        writeFileSync(tmp, "irm https://u1s1.io/releases/install.ps1 | iex\n");
+        const child = spawn("cmd.exe", ["/c", "start", "u1s1", "powershell", "-NoProfile", "-ExecutionPolicy", "Bypass", "-NoExit", "-File", tmp], { detached: true, stdio: "ignore" });
+        child.unref();
+        // 立刻退出释放 node.exe 的文件锁,让安装器能替换安装目录
+        process.exit(0);
+    }
+    console.log(`正在下载安装脚本并升级到 v${latest}…`);
+    let script;
+    try {
+        const res = await fetch("https://u1s1.io/releases/install.sh", {
+            signal: AbortSignal.timeout(30_000),
+        });
+        if (!res.ok)
+            throw new Error(`HTTP ${res.status}`);
+        script = await res.text();
+    }
+    catch {
+        console.error("安装脚本下载失败。请手动运行:");
+        console.error("  curl -fsSL https://u1s1.io/releases/install.sh | bash");
+        process.exit(1);
+    }
+    const tmp = join(mkdtempSync(join(tmpdir(), "u1s1-update-")), "install.sh");
+    writeFileSync(tmp, script, { mode: 0o755 });
+    try {
+        execSync(`bash ${JSON.stringify(tmp)}`, { stdio: "inherit" });
+        console.log(`\n✅ 已升级到 v${latest},重新运行 u1s1 生效。`);
+    }
+    catch {
+        console.error("\n自动升级失败。请手动运行:");
+        console.error("  curl -fsSL https://u1s1.io/releases/install.sh | bash");
+        process.exit(1);
+    }
+}
 export async function update() {
     console.log("正在检查更新…");
     const latest = await getLatestVersion();
@@ -62,15 +114,9 @@ export async function update() {
     }
     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");
+        await portableSelfUpdate(latest);
         return;
     }
     const pm = detectPackageManager();

package/dist/usage.js

@@ -35,6 +35,46 @@ export async function usage() {
     const tpu = me.tokens_per_usd ?? 0;
     console.log("");
     console.log(`  账号       ${me.email ?? "(未绑定邮箱)"}`);
+    if (me.packages) {
+        // 新网关:按用量包逐个展示,token 原生数字
+        const PKG_LABEL = {
+            free_first: "首月免费包",
+            free_yearly: "年度免费包",
+            invite: "邀请赠送",
+            topup_daily: "每日加量包",
+            admin_grant: "官方赠送",
+        };
+        if (me.packages.length === 0)
+            console.log("  用量包     (无生效中的用量包)");
+        for (const p of me.packages) {
+            const daily = p.daily_tokens != null;
+            const total = daily ? (p.daily_tokens ?? 0) : (p.total_tokens ?? 0);
+            const ratio = total > 0 ? p.remaining / total : 0;
+            const label = (PKG_LABEL[p.kind] ?? p.kind).padEnd(5, "　");
+            const per = daily ? "/天" : "";
+            console.log(`  ${label} 还剩 ${fmtTokensCn(p.remaining)} / ${fmtTokensCn(total)}${per}  ${bar(ratio)}`);
+            const scopeNote = p.scope === "free" ? "仅默认模型和搜索 · 0 点恢复" : "全模型可用";
+            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}`;
+            console.log(`  余额(按量) ${balText}`);
+        }
+        console.log(`  本月已用   约 ${tpu > 0 ? `${fmtTokensCn(me.mtd_usd * tpu)} Token` : ""}($${me.mtd_usd.toFixed(2)})`);
+        console.log("");
+        if (me.free_claim === "first") {
+            console.log("  → 你有免费用量包没领:首月每天 1 亿 Token,去 https://u1s1.io/dashboard 点「领取」");
+        }
+        else if (me.free_claim === "renew") {
+            console.log("  → 免费用量包到期了,去 https://u1s1.io/dashboard 续领:每天 5000 万 Token,一年有效");
+        }
+        else {
+            console.log("  免费包每天 0 点恢复;邀请朋友双方各得一次性 1 亿 Token 包 → https://u1s1.io/dashboard");
+        }
+        console.log("  Token 数按默认模型单价折算,为约数;用更贵的模型时消耗更快。");
+        console.log("");
+        return;
+    }
     if (tpu > 0) {
         const tok = (usd) => `${fmtTokensCn(usd * tpu)} Token`;
         console.log(`  今日免费   还剩 ${fmtTokensCn(freeRemain * tpu)} / ${tok(freeTotal)}  ${bar(freeRatio)}`);

package/dist/web.js

@@ -2,7 +2,7 @@ import { spawn, spawnSync } from "node:child_process";
 import { mkdirSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
-import { cleanupBrandThemes, endpointKeyEnv, ensureAuthCredential, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, writeWebToolsExtension, } from "./agent-setup.js";
+import { cleanupBrandThemes, endpointKeyEnv, ensureAuthCredential, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, scrubForeignProviderEnv, writeWebToolsExtension, } from "./agent-setup.js";
 import { agentDir, apiModelToDef, resolvePreferredModel, setModelsFromApi, u1s1Dir, writeAgentDefaultModel, } from "./config.js";
 import { ensureSearchTools } from "./search-tools.js";
 import { applyWebUiBranding, applyWebUiFrontend } from "./webui-brand.js";
@@ -49,6 +49,8 @@ export async function prepareWebEnv(cfg) {
     writeAgentDefaultModel(pref.provider, pref.id);
     const dataDir = join(u1s1Dir, "web");
     mkdirSync(dataDir, { recursive: true });
+    // web 子进程按 {...process.env, ...返回值} 起,这里剔掉即对子进程生效
+    scrubForeignProviderEnv();
     await searchToolsReady;
     return {
         PI_CODING_AGENT_DIR: agentDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "0.12.1",
+  "version": "0.13.1",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {
@@ -47,8 +47,8 @@
     "pi-web-ui": "0.26.0"
   },
   "devDependencies": {
-    "@types/node": "^22.15.0",
-    "tsx": "^4.20.0",
-    "typescript": "^5.9.2"
+    "@types/node": "^22.20.1",
+    "tsx": "^4.23.12",
+    "typescript": "^5.9.3"
   }
 }