openclaw-channel-dmwork 0.2.12 → 0.2.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-channel-dmwork",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "description": "DMWork channel plugin for OpenClaw via WuKongIM WebSocket",
   "main": "index.ts",
   "type": "module",

package/src/channel.ts

@@ -217,7 +217,7 @@ export const dmworkPlugin: ChannelPlugin<ResolvedDmworkAccount> = {
             log,
             statusSink,
           }).catch((err) => {
-            log?.error?.(`dmwork: inbound handler failed: ${String(err)}`);
+            log?.error?.(`dmwork: inbound handler failed: ${err instanceof Error ? err.stack ?? String(err) : String(err)}`);
           });
         },
 
@@ -262,32 +262,29 @@ export const dmworkPlugin: ChannelPlugin<ResolvedDmworkAccount> = {
 
       socket.connect();
 
-      // Handle abort signal
-      const onAbort = () => {
-        stopped = true;
-        socket.disconnect();
-        if (heartbeatTimer) { clearInterval(heartbeatTimer); heartbeatTimer = null; }
-      };
-
-      if (ctx.abortSignal.aborted) {
-        onAbort();
-      } else {
-        ctx.abortSignal.addEventListener("abort", onAbort, { once: true });
-      }
-
-      return {
-        stop: () => {
+      // Keep Promise pending until stopped — gateway treats resolve as "account stopped"
+      return new Promise((resolve) => {
+        const cleanup = () => {
+          if (stopped) return;
           stopped = true;
           socket.disconnect();
           if (heartbeatTimer) { clearInterval(heartbeatTimer); heartbeatTimer = null; }
-            ctx.abortSignal.removeEventListener("abort", onAbort);
           ctx.setStatus({
             accountId: account.accountId,
             running: false,
             lastStopAt: Date.now(),
           });
-        },
-      };
+          resolve({
+            stop: () => { /* already cleaned up */ },
+          });
+        };
+
+        if (ctx.abortSignal.aborted) {
+          cleanup();
+        } else {
+          ctx.abortSignal.addEventListener("abort", cleanup, { once: true });
+        }
+      });
     },
   },
 };

package/src/inbound.ts

@@ -6,8 +6,7 @@ import { ChannelType, MessageType } from "./types.js";
 import { getDmworkRuntime } from "./runtime.js";
 
 // Defensive imports — these may not exist in older OpenClaw versions
-let recordPendingHistoryEntryIfEnabled: any;
-let buildPendingHistoryContextFromMap: any;
+// History context managed manually for cross-SDK compatibility
 let clearHistoryEntriesIfEnabled: any;
 let DEFAULT_GROUP_HISTORY_LIMIT = 20;
 let _sdkLoaded = false;
@@ -17,12 +16,8 @@ async function ensureSdkLoaded() {
   _sdkLoaded = true;
   try {
     const sdk = await import("openclaw/plugin-sdk");
-    if (typeof sdk.recordPendingHistoryEntryIfEnabled === "function") {
-      recordPendingHistoryEntryIfEnabled = sdk.recordPendingHistoryEntryIfEnabled;
-    }
-    if (typeof sdk.buildPendingHistoryContextFromMap === "function") {
-      buildPendingHistoryContextFromMap = sdk.buildPendingHistoryContextFromMap;
-    }
+    // History context managed manually (SDK buildPendingHistoryContextFromMap
+    // has incompatible entry format expectations across versions)
     if (typeof sdk.clearHistoryEntriesIfEnabled === "function") {
       clearHistoryEntriesIfEnabled = sdk.clearHistoryEntriesIfEnabled;
     }
@@ -95,33 +90,18 @@ export async function handleInboundMessage(params: {
     const isMentioned = mentionAll || mentionUids.includes(botUid);
 
     if (!isMentioned) {
-      // Record as pending history — with fallback for older SDK
-      if (typeof recordPendingHistoryEntryIfEnabled === "function") {
-        recordPendingHistoryEntryIfEnabled({
-          historyMap: groupHistories,
-          historyKey: sessionId,
-          entry: {
-            sender: message.from_uid,
-            body: rawBody,
-            timestamp: message.timestamp ? message.timestamp * 1000 : Date.now(),
-          },
-          limit: DEFAULT_GROUP_HISTORY_LIMIT,
-        });
-      } else {
-        // Manual fallback: store history in the map directly
-        if (!groupHistories.has(sessionId)) {
-          groupHistories.set(sessionId, []);
-        }
-        const entries = groupHistories.get(sessionId)!;
-        entries.push({
-          sender: message.from_uid,
-          body: rawBody,
-          timestamp: message.timestamp ? message.timestamp * 1000 : Date.now(),
-        });
-        // Trim to limit
-        while (entries.length > DEFAULT_GROUP_HISTORY_LIMIT) {
-          entries.shift();
-        }
+      // Record as pending history context (manual — avoids SDK format incompatibility)
+      if (!groupHistories.has(sessionId)) {
+        groupHistories.set(sessionId, []);
+      }
+      const entries = groupHistories.get(sessionId)!;
+      entries.push({
+        sender: message.from_uid,
+        body: rawBody,
+        timestamp: message.timestamp ? message.timestamp * 1000 : Date.now(),
+      });
+      while (entries.length > DEFAULT_GROUP_HISTORY_LIMIT) {
+        entries.shift();
       }
       log?.info?.(
         `dmwork: group message not mentioning bot, recorded as history context`,
@@ -129,26 +109,14 @@ export async function handleInboundMessage(params: {
       return;
     }
 
-    // Bot IS mentioned — prepend history context
-    if (typeof buildPendingHistoryContextFromMap === "function") {
-      const enrichedBody = buildPendingHistoryContextFromMap({
-        historyMap: groupHistories,
-        historyKey: sessionId,
-        currentMessage: rawBody,
-        limit: DEFAULT_GROUP_HISTORY_LIMIT,
-      });
-      if (enrichedBody !== rawBody) {
-        historyPrefix = enrichedBody.slice(0, enrichedBody.length - rawBody.length);
-        log?.info?.(`dmwork: prepending history context (${historyPrefix.length} chars)`);
-      }
-    } else {
-      // Manual fallback: build history prefix
+    // Bot IS mentioned — prepend history context (manual — avoids SDK format incompatibility)
+    {
       const entries = groupHistories.get(sessionId) ?? [];
       if (entries.length > 0) {
         historyPrefix = entries
           .map((e: any) => `[${e.sender}]: ${e.body}`)
           .join("\n") + "\n---\n";
-        log?.info?.(`dmwork: prepending history context (${historyPrefix.length} chars, fallback)`);
+        log?.info?.(`dmwork: prepending history context (${historyPrefix.length} chars)`);
       }
     }