@zhushanwen/pi-subagent-workflow 8.6.0 → 8.8.0

package/src/index.ts

@@ -20,37 +20,50 @@ import type { BeforeAgentStartEvent, ExtensionAPI, ExtensionContext, SessionComp
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { getLogger, setPiHandle } from "@zhushanwen/pi-extension-logger";
 
-import { bestEffort } from "./execution/best-effort.ts";
+// ═══ core 宿主端口接线（subagent-core 包抽离 u0-wire；实现见 src/host/pi-host.ts） ═══
+import { configureCore } from "@zhushanwen/subagent-core/core/host-services.ts";
+import { configureNotifyDomain } from "@zhushanwen/subagent-core/core/notify-ports.ts";
+import { createPiHostServices, createPiNotifyDomainPorts } from "./host/pi-host.ts";
+
+import { oncePerProcess } from "@zhushanwen/pi-ext-guards";
+import { bestEffort } from "@zhushanwen/subagent-core/execution/best-effort.ts";
 // ═══ execution/ 层（subagents 核心 + 运行时） ═══
-import { getOrCreateChannelRegistry } from "./execution/channel-registry-access.ts";
-import { DialogGlobalQueue } from "./execution/dialog-queue.ts";
+import { getOrCreateChannelRegistry } from "@zhushanwen/subagent-core/execution/channel-registry-access.ts";
+import { DialogGlobalQueue } from "@zhushanwen/subagent-core/execution/dialog-queue.ts";
+// [engine-awareness U3] 全局 config 三态读取（检测 poll 与 session_start 基线共用）
+import { readGlobalConfig } from "@zhushanwen/subagent-core/execution/config.ts";
 // [U7] 引擎列表状态文件（registry → engines.json，GUI 引擎选择器数据源）
-import { syncEnginesFile } from "./execution/engine/engine-discovery.ts";
+import { syncEnginesFile } from "@zhushanwen/subagent-core/execution/engine/engine-discovery.ts";
 // [U7] 引擎模型段注入（defaultEngine 非 pi 时 system prompt 补 <available_<engine>_models>）
-import { buildEngineModelsPromptAppend } from "./execution/engine/model-prompt.ts";
+// [engine-awareness U3] 补恒在状态段 <current_subagent_engine>（D6，pi 引擎也声明）
+import { buildEngineModelsPromptAppend, buildSubagentEngineSection } from "@zhushanwen/subagent-core/execution/engine/model-prompt.ts";
 // [P1 引擎接线] 组合根登记 'pi' 引擎进 registry（引擎获取统一经 getEngine，缺省 id 'pi'）
-import { registerPiEngine } from "./execution/engine/engines/pi/registration.ts";
+import { registerPiEngine } from "@zhushanwen/subagent-core/execution/engine/engines/pi/registration.ts";
 // [P3 引擎接线] 组合根登记 'zcode' 引擎（spawn 单轮模式；engineDataDir 默认走
 // common/data-dir SSOT，见 engines/zcode/registration.ts）
-import { registerZcodeEngine } from "./execution/engine/engines/zcode/registration.ts";
-import { createUiRequestHandlerForMode } from "./execution/ui-request-handler-factory.ts";
+import { registerZcodeEngine } from "@zhushanwen/subagent-core/execution/engine/engines/zcode/registration.ts";
+import { createUiRequestHandlerForMode } from "@zhushanwen/subagent-core/execution/ui-request-handler-factory.ts";
 import {
   getModelConfigService,
   ModelConfigService,
   setModelConfigService,
-} from "./execution/model-config-service.ts";
-import { bindNotifyLedgerHost, getBoundNotifyLedger, type NotifyLedgerHost } from "./execution/notify-ledger.ts";
-import { IDENTITY_CUSTOM_TYPE, type SubagentIdentityData } from "./execution/session-reconstructor.ts";
-import type { ExecutionMode, SubagentRecord } from "./execution/types.ts";
-import { maybeCleanupExpiredSessionFiles } from "./execution/session-file-gc.ts";
+} from "@zhushanwen/subagent-core/execution/model-config-service.ts";
+import { bindNotifyLedgerHost, getBoundNotifyLedger, type NotifyLedgerHost } from "@zhushanwen/subagent-core/execution/notify-ledger.ts";
+import { IDENTITY_CUSTOM_TYPE, type SubagentIdentityData } from "@zhushanwen/subagent-core/execution/session-reconstructor.ts";
+import type { ExecutionMode } from "@zhushanwen/subagent-core/execution/types.ts";
+import { maybeCleanupExpiredSessionFiles } from "@zhushanwen/subagent-core/execution/session-file-gc.ts";
 import {
   getSubagentService,
   setSubagentService,
   SubagentService,
-} from "./execution/subagent-service.ts";
-import { killAllSpawnedChildren } from "./execution/session-runner.ts";
-import { SubprocessAgentRunner } from "./execution/subprocess-agent-runner.ts";
-import { WorktreeManager } from "./execution/worktree-manager.ts";
+} from "@zhushanwen/subagent-core/execution/subagent-service.ts";
+import { killAllSpawnedChildren } from "@zhushanwen/subagent-core/execution/session-runner.ts";
+import { SubprocessAgentRunner } from "@zhushanwen/subagent-core/execution/subprocess-agent-runner.ts";
+import { WorktreeManager } from "@zhushanwen/subagent-core/execution/worktree-manager.ts";
+// [engine-awareness U3] per-turn 引擎检测编排（D1/D1b/D2/D3/D5）；normalizeEngineId
+// 单一权威源在 core registry（原经 engine-awareness 再导出，导入面已折叠直连）
+import { normalizeEngineId } from "@zhushanwen/subagent-core/execution/engine/registry.ts";
+import { runEngineAwarenessTurn } from "./injectors/engine-awareness.ts";
 import { setupModelListInjector } from "./injectors/model-list-injector.ts";
 import { setupSubagentListInjector } from "./injectors/subagent-list-injector.ts";
 import { setupWorkflowListInjector } from "./injectors/workflow-list-injector.ts";
