@yaoyuanchao/dingtalk 1.7.0 → 1.7.1

package/package.json

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

package/src/api.ts

@@ -882,6 +882,73 @@ export async function recallGroupMessages(params: {
  * Typing indicator helper - sends a "thinking" message that will be recalled
  * Returns a cleanup function to recall the message
  */
+// ============================================================================
+// Emotion Reaction API - add/recall emoji reactions on user messages
+// Cleaner UX than typing indicators: reaction floats on the message itself
+// ============================================================================
+
+export async function addEmotionReply(params: {
+  clientId: string;
+  clientSecret: string;
+  robotCode: string;
+  msgId: string;
+  conversationId: string;
+  emotionName?: string;
+}): Promise<{ cleanup: () => Promise<void>; error?: string }> {
+  const emotionName = params.emotionName || '🤔思考中';
+  try {
+    const token = await getDingTalkAccessToken(params.clientId, params.clientSecret);
+    const res = await jsonPost(
+      `${DINGTALK_API_BASE}/robot/emotion/reply`,
+      {
+        robotCode: params.robotCode,
+        openMsgId: params.msgId,
+        openConversationId: params.conversationId,
+        emotionType: 2,
+        emotionName,
+        textEmotion: {
+          emotionId: "2659900",
+          emotionName,
+          text: emotionName,
+          backgroundId: "im_bg_1",
+        },
+      },
+      { "x-acs-dingtalk-access-token": token },
+    );
+
+    if (res?.errcode && res.errcode !== 0) {
+      return { cleanup: async () => {}, error: `emotion reply failed: ${res.errmsg || res.errcode}` };
+    }
+
+    return {
+      cleanup: async () => {
+        try {
+          const t = await getDingTalkAccessToken(params.clientId, params.clientSecret);
+          await jsonPost(
+            `${DINGTALK_API_BASE}/robot/emotion/recall`,
+            {
+              robotCode: params.robotCode,
+              openMsgId: params.msgId,
+              openConversationId: params.conversationId,
+              emotionType: 2,
+              emotionName,
+              textEmotion: {
+                emotionId: "2659900",
+                emotionName,
+                text: emotionName,
+                backgroundId: "im_bg_1",
+              },
+            },
+            { "x-acs-dingtalk-access-token": t },
+          );
+        } catch (_) { /* best-effort recall */ }
+      },
+    };
+  } catch (err) {
+    return { cleanup: async () => {}, error: String(err) };
+  }
+}
+
 export async function sendTypingIndicator(params: {
   clientId: string;
   clientSecret: string;

package/src/monitor.ts

@@ -1,5 +1,5 @@
 import type { DingTalkRobotMessage, ResolvedDingTalkAccount, ExtractedMessage } from "./types.js";
-import { sendViaSessionWebhook, sendMarkdownViaSessionWebhook, sendDingTalkRestMessage, batchGetUserInfo, downloadPicture, downloadMediaFile, cleanupOldMedia, uploadMediaFile, sendFileMessage, textToMarkdownFile, sendTypingIndicator } from "./api.js";
+import { sendViaSessionWebhook, sendMarkdownViaSessionWebhook, sendDingTalkRestMessage, batchGetUserInfo, downloadPicture, downloadMediaFile, cleanupOldMedia, uploadMediaFile, sendFileMessage, textToMarkdownFile, sendTypingIndicator, addEmotionReply } from "./api.js";
 import { getDingTalkRuntime } from "./runtime.js";
 import { cacheInboundDownloadCode, getCachedDownloadCode } from "./quoted-msg-cache.js";
 import { resolveQuotedFile } from "./quoted-file-service.js";
@@ -1448,30 +1448,55 @@ async function dispatchMessageInternal(params: {
   // Typing indicator cleanup function (will be called after dispatch completes)
   let typingCleanup: (() => Promise<void>) | null = null;
 
-  // Send typing indicator (recallable) if enabled
-  // This replaces the old showThinking feature with a better UX - the indicator disappears when reply arrives
+  // Send thinking feedback: prefer emotion reaction (clean UX, floats on message),
+  // fall back to typing indicator (separate message) if emotion API fails or msgId unavailable.
   if (account.config.typingIndicator !== false && account.clientId && account.clientSecret) {
-    try {
-      const typingMessage = account.config.typingIndicatorMessage || '⏳ 思考中...';
-      const robotCode = account.robotCode || account.clientId;
-      
-      const result = await sendTypingIndicator({
-        clientId: account.clientId,
-        clientSecret: account.clientSecret,
-        robotCode,
-        userId: isDm ? senderId : undefined,
-        conversationId: !isDm ? conversationId : undefined,
-        message: typingMessage,
-      });
-      
-      if (result.error) {
-        log?.info?.('[dingtalk] Typing indicator failed: ' + result.error);
-      } else {
-        typingCleanup = result.cleanup;
-        log?.info?.('[dingtalk] Typing indicator sent (will be recalled on reply)');
+    const robotCode = account.robotCode || account.clientId;
+    let emotionOk = false;
+
+    // Try emotion reaction first (requires msgId + conversationId)
+    if (msg.msgId && conversationId) {
+      try {
+        const result = await addEmotionReply({
+          clientId: account.clientId,
+          clientSecret: account.clientSecret,
+          robotCode,
+          msgId: msg.msgId,
+          conversationId,
+        });
+        if (!result.error) {
+          typingCleanup = result.cleanup;
+          emotionOk = true;
+          log?.info?.('[dingtalk] Emotion reaction added (will be recalled on reply)');
+        } else {
+          log?.info?.('[dingtalk] Emotion reaction failed: ' + result.error + ', falling back to typing indicator');
+        }
+      } catch (err) {
+        log?.info?.('[dingtalk] Emotion reaction error: ' + err + ', falling back to typing indicator');
+      }
+    }
+
+    // Fallback to typing indicator (separate message)
+    if (!emotionOk) {
+      try {
+        const typingMessage = account.config.typingIndicatorMessage || '⏳ 思考中...';
+        const result = await sendTypingIndicator({
+          clientId: account.clientId,
+          clientSecret: account.clientSecret,
+          robotCode,
+          userId: isDm ? senderId : undefined,
+          conversationId: !isDm ? conversationId : undefined,
+          message: typingMessage,
+        });
+        if (!result.error) {
+          typingCleanup = result.cleanup;
+          log?.info?.('[dingtalk] Typing indicator sent (will be recalled on reply)');
+        } else {
+          log?.info?.('[dingtalk] Typing indicator failed: ' + result.error);
+        }
+      } catch (err) {
+        log?.info?.('[dingtalk] Typing indicator error: ' + err);
       }
-    } catch (err) {
-      log?.info?.('[dingtalk] Typing indicator error: ' + err);
     }
   }
   // Legacy: Send thinking feedback (opt-in, non-recallable) - only if typingIndicator is explicitly disabled