@zhin.js/agent 1.1.2 → 1.1.5

package/lib/stability/memory-pressure.js

@@ -41,36 +41,19 @@ export function startStabilityMonitor(options = {}) {
                     const size = collect();
                     if (size >= threshold * 2) {
                         const removed = evict?.() ?? 0;
-                        log.warn(formatCompact({
-                            code: 'memory_pressure_evict',
-                            metric: name,
-                            size,
-                            threshold,
-                            removed,
-                        }));
+                        log.warn(formatCompact({ op: 'evict', metric: name, size, threshold, removed }));
                     }
                     else if (size >= threshold) {
-                        log.warn(formatCompact({
-                            code: 'memory_pressure_warn',
-                            metric: name,
-                            size,
-                            threshold,
-                        }));
+                        log.warn(formatCompact({ op: 'pressure', metric: name, size, threshold }));
                     }
                 }
                 if (includeRss) {
                     const metrics = await collectStabilityMetrics({ includeRss: true });
-                    log.debug(formatCompact({
-                        code: 'stability_metrics',
-                        ...metrics,
-                    }));
+                    log.debug(formatCompact({ op: 'stability', ...metrics }));
                 }
             }
             catch (err) {
-                log.error(formatCompact({
-                    code: 'stability_monitor_error',
-                    error: err instanceof Error ? err.message : String(err),
-                }));
+                log.error(`Stability monitor error: ${err instanceof Error ? err.message : String(err)}`);
             }
         })();
     }, intervalMs);

package/lib/stability/memory-pressure.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory-pressure.js","sourceRoot":"","sources":["../../src/stability/memory-pressure.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"memory-pressure.js","sourceRoot":"","sources":["../../src/stability/memory-pressure.ts"],"names":[],"mappings":"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"}

package/lib/subagent/subagent-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-runtime.d.ts","sourceRoot":"","sources":["../../src/subagent/subagent-runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subagent-runtime.d.ts","sourceRoot":"","sources":["../../src/subagent/subagent-runtime.ts"],"names":[],"mappings":"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"}

package/lib/subagent/subagent-runtime.js

@@ -16,7 +16,6 @@ import { runAgentLoopStandaloneTurn } from '../core/agent-loop-standalone.js';
 import { DEFAULT_CONFIG } from '../config/index.js';
 import { applyExecPolicyToTools } from '../security/exec-policy.js';
 import { resolveSubagentAgentTools } from '../orchestrator/resolve-subagent-tools.js';
-import { createOwnerOrchestratedToolResultTransform } from '../orchestrator/owner-confirm-orchestration.js';
 import { buildSubagentUserDelivery } from '../media/subagent-user-delivery.js';
 import { loadAgentInstructionsBody } from '../discovery/agents.js';
 const EFFORT_MAX_ITERATIONS = {
@@ -282,6 +281,7 @@ export class SubagentRuntime {
                 taskId,
                 label,
                 presetName: opts?.presetName,
+                role,
                 origin,
                 keepTypingUntilUpstreamFinish: opts?.keepTypingUntilUpstreamFinish,
             })
@@ -380,10 +380,6 @@ export class SubagentRuntime {
                 userInput: agentUserInput,
                 maxIterations: effortIterations ?? this.maxIterations,
                 commMessage: bashCommMessage,
-                transformToolResult: createOwnerOrchestratedToolResultTransform({
-                    commMessage: bashCommMessage,
-                    disableHardOrchestration: true,
-                }),
                 callbacks: aiEvents?.createAgentLoopCallbacks(model),
             });
             this.onSubagentUsage?.(result.usage);

