@dingtalk-real-ai/dingtalk-connector 0.8.0 → 0.8.2

package/src/core/message-handler.ts

@@ -44,6 +44,7 @@ import { sendProactive, type AICardTarget } from "../services/messaging/index.ts
 import { createDingtalkReplyDispatcher, normalizeSlashCommand } from "../reply-dispatcher.ts";
 import { getDingtalkRuntime } from "../runtime.ts";
 import { dingtalkHttp } from '../utils/http-client.ts';
+import { createLoggerFromConfig } from '../utils/logger.ts';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
@@ -266,6 +267,11 @@ export async function downloadImageToFile(
   try {
     log?.info?.(`开始下载图片: ${downloadUrl.slice(0, 100)}...`);
     const resp = await dingtalkHttp.get(downloadUrl, {
+      proxy: false, // 禁用代理，避免 PAC 文件影响
+
+      headers: {
+        'Content-Type': undefined, // 删除默认的 Content-Type 请求头，让 OSS 签名验证通过
+      },
       responseType: 'arraybuffer',
       timeout: 30_000,
     });
@@ -366,6 +372,10 @@ export async function downloadFileToLocal(
   try {
     log?.info?.(`开始下载文件: ${fileName}`);
     const resp = await dingtalkHttp.get(downloadUrl, {
+      proxy: false, // 禁用代理，避免 PAC 文件影响
+      headers: {
+        'Content-Type': undefined, // 删除默认的 Content-Type 请求头，让 OSS 签名验证通过
+      },
       responseType: 'arraybuffer',
       timeout: 60_000, // 文件可能较大，增加超时时间
     });
@@ -407,7 +417,8 @@ export async function downloadFileToLocal(
     log?.info?.(`文件下载成功: ${fileName}, size=${buffer.length} bytes, path=${localPath}`);
     return localPath;
   } catch (err: any) {
-    log?.error?.(`文件下载失败: ${fileName}, error=${err.message}`);
+    console.error(`[ERROR] downloadFileToLocal 异常: ${err.message}`);
+    console.error(`[ERROR] 异常堆栈:\n${err.stack}`);
     return null;
   }
 }
@@ -526,8 +537,11 @@ interface HandleMessageParams {
 /**
  * 内部消息处理函数（实际执行消息处理逻辑）
  */
-async function handleDingTalkMessageInternal(params: HandleMessageParams): Promise<void> {
-  const { accountId, config, data, sessionWebhook, runtime, log, cfg } = params;
+export async function handleDingTalkMessageInternal(params: HandleMessageParams): Promise<void> {
+  const { accountId, config, data, sessionWebhook, runtime, log: inputLog, cfg } = params;
+
+  // 如果传入的 log 为空，则使用基于 config 的 logger
+  const log = createLoggerFromConfig(config, `DingTalk:${accountId}`);
 
   const content = extractMessageContent(data);
   if (!content.text && content.imageUrls.length === 0 && content.downloadCodes.length === 0) return;
@@ -536,32 +550,7 @@ async function handleDingTalkMessageInternal(params: HandleMessageParams): Promi
   const senderId = data.senderStaffId || data.senderId;
   const senderName = data.senderNick || 'Unknown';
 
-  // ===== 提前解析 agentId 和工作空间路径 =====
-  const chatType = isDirect ? "direct" : "group";
-  const peerId = isDirect ? senderId : data.conversationId;
-  
-  // 手动匹配 bindings 获取 agentId
-  let matchedAgentId: string | null = null;
-  if (cfg.bindings && cfg.bindings.length > 0) {
-    for (const binding of cfg.bindings) {
-      const match = binding.match;
-      if (match.channel && match.channel !== "dingtalk-connector") continue;
-      if (match.accountId && match.accountId !== accountId) continue;
-      if (match.peer) {
-        if (match.peer.kind && match.peer.kind !== chatType) continue;
-        if (match.peer.id && match.peer.id !== '*' && match.peer.id !== peerId) continue;
-      }
-      matchedAgentId = binding.agentId;
-      break;
-    }
-  }
-  if (!matchedAgentId) {
-    matchedAgentId = cfg.defaultAgent || 'main';
-  }
-  
-  // 获取 Agent 工作空间路径
-  const agentWorkspaceDir = resolveAgentWorkspaceDir(cfg, matchedAgentId);
-  log?.info?.(`Agent 工作空间路径: ${agentWorkspaceDir}`);
+
 
 
 
@@ -706,6 +695,29 @@ async function handleDingTalkMessageInternal(params: HandleMessageParams): Promi
     sharedMemoryAcrossConversations: config.sharedMemoryAcrossConversations,
   });
 
+  // ===== 解析 agentId 和工作空间路径（在 sessionContext 之后，确保 peerId 与会话隔离策略一致）=====
+  // 使用 sessionContext.peerId 进行匹配，与后续 sessionKey 构建保持一致，避免两次匹配结果不一致
+  let matchedAgentId: string | null = null;
+  if (cfg.bindings && cfg.bindings.length > 0) {
+    for (const binding of cfg.bindings) {
+      const match = binding.match;
+      if (match.channel && match.channel !== "dingtalk-connector") continue;
+      if (match.accountId && match.accountId !== accountId) continue;
+      if (match.peer) {
+        if (match.peer.kind && match.peer.kind !== sessionContext.chatType) continue;
+        if (match.peer.id && match.peer.id !== '*' && match.peer.id !== sessionContext.peerId) continue;
+      }
+      matchedAgentId = binding.agentId;
+      break;
+    }
+  }
+  if (!matchedAgentId) {
+    matchedAgentId = cfg.defaultAgent || 'main';
+  }
+
+  // 获取 Agent 工作空间路径
+  const agentWorkspaceDir = resolveAgentWorkspaceDir(cfg, matchedAgentId);
+  log?.info?.(`Agent 工作空间路径: ${agentWorkspaceDir}`);
 
   // 构建消息内容
   // ✅ 使用 normalizeSlashCommand 归一化新会话命令
@@ -825,7 +837,7 @@ async function handleDingTalkMessageInternal(params: HandleMessageParams): Promi
       const parseResult = await parseFileContent(localPath, fileName, log);
       
       if (parseResult.type === 'text' && parseResult.content) {
-        // 文本类文件：将内容注入到上下文
+        // 文本类文件：将内容注入到上下文（即使解析成功也给出文件路径）
         const contentPreview = parseResult.content.length > 200 
           ? parseResult.content.slice(0, 200) + '...' 
           : parseResult.content;
@@ -833,6 +845,7 @@ async function handleDingTalkMessageInternal(params: HandleMessageParams): Promi
         fileContentParts.push(
           `📄 **${fileType}**: ${fileName}\n` +
           `✅ 已解析文件内容（${parseResult.content.length} 字符）\n` +
+          `💾 已保存到本地: ${localPath}\n` +
           `📝 内容预览:\n\`\`\`\n${contentPreview}\n\`\`\`\n\n` +
           `📋 完整内容:\n${parseResult.content}`
         );
@@ -929,65 +942,24 @@ async function handleDingTalkMessageInternal(params: HandleMessageParams): Promi
       body: finalContent,
     });
 
-    // 手动实现路由匹配（支持通配符 *）
-    const chatType = isDirect ? "direct" : "group";
-    const peerId = isDirect ? senderId : data.conversationId;
-    
-    // 手动匹配 bindings（支持通配符 *）
-    let matchedAgentId: string | null = null;
-    let matchedBy = 'default';
-    
-    if (cfg.bindings && cfg.bindings.length > 0) {
-      for (const binding of cfg.bindings) {
-        const match = binding.match;
-        
-        // 检查 channel
-        if (match.channel && match.channel !== "dingtalk-connector") {
-          continue;
-        }
-        
-        // 检查 accountId
-        if (match.accountId && match.accountId !== accountId) {
-          continue;
-        }
-        
-        // 检查 peer
-        if (match.peer) {
-          // 检查 peer.kind
-          if (match.peer.kind && match.peer.kind !== sessionContext.chatType) {
-            continue;
-          }
-          
-          // ✅ 使用 sessionContext.peerId 进行匹配（支持通配符 *）
-          if (match.peer.id && match.peer.id !== '*' && match.peer.id !== sessionContext.peerId) {
-            continue;
-          }
-        }
-        
-        // 匹配成功
-        matchedAgentId = binding.agentId;
-        matchedBy = 'binding';
-        break;
-      }
-    }
-    
-    // 如果没有匹配到，使用默认 agent
-    if (!matchedAgentId) {
-      matchedAgentId = cfg.defaultAgent || 'main';
-      log?.info?.(`未匹配到 binding，使用默认 agent: ${matchedAgentId}`);
-    }
+    // matchedAgentId 已在 sessionContext 构建之后通过 bindings 匹配确定，此处直接使用
+    const matchedBy = matchedAgentId !== (cfg.defaultAgent || 'main') ? 'binding' : 'default';
     
     // ✅ 使用 SDK 标准方法构建 sessionKey，符合 OpenClaw 规范
     // 格式：agent:{agentId}:{channel}:{peerKind}:{peerId}
     // ✅ 修复：使用 sessionContext.peerId，确保会话隔离配置生效
+    // ✅ 关键修复：传递 dmScope 参数，让 SDK 使用配置文件中的 session.dmScope 设置
+    const dmScope = cfg.session?.dmScope || 'per-channel-peer';
+    log?.info?.(`🔍 构建 sessionKey 前的参数: agentId=${matchedAgentId}, channel=dingtalk-connector, accountId=${accountId}, chatType=${sessionContext.chatType}, peerId=${sessionContext.peerId}, dmScope=${dmScope}`);
     const sessionKey = core.channel.routing.buildAgentSessionKey({
       agentId: matchedAgentId,
-      channel: 'dingtalk',  // ✅ 使用 'dingtalk' 而不是 'dingtalk-connector'
+      channel: 'dingtalk-connector',  // ✅ 使用 'dingtalk-connector' 而不是 'dingtalk'
       accountId: accountId,
       peer: {
         kind: sessionContext.chatType,  // ✅ 使用 sessionContext.chatType
         id: sessionContext.peerId,      // ✅ 使用 sessionContext.peerId（包含会话隔离逻辑）
       },
+      dmScope: dmScope,  // ✅ 传递 dmScope 参数，确保生成完整格式的 sessionKey
     });
     log?.info?.(`路由解析完成: agentId=${matchedAgentId}, sessionKey=${sessionKey}, matchedBy=${matchedBy}`);
     
@@ -1007,7 +979,7 @@ async function handleDingTalkMessageInternal(params: HandleMessageParams): Promi
       To: toField,  // ✅ 修复：单聊用 senderId，群聊用 conversationId
       SessionKey: sessionKey,  // ✅ 使用手动匹配的 sessionKey
       AccountId: accountId,
-      ChatType: chatType,
+      ChatType: sessionContext.chatType,
       GroupSubject: isDirect ? undefined : data.conversationId,
       SenderName: senderId,
       SenderId: senderId,
@@ -1190,23 +1162,33 @@ async function handleDingTalkMessageInternal(params: HandleMessageParams): Promi
  * 确保同一会话+agent的消息按顺序处理，避免并发冲突
  */
 export async function handleDingTalkMessage(params: HandleMessageParams): Promise<void> {
-  const { accountId, data, log, cfg } = params;
-  
-  // 构建会话标识（与会话上下文保持一致）
+  const { accountId, config, data, log, cfg } = params;
+
+  // 使用 buildSessionContext 构建会话标识，与 handleDingTalkMessageInternal 保持一致
+  // 确保 queueKey 的隔离策略（groupSessionScope、sharedMemoryAcrossConversations）与 sessionKey 一致
   const isDirect = data.conversationType === '1';
   const senderId = data.senderStaffId || data.senderId;
   const conversationId = data.conversationId;
-  const baseSessionId = isDirect ? senderId : conversationId;
-  
+
+  const queueSessionContext = buildSessionContext({
+    accountId,
+    senderId,
+    conversationType: data.conversationType,
+    conversationId,
+    separateSessionByConversation: config.separateSessionByConversation,
+    groupSessionScope: config.groupSessionScope,
+    sharedMemoryAcrossConversations: config.sharedMemoryAcrossConversations,
+  });
+
+  const baseSessionId = queueSessionContext.peerId;
+
   if (!baseSessionId) {
     log?.warn?.('无法构建会话标识，跳过队列管理');
     return handleDingTalkMessageInternal(params);
   }
-  
-  // 解析 agentId（与消息处理逻辑保持一致）
-  const chatType = isDirect ? "direct" : "group";
-  const peerId = isDirect ? senderId : conversationId;
-  
+
+  // 解析 agentId：使用 sessionContext.peerId 和 sessionContext.chatType 进行匹配
+  // 与 handleDingTalkMessageInternal 中的匹配逻辑保持一致
   let matchedAgentId: string | null = null;
   if (cfg.bindings && cfg.bindings.length > 0) {
     for (const binding of cfg.bindings) {
@@ -1214,8 +1196,8 @@ export async function handleDingTalkMessage(params: HandleMessageParams): Promis
       if (match.channel && match.channel !== "dingtalk-connector") continue;
       if (match.accountId && match.accountId !== accountId) continue;
       if (match.peer) {
-        if (match.peer.kind && match.peer.kind !== chatType) continue;
-        if (match.peer.id && match.peer.id !== '*' && match.peer.id !== peerId) continue;
+        if (match.peer.kind && match.peer.kind !== queueSessionContext.chatType) continue;
+        if (match.peer.id && match.peer.id !== '*' && match.peer.id !== queueSessionContext.peerId) continue;
       }
       matchedAgentId = binding.agentId;
       break;
@@ -1224,42 +1206,52 @@ export async function handleDingTalkMessage(params: HandleMessageParams): Promis
   if (!matchedAgentId) {
     matchedAgentId = cfg.defaultAgent || 'main';
   }
-  
-  // 构建队列标识：会话 + agentId
-  // 这样不同 agent 可以并发处理，同一 agent 的同一会话串行处理
+
+  // 构建队列标识：会话 peerId + agentId
+  // queueKey 与 sessionKey 使用相同的 peerId，确保隔离策略一致：
+  // - groupSessionScope: 'group_sender' 时，同群不同用户的消息可并行处理
+  // - sharedMemoryAcrossConversations: true 时，所有消息共享同一队列
   const queueKey = `${baseSessionId}:${matchedAgentId}`;
-  
-  // 更新会话活跃时间
-  sessionLastActivity.set(queueKey, Date.now());
-  
-  // 获取该会话+agent的上一个处理任务
-  const previousTask = sessionQueues.get(queueKey) || Promise.resolve();
-  
-  // 创建当前消息的处理任务
-  const currentTask = previousTask
-    .then(async () => {
-      log?.info?.(`[队列] 开始处理消息，queueKey=${queueKey}`);
-      await handleDingTalkMessageInternal(params);
-      log?.info?.(`[队列] 消息处理完成，queueKey=${queueKey}`);
-    })
-    .catch((err: any) => {
-      log?.error?.(`[队列] 消息处理异常，queueKey=${queueKey}, error=${err.message}`);
-      // 不抛出错误，避免阻塞后续消息
-    })
-    .finally(() => {
-      // 如果当前任务是队列中的最后一个任务，清理队列
-      if (sessionQueues.get(queueKey) === currentTask) {
-        sessionQueues.delete(queueKey);
-        log?.info?.(`[队列] 队列已清空，queueKey=${queueKey}`);
-      }
-    });
-  
-  // 更新队列
-  sessionQueues.set(queueKey, currentTask);
-  log?.info?.(`[队列] 消息已加入队列，queueKey=${queueKey}, 队列大小=${sessionQueues.size}`);
-  
-  // 不等待任务完成，让消息异步处理
-  // 这样可以立即返回，不阻塞 WebSocket 消息接收
+
+  try {
+
+    // 更新会话活跃时间
+    sessionLastActivity.set(queueKey, Date.now());
+
+    // 获取该会话+agent的上一个处理任务
+    const previousTask = sessionQueues.get(queueKey) || Promise.resolve();
+
+    // 创建当前消息的处理任务
+    const currentTask = previousTask
+      .then(async () => {
+        log?.info?.(`[队列] 开始处理消息，queueKey=${queueKey}`);
+        await handleDingTalkMessageInternal(params);
+        log?.info?.(`[队列] 消息处理完成，queueKey=${queueKey}`);
+      })
+      .catch((err: any) => {
+        log?.error?.(`[队列] 消息处理异常，queueKey=${queueKey}, error=${err.message}`);
+        // 不抛出错误，避免阻塞后续消息
+      })
+      .finally(() => {
+        // 如果当前任务是队列中的最后一个任务，清理队列
+        if (sessionQueues.get(queueKey) === currentTask) {
+          sessionQueues.delete(queueKey);
+          log?.info?.(`[队列] 队列已清空，queueKey=${queueKey}`);
+        }
+      });
+    
+    // 更新队列
+    sessionQueues.set(queueKey, currentTask);
+
+    // 等待当前任务完成
+    await currentTask;
+    console.log(`[DEBUG] 任务执行完成`);
+  } catch (err: any) {
+    console.error(`[DEBUG] 队列管理异常: ${err.message}`);
+    console.error(`[DEBUG] 队列管理异常堆栈: ${err.stack}`);
+    // 如果队列管理失败，直接调用内部处理函数
+    return handleDingTalkMessageInternal(params);
+  }
 }
 
 // handleDingTalkMessage 已在函数定义处直接导出

package/src/core/provider.ts

@@ -13,6 +13,7 @@
  */
 import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk";
 import * as monitorState from "./state";
+import { createLogger } from "../utils/logger";
 
 // 只解构 monitorState 的导出
 const {
@@ -44,7 +45,7 @@ export async function monitorDingtalkProvider(opts: MonitorDingtalkOpts = {}): P
     throw new Error("Config is required for DingTalk monitor");
   }
 
-  const log = opts.runtime?.log;
+  const log = createLogger(cfg.channels?.["dingtalk-connector"]?.debug ?? false);
 
   // 并行导入所有模块（无循环依赖，可以并行）
   const [accountsModule, monitorAccountModule, monitorSingleModule] = await Promise.all([

package/src/onboarding.ts

@@ -112,7 +112,7 @@ async function noteDingtalkCredentialHelp(prompter: WizardPrompter): Promise<voi
     [
       "1) Go to DingTalk Open Platform (open-dev.dingtalk.com)",
       "2) Create an enterprise internal app",
-      "3) Get App Key (Client ID) and App Secret (Client Secret) from Credentials page",
+      "3) Get Client ID and Client Secret from Credentials page",
       "4) Enable required permissions: im:message, im:chat",
       "5) Publish the app or add it to a test group",
       "Tip: you can also set DINGTALK_CLIENT_ID / DINGTALK_CLIENT_SECRET env vars.",
@@ -128,7 +128,7 @@ async function promptDingtalkClientId(params: {
 }): Promise<string> {
   const clientId = String(
     await params.prompter.text({
-      message: "Enter DingTalk App Key (Client ID)",
+      message: "Enter DingTalk Client ID",
       initialValue: params.initialValue,
       validate: (value) => (value?.trim() ? undefined : "Required"),
     }),
@@ -274,36 +274,96 @@ export const dingtalkOnboardingAdapter: ChannelOnboardingAdapter = {
       await noteDingtalkCredentialHelp(prompter);
     }
 
-    const clientSecretResult = await promptSingleChannelSecretInput({
-      cfg: next,
-      prompter,
-      providerHint: "dingtalk",
-      credentialLabel: "App Secret (Client Secret)",
-      accountConfigured: Boolean(resolved),
-      canUseEnv,
-      hasConfigToken: hasConfigSecret,
-      envPrompt: "DINGTALK_CLIENT_ID + DINGTALK_CLIENT_SECRET detected. Use env vars?",
-      keepPrompt: "DingTalk App Secret already configured. Keep it?",
-      inputPrompt: "Enter DingTalk App Secret (Client Secret)",
-      preferredEnvVar: "DINGTALK_CLIENT_SECRET",
-    });
-
-    if (clientSecretResult.action === "use-env") {
-      next = {
-        ...next,
-        channels: {
-          ...next.channels,
-          "dingtalk-connector": { ...next.channels?.["dingtalk-connector"], enabled: true },
-        },
-      };
-    } else if (clientSecretResult.action === "set") {
-      clientSecret = clientSecretResult.value;
-      clientSecretProbeValue = clientSecretResult.resolvedValue;
-      clientId = await promptDingtalkClientId({
-        prompter,
-        initialValue:
-          normalizeString(dingtalkCfg?.clientId) ?? normalizeString(process.env.DINGTALK_CLIENT_ID),
+    // Check if we can use environment variables
+    if (canUseEnv) {
+      const useEnv = await prompter.confirm({
+        message: "DINGTALK_CLIENT_ID + DINGTALK_CLIENT_SECRET detected. Use env vars?",
+        initialValue: true,
       });
+
+      if (useEnv) {
+        next = {
+          ...next,
+          channels: {
+            ...next.channels,
+            "dingtalk-connector": { ...next.channels?.["dingtalk-connector"], enabled: true },
+          },
+        };
+        // Environment variables will be used, skip manual input
+      } else {
+        // User chose not to use env vars, proceed to manual input
+        canUseEnv = false;
+      }
+    }
+
+    // If not using env vars, prompt for credentials
+    if (!canUseEnv) {
+      // Check if we should keep existing configuration
+      if (resolved && hasConfigSecret) {
+        const keepExisting = await prompter.confirm({
+          message: "DingTalk credentials already configured. Keep them?",
+          initialValue: true,
+        });
+
+        if (!keepExisting) {
+          // User wants to reconfigure, proceed to input
+          // Step 1: Prompt for Client ID first
+          clientId = await promptDingtalkClientId({
+            prompter,
+            initialValue:
+              normalizeString(dingtalkCfg?.clientId) ?? normalizeString(process.env.DINGTALK_CLIENT_ID),
+          });
+
+          // Step 2: Then prompt for Client Secret
+          const clientSecretResult = await promptSingleChannelSecretInput({
+            cfg: next,
+            prompter,
+            providerHint: "dingtalk",
+            credentialLabel: "Client Secret",
+            accountConfigured: false, // Force new input
+            canUseEnv: false, // Already handled above
+            hasConfigToken: false, // Force new input
+            envPrompt: "", // Not used
+            keepPrompt: "", // Not used
+            inputPrompt: "Enter DingTalk Client Secret",
+            preferredEnvVar: "DINGTALK_CLIENT_SECRET",
+          });
+
+          if (clientSecretResult.action === "set") {
+            clientSecret = clientSecretResult.value;
+            clientSecretProbeValue = clientSecretResult.resolvedValue;
+          }
+        }
+        // If keepExisting is true, we don't modify anything
+      } else {
+        // No existing config, prompt for new credentials
+        // Step 1: Prompt for Client ID first
+        clientId = await promptDingtalkClientId({
+          prompter,
+          initialValue:
+            normalizeString(dingtalkCfg?.clientId) ?? normalizeString(process.env.DINGTALK_CLIENT_ID),
+        });
+
+        // Step 2: Then prompt for Client Secret
+        const clientSecretResult = await promptSingleChannelSecretInput({
+          cfg: next,
+          prompter,
+          providerHint: "dingtalk",
+          credentialLabel: "Client Secret",
+          accountConfigured: false,
+          canUseEnv: false,
+          hasConfigToken: false,
+          envPrompt: "",
+          keepPrompt: "",
+          inputPrompt: "Enter DingTalk Client Secret",
+          preferredEnvVar: "DINGTALK_CLIENT_SECRET",
+        });
+
+        if (clientSecretResult.action === "set") {
+          clientSecret = clientSecretResult.value;
+          clientSecretProbeValue = clientSecretResult.resolvedValue;
+        }
+      }
     }
 
     if (clientId && clientSecret) {

package/src/reply-dispatcher.ts

@@ -276,6 +276,12 @@ export function createDingtalkReplyDispatcher(params: CreateDingtalkReplyDispatc
       // 处理媒体标记
       let finalText = accumulatedText;
       
+      // ✅ 如果累积的文本为空，使用默认提示文案
+      if (!finalText.trim()) {
+        finalText = '✅ 任务执行完成（无文本输出）';
+        log.info(`[DingTalk][closeStreaming] 累积文本为空，使用默认提示文案`);
+      }
+      
       // 获取 oapiToken 用于媒体处理
       const oapiToken = await getOapiAccessToken(account.config as DingtalkConfig);
       
@@ -420,7 +426,14 @@ export function createDingtalkReplyDispatcher(params: CreateDingtalkReplyDispatc
         const hasText = Boolean(text.trim());
         const skipTextForDuplicateFinal =
           info?.kind === "final" && hasText && deliveredFinalTexts.has(text);
-        const shouldDeliverText = hasText && !skipTextForDuplicateFinal;
+        
+        // ✅ 如果是 final 响应且没有文本，使用默认提示文案
+        if (info?.kind === "final" && !hasText) {
+          text = '✅ 任务执行完成（无文本输出）';
+          log.info(`[DingTalk][deliver] final 响应无文本，使用默认提示文案`);
+        }
+        
+        const shouldDeliverText = Boolean(text.trim()) && !skipTextForDuplicateFinal;
 
         if (!shouldDeliverText) {
           log.info(`[DingTalk][deliver] 跳过发送：hasText=${hasText}, skipTextForDuplicateFinal=${skipTextForDuplicateFinal}`);

package/src/services/media.ts

@@ -7,7 +7,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import type { DingtalkConfig } from '../types/index.ts';
 import { DINGTALK_OAPI, getOapiAccessToken } from '../utils/index.ts';
-import { dingtalkOapiHttp } from '../utils/http-client.ts';
+import { dingtalkHttp, dingtalkOapiHttp } from '../utils/http-client.ts';
 
 // ============ 常量 ============
 

package/src/services/messaging.ts

@@ -591,9 +591,10 @@ export async function sendMediaToDingTalk(params: {
     });
   }
 
-  // 1. 先发送文本消息（如果有）
-  if (text?.trim()) {
-    log.info("先发送文本消息");
+  // 1. 先发送文本消息（如果有且不为空）
+  // 注意：只有在 text 有实际内容时才发送，避免发送空消息
+  if (text && text.trim().length > 0) {
+    log.info("先发送文本消息:", text);
     await sendProactive(config, targetParam, text, {
       msgType: "text",
       replyToId,
@@ -726,33 +727,28 @@ export async function sendMediaToDingTalk(params: {
       };
     }
 
-    // 对于音频、文件，发送包含下载链接的文本消息
+    // 对于音频、文件，发送真正的文件消息
     const fs = await import("fs");
     const stats = fs.statSync(mediaUrl);
-    const fileSizeMB = (stats.size / (1024 * 1024)).toFixed(2);
-
-    // 使用上传结果中的下载链接
-    const downloadUrl = uploadResult.downloadUrl;
-
-    // 根据媒体类型选择图标和描述
-    let icon = "📄";
-    let typeLabel = "文件";
-    if (mediaType === "voice") {
-      icon = "🎵";
-      typeLabel = "音频";
-    }
-
-    const message = `${icon} ${typeLabel}文件已上传\n\n文件: ${fileName}\n大小: ${fileSizeMB} MB\n\n下载链接: ${downloadUrl}`;
+    
+    // 获取文件扩展名作为 fileType
+    const fileType = ext || "file";
+    
+    // 构建文件信息
+    const fileInfo = {
+      fileName: fileName,
+      fileType: fileType,
+    };
 
-    const result = await sendProactive(config, targetParam, message, {
-      msgType: "text",
-      replyToId,
-    });
+    // 使用 sendFileProactive 发送文件消息
+    const { sendFileProactive } = await import("./media.ts");
+    await sendFileProactive(config, targetParam, fileInfo, uploadResult.mediaId, log);
 
-    // 确保返回值中有 processQueryKey，告诉 SDK 消息已发送成功
+    // 返回成功结果
     return {
-      ...result,
-      processQueryKey: result.processQueryKey || "media-message-sent",
+      ok: true,
+      usedAICard: false,
+      processQueryKey: "file-message-sent",
     };
   } catch (err: any) {
     log.error("发送媒体消息失败:", err.message);
@@ -862,8 +858,8 @@ async function sendProactiveInternal(
 
   const {
     msgType = "text",
-    useAICard = false,
-    fallbackToNormal = false,
+    useAICard = true,          // 默认启用 AI Card，让主动发送消息优先使用卡片形式
+    fallbackToNormal = true,   // 默认降级，AI Card 失败时自动回退到普通消息
     log: externalLog,
   } = options;
 
@@ -916,21 +912,19 @@ async function sendProactiveInternal(
       ? `${DINGTALK_API}/v1.0/robot/oToMessages/batchSend`
       : `${DINGTALK_API}/v1.0/robot/groupMessages/send`;
 
-    // 构建消息体
+    // 使用 buildMsgPayload 构建消息体（支持所有消息类型）
+    const payload = buildMsgPayload(msgType, content, options.title);
+    if ("error" in payload) {
+      log.error("构建消息失败:", payload.error);
+      return { ok: false, error: payload.error, usedAICard: false };
+    }
+
     const body: any = {
       robotCode: config.clientId,
-      msgKey: msgType === "markdown" ? "sampleMarkdown" : "sampleText",
+      msgKey: payload.msgKey,
+      msgParam: JSON.stringify(payload.msgParam),
     };
 
-    if (msgType === "markdown") {
-      body.msgParam = JSON.stringify({
-        title: options.title || "Message",
-        text: content,
-      });
-    } else {
-      body.msgParam = JSON.stringify({ content });
-    }
-
     // ✅ 根据目标类型设置不同的参数
     if (isUser) {
       body.userIds = [targetId];