@yaoyuanchao/dingtalk 1.7.8 → 1.7.10

package/package.json

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

package/src/channel.ts

@@ -1,6 +1,6 @@
 import { getDingTalkRuntime } from './runtime.js';
 import { resolveDingTalkAccount, listDingTalkAccountIds, resolveDefaultDingTalkAccountId } from './accounts.js';
-import { startDingTalkMonitor } from './monitor.js';
+import { startDingTalkMonitor, getCachedReplyTarget, deliverReply } from './monitor.js';
 import { sendDingTalkRestMessage, uploadMediaFile, sendFileMessage, textToMarkdownFile } from './api.js';
 import { probeDingTalk } from './probe.js';
 
@@ -359,7 +359,17 @@ export const dingtalkPlugin = {
   actions: {
     // New SDK interface (2026.3.22+): replaces listActions
     describeMessageTool({ cfg }: { cfg: any }) {
-      return { actions: ['send', 'sendAttachment'] };
+      return {
+        actions: ['send', 'sendAttachment'],
+        instructions: [
+          'DingTalk @mention syntax: wrap staffId in <at:STAFFID> markers.',
+          'Example: "<at:0164546066>你好" sends a real @mention to that user.',
+          'The <at:...> marker is stripped from displayed text automatically.',
+          'Look up staffId: use "dws contact user search --query NAME --format json".',
+          'The message sender is auto-@mentioned in group replies (no marker needed for them).',
+          'IMPORTANT: Do NOT write @Name or at:id — only <at:STAFFID> with angle brackets works.',
+        ].join(' '),
+      };
     },
 
     // Legacy - kept for compatibility
@@ -374,7 +384,40 @@ export const dingtalkPlugin = {
     async handleAction(ctx: any) {
       const { action, params, cfg, accountId, conversationTarget } = ctx;
 
-      // Only handle sendAttachment action
+      // Handle 'send' action: route through deliverReply for sessionWebhook persona
+      if (action === 'send') {
+        const text = params?.text || params?.message;
+        if (!text) return null;
+
+        let target = params?.target || params?.to || conversationTarget;
+        if (!target) return null;
+
+        const { type, id } = parseOutboundTo(target);
+        const cacheKey = (type === 'dm' ? 'dm:' : 'group:') + id;
+        const cached = getCachedReplyTarget(cacheKey);
+
+        // Build a replyTarget — use cached sessionWebhook if available
+        const account = resolveDingTalkAccount({ cfg, accountId });
+        const replyTarget = cached
+          ? { ...cached, account } // refresh account credentials
+          : {
+              sessionWebhook: undefined,
+              sessionWebhookExpiry: 0,
+              conversationId: type === 'group' ? id : '',
+              senderId: type === 'dm' ? id : '',
+              isDm: type === 'dm',
+              account,
+            };
+
+        await deliverReply(replyTarget, text);
+        return {
+          ok: true,
+          channel: 'dingtalk',
+          content: [{ type: 'text', text: JSON.stringify({ ok: true, sent: true }) }],
+        };
+      }
+
+      // Only handle sendAttachment action below
       if (action !== 'sendAttachment') {
         return null; // Let SDK handle other actions
       }

package/src/monitor.ts

@@ -249,6 +249,30 @@ interface BufferedMessage {
 const messageBuffer = new Map<string, BufferedMessage>();
 const AGGREGATION_DELAY_MS = 2000; // 2 seconds - balance between UX and catching split messages
 
+// ============================================================================
+// Reply Target Cache — remember the latest replyTarget (with sessionWebhook)
+// per conversation so that proactive/cron sends can use the persona-preserving
+// sessionWebhook path instead of falling back to robot-identity REST API.
+// ============================================================================
+
+const replyTargetCache = new Map<string, any>();
+const REPLY_TARGET_CACHE_TTL_MS = 3 * 60 * 60 * 1000; // 3 hours
+
+function buildReplyTargetCacheKey(isDm: boolean, conversationId: string, senderId: string): string {
+  return isDm ? `dm:${senderId}` : `group:${conversationId}`;
+}
+
+/** Look up the most recent replyTarget for a conversation (for outbound/cron sends). */
+export function getCachedReplyTarget(cacheKey: string): any | undefined {
+  const entry = replyTargetCache.get(cacheKey);
+  if (!entry) return undefined;
+  if (Date.now() - entry._cachedAt > REPLY_TARGET_CACHE_TTL_MS) {
+    replyTargetCache.delete(cacheKey);
+    return undefined;
+  }
+  return entry;
+}
+
 // ============================================================================
 // Per-Session Message Queue - serializes dispatch to prevent concurrent
 // processing of messages in the same conversation. Uses Promise chaining:
@@ -1358,6 +1382,10 @@ async function processInboundMessage(
     account,
   };
 
+  // Cache replyTarget so proactive/cron sends can use sessionWebhook
+  const rtCacheKey = buildReplyTargetCacheKey(isDm, conversationId, senderId);
+  replyTargetCache.set(rtCacheKey, { ...replyTarget, _cachedAt: Date.now() });
+
   // Check if message aggregation is enabled
   const aggregationEnabled = account.config.messageAggregation !== false;
   const aggregationDelayMs = account.config.messageAggregationDelayMs ?? AGGREGATION_DELAY_MS;
@@ -1673,7 +1701,9 @@ async function dispatchMessageInternal(params: {
       // Fallback: existing buffered block dispatcher
       // Per-group system prompt for fallback path
       const _fallbackGroupsConfig = account?.config?.groups ?? {};
-      const _fallbackGroupSystemPrompt = isGroup ? (_fallbackGroupsConfig?.[conversationId]?.systemPrompt?.trim() || undefined) : undefined;
+      const _fallbackCustomPrompt = isGroup ? (_fallbackGroupsConfig?.[conversationId]?.systemPrompt?.trim() || undefined) : undefined;
+      const _AT_HINT = 'To @mention someone in this group, use <at:STAFFID> in your reply (e.g. "<at:0164546066>请查看"). Look up staffId with "dws contact user search --query NAME --format json". Do NOT write @Name — only <at:STAFFID> with angle brackets triggers a real DingTalk @mention. The sender is auto-@mentioned.';
+      const _fallbackGroupSystemPrompt = isGroup ? (_fallbackCustomPrompt ? `${_fallbackCustomPrompt}\n\n${_AT_HINT}` : _AT_HINT) : undefined;
 
       const ctxPayload = {
         Body: rawBody,
@@ -1831,7 +1861,9 @@ async function dispatchWithFullPipeline(params: {
   // 6a. Per-group system prompt (read from account.config.groups)
   const groupsConfig = account?.config?.groups ?? {};
   const groupOverride = !isDm ? (groupsConfig?.[conversationId] ?? {}) : {};
-  const groupSystemPrompt = !isDm ? (groupOverride?.systemPrompt?.trim() || undefined) : undefined;
+  const AT_MENTION_HINT = 'To @mention someone in this group, use <at:STAFFID> in your reply (e.g. "<at:0164546066>请查看"). Look up staffId with "dws contact user search --query NAME --format json". Do NOT write @Name — only <at:STAFFID> with angle brackets triggers a real DingTalk @mention. The sender is auto-@mentioned.';
+  const customGroupPrompt = !isDm ? (groupOverride?.systemPrompt?.trim() || undefined) : undefined;
+  const groupSystemPrompt = !isDm ? (customGroupPrompt ? `${customGroupPrompt}\n\n${AT_MENTION_HINT}` : AT_MENTION_HINT) : undefined;
 
   const ctx = rt.channel.reply.finalizeInboundContext({
     Body: body, RawBody: rawBody, CommandBody: rawBody, From: to, To: to,
@@ -1973,7 +2005,7 @@ function buildMarkdownPreviewTitle(text: string, fallback = "Jax"): string {
   return fallback;
 }
 
-async function deliverReply(target: any, text: string, log?: any): Promise<void> {
+export async function deliverReply(target: any, text: string, log?: any): Promise<void> {
   const now = Date.now();
   const chunkLimit = target.account.config.textChunkLimit ?? 2000;
   const messageFormat = target.account.config.messageFormat ?? "text";
@@ -2026,8 +2058,26 @@ async function deliverReply(target: any, text: string, log?: any): Promise<void>
     }
   }
 
-  // Auto @mention sender in group chats (only on first chunk to avoid spam)
-  const atUserIds = (!target.isDm && target.senderId) ? [target.senderId] : undefined;
+  // Parse <at:staffId> markers from agent response and collect explicit @mentions
+  const explicitAtIds: string[] = [];
+  const atPattern = /<at:([a-zA-Z0-9_]+)>/g;
+  // Strip markers from all chunks and collect staffIds
+  for (let i = 0; i < chunks.length; i++) {
+    let match;
+    while ((match = atPattern.exec(chunks[i])) !== null) {
+      if (!explicitAtIds.includes(match[1])) explicitAtIds.push(match[1]);
+    }
+    chunks[i] = chunks[i].replace(atPattern, '').replace(/  +/g, ' ').trim();
+  }
+  if (explicitAtIds.length > 0) {
+    log?.info?.("[dingtalk] Explicit @mentions parsed: " + JSON.stringify(explicitAtIds));
+  }
+
+  // Build atUserIds: explicit markers + auto-@ sender in group chats
+  const atUserIds: string[] = [...explicitAtIds];
+  if (!target.isDm && target.senderId && !atUserIds.includes(target.senderId)) {
+    atUserIds.push(target.senderId);
+  }
   let atApplied = false; // Only @ on the first chunk
 
   for (const chunk of chunks) {
@@ -2041,7 +2091,7 @@ async function deliverReply(target: any, text: string, log?: any): Promise<void>
           await throttleSend();
           log?.info?.("[dingtalk] Using sessionWebhook (attempt " + attempt + "/" + maxRetries + "), format=" + messageFormat);
           log?.info?.("[dingtalk] Sending text (" + chunk.length + " chars): " + chunk.substring(0, 200));
-          const currentAt = (!atApplied && atUserIds) ? atUserIds : undefined;
+          const currentAt = (!atApplied && atUserIds.length > 0) ? atUserIds : undefined;
           let sendResult: { ok: boolean; errcode?: number; errmsg?: string; processQueryKey?: string };
           if (isMarkdown) {
             const markdownTitle = buildMarkdownPreviewTitle(chunk, "Jax");