multiclaws 0.4.19 → 0.4.21

package/dist/service/a2a-adapter.js

@@ -71,6 +71,9 @@ class OpenClawAgentExecutor {
         try {
             this.logger.info(`[a2a-adapter] executing task ${taskId}: ${taskText.slice(0, 100)}`);
             // 1. Spawn the subagent
+            // Use a dedicated session key to avoid inheriting the main session's
+            // thinking blocks, which would cause "thinking blocks cannot be modified"
+            // errors from the Claude API.
             const spawnResult = await (0, gateway_client_1.invokeGatewayTool)({
                 gateway: this.gatewayConfig,
                 tool: "sessions_spawn",
@@ -78,6 +81,7 @@ class OpenClawAgentExecutor {
                     task: taskText,
                     mode: "run",
                 },
+                sessionKey: `a2a-${taskId}`,
                 timeoutMs: 15_000,
             });
             // Extract details from gateway response: { content: [...], details: { childSessionKey, ... } }
@@ -87,8 +91,9 @@ class OpenClawAgentExecutor {
                 throw new Error("sessions_spawn did not return a childSessionKey");
             }
             // 2. Poll for completion
+            const gatewaySessionKey = `a2a-${taskId}`;
             this.logger.info(`[a2a-adapter] task ${taskId} spawned as ${childSessionKey}, waiting for result...`);
-            const output = await this.waitForCompletion(childSessionKey, 180_000);
+            const output = await this.waitForCompletion(childSessionKey, 180_000, gatewaySessionKey);
             // 3. Return result
             this.taskTracker.update(taskId, { status: "completed", result: output });
             this.logger.info(`[a2a-adapter] task ${taskId} completed`);
@@ -106,7 +111,8 @@ class OpenClawAgentExecutor {
      * Poll sessions_history until the subagent session completes.
      * Collects ALL assistant text messages and returns them joined.
      */
-    async waitForCompletion(sessionKey, timeoutMs) {
+    async waitForCompletion(sessionKey, timeoutMs, gatewaySessionKey) {
+        this.logger.info(`[a2a-adapter] waitForCompletion(sessionKey=${sessionKey}, timeoutMs=${timeoutMs})`);
         const gateway = this.gatewayConfig;
         const startTime = Date.now();
         let attempt = 0;
@@ -124,6 +130,7 @@ class OpenClawAgentExecutor {
                         limit: 50,
                         includeTools: false,
                     },
+                    sessionKey: gatewaySessionKey,
                     timeoutMs: 8_000,
                 });
                 const result = this.extractCompletedResult(histResult);
@@ -220,6 +227,7 @@ class OpenClawAgentExecutor {
         return null;
     }
     async cancelTask(taskId, eventBus) {
+        this.logger.info(`[a2a-adapter] cancelTask(taskId=${taskId})`);
         this.taskTracker.update(taskId, { status: "failed", error: "canceled" });
         this.publishMessage(eventBus, "Task was canceled.");
         eventBus.finished();

package/dist/service/agent-profile.d.ts

@@ -1,3 +1,4 @@
+import type { BasicLogger } from "../infra/logger";
 export type AgentProfile = {
     ownerName: string;
     /** Free-form markdown describing this agent: role, capabilities, data sources, etc. */
@@ -6,7 +7,9 @@ export type AgentProfile = {
 export declare function renderProfileDescription(profile: AgentProfile): string;
 export declare class ProfileStore {
     private readonly filePath;
-    constructor(filePath: string);
+    private readonly logger?;
+    constructor(filePath: string, logger?: BasicLogger | undefined);
+    private log;
     load(): Promise<AgentProfile>;
     save(profile: AgentProfile): Promise<void>;
     update(patch: Partial<AgentProfile>): Promise<AgentProfile>;

package/dist/service/agent-profile.js

@@ -16,23 +16,44 @@ function renderProfileDescription(profile) {
 }
 class ProfileStore {
     filePath;
-    constructor(filePath) {
+    logger;
+    constructor(filePath, logger) {
         this.filePath = filePath;
+        this.logger = logger;
+    }
+    log(level, message) {
+        const fn = level === "debug" ? this.logger?.debug : this.logger?.[level];
+        fn?.(`[profile-store] ${message}`);
     }
     async load() {
         return await (0, json_store_1.readJsonWithFallback)(this.filePath, emptyProfile());
     }
     async save(profile) {
-        await (0, json_store_1.writeJsonAtomically)(this.filePath, profile);
+        this.log("debug", `save(ownerName=${profile.ownerName})`);
+        try {
+            await (0, json_store_1.writeJsonAtomically)(this.filePath, profile);
+        }
+        catch (err) {
+            this.log("error", `save failed: ${err instanceof Error ? err.message : String(err)}`);
+            throw err;
+        }
     }
     async update(patch) {
-        const profile = await this.load();
-        if (patch.ownerName !== undefined)
-            profile.ownerName = patch.ownerName;
-        if (patch.bio !== undefined)
-            profile.bio = patch.bio;
-        await this.save(profile);
-        return profile;
+        this.log("debug", `update(keys=${Object.keys(patch).join(",")})`);
+        try {
+            const profile = await this.load();
+            if (patch.ownerName !== undefined)
+                profile.ownerName = patch.ownerName;
+            if (patch.bio !== undefined)
+                profile.bio = patch.bio;
+            await this.save(profile);
+            this.log("debug", `update completed`);
+            return profile;
+        }
+        catch (err) {
+            this.log("error", `update failed: ${err instanceof Error ? err.message : String(err)}`);
+            throw err;
+        }
     }
 }
 exports.ProfileStore = ProfileStore;

package/dist/service/agent-registry.d.ts

@@ -1,3 +1,4 @@
+import type { BasicLogger } from "../infra/logger";
 export type AgentRecord = {
     url: string;
     name: string;
@@ -9,7 +10,9 @@ export type AgentRecord = {
 };
 export declare class AgentRegistry {
     private readonly filePath;
-    constructor(filePath: string);
+    private readonly logger?;
+    constructor(filePath: string, logger?: BasicLogger | undefined);
+    private log;
     private readStore;
     add(params: {
         url: string;

package/dist/service/agent-registry.js

@@ -19,50 +19,74 @@ function normalizeStore(raw) {
 }
 class AgentRegistry {
     filePath;
-    constructor(filePath) {
+    logger;
+    constructor(filePath, logger) {
         this.filePath = filePath;
+        this.logger = logger;
+    }
+    log(level, message) {
+        const fn = level === "debug" ? this.logger?.debug : this.logger?.[level];
+        fn?.(`[agent-registry] ${message}`);
     }
     async readStore() {
         const store = await (0, json_store_1.readJsonWithFallback)(this.filePath, emptyStore());
         return normalizeStore(store);
     }
     async add(params) {
-        return await (0, json_store_1.withJsonLock)(this.filePath, emptyStore(), async () => {
-            const store = await this.readStore();
-            const normalizedUrl = params.url.replace(/\/+$/, "");
-            const existing = store.agents.findIndex((a) => a.url === normalizedUrl);
-            const now = Date.now();
-            const record = {
-                url: normalizedUrl,
-                name: params.name,
-                description: params.description ?? "",
-                skills: params.skills ?? [],
-                apiKey: params.apiKey,
-                addedAtMs: existing >= 0 ? store.agents[existing].addedAtMs : now,
-                lastSeenAtMs: now,
-            };
-            if (existing >= 0) {
-                store.agents[existing] = record;
-            }
-            else {
-                store.agents.push(record);
-            }
-            await (0, json_store_1.writeJsonAtomically)(this.filePath, store);
-            return record;
-        });
+        const normalizedUrl = params.url.replace(/\/+$/, "");
+        this.log("debug", `add(url=${normalizedUrl}, name=${params.name})`);
+        try {
+            const result = await (0, json_store_1.withJsonLock)(this.filePath, emptyStore(), async () => {
+                const store = await this.readStore();
+                const existing = store.agents.findIndex((a) => a.url === normalizedUrl);
+                const now = Date.now();
+                const record = {
+                    url: normalizedUrl,
+                    name: params.name,
+                    description: params.description ?? "",
+                    skills: params.skills ?? [],
+                    apiKey: params.apiKey,
+                    addedAtMs: existing >= 0 ? store.agents[existing].addedAtMs : now,
+                    lastSeenAtMs: now,
+                };
+                if (existing >= 0) {
+                    store.agents[existing] = record;
+                }
+                else {
+                    store.agents.push(record);
+                }
+                await (0, json_store_1.writeJsonAtomically)(this.filePath, store);
+                return record;
+            });
+            this.log("debug", `add completed, agent=${result.name}`);
+            return result;
+        }
+        catch (err) {
+            this.log("error", `add failed for url=${normalizedUrl}: ${err instanceof Error ? err.message : String(err)}`);
+            throw err;
+        }
     }
     async remove(url) {
-        return await (0, json_store_1.withJsonLock)(this.filePath, emptyStore(), async () => {
-            const store = await this.readStore();
-            const normalizedUrl = url.replace(/\/+$/, "");
-            const before = store.agents.length;
-            store.agents = store.agents.filter((a) => a.url !== normalizedUrl);
-            if (store.agents.length === before) {
-                return false;
-            }
-            await (0, json_store_1.writeJsonAtomically)(this.filePath, store);
-            return true;
-        });
+        const normalizedUrl = url.replace(/\/+$/, "");
+        this.log("debug", `remove(url=${normalizedUrl})`);
+        try {
+            const result = await (0, json_store_1.withJsonLock)(this.filePath, emptyStore(), async () => {
+                const store = await this.readStore();
+                const before = store.agents.length;
+                store.agents = store.agents.filter((a) => a.url !== normalizedUrl);
+                if (store.agents.length === before) {
+                    return false;
+                }
+                await (0, json_store_1.writeJsonAtomically)(this.filePath, store);
+                return true;
+            });
+            this.log("debug", `remove completed, found=${result}`);
+            return result;
+        }
+        catch (err) {
+            this.log("error", `remove failed for url=${normalizedUrl}: ${err instanceof Error ? err.message : String(err)}`);
+            throw err;
+        }
     }
     async list() {
         const store = await this.readStore();
@@ -74,16 +98,23 @@ class AgentRegistry {
         return store.agents.find((a) => a.url === normalizedUrl) ?? null;
     }
     async updateDescription(url, description) {
-        await (0, json_store_1.withJsonLock)(this.filePath, emptyStore(), async () => {
-            const store = await this.readStore();
-            const normalizedUrl = url.replace(/\/+$/, "");
-            const agent = store.agents.find((a) => a.url === normalizedUrl);
-            if (agent) {
-                agent.description = description;
-                agent.lastSeenAtMs = Date.now();
-                await (0, json_store_1.writeJsonAtomically)(this.filePath, store);
-            }
-        });
+        const normalizedUrl = url.replace(/\/+$/, "");
+        this.log("debug", `updateDescription(url=${normalizedUrl})`);
+        try {
+            await (0, json_store_1.withJsonLock)(this.filePath, emptyStore(), async () => {
+                const store = await this.readStore();
+                const agent = store.agents.find((a) => a.url === normalizedUrl);
+                if (agent) {
+                    agent.description = description;
+                    agent.lastSeenAtMs = Date.now();
+                    await (0, json_store_1.writeJsonAtomically)(this.filePath, store);
+                }
+            });
+        }
+        catch (err) {
+            this.log("error", `updateDescription failed for url=${normalizedUrl}: ${err instanceof Error ? err.message : String(err)}`);
+            throw err;
+        }
     }
     async updateLastSeen(url) {
         await (0, json_store_1.withJsonLock)(this.filePath, emptyStore(), async () => {

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

@@ -42,6 +42,7 @@ export declare class MulticlawsService extends EventEmitter {
     private frpTunnel;
     private selfUrl;
     private profileDescription;
+    private readonly gatewayConfig;
     constructor(options: MulticlawsServiceOptions);
     start(): Promise<void>;
     stop(): Promise<void>;
@@ -56,6 +57,25 @@ export declare class MulticlawsService extends EventEmitter {
         agentUrl: string;
         task: string;
     }): Promise<DelegateTaskResult>;
+    /**
+     * Synchronous delegation: sends A2A task and waits for the result.
+     * Used by sub-agents internally via the multiclaws_delegate_send tool.
+     */
+    delegateTaskSync(params: {
+        agentUrl: string;
+        task: string;
+    }): Promise<DelegateTaskResult>;
+    /**
+     * Spawn a sub-agent to handle delegation asynchronously.
+     * The sub-agent uses multiclaws_delegate_send internally and
+     * reports results back to the user via the message tool.
+     */
+    spawnDelegation(params: {
+        agentUrl: string;
+        task: string;
+    }): Promise<{
+        message: string;
+    }>;
     getTaskStatus(taskId: string): import("../task/tracker").TaskRecord | null;
     getProfile(): Promise<AgentProfile>;
     /**