@soimy/dingtalk 3.6.3 → 3.6.4

package/dist/index.js

@@ -9584,6 +9584,7 @@ function createCardReplyStrategy(ctx) {
   let sawFinalDelivery = false;
   let latestReasoningSnapshot = "";
   let pendingNonImageMedia = [];
+  const processedMediaUrls = /* @__PURE__ */ new Set();
   const getRenderedTimeline = (options = {}) => {
     const fallbackAnswer = finalTextForFallback || (sawFinalDelivery ? EMPTY_FINAL_REPLY : void 0);
     return controller.getRenderedContent({
@@ -9752,6 +9753,11 @@ function createCardReplyStrategy(ctx) {
       if (candidate.classification !== "local") {
         continue;
       }
+      if (processedMediaUrls.has(candidate.url.trim())) {
+        const placeholder = buildImagePlaceholderText({ alt: candidate.alt, url: candidate.url });
+        nextText = `${nextText.slice(0, candidate.start)}${placeholder}${nextText.slice(candidate.end)}`;
+        continue;
+      }
       let prepared;
       try {
         prepared = await prepareMediaInput(candidate.url, log, config.mediaUrlAllowlist);
@@ -9764,6 +9770,7 @@ function createCardReplyStrategy(ctx) {
         if (!result?.mediaId) {
           continue;
         }
+        processedMediaUrls.add(candidate.url.trim());
         const placeholder = buildImagePlaceholderText({ alt: candidate.alt, url: candidate.url });
         const blockText = candidate.alt.trim() || placeholder.replace(/^见下图/, "").trim() || "\u56FE\u7247";
         successfulReroutes.push({
@@ -9863,6 +9870,10 @@ function createCardReplyStrategy(ctx) {
         );
         if (payload.mediaUrls.length > 0) {
           for (const url of payload.mediaUrls) {
+            const normalizedUrl = url.trim();
+            if (processedMediaUrls.has(normalizedUrl)) {
+              continue;
+            }
             try {
               const prepared = await prepareMediaInput(url, log, config.mediaUrlAllowlist);
               const mediaType = resolveOutboundMediaType({ mediaPath: prepared.path, asVoice: false });
@@ -9877,6 +9888,7 @@ function createCardReplyStrategy(ctx) {
               const result = await uploadMedia2(config, prepared.path, "image", log);
               await prepared.cleanup?.();
               if (result?.mediaId) {
+                processedMediaUrls.add(normalizedUrl);
                 await controller.appendImageBlock(result.mediaId);
               }
             } catch (err) {
@@ -9935,6 +9947,10 @@ function createCardReplyStrategy(ctx) {
       }
       if (payload.mediaUrls.length > 0) {
         for (const url of payload.mediaUrls) {
+          const normalizedUrl = url.trim();
+          if (processedMediaUrls.has(normalizedUrl)) {
+            continue;
+          }
           try {
             const prepared = await prepareMediaInput(url, log, config.mediaUrlAllowlist);
             const mediaType = resolveOutboundMediaType({ mediaPath: prepared.path, asVoice: false });
@@ -9947,6 +9963,7 @@ function createCardReplyStrategy(ctx) {
             const result = await uploadMedia2(config, prepared.path, "image", log);
             await prepared.cleanup?.();
             if (result?.mediaId) {
+              processedMediaUrls.add(normalizedUrl);
               await controller.appendImageBlock(result.mediaId);
             }
           } catch (err) {
@@ -10556,46 +10573,61 @@ function buildAgentSessionKey(params) {
     identityLinks: cfg.session?.identityLinks
   }).toLowerCase();
 }
-function sanitizeAgentName(name) {
-  return name.replace(/[[\]\r\n]/g, "").trim();
-}
-async function resolveSubAgentRoute(params) {
-  const { extractedContent, cfg, isGroup, dingtalkConfig, sessionWebhook, senderId, log } = params;
+function resolveMessageTarget(params) {
+  const { extractedContent, cfg, isGroup } = params;
   const atMentions = extractedContent.atMentions || [];
-  const atUserDingtalkIds = isGroup ? extractedContent.atUserDingtalkIds : void 0;
+  if (atMentions.length === 0 || !cfg.agents?.list || cfg.agents.list.length === 0) {
+    return { kind: "default" };
+  }
   const textForCommandCheck = extractedContent.text.replace(/^\[引用[^\]]*\]\s*/, "");
-  const isLearnCommand = parseLearnCommand(textForCommandCheck).scope !== "unknown";
-  const textWithoutMentions = textForCommandCheck.replace(/^(?:@\S+\s+)*/u, "").trim();
-  const isSlashCommand = maybeResolveTextAlias(textWithoutMentions, cfg) !== null;
-  if (atMentions.length === 0 || !cfg.agents?.list || cfg.agents.list.length === 0 || isLearnCommand || isSlashCommand) {
-    return null;
+  if (parseLearnCommand(textForCommandCheck).scope !== "unknown") {
+    return { kind: "default" };
   }
-  const { matchedAgents, unmatchedNames, realUserCount, hasInvalidAgentNames } = resolveAtAgents(
+  const atUserDingtalkIds = isGroup ? extractedContent.atUserDingtalkIds : void 0;
+  const { matchedAgents, unmatchedNames, hasInvalidAgentNames } = resolveAtAgents(
     atMentions,
     cfg,
     atUserDingtalkIds
   );
-  log?.info?.(
-    `[DingTalk] Sub-agent resolve: matched=${matchedAgents.map((a) => a.agentId).join(",")} unmatched=${unmatchedNames.join(",")} realUsers=${realUserCount}`
-  );
-  if (hasInvalidAgentNames) {
-    const fallbackReason = `\u672A\u627E\u5230\u540D\u4E3A"${unmatchedNames.join("\u3001")}"\u7684\u52A9\u624B`;
-    try {
-      const sendOptions = isGroup ? { atUserId: senderId, log } : { log };
-      await sendBySession(dingtalkConfig, sessionWebhook, `\u26A0\uFE0F ${fallbackReason}`, {
-        ...sendOptions
-      });
-    } catch (err) {
-      log?.debug?.(`[DingTalk] Failed to send fallback notice: ${getErrorMessage(err)}`);
+  const commandText = textForCommandCheck.replace(/^(?:@\S+\s+)*/u, "").trim();
+  if (maybeResolveTextAlias(commandText, cfg) !== null) {
+    const firstMatch = matchedAgents[0];
+    if (firstMatch) {
+      return { kind: "subagent-command", agent: firstMatch, commandText };
     }
   }
-  if (matchedAgents.length === 0) {
-    return null;
+  if (matchedAgents.length === 0 && !hasInvalidAgentNames) {
+    return { kind: "default" };
+  }
+  return { kind: "subagent-content", matchedAgents, unmatchedNames, hasInvalidAgentNames };
+}
+function sanitizeAgentName(name) {
+  return name.replace(/[[\]\r\n]/g, "").trim();
+}
+async function sendUnmatchedAgentNotice(params) {
+  const { unmatchedNames, isGroup, senderId, dingtalkConfig, sessionWebhook, log } = params;
+  const fallbackReason = `\u672A\u627E\u5230\u540D\u4E3A"${unmatchedNames.join("\u3001")}"\u7684\u52A9\u624B`;
+  try {
+    const sendOptions = isGroup ? { atUserId: senderId, log } : { log };
+    await sendBySession(dingtalkConfig, sessionWebhook, `\u26A0\uFE0F ${fallbackReason}`, sendOptions);
+  } catch (err) {
+    log?.debug?.(`[DingTalk] Failed to send fallback notice: ${getErrorMessage(err)}`);
   }
-  return { matchedAgents };
 }
 async function dispatchSubAgents(params) {
-  const { matchedAgents, cfg, accountId, data, dingtalkConfig, sessionWebhook, extractedContent, handleMessage, downloadMedia: download, log } = params;
+  const {
+    matchedAgents,
+    commandText,
+    cfg,
+    accountId,
+    data,
+    dingtalkConfig,
+    sessionWebhook,
+    extractedContent,
+    handleMessage,
+    downloadMedia: download,
+    log
+  } = params;
   let preDownloadedMedia;
   const robotCode = resolveRobotCode(dingtalkConfig);
   if (robotCode) {
@@ -10630,18 +10662,17 @@ async function dispatchSubAgents(params) {
         dingtalkConfig,
         subAgentOptions: {
           agentId: agentMatch.agentId,
-          responsePrefix: `> \u{1F916} **${sanitizeAgentName(agentMatch.matchedName)}**:
+          responsePrefix: commandText ? "" : `> \u{1F916} **${sanitizeAgentName(agentMatch.matchedName)}**:
 
 `,
-          matchedName: agentMatch.matchedName
+          matchedName: agentMatch.matchedName,
+          commandText
         },
         preDownloadedMedia
       });
     } catch (error) {
       const message = getErrorMessage(error);
-      log?.error?.(
-        `[DingTalk] Sub-agent ${agentMatch.agentId} failed: ${message}`
-      );
+      log?.error?.(`[DingTalk] Sub-agent ${agentMatch.agentId} failed: ${message}`);
       if (error instanceof HostRoutingHelperUnavailableError && !helperMissingWarningSent) {
         helperMissingWarningSent = true;
         try {
@@ -11361,7 +11392,7 @@ async function handleDingTalkMessage(params) {
     return;
   }
   const rawInboundText = extractedContent.text.trim();
-  if (subAgentOptions) {
+  if (subAgentOptions && !subAgentOptions.commandText) {
     const cleanText = extractedContent.text.replace(/^\[引用[^\]]*\]\s*/, "");
     const contextHint = `[\u4F60\u88AB @ \u4E3A"${subAgentOptions.matchedName}"]
 
@@ -11539,36 +11570,62 @@ async function handleDingTalkMessage(params) {
     peerIdOverride,
     config: dingtalkConfig
   });
-  const route = subAgentOptions ? {
-    agentId: subAgentOptions.agentId,
-    sessionKey: buildAgentSessionKey({
-      rt,
-      cfg,
-      accountId,
+  const messageTarget = subAgentOptions ? null : resolveMessageTarget({ extractedContent, cfg, isGroup });
+  let route;
+  if (subAgentOptions) {
+    route = {
       agentId: subAgentOptions.agentId,
-      peerKind: sessionPeer.kind,
-      peerId: sessionPeer.peerId
-    }),
-    mainSessionKey: ""
-  } : rt.channel.routing.resolveAgentRoute({
-    cfg,
-    channel: "dingtalk",
-    accountId,
-    peer: { kind: sessionPeer.kind, id: sessionPeer.peerId }
-  });
-  if (!subAgentOptions) {
-    const subAgentRoute = await resolveSubAgentRoute({
-      extractedContent,
+      sessionKey: buildAgentSessionKey({
+        rt,
+        cfg,
+        accountId,
+        agentId: subAgentOptions.agentId,
+        peerKind: sessionPeer.kind,
+        peerId: sessionPeer.peerId
+      }),
+      mainSessionKey: ""
+    };
+  } else {
+    route = rt.channel.routing.resolveAgentRoute({
       cfg,
-      isGroup,
-      dingtalkConfig,
-      sessionWebhook,
-      senderId,
-      log
+      channel: "dingtalk",
+      accountId,
+      peer: { kind: sessionPeer.kind, id: sessionPeer.peerId }
     });
-    if (subAgentRoute) {
+  }
+  if (messageTarget && messageTarget.kind !== "default") {
+    if (messageTarget.kind === "subagent-command") {
+      await dispatchSubAgents({
+        matchedAgents: [messageTarget.agent],
+        commandText: messageTarget.commandText,
+        cfg,
+        accountId,
+        data,
+        dingtalkConfig,
+        sessionWebhook,
+        extractedContent,
+        handleMessage: handleDingTalkMessage,
+        downloadMedia,
+        log
+      });
+      return;
+    }
+    if (messageTarget.hasInvalidAgentNames) {
+      await sendUnmatchedAgentNotice({
+        unmatchedNames: messageTarget.unmatchedNames,
+        isGroup,
+        senderId,
+        dingtalkConfig,
+        sessionWebhook,
+        log
+      });
+    }
+    if (messageTarget.matchedAgents.length > 0) {
+      log?.info?.(
+        `[DingTalk] Sub-agent resolve: matched=${messageTarget.matchedAgents.map((a) => a.agentId).join(",")} unmatched=${messageTarget.unmatchedNames.join(",")}`
+      );
       await dispatchSubAgents({
-        ...subAgentRoute,
+        matchedAgents: messageTarget.matchedAgents,
         cfg,
         accountId,
         data,
@@ -11592,7 +11649,7 @@ async function handleDingTalkMessage(params) {
     dingtalkConfig,
     senderId,
     isDirect,
-    extractedText: extractedContent.text,
+    extractedText: subAgentOptions?.commandText ?? extractedContent.text,
     messageType: extractedContent.messageType,
     data: {
       conversationId: data.conversationId,
@@ -12215,6 +12272,7 @@ ${extracted.text}`;
     const inboundText = attachmentExtractedText ? `${inboundBody.trimEnd()}
 
 ${attachmentExtractedText}` : inboundBody;
+    const commandBody = subAgentOptions?.commandText ?? inboundText;
     const learningEnabled = isLearningEnabled(dingtalkConfig);
     const learningContextBlock = buildLearningContextBlock({
       enabled: learningEnabled,
@@ -12256,7 +12314,7 @@ ${attachmentExtractedText}` : inboundBody;
     const ctx = rt.channel.reply.finalizeInboundContext({
       Body: body,
       RawBody: inboundText,
-      CommandBody: inboundText,
+      CommandBody: commandBody,
       QuotedRef: quotedRef,
       QuotedRefJson: quotedRef ? JSON.stringify(quotedRef) : void 0,
       ReplyToId: quotedRuntimeContext?.replyToId,