@zhushanwen/pi-subagent-workflow 7.4.0 → 8.1.0

package/src/orchestration/__tests__/worker-script-template-snapshot.test.ts

@@ -0,0 +1,110 @@
+/**
+ * buildWorkerScript 模板 hoisting（IF5/IF6）— byte-identical 快照锚定。
+ *
+ * ES8：快照先行——fixture 由「改造前实现」生成落盘（本文件同 commit），
+ * 断言重构后输出与 fixture 逐字节一致，锁定 PRE/POST 边界换行与 userScript
+ * 缩进语义（AC-4「逐字保留」不变式）。IF6（_KNOWN_FIELDS 提升至生成源
+ * module scope）落地时基线已按设计在同一 commit 内更新为最终形态。
+ *
+ * 样例脚本覆盖 $ARGS / schema / parallel / pipeline / workflow / phase / log 特性。
+ */
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { dirname, join } from "node:path";
+
+import { describe, expect, it } from "vitest";
+
+import { buildWorkerScript } from "../worker-script-builder.ts";
+
+const sampleScript = [
+  "// sample exercising template features",
+  'const name = $ARGS.name ?? "default";',
+  'phase("build");',
+  'const spec = await agent("build it", { label: "builder", schema: { type: "object" } });',
+  "const results = await parallel([",
+  '  agent({ task: "unit tests", agent: "./tester.md" }),',
+  '  agent({ task: "lint", agent: "./linter.md", skill: "lint-skill" }),',
+  "]);",
+  "await pipeline([(x) => x, (x) => x]);",
+  'await workflow("deploy", { env: "prod" });',
+  'log("done " + name + " " + $WORKSPACE + " " + $BUDGET.remaining());',
+  "module.exports = { execute: async (ctx) => ctx.agent(\"finalize\") };",
+].join("\n");
+
+function loadFixture(): string {
+  const here = dirname(fileURLToPath(import.meta.url));
+  return readFileSync(join(here, "__fixtures__", "worker-template.snapshot.txt"), "utf8");
+}
+
+describe("buildWorkerScript — 模板 hoisting byte-identical 快照（IF5）", () => {
+  it("特性全量样例的输出与 fixture 逐字节一致", () => {
+    const out = buildWorkerScript(sampleScript);
+    expect(out).toBe(loadFixture());
+  });
+
+  it("首尾边界锚定：use strict 开头 + error handler 结尾 + userScript 缩进注入", () => {
+    const out = buildWorkerScript(sampleScript);
+    // PRE 边界：第一行 use strict（无前导换行）
+    expect(out.startsWith('"use strict";\n')).toBe(true);
+    // userScript 段：两空格缩进注入（AC-4 拼接语义）
+    expect(out).toContain("\n  // sample exercising template features\n");
+    // userScript 段结束后一个空行再接 auto-invoke 段（POST 首部换行语义）
+    expect(out).toContain("ctx.agent(\"finalize\") };\n\n  // ── Auto-invoke execute() for module.exports pattern ──");
+    // POST 边界：以 error handler 的 "});" 结尾（无尾随换行）
+    expect(out.endsWith('_safePost({ type: "error", runId, error: err.message || String(err), workerLogs: _workerLogs }, "error");\n});')).toBe(true);
+  });
+
+  it("空 userScript 与任意脚本的拼接语义稳定（PRE/POST 不含 userScript 状态）", () => {
+    const a = buildWorkerScript("x");
+    const b = buildWorkerScript("y");
+    // 除 userScript 段外完全一致：以 userScript 行为界切割比对
+    const [preA] = a.split("\n  x\n");
+    const [preB] = b.split("\n  y\n");
+    expect(preA).toBe(preB);
+  });
+
+  it("A8 rfl 仪表透传字段字面量锚定（tier-1 §7.1）：live resolve 与缓存重放两对称点均含三字段", () => {
+    const out = buildWorkerScript("// noop");
+    // live resolve 分支（agent-result 消息处理）
+    expect(out).toContain("usage: msg.result.usage,");
+    expect(out).toContain("durationMs: msg.result.durationMs,");
+    expect(out).toContain("sessionId: msg.result.sessionId,");
+    // 缓存重放分支（_callCache 命中重建，对称点）
+    expect(out).toContain("usage: cached.usage,");
+    expect(out).toContain("durationMs: cached.durationMs,");
+    expect(out).toContain("sessionId: cached.sessionId,");
+  });
+});
+
+describe("buildWorkerScript — _KNOWN_FIELDS module scope 提升（IF6）", () => {
+  const script = buildWorkerScript("// noop user script");
+
+  it("生成源含 module 级 _KNOWN_FIELDS 声明（与 _workerLogs 同级，IIFE 外）", () => {
+    // 声明在 IIFE 开始之前（module scope）：const _KNOWN_FIELDS 必须出现在 "(async () => {" 前
+    const iifePos = script.indexOf("(async () => {");
+    const knownPos = script.indexOf("const _KNOWN_FIELDS = new Set([");
+    expect(knownPos).toBeGreaterThan(-1);
+    expect(knownPos).toBeLessThan(iifePos);
+    // 紧随 _workerLogs 声明之后（design IF6：与 _workerLogs/:62 同级）
+    expect(script.indexOf("const _workerLogs = [];")).toBeLessThan(knownPos);
+  });
+
+  it("agent() 体内不再重建 Set（引用 _KNOWN_FIELDS，无 new Set）", () => {
+    // agent() 函数体（到 parallel 声明前）内不得有 new Set 构造
+    const agentPos = script.indexOf("async function agent(firstArg, secondArg)");
+    const parallelPos = script.indexOf("async function parallel(calls)");
+    expect(agentPos).toBeGreaterThan(-1);
+    expect(parallelPos).toBeGreaterThan(agentPos);
+    const agentBody = script.slice(agentPos, parallelPos);
+    expect(agentBody).not.toContain("new Set(");
+    expect(agentBody).toContain("_KNOWN_FIELDS.has(k)");
+  });
+
+  it("字段集合内容逐字段一致（16 known fields 不丢失）", () => {
+    expect(script).toContain(
+      'const _KNOWN_FIELDS = new Set(["prompt", "description", "schema", "model", "scene", "label", "task", "agent", "phase", "skill", "timeoutMs", "cwd", "fork", "worktree", "returnMeta", "thinkingLevel"]);',
+    );
+    // unknown-fields 警告文案不变（known 列表仍全量）
+    expect(script).toMatch(/Known fields:.*returnMeta.*thinkingLevel/);
+  });
+});