@@ -63,20 +76,21 @@ import { registerSubagentTool } from "./interface/subagent-tool.ts";
 import { registerSubagentsCommand } from "./interface/subagents.ts";
 import { registerWorkflowTool } from "./interface/tool-workflow.ts";
 import { registerWorkflowScriptTool } from "./interface/tool-workflow-script.ts";
-import { JsonlRunStore } from "./orchestration/jsonl-run-store.ts";
-import { clearSkillPathCache } from "./orchestration/skill-discovery.ts";
+import { JsonlRunStore } from "./jsonl-run-store.ts";
+import { clearSkillPathCache } from "@zhushanwen/subagent-core/orchestration/skill-discovery.ts";
 // ═══ orchestration/ 层（workflow engine + infra） ═══
-import type { LauncherDeps } from "./orchestration/launcher.ts";
-import { executeNestedWorkflow, runAndWait, type WorkflowRunResult } from "./orchestration/launcher.ts";
+import type { LauncherDeps } from "@zhushanwen/subagent-core/orchestration/launcher.ts";
+import { executeNestedWorkflow, runAndWait, type WorkflowRunResult } from "@zhushanwen/subagent-core/orchestration/launcher.ts";
 import {
   evictDoneRunsBeyondCap,
   MAX_RETAINED_DONE_RUNS,
+  recoverCrashedRuns,
   scheduleTimeBudget,
   terminateRunningRuns,
-} from "./orchestration/lifecycle.ts";
-import type { WorkflowRun } from "./orchestration/models/workflow-run.ts";
-import { WorkerHostImpl } from "./orchestration/worker-host.ts";
-import { WorkflowScriptRegistryImpl } from "./orchestration/workflow-script-registry-impl.ts";
+} from "@zhushanwen/subagent-core/orchestration/lifecycle.ts";
+import type { WorkflowRun } from "@zhushanwen/subagent-core/orchestration/models/workflow-run.ts";
+import { WorkerHostImpl } from "@zhushanwen/subagent-core/orchestration/worker-host.ts";
+import { WorkflowScriptRegistryImpl } from "@zhushanwen/subagent-core/orchestration/workflow-script-registry-impl.ts";
 
 // ── pi.__workflowRun 类型扩展（D-8 签名） ─────────────────
 
