multiclaws 0.4.37 → 0.4.38

package/dist/index.js

@@ -4,6 +4,7 @@ const handlers_1 = require("./gateway/handlers");
 const multiclaws_service_1 = require("./service/multiclaws-service");
 const logger_1 = require("./infra/logger");
 const telemetry_1 = require("./infra/telemetry");
+const version_1 = require("./infra/version");
 /** Default FRP tunnel config for demo/testing */
 const DEFAULT_TUNNEL = {
     type: "frp",
@@ -558,7 +559,7 @@ function createTools(getService, logger) {
 const plugin = {
     id: "multiclaws",
     name: "MultiClaws",
-    version: "0.3.1",
+    version: version_1.PLUGIN_VERSION,
     register(api) {
         const config = readConfig(api);
         (0, telemetry_1.initializeTelemetry)({ enableConsoleExporter: config.telemetry?.consoleExporter });
@@ -582,7 +583,7 @@ const plugin = {
             if (gw) {
                 const tools = (gw.tools ?? {});
                 const allow = Array.isArray(tools.allow) ? tools.allow : [];
-                const adapterRequired = ["sessions_spawn", "sessions_history", "message", "chat.send"];
+                const adapterRequired = ["sessions_spawn", "sessions_list", "sessions_send", "sessions_history", "message", "chat.send"];
                 const defaultA2AExecutionTools = ["exec", "read", "write", "edit", "process"];
                 const pluginConf = api.pluginConfig ?? {};
                 const a2aExecTools = Array.isArray(pluginConf.a2aAllowedTools)

package/dist/infra/version.d.ts

@@ -0,0 +1 @@
+export declare const PLUGIN_VERSION: string;

package/dist/infra/version.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PLUGIN_VERSION = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+function readPackageVersion() {
+    try {
+        const pkgPath = node_path_1.default.resolve(__dirname, "..", "..", "package.json");
+        const pkg = JSON.parse(node_fs_1.default.readFileSync(pkgPath, "utf-8"));
+        return pkg.version ?? "0.0.0";
+    }
+    catch {
+        return "0.0.0";
+    }
+}
+exports.PLUGIN_VERSION = readPackageVersion();

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

@@ -7,6 +7,8 @@ export type A2AAdapterOptions = {
     taskTracker: TaskTracker;
     cwd?: string;
     getNotificationTargets?: () => ReadonlyMap<string, NotificationTarget>;
+    /** Called when a session is discovered via fallback; allows service to cache it for future use. */
+    registerDiscoveredTarget?: (sessionKey: string) => void;
     logger: {
         info: (msg: string) => void;
         warn: (msg: string) => void;
@@ -30,6 +32,7 @@ export declare class OpenClawAgentExecutor implements AgentExecutor {
     private gatewayConfig;
     private readonly taskTracker;
     private readonly getNotificationTargets;
+    private readonly registerDiscoveredTarget;
     private readonly logger;
     private readonly cwd;
     private readonly pendingCallbacks;
@@ -58,6 +61,12 @@ export declare class OpenClawAgentExecutor implements AgentExecutor {
      * or rejects on timeout or cancellation.
      */
     private createApprovalCallback;
+    /**
+     * Discover the most recently active non-internal session via sessions_list.
+     * Used as fallback when no notification targets have been registered yet
+     * (e.g. right after a gateway restart before the user sends their first message).
+     */
+    private discoverActiveSession;
     /** Send a notification to all known targets. Individual failures are silently ignored. */
     private notifyUser;
     private publishMessage;

package/dist/service/a2a-adapter.js

@@ -16,28 +16,33 @@ function classifyTaskRisk(taskText) {
     const text = taskText.toLowerCase();
     // Explicit risky patterns (write / modify / execute / send)
     const riskyPatterns = [
-        // English
-        /\b(write|creat|delet|remov|modif|edit|updat|install|execut|deploy|push|commit|send|post|drop|format|rename|overwrite|reset|wipe|destroy|kill|terminat|rm\b|mkdir|touch\b|mv\b)\b/i,
-        // Chinese write-oriented verbs
-        /[写创建删除修改编辑更新安装执行运行发送提交部署重命名覆盖重置清空销毁终止]/,
+        // English — word-boundary matched to avoid false positives
+        /\b(write|creat|delet|remov|modif|edit|updat|install|execut|deploy|push|commit|send|post|drop|format|rename|overwrite|reset|wipe|destroy|kill|terminat|rm|mkdir|touch|mv)\b/i,
+        // Chinese — multi-character phrases to avoid single-char false positives
+        // e.g. 安 alone would match 安排(schedule) or 安全(safe)
+        /写入|写文件|写邮件|写信|创建|新建|删除|移除|修改|更改|编辑|更新|升级|安装|部署|执行|运行命令|发送|发邮件|提交|推送|重命名|覆盖|重置|清空|清除|销毁|终止|停止服务|kill进程/,
     ];
-    if (riskyPatterns.some((p) => p.test(text))) {
-        return "risky";
-    }
-    // Explicitly safe read-only patterns
+    // Explicitly safe read-only patterns — checked BEFORE risky to avoid false positives
+    // (e.g. "查询并发送报告" is risky overall, but "查询" alone should be safe)
     const safePatterns = [
+        // English read-only verbs
         /\b(list|show|get|check|view|read|query|find|search|display|fetch|retriev|look|what|which|count|how many|summariz|describ|explain|analyz|report)\b/i,
-        /[查看获取搜索显示检查列出查询统计描述分析报告]/,
-        // Calendar / schedule queries
-        /\b(calendar|schedule|event|meeting|free|busy|availab)\b/i,
-        /[日历日程会议空闲忙碌可用时间]/,
-        // Process / system info
-        /\b(process|pid|cpu|memory|disk|uptime|version|status|running|service)\b/i,
-        /[进程内存磁盘状态运行版本服务]/,
+        // Chinese read-only verbs (multi-char to be specific)
+        /查看|查询|获取|搜索|显示|检查|列出|列举|统计|描述|分析|报告|读取|浏览/,
+        // Calendar / scheduling queries
+        /\b(calendar|schedule|event|meeting|free|busy|availab|appointment)\b/i,
+        /日历|日程|会议|空闲|忙碌|可用时间|时间段|什么时候|哪个时间|安排会议|约会|预约/,
+        // Process / system info queries
+        /\b(process|pid|cpu|memory|disk|uptime|version|status|running|service|log)\b/i,
+        /进程|内存|磁盘|系统状态|运行状态|版本信息|日志|监控/,
     ];
+    // Safe check first — if clearly a read query, don't let ambiguous chars trigger risky
     if (safePatterns.some((p) => p.test(text))) {
         return "safe";
     }
+    if (riskyPatterns.some((p) => p.test(text))) {
+        return "risky";
+    }
     // Default: treat as risky if uncertain
     return "risky";
 }
@@ -69,6 +74,7 @@ class OpenClawAgentExecutor {
     gatewayConfig;
     taskTracker;
     getNotificationTargets;
+    registerDiscoveredTarget;
     logger;
     cwd;
     pendingCallbacks = new Map();
@@ -77,6 +83,7 @@ class OpenClawAgentExecutor {
         this.gatewayConfig = options.gatewayConfig;
         this.taskTracker = options.taskTracker;
         this.getNotificationTargets = options.getNotificationTargets ?? (() => new Map());
+        this.registerDiscoveredTarget = options.registerDiscoveredTarget;
         this.logger = options.logger;
         this.cwd = options.cwd || process.cwd();
     }
@@ -274,11 +281,64 @@ class OpenClawAgentExecutor {
             this.pendingApprovals.set(taskId, { resolve, reject, timer });
         });
     }
+    /**
+     * Discover the most recently active non-internal session via sessions_list.
+     * Used as fallback when no notification targets have been registered yet
+     * (e.g. right after a gateway restart before the user sends their first message).
+     */
+    async discoverActiveSession() {
+        if (!this.gatewayConfig)
+            return null;
+        try {
+            const result = await (0, gateway_client_1.invokeGatewayTool)({
+                gateway: this.gatewayConfig,
+                tool: "sessions_list",
+                args: { limit: 10, activeMinutes: 120 },
+                timeoutMs: 5_000,
+            });
+            const INTERNAL_PREFIXES = ["delegate-", "a2a-"];
+            const session = result?.sessions?.find((s) => s.sessionKey &&
+                !INTERNAL_PREFIXES.some((p) => s.sessionKey.startsWith(p)));
+            return session?.sessionKey ?? null;
+        }
+        catch (err) {
+            this.logger.warn(`[a2a-adapter] discoverActiveSession failed: ${err instanceof Error ? err.message : String(err)}`);
+            return null;
+        }
+    }
     /** Send a notification to all known targets. Individual failures are silently ignored. */
     async notifyUser(message) {
         const targets = this.getNotificationTargets();
-        if (!this.gatewayConfig || targets.size === 0) {
-            this.logger.info(`[a2a-adapter] notifyUser: skipped (gateway=${!!this.gatewayConfig}, targets=${targets.size})`);
+        if (!this.gatewayConfig) {
+            this.logger.info(`[a2a-adapter] notifyUser: skipped (no gateway config)`);
+            return;
+        }
+        // Fallback: no registered targets yet (e.g. right after gateway restart).
+        // Discover the active session and send directly via sessions_send.
+        if (targets.size === 0) {
+            this.logger.info(`[a2a-adapter] notifyUser: no registered targets — attempting session discovery`);
+            const sessionKey = await this.discoverActiveSession();
+            if (sessionKey) {
+                this.logger.info(`[a2a-adapter] notifyUser: discovered session ${sessionKey}, sending via sessions_send`);
+                try {
+                    await (0, gateway_client_1.invokeGatewayTool)({
+                        gateway: this.gatewayConfig,
+                        tool: "sessions_send",
+                        args: { sessionKey, message },
+                        timeoutMs: 5_000,
+                    });
+                    // Also register this session for future notifications
+                    if (this.registerDiscoveredTarget) {
+                        this.registerDiscoveredTarget(sessionKey);
+                    }
+                }
+                catch (err) {
+                    this.logger.warn(`[a2a-adapter] notifyUser: sessions_send to ${sessionKey} failed: ${err instanceof Error ? err.message : String(err)}`);
+                }
+            }
+            else {
+                this.logger.warn(`[a2a-adapter] notifyUser: no active session found, message lost`);
+            }
             return;
         }
         const results = await Promise.allSettled([...targets.entries()].map(async ([key, target]) => {

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

@@ -144,6 +144,8 @@ export declare class MulticlawsService extends EventEmitter {
     /** Consistent name for this agent: AgentCard.name or fallback. */
     private getFormattedName;
     /** Send a notification to all known targets with detailed logging. */
+    /** Discover the most recently active non-internal session via sessions_list. */
+    private discoverActiveSession;
     notifyUser(message: string): Promise<void>;
     private log;
 }

package/dist/service/multiclaws-service.js

@@ -15,6 +15,7 @@ const express_1 = __importDefault(require("express"));
 const server_1 = require("@a2a-js/sdk/server");
 const express_2 = require("@a2a-js/sdk/server/express");
 const client_1 = require("@a2a-js/sdk/client");
+const version_1 = require("../infra/version");
 const a2a_adapter_1 = require("./a2a-adapter");
 const agent_registry_1 = require("./agent-registry");
 const agent_profile_1 = require("./agent-profile");
@@ -120,13 +121,16 @@ class MulticlawsService extends node_events_1.EventEmitter {
                 taskTracker: this.taskTracker,
                 cwd: this.resolvedCwd,
                 getNotificationTargets: () => this.notificationTargets,
+                registerDiscoveredTarget: (sessionKey) => {
+                    this.addNotificationTarget(`web:${sessionKey}`, { type: "web", sessionKey });
+                },
                 logger,
             });
             this.agentCard = {
                 name: profile.ownerName?.trim() ? (0, agent_profile_1.formatAgentCardName)(profile.ownerName.trim()) : "OpenClaw Agent",
                 description: this.profileDescription,
                 url: this.selfUrl,
-                version: "0.3.0",
+                version: version_1.PLUGIN_VERSION,
                 protocolVersion: "0.2.2",
                 defaultInputModes: ["text/plain"],
                 defaultOutputModes: ["text/plain"],
@@ -976,10 +980,54 @@ class MulticlawsService extends node_events_1.EventEmitter {
         return this.agentCard?.name ?? "OpenClaw Agent";
     }
     /** Send a notification to all known targets with detailed logging. */
+    /** Discover the most recently active non-internal session via sessions_list. */
+    async discoverActiveSession() {
+        if (!this.gatewayConfig)
+            return null;
+        try {
+            const result = await (0, gateway_client_1.invokeGatewayTool)({
+                gateway: this.gatewayConfig,
+                tool: "sessions_list",
+                args: { limit: 10, activeMinutes: 120 },
+                timeoutMs: 5_000,
+            });
+            const INTERNAL_PREFIXES = ["delegate-", "a2a-"];
+            const session = result?.sessions?.find((s) => s.sessionKey && !INTERNAL_PREFIXES.some((p) => s.sessionKey.startsWith(p)));
+            return session?.sessionKey ?? null;
+        }
+        catch (err) {
+            this.log("warn", `discoverActiveSession failed: ${err instanceof Error ? err.message : String(err)}`);
+            return null;
+        }
+    }
     async notifyUser(message) {
         this.log("info", `notifyUser: targets=${this.notificationTargets.size}, msg=${message.slice(0, 80)}`);
-        if (!this.gatewayConfig || this.notificationTargets.size === 0) {
-            this.log("warn", "notifyUser: skipped — no gatewayConfig or no targets");
+        if (!this.gatewayConfig) {
+            this.log("warn", "notifyUser: skipped — no gatewayConfig");
+            return;
+        }
+        // Fallback: no registered targets yet (e.g. right after gateway restart)
+        if (this.notificationTargets.size === 0) {
+            this.log("warn", "notifyUser: no registered targets — attempting session discovery");
+            const sessionKey = await this.discoverActiveSession();
+            if (sessionKey) {
+                this.log("info", `notifyUser: discovered session ${sessionKey}`);
+                try {
+                    await (0, gateway_client_1.invokeGatewayTool)({
+                        gateway: this.gatewayConfig,
+                        tool: "sessions_send",
+                        args: { sessionKey, message },
+                        timeoutMs: 5_000,
+                    });
+                    this.addNotificationTarget(`web:${sessionKey}`, { type: "web", sessionKey });
+                }
+                catch (err) {
+                    this.log("warn", `notifyUser: sessions_send to ${sessionKey} failed: ${err instanceof Error ? err.message : String(err)}`);
+                }
+            }
+            else {
+                this.log("warn", "notifyUser: no active session found, message lost");
+            }
             return;
         }
         const entries = [...this.notificationTargets.entries()];

package/package.json

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