package/src/orchestration/__tests__/workflow-nesting-e2e.test.ts

@@ -21,8 +21,6 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 vi.mock("../lifecycle.ts", () => ({
   runWorkflow: vi.fn(),
   abortRun: vi.fn(async () => {}),
-  pauseRun: vi.fn(async () => {}),
-  resumeRun: vi.fn(async () => {}),
   scheduleTimeBudget: vi.fn(() => undefined),
 }));
 

package/src/orchestration/__tests__/workflow-script-lint-memo.test.ts

@@ -0,0 +1,110 @@
+/**
+ * WorkflowScript.validate lint memo（IF9/#15，TC9/DM2）— 引用相等键缓存测试。
+ *
+ * vi.mock script-lint 模块统计 lintScript 调用次数（design IF9 测试面）：
+ * - 同 path + sourceCode 相等（含等值异字面量）→ 二次 validate 只 1 次 lint 调用
+ * - 【设计修正】design 原文「异引用等值 miss」在 JS 不可构造：字符串 === 是值相等
+ *   （实测等值异字面量命中）。lintScript 是纯函数，值相等 ⟹ 结果相同，值键 memo
+ *   语义严格正确且是引用键意图的超集（registry 等值重建实例同样命中）。
+ * - 同 path 新内容（值不等）→ 重 lint 并更新条目
+ * - clearLintMemo → 重 lint（config-loader.invalidateCache 挂载点）
+ */
+import { describe, it, expect, vi, beforeEach } from "vitest";
+
+const lintCalls = vi.hoisted(() => ({ count: 0 }));
+
+vi.mock("../script-lint.ts", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../script-lint.ts")>();
+  const realLintScript = actual.lintScript;
+  const countingLintScript = ((source: string) => {
+    lintCalls.count++;
+    return realLintScript(source);
+  }) as typeof actual.lintScript;
+  return { ...actual, lintScript: countingLintScript };
+});
+
+import { WorkflowScript, clearLintMemo, type WorkflowMeta } from "../models/workflow-script.ts";
+
+const meta: WorkflowMeta = {
+  kind: "workflow",
+  name: "w",
+  description: "",
+  phases: [],
+};
+
+function makeScript(path: string, sourceCode: string): WorkflowScript {
+  return new WorkflowScript({
+    name: "w",
+    source: "saved",
+    path,
+    sourceCode,
+    meta,
+    available: true,
+  });
+}
+
+const VALID = '/* @pi-meta name: w */\nagent({ prompt: "x" });\n';
+
+beforeEach(() => {
+  clearLintMemo();
+  lintCalls.count = 0;
+});
+
+describe("WorkflowScript.validate — lintMemo（IF9）", () => {
+  it("同 sourceCode 引用：二次 validate 只 1 次 lint 调用", () => {
+    const src = VALID;
+    const a = makeScript("/ws/.pi/workflows/w.js", src);
+    const b = makeScript("/ws/.pi/workflows/w.js", src); // registry 重建实例场景
+
+    const ra = a.validate();
+    const rb = b.validate();
+
+    expect(lintCalls.count).toBe(1);
+    expect(rb).toEqual(ra); // 缓存返回同一 lint 结果
+  });
+
+  it("等值异字面量同样命中（JS === 值相等；lintScript 纯函数 ⟹ 值键 memo 正确）", () => {
+    const a = makeScript("/ws/.pi/workflows/w.js", VALID);
+    const b = makeScript("/ws/.pi/workflows/w.js", `/* @pi-meta name: w */\nagent({ prompt: "x" });\n`);
+
+    a.validate();
+    b.validate();
+
+    // 设计原文预期「异引用 miss → 2 次」，但字符串 === 是值相等，等值必命中；
+    // lintScript(source) 纯函数，同值同结果，缓存正确性不受影响（实测锚定）。
+    expect(lintCalls.count).toBe(1);
+  });
+
+  it("同 path 新内容（值不等）：重 lint 并更新条目", () => {
+    const path = "/ws/.pi/workflows/w.js";
+    const old = makeScript(path, VALID);
+    old.validate();
+    expect(lintCalls.count).toBe(1);
+
+    const edited = makeScript(path, '/* @pi-meta name: w */\nagent({ prompt: "y", outputSchema: {} });\n');
+    edited.validate();
+    expect(lintCalls.count).toBe(2); // 新引用 → miss → 重 lint
+
+    // 新条目已覆写：再以 edited 同引用 validate 命中缓存
+    const replay = makeScript(path, edited.sourceCode);
+    replay.validate();
+    expect(lintCalls.count).toBe(2);
+  });
+
+  it("clearLintMemo 后重 lint（invalidateCache 挂载点）", () => {
+    const a = makeScript("/ws/.pi/workflows/w.js", VALID);
+    a.validate();
+    expect(lintCalls.count).toBe(1);
+
+    clearLintMemo();
+    a.validate();
+    expect(lintCalls.count).toBe(2);
+  });
+
+  it("不同 path 互不共享条目", () => {
+    const src = VALID;
+    makeScript("/ws/.pi/workflows/a.js", src).validate();
+    makeScript("/ws/.pi/workflows/b.js", src).validate();
+    expect(lintCalls.count).toBe(2);
+  });
+});

