@dhfpub/clawpool 0.1.0 → 0.1.1

package/README.md

@@ -49,6 +49,27 @@ openclaw plugins list
 openclaw plugins doctor
 ```
 
+For source-level local development from this repository, use the repo debug scripts or merge this fragment into `~/.openclaw/openclaw.json` so source edits take effect after a gateway restart:
+
+```json
+{
+  "plugins": {
+    "load": {
+      "paths": ["/path/to/repo/openclaw_plugins/clawpool/index.ts"]
+    }
+  }
+}
+```
+
+If you prefer a packaged install instead of source debugging, build first and then install the plugin directory:
+
+```bash
+npm install
+npm run build
+openclaw plugins install -l /path/to/repo/openclaw_plugins/clawpool
+openclaw plugins enable clawpool
+```
+
 ## Configuration
 
 ### Option 1: Use the onboarding flow

package/dist/index.js

@@ -1171,6 +1171,93 @@ function requireActiveAibotClient(accountId) {
   return client;
 }
 
+// src/target-resolver.ts
+var aibotSessionIDPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function isAibotSessionID(value) {
+  const normalized = String(value ?? "").trim();
+  if (!normalized) {
+    return false;
+  }
+  return aibotSessionIDPattern.test(normalized);
+}
+function normalizeAibotSessionTarget2(raw) {
+  const trimmed = String(raw ?? "").trim();
+  if (!trimmed) {
+    return "";
+  }
+  return trimmed.replace(/^clawpool:/i, "").replace(/^session:/i, "").trim();
+}
+function buildRouteSessionKeyCandidates(rawTarget, normalizedTarget) {
+  if (rawTarget === normalizedTarget) {
+    return [rawTarget];
+  }
+  return [rawTarget, normalizedTarget].filter((candidate) => candidate.length > 0);
+}
+async function resolveAibotOutboundTarget(params) {
+  const rawTarget = String(params.to ?? "").trim();
+  if (!rawTarget) {
+    throw new Error("clawpool outbound target must be non-empty");
+  }
+  const normalizedTarget = normalizeAibotSessionTarget2(rawTarget);
+  if (!normalizedTarget) {
+    throw new Error("clawpool outbound target must contain session_id or route_session_key");
+  }
+  if (isAibotSessionID(normalizedTarget)) {
+    return {
+      sessionId: normalizedTarget,
+      rawTarget,
+      normalizedTarget,
+      resolveSource: "direct"
+    };
+  }
+  if (/^\d+$/.test(normalizedTarget)) {
+    throw new Error(
+      `clawpool outbound target "${rawTarget}" is numeric; expected session_id(UUID) or route.sessionKey`
+    );
+  }
+  const routeSessionKeyCandidates = buildRouteSessionKeyCandidates(rawTarget, normalizedTarget);
+  let lastResolveError = null;
+  for (const routeSessionKey of routeSessionKeyCandidates) {
+    try {
+      const ack = await params.client.resolveSessionRoute("clawpool", params.accountId, routeSessionKey);
+      const sessionId = String(ack.session_id ?? "").trim();
+      if (!isAibotSessionID(sessionId)) {
+        throw new Error(
+          `session_route_resolve returned invalid session_id for route_session_key="${routeSessionKey}"`
+        );
+      }
+      return {
+        sessionId,
+        rawTarget,
+        normalizedTarget,
+        resolveSource: "sessionRouteMap"
+      };
+    } catch (err) {
+      lastResolveError = err instanceof Error ? err : new Error(String(err));
+    }
+  }
+  if (lastResolveError) {
+    throw new Error(
+      `clawpool outbound target resolve failed target="${rawTarget}" accountId=${params.accountId}: ${lastResolveError.message}`
+    );
+  }
+  throw new Error(`clawpool outbound target resolve failed target="${rawTarget}" accountId=${params.accountId}`);
+}
+
+// src/delete-target-resolver.ts
+async function resolveAibotDeleteTarget(params) {
+  const rawTarget = String(params.sessionId ?? "").trim() || String(params.to ?? "").trim() || String(params.topic ?? "").trim() || String(params.currentChannelId ?? "").trim();
+  if (!rawTarget) {
+    return "";
+  }
+  const resolved = await resolveAibotOutboundTarget({
+    client: params.client,
+    accountId: params.accountId,
+    to: rawTarget
+  });
+  return resolved.sessionId;
+}
+
 // src/actions.ts
 var SUPPORTED_AIBOT_MESSAGE_ACTIONS = /* @__PURE__ */ new Set(["unsend", "delete"]);
 function toSnakeCaseKey(key) {
@@ -1188,10 +1275,6 @@ function readStringishParam(params, key) {
   }
   return void 0;
 }
-function resolveDeleteSessionId(params) {
-  const direct = readStringParam(params.params, "sessionId") ?? readStringParam(params.params, "to") ?? params.currentChannelId;
-  return normalizeAibotSessionTarget(direct ?? "");
-}
 var aibotMessageActions = {
   listActions: ({ cfg }) => {
     const hasConfiguredAccount = listAibotAccountIds(cfg).map((accountId) => resolveAibotAccount({ cfg, accountId })).some((account) => account.enabled && account.configured);
@@ -1211,8 +1294,12 @@ var aibotMessageActions = {
     if (!messageId) {
       throw new Error("Clawpool unsend requires messageId.");
     }
-    const sessionId = resolveDeleteSessionId({
-      params,
+    const sessionId = await resolveAibotDeleteTarget({
+      client,
+      accountId: account.accountId,
+      sessionId: readStringishParam(params, "sessionId"),
+      to: readStringishParam(params, "to"),
+      topic: readStringishParam(params, "topic"),
       currentChannelId: toolContext?.currentChannelId
     });
     if (!sessionId) {
@@ -1351,6 +1438,56 @@ function buildBodyWithQuotedReplyId(rawBody, quotedMessageId) {
 ${rawBody}`;
 }
 
