@yaoyuanchao/dingtalk 1.7.2 → 1.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaoyuanchao/dingtalk",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "type": "module",
   "description": "DingTalk channel plugin for ClawdBot/OpenClaw with Stream Mode support",
   "license": "MIT",

package/src/monitor.ts

@@ -308,8 +308,11 @@ export async function startDingTalkMonitor(ctx: DingTalkMonitorContext): Promise
     touchActivity(); // Track message activity for heartbeat
 
     // Deduplication: skip messages already processed (e.g. re-delivered after reconnect)
+    // Check both protocol-level messageId AND business-level msgId, because
+    // DingTalk re-delivers with a NEW protocol messageId after reconnect but
+    // the same business msgId.
     if (isDuplicateMessage(protocolMsgId)) {
-      log?.info?.("[dingtalk] Duplicate message skipped: " + protocolMsgId);
+      log?.info?.("[dingtalk] Duplicate message skipped (protocol): " + protocolMsgId);
       return { status: "SUCCESS", message: "OK" };
     }
     markMessageProcessed(protocolMsgId);
@@ -317,6 +320,15 @@ export async function startDingTalkMonitor(ctx: DingTalkMonitorContext): Promise
     try {
       const data: DingTalkRobotMessage = typeof downstream.data === "string"
         ? JSON.parse(downstream.data) : downstream.data;
+
+      // Business-level dedup: same msgId re-delivered with different protocol ID
+      const bizMsgId = data.msgId;
+      if (bizMsgId && isDuplicateMessage('biz:' + bizMsgId)) {
+        log?.info?.("[dingtalk] Duplicate message skipped (bizMsgId): " + bizMsgId);
+        return { status: "SUCCESS", message: "OK" };
+      }
+      if (bizMsgId) markMessageProcessed('biz:' + bizMsgId);
+
       setStatus?.({ lastInboundAt: Date.now() });
       await processInboundMessage(data, ctx);
     } catch (err) {
@@ -1656,6 +1668,7 @@ async function dispatchWithFullPipeline(params: {
           log, setStatus, onFirstReply } = params;
   
   let firstReplyFired = false;
+  let typingSafetyTimeout: ReturnType<typeof setTimeout> | null = null;
 
   // 1. Resolve agent route via own bindings matching (like official plugin).
   // OpenClaw's resolveAgentRoute doesn't handle accountId correctly for multi-account.
@@ -1751,6 +1764,7 @@ async function dispatchWithFullPipeline(params: {
       // Recall typing indicator on first delivery
       if (!firstReplyFired && onFirstReply) {
         firstReplyFired = true;
+        if (typingSafetyTimeout) { clearTimeout(typingSafetyTimeout); typingSafetyTimeout = null; }
         await onFirstReply().catch((err) => {
           log?.info?.("[dingtalk] onFirstReply error: " + err);
         });
@@ -1778,12 +1792,20 @@ async function dispatchWithFullPipeline(params: {
     await rt.channel.reply.dispatchReplyFromConfig({ ctx, cfg, dispatcher, replyOptions });
   } finally {
     markDispatchIdle();
-    // Recall typing indicator if no reply was sent (queued or error).
-    // Note: when a message is queued (session has active run), dispatch returns
-    // quickly with no delivery — this is normal, not an error. The queued message
-    // will be processed after the current run completes.
+    // Don't recall typing immediately — dispatchReplyFromConfig resolves when
+    // dispatch is *initiated*, not when the agent finishes. The agent may still
+    // be doing tool calls for minutes before producing the first text reply.
+    // The deliver callback above handles the normal recall on first delivery.
+    // Set a safety timeout to recall if no delivery ever arrives (edge case).
     if (!firstReplyFired && onFirstReply) {
-      await onFirstReply().catch(() => {});
+      const TYPING_SAFETY_TIMEOUT_MS = 3 * 60 * 1000; // 3 minutes
+      typingSafetyTimeout = setTimeout(async () => {
+        if (!firstReplyFired && onFirstReply) {
+          firstReplyFired = true;
+          log?.info?.('[dingtalk] Typing safety timeout — recalling after no delivery');
+          await onFirstReply().catch(() => {});
+        }
+      }, TYPING_SAFETY_TIMEOUT_MS);
     }
   }