package/src/orchestration/__tests__/workflows-e2e.test.ts

@@ -279,7 +279,7 @@ interface ScriptOutcome {
 /**
  * 断言 runAndWait 返回成功完成的终态。
  *
- * - result.status === "done"（runAndWait 恒 done）
+ * - result.status === "closed"（runAndWait 恒 done）
  * - result.reason === "completed"（脚本正常 return，非 failed/aborted/time_limited）
  * - result.scriptResult.status 是 "ok" 或 "partial"（脚本层 outcome，非 "error"）
  * - result.error 为 undefined
@@ -476,63 +476,61 @@ describe("内置 workflow E2E（真实 worker thread + mock LLM runner）", () =
 
   it("TC4: actionRun 顺序——not_found 优先（平铺 + 不存在名）；slug 护栏保留；chain 平铺 Correct 文案", async () => {
     const deps = makeDeps();
-    // 平铺 + 不存在 name → not_found 优先（m6：registry.get 先于平铺检测）
-    const notFound = await actionRun(
+    // 平铺 + 不存在 name → not_found 优先（m6：registry.get 先于平铺检测）。
+    // W4：not_found 改 throw（pi 只对 execute throw 置 isError:true，返回值里的
+    // isError 被 agent-loop 丢弃）——文案含 <available_workflows> <location> 恢复指引，
+    // pi catch 后原样进 toolResult content。
+    const notFoundErr: Error = await actionRun(
       { action: "run", name: wf("nope"), task: "x" },
       deps,
       undefined,
-    );
-    expect(notFound.isError).toBe(true);
-    expect(notFound.content![0]!.text).toContain("not found"); // DoD 用户可见断言
-    // R5（D7）：workflow not_found 文案含 <available_workflows> <location> 恢复指引
-    expect(notFound.content![0]!.text).toContain("<available_workflows>");
-    expect(notFound.content![0]!.text).toContain("<location>");
-    // chain 平铺 task → isError Correct 正例（动态集来自 registry）
-    const flat = await actionRun(
+    ).catch((e: unknown) => e as Error);
+    expect(notFoundErr).toBeInstanceOf(Error);
+    expect(notFoundErr.message).toContain("not found"); // DoD 用户可见断言
+    expect(notFoundErr.message).toContain("<available_workflows>");
+    expect(notFoundErr.message).toContain("<location>");
+    // chain 平铺 task → throw Correct 正例（动态集来自 registry；W4b：原 textResult
+    // 间接 isError 返回改 throw——pi 只对 execute throw 置 isError:true，
+    // 返回值里的 isError 被 agent-loop 丢弃）
+    const flatErr: Error = await actionRun(
       { action: "run", name: wf("chain"), task: "x" },
       deps,
       undefined,
-    );
-    expect(flat.isError).toBe(true);
-    expect(flat.content![0]!.text).toContain("Detected task at top level");
-    expect(flat.content![0]!.text).toContain("Correct:");
-    // slug 护栏保留（m6 顺序调整后仍在 runWorkflow 前）
-    const slug = await actionRun(
+    ).catch((e: unknown) => e as Error);
+    expect(flatErr).toBeInstanceOf(Error);
+    expect(flatErr.message).toContain("Detected task at top level");
+    expect(flatErr.message).toContain("Correct:");
+    // slug 护栏保留（m6 顺序调整后仍在 runWorkflow 前；W4b 同改 throw）
+    const slugErr: Error = await actionRun(
       { action: "run", name: wf("chain"), args: { task: "x" }, slug: "a".repeat(40) },
       deps,
       undefined,
-    );
-    expect(slug.isError).toBe(true);
-    expect(slug.content![0]!.text).toContain("slug exceeds");
+    ).catch((e: unknown) => e as Error);
+    expect(slugErr).toBeInstanceOf(Error);
+    expect(slugErr.message).toContain("slug exceeds");
   });
 
   it("TC6: 跨 workflow 平铺语义——review-fix-loop 平铺 task（非其参数）走 args-validator", async () => {
     const deps = makeDeps();
     // task 是 chain 参数非 review-fix-loop 参数 → 不报平铺 → args 缺 targetType
-    // → m3 chokepoint invalid_args（错误更准——评审 m-5 语义锁定）
-    const result = await actionRun(
-      { action: "run", name: wf("review-fix-loop"), task: "x" },
-      deps,
-      undefined,
-    );
-    expect(result.isError).toBe(true);
-    expect(result.content![0]!.text).toContain("Invalid args for workflow 'review-fix-loop'");
-    expect(result.content![0]!.text).toContain("targetType");
+    // → m3 chokepoint invalid_args（错误更准——评审 m-5 语义锁定）。
+    // W4：ArgsValidationError 直接 throw（message 原文即 §5.3 指引）
+    await expect(
+      actionRun({ action: "run", name: wf("review-fix-loop"), task: "x" }, deps, undefined),
+    ).rejects.toThrow(/Invalid args for workflow 'review-fix-loop'[\s\S]*targetType/);
   });
 
-  it("TC9: actionRun 参数校验失败 → isError ToolResult + §5.3 指引", async () => {
+  it("TC9: actionRun 参数校验失败 → throw + §5.3 指引（W4）", async () => {
     const deps = makeDeps();
-    const result = await actionRun(
-      { action: "run", name: wf("review-fix-loop"), args: { batch1: agentMd("code-reviewer") } },
-      deps,
-      undefined,
+    await expect(
+      actionRun(
+        { action: "run", name: wf("review-fix-loop"), args: { batch1: agentMd("code-reviewer") } },
+        deps,
+        undefined,
+      ),
+    ).rejects.toThrow(
+      /Invalid args for workflow 'review-fix-loop'[\s\S]*targetType[\s\S]*Read the workflow script file/,
     );
-
-    expect(result.isError).toBe(true);
-    const text = result.content?.[0]?.text ?? "";
-    expect(text).toContain("Invalid args for workflow 'review-fix-loop'");
-    expect(text).toContain("targetType");
-    expect(text).toContain("Read the workflow script file");
   });
 
 

package/src/orchestration/agent-opts-resolver.ts

@@ -21,6 +21,7 @@
 
 import type { AgentCallOpts } from "./models/types.ts";
 import { resolveSkillPath } from "./skill-discovery.ts";
+import { stringifySchemaCached } from "../shared/schema-jsonify.ts";
 
 export interface ResolveResult {
   opts: AgentCallOpts;
@@ -59,7 +60,9 @@ export function resolveAgentOpts(opts: AgentCallOpts): ResolveResult {
  // which got concatenated into the final append file as path garbage — the SO instruction
  // never reached the subprocess. Now the instruction content is pushed directly.
   if (opts.schema) {
-    const schemaJson = JSON.stringify(opts.schema);
+    // IF7(#13)：同 schema 对象引用的 compact stringify 走 WeakMap 缓存
+    // （与 session-runner formatSchemaInstruction 的 pretty 版共享缓存条目）
+    const schemaJson = stringifySchemaCached(opts.schema, "compact");
     const content = [
       "## MANDATORY: Structured Output Requirement",
       "",

package/src/orchestration/args-validator.ts

@@ -62,8 +62,8 @@ function formatMessage(name: string, errors: readonly unknown[]): string {
  * 校验 spec.parameters（JSON Schema draft-07）对 spec.args 的约束。
  *
  * - spec.parameters === undefined → 跳过（安全退化：漏拷 parameters 退化是「不校验」非「校验错」）
- * - coerceTypes 原地规范化 spec.args（worker 启动 + pause/resume 重建共用同一对象，
- *   run.spec === spec，保证恢复路径参数一致）
+ * - coerceTypes 原地规范化 spec.args（worker 启动 + 崩溃重建重跑共用同一对象，
+ *   run.spec === spec，保证重跑路径参数一致）
  * - 失败 throw ArgsValidationError（非原始 ajv 错误）
  *
  * @throws ArgsValidationError 参数不合法或 schema 无效

package/src/orchestration/config-loader.ts

@@ -16,6 +16,7 @@ import { resolve } from "node:path";
 
 // WorkflowMeta 规范来源是 shared/resource-meta.ts（m1 DM1）；WorkflowSource 来自 workflow-script
 import type { WorkflowSource } from "./models/workflow-script.ts";
+import { clearLintMemo } from "./models/workflow-script.ts";
 import type { WorkflowMeta } from "../shared/resource-meta.ts";
 import { getCachedFile, getCachedFileContent, clearFileCache } from "../shared/resource-discovery.ts";
 import { parseResourceMeta } from "../shared/meta-parser.ts";
@@ -93,6 +94,20 @@ function toWorkflowSource(source: ResourceSource): WorkflowSource {
   return source === "project-pi-tmp" ? "tmp" : "saved";
 }
 
+/**
+ * 按路径推导 ResourceSource（IF4/外部 #5 残留）。
+ *
+ * getWorkflowByPath 可加载任意绝对路径（不限扫描源），此前硬编码 "user-pi"
+ * 使 workspaceRoot/.pi/workflows/.tmp/ 下的临时脚本按路径加载被错标 saved
+ * （discoverWorkflows 对同文件正确标 tmp，两路径不一致）。修正：路径落在
+ * tmp 目录前缀内 → "project-pi-tmp"，其余 → "user-pi"（非 tmp 路径输出不变，DS4）。
+ */
+function deriveResourceSource(filePath: string, workspaceRoot: string): ResourceSource {
+  const tmpDir = resolve(workspaceRoot, ".pi/workflows/.tmp");
+  const normalized = resolve(filePath);
+  return normalized === tmpDir || normalized.startsWith(`${tmpDir}/`) ? "project-pi-tmp" : "user-pi";
+}
+
 // ── 单文件 → CachedWorkflowMeta（IF1 parseResourceMeta + 整对象透传）──
 
 /**
@@ -264,11 +279,23 @@ export async function getWorkflow(name: string): Promise<CachedWorkflowMeta | un
  * - ~/ 前缀展开；相对路径/非 .js 引用返回 undefined（引用唯一形态 = 绝对路径）
  * - 任意路径（不限扫描源）：内置包内脚本、用户任意位置脚本均可执行
  * - meta 提取失败/文件不可读 → available=false（fail-safe，不抛）
+ * - [perf] 与 getWorkflow(name) 对称走 bucket 缓存（key=绝对路径，与 stem 名不冲突），
+ *   消除 workflow tool 主路径每次 run 的全文 regex + YAML.parse（mtime 判变失效）
  */
 export async function getWorkflowByPath(ref: string): Promise<CachedWorkflowMeta | undefined> {
   const filePath = normalizeRef(ref, WORKFLOW_REF_EXT);
   if (filePath === null) return undefined;
-  return toCachedMeta(filePath, "user-pi");
+  const workspaceRoot = findWorkspaceRoot();
+  const bucket = getCacheBucket(workspaceRoot);
+  const cached = bucket.get(filePath);
+  if (cached && isCacheValid(cached)) {
+    return cached.meta;
+  }
+  // IF4：source 按路径推导——.tmp 前缀 → project-pi-tmp（→ "tmp"），其余 user-pi 维持现值
+  const meta = await toCachedMeta(filePath, deriveResourceSource(filePath, workspaceRoot));
+  const file = getCachedFile(filePath);
+  if (file) bucket.set(filePath, { meta, mtimeMs: file.mtimeMs });
+  return meta;
 }
 
 /**
@@ -277,6 +304,8 @@ export async function getWorkflowByPath(ref: string): Promise<CachedWorkflowMeta
  */
 export function invalidateCache(): void {
   // m5：清统一 mtime 缓存层 + bucket（测试隔离 + mtime 漏判场景手动刷新兜底）
+  // IF9：连带清 workflow-script validate 的 lint memo（同源文件缓存，测试隔离统一走它）
   clearFileCache();
   cache.clear();
+  clearLintMemo();
 }