@zhushanwen/subagent-core 0.5.1 → 0.6.0

package/src/execution/types.ts

@@ -479,6 +479,14 @@ export interface ExecutionRecord {
    * 回填（sessionFile 即定位符）。持久化经 subagent-record entry。
    */
   engineHandle?: { sessionRef: Record<string, string>; journalPath?: string; poolKey: string };
+  /**
+   * 同步收集模式标记（subagent-sync-collect 设计 §3.1.3，U1 foundation 契约）。
+   * 创建时确定不可变；undefined = async（缺省语义，旧记录零迁移）。持久化经
+   * subagent-record entry（record-entry.ts 序列化白名单，entry 唯一写点）。
+   * 消费方：U2 collectCoordinator 路由（sync→批缓冲）、U5 E1 重建投影。
+   * U2 接线点：service.createRecordForMode 从 ExecuteOptions.collect 读入 identity。
+   */
+  readonly collectMode?: "sync";
 
   // ── 状态（实时更新）──
   status: ExecutionStatus;
@@ -492,6 +500,13 @@ export interface ExecutionRecord {
    * record 无此字段，投影层按 projectOutcome 兜底（closed-legacy 语义）。
    */
   outcome?: ExecutionOutcome;
+  /**
+   * 离开批的终局标记（subagent-sync-collect 设计 §3.1.3，U1 foundation 契约）。
+   * 两出口统一落标：① 批闭合 flush 写账成功后；② E9 dispose 逐条转 async 写账后
+   * （均 appendEntry 持久化，U3/U5 写点）。undefined = 未离开批 / 旧记录零迁移。
+   * 消费方：U5 E1 重建扫描只收「collectMode=sync 且无本标记」的成员（防双重通知）。
+   */
+  batchFinalized?: boolean;
   /** 完整执行内容，按 turn 组织。createRecord 初始化为 [空 turn]。 */
   turns: Turn[];
   /** turn 计数（= turns.filter(closed).length，冗余存储供投影直接读）。 */
@@ -676,6 +691,17 @@ export interface ExecuteOptions {
    * undefined/false = 一次性模式（默认，行为完全不变）。service.execute 透传到 createRecordForMode。
    */
   conversation?: boolean;
+  /**
+   * 同步收集模式（subagent-sync-collect 设计 §3.1.3，U1 foundation 契约）。
+   * undefined = config collectSync.default（缺省 "async"，新 session 生效）。
+   * schema 层枚举限 "async"|"sync"；运行时宽收 string 与 engine 字段同风格
+   * （非法值 ≠ "sync" 按 async 处理）。
+   * "sync" + conversation:true 组合在 startHandler E4 校验即拒
+   * （immediate throw，不产生半启动 record）。
+   * U2 接线点：service.createRecordForMode 读入 createRecord identity.collectMode
+   * （U1 打通类型与 startHandler 透传，record 落点归 U2）。
+   */
+  collect?: string;
   /**
    * 空闲超时毫秒数（仅 conversation 模式有意义）。覆盖默认 5min idle timeout。
    * 优先级：参数 > env XYZ_SUBAGENT_IDLE_TIMEOUT_MS > 默认 300000ms。
@@ -764,6 +790,13 @@ export interface BgResponse {
    * 值语义由 U2（execution/notify-ledger.ts）兑现。
    */
   notifyContract: "ledger+at-least-once";
+  /**
+   * 同步收集登记回显段（subagent-sync-collect 设计 §3.1.1 交互样例，U1 foundation）。
+   * 仅 resolved 模式为 sync 时附带（async 响应字节零变化，G3）：mode = 生效模式；
+   * pendingSyncCount = 当前未闭合批的 sync 成员总数（含本条；跨轮派发续累不重置，
+   * 与 D2 隐式批一致）。
+   */
+  collect?: { mode: "sync"; pendingSyncCount: number };
 }
 
 /** list 的内层响应（挂在 SubagentToolResult.listResponse）。 */
@@ -902,12 +935,37 @@ export interface SubagentRecord {
    * subagent-engine-history）；缺省 = pi（走 JSONL 直读链）。
    */
   engineHandle?: { sessionRef: Record<string, string>; journalPath?: string; poolKey: string };
+  /**
+   * 同步收集模式标记（与 ExecutionRecord.collectMode 同源投影/重建，U1 foundation）。
+   * 缺省（存量 record）= async 投影，消费方零迁移。
+   */
+  collectMode?: "sync";
+  /**
+   * 离开批终局标记（与 ExecutionRecord.batchFinalized 同源投影/重建，U1 foundation）。
+   * 缺省 = 未离开批；U5 E1 重建扫描据此排除已离场成员。
+   */
+  batchFinalized?: boolean;
 }
 
 // ============================================================
 // 配置（global + session）
 // ============================================================
 
+/**
+ * 同步收集（sync collect）配置节类型（subagent-sync-collect 设计 §3.1.3，U1 foundation）。
+ * 权威默认值在 config.ts DEFAULT_COLLECT_SYNC；坏值 sanitize 回默认不炸启动（E5，
+ * 与 maxConcurrent 同判）。类型定义于 types.ts（避免 config → types 反向依赖成环），
+ * config.ts re-export。
+ */
+export interface CollectSyncConfig {
+  /** start 未显式传 collect 时的缺省模式。新 session 生效（与 engine 配置时机一致）。 */
+  default: "async" | "sync";
+  /** 批通知单条目结果正文预算（字符）：超出截断并接 session_read 指针行。flush 时热读。 */
+  perItemChars: number;
+  /** 批通知结果正文总量预算（字符）：Σ 超限时统一收紧 effectivePerItem（U4 算法）。flush 时热读。 */
+  totalChars: number;
+}
+
 /**
  * 全局配置（~/.pi/agent/subagents/config.json）。
  *
@@ -925,6 +983,11 @@ export interface SubagentsGlobalConfig {
   defaultEngine?: string;
   /** 引擎路由策略（D9①）：strict=true 时一切 probe 失败直接报错（不 fallback）。 */
   engineRouting?: { strict: boolean };
+  /**
+   * 同步收集配置节（subagent-sync-collect 设计 §3.1.3，U1 foundation）。
+   * 整节缺省 = DEFAULT_COLLECT_SYNC（config.ts）；逐字段 sanitize 回默认（E5）。
+   */
+  collectSync?: CollectSyncConfig;
 }
 
 // ============================================================

package/src/index.ts

@@ -24,7 +24,7 @@
 // 0.4.0 = 首个公开发布的收敛收口面（0.3.0 为 2026-08-30 裁决的跳号占位，永不单独
 // 发布；+ minor changeset 收口面落本号）；与 package.json version 的一致性由
 // src/__tests__/smoke.test.ts 动态守护，改版本须两处同步。
-export const CORE_PACKAGE_VERSION = "0.5.1";
+export const CORE_PACKAGE_VERSION = "0.6.0";
 
 // ── 宿主端口接线面（core/）────────────────────────────────────
 // HostServices：dataRoot / log / discoveryRoots 端口 + configureCore 注入；

package/src/orchestration/__tests__/config-loader.test.ts

@@ -102,7 +102,7 @@ beforeEach(async () => {
 
 afterEach(async () => {
   vi.useRealTimers();
-  if (ws) await rm(ws.root, { recursive: true, force: true });
+  if (ws) await rm(ws.root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
 });
 
 /** 过滤掉可能从真实 homedir 泄漏进来的 user-agents 文件，只保留临时工作区内结果。 */

package/src/orchestration/__tests__/file-run-store-prune.test.ts

@@ -41,7 +41,7 @@ beforeEach(() => {
 
 afterEach(() => {
   resetCoreForTests();
-  rmSync(dataRoot, { recursive: true, force: true });
+  rmSync(dataRoot, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   delete process.env[ENV_NAME];
 });
 

package/src/orchestration/__tests__/file-run-store-throttle.test.ts

@@ -39,7 +39,7 @@ beforeEach(() => {
 afterEach(() => {
   vi.useRealTimers();
   resetCoreForTests();
-  rmSync(dataRoot, { recursive: true, force: true });
+  rmSync(dataRoot, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
 });
 
 /** 构造可持久化的 WorkflowRun（对齐 file-run-store.test.ts makeRun 模式）。 */

package/src/orchestration/__tests__/review-fix-loop-scriptpath-failfast.test.ts

@@ -67,7 +67,7 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-  rmSync(sandboxDir, { recursive: true, force: true });
+  rmSync(sandboxDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
 });
 
 /** cwd 植入件：若任一脚本回退 process.cwd() 加载依赖，本文件被 require 即抛标记错误。 */

package/src/orchestration/__tests__/script-generate.test.ts

@@ -168,7 +168,7 @@ describe("generateWorkflowScript 校验闸（文案逐字对齐 pi 现版）", (
       );
       expect(existsSync(join(tmpRoot, "esm-wf.js"))).toBe(false);
     } finally {
-      rmSync(tmpRoot, { recursive: true, force: true });
+      rmSync(tmpRoot, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 
@@ -216,7 +216,7 @@ describe("generateWorkflowScript 校验闸（文案逐字对齐 pi 现版）", (
       }
       expect(existsSync(join(tmpRoot, "bad-wf.js"))).toBe(false);
     } finally {
-      rmSync(tmpRoot, { recursive: true, force: true });
+      rmSync(tmpRoot, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 
@@ -247,7 +247,7 @@ describe("generateWorkflowScript 合法样本落 tmp", () => {
       expect(existsSync(r.path)).toBe(true);
       expect(readFileSync(r.path, "utf-8")).toBe(PI_META_VALID);
     } finally {
-      rmSync(tmpRoot, { recursive: true, force: true });
+      rmSync(tmpRoot, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 
@@ -259,7 +259,7 @@ describe("generateWorkflowScript 合法样本落 tmp", () => {
       if (!r.ok) throw new Error(r.error);
       expect(existsSync(r.path)).toBe(true);
     } finally {
-      rmSync(tmpRoot, { recursive: true, force: true });
+      rmSync(tmpRoot, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 
@@ -274,7 +274,7 @@ describe("generateWorkflowScript 合法样本落 tmp", () => {
       expect(existsSync(r.path)).toBe(true);
     } finally {
       cwdSpy.mockRestore();
-      rmSync(fakeCwd, { recursive: true, force: true });
+      rmSync(fakeCwd, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 });

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

@@ -73,8 +73,8 @@ beforeEach(() => {
 afterEach(() => {
   vi.restoreAllMocks();
   resetCoreForTests();
-  rmSync(projRoot, { recursive: true, force: true });
-  rmSync(homeRoot, { recursive: true, force: true });
+  rmSync(projRoot, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
+  rmSync(homeRoot, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
 });
 
 /** mkdir -p（目录存在即 resolveSkillPath 命中——检查的是目录而非 SKILL.md）。 */

package/src/orchestration/__tests__/workflow-files.test.ts

@@ -43,7 +43,7 @@ describe("saveWorkflow 目录注入（非 .pi 布局）", () => {
       expect(existsSync(join(tmpDir, "alpha.js"))).toBe(false);
       expect(readFileSync(join(savedDir, "alpha.js"), "utf-8")).toBe("// alpha body");
     } finally {
-      rmSync(root, { recursive: true, force: true });
+      rmSync(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 
@@ -56,7 +56,7 @@ describe("saveWorkflow 目录注入（非 .pi 布局）", () => {
       expect(existsSync(join(savedDir, "alpha.js"))).toBe(false);
       expect(existsSync(join(savedDir, "beta.js"))).toBe(true);
     } finally {
-      rmSync(root, { recursive: true, force: true });
+      rmSync(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 
@@ -72,7 +72,7 @@ describe("saveWorkflow 目录注入（非 .pi 布局）", () => {
       // 原文件不动
       expect(existsSync(join(tmpDir, "alpha.js"))).toBe(true);
     } finally {
-      rmSync(root, { recursive: true, force: true });
+      rmSync(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 
@@ -83,7 +83,7 @@ describe("saveWorkflow 目录注入（非 .pi 布局）", () => {
         "Temporary workflow 'ghost' not found",
       );
     } finally {
-      rmSync(root, { recursive: true, force: true });
+      rmSync(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 });
@@ -104,7 +104,7 @@ describe("deleteWorkflow 目录注入（非 .pi 布局）", () => {
       expect(existsSync(join(tmpDir, "dup.js"))).toBe(false);
       expect(existsSync(join(savedDir, "dup.js"))).toBe(true);
     } finally {
-      rmSync(root, { recursive: true, force: true });
+      rmSync(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 
@@ -117,7 +117,7 @@ describe("deleteWorkflow 目录注入（非 .pi 布局）", () => {
       expect(msg).toBe(`Deleted workflow 'gamma' (${join(savedDir, "gamma.js")})`);
       expect(existsSync(join(savedDir, "gamma.js"))).toBe(false);
     } finally {
-      rmSync(root, { recursive: true, force: true });
+      rmSync(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 
@@ -130,7 +130,7 @@ describe("deleteWorkflow 目录注入（非 .pi 布局）", () => {
       ).toThrow("Cannot delete 'busy': workflow is currently running. Abort it first.");
       expect(existsSync(join(tmpDir, "busy.js"))).toBe(true);
     } finally {
-      rmSync(root, { recursive: true, force: true });
+      rmSync(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 
@@ -141,7 +141,7 @@ describe("deleteWorkflow 目录注入（非 .pi 布局）", () => {
         "Workflow file 'void' not found",
       );
     } finally {
-      rmSync(root, { recursive: true, force: true });
+      rmSync(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 });
@@ -164,7 +164,7 @@ describe("缺省目录 = pi 布局（向后兼容回归）", () => {
       expect(existsSync(join(fakeCwd, ".pi", "workflows", "pi-wf.js"))).toBe(true);
     } finally {
       cwdSpy.mockRestore();
-      rmSync(fakeCwd, { recursive: true, force: true });
+      rmSync(fakeCwd, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 
@@ -180,7 +180,7 @@ describe("缺省目录 = pi 布局（向后兼容回归）", () => {
       expect(existsSync(join(savedDir, "saved-only.js"))).toBe(false);
     } finally {
       cwdSpy.mockRestore();
-      rmSync(fakeCwd, { recursive: true, force: true });
+      rmSync(fakeCwd, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 });

package/src/orchestration/__tests__/workflow-script-registry-impl.test.ts

@@ -59,7 +59,7 @@ describe("loadWorkflowScriptByPath / WorkflowScript 导出形态（U1）", () =>
   afterEach(async () => {
     invalidateCache();
     for (const dir of tempDirs) {
-      await rm(dir, { recursive: true, force: true });
+      await rm(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
     }
   });
 

package/src/shared/__tests__/atomic-write.test.ts

@@ -40,7 +40,7 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-  rmSync(dir, { recursive: true, force: true });
+  rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
 });
 
 /** 目录内约定形态 tmp 残留计数（断言「无残留」用）。 */

package/src/shared/__tests__/resource-discovery-host-roots.test.ts

@@ -74,7 +74,7 @@ describe("C2 W2①: async 链 realpath 去重", () => {
     ws = tmpWorkspace();
   });
   afterEach(() => {
-    fs.rmSync(ws, { recursive: true, force: true });
+    fs.rmSync(ws, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   it("多链同文件（a.md 本体 + b.md symlink → a.md）清单只留 1 条", async () => {
@@ -171,7 +171,7 @@ describe("C2 W2④: hostRoots 同标签多根语义", () => {
     agentDir = path.join(ws, ".fake-agent");
   });
   afterEach(() => {
-    fs.rmSync(ws, { recursive: true, force: true });
+    fs.rmSync(ws, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   it("同标签两条 user-pi 根都被扫描（非靠后者整体覆盖）", async () => {
@@ -300,7 +300,7 @@ describe("C2 W2②: project-host 槽位序位", () => {
     hostRoot = path.join(ws, ".zcode", "agents");
   });
   afterEach(() => {
-    fs.rmSync(ws, { recursive: true, force: true });
+    fs.rmSync(ws, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   it("project-host 同名被 project-agents 遮蔽（project-agents 是项目级最高逃生门）", async () => {
@@ -364,7 +364,7 @@ describe("C2 红线 3: 单层扫描维持", () => {
     agentDir = path.join(ws, ".fake-agent");
   });
   afterEach(() => {
-    fs.rmSync(ws, { recursive: true, force: true });
+    fs.rmSync(ws, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   it("子目录不递归（nested/deep.md 不入清单）", async () => {
@@ -410,7 +410,7 @@ describe("C2 回归红线: pi 单条目形态快照", () => {
     agentDir = path.join(ws, ".fake-agent");
   });
   afterEach(() => {
-    fs.rmSync(ws, { recursive: true, force: true });
+    fs.rmSync(ws, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   it("与 pi 真实 agentDir 同构 fixture——source 标签与胜出路径逐项稳定", async () => {