u1s1-cli 0.13.3 → 0.13.5

package/dist/agent-setup.d.ts

@@ -1,6 +1,7 @@
 import { type CliConfig, type CustomEndpoint, type ModelDef } from "./config.js";
+import type { ShellDoctorResult } from "./shell-doctor.js";
 /** pi auto-appends <agentDir>/APPEND_SYSTEM.md to its system prompt — our branding hook. */
-export declare function ensureBrandPrompt(): void;
+export declare function ensureBrandPrompt(shell: ShellDoctorResult): void;
 /** Defaults that don't overwrite values the user already set. */
 export declare function ensureDefaultSettings(): void;
 /** ≤0.4.0 wrote u1s1-dark/u1s1-light into the pi themes dir; remove them. */

package/dist/agent-setup.js

@@ -10,12 +10,44 @@ const BRAND_APPEND = `## u1s1
 - 改动前先说明打算做什么,改完用一两句话总结改了哪里。
 - 用户描述模糊时,先猜最可能的意图并确认,不要长篇追问。
 `;
+const EXEC_RULES = `
+## 命令执行
+
+- 能用 bash 工具执行的命令,自己执行并展示输出,不要让用户手动执行。
+- 只有需要管理员权限、交互式输入(登录、装系统组件等),或必须开新终端窗口的操作,才让用户执行,并给出可直接粘贴的完整命令。
+`;
+/**
+ * pi 的系统提示不含任何 OS/平台信息,模型只能拿 uname 之类盲探,Windows 上
+ * 第一步就撞墙。这里按 shell 体检结果告诉模型:系统是什么、命令实际跑在哪、
+ * 坏了该怎么引导用户修(而不是反复重试)。
+ */
+function envSection(shell) {
+    if (shell.status === "posix") {
+        return `\n## 运行环境\n\n- 操作系统: ${process.platform === "darwin" ? "macOS" : "Linux"}。\n`;
+    }
+    const lines = ["", "## 运行环境", "", "- 操作系统: Windows。环境信息以本节为准,不要用 uname 探测。"];
+    switch (shell.status) {
+        case "bash":
+            lines.push(`- 命令通过 bash 执行(${shell.shellPath}),ls/grep/curl 等 POSIX 工具可用。`, '- 查 Windows 原生信息或调 Windows 程序,用 cmd.exe /c "..." 或 powershell.exe -NoProfile -Command "..."。', "- 默认在 Windows 本机干活;只有用户要求或任务确实需要 Linux 时才考虑 WSL。");
+            break;
+        case "wsl":
+            lines.push("- 注意:命令通过 WSL 的 bash 执行,实际跑在 Linux 发行版里,不是 Windows 本机。", "- 访问 Windows 文件用 /mnt/c/... 路径;调 Windows 程序用带 .exe 的名字(cmd.exe、powershell.exe)。", "- 适时提醒用户:安装 Git for Windows(PowerShell 运行 winget install --id Git.Git)并重启 u1s1,命令就能回到 Windows 本机执行。");
+            break;
+        case "none":
+            lines.push("- 严重:当前没有可用的 bash,bash 工具执行任何命令都会立刻失败,反复重试没有意义。", "- 第一要务是引导用户修复:让用户在 PowerShell 运行 winget install --id Git.Git 安装 Git for Windows,装完重启 u1s1。", "- 修复之前只用读写文件等其他工具帮用户。");
+            break;
+        case "unknown":
+            break;
+    }
+    return lines.join("\n") + "\n";
+}
 /** pi auto-appends <agentDir>/APPEND_SYSTEM.md to its system prompt — our branding hook. */
