multiclaws 0.4.4 → 0.4.6

package/dist/gateway/handlers.js

@@ -3,10 +3,6 @@ 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({
     agentUrl: nonEmptyString,
@@ -49,17 +45,6 @@ function createGatewayHandlers(getService) {
                 safeHandle(respond, "agent_list_failed", error);
             }
         },
-        "multiclaws.agent.add": async ({ params, respond }) => {
-            try {
-                const parsed = agentAddSchema.parse(params);
-                const service = getService();
-                const agent = await service.addAgent(parsed);
-                respond(true, agent);
-            }
-            catch (error) {
-                safeHandle(respond, "invalid_params", error);
-            }
-        },
         "multiclaws.agent.remove": async ({ params, respond }) => {
             try {
                 const parsed = agentRemoveSchema.parse(params);

package/dist/index.js

@@ -45,31 +45,6 @@ function createTools(getService) {
             return textResult(JSON.stringify({ agents }, null, 2), { agents });
         },
     };
-    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"],
-        },
-        execute: async (_toolCallId, args) => {
-            const service = requireService(getService());
-            const url = typeof args.url === "string" ? args.url.trim() : "";
-            if (!url)
-                throw new Error("url is required");
-            const apiKey = typeof args.apiKey === "string" ? args.apiKey.trim() : undefined;
-            const agent = await service.addAgent({ url, apiKey });
-            const status = agent.reachable
-                ? `Agent added: ${agent.name} (${agent.url})`
-                : `⚠️ Agent added but NOT reachable: ${agent.url} — agent card could not be fetched. Verify the URL and ensure the agent is running.`;
-            return textResult(status, agent);
-        },
-    };
     const multiclawsRemoveAgent = {
         name: "multiclaws_remove_agent",
         description: "Remove a known A2A agent by URL.",
@@ -349,7 +324,6 @@ function createTools(getService) {
     };
     return [
         multiclawsAgents,
-        multiclawsAddAgent,
         multiclawsRemoveAgent,
         multiclawsSessionStart,
         multiclawsSessionReply,
@@ -375,19 +349,34 @@ const plugin = {
         (0, telemetry_1.initializeTelemetry)({ enableConsoleExporter: config.telemetry?.consoleExporter });
         const structured = (0, logger_1.createStructuredLogger)(api.logger, "multiclaws");
         let service = null;
-        // Ensure required tools are in gateway.tools.allow at registration time
-        // so the gateway starts with them already present (no restart needed).
+        // 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.
         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 required = ["sessions_spawn", "sessions_history", "message"];
-                const missing = required.filter((t) => !allow.includes(t));
-                if (missing.length > 0) {
-                    tools.allow = [...allow, ...missing];
-                    gw.tools = tools;
+                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];
+                }
+                gw.tools = tools;
             }
         }
         const gatewayConfig = (() => {
@@ -463,10 +452,34 @@ const plugin = {
                 const review = await service.getPendingProfileReview();
                 if (!review.pending)
                     return;
+                const tsStatus = service.getTailscaleStatus();
+                let networkLine;
+                if (tsStatus === "ready") {
+                    networkLine = "Tailscale 已检测到，跨网络协作已就绪。";
+                }
+                else if (tsStatus === "needs_auth") {
+                    networkLine = "Tailscale 已安装但未登录。跨网络协作需要先完成登录，登录后重启 OpenClaw。局域网内可直接使用。";
+                }
+                else {
+                    networkLine = "当前仅支持局域网协作。如需跨网络，安装 Tailscale（https://tailscale.com/download）并登录同一 tailnet，然后重启 OpenClaw。";
+                }
                 return {
-                    appendSystemContext: `## MultiClaws 首次安装 — 需要完成档案设置
+                    appendSystemContext: `## MultiClaws 首次安装 — 需要完成初始化
+
+multiclaws 插件刚安装，需要在本次对话中完成以下初始化流程（优先处理，不管用户说了什么）。
+**务必使用插件工具调用，不要通过命令行或 gateway 方法操作。**
+
+### 第一步：向用户介绍 MultiClaws
+
+简要说明插件功能：
+- MultiClaws 让多个 OpenClaw 实例组成团队协作
+- 你可以创建团队、邀请队友加入，然后把任务委派给队友的 AI
+- 它会根据每个智能体的档案（名字、角色、能力、数据源）自动选择最合适的执行者
+- 支持多轮对话、并发扇出、链式协作等模式
+
+### 第二步：设置档案
 
-multiclaws 插件刚安装，需要在本次对话中完成以下初始化流程（优先处理，不管用户说了什么）：
+档案（名字 + bio）是你在团队中的「名片」，其他 AI 读它来决定是否把任务委派给你。
 
 1. **扫描当前环境**，自动生成 bio（markdown 格式），内容包括：
    - 用户角色和职责
@@ -474,16 +487,16 @@ multiclaws 插件刚安装，需要在本次对话中完成以下初始化流程
    - 可访问的数据/系统（git 仓库、邮件、日历、Notion 等）
    - 时区和语言
 
-2. 向用户展示生成的档案，并逐一确认以下三项（名字和 bio 需要用户明确回答）：
+2. 向用户展示生成的档案，并逐一确认（名字和 bio 需要用户明确回答）：
    - **名字**：展示推断出的名字，询问是否需要修改
    - **Bio**：展示生成的 bio，询问是否需要修改
-   - **网络情况**：告知用户「同局域网开箱即用；跨网络需安装 Tailscale（https://tailscale.com/download）并重启 OpenClaw」，无需用户回答
 
-3. 根据用户对名字和 bio 的回答更新档案内容（如需修改），然后调用 \`multiclaws_profile_set(ownerName="...", bio="...")\` 保存。
+3. 根据用户确认的内容，调用 \`multiclaws_profile_set(ownerName="...", bio="...")\` 保存。保存后初始化自动完成。
 
-4. 调用 \`multiclaws_profile_clear_pending_review()\` 完成初始化。
+### 第三步：告知网络状态和使用方式
 
-**注意**：名字和 bio 需要用户明确确认；网络情况仅告知无需回答。`,
+- **网络**：${networkLine}
+- **如何开始**：说「创建一个叫 xxx 的团队」创建团队，把邀请码分享给队友；或说「用邀请码 mc:xxxx 加入团队」加入队友的团队。`,
                 };
             }
             catch (err) {

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

@@ -45,17 +45,12 @@ export declare class MulticlawsService extends EventEmitter {
     private readonly httpRateLimiter;
     private selfUrl;
     private profileDescription;
+    private tailscaleStatus;
     constructor(options: MulticlawsServiceOptions);
     start(): Promise<void>;
     stop(): Promise<void>;
     updateGatewayConfig(config: GatewayConfig): void;
     listAgents(): Promise<AgentRecord[]>;
-    addAgent(params: {
-        url: string;
-        apiKey?: string;
-    }): Promise<AgentRecord & {
-        reachable: boolean;
-    }>;
     removeAgent(url: string): Promise<boolean>;
     startSession(params: {
         agentUrl: string;
@@ -91,8 +86,10 @@ export declare class MulticlawsService extends EventEmitter {
         ownerName?: string;
         bio?: string;
     }): Promise<AgentProfile>;
+    private autoClearPendingReviewIfReady;
     private updateProfileDescription;
     private getPendingReviewPath;
+    getTailscaleStatus(): "ready" | "needs_auth" | "not_installed" | "unavailable";
     getPendingProfileReview(): Promise<{
         pending: boolean;
         profile?: AgentProfile;

package/dist/service/multiclaws-service.js

@@ -48,6 +48,7 @@ class MulticlawsService extends node_events_1.EventEmitter {
     httpRateLimiter = new rate_limiter_1.RateLimiter({ windowMs: 60_000, maxRequests: 60 });
     selfUrl;
     profileDescription = "OpenClaw agent";
+    tailscaleStatus = "unavailable";
     constructor(options) {
         super();
         this.options = options;
@@ -75,18 +76,17 @@ class MulticlawsService extends node_events_1.EventEmitter {
             const tsIp = (0, tailscale_1.getTailscaleIpFromInterfaces)();
             if (tsIp) {
                 this.selfUrl = `http://${tsIp}:${port}`;
+                this.tailscaleStatus = "ready";
                 this.log("info", `Tailscale IP detected: ${tsIp}`);
             }
             else {
-                // Slow path: Tailscale not active — run full detection and notify user
+                // Slow path: Tailscale not active — run full detection
                 const tailscale = await (0, tailscale_1.detectTailscale)();
+                this.tailscaleStatus = tailscale.status;
                 if (tailscale.status === "ready") {
                     this.selfUrl = `http://${tailscale.ip}:${port}`;
                     this.log("info", `Tailscale IP detected: ${tailscale.ip}`);
                 }
-                else {
-                    void this.notifyTailscaleSetup(tailscale);
-                }
             }
         }
         // Load profile for AgentCard description
@@ -196,30 +196,6 @@ class MulticlawsService extends node_events_1.EventEmitter {
     async listAgents() {
         return await this.agentRegistry.list();
     }
-    async addAgent(params) {
-        const normalizedUrl = params.url.replace(/\/+$/, "");
-        try {
-            const client = await this.clientFactory.createFromUrl(normalizedUrl);
-            const card = await client.getAgentCard();
-            const record = await this.agentRegistry.add({
-                url: normalizedUrl,
-                name: card.name ?? normalizedUrl,
-                description: card.description ?? "",
-                skills: card.skills?.map((s) => s.name ?? s.id) ?? [],
-                apiKey: params.apiKey,
-            });
-            return { ...record, reachable: true };
-        }
-        catch {
-            this.log("warn", `agent at ${normalizedUrl} is not reachable, adding with limited info`);
-            const record = await this.agentRegistry.add({
-                url: normalizedUrl,
-                name: normalizedUrl,
-                apiKey: params.apiKey,
-            });
-            return { ...record, reachable: false };
-        }
-    }
     async removeAgent(url) {
         return await this.agentRegistry.remove(url);
     }
@@ -558,9 +534,20 @@ class MulticlawsService extends node_events_1.EventEmitter {
     async setProfile(patch) {
         const profile = await this.profileStore.update(patch);
         this.updateProfileDescription(profile);
+        // Auto-clear pending review once both ownerName and bio are filled
+        await this.autoClearPendingReviewIfReady(profile);
         await this.broadcastProfileToTeams();
         return profile;
     }
+    async autoClearPendingReviewIfReady(profile) {
+        if (profile.ownerName?.trim() && profile.bio?.trim()) {
+            const review = await this.getPendingProfileReview();
+            if (review.pending) {
+                await this.clearPendingProfileReview();
+                this.log("info", "pending profile review auto-cleared after profile update");
+            }
+        }
+    }
     updateProfileDescription(profile) {
         this.profileDescription = (0, agent_profile_1.renderProfileDescription)(profile);
         if (this.agentCard) {
@@ -573,6 +560,9 @@ class MulticlawsService extends node_events_1.EventEmitter {
     getPendingReviewPath() {
         return node_path_1.default.join(this.options.stateDir, "multiclaws", "pending-profile-review.json");
     }
+    getTailscaleStatus() {
+        return this.tailscaleStatus;
+    }
     async getPendingProfileReview() {
         const p = this.getPendingReviewPath();
         const data = await (0, json_store_1.readJsonWithFallback)(p, {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multiclaws",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "MultiClaws plugin for OpenClaw collaboration via A2A protocol",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -53,4 +53,4 @@
     "typescript": "^5.9.2",
     "vitest": "^3.2.4"
   }
-}
+}

package/skills/multiclaws/SKILL.md

@@ -15,8 +15,9 @@ MultiClaws 让多个 OpenClaw 实例通过 [A2A（Agent-to-Agent）](https://goo
    - **名字**：询问是否需要修改（需用户明确回答）
    - **Bio**：询问是否需要修改（需用户明确回答）
    - **网络情况**：告知「同局域网开箱即用；跨网络需安装 Tailscale」，无需用户回答
-3. 调用 `multiclaws_profile_set(ownerName="...", bio="...")` 保存
-4. 调用 `multiclaws_profile_clear_pending_review()` 完成初始化
+3. 调用 `multiclaws_profile_set(ownerName="...", bio="...")` 保存（pending review 标记会自动清除，无需额外操作）
+
+> **重要**：始终使用插件工具调用，不要通过命令行或 gateway 方法操作 MultiClaws。
 
 ---
 
@@ -131,13 +132,13 @@ multiclaws_profile_show()
 | 工具 | 说明 | 参数 |
 |------|------|------|
 | `multiclaws_agents` | 列出已知 agent 及 bio | — |
-| `multiclaws_add_agent` | 手动添加 agent | `url`, `apiKey`（可选） |
 | `multiclaws_remove_agent` | 移除 agent | `url` |
 
 ---
 
 ## 重要规则
 
+- **始终使用插件工具调用**，不要通过命令行、shell 或 gateway 方法操作 MultiClaws
 - **不要问用户 IP 或 selfUrl**，插件自动处理
 - **Bio 是 markdown**，写得让另一个 AI 能读懂这个 agent 能做什么
 - **名字和 bio 必须用户明确确认**；网络情况仅告知