u1s1-cli 0.11.0 → 0.11.1

package/dist/index.js

@@ -4,6 +4,7 @@ import { writeFileSync } from "node:fs";
 import { cleanupBrandThemes, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, writeWebToolsExtension, } from "./agent-setup.js";
 import { printConsoleBanner } from "./brand.js";
 import { agentDir, apiModelToDef, isPortableInstall, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, readSettings, resolvePreferredModel, setModelsFromApi, VERSION, } from "./config.js";
+import { ensureSearchTools } from "./search-tools.js";
 import { applyBrandUi, setUpdateNotice } from "./style.js";
 import { offerStarterTemplates } from "./templates.js";
 import { fetchModels } from "./api.js";
@@ -117,6 +118,9 @@ async function runAgent(cfg, args) {
     cleanupBrandThemes();
     ensureBrandPrompt();
     ensureDefaultSettings();
+    // 预 seed fd/rg(国内直连 GitHub 不通,pi 自己下不动);与取模型列表并行,
+    // 但必须在进 pi 之前就位,否则 pi 会自己去 GitHub 下载
+    const searchToolsReady = ensureSearchTools(cfg);
     // Fetch model list from server; fall back to built-in MODELS on error.
     // 服务端没开搜索(或老网关没有 features 字段)时不注册 web_search,模型就不会白调
     let webSearchEnabled = true;
@@ -138,6 +142,7 @@ async function runAgent(cfg, args) {
     process.env["U1S1_TOOLS_VIA_EXTENSION"] = "1";
     // hide pi's own "Run pi update" banner; users should run `u1s1 update` instead
     process.env["PI_SKIP_VERSION_CHECK"] = "1";
+    await searchToolsReady;
     const { CustomEditor, main } = await import("@earendil-works/pi-coding-agent");
     // 网页终端(如 Taikula)把 Shift+Enter 发成 ESC+CR(\x1b\r)。pi 在没开 Kitty
     // 协议时把它当成 Alt+Enter:空闲就直接发送,忙碌才排队。先改成 CSI-u 的

package/dist/search-tools.d.ts

@@ -0,0 +1,3 @@
+import { type CliConfig } from "./config.js";
+/** 缺哪个装哪个;都在(本地目录或 PATH)则秒退。失败只提示,不阻塞启动。 */
+export declare function ensureSearchTools(cfg: Pick<CliConfig, "baseUrl">): Promise<void>;

package/dist/search-tools.js

@@ -0,0 +1,153 @@
+import { spawnSync } from "node:child_process";
+import { chmodSync, createWriteStream, existsSync, mkdirSync, readdirSync, renameSync, rmSync } from "node:fs";
+import { arch, platform } from "node:os";
+import { join } from "node:path";
+import { Readable } from "node:stream";
+import { pipeline } from "node:stream/promises";
+import { agentDir } from "./config.js";
+/**
+ * 预 seed pi 的搜索组件(fd / ripgrep)到 ~/.u1s1/agent/bin。
+ *
+ * pi 首启发现缺 fd/rg 会从 GitHub 现下,国内直连基本不通:启动时连弹
+ * "Failed to download ... fetch failed",更糟的是 grep/find 工具运行时直接
+ * 报错,没有降级路径。这里在进 pi 之前从自家网关(/tools/<asset>,CF 边缘
+ * 代理 GitHub release,见 gateway/src/index.ts)把二进制放进 pi 的探测目录
+ * (探测顺序:agentDir/bin → PATH);探到本地文件后 pi 不再碰 GitHub。
+ * 任何失败都不阻塞启动——pi 自己的 GitHub 下载仍是兜底(有代理的用户能通)。
+ *
+ * 版本钉死而不是查 latest:免去对 GitHub API 的依赖,且 fd 10.4+ 不再发
+ * x86_64 macOS 产物,统一钉 10.3.0(与 pi 对 darwin-x64 的钉版一致)。
+ */
+const TOOLS = [
+    { bin: "fd", version: "10.3.0", pathNames: ["fd", "fdfind"], asset: fdAsset },
+    { bin: "rg", version: "15.2.0", pathNames: ["rg"], asset: rgAsset },
+];
+const binDir = join(agentDir, "bin");
+const DOWNLOAD_TIMEOUT_MS = 60_000;
+function archStr() {
+    const a = arch();
+    return a === "arm64" ? "aarch64" : a === "x64" ? "x86_64" : null;
+}
+function fdAsset(version) {
+    const a = archStr();
+    if (!a)
+        return null;
+    const p = platform();
+    if (p === "darwin")
+        return `fd-v${version}-${a}-apple-darwin.tar.gz`;
+    if (p === "linux")
+        return `fd-v${version}-${a}-unknown-linux-gnu.tar.gz`;
+    if (p === "win32")
+        return `fd-v${version}-${a}-pc-windows-msvc.zip`;
+    return null;
+}
+function rgAsset(version) {
+    const a = archStr();
+    if (!a)
+        return null;
+    const p = platform();
+    if (p === "darwin")
+        return `ripgrep-${version}-${a}-apple-darwin.tar.gz`;
+    // linux 上 arm64 用 gnu、x64 用 musl:与 pi 的资产选择保持一致
+    if (p === "linux") {
+        return a === "aarch64"
+            ? `ripgrep-${version}-aarch64-unknown-linux-gnu.tar.gz`
+            : `ripgrep-${version}-x86_64-unknown-linux-musl.tar.gz`;
+    }
+    if (p === "win32")
+        return `ripgrep-${version}-${a}-pc-windows-msvc.zip`;
+    return null;
+}
+/** 与 pi 的 commandExists 同语义:能 spawn 就算在 PATH 里(fd 也认 Debian 名 fdfind)。 */
+function inPath(names) {
+    return names.some((name) => {
+        const r = spawnSync(name, ["--version"], { stdio: "pipe" });
+        return r.error === undefined || r.error === null;
+    });
+}
+function run(command, cmdArgs) {
+    const r = spawnSync(command, cmdArgs, { stdio: "pipe" });
+    return !r.error && r.status === 0;
+}
+function extract(archive, dir) {
+    if (archive.endsWith(".zip")) {
+        // 只有 win32 会拿到 zip。System32 的 tar 是 bsdtar,认 zip;Git Bash 的
+        // GNU tar 不认——优先绝对路径,失败再退 powershell Expand-Archive。
+        const sysRoot = process.env["SystemRoot"] ?? process.env["WINDIR"];
+        const sysTar = sysRoot ? join(sysRoot, "System32", "tar.exe") : "tar.exe";
+        if (run(existsSync(sysTar) ? sysTar : "tar.exe", ["xf", archive, "-C", dir]))
+            return true;
+        return run("powershell.exe", [
+            "-NoLogo", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command",
+            "& { param($a,$d) $ErrorActionPreference='Stop'; Expand-Archive -LiteralPath $a -DestinationPath $d -Force }",
+            archive, dir,
+        ]);
+    }
+    return run("tar", ["xzf", archive, "-C", dir]);
+}
+/** 资产里的二进制可能嵌在版本号目录下(fd 是,rg 也是),递归找。 */
+function findBinary(root, name) {
+    const stack = [root];
+    while (stack.length > 0) {
+        const dir = stack.pop();
+        for (const entry of readdirSync(dir, { withFileTypes: true })) {
+            const full = join(dir, entry.name);
+            if (entry.isFile() && entry.name === name)
+                return full;
+            if (entry.isDirectory())
+                stack.push(full);
+        }
+    }
+    return null;
+}
+async function install(tool, baseUrl, binName) {
+    const asset = tool.asset(tool.version);
+    if (!asset)
+        throw new Error(`不支持的平台 ${platform()}/${arch()}`);
+    mkdirSync(binDir, { recursive: true });
+    const res = await fetch(new URL(`/tools/${asset}`, baseUrl), {
+        signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS),
+    });
+    if (!res.ok || !res.body)
+        throw new Error(`HTTP ${res.status}`);
+    const archive = join(binDir, asset);
+    // fd/rg 并行安装,解压目录按工具名+pid 隔离,避免互踩
+    const extractDir = join(binDir, `preseed_${tool.bin}_${process.pid}`);
+    try {
+        await pipeline(Readable.fromWeb(res.body), createWriteStream(archive));
+        mkdirSync(extractDir, { recursive: true });
+        if (!extract(archive, extractDir))
+            throw new Error(`解压失败 ${asset}`);
+        const found = findBinary(extractDir, binName);
+        if (!found)
+            throw new Error(`包内没有 ${binName}`);
+        renameSync(found, join(binDir, binName));
+        if (platform() !== "win32")
+            chmodSync(join(binDir, binName), 0o755);
+    }
+    finally {
+        rmSync(archive, { force: true });
+        rmSync(extractDir, { recursive: true, force: true });
+    }
+}
+/** 缺哪个装哪个;都在(本地目录或 PATH)则秒退。失败只提示,不阻塞启动。 */
+export async function ensureSearchTools(cfg) {
+    try {
+        const ext = platform() === "win32" ? ".exe" : "";
+        const missing = TOOLS.filter((t) => !existsSync(join(binDir, t.bin + ext)) && !inPath(t.pathNames));
+        if (missing.length === 0)
+            return;
+        console.log(`  正在安装搜索组件(${missing.map((t) => t.bin).join("/")})…`);
+        const results = await Promise.allSettled(missing.map((t) => install(t, cfg.baseUrl, t.bin + ext)));
+        for (let i = 0; i < results.length; i++) {
+            const r = results[i];
+            if (r.status === "rejected") {
+                const msg = r.reason instanceof Error ? r.reason.message : String(r.reason);
+                console.error(`  ${missing[i].bin} 安装失败(${msg}),稍后将尝试 GitHub 直连`);
+            }
+        }
+    }
+    catch {
+        // 预 seed 只是加速,任何意外都不该挡住启动
+    }
+}

package/dist/web.js

@@ -4,6 +4,7 @@ import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 import { cleanupBrandThemes, ensureAuthCredential, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, 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";
 import { fetchModels } from "./api.js";
 const require = createRequire(import.meta.url);
@@ -21,6 +22,8 @@ export async function prepareWebEnv(cfg) {
     cleanupBrandThemes();
     ensureBrandPrompt();
     ensureDefaultSettings();
+    // 网页版/App 的 agent 会话同样依赖 fd/rg(同一个 agentDir);与取模型列表并行
+    const searchToolsReady = ensureSearchTools(cfg);
     // Fetch model list from server; fall back to built-in MODELS on error.
     // 服务端没开搜索(或老网关没有 features 字段)时不注册 web_search
     let webSearchEnabled = true;
@@ -42,6 +45,7 @@ export async function prepareWebEnv(cfg) {
     writeAgentDefaultModel(resolvePreferredModel(cfg.model));
     const dataDir = join(u1s1Dir, "web");
     mkdirSync(dataDir, { recursive: true });
+    await searchToolsReady;
     return {
         PI_CODING_AGENT_DIR: agentDir,
         U1S1_API_KEY: cfg.apiKey,

package/package.json

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