gopherhole_openclaw_a2a 0.4.4 → 0.4.6

package/dist/src/channel.js

@@ -7,6 +7,8 @@ const DEFAULT_ACCOUNT_ID = 'default';
 function normalizeAccountId(id) {
     return id?.trim()?.toLowerCase() || DEFAULT_ACCOUNT_ID;
 }
+import { existsSync, readFileSync } from 'fs';
+import { join } from 'path';
 import { A2AConnectionManager } from './connection.js';
 import { sendChatMessage } from './gateway-client.js';
 import { a2aLog } from './logger.js';
@@ -16,6 +18,27 @@ let currentRuntime = null;
 export function setA2ARuntime(runtime) {
     currentRuntime = runtime;
 }
+function loadAgentSecrets(agentId) {
+    const secretsDir = join(process.cwd(), '.gopherhole', 'secrets');
+    const filePath = join(secretsDir, `${agentId}.json`);
+    if (!existsSync(filePath))
+        return null;
+    try {
+        const raw = readFileSync(filePath, 'utf-8');
+        const parsed = JSON.parse(raw);
+        if (typeof parsed !== 'object' || parsed === null)
+            return null;
+        const secrets = {};
+        for (const [k, v] of Object.entries(parsed)) {
+            if (typeof v === 'string')
+                secrets[k] = v;
+        }
+        return Object.keys(secrets).length > 0 ? secrets : null;
+    }
+    catch {
+        return null;
+    }
+}
 function resolveA2AConfig(cfg) {
     return cfg?.channels?.a2a ?? {};
 }
@@ -145,7 +168,8 @@ export const a2aPlugin = {
                 return { channel: 'a2a', success: false, error: 'A2A not connected' };
             }
             try {
-                const response = await connectionManager.sendMessage(to, text);
+                const secrets = loadAgentSecrets(to) ?? undefined;
+                const response = await connectionManager.sendMessage(to, text, secrets ? { secrets } : undefined);
                 return {
                     channel: 'a2a',
                     success: true,
@@ -203,9 +227,19 @@ export const a2aPlugin = {
             const config = account.config;
             ctx.log?.info(`[a2a] Starting A2A channel`);
             ctx.setStatus({ accountId: account.accountId });
-            connectionManager = new A2AConnectionManager(config);
+            const localConnection = new A2AConnectionManager(config);
+            // Defensive: prior plugin versions leaked a connection on every
+            // supervisor auto-restart. If a stale manager is still around, stop it
+            // before overwriting the module-level singleton.
+            if (connectionManager && connectionManager !== localConnection) {
+                try {
+                    await connectionManager.stop();
+                }
+                catch { /* ignore */ }
+            }
+            connectionManager = localConnection;
             // Set up message handler for incoming messages
-            connectionManager.setMessageHandler(async (agentId, message) => {
+            localConnection.setMessageHandler(async (agentId, message) => {
                 if (message.type === 'message' && message.from) {
                     const text = message.content?.parts
                         ?.filter((p) => p.kind === 'text')
@@ -252,24 +286,46 @@ export const a2aPlugin = {
                     }
                 }
             });
-            await connectionManager.start();
+            await localConnection.start();
             ctx.setStatus({
                 accountId: account.accountId,
                 running: true,
                 lastStartAt: Date.now(),
             });
             ctx.log?.info(`[a2a] A2A channel started`);
-            // Return cleanup function
-            return async () => {
+            // OpenClaw's channel supervisor treats resolution of this promise as
+            // "channel exited" and immediately schedules an auto-restart. Hold the
+            // channel open for its lifetime by blocking on the abort signal — the
+            // supervisor aborts it only when it actually wants us to stop.
+            try {
+                await new Promise((resolve) => {
+                    const signal = ctx.abortSignal;
+                    if (!signal)
+                        return; // no signal provided: never resolve
+                    if (signal.aborted) {
+                        resolve();
+                        return;
+                    }
+                    signal.addEventListener('abort', () => resolve(), { once: true });
+                });
+            }
+            finally {
                 ctx.log?.info(`[a2a] Stopping A2A channel`);
-                await connectionManager?.stop();
-                connectionManager = null;
+                try {
+                    await localConnection.stop();
+                }
+                catch (err) {
+                    ctx.log?.error?.(`[a2a] Error during stop: ${err.message}`);
+                }
+                if (connectionManager === localConnection) {
+                    connectionManager = null;
+                }
                 ctx.setStatus({
                     accountId: account.accountId,
                     running: false,
                     lastStopAt: Date.now(),
                 });
-            };
+            }
         },
     },
 };

package/dist/src/connection.d.ts

@@ -25,7 +25,10 @@ export declare class A2AConnectionManager {
     /**
      * Send a message to another agent via GopherHole and wait for response
      */
-    sendMessage(targetAgentId: string, text: string, _contextId?: string): Promise<A2AResponse>;
+    sendMessage(targetAgentId: string, text: string, opts?: {
+        contextId?: string;
+        secrets?: Record<string, string>;
+    }): Promise<A2AResponse>;
     /**
      * Send a multi-part message via GopherHole hub
      * Supports text, images, and other MIME types
@@ -35,7 +38,7 @@ export declare class A2AConnectionManager {
         text?: string;
         data?: string;
         mimeType?: string;
-    }>, contextId?: string): Promise<A2AResponse>;
+    }>, contextId?: string, secrets?: Record<string, string>): Promise<A2AResponse>;
     /**
      * Send a response to an incoming message via GopherHole
      * Uses SDK's respond() method to complete the original task

package/dist/src/connection.js

@@ -197,14 +197,14 @@ export class A2AConnectionManager {
     /**
      * Send a message to another agent via GopherHole and wait for response
      */
-    async sendMessage(targetAgentId, text, _contextId) {
-        return this.sendPartsViaGopherHole(targetAgentId, [{ kind: 'text', text }]);
+    async sendMessage(targetAgentId, text, opts) {
+        return this.sendPartsViaGopherHole(targetAgentId, [{ kind: 'text', text }], opts?.contextId, opts?.secrets);
     }
     /**
      * Send a multi-part message via GopherHole hub
      * Supports text, images, and other MIME types
      */
-    async sendPartsViaGopherHole(targetAgentId, parts, contextId) {
+    async sendPartsViaGopherHole(targetAgentId, parts, contextId, secrets) {
         if (!this.gopherhole || !this.connected) {
             throw new Error('GopherHole not connected');
         }
@@ -219,7 +219,7 @@ export class A2AConnectionManager {
                     data: p.data,
                     mimeType: p.mimeType,
                 })),
-            }, { contextId });
+            }, { contextId, secrets });
             // Wait for task completion
             const completedTask = await this.gopherhole.waitForTask(task.id, {
                 pollIntervalMs: 1000,

package/openclaw.plugin.json

@@ -10,5 +10,119 @@
         "description": "Enable the plugin"
       }
     }
+  },
+  "channelConfigs": {
+    "a2a": {
+      "label": "A2A (GopherHole)",
+      "description": "Agent-to-agent communication over the GopherHole hub. Lets other AI agents discover and message this OpenClaw instance.",
+      "schema": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "default": false,
+            "description": "Enable the A2A channel"
+          },
+          "apiKey": {
+            "type": "string",
+            "description": "GopherHole API key (starts with gph_)"
+          },
+          "bridgeUrl": {
+            "type": "string",
+            "format": "uri",
+            "default": "wss://hub.gopherhole.ai/ws",
+            "description": "WebSocket URL for the GopherHole hub"
+          },
+          "agentId": {
+            "type": "string",
+            "description": "Canonical hub-side agent ID (e.g. agent-9a2fb7a8). Assigned by the hub; look it up via the GopherHole admin dashboard."
+          },
+          "agentName": {
+            "type": "string",
+            "description": "Display name for this agent; used to build the default agent card when agentCard is not provided."
+          },
+          "agentCard": {
+            "type": "object",
+            "description": "Override the default agent card sent to the hub on connect.",
+            "properties": {
+              "name": { "type": "string" },
+              "description": { "type": "string" },
+              "url": { "type": "string", "format": "uri" },
+              "version": { "type": "string" },
+              "skills": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "id": { "type": "string" },
+                    "name": { "type": "string" },
+                    "description": { "type": "string" },
+                    "tags": { "type": "array", "items": { "type": "string" } },
+                    "examples": { "type": "array", "items": { "type": "string" } },
+                    "inputModes": { "type": "array", "items": { "type": "string" } },
+                    "outputModes": { "type": "array", "items": { "type": "string" } }
+                  },
+                  "required": ["id", "name"]
+                }
+              }
+            }
+          },
+          "reconnectIntervalMs": {
+            "type": "integer",
+            "minimum": 100,
+            "default": 5000,
+            "description": "Initial reconnect delay in milliseconds. The SDK backs off exponentially up to a 5-minute cap."
+          },
+          "requestTimeoutMs": {
+            "type": "integer",
+            "minimum": 1000,
+            "default": 180000,
+            "description": "Timeout in milliseconds for outbound requests and inbound message-response waits."
+          }
+        }
+      },
+      "uiHints": {
+        "": {
+          "label": "A2A (GopherHole)",
+          "help": "Connect this OpenClaw instance to the GopherHole hub so other AI agents can discover and message it. Get an API key at https://gopherhole.ai."
+        },
+        "apiKey": {
+          "label": "API Key",
+          "help": "Your GopherHole API key (starts with gph_). Create one at https://gopherhole.ai settings.",
+          "sensitive": true,
+          "placeholder": "gph_..."
+        },
+        "bridgeUrl": {
+          "label": "Bridge URL",
+          "help": "WebSocket endpoint of the GopherHole hub. Only override for self-hosted deployments.",
+          "advanced": true,
+          "placeholder": "wss://hub.gopherhole.ai/ws"
+        },
+        "agentId": {
+          "label": "Agent ID",
+          "help": "Hub-assigned agent ID. Find it in your GopherHole admin dashboard.",
+          "advanced": true,
+          "placeholder": "agent-xxxxxxxx"
+        },
+        "agentName": {
+          "label": "Display Name",
+          "help": "Human-readable name shown in agent cards and discovery listings."
+        },
+        "agentCard": {
+          "label": "Agent Card",
+          "help": "Advanced: fully override the agent card metadata (name, description, version, skills) registered with the hub on connect.",
+          "advanced": true
+        },
+        "reconnectIntervalMs": {
+          "label": "Reconnect Interval (ms)",
+          "advanced": true
+        },
+        "requestTimeoutMs": {
+          "label": "Request Timeout (ms)",
+          "advanced": true
+        }
+      }
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gopherhole_openclaw_a2a",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "GopherHole A2A plugin for OpenClaw - connect your AI agent to the GopherHole network",
   "type": "module",
   "main": "dist/index.js",
@@ -35,7 +35,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@gopherhole/sdk": "^0.7.4",
+    "@gopherhole/sdk": "^0.7.5",
     "uuid": "^10.0.0"
   },
   "devDependencies": {