@zhushanwen/pi-subagent-workflow 7.4.0 → 8.1.0

package/src/orchestration/__tests__/skill-discovery.test.ts

@@ -1,88 +1,157 @@
 /**
- * resolveSkillPath 测试（S-6：getAgentDir 迁移后全局/npm 两级候选路径断言兜底）。
- * 候选顺序：项目级 .agents/skills → agentDir/skills → agentDir/npm/node_modules 下各包 skills。
- * 注意：getNpmSkillCandidates 有模块级缓存（key = npmSkillsDir），各用例用不同 agentDir 隔离缓存键。
+ * skill-discovery — resolveSkillPath 结果缓存（IF8/#14）+ 搜索序测试。
+ *
+ * 现状该文件此前零测试，本文件为首个测试（design IF8 契约）：
+ * - hit 不再 existsSync（计数 wrapper 观察，spyOn ESM namespace 不可配置的既有教训）
+ * - 未命中 undefined 也缓存（不存在的名字二次调用零 stat）
+ * - clearSkillPathCache 后重扫
+ * - project 优先于 user/npm 的搜索序
+ *
+ * [merge 注] main 侧同名文件（mock-fs 版）的 5 用例语义均已覆盖：搜索序三用例
+ * 同名等价；「npm 候选路径构造含 agentDir」= 本文件各用例断言 join(homeRoot,
+ * ".pi/agent/npm/...") 完整路径 + npm 兜底用例的多包枚举；「全 miss undefined 含
+ * readdirSync ENOENT 兜底」= 「未命中 undefined 也缓存」用例（homeRoot 无 npm 目录，
+ * 真实 fs 下 ENOENT 由实现 catch）。mock 版被本集成版取代。
+ *
+ * 隔离：node:fs 的 existsSync 用 vi.mock 包一层计数（委托真实实现）；
+ * getAgentDir 用 vi.mock 覆盖为临时 home（vitest alias 指向 mocks/pi-coding-agent.ts
+ * 的硬编码桩 "/home/user/.pi/agent"，桩不读 os.homedir——mock node:os 无法影响它）；
+ * process.cwd 用 spyOn。
  */
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import * as path from "node:path";
-import * as fs from "node:fs";
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, mkdirSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 
-vi.mock("node:fs", () => ({
-  readdirSync: vi.fn(),
-  existsSync: vi.fn(),
+const { existsSyncCalls, osHome } = vi.hoisted(() => ({
+  existsSyncCalls: { count: 0 },
+  osHome: { dir: "/nonexistent-home-skill-tests" },
 }));
 
-vi.mock("@earendil-works/pi-coding-agent", () => ({
-  getAgentDir: vi.fn(() => "/mock/agent-dir"),
-}));
+vi.mock("node:fs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:fs")>();
+  const realExistsSync = actual.existsSync;
+  // 计数 wrapper（委托真实实现）——vi.spyOn(fs, "existsSync") 在 ESM 模块
+  // 命名空间不可配置（record-store-index.test.ts:419 同款教训），改用 mock 工厂。
+  const countingExistsSync = ((p: string) => {
+    existsSyncCalls.count++;
+    return realExistsSync(p);
+  }) as typeof actual.existsSync;
+  return { ...actual, existsSync: countingExistsSync };
+});
+
+vi.mock("@earendil-works/pi-coding-agent", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@earendil-works/pi-coding-agent")>();
+  const { join } = await import("node:path");
+  // 桩不读 os.homedir，必须在此把 agentDir 指向 hoisted 临时 home（beforeEach 注入 homeRoot）
+  return { ...actual, getAgentDir: () => join(osHome.dir, ".pi", "agent") };
+});
+
+import { clearSkillPathCache, resolveSkillPath } from "../skill-discovery.ts";
 
-import { getAgentDir } from "@earendil-works/pi-coding-agent";
-import { resolveSkillPath } from "../skill-discovery";
+// ── 临时目录工具 ──────────────────────────────────────────────
 
