@agentapprove/openclaw 0.1.9 → 0.2.0

package/dist/index.js

@@ -415,7 +415,7 @@ function loadConfig(openclawConfig, logger) {
     failBehavior,
     privacyTier,
     debug,
-    hookVersion: "1.1.5",
+    hookVersion: "1.2.0",
     agentType: "openclaw",
     agentName,
     e2eEnabled,
@@ -851,6 +851,153 @@ async function sendEvent(event, config, pluginPath, hookName = "openclaw-plugin"
   }
 }
 
+// src/gateway-client.ts
+import { randomUUID } from "crypto";
+var DEFAULT_GATEWAY_PORT = 18789;
+var CONNECT_TIMEOUT_MS = 1e4;
+var HOOK_NAME = "openclaw-gateway";
+function resolveGatewayConfig(pluginConfig, debug) {
+  const gw = pluginConfig?.gateway;
+  const envPortRaw = process.env.OPENCLAW_GATEWAY_PORT;
+  const envPort = parseInt(envPortRaw || "", 10);
+  if (envPortRaw && isNaN(envPort)) {
+    debugLog(`Invalid OPENCLAW_GATEWAY_PORT "${envPortRaw}", using default ${DEFAULT_GATEWAY_PORT}`, HOOK_NAME);
+  }
+  const port = (typeof gw?.port === "number" && gw.port > 0 ? gw.port : void 0) || (!isNaN(envPort) ? envPort : void 0) || DEFAULT_GATEWAY_PORT;
+  const auth = gw?.auth;
+  const configToken = typeof auth?.token === "string" ? auth.token : "";
+  const token = configToken || process.env.OPENCLAW_GATEWAY_TOKEN || "";
+  if (!token) {
+    return null;
+  }
+  return { port, token, debug };
+}
+async function sendChatMessage(gwConfig, sessionKey, message, idempotencyKey = randomUUID()) {
+  let WebSocket;
+  try {
+    ({ default: WebSocket } = await import("ws"));
+  } catch {
+    throw new Error(
+      'The "ws" package is required for Gateway WebSocket support. Install it with: npm install ws'
+    );
+  }
+  return new Promise((resolve, reject) => {
+    const url = `ws://127.0.0.1:${gwConfig.port}`;
+    let settled = false;
+    let connectReqId;
+    let chatReqId;
+    if (gwConfig.debug) {
+      debugLog(`Connecting to gateway at ${url}`, HOOK_NAME);
+    }
+    const ws = new WebSocket(url);
+    const sendOrFail = (payload) => {
+      ws.send(payload, (sendErr) => {
+        if (sendErr && !settled) {
+          settled = true;
+          cleanup();
+          reject(sendErr);
+        }
+      });
+    };
+    const timeout = setTimeout(() => {
+      if (!settled) {
+        settled = true;
+        try {
+          ws.terminate();
+        } catch {
+        }
+        reject(new Error(`Gateway connection timed out after ${CONNECT_TIMEOUT_MS}ms`));
+      }
+    }, CONNECT_TIMEOUT_MS);
+    const cleanup = () => {
+      clearTimeout(timeout);
+      try {
+        ws.terminate();
+      } catch {
+      }
+    };
+    ws.on("error", (err) => {
+      if (!settled) {
+        settled = true;
+        cleanup();
+        reject(err);
+      }
+    });
+    ws.on("message", (data) => {
+      let msg;
+      try {
+        msg = JSON.parse(data.toString());
+      } catch {
+        return;
+      }
+      if (msg.type === "event" && msg.event === "connect.challenge" && !connectReqId) {
+        connectReqId = randomUUID();
+        sendOrFail(JSON.stringify({
+          type: "req",
+          id: connectReqId,
+          method: "connect",
+          params: {
+            minProtocol: 3,
+            maxProtocol: 3,
+            client: { id: "agentapprove-plugin", version: "1.0", platform: "node", mode: "operator" },
+            role: "operator",
+            scopes: ["operator.admin"],
+            auth: { token: gwConfig.token }
+          }
+        }));
+        if (gwConfig.debug) {
+          debugLog("Sent connect request", HOOK_NAME);
+        }
+        return;
+      }
+      if (msg.type === "res" && connectReqId && msg.id === connectReqId && !chatReqId) {
+        if (!msg.ok) {
+          settled = true;
+          cleanup();
+          reject(new Error(`Gateway auth failed: ${msg.error?.message || "unknown"}`));
+          return;
+        }
+        chatReqId = randomUUID();
+        sendOrFail(JSON.stringify({
+          type: "req",
+          id: chatReqId,
+          method: "chat.send",
+          params: {
+            sessionKey,
+            message,
+            idempotencyKey
+          }
+        }));
+        if (gwConfig.debug) {
+          debugLog(`Sent chat.send for session ${sessionKey}`, HOOK_NAME);
+        }
+        return;
+      }
+      if (msg.type === "res" && chatReqId && msg.id === chatReqId) {
+        settled = true;
+        cleanup();
+        if (msg.ok) {
+          const runId = msg.payload?.runId;
+          if (gwConfig.debug) {
+            debugLog(`chat.send succeeded, runId=${runId || "unknown"}`, HOOK_NAME);
+          }
+          resolve({ runId });
+        } else {
+          reject(new Error(`chat.send failed: ${msg.error?.message || "unknown"}`));
+        }
+        return;
+      }
+    });
+    ws.on("close", () => {
+      if (!settled) {
+        settled = true;
+        cleanup();
+        reject(new Error("Gateway connection closed unexpectedly"));
+      }
+    });
+  });
+}
+
 // src/index.ts
 var pluginFilePath;
 try {
@@ -1209,29 +1356,29 @@ function register(api) {
           }
           followupText = decrypted;
         }