package/lib/subagent/subagent-runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-runtime.js","sourceRoot":"","sources":["../../src/subagent/subagent-runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subagent-runtime.js","sourceRoot":"","sources":["../../src/subagent/subagent-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAgB,SAAS,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAIrF,OAAO,EACL,8BAA8B,EAC9B,qBAAqB,GACtB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAwB,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAKtF,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,EAAyC,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAC1G,MAAM,qBAAqB,GAAqC;IAC9D,GAAG,EAAE,CAAC;IACN,MAAM,EAAE,CAAC;IACT,IAAI,EAAE,EAAE;IACR,GAAG,EAAE,EAAE;CACR,CAAC;AACF,OAAO,EACL,0BAA0B,EAC1B,mBAAmB,GAEpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAE9F,OAAO,EACL,kBAAkB,EAClB,yBAAyB,EACzB,yBAAyB,EACzB,2BAA2B,GAC5B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAGnE,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;AAErC,uCAAuC;AACvC,SAAS,mBAAmB,CAAC,KAA0B;IACrD,OAAO,KAAK;SACT,MAAM,CAAC,CAAC,CAAC,EAAuC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;SAChG,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SAClB,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAsHD,+EAA+E;AAC/E,kBAAkB;AAClB,+EAA+E;AAE/E,MAAM,OAAO,eAAe;IAClB,QAAQ,CAAa;IACrB,aAAa,CAAyC;IACtD,gBAAgB,CAA8D;IAC9E,gBAAgB,CAAoC;IACpD,SAAS,CAAS;IAClB,WAAW,CAAoB;IAC/B,aAAa,CAAS;IACtB,oBAAoB,CAAS;IAC7B,aAAa,CAAW;IACxB,gBAAgB,CAAmC;IACnD,aAAa,CAAuB;IACpC,YAAY,GAAiC,IAAI,GAAG,EAAE,CAAC;IACvD,YAAY,GAAgC,IAAI,CAAC;IACjD,eAAe,CAAkC;IACjD,oBAAoB,CAAyC;IAC7D,eAAe,CAAyB;IACxC,OAAO,CAAmE;IAC1E,oBAAoB,CAA+D;IACnF,YAAY,CAA+B;IAC3C,kBAAkB,CAA4D;IAC9E,0BAA0B,CAAmE;IAErG,YAAY,OAA+B;QACzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,cAAc,IAAI,IAAI,CAAC;QACvD,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,cAAc,IAAI,IAAI,CAAC;QACvD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;QACjD,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,IAAI,CAAC,CAAC;QAC9D,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,IAAI,CAAC;QACzD,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC;QACnD,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC;QACvD,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,IAAI,IAAI,CAAC;QACjE,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC;QACvC,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,IAAI,IAAI,CAAC;QAC/D,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC;QACjD,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,IAAI,IAAI,CAAC;QAC3D,IAAI,CAAC,0BAA0B,GAAG,OAAO,CAAC,wBAAwB,IAAI,IAAI,CAAC;IAC7E,CAAC;IAED,eAAe,CAAC,OAAqC;QACnD,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;IAC9B,CAAC;IAED,SAAS,CAAC,MAA4B;QACpC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC;IAC7B,CAAC;IAED,gBAAgB,CAAC,QAA8B;QAC7C,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC;IAChC,CAAC;IAED,gBAAgB,CAAC,IAMhB;QACC,IAAI,IAAI,CAAC,WAAW;YAAE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5D,IAAI,IAAI,CAAC,cAAc;YAAE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC;QACrE,IAAI,IAAI,CAAC,cAAc;YAAE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC;QACrE,IAAI,IAAI,CAAC,gBAAgB;YAAE,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC3E,IAAI,IAAI,CAAC,wBAAwB;YAAE,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,wBAAwB,CAAC;IACrG,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,OAAqB;QACpD,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,SAAS,IAAI,IAAI,CAAC,kBAAkB;YAC/C,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC;YAC1C,CAAC,CAAC,IAAI,CAAC;QACT,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,mBAAmB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,0BAA0B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAChF,IAAI,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,YAAY,IAAI,IAAI,EAAE,QAAQ,EAAE,CAAC;YACpC,IAAI,CAAC;gBACH,YAAY,GAAG,MAAM,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC9E,CAAC;YAAC,MAAM,CAAC;gBACP,sBAAsB;YACxB,CAAC;QACH,CAAC;QACD,IAAI,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;QAC9C,IAAI,WAAW,KAAK,MAAM,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAClF,eAAe,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO;YACL,GAAG,OAAO;YACV,IAAI;YACJ,WAAW;YACX,YAAY;YACZ,eAAe;YACf,UAAU,EAAE,IAAI,IAAI,SAAS;SAC9B,CAAC;IACJ,CAAC;IAED,sDAAsD;IACtD,KAAK,CAAC,SAAS,CAAC,OAAqB;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC9C,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAE9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,IAAI,SAAS,CAAC;QACxC,MAAM,YAAY,GAAG,2BAA2B,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChF,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,CAAC;YACH,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;gBAC3B,MAAM,kBAAkB,CAAC,QAAQ,CAAC,aAAa,EAAE;oBAC/C,MAAM;oBACN,IAAI,EAAE,yBAAyB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;oBAC/C,KAAK,EAAE,YAAY;oBACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;iBACtB,CAAC,CAAC;YACL,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CACnC,MAAM,EACN,QAAQ,CAAC,IAAI,EACb,YAAY,EACZ,QAAQ,CAAC,MAAM,EACf,IAAI,EACJ,QAAQ,CAAC,OAAO,EAChB;gBACE,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;gBACtG,YAAY,EAAE,QAAQ,CAAC,YAAY;gBACnC,eAAe,EAAE,QAAQ,CAAC,eAAe;gBACzC,IAAI,EAAE,IAAI;gBACV,UAAU,EAAE,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK;gBAC5C,6BAA6B,EAAE,IAAI;gBACnC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB;gBACjD,SAAS,EAAE,QAAQ,CAAC,UAAU;gBAC9B,cAAc,EAAE,QAAQ,CAAC,cAAc;gBACvC,eAAe,EAAE,QAAQ,CAAC,eAAe;gBACzC,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB;gBACjD,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;aAChD,CACF,CAAC;YACF,OAAO,MAAM,IAAI,iBAAiB,CAAC;QACrC,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAqB;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC9C,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAE9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,IAAI,SAAS,CAAC;QACxC,MAAM,YAAY,GAAG,2BAA2B,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEhF,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YAC3B,MAAM,kBAAkB,CAAC,QAAQ,CAAC,aAAa,EAAE;gBAC/C,MAAM;gBACN,IAAI,EAAE,yBAAyB,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;gBAChD,KAAK,EAAE,YAAY;gBACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;aACtB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAE/C,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC9G,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE;YAC1G,OAAO;YACP,YAAY,EAAE,QAAQ,CAAC,YAAY;YACnC,eAAe,EAAE,QAAQ,CAAC,eAAe;YACzC,UAAU,EAAE,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK;YAC5C,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB;YACjD,SAAS,EAAE,QAAQ,CAAC,UAAU;YAC9B,cAAc,EAAE,QAAQ,CAAC,cAAc;YACvC,eAAe,EAAE,QAAQ,CAAC,eAAe;YACzC,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB;YACjD,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;SAChD,CAAC;aACC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;aACrB,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,iBAAiB,CAAC,CAAC;QACrD,CAAC,CAAC;aACD,OAAO,CAAC,GAAG,EAAE;YACZ,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QACL,IAAI,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC;QAElC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;YACxB,QAAQ,EAAE,OAAO;YACjB,OAAO,EAAE,MAAM;YACf,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,yBAAyB,CAAC,QAAQ,CAAC,KAAK,CAAC;YAChD,IAAI;YACJ,IAAI,EAAE,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;SAC1C,CAAC,CAAC,CAAC;QACJ,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,KAAK,EAAE,OAAO;YACd,MAAM;YACN,KAAK,EAAE,YAAY;YACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,IAAI;YACJ,KAAK,EAAE,QAAQ,CAAC,KAAK;SACtB,CAAC,CAAC;QACH,OAAO,QAAQ,YAAY,cAAc,MAAM,cAAc,CAAC;IAChE,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU;YAAE,OAAO,KAAK,CAAC;QAC9B,IAAI,CAAC;YACH,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,qBAAqB;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QACvC,IAAI,OAAO,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACzC,OAAO,CACL,cAAc,OAAO,IAAI,IAAI,CAAC,oBAAoB,IAAI;kBACpD,0BAA0B,CAC7B,CAAC;QACJ,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,gBAAgB,CAAC,MAAc;QACrC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,eAAe,EAAE,CAAC,CAAC;IACvD,CAAC;IAEO,kBAAkB,CAAC,MAAc;QACvC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,iEAAiE;IAEzD,KAAK,CAAC,WAAW,CACvB,MAAc,EACd,IAAY,EACZ,KAAa,EACb,MAAsB,EACtB,OAAkB,SAAS,EAC3B,OAAiC,EACjC,IAeC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,cAAc,GAAG,IAAI,EAAE,QAAQ,IAAI,IAAI,CAAC;QAC9C,MAAM,SAAS,GAAG,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,cAAc,CAAC,MAAM,EAAE,CAAC;QACjG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;YACxB,QAAQ,EAAE,OAAO;YACjB,OAAO,EAAE,MAAM;YACf,KAAK;YACL,KAAK,EAAE,yBAAyB,CAAC,IAAI,EAAE,UAAU,CAAC;YAClD,IAAI;YACJ,KAAK,EAAE,SAAS;YAChB,YAAY,EAAE,eAAe,CAAC,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,mBAAmB,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC;SAC9H,CAAC,CAAC,CAAC;QACJ,MAAM,CAAC,KAAK,CAAC,aAAa,CAAE,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAE/D,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY;YAChC,CAAC,CAAC,IAAI,uBAAuB,CAAC,IAAI,CAAC,YAAY,EAAE;gBAC/C,MAAM;gBACN,KAAK;gBACL,UAAU,EAAE,IAAI,EAAE,UAAU;gBAC5B,IAAI;gBACJ,MAAM;gBACN,6BAA6B,EAAE,IAAI,EAAE,6BAA6B;aACnE,CAAC;YACF,CAAC,CAAC,IAAI,CAAC;QACT,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC;QAED,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACnB,KAAK,EAAE,OAAO;YACd,MAAM;YACN,KAAK;YACL,IAAI;YACJ,MAAM;YACN,IAAI;YACJ,KAAK,EAAE,IAAI,EAAE,UAAU;SACxB,CAAC,CAAC;QAEH,IAAI,gBAAgB,GAAuB,IAAI,EAAE,mBAAmB,CAAC;QACrE,MAAM,mBAAmB,GAAG,CAAC,CAAC,IAAI,EAAE,mBAAmB,CAAC;QACxD,MAAM,OAAO,GAAG,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC;QACtC,MAAM,QAAQ,GAAG,OAAO,IAAI,IAAI,CAAC,aAAa;YAC5C,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC;YAC3C,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,EAAE,EAAE,IAAI,IAAI,CAAC;YAC/C,IAAI,IAAI,IAAI,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;gBACxC,IAAI,QAAQ,EAAE,CAAC;oBACb,MAAM,QAAQ,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC/D,CAAC;qBAAM,CAAC;oBACN,MAAM,8BAA8B,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;gBACjE,CAAC;gBACD,QAAQ,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,CAAC;YAED,IAAI,KAAK,GAAG,yBAAyB,CAAC;gBACpC,QAAQ;gBACR,IAAI;gBACJ,IAAI;gBACJ,MAAM,EAAE,CAAC,IAAI,CAAC,gBAAgB,IAAI,cAAc,CAA8B;gBAC9E,eAAe,EAAE,IAAI,CAAC,eAAe;gBACrC,SAAS,EAAE,IAAI,EAAE,SAAS;gBAC1B,cAAc,EAAE,IAAI,EAAE,cAAc;gBACpC,mBAAmB,EAAE,IAAI,EAAE,mBAAmB;aAC/C,CAAC,CAAC;YAEH,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC1B,KAAK,GAAG,sBAAsB,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE;oBAC3D,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,wBAAwB;iBAC7D,CAAC,CAAC;YACL,CAAC;YAED,IAAI,YAAY,GAAG,IAAI,EAAE,YAAY,CAAC;YACtC,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,IAAI,IAAI,CAAC,eAAe,IAAI,mBAAmB,IAAI,gBAAgB,EAAE,CAAC;oBACpE,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;oBAC/D,IAAI,OAAO,EAAE,CAAC;wBACZ,YAAY,GAAG,uBAAuB,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;oBACtF,CAAC;gBACH,CAAC;gBACD,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;oBAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC;wBAC9C,IAAI,EAAE,KAAK;wBACX,WAAW,EAAE,IAAI;wBACjB,IAAI;wBACJ,IAAI,EAAE,IAAI;wBACV,QAAQ,EAAE,QAAQ;wBAClB,OAAO;qBACR,CAAC,CAAC;oBACH,IAAI,CAAC,mBAAmB;wBAAE,gBAAgB,GAAG,OAAO,CAAC,EAAE,CAAC;oBACxD,YAAY,GAAG,uBAAuB,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC9E,CAAC;qBAAM,IAAI,CAAC,YAAY,EAAE,CAAC;oBACzB,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,YAAY,GAAG,4BAA4B,CAAC,YAAY,CAAC,CAAC;YAC5D,CAAC;YAED,IAAI,mBAAmB,IAAI,gBAAgB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACpE,IAAI,CAAC,eAAe,CAAC,WAAW,CAC9B,gBAAgB,EAChB,IAAI,OAAO,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CACtB,CAAC;YACJ,CAAC;YACD,IAAI,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE,CAAC;gBAClC,YAAY,GAAG,GAAG,YAAY,yCAAyC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC;YACvG,CAAC;YACD,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACnD,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC;YAEvC,MAAM,QAAQ,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;YAClC,MAAM,gBAAgB,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM;gBAC9C,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;gBAC9C,CAAC,CAAC,SAAS,CAAC;YACd,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC;gBAC9C,QAAQ;gBACR,eAAe,EAAE,IAAI,CAAC,aAAa,IAAI,SAAS;gBAChD,KAAK;gBACL,YAAY;gBACZ,KAAK;gBACL,SAAS,EAAE,cAAc;gBACzB,aAAa,EAAE,gBAAgB,IAAI,IAAI,CAAC,aAAa;gBACrD,WAAW,EAAE,eAAe;gBAC5B,SAAS,EAAE,QAAQ,EAAE,wBAAwB,CAAC,KAAK,CAAC;aACrD,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,IAAI,iBAAiB,CAAC;YACtD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC;YAClC,MAAM,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YACtE,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,KAAK,IAAI,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAEhF,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;gBACxB,QAAQ,EAAE,MAAM;gBAChB,OAAO,EAAE,MAAM;gBACf,KAAK;gBACL,KAAK,EAAE,yBAAyB,CAAC,IAAI,EAAE,UAAU,CAAC;gBAClD,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;gBAChC,KAAK,EAAE,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC;gBACvC,IAAI,EAAE,MAAM,CAAC,UAAU;gBACvB,KAAK;gBACL,MAAM,EAAE,eAAe,CAAC,WAAW,EAAE,GAAG,CAAC;aAC1C,CAAC,CAAC,CAAC;YACJ,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;gBACnB,KAAK,EAAE,QAAQ;gBACf,MAAM;gBACN,KAAK;gBACL,IAAI;gBACJ,MAAM;gBACN,IAAI;gBACJ,KAAK,EAAE,IAAI,EAAE,UAAU;gBACvB,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,WAAW;aACpB,CAAC,CAAC;YACH,MAAM,QAAQ,EAAE,gBAAgB,CAAC,WAAW,EAAE;gBAC5C,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,KAAK;gBAC5B,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;YACH,IAAI,IAAI,EAAE,IAAI;gBAAE,OAAO,WAAW,CAAC;YACnC,MAAM,IAAI,CAAC,kBAAkB,CAAC;gBAC5B,MAAM;gBACN,KAAK;gBACL,IAAI;gBACJ,MAAM;gBACN,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,KAAK,EAAE,IAAI,EAAE,UAAU;aACxB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,QAAQ,GAAG,UAAU,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACpF,MAAM,QAAQ,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;YAC1C,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,iBAAiB,CAAC,CAAC;YACnD,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;gBACxB,QAAQ,EAAE,MAAM;gBAChB,OAAO,EAAE,MAAM;gBACf,KAAK;gBACL,KAAK,EAAE,yBAAyB,CAAC,IAAI,EAAE,UAAU,CAAC;gBAClD,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC;aACtC,CAAC,CAAC,CAAC;YACJ,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;gBACnB,KAAK,EAAE,QAAQ;gBACf,MAAM;gBACN,KAAK;gBACL,IAAI;gBACJ,MAAM;gBACN,IAAI;gBACJ,KAAK,EAAE,IAAI,EAAE,UAAU;gBACvB,MAAM,EAAE,OAAO;gBACf,KAAK,EAAE,QAAQ;aAChB,CAAC,CAAC;YACH,IAAI,IAAI,EAAE,IAAI;gBAAE,OAAO,QAAQ,CAAC;YAChC,MAAM,IAAI,CAAC,kBAAkB,CAAC;gBAC5B,MAAM;gBACN,KAAK;gBACL,IAAI;gBACJ,MAAM;gBACN,MAAM,EAAE,OAAO;gBACf,MAAM,EAAE,QAAQ;gBAChB,SAAS,EAAE,EAAE;gBACb,KAAK,EAAE,IAAI,EAAE,UAAU;aACxB,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,IAAI,mBAAmB,IAAI,gBAAgB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACpE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,IAAI,CAAC,eAAe,IAAI,gBAAgB,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACrE,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;QACD,OAAO;IACT,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,OAAgC;QAC/D,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC9B,oEAAoE;YACpE,6DAA6D;YAC7D,KAAK,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACtD,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,2BAA2B,CAAC,CAAC;YAC/E,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC;QAC1F,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO;QAE/B,MAAM,QAAQ,GAAG;YACf,GAAG,yBAAyB,CAAC;gBAC3B,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B,CAAC;YACF,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAClD,MAAM,CAAC,KAAK,CAAC;gBACX,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,MAAM;aACrC,EAAE,6BAA6B,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,oCAAoC,CAAC,CAAC;QACxF,CAAC;IACH,CAAC;IAEO,mBAAmB,CAAC,IAAY;QACtC,OAAO;;;;;EAKT,IAAI;;;;;;;;;;;;;;;;;;;;;;kBAsBY,IAAI,CAAC,SAAS;;2DAE2B,CAAC;IAC1D,CAAC;IAED,OAAO;QACL,KAAK,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/D,IAAI,CAAC;gBAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;CACF"}

