@soimy/dingtalk 3.4.2 → 3.5.1

package/src/onboarding.ts

@@ -115,9 +115,6 @@ function applyAccountConfig(params: {
   const payload: Partial<DingTalkConfig> = {
     ...(input.clientId ? { clientId: input.clientId } : {}),
     ...(input.clientSecret ? { clientSecret: input.clientSecret } : {}),
-    ...(input.robotCode ? { robotCode: input.robotCode } : {}),
-    ...(input.corpId ? { corpId: input.corpId } : {}),
-    ...(input.agentId ? { agentId: input.agentId } : {}),
     ...(input.dmPolicy ? { dmPolicy: input.dmPolicy } : {}),
     ...(input.groupPolicy ? { groupPolicy: input.groupPolicy } : {}),
     ...(input.allowFrom && input.allowFrom.length > 0 ? { allowFrom: input.allowFrom } : {}),
@@ -129,8 +126,6 @@ function applyAccountConfig(params: {
       ? { mediaUrlAllowlist: input.mediaUrlAllowlist }
       : {}),
     ...(input.messageType ? { messageType: input.messageType } : {}),
-    ...(input.cardTemplateId ? { cardTemplateId: input.cardTemplateId } : {}),
-    ...(input.cardTemplateKey ? { cardTemplateKey: input.cardTemplateKey } : {}),
     ...(typeof input.maxReconnectCycles === "number"
       ? { maxReconnectCycles: input.maxReconnectCycles }
       : {}),
@@ -192,7 +187,6 @@ function applyGenericSetupInput(params: {
       clientId: typeof params.input.token === "string" ? params.input.token.trim() : undefined,
       clientSecret:
         typeof params.input.password === "string" ? params.input.password.trim() : undefined,
-      robotCode: typeof params.input.code === "string" ? params.input.code.trim() : undefined,
     },
   });
 }
@@ -233,84 +227,22 @@ async function configureDingTalkAccount(params: {
     validate: (value: string) => (String(value ?? "").trim() ? undefined : "Required"),
   });
 
-  const wantsFullConfig = await prompter.confirm({
-    message: "Configure robot code, corp ID, and agent ID? (recommended for full features)",
-    initialValue: false,
-  });
-
-  let robotCode: string | undefined;
-  let corpId: string | undefined;
-  let agentId: string | undefined;
-
-  if (wantsFullConfig) {
-    robotCode =
-      String(
-        await prompter.text({
-          message: "Robot Code",
-          placeholder: "dingxxxxxxxx",
-          initialValue: resolved.robotCode ?? undefined,
-        }),
-      ).trim() || undefined;
-
-    corpId =
-      String(
-        await prompter.text({
-          message: "Corp ID",
-          placeholder: "dingxxxxxxxx",
-          initialValue: resolved.corpId ?? undefined,
-        }),
-      ).trim() || undefined;
-
-    agentId =
-      String(
-        await prompter.text({
-          message: "Agent ID",
-          placeholder: "123456789",
-          initialValue: resolved.agentId ? String(resolved.agentId) : undefined,
-        }),
-      ).trim() || undefined;
-  }
-
   const wantsCardMode = await prompter.confirm({
     message: "Enable AI interactive card mode? (for streaming AI responses)",
     initialValue: resolved.messageType === "card",
   });
 
-  let cardTemplateId: string | undefined;
-  let cardTemplateKey: string | undefined;
   let messageType: "markdown" | "card" = "markdown";
 
   if (wantsCardMode) {
     await prompter.note(
       [
-        "Create an AI card template in DingTalk Developer Console:",
-        "https://open-dev.dingtalk.com/fe/card",
-        "1. Go to 'My Templates' > 'Create Template'",
-        "2. Select 'AI Card' scenario",
-        "3. Design your card and publish",
-        "4. Copy the Template ID (e.g., xxx.schema)",
+        "AI interactive card mode now uses the built-in DingTalk template contract.",
+        "No manual Template ID or content field configuration is required.",
+        "Legacy cardTemplateId/cardTemplateKey config is deprecated and ignored.",
       ].join("\n"),
-      "Card Template Setup",
+      "Built-in AI Card Template",
     );
-
-    cardTemplateId =
-      String(
-        await prompter.text({
-          message: "Card Template ID",
-          placeholder: "xxxxx-xxxxx-xxxxx.schema",
-          initialValue: resolved.cardTemplateId ?? undefined,
-        }),
-      ).trim() || undefined;
-
-    cardTemplateKey =
-      String(
-        await prompter.text({
-          message: "Card Template Key (content field name)",
-          placeholder: "content",
-          initialValue: resolved.cardTemplateKey ?? "content",
-        }),
-      ).trim() || "content";
-
     messageType = "card";
   }
 
@@ -471,9 +403,6 @@ async function configureDingTalkAccount(params: {
     input: {
       clientId: String(clientId).trim(),
       clientSecret: String(clientSecret).trim(),
-      robotCode,
-      corpId,
-      agentId,
       dmPolicy: dmPolicyValue as "open" | "allowlist",
       groupPolicy: groupPolicyValue as "open" | "allowlist" | "disabled",
       allowFrom,
@@ -481,8 +410,6 @@ async function configureDingTalkAccount(params: {
       displayNameResolution: displayNameResolutionValue as "disabled" | "all",
       mediaUrlAllowlist,
       messageType,
-      cardTemplateId,
-      cardTemplateKey,
       maxReconnectCycles,
       mediaMaxMb,
       journalTTLDays,

package/src/reply-strategy-card.ts

@@ -8,23 +8,37 @@
 
 import {
   finishAICard,
-  formatContentForCard,
   isCardInTerminalState,
 } from "./card-service";
 import { createCardDraftController } from "./card-draft-controller";
+import { attachCardRunController } from "./card/card-run-registry";
 import type { DeliverPayload, ReplyOptions, ReplyStrategy, ReplyStrategyContext } from "./reply-strategy";
 import { sendBySession, sendMessage } from "./send-service";
 import type { AICardInstance } from "./types";
 import { AICardStatus } from "./types";
 import { formatDingTalkErrorPayloadLog } from "./utils";
 
+const FILE_ONLY_FALLBACK_ANSWER = "附件已发送，请查收。";
+
 export function createCardReplyStrategy(
-  ctx: ReplyStrategyContext & { card: AICardInstance },
+  ctx: ReplyStrategyContext & { card: AICardInstance; isStopRequested?: () => boolean },
 ): ReplyStrategy {
-  const { card, config, log } = ctx;
+  const { card, config, log, isStopRequested } = ctx;
 
   const controller = createCardDraftController({ card, log });
+  if (card.outTrackId) {
+    attachCardRunController(card.outTrackId, controller);
+  }
   let finalTextForFallback: string | undefined;
+  let sawFinalDelivery = false;
+
+  const getRenderedTimeline = (options: { preferFinalAnswer?: boolean } = {}): string => {
+    const fallbackAnswer = finalTextForFallback || (sawFinalDelivery ? FILE_ONLY_FALLBACK_ANSWER : undefined);
+    return controller.getRenderedContent({
+      fallbackAnswer,
+      overrideAnswer: options.preferFinalAnswer ? finalTextForFallback : undefined,
+    });
+  };
 
   return {
     getReplyOptions(): ReplyOptions {
@@ -33,21 +47,24 @@ export function createCardReplyStrategy(
         // onPartialReply (real-time) or deliver(final) -> finishAICard.
         disableBlockStreaming: true,
 
-        onAssistantMessageStart: () => {
-          controller.notifyNewAssistantTurn();
+        onAssistantMessageStart: async () => {
+          if (isStopRequested?.()) {
+            return;
+          }
+          await controller.notifyNewAssistantTurn();
         },
 
         onPartialReply: config.cardRealTimeStream
-          ? (payload) => {
-              if (payload.text) {
-                controller.updateAnswer(payload.text);
+          ? async (payload) => {
+              if (payload.text && !isStopRequested?.()) {
+                await controller.updateAnswer(payload.text);
               }
             }
           : undefined,
 
-        onReasoningStream: (payload) => {
-          if (payload.text) {
-            controller.updateReasoning(payload.text);
+        onReasoningStream: async (payload) => {
+          if (payload.text && !isStopRequested?.()) {
+            await controller.updateThinking(payload.text);
           }
         },
       };
@@ -65,6 +82,7 @@ export function createCardReplyStrategy(
 
       // ---- final: defer to finalize, just save text ----
       if (payload.kind === "final") {
+        sawFinalDelivery = true;
         log?.info?.(
           `[DingTalk][Finalize] deliver(final) received — cardState=${card.state} ` +
           `textLen=${typeof textToSend === "string" ? textToSend.length : "null"} ` +
@@ -88,27 +106,10 @@ export function createCardReplyStrategy(
           log?.debug?.("[DingTalk] Card failed, skipping tool result (will send full reply on final)");
           return;
         }
-        await controller.flush();
-        await controller.waitForInFlight();
         log?.info?.(
           `[DingTalk] Tool result received, streaming to AI Card: ${(textToSend ?? "").slice(0, 100)}`,
         );
-        const toolText = typeof textToSend === "string" ? formatContentForCard(textToSend, "tool") : "";
-        if (toolText) {
-          const sendResult = await sendMessage(ctx.config, ctx.to, toolText, {
-            sessionWebhook: ctx.sessionWebhook,
-            atUserId: !ctx.isDirect ? ctx.senderId : null,
-            log,
-            card,
-            accountId: ctx.accountId,
-            storePath: ctx.storePath,
-            conversationId: ctx.groupId,
-            cardUpdateMode: "append",
-          });
-          if (!sendResult.ok) {
-            throw new Error(sendResult.error || "Tool stream send failed");
-          }
-        }
+        await controller.appendTool(textToSend ?? "");
         return;
       }
 
@@ -128,14 +129,24 @@ export function createCardReplyStrategy(
         `lastContent="${(controller.getLastContent() ?? "").slice(0, 80)}"`,
       );
 
+      if (isStopRequested?.()) {
+        log?.info?.("[DingTalk][Finalize] Skipping — card stop was requested");
+        return;
+      }
+
       if (card.state === AICardStatus.FINISHED) {
         log?.info?.("[DingTalk][Finalize] Skipping — card already FINISHED");
         return;
       }
 
+      if (card.state === AICardStatus.STOPPED) {
+        log?.info?.("[DingTalk][Finalize] Skipping — card already STOPPED");
+        return;
+      }
+
       // Card failed -> markdown fallback (bypass sendMessage to avoid duplicate card).
       if (card.state === AICardStatus.FAILED || controller.isFailed()) {
-        const fallbackText = finalTextForFallback
+        const fallbackText = getRenderedTimeline({ preferFinalAnswer: true })
           || controller.getLastAnswerContent()
           || controller.getLastContent()
           || card.lastStreamedContent;
@@ -164,13 +175,11 @@ export function createCardReplyStrategy(
       try {
         await controller.flush();
         await controller.waitForInFlight();
+        const finalText = getRenderedTimeline() || "✅ Done";
         controller.stop();
-        const finalText = controller.getLastAnswerContent()
-          || finalTextForFallback
-          || "✅ Done";
         log?.info?.(
           `[DingTalk][Finalize] Calling finishAICard — finalTextLen=${finalText.length} ` +
-          `source=${controller.getLastAnswerContent() ? "lastAnswerContent" : finalTextForFallback ? "finalTextForFallback" : "fallbackDone"} ` +
+          `source=${controller.getFinalAnswerContent() ? "timeline.answer" : sawFinalDelivery ? "timeline.fileOnly" : "fallbackDone"} ` +
           `preview="${finalText.slice(0, 120)}"`,
         );
         await finishAICard(card, finalText, log, {
@@ -219,7 +228,9 @@ export function createCardReplyStrategy(
     },
 
     getFinalText(): string | undefined {
-      return controller.getLastAnswerContent() || finalTextForFallback;
+      return controller.getFinalAnswerContent()
+        || finalTextForFallback
+        || (sawFinalDelivery ? FILE_ONLY_FALLBACK_ANSWER : undefined);
     },
   };
 }

package/src/reply-strategy.ts

@@ -20,9 +20,9 @@ export interface DeliverPayload {
 
 export interface ReplyOptions {
   disableBlockStreaming: boolean;
-  onPartialReply?: (payload: { text?: string }) => void;
-  onReasoningStream?: (payload: { text?: string }) => void;
-  onAssistantMessageStart?: () => void;
+  onPartialReply?: (payload: { text?: string }) => void | Promise<void>;
+  onReasoningStream?: (payload: { text?: string }) => void | Promise<void>;
+  onAssistantMessageStart?: () => void | Promise<void>;
 }
 
 export interface ReplyStrategy {
@@ -55,6 +55,7 @@ export interface ReplyStrategyContext {
   log?: Logger;
   replyQuotedRef?: QuotedRef;
   deliverMedia: (urls: string[]) => Promise<void>;
+  isStopRequested?: () => boolean;
 }
 
 // ---- Factory -----------------------------------------------------

package/src/send-service.ts

@@ -4,13 +4,17 @@ import { getAccessToken } from "./auth";
 import {
   isCardInTerminalState,
   sendProactiveCardText,
-  streamAICard,
 } from "./card-service";
-import { stripTargetPrefix } from "./config";
+import { resolveRobotCode, stripTargetPrefix } from "./config";
 import { getLogger } from "./logger-context";
-import { getVoiceDurationMs, uploadMedia as uploadMediaUtil, type UploadMediaResult } from "./media-utils";
+import { getVoiceDurationMs, uploadMedia as uploadMediaUtil } from "./media-utils";
 import { convertMarkdownTablesToPlainText, detectMarkdownAndExtractTitle } from "./message-utils";
-import { DEFAULT_MESSAGE_CONTEXT_TTL_DAYS, upsertOutboundMessageContext } from "./message-context-store";
+import {
+  DEFAULT_MESSAGE_CONTEXT_TTL_DAYS,
+  DEFAULT_OUTBOUND_SENDER,
+  inferConversationChatType,
+  upsertOutboundMessageContext,
+} from "./message-context-store";
 import { resolveOriginalPeerId } from "./peer-id-registry";
 import {
   deleteProactiveRiskObservation,
@@ -18,6 +22,7 @@ import {
   recordProactiveRiskObservation,
 } from "./proactive-risk-registry";
 import { formatDingTalkErrorPayloadLog, getProxyBypassOption } from "./utils";
+import type { UploadMediaResult } from "./media-utils";
 import type {
   AICardInstance,
   AxiosResponse,
@@ -29,7 +34,6 @@ import type {
   SendMessageOptions,
   SessionWebhookResponse,
 } from "./types";
-import { AICardStatus } from "./types";
 
 export { detectMediaTypeFromExtension } from "./media-utils";
 
@@ -78,6 +82,9 @@ function persistOutboundMessageContext(params: {
   createdAt?: number;
   quotedRef?: QuotedRef;
   log?: Logger;
+  senderId?: string;
+  senderName?: string;
+  chatType?: "direct" | "group";
   delivery: {
     messageId?: string;
     processQueryKey?: string;
@@ -101,6 +108,9 @@ function persistOutboundMessageContext(params: {
     createdAt: params.createdAt ?? Date.now(),
     text: params.text,
     messageType: params.messageType,
+    senderId: params.senderId,
+    senderName: params.senderName,
+    chatType: params.chatType,
     ttlMs: DEFAULT_MESSAGE_CONTEXT_TTL_DAYS * 24 * 60 * 60 * 1000,
     topic: null,
     quotedRef: params.quotedRef,
@@ -118,26 +128,6 @@ function buildPersistedOutboundText(text: string, options: SendMessageOptions):
   return text;
 }
 
-function composeCardContentForAppend(previous: string | undefined, incoming: string): string {
-  const prev = previous ?? "";
-  if (!prev) {
-    return incoming;
-  }
-  if (!incoming) {
-    return prev;
-  }
-  if (incoming.startsWith(prev)) {
-    return incoming;
-  }
-  if (prev.endsWith(incoming)) {
-    return prev;
-  }
-  if (prev.endsWith("\n") || incoming.startsWith("\n")) {
-    return `${prev}${incoming}`;
-  }
-  return `${prev}${incoming}`;
-}
-
 const DINGTALK_TEXT_CHUNK_LIMIT = 3800;
 
 function splitMarkdownChunks(text: string, limit = DINGTALK_TEXT_CHUNK_LIMIT): string[] {
@@ -203,7 +193,6 @@ function isProactivePermissionOrScopeError(code: string | null): boolean {
 
 /**
  * Wrapper to upload media with shared getAccessToken binding.
- * Supports sandbox/container paths via mediaLocalRoots option.
  */
 export async function uploadMedia(
   config: DingTalkConfig,
@@ -236,7 +225,7 @@ export async function sendProactiveTextOrMarkdown(
 
   // In card mode, use card API to avoid oToMessages/batchSend permission requirement.
   const messageType = config.messageType || "markdown";
-  if (messageType === "card" && config.cardTemplateId && !options.forceMarkdown) {
+  if (messageType === "card" && !options.forceMarkdown) {
     log?.debug?.(
       `[DingTalk] Using card API for proactive message to user ${resolvedTarget}${proactiveRiskTag}`,
     );
@@ -277,7 +266,7 @@ export async function sendProactiveTextOrMarkdown(
     : JSON.stringify({ content: normalizedText });
 
   const payload: ProactiveMessagePayload = {
-    robotCode: config.robotCode || config.clientId,
+    robotCode: resolveRobotCode(config),
     msgKey,
     msgParam,
   };
@@ -343,7 +332,7 @@ export async function sendProactiveMedia(
   target: string,
   mediaPath: string,
   mediaType: "image" | "voice" | "video" | "file",
-  options: SendMessageOptions & { accountId?: string; mediaLocalRoots?: string[] } = {},
+  options: SendMessageOptions & { accountId?: string } = {},
 ): Promise<{ ok: boolean; error?: string; data?: any; messageId?: string }> {
   const log = options.log || getLogger();
 
@@ -355,7 +344,7 @@ export async function sendProactiveMedia(
     if (!uploadResult) {
       return { ok: false, error: "Failed to upload media" };
     }
-    const { mediaId, buffer: uploadedBuffer } = uploadResult;
+    const { mediaId, buffer } = uploadResult;
 
     const token = await getAccessToken(config, log);
     const { targetId, isExplicitUser } = stripTargetPrefix(target);
@@ -376,10 +365,7 @@ export async function sendProactiveMedia(
       msgParam = JSON.stringify({ photoURL: mediaId });
     } else if (mediaType === "voice") {
       msgKey = "sampleAudio";
-      // Reuse buffer from upload to avoid reading the file twice
-      const durationMs = await getVoiceDurationMs(mediaPath, mediaType, log, {
-        preReadBuffer: uploadedBuffer,
-      });
+      const durationMs = await getVoiceDurationMs(mediaPath, mediaType, log, { preReadBuffer: buffer });
       msgParam = JSON.stringify({ mediaId, duration: String(durationMs) });
     } else {
       // sampleVideo requires picMediaId; fallback to sampleFile for broader compatibility.
@@ -391,7 +377,7 @@ export async function sendProactiveMedia(
     }
 
     const payload: ProactiveMessagePayload = {
-      robotCode: config.robotCode || config.clientId,
+      robotCode: resolveRobotCode(config),
       msgKey,
       msgParam,
     };
@@ -427,6 +413,8 @@ export async function sendProactiveMedia(
       messageType: "outbound-proactive-media",
       quotedRef: options.quotedRef,
       log,
+      ...DEFAULT_OUTBOUND_SENDER,
+      chatType: inferConversationChatType(options.conversationId || resolvedTarget),
       delivery: {
         ...delivery,
         kind: "proactive-media",
@@ -485,6 +473,8 @@ export async function sendProactiveMedia(
       messageType: "outbound-proactive-fallback",
       quotedRef: options.quotedRef,
       log,
+      ...DEFAULT_OUTBOUND_SENDER,
+      chatType: inferConversationChatType(options.conversationId || normalizedTarget),
       delivery: {
         ...fallbackDelivery,
         kind: isTrackingResult(fallback as ProactiveTextSendResult) ? "proactive-card" : "proactive-text",
@@ -509,16 +499,13 @@ export async function sendBySession(
       mediaLocalRoots: options.mediaLocalRoots,
     });
     if (uploadResult) {
-      const { mediaId, buffer: uploadedBuffer } = uploadResult;
+      const { mediaId, buffer } = uploadResult;
       let body: any;
 
       if (options.mediaType === "image") {
         body = { msgtype: "image", image: { media_id: mediaId } };
       } else if (options.mediaType === "voice") {
-        // Reuse buffer from upload to avoid reading the file twice
-        const durationMs = await getVoiceDurationMs(options.mediaPath, options.mediaType, log, {
-          preReadBuffer: uploadedBuffer,
-        });
+        const durationMs = await getVoiceDurationMs(options.mediaPath, options.mediaType, log, { preReadBuffer: buffer });
         body = { msgtype: "voice", voice: { media_id: mediaId, duration: String(durationMs) } };
       } else if (options.mediaType === "video") {
         body = { msgtype: "video", video: { media_id: mediaId } };
@@ -595,31 +582,18 @@ export async function sendMessage(
           return { ok: true };
         }
 
-        if (config.cardTemplateId) {
-          const proactiveResult = await sendProactiveCardText(config, conversationId, text, log);
-          if (!proactiveResult.ok) {
-            return { ok: false, error: proactiveResult.error || "Card send failed" };
-          }
-          return {
-            ok: true,
-            tracking: {
-              processQueryKey: proactiveResult.processQueryKey,
-              outTrackId: proactiveResult.outTrackId,
-              cardInstanceId: proactiveResult.cardInstanceId,
-            },
-          };
-        }
-      } else if (options.cardUpdateMode === "append") {
-        try {
-          const nextContent = composeCardContentForAppend(card.lastStreamedContent, text);
-          await streamAICard(card, nextContent, false, log);
-          return { ok: true };
-        } catch (err: any) {
-          log?.warn?.(`[DingTalk] AI Card streaming failed: ${err.message}`);
-          card.state = AICardStatus.FAILED;
-          card.lastUpdated = Date.now();
-          return { ok: false, error: err.message };
+        const proactiveResult = await sendProactiveCardText(config, conversationId, text, log);
+        if (!proactiveResult.ok) {
+          return { ok: false, error: proactiveResult.error || "Card send failed" };
         }
+        return {
+          ok: true,
+          tracking: {
+            processQueryKey: proactiveResult.processQueryKey,
+            outTrackId: proactiveResult.outTrackId,
+            cardInstanceId: proactiveResult.cardInstanceId,
+          },
+        };
       }
     }
 
@@ -636,6 +610,8 @@ export async function sendMessage(
         messageType: options.mediaPath && options.mediaType ? "outbound-media" : "outbound",
         quotedRef: options.quotedRef,
         log,
+        ...DEFAULT_OUTBOUND_SENDER,
+        chatType: inferConversationChatType(options.conversationId || conversationId),
         delivery: {
           ...delivery,
           kind: "session",
@@ -655,6 +631,8 @@ export async function sendMessage(
       messageType: "outbound-proactive",
       quotedRef: options.quotedRef,
       log,
+      ...DEFAULT_OUTBOUND_SENDER,
+      chatType: inferConversationChatType(options.conversationId || conversationId),
       delivery: {
         ...delivery,
         kind: isTrackingResult(result) ? "proactive-card" : "proactive-text",

package/src/targeting/agent-routing.ts

@@ -9,6 +9,7 @@
 
 import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
 import { resolveAtAgents } from "./agent-name-matcher";
+import { resolveRobotCode } from "../config";
 import { parseLearnCommand } from "../learning-command-service";
 import { getDingTalkRuntime } from "../runtime";
 import { sendBySession } from "../send-service";
@@ -65,7 +66,12 @@ function sanitizeAgentName(name: string): string {
 }
 
 /**
- * Resolve @mention-based sub-agent routing for a group message.
+ * Resolve @mention-based sub-agent routing for a group or direct message.
+ *
+ * In group chats, @mentions are populated by the DingTalk SDK (atMentions field).
+ * In direct messages (DM), the SDK also populates atMentions for text-type messages
+ * via extractMessageContent in message-utils.ts, so the same field is reused here.
+ * The !isGroup guard is removed to enable sub-agent routing in DM as well.
  *
  * Returns matched agents if any @mentions resolve to configured agents,
  * or null if the message should be handled by the default agent.
@@ -85,14 +91,14 @@ export async function resolveSubAgentRoute(params: {
   const { extractedContent, cfg, isGroup, dingtalkConfig, sessionWebhook, senderId, log } = params;
 
   const atMentions = extractedContent.atMentions || [];
-  const atUserDingtalkIds = extractedContent.atUserDingtalkIds;
+  // DM has no @picker list from DingTalk; only group chats provide atUsers for real-user hints.
+  const atUserDingtalkIds = isGroup ? extractedContent.atUserDingtalkIds : undefined;
   // Strip quoted prefix before checking /learn to avoid false positives
   // when the quoted message itself contains a /learn command.
   const textForCommandCheck = extractedContent.text.replace(/^\[引用[^\]]*\]\s*/, "");
   const isLearnCommand = parseLearnCommand(textForCommandCheck).scope !== "unknown";
 
   if (
-    !isGroup ||
     atMentions.length === 0 ||
     !cfg.agents?.list ||
     cfg.agents.list.length === 0 ||
@@ -114,9 +120,9 @@ export async function resolveSubAgentRoute(params: {
   if (hasInvalidAgentNames) {
     const fallbackReason = `未找到名为"${unmatchedNames.join("、")}"的助手`;
     try {
+      const sendOptions = isGroup ? { atUserId: senderId, log } : { log };
       await sendBySession(dingtalkConfig, sessionWebhook, `⚠️ ${fallbackReason}`, {
-        atUserId: senderId,
-        log,
+        ...sendOptions,
       });
     } catch (err: any) {
       log?.debug?.(`[DingTalk] Failed to send fallback notice: ${err.message}`);
@@ -149,7 +155,7 @@ export async function dispatchSubAgents(params: {
 
   // Pre-download media once to avoid duplication across sub-agents
   let preDownloadedMedia: { mediaPath?: string; mediaType?: string } | undefined;
-  if (extractedContent.mediaPath && dingtalkConfig.robotCode) {
+  if (extractedContent.mediaPath && resolveRobotCode(dingtalkConfig)) {
     const media = await download(dingtalkConfig, extractedContent.mediaPath, log);
     if (media) {
       preDownloadedMedia = { mediaPath: media.path, mediaType: media.mimeType };