@zhin.js/agent 0.1.32 → 0.2.1

package/lib/stability/memory-pressure.js

@@ -0,0 +1,104 @@
+/**
+ * ADR 0014 P2-1 — 关键全局 Map / RSS 内存压力监控
+ */
+import { formatCompact, Logger } from '@zhin.js/logger';
+import { getCompactionStateCount, evictCompactionStatesIfOverPressure } from '../zhin-agent/compaction-runtime.js';
+import { getPendingOrchestrationCount, evictPendingOrchestrationIfOverPressure, } from '../security/owner-approve-always-store.js';
+const defaultLogger = new Logger(null, 'StabilityMonitor');
+const DEFAULT_COLLECTORS = [
+    {
+        name: 'compactionStates',
+        collect: getCompactionStateCount,
+        threshold: 4000,
+        evict: evictCompactionStatesIfOverPressure,
+    },
+    {
+        name: 'pendingOrchestration',
+        collect: getPendingOrchestrationCount,
+        threshold: 100,
+        evict: evictPendingOrchestrationIfOverPressure,
+    },
+];
+async function collectSseSubscriberCount() {
+    try {
+        // 可选依赖：避免 @zhin.js/agent 编译期硬依赖 host-api
+        const dynamicImport = new Function('specifier', 'return import(specifier)');
+        const mod = await dynamicImport('@zhin.js/host-api');
+        return mod.sseSubscriberCount?.();
+    }
+    catch {
+        return undefined;
+    }
+}
+export async function collectStabilityMetrics(options = {}) {
+    const snapshot = {
+        compactionStates: getCompactionStateCount(),
+        pendingOrchestration: getPendingOrchestrationCount(),
+    };
+    if (options.includeSse !== false) {
+        const sse = await collectSseSubscriberCount();
+        if (sse !== undefined)
+            snapshot.sseSubscribers = sse;
+    }
+    if (options.includeRss !== false && typeof process.memoryUsage === 'function') {
+        snapshot.rssMb = Math.round(process.memoryUsage().rss / (1024 * 1024));
+    }
+    return snapshot;
+}
+export function startStabilityMonitor(options = {}) {
+    const log = options.logger ?? defaultLogger;
+    const intervalMs = options.intervalMs ?? 60_000;
+    const collectors = options.collectors ?? DEFAULT_COLLECTORS;
+    const includeRss = options.includeRss !== false;
+    const timer = setInterval(() => {
+        void (async () => {
+            try {
+                for (const { name, collect, threshold, evict } of collectors) {
+                    const size = collect();
+                    if (size >= threshold * 2) {
+                        const removed = evict?.() ?? 0;
+                        log.warn(formatCompact({
+                            code: 'memory_pressure_evict',
+                            metric: name,
+                            size,
+                            threshold,
+                            removed,
+                        }));
+                    }
+                    else if (size >= threshold) {
+                        log.warn(formatCompact({
+                            code: 'memory_pressure_warn',
+                            metric: name,
+                            size,
+                            threshold,
+                        }));
+                    }
+                }
+                if (includeRss) {
+                    const metrics = await collectStabilityMetrics({ includeSse: true, includeRss: true });
+                    if (metrics.sseSubscribers !== undefined && metrics.sseSubscribers >= 500) {
+                        log.warn(formatCompact({
+                            code: 'memory_pressure_warn',
+                            metric: 'sseSubscribers',
+                            size: metrics.sseSubscribers,
+                            threshold: 500,
+                        }));
+                    }
+                    log.debug(formatCompact({
+                        code: 'stability_metrics',
+                        ...metrics,
+                    }));
+                }
+            }
+            catch (err) {
+                log.error(formatCompact({
+                    code: 'stability_monitor_error',
+                    error: err instanceof Error ? err.message : String(err),
+                }));
+            }
+        })();
+    }, intervalMs);
+    timer.unref?.();
+    return () => clearInterval(timer);
+}
+//# sourceMappingURL=memory-pressure.js.map

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

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

package/lib/stability/registry-cleanup.d.ts

