u1s1-cli 0.13.4 → 0.13.6

package/dist/index.js

@@ -134,8 +134,10 @@ function ensureTmuxKeyboardProtocol() {
 }
 async function runAgent(cfg, args) {
     cleanupBrandThemes();
-    ensureBrandPrompt(ensureUsableShell());
     ensureDefaultSettings();
+    // Windows shell 体检异步先行,与取模型列表/搜索工具下载并行;首启验活
+    // (Defender 首扫 bash.exe 可达秒级)藏进网络等待,进 pi 前再 await
+    const shellReady = ensureUsableShell();
     // 预 seed fd/rg(国内直连 GitHub 不通,pi 自己下不动);与取模型列表并行,
     // 但必须在进 pi 之前就位,否则 pi 会自己去 GitHub 下载
     const searchToolsReady = ensureSearchTools(cfg);
@@ -153,6 +155,7 @@ async function runAgent(cfg, args) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
     }
     await endpointsReady;
+    ensureBrandPrompt(await shellReady);
     ensureProviderModels(cfg);
     // 联网工具经 agentDir/extensions 投影,TUI 和 u1s1 web 共用一份注册
     writeWebToolsExtension(cfg, webSearchEnabled);

package/dist/login.js

@@ -126,7 +126,7 @@ export async function login(keyArg) {
         quotaNote =
             me.free_claim === "first"
                 ? "免费用量包还没领,去 https://u1s1.io/dashboard 点「领取」(首月每天 1 亿 Token)"
-                : "免费用量包到期了,去 https://u1s1.io/dashboard 续领(每天 5000 万 Token)";
+                : "免费用量包到期了,去 https://u1s1.io/dashboard 续领(每天 3000 万 Token)";
     }
     else if (tpu > 0) {
         const tok = (usd) => {

package/dist/shell-doctor.d.ts

@@ -5,6 +5,10 @@
  * 常见),所有命令 0.1s 内失败,stderr 还是 UTF-16 乱码,模型只能干瞪眼。
  * 这里在进 pi 之前把一个「验过活」的 bash 写进 settings.json 的 shellPath;
  * 找不到就当场把修复指引打给用户,并让品牌 prompt 告知模型别撞墙。
+ *
+ * 整个探测是异步的:调用方先拿 Promise 与拉模型列表等网络请求并行,进 pi 前
+ * 再 await——首启的 where/验活成本(Defender 首扫 bash.exe 可达秒级)藏进
+ * 网络等待里。验活结果持久化到 shellPath,之后每次启动只花 existsSync。
  */
 export type ShellDoctorResult = {
     status: "posix";
@@ -19,4 +23,4 @@ export type ShellDoctorResult = {
 } | {
     status: "unknown";
 };
-export declare function ensureUsableShell(): ShellDoctorResult;
+export declare function ensureUsableShell(): Promise<ShellDoctorResult>;

package/dist/shell-doctor.js

@@ -1,4 +1,4 @@
-import { spawnSync } from "node:child_process";
+import { spawn } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { agentDir, agentSettingsFile } from "./config.js";
@@ -7,70 +7,125 @@ function isWslRelayBash(p) {
     const normalized = p.replace(/\//g, "\\").toLowerCase();
     return /^[a-z]:\\windows\\(?:system32|sysnative)\\bash\.exe$/.test(normalized);
 }
-/** 真跑一条 echo 验活。WSL 转发器不支持 -c 传参(pi 对它走 stdin),探活同款。 */
-function bashWorks(bashPath) {
-    const viaStdin = isWslRelayBash(bashPath);
-    try {
-        const res = spawnSync(bashPath, viaStdin ? ["-s"] : ["-c", "echo u1s1-shell-ok"], {
-            input: viaStdin ? "echo u1s1-shell-ok\n" : undefined,
-            encoding: "utf-8",
-            timeout: 5000,
-            windowsHide: true,
+/** 异步跑子进程收 stdout;超时杀掉。任何失败都归为 ok=false,不抛。 */
+function runCapture(cmd, args, opts) {
+    return new Promise((resolve) => {
+        let done = false;
+        let timer;
+        const finish = (ok, stdout) => {
+            if (done)
+                return;
+            done = true;
+            if (timer)
+                clearTimeout(timer);
+            resolve({ ok, stdout });
+        };
+        let child;
+        try {
+            child = spawn(cmd, args, { windowsHide: true, stdio: ["pipe", "pipe", "ignore"] });
+        }
+        catch {
+            finish(false, "");
+            return;
+        }
+        timer = setTimeout(() => {
+            try {
+                child.kill();
+            }
+            catch {
+                // 已退出
+            }
+            finish(false, "");
+        }, opts.timeoutMs);
+        let out = "";
+        child.stdout?.on("data", (d) => {
+            out += d.toString("utf8");
+            if (out.length > 65536)
+                out = out.slice(-65536);
         });
-        // WSL 转发器可能按 UTF-16LE 输出(ASCII 字符间夹 NUL),剔掉再找标记
-        return res.status === 0 && (res.stdout ?? "").replace(/\u0000/g, "").includes("u1s1-shell-ok");
-    }
-    catch {
-        return false;
-    }
-}
-function runWhere(name) {
-    try {
-        const res = spawnSync("where", [name], { encoding: "utf-8", timeout: 5000, windowsHide: true });
-        if (res.status !== 0 || !res.stdout)
-            return [];
-        return res.stdout
-            .trim()
-            .split(/\r?\n/)
-            .map((l) => l.trim())
-            .filter(Boolean);
-    }
-    catch {
-        return [];
-    }
+        child.on("error", () => finish(false, out));
+        child.on("close", (code) => finish(code === 0, out));
+        child.stdin?.on("error", () => { });
+        child.stdin?.end(opts.input ?? "");
+    });
 }
 /**
- * Git Bash 候选位置:pi 只认 Program Files 两处,漏掉 winget 默认的用户级
- * 安装(%LOCALAPPDATA%\Programs\Git)和 scoop;再从 git.exe 反推兜住
- * portable 安装。只返回磁盘上真实存在的路径。
+ * 真跑一条 echo 验活。WSL 转发器不支持 -c 传参(pi 对它走 stdin),探活同款;
+ * WSL 冷启动一个发行版可能要好几秒,超时放宽——真坏的 WSL(缺 /bin/bash)
+ * 是瞬间失败,不会吃满超时。
  */
-function candidateGitBashPaths() {
+async function bashWorks(bashPath) {
+    const viaStdin = isWslRelayBash(bashPath);
+    const res = await runCapture(bashPath, viaStdin ? ["-s"] : ["-c", "echo u1s1-shell-ok"], {
+        input: viaStdin ? "echo u1s1-shell-ok\n" : undefined,
+        timeoutMs: viaStdin ? 10_000 : 5_000,
+    });
+    // WSL 转发器可能按 UTF-16LE 输出(ASCII 字符间夹 NUL),剔掉再找标记
+    return res.ok && res.stdout.replace(/\u0000/g, "").includes("u1s1-shell-ok");
+}
+async function runWhere(name) {
+    const res = await runCapture("where", [name], { timeoutMs: 5_000 });
+    if (!res.ok)
+        return [];
+    return res.stdout
+        .trim()
+        .split(/\r?\n/)
+        .map((l) => l.trim())
+        .filter(Boolean);
+}
+/** 快路径候选:环境变量推得出的固定安装位置,只花 existsSync,零进程开销。 */
+function knownGitBashPaths() {
     const out = [];
-    const add = (p) => {
-        if (!out.includes(p))
-            out.push(p);
-    };
     for (const [envKey, ...rest] of [
         ["ProgramFiles", "Git", "bin", "bash.exe"],
         ["ProgramFiles(x86)", "Git", "bin", "bash.exe"],
-        ["LOCALAPPDATA", "Programs", "Git", "bin", "bash.exe"],
+        ["LOCALAPPDATA", "Programs", "Git", "bin", "bash.exe"], // winget 用户级默认位置
         ["USERPROFILE", "scoop", "apps", "git", "current", "bin", "bash.exe"],
     ]) {
         const base = process.env[envKey];
-        if (base)
-            add(join(base, ...rest));
+        if (!base)
+            continue;
+        const p = join(base, ...rest);
+        if (!out.includes(p) && existsSync(p))
+            out.push(p);
     }
+    return out;
+}
+/** 慢路径候选:where git.exe 反推安装根,兜住 portable 等非常规安装。 */
+async function discoveredGitBashPaths(skip) {
+    const out = [];
     // git.exe 在 <root>\cmd、<root>\bin 或 <root>\mingw64\bin 下,向上找 root
-    for (const gitPath of runWhere("git.exe")) {
+    for (const gitPath of await runWhere("git.exe")) {
         const dir = dirname(gitPath);
         for (const root of [dirname(dir), dirname(dirname(dir))]) {
-            add(join(root, "bin", "bash.exe"));
-            add(join(root, "usr", "bin", "bash.exe"));
+            for (const p of [join(root, "bin", "bash.exe"), join(root, "usr", "bin", "bash.exe")]) {
+                if (!out.includes(p) && !skip.includes(p) && existsSync(p))
+                    out.push(p);
+            }
         }
     }
-    return out.filter((p) => existsSync(p));
+    return out;
 }
-export function ensureUsableShell() {
+/** 持久化写 settings.json:写入时现读现改,避免覆盖并行流程刚写的其他键。 */
+function persistShellPath(p) {
+    let settings = {};
+    if (existsSync(agentSettingsFile)) {
+        try {
+            settings = JSON.parse(readFileSync(agentSettingsFile, "utf8"));
+        }
+        catch {
+            return false; // 不动损坏的文件
+        }
+    }
+    settings["shellPath"] = p;
+    writeFileSync(agentSettingsFile, JSON.stringify(settings, null, 2) + "\n");
+    return true;
+}
+function adviseInstallGitBash() {
+    console.error("  ⚠ 未找到 Git Bash,将使用 WSL 的 bash:命令会在 WSL 的 Linux 里执行,不是 Windows 本机。");
+    console.error("    建议安装 Git for Windows(PowerShell 运行: winget install --id Git.Git)后重启 u1s1。");
+}
+export async function ensureUsableShell() {
     if (process.platform !== "win32")
         return { status: "posix" };
     mkdirSync(agentDir, { recursive: true });
@@ -83,36 +138,50 @@ export function ensureUsableShell() {
             return { status: "unknown" }; // 不动损坏的文件,pi 启动时会自己报
         }
     }
-    // 已配置且文件还在:信它,不每次启动都探活(坏了 pi 会在会话里报错)
+    // 已配置且文件还在:信它,不每次启动都探活(坏了 pi 会在会话里报错)。
+    // 配置的是 WSL 转发器时,零成本看一眼 Git Bash 是否新装了,装了就换轨。
     const configured = settings["shellPath"];
     if (typeof configured === "string" && configured && existsSync(configured)) {
-        return isWslRelayBash(configured)
-            ? { status: "wsl", shellPath: configured }
-            : { status: "bash", shellPath: configured };
-    }
-    // shellPath 缺失或指向已卸载的文件:探测 + 验活,找到就固定下来
-    for (const candidate of candidateGitBashPaths()) {
-        if (bashWorks(candidate)) {
-            settings["shellPath"] = candidate;
-            writeFileSync(agentSettingsFile, JSON.stringify(settings, null, 2) + "\n");
-            if (typeof configured === "string") {
-                console.error(`  原 shellPath 已失效,自动改用: ${candidate}`);
+        if (!isWslRelayBash(configured))
+            return { status: "bash", shellPath: configured };
+        for (const candidate of knownGitBashPaths()) {
+            if (await bashWorks(candidate)) {
+                persistShellPath(candidate);
+                console.error(`  检测到 Git Bash,命令改回 Windows 本机执行: ${candidate}`);
+                return { status: "bash", shellPath: candidate };
             }
-            return { status: "bash", shellPath: candidate };
         }
+        adviseInstallGitBash();
+        return { status: "wsl", shellPath: configured };
+    }
+    // shellPath 缺失或指向已卸载的文件:探测 + 验活,找到就固定下来。
+    // 先试零开销的固定位置,全灭才花 where git.exe 找非常规安装。
+    const adopt = (candidate) => {
+        persistShellPath(candidate);
+        if (typeof configured === "string") {
+            console.error(`  原 shellPath 已失效,自动改用: ${candidate}`);
+        }
+        return { status: "bash", shellPath: candidate };
+    };
+    const known = knownGitBashPaths();
+    for (const candidate of known) {
+        if (await bashWorks(candidate))
+            return adopt(candidate);
+    }
+    for (const candidate of await discoveredGitBashPaths(known)) {
+        if (await bashWorks(candidate))
+            return adopt(candidate);
     }
     // 没有 Git Bash:看 PATH 上还有什么(与 pi 的兜底一致,但这里要验活)
-    const fallback = runWhere("bash.exe").find((p) => existsSync(p));
-    if (fallback && bashWorks(fallback)) {
+    const fallback = (await runWhere("bash.exe")).find((p) => existsSync(p));
+    if (fallback && (await bashWorks(fallback))) {
+        // WSL 转发器也持久化:冷启 WSL 验活要好几秒,不能每次启动都付。装了
+        // Git Bash 后的换轨由上面的 configured-WSL 分支负责(零成本 existsSync)。
+        persistShellPath(fallback);
         if (isWslRelayBash(fallback)) {
-            // 能用但跑在 Linux 里。不写进 settings:一旦用户装了 Git Bash,
-            // 下次启动就能自动切回 Windows 本机执行。
-            console.error("  ⚠ 未找到 Git Bash,将使用 WSL 的 bash:命令会在 WSL 的 Linux 里执行,不是 Windows 本机。");
-            console.error("    建议安装 Git for Windows(PowerShell 运行: winget install --id Git.Git)后重启 u1s1。");
+            adviseInstallGitBash();
             return { status: "wsl", shellPath: fallback };
         }
-        settings["shellPath"] = fallback;
-        writeFileSync(agentSettingsFile, JSON.stringify(settings, null, 2) + "\n");
         return { status: "bash", shellPath: fallback };
     }
     if (fallback) {

package/dist/update.js

@@ -1,4 +1,4 @@
-import { execSync, spawn } from "node:child_process";
+import { execSync, spawnSync } from "node:child_process";
 import { mkdtempSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
@@ -65,14 +65,25 @@ async function portableSelfUpdate(latest) {
     if (process.platform === "win32") {
         console.log(`正在打开更新窗口(升级到 v${latest})…`);
         console.log("更新在新窗口里进行,本窗口会退出;装完后重新打开终端运行 u1s1 即可。");
+        console.log("若新窗口没有出现,可手动在 PowerShell 运行: irm https://u1s1.io/releases/install.ps1 | iex");
         // 不走 `cmd /c start`:start 只把**带引号**的首参当窗口标题,而 node 对
-        // 无空格参数不加引号,标题会被当成命令执行(0.13.1 翻车现场)。node 在
-        // Windows 上 detached + stdio ignore 的子进程自带新控制台,直接 spawn
-        // powershell 即可,参数按 Win32 规则原样传递,没有二次解析。
-        const tmp = join(mkdtempSync(join(tmpdir(), "u1s1-update-")), "update.ps1");
-        writeFileSync(tmp, "irm https://u1s1.io/releases/install.ps1 | iex\n");
-        const child = spawn("powershell.exe", ["-NoProfile", "-ExecutionPolicy", "Bypass", "-NoExit", "-File", tmp], { detached: true, stdio: "ignore" });
-        child.unref();
+        // 无空格参数不加引号,标题会被当成命令执行(0.13.1 翻车现场)。也不走
+        // spawn detached:Windows 上 detached 是 DETACHED_PROCESS——子进程**没有**
+        // 控制台,窗口根本不出现,0.13.2-0.13.4 的更新其实在隐形 powershell 里
+        // 跑完的(当时的注释把这个标志理解反了)。可靠开窗走 ShellExecute 语义:
+        // 同步跑一个无窗 launcher,由它 Start-Process 弹真窗口(ShellExecute 出的
+        // 进程完全独立,不随本进程退出)。路径经 $PSScriptRoot 传递,不往命令行
+        // 拼字符串,没有引号二次解析问题。
+        const dir = mkdtempSync(join(tmpdir(), "u1s1-update-"));
+        writeFileSync(join(dir, "update.ps1"), "irm https://u1s1.io/releases/install.ps1 | iex\n");
+        writeFileSync(join(dir, "launch.ps1"), "$inner = '-NoProfile -ExecutionPolicy Bypass -NoExit -File \"' + $PSScriptRoot + '\\update.ps1\"'\n" +
+            "Start-Process powershell -ArgumentList $inner\n");
+        const res = spawnSync("powershell.exe", ["-NoProfile", "-ExecutionPolicy", "Bypass", "-File", join(dir, "launch.ps1")], { stdio: "ignore", windowsHide: true, timeout: 30_000 });
+        if (res.error || res.status !== 0) {
+            console.error("无法拉起更新窗口。请手动在 PowerShell 里运行:");
+            console.error("  irm https://u1s1.io/releases/install.ps1 | iex");
+            process.exit(1);
+        }
         // 立刻退出释放 node.exe 的文件锁,让安装器能替换安装目录
         process.exit(0);
     }

package/dist/usage.js

@@ -66,7 +66,7 @@ export async function usage() {
             console.log("  → 你有免费用量包没领:首月每天 1 亿 Token,去 https://u1s1.io/dashboard 点「领取」");
         }
         else if (me.free_claim === "renew") {
-            console.log("  → 免费用量包到期了,去 https://u1s1.io/dashboard 续领:每天 5000 万 Token,一年有效");
+            console.log("  → 免费用量包到期了,去 https://u1s1.io/dashboard 续领:每天 3000 万 Token,一年有效");
         }
         else {
             console.log("  免费包每天 0 点恢复;邀请朋友双方各得一次性 1 亿 Token 包 → https://u1s1.io/dashboard");

package/dist/web.js

@@ -21,8 +21,9 @@ const require = createRequire(import.meta.url);
  */
 export async function prepareWebEnv(cfg) {
     cleanupBrandThemes();
-    ensureBrandPrompt(ensureUsableShell());
     ensureDefaultSettings();
+    // Windows shell 体检异步先行,与取模型列表并行,写 brand prompt 前 await
+    const shellReady = ensureUsableShell();
     // 网页版/App 的 agent 会话同样依赖 fd/rg(同一个 agentDir);与取模型列表并行
     const searchToolsReady = ensureSearchTools(cfg);
     // Fetch model list from server; fall back to built-in MODELS on error.
@@ -39,6 +40,7 @@ export async function prepareWebEnv(cfg) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
     }
     await endpointsReady;
+    ensureBrandPrompt(await shellReady);
     ensureProviderModels(cfg);
     // pi-web-ui 靠 auth.json 判断「已配置」,否则网页会弹 pi 安装引导
     ensureAuthCredential();

package/package.json

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