@jeik/dingtalk-connector 0.8.21-fix13 → 0.8.21-fix16

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as initDingtalkPluginConfigSchema, i as dingtalkPlugin, n as setDingtalkRuntime } from "./runtime-CmHKkoFi.mjs";
+import { a as initDingtalkPluginConfigSchema, i as dingtalkPlugin, n as setDingtalkRuntime } from "./runtime-CaDlY3DU.mjs";
 import { t as registerGatewayMethods } from "./gateway-methods-5IlNoS6J.mjs";
 //#region index.ts
 /**

package/dist/{message-handler-BVUTuUpc.mjs → message-handler-CCyUaGHW.mjs}

@@ -1,6 +1,6 @@
 import { u as uploadMediaToDingTalk } from "./media-cz72EVS3.mjs";
 import { a as resolveDingtalkAccount } from "./accounts-BAzdqkAV.mjs";
-import { r as CHANNEL_ID, t as getDingtalkRuntime } from "./runtime-CmHKkoFi.mjs";
+import { r as CHANNEL_ID, t as getDingtalkRuntime } from "./runtime-CaDlY3DU.mjs";
 import { n as createLoggerFromConfig } from "./logger-mZ9OSbmD.mjs";
 import { t as dingtalkHttp } from "./http-client-DFWZgO1n.mjs";
 import { i as getOapiAccessToken } from "./utils-CIfI_3Jh.mjs";
@@ -399,6 +399,7 @@ function createDingtalkReplyDispatcher(params) {
 		log.info(`[DingTalk][closeStreaming] 开始关闭 AI Card...`);
 		try {
 			let finalText = finalClean(pickFinalText());
+			const hadRealAnswer = finalText.trim().length > 0;
 			log.info(`[DingTalk][closeStreaming] 最终答案来源=${finalMarkedText !== null ? "marker[-final-]" : lastAnswerText ? "非reasoning答案" : "accumulatedText兜底"}，长度=${finalText.length}`);
 			if (!finalText.trim()) {
 				finalText = "✅ 任务执行完成（无文本输出）";
@@ -451,19 +452,28 @@ function createDingtalkReplyDispatcher(params) {
 			}
 			finalText = await applyReplyTemplate(finalText);
 			if (account.config?.answerCard === true) {
-				log.info(`[DingTalk][closeStreaming] answerCard 模式：原卡定格思考完成 + 新建答案卡`);
-				try {
-					await finishAICard(cardSnapshot, "✅ 思考完成", account.config, log);
-				} catch (e) {
-					log.warn(`[DingTalk][closeStreaming] 原卡定格思考完成失败（忽略）：${e?.message || e}`);
-				}
-				const answerCard = await createAICardForTarget(account.config, target, log, ANSWER_CARD_TEMPLATE_ID);
-				if (answerCard) {
-					await finishAICard(answerCard, finalText, account.config, log);
-					log.info(`[DingTalk][closeStreaming] ✅ 答案卡投放成功`);
+				const finalizeOriginalToDone = async () => {
+					try {
+						await streamAICard(cardSnapshot, "✅ 思考完成", true, account.config, log);
+						await finishAICard(cardSnapshot, "✅ 思考完成", account.config, log);
+					} catch (e) {
+						log.warn(`[DingTalk][closeStreaming] 原卡定格思考完成失败（忽略）：${e?.message || e}`);
+					}
+				};
+				if (!hadRealAnswer) {
+					log.info(`[DingTalk][closeStreaming] answerCard 模式：无真实答案，仅定格原卡思考完成（不建答案卡）`);
+					await finalizeOriginalToDone();
 				} else {
-					log.warn(`[DingTalk][closeStreaming] 答案卡创建失败，降级定稿原卡`);
-					await finishAICard(cardSnapshot, finalText, account.config, log);
+					log.info(`[DingTalk][closeStreaming] answerCard 模式：原卡定格思考完成 + 新建答案卡`);
+					await finalizeOriginalToDone();
+					const answerCard = await createAICardForTarget(account.config, target, log, ANSWER_CARD_TEMPLATE_ID);
+					if (answerCard) {
+						await finishAICard(answerCard, finalText, account.config, log);
+						log.info(`[DingTalk][closeStreaming] ✅ 答案卡投放成功`);
+					} else {
+						log.warn(`[DingTalk][closeStreaming] 答案卡创建失败，降级定稿原卡`);
+						await finishAICard(cardSnapshot, finalText, account.config, log);
+					}
 				}
 			} else {
 				log.info(`[DingTalk][closeStreaming] 准备调用 finishAICard，文本长度=${finalText.length}`);
@@ -666,6 +676,23 @@ function createDingtalkReplyDispatcher(params) {
 					} else log.debug(`[DingTalk][onPartialReply] 节流控制，跳过本次更新（距离上次更新 ${now - lastUpdateTime}ms）`);
 				} else log.warn(`[DingTalk][onPartialReply] ⚠️ AI Card 不存在，跳过更新`);
 			} },
+			onToolStart: async (payload) => {
+				const toolName = (payload?.name || "").trim();
+				if (!toolName) return;
+				if (payload?.phase === "end" || payload?.phase === "complete") return;
+				if (!streamingEnabled || asyncMode || finalMarkedText !== null) return;
+				try {
+					await startStreaming();
+					if (!currentCardTarget) return;
+					const now = Date.now();
+					if (now - lastUpdateTime < updateInterval) return;
+					lastUpdateTime = now;
+					await streamAICard(currentCardTarget, `🔧 正在调用工具：${toolName}`, false, account.config, log, account.config?.cardContentVar || "msgContent");
+					log.debug(`[DingTalk][onToolStart] 工具进度写卡：${toolName}（phase=${payload?.phase}）`);
+				} catch (e) {
+					if (!isQpsLimitError(e)) log.warn(`[DingTalk][onToolStart] 工具进度写卡失败：${e?.message || e}`);
+				}
+			},
 			onCommandOutput: (payload) => {
 				const dwsMatch = (payload.title || payload.name || "").match(DWS_PRODUCT_PATTERN) || payload.output?.match(DWS_PRODUCT_PATTERN);
 				if (dwsMatch) {

package/dist/{runtime-CmHKkoFi.mjs → runtime-CaDlY3DU.mjs}

@@ -922,7 +922,7 @@ async function monitorDingtalkProvider(opts = {}) {
 	const log = createLogger(cfg.channels?.["dingtalk-connector"]?.debug ?? false);
 	const [accountsModule, monitorAccountModule, monitorSingleModule] = await Promise.all([
 		import("./accounts-BQptOmgB.mjs"),
-		import("./message-handler-BVUTuUpc.mjs"),
+		import("./message-handler-CCyUaGHW.mjs"),
 		import("./connection-DHHFFNQJ.mjs")
 	]);
 	const { resolveDingtalkAccount, listEnabledDingtalkAccounts } = accountsModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeik/dingtalk-connector",
-  "version": "0.8.21-fix13",
+  "version": "0.8.21-fix16",
   "description": "OpenClaw DingTalk channel plugin (fork) | 钉钉 OpenClaw 渠道插件（fork 自官方，含标记/卡片渲染修复）",
   "type": "module",
   "exports": {

package/src/reply-dispatcher.ts

@@ -391,6 +391,9 @@ export function createDingtalkReplyDispatcher(params: CreateDingtalkReplyDispatc
     try {
       // 选定最终答案：marker 优先 → 最近非 reasoning 答案 → accumulatedText 兜底，并剥离尾标记
       let finalText = finalClean(pickFinalText());
+      // 是否有真实对话答案（在套兜底文案之前判断）。纯工具进度/无回复时为 false，
+      // 用于 answerCard 模式下决定"不另建无文本输出答案卡"。
+      const hadRealAnswer = finalText.trim().length > 0;
       log.info(
         `[DingTalk][closeStreaming] 最终答案来源=${finalMarkedText !== null ? "marker[-final-]" : (lastAnswerText ? "非reasoning答案" : "accumulatedText兜底")}，长度=${finalText.length}`
       );
@@ -506,27 +509,40 @@ export function createDingtalkReplyDispatcher(params: CreateDingtalkReplyDispatc
       // 代价：多一条消息，但渲染正确、更快。
       const useAnswerCard = (account.config as any)?.answerCard === true;
       if (useAnswerCard) {
-        log.info(`[DingTalk][closeStreaming] answerCard 模式：原卡定格思考完成 + 新建答案卡`);
-        // 1. 原卡定格"思考完成"
-        try {
-          await finishAICard(cardSnapshot as any, "✅ 思考完成", account.config as DingtalkConfig, log);
-        } catch (e: any) {
-          log.warn(`[DingTalk][closeStreaming] 原卡定格思考完成失败（忽略）：${e?.message || e}`);
-        }
-        // 2. 新建答案专用卡（静态模板）并投放最终答案
-        const answerCard = await createAICardForTarget(
-          account.config as DingtalkConfig,
-          target,
-          log,
-          ANSWER_CARD_TEMPLATE_ID,
-        );
-        if (answerCard) {
-          await finishAICard(answerCard, finalText, account.config as DingtalkConfig, log);
-          log.info(`[DingTalk][closeStreaming] ✅ 答案卡投放成功`);
+        // 原卡定格"思考完成"。必须用流式端点 streamAICard 覆盖可见内容——
+        // FINISHED(/card/instances) 不会刷新已流式过的内容（钉钉 bug），先 streamAICard 盖文本再 FINISHED。
+        const finalizeOriginalToDone = async () => {
+          try {
+            await streamAICard(cardSnapshot as any, "✅ 思考完成", true, account.config as DingtalkConfig, log);
+            await finishAICard(cardSnapshot as any, "✅ 思考完成", account.config as DingtalkConfig, log);
+          } catch (e: any) {
+            log.warn(`[DingTalk][closeStreaming] 原卡定格思考完成失败（忽略）：${e?.message || e}`);
+          }
+        };
+
+        if (!hadRealAnswer) {
+          // 只有工具进度 / 没真实对话答案 → 只把原卡定格"思考完成"，不另建"无文本输出"答案卡，
+          // 避免重新引入"多段/纯工具轮次留空卡"问题。
+          log.info(`[DingTalk][closeStreaming] answerCard 模式：无真实答案，仅定格原卡思考完成（不建答案卡）`);
+          await finalizeOriginalToDone();
         } else {
-          // 答案卡建失败 → 降级直接定稿原卡，保证用户能看到回复
-          log.warn(`[DingTalk][closeStreaming] 答案卡创建失败，降级定稿原卡`);
-          await finishAICard(cardSnapshot as any, finalText, account.config as DingtalkConfig, log);
+          log.info(`[DingTalk][closeStreaming] answerCard 模式：原卡定格思考完成 + 新建答案卡`);
+          await finalizeOriginalToDone();
+          // 新建答案专用卡（静态模板）并投放最终答案
+          const answerCard = await createAICardForTarget(
+            account.config as DingtalkConfig,
+            target,
+            log,
+            ANSWER_CARD_TEMPLATE_ID,
+          );
+          if (answerCard) {
+            await finishAICard(answerCard, finalText, account.config as DingtalkConfig, log);
+            log.info(`[DingTalk][closeStreaming] ✅ 答案卡投放成功`);
+          } else {
+            // 答案卡建失败 → 降级直接定稿原卡，保证用户能看到回复
+            log.warn(`[DingTalk][closeStreaming] 答案卡创建失败，降级定稿原卡`);
+            await finishAICard(cardSnapshot as any, finalText, account.config as DingtalkConfig, log);
+          }
         }
       } else {
         log.info(`[DingTalk][closeStreaming] 准备调用 finishAICard，文本长度=${finalText.length}`);
@@ -594,7 +610,7 @@ export function createDingtalkReplyDispatcher(params: CreateDingtalkReplyDispatc
 
         // 观察标记：更新最终答案认定（marker / 非 reasoning 兜底）
         observeReply(payload.text, (payload as any).isReasoning);
-        
+
         // ✅ 在 final 响应时，先处理裸露的文件路径
         if (info?.kind === "final" && text.trim()) {
           const target: AICardTarget = isDirect
@@ -877,6 +893,32 @@ export function createDingtalkReplyDispatcher(params: CreateDingtalkReplyDispatc
         }
       },
       }),
+      // ===== 工具调用进度：开始调用工具时，往原卡流式显示"正在调用工具：工具名" =====
+      // OpenClaw 的 onToolStart 带干净的工具名（payload.name）。已进入最终答案 / 异步 / 非流式则跳过。
+      onToolStart: async (payload: { name?: string; phase?: string; args?: Record<string, unknown> }) => {
+        const toolName = (payload?.name || "").trim();
+        if (!toolName) return;
+        if (payload?.phase === "end" || payload?.phase === "complete") return;
+        if (!streamingEnabled || asyncMode || finalMarkedText !== null) return;
+        try {
+          await startStreaming();
+          if (!currentCardTarget) return;
+          const now = Date.now();
+          if (now - lastUpdateTime < updateInterval) return;
+          lastUpdateTime = now;
+          await streamAICard(
+            currentCardTarget as any,
+            `🔧 正在调用工具：${toolName}`,
+            false,
+            account.config as DingtalkConfig,
+            log,
+            (account.config as DingtalkConfig)?.cardContentVar as string || "msgContent",
+          );
+          log.debug(`[DingTalk][onToolStart] 工具进度写卡：${toolName}（phase=${payload?.phase}）`);
+        } catch (e: any) {
+          if (!isQpsLimitError(e)) log.warn(`[DingTalk][onToolStart] 工具进度写卡失败：${e?.message || e}`);
+        }
+      },
       // ===== 养成系统：监听 dws 命令执行 =====
       onCommandOutput: (payload: {
         itemId?: string;