multiclaws 0.4.5 → 0.4.7

package/dist/gateway/handlers.js

@@ -3,21 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGatewayHandlers = createGatewayHandlers;
 const zod_1 = require("zod");
 const nonEmptyString = zod_1.z.string().trim().min(1);
+const agentAddSchema = zod_1.z.object({
+    url: nonEmptyString,
+    apiKey: zod_1.z.string().trim().min(1).optional(),
+});
 const agentRemoveSchema = zod_1.z.object({ url: nonEmptyString });
-const sessionStartSchema = zod_1.z.object({
+const taskDelegateSchema = zod_1.z.object({
     agentUrl: nonEmptyString,
-    message: nonEmptyString,
-});
-const sessionReplySchema = zod_1.z.object({
-    sessionId: nonEmptyString,
-    message: nonEmptyString,
-});
-const sessionStatusSchema = zod_1.z.object({ sessionId: zod_1.z.string().trim().min(1).optional() });
-const sessionEndSchema = zod_1.z.object({ sessionId: nonEmptyString });
-const sessionWaitAllSchema = zod_1.z.object({
-    sessionIds: zod_1.z.array(nonEmptyString).min(1),
-    timeoutMs: zod_1.z.number().positive().optional(),
+    task: nonEmptyString,
 });
+const taskStatusSchema = zod_1.z.object({ taskId: nonEmptyString });
 const profileSetSchema = zod_1.z.object({
     ownerName: zod_1.z.string().trim().optional(),
     bio: zod_1.z.string().optional(),
@@ -36,13 +31,19 @@ function createGatewayHandlers(getService) {
     const handlers = {
         /* ── Agent handlers ─────────────────────────────────────────── */
         "multiclaws.agent.list": async ({ respond }) => {
+            const service = getService();
+            const agents = await service.listAgents();
+            respond(true, { agents });
+        },
+        "multiclaws.agent.add": async ({ params, respond }) => {
             try {
+                const parsed = agentAddSchema.parse(params);
                 const service = getService();
-                const agents = await service.listAgents();
-                respond(true, { agents });
+                const agent = await service.addAgent(parsed);
+                respond(true, agent);
             }
             catch (error) {
-                safeHandle(respond, "agent_list_failed", error);
+                safeHandle(respond, "invalid_params", error);
             }
         },
         "multiclaws.agent.remove": async ({ params, respond }) => {
@@ -56,70 +57,34 @@ function createGatewayHandlers(getService) {
                 safeHandle(respond, "invalid_params", error);
             }
         },
-        /* ── Session handlers ───────────────────────────────────────── */
-        "multiclaws.session.start": async ({ params, respond }) => {
-            try {
-                const parsed = sessionStartSchema.parse(params);
-                const service = getService();
-                const result = await service.startSession(parsed);
-                respond(true, result);
-            }
-            catch (error) {
-                safeHandle(respond, "session_start_failed", error);
-            }
-        },
-        "multiclaws.session.reply": async ({ params, respond }) => {
+        /* ── Task handlers ──────────────────────────────────────────── */
+        "multiclaws.task.delegate": async ({ params, respond }) => {
             try {
-                const parsed = sessionReplySchema.parse(params);
+                const parsed = taskDelegateSchema.parse(params);
                 const service = getService();
-                const result = await service.sendSessionMessage(parsed);
+                const result = await service.delegateTask(parsed);
                 respond(true, result);
             }
             catch (error) {
-                safeHandle(respond, "session_reply_failed", error);
+                safeHandle(respond, "task_delegate_failed", error);
             }
         },
-        "multiclaws.session.status": async ({ params, respond }) => {
+        "multiclaws.task.status": async ({ params, respond }) => {
             try {
-                const parsed = sessionStatusSchema.parse(params);
+                const parsed = taskStatusSchema.parse(params);
                 const service = getService();
-                if (parsed.sessionId) {
-                    const session = service.getSession(parsed.sessionId);
-                    if (!session) {
-                        respond(false, undefined, { code: "not_found", message: `session not found: ${parsed.sessionId}` });
-                        return;
-                    }
-                    respond(true, session);
-                }
-                else {
-                    const sessions = service.listSessions();
-                    respond(true, { sessions });
+                const task = service.getTaskStatus(parsed.taskId);
+                if (!task) {
+                    respond(false, undefined, {
+                        code: "not_found",
+                        message: `task not found: ${parsed.taskId}`,
+                    });
+                    return;
                 }
+                respond(true, { task });
             }
             catch (error) {
-                safeHandle(respond, "session_status_failed", error);
-            }
-        },
-        "multiclaws.session.wait_all": async ({ params, respond }) => {
-            try {
-                const parsed = sessionWaitAllSchema.parse(params);
-                const service = getService();
-                const result = await service.waitForSessions(parsed);
-                respond(true, result);
-            }
-            catch (error) {
-                safeHandle(respond, "session_wait_all_failed", error);
-            }
-        },
-        "multiclaws.session.end": async ({ params, respond }) => {
-            try {
-                const parsed = sessionEndSchema.parse(params);
-                const service = getService();
-                const ok = service.endSession(parsed.sessionId);
-                respond(true, { ended: ok });
-            }
-            catch (error) {
-                safeHandle(respond, "session_end_failed", error);
+                safeHandle(respond, "task_status_failed", error);
             }
         },
         /* ── Team handlers ──────────────────────────────────────────── */
@@ -177,34 +142,19 @@ function createGatewayHandlers(getService) {
         },
         /* ── Profile handlers ───────────────────────────────────────── */
         "multiclaws.profile.show": async ({ respond }) => {
-            try {
-                const service = getService();
-                const profile = await service.getProfile();
-                respond(true, profile);
-            }
-            catch (error) {
-                safeHandle(respond, "profile_show_failed", error);
-            }
+            const service = getService();
+            const profile = await service.getProfile();
+            respond(true, profile);
         },
         "multiclaws.profile.pending_review": async ({ respond }) => {
-            try {
-                const service = getService();
-                const result = await service.getPendingProfileReview();
-                respond(true, result);
-            }
-            catch (error) {
-                safeHandle(respond, "profile_pending_review_failed", error);
-            }
+            const service = getService();
+            const result = await service.getPendingProfileReview();
+            respond(true, result);
         },
         "multiclaws.profile.clear_pending_review": async ({ respond }) => {
-            try {
-                const service = getService();
-                await service.clearPendingProfileReview();
-                respond(true, { cleared: true });
-            }
-            catch (error) {
-                safeHandle(respond, "profile_clear_pending_review_failed", error);
-            }
+            const service = getService();
+            await service.clearPendingProfileReview();
+            respond(true, { cleared: true });
         },
         "multiclaws.profile.set": async ({ params, respond }) => {
             try {

package/dist/index.js

@@ -45,14 +45,15 @@ function createTools(getService) {
             return textResult(JSON.stringify({ agents }, null, 2), { agents });
         },
     };
-    const multiclawsRemoveAgent = {
-        name: "multiclaws_remove_agent",
-        description: "Remove a known A2A agent by URL.",
+    const multiclawsAddAgent = {
+        name: "multiclaws_add_agent",
+        description: "Add a remote A2A agent by URL. Automatically fetches its Agent Card.",
         parameters: {
             type: "object",
             additionalProperties: false,
             properties: {
                 url: { type: "string" },
+                apiKey: { type: "string" },
             },
             required: ["url"],
         },
@@ -61,120 +62,73 @@ function createTools(getService) {
             const url = typeof args.url === "string" ? args.url.trim() : "";
             if (!url)
                 throw new Error("url is required");
-            const removed = await service.removeAgent(url);
-            return textResult(removed ? `Agent ${url} removed.` : `Agent ${url} not found.`);
-        },
-    };
-    /* ── Session tools (multi-turn collaboration) ─────────────────── */
-    const multiclawsSessionStart = {
-        name: "multiclaws_session_start",
-        description: "Start a multi-turn collaboration session with a remote agent. Sends the first message and returns immediately with a sessionId (async). The agent's response will be pushed as a message when ready. Covers both single-turn and multi-turn use cases.",
-        parameters: {
-            type: "object",
-            additionalProperties: false,
-            properties: {
-                agentUrl: { type: "string" },
-                message: { type: "string" },
-            },
-            required: ["agentUrl", "message"],
-        },
-        execute: async (_toolCallId, args) => {
-            const service = requireService(getService());
-            const agentUrl = typeof args.agentUrl === "string" ? args.agentUrl.trim() : "";
-            const message = typeof args.message === "string" ? args.message.trim() : "";
-            if (!agentUrl || !message)
-                throw new Error("agentUrl and message are required");
-            const result = await service.startSession({ agentUrl, message });
-            return textResult(JSON.stringify(result, null, 2), result);
-        },
-    };
-    const multiclawsSessionReply = {
-        name: "multiclaws_session_reply",
-        description: "Send a follow-up message in an existing collaboration session. Use when the remote agent returns 'input-required' or to continue a multi-turn conversation.",
-        parameters: {
-            type: "object",
-            additionalProperties: false,
-            properties: {
-                sessionId: { type: "string" },
-                message: { type: "string" },
-            },
-            required: ["sessionId", "message"],
-        },
-        execute: async (_toolCallId, args) => {
-            const service = requireService(getService());
-            const sessionId = typeof args.sessionId === "string" ? args.sessionId.trim() : "";
-            const message = typeof args.message === "string" ? args.message.trim() : "";
-            if (!sessionId || !message)
-                throw new Error("sessionId and message are required");
-            const result = await service.sendSessionMessage({ sessionId, message });
-            return textResult(JSON.stringify(result, null, 2), result);
+            const apiKey = typeof args.apiKey === "string" ? args.apiKey.trim() : undefined;
+            const agent = await service.addAgent({ url, apiKey });
+            return textResult(`Agent added: ${agent.name} (${agent.url})`, agent);
         },
     };
-    const multiclawsSessionStatus = {
-        name: "multiclaws_session_status",
-        description: "Get the status and message history of a collaboration session. If sessionId is omitted, lists all sessions.",
+    const multiclawsRemoveAgent = {
+        name: "multiclaws_remove_agent",
+        description: "Remove a known A2A agent by URL.",
         parameters: {
             type: "object",
             additionalProperties: false,
             properties: {
-                sessionId: { type: "string" },
+                url: { type: "string" },
             },
+            required: ["url"],
         },
         execute: async (_toolCallId, args) => {
             const service = requireService(getService());
-            const sessionId = typeof args.sessionId === "string" ? args.sessionId.trim() : "";
-            if (sessionId) {
-                const session = service.getSession(sessionId);
-                if (!session)
-                    throw new Error(`session not found: ${sessionId}`);
-                return textResult(JSON.stringify(session, null, 2), session);
-            }
-            const sessions = service.listSessions();
-            return textResult(JSON.stringify({ sessions }, null, 2), { sessions });
+            const url = typeof args.url === "string" ? args.url.trim() : "";
+            if (!url)
+                throw new Error("url is required");
+            const removed = await service.removeAgent(url);
+            return textResult(removed ? `Agent ${url} removed.` : `Agent ${url} not found.`);
         },
     };
-    const multiclawsSessionWaitAll = {
-        name: "multiclaws_session_wait_all",
-        description: "Wait for multiple sessions to complete, then return all results at once. Use this when you have started multiple sessions concurrently and need all results before synthesizing an answer. Returns early if any session needs input (input-required). Default timeout: 5 minutes.",
+    const multiclawsDelegate = {
+        name: "multiclaws_delegate",
+        description: "Delegate a task to a remote A2A agent.",
         parameters: {
             type: "object",
             additionalProperties: false,
             properties: {
-                sessionIds: { type: "array", items: { type: "string" } },
-                timeoutMs: { type: "number" },
+                agentUrl: { type: "string" },
+                task: { type: "string" },
             },
-            required: ["sessionIds"],
+            required: ["agentUrl", "task"],
         },
         execute: async (_toolCallId, args) => {
             const service = requireService(getService());
-            const sessionIds = Array.isArray(args.sessionIds)
-                ? args.sessionIds.map((s) => String(s).trim()).filter(Boolean)
-                : [];
-            if (!sessionIds.length)
-                throw new Error("sessionIds must be a non-empty array");
-            const timeoutMs = typeof args.timeoutMs === "number" ? args.timeoutMs : undefined;
-            const result = await service.waitForSessions({ sessionIds, timeoutMs });
+            const agentUrl = typeof args.agentUrl === "string" ? args.agentUrl.trim() : "";
+            const task = typeof args.task === "string" ? args.task.trim() : "";
+            if (!agentUrl || !task)
+                throw new Error("agentUrl and task are required");
+            const result = await service.delegateTask({ agentUrl, task });
             return textResult(JSON.stringify(result, null, 2), result);
         },
     };
-    const multiclawsSessionEnd = {
-        name: "multiclaws_session_end",
-        description: "Cancel and close a collaboration session.",
+    const multiclawsTaskStatus = {
+        name: "multiclaws_task_status",
+        description: "Check the status of a delegated task.",
         parameters: {
             type: "object",
             additionalProperties: false,
             properties: {
-                sessionId: { type: "string" },
+                taskId: { type: "string" },
             },
-            required: ["sessionId"],
+            required: ["taskId"],
         },
         execute: async (_toolCallId, args) => {
             const service = requireService(getService());
-            const sessionId = typeof args.sessionId === "string" ? args.sessionId.trim() : "";
-            if (!sessionId)
-                throw new Error("sessionId is required");
-            const ok = service.endSession(sessionId);
-            return textResult(ok ? `Session ${sessionId} ended.` : `Session ${sessionId} not found.`);
+            const taskId = typeof args.taskId === "string" ? args.taskId.trim() : "";
+            if (!taskId)
+                throw new Error("taskId is required");
+            const task = service.getTaskStatus(taskId);
+            if (!task)
+                throw new Error(`task not found: ${taskId}`);
+            return textResult(JSON.stringify(task, null, 2), task);
         },
     };
     /* ── Team tools ───────────────────────────────────────────────── */
@@ -324,12 +278,10 @@ function createTools(getService) {
     };
     return [
         multiclawsAgents,
+        multiclawsAddAgent,
         multiclawsRemoveAgent,
-        multiclawsSessionStart,
-        multiclawsSessionReply,
-        multiclawsSessionStatus,
-        multiclawsSessionWaitAll,
-        multiclawsSessionEnd,
+        multiclawsDelegate,
+        multiclawsTaskStatus,
         multiclawsTeamCreate,
         multiclawsTeamJoin,
         multiclawsTeamLeave,
@@ -343,40 +295,25 @@ function createTools(getService) {
 const plugin = {
     id: "multiclaws",
     name: "MultiClaws",
-    version: "0.4.2",
+    version: "0.3.1",
     register(api) {
         const config = readConfig(api);
         (0, telemetry_1.initializeTelemetry)({ enableConsoleExporter: config.telemetry?.consoleExporter });
         const structured = (0, logger_1.createStructuredLogger)(api.logger, "multiclaws");
         let service = null;
-        // Ensure plugin tools and gateway dependencies are whitelisted at registration time.
-        // tools.alsoAllow is additive and won't override the user's tools.profile setting.
+        // Ensure required tools are in gateway.tools.allow at registration time
+        // so the gateway starts with them already present (no restart needed).
         if (api.config) {
             const gw = api.config.gateway;
             if (gw) {
                 const tools = (gw.tools ?? {});
-                // 1. Gateway tools the plugin depends on → tools.allow
                 const allow = Array.isArray(tools.allow) ? tools.allow : [];
-                const requiredGatewayTools = ["sessions_spawn", "sessions_history", "message"];
-                const missingGateway = requiredGatewayTools.filter((t) => !allow.includes(t));
-                if (missingGateway.length > 0) {
-                    tools.allow = [...allow, ...missingGateway];
-                }
-                // 2. Plugin's own tools → tools.alsoAllow (additive, works with any profile)
-                const alsoAllow = Array.isArray(tools.alsoAllow) ? tools.alsoAllow : [];
-                const pluginToolNames = [
-                    "multiclaws_agents", "multiclaws_remove_agent",
-                    "multiclaws_session_start", "multiclaws_session_reply", "multiclaws_session_status",
-                    "multiclaws_session_wait_all", "multiclaws_session_end",
-                    "multiclaws_team_create", "multiclaws_team_join", "multiclaws_team_leave", "multiclaws_team_members",
-                    "multiclaws_profile_set", "multiclaws_profile_show",
-                    "multiclaws_profile_pending_review", "multiclaws_profile_clear_pending_review",
-                ];
-                const missingPlugin = pluginToolNames.filter((t) => !alsoAllow.includes(t));
-                if (missingPlugin.length > 0) {
-                    tools.alsoAllow = [...alsoAllow, ...missingPlugin];
+                const required = ["sessions_spawn", "sessions_history"];
+                const missing = required.filter((t) => !allow.includes(t));
+                if (missing.length > 0) {
+                    tools.allow = [...allow, ...missing];
+                    gw.tools = tools;
                 }
-                gw.tools = tools;
             }
         }
         const gatewayConfig = (() => {
@@ -429,17 +366,6 @@ const plugin = {
         });
         api.on("gateway_start", () => {
             structured.logger.info("[multiclaws] gateway_start observed");
-            // Re-read gateway config in case token became available after initial registration
-            if (service && !gatewayConfig) {
-                const gw = api.config?.gateway;
-                const port = typeof gw?.port === "number" ? gw.port : 18789;
-                const token = typeof gw?.auth?.token === "string" ? gw.auth.token : null;
-                if (token) {
-                    const newConfig = { port, token };
-                    service.updateGatewayConfig(newConfig);
-                    structured.logger.info("[multiclaws] gateway config updated from gateway_start event");
-                }
-            }
         });
         api.on("gateway_stop", () => {
             structured.logger.info("[multiclaws] gateway_stop observed");
@@ -455,8 +381,7 @@ const plugin = {
                 return {
                     appendSystemContext: `## MultiClaws 首次安装 — 需要完成档案设置
 
-multiclaws 插件刚安装，需要在本次对话中完成以下初始化流程（优先处理，不管用户说了什么）。
-**务必使用插件工具调用，不要通过命令行或 gateway 方法操作。**
+multiclaws 插件刚安装，需要在本次对话中完成以下初始化流程（优先处理，不管用户说了什么）：
 
 1. **扫描当前环境**，自动生成 bio（markdown 格式），内容包括：
    - 用户角色和职责
@@ -469,7 +394,9 @@ multiclaws 插件刚安装，需要在本次对话中完成以下初始化流程
    - **Bio**：展示生成的 bio，询问是否需要修改
    - **网络情况**：告知用户「同局域网开箱即用；跨网络需安装 Tailscale（https://tailscale.com/download）并重启 OpenClaw」，无需用户回答
 
-3. 根据用户确认的内容，调用 \`multiclaws_profile_set(ownerName="...", bio="...")\` 保存。保存后初始化自动完成，无需额外操作。
+3. 根据用户对名字和 bio 的回答更新档案内容（如需修改），然后调用 \`multiclaws_profile_set(ownerName="...", bio="...")\` 保存。
+
+4. 调用 \`multiclaws_profile_clear_pending_review()\` 完成初始化。
 
 **注意**：名字和 bio 需要用户明确确认；网络情况仅告知无需回答。`,
                 };

package/dist/infra/gateway-client.js

@@ -40,7 +40,6 @@ exports.invokeGatewayTool = invokeGatewayTool;
 const opossum_1 = __importDefault(require("opossum"));
 class NonRetryableError extends Error {
 }
-const MAX_BREAKERS = 50;
 const breakerCache = new Map();
 let pRetryModulePromise = null;
 async function loadPRetry() {
@@ -54,15 +53,6 @@ function getBreaker(key, timeoutMs) {
     if (existing) {
         return existing;
     }
-    // Evict oldest entries when cache is full
-    if (breakerCache.size >= MAX_BREAKERS) {
-        const oldest = breakerCache.keys().next().value;
-        if (oldest !== undefined) {
-            const old = breakerCache.get(oldest);
-            old?.shutdown();
-            breakerCache.delete(oldest);
-        }
-    }
     const breaker = new opossum_1.default((operation) => operation(), {
         timeout: false, // timeout handled by AbortController in the operation
         errorThresholdPercentage: 50,

package/dist/infra/tailscale.d.ts

@@ -10,7 +10,7 @@ export type TailscaleStatus = {
     status: "unavailable";
     reason: string;
 };
-/** Check network interfaces for a Tailscale IP (100.64.0.0/10) — exported for fast-path checks */
+/** Check network interfaces for a Tailscale IP (100.x.x.x) — exported for fast-path checks */
 export declare function getTailscaleIpFromInterfaces(): string | null;
 /**
  * Detect Tailscale status — does NOT install or modify system state.

package/dist/infra/tailscale.js

@@ -7,7 +7,6 @@ exports.getTailscaleIpFromInterfaces = getTailscaleIpFromInterfaces;
 exports.detectTailscale = detectTailscale;
 const node_child_process_1 = require("node:child_process");
 const node_os_1 = __importDefault(require("node:os"));
-const isWindows = process.platform === "win32";
 function run(cmd, timeoutMs = 5_000) {
     return (0, node_child_process_1.execSync)(cmd, { timeout: timeoutMs, stdio: ["ignore", "pipe", "pipe"] })
         .toString()
@@ -15,30 +14,21 @@ function run(cmd, timeoutMs = 5_000) {
 }
 function commandExists(cmd) {
     try {
-        run(isWindows ? `where ${cmd}` : `which ${cmd}`);
+        run(`which ${cmd}`);
         return true;
     }
     catch {
         return false;
     }
 }
-/** Check whether an IPv4 address falls within the Tailscale CGNAT range (100.64.0.0/10). */
-function isTailscaleCGNAT(ip) {
-    const parts = ip.split(".");
-    if (parts.length !== 4)
-        return false;
-    const first = parseInt(parts[0], 10);
-    const second = parseInt(parts[1], 10);
-    return first === 100 && second >= 64 && second <= 127;
-}
-/** Check network interfaces for a Tailscale IP (100.64.0.0/10) — exported for fast-path checks */
+/** Check network interfaces for a Tailscale IP (100.x.x.x) — exported for fast-path checks */
 function getTailscaleIpFromInterfaces() {
     const interfaces = node_os_1.default.networkInterfaces();
     for (const addrs of Object.values(interfaces)) {
         if (!addrs)
             continue;
         for (const addr of addrs) {
-            if (addr.family === "IPv4" && isTailscaleCGNAT(addr.address)) {
+            if (addr.family === "IPv4" && addr.address.startsWith("100.")) {
                 return addr.address;
             }
         }
@@ -71,7 +61,8 @@ async function getAuthUrl() {
     return new Promise((resolve) => {
         try {
             // tailscale up prints the auth URL to stderr
-            const proc = (0, node_child_process_1.spawn)("tailscale", ["up"], { stdio: ["ignore", "pipe", "pipe"] });
+            const { spawn } = require("node:child_process");
+            const proc = spawn("tailscale", ["up"], { stdio: ["ignore", "pipe", "pipe"] });
             let output = "";
             let resolved = false;
             const tryResolve = (text) => {

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

@@ -24,7 +24,6 @@ export declare class OpenClawAgentExecutor implements AgentExecutor {
     private gatewayConfig;
     private readonly taskTracker;
     private readonly logger;
-    private readonly a2aToTracker;
     constructor(options: A2AAdapterOptions);
     execute(context: RequestContext, eventBus: ExecutionEventBus): Promise<void>;
     /**