+// src/revoke-event.ts
+function toStringId(value) {
+  return String(value ?? "").trim();
+}
+function resolveChatType(sessionType) {
+  if (sessionType === 1) {
+    return "direct";
+  }
+  if (sessionType === 2) {
+    return "group";
+  }
+  throw new Error(`clawpool revoke event has unsupported session_type=${sessionType}`);
+}
+function enqueueRevokeSystemEvent(params) {
+  const sessionId = toStringId(params.event.session_id);
+  const messageId = toStringId(params.event.msg_id);
+  const senderId = toStringId(params.event.sender_id);
+  const sessionType = Number(params.event.session_type);
+  if (!sessionId || !messageId) {
+    throw new Error(
+      `invalid event_revoke payload: session_id=${sessionId || "<empty>"} msg_id=${messageId || "<empty>"}`
+    );
+  }
+  const chatType = resolveChatType(sessionType);
+  const route = params.core.channel.routing.resolveAgentRoute({
+    cfg: params.config,
+    channel: "clawpool",
+    accountId: params.account.accountId,
+    peer: {
+      kind: chatType,
+      id: sessionId
+    }
+  });
+  const metadataParts = [`session_id=${sessionId}`, `msg_id=${messageId}`];
+  if (senderId) {
+    metadataParts.push(`sender_id=${senderId}`);
+  }
+  const text = `Clawpool ${chatType} message deleted [${metadataParts.join(" ")}]`;
+  params.core.system.enqueueSystemEvent(text, {
+    sessionKey: route.sessionKey,
+    contextKey: `clawpool:revoke:${sessionId}:${messageId}`
+  });
+  return {
+    messageId,
+    sessionId,
+    sessionKey: route.sessionKey,
+    text
+  };
+}
+
 // src/monitor.ts
 var activeMonitorClients = /* @__PURE__ */ new Map();
 function registerActiveMonitor(accountId, client) {
@@ -1376,7 +1513,7 @@ function clearActiveMonitor(accountId, client) {
   }
   activeMonitorClients.delete(accountId);
 }
-function toStringId(value) {
+function toStringId2(value) {
   const text = String(value ?? "").trim();
   return text;
 }
@@ -1391,7 +1528,7 @@ function toTimestampMs(value) {
   return Math.floor(n);
 }
 function normalizeNumericMessageId(value) {
-  const raw = toStringId(value);
+  const raw = toStringId2(value);
   if (!raw) {
     return void 0;
   }
@@ -1572,8 +1709,8 @@ async function bindSessionRouteMapping(params) {
 async function processEvent(params) {
   const { event, account, config, runtime: runtime2, client, statusSink } = params;
   const core = getAibotRuntime();
-  const sessionId = toStringId(event.session_id);
-  const messageSid = toStringId(event.msg_id);
+  const sessionId = toStringId2(event.session_id);
+  const messageSid = toStringId2(event.msg_id);
   const rawBody = String(event.content ?? "").trim();
   if (!sessionId || !messageSid || !rawBody) {
     const reason = `invalid event_msg payload: session_id=${sessionId || "<empty>"} msg_id=${messageSid || "<empty>"}`;
@@ -1581,10 +1718,10 @@ async function processEvent(params) {
     statusSink?.({ lastError: reason });
     return;
   }
-  const eventId = toStringId(event.event_id);
+  const eventId = toStringId2(event.event_id);
   const quotedMessageId = normalizeNumericMessageId(event.quoted_message_id);
   const bodyForAgent = buildBodyWithQuotedReplyId(rawBody, quotedMessageId);
-  const senderId = toStringId(event.sender_id);
+  const senderId = toStringId2(event.sender_id);
   const isGroup = Number(event.session_type ?? 0) === 2 || String(event.event_type ?? "").startsWith("group_");
   const chatType = isGroup ? "group" : "direct";
   const createdAt = toTimestampMs(event.created_at);
@@ -1933,6 +2070,27 @@ async function monitorAibotProvider(options) {
         runtime2.error(`[clawpool:${account.accountId}] process event failed: ${msg}`);
         guardedStatusSink({ lastError: msg });
       });
+    },
+    onEventRevoke: (event) => {
+      if (!isActiveMonitor(account.accountId, client)) {
+        return;
+      }
+      guardedStatusSink({ lastInboundAt: Date.now() });
+      try {
+        const revokeEvent = enqueueRevokeSystemEvent({
+          core: getAibotRuntime(),
+          event,
+          account,
+          config
+        });
+        runtime2.log(
+          `[clawpool:${account.accountId}] inbound revoke sessionId=${revokeEvent.sessionId} messageSid=${revokeEvent.messageId} routeSessionKey=${revokeEvent.sessionKey}`
+        );
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        runtime2.error(`[clawpool:${account.accountId}] process revoke event failed: ${msg}`);
+        guardedStatusSink({ lastError: msg });
+      }
     }
   });
   const previousClient = registerActiveMonitor(account.accountId, client);
@@ -2181,85 +2339,12 @@ var clawpoolOnboardingAdapter = {
   })
 };
 
