u1s1-cli 1.2.2 → 1.2.4

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,92 +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: "邀请赠送",
-            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 === "invite"
-                ? "仅限 u1s1 客户端使用 · 全模型可用"
-                : p.scope === "free" ? "仅默认模型和搜索 · 0 点恢复" : "全模型可用";
-            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("");
-        if (me.free_claim === "first") {
-            console.log("  → 你有免费用量包没领:首月每天 1 亿 Token,去 https://u1s1.io/dashboard 点「领取」");
-        }
-        else if (me.free_claim === "renew") {
-            console.log("  → 免费用量包到期了,去 https://u1s1.io/dashboard 续领:每天 3000 万 Token,一年有效");
-        }
-        else {
-            console.log("  免费包每天 0 点恢复;邀请礼包需受邀人手动领取,仅限 u1s1 客户端 → 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)}`);
@@ -115,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/web.js

@@ -1,7 +1,7 @@
 import { mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { cleanupBrandThemes, endpointKeyEnv, ensureAuthCredential, ensureBrandPrompt, ensureWorkflowPromptTemplate, ensureDefaultSettings, ensureProviderModels, scrubForeignProviderEnv, writeAttributionExtension, writeWebToolsExtension, } from "./agent-setup.js";
-import { agentDir, apiModelToDef, resolvePreferredModel, setModelsFromApi, u1s1Dir, writeAgentDefaultModel, } from "./config.js";
+import { agentDir, apiModelToDef, MODELS, resolvePreferredModel, setModelsFromApi, u1s1Dir, writeAgentDefaultModel, } from "./config.js";
 import { ensureSearchTools } from "./search-tools.js";
 import { ensureUsableShell } from "./shell-doctor.js";
 import { fetchModels, loadCustomEndpoints } from "./api.js";
@@ -38,6 +38,7 @@ export async function prepareWebEnv(cfg) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
     }
     await endpointsReady;
+    ensureDefaultSettings(MODELS);
     const signing = await ensureSigningProxy(cfg, "desktop");
     const officialCfg = { ...cfg, baseUrl: signing.baseUrl, apiKey: signing.localKey };
     ensureBrandPrompt(await shellReady);

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…)天然可用

package/dist/workflow/tool.js

@@ -6,6 +6,65 @@ import { Type } from "typebox";
 import { compactResultRender, truncate } from "../tools.js";
 import { runWorkflow, saveWorkflowScript, validateScript, workflowsDir, WORKFLOW_DEFAULT_BUDGET_TOKENS, WORKFLOW_TIMEOUT_MS, } from "./runner.js";
 import { buildFromTemplate, TEMPLATES } from "./templates.js";
+function assertValidWorkflowCode(code) {
+    const errors = validateScript(code);
+    if (errors.length > 0) {
+        throw new Error(`脚本未通过静态校验,请修复后重试:\n- ${errors.join("\n- ")}`);
+    }
+}
+function buildTemplateSource(template, input) {
+    try {
+        return buildFromTemplate(template, input);
+    }
+    catch (error) {
+        throw new Error(`${error.message}\n模板 input 说明:${TEMPLATES[template]?.inputHint ?? "—"}`, { cause: error });
+    }
+}
+function readWorkflowSource(scriptPath) {
+    try {
+        return readFileSync(scriptPath, "utf8");
+    }
+    catch {
+        throw new Error(`读不到脚本文件:${scriptPath}`);
+    }
+}
+function resolveWorkflowSource(params) {
+    const saveAs = params.save_as?.trim();
+    if (saveAs && !/^[a-zA-Z0-9_-]+$/.test(saveAs)) {
+        throw new Error("save_as 只允许字母、数字、横线和下划线");
+    }
+    if (saveAs && params.script_path?.trim()) {
+        throw new Error("script_path 指向的脚本已经落盘,不能再配 save_as;要另存新名字请用 script 传入源码");
+    }
+    const inlineCode = params.script?.trim();
+    if (inlineCode) {
+        assertValidWorkflowCode(inlineCode);
+        return { code: inlineCode, saveAs };
+    }
+    const template = params.template?.trim();
+    if (template) {
+        return { code: buildTemplateSource(template, params.input ?? {}), saveAs };
+    }
+    const requestedPath = params.script_path?.trim();
+    if (requestedPath) {
+        const scriptPath = resolve(requestedPath);
+        return { code: readWorkflowSource(scriptPath), scriptPath };
+    }
+    throw new Error("script、template、script_path 至少填一个");
+}
+function persistWorkflowSource(source) {
+    if (source.scriptPath)
+        return source.scriptPath;
+    if (!source.saveAs)
+        return saveWorkflowScript(source.code);
+    const scriptPath = resolve(workflowsDir(), `${source.saveAs}.mjs`);
+    if (existsSync(scriptPath)) {
+        throw new Error(`工作流 "${source.saveAs}" 已存在(${scriptPath})。要重跑它请用 script_path 指向该文件(可加 resume:true 续跑);要新建请换个名字`);
+    }
+    mkdirSync(dirname(scriptPath), { recursive: true });
+    writeFileSync(scriptPath, source.code);
+    return scriptPath;
+}
 /**
  * run_workflow 工具:主 agent 把模型生成的编排脚本交给 WorkflowRunner 执行。
  * 脚本在 vm 沙箱里跑,只能用注入的 subagent/parallel/pipeline 原语。
@@ -61,67 +120,20 @@ export function createRunWorkflowTool(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.ok === "number"
                 ? `🧭 工作流 · ✓${d.ok}${d.failed ? ` ✗${d.failed}` : ""}` +
                     (typeof d.seconds === "number" ? ` · ${d.seconds}s` : "") +
                     (d.aborted ? " · 已中止" : "")
                 : "🧭 工作流";
-            return compactResultRender(result, options, theme, context, summary);
+            return compactResultRender({ result, options, theme, context, summaryLine: summary });
         },
-        async execute(_toolCallId, params, signal, onUpdate) {
-            let code = params.script?.trim();
-            let scriptPath;
-            const named = params.save_as?.trim();
-            if (named && !/^[a-zA-Z0-9_-]+$/.test(named)) {
-                throw new Error("save_as 只允许字母、数字、横线和下划线");
-            }
-            if (named && params.script_path?.trim()) {
-                throw new Error("script_path 指向的脚本已经落盘,不能再配 save_as;要另存新名字请用 script 传入源码");
-            }
-            if (code) {
-                const errors = validateScript(code);
-                if (errors.length > 0) {
-                    throw new Error(`脚本未通过静态校验,请修复后重试:\n- ${errors.join("\n- ")}`);
-                }
-            }
-            else if (params.template?.trim()) {
-                // 内置模板:模型只填参数,脚本由模板生成(生成后自检过静态校验)
-                try {
-                    code = buildFromTemplate(params.template.trim(), (params.input ?? {}));
-                }
-                catch (e) {
-                    throw new Error(`${e.message}\n模板 input 说明:${TEMPLATES[params.template.trim()]?.inputHint ?? "—"}`);
-                }
-            }
-            else if (params.script_path?.trim()) {
-                scriptPath = resolve(params.script_path.trim());
-                try {
-                    code = readFileSync(scriptPath, "utf8");
-                }
-                catch {
-                    throw new Error(`读不到脚本文件:${scriptPath}`);
-                }
-            }
-            else {
-                throw new Error("script、template、script_path 至少填一个");
-            }
-            // 落盘:save_as 用语义化名字(同名报错防覆盖进度配对),否则时间戳名;
-            // script_path 分支上面已读入,不重复落盘
-            if (!scriptPath) {
-                if (named) {
-                    scriptPath = resolve(workflowsDir(), `${named}.mjs`);
-                    if (existsSync(scriptPath)) {
-                        throw new Error(`工作流 "${named}" 已存在(${scriptPath})。要重跑它请用 script_path 指向该文件(可加 resume:true 续跑);要新建请换个名字`);
-                    }
-                    mkdirSync(dirname(scriptPath), { recursive: true });
-                    writeFileSync(scriptPath, code ?? "");
-                }
-                else {
-                    scriptPath = saveWorkflowScript(code ?? "");
-                }
-            }
+        async execute(...args) {
+            const [, params, signal, onUpdate] = args;
+            const source = resolveWorkflowSource(params);
+            const scriptPath = persistWorkflowSource(source);
             const progressPath = scriptPath.replace(/\.mjs$/, ".progress.jsonl");
             // 流式进度:onProgress 高频触发,节流到 ≥2s 一次才推给 TUI
             let lastPush = 0;
@@ -143,7 +155,7 @@ export function createRunWorkflowTool(getParentModel) {
                 }
                 : undefined;
             const result = await runWorkflow({
-                code: code ?? "",
+                code: source.code,
                 progressPath,
                 resume: params.resume === true,
                 parentModel: getParentModel(),

package/package.json

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

package/scripts/render-regression.mjs

@@ -60,7 +60,9 @@ function hiddenToolDef(orig) {
     renderCall() {
       return new Text("", 0, 0);
     },
-    renderResult(result, { expanded }, theme, context) {
+    // pi owns this positional callback contract; keep the adapter narrow here.
+    renderResult(...args) {
+      const [result, { expanded }, theme, context] = args;
       if (context.isError) {
         const c = result.content.find((x) => x.type === "text");
         return new Text(theme.fg("warning", "✗ ") + theme.fg("muted", c?.text ?? "error"), 0, 0);