@soimy/dingtalk 3.6.5 → 3.6.6

package/README.md

@@ -150,6 +150,8 @@ openclaw configure --section channels
 
 使用该能力无需额外配置模板 ID；插件内置钉钉互动卡片模板。若当前 OpenClaw 运行时不支持工具注册，插件会跳过该工具注册，不影响既有钉钉消息收发、AI 卡片和反馈学习能力。
 
+使用说明见 [表单互动卡片](docs/user/features/form-interactive-card.md)。
+
 ## 重要功能文档
 
 - [消息类型支持](docs/user/features/message-types.md)

package/dist/index.js

@@ -1667,7 +1667,7 @@ var BUILTIN_DINGTALK_CARD_TEMPLATE_ID = process.env.DINGTALK_CARD_TEMPLATE_ID ||
 var BUILTIN_DINGTALK_CARD_CONTENT_KEY = "content";
 var BUILTIN_DINGTALK_CARD_BLOCK_LIST_KEY = "blockList";
 var BUILTIN_DINGTALK_CARD_COPY_CONTENT_KEY = "copy_content";
-var BUILTIN_DINGTALK_ASK_USER_CARD_TEMPLATE_ID = "89d0c6fe-3822-44c8-950e-e950f562546d.schema";
+var BUILTIN_DINGTALK_ASK_USER_CARD_TEMPLATE_ID = "c2a6355b-9724-4f7e-9653-d33fcb3311bb.schema";
 var DINGTALK_CARD_TEMPLATE = Object.freeze({
   templateId: BUILTIN_DINGTALK_CARD_TEMPLATE_ID,
   contentKey: BUILTIN_DINGTALK_CARD_CONTENT_KEY,
@@ -3514,6 +3514,36 @@ function renderStatusLine(data, config) {
   return lines.join("\n");
 }
 
+// src/card/task-model-metadata.ts
+function readPrimaryModelRef(value) {
+  if (typeof value === "string") {
+    return value.trim() || void 0;
+  }
+  if (value && typeof value === "object" && typeof value.primary === "string") {
+    return value.primary.trim() || void 0;
+  }
+  return void 0;
+}
+function normalizeModelDisplayName(modelRef) {
+  const trimmed = typeof modelRef === "string" ? modelRef.trim() : "";
+  if (!trimmed) {
+    return void 0;
+  }
+  const parts = trimmed.split("/").map((part) => part.trim()).filter(Boolean);
+  return parts.at(-1) || void 0;
+}
+function resolveConfiguredTaskModelMetadata(params) {
+  const agents = params.cfg.agents;
+  const agentId = String(params.agentId || "").trim();
+  const agent = Array.isArray(agents?.list) ? agents.list.find((entry) => String(entry.id || "").trim() === agentId) : void 0;
+  const modelRef = readPrimaryModelRef(agent?.model) ?? readPrimaryModelRef(agents?.defaults?.model);
+  const effort = typeof agent?.thinkingDefault === "string" && agent.thinkingDefault.trim() ? agent.thinkingDefault.trim() : typeof agents?.defaults?.thinkingDefault === "string" && agents.defaults.thinkingDefault.trim() ? agents.defaults.thinkingDefault.trim() : void 0;
+  return {
+    model: normalizeModelDisplayName(modelRef),
+    effort
+  };
+}
+
 // src/command/card-stop-command.ts
 import { resolveNativeCommandSessionTargets } from "openclaw/plugin-sdk/command-auth";
 
@@ -8528,27 +8558,43 @@ function createCardDraftController(params) {
 
 // src/session-state.ts
 var sessionStore = /* @__PURE__ */ new Map();
-function sessionKey(accountId, conversationId) {
-  return `${accountId}:${conversationId}`;
+function sessionKey(scope) {
+  return `${scope.accountId}:${scope.agentId}:${scope.conversationId}`;
+}
+function normalizeMetadataValue(value) {
+  const trimmed = typeof value === "string" ? value.trim() : "";
+  return trimmed || void 0;
+}
+function seedMissingSessionStateMetadata(state, metadata) {
+  const model = normalizeMetadataValue(metadata?.model);
+  const effort = normalizeMetadataValue(metadata?.effort);
+  if (state.model === void 0 && model !== void 0) {
+    state.model = model;
+  }
+  if (state.effort === void 0 && effort !== void 0) {
+    state.effort = effort;
+  }
 }
-function initSessionState(accountId, conversationId) {
-  const key = sessionKey(accountId, conversationId);
+function initSessionState(scope, metadata) {
+  const key = sessionKey(scope);
   const existing = sessionStore.get(key);
   if (existing) {
     existing.taskStartTime = Date.now();
+    seedMissingSessionStateMetadata(existing, metadata);
     return existing;
   }
   const state = {
     taskStartTime: Date.now()
   };
+  seedMissingSessionStateMetadata(state, metadata);
   sessionStore.set(key, state);
   return state;
 }
-function getSessionState(accountId, conversationId) {
-  return sessionStore.get(sessionKey(accountId, conversationId));
+function getSessionState(scope) {
+  return sessionStore.get(sessionKey(scope));
 }
-function updateSessionState(accountId, conversationId, patch) {
-  const state = sessionStore.get(sessionKey(accountId, conversationId));
+function updateSessionState(scope, patch) {
+  const state = sessionStore.get(sessionKey(scope));
   if (!state) {
     return;
   }
@@ -8559,8 +8605,8 @@ function updateSessionState(accountId, conversationId, patch) {
     state.effort = patch.effort;
   }
 }
-function getTaskTimeSeconds(accountId, conversationId) {
-  const state = sessionStore.get(sessionKey(accountId, conversationId));
+function getTaskTimeSeconds(scope) {
+  const state = sessionStore.get(sessionKey(scope));
   if (!state) {
     return void 0;
   }
@@ -8618,12 +8664,17 @@ var EMPTY_FINAL_REPLY = "\u2705 Done";
 var DEFAULT_CARD_FAILED_MESSAGE = "\u56DE\u590D\u751F\u6210\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5";
 function createCardReplyStrategy(ctx) {
   const { card, config, log, isStopRequested } = ctx;
+  const sessionTaskStateScope = card.accountId && card.conversationId && ctx.sessionAgentId ? {
+    accountId: card.accountId,
+    conversationId: card.contextConversationId || card.conversationId,
+    agentId: ctx.sessionAgentId
+  } : void 0;
   const buildStatusLine = () => {
     if (!ctx.taskMeta) {
       return void 0;
     }
     const resolvedUsage = typeof card.dapiUsage === "number" ? card.dapiUsage : typeof ctx.taskMeta.usage === "number" ? ctx.taskMeta.usage : void 0;
-    const sessionTaskTimeSeconds = card.accountId && card.conversationId ? getTaskTimeSeconds(card.accountId, card.contextConversationId || card.conversationId) : void 0;
+    const sessionTaskTimeSeconds = sessionTaskStateScope ? getTaskTimeSeconds(sessionTaskStateScope) : void 0;
     const cardElapsedMs = Math.max(0, Date.now() - card.createdAt);
     const sessionElapsedMs = typeof sessionTaskTimeSeconds === "number" ? sessionTaskTimeSeconds * 1e3 : void 0;
     const metaElapsedMs = typeof ctx.taskMeta.elapsedMs === "number" && ctx.taskMeta.elapsedMs > 0 ? ctx.taskMeta.elapsedMs : void 0;
@@ -8938,10 +8989,12 @@ function createCardReplyStrategy(ctx) {
           if (!card.accountId || !card.conversationId) {
             return;
           }
-          updateSessionState(card.accountId, card.contextConversationId || card.conversationId, {
-            model: selected.model,
-            effort: selected.thinkLevel
-          });
+          if (sessionTaskStateScope) {
+            updateSessionState(sessionTaskStateScope, {
+              model: selected.model,
+              effort: selected.thinkLevel
+            });
+          }
           if (ctx.taskMeta) {
             ctx.taskMeta.model = selected.model;
             ctx.taskMeta.effort = selected.thinkLevel;
@@ -8964,6 +9017,13 @@ function createCardReplyStrategy(ctx) {
         }
       }
       if (payload.kind === "final") {
+        const hasPreservableReply = Boolean(
+          finalTextForFallback?.trim() || controller.getFinalAnswerContent().trim()
+        ) || processedMediaUrls.size > 0 || pendingNonImageMedia.length > 0;
+        if (payload.isError === true && sawFinalDelivery && payload.mediaUrls.length === 0 && hasPreservableReply) {
+          log?.debug?.("[DingTalk][Finalize] Ignoring late error final after answer delivery");
+          return;
+        }
         const isFirstFinalDelivery = !sawFinalDelivery;
         lifecycleState = "final_seen";
         await flushPendingReasoning();
@@ -10798,16 +10858,26 @@ async function handleDingTalkMessageInner(params) {
   const content = extractedContent;
   const isBtwBypass = isBtwRequestText(stripLeadingMentions(content.text).trim());
   const taskInfoConversationId = groupId || to;
-  const sessionTaskState = initSessionState(accountId, taskInfoConversationId);
+  const agentDisplayName = getAgentDisplayName({
+    subAgentOptions,
+    agentId: route.agentId,
+    agentsList: cfg.agents?.list
+  });
+  const configuredTaskMetadata = resolveConfiguredTaskModelMetadata({
+    cfg,
+    agentId: route.agentId
+  });
+  const sessionTaskStateScope = {
+    accountId,
+    conversationId: taskInfoConversationId,
+    agentId: route.agentId
+  };
+  const sessionTaskState = initSessionState(sessionTaskStateScope, configuredTaskMetadata);
   const initialStatusLine = renderStatusLine(
     {
       model: sessionTaskState.model,
       effort: sessionTaskState.effort,
-      agent: getAgentDisplayName({
-        subAgentOptions,
-        agentId: route.agentId,
-        agentsList: cfg.agents?.list
-      })
+      agent: agentDisplayName
     },
     dingtalkConfig
   ) || void 0;
@@ -11768,16 +11838,12 @@ ${attachmentExtractedText}` : inboundBody;
         accountId
       });
       const strategyConfig = legacyCardStreamReasoning === void 0 ? dingtalkConfig : { ...dingtalkConfig, cardStreamReasoning: legacyCardStreamReasoning };
-      const sessionTaskState2 = getSessionState(accountId, taskInfoConversationId);
+      const sessionTaskState2 = getSessionState(sessionTaskStateScope);
       const taskMeta = {
         model: sessionTaskState2?.model,
         effort: sessionTaskState2?.effort,
         elapsedMs: typeof sessionTaskState2?.taskStartTime === "number" ? Math.max(0, Date.now() - sessionTaskState2.taskStartTime) : void 0,
-        agent: getAgentDisplayName({
-          subAgentOptions,
-          agentId: route.agentId,
-          agentsList: cfg.agents?.list
-        })
+        agent: agentDisplayName
       };
       const strategy = createReplyStrategy({
         config: strategyConfig,
@@ -11838,6 +11904,7 @@ ${attachmentExtractedText}` : inboundBody;
                   mediaUrls,
                   audioAsVoice: extractSharedAudioAsVoice(payload, inlineReplyPayload),
                   kind: replyKind,
+                  isError: payload.isError === true,
                   isReasoning: richPayload.isReasoning === true
                 });
               } catch (err) {