@@ -96,42 +110,6 @@ declare module "@earendil-works/pi-coding-agent" {
 // 模块级 logger（setPiHandle 注入后自动走 appendEntry）
 const logger = getLogger("subagents");
 
-// ── subagent 状态快照格式化 ──
-//
-// [v4 A-6] before_agent_start 注入 hook 已删（活跃 subagent 清单改由 agent 按需调
-// action:'list' 拉取，消除每 loop 注入的上下文税与盲点）。本函数保留为纯格式化工具：
-// before-agent-start-injection / parent-child-matrix 测试覆盖其正确性，未来 list
-// 视图或其他注入点可复用。
-
-/** 活跃 subagent 数量上限（超过截断显示）。 */
-const MAX_STATUS_INJECTION = 10;
-
-/**
- * 将活跃 subagent record 格式化为一行一条的快照文本。
- *
- * 格式：
- *   [subagent-status] N active subagents:
- *   - sa-xxx (slug): running, rounds 0
- *   - sa-yyy (slug): idle, rounds 3
- *   +2 more, use action:'list'
- *
- * @param records 已筛选的活跃 record（running + idle）
- */
-export function formatSubagentStatusSnapshot(records: SubagentRecord[]): string {
-  const lines = [`[subagent-status] ${records.length} active subagent${records.length === 1 ? "" : "s"}:`];
-  const shown = records.slice(0, MAX_STATUS_INJECTION);
-  for (const r of shown) {
-    const slug = r.slug || r.agent;
-    const roundPart = r.round !== undefined && r.round > 0 ? `, rounds ${r.round}` : "";
-    lines.push(`- ${r.id} (${slug}): ${r.status}${roundPart}`);
-  }
-  const remaining = records.length - MAX_STATUS_INJECTION;
-  if (remaining > 0) {
-    lines.push(`+${remaining} more, use action:'list'`);
-  }
-  return lines.join("\n");
-}
-
 // ═══ [V2 决策 7 防线 i] process 级 shutdown hook ═══
 //
 // session_shutdown 是 pi 的 async hook，进程被 SIGTERM/SIGINT 强杀或崩溃时来不及
@@ -170,6 +148,14 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
   // 的 getLogger("subagents") 也能走 appendEntry。
   setPiHandle(pi);
 
+  // [u0-wire] core 宿主端口接线：本波端口尚无 core 消费方（消费切换在 u0-log /
+  // u0-data-discovery / u0-notify 波次），接线本身零行为变化。紧随 setPiHandle——
+  // core log 桥接走 pi-extension-logger，其 pi handle 先注入则配置完成即桥接链路
+  // 完整；且先于任何可能消费 core 端口的初始化逻辑（引擎登记等）。缺省态若被消费，
+  // dataRoot 抛 core_host_not_configured（§3.4），接线后不再可达。
+  configureCore(createPiHostServices());
+  configureNotifyDomain(createPiNotifyDomainPorts());
+
   // [P1 引擎接线] 组合根登记缺省引擎：进程级 SubagentService 单例（session_start 注入）
   // 经 registry 以 'pi' 暴露——引擎获取从此统一走 getEngine(DEFAULT_ENGINE_ID)，上层
   // 不再硬编码「spawn pi」。幂等（registerEngine 覆盖语义），工厂惰性解析服务单例。
@@ -230,12 +216,10 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
     }
   }
 
-  // resources_discover：不再注入额外 skill 目录（ADR-031 废弃 discovery.json）。
-  // pi 核心 auto-discovery 已覆盖 .agents/skills 等标准目录，子 session 的
-  // --skill 由 agent({skill}) 调用方显式传入，无需 extension 额外补充。
-  pi.on("resources_discover", (_event, _ctx: ExtensionContext) => {
-    return {};
-  });
+  // resources_discover：不再注册 handler（v4 决策：不再注入额外 skill 目录，
+  // ADR-031 废弃 discovery.json）。pi 核心 auto-discovery 已覆盖 .agents/skills
+  // 等标准目录，子 session 的 --skill 由 agent({skill}) 调用方显式传入，无需
+  // extension 额外补充。
 
   // ════════════════════════════════════════════════════════════
   //  workflow 域：tools + command + pi.__workflowRun + state
@@ -267,6 +251,10 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
        *  workflow 域启动时 fail-fast，避免后续 store.save 再次失败导致 run 状态不落地。
        *  subagent 域不依赖 store，不受此标志影响。 */
       storeHealthy: boolean;
+      /** [engine-awareness D1b] 上一次已知默认引擎（session_start 初始化，per-turn 检测
+       *  diff 基准）。undefined = 初始化时 config 读失败——首 turn 检测遇 undefined
+       *  静默基线化，不算变更、不发通知（防首 turn 伪通知）。 */
+      lastEngine?: string;
     }
   >();
 