-// src/target-resolver.ts
-var aibotSessionIDPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-function isAibotSessionID(value) {
-  const normalized = String(value ?? "").trim();
-  if (!normalized) {
-    return false;
-  }
-  return aibotSessionIDPattern.test(normalized);
-}
-function normalizeAibotSessionTarget2(raw) {
-  const trimmed = String(raw ?? "").trim();
-  if (!trimmed) {
-    return "";
-  }
-  return trimmed.replace(/^clawpool:/i, "").replace(/^session:/i, "").trim();
-}
-function buildRouteSessionKeyCandidates(rawTarget, normalizedTarget) {
-  if (rawTarget === normalizedTarget) {
-    return [rawTarget];
-  }
-  return [rawTarget, normalizedTarget].filter((candidate) => candidate.length > 0);
-}
-async function resolveAibotOutboundTarget(params) {
-  const rawTarget = String(params.to ?? "").trim();
-  if (!rawTarget) {
-    throw new Error("clawpool outbound target must be non-empty");
-  }
-  const normalizedTarget = normalizeAibotSessionTarget2(rawTarget);
-  if (!normalizedTarget) {
-    throw new Error("clawpool outbound target must contain session_id or route_session_key");
-  }
-  if (isAibotSessionID(normalizedTarget)) {
-    return {
-      sessionId: normalizedTarget,
-      rawTarget,
-      normalizedTarget,
-      resolveSource: "direct"
-    };
-  }
-  if (/^\d+$/.test(normalizedTarget)) {
-    throw new Error(
-      `clawpool outbound target "${rawTarget}" is numeric; expected session_id(UUID) or route.sessionKey`
-    );
-  }
-  const routeSessionKeyCandidates = buildRouteSessionKeyCandidates(rawTarget, normalizedTarget);
-  let lastResolveError = null;
-  for (const routeSessionKey of routeSessionKeyCandidates) {
-    try {
-      const ack = await params.client.resolveSessionRoute("clawpool", params.accountId, routeSessionKey);
-      const sessionId = String(ack.session_id ?? "").trim();
-      if (!isAibotSessionID(sessionId)) {
-        throw new Error(
-          `session_route_resolve returned invalid session_id for route_session_key="${routeSessionKey}"`
-        );
-      }
-      return {
-        sessionId,
-        rawTarget,
-        normalizedTarget,
-        resolveSource: "sessionRouteMap"
-      };
-    } catch (err) {
-      lastResolveError = err instanceof Error ? err : new Error(String(err));
-    }
-  }
-  if (lastResolveError) {
-    throw new Error(
-      `clawpool outbound target resolve failed target="${rawTarget}" accountId=${params.accountId}: ${lastResolveError.message}`
-    );
-  }
-  throw new Error(`clawpool outbound target resolve failed target="${rawTarget}" accountId=${params.accountId}`);
-}
-
 // src/channel.ts
 var meta = {
   id: "clawpool",
   label: "Clawpool",
   selectionLabel: "Clawpool",
-  blurb: "Bridge OpenClaw to Clawpool over the Aibot Agent API WebSocket.",
+  blurb: "Bridge OpenClaw to Clawpool over the ClawPool Agent API WebSocket.",
   aliases: ["cp", "clowpool"],
   order: 90
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhfpub/clawpool",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "OpenClaw channel plugin for ClawPool",
   "type": "module",
   "main": "./dist/index.js",
@@ -52,7 +52,7 @@
       "id": "clawpool",
       "label": "Clawpool",
       "selectionLabel": "Clawpool",
-      "blurb": "Bridge OpenClaw to Clawpool over the Aibot Agent API WebSocket.",
+      "blurb": "Bridge OpenClaw to Clawpool over the ClawPool Agent API WebSocket.",
       "aliases": [
         "cp",
         "clowpool"