@@ -0,0 +1,5 @@
+/** 保留指定的适配器名称，移除其余工厂（hot-reload 后重注册） */
+export declare function pruneAdapterRegistry(keep: Iterable<string>): void;
+export declare function clearAdapterRegistry(): void;
+export declare function adapterRegistrySize(): number;
+//# sourceMappingURL=registry-cleanup.d.ts.map

package/lib/stability/registry-cleanup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registry-cleanup.d.ts","sourceRoot":"","sources":["../../src/stability/registry-cleanup.ts"],"names":[],"mappings":"AAKA,yCAAyC;AACzC,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAOjE;AAED,wBAAgB,oBAAoB,IAAI,IAAI,CAE3C;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C"}

package/lib/stability/registry-cleanup.js

@@ -0,0 +1,20 @@
+/**
+ * ADR 0014 P1-1 — 模块级注册表 hot-reload / shutdown 清理
+ */
+import { Adapter } from '@zhin.js/core';
+/** 保留指定的适配器名称，移除其余工厂（hot-reload 后重注册） */
+export function pruneAdapterRegistry(keep) {
+    const keepSet = new Set(keep);
+    for (const name of [...Adapter.Registry.keys()]) {
+        if (!keepSet.has(name)) {
+            Adapter.Registry.delete(name);
+        }
+    }
+}
+export function clearAdapterRegistry() {
+    Adapter.Registry.clear();
+}
+export function adapterRegistrySize() {
+    return Adapter.Registry.size;
+}
+//# sourceMappingURL=registry-cleanup.js.map

package/lib/stability/registry-cleanup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"registry-cleanup.js","sourceRoot":"","sources":["../../src/stability/registry-cleanup.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,yCAAyC;AACzC,MAAM,UAAU,oBAAoB,CAAC,IAAsB;IACzD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;AAC/B,CAAC"}

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

@@ -1,5 +1,5 @@
 import type { AgentLoopStandaloneCallbacks } from './zhin-agent/agent-loop-standalone.js';
-import type { ToolContext } from '@zhin.js/core';
+import type { Message } from '@zhin.js/core';
 import type { McpRegistry } from './orchestrator/mcp-registry.js';
 import type { SubagentOrigin } from './subagent.js';
 import type { ZhinAgentEventEmitter } from './zhin-agent/event-emitter.js';
