@agentchatme/openclaw 0.6.13 → 0.6.15

package/dist/setup-entry.js

@@ -3,8 +3,10 @@ import { setSetupChannelEnabled, WizardCancelledError } from 'openclaw/plugin-sd
 import { readApiKeyFromEnv } from './credentials/read-env.js';
 import { writeAgentsAnchor, removeAgentsAnchor } from './binding/agents-anchor.js';
 import { z } from 'zod';
+import { waitUntilAbort } from 'openclaw/plugin-sdk/channel-lifecycle';
 import pino from 'pino';
 import { WebSocket } from 'ws';
+import { dispatchInboundDirectDmWithRuntime } from 'openclaw/plugin-sdk/direct-dm';
 import { AgentChatClient } from '@agentchatme/agentchat';
 import { Type } from '@sinclair/typebox';
 
@@ -1845,7 +1847,7 @@ var CircuitBreaker = class {
 };
 
 // src/version.ts
-var PACKAGE_VERSION = "0.6.13";
+var PACKAGE_VERSION = "0.6.15";
 
 // src/outbound.ts
 var DEFAULT_RETRY_POLICY = {
@@ -2374,8 +2376,6 @@ function unregisterRuntime(accountId, deadlineMs = Date.now() + 5e3) {
 function getRuntime(accountId) {
   return registry.get(accountId)?.runtime;
 }
-
-// src/binding/inbound-bridge.ts
 function createInboundBridge(deps) {
   return async function onInbound(event) {
     switch (event.kind) {
@@ -2412,8 +2412,8 @@ async function handleMessage(deps, event) {
   if (!body && !event.content.attachmentId && !event.content.data) {
     return;
   }
-  const dispatcher = deps.channelRuntime?.reply?.dispatchReplyWithBufferedBlockDispatcher;
-  if (typeof dispatcher !== "function") {
+  const channelRuntime = deps.channelRuntime;
+  if (!channelRuntime || typeof channelRuntime.reply?.dispatchReplyWithBufferedBlockDispatcher !== "function") {
     deps.logger.error(
       {
         event: "inbound_dispatch_unavailable",
@@ -2422,50 +2422,90 @@ async function handleMessage(deps, event) {
         conversationKind: event.conversationKind,
         sender: event.sender
       },
-      "channelRuntime.reply.dispatchReplyWithBufferedBlockDispatcher unavailable \u2014 message NOT dispatched to agent (will be redelivered on next sync)"
+      "channelRuntime unavailable \u2014 message NOT dispatched to agent (will be redelivered on next sync)"
     );
     return;
   }
   const recipientHandle = selfHandle ?? "me";
   const conversationLabel = event.conversationKind === "group" ? `group ${event.conversationId}` : `dm with @${senderHandle}`;
+  const sendReply = async (replyText) => {
+    if (!replyText) return;
+    const target = event.conversationKind === "group" ? { kind: "group", conversationId: event.conversationId } : { kind: "direct", to: senderHandle };
+    await deps.runtime.sendMessage({
+      ...target,
+      type: "text",
+      content: { text: replyText },
+      metadata: { reply_to: event.messageId }
+    });
+  };
+  const deliver2 = async (payload) => {
+    const replyText = payload.text ?? extractText(payload.blocks);
+    await sendReply(replyText);
+  };
   try {
-    const sessionKey = event.conversationKind === "group" ? `agentchat:${deps.accountId}:group:${event.conversationId}` : `agentchat:${deps.accountId}:dm:${senderHandle}`;
-    await dispatcher({
-      cfg: deps.gatewayCfg,
-      ctx: {
-        Body: body,
-        BodyForAgent: body,
-        RawBody: body,
-        CommandBody: body,
-        From: `@${senderHandle}`,
-        To: `@${recipientHandle}`,
-        SessionKey: sessionKey,
-        AccountId: deps.accountId,
-        ChatType: event.conversationKind === "group" ? "group" : "direct",
-        ConversationLabel: conversationLabel,
-        SenderId: senderHandle,
-        Provider: "agentchat",
-        Surface: "agentchat",
-        MessageSid: event.messageId,
-        MessageSidFull: event.messageId,
-        Timestamp: event.createdAt,
-        OriginatingChannel: "agentchat",
-        OriginatingTo: `@${recipientHandle}`
-      },
-      dispatcherOptions: {
-        deliver: async (payload) => {
-          const replyText = payload.text ?? extractText(payload.blocks);
-          if (!replyText) return;
-          const target = event.conversationKind === "group" ? { kind: "group", conversationId: event.conversationId } : { kind: "direct", to: senderHandle };
-          await deps.runtime.sendMessage({
-            ...target,
-            type: "text",
-            content: { text: replyText },
-            metadata: { reply_to: event.messageId }
-          });
+    if (event.conversationKind === "direct") {
+      await dispatchInboundDirectDmWithRuntime({
+        cfg: deps.gatewayCfg,
+        runtime: { channel: channelRuntime },
+        channel: "agentchat",
+        channelLabel: "AgentChat",
+        accountId: deps.accountId,
+        peer: { kind: "direct", id: senderHandle },
+        senderId: senderHandle,
+        senderAddress: `@${senderHandle}`,
+        recipientAddress: `@${recipientHandle}`,
+        conversationLabel,
+        rawBody: body,
+        messageId: event.messageId,
+        timestamp: typeof event.createdAt === "number" ? event.createdAt : Date.parse(event.createdAt),
+        provider: "agentchat",
+        surface: "agentchat",
+        deliver: deliver2,
+        onRecordError: (err3) => {
+          deps.logger.error(
+            { err: err3 instanceof Error ? err3.message : String(err3), messageId: event.messageId },
+            "recordInboundSession failed"
+          );
+        },
+        onDispatchError: (err3, info) => {
+          deps.logger.error(
+            {
+              err: err3 instanceof Error ? err3.message : String(err3),
+              messageId: event.messageId,
+              kind: info.kind
+            },
+            "inbound dispatch failed"
+          );
         }
-      }
-    });
+      });
+    } else {
+      const dispatcher = channelRuntime.reply.dispatchReplyWithBufferedBlockDispatcher;
+      const sessionKey = `agentchat:${deps.accountId}:group:${event.conversationId}`;
+      await dispatcher({
+        cfg: deps.gatewayCfg,
+        ctx: {
+          Body: body,
+          BodyForAgent: body,
+          RawBody: body,
+          CommandBody: body,
+          From: `@${senderHandle}`,
+          To: `@${recipientHandle}`,
+          SessionKey: sessionKey,
+          AccountId: deps.accountId,
+          ChatType: "group",
+          ConversationLabel: conversationLabel,
+          SenderId: senderHandle,
+          Provider: "agentchat",
+          Surface: "agentchat",
+          MessageSid: event.messageId,
+          MessageSidFull: event.messageId,
+          Timestamp: event.createdAt,
+          OriginatingChannel: "agentchat",
+          OriginatingTo: `@${recipientHandle}`
+        },
+        dispatcherOptions: { deliver: deliver2 }
+      });
+    }
   } catch (err3) {
     deps.logger.error(
       {
@@ -2604,17 +2644,15 @@ var agentchatGatewayAdapter = {
       gatewayCfg: ctx.cfg,
       selfHandle: account.config.agentHandle
     });
-    ctx.abortSignal.addEventListener(
-      "abort",
-      () => {
-        void unregisterRuntime(ctx.accountId, Date.now() + 5e3).catch((err3) => {
-          ctx.log?.error?.(
-            `[agentchat:${ctx.accountId}] unregisterRuntime failed on abort: ${err3 instanceof Error ? err3.message : String(err3)}`
-          );
-        });
-      },
-      { once: true }
-    );
+    await waitUntilAbort(ctx.abortSignal, async () => {
+      try {
+        await unregisterRuntime(ctx.accountId, Date.now() + 5e3);
+      } catch (err3) {
+        ctx.log?.error?.(
+          `[agentchat:${ctx.accountId}] unregisterRuntime failed on abort: ${err3 instanceof Error ? err3.message : String(err3)}`
+        );
+      }
+    });
   },
   async stopAccount(ctx) {
     await unregisterRuntime(ctx.accountId, Date.now() + 5e3);