@soimy/dingtalk 3.6.11 → 3.7.0

package/src/card/card-markdown-image-reroute.ts

@@ -10,14 +10,20 @@ export interface MarkdownImageCandidate {
 }
 
 const MARKDOWN_IMAGE_RE = /!\[([^\]]*)\]\(([^)]+)\)/g;
-const PRIVATE_HOST_RE = /^(?:localhost|127\.0\.0\.1|10\.\d+\.\d+\.\d+|192\.168\.\d+\.\d+|172\.(?:1[6-9]|2\d|3[0-1])\.\d+\.\d+)$/;
+const PRIVATE_HOST_RE =
+  /^(?:localhost|127\.0\.0\.1|10\.\d+\.\d+\.\d+|192\.168\.\d+\.\d+|172\.(?:1[6-9]|2\d|3[0-1])\.\d+\.\d+)$/;
 
 function isLikelyPlainRelativePath(url: string): boolean {
   return !/^[a-zA-Z][a-zA-Z\d+.-]*:/.test(url) && !url.startsWith("//");
 }
 
 function isLikelyLocalPath(url: string): boolean {
-  return url.startsWith("./") || url.startsWith("../") || url.startsWith("/") || isLikelyPlainRelativePath(url);
+  return (
+    url.startsWith("./") ||
+    url.startsWith("../") ||
+    url.startsWith("/") ||
+    isLikelyPlainRelativePath(url)
+  );
 }
 
 function safeFileNameFromUrl(url: string): string {

package/src/card/card-run-registry.ts

@@ -1,3 +1,4 @@
+import type { AICardInstance } from "../platform/types";
 /**
  * In-process card run registry for tracking active AI card runs.
  *
@@ -7,8 +8,7 @@
  * the stop button to silently fail. Ensure single-process deployment or sticky
  * routing per card callback when using the stop button feature.
  */
-import type { CardDraftController } from "../card-draft-controller";
-import type { AICardInstance } from "../types";
+import type { CardDraftController } from "./card-draft-controller";
 
 export interface CardRunRecord {
   outTrackId: string;
@@ -110,10 +110,16 @@ export function resolveCardRunByConversation(
   const targetOwner = options?.ownerUserId;
   let latest: CardRunRecord | null = null;
   for (const record of records.values()) {
-    if (record.accountId !== accountId) { continue; }
-    if (!record.sessionKey.toLowerCase().includes(lowerCid)) { continue; }
+    if (record.accountId !== accountId) {
+      continue;
+    }
+    if (!record.sessionKey.toLowerCase().includes(lowerCid)) {
+      continue;
+    }
     // If ownerUserId filter is specified, only match runs owned by that user
-    if (targetOwner !== undefined && record.ownerUserId !== targetOwner) { continue; }
+    if (targetOwner !== undefined && record.ownerUserId !== targetOwner) {
+      continue;
+    }
     if (!latest || record.registeredAt > latest.registeredAt) {
       latest = record;
     }
@@ -134,8 +140,12 @@ export function resolveCardRunByOwner(
 ): CardRunRecord | null {
   let latest: CardRunRecord | null = null;
   for (const record of records.values()) {
-    if (record.accountId !== accountId) { continue; }
-    if (record.ownerUserId !== ownerUserId) { continue; }
+    if (record.accountId !== accountId) {
+      continue;
+    }
+    if (record.ownerUserId !== ownerUserId) {
+      continue;
+    }
     if (!latest || record.registeredAt > latest.registeredAt) {
       latest = record;
     }

package/src/{card-service.ts → card/card-service.ts}

@@ -1,12 +1,6 @@
 import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import axios from "./http-client";
-import { getAccessToken } from "./auth";
-import { updateCardVariables } from "./card-callback-service";
-import { DINGTALK_CARD_TEMPLATE, STOP_ACTION_VISIBLE, STOP_ACTION_HIDDEN } from "./card/card-template";
-import { resolveRobotCode, stripTargetPrefix } from "./config";
-import { resolveOriginalPeerId } from "./peer-id-registry";
 import {
   createSyntheticOutboundMsgId,
   clearMessageContextCacheForTest,
@@ -16,12 +10,9 @@ import {
   inferConversationChatType,
   resolveByCreatedAtWindow,
   upsertOutboundMessageContext,
-} from "./message-context-store";
-import {
-  readNamespaceJson,
-  resolveNamespacePath,
-  writeNamespaceJsonAtomic,
-} from "./persistence-store";
+} from "../messaging/message-context-store";
+import { getAccessToken } from "../platform/auth";
+import { resolveRobotCode, stripTargetPrefix } from "../platform/config";
 import type {
   AICardInstance,
   AICardStreamingRequest,
@@ -30,9 +21,18 @@ import type {
   DingTalkTrackingMetadata,
   Logger,
   QuotedRef,
-} from "./types";
-import { AICardStatus } from "./types";
-import { formatDingTalkErrorPayloadLog, getProxyBypassOption } from "./utils";
+} from "../platform/types";
+import { AICardStatus } from "../platform/types";
+import axios from "../shared/http-client";
+import {
+  readNamespaceJson,
+  resolveNamespacePath,
+  writeNamespaceJsonAtomic,
+} from "../shared/persistence-store";
+import { formatDingTalkErrorPayloadLog, getProxyBypassOption } from "../shared/utils";
+import { resolveOriginalPeerId } from "../targeting/peer-id-registry";
+import { updateCardVariables } from "./card-callback-service";
+import { DINGTALK_CARD_TEMPLATE, STOP_ACTION_VISIBLE, STOP_ACTION_HIDDEN } from "./card-template";
 
 const DINGTALK_API = "https://api.dingtalk.com";
 // Thinking/tool stream snippets are truncated to keep card updates compact.
@@ -85,7 +85,10 @@ function pruneInMemoryCardContentEntries(
   return entries.filter((entry) => nowMs < entry.expiresAt).slice(-CARD_CACHE_MAX_PER_CONVERSATION);
 }
 
-function touchInMemoryCardContentBucket(scopeKey: string, nowMs: number): {
+function touchInMemoryCardContentBucket(
+  scopeKey: string,
+  nowMs: number,
+): {
   entries: Array<{ content: string; createdAt: number; expiresAt: number }>;
   lastActiveAt: number;
 } {
@@ -282,7 +285,11 @@ async function putAICardStreamingField(
   };
 
   try {
-    const streamResp = await axios.put(`${DINGTALK_API}/v1.0/card/streaming`, streamBody, requestConfig);
+    const streamResp = await axios.put(
+      `${DINGTALK_API}/v1.0/card/streaming`,
+      streamBody,
+      requestConfig,
+    );
     log?.debug?.(
       `[DingTalk][AICard] Streaming response: status=${streamResp.status}, data=${JSON.stringify(streamResp.data)}`,
     );
@@ -408,8 +415,11 @@ function normalizePendingState(parsed: Partial<PendingCardStateFile>): PendingCa
         typeof entry.conversationId === "string" &&
         (entry.lastContent === undefined || typeof entry.lastContent === "string") &&
         (entry.lastBlockListJson === undefined || typeof entry.lastBlockListJson === "string") &&
-        (entry.streamLifecycleOpened === undefined || typeof entry.streamLifecycleOpened === "boolean") &&
-        (entry.recoveryAction === undefined || entry.recoveryAction === "finalize" || entry.recoveryAction === "recall"),
+        (entry.streamLifecycleOpened === undefined ||
+          typeof entry.streamLifecycleOpened === "boolean") &&
+        (entry.recoveryAction === undefined ||
+          entry.recoveryAction === "finalize" ||
+          entry.recoveryAction === "recall"),
       ),
     ),
   };
@@ -517,9 +527,7 @@ function buildStoppedCardFinalizePayload(params: {
   const baseContent = params.previousContent?.trim() || "";
   const blocks = parseStoredBlockList(params.previousBlockListJson);
   blocks.push({ type: 0, markdown: markerText });
-  const content = baseContent
-    ? `${baseContent}\n\n---\n*${markerText}*`
-    : markerText;
+  const content = baseContent ? `${baseContent}\n\n---\n*${markerText}*` : markerText;
   return {
     blockListJson: JSON.stringify(blocks),
     content,
@@ -593,9 +601,9 @@ function normalizeRecoveredState(state: string): AICardInstance["state"] {
 // Helper to identify card terminal states.
 export function isCardInTerminalState(state: string): boolean {
   return (
-    state === AICardStatus.FINISHED
-    || state === AICardStatus.STOPPED
-    || state === AICardStatus.FAILED
+    state === AICardStatus.FINISHED ||
+    state === AICardStatus.STOPPED ||
+    state === AICardStatus.FAILED
   );
 }
 
@@ -619,7 +627,10 @@ async function ensureFreshToken(card: AICardInstance, log?: Logger): Promise<voi
   }
 }
 
-export function formatContentForCard(content: string | undefined, type: "thinking" | "tool"): string {
+export function formatContentForCard(
+  content: string | undefined,
+  type: "thinking" | "tool",
+): string {
   if (!content) {
     return "";
   }
@@ -693,10 +704,14 @@ export async function sendProactiveCardText(
       return { ok: false, error: "Failed to create AI card" };
     }
     const blockListJson = JSON.stringify([{ type: 0, markdown: content } satisfies CardBlock]);
-    await commitAICardBlocks(card, {
-      blockListJson,
-      content,
-    }, log);
+    await commitAICardBlocks(
+      card,
+      {
+        blockListJson,
+        content,
+      },
+      log,
+    );
     return {
       ok: true,
       processQueryKey: card.processQueryKey,
@@ -749,8 +764,9 @@ async function finalizePendingCardsByAccount(
 
   const pendingCards = listPendingCardsByAccount(accountId, storePath, log).filter(
     (item) =>
-      (item.recoveryAction === "recall" && mode === "recover")
-      || (item.recoveryAction !== "recall" && (!isCardInTerminalState(item.state) || item.recoveryAction === "finalize")),
+      (item.recoveryAction === "recall" && mode === "recover") ||
+      (item.recoveryAction !== "recall" &&
+        (!isCardInTerminalState(item.state) || item.recoveryAction === "finalize")),
   );
   if (pendingCards.length === 0) {
     return 0;
@@ -794,11 +810,15 @@ async function finalizePendingCardsByAccount(
         }
         continue;
       }
-      await finalizeStoppedAICard(card, {
-        reason,
-        previousContent: entry.lastContent,
-        previousBlockListJson: entry.lastBlockListJson,
-      }, log);
+      await finalizeStoppedAICard(
+        card,
+        {
+          reason,
+          previousContent: entry.lastContent,
+          previousBlockListJson: entry.lastBlockListJson,
+        },
+        log,
+      );
       finalizedCount += 1;
     } catch (err: unknown) {
       const action = mode === "recover" ? "recover" : "finalize";
@@ -904,7 +924,11 @@ export async function createAICard(
           cardInstanceId?: unknown;
         }
       | undefined;
-    const deliverResults = (responseData?.result as { deliverResults?: Array<{ success?: boolean; errorMsg?: string }> } | undefined)?.deliverResults;
+    const deliverResults = (
+      responseData?.result as
+        | { deliverResults?: Array<{ success?: boolean; errorMsg?: string }> }
+        | undefined
+    )?.deliverResults;
     if (Array.isArray(deliverResults)) {
       const failedDelivery = deliverResults.find((item) => item?.success === false);
       if (failedDelivery) {
@@ -1130,7 +1154,9 @@ async function finalizeAICardStreamingLifecycleIfNeeded(
     });
   } catch (err: unknown) {
     const message = err instanceof Error ? err.message : String(err);
-    log?.warn?.(`[DingTalk][AICard] Streaming lifecycle finalize failed; continuing instances finalize: ${message}`);
+    log?.warn?.(
+      `[DingTalk][AICard] Streaming lifecycle finalize failed; continuing instances finalize: ${message}`,
+    );
   }
 }
 
@@ -1189,8 +1215,8 @@ export async function commitAICardBlocks(
 
   log?.debug?.(
     `[DingTalk][AICard] Finalizing via instances API: outTrackId=${card.outTrackId || card.cardInstanceId} ` +
-    `blockListLen=${options.blockListJson.length} contentLen=${options.content.length} flowStatus=3` +
-    (options.statusLine ? ` statusLine="${options.statusLine}"` : ""),
+      `blockListLen=${options.blockListJson.length} contentLen=${options.content.length} flowStatus=3` +
+      (options.statusLine ? ` statusLine="${options.statusLine}"` : ""),
   );
 
   try {
@@ -1233,10 +1259,11 @@ export async function commitAICardBlocks(
   card.state = AICardStatus.FINISHED;
   card.lastUpdated = Date.now();
   removePendingCard(card, log);
-  log?.info?.(`[DingTalk][AICard] Card finalized: outTrackId=${card.outTrackId || card.cardInstanceId} state=FINISHED`);
+  log?.info?.(
+    `[DingTalk][AICard] Card finalized: outTrackId=${card.outTrackId || card.cardInstanceId} state=FINISHED`,
+  );
 }
 
-
 export async function streamAICard(
   card: AICardInstance,
   content: string,
@@ -1270,8 +1297,8 @@ export async function streamAICard(
     retainPendingCardForRecovery(card, options.recoveryAction ?? "finalize", log);
     if (err.response?.status === 500 && err.response?.data?.code === "unknownError") {
       const errorMsg =
-        "⚠️ **[DingTalk] AI Card 串流更新失败 (500 unknownError)**\n\n"
-        + "这通常表示当前内置模板契约与钉钉侧模板字段不一致，当前及后续消息将自动回退为 Markdown 发送。";
+        "⚠️ **[DingTalk] AI Card 串流更新失败 (500 unknownError)**\n\n" +
+        "这通常表示当前内置模板契约与钉钉侧模板字段不一致，当前及后续消息将自动回退为 Markdown 发送。";
       await sendTemplateMismatchNotification(card, errorMsg, log);
     }
     throw err;
@@ -1300,7 +1327,9 @@ export async function finishAICard(
       const token = await getAccessToken(card.config, log);
       await hideCardStopButton(card.outTrackId, token, card.config);
     } catch (err: any) {
-      log?.debug?.(`[DingTalk][AICard] Non-critical: failed to hide stop button on finish: ${err.message}`);
+      log?.debug?.(
+        `[DingTalk][AICard] Non-critical: failed to hide stop button on finish: ${err.message}`,
+      );
     }
   }
   if (card.conversationId && content.trim() && card.accountId && card.processQueryKey) {
@@ -1334,14 +1363,12 @@ function parseRecallFailureEntries(payload: unknown): Array<[string, string]> {
   if (!payload || typeof payload !== "object") {
     return [];
   }
-  return Object.entries(payload as Record<string, unknown>)
-    .map(([key, value]) => [String(key), String(value ?? "")] as [string, string]);
+  return Object.entries(payload as Record<string, unknown>).map(
+    ([key, value]) => [String(key), String(value ?? "")] as [string, string],
+  );
 }
 
-export async function recallAICardMessage(
-  card: AICardInstance,
-  log?: Logger,
-): Promise<boolean> {
+export async function recallAICardMessage(card: AICardInstance, log?: Logger): Promise<boolean> {
   const config = card.config;
   const processQueryKey = card.processQueryKey?.trim();
   const robotCode = config ? resolveRobotCode(config) : "";
@@ -1349,8 +1376,8 @@ export async function recallAICardMessage(
   if (!config || !processQueryKey || !robotCode) {
     log?.warn?.(
       `[DingTalk][AICard] Skip recall because required metadata is missing: ` +
-      `card=${card.cardInstanceId} hasConfig=${Boolean(config)} ` +
-      `processQueryKey=${processQueryKey || "(none)"} robotCode=${robotCode || "(none)"}`,
+        `card=${card.cardInstanceId} hasConfig=${Boolean(config)} ` +
+        `processQueryKey=${processQueryKey || "(none)"} robotCode=${robotCode || "(none)"}`,
     );
     return false;
   }
@@ -1383,9 +1410,12 @@ export async function recallAICardMessage(
       },
       ...getProxyBypassOption(config),
     });
-    const successResults = Array.isArray((response.data as Record<string, unknown> | undefined)?.successResult)
-      ? ((response.data as Record<string, unknown>).successResult as unknown[])
-          .map((item) => String(item))
+    const successResults = Array.isArray(
+      (response.data as Record<string, unknown> | undefined)?.successResult,
+    )
+      ? ((response.data as Record<string, unknown>).successResult as unknown[]).map((item) =>
+          String(item),
+        )
       : [];
     const failedEntries = parseRecallFailureEntries(
       (response.data as Record<string, unknown> | undefined)?.failedResult,
@@ -1393,14 +1423,14 @@ export async function recallAICardMessage(
     if (failedEntries.length > 0) {
       log?.warn?.(
         `[DingTalk][AICard] Recall reported failedResult: card=${card.cardInstanceId} ` +
-        `processQueryKey=${processQueryKey} failed=${JSON.stringify(failedEntries)}`,
+          `processQueryKey=${processQueryKey} failed=${JSON.stringify(failedEntries)}`,
       );
       return false;
     }
     if (!successResults.includes(processQueryKey)) {
       log?.warn?.(
         `[DingTalk][AICard] Recall response missing successResult for processQueryKey=${processQueryKey} ` +
-        `payload=${JSON.stringify(response.data)}`,
+          `payload=${JSON.stringify(response.data)}`,
       );
       return false;
     }
@@ -1410,7 +1440,7 @@ export async function recallAICardMessage(
     removePendingCard(card, log);
     log?.info?.(
       `[DingTalk][AICard] Recalled empty card message: card=${card.cardInstanceId} ` +
-      `conversationId=${target.conversationId} processQueryKey=${processQueryKey} mode=${target.isGroup ? "group" : "direct"}`,
+        `conversationId=${target.conversationId} processQueryKey=${processQueryKey} mode=${target.isGroup ? "group" : "direct"}`,
     );
     return true;
   } catch (err: any) {
@@ -1514,7 +1544,7 @@ function cacheCardContentByProcessQueryKey(
   }
   log?.debug?.(
     `[DingTalk][QuotedRef][Persist] direction=outbound scope=${conversationId} messageType=card ` +
-    `processQueryKey=${processQueryKey} quotedRef=${quotedRef ? JSON.stringify(quotedRef) : "(none)"}`,
+      `processQueryKey=${processQueryKey} quotedRef=${quotedRef ? JSON.stringify(quotedRef) : "(none)"}`,
   );
   upsertOutboundMessageContext({
     storePath,

package/src/card/card-stop-handler.ts

@@ -1,9 +1,9 @@
 import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
-import { finalizeStoppedAICard } from "../card-service";
 import { dispatchDingTalkCardStopCommand } from "../command/card-stop-command";
-import type { DingTalkConfig, Logger } from "../types";
-import { AICardStatus } from "../types";
+import type { DingTalkConfig, Logger } from "../platform/types";
+import { AICardStatus } from "../platform/types";
 import { markCardRunStopRequested, resolveCardRun } from "./card-run-registry";
+import { finalizeStoppedAICard } from "./card-service";
 
 export interface StopCardRunResult {
   ok: boolean;
@@ -68,11 +68,15 @@ export async function stopCardRun(params: {
   // --- Phase 2: Finalize card via instances API so V2 blockList/content stay consistent ---
   if (record.card) {
     try {
-      await finalizeStoppedAICard(record.card, {
-        reason: "⏹️ 已停止",
-        previousContent: lastContent,
-        previousBlockListJson: lastBlockListJson,
-      }, params.log);
+      await finalizeStoppedAICard(
+        record.card,
+        {
+          reason: "⏹️ 已停止",
+          previousContent: lastContent,
+          previousBlockListJson: lastBlockListJson,
+        },
+        params.log,
+      );
     } catch (error) {
       params.log?.warn?.(
         `[${params.accountId}] [DingTalk][CardStop] failed to finalize stopped card: ${error instanceof Error ? error.message : String(error)}`,

package/src/card/card-streaming-mode.ts

@@ -1,4 +1,4 @@
-import type { DingTalkConfig } from "../types";
+import type { DingTalkConfig } from "../platform/types";
 
 export type CardStreamingMode = "off" | "answer" | "all";