package/lib/subagent/subagent-system-init.js

@@ -1,6 +1,6 @@
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import { resolveIMSessionIdFromMessage } from '@zhin.js/core';
-import { getAgentDispatcher } from '../orchestrator/agent-dispatcher.js';
+import { getOrchestrationService } from '../orchestrator/orchestration-service.js';
 import { getActiveTurnTracker } from '../internal/turn-context.js';
 import { SubagentSystem } from './subagent-system.js';
 const logger = getLogger('ZhinAgent');
@@ -15,7 +15,7 @@ export function createSubagentSystem(opts) {
         maxParallelSubagents: opts.config.maxParallelSubagents,
         execPolicyConfig: opts.config,
         modelRegistry: opts.modelRegistry,
-        agentDispatcher: getAgentDispatcher(),
+        agentDispatcher: getOrchestrationService()?.dispatcherHandle,
         onSubagentUsage: (usage) => getActiveTurnTracker()?.addSubagentUsage(usage),
         registerSubagentTask: (done) => getActiveTurnTracker()?.trackSubagent(done),
         eventEmitter: opts.emitter,

package/lib/subagent/subagent-system-init.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-system-init.js","sourceRoot":"","sources":["../../src/subagent/subagent-system-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGnE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AAWtC,MAAM,UAAU,oBAAoB,CAAC,IAA+B;IAClE,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,aAAa,CAAC;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE;QACxB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;QACxC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,qBAAqB;QAChD,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,oBAAoB;QACtD,gBAAgB,EAAE,IAAI,CAAC,MAAM;QAC7B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,eAAe,EAAE,kBAAkB,EAAE;QACrC,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,oBAAoB,EAAE,EAAE,gBAAgB,CAAC,KAAK,CAAC;QAC3E,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC;QAC3E,YAAY,EAAE,IAAI,CAAC,OAAO;QAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,MAAM,SAAS,GAAG,6BAA6B,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE;gBAClF,MAAM,EAAE,UAAU;gBAClB,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,OAAO,EAAE,KAAK,CAAC,IAAI;gBACnB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,KAAK,EAAE,KAAK,CAAC,MAAM;gBACnB,OAAO,EAAE,KAAK,CAAC,KAAK;gBACpB,WAAW,EAAE;oBACX,aAAa,EAAE,KAAK,CAAC,KAAK;iBAC3B;aACF,CAAC,CAAC;YACH,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;gBAC5B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YAClD,CAAC;iBAAM,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;gBACnC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YAClD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QACD,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;KAC5C,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IAChE,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"subagent-system-init.js","sourceRoot":"","sources":["../../src/subagent/subagent-system-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAE9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGnE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AAWtC,MAAM,UAAU,oBAAoB,CAAC,IAA+B;IAClE,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,aAAa,CAAC;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE;QACxB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;QACxC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,qBAAqB;QAChD,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,oBAAoB;QACtD,gBAAgB,EAAE,IAAI,CAAC,MAAM;QAC7B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,eAAe,EAAE,uBAAuB,EAAE,EAAE,gBAAgB;QAC5D,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,oBAAoB,EAAE,EAAE,gBAAgB,CAAC,KAAK,CAAC;QAC3E,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC;QAC3E,YAAY,EAAE,IAAI,CAAC,OAAO;QAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,MAAM,SAAS,GAAG,6BAA6B,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE;gBAClF,MAAM,EAAE,UAAU;gBAClB,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,OAAO,EAAE,KAAK,CAAC,IAAI;gBACnB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,KAAK,EAAE,KAAK,CAAC,MAAM;gBACnB,OAAO,EAAE,KAAK,CAAC,KAAK;gBACpB,WAAW,EAAE;oBACX,aAAa,EAAE,KAAK,CAAC,KAAK;iBAC3B;aACF,CAAC,CAAC;YACH,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;gBAC5B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YAClD,CAAC;iBAAM,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;gBACnC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YAClD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QACD,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;KAC5C,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IAChE,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/lib/subagent-ai-events.d.ts

@@ -6,7 +6,10 @@ import type { ZhinAgentEventEmitter } from './event/event-emitter.js';
 export interface SubagentAiEventContext {
     taskId: string;
     label: string;
+    /** ai.agents / *.agent.md 名，如 researcher */
     presetName?: string;
+    /** 角色：researcher / executor / … */
+    role?: string;
     origin: SubagentOrigin;
     /** 为 true 时不在 processing.finish 里发 typing.stop（入站 route + 主 agent 摘要续接） */
     keepTypingUntilUpstreamFinish?: boolean;

package/lib/subagent-ai-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-ai-events.d.ts","sourceRoot":"","sources":["../src/subagent-ai-events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC5E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAElE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACtE,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,cAAc,CAAC;IACvB,2EAA2E;IAC3E,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC;AAED,qBAAa,uBAAuB;IAKhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;gBAGX,OAAO,EAAE,qBAAqB,EAC9B,GAAG,EAAE,sBAAsB;IAM9C,OAAO,CAAC,OAAO;IAWT,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,OAAO,eAAe,EAAE,MAAM,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9G,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBlF,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,4BAA4B;IAmB/D,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzE,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAG5F"}
+{"version":3,"file":"subagent-ai-events.d.ts","sourceRoot":"","sources":["../src/subagent-ai-events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC5E,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAElE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACtE,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mCAAmC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,cAAc,CAAC;IACvB,2EAA2E;IAC3E,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC;AAED,qBAAa,uBAAuB;IAKhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;gBAGX,OAAO,EAAE,qBAAqB,EAC9B,GAAG,EAAE,sBAAsB;IAM9C,OAAO,CAAC,OAAO;IAcT,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,OAAO,eAAe,EAAE,MAAM,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9G,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBlF,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,4BAA4B;IAmB/D,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzE,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAG5F"}

package/lib/subagent-ai-events.js

@@ -12,12 +12,15 @@ export class SubagentAiEventReporter {
         this.sessionId = resolveIMSessionIdFromMessage(this.commMessage);
     }
     payload(extra = {}) {
+        const agentId = this.ctx.presetName?.trim()
+            || this.ctx.role?.trim()
+            || 'subagent';
         return this.emitter.createPayload(this.sessionId, this.commMessage, 'text', {
             source: 'subagent',
             path: 'agent',
             taskId: this.ctx.taskId,
             label: this.ctx.label,
-            agentId: this.ctx.presetName ?? this.ctx.label,
+            agentId,
             ...extra,
         });
     }

package/lib/subagent-ai-events.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-ai-events.js","sourceRoot":"","sources":["../src/subagent-ai-events.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subagent-ai-events.js","sourceRoot":"","sources":["../src/subagent-ai-events.ts"],"names":[],"mappings":"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"}

package/lib/subagent-goal-notify.d.ts

@@ -28,7 +28,7 @@ export declare function formatSubagentProcessingMessage(notice: SubagentProcessi
  */
 export declare function shouldSuppressSubagentGoalNotifyToIm(message: Message, cell?: {
     members: {
-        endpointId: string;
+        endpointKey: string;
     }[];
 }): boolean;
 export declare function getSubagentGoalNotifier(commMessage?: Message): SubagentGoalNotifier | undefined;

package/lib/subagent-goal-notify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-goal-notify.d.ts","sourceRoot":"","sources":["../src/subagent-goal-notify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,OAAO,EAAE,MAAM,eAAe,CAAC;AAE/D,qCAAqC;AACrC,eAAO,MAAM,8BAA8B,mBAAmB,CAAC;AAE/D,yBAAyB;AACzB,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC;AAE3E,eAAO,MAAM,8BAA8B,EAAE,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAKhF,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,qBAAqB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,wBAAwB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9F,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAI3F;AAED,8BAA8B;AAC9B,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IACjD,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,GAAG,qBAAqB,CAGxB;AAED,0BAA0B;AAC1B,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG5E;AAED,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,qBAAqB,GAAG,MAAM,CAEpF;AAED,4CAA4C;AAC5C,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,wBAAwB,GAAG,MAAM,CAOxF;AAED;;;GAGG;AACH,wBAAgB,oCAAoC,CAClD,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE;IAAE,OAAO,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,GAC3C,OAAO,CAMT;AAED,wBAAgB,uBAAuB,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,oBAAoB,GAAG,SAAS,CAI/F;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,OAAO,GAAG,SAAS,EAChC,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAaf"}
+{"version":3,"file":"subagent-goal-notify.d.ts","sourceRoot":"","sources":["../src/subagent-goal-notify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,OAAO,EAAE,MAAM,eAAe,CAAC;AAE/D,qCAAqC;AACrC,eAAO,MAAM,8BAA8B,mBAAmB,CAAC;AAE/D,yBAAyB;AACzB,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC;AAE3E,eAAO,MAAM,8BAA8B,EAAE,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAKhF,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,qBAAqB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,wBAAwB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9F,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAI3F;AAED,8BAA8B;AAC9B,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IACjD,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,GAAG,qBAAqB,CAGxB;AAED,0BAA0B;AAC1B,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG5E;AAED,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,qBAAqB,GAAG,MAAM,CAEpF;AAED,4CAA4C;AAC5C,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,wBAAwB,GAAG,MAAM,CAOxF;AAED;;;GAGG;AACH,wBAAgB,oCAAoC,CAClD,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE;IAAE,OAAO,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,GAC5C,OAAO,CAMT;AAED,wBAAgB,uBAAuB,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,oBAAoB,GAAG,SAAS,CAI/F;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,OAAO,GAAG,SAAS,EAChC,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAaf"}

package/lib/subagent-goal-notify.js

@@ -45,7 +45,7 @@ export function shouldSuppressSubagentGoalNotifyToIm(message, cell) {
         return false;
     if (!cell?.members?.length)
         return false;
-    const endpoints = new Set(cell.members.map((m) => m.endpointId));
+    const endpoints = new Set(cell.members.map((m) => m.endpointKey));
     return endpoints.size >= 2;
 }
 export function getSubagentGoalNotifier(commMessage) {

package/lib/subagent-goal-notify.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-goal-notify.js","sourceRoot":"","sources":["../src/subagent-goal-notify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subagent-goal-notify.js","sourceRoot":"","sources":["../src/subagent-goal-notify.ts"],"names":[],"mappings":"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"}

package/lib/subagent-parent-context.d.ts

@@ -2,6 +2,15 @@
  * fork 模式：从主会话 active_leaf 链构建子 agent 上下文前导（过滤编排噪声）
  */
 import { type AgentMessage } from '@zhin.js/ai';
+export declare function buildParentContextSnapshot(agentSessionStore: {
+    findActive(key: string): Promise<{
+        session_id: string;
+    } | null>;
+}, contextRepository: {
+    loadContext(sessionId: string): Promise<{
+        messages: AgentMessage[];
+    }>;
+}, sessionKey: string): Promise<string | undefined>;
 export declare function buildParentContextPreamble(messages: AgentMessage[], options?: {
     maxChars?: number;
     maxMessages?: number;

package/lib/subagent-parent-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-parent-context.d.ts","sourceRoot":"","sources":["../src/subagent-parent-context.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,aAAa,CAAC;AAmCrB,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,YAAY,EAAE,EACxB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GACpD,MAAM,CAaR"}
+{"version":3,"file":"subagent-parent-context.d.ts","sourceRoot":"","sources":["../src/subagent-parent-context.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,aAAa,CAAC;AAmCrB,wBAAsB,0BAA0B,CAC9C,iBAAiB,EAAE;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAA;CAAE,EACtF,iBAAiB,EAAE;IAAE,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,YAAY,EAAE,CAAA;KAAE,CAAC,CAAA;CAAE,EAC5F,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAM7B;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,YAAY,EAAE,EACxB,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GACpD,MAAM,CAaR"}

package/lib/subagent-parent-context.js

@@ -31,6 +31,14 @@ function messageToLine(message) {
     }
     return null;
 }
+export async function buildParentContextSnapshot(agentSessionStore, contextRepository, sessionKey) {
+    const active = await agentSessionStore.findActive(sessionKey);
+    if (!active)
+        return undefined;
+    const ctx = await contextRepository.loadContext(active.session_id);
+    const preamble = buildParentContextPreamble(ctx.messages);
+    return preamble || undefined;
+}
 export function buildParentContextPreamble(messages, options) {
     const maxChars = options?.maxChars ?? DEFAULT_MAX_CHARS;
     const maxMessages = options?.maxMessages ?? DEFAULT_MAX_MESSAGES;

package/lib/subagent-parent-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-parent-context.js","sourceRoot":"","sources":["../src/subagent-parent-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subagent-parent-context.js","sourceRoot":"","sources":["../src/subagent-parent-context.ts"],"names":[],"mappings":"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"}

package/lib/task-executor.d.ts

@@ -1,25 +1,10 @@
-import { type Message } from '@zhin.js/core';
 import type { ZhinAgent } from './zhin-agent/index.js';
 import { type NotificationRouter } from './assistant/notification-router.js';
-import type { JobNotify, ScheduleJobCreator, ScheduleJobExecutionPlan } from './assistant/types.js';
-export interface TaskExecutionOptions {
-    prompt: string;
-    notify?: JobNotify;
-    timeContext?: boolean;
-    createdBy?: ScheduleJobCreator;
-    /** 预演模式：结果回创建者，不投递 notify 目标 */
-    preview?: boolean;
-    /** 预演时使用创建者入站 Message（保留 messageId / 角色） */
-    previewCommMessage?: Message;
-    executionPlan?: ScheduleJobExecutionPlan;
-    activityFeedback?: boolean;
-    scheduleJobId?: string;
-}
-export interface TaskExecutionResult {
-    success: boolean;
+import type { ScheduleJob, ScheduleJobExecutionPlan } from './assistant/types.js';
+import type { ScheduleInvocationContext } from './assistant/schedule-job-service.js';
+import { type ScheduleExecutionDomain, type ScheduleExecutionResult } from './schedule-domain/execution-domain.js';
+export interface TaskExecutionResult extends ScheduleExecutionResult {
     responseText: string;
-    durationMs: number;
-    error?: string;
     executionPlan?: ScheduleJobExecutionPlan;
 }
 export interface TaskExecutorDeps {
@@ -28,14 +13,18 @@ export interface TaskExecutorDeps {
         sendMessage: (opts: import('@zhin.js/core').SendOptions) => Promise<string>;
     } | undefined;
     router?: NotificationRouter;
-    defaultNotify?: JobNotify;
-    deliverIm?: (notify: JobNotify & {
-        channel: 'im';
-    }, content: string) => Promise<void>;
-    proactiveOutbound?: import('./outbound/send-proactive.js').ProactiveOutboundService;
+    defaultNotify?: import('./assistant/types.js').JobNotify;
+    domain?: ScheduleExecutionDomain;
+    dataDir?: string;
+}
+export interface TaskExecutionOptions {
+    previewSource?: ScheduleInvocationContext;
 }
 export declare function createTaskExecutor(deps: TaskExecutorDeps): {
-    executeTask: (options: TaskExecutionOptions) => Promise<TaskExecutionResult>;
+    execute: (job: ScheduleJob, options?: TaskExecutionOptions) => Promise<TaskExecutionResult>;
+    preview: (prompt: string, source: ScheduleInvocationContext, options?: {
+        activityFeedback?: boolean;
+    }) => Promise<TaskExecutionResult>;
     resolveAdapter: (platform: string) => {
         sendMessage: (opts: import("@zhin.js/core").SendOptions) => Promise<string>;
     } | undefined;

package/lib/task-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-executor.d.ts","sourceRoot":"","sources":["../src/task-executor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAAoE,MAAM,eAAe,CAAC;AAC/G,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EACV,SAAS,EACT,kBAAkB,EAClB,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAO9B,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,gCAAgC;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,4CAA4C;IAC5C,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,wBAAwB,CAAC;CAC1C;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK;QAAE,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,eAAe,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,SAAS,CAAC;IAClI,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,GAAG;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtF,iBAAiB,CAAC,EAAE,OAAO,8BAA8B,EAAE,wBAAwB,CAAC;CACrF;AA4BD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB;2BAQnB,oBAAoB,KAAG,OAAO,CAAC,mBAAmB,CAAC;+BAzC5D,MAAM,KAAK;QAAE,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,eAAe,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,SAAS;EAwKlI;AAED,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM7E;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"task-executor.d.ts","sourceRoot":"","sources":["../src/task-executor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAA4B,KAAK,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACvG,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAElF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAGrF,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,uBAAuB,EAC7B,MAAM,uCAAuC,CAAC;AAO/C,MAAM,WAAW,mBAAoB,SAAQ,uBAAuB;IAClE,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,wBAAwB,CAAC;CAC1C;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK;QAAE,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,eAAe,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,SAAS,CAAC;IAClI,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,sBAAsB,EAAE,SAAS,CAAC;IACzD,MAAM,CAAC,EAAE,uBAAuB,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,EAAE,yBAAyB,CAAC;CAC3C;AAiCD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB;mBAO3B,WAAW,YAAW,oBAAoB,KAAQ,OAAO,CAAC,mBAAmB,CAAC;sBA4DhG,MAAM,UACN,yBAAyB,YACxB;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,KACtC,OAAO,CAAC,mBAAmB,CAAC;+BAhHJ,MAAM,KAAK;QAAE,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,eAAe,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,SAAS;EAmIlI;AAED,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7E;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}