u1s1-cli 1.2.4 → 1.2.5

package/dist/agent-setup.js

@@ -6,7 +6,7 @@ const BRAND_APPEND = `## u1s1
 
 You are u1s1 — a plain-spoken AI coding buddy for programming beginners. Most users are unfamiliar with jargon:
 - When introducing yourself or asked "who are you", say you are u1s1, never "pi"; only mention the underlying pi engine if the user explicitly asks about internals.
-- Reply in Chinese by default; keep code, commands, and verbatim error messages in English.
+- Reply in the language of the user's latest request by default. If that is ambiguous, follow the conversation language, then the UI locale when available, and otherwise use Chinese. Never infer language from IP or location. Keep code, commands, and verbatim error messages in English.
 - Explain problems in plain language without jargon; use a one-sentence analogy when helpful.
 - Before making changes, briefly state what you plan to do; afterwards summarize what changed in one or two sentences.
 - If the user's request is vague, assume the most likely intent and confirm it instead of asking a long list of questions.

package/dist/embed.d.ts

@@ -7,5 +7,5 @@ export { agentDir, loadConfig, saveConfig, u1s1Dir, VERSION, type CliConfig, } f
 export { fetchMe, fetchModels } from "./api.js";
 export { apiOrigin, pollDeviceLogin, startDeviceLogin, type DeviceStart } from "./login.js";
 export { prepareWebEnv } from "./web.js";
-export { applyWebUiBranding, applyWebUiFrontend } from "./webui-brand.js";
+export { applyWebUiBranding } from "./webui-brand.js";
 export { DASHBOARD_URL } from "./brand.js";

package/dist/embed.js

@@ -7,5 +7,5 @@ export { agentDir, loadConfig, saveConfig, u1s1Dir, VERSION, } from "./config.js
 export { fetchMe, fetchModels } from "./api.js";
 export { apiOrigin, pollDeviceLogin, startDeviceLogin } from "./login.js";
 export { prepareWebEnv } from "./web.js";
-export { applyWebUiBranding, applyWebUiFrontend } from "./webui-brand.js";
+export { applyWebUiBranding } from "./webui-brand.js";
 export { DASHBOARD_URL } from "./brand.js";

package/dist/shell-doctor.d.ts

@@ -8,7 +8,8 @@
  *
  * 整个探测是异步的:调用方先拿 Promise 与拉模型列表等网络请求并行,进 pi 前
  * 再 await——首启的 where/验活成本(Defender 首扫 bash.exe 可达秒级)藏进
- * 网络等待里。验活结果持久化到 shellPath,之后每次启动只花 existsSync。
+ * 网络等待里。Git Bash 验活结果持久化到 shellPath,之后每次启动只花
+ * existsSync；缓存的是 WSL 时仍会检查 PATH,以便发现自定义目录的 Git。
  */
 export type ShellDoctorResult = {
     status: "posix";
@@ -23,4 +24,6 @@ export type ShellDoctorResult = {
 } | {
     status: "unknown";
 };
+/** 从 git.exe 路径反推 Git Bash 候选;用 win32 保证非 Windows CI 也能覆盖路径规则。 */
+export declare function gitBashPathsFromGitExecutables(gitPaths: string[], skip: string[], pathExists?: (path: string) => boolean): string[];
 export declare function ensureUsableShell(): Promise<ShellDoctorResult>;

package/dist/shell-doctor.js

@@ -1,6 +1,6 @@
 import { spawn } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname, join } from "node:path";
+import { join, win32 } from "node:path";
 import { agentDir, agentSettingsFile } from "./config.js";
 /** System32/Sysnative 的 bash.exe 是 WSL 转发器,不是真 bash(与 pi 同款判断)。 */
 function isWslRelayBash(p) {
@@ -91,21 +91,38 @@ function knownGitBashPaths() {
     }
     return out;
 }
-/** 慢路径候选:where git.exe 反推安装根,兜住 portable 等非常规安装。 */
-async function discoveredGitBashPaths(skip) {
+/** 从 git.exe 路径反推 Git Bash 候选;用 win32 保证非 Windows CI 也能覆盖路径规则。 */
+export function gitBashPathsFromGitExecutables(gitPaths, skip, pathExists = existsSync) {
     const out = [];
     // git.exe 在 <root>\cmd、<root>\bin 或 <root>\mingw64\bin 下,向上找 root
-    for (const gitPath of await runWhere("git.exe")) {
-        const dir = dirname(gitPath);
-        for (const root of [dirname(dir), dirname(dirname(dir))]) {
-            for (const p of [join(root, "bin", "bash.exe"), join(root, "usr", "bin", "bash.exe")]) {
-                if (!out.includes(p) && !skip.includes(p) && existsSync(p))
+    for (const gitPath of gitPaths) {
+        const dir = win32.dirname(gitPath);
+        for (const root of [win32.dirname(dir), win32.dirname(win32.dirname(dir))]) {
+            for (const p of [win32.join(root, "bin", "bash.exe"), win32.join(root, "usr", "bin", "bash.exe")]) {
+                if (!out.includes(p) && !skip.includes(p) && pathExists(p))
                     out.push(p);
             }
         }
     }
     return out;
 }
+/** 慢路径候选:where git.exe 反推安装根,兜住 portable 等非常规安装。 */
+async function discoveredGitBashPaths(skip) {
+    return gitBashPathsFromGitExecutables(await runWhere("git.exe"), skip);
+}
+/** 固定位置与 PATH 反推共用同一验活流程,缓存 WSL 和首次探测都走这里。 */
+async function findUsableGitBash() {
+    const known = knownGitBashPaths();
+    for (const candidate of known) {
+        if (await bashWorks(candidate))
+            return candidate;
+    }
+    for (const candidate of await discoveredGitBashPaths(known)) {
+        if (await bashWorks(candidate))
+            return candidate;
+    }
+    return undefined;
+}
 /** 持久化写 settings.json:写入时现读现改,避免覆盖并行流程刚写的其他键。 */
 function persistShellPath(p) {
     let settings = {};
@@ -139,17 +156,16 @@ export async function ensureUsableShell() {
         }
     }
     // 已配置且文件还在:信它,不每次启动都探活(坏了 pi 会在会话里报错)。
-    // 配置的是 WSL 转发器时,零成本看一眼 Git Bash 是否新装了,装了就换轨。
+    // 配置的是 WSL 转发器时,同时检查固定位置与 PATH 里的 Git 安装,找到就换轨。
     const configured = settings["shellPath"];
     if (typeof configured === "string" && configured && existsSync(configured)) {
         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 };
-            }
+        const candidate = await findUsableGitBash();
+        if (candidate) {
+            persistShellPath(candidate);
+            console.error(`  检测到 Git Bash,命令改回 Windows 本机执行: ${candidate}`);
+            return { status: "bash", shellPath: candidate };
         }
         adviseInstallGitBash();
         return { status: "wsl", shellPath: configured };
@@ -163,20 +179,14 @@ export async function ensureUsableShell() {
         }
         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);
-    }
+    const gitBash = await findUsableGitBash();
+    if (gitBash)
+        return adopt(gitBash);
     // 没有 Git Bash:看 PATH 上还有什么(与 pi 的兜底一致,但这里要验活)
     const fallback = (await runWhere("bash.exe")).find((p) => existsSync(p));
     if (fallback && (await bashWorks(fallback))) {
         // WSL 转发器也持久化:冷启 WSL 验活要好几秒,不能每次启动都付。装了
-        // Git Bash 后的换轨由上面的 configured-WSL 分支负责(零成本 existsSync)。
+        // Git Bash 后的换轨由上面的 configured-WSL 分支负责。
         persistShellPath(fallback);
         if (isWslRelayBash(fallback)) {
             adviseInstallGitBash();

package/dist/webui-brand.d.ts

@@ -1,9 +1,2 @@
-/**
- * u1s1 自有前端(packages/webui,Codex 布局复刻)整体替换 pi-web-ui 的
- * web/dist。产物随 CLI 包发布在 <cliPkg>/webui-dist;index.html 内容一致
- * 说明已同步过,跳过。目标目录先整体删除再拷贝 —— 断开 pnpm 硬链接,
- * 也顺带清掉上游的旧 assets。返回 false 表示产物缺失(回退到品牌补丁)。
- */
-export declare function applyWebUiFrontend(binPath: string): boolean;
 /** binPath = <pkg>/bin/pi-web-ui.mjs → 前端产物在 <pkg>/web/dist。 */
 export declare function applyWebUiBranding(binPath: string): void;

package/dist/webui-brand.js

@@ -1,33 +1,5 @@
-import { cpSync, existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-/**
- * u1s1 自有前端(packages/webui,Codex 布局复刻)整体替换 pi-web-ui 的
- * web/dist。产物随 CLI 包发布在 <cliPkg>/webui-dist;index.html 内容一致
- * 说明已同步过,跳过。目标目录先整体删除再拷贝 —— 断开 pnpm 硬链接,
- * 也顺带清掉上游的旧 assets。返回 false 表示产物缺失(回退到品牌补丁)。
- */
-export function applyWebUiFrontend(binPath) {
-    const src = fileURLToPath(new URL("../webui-dist/", import.meta.url));
-    const srcIndex = join(src, "index.html");
-    if (!existsSync(srcIndex))
-        return false;
-    const dist = join(dirname(binPath), "..", "web", "dist");
-    const distIndex = join(dist, "index.html");
-    try {
-        if (existsSync(distIndex) &&
-            readFileSync(distIndex, "utf8") === readFileSync(srcIndex, "utf8")) {
-            return true;
-        }
-        rmSync(dist, { recursive: true, force: true });
-        cpSync(src, dist, { recursive: true });
-        return true;
-    }
-    catch (e) {
-        console.error("  前端替换失败,退回默认界面:", e.message);
-        return false;
-    }
-}
 /**
  * pi-web-ui 前端产物的启动时品牌补丁。不 fork 上游,只在 Desktop App
  * 启动前改它 web/dist 里的静态文件:重写 <title>、换 favicon、注入
@@ -41,9 +13,9 @@ export function applyWebUiFrontend(binPath) {
  */
 const PATCH_MARK = "u1s1-brand-v2";
 const PAGE_TITLE = "u1s1 Desktop App — 有一说一";
-const FAVICON_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-<rect width="64" height="64" rx="14" fill="#101418"/>
-<text x="32" y="42" font-family="ui-monospace,Menlo,Consolas,monospace" font-size="26" font-weight="700" fill="#4ea1ff" text-anchor="middle">u1</text>
+const FAVICON_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<rect width="100" height="100" rx="18" fill="#e8442e"/>
+<text x="50" y="68" font-family="ui-monospace,Menlo,Consolas,monospace" font-size="52" font-weight="700" fill="#faf5ec" text-anchor="middle">u1</text>
 </svg>
 `;
 /** 页面 chrome 品牌替换:改 .brand-logo/.brand-name,盯住 title(React 可能改回去)。 */

package/package.json

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