@@ -15,7 +15,7 @@ export declare class SubagentAiEventReporter {
     private readonly emitter;
     private readonly ctx;
     readonly sessionId: string;
-    readonly toolContext: ToolContext;
+    readonly commMessage: Message;
     constructor(emitter: ZhinAgentEventEmitter, ctx: SubagentAiEventContext);
     private payload;
     processingStart(content: string): Promise<void>;

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":"AACA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAC1F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAElE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,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,WAAW,CAAC;gBAGf,OAAO,EAAE,qBAAqB,EAC9B,GAAG,EAAE,sBAAsB;IAuB9C,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":"AACA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAC1F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAElE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAE3E,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"}

package/lib/subagent-ai-events.js

@@ -1,35 +1,18 @@
-import { resolveIMSessionIdFromToolContext } from '@zhin.js/ai';
+import { resolveIMSessionIdFromMessage } from '@zhin.js/core';
 import { ensureMcpConnectionsForBinding } from './orchestrator/mcp-lifecycle.js';
 export class SubagentAiEventReporter {
     emitter;
     ctx;
     sessionId;
-    toolContext;
+    commMessage;
     constructor(emitter, ctx) {
         this.emitter = emitter;
         this.ctx = ctx;
-        const scope = ctx.origin.sceneType === 'group' || ctx.origin.sceneType === 'channel'
-            ? ctx.origin.sceneType
-            : 'private';
-        this.toolContext = {
-            platform: ctx.origin.platform,
-            botId: ctx.origin.botId,
-            sceneId: ctx.origin.sceneId,
-            senderId: ctx.origin.senderId,
-            messageId: ctx.origin.messageId,
-            scope,
-            fileRole: ctx.origin.fileRole,
-        };
-        this.sessionId = resolveIMSessionIdFromToolContext({
-            platform: ctx.origin.platform,
-            botId: ctx.origin.botId,
-            scope,
-            sceneId: ctx.origin.sceneId,
-            senderId: ctx.origin.senderId,
-        });
+        this.commMessage = ctx.origin.message;
+        this.sessionId = resolveIMSessionIdFromMessage(this.commMessage);
     }
     payload(extra = {}) {
-        return this.emitter.createPayload(this.sessionId, this.toolContext, 'text', {
+        return this.emitter.createPayload(this.sessionId, this.commMessage, 'text', {
             source: 'subagent',
             path: 'agent',
             taskId: this.ctx.taskId,

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

@@ -4,8 +4,8 @@
  * 注意：`kind` 是用户可见的「执行通道」（异步/视觉/定时/同步/编排），
  * 与 AgentDispatcher 内部的 `AgentRole`（subtask/worker 等工具权限）不是同一概念。
  */
-import type { ToolContext } from '@zhin.js/core';
-/** ToolContext.extra 中挂载的回调键 */
+import type { Message } from '@zhin.js/core';
+/** AgentTurnMessage.extra 中挂载的回调键 */
 export declare const SUBAGENT_GOAL_NOTIFY_EXTRA_KEY = "onSubagentGoal";
 /** 用户可见的执行通道（进度提示中间段） */
 export type SubagentExecutionKind = 'async' | 'sync' | 'vision' | 'draw' | 'deferred' | 'cron';
@@ -29,6 +29,6 @@ export declare function resolveSubagentAgentLabel(agent?: string): string | unde
 export declare function formatSubagentExecutionKindLabel(kind: SubagentExecutionKind): string;
 /** 用户可见格式：任务【taskId】:执行通道·agent => label */
 export declare function formatSubagentProcessingMessage(notice: SubagentProcessingNotice): string;
-export declare function getSubagentGoalNotifier(ctx?: ToolContext): SubagentGoalNotifier | undefined;
-export declare function notifySubagentGoal(ctx: ToolContext | undefined, notice: SubagentProcessingNotice): Promise<void>;
+export declare function getSubagentGoalNotifier(commMessage?: Message): SubagentGoalNotifier | undefined;
+export declare function notifySubagentGoal(commMessage: Message | undefined, notice: SubagentProcessingNotice): Promise<void>;
 //# sourceMappingURL=subagent-goal-notify.d.ts.map

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;;;;;GAKG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,gCAAgC;AAChC,eAAO,MAAM,8BAA8B,mBAAmB,CAAC;AAE/D,yBAAyB;AACzB,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC;AAE/F,eAAO,MAAM,8BAA8B,EAAE,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAOhF,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,wDAAwD;AACxD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IACjD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,qBAAqB,CAMxB;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,wBAAgB,uBAAuB,CAAC,GAAG,CAAC,EAAE,WAAW,GAAG,oBAAoB,GAAG,SAAS,CAG3F;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,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;;;;;GAKG;AACH,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,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC;AAE/F,eAAO,MAAM,8BAA8B,EAAE,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAOhF,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,wDAAwD;AACxD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IACjD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,qBAAqB,CAMxB;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,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

@@ -1,4 +1,4 @@
-/** ToolContext.extra 中挂载的回调键 */
+/** AgentTurnMessage.extra 中挂载的回调键 */
 export const SUBAGENT_GOAL_NOTIFY_EXTRA_KEY = 'onSubagentGoal';
 export const SUBAGENT_EXECUTION_KIND_LABELS = {
     async: '异步',
@@ -42,12 +42,13 @@ export function formatSubagentProcessingMessage(notice) {
     const channel = agent ? `${kindLabel}·${agent}` : kindLabel;
     return `任务【${taskId}】:${channel} => ${label}`;
 }
-export function getSubagentGoalNotifier(ctx) {
-    const fn = ctx?.extra?.[SUBAGENT_GOAL_NOTIFY_EXTRA_KEY];
+export function getSubagentGoalNotifier(commMessage) {
+    const extra = commMessage ? commMessage.extra : undefined;
+    const fn = extra?.[SUBAGENT_GOAL_NOTIFY_EXTRA_KEY];
     return typeof fn === 'function' ? fn : undefined;
 }
-export async function notifySubagentGoal(ctx, notice) {
-    const notify = getSubagentGoalNotifier(ctx);
+export async function notifySubagentGoal(commMessage, notice) {
+    const notify = getSubagentGoalNotifier(commMessage);
     if (!notify)
         return;
     if (!notice.taskId.trim() || !notice.label.trim())

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.d.ts

@@ -12,22 +12,14 @@ import type { ResolvedAgentBinding } from './config/types.js';
 import type { McpRegistry } from './orchestrator/mcp-registry.js';
 import type { AgentResult, ContentPart, ModelRegistry } from '@zhin.js/ai';
 import { type ZhinAgentConfig } from './zhin-agent/config.js';
-import type { ToolContext } from '@zhin.js/core';
-import type { FileRole } from './security/file-role-policy.js';
+import type { Message } from '@zhin.js/core';
 import { AgentDispatcher, type AgentRole } from './orchestrator/agent-dispatcher.js';
 import type { AgentMeta } from './discovery/agents.js';
 import { type SubagentContextMode } from './subagent-preset.js';
 import type { ToolCallRecord } from './zhin-agent/tool-calls-user-format.js';
 import type { ZhinAgentEventEmitter } from './zhin-agent/event-emitter.js';
 export interface SubagentOrigin {
-    platform: string;
-    botId: string;
-    sceneId: string;
-    senderId: string;
-    sceneType: string;
-    /** 入站消息 ID（ICQQ 等 reaction 打字必填） */
-    messageId?: string;
-    fileRole?: FileRole;
+    message: Message;
 }
 export interface SpawnOptions {
     task: string;
@@ -50,7 +42,7 @@ export interface SpawnOptions {
     /** 首条 user 消息（含 vision parts）；缺省则用 task 字符串 */
     runInput?: string | ContentPart[];
     /** 用于向用户发送「任务【id】:执行通道 => label」进度提示 */
-    notifyContext?: ToolContext;
+    notifyContext?: Message;
     /** 硬编排任务 ID（AgentDispatcher SSOT） */
     orchestrationTaskId?: string;
 }

package/lib/subagent.d.ts.map

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

package/lib/subagent.js

@@ -300,13 +300,7 @@ export class SubagentManager {
                 systemPrompt = `${systemPrompt}\n\n## Parent session context (fork)\n${opts.contextPreamble.trim()}`;
             }
             const model = binding?.model || provider.models[0];
-            const bashToolContext = {
-                platform: origin.platform,
-                botId: origin.botId,
-                sceneId: origin.sceneId,
-                senderId: origin.senderId,
-                fileRole: origin.fileRole,
-            };
+            const bashCommMessage = origin.message;
             await aiEvents?.agentStart(model);
             const result = await runAgentLoopStandaloneTurn({
                 provider,
@@ -316,9 +310,9 @@ export class SubagentManager {
                 tools,
                 userInput: agentUserInput,
                 maxIterations: this.maxIterations,
-                toolContext: bashToolContext,
+                commMessage: bashCommMessage,
                 transformToolResult: createOwnerOrchestratedToolResultTransform({
-                    toolContext: bashToolContext,
+                    commMessage: bashCommMessage,
                     disableHardOrchestration: true,
                 }),
                 callbacks: aiEvents?.createAgentLoopCallbacks(model),
@@ -477,6 +471,12 @@ Workspace path: ${this.workspace}
 When done, provide a clear summary of findings or actions.`;
     }
     dispose() {
+        for (const [taskId, controller] of this.runningTasks.entries()) {
+            try {
+                controller.abort();
+            }
+            catch { /* ignore */ }
+        }
         this.runningTasks.clear();
     }
 }

package/lib/subagent.js.map

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

package/lib/task-executor.d.ts

@@ -35,5 +35,6 @@ export declare function createTaskExecutor(deps: TaskExecutorDeps): {
         sendMessage: (opts: import("@zhin.js/core").SendOptions) => Promise<string>;
     } | undefined;
 };
+export declare function drainTaskExecutorLocks(timeoutMs: number): Promise<void>;
 export type TaskExecutor = ReturnType<typeof createTaskExecutor>;
 //# sourceMappingURL=task-executor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"task-executor.d.ts","sourceRoot":"","sources":["../src/task-executor.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAQtD,MAAM,WAAW,oBAAoB;IACnC,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW;IACX,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,4DAA4D;IAC5D,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,uDAAuD;IACvD,YAAY,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB,qFAAqF;IACrF,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,sCAAsC;IACtC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,gCAAgC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAiCD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB;2BAGnB,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;EA6FlI;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":"AAYA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAQtD,MAAM,WAAW,oBAAoB;IACnC,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW;IACX,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,4DAA4D;IAC5D,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,uDAAuD;IACvD,YAAY,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB,qFAAqF;IACrF,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,sCAAsC;IACtC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,gCAAgC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAwCD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB;2BAGnB,oBAAoB,KAAG,OAAO,CAAC,mBAAmB,CAAC;+BAhD5D,MAAM,KAAK;QAAE,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,eAAe,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,SAAS;EAqGlI;AAED,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM7E;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}

package/lib/task-executor.js

@@ -1,4 +1,4 @@
-import { Logger } from '@zhin.js/core';
+import { Logger, createSyntheticMessage } from '@zhin.js/core';
 import { createNotificationRouter, } from './assistant/notification-router.js';
 const logger = new Logger(null, 'task-executor');
 // ─────────────────────────────────────────────────────────────────────────────
@@ -7,12 +7,20 @@ const logger = new Logger(null, 'task-executor');
 const locks = new Map();
 async function withLock(sceneId, fn) {
     const prev = locks.get(sceneId) ?? Promise.resolve();
-    const next = prev.then(fn, fn);
+    let resolve;
+    const gate = new Promise((r) => { resolve = r; });
+    const next = prev.then(() => gate, () => gate);
     locks.set(sceneId, next.finally(() => {
         if (locks.get(sceneId) === next)
             locks.delete(sceneId);
     }));
-    return next;
+    await prev.catch(() => { });
+    try {
+        return await fn();
+    }
+    finally {
+        resolve();
+    }
 }
 // ─────────────────────────────────────────────────────────────────────────────
 // OutputElement[] → string
@@ -53,14 +61,15 @@ export function createTaskExecutor(deps) {
                 ].join('\n');
             }
             const im = effectiveNotify.channel === 'im' ? effectiveNotify : undefined;
-            const sceneId = im?.sceneId || 'default';
-            const elements = await withLock(sceneId, () => deps.agent.process(finalPrompt, {
-                platform: im?.platform || 'cron',
-                senderId: 'system',
-                botId: im?.botId,
-                sceneId: im?.sceneId || 'cron',
-                scope: im?.scope || undefined,
-            }));
+            const sceneId = im?.sceneId || 'cron';
+            const scope = im?.scope || 'private';
+            const commMessage = createSyntheticMessage({
+                adapter: im?.platform || 'cron',
+                endpoint: im?.endpointId || 'default',
+                sender: { id: 'system', name: 'system', isMaster: true },
+                channel: { type: scope, id: sceneId },
+            });
+            const elements = await withLock(sceneId, () => deps.agent.process(finalPrompt, commMessage));
             const text = elementsToText(elements);
             if (!text) {
                 return { success: true, responseText: '', durationMs: Date.now() - t0 };
@@ -76,4 +85,11 @@ export function createTaskExecutor(deps) {
     }
     return { executeTask, resolveAdapter: deps.resolveAdapter };
 }
+export async function drainTaskExecutorLocks(timeoutMs) {
+    const deadline = Date.now() + timeoutMs;
+    while (locks.size > 0 && Date.now() < deadline) {
+        await Promise.allSettled([...locks.values()]);
+    }
+    locks.clear();
+}
 //# sourceMappingURL=task-executor.js.map

package/lib/task-executor.js.map

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