@zhin.js/agent 1.1.7 → 1.1.9

package/lib/subagent-goal-notify.js

@@ -35,19 +35,6 @@ export function formatSubagentProcessingMessage(notice) {
     const channel = agent ? `${kindLabel}·${agent}` : kindLabel;
     return `任务【${taskId}】:${channel} => ${label}`;
 }
-/**
- * 多 Bot 同群协作时，编排/子任务进度提示若发到群里会被 peer Bot 收进引用链。
- * 此类场景仅打日志，最终结论仍由主 Agent 正常 reply。
- */
-export function shouldSuppressSubagentGoalNotifyToIm(message, cell) {
-    const scope = message.$channel?.type;
-    if (scope !== 'group' && scope !== 'channel')
-        return false;
-    if (!cell?.members?.length)
-        return false;
-    const endpoints = new Set(cell.members.map((m) => m.endpointKey));
-    return endpoints.size >= 2;
-}
 export function getSubagentGoalNotifier(commMessage) {
     const extra = commMessage ? commMessage.extra : undefined;
     const fn = extra?.[SUBAGENT_GOAL_NOTIFY_EXTRA_KEY];

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":"AAEA,qCAAqC;AACrC,MAAM,CAAC,MAAM,8BAA8B,GAAG,gBAAgB,CAAC;AAK/D,MAAM,CAAC,MAAM,8BAA8B,GAA0C;IACnF,KAAK,EAAE,IAAI;IACX,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,IAAI;IACd,IAAI,EAAE,IAAI;CACX,CAAC;AAYF,MAAM,UAAU,2BAA2B,CAAC,KAAyB,EAAE,IAAY;IACjF,MAAM,OAAO,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IAC9B,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,8BAA8B;AAC9B,MAAM,UAAU,yBAAyB,CAAC,OAEzC;IACC,IAAI,OAAO,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;IAChC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,yBAAyB,CAAC,KAAc;IACtD,MAAM,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IACxB,OAAO,CAAC,IAAI,SAAS,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,gCAAgC,CAAC,IAA2B;IAC1E,OAAO,8BAA8B,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;AACtD,CAAC;AAED,4CAA4C;AAC5C,MAAM,UAAU,+BAA+B,CAAC,MAAgC;IAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACpC,MAAM,SAAS,GAAG,gCAAgC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;IAC1C,MAAM,KAAK,GAAG,yBAAyB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5D,OAAO,MAAM,MAAM,KAAK,OAAO,OAAO,KAAK,EAAE,CAAC;AAChD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oCAAoC,CAClD,OAAgB,EAChB,IAA6C;IAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC;IACrC,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC3D,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM;QAAE,OAAO,KAAK,CAAC;IACzC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;IAClE,OAAO,SAAS,CAAC,IAAI,IAAI,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,WAAqB;IAC3D,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAE,WAAgC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,8BAA8B,CAAC,CAAC;IACnD,OAAO,OAAO,EAAE,KAAK,UAAU,CAAC,CAAC,CAAE,EAA2B,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAgC,EAChC,MAAgC;IAEhC,MAAM,MAAM,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;IACpD,IAAI,CAAC,MAAM;QAAE,OAAO;IACpB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;QAAE,OAAO;IAC1D,IAAI,CAAC;QACH,MAAM,MAAM,CAAC;YACX,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAC5B,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,eAAe;IACjB,CAAC;AACH,CAAC"}
+{"version":3,"file":"subagent-goal-notify.js","sourceRoot":"","sources":["../src/subagent-goal-notify.ts"],"names":[],"mappings":"AAEA,qCAAqC;AACrC,MAAM,CAAC,MAAM,8BAA8B,GAAG,gBAAgB,CAAC;AAK/D,MAAM,CAAC,MAAM,8BAA8B,GAA0C;IACnF,KAAK,EAAE,IAAI;IACX,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,IAAI;IACd,IAAI,EAAE,IAAI;CACX,CAAC;AAYF,MAAM,UAAU,2BAA2B,CAAC,KAAyB,EAAE,IAAY;IACjF,MAAM,OAAO,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IAC9B,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,8BAA8B;AAC9B,MAAM,UAAU,yBAAyB,CAAC,OAEzC;IACC,IAAI,OAAO,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;IAChC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,yBAAyB,CAAC,KAAc;IACtD,MAAM,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IACxB,OAAO,CAAC,IAAI,SAAS,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,gCAAgC,CAAC,IAA2B;IAC1E,OAAO,8BAA8B,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;AACtD,CAAC;AAED,4CAA4C;AAC5C,MAAM,UAAU,+BAA+B,CAAC,MAAgC;IAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACpC,MAAM,SAAS,GAAG,gCAAgC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;IAC1C,MAAM,KAAK,GAAG,yBAAyB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5D,OAAO,MAAM,MAAM,KAAK,OAAO,OAAO,KAAK,EAAE,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,WAAqB;IAC3D,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAE,WAAgC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,8BAA8B,CAAC,CAAC;IACnD,OAAO,OAAO,EAAE,KAAK,UAAU,CAAC,CAAC,CAAE,EAA2B,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAgC,EAChC,MAAgC;IAEhC,MAAM,MAAM,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;IACpD,IAAI,CAAC,MAAM;QAAE,OAAO;IACpB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;QAAE,OAAO;IAC1D,IAAI,CAAC;QACH,MAAM,MAAM,CAAC;YACX,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YAC5B,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,eAAe;IACjB,CAAC;AACH,CAAC"}

package/lib/task-executor.d.ts

@@ -1,18 +1,20 @@
-import type { ZhinAgent } from './zhin-agent/index.js';
 import { type NotificationRouter } from './assistant/notification-router.js';
 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';
+import { type ScheduleExecutionDomain, type ScheduleExecutionResult, type ScheduleTurnPort } from './schedule-domain/execution-domain.js';
+import type { ZhinAgentConfig } from './config/zhin-agent-config.js';
 export interface TaskExecutionResult extends ScheduleExecutionResult {
     responseText: string;
     executionPlan?: ScheduleJobExecutionPlan;
 }
 export interface TaskExecutorDeps {
-    agent: ZhinAgent;
+    turn?: ScheduleTurnPort;
+    config?: Required<ZhinAgentConfig>;
     resolveAdapter: (platform: string) => {
         sendMessage: (opts: import('@zhin.js/core').SendOptions) => Promise<string>;
     } | undefined;
     router?: NotificationRouter;
+    activity?: ScheduleActivityPort;
     defaultNotify?: import('./assistant/types.js').JobNotify;
     domain?: ScheduleExecutionDomain;
     dataDir?: string;
@@ -20,6 +22,15 @@ export interface TaskExecutorDeps {
 export interface TaskExecutionOptions {
     previewSource?: ScheduleInvocationContext;
 }
+export interface ScheduleActivityEvent {
+    readonly phase: 'start' | 'finish' | 'error';
+    readonly job: ScheduleJob;
+    readonly previewSource?: ScheduleInvocationContext;
+    readonly notify: import('./assistant/types.js').JobNotify;
+}
+export interface ScheduleActivityPort {
+    publish(event: ScheduleActivityEvent): void | Promise<void>;
+}
 export declare function createTaskExecutor(deps: TaskExecutorDeps): {
     execute: (job: ScheduleJob, options?: TaskExecutionOptions) => Promise<TaskExecutionResult>;
     preview: (prompt: string, source: ScheduleInvocationContext, options?: {

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"task-executor.d.ts","sourceRoot":"","sources":["../src/task-executor.ts"],"names":[],"mappings":"AAEA,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,EAC5B,KAAK,gBAAgB,EACtB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAMrE,MAAM,WAAW,mBAAoB,SAAQ,uBAAuB;IAClE,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,wBAAwB,CAAC;CAC1C;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,MAAM,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IACnC,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,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,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;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC7C,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,yBAAyB,CAAC;IACnD,QAAQ,CAAC,MAAM,EAAE,OAAO,sBAAsB,EAAE,SAAS,CAAC;CAC3D;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB;mBAQ3B,WAAW,YAAW,oBAAoB,KAAQ,OAAO,CAAC,mBAAmB,CAAC;sBA0DhG,MAAM,UACN,yBAAyB,YACxB;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,KACtC,OAAO,CAAC,mBAAmB,CAAC;+BA5FJ,MAAM,KAAK;QAAE,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,eAAe,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,SAAS;EA+GlI;AAgBD,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7E;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}

package/lib/task-executor.js

@@ -1,79 +1,47 @@
 /** Delivery boundary for the independent schedule execution domain. */
-import { createSyntheticMessage, resolveIMSessionIdFromMessage, getLogger } from '@zhin.js/core';
+import { getLogger } from '@zhin.js/logger';
 import { createNotificationRouter } from './assistant/notification-router.js';
-import { scheduleJobCreatorFromPrincipal, senderFromScheduleCreator } from './assistant/job-creator.js';
+import { scheduleJobCreatorFromPrincipal } from './assistant/job-creator.js';
 import { deliverScheduleToAdapter } from './assistant/deliver-schedule-to-adapter.js';
 import { KeyedMutex } from './utils/keyed-mutex.js';
 import { ScheduleExecutionDomainImpl, } from './schedule-domain/execution-domain.js';
-import { demoteScheduleCreator } from './schedule-domain/security-harness.js';
 import { JsonlScheduleAuditLogger } from './schedule-domain/audit-logger.js';
+import { DEFAULT_CONFIG } from './config/zhin-agent-defaults.js';
 const logger = getLogger('task-executor');
 const sceneLocks = new KeyedMutex();
-function buildExecutionMessage(job, notify) {
-    const im = notify.channel === 'im' ? notify : undefined;
-    const scene = im?.target.scene;
-    const sceneId = scene?.sceneId || 'cron';
-    const scope = scene?.kind || 'private';
-    const creator = job.createdBy ? demoteScheduleCreator(job.createdBy) : undefined;
-    const sender = creator
-        ? senderFromScheduleCreator(creator)
-        : { id: 'schedule', name: 'schedule', isMaster: false, isTrusted: false };
-    return createSyntheticMessage({
-        adapter: scene?.platform || 'cron',
-        endpoint: scene?.endpointKey || 'default',
-        sender,
-        channel: { type: scope, id: sceneId },
-    });
-}
-function buildPreviewMessage(job, source) {
-    const creator = demoteScheduleCreator(job.createdBy ?? scheduleJobCreatorFromPrincipal(source.principal));
-    const im = source.origin.kind === 'im' ? source.origin : undefined;
-    return createSyntheticMessage({
-        adapter: im?.platform ?? source.origin.kind,
-        endpoint: im?.endpoint ?? 'preview',
-        sender: senderFromScheduleCreator(creator),
-        channel: { type: im?.scope ?? 'private', id: im?.sceneId ?? creator.userId },
-        id: im?.messageId,
-    });
-}
 export function createTaskExecutor(deps) {
     const router = deps.router ?? createNotificationRouter({ resolveAdapter: deps.resolveAdapter });
     const domain = deps.domain ?? new ScheduleExecutionDomainImpl({
-        agent: deps.agent,
+        turn: deps.turn ?? missingScheduleTurnPort(),
+        config: deps.config ?? DEFAULT_CONFIG,
         auditLogger: new JsonlScheduleAuditLogger(deps.dataDir),
     });
     async function execute(job, options = {}) {
         const previewSource = options.previewSource;
         const effectiveNotify = router.resolveEffectiveNotify(job.notify, deps.defaultNotify);
-        const commMessage = previewSource
-            ? buildPreviewMessage(job, previewSource)
-            : buildExecutionMessage(job, effectiveNotify);
-        const emitter = deps.agent.getEventEmitter();
-        const event = (name) => {
+        const event = async (phase) => {
             if (!job.activityFeedback)
                 return;
-            const sessionId = resolveIMSessionIdFromMessage(commMessage);
-            emitter.emit(name, emitter.createPayload(sessionId, commMessage, 'text', {
-                hookContext: {
-                    scheduleJobId: job.id,
-                    ...(job.createdBy ? { scheduleCreatedBy: job.createdBy } : {}),
-                    ...(previewSource ? { schedulePreview: true } : {}),
-                    scheduleActivityFeedback: true,
-                    ...(job.executionPlan ? { scheduleExecutionPlan: job.executionPlan } : {}),
-                },
-            }));
+            await deps.activity?.publish({ phase, job, previewSource, notify: effectiveNotify });
         };
         const lockKey = previewSource
             ? `preview:${previewSource.sessionKey}`
-            : (commMessage.$channel?.id ?? 'cron');
-        event('schedule.start');
-        const result = await sceneLocks.run(lockKey, () => domain.execute(job, commMessage, {
-            preview: Boolean(previewSource),
-        }));
+            : scheduleLockKey(job, effectiveNotify);
+        await event('start');
+        let result;
+        try {
+            result = await sceneLocks.run(lockKey, () => domain.execute(job, {
+                preview: Boolean(previewSource),
+            }));
+        }
+        catch (error) {
+            await event('error');
+            throw error;
+        }
         const executionPlan = previewSource
             ? {
                 prompt: job.action.prompt,
-                tools: result.toolsUsed.length ? result.toolsUsed : undefined,
+                tools: result.audit.toolsResolved.length ? result.audit.toolsResolved : undefined,
                 skills: result.audit.skillsResolved?.length ? result.audit.skillsResolved : undefined,
                 previewSample: result.output || undefined,
                 previewedAt: Date.now(),
@@ -81,22 +49,28 @@ export function createTaskExecutor(deps) {
             }
             : job.executionPlan;
         if (!result.success) {
-            event('schedule.error');
+            await event('error');
             logger.error(`[TaskExecutor] 执行失败: ${result.error ?? 'unknown error'}`);
         }
         else if (previewSource) {
-            event('schedule.finish');
+            await event('finish');
         }
         else {
             if (result.output) {
-                await deliverScheduleToAdapter({
-                    notify: effectiveNotify,
-                    content: result.output,
-                    router,
-                    source: 'scheduled',
-                });
+                try {
+                    await deliverScheduleToAdapter({
+                        notify: effectiveNotify,
+                        content: result.output,
+                        router,
+                        source: 'scheduled',
+                    });
+                }
+                catch (error) {
+                    await event('error');
+                    throw error;
+                }
             }
-            event('schedule.finish');
+            await event('finish');
         }
         return { ...result, responseText: result.output, executionPlan };
     }
@@ -119,6 +93,19 @@ export function createTaskExecutor(deps) {
     }
     return { execute, preview, resolveAdapter: deps.resolveAdapter };
 }
+function missingScheduleTurnPort() {
+    return Object.freeze({
+        execute: async () => {
+            throw new Error('TaskExecutor requires a ScheduleTurnPort when no execution domain is supplied');
+        },
+    });
+}
+function scheduleLockKey(job, notify) {
+    if (notify.channel !== 'im')
+        return `schedule:${job.id}`;
+    const scene = notify.target.scene;
+    return `im:${scene.platform}:${scene.endpointKey}:${scene.kind}:${scene.sceneId}`;
+}
 export async function drainTaskExecutorLocks(timeoutMs) {
     await sceneLocks.drain(timeoutMs);
 }

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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"}

package/lib/tool/classic-tool-execution-authority.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"classic-tool-execution-authority.d.ts","sourceRoot":"","sources":["../../src/tool/classic-tool-execution-authority.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAEV,sBAAsB,EACvB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAGlE,OAAO,EAAiC,KAAK,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAKzH,MAAM,WAAW,oCAAoC;IACnD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,kBAAkB,CAAC,EAAE,sBAAsB,CAAC;IACrD,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC;CACpC;AAED;;;GAGG;AACH,wBAAgB,mCAAmC,CACjD,OAAO,EAAE,oCAAoC,GAC5C,sBAAsB,CA4ExB"}
+{"version":3,"file":"classic-tool-execution-authority.d.ts","sourceRoot":"","sources":["../../src/tool/classic-tool-execution-authority.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAEV,sBAAsB,EACvB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAGlE,OAAO,EAAiC,KAAK,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAKzH,MAAM,WAAW,oCAAoC;IACnD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,kBAAkB,CAAC,EAAE,sBAAsB,CAAC;IACrD,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC;CACpC;AAED;;;GAGG;AACH,wBAAgB,mCAAmC,CACjD,OAAO,EAAE,oCAAoC,GAC5C,sBAAsB,CAyExB"}

package/lib/tool/classic-tool-execution-authority.js

@@ -1,5 +1,5 @@
 import { runWithCommMessage } from '../security/comm-message-context.js';
-import { readHttpSessionId, resolveApprovalPort } from '../session/resolve-approval-port.js';
+import { isApprovalPortAvailable } from '../session/approval-port.js';
 import { runWithDeferredTurnController } from '../tool-catalog/deferred-turn-controller.js';
 import { registerBuiltinPolicyExtractors } from './builtin-policy-extractors.js';
 import { runToolApprovalGate } from './tool-approval-gate.js';
@@ -33,10 +33,11 @@ export function createClassicToolExecutionAuthority(options) {
                     policy: tool.approval,
                     plugin: options.plugin,
                     bus: options.host.orchestrator?.agentStreamBus,
-                    port: resolveApprovalPort(options.message, options.host.httpApprovalAdapter, options.host.approvalPort),
+                    port: isApprovalPortAvailable(options.host.approvalPort)
+                        ? options.host.approvalPort
+                        : undefined,
                     publishCtx: {
                         sessionId: options.sessionId,
-                        httpSessionId: readHttpSessionId(options.message),
                     },
                     onceStore: options.host.orchestrator?.approvalOnce,
                     journal: options.journal,

package/lib/tool/classic-tool-execution-authority.js.map

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

package/lib/tool/prepare-turn-tools.d.ts

@@ -2,7 +2,6 @@ import type { AgentTool } from '@zhin.js/ai';
 import type { Message } from '@zhin.js/core';
 import type { ZhinAgentPrivate, Tool } from '../internal/agent-host.js';
 import type { ResolvedToolsForTurn } from './deferred-resolution.js';
-import type { HostScheduleTurnContext } from '../internal/host-types.js';
 export interface TurnToolsPrep {
     contextForTools: Message;
     allTools: AgentTool[];
@@ -19,6 +18,5 @@ export declare function prepareTurnTools(host: ZhinAgentPrivate, opts: {
     sessionId: string;
     userId: string;
     mcpServerNames: string[];
-    scheduleContext?: HostScheduleTurnContext;
 }): Promise<TurnToolsPrep>;
 //# sourceMappingURL=prepare-turn-tools.d.ts.map

package/lib/tool/prepare-turn-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-turn-tools.d.ts","sourceRoot":"","sources":["../../src/tool/prepare-turn-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAQ7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAGxE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAKrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AASzE,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,OAAO,CAAC;IACzB,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACzC,eAAe,EAAE,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;CAC1D;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,CAAC,EAAE,uBAAuB,CAAC;CAC3C,GACA,OAAO,CAAC,aAAa,CAAC,CAqIxB"}
+{"version":3,"file":"prepare-turn-tools.d.ts","sourceRoot":"","sources":["../../src/tool/prepare-turn-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAQ7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAGxE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAOrE,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,OAAO,CAAC;IACzB,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACzC,eAAe,EAAE,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;CAC1D;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,GACA,OAAO,CAAC,aAAa,CAAC,CAmFxB"}

package/lib/tool/prepare-turn-tools.js

@@ -1,14 +1,9 @@
 import { ensureMcpConnectionsForBinding, getMcpToolsForBinding, } from '../orchestrator/mcp-lifecycle.js';
 import { rehydrateTurnActiveSkills } from '../assistant/schedule-skills.js';
-import { captureDeferredSnapshotBefore, cloneDeferredSnapshot, setTurnActiveSkills } from '../internal/turn-context.js';
+import { captureDeferredSnapshotBefore, cloneDeferredSnapshot } from '../internal/turn-context.js';
 import { attachWebSearchLocale } from './web-search-locale-attach.js';
 import { defaultToolSystem } from '../tool/tool-system.js';
 import { applyDynamicTurnOverrides } from '../dynamic/dynamic-registry.js';
-import { resolveScheduleTools } from '../schedule-domain/tool-resolver.js';
-import { secureScheduleTools } from '../schedule-domain/security-harness.js';
-import { loadScheduleSkillContext } from '../schedule-domain/prompt-assembler.js';
-import { getLogger } from '@zhin.js/logger';
-const scheduleLogger = getLogger('schedule-execution-domain');
 function listSpawnableAgentNames(host) {
     const presets = host.orchestrator?.subagents.getAllPresets().map((p) => p.name) ?? [];
     return [...new Set(presets.filter(Boolean))].sort();
@@ -68,55 +63,6 @@ export async function prepareTurnTools(host, opts) {
     });
     allTools = dynamicApplied.tools;
     host.turnDynamicInstructions = dynamicApplied.additionalInstructions;
-    const scheduleContext = opts.scheduleContext;
-    if (scheduleContext) {
-        const resolution = resolveScheduleTools({
-            prompt: opts.content,
-            executionPlan: scheduleContext.executionPlan,
-            tools: allTools,
-            skillRegistry: host.skillRegistry,
-        });
-        const resolvedTools = secureScheduleTools({
-            tools: resolution.tools,
-            message: contextForTools,
-            config: host.config,
-            context: scheduleContext.security,
-            onDenial: denial => scheduleContext.securityDenials.push(denial),
-        });
-        const catalog = [];
-        const sessionSnapshot = {
-            loadedTools: {},
-            loadedSkills: [],
-        };
-        scheduleContext.toolResolution = {
-            tools: resolvedTools.map(tool => tool.name),
-            skills: resolution.skills,
-            resolvedBy: resolution.resolvedBy,
-            missingTools: resolution.missingTools,
-            missingSkills: resolution.missingSkills,
-        };
-        for (const name of resolution.missingTools) {
-            scheduleLogger.warn(`Schedule execution plan tool not found: ${name}`);
-        }
-        for (const name of resolution.missingSkills) {
-            scheduleLogger.warn(`Schedule execution plan skill not found: ${name}`);
-        }
-        setTurnActiveSkills(await loadScheduleSkillContext(host, resolution.skills));
-        const resolved = {
-            tools: resolvedTools,
-            catalog,
-            deferred: false,
-            sessionSnapshot,
-        };
-        return {
-            contextForTools,
-            allTools,
-            resolved,
-            resolvedTools,
-            catalog,
-            sessionSnapshot,
-        };
-    }
     const resolved = await toolSystem.resolveForTurn(host, allTools, opts.sessionId, String(contextForTools.$adapter));
     const { tools: resolvedTools, deferredStats, catalog, sessionSnapshot: initialSnapshot } = resolved;
     const sessionSnapshot = initialSnapshot;

package/lib/tool/prepare-turn-tools.js.map

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

package/lib/tool/tool-runtime.d.ts

@@ -22,7 +22,7 @@ export interface ToolRuntimeTurnContext {
     readonly generation: number;
     readonly signal: AbortSignal;
     readonly sessionId: string;
-    readonly commMessage: Message;
+    readonly commMessage?: Message;
     readonly journal?: ToolRuntimeJournalPort;
     readonly config?: Required<ZhinAgentConfig>;
     readonly hostPlugin?: Plugin;

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

@@ -1 +1 @@
-{"version":3,"file":"tool-runtime.d.ts","sourceRoot":"","sources":["../../src/tool/tool-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC3B,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE7E,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,eAAe,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtE;AAID,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IAC1C,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACvD;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,SAAS,qBAAqB,EAAE,CAAC;CACxD;AAED;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,CACrC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,WAAW,CAAC,EAAE,OAAO,EACrB,UAAU,CAAC,EAAE,MAAM,KAChB,eAAe,CAAC;AAMrB,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,wBAAwB,GAAG,IAAI,CAEnG;AAYD,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9G,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,gBAAgB,CAAC;IACtD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,sBAAsB,GAAG,WAAW,CA2F1E"}
+{"version":3,"file":"tool-runtime.d.ts","sourceRoot":"","sources":["../../src/tool/tool-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC3B,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE7E,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,eAAe,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtE;AAID,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IAC1C,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACvD;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,SAAS,qBAAqB,EAAE,CAAC;CACxD;AAED;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,CACrC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,WAAW,CAAC,EAAE,OAAO,EACrB,UAAU,CAAC,EAAE,MAAM,KAChB,eAAe,CAAC;AAMrB,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,wBAAwB,GAAG,IAAI,CAEnG;AAYD,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9G,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,gBAAgB,CAAC;IACtD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,sBAAsB,GAAG,WAAW,CA2F1E"}

package/lib/turn/auto-continue.js

@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto';
 import { formatCompact, getLogger } from '@zhin.js/logger';
-import { resolveAgentTurnSessionKey } from '../collaboration/resolve-agent-session-key.js';
+import { resolveAgentTurnSessionKey } from '../session/session-key.js';
 import { deliverDeferredAutoContinueReply } from './deferred-delivery.js';
 import { buildDeferredAutoContinueUserMessage, shouldDeferredAutoContinue } from './deferred-auto-continue.js';
 import { buildSubagentAutoContinueUserMessage, buildSubagentAutoContinueRetryMessage, } from './subagent-auto-continue.js';

package/lib/turn/auto-continue.js.map

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

package/lib/turn/persist-deferred-context.js

@@ -3,7 +3,7 @@
  * 避免下一轮主 Agent 仍只看到 run_deferred_task 的 delegated 占位。
  */
 import { EMPTY_TOKEN_USAGE, } from '@zhin.js/ai';
-import { resolveAgentTurnSessionKey } from '../collaboration/resolve-agent-session-key.js';
+import { resolveAgentTurnSessionKey } from '../session/session-key.js';
 import { resolveSubagentDisplayLabel } from '../subagent-goal-notify.js';
 import { packageSubagentResult } from '../subagent-artifact.js';
 import { extractDeferredBody } from './deferred-delivery.js';

package/lib/turn/persist-deferred-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"persist-deferred-context.js","sourceRoot":"","sources":["../../src/turn/persist-deferred-context.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACL,iBAAiB,GAElB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,0BAA0B,EAAE,MAAM,+CAA+C,CAAC;AAE3F,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,CAAC,KAAK,UAAU,oCAAoC,CACxD,KAAuB,EACvB,WAAoB,EACpB,MAAc,EACd,IAAY,EACZ,MAA4B;IAE5B,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;QAAE,OAAO,KAAK,CAAC;IAE/B,MAAM,UAAU,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,MAAM,EAAE,UAAU,CAAC;IACrC,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IAE7B,MAAM,KAAK,GAAG,2BAA2B,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,8BAA8B,MAAM,MAAM,KAAK,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEpF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACjC,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,iBAAiB;QAC3B,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,iBAAiB;QACxB,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,MAAM,KAAK,CAAC,iBAAiB,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC5E,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"persist-deferred-context.js","sourceRoot":"","sources":["../../src/turn/persist-deferred-context.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACL,iBAAiB,GAElB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,CAAC,KAAK,UAAU,oCAAoC,CACxD,KAAuB,EACvB,WAAoB,EACpB,MAAc,EACd,IAAY,EACZ,MAA4B;IAE5B,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;QAAE,OAAO,KAAK,CAAC;IAE/B,MAAM,UAAU,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,MAAM,EAAE,UAAU,CAAC;IACrC,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IAE7B,MAAM,KAAK,GAAG,2BAA2B,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,8BAA8B,MAAM,MAAM,KAAK,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEpF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACjC,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,iBAAiB;QAC3B,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,iBAAiB;QACxB,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,MAAM,KAAK,CAAC,iBAAiB,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC5E,OAAO,IAAI,CAAC;AACd,CAAC"}

package/lib/turn/persist-subagent-context.js

@@ -2,7 +2,7 @@
  * Persist async subagent result into main session context before auto-continue.
  */
 import { EMPTY_TOKEN_USAGE, } from '@zhin.js/ai';
-import { resolveAgentTurnSessionKey } from '../collaboration/resolve-agent-session-key.js';
+import { resolveAgentTurnSessionKey } from '../session/session-key.js';
 import { packageSubagentResult } from '../subagent-artifact.js';
 export async function persistSubagentResultToContext(agent, commMessage, payload) {
     const body = payload.result.trim();

package/lib/turn/persist-subagent-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"persist-subagent-context.js","sourceRoot":"","sources":["../../src/turn/persist-subagent-context.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EACL,iBAAiB,GAElB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,0BAA0B,EAAE,MAAM,+CAA+C,CAAC;AAE3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAIhE,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,KAAuB,EACvB,WAAoB,EACpB,OAAgC;IAEhC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACnC,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IAExB,MAAM,UAAU,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,MAAM,EAAE,UAAU,CAAC;IACrC,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IAE7B,MAAM,QAAQ,GAAG,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7D,MAAM,IAAI,GAAG;QACX,8BAA8B,OAAO,CAAC,MAAM,MAAM,OAAO,CAAC,KAAK,GAAG;QAClE,WAAW,OAAO,CAAC,MAAM,EAAE;QAC3B,EAAE;QACF,QAAQ,CAAC,IAAI;KACd,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACjC,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,UAAU;QACpB,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,UAAU;QAClC,KAAK,EAAE,iBAAiB;QACxB,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,MAAM,KAAK,CAAC,iBAAiB,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC5E,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"persist-subagent-context.js","sourceRoot":"","sources":["../../src/turn/persist-subagent-context.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EACL,iBAAiB,GAElB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAIhE,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,KAAuB,EACvB,WAAoB,EACpB,OAAgC;IAEhC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACnC,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IAExB,MAAM,UAAU,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,MAAM,EAAE,UAAU,CAAC;IACrC,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IAE7B,MAAM,QAAQ,GAAG,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7D,MAAM,IAAI,GAAG;QACX,8BAA8B,OAAO,CAAC,MAAM,MAAM,OAAO,CAAC,KAAK,GAAG;QAClE,WAAW,OAAO,CAAC,MAAM,EAAE;QAC3B,EAAE;QACF,QAAQ,CAAC,IAAI;KACd,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACjC,GAAG,EAAE,oBAAoB;QACzB,QAAQ,EAAE,UAAU;QACpB,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,UAAU;QAClC,KAAK,EAAE,iBAAiB;QACxB,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,MAAM,KAAK,CAAC,iBAAiB,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC5E,OAAO,IAAI,CAAC;AACd,CAAC"}

package/lib/turn/process-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process-stream.d.ts","sourceRoot":"","sources":["../../src/turn/process-stream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAKlF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,wBAAuB,qBAAqB,CAC1C,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,kBAAkB,EAAE,0BAA0B,CAAC;IAC/C,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,gBAAgB,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;CAC3E,GACA,cAAc,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,CAuC5C"}
+{"version":3,"file":"process-stream.d.ts","sourceRoot":"","sources":["../../src/turn/process-stream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAKlF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,wBAAuB,qBAAqB,CAC1C,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,kBAAkB,EAAE,0BAA0B,CAAC;IAC/C,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,gBAAgB,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;CAC3E,GACA,cAAc,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,CAsC5C"}

package/lib/turn/process-stream.js

@@ -2,7 +2,6 @@ import { randomUUID } from 'node:crypto';
 import { resolveIMSessionIdFromMessage } from '@zhin.js/core';
 import { AgentRunJournal } from '@zhin.js/ai/agent-stream';
 import { publishTurnStreamEvents } from '../event/publish-agent-stream.js';
-import { readHttpSessionId } from '../session/resolve-approval-port.js';
 import { runWithInboundQueue } from '../turn/inbound-queue-runtime.js';
 import { processTextTurn } from './turn-pipeline.js';
 import { isTurnCancellation, turnCancelledEvent } from './turn-terminal.js';
@@ -14,7 +13,6 @@ export async function* processTextTurnStream(agent, opts) {
     const streamCtx = () => ({
         sessionId,
         turnId,
-        httpSessionId: readHttpSessionId(commMessage),
     });
     const journal = new AgentRunJournal({ sessionId, turnId });
     const turnStart = { type: 'turn_start', sessionId, turnId };

package/lib/turn/process-stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-stream.js","sourceRoot":"","sources":["../../src/turn/process-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAGxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1D,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,qBAAqB,CAC1C,KAAuB,EACvB,IAOC;IAED,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAC7G,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAG,6BAA6B,CAAC,WAAW,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC;QACvB,SAAS;QACT,MAAM;QACN,aAAa,EAAE,iBAAiB,CAAC,WAAW,CAAC;KAC9C,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3D,MAAM,SAAS,GAAc,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IACvE,MAAM,SAAS,CAAC;IAChB,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,OAAO,CAAC,CAAC;IAEhE,MAAM,MAAM,GAAG,gBAAgB,CAAC;QAC9B,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,CAC/C,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAE;YACrE,OAAO;YACP,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE,CACrB,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,SAAS,EAAE;gBAC3E,WAAW,EAAE,IAAI;gBACjB,OAAO;aACR,CAAC;SACL,CAAC,CAAC;QACL,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC;YAC5C,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC;YAC3B,CAAC,CAAC;gBACE,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChE,WAAW,EAAE,KAAK;aACnB;KACN,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,uBAAuB,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"process-stream.js","sourceRoot":"","sources":["../../src/turn/process-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1D,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,qBAAqB,CAC1C,KAAuB,EACvB,IAOC;IAED,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAC7G,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAG,6BAA6B,CAAC,WAAW,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC;QACvB,SAAS;QACT,MAAM;KACP,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3D,MAAM,SAAS,GAAc,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IACvE,MAAM,SAAS,CAAC;IAChB,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,OAAO,CAAC,CAAC;IAEhE,MAAM,MAAM,GAAG,gBAAgB,CAAC;QAC9B,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,CAC/C,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAE;YACrE,OAAO;YACP,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE,CACrB,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,SAAS,EAAE;gBAC3E,WAAW,EAAE,IAAI;gBACjB,OAAO;aACR,CAAC;SACL,CAAC,CAAC;QACL,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC;YAC5C,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC;YAC3B,CAAC,CAAC;gBACE,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChE,WAAW,EAAE,KAAK;aACnB;KACN,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,uBAAuB,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}