@zhushanwen/subagent-core 0.2.0

package/src/execution/__tests__/records-cwd-isolation.test.ts

@@ -0,0 +1,91 @@
+// src/__tests__/records-cwd-isolation.test.ts
+//
+// T5（F1 端到端补充）：验证 records 目录改 cwd-scoped 后，不同 cwd 的 manifest 物理
+// 隔离——一个 cwd 的 ManifestStore 读不到另一个 cwd 的 manifest。
+//
+// F1 之前 recordsDir = path.join(agentDir, "records")（全局共享），所有 cwd 的 manifest
+// 混在一个目录，靠 rootSessionFilter 软隔离。F1 改为 getSubagentRecordsDir(agentDir, cwd)
+// 后，每个 cwd 物理独立目录，不再依赖软过滤。
+//
+// T1（path-encoding.test.ts）已覆盖路径层契约；本测试补一个真实 fs + ManifestStore 的
+// 端到端隔离烟雾测试，避免 SubagentService 构造成本（需 mock ModelConfigService/PiLike 等）。
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+
+import type { ManifestRecord } from "../manifest-store.ts";
+import { ManifestStore } from "../manifest-store.ts";
+import { getSubagentRecordsDir } from "../path-encoding.ts";
+
+let tmpAgentDir: string;
+
+beforeEach(() => {
+  tmpAgentDir = fs.mkdtempSync(path.join(os.tmpdir(), "records-cwd-iso-"));
+});
+
+afterEach(() => {
+  fs.rmSync(tmpAgentDir, { recursive: true, force: true });
+});
+
+/** 写一个最小合法的 manifest 到指定 records 目录。 */
+function writeManifest(recordsDir: string, id: string): string {
+  fs.mkdirSync(recordsDir, { recursive: true });
+  const rec: ManifestRecord = {
+    id,
+    rootSessionId: "sess-1",
+    agentName: "worker",
+    status: "completed",
+    createdAt: Date.now(),
+  };
+  const filePath = path.join(recordsDir, `${id}.json`);
+  fs.writeFileSync(filePath, JSON.stringify(rec), "utf-8");
+  return filePath;
+}
+
+describe("[F1/T5] records cwd physical isolation", () => {
+  it("ManifestStore bound to cwd1 cannot read cwd2's manifest (physical isolation)", () => {
+    const cwd1 = "/Users/x/proj-a";
+    const cwd2 = "/Users/x/proj-b";
+    const recordsDir1 = getSubagentRecordsDir(tmpAgentDir, cwd1);
+    const recordsDir2 = getSubagentRecordsDir(tmpAgentDir, cwd2);
+
+    // 两个 records 目录必须物理不同（已在 T1 路径层覆盖，这里再断言一次作为前提）
+    expect(recordsDir1).not.toBe(recordsDir2);
+
+    // 只在 cwd1 的 records 目录写一个 manifest
+    writeManifest(recordsDir1, "rec-cwd1");
+
+    const store1 = new ManifestStore(recordsDir1);
+    const store2 = new ManifestStore(recordsDir2);
+
+    const cwd1Ids = store1.listAllSync().map((m) => m.id);
+    const cwd2Ids = store2.listAllSync().map((m) => m.id);
+
+    // cwd1 能读到自己的 manifest
+    expect(cwd1Ids).toContain("rec-cwd1");
+    // cwd2 物理读不到 cwd1 的 manifest（不再依赖 rootSessionFilter 软过滤）
+    expect(cwd2Ids).not.toContain("rec-cwd1");
+    expect(cwd2Ids).toEqual([]);
+  });
+
+  it("two cwds with their own manifests are mutually invisible", () => {
+    const cwdA = "/home/user/project-a";
+    const cwdB = "/home/user/project-b";
+    const recordsDirA = getSubagentRecordsDir(tmpAgentDir, cwdA);
+    const recordsDirB = getSubagentRecordsDir(tmpAgentDir, cwdB);
+
+    writeManifest(recordsDirA, "rec-a");
+    writeManifest(recordsDirB, "rec-b");
+
+    const storeA = new ManifestStore(recordsDirA);
+    const storeB = new ManifestStore(recordsDirB);
+
+    const aIds = storeA.listAllSync().map((m) => m.id);
+    const bIds = storeB.listAllSync().map((m) => m.id);
+
+    expect(aIds).toEqual(["rec-a"]);
+    expect(bIds).toEqual(["rec-b"]);
+  });
+});

package/src/execution/__tests__/recursive-visibility-baseline.test.ts

@@ -0,0 +1,339 @@
+// src/execution/__tests__/recursive-visibility-baseline.test.ts
+//
+// 递归 subagent 跨进程身份：进程级基线兜底验证（ALS 断裂修复）。
+//
+// 背景（2026-08-11 实测）：pi RPC mode 的 stdin JSONL 是事件回调式读取
+// （attachJsonlLineReader → stream.on("data")），每个 RPC 命令是独立异步链。
+// initSession 里 execCtxAls.enterWith 的 store 不会贯穿到后续 tool 调用事件——
+// 递归第二层 subagent 的 parentRecordId/depth 丢失（rootSessionId 是实例字段所以正确）。
+//
+// 修复：execCtxBaseline / forkDepthBaseline 实例字段（initSession 从 env 读取，
+// 与 sessionRootId 同机制），createRecordForMode / 嵌套护栏读 ALS store 失败时兜底。
+// 本文件验证：
+//   1. 有 env（子进程身份）→ execute 创建的 record parentRecordId/depth 来自基线
+//   2. 无 env（根进程）→ parentRecordId undefined / depth 0（顶层）
+//   3. execCtxAls.run 的 store 优先于基线（并发链语义不回归）
+//   4. forkDepth 基线：env PI_SUBAGENT_FORK_DEPTH → fork spawn env 递增
+//
+// mock 策略与 execute-nesting.test.ts 一致（spawn → FakeChild，fs 同步方法 mock，
+// temp-prompt / alive-store / finalized-marker / manifest-store mock）。
+
+import type { PassThrough } from "node:stream";
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+// ── mock modules（同 execute-nesting.test.ts）──
+
+vi.mock("node:child_process", async () => {
+  const { EventEmitter } = await import("node:events");
+  const { PassThrough } = await import("node:stream");
+
+  class FakeChild extends EventEmitter {
+    pid = 12345;
+    stdout = new PassThrough();
+    stderr = new PassThrough();
+    killed = false;
+    killSignal: string | undefined;
+    kill(sig?: string): boolean {
+      this.killed = true;
+      this.killSignal = sig;
+      return true;
+    }
+  }
+
+  return {
+    spawn: vi.fn(() => new FakeChild()),
+    // buildEnvBlock 用 execFile 异步取 git branch：默认 err-first 兜底（catch → branch=""）
+    execFile: vi.fn(
+      (
+        _cmd: string,
+        _args: readonly string[],
+        _opts: unknown,
+        cb: (err: Error | null, stdout?: string, stderr?: string) => void,
+      ) => cb(new Error("execFile not configured in this test")),
+    ),
+  };
+});
+
+vi.mock("node:fs", async () => {
+  const actual = await import("node:fs");
+  return {
+    default: {
+      ...actual,
+      mkdirSync: vi.fn(),
+      existsSync: vi.fn(() => false),
+      appendFileSync: vi.fn(),
+      writeFileSync: vi.fn(),
+      readdirSync: vi.fn(() => []),
+    },
+    mkdirSync: vi.fn(),
+    existsSync: vi.fn(() => false),
+    appendFileSync: vi.fn(),
+    writeFileSync: vi.fn(),
+    readdirSync: vi.fn(() => []),
+    promises: actual.promises,
+  };
+});
+
+vi.mock("../alive-store.ts", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../alive-store.ts")>();
+  return {
+    ...actual,
+    writeAliveMarker: vi.fn(),
+    removeAliveMarker: vi.fn(),
+  };
+});
+
+vi.mock("../finalized-marker.ts", () => ({
+  writeFinalized: vi.fn(),
+  readFinalized: vi.fn(() => false),
+}));
+
+vi.mock("../manifest-store.ts", () => {
+  class FakeManifestStore {
+    writeManifest = vi.fn(async () => {});
+    readManifest = vi.fn(async () => null);
+    listAllSync = vi.fn(() => []);
+    recoverTmpFiles = vi.fn(async () => []);
+  }
+  // vi.fn 包裹：构造参数（recordsDir）可从 mock.calls 断言（[MF-3] 目录统一验证）。
+  // 注意用普通 function（箭头函数不能被 new 调用）。
+  return { ManifestStore: vi.fn(function (_recordsDir: string) { return new FakeManifestStore(); }) };
+});
+
+vi.mock("../temp-prompt.ts", () => ({
+  writePromptToTempFile: vi.fn(async (agent: string) => {
+    const safeName = agent.replace(/[^\w.-]+/g, "_");
+    return { dir: `/tmp/fake-${safeName}`, filePath: `/tmp/fake-${safeName}/prompt-${safeName}.md` };
+  }),
+  cleanupTempPrompt: vi.fn(async () => {}),
+}));
+
+import { spawn } from "node:child_process";
+
+import { waitForSpawn } from "./helpers/spawn-mock.ts";
+import { ModelConfigService } from "../model-config-service.ts";
+import type { ModelInfo, ModelRegistryLike } from "../model-resolver.ts";
+import { ManifestStore } from "../manifest-store.ts";
+import { getSubagentRecordsDir, getSubagentSessionDir } from "../path-encoding.ts";
+import type { RecordStore } from "../record-store.ts";
+import { SubagentService } from "../subagent-service.ts";
+
+const mockSpawn = vi.mocked(spawn);
+
+// ── 身份 env 名（与 subagent-service.ts 常量一致，避免魔法字符串）──
+const ENV_ROOT_SESSION_ID = "PI_SUBAGENT_ROOT_SESSION_ID";
+const ENV_SELF_RECORD_ID = "PI_SUBAGENT_SELF_RECORD_ID";
+const ENV_DEPTH = "PI_SUBAGENT_DEPTH";
+const ENV_ROOT_CWD = "PI_SUBAGENT_ROOT_CWD";
+const ENV_FORK_DEPTH = "PI_SUBAGENT_FORK_DEPTH";
+
+interface FakeChild {
+  pid: number;
+  stdout: PassThrough;
+  stderr: PassThrough;
+  killed: boolean;
+  killSignal: string | undefined;
+  kill(sig?: string): boolean;
+  emit(event: string, ...args: unknown[]): boolean;
+}
+
+function lastSpawnedChild(): FakeChild {
+  const result = mockSpawn.mock.results.at(-1);
+  if (!result) throw new Error("spawn was not called yet");
+  return result.value as FakeChild;
+}
+
+function getLastSpawnEnv(): Record<string, string | undefined> {
+  return (mockSpawn.mock.calls.at(-1)?.[2]?.env as Record<string, string | undefined>) ?? {};
+}
+
+function sessionHeader(id = "baseline-session"): Record<string, unknown> {
+  return { type: "session", id, timestamp: "2026-08-11T00-00-00-000Z", cwd: "/tmp/test" };
+}
+
+function emitStdoutLine(child: FakeChild, obj: Record<string, unknown>): void {
+  child.stdout.write(`${JSON.stringify(obj)}\n`);
+}
+
+/** 驱动 FakeChild 完成：header + 可选事件 + close(0)（runSpawn 自然 resolve）。 */
+async function driveChildToCompletion(child: FakeChild, events: Record<string, unknown>[] = []): Promise<void> {
+  emitStdoutLine(child, sessionHeader());
+  for (const e of events) emitStdoutLine(child, e);
+  child.stdout.end();
+  child.stderr.end();
+  child.emit("close", 0);
+}
+
+// ── 辅助：service 构造 ──
+
+function makeEmptyRegistry(): ModelRegistryLike {
+  return { getAvailable: () => [], find: () => undefined, hasConfiguredAuth: () => true };
+}
+
+function makePi() {
+  return { sendMessage: vi.fn(), appendEntry: vi.fn(), events: { emit: vi.fn() } };
+}
+
+function setup(env: Record<string, string>): { service: SubagentService; store: RecordStore } {
+  const agentDir = "/tmp/baseline-it";
+  const modelService = new ModelConfigService({ agentDir });
+  modelService.initModel({
+    modelRegistry: makeEmptyRegistry(),
+    sessionId: "baseline-it",
+    ctxModel: { id: "m", name: "M", provider: "p", reasoning: false },
+  });
+  const service = new SubagentService({
+    cwd: agentDir,
+    modelService,
+    getMainSessionFile: () => "/mock/main-session.jsonl",
+  });
+  service.initSession({ pi: makePi(), sessionId: "baseline-it" });
+  const store = Reflect.get(service, "store") as RecordStore;
+  return { service, store };
+}
+
+const ctxModel: ModelInfo = { id: "m", name: "M", provider: "p", reasoning: false };
+
+/** execCtxAls.run 的 duck-type（绕过 import AsyncLocalStorage）。 */
+interface ExecCtxAls {
+  run: <T>(store: { recordId: string | undefined; depth: number }, cb: () => T) => T;
+}
+
+// ── 用例 ──
+
+describe("进程级基线兜底（ALS 断裂修复，pi 事件回调模型）", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    // 清理身份 env，防用例间泄漏
+    for (const k of [ENV_ROOT_SESSION_ID, ENV_SELF_RECORD_ID, ENV_DEPTH, ENV_FORK_DEPTH, ENV_ROOT_CWD]) {
+      delete process.env[k];
+    }
+  });
+
+  afterEach(() => {
+    for (const k of [ENV_ROOT_SESSION_ID, ENV_SELF_RECORD_ID, ENV_DEPTH, ENV_FORK_DEPTH, ENV_ROOT_CWD]) {
+      delete process.env[k];
+    }
+    vi.restoreAllMocks();
+  });
+
+  it("[核心回归] 有 env（子进程身份）：execute 创建 record 的 parentRecordId/depth 来自基线，不依赖 ALS store", async () => {
+    // 模拟第一层 subagent 进程：env 注入「自己的身份」（父 record id + depth=1）
+    process.env[ENV_ROOT_SESSION_ID] = "root-main";
+    process.env[ENV_SELF_RECORD_ID] = "sa-parent-record";
+    process.env[ENV_DEPTH] = "1";
+
+    const { service, store } = setup({});
+
+    // 不在 execCtxAls.run 内调用（模拟 ALS 断裂：事件回调上下文读不到 store）
+    const handle = await service.execute({ task: "child of parent", ctxModel });
+
+    const rec = store.collectRecords(10, "all", "root-main").find((r) => r.id === handle.subagentId);
+    expect(rec).toBeDefined();
+    expect(rec!.parentRecordId).toBe("sa-parent-record");
+    expect(rec!.depth).toBe(2); // 基线 depth 1 + 1
+    expect(rec!.rootSessionId).toBe("root-main");
+
+    // [MF-1 回归] 读侧 collectRecords 过滤必须与写侧盖章同源（sessionRootId）。
+    // 旧实现传 this.sessionId（子进程自己的 session id ≠ ROOT）→ 子进程内列表恒空。
+    // 子进程的本进程 sessionId 是 "baseline-it"（initSession 注入），而 record 归属
+    // root-main（env 贯穿的真 ROOT）——能查到即证明过滤用的是 sessionRootId。
+    const viaService = service.collectRecords(10);
+    expect(viaService.map((r) => r.id)).toContain(handle.subagentId);
+    expect(viaService[0]!.rootSessionId).toBe("root-main");
+  });
+
+  it("[顶层] 无 env（根进程）：parentRecordId undefined / depth 0", async () => {
+    const { service, store } = setup({});
+
+    const handle = await service.execute({ task: "top level", ctxModel });
+
+    const rec = store.collectRecords(10, "all", "baseline-it").find((r) => r.id === handle.subagentId);
+    expect(rec).toBeDefined();
+    expect(rec!.parentRecordId).toBeUndefined();
+    expect(rec!.depth).toBe(0);
+  });
+
+  it("[优先级] execCtxAls.run 的 store 优先于基线（并发链语义不回归）", async () => {
+    process.env[ENV_ROOT_SESSION_ID] = "root-main";
+    process.env[ENV_SELF_RECORD_ID] = "sa-baseline";
+    process.env[ENV_DEPTH] = "0";
+
+    const { service, store } = setup({});
+    const execCtxAls = Reflect.get(service, "execCtxAls") as ExecCtxAls;
+
+    const handle = await execCtxAls.run({ recordId: "sa-inline-parent", depth: 3 }, () =>
+      service.execute({ task: "inline nested", ctxModel }),
+    );
+
+    const rec = store.collectRecords(10, "all", "root-main").find((r) => r.id === handle.subagentId);
+    expect(rec).toBeDefined();
+    expect(rec!.parentRecordId).toBe("sa-inline-parent"); // run store 优先，非基线 sa-baseline
+    expect(rec!.depth).toBe(4);
+  });
+
+  it("[forkDepth 基线] env PI_SUBAGENT_FORK_DEPTH=1 + fork：spawn env 递增为 2（读点兜底基线生效）", async () => {
+    process.env[ENV_ROOT_SESSION_ID] = "root-main";
+    process.env[ENV_SELF_RECORD_ID] = "sa-fork-parent";
+    process.env[ENV_DEPTH] = "0";
+    process.env[ENV_FORK_DEPTH] = "1";
+
+    const { service } = setup({});
+
+    const execPromise = service.execute({ task: "fork child", ctxModel, fork: true });
+    await waitForSpawn(mockSpawn);
+    const childEnv = getLastSpawnEnv();
+
+    // 742 行 parentDepth = forkDepthAls.getStore() ?? forkDepthBaseline —— ALS 断裂时基线=1，+1 → 2
+    expect(childEnv.PI_SUBAGENT_FORK_DEPTH).toBe("2");
+
+    const child = lastSpawnedChild();
+    child.emit("close", 0);
+    await execPromise;
+  });
+
+  it("[嵌套护栏] 基线 depth 参与 execute 入口嵌套护栏（depth>MAX 拒绝）", async () => {
+    process.env[ENV_ROOT_SESSION_ID] = "root-main";
+    process.env[ENV_SELF_RECORD_ID] = "sa-deep-parent";
+    process.env[ENV_DEPTH] = "5";
+
+    const { service } = setup({});
+
+    // MAX_FORK_DEPTH 至少 > 5 才不会被误拒；这里验证基线参与计数的方式是
+    // 用直接深度断言——execute 不抛错说明 nestingDepth=6 未超限，护栏不误伤。
+    // （MAX_FORK_DEPTH 具体值由 session-context-resolver 定义，这里不硬编码。）
+    await expect(service.execute({ task: "deep but allowed", ctxModel })).resolves.toBeDefined();
+  });
+
+  it("[MF-3 回归] 有 ENV_ROOT_CWD（worktree 子进程）：sessions 与 records 两套目录统一编码在 ROOT cwd 段", () => {
+    // 模拟 B（worktree 子进程，自身 cwd=checkout 路径）经 env 拿到真 ROOT cwd。
+    // 旧实现按 init.cwd 编码 → enc(checkout) 段，ROOT 磁盘重建扫不到（MF-3）。
+    const rootCwd = "/root/project";
+    process.env[ENV_ROOT_CWD] = rootCwd;
+
+    const agentDir = "/tmp/baseline-it";
+    const checkoutPath = "/var/folders/worktree/pi-subagents/--root-project--/branch";
+    const modelService = new ModelConfigService({ agentDir });
+    modelService.initModel({
+      modelRegistry: makeEmptyRegistry(),
+      sessionId: "baseline-it",
+      ctxModel: { id: "m", name: "M", provider: "p", reasoning: false },
+    });
+    // service cwd = checkout 路径（worktree 子进程的 spawn cwd）
+    const service = new SubagentService({
+      cwd: checkoutPath,
+      modelService,
+      getMainSessionFile: () => "/mock/main-session.jsonl",
+    });
+
+    const store = Reflect.get(service, "store") as RecordStore;
+    const sessionsDir = Reflect.get(store, "sessionsDir") as string;
+    // ManifestStore 在本文件被 mock：recordsDir 从构造调用参数取（vi.fn 包裹）
+    const recordsDir = vi.mocked(ManifestStore).mock.calls.at(-1)?.[0] as string | undefined;
+
+    // 两套目录都编码在 enc(ROOT cwd) 段（不是 enc(checkout)）
+    expect(sessionsDir).toBe(getSubagentSessionDir(agentDir, rootCwd));
+    expect(recordsDir).toBe(getSubagentRecordsDir(agentDir, rootCwd));
+  });
+});