-export function ensureBrandPrompt() {
+export function ensureBrandPrompt(shell) {
     mkdirSync(agentDir, { recursive: true });
+    const content = BRAND_APPEND + envSection(shell) + EXEC_RULES;
     const p = join(agentDir, "APPEND_SYSTEM.md");
-    if (!existsSync(p) || readFileSync(p, "utf8") !== BRAND_APPEND) {
-        writeFileSync(p, BRAND_APPEND);
+    if (!existsSync(p) || readFileSync(p, "utf8") !== content) {
+        writeFileSync(p, content);
     }
 }
 /** Defaults that don't overwrite values the user already set. */

package/dist/index.js

@@ -5,6 +5,7 @@ import { cleanupBrandThemes, endpointKeyEnv, endpointProviderEntry, ensureBrandP
 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";
+import { ensureUsableShell } from "./shell-doctor.js";
 import { applyBrandUi, setUpdateNotice } from "./style.js";
 import { offerStarterTemplates } from "./templates.js";
 import { fetchModels, loadCustomEndpoints } from "./api.js";
@@ -133,7 +134,7 @@ function ensureTmuxKeyboardProtocol() {
 }
 async function runAgent(cfg, args) {
     cleanupBrandThemes();
-    ensureBrandPrompt();
+    ensureBrandPrompt(ensureUsableShell());
     ensureDefaultSettings();
     // 预 seed fd/rg(国内直连 GitHub 不通,pi 自己下不动);与取模型列表并行,
     // 但必须在进 pi 之前就位,否则 pi 会自己去 GitHub 下载

package/dist/shell-doctor.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Windows shell 体检。pi 的 shell 兜底顺序是 Program Files 的 Git Bash →
+ * PATH 上第一个 bash.exe,后者经常命中 System32 的 WSL 转发器:默认发行版
+ * 没有 /bin/bash 时(装过 Docker Desktop 的机器把 docker-desktop 当默认很
+ * 常见),所有命令 0.1s 内失败,stderr 还是 UTF-16 乱码,模型只能干瞪眼。
+ * 这里在进 pi 之前把一个「验过活」的 bash 写进 settings.json 的 shellPath;
+ * 找不到就当场把修复指引打给用户,并让品牌 prompt 告知模型别撞墙。
+ */
+export type ShellDoctorResult = {
+    status: "posix";
+} | {
+    status: "bash";
+    shellPath: string;
+} | {
+    status: "wsl";
+    shellPath: string;
+} | {
+    status: "none";
+} | {
+    status: "unknown";
+};
+export declare function ensureUsableShell(): ShellDoctorResult;

package/dist/shell-doctor.js

@@ -0,0 +1,129 @@
+import { spawnSync } from "node:child_process";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { agentDir, agentSettingsFile } from "./config.js";
+/** System32/Sysnative 的 bash.exe 是 WSL 转发器,不是真 bash(与 pi 同款判断)。 */
+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,
+        });
+        // 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 [];
+    }
+}
+/**
+ * Git Bash 候选位置:pi 只认 Program Files 两处,漏掉 winget 默认的用户级
+ * 安装(%LOCALAPPDATA%\Programs\Git)和 scoop;再从 git.exe 反推兜住
+ * portable 安装。只返回磁盘上真实存在的路径。
+ */
+function candidateGitBashPaths() {
+    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"],
+        ["USERPROFILE", "scoop", "apps", "git", "current", "bin", "bash.exe"],
+    ]) {
+        const base = process.env[envKey];
+        if (base)
+            add(join(base, ...rest));
+    }
+    // git.exe 在 <root>\cmd、<root>\bin 或 <root>\mingw64\bin 下,向上找 root
+    for (const gitPath of 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"));
+        }
+    }
+    return out.filter((p) => existsSync(p));
+}
+export function ensureUsableShell() {
+    if (process.platform !== "win32")
+        return { status: "posix" };
+    mkdirSync(agentDir, { recursive: true });
+    let settings = {};
+    if (existsSync(agentSettingsFile)) {
+        try {
+            settings = JSON.parse(readFileSync(agentSettingsFile, "utf8"));
+        }
+        catch {
+            return { status: "unknown" }; // 不动损坏的文件,pi 启动时会自己报
+        }
+    }
+    // 已配置且文件还在:信它,不每次启动都探活(坏了 pi 会在会话里报错)
+    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}`);
+            }
+            return { status: "bash", shellPath: candidate };
+        }
+    }
+    // 没有 Git Bash:看 PATH 上还有什么(与 pi 的兜底一致,但这里要验活)
+    const fallback = runWhere("bash.exe").find((p) => existsSync(p));
+    if (fallback && bashWorks(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。");
+            return { status: "wsl", shellPath: fallback };
+        }
+        settings["shellPath"] = fallback;
+        writeFileSync(agentSettingsFile, JSON.stringify(settings, null, 2) + "\n");
+        return { status: "bash", shellPath: fallback };
+    }
+    if (fallback) {
+        console.error(`  ⚠ 检测到的 bash(${fallback})无法执行命令,u1s1 的命令工具会全部失败。`);
+        if (isWslRelayBash(fallback)) {
+            console.error("    它是 WSL 转发器,当前默认发行版里没有 /bin/bash(docker-desktop 被设为默认时就会这样)。");
+        }
+    }
+    else {
+        console.error("  ⚠ 没找到 bash,u1s1 无法执行命令。");
+    }
+    console.error("    修复:PowerShell 里运行 winget install --id Git.Git 安装 Git for Windows,装完重启 u1s1。");
+    return { status: "none" };
+}

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/web.js

@@ -5,6 +5,7 @@ import { dirname, join } from "node:path";
 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 { ensureUsableShell } from "./shell-doctor.js";
 import { applyWebUiBranding, applyWebUiFrontend } from "./webui-brand.js";
 import { fetchModels, loadCustomEndpoints } from "./api.js";
 const require = createRequire(import.meta.url);
@@ -20,7 +21,7 @@ const require = createRequire(import.meta.url);
  */
 export async function prepareWebEnv(cfg) {
     cleanupBrandThemes();
-    ensureBrandPrompt();
+    ensureBrandPrompt(ensureUsableShell());
     ensureDefaultSettings();
     // 网页版/App 的 agent 会话同样依赖 fd/rg(同一个 agentDir);与取模型列表并行
     const searchToolsReady = ensureSearchTools(cfg);

package/package.json

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