@@ -359,8 +347,9 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
     lsRef.lastSessionId = sessionId;
 
     // [U7] 引擎列表同步 engines.json（幂等零写 + fail-safe；组合根注册已在
-    // extension 工厂体完成，此处 registry 已含全部引擎）
-    syncEnginesFile(agentDir);
+    // extension 工厂体完成，此处 registry 已含全部引擎）。写 agentDir 全局文件属
+    // 跨 session 副作用——oncePerProcess 守卫防 factory 二调/handler 累积双跑（u-audit-fix）。
+    oncePerProcess("subagent-workflow:sync-engines-file", () => syncEnginesFile(agentDir));
 
     // skill 路径两级缓存 session 级失效：pi 同进程可能有多个 session（TUI /new、/fork），
     // 运行中安装的 skill 需对新 session 可见（含曾 miss 缓存的 undefined 条目与 npm 新装
@@ -505,21 +494,27 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
       setSubagentService(service);
     }
 
-    // S-2: 启动 idle record GC 定时器（30 天 TTL，每小时检查一次）
-    service.startGcTimer();
+    // S-2: 启动 idle record GC 定时器（30 天 TTL，每小时检查一次）。
+    // 注册 setInterval 属进程级副作用——oncePerProcess 守卫防双跑（u-audit-fix）。
+    oncePerProcess("subagent-workflow:start-gc-timer", () => service.startGcTimer());
 
     try {
-      maybeCleanupExpiredSessionFiles(agentDir, cwd);
+      // 递归扫描 <agentDir>/subagents + unlink 超 TTL 跨 session 文件属进程级维护
+      // ——oncePerProcess 守卫防双跑（u-audit-fix）。
+      oncePerProcess("subagent-workflow:cleanup-expired-session-files", () =>
+        maybeCleanupExpiredSessionFiles(agentDir, cwd));
     } catch (err) {
       logger.warn("[subagents] expired session file cleanup failed", {
         reason: err instanceof Error ? err.message : String(err),
       });
     }
 
