multiclaws 0.4.2 → 0.4.3

package/dist/gateway/handlers.js

@@ -40,9 +40,14 @@ function createGatewayHandlers(getService) {
     const handlers = {
         /* ── Agent handlers ─────────────────────────────────────────── */
         "multiclaws.agent.list": async ({ respond }) => {
-            const service = getService();
-            const agents = await service.listAgents();
-            respond(true, { agents });
+            try {
+                const service = getService();
+                const agents = await service.listAgents();
+                respond(true, { agents });
+            }
+            catch (error) {
+                safeHandle(respond, "agent_list_failed", error);
+            }
         },
         "multiclaws.agent.add": async ({ params, respond }) => {
             try {
@@ -187,19 +192,34 @@ function createGatewayHandlers(getService) {
         },
         /* ── Profile handlers ───────────────────────────────────────── */
         "multiclaws.profile.show": async ({ respond }) => {
-            const service = getService();
-            const profile = await service.getProfile();
-            respond(true, profile);
+            try {
+                const service = getService();
+                const profile = await service.getProfile();
+                respond(true, profile);
+            }
+            catch (error) {
+                safeHandle(respond, "profile_show_failed", error);
+            }
         },
         "multiclaws.profile.pending_review": async ({ respond }) => {
-            const service = getService();
-            const result = await service.getPendingProfileReview();
-            respond(true, result);
+            try {
+                const service = getService();
+                const result = await service.getPendingProfileReview();
+                respond(true, result);
+            }
+            catch (error) {
+                safeHandle(respond, "profile_pending_review_failed", error);
+            }
         },
         "multiclaws.profile.clear_pending_review": async ({ respond }) => {
-            const service = getService();
-            await service.clearPendingProfileReview();
-            respond(true, { cleared: true });
+            try {
+                const service = getService();
+                await service.clearPendingProfileReview();
+                respond(true, { cleared: true });
+            }
+            catch (error) {
+                safeHandle(respond, "profile_clear_pending_review_failed", error);
+            }
         },
         "multiclaws.profile.set": async ({ params, respond }) => {
             try {

package/dist/index.js

@@ -369,7 +369,7 @@ function createTools(getService) {
 const plugin = {
     id: "multiclaws",
     name: "MultiClaws",
-    version: "0.3.1",
+    version: "0.4.2",
     register(api) {
         const config = readConfig(api);
         (0, telemetry_1.initializeTelemetry)({ enableConsoleExporter: config.telemetry?.consoleExporter });
@@ -382,7 +382,7 @@ const plugin = {
             if (gw) {
                 const tools = (gw.tools ?? {});
                 const allow = Array.isArray(tools.allow) ? tools.allow : [];
-                const required = ["sessions_spawn", "sessions_history"];
+                const required = ["sessions_spawn", "sessions_history", "message"];
                 const missing = required.filter((t) => !allow.includes(t));
                 if (missing.length > 0) {
                     tools.allow = [...allow, ...missing];

package/dist/infra/gateway-client.js

@@ -40,6 +40,7 @@ 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() {
@@ -53,6 +54,15 @@ 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.x.x.x) — exported for fast-path checks */
+/** Check network interfaces for a Tailscale IP (100.64.0.0/10) — 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,6 +7,7 @@ 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()
@@ -14,21 +15,30 @@ function run(cmd, timeoutMs = 5_000) {
 }
 function commandExists(cmd) {
     try {
-        run(`which ${cmd}`);
+        run(isWindows ? `where ${cmd}` : `which ${cmd}`);
         return true;
     }
     catch {
         return false;
     }
 }
-/** Check network interfaces for a Tailscale IP (100.x.x.x) — exported for fast-path checks */
+/** 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 */
 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" && addr.address.startsWith("100.")) {
+            if (addr.family === "IPv4" && isTailscaleCGNAT(addr.address)) {
                 return addr.address;
             }
         }
@@ -61,8 +71,7 @@ async function getAuthUrl() {
     return new Promise((resolve) => {
         try {
             // tailscale up prints the auth URL to stderr
-            const { spawn } = require("node:child_process");
-            const proc = spawn("tailscale", ["up"], { stdio: ["ignore", "pipe", "pipe"] });
+            const proc = (0, node_child_process_1.spawn)("tailscale", ["up"], { stdio: ["ignore", "pipe", "pipe"] });
             let output = "";
             let resolved = false;
             const tryResolve = (text) => {

package/dist/service/a2a-adapter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenClawAgentExecutor = void 0;
+const node_crypto_1 = require("node:crypto");
 const gateway_client_1 = require("../infra/gateway-client");
 function extractTextFromMessage(message) {
     if (!message.parts)
@@ -23,7 +24,7 @@ function buildTaskWithHistory(context) {
         .slice(-8) // keep last 8 messages max to avoid huge prompts
         .map((m) => {
         const text = extractTextFromMessage(m);
-        const role = m.role === "agent" ? "[agent]" : "[user]";
+        const role = m.role === "agent" ? "agent" : "user";
         return `[${role}]: ${text}`;
     })
         .filter((line) => line.length > 10)
@@ -96,6 +97,7 @@ class OpenClawAgentExecutor {
         if (!this.gatewayConfig) {
             this.logger.error("[a2a-adapter] gateway config not available, cannot execute task");
             this.taskTracker.update(trackedId, { status: "failed", error: "gateway config not available" });
+            this.a2aToTracker.delete(taskId);
             this.publishMessage(eventBus, "Error: gateway config not available, cannot execute task.");
             eventBus.finished();
             return;
@@ -243,7 +245,7 @@ class OpenClawAgentExecutor {
         const message = {
             kind: "message",
             role: "agent",
-            messageId: `msg-${Date.now()}`,
+            messageId: (0, node_crypto_1.randomUUID)(),
             parts: [{ kind: "text", text }],
         };
         eventBus.publish(message);

package/dist/service/agent-registry.js

@@ -32,14 +32,17 @@ class AgentRegistry {
             const normalizedUrl = params.url.replace(/\/+$/, "");
             const existing = store.agents.findIndex((a) => a.url === normalizedUrl);
             const now = Date.now();
+            const prev = existing >= 0 ? store.agents[existing] : null;
             const record = {
                 url: normalizedUrl,
                 name: params.name,
                 description: params.description ?? "",
                 skills: params.skills ?? [],
                 apiKey: params.apiKey,
-                addedAtMs: existing >= 0 ? store.agents[existing].addedAtMs : now,
+                addedAtMs: prev?.addedAtMs ?? now,
                 lastSeenAtMs: now,
+                // Preserve existing teamIds so that team associations are not lost on upsert
+                ...(prev?.teamIds?.length ? { teamIds: prev.teamIds } : {}),
             };
             if (existing >= 0) {
                 store.agents[existing] = record;

package/dist/service/multiclaws-service.js

@@ -110,7 +110,7 @@ class MulticlawsService extends node_events_1.EventEmitter {
             name: this.options.displayName ?? (profile.ownerName || "OpenClaw Agent"),
             description: this.profileDescription,
             url: this.selfUrl,
-            version: "0.3.0",
+            version: "0.4.2",
             protocolVersion: "0.2.2",
             defaultInputModes: ["text/plain"],
             defaultOutputModes: ["text/plain"],
@@ -149,7 +149,13 @@ class MulticlawsService extends node_events_1.EventEmitter {
         }));
         const listenPort = this.options.port ?? 3100;
         this.httpServer = node_http_1.default.createServer(app);
-        await new Promise((resolve) => this.httpServer.listen(listenPort, "0.0.0.0", resolve));
+        await new Promise((resolve, reject) => {
+            this.httpServer.once("error", reject);
+            this.httpServer.listen(listenPort, "0.0.0.0", () => {
+                this.httpServer.removeListener("error", reject);
+                resolve();
+            });
+        });
         this.started = true;
         this.log("info", `multiclaws A2A service listening on :${listenPort}`);
     }
@@ -351,18 +357,20 @@ class MulticlawsService extends node_events_1.EventEmitter {
         const timer = setTimeout(() => abortController.abort(), timeout);
         try {
             const client = await this.createA2AClient(params.agentRecord);
-            const withAbort = (p) => Promise.race([
-                p,
-                new Promise((_, reject) => {
-                    if (abortController.signal.aborted) {
-                        reject(new Error("session canceled"));
-                        return;
-                    }
-                    abortController.signal.addEventListener("abort", () => reject(new Error(this.sessionStore.get(params.sessionId)?.status === "canceled"
-                        ? "session canceled"
-                        : "session timeout")));
-                }),
-            ]);
+            const withAbort = (p) => {
+                if (abortController.signal.aborted) {
+                    return Promise.reject(new Error("session canceled"));
+                }
+                return new Promise((resolve, reject) => {
+                    const onAbort = () => {
+                        reject(new Error(this.sessionStore.get(params.sessionId)?.status === "canceled"
+                            ? "session canceled"
+                            : "session timeout"));
+                    };
+                    abortController.signal.addEventListener("abort", onAbort, { once: true });
+                    p.then((val) => { abortController.signal.removeEventListener("abort", onAbort); resolve(val); }, (err) => { abortController.signal.removeEventListener("abort", onAbort); reject(err); });
+                });
+            };
             let result = await withAbort(client.sendMessage({
                 message: {
                     kind: "message",
@@ -814,7 +822,7 @@ class MulticlawsService extends node_events_1.EventEmitter {
                 }
                 const normalizedUrl = parsed.data.url.replace(/\/+$/, "");
                 await this.teamStore.removeMember(team.teamId, normalizedUrl);
-                await this.agentRegistry.remove(normalizedUrl);
+                await this.agentRegistry.removeTeamSource(normalizedUrl, team.teamId);
                 res.json({ ok: true });
             }
             catch (err) {
@@ -864,12 +872,13 @@ class MulticlawsService extends node_events_1.EventEmitter {
         const selfNormalized = this.selfUrl.replace(/\/+$/, "");
         const displayName = this.options.displayName ?? node_os_1.default.hostname();
         for (const team of teams) {
-            // Update self in team store
+            // Update self in team store, preserving original joinedAtMs
+            const selfMember = team.members.find((m) => m.url.replace(/\/+$/, "") === selfNormalized);
             await this.teamStore.addMember(team.teamId, {
                 url: this.selfUrl,
                 name: displayName,
                 description: this.profileDescription,
-                joinedAtMs: Date.now(),
+                joinedAtMs: selfMember?.joinedAtMs ?? Date.now(),
             });
             // Broadcast to other members
             const others = team.members.filter((m) => m.url.replace(/\/+$/, "") !== selfNormalized);

package/dist/service/session-store.js

@@ -14,6 +14,20 @@ const MAX_MESSAGES_PER_SESSION = 200;
 function emptyStore() {
     return { version: 1, sessions: [] };
 }
+function normalizeStore(raw) {
+    if (raw.version !== 1 || !Array.isArray(raw.sessions)) {
+        return emptyStore();
+    }
+    return {
+        version: 1,
+        sessions: raw.sessions.filter((s) => s &&
+            typeof s.sessionId === "string" &&
+            typeof s.agentUrl === "string" &&
+            typeof s.status === "string" &&
+            typeof s.createdAtMs === "number" &&
+            Array.isArray(s.messages)),
+    };
+}
 class SessionStore {
     filePath;
     ttlMs;
@@ -78,9 +92,7 @@ class SessionStore {
         node_fs_1.default.mkdirSync(node_path_1.default.dirname(this.filePath), { recursive: true });
         try {
             const raw = JSON.parse(node_fs_1.default.readFileSync(this.filePath, "utf8"));
-            if (raw.version !== 1 || !Array.isArray(raw.sessions))
-                return emptyStore();
-            return raw;
+            return normalizeStore(raw);
         }
         catch {
             const store = emptyStore();

package/package.json

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