@zhin.js/agent 0.1.29 → 0.1.31

package/lib/subagent-ai-events.js

@@ -0,0 +1,110 @@
+import { resolveIMSessionIdFromToolContext } from '@zhin.js/ai';
+import { ensureMcpConnectionsForBinding } from './orchestrator/mcp-lifecycle.js';
+export class SubagentAiEventReporter {
+    emitter;
+    ctx;
+    sessionId;
+    toolContext;
+    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,
+        });
+    }
+    payload(extra = {}) {
+        return this.emitter.createPayload(this.sessionId, this.toolContext, 'text', {
+            source: 'subagent',
+            path: 'agent',
+            taskId: this.ctx.taskId,
+            label: this.ctx.label,
+            agentId: this.ctx.presetName ?? this.ctx.label,
+            ...extra,
+        });
+    }
+    async processingStart(content) {
+        await this.emitter.dispatch('ai.processing.start', this.payload({
+            content,
+            keepTyping: this.ctx.keepTypingUntilUpstreamFinish,
+        }));
+    }
+    async processingFinish(reply, extra) {
+        await this.emitter.dispatch('ai.processing.finish', this.payload({
+            reply,
+            keepTyping: this.ctx.keepTypingUntilUpstreamFinish,
+            ...extra,
+        }));
+        if (!this.ctx.keepTypingUntilUpstreamFinish) {
+            this.emitter.emit('ai.typing.stop', this.payload({ reason: 'subagent_done' }));
+        }
+    }
+    async processingError(error) {
+        await this.emitter.dispatch('ai.processing.error', this.payload({ error }));
+        if (!this.ctx.keepTypingUntilUpstreamFinish) {
+            this.emitter.emit('ai.typing.stop', this.payload({ reason: 'subagent_error' }));
+        }
+    }
+    async ensureMcpForBinding(mcps, serverNames) {
+        await ensureMcpConnectionsForBinding(mcps, serverNames, (event) => {
+            const payload = this.payload({
+                serverName: event.serverName,
+                loadedToolNames: event.toolNames,
+                error: event.error,
+                reason: event.connected === false ? 'disconnected' : undefined,
+            });
+            if (event.phase === 'start') {
+                this.emitter.emit('ai.mcp.connect.start', payload);
+            }
+            else if (event.phase === 'finish') {
+                this.emitter.emit('ai.mcp.connect.finish', payload);
+            }
+            else {
+                this.emitter.emit('ai.mcp.connect.error', payload);
+            }
+        });
+    }
+    createAgentLoopCallbacks(model) {
+        return {
+            onToolCall: (toolName, args) => {
+                this.emitter.emit('ai.tool.call', this.payload({
+                    toolName,
+                    args,
+                    model,
+                }));
+            },
+            onToolResult: (toolName, result) => {
+                this.emitter.emit('ai.tool.result', this.payload({
+                    toolName,
+                    result,
+                    model,
+                }));
+            },
+        };
+    }
+    async agentStart(model) {
+        await this.emitter.dispatch('ai.agent.start', this.payload({ model }));
+    }
+    async agentFinish(model, iterations) {
+        await this.emitter.dispatch('ai.agent.finish', this.payload({ model, iterations }));
+    }
+    async response(reply, model, iterations) {
+        await this.emitter.dispatch('ai.response', this.payload({ reply, model, iterations }));
+    }
+}
+//# sourceMappingURL=subagent-ai-events.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -1,13 +1,34 @@
 /**
- * 主 Agent 委派子任务时，向 IM 用户即时发送 goal 进度提示。
+ * 主 Agent 委派子任务时，向 IM 用户即时发送进度提示。
+ *
+ * 注意：`kind` 是用户可见的「执行通道」（异步/视觉/定时/同步/编排），
+ * 与 AgentDispatcher 内部的 `AgentRole`（subtask/worker 等工具权限）不是同一概念。
  */
 import type { ToolContext } from '@zhin.js/core';
 /** ToolContext.extra 中挂载的回调键 */
 export declare const SUBAGENT_GOAL_NOTIFY_EXTRA_KEY = "onSubagentGoal";
-export type SubagentGoalNotifier = (goal: string) => void | Promise<void>;
-export declare function truncateSubagentGoal(goal: string): string;
-/** 用户可见格式：🔧 正在执行：${goal} */
-export declare function formatSubagentProcessingMessage(goal: string): string;
+/** 用户可见的执行通道（进度提示中间段） */
+export type SubagentExecutionKind = 'async' | 'sync' | 'vision' | 'draw' | 'deferred' | 'cron';
+export declare const SUBAGENT_EXECUTION_KIND_LABELS: Record<SubagentExecutionKind, string>;
+export interface SubagentProcessingNotice {
+    taskId: string;
+    kind: SubagentExecutionKind;
+    label: string;
+    /** ai.agents / spawn_task 的 agent 名（如 draw、vision） */
+    agent?: string;
+}
+export type SubagentGoalNotifier = (notice: SubagentProcessingNotice) => void | Promise<void>;
+export declare function resolveSubagentDisplayLabel(label: string | undefined, task: string): string;
+/** spawn / spawnSync 的执行通道：具名 agent 优先，否则 sync/async */
+export declare function resolveSpawnExecutionKind(options: {
+    sync?: boolean;
+    agent?: string;
+}): SubagentExecutionKind;
+/** 日志与进度提示用的 agent 展示名 */
+export declare function resolveSubagentAgentLabel(agent?: string): string | undefined;
+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, goal: string): Promise<void>;
+export declare function notifySubagentGoal(ctx: ToolContext | 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;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,gCAAgC;AAChC,eAAO,MAAM,8BAA8B,mBAAmB,CAAC;AAE/D,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAI1E,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIzD;AAED,6BAA6B;AAC7B,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,uBAAuB,CAAC,GAAG,CAAC,EAAE,WAAW,GAAG,oBAAoB,GAAG,SAAS,CAG3F;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,WAAW,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUlG"}
+{"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"}

package/lib/subagent-goal-notify.js

@@ -1,29 +1,63 @@
 /** ToolContext.extra 中挂载的回调键 */
 export const SUBAGENT_GOAL_NOTIFY_EXTRA_KEY = 'onSubagentGoal';
-const MAX_GOAL_CHARS = 500;
-export function truncateSubagentGoal(goal) {
-    const trimmed = goal.trim();
-    if (trimmed.length <= MAX_GOAL_CHARS)
+export const SUBAGENT_EXECUTION_KIND_LABELS = {
+    async: '异步',
+    sync: '同步',
+    vision: '视觉',
+    draw: '文生图',
+    deferred: '编排',
+    cron: '定时',
+};
+export function resolveSubagentDisplayLabel(label, task) {
+    const trimmed = label?.trim();
+    if (trimmed)
         return trimmed;
-    return `${trimmed.slice(0, MAX_GOAL_CHARS)}…`;
+    return task.slice(0, 30) + (task.length > 30 ? '...' : '');
 }
-/** 用户可见格式：🔧 正在执行：${goal} */
-export function formatSubagentProcessingMessage(goal) {
-    return `🔧 正在执行：${truncateSubagentGoal(goal)}`;
+/** spawn / spawnSync 的执行通道：具名 agent 优先，否则 sync/async */
+export function resolveSpawnExecutionKind(options) {
+    const agent = options.agent?.trim().toLowerCase();
+    if (agent === 'vision')
+        return 'vision';
+    if (agent === 'draw')
+        return 'draw';
+    if (options.sync)
+        return 'sync';
+    return 'async';
+}
+/** 日志与进度提示用的 agent 展示名 */
+export function resolveSubagentAgentLabel(agent) {
+    const a = agent?.trim();
+    return a || undefined;
+}
+export function formatSubagentExecutionKindLabel(kind) {
+    return SUBAGENT_EXECUTION_KIND_LABELS[kind] ?? kind;
+}
+/** 用户可见格式：任务【taskId】:执行通道·agent => label */
+export function formatSubagentProcessingMessage(notice) {
+    const taskId = notice.taskId.trim();
+    const kindLabel = formatSubagentExecutionKindLabel(notice.kind);
+    const label = notice.label.trim() || '任务';
+    const agent = resolveSubagentAgentLabel(notice.agent);
+    const channel = agent ? `${kindLabel}·${agent}` : kindLabel;
+    return `任务【${taskId}】:${channel} => ${label}`;
 }
 export function getSubagentGoalNotifier(ctx) {
     const fn = ctx?.extra?.[SUBAGENT_GOAL_NOTIFY_EXTRA_KEY];
     return typeof fn === 'function' ? fn : undefined;
 }
-export async function notifySubagentGoal(ctx, goal) {
+export async function notifySubagentGoal(ctx, notice) {
     const notify = getSubagentGoalNotifier(ctx);
     if (!notify)
         return;
-    const trimmed = goal.trim();
-    if (!trimmed)
+    if (!notice.taskId.trim() || !notice.label.trim())
         return;
     try {
-        await notify(trimmed);
+        await notify({
+            taskId: notice.taskId.trim(),
+            kind: notice.kind,
+            label: notice.label.trim(),
+        });
     }
     catch {
         // 进度提示失败不中断子任务

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":"AAKA,gCAAgC;AAChC,MAAM,CAAC,MAAM,8BAA8B,GAAG,gBAAgB,CAAC;AAI/D,MAAM,cAAc,GAAG,GAAG,CAAC;AAE3B,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,OAAO,CAAC,MAAM,IAAI,cAAc;QAAE,OAAO,OAAO,CAAC;IACrD,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,GAAG,CAAC;AAChD,CAAC;AAED,6BAA6B;AAC7B,MAAM,UAAU,+BAA+B,CAAC,IAAY;IAC1D,OAAO,WAAW,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,GAAiB;IACvD,MAAM,EAAE,GAAG,GAAG,EAAE,KAAK,EAAE,CAAC,8BAA8B,CAAC,CAAC;IACxD,OAAO,OAAO,EAAE,KAAK,UAAU,CAAC,CAAC,CAAE,EAA2B,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,GAA4B,EAAE,IAAY;IACjF,MAAM,MAAM,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;IAC5C,IAAI,CAAC,MAAM;QAAE,OAAO;IACpB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,OAAO;QAAE,OAAO;IACrB,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC;IACxB,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":"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"}

package/lib/subagent.d.ts

@@ -8,26 +8,43 @@
  *   4. 完成后将结果投递回主流程，由主 agent 摘要后发送到原始频道
  */
 import type { AIProvider, AgentTool, Usage } from '@zhin.js/core';
-import type { ModelRegistry } from '@zhin.js/ai';
-import type { ZhinAgentConfig } from './zhin-agent/config.js';
+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 { AgentDispatcher, type AgentRole } from './orchestrator/agent-dispatcher.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;
 }
 export interface SpawnOptions {
     task: string;
     label?: string;
     origin: SubagentOrigin;
+    /** 配置/route 中的 agent 名（ai.agents + *.agent.md） */
+    agent?: string;
+    /** 显式绑定（优先于 agent 名解析） */
+    binding?: ResolvedAgentBinding;
+    /** 来自 *.agent.md 正文的 system prompt */
+    systemPrompt?: string;
     /** Agent 角色（可选，默认为 'subtask'） */
     role?: AgentRole;
     /** 任务上下文（可选） */
     context?: Record<string, unknown>;
+    /** 首条 user 消息（含 vision parts）；缺省则用 task 字符串 */
+    runInput?: string | ContentPart[];
+    /** 用于向用户发送「任务【id】:执行通道 => label」进度提示 */
+    notifyContext?: ToolContext;
 }
 export interface SubagentLifecycleEvent {
     phase: 'spawn' | 'start' | 'finish';
@@ -36,13 +53,22 @@ export interface SubagentLifecycleEvent {
     task: string;
     origin: SubagentOrigin;
     role?: AgentRole;
+    /** ai.agents 名，如 pm / architect / dev */
+    agent?: string;
     status?: 'ok' | 'error';
     result?: string;
     error?: string;
 }
-export type SubagentResultSender = (origin: SubagentOrigin, content: string) => Promise<void>;
+export interface SubagentResultDelivery {
+    text: string;
+    toolCalls?: AgentResult['toolCalls'] | ToolCallRecord[];
+}
+export type SubagentResultSender = (origin: SubagentOrigin, delivery: SubagentResultDelivery) => Promise<void>;
 export interface SubagentManagerOptions {
     provider: AIProvider;
+    getProvider?: (alias: string) => AIProvider;
+    resolveBinding?: (agentName: string) => ResolvedAgentBinding | null;
+    getMcpRegistry?: () => McpRegistry | null;
     workspace: string;
     createTools: () => AgentTool[];
     subagentTools?: string[];
@@ -58,9 +84,14 @@ export interface SubagentManagerOptions {
     agentDispatcher?: AgentDispatcher;
     /** 生命周期事件回调（供上层桥接到统一事件总线） */
     onEvent?: (event: SubagentLifecycleEvent) => void | Promise<void>;
+    /** 与主 ZhinAgent 相同的 AI 处理事件总线（processing / tool / mcp 等） */
+    eventEmitter?: ZhinAgentEventEmitter | null;
 }
 export declare class SubagentManager {
     private provider;
+    private getProviderFn;
+    private resolveBindingFn;
+    private getMcpRegistryFn;
     private workspace;
     private createTools;
     private maxIterations;
@@ -73,9 +104,18 @@ export declare class SubagentManager {
     private registerSubagentTask;
     private agentDispatcher;
     private onEvent;
+    private eventEmitter;
     constructor(options: SubagentManagerOptions);
+    setEventEmitter(emitter: ZhinAgentEventEmitter | null): void;
     setSender(sender: SubagentResultSender): void;
     setModelRegistry(registry: ModelRegistry | null): void;
+    configureRouting(deps: {
+        getProvider?: (alias: string) => AIProvider;
+        resolveBinding?: (agentName: string) => ResolvedAgentBinding | null;
+        getMcpRegistry?: () => McpRegistry | null;
+    }): void;
+    /** 同步执行子 agent（入站 route 用）；返回最终文本，不经过 resultSender */
+    spawnSync(options: SpawnOptions): Promise<string>;
     spawn(options: SpawnOptions): Promise<string>;
     getRunningCount(): number;
     private runSubagent;

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