-    // ADR-035 启动恢复：扫描 manifest tmp 残留（崩溃打断的 writeManifest 留下），
-    // 每次 session_start 都调（与上方 maybeCleanupExpiredSessionFiles 一致）。
+    // ADR-035 启动恢复：扫描 manifest tmp 残留（崩溃打断的 writeManifest 留下，promote/unlink）。
+    // 扫描属进程级维护——oncePerProcess 守卫防双跑（u-audit-fix）；第二派发重放首次
+    // Promise（结果缓存语义），recovered 计数日志可能重打，无文件副作用。
     try {
-      const recovered = await service.recoverManifestTmpFiles();
+      const recovered = await oncePerProcess("subagent-workflow:recover-manifest-tmp-files", () =>
+        service.recoverManifestTmpFiles());
       if (recovered.recovered > 0 || recovered.deleted > 0) {
         logger.warn(`[subagents] manifest tmp recovery: ${recovered.recovered} promoted, ${recovered.deleted} deleted`);
       }
@@ -530,8 +525,9 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
     }
 
     try {
-      const wtm = new WorktreeManager(agentDir);
-      await wtm.scan();
+      // 孤儿 worktree 清理（git/rm 进程操作 + 注册表/目录扫描）属进程级维护
+      // ——oncePerProcess 守卫防双跑（u-audit-fix）。
+      await oncePerProcess("subagent-workflow:worktree-scan", () => new WorktreeManager(agentDir).scan());
     } catch (err) {
       logger.warn("[subagents] worktree reaper scan failed", {
         reason: err instanceof Error ? err.message : String(err),
@@ -553,49 +549,30 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
     // resolveIdentity），无需经 state 透传——modelService 是唯一 registry 源。
 
     // MF-1: store 健康度跟踪。loadAll 失败 → storeHealthy=false，workflow 域启动时 fail-fast。
+    // 崩溃恢复四步（loadAll → failed → save → evict）收口到 core recoverCrashedRuns（D8：
+    // 宿主各写一遍正是 failure-mode-B）；pending:unregister 经 hooks 外置发射（位置在
+    // transition 后、save 前，对齐原内联实现）；save 走 store 冷路径（done 绕过去抖）——
+    // 冷路径语义在 JsonlRunStore.save 内，不随循环归属转移。loadAll 失败的 fail-fast
+    // （storeHealthy=false 停初始化）是宿主职责，core 原样上抛、这里 catch 兜住。
     let storeHealthy = true;
     try {
-      const loaded = await store.loadAll();
-      for (const run of loaded) {
-        if (run.state.status === "running") {
-          run.state.error = "Process killed (kill-9 or crash recovery)";
-          run.transition("done", "failed");
-          pi.events.emit("pending:unregister", {
-            id: run.runId,
-            reason: "failed",
-          });
-          // 恢复终态必须落盘：save 走冷路径（done 绕过去抖）同步写 state 文件 +
-          // append 终态 workflow-record entry——entry_appended 事件驱动 runtime 派生
-          // 缓存失效重拉（无 triggerTurn 副作用）。不 save 则 entry/state 双双停留
-          // running，侧栏永久卡 running。失败仅记日志不阻断其余 run 的恢复（下次
-          // session_start 重开重试，恢复循环天然幂等）。
-          try {
-            await store.save(run);
-          } catch (err) {
-            logger.error("[subagent-workflow] kill-9 recovery store.save failed", {
-              runId: run.runId,
-              reason: err instanceof Error ? err.message : String(err),
-            });
-          }
-        }
-        runs.set(run.runId, run);
-      }
-      // done run 内存有界性：loadAll 全量重水合后立即裁剪到 K。kill-9 恢复（上方
-      // running → transition("done","failed")）的 run completedAt 为 transition 时刻
-      // （当前时间=全局最新）参与排序且必在保留端；多条恢复 run 同 ms completedAt →
-      // tie 稳定排序。淘汰只 delete runs Map 条目——磁盘 state 文件与
-      // workflow-state-link 指针条目均不动（历史审计保留）；下次 session_start loadAll
-      // 从指针全量重水合后再次裁剪，该循环每次 session 启动重复且可接受：内存峰值只在
-      // 启动期，常驻 O(K + 活跃 run)。消除启动峰值需指针 compaction，属 append+replay
-      // 长期方案问题域，非本范围。
-      const evicted = evictDoneRunsBeyondCap(runs, MAX_RETAINED_DONE_RUNS);
-      if (evicted > 0) {
-        logger.debug("[subagent-workflow] evicted done runs beyond cap after loadAll", {
-          evicted,
-          keep: MAX_RETAINED_DONE_RUNS,
-          sessionId,
-        });
-      }
+      // 崩溃恢复 loadAll 扫 cwd 共享 sessionDir（同 cwd 跨 session 共享）并把 running run
+      // 转 failed 落盘——写非本 session 的 run state 文件属跨 session 副作用，oncePerProcess
+      // 守卫防双跑（u-audit-fix）。第二派发重放首次 Promise：不再落盘、不再 emit。
+      await oncePerProcess(
+        "subagent-workflow:recover-crashed-runs",
+        () =>
+          recoverCrashedRuns(
+            store,
+            runs,
+            "Process killed (kill-9 or crash recovery)",
+            {
+              onRunRecovered: (payload) => {
+                pi.events.emit("pending:unregister", payload);
+              },
+            },
+          ),
+      );
     } catch (err) {
       // QMF-4 fix: store.loadAll 失败是关键路径错误，workflow 域将未初始化
       logger.error("[subagent-workflow] store.loadAll failed, workflow domain uninitialized", {
@@ -612,6 +589,13 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
       ctxModel: ctx.model ?? undefined,
     });
 
+    // [engine-awareness D1b] lastEngine 初始化：构造性同源——单次 reloadGlobalConfig
+    // 读取同时刷新 Service 路由缓存与 lastEngine 基准，消灭 initModel 与本处两次独立
+    // 读取间的分叉窗口（两读值不一致时检测走 unchanged 分支不 reload，状态段/路由
+    // 永停旧值且永不通知）。ok/absent → 归一后的当前引擎；failed → undefined（首 turn
+    // 检测静默基线化兜底，此时缓存亦保持不动）。/resume、/fork 同样走 session_start
+    // （SR-3），基线天然覆盖。
+    const engineRead = modelService.reloadGlobalConfig();
     sessionState.set(sessionId, {
       store,
       runs,
@@ -619,6 +603,8 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
       runner,
       ctx,
       storeHealthy,
+      lastEngine:
+        engineRead.status === "failed" ? undefined : normalizeEngineId(engineRead.config.defaultEngine),
     });
   });
 
@@ -642,15 +628,41 @@ export default function subagentsWorkflowExtension(pi: ExtensionAPI): void {
   });
 
   // ════════════════════════════════════════════════════════════
-  //  [U7] before_agent_start：引擎模型段注入（defaultEngine 非 pi 且引擎实现
-  //  listModels 时追加 <available_<engine>_models>——每 turn 重判 config，改配置
-  //  后下一 turn 即生效；fail-safe 任何异常不注入不阻塞 agent loop）
+  //  [U7 + engine-awareness U3] before_agent_start：引擎感知注入（链尾注册，D7——
+  //  段内容变化只断 system prompt 尾部 cache 前缀）。
+  //  ① per-turn 检测编排（§2.3 数据流）：三态 poll config → lastEngine diff →
+  //     变更时读取结果先行提交缓存（D2，applyGlobalConfig 纯赋值，本 turn 路由生效）
+  //     → sendMessage 通知
+  //     （D3，不设 triggerTurn——P1 探针已证此形态消息进入本 turn LLM 上下文，
+  //     证据：真机 pi rpc payload dump + 0.84.4 dist sendMessage→_appendCustomMessage
+  //     →agent.state.messages.push→createContextSnapshot 调用链）→ 更新 lastEngine。
+  //  ② 恒在状态段 <current_subagent_engine>（D6）+ 引擎清单段 <available_<engine>_models>。
+  //     apply 后 getGlobalConfig() 即新值——通知、状态段、路由三处同 turn 对齐（G2）。
+  //  段序：状态段在前（文案声明 "listed ... below"），清单段在后；provider models 段
+  //  由更早注册的 handler 注入、位于上方。fail-safe 任何异常不注入不阻塞 agent loop。
   // ════════════════════════════════════════════════════════════
-  pi.on("before_agent_start", (event: BeforeAgentStartEvent) => {
+  pi.on("before_agent_start", (event: BeforeAgentStartEvent, ctx: ExtensionContext) => {
     try {
       const service = getModelConfigService();
-      const append = service === null ? "" : buildEngineModelsPromptAppend(service.getGlobalConfig().defaultEngine);
-      if (append === "" || typeof event.systemPrompt !== "string") return undefined;
+      if (service === null || typeof event.systemPrompt !== "string") return undefined;
+      const sid = ctx.sessionManager.getSessionId();
+      runEngineAwarenessTurn({
+        readConfig: () => readGlobalConfig(getAgentDir()),
+        applyRead: (read) => service.applyGlobalConfig(read),
+        sendMessage: (message) => {
+          // D3：不设 triggerTurn——切换是用户主动行为，无需唤醒 AI 立即行动
+          pi.sendMessage(message, {});
+        },
+        getLastEngine: () => sessionState.get(sid)?.lastEngine,
+        setLastEngine: (engine) => {
+          const state = sessionState.get(sid);
+          if (state) state.lastEngine = engine;
+        },
+      });
+      const defaultEngine = service.getGlobalConfig().defaultEngine;
+      const append = [buildSubagentEngineSection(defaultEngine), buildEngineModelsPromptAppend(defaultEngine)]
+        .filter((part) => part !== "")
+        .join("\n\n");
       return { systemPrompt: `${event.systemPrompt}\n\n${append}` };
     } catch {
       return undefined;
@@ -940,17 +952,8 @@ function getOrCreateDialogQueue(): DialogGlobalQueue {
   return queue;
 }
 
-// ============================================================
-// Public cross-extension API（channel handler 注册入口）
-// ============================================================
-//
-// 跨扩展消费者（ask-user 等）通过包根 import 注册 channel handler，
-// 让 subagent 子进程的 UI 请求（ask_user 等）透传到主进程渲染。
-// 重新导出 channel-registry-access 的公开 API——稳定 surface，
-// 内部存储实现演进不影响消费者。
-
-export {
-  getOrCreateChannelRegistry,
-  type UiChannelRegistry,
-  type ChannelHandler,
-} from "./execution/channel-registry-access.ts";
+// 跨扩展 channel handler 注册入口已收口到 core 深路径
+// `@zhushanwen/subagent-core/execution/channel-registry-access.ts`
+// （getOrCreateChannelRegistry / UiChannelRegistry / ChannelHandler）。
+// 历史上的包根 re-export 已删：ask-user 等跨扩展消费者经 globalThis 握手
+// （DIALOG_QUEUE_KEY 同款进程级单例），不再经包根 import 消费本模块。