-const mockedFs = vi.mocked(fs);
-const mockedGetAgentDir = vi.mocked(getAgentDir);
+let projRoot: string;
+let homeRoot: string;
 
 beforeEach(() => {
-  mockedFs.existsSync.mockReset();
-  mockedFs.readdirSync.mockReset();
-  mockedGetAgentDir.mockReturnValue("/mock/agent-dir");
-  // 默认：任何路径都不存在、npm 目录无包
-  mockedFs.existsSync.mockReturnValue(false);
-  mockedFs.readdirSync.mockReturnValue([]);
+  clearSkillPathCache();
+  existsSyncCalls.count = 0;
+  projRoot = mkdtempSync(join(tmpdir(), "skill-proj-"));
+  homeRoot = mkdtempSync(join(tmpdir(), "skill-home-"));
+  osHome.dir = homeRoot;
 });
 
-describe("resolveSkillPath", () => {
-  it("项目级 .agents/skills 优先命中（返回 cwd 相对路径）", () => {
-    const projectPath = path.resolve(process.cwd(), ".agents/skills", "foo");
-    mockedFs.existsSync.mockImplementation((p) => p === projectPath);
+afterEach(() => {
+  vi.restoreAllMocks();
+  rmSync(projRoot, { recursive: true, force: true });
+  rmSync(homeRoot, { recursive: true, force: true });
+});
+
+/** mkdir -p（目录存在即 resolveSkillPath 命中——检查的是目录而非 SKILL.md）。 */
+function mkdirp(dir: string): void {
+  mkdirSync(dir, { recursive: true });
+}
+
+describe("resolveSkillPath — 搜索序（project > user > npm）", () => {
+  it("project 优先：同名 skill 同时存在于 project/user/npm 时返回 project 路径", () => {
+    const cwdSpy = vi.spyOn(process, "cwd").mockReturnValue(projRoot);
+    const name = "dup-skill";
+    mkdirp(join(projRoot, ".agents/skills", name));
+    mkdirp(join(homeRoot, ".pi/agent/skills", name));
+    mkdirp(join(homeRoot, ".pi/agent/npm/node_modules/some-pkg/skills", name));
+
+    const resolved = resolveSkillPath(name);
 
-    expect(resolveSkillPath("foo")).toBe(projectPath);
+    expect(resolved).toBe(join(projRoot, ".agents/skills", name));
+    expect(cwdSpy).toHaveBeenCalled();
   });
 
-  it("agentDir 全局 skills 兜底（路径含 getAgentDir 返回值）", () => {
-    const agentPath = path.join("/mock/agent-dir", "skills", "foo");
-    mockedFs.existsSync.mockImplementation((p) => p === agentPath);
+  it("user 次之：仅 user/npm 存在时返回 user 路径", () => {
+    vi.spyOn(process, "cwd").mockReturnValue(projRoot);
+    const name = "user-skill";
+    mkdirp(join(homeRoot, ".pi/agent/skills", name));
+    mkdirp(join(homeRoot, ".pi/agent/npm/node_modules/some-pkg/skills", name));
 
-    expect(resolveSkillPath("foo")).toBe(agentPath);
+    expect(resolveSkillPath(name)).toBe(join(homeRoot, ".pi/agent/skills", name));
   });
 
-  it("npm 候选命中：readdirSync 枚举包目录，skills/<name> 存在则返回 agentDir 派生路径", () => {
-    // 独立 agentDir 避免命中前序用例已缓存的空 npm 候选（getNpmSkillCandidates 按 npmSkillsDir 缓存）
-    mockedGetAgentDir.mockReturnValue("/mock/agent-dir-npm");
-    const npmSkillsDir = path.join("/mock/agent-dir-npm", "npm/node_modules");
-    const npmHit = path.join(npmSkillsDir, "@zhushanwen/pi-x", "skills", "foo");
-    mockedFs.readdirSync.mockImplementation((dir) =>
-      dir === npmSkillsDir ? ["@zhushanwen/pi-x"] : [],
+  it("npm 兜底：仅 npm 包内存在时返回包内 skills 路径（readdirSync 枚举多包候选）", () => {
+    vi.spyOn(process, "cwd").mockReturnValue(projRoot);
+    const name = "npm-skill";
+    // 两个包并存：断言实现枚举 npm/node_modules 下每个包（S-6 语义，防只查首个包的回退）
+    mkdirp(join(homeRoot, ".pi/agent/npm/node_modules/pkg-a/other", "x"));
+    mkdirp(join(homeRoot, ".pi/agent/npm/node_modules/some-pkg/skills", name));
+
+    expect(resolveSkillPath(name)).toBe(
+      join(homeRoot, ".pi/agent/npm/node_modules/some-pkg/skills", name),
     );
-    mockedFs.existsSync.mockImplementation((p) => p === npmHit);
+  });
+});
+
+describe("resolveSkillPath — 结果缓存（IF8/DM3）", () => {
+  it("hit 不再 existsSync：二次调用零 stat", () => {
+    vi.spyOn(process, "cwd").mockReturnValue(projRoot);
+    const name = "cache-hit";
+    const expected = join(projRoot, ".agents/skills", name);
+    mkdirp(expected);
 
-    expect(resolveSkillPath("foo")).toBe(npmHit);
+    const first = resolveSkillPath(name);
+    const callsAfterFirst = existsSyncCalls.count;
+    expect(first).toBe(expected);
+    expect(callsAfterFirst).toBeGreaterThan(0);
+
+    const second = resolveSkillPath(name);
+    expect(second).toBe(expected);
+    expect(existsSyncCalls.count).toBe(callsAfterFirst); // 零增量
   });
 
-  it("npm 候选路径构造含 agentDir（getAgentDir 迁移后的候选断言，防回退硬编码）", () => {
-    mockedGetAgentDir.mockReturnValue("/mock/agent-dir-2");
-    const npmSkillsDir = path.join("/mock/agent-dir-2", "npm/node_modules");
-    const probed: string[] = [];
-    mockedFs.existsSync.mockImplementation((p) => {
-      probed.push(p as string);
-      return false;
-    });
-    mockedFs.readdirSync.mockImplementation((dir) =>
-      dir === npmSkillsDir ? ["pkg-a", "pkg-b"] : [],
-    );
+  it("未命中 undefined 也缓存：不存在的名字二次调用零 stat", () => {
+    vi.spyOn(process, "cwd").mockReturnValue(projRoot);
+    const name = "no-such-skill-xyz";
 
-    expect(resolveSkillPath("missing")).toBeUndefined();
-    // 探测过的候选必须包含 agentDir 派生的 npm 路径
-    expect(probed).toContain(path.join(npmSkillsDir, "pkg-a", "skills", "missing"));
-    expect(probed).toContain(path.join(npmSkillsDir, "pkg-b", "skills", "missing"));
+    const first = resolveSkillPath(name);
+    expect(first).toBeUndefined();
+    const callsAfterFirst = existsSyncCalls.count;
+    expect(callsAfterFirst).toBeGreaterThan(0);
+
+    const second = resolveSkillPath(name);
+    expect(second).toBeUndefined();
+    expect(existsSyncCalls.count).toBe(callsAfterFirst); // 零增量（未命中也缓存）
   });
 
-  it("全部 miss 返回 undefined（含 npm 目录不存在时 readdirSync 抛错兜底）", () => {
-    mockedFs.readdirSync.mockImplementation(() => {
-      throw new Error("ENOENT");
-    });
-    mockedFs.existsSync.mockReturnValue(false);
+  it("clearSkillPathCache 后重扫：计数恢复增长且结果一致", () => {
+    vi.spyOn(process, "cwd").mockReturnValue(projRoot);
+    const name = "cache-clear";
+    const expected = join(projRoot, ".agents/skills", name);
+    mkdirp(expected);
+
+    expect(resolveSkillPath(name)).toBe(expected);
+    const callsAfterFirst = existsSyncCalls.count;
+    expect(callsAfterFirst).toBeGreaterThan(0);
 
-    expect(resolveSkillPath("nope")).toBeUndefined();
+    clearSkillPathCache();
+    expect(resolveSkillPath(name)).toBe(expected);
+    expect(existsSyncCalls.count).toBeGreaterThan(callsAfterFirst); // 重扫发生
   });
 });

package/src/orchestration/__tests__/test-mocks.ts

@@ -0,0 +1,197 @@
+// src/orchestration/__tests__/test-mocks.ts
+//
+// Pi ExtensionAPI / ExtensionContext 测试 mock 工厂（PR #173 review S8）。
+//
+// 为什么需要工厂：此前测试用 `as never` 注入残缺 mock（如 `{ appendEntry: vi.fn() }`
+// 直接塞进 `JsonlRunStoreOptions.pi`）。`as never` 是 bottom type 断言，mock 缺字段时
+// 编译期零报错，比 `as unknown as T` 更危险。工厂返回**类型完整**的对象——被 mock
+// 接口（真实 SDK 类型，tsc 按根 tsconfig 排除规则不检查 __tests__，但编辑器 LSP 与
+// 显式 tsc 文件级检查会检查）新增成员时，这里补默认值即暴露，用例侧不再有断言后门。
+//
+// 语义约定：
+// - 默认值贴近真实行为：sessionManager.getEntries 返回浅拷贝（真实 SessionManager
+//   契约）；appendEntry 捕获变体追加完整 CustomEntry（真实 pi.appendEntry 即向 session
+//   追加 CustomEntry）；isIdle → true、hasPendingMessages → false 等按真实语义取值。
+// - 测试真正消费的成员（jsonl-run-store 只读 ctx.sessionManager.getEntries 与
+//   pi.appendEntry）行为真实；其余成员为 no-op spy（vi.fn()），调用不炸但返回
+//   undefined——本包测试不消费它们。
+// - modelRegistry / ui.theme 是含 private 字段的 nominal class：真实构造需
+//   ModelRuntime.create()（async + 读用户级 models.json）/ loadTheme 读包文件，且
+//   vitest 把 @earendil-works/pi-coding-agent alias 到 mocks/（无这些值导出），结构
+//   构造又被 private 字段阻断。二者经 fail-loud Proxy 提供：误用时立即抛错（而非
+//   静默 undefined），把「缺 mock」变成显式失败。这是本文件仅有的两处断言收敛点。
+
+import { vi } from "vitest";
+
+import type {
+  CustomEntry,
+  ExtensionAPI,
+  ExtensionContext,
+  ExtensionUIContext,
+  ModelRegistry,
+  Theme,
+} from "@earendil-works/pi-coding-agent";
+
+/**
+ * 误用即抛错的占位成员：比静默返回 undefined 的 no-op 更早暴露「缺 mock」。
+ *
+ * T 收窄为 object：调用点（ModelRegistry/Theme）均为对象类型；Proxy 静态类型是 `{}`，
+ * 目标是 nominal class（private 字段阻断结构构造），单重 `as T` 断言已足够表达
+ * 「结构上无法构造，运行时 fail-loud 兜底」的意图，无需 `as unknown as T` 双重断言。
+ */
+function failLoud<T extends object>(memberPath: string): T {
+  return new Proxy(
+    {},
+    {
+      get(_target, prop) {
+        throw new Error(
+          `[test-mocks] ${memberPath}.${String(prop)} 未提供 mock 实现——` +
+            `本测试不应消费该成员；确需消费时经 overrides 显式提供`,
+        );
+      },
+    },
+  ) as T;
+}
+
+/**
+ * 构造类型完整的 ExtensionContext。
+ *
+ * @param entries sessionManager.getEntries 的返回源（浅拷贝返回）。与 mkPi(entries)
+ *   共享同一数组时可复现真实 pi 行为：appendEntry 写入 ↔ getEntries 读出。
+ * @param overrides 覆写任意 ctx 字段（浅合并，整体替换成员，最后应用）。
+ */
+export function mkCtx(
+  entries: CustomEntry[] = [],
+  overrides: Partial<ExtensionContext> = {},
+): ExtensionContext {
+  const ctx: ExtensionContext = {
+    ui: mkUi(),
+    // pi 在 xyz-agent 下以 rpc 子进程模式运行；rpc 模式 hasUI 为 true（SDK 契约注释）
+    mode: "rpc",
+    hasUI: true,
+    cwd: "/tmp",
+    sessionManager: {
+      getCwd: () => "/tmp",
+      getSessionDir: () => "/tmp/sessions-test",
+      getSessionId: () => "session-test",
+      // 真实语义：首条 assistant 消息前 session 文件未落盘，返回 undefined
+      getSessionFile: () => undefined,
+      getLeafId: () => null,
+      getLeafEntry: () => undefined,
+      getEntry: () => undefined,
+      getLabel: () => undefined,
+      getBranch: () => [],
+      buildContextEntries: () => [],
+      getHeader: () => null,
+      // 真实 SessionManager.getEntries 返回浅拷贝
+      getEntries: () => [...entries],
+      getTree: () => [],
+      getSessionName: () => undefined,
+    },
+    modelRegistry: failLoud<ModelRegistry>("ctx.modelRegistry"),
+    // SDK 契约：model / signal 在 agent 未流式输出时合法为 undefined
+    model: undefined,
+    isIdle: vi.fn(() => true),
+    isProjectTrusted: vi.fn(() => true),
+    signal: undefined,
+    abort: vi.fn(),
+    hasPendingMessages: vi.fn(() => false),
+    shutdown: vi.fn(),
+    getContextUsage: vi.fn(() => undefined),
+    compact: vi.fn(),
+    getSystemPrompt: vi.fn(() => ""),
+  };
+  return Object.assign(ctx, overrides);
+}
+
+/** ExtensionUIContext 完整 no-op mock（theme 为 fail-loud 占位，见文件头说明）。 */
+function mkUi(): ExtensionUIContext {
+  return {
+    select: vi.fn(async () => undefined),
+    confirm: vi.fn(async () => false),
+    input: vi.fn(async () => undefined),
+    notify: vi.fn(),
+    onTerminalInput: vi.fn(() => () => {}),
+    setStatus: vi.fn(),
+    setWorkingMessage: vi.fn(),
+    setWorkingVisible: vi.fn(),
+    setWorkingIndicator: vi.fn(),
+    setHiddenThinkingLabel: vi.fn(),
+    setWidget: vi.fn(),
+    setFooter: vi.fn(),
+    setHeader: vi.fn(),
+    setTitle: vi.fn(),
+    custom: vi.fn(),
+    pasteToEditor: vi.fn(),
+    setEditorText: vi.fn(),
+    getEditorText: vi.fn(() => ""),
+    editor: vi.fn(async () => undefined),
+    addAutocompleteProvider: vi.fn(),
+    setEditorComponent: vi.fn(),
+    getEditorComponent: vi.fn(() => undefined),
+    theme: failLoud<Theme>("ctx.ui.theme"),
+    getAllThemes: vi.fn(() => []),
+    getTheme: vi.fn(() => undefined),
+    setTheme: vi.fn(() => ({ success: true })),
+    getToolsExpanded: vi.fn(() => false),
+    setToolsExpanded: vi.fn(),
+  };
+}
+
+/**
+ * 构造类型完整的 ExtensionAPI。
+ *
+ * @param entries 给定时，appendEntry 追加完整 CustomEntry 到该数组（真实
+ *   pi.appendEntry 语义：向 session 追加 custom entry）；缺省为纯 spy（可断言
+ *   调用次数、无副作用）。
+ * @param overrides 覆写任意 pi 字段（浅合并，最后应用）。
+ */
+export function mkPi(
+  entries?: CustomEntry[],
+  overrides: Partial<ExtensionAPI> = {},
+): ExtensionAPI {
+  const appendEntry =
+    entries === undefined
+      ? vi.fn()
+      : vi.fn((customType: string, data?: unknown) => {
+          entries.push({
+            type: "custom",
+            customType,
+            data,
+            id: `entry-${entries.length}`,
+            parentId: null,
+            timestamp: new Date().toISOString(),
+          });
+        });
+  const pi: ExtensionAPI = {
+    on: vi.fn(),
+    registerTool: vi.fn(),
+    registerCommand: vi.fn(),
+    registerShortcut: vi.fn(),
+    registerFlag: vi.fn(),
+    getFlag: vi.fn(() => undefined),
+    registerMessageRenderer: vi.fn(),
+    registerEntryRenderer: vi.fn(),
+    sendMessage: vi.fn(),
+    sendUserMessage: vi.fn(),
+    appendEntry,
+    setSessionName: vi.fn(),
+    getSessionName: vi.fn(() => undefined),
+    setLabel: vi.fn(),
+    exec: vi.fn(),
+    getActiveTools: vi.fn(() => []),
+    getAllTools: vi.fn(() => []),
+    setActiveTools: vi.fn(),
+    getCommands: vi.fn(() => []),
+    setModel: vi.fn(async () => true),
+    getThinkingLevel: vi.fn(),
+    setThinkingLevel: vi.fn(),
+    registerProvider: vi.fn(),
+    unregisterProvider: vi.fn(),
+    events: {
+      emit: vi.fn(),
+      on: vi.fn(() => () => {}),
+    },
+  };
+  return Object.assign(pi, overrides);
+}

package/src/orchestration/__tests__/worker-returnmeta-passthrough.test.ts

@@ -0,0 +1,164 @@
+/**
+ * rfl 仪表 T1（tier-1 §7.1）：returnMeta 透传 usage/durationMs/sessionId。
+ *
+ * 两个对称点的运行时验证（worker-script-builder 模板字符串断言无法证明
+ * 「真实 Worker 线程里 resolve 对象字段齐全」）：
+ *   A1 live resolve——agent-result 消息回发完整 AgentResult，returnMeta:true
+ *      时 resolve 对象 = {value, sessionFile, worktreePath, error, usage, durationMs, sessionId}
+ *   A2 缓存重放——workerData.callCache 命中时重建对象同样含三字段（对称点）
+ *
+ * 模式与 worker-script-builder-runtime.test.ts 相同：真实 Worker 线程执行
+ * buildWorkerScript 产物，主线程模拟 runtime 回发消息。
+ */
+import { Worker } from "node:worker_threads";
+
+import { afterEach, describe, expect, it } from "vitest";
+
+import { buildWorkerScript } from "../worker-script-builder.ts";
+
+const USAGE = { input: 100, output: 50, cacheRead: 700, cacheWrite: 30, cost: 0.012, contextTokens: 850, turns: 3 };
+
+const createdWorkers: Worker[] = [];
+
+afterEach(() => {
+  for (const w of createdWorkers.splice(0)) {
+    w.terminate().catch(() => {});
+  }
+});
+
+interface RunOutcome {
+  returnValue?: unknown;
+  errorMessage?: string;
+  exitCode?: number;
+}
+
+/**
+ * 起 Worker 跑 userScript；收到首个 agent-call 即回发 agentResult（调用方提供），
+ * 等脚本 return。callCache 命中路径不会发出 agent-call（直接从缓存重建返回）。
+ */
+function runWorker(
+  userScript: string,
+  opts: { agentResult?: Record<string, unknown>; callCache?: Record<number, unknown>; timeoutMs?: number },
+): Promise<RunOutcome> {
+  const timeoutMs = opts.timeoutMs ?? 4000;
+  return new Promise((resolve, reject) => {
+    const worker = new Worker(buildWorkerScript(userScript), {
+      eval: true,
+      workerData: {
+        scriptPath: "test.js",
+        args: {},
+        workspace: process.cwd(),
+        budget: { maxTokens: 0, usedTokens: 0, usedCost: 0 },
+        callCache: opts.callCache ?? {},
+      },
+    });
+    createdWorkers.push(worker);
+    const out: RunOutcome = {};
+    let settled = false;
+    const timer = setTimeout(() => {
+      worker.terminate().catch(() => {});
+      reject(new Error("Worker timed out — likely hung"));
+    }, timeoutMs);
+    const finish = (r: RunOutcome): void => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      resolve(r);
+    };
+    worker.on("message", (raw: unknown) => {
+      const msg = raw as { type?: string; callId?: number };
+      if (msg.type === "agent-call" && typeof msg.callId === "number") {
+        worker.postMessage({
+          type: "agent-result",
+          callId: msg.callId,
+          result: opts.agentResult ?? { content: "fallback", parsedOutput: { ok: true } },
+          cached: false,
+        });
+      } else if (msg.type === "return") {
+        out.returnValue = (raw as { result?: unknown }).result;
+        finish(out);
+      } else if (msg.type === "error") {
+        out.errorMessage = (raw as { error?: string }).error;
+        finish(out);
+      }
+    });
+    worker.on("exit", (code: number) => {
+      out.exitCode = code;
+      if (code !== 0) finish(out);
+    });
+    worker.on("error", (err: Error) => {
+      out.errorMessage = err.message;
+      finish(out);
+    });
+  });
+}
+
+const META_SCRIPT = "const meta = await agent({ prompt: 'passthrough probe', returnMeta: true }); return meta;";
+
+describe("A1 returnMeta live resolve 透传（tier-1 §7.1）", () => {
+  it("A1 agent-result 回发完整 AgentResult 时 resolve 对象含 usage/durationMs/sessionId（七字段全集）", async () => {
+    const outcome = await runWorker(META_SCRIPT, {
+      agentResult: {
+        content: "raw text",
+        parsedOutput: { ok: true },
+        sessionFile: "/tmp/sess.jsonl",
+        worktreePath: "/tmp/wt",
+        error: undefined,
+        usage: USAGE,
+        durationMs: 83_000,
+        sessionId: "sess-abc-1",
+      },
+    });
+    expect(outcome.errorMessage).toBeUndefined();
+    expect(outcome.returnValue).toEqual({
+      value: { ok: true },
+      sessionFile: "/tmp/sess.jsonl",
+      worktreePath: "/tmp/wt",
+      error: undefined,
+      usage: USAGE,
+      durationMs: 83_000,
+      sessionId: "sess-abc-1",
+    });
+  });
+
+  it("A1 旧主线程（AgentResult 无三字段）时 resolve 对象三字段为 undefined（向后兼容不抛错）", async () => {
+    const outcome = await runWorker(META_SCRIPT, {
+      agentResult: { content: "raw", parsedOutput: { v: 1 }, sessionFile: "/tmp/s.jsonl" },
+    });
+    expect(outcome.returnValue).toMatchObject({
+      value: { v: 1 },
+      sessionFile: "/tmp/s.jsonl",
+      usage: undefined,
+      durationMs: undefined,
+      sessionId: undefined,
+    });
+  });
+});
+
+describe("A2 returnMeta 缓存重放重建透传（对称点，tier-1 §7.1）", () => {
+  it("A2 workerData.callCache 命中时重建对象含 usage/durationMs/sessionId（不回发 agent-call）", async () => {
+    const outcome = await runWorker(META_SCRIPT, {
+      callCache: {
+        0: {
+          content: "cached raw",
+          parsedOutput: { cached: true },
+          sessionFile: "/tmp/cached.jsonl",
+          worktreePath: "/tmp/cwt",
+          usage: USAGE,
+          durationMs: 42_000,
+          sessionId: "sess-cache-9",
+        },
+      },
+    });
+    expect(outcome.errorMessage).toBeUndefined();
+    expect(outcome.returnValue).toEqual({
+      value: { cached: true },
+      sessionFile: "/tmp/cached.jsonl",
+      worktreePath: "/tmp/cwt",
+      error: undefined,
+      usage: USAGE,
+      durationMs: 42_000,
+      sessionId: "sess-cache-9",
+    });
+  });
+});