@zhushanwen/subagent-core 0.7.0 → 0.8.0

package/dist/execution/engine/engine-discovery-scan.cjs

@@ -388,16 +388,16 @@ var SpawnedChildrenMirror = class {
     return this.entries.size;
   }
   /** 订阅状态广播（W6 notify/谓词接线点）。返回退订函数。 */
-  onChange(listener) {
-    this.listeners.add(listener);
+  onChange(listener2) {
+    this.listeners.add(listener2);
     return () => {
-      this.listeners.delete(listener);
+      this.listeners.delete(listener2);
     };
   }
   emit(event) {
-    for (const listener of this.listeners) {
+    for (const listener2 of this.listeners) {
       try {
-        listener(event);
+        listener2(event);
       } catch (err) {
         logger3.debug(
           `[spawned-children-mirror] listener threw for ${event.reason}: ${err instanceof Error ? err.message : String(err)}`
@@ -846,8 +846,117 @@ function waitForChildExit(child, timeoutMs) {
   });
 }
 
+// src/execution/engine/host/spawned-children.ts
+var CoreSpawnedChildrenMirror = class {
+  entries = /* @__PURE__ */ new Map();
+  /** 落项 / 覆盖（同 recordId 重 spawn = 覆盖旧句柄，与引擎侧 Map 同语义）。 */
+  register(recordId, child) {
+    this.entries.set(recordId, {
+      pid: child.pid,
+      killed: child.killed,
+      updatedAt: Date.now()
+    });
+  }
+  /** 单项置死（杀链入口：killRecordChildWithEscalation 途经）。 */
+  markKilled(recordId) {
+    const entry = this.entries.get(recordId);
+    if (entry !== void 0) {
+      entry.killed = true;
+      entry.updatedAt = Date.now();
+    }
+  }
+  /** 整体置死 + 清空（失效语义 2+3：引擎 exit / 重建 / dispose / killAll）。 */
+  killAll() {
+    this.entries.clear();
+  }
+  getChildByRecord(recordId) {
+    return this.entries.get(recordId);
+  }
+  /** 句柄存活谓词（镜像面；判据与引擎侧 `!child.killed` 同构）。 */
+  hasLiveProcessHandle(recordId) {
+    const entry = this.entries.get(recordId);
+    return entry !== void 0 && !entry.killed;
+  }
+  /** 快照（诊断/测试）。 */
+  snapshot() {
+    return [...this.entries.entries()].map(([recordId, entry]) => ({ recordId, ...entry }));
+  }
+  /** 测试隔离专用（生产禁用——进程级全局状态）。 */
+  clear() {
+    this.entries.clear();
+  }
+};
+var MIRROR_SLOT_KEY = /* @__PURE__ */ Symbol.for(
+  "@zhushanwen/pi-subagent-workflow.coreSpawnedChildrenMirror"
+);
+function coreMirrorSlot() {
+  let slot = Reflect.get(globalThis, MIRROR_SLOT_KEY);
+  if (!slot) {
+    slot = new CoreSpawnedChildrenMirror();
+    Reflect.set(globalThis, MIRROR_SLOT_KEY, slot);
+  }
+  return slot;
+}
+function coreSpawnedChildrenMirror() {
+  return coreMirrorSlot();
+}
+function hasLiveProcessHandleCore(recordId) {
+  return coreMirrorSlot().hasLiveProcessHandle(recordId);
+}
+
+// src/execution/lifecycle-manager.ts
+var logger8 = getLogger("subagents");
+var MS_PER_SECOND = 1e3;
+var SECONDS_PER_MINUTE = 60;
+var IDLE_TIMEOUT_MINUTES = 5;
+var DEFAULT_IDLE_TIMEOUT_MS = IDLE_TIMEOUT_MINUTES * SECONDS_PER_MINUTE * MS_PER_SECOND;
+var idleTimers = /* @__PURE__ */ new Map();
+function hasIdleTimer(recordId) {
+  return idleTimers.has(recordId);
+}
+var ACTIVATE_LOCK_TIMEOUT_SECONDS = 30;
+var ACTIVATE_LOCK_TIMEOUT_MS = ACTIVATE_LOCK_TIMEOUT_SECONDS * MS_PER_SECOND;
+
+// src/execution/lifecycle-predicates.ts
+function hasLiveProcessHandle(recordId) {
+  return hasLiveProcessHandleCore(recordId);
+}
+
+// src/execution/engine/inflight-snapshot.ts
+var listener = null;
+function getInFlightSnapshot() {
+  return { inFlight: countInFlight() };
+}
+function notifyInFlightChanged() {
+  if (listener === null) return;
+  try {
+    listener(getInFlightSnapshot());
+  } catch {
+  }
+}
+function countInFlight() {
+  let count = 0;
+  for (const entry of coreSpawnedChildrenMirror().snapshot()) {
+    const recordId = entry.recordId;
+    if (hasLiveProcessHandle(recordId) && !hasIdleTimer(recordId)) count++;
+  }
+  return count;
+}
+
 // src/execution/engine/client/engine-client.ts
-var logger8 = (0, import_subagent_engine_sdk6.getLogger)("subagents");
+var logger9 = (0, import_subagent_engine_sdk6.getLogger)("subagents");
+function bridgeMirrorEventToCoreMirror(event, mirror) {
+  if (event.recordId === void 0 || event.pid === void 0) return;
+  const entry = mirror.getEntry(event.pid);
+  if (entry === void 0) return;
+  const core = coreSpawnedChildrenMirror();
+  if (entry.killed) {
+    core.markKilled(event.recordId);
+  } else {
+    core.register(event.recordId, { pid: entry.pid, killed: false });
+  }
+  notifyInFlightChanged();
+}
 var DISPOSE_GRACE_MS = 3e3;
 var SIGKILL_REAP_TIMEOUT_MS = 1e4;
 var FRAME_ECHO_MAX_CHARS = 200;
@@ -910,6 +1019,7 @@ var EngineClient = class {
     };
     this.mirror.onChange((event) => {
       opts.onMirrorChanged?.(event);
+      bridgeMirrorEventToCoreMirror(event, this.mirror);
     });
   }
   get currentState() {
@@ -972,19 +1082,19 @@ var EngineClient = class {
         matchesEngineCmdline: this.opts.engineCmdlineMatcher ?? defaultEngineCmdlineMatcher(this.opts.command)
       });
       if (sweep.killed.length > 0) {
-        logger8.warn(
+        logger9.warn(
           `[engine-client:${this.engineId}] startup sweep killed stale orphan engine pids: ${sweep.killed.join(",")}`
         );
       }
       for (const removed of sweep.removed) {
-        logger8.debug(`[engine-client:${this.engineId}] swept stale pidfile ${removed.file}: ${removed.reason}`);
+        logger9.debug(`[engine-client:${this.engineId}] swept stale pidfile ${removed.file}: ${removed.reason}`);
       }
     }
     let attempt = 0;
     while (attempt <= import_subagent_engine_sdk6.CRASH_REBUILD_MAX_ATTEMPTS) {
       if (attempt > 0) {
         const backoff = import_subagent_engine_sdk6.CRASH_REBUILD_BACKOFF_MS[attempt - 1];
-        logger8.warn(
+        logger9.warn(
           `[engine-client:${this.engineId}] rebuild attempt ${attempt}/${import_subagent_engine_sdk6.CRASH_REBUILD_MAX_ATTEMPTS} after ${backoff}ms backoff`
         );
         await delay(backoff);
@@ -1017,7 +1127,7 @@ var EngineClient = class {
   markUnavailable(reason) {
     this.state = "unavailable";
     this.unavailableReason = reason;
-    logger8.error(`[engine-client:${this.engineId}] marked unavailable: ${reason.message}`);
+    logger9.error(`[engine-client:${this.engineId}] marked unavailable: ${reason.message}`);
   }
   /** spawn 引擎 CLI + initialize 握手 + 版本协商 + 诊断留痕。 */
   async spawnAndInitialize() {
@@ -1047,13 +1157,13 @@ var EngineClient = class {
     });
     const child = this.child;
     child.on("error", (err) => {
-      logger8.warn(`[engine-client:${this.engineId}] spawn error: ${err.message}`);
+      logger9.warn(`[engine-client:${this.engineId}] spawn error: ${err.message}`);
       this.appendStderrTail(`spawn error: ${err.message}
 `);
     });
     for (const pipe of ["stdin", "stdout", "stderr"]) {
       child[pipe]?.on("error", (err) => {
-        logger8.debug(`[engine-client:${this.engineId}] ${pipe} pipe error (engine died concurrently = expected): ${err.message}`);
+        logger9.debug(`[engine-client:${this.engineId}] ${pipe} pipe error (engine died concurrently = expected): ${err.message}`);
       });
     }
     child.stdout?.setEncoding("utf-8");
@@ -1122,7 +1232,7 @@ var EngineClient = class {
     try {
       frame = JSON.parse(line);
     } catch {
-      logger8.warn(
+      logger9.warn(
         `[engine-client:${this.engineId}] dropped non-NDJSON stdout line (protocol contract: stdout is NDJSON-only): ${truncate(line, FRAME_ECHO_MAX_CHARS)}`
       );
       return;
@@ -1139,7 +1249,7 @@ var EngineClient = class {
       this.onReverseRequest(frame);
       return;
     }
-    logger8.warn(
+    logger9.warn(
       `[engine-client:${this.engineId}] dropped unrecognized frame: ${truncate(line, FRAME_ECHO_MAX_CHARS)}`
     );
   }
@@ -1263,7 +1373,7 @@ var EngineClient = class {
       try {
         await this.request("dispose", {}, { timeoutMs: DISPOSE_GRACE_MS });
       } catch (err) {
-        logger8.debug(
+        logger9.debug(
           `[engine-client:${this.engineId}] dispose frame failed, falling back to kill chain: ${err instanceof Error ? err.message : String(err)}`
         );
       }
@@ -1275,9 +1385,9 @@ var EngineClient = class {
   onEngineExit(code, signal) {
     const detail = signal !== null ? `signal ${signal}` : `exit code ${code}`;
     if (this.intentionalKill) {
-      logger8.debug(`[engine-client:${this.engineId}] engine exited after intentional kill (${detail}) \u2014 expected`);
+      logger9.debug(`[engine-client:${this.engineId}] engine exited after intentional kill (${detail}) \u2014 expected`);
     } else {
-      logger8.warn(`[engine-client:${this.engineId}] engine process exited unexpectedly (${detail})`);
+      logger9.warn(`[engine-client:${this.engineId}] engine process exited unexpectedly (${detail})`);
     }
     this.teardownProcess(detail);
     this.state = "exited";
@@ -1326,7 +1436,7 @@ var EngineClient = class {
 `);
       return true;
     } catch (err) {
-      logger8.debug(
+      logger9.debug(
         `[engine-client:${this.engineId}] stdin write failed: ${err instanceof Error ? err.message : String(err)}`
       );
       return false;
@@ -1675,7 +1785,7 @@ function getHostUiRequestEndpoint() {
 }
 
 // src/execution/engine/engine-inspect-package.ts
-var logger9 = getLogger("subagents");
+var logger10 = getLogger("subagents");
 function readEnginePackageJson(pkgDir) {
   let raw;
   try {
@@ -1754,12 +1864,12 @@ function parseOptionalDisplayFields(m, id) {
     if (typeof rawDisplayName === "string" && rawDisplayName.trim() !== "") {
       displayName = rawDisplayName;
     } else {
-      logger9.warn(`[engine-discovery] engine '${id}': displayName must be a non-empty string \u2014 ignoring`);
+      logger10.warn(`[engine-discovery] engine '${id}': displayName must be a non-empty string \u2014 ignoring`);
     }
   }
   const rawDescription = m["description"];
   if (rawDescription !== void 0 && typeof rawDescription !== "string") {
-    logger9.warn(`[engine-discovery] engine '${id}': description must be a string \u2014 ignoring`);
+    logger10.warn(`[engine-discovery] engine '${id}': description must be a string \u2014 ignoring`);
   }
   return displayName;
 }
@@ -1848,7 +1958,7 @@ function errorMessage(err) {
 // src/execution/engine/engine-discovery-roots.ts
 var fs2 = __toESM(require("fs"), 1);
 var path3 = __toESM(require("path"), 1);
-var logger10 = getLogger("subagents");
+var logger11 = getLogger("subagents");
 var ENGINE_ROOTS_ENV = "XYZ_AGENT_ENGINE_ROOTS";
 function parseEngineRootsEnv(env) {
   const raw = env[ENGINE_ROOTS_ENV];
@@ -1859,7 +1969,7 @@ function parseEngineRootsEnv(env) {
     const dir = part.trim();
     if (dir === "") continue;
     if (!path3.isAbsolute(dir)) {
-      logger10.warn(
+      logger11.warn(
         `[engine-discovery] ${ENGINE_ROOTS_ENV} entry '${dir}' is not an absolute path \u2014 dropping entry`
       );
       continue;
@@ -1928,7 +2038,7 @@ function isFile(p) {
 // src/execution/engine/config.ts
 var fs3 = __toESM(require("fs"), 1);
 var path4 = __toESM(require("path"), 1);
-var logger11 = getLogger("subagents");
+var logger12 = getLogger("subagents");
 function readExplicitEngines(agentDir) {
   const configPath = path4.join(agentDir, "subagents", "config.json");
   let parsed;
@@ -1941,7 +2051,7 @@ function readExplicitEngines(agentDir) {
   const engines = parsed["engines"];
   if (typeof engines !== "object" || engines === null || Array.isArray(engines)) {
     if (engines !== void 0) {
-      logger11.warn(
+      logger12.warn(
         `[engine-discovery] config.json engines section must be an object keyed by engine id, got ${jsonKindOf(engines)} \u2014 ignoring L3 explicit engines`
       );
     }
@@ -1969,7 +2079,7 @@ function sanitizeExplicitEntry(id, raw) {
 }
 function requireEntryObject(id, raw) {
   if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
-    logger11.warn(
+    logger12.warn(
       `[engine-discovery] config.json engines.${id} must be an object, got ${jsonKindOf(raw)} \u2014 skipping entry`
     );
     return void 0;
@@ -1978,7 +2088,7 @@ function requireEntryObject(id, raw) {
 }
 function requireCommand(id, command) {
   if (typeof command !== "string" || command.trim() === "") {
-    logger11.warn(
+    logger12.warn(
       `[engine-discovery] config.json engines.${id}.command is required (non-empty string) \u2014 skipping entry`
     );
     return void 0;
@@ -1987,7 +2097,7 @@ function requireCommand(id, command) {
 }
 function normalizeArgs(id, args) {
   if (args !== void 0 && !isStringArray(args)) {
-    logger11.warn(
+    logger12.warn(
       `[engine-discovery] config.json engines.${id}.args must be a string array \u2014 ignoring args`
     );
   }
@@ -1995,7 +2105,7 @@ function normalizeArgs(id, args) {
 }
 function normalizeConfig(id, config) {
   if (config !== void 0 && !isStringRecord(config)) {
-    logger11.warn(
+    logger12.warn(
       `[engine-discovery] config.json engines.${id}.config must be a Record<string, string> \u2014 ignoring config`
     );
   }
@@ -2003,7 +2113,7 @@ function normalizeConfig(id, config) {
 }
 function normalizeCwd(id, cwd) {
   if (cwd !== void 0 && typeof cwd !== "string") {
-    logger11.warn(
+    logger12.warn(
       `[engine-discovery] config.json engines.${id}.cwd must be a string \u2014 ignoring cwd`
     );
   }
@@ -2023,7 +2133,7 @@ function jsonKindOf(value) {
 }
 
 // src/execution/engine/registry.ts
-var logger12 = getLogger("subagents");
+var logger13 = getLogger("subagents");
 var ENGINE_REGISTRY_SLOT_KEY = /* @__PURE__ */ Symbol.for("@zhushanwen/pi-subagent-workflow.engineRegistry");
 function getRegistrySlot() {
   let slot = Reflect.get(globalThis, ENGINE_REGISTRY_SLOT_KEY);
@@ -2037,12 +2147,12 @@ function triggerEngineDispose(engine, source) {
   if (typeof engine.dispose !== "function") return;
   try {
     engine.dispose().then(void 0, (err) => {
-      logger12.warn(
+      logger13.warn(
         `[engine-registry] engine '${engine.id}' dispose rejected (${source}, best-effort continue): ${err instanceof Error ? err.message : String(err)}`
       );
     });
   } catch (err) {
-    logger12.warn(
+    logger13.warn(
       `[engine-registry] engine '${engine.id}' dispose threw synchronously (${source}, best-effort continue): ${err instanceof Error ? err.message : String(err)}`
     );
   }
@@ -2059,14 +2169,14 @@ function hasEngine(id) {
 }
 
 // src/execution/engine/engine-discovery-scan.ts
-var logger13 = getLogger("subagents");
+var logger14 = getLogger("subagents");
 function scanEngines(opts) {
   const env = opts.env ?? process.env;
   const result = { discovered: [], skipped: [], unusable: [] };
   const present = (entry) => {
     const idx = result.discovered.findIndex((d) => d.id === entry.id);
     if (idx >= 0) {
-      logger13.debug(
+      logger14.debug(
         `[engine-discovery] engine id '${entry.id}' from '${entry.source}' overrides earlier discovery from '${result.discovered[idx].source}' \u2014 same-id override`
       );
       result.discovered[idx] = entry;
@@ -2078,13 +2188,13 @@ function scanEngines(opts) {
     const inspection = inspectEnginePackage(pkgDir, source, opts.hostKind, env);
     if (inspection.status === "skip") {
       if (!inspection.reason.includes("not an engine package")) {
-        logger13.warn(`[engine-discovery] skipping ${pkgDir} (${source}): ${inspection.reason}`);
+        logger14.warn(`[engine-discovery] skipping ${pkgDir} (${source}): ${inspection.reason}`);
         result.skipped.push({ pkgDir, reason: inspection.reason });
       }
       return;
     }
     if (inspection.status === "unusable") {
-      logger13.warn(`[engine-discovery] engine unavailable: ${inspection.reason}`);
+      logger14.warn(`[engine-discovery] engine unavailable: ${inspection.reason}`);
       result.unusable.push({ pkgDir, id: inspection.id, reason: inspection.reason });
       return;
     }
@@ -2109,7 +2219,7 @@ function scanEngines(opts) {
       const command = resolveExplicitCommand(entry.command, env);
       if (command === void 0) {
         const reason = `engine '${id}' (config.json engines.${id}): command '${entry.command}' not found or not executable`;
-        logger13.warn(`[engine-discovery] ${reason} \u2014 not registering`);
+        logger14.warn(`[engine-discovery] ${reason} \u2014 not registering`);
         result.unusable.push({ pkgDir: `config.json engines.${id}`, id, reason });
         continue;
       }
@@ -2126,7 +2236,7 @@ function discoverAndRegisterEngines(opts) {
     registerEngineDescriptor(entry.id, entry.descriptor);
     loadedDiscoveryIdSet.add(entry.id);
     if (existed) {
-      logger13.debug(
+      logger14.debug(
         `[engine-discovery] engine '${entry.id}' descriptor overwritten in registry (source '${entry.source}') \u2014 same-id override`
       );
     }
@@ -2156,7 +2266,7 @@ function resolveExplicitCommand(command, env) {
 }
 function buildExplicitDescriptor(id, command, entry, opts) {
   const env = opts.env ?? process.env;
-  logger13.debug(
+  logger14.debug(
     `[engine-discovery] engine '${id}' registered from config.json engines section with conservative capabilities (no manifest)`
   );
   const caps = { ...CONSERVATIVE_CAPABILITIES };

package/dist/execution/engine/engine-discovery-scan.d.cts

@@ -1,4 +1,4 @@
-export { D as DiscoverEnginesOptions, a4 as DiscoveredEngine, a5 as DiscoveryScanResult, a6 as ENGINE_ROOTS_ENV, a7 as PackageInspection, a8 as deriveNodeModuleRoots, a9 as discoverAndRegisterEngines, aa as ensureEngineDiscovered, ab as inspectEnginePackage, ac as loadedDiscoveryIds, ad as parseEngineRootsEnv, ae as scanEngines } from '../../engine-discovery-scan-ocpM8FmI.cjs';
+export { D as DiscoverEnginesOptions, a4 as DiscoveredEngine, a5 as DiscoveryScanResult, a6 as ENGINE_ROOTS_ENV, a7 as PackageInspection, a8 as deriveNodeModuleRoots, a9 as discoverAndRegisterEngines, aa as ensureEngineDiscovered, ab as inspectEnginePackage, ac as loadedDiscoveryIds, ad as parseEngineRootsEnv, ae as scanEngines } from '../../engine-discovery-scan-BXLA8y-z.cjs';
 import '@zhushanwen/subagent-engine-sdk';
 import 'node:child_process';
 import '@xyz-agent/extension-protocol';

package/dist/execution/engine/engine-discovery-scan.d.ts

@@ -1,4 +1,4 @@
-export { D as DiscoverEnginesOptions, a4 as DiscoveredEngine, a5 as DiscoveryScanResult, a6 as ENGINE_ROOTS_ENV, a7 as PackageInspection, a8 as deriveNodeModuleRoots, a9 as discoverAndRegisterEngines, aa as ensureEngineDiscovered, ab as inspectEnginePackage, ac as loadedDiscoveryIds, ad as parseEngineRootsEnv, ae as scanEngines } from '../../engine-discovery-scan-ocpM8FmI.js';
+export { D as DiscoverEnginesOptions, a4 as DiscoveredEngine, a5 as DiscoveryScanResult, a6 as ENGINE_ROOTS_ENV, a7 as PackageInspection, a8 as deriveNodeModuleRoots, a9 as discoverAndRegisterEngines, aa as ensureEngineDiscovered, ab as inspectEnginePackage, ac as loadedDiscoveryIds, ad as parseEngineRootsEnv, ae as scanEngines } from '../../engine-discovery-scan-BXLA8y-z.js';
 import '@zhushanwen/subagent-engine-sdk';
 import 'node:child_process';
 import '@xyz-agent/extension-protocol';

package/dist/execution/engine/engine-discovery-scan.js

@@ -7,7 +7,7 @@ import {
   loadedDiscoveryIds,
   parseEngineRootsEnv,
   scanEngines
-} from "../../chunk-VURUAGMM.js";
+} from "../../chunk-OL5BK4VN.js";
 export {
   ENGINE_ROOTS_ENV,
   deriveNodeModuleRoots,