-        if (!api.runtime?.system?.enqueueSystemEvent) {
+        const gwConfig = resolveGatewayConfig(api.pluginConfig, config.debug);
+        if (!gwConfig) {
           api.logger.warn(
-            "Agent Approve: follow-up received but runtime.system API unavailable (OpenClaw version may be too old)"
+            "Agent Approve: follow-up received but no gateway token configured \u2014 set OPENCLAW_GATEWAY_TOKEN or gateway.auth.token in plugin config"
           );
           return;
         }
-        try {
-          const sessionKey = ctx.sessionKey || conversationId;
-          api.runtime.system.enqueueSystemEvent(
-            `Agent Approve follow-up from user: ${followupText}`,
-            { sessionKey }
+        if (!ctx.sessionKey) {
+          api.logger.warn(
+            "Agent Approve: follow-up received but session key unavailable \u2014 cannot send to OpenClaw"
           );
-          api.runtime.system.requestHeartbeatNow({
-            sessionKey,
-            reason: "agentapprove-followup"
-          });
+          return;
+        }
+        try {
+          const idempotencyKey = createHash2("sha256").update(`${ctx.sessionKey}:${stopRequest.timestamp}:${followupText}`).digest("hex").slice(0, 32);
+          const result = await sendChatMessage(gwConfig, ctx.sessionKey, followupText, idempotencyKey);
           if (config.debug) {
-            debugLog(`Follow-up injected via system event, heartbeat requested`, HOOK_AGENT_END);
+            debugLog(`Follow-up sent via gateway chat.send, runId=${result.runId || "unknown"}`, HOOK_AGENT_END);
           }
-          api.logger.info(`Agent Approve: follow-up injected, heartbeat requested`);
+          api.logger.info(`Agent Approve: follow-up sent as user prompt via gateway`);
         } catch (injectionError) {
           const injMsg = injectionError instanceof Error ? injectionError.message : String(injectionError);
-          api.logger.warn(`Agent Approve: follow-up injection failed \u2014 ${injMsg}`);
+          api.logger.warn(`Agent Approve: follow-up injection via gateway failed \u2014 ${injMsg}`);
         }
       }
     } catch (error) {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@agentapprove/openclaw",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "description": "Agent Approve plugin for OpenClaw - approve or deny AI agent tool calls from your iPhone and Apple Watch",
   "main": "dist/index.js",
   "scripts": {
-    "build": "esbuild src/index.ts --bundle --platform=node --target=node18 --outfile=dist/index.js --format=esm --external:crypto --external:fs --external:path --external:os --external:https --external:http --external:url --external:child_process",
+    "build": "esbuild src/index.ts --bundle --platform=node --target=node18 --outfile=dist/index.js --format=esm --external:crypto --external:fs --external:path --external:os --external:https --external:http --external:url --external:child_process --external:ws",
     "hash": "shasum -a 256 dist/index.js | cut -d' ' -f1",
-    "dev": "esbuild src/index.ts --bundle --platform=node --target=node18 --outfile=dist/index.js --format=esm --external:crypto --external:fs --external:path --external:os --external:https --external:http --external:url --external:child_process --watch"
+    "dev": "esbuild src/index.ts --bundle --platform=node --target=node18 --outfile=dist/index.js --format=esm --external:crypto --external:fs --external:path --external:os --external:https --external:http --external:url --external:child_process --external:ws --watch"
   },
   "openclaw": {
     "extensions": ["./dist/index.js"]
@@ -36,6 +36,14 @@
   "engines": {
     "node": ">=18"
   },
+  "peerDependencies": {
+    "ws": ">=7.0.0"
+  },
+  "peerDependenciesMeta": {
+    "ws": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "esbuild": "^0.24.0",
     "typescript": "^5.0.0"