u1s1-cli 1.2.3 → 1.2.5

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.3",
+  "version": "1.2.5",
   "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);