multiclaws 0.4.31 → 0.4.33

package/dist/index.js

@@ -234,6 +234,35 @@ function createTools(getService, logger) {
             }
         },
     };
+    const multiclawsNotify = {
+        name: "multiclaws_notify",
+        description: "Send a notification message to the local user's WebUI. " +
+            "Used by sub-agents to deliver delegation results back to the user. " +
+            "Broadcasts to all known channels so the user sees the message regardless of which channel they are on.",
+        parameters: {
+            type: "object",
+            additionalProperties: false,
+            properties: {
+                message: { type: "string", description: "The message to send to the user." },
+            },
+            required: ["message"],
+        },
+        execute: async (_toolCallId, args) => {
+            const msg = typeof args.message === "string" ? args.message.trim() : "";
+            log("info", `tool:multiclaws_notify(len=${msg.length})`);
+            try {
+                const service = requireService(getService());
+                if (!msg)
+                    throw new Error("message is required");
+                await service.notifyUser(msg);
+                return textResult("Notification sent.");
+            }
+            catch (err) {
+                log("error", `tool:multiclaws_notify failed: ${err instanceof Error ? err.message : String(err)}`);
+                throw err;
+            }
+        },
+    };
     const multiclawsTaskStatus = {
         name: "multiclaws_task_status",
         description: "Check the status of a delegated task.",
@@ -471,6 +500,7 @@ function createTools(getService, logger) {
         multiclawsDelegate,
         multiclawsDelegateSend,
         multiclawsA2ACallback,
+        multiclawsNotify,
         multiclawsTaskStatus,
         multiclawsTeamCreate,
         multiclawsTeamJoin,
@@ -509,7 +539,7 @@ const plugin = {
             if (gw) {
                 const tools = (gw.tools ?? {});
                 const allow = Array.isArray(tools.allow) ? tools.allow : [];
-                const adapterRequired = ["sessions_spawn", "sessions_history", "message"];
+                const adapterRequired = ["sessions_spawn", "sessions_history", "message", "chat.send"];
                 const defaultA2AExecutionTools = ["exec", "read", "write", "edit", "process"];
                 const pluginConf = api.pluginConfig ?? {};
                 const a2aExecTools = Array.isArray(pluginConf.a2aAllowedTools)
@@ -595,14 +625,18 @@ const plugin = {
         api.on("gateway_stop", () => {
             structured.logger.info("[multiclaws] gateway_stop observed");
         });
-        // Collect all channel IDs for broadcasting notifications
+        // Collect notification targets from incoming messages (external channels)
         api.on("message_received", (_event, ctx) => {
-            if (service && ctx.channelId) {
-                service.addChannelId(ctx.channelId);
+            if (service && ctx.channelId && ctx.channelId !== "webchat" && ctx.conversationId) {
+                service.addNotificationTarget(`${ctx.channelId}:${ctx.conversationId}`, { type: "channel", conversationId: ctx.conversationId });
             }
         });
         // Inject onboarding prompt when profile is pending first-run setup
-        api.on("before_prompt_build", async (_event, _ctx) => {
+        // Also capture web session targets for notifications
+        api.on("before_prompt_build", async (_event, ctx) => {
+            if (service && ctx.sessionKey) {
+                service.addNotificationTarget(`web:${ctx.sessionKey}`, { type: "web", sessionKey: ctx.sessionKey });
+            }
             if (!service)
                 return;
             try {

package/dist/service/a2a-adapter.d.ts

@@ -1,11 +1,12 @@
 import type { AgentExecutor, ExecutionEventBus, RequestContext } from "@a2a-js/sdk/server";
 import { type GatewayConfig } from "../infra/gateway-client";
 import type { TaskTracker } from "../task/tracker";
+import type { NotificationTarget } from "./multiclaws-service";
 export type A2AAdapterOptions = {
     gatewayConfig: GatewayConfig | null;
     taskTracker: TaskTracker;
     cwd?: string;
-    getChannelIds?: () => ReadonlySet<string>;
+    getNotificationTargets?: () => ReadonlyMap<string, NotificationTarget>;
     logger: {
         info: (msg: string) => void;
         warn: (msg: string) => void;
@@ -25,7 +26,7 @@ export type A2AAdapterOptions = {
 export declare class OpenClawAgentExecutor implements AgentExecutor {
     private gatewayConfig;
     private readonly taskTracker;
-    private readonly getChannelIds;
+    private readonly getNotificationTargets;
     private readonly logger;
     private readonly cwd;
     private readonly pendingCallbacks;
@@ -43,7 +44,7 @@ export declare class OpenClawAgentExecutor implements AgentExecutor {
      * or rejects on timeout.
      */
     private createCallback;
-    /** Send a notification to all known channels. Individual failures are silently ignored. */
+    /** Send a notification to all known targets. Individual failures are silently ignored. */
     private notifyUser;
     private publishMessage;
 }

package/dist/service/a2a-adapter.js

@@ -23,14 +23,14 @@ function extractTextFromMessage(message) {
 class OpenClawAgentExecutor {
     gatewayConfig;
     taskTracker;
-    getChannelIds;
+    getNotificationTargets;
     logger;
     cwd;
     pendingCallbacks = new Map();
     constructor(options) {
         this.gatewayConfig = options.gatewayConfig;
         this.taskTracker = options.taskTracker;
-        this.getChannelIds = options.getChannelIds ?? (() => new Set());
+        this.getNotificationTargets = options.getNotificationTargets ?? (() => new Map());
         this.logger = options.logger;
         this.cwd = options.cwd || process.cwd();
     }
@@ -132,17 +132,24 @@ class OpenClawAgentExecutor {
             this.pendingCallbacks.set(taskId, { resolve, reject, timer });
         });
     }
-    /** Send a notification to all known channels. Individual failures are silently ignored. */
+    /** Send a notification to all known targets. Individual failures are silently ignored. */
     async notifyUser(message) {
-        const channels = this.getChannelIds();
-        if (!this.gatewayConfig || channels.size === 0)
+        const targets = this.getNotificationTargets();
+        if (!this.gatewayConfig || targets.size === 0)
             return;
-        await Promise.allSettled([...channels].map((target) => (0, gateway_client_1.invokeGatewayTool)({
-            gateway: this.gatewayConfig,
-            tool: "message",
-            args: { action: "send", target, message },
-            timeoutMs: 5_000,
-        })));
+        await Promise.allSettled([...targets.values()].map((target) => target.type === "channel"
+            ? (0, gateway_client_1.invokeGatewayTool)({
+                gateway: this.gatewayConfig,
+                tool: "message",
+                args: { action: "send", target: target.conversationId, message },
+                timeoutMs: 5_000,
+            })
+            : (0, gateway_client_1.invokeGatewayTool)({
+                gateway: this.gatewayConfig,
+                tool: "chat.send",
+                args: { sessionKey: target.sessionKey, message },
+                timeoutMs: 5_000,
+            })));
     }
     publishMessage(eventBus, text) {
         const message = {

package/dist/service/multiclaws-service.d.ts

@@ -27,6 +27,13 @@ export type DelegateTaskResult = {
     status: string;
     error?: string;
 };
+export type NotificationTarget = {
+    type: "channel";
+    conversationId: string;
+} | {
+    type: "web";
+    sessionKey: string;
+};
 export declare class MulticlawsService extends EventEmitter {
     private readonly options;
     private started;
@@ -45,7 +52,7 @@ export declare class MulticlawsService extends EventEmitter {
     private profileDescription;
     private readonly gatewayConfig;
     private readonly resolvedCwd;
-    private readonly knownChannelIds;
+    private readonly notificationTargets;
     constructor(options: MulticlawsServiceOptions);
     start(): Promise<void>;
     stop(): Promise<void>;
@@ -128,8 +135,8 @@ export declare class MulticlawsService extends EventEmitter {
     private fetchWithRetry;
     /** Register a channel ID for notifications. */
     resolveA2ACallback(taskId: string, result: string): boolean;
-    addChannelId(channelId: string): void;
-    /** Send a notification to all known channels. Individual failures are silently ignored. */
-    private notifyUser;
+    addNotificationTarget(key: string, target: NotificationTarget): void;
+    /** Send a notification to all known targets. Individual failures are silently ignored. */
+    notifyUser(message: string): Promise<void>;
     private log;
 }

package/dist/service/multiclaws-service.js

@@ -38,14 +38,15 @@ function buildDelegationPrompt(agent, task) {
 
 ## 执行步骤
 1. 调用 multiclaws_delegate_send(agentUrl="${agent.url}", task="${task.replace(/"/g, '\\"')}") 发送任务
-2. 收到回复后，用 message 工具将结果汇报给用户
+2. 收到回复后，调用 multiclaws_notify(message="结果内容") 将结果推送给用户
 3. 如果需要进一步沟通，可再次调用 multiclaws_delegate_send（最多 5 轮）
-4. 每次收到回复后立即用 message 汇报进展
+4. 每次收到回复后立即调用 multiclaws_notify 推送进展
 
 ## 规则
 - 使用 multiclaws_delegate_send（不是 multiclaws_delegate）发送任务
+- 使用 multiclaws_notify（不是 message）将结果推送给用户
 - 最多 5 轮沟通
-- 遇到错误时在汇报中说明原因`;
+- 遇到错误时在 multiclaws_notify 中说明失败原因`;
 }
 /* ------------------------------------------------------------------ */
 /*  Service                                                            */
@@ -68,7 +69,7 @@ class MulticlawsService extends node_events_1.EventEmitter {
     profileDescription = "OpenClaw agent";
     gatewayConfig;
     resolvedCwd;
-    knownChannelIds = new Set();
+    notificationTargets = new Map();
     constructor(options) {
         super();
         this.options = options;
@@ -123,7 +124,7 @@ class MulticlawsService extends node_events_1.EventEmitter {
                 gatewayConfig: this.options.gatewayConfig ?? null,
                 taskTracker: this.taskTracker,
                 cwd: this.resolvedCwd,
-                getChannelIds: () => this.knownChannelIds,
+                getNotificationTargets: () => this.notificationTargets,
                 logger,
             });
             this.agentCard = {
@@ -925,22 +926,29 @@ class MulticlawsService extends node_events_1.EventEmitter {
             return false;
         return this.agentExecutor.resolveCallback(taskId, result);
     }
-    addChannelId(channelId) {
-        if (!this.knownChannelIds.has(channelId)) {
-            this.knownChannelIds.add(channelId);
-            this.log("debug", `channel registered: ${channelId} (total: ${this.knownChannelIds.size})`);
+    addNotificationTarget(key, target) {
+        if (!this.notificationTargets.has(key)) {
+            this.notificationTargets.set(key, target);
+            this.log("debug", `notification target registered: ${key} (total: ${this.notificationTargets.size})`);
         }
     }
-    /** Send a notification to all known channels. Individual failures are silently ignored. */
+    /** Send a notification to all known targets. Individual failures are silently ignored. */
     async notifyUser(message) {
-        if (!this.gatewayConfig || this.knownChannelIds.size === 0)
+        if (!this.gatewayConfig || this.notificationTargets.size === 0)
             return;
-        await Promise.allSettled([...this.knownChannelIds].map((target) => (0, gateway_client_1.invokeGatewayTool)({
-            gateway: this.gatewayConfig,
-            tool: "message",
-            args: { action: "send", target, message },
-            timeoutMs: 5_000,
-        })));
+        await Promise.allSettled([...this.notificationTargets.values()].map((target) => target.type === "channel"
+            ? (0, gateway_client_1.invokeGatewayTool)({
+                gateway: this.gatewayConfig,
+                tool: "message",
+                args: { action: "send", target: target.conversationId, message },
+                timeoutMs: 5_000,
+            })
+            : (0, gateway_client_1.invokeGatewayTool)({
+                gateway: this.gatewayConfig,
+                tool: "chat.send",
+                args: { sessionKey: target.sessionKey, message },
+                timeoutMs: 5_000,
+            })));
     }
     log(level, message) {
         this.options.logger?.[level]?.(`[multiclaws] ${message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multiclaws",
-  "version": "0.4.31",
+  "version": "0.4.33",
   "description": "MultiClaws plugin for OpenClaw collaboration via A2A protocol",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",