@zhushanwen/pi-subagent-workflow 8.6.0 → 8.7.0

package/src/execution/__tests__/run-spawn-stdout-callback-throw.test.ts

@@ -1,199 +0,0 @@
-// src/execution/__tests__/run-spawn-stdout-callback-throw.test.ts
-//
-// [F-R2] stdout data 同步回调链内 fail-fast throw 不逃逸（不升级为 uncaughtException 崩宿主）。
-//
-// 背景：session-runner 的两处 timer 安全校验调用位于 child.stdout.on("data") 同步回调链内：
-//   ① agent_end keep-alive 分支的 resolveSpawnWatchdogMs（→ assertSafeTimerDelay fail-fast）
-//   ② chatMode agent_settled 分支的 armIdleTimer（→ assertSafeTimerDelay fail-fast）
-// 旧实现任一处 throw 都会逃出事件回调 = Node uncaughtException 崩宿主进程。
-// 修复：调用点包 try/catch 降级（不挂 timer），错误经 bestEffort("error") 可见。
-//
-// mock 结构与 run-spawn-chatmode-settled.test.ts 一致（FakeChild + lifecycle-manager 真实模块）。
-// logger 整体 mock（loggerMock spy）断言错误可见——「fail-fast 语义保留（错误可见、行为明确）
-// 但不升级为进程崩溃」。
-import { spawn } from "node:child_process";
-import * as fs from "node:fs";
-
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-// logger mock：bestEffort / session-runner 共享同一 loggerMock（断言错误可见性）。
-// vi.hoisted：vi.mock 工厂被提升到顶层 const 之前执行，loggerMock 必须经 vi.hoisted 创建。
-const { loggerMock } = vi.hoisted(() => ({
-  loggerMock: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() },
-}));
-vi.mock("@zhushanwen/pi-extension-logger", () => ({ getLogger: () => loggerMock }));
-
-vi.mock("node:child_process", async () => {
-  const { FakeChild } = await import("./helpers/spawn-mock.ts");
-  return {
-    spawn: vi.fn(() => new FakeChild()),
-    // buildEnvBlock 的 git branch 调用（execFile 异步）：默认 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", () => ({
-  writeAliveMarker: vi.fn(),
-}));
-
-// 场景 ① 依赖 keep-alive 分支命中：count=1（有活跃后代 → 不 kill → 重挂 watchdog）
-vi.mock("../session-pending.ts", () => ({
-  readActivePendingFromSessionFile: vi.fn(() => ({ count: 1 })),
-}));
-
-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 { runSpawn, SPAWN_WATCHDOG_ENV } from "../session-runner.ts";
-import type { SessionRunnerContext } from "../session-runner.ts";
-import { hasIdleTimer, _resetLifecycleState } from "../lifecycle-manager.ts";
-import { createRecord } from "../execution-record.ts";
-import type { ExecutionRecord } from "../types.ts";
-import {
-  emitStdoutLine,
-  type FakeChild,
-  lastSpawnedChild as lastSpawnedChildOf,
-  makeCtx,
-  makeOpts,
-  makeRecord,
-  sessionHeader,
-  waitForSpawn as waitForSpawnOf,
-} from "./helpers/spawn-mock.ts";
-
-const mockSpawn = vi.mocked(spawn);
-
-const lastSpawnedChild = (): FakeChild => lastSpawnedChildOf(mockSpawn);
-const waitForSpawn = (timeoutMs = 1000): Promise<void> => waitForSpawnOf(mockSpawn, timeoutMs);
-
-/** 构造 chatMode record（idleTimeoutMs 设为超出 setTimeout 安全域的值 → assertSafeTimerDelay throw）。 */
-function makeChatModeRecord(id = "sa-f2-idle"): ExecutionRecord {
-  return createRecord(id, {
-    agent: "general-purpose",
-    model: "test-model",
-    mode: "sync",
-    task: "chat task",
-    slug: "chat",
-    startedAt: 1_000_000,
-    rootSessionId: "root-session",
-    parentRecordId: undefined,
-    depth: 0,
-    chatMode: true,
-    // > 2^31-1：Node setTimeout 溢出域，assertSafeTimerDelay fail-fast
-    idleTimeoutMs: Number.MAX_SAFE_INTEGER,
-  });
-}
-
-describe("[F-R2] stdout 回调链内 fail-fast throw 不逃逸", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    _resetLifecycleState();
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-    _resetLifecycleState();
-  });
-
-  it("① agent_end keep-alive 分支 resolveSpawnWatchdogMs throw → 降级不 re-arm，run 正常收尾，error 可见", async () => {
-    const record = makeRecord();
-    const promise = runSpawn(record, "Task: keepalive", makeOpts(), makeCtx());
-
-    await waitForSpawn();
-    const child = lastSpawnedChild();
-
-    emitStdoutLine(child, sessionHeader("sess-fr2a"));
-    // 初始 watchdog 解析在 spawn 后同步块内已完成（env 未设 → 不挂）。
-    // 此刻设非法 env：agent_end keep-alive 分支再读 env → assertSafeTimerDelay throw。
-    process.env[SPAWN_WATCHDOG_ENV] = String(Number.MAX_SAFE_INTEGER);
-    try {
-      emitStdoutLine(child, { type: "agent_end", willRetry: false });
-      // 给 stream flush 留一个 tick（对齐 chatmode 测试模式）：throw 若逃逸回调，
-      // vitest 会以 unhandled error 判本测试失败——能走到断言即「未崩宿主」。
-      await new Promise((r) => setTimeout(r, 20));
-
-      // 降级语义：不 re-arm（无 timer 可直接观察的是——子进程未被 kill、run 未被中断）
-      expect(child.killed).toBe(false);
-
-      // 错误可见（fail-fast 语义保留）：bestEffort("error") 经 logger.error 落日志
-      expect(loggerMock.error).toHaveBeenCalledWith(
-        expect.stringContaining("resolveSpawnWatchdogMs"),
-        expect.objectContaining({ detail: expect.stringContaining("exceeds the Node setTimeout limit") }),
-      );
-
-      // 收尾：run 正常完成（未被回调异常打断）
-      child.stdout.end();
-      child.stderr.end();
-      child.emit("close", 0);
-      const result = await promise;
-      expect(result.success).toBe(true);
-    } finally {
-      delete process.env[SPAWN_WATCHDOG_ENV];
-    }
-  });
-
-  it("② chatMode agent_settled armIdleTimer throw → 降级不挂 idle timer，onRoundSettled 照常、提前 resolve", async () => {
-    const record = makeChatModeRecord("sa-f2-idle");
-    const onRoundSettled = vi.fn();
-    const ctx: Partial<SessionRunnerContext> = { onRoundSettled };
-    const promise = runSpawn(record, "Task: idle", makeOpts(), makeCtx(ctx as SessionRunnerContext));
-
-    await waitForSpawn();
-    const child = lastSpawnedChild();
-
-    emitStdoutLine(child, sessionHeader("sess-fr2b"));
-    emitStdoutLine(child, { type: "agent_settled" });
-    await new Promise((r) => setTimeout(r, 20));
-
-    // 降级语义：idle timer 未挂（throw 发生在 arm 入口校验，先于 setTimeout）
-    expect(hasIdleTimer(record.id)).toBe(false);
-    expect(child.killed).toBe(false);
-
-    // catch 后续语句照常执行：本轮完成通知不因 GC timer 故障丢失
-    expect(onRoundSettled).toHaveBeenCalledTimes(1);
-
-    // 错误可见
-    expect(loggerMock.error).toHaveBeenCalledWith(
-      expect.stringContaining("armIdleTimer"),
-      expect.objectContaining({ detail: expect.stringContaining("exceeds the Node setTimeout limit") }),
-    );
-
-    // 收尾：chatMode 首轮 agent_settled 已 resolveRun(0)，close 后 runSpawn 正常返回
-    child.stdout.end();
-    child.stderr.end();
-    child.emit("close", 0);
-    const result = await promise;
-    expect(result.success).toBe(true);
-  });
-});

package/src/execution/__tests__/sdk-contract.test.ts

@@ -1,273 +0,0 @@
-// src/__tests__/sdk-contract.test.ts
-//
-// SDK 契约测试：验证扩展对 Pi SDK 的消费符合 [MANDATORY] checklist。
-// 关闭 CI sdk-contract-audit job 的前向引用（该 job 直接跑此文件）。
-//
-// 核心断言（[MANDATORY] checklist）：
-//   1. registerSubagentsCommand 注册名为 "subagents" 的命令，handler 是 (args, ctx)
-//   2. registerSubagentTool 注册名为 "subagent" 的工具，schema 存在
-//   3. pending:unregister 事件携带 result/error/patchFile 时消费侧 sendMessage（T2 后替代 notifier）
-//   4. session_start handler 类型签名 (event, ctx) → 编译期保证（stub 精确类型）
-//
-// 不导入 index.ts（它经 getAgentDir 值导入触发 alias 解析失败——alias 指向
-// .d.ts-only stub）。改测叶子注册函数。session_start 的
-// (event, ctx) 双参数契约由 tsconfig 的精确 stub 类型在编译期强制（见
-// 注释：modelRegistry/cwd/ui 不在 event 上）。
-
-import { describe, expect, it, vi } from "vitest";
-
-// registerSubagentTool 经 subagent-tool.ts 值导入 StringEnum（pi-ai）+ Type（typebox）。
-// stub 是 .d.ts（仅类型），pnpm optional-peer-dep 插件拦截值导入 → vi.mock 兜底。
-vi.mock("@earendil-works/pi-ai", () => ({
-  StringEnum: (values: string[]) => ({ type: "string", enum: values }),
-}));
-vi.mock("@earendil-works/pi-ai", () => ({
-  StringEnum: (values: string[]) => ({ type: "string", enum: values }),
-}));
-vi.mock("typebox", () => ({
-  Type: {
-    Object: (props: Record<string, unknown>) => ({ type: "object", properties: props }),
-    Optional: (schema: unknown) => ({ ...schema as object, optional: true }),
-    String: () => ({ type: "string" }),
-    Boolean: () => ({ type: "boolean" }),
-    Number: () => ({ type: "number" }),
-    Array: (items: unknown) => ({ type: "array", items }),
-    Record: (key: unknown, value: unknown) => ({ type: "object", additionalProperties: value, key }),
-    Unknown: () => ({ type: "unknown" }),
-    Union: (members: unknown[]) => ({ type: "union", members }),
-    Literal: (value: unknown) => ({ type: "literal", value }),
-  },
-}));
-
-// Mock getSubagentService：execute plumb-through 契约测试需要拦截 service.execute 调用。
-const { mockServiceExecute } = vi.hoisted(() => ({
-  mockServiceExecute: vi.fn(),
-}));
-vi.mock("../subagent-service.ts", () => ({
-  getSubagentService: () => ({ execute: mockServiceExecute }),
-}));
-
-import { registerWorkflowsCommand } from "../../interface/commands.ts";
-import { registerSubagentTool } from "../../interface/subagent-tool.ts";
-import { registerSubagentsCommand } from "../../interface/subagents.ts";
-import type { LauncherDeps } from "../../orchestration/launcher.ts";
-import { mockExtensionApi } from "./helpers/mock-extension-api.ts";
-
-/**
- * 构造最小 LauncherDeps mock（契约测试只捕获 handler，从不调用它，
- * 故 deps 字段全为占位 no-op 即可——registerWorkflowsCommand 注册时不读 deps，
- * 仅存入 handler 闭包）。
- *
- * 用 `as unknown as LauncherDeps` 与 orchestration/__tests__ 同模式（该类型字段多，
- * 全字段构造冗余；占位足够此处断言注册名 + handler arity 的需要）。
- */
-function makeLauncherDepsStub(): LauncherDeps {
-  return {
-    registry: { get: vi.fn() },
-    runs: new Map(),
-    store: { save: vi.fn(), loadAll: vi.fn(async () => []) },
-    workerHost: { start: vi.fn() },
-    runner: { run: vi.fn() },
-    log: vi.fn(),
-    eventBus: { emit: vi.fn() },
-  } as unknown as LauncherDeps;
-}
-
-// ============================================================
-// /subagents command 契约
-// ============================================================
-describe("/subagents command contract [MANDATORY]", () => {
-  it("registers a command named 'subagents'", () => {
-    let registeredName: string | undefined;
-    const pi = mockExtensionApi({
-      registerCommand: (name: string) => { registeredName = name; },
-    });
-    registerSubagentsCommand(pi);
-    expect(registeredName).toBe("subagents");
-  });
-
-  it("handler accepts (args, ctx) — two parameters", () => {
-    let capturedHandler: ((...args: unknown[]) => unknown) | undefined;
-    const pi = mockExtensionApi({
-      registerCommand: (_name: string, command: { handler: (...args: unknown[]) => unknown }) => {
-        capturedHandler = command.handler;
-      },
-    });
-    registerSubagentsCommand(pi);
-    expect(capturedHandler).toBeDefined();
-    // function.length 反映必填参数数（ctx 至少是第 2 个）
-    expect(capturedHandler!.length).toBeGreaterThanOrEqual(2);
-  });
-});
-
-// ============================================================
-// /workflows command 契约 [MANDATORY]
-// ============================================================
-//
-// registerWorkflowsCommand(api, getRuns, deps) 注册名为 "workflows" 的命令，
-// handler 是 (args, ctx)。与 /subagents 同构的注册契约——此处锁住注册名 + handler arity，
-// 防止重构时改名或丢参数导致 /workflows 命令失效。
-describe("/workflows command contract [MANDATORY]", () => {
-  it("registers a command named 'workflows'", () => {
-    let registeredName: string | undefined;
-    const pi = mockExtensionApi({
-      registerCommand: (name: string) => { registeredName = name; },
-    });
-    // getRuns / deps 契约测试不调用 handler，传最小合法值即可
-    registerWorkflowsCommand(pi, () => new Map(), makeLauncherDepsStub());
-    expect(registeredName).toBe("workflows");
-  });
-
-  it("handler accepts (args, ctx) — two parameters", () => {
-    let capturedHandler: ((...args: unknown[]) => unknown) | undefined;
-    const pi = mockExtensionApi({
-      registerCommand: (_name: string, command: { handler: (...args: unknown[]) => unknown }) => {
-        capturedHandler = command.handler;
-      },
-    });
-    registerWorkflowsCommand(pi, () => new Map(), makeLauncherDepsStub());
-    expect(capturedHandler).toBeDefined();
-    // function.length 反映必填参数数（args + ctx = 2）
-    expect(capturedHandler!.length).toBeGreaterThanOrEqual(2);
-  });
-});
-
-// ============================================================
-// subagent tool 契约
-// ============================================================
-describe("subagent tool contract [MANDATORY]", () => {
-  it("registers a tool named 'subagent' with a parameters schema", () => {
-    let registeredTool: { name: string; parameters: unknown } | undefined;
-    const pi = mockExtensionApi({
-      registerTool: (tool: unknown) => { registeredTool = tool as { name: string; parameters: unknown }; },
-    });
-    registerSubagentTool(pi);
-    expect(registeredTool?.name).toBe("subagent");
-    expect(registeredTool?.parameters).toBeDefined();
-  });
-
-  it("tool has execute, renderCall, renderResult callbacks", () => {
-    let registeredTool: Record<string, unknown> | undefined;
-    const pi = mockExtensionApi({
-      registerTool: (tool: unknown) => { registeredTool = tool as Record<string, unknown>; },
-    });
-    registerSubagentTool(pi);
-    expect(typeof registeredTool?.execute).toBe("function");
-  });
-
-  // SDK 契约：ToolDefinition.execute 是 5 参数 (toolCallId, params, signal, onUpdate, ctx)。
-  // ctx 是第 5 个参数，runtime 通过 wrapToolDefinition(ctxFactory) 注入。
-  // 此测试验证 ctx.model 被 plumb 到 service.execute 的 ctxModel 参数。
-  // 回归保护：subagent-tool.ts execute 把 _ctx?.model 传给 startHandler 的第 5 参 ctxModel。
-  it("execute passes ctx.model as ctxModel (SDK 5-param contract)", async () => {
-    let capturedExecute: ((...args: never[]) => Promise<unknown>) | undefined;
-    const pi = mockExtensionApi({
-      registerTool: (tool: unknown) => {
-        capturedExecute = (tool as { execute: (...args: never[]) => Promise<unknown> }).execute;
-      },
-    });
-    registerSubagentTool(pi);
-    expect(capturedExecute).toBeDefined();
-
-    mockServiceExecute.mockReset();
-    mockServiceExecute.mockResolvedValue({
-      mode: "background",
-      subagentId: "bg-test",
-      sessionFile: "/test/session.jsonl",
-      details: { slug: "test-slug" },
-    });
-    const ctxModel = { id: "test-model", name: "Test", provider: "test", reasoning: false };
-    const ctx = { model: ctxModel } as object;
-
-    await capturedExecute!(
-      "call-1",
-      { action: "start", task: "test task", slug: "test-slug" },
-      undefined,
-      undefined,
-      ctx,
-    );
-
-    expect(mockServiceExecute).toHaveBeenCalledTimes(1);
-    expect(mockServiceExecute).toHaveBeenCalledWith(
-      expect.objectContaining({ ctxModel, slug: "test-slug" }),
-    );
-  });
-
-  // [MF#5] fork/worktree/cwd 参数传递链路契约（acceptance #8）：
-  // tool execute → startHandler(service, params) → service.execute({fork, worktree, cwd, ...})。
-  // 回归保护：subagent-actions.ts startHandler L152-166 把 input.fork/worktree/cwd 透传给
-  // service.execute。若任一字段在 handler 内漏传（如重构改名/删行），子 agent 静默丢失隔离模式。
-  // 此测试锁住「顶层 fork/worktree/cwd → service.execute 同名参数」端到端透传（拍平后无 startParam envelope）。
-  it("execute plumbs top-level fork/worktree/cwd to service.execute (chain contract)", async () => {
-    let capturedExecute: ((...args: never[]) => Promise<unknown>) | undefined;
-    const pi = mockExtensionApi({
-      registerTool: (tool: unknown) => {
-        capturedExecute = (tool as { execute: (...args: never[]) => Promise<unknown> }).execute;
-      },
-    });
-    registerSubagentTool(pi);
-    expect(capturedExecute).toBeDefined();
-
-    mockServiceExecute.mockReset();
-    mockServiceExecute.mockResolvedValue({
-      mode: "background",
-      subagentId: "bg-fork-wt",
-      sessionFile: "/test/session.jsonl",
-      details: { slug: "iso-work" },
-    });
-
-    await capturedExecute!(
-      "call-fork-wt",
-      {
-        action: "start",
-        task: "isolated work",
-        slug: "iso-work",
-        fork: true,
-        worktree: true,
-        cwd: "/x",
-      },
-      undefined,
-      undefined,
-      undefined,
-    );
-
-    // service.execute 收到完整的 fork/worktree/cwd 三参数透传
-    expect(mockServiceExecute).toHaveBeenCalledTimes(1);
-    expect(mockServiceExecute).toHaveBeenCalledWith(
-      expect.objectContaining({
-        fork: true,
-        worktree: true,
-        cwd: "/x",
-      }),
-    );
-  });
-
-  // sync 路径已删除（T2 Wave 0）。background 的 content JSON 只含 bgResponse
-  // （status/mode/message），不含 record 派生投影——投影发生在 notifier 注入的完成消息。
-});
-
-// ============================================================
-// pending:unregister 事件契约 [MANDATORY]（T2 后 notifier 职责转移至此）
-// ============================================================
-//
-// T2 后 background 完成通知改由 pending-notifications 扩展消费 pending:unregister
-// 事件后调 pi.sendMessage。subagent-service 的 emitPendingUnregister 在终态路径
-// 携带 result/error/patchFile，消费侧据此构造 customType:"subagent-bg-notify" 消息
-// 并以 triggerTurn:true + deliverAs:"followUp" 注入。
-//
-// 此处的契约由 pending-notifications 的单元测试覆盖（断言 sendMessage 调用参数），
-// 本套件不再直接测试 BgNotifier（已删除）。
-
-// ============================================================
-// session_start handler 双参数契约 — 编译期保证
-// ============================================================
-describe("session_start handler signature (compile-time guarantee)", () => {
-  it("ExtensionHandler<SessionStartEvent> is (event, ctx) two-param — enforced by stub type", () => {
-    // 此测试是编译期断言：stub 类型声明
-    //   ExtensionHandler<E, R> = (event: E, ctx: ExtensionContext) => Promise<R|void> | R | void;
-    // 且 SessionStartEvent 注释明确 modelRegistry/cwd/ui 不在 event 上（在 ctx）。
-    // index.ts:66 `pi.on("session_start", (_event, ctx) => {...})` 通过此类型检查即证明契约。
-    // tsc --noEmit 零错误 = 此契约成立。此 it() 占位让套件非空（实际断言在编译期）。
-    expect(true).toBe(true);
-  });
-});

package/src/execution/__tests__/session-context-resolver.test.ts

@@ -1,167 +0,0 @@
-// src/__tests__/session-context-resolver.test.ts
-//
-// 覆盖 resolveSessionContext 全部 5 种输入组合 + ForkDepthExceededError 边界。
-import * as path from "node:path";
-
-import { describe, expect, it } from "vitest";
-
-import { encodeCwd } from "../path-encoding.ts";
-import { resolveSessionContext } from "../session-context-resolver.ts";
-import { ForkDepthExceededError } from "../types.ts";
-
-const AGENT_DIR = "/home/user/.pi/agent";
-const MAIN_CWD = "/home/user/project";
-const SESSION_FILE = "session-abc.jsonl";
-
-function expectedSessionDir(mainCwd: string): string {
-  // [MF#1] 既有布局：subagents/<enc>/sessions/
-  return path.join(AGENT_DIR, "subagents", encodeCwd(mainCwd), "sessions");
-}
-
-describe("resolveSessionContext", () => {
-  // ── 边界 1: fork=false, worktree=false ──
-  it("fork=false, worktree=false → shouldFork=false, effectiveCwd=mainCwd", () => {
-    const result = resolveSessionContext({
-      fork: false,
-      worktree: false,
-      mainCwd: MAIN_CWD,
-      agentDir: AGENT_DIR,
-    });
-    expect(result.shouldFork).toBe(false);
-    expect(result.forkSource).toBeUndefined();
-    expect(result.effectiveCwd).toBe(MAIN_CWD);
-    expect(result.sessionDir).toBe(expectedSessionDir(MAIN_CWD));
-  });
-
-  // ── 边界 2: fork=true, worktree=false ──
-  it("fork=true, worktree=false → shouldFork=true, forkSource=mainSessionFile", () => {
-    const result = resolveSessionContext({
-      fork: true,
-      worktree: false,
-      mainCwd: MAIN_CWD,
-      mainSessionFile: SESSION_FILE,
-      agentDir: AGENT_DIR,
-    });
-    expect(result.shouldFork).toBe(true);
-    expect(result.forkSource).toBe(SESSION_FILE);
-    expect(result.effectiveCwd).toBe(MAIN_CWD);
-    expect(result.sessionDir).toBe(expectedSessionDir(MAIN_CWD));
-  });
-
-  // ── 边界 3: fork=false, worktree=true ──
-  it("fork=false, worktreePath 提供 → effectiveCwd=worktreePath", () => {
-    const worktreePath = "/tmp/pi-sub-run-42";
-    const result = resolveSessionContext({
-      fork: false,
-      mainCwd: MAIN_CWD,
-      agentDir: AGENT_DIR,
-      worktreePath,
-    });
-    expect(result.shouldFork).toBe(false);
-    expect(result.forkSource).toBeUndefined();
-    expect(result.effectiveCwd).toBe(worktreePath);
-    expect(result.sessionDir).toBe(expectedSessionDir(MAIN_CWD));
-  });
-
-  // ── 边界 4: fork=true, worktree=true ──
-  it("fork=true, worktreePath 提供 → shouldFork=true + effectiveCwd=worktreePath", () => {
-    const worktreePath = "/tmp/pi-sub-bg-7-abc";
-    const result = resolveSessionContext({
-      fork: true,
-      mainCwd: MAIN_CWD,
-      mainSessionFile: SESSION_FILE,
-      agentDir: AGENT_DIR,
-      worktreePath,
-    });
-    expect(result.shouldFork).toBe(true);
-    expect(result.forkSource).toBe(SESSION_FILE);
-    expect(result.effectiveCwd).toBe(worktreePath);
-    expect(result.sessionDir).toBe(expectedSessionDir(MAIN_CWD));
-  });
-
-  // ── 边界 5: fork=true + parentForkDepth>=10 → 抛错 ──
-  it("fork=true + parentForkDepth=10 → throws ForkDepthExceededError", () => {
-    expect(() =>
-      resolveSessionContext({
-        fork: true,
-        mainCwd: MAIN_CWD,
-        mainSessionFile: SESSION_FILE,
-        parentForkDepth: 10,
-        agentDir: AGENT_DIR,
-      }),
-    ).toThrow(ForkDepthExceededError);
-  });
-
-  it("fork=true + parentForkDepth=15 → throws ForkDepthExceededError", () => {
-    expect(() =>
-      resolveSessionContext({
-        fork: true,
-        mainCwd: MAIN_CWD,
-        parentForkDepth: 15,
-        agentDir: AGENT_DIR,
-      }),
-    ).toThrow(ForkDepthExceededError);
-  });
-
-  // ── depth=9 不抛 ──
-  it("fork=true + parentForkDepth=9 → does NOT throw", () => {
-    const result = resolveSessionContext({
-      fork: true,
-      mainCwd: MAIN_CWD,
-      mainSessionFile: SESSION_FILE,
-      parentForkDepth: 9,
-      agentDir: AGENT_DIR,
-    });
-    expect(result.shouldFork).toBe(true);
-  });
-
-  // ── sessionDir 始终用 mainCwd 编码（非 effectiveCwd）──
-  it("sessionDir always encoded from mainCwd even when worktreePath overrides effectiveCwd", () => {
-    const mainCwd = "/Users/alice/code/my-app";
-    const result = resolveSessionContext({
-      fork: false,
-      mainCwd,
-      agentDir: AGENT_DIR,
-      worktreePath: "/tmp/pi-sub-run-1",
-    });
-    // effectiveCwd 是 worktree checkout，但 sessionDir 仍基于 mainCwd
-    expect(result.effectiveCwd).not.toBe(mainCwd);
-    expect(result.sessionDir).toBe(expectedSessionDir(mainCwd));
-  });
-
-  // ── [MF#5] fork=true 但主 session 文件不可用 → 抛错（不静默降级）──
-  it("fork=true + mainSessionFile 缺失 → throws（不静默降级到 from-scratch）", () => {
-    expect(() =>
-      resolveSessionContext({
-        fork: true,
-        mainCwd: MAIN_CWD,
-        // mainSessionFile 故意不传
-        agentDir: AGENT_DIR,
-      }),
-    ).toThrow(/main session file is unavailable/);
-  });
-
-  // ── 默认值：fork/worktree 未传 → undefined → false ──
-  it("fork/worktree omitted → shouldFork=false", () => {
-    const result = resolveSessionContext({
-      mainCwd: MAIN_CWD,
-      agentDir: AGENT_DIR,
-    });
-    expect(result.shouldFork).toBe(false);
-    expect(result.forkSource).toBeUndefined();
-    expect(result.effectiveCwd).toBe(MAIN_CWD);
-  });
-
-  // ── cwd 覆盖 mainCwd（worktree=false 时）──
-  it("explicit cwd overrides mainCwd when worktree=false", () => {
-    const customCwd = "/tmp/custom-cwd";
-    const result = resolveSessionContext({
-      mainCwd: MAIN_CWD,
-      cwd: customCwd,
-      agentDir: AGENT_DIR,
-    });
-    expect(result.effectiveCwd).toBe(customCwd);
-    // sessionDir 仍用 mainCwd
-    expect(result.sessionDir).toBe(expectedSessionDir(MAIN_CWD));
-  });
-});