u1s1-cli 1.2.3 → 1.2.5

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

@@ -34,7 +34,13 @@ export function applyBrandUi(pi, version) {
                 return {
                     render(width) {
                         // pi-tui crashes on lines wider than the terminal, so truncate defensively.
-                        return renderBrandHeader(theme, version, process.cwd(), width, updateNotice, announcement).map((line) => truncateToWidth(line, width));
+                        return renderBrandHeader(theme, {
+                            version,
+                            cwd: process.cwd(),
+                            width,
+                            notice: updateNotice,
+                            announcement,
+                        }).map((line) => truncateToWidth(line, width));
                     },
                     invalidate() { },
                 };

package/dist/subagent.d.ts

@@ -41,4 +41,9 @@ export declare function runSubagent(opts: SubagentOptions): Promise<SubagentOutc
  * 固定并发的工作池:limit 个工人依次领任务跑完一个补位一个。
  * worker 抛错由调用方在 fn 内部兜住;signal 中止后不再领新任务。
  */
-export declare function runPool<T>(items: readonly T[], limit: number, fn: (item: T, index: number) => Promise<void>, signal?: AbortSignal): Promise<void>;
+export declare function runPool<T>(input: {
+    items: readonly T[];
+    limit: number;
+    run: (item: T, index: number) => Promise<void>;
+    signal?: AbortSignal;
+}): Promise<void>;

package/dist/subagent.js

@@ -119,15 +119,15 @@ export async function runSubagent(opts) {
  * 固定并发的工作池:limit 个工人依次领任务跑完一个补位一个。
  * worker 抛错由调用方在 fn 内部兜住;signal 中止后不再领新任务。
  */
-export async function runPool(items, limit, fn, signal) {
+export async function runPool(input) {
     let next = 0;
     const worker = async () => {
         for (;;) {
             const i = next++;
-            if (i >= items.length || signal?.aborted)
+            if (i >= input.items.length || input.signal?.aborted)
                 return;
-            await fn(items[i], i);
+            await input.run(input.items[i], i);
         }
     };
-    await Promise.all(Array.from({ length: Math.max(1, Math.min(limit, items.length)) }, worker));
+    await Promise.all(Array.from({ length: Math.max(1, Math.min(input.limit, input.items.length)) }, worker));
 }

package/dist/tools.d.ts

@@ -4,18 +4,24 @@ import { Type } from "typebox";
 import type { CliConfig } from "./config.js";
 export declare function truncate(text: string): string;
 /** 联网工具通用渲染:调用行不占位,收起时只显一行摘要,ctrl+o 展开全文,出错显一行 ✗ */
-export declare function compactResultRender(result: {
-    content: Array<{
-        type: string;
-        text?: string;
-    }>;
-}, options: {
-    expanded: boolean;
-}, theme: {
-    fg: (color: any, text: string) => string;
-}, context: {
-    isError: boolean;
-}, summaryLine: string): Text;
+export declare function compactResultRender(input: {
+    result: {
+        content: Array<{
+            type: string;
+            text?: string;
+        }>;
+    };
+    options: {
+        expanded: boolean;
+    };
+    theme: {
+        fg: (color: any, text: string) => string;
+    };
+    context: {
+        isError: boolean;
+    };
+    summaryLine: string;
+}): Text;
 /** 联网搜索工具:走 u1s1 网关代理,上游 key 不落到用户机器上。 */
 export declare function createSearchTool(cfg: Pick<CliConfig, "baseUrl" | "apiKey">): import("@earendil-works/pi-coding-agent").ToolDefinition<Type.TObject<{
     query: Type.TString;

package/dist/tools.js

@@ -88,10 +88,8 @@ function resultText(result) {
     return c && c.type === "text" ? (c.text ?? "") : "";
 }
 /** 联网工具通用渲染:调用行不占位,收起时只显一行摘要,ctrl+o 展开全文,出错显一行 ✗ */
-export function compactResultRender(result, options, 
-// 放宽成 any 只为避开 pi 的 ThemeColor 联合类型在结构化匹配时的逆变报错;
-// 实际传入的就是 pi 的 Theme,取值只用 "warning"/"muted" 两色
-theme, context, summaryLine) {
+export function compactResultRender(input) {
+    const { result, options, theme, context, summaryLine } = input;
     if (context.isError) {
         // 低调处理:✗ 用警示色,内容用灰色弱化(与内置工具的错误展示一致)
         const msg = previewLine(resultText(result) || "error", 160);
@@ -123,14 +121,15 @@ export function createSearchTool(cfg) {
         renderCall() {
             return new Text("", 0, 0);
         },
-        renderResult(result, options, theme, context) {
+        renderResult(...args) {
+            const [result, options, theme, context] = args;
             const d = result.details;
             const q = d?.query ? `"${previewLine(d.query, 80)}"` : "…";
             const n = typeof d?.count === "number" ? ` · ${d.count} 条结果` : "";
-            return compactResultRender(result, options, theme, context, `🔍 搜索 ${q}${n}`);
+            return compactResultRender({ result, options, theme, context, summaryLine: `🔍 搜索 ${q}${n}` });
         },
         async execute(_toolCallId, params, signal) {
-            const data = await searchWeb(cfg, params.query, params.maxResults, signal);
+            const data = await searchWeb(cfg, { query: params.query, maxResults: params.maxResults, signal });
             const lines = [];
             if (data.answer)
                 lines.push(`Answer: ${data.answer}`, "");
@@ -187,14 +186,15 @@ export function createSubagentTool(getParentModel) {
         renderCall() {
             return new Text("", 0, 0);
         },
-        renderResult(result, options, theme, context) {
+        renderResult(...args) {
+            const [result, options, theme, context] = args;
             const d = result.details;
             const summary = d && typeof d.count === "number"
                 ? `🤖 子任务 ×${d.count}` +
                     (typeof d.ok === "number" && d.failed ? ` · ✓${d.ok} ✗${d.failed}` : "") +
                     (typeof d.seconds === "number" ? ` · ${d.seconds}s` : "")
                 : "🤖 子任务";
-            return compactResultRender(result, options, theme, context, summary);
+            return compactResultRender({ result, options, theme, context, summaryLine: summary });
         },
         async execute(_toolCallId, params, signal) {
             const list = (params.tasks?.length ? params.tasks : params.task ? [params.task] : [])
@@ -210,11 +210,16 @@ export function createSubagentTool(getParentModel) {
             const prevFlag = process.env.U1S1_IN_SUBAGENT;
             process.env.U1S1_IN_SUBAGENT = "1";
             const started = Date.now();
-            const outcomes = new Array(list.length);
+            const outcomes = Array.from({ length: list.length });
             try {
-                await runPool(list, SUBAGENT_CONCURRENCY, async (task, i) => {
-                    outcomes[i] = await runSubagent({ task, parentModel, model: params.model, timeoutMs, signal }).catch((e) => ({ ok: false, text: e.message, usage: { totalTokens: 0, costUsd: 0 } }));
-                }, signal);
+                await runPool({
+                    items: list,
+                    limit: SUBAGENT_CONCURRENCY,
+                    run: async (task, i) => {
+                        outcomes[i] = await runSubagent({ task, parentModel, model: params.model, timeoutMs, signal }).catch((e) => ({ ok: false, text: e.message, usage: { totalTokens: 0, costUsd: 0 } }));
+                    },
+                    signal,
+                });
             }
             finally {
                 if (prevFlag === undefined)
@@ -458,12 +463,13 @@ export function createFetchTool(cfg) {
         renderCall() {
             return new Text("", 0, 0);
         },
-        renderResult(result, options, theme, context) {
+        renderResult(...args) {
+            const [result, options, theme, context] = args;
             const d = result.details;
             const u = previewLine(d?.url ?? "…", 90);
             const n = typeof d?.chars === "number" ? ` · ${d.chars} 字符` : "";
             const cloud = d?.via === "render" ? " · ☁ 浏览器渲染" : "";
-            return compactResultRender(result, options, theme, context, `🌐 ${u}${n}${cloud}`);
+            return compactResultRender({ result, options, theme, context, summaryLine: `🌐 ${u}${n}${cloud}` });
         },
         async execute(_toolCallId, params, signal) {
             let url;
@@ -492,7 +498,7 @@ export function createFetchTool(cfg) {
                     return ok(await renderViaGateway(url, signal), "render", "text/markdown");
                 }
                 catch (re) {
-                    throw new Error(`${e.message}；云端浏览器渲染也失败: ${re.message}`);
+                    throw new Error(`${e.message}；云端浏览器渲染也失败: ${re.message}`, { cause: re });
                 }
             }
             // 直连 200 但正文近乎空:大概率是 JS 渲染的 SPA,换浏览器再试;渲染失败就退回空壳

package/dist/usage.js

@@ -20,89 +20,91 @@ function fmtTokensCn(tokens) {
         return sig2(t / 1e4).toLocaleString("en-US") + " 万";
     return sig2(t).toLocaleString("en-US");
 }
-export async function usage() {
-    const cfg = loadConfig();
-    if (!hasDeviceCredential(cfg)) {
-        console.error("还没登录,先跑 u1s1 login");
-        process.exit(1);
+const PACKAGE_LABELS = {
+    free_first: "首月免费包",
+    free_yearly: "年度免费包",
+    invite: "邀请赠送",
+    new_user: "新用户赠送",
+    login_checkin: "登录打卡",
+    payment_delay_gift: "临时加量包",
+    topup_daily: "每日加量包",
+    admin_grant: "官方赠送",
+};
+function sumOptional(a, b) {
+    return a == null && b == null ? null : (a ?? 0) + (b ?? 0);
+}
+function groupPackages(packages) {
+    const groups = new Map();
+    for (const pkg of packages) {
+        const key = `${pkg.kind}|${pkg.scope}|${pkg.daily_tokens != null}|${pkg.expires_at || ""}`;
+        const group = groups.get(key);
+        if (!group) {
+            groups.set(key, { ...pkg, count: 1 });
+            continue;
+        }
+        group.count += 1;
+        group.daily_tokens = sumOptional(group.daily_tokens, pkg.daily_tokens);
+        group.total_tokens = sumOptional(group.total_tokens, pkg.total_tokens);
+        group.remaining += pkg.remaining;
     }
-    const me = await fetchMe(cfg).catch((e) => {
-        console.error(e.message);
-        process.exit(1);
-    });
+    return [...groups.values()];
+}
+function packageScopeNote(pkg) {
+    if (pkg.kind === "login_checkin") {
+        return "仅限 u1s1 客户端使用 · 全模型可用";
+    }
+    return pkg.scope === "free"
+        ? "免费包适用模型 · 0 点恢复"
+        : "仅限 u1s1 客户端使用 · 免费包适用模型";
+}
+function packageLabel(pkg) {
+    const count = pkg.count > 1 ? ` ×${pkg.count}` : "";
+    return `${PACKAGE_LABELS[pkg.kind] ?? pkg.kind}${count}`.padEnd(5, "　");
+}
+function printPackage(pkg) {
+    const isDaily = pkg.daily_tokens != null;
+    const total = isDaily ? (pkg.daily_tokens ?? 0) : (pkg.total_tokens ?? 0);
+    const ratio = total > 0 ? pkg.remaining / total : 0;
+    console.log(`  ${packageLabel(pkg)} 还剩 ${fmtTokensCn(pkg.remaining)} / ${fmtTokensCn(total)}${isDaily ? "/天" : ""}  ${bar(ratio)}`);
+    const expiry = pkg.expires_at ? `${pkg.expires_at.slice(0, 10)} 到期` : "永不过期";
+    console.log(`             ${packageScopeNote(pkg)} · ${expiry}`);
+}
+function printPackageUsage(me, tokensPerUsd) {
+    const packages = me.packages ?? [];
+    if (packages.length === 0)
+        console.log("  用量包     (无生效中的用量包)");
+    for (const pkg of groupPackages(packages))
+        printPackage(pkg);
+    if (me.bonus_balance_usd > 0) {
+        const balance = tokensPerUsd > 0
+            ? `${fmtTokensCn(me.bonus_balance_usd * tokensPerUsd)} Token`
+            : `$${me.bonus_balance_usd.toFixed(2)}`;
+        console.log(`  余额(按量) ${balance}`);
+    }
+    const monthlyUsage = tokensPerUsd > 0
+        ? `约 ${fmtTokensCn(me.mtd_usd * tokensPerUsd)} Token($${me.mtd_usd.toFixed(2)})`
+        : `$${me.mtd_usd.toFixed(2)}`;
+    console.log(`  本月已用   ${monthlyUsage}`);
+    console.log("");
+    console.log("  免费用量包覆盖 DeepSeek V4 Flash / Vision、GLM-5.3 Flash、Qwen3.8 Flash 和联网搜索。");
+    console.log("  DeepSeek V4 Pro 仅可使用余额 → https://u1s1.io/dashboard");
+    console.log("  Token 数按默认模型单价折算,为约数;用更贵的模型时消耗更快。");
+    console.log("");
+}
+function printLegacyUsage(me, tokensPerUsd) {
     const freeRemain = me.daily_free_remaining_usd;
     const freeTotal = me.daily_free_usd;
     const freeRatio = freeTotal > 0 ? freeRemain / freeTotal : 0;
-    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: "邀请赠送",
-            new_user: "新用户赠送",
-            payment_delay_gift: "临时加量包",
-            topup_daily: "每日加量包",
-            admin_grant: "官方赠送",
-        };
-        if (me.packages.length === 0)
-            console.log("  用量包     (无生效中的用量包)");
-        // 同种类、同范围、同有效期的包合并成一条展示(比如邀请多个好友拿到的多份邀请赠送)
-        const groups = new Map();
-        for (const p of me.packages) {
-            const key = `${p.kind}|${p.scope}|${p.daily_tokens != null}|${p.expires_at || ""}`;
-            const g = groups.get(key);
-            // 可空字段求和:两边都是 null 就保持 null,别把「一次性包没有日额度」污染成 0
-            const sumOpt = (a, b) => (a == null && b == null ? null : (a ?? 0) + (b ?? 0));
-            if (g) {
-                g.count += 1;
-                g.daily_tokens = sumOpt(g.daily_tokens, p.daily_tokens);
-                g.total_tokens = sumOpt(g.total_tokens, p.total_tokens);
-                g.remaining += p.remaining;
-            }
-            else {
-                groups.set(key, { ...p, count: 1 });
-            }
-        }
-        for (const p of groups.values()) {
-            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) + (p.count > 1 ? ` ×${p.count}` : "")).padEnd(5, "　");
-            const per = daily ? "/天" : "";
-            console.log(`  ${label} 还剩 ${fmtTokensCn(p.remaining)} / ${fmtTokensCn(total)}${per}  ${bar(ratio)}`);
-            const scopeNote = p.kind === "login_checkin"
-                ? "仅限 u1s1 客户端使用 · 全模型可用"
-                : p.scope === "free"
-                    ? "免费包适用模型 · 0 点恢复"
-                    : "仅限 u1s1 客户端使用 · 免费包适用模型";
-            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.toFixed(2)}`;
-            console.log(`  余额(按量) ${balText}`);
-        }
-        console.log(`  本月已用   ${tpu > 0 ? `约 ${fmtTokensCn(me.mtd_usd * tpu)} Token($${me.mtd_usd.toFixed(2)})` : `$${me.mtd_usd.toFixed(2)}`}`);
-        console.log("");
-        console.log("  免费用量包覆盖 DeepSeek V4 Flash / Vision、GLM-5.3 Flash、Qwen3.8 Flash 和联网搜索。");
-        console.log("  DeepSeek V4 Pro 仅可使用余额 → 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)}`);
+    if (tokensPerUsd > 0) {
+        const tokens = (usd) => `${fmtTokensCn(usd * tokensPerUsd)} Token`;
+        console.log(`  今日免费   还剩 ${fmtTokensCn(freeRemain * tokensPerUsd)} / ${tokens(freeTotal)}  ${bar(freeRatio)}`);
         console.log("             DeepSeek V4 Flash · 北京时间 0 点恢复");
-        console.log(`  永久余额   ${tok(me.remaining_usd)}`);
-        console.log(`  本月已用   约 ${tok(me.mtd_usd)}($${me.mtd_usd.toFixed(2)})`);
+        console.log(`  永久余额   ${tokens(me.remaining_usd)}`);
+        console.log(`  本月已用   约 ${tokens(me.mtd_usd)}($${me.mtd_usd.toFixed(2)})`);
         console.log("");
         console.log("  Token 数按默认模型单价折算,为约数;用更贵的模型时消耗更快。");
     }
     else {
-        // 老网关没下发 tokens_per_usd,退回金额显示
         console.log(`  今日免费   $${freeRemain.toFixed(2)} / $${freeTotal.toFixed(2)}  ${bar(freeRatio)}`);
         console.log("             DeepSeek V4 Flash · 北京时间 0 点恢复");
         console.log(`  永久余额   $${me.remaining_usd.toFixed(2)}`);
@@ -112,3 +114,22 @@ export async function usage() {
     console.log("  免费额度每天自动恢复；邀请朋友双方各得永久加量 → https://u1s1.io/dashboard");
     console.log("");
 }
+export async function usage() {
+    const cfg = loadConfig();
+    if (!hasDeviceCredential(cfg)) {
+        console.error("还没登录,先跑 u1s1 login");
+        process.exit(1);
+    }
+    const me = await fetchMe(cfg).catch((e) => {
+        console.error(e.message);
+        process.exit(1);
+    });
+    const tokensPerUsd = me.tokens_per_usd ?? 0;
+    console.log("");
+    console.log(`  账号       ${me.email ?? "(未绑定邮箱)"}`);
+    if (me.packages) {
+        printPackageUsage(me, tokensPerUsd);
+        return;
+    }
+    printLegacyUsage(me, tokensPerUsd);
+}

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/dist/workflow/runner.js

@@ -189,12 +189,12 @@ export async function runWorkflow(opts) {
             store.append({ key, task: task.slice(0, 120), ok: true, text: out.text, ms: Date.now() - t0 });
             return out.text;
         }
-        catch (e) {
+        catch (error) {
             stats.failed++;
             progress.failed = stats.failed;
-            const msg = e.message || "未知错误";
+            const msg = error.message || "未知错误";
             store.append({ key, task: task.slice(0, 120), ok: false, text: msg, ms: Date.now() - t0 });
-            throw new Error(msg);
+            throw new Error(msg, { cause: error });
         }
         finally {
             if (worktreeDir)
@@ -221,15 +221,20 @@ export async function runWorkflow(opts) {
     async function parallel(thunks) {
         if (!Array.isArray(thunks))
             throw new Error("parallel() 需要一个 thunk 数组");
-        const results = new Array(thunks.length);
-        await runPool(thunks, SUBAGENT_CONCURRENCY, async (thunk, i) => {
-            results[i] = await Promise.resolve()
-                .then(thunk)
-                .catch((e) => {
-                logs.push(`✗ 任务 ${i + 1} 失败:${e.message}`);
-                return null;
-            });
-        }, internal.signal);
+        const results = [];
+        await runPool({
+            items: thunks,
+            limit: SUBAGENT_CONCURRENCY,
+            run: async (thunk, i) => {
+                results[i] = await Promise.resolve()
+                    .then(thunk)
+                    .catch((e) => {
+                    logs.push(`✗ 任务 ${i + 1} 失败:${e.message}`);
+                    return null;
+                });
+            },
+            signal: internal.signal,
+        });
         return results;
     }
     /** 无屏障流水线:每个 item 独立穿过所有 stage,item 失败只废自己。 */
@@ -238,21 +243,26 @@ export async function runWorkflow(opts) {
             throw new Error("pipeline() 第一个参数需要数组");
         if (!Array.isArray(stages) || stages.length === 0)
             throw new Error("pipeline() 第二个参数需要非空 stage 数组");
-        const results = new Array(items.length);
-        await runPool(items, SUBAGENT_CONCURRENCY, async (item, i) => {
-            let current = item;
-            for (let s = 0; s < stages.length; s++) {
-                try {
-                    current = await stages[s](current);
-                }
-                catch (e) {
-                    logs.push(`✗ item ${i + 1} 在第 ${s + 1} 阶段失败:${e.message}`);
-                    current = null;
-                    break;
+        const results = [];
+        await runPool({
+            items: items,
+            limit: SUBAGENT_CONCURRENCY,
+            run: async (item, i) => {
+                let current = item;
+                for (let s = 0; s < stages.length; s++) {
+                    try {
+                        current = await stages[s](current);
+                    }
+                    catch (e) {
+                        logs.push(`✗ item ${i + 1} 在第 ${s + 1} 阶段失败:${e.message}`);
+                        current = null;
+                        break;
+                    }
                 }
-            }
-            results[i] = current;
-        }, internal.signal);
+                results[i] = current;
+            },
+            signal: internal.signal,
+        });
         return results;
     }
     // 沙箱:只有编排原语 + 受限 log/timer,标准 JS 内建(Promise/JSON/Math…)天然可用