@soimy/dingtalk 3.5.3 → 3.6.1

package/src/targeting/agent-name-matcher.ts

@@ -146,3 +146,31 @@ export function resolveAtAgents(
     hasInvalidAgentNames,
   };
 }
+
+/**
+ * Get agent display name for statusLine in card template.
+ *
+ * Priority:
+ * 1. subAgentOptions.matchedName - user-friendly name from @mention (e.g., "代码专家")
+ * 2. agents.list lookup - name field from agent config
+ * 3. agentId fallback - technical identifier
+ */
+export function getAgentDisplayName(params: {
+  subAgentOptions?: { matchedName?: string };
+  agentId: string;
+  agentsList?: Array<{ id: string; name?: string }>;
+}): string {
+  // Priority 1: sub-agent matchedName (user-friendly)
+  if (params.subAgentOptions?.matchedName) {
+    return params.subAgentOptions.matchedName;
+  }
+  // Priority 2: lookup from agents.list
+  if (params.agentsList) {
+    const agent = params.agentsList.find((a) => a.id === params.agentId);
+    if (agent?.name) {
+      return agent.name;
+    }
+  }
+  // Priority 3: fallback to agentId
+  return params.agentId;
+}

package/src/targeting/agent-routing.ts

@@ -158,11 +158,36 @@ export async function dispatchSubAgents(params: {
   const { matchedAgents, cfg, accountId, data, dingtalkConfig, sessionWebhook, extractedContent, handleMessage, downloadMedia: download, log } = params;
 
   // Pre-download media once to avoid duplication across sub-agents
-  let preDownloadedMedia: { mediaPath?: string; mediaType?: string } | undefined;
-  if (extractedContent.mediaPath && resolveRobotCode(dingtalkConfig)) {
-    const media = await download(dingtalkConfig, extractedContent.mediaPath, log);
-    if (media) {
-      preDownloadedMedia = { mediaPath: media.path, mediaType: media.mimeType };
+  let preDownloadedMedia: {
+    mediaPath?: string;
+    mediaType?: string;
+    mediaPaths?: string[];
+    mediaTypes?: string[];
+  } | undefined;
+  const robotCode = resolveRobotCode(dingtalkConfig);
+  if (robotCode) {
+    const downloadCodes =
+      extractedContent.mediaPaths && extractedContent.mediaPaths.length > 0
+        ? extractedContent.mediaPaths
+        : extractedContent.mediaPath
+          ? [extractedContent.mediaPath]
+          : [];
+    const mediaPaths: string[] = [];
+    const mediaTypes: string[] = [];
+    for (const downloadCode of downloadCodes) {
+      const media = await download(dingtalkConfig, downloadCode, log);
+      if (media) {
+        mediaPaths.push(media.path);
+        mediaTypes.push(media.mimeType);
+      }
+    }
+    if (mediaPaths.length > 0) {
+      preDownloadedMedia = {
+        mediaPath: mediaPaths[0],
+        mediaType: mediaTypes[0],
+        mediaPaths,
+        mediaTypes,
+      };
     }
   }
   let helperMissingWarningSent = false;

package/src/types.ts

@@ -9,17 +9,14 @@
  * - Session and token management
  */
 
-import type {
-  ChannelPlugin as SDKChannelPlugin,
-  OpenClawConfig,
-} from "openclaw/plugin-sdk/core";
 import type {
   ChannelAccountSnapshot as SDKChannelAccountSnapshot,
   ChannelGatewayContext as SDKChannelGatewayContext,
   ChannelLogSink as SDKChannelLogSink,
 } from "openclaw/plugin-sdk/channel-runtime";
+import type { ChannelPlugin as SDKChannelPlugin, OpenClawConfig } from "openclaw/plugin-sdk/core";
 import type { ChannelSetupWizard } from "openclaw/plugin-sdk/setup";
-import { mergeAccountWithDefaults } from "./config";
+import type { SecretInput } from "./secret-input";
 
 export type AckReactionMode = "off" | "emoji" | "kaomoji";
 // Accept arbitrary strings for backward compatibility; the recommended
@@ -33,7 +30,7 @@ export type ContextVisibilityMode = "all" | "allowlist" | "allowlist_quote";
  */
 export interface DingTalkConfig extends OpenClawConfig {
   clientId: string;
-  clientSecret: string;
+  clientSecret: SecretInput;
   name?: string;
   enabled?: boolean;
   dmPolicy?: "open" | "pairing" | "allowlist";
@@ -51,7 +48,10 @@ export interface DingTalkConfig extends OpenClawConfig {
   cardTemplateId?: string;
   /** @deprecated 已固定使用内置模板契约 */
   cardTemplateKey?: string;
-  groups?: Record<string, { systemPrompt?: string; requireMention?: boolean; groupAllowFrom?: string[] }>;
+  groups?: Record<
+    string,
+    { systemPrompt?: string; requireMention?: boolean; groupAllowFrom?: string[] }
+  >;
   accounts?: Record<string, DingTalkConfig>;
   // Connection robustness configuration
   maxConnectionAttempts?: number;
@@ -95,6 +95,15 @@ export interface DingTalkConfig extends OpenClawConfig {
   convertMarkdownTables?: boolean;
   /** @mention the sender after card finalization in group chats; value is the message text */
   cardAtSender?: string;
+  /** Status line visibility toggles for the AI card footer */
+  cardStatusLine?: {
+    model?: boolean;
+    effort?: boolean;
+    agent?: boolean;
+    taskTime?: boolean;
+    tokens?: boolean;
+    dapiUsage?: boolean;
+  };
 }
 
 /**
@@ -103,7 +112,7 @@ export interface DingTalkConfig extends OpenClawConfig {
 export interface DingTalkChannelConfig {
   enabled?: boolean;
   clientId: string;
-  clientSecret: string;
+  clientSecret: SecretInput;
   name?: string;
   dmPolicy?: "open" | "pairing" | "allowlist";
   groupPolicy?: "open" | "allowlist" | "disabled";
@@ -120,7 +129,10 @@ export interface DingTalkChannelConfig {
   cardTemplateId?: string;
   /** @deprecated 已固定使用内置模板契约 */
   cardTemplateKey?: string;
-  groups?: Record<string, { systemPrompt?: string; requireMention?: boolean; groupAllowFrom?: string[] }>;
+  groups?: Record<
+    string,
+    { systemPrompt?: string; requireMention?: boolean; groupAllowFrom?: string[] }
+  >;
   accounts?: Record<string, DingTalkConfig>;
   maxConnectionAttempts?: number;
   initialReconnectDelay?: number;
@@ -298,7 +310,12 @@ export interface DingTalkInboundMessage {
   sessionWebhook: string;
 }
 
-export type QuotedRefKey = "msgId" | "processQueryKey" | "messageId" | "outTrackId" | "cardInstanceId";
+export type QuotedRefKey =
+  | "msgId"
+  | "processQueryKey"
+  | "messageId"
+  | "outTrackId"
+  | "cardInstanceId";
 
 export type AttachmentTextSource = "text" | "html" | "pdf" | "docx";
 
@@ -460,6 +477,8 @@ export interface HandleDingTalkMessageParams {
   preDownloadedMedia?: {
     mediaPath?: string;
     mediaType?: string;
+    mediaPaths?: string[];
+    mediaTypes?: string[];
   };
 }
 
@@ -636,7 +655,9 @@ export interface DingTalkOutboundHandler {
   deliveryMode: "direct" | "queued" | "batch";
   resolveTarget: (params: ResolveTargetParams) => TargetResolutionResult;
   sendText: (params: SendTextParams) => Promise<{ ok: boolean; data?: unknown; error?: unknown }>;
-  sendMedia?: (params: SendMediaParams) => Promise<{ ok: boolean; data?: unknown; error?: unknown }>;
+  sendMedia?: (
+    params: SendMediaParams,
+  ) => Promise<{ ok: boolean; data?: unknown; error?: unknown }>;
 }
 
 /**
@@ -670,8 +691,13 @@ export interface AICardInstance {
   lastUpdated: number;
   state: AICardState; // Current card state: PROCESSING, INPUTING, FINISHED, STOPPED, FAILED
   config?: DingTalkConfig; // Store config reference for token refresh
-  lastStreamedContent?: string;
+  lastStreamedContent?: string; // Latest copy/content text shown to user
+  lastBlockListJson?: string; // Latest rendered CardBlock[] JSON for V2 instances API
   outTrackId?: string;
+  /** Cumulative DingTalk API call count for this card instance. */
+  dapiUsage?: number;
+  /** True after this card has successfully opened DingTalk's streaming lifecycle. */
+  streamLifecycleOpened?: boolean;
 }
 
 /**
@@ -731,150 +757,15 @@ export interface ConnectionAttemptResult {
   error?: Error;
   nextDelay?: number;
 }
-
-// ============ Onboarding Helper Functions ============
-
-const DEFAULT_ACCOUNT_ID = "default";
-
-function stripRemovedLegacyFieldsFromPublicAccount(
-  config: DingTalkConfig,
-): DingTalkConfig {
-  const {
-    cardStreamReasoning: _cardStreamReasoning,
-    verboseRealtimeStream: _verboseRealtimeStream,
-    accounts,
-    ...rest
-  } = config as DingTalkConfig & {
-    cardStreamReasoning?: unknown;
-    verboseRealtimeStream?: unknown;
-    accounts?: Record<string, DingTalkConfig | undefined>;
-  };
-  const sanitizedAccounts = accounts
-    ? Object.fromEntries(
-        Object.entries(accounts).map(([accountId, accountConfig]) => [
-          accountId,
-          accountConfig ? stripRemovedLegacyFieldsFromPublicAccount(accountConfig) : accountConfig,
-        ]),
-      )
-    : undefined;
-  if (sanitizedAccounts) {
-    return { ...rest, accounts: sanitizedAccounts } as DingTalkConfig;
-  }
-  return rest as DingTalkConfig;
-}
-
-/**
- * List all DingTalk account IDs from config
- */
-export function listDingTalkAccountIds(cfg: OpenClawConfig): string[] {
-  const dingtalk = cfg.channels?.dingtalk as DingTalkChannelConfig | undefined;
-  if (!dingtalk) {
-    return [];
-  }
-
-  const accountIds: string[] = [];
-
-  // Check for direct configuration (default account)
-  if (dingtalk.clientId || dingtalk.clientSecret) {
-    accountIds.push(DEFAULT_ACCOUNT_ID);
-  }
-
-  // Check accounts object
-  if (dingtalk.accounts) {
-    accountIds.push(...Object.keys(dingtalk.accounts));
-  }
-
-  return accountIds;
-}
-
 /**
- * Resolved DingTalk account with configuration status
+ * CardBlock types for AI Card v2 blockList.
+ * - 0 = answer (markdown text)
+ * - 1 = thinking process
+ * - 2 = tool result
+ * - 3 = image (uploaded mediaId)
  */
-export interface ResolvedDingTalkAccount extends DingTalkConfig {
-  accountId: string;
-  configured: boolean;
-}
-
-/**
- * Resolve a specific DingTalk account configuration
- */
-export function resolveDingTalkAccount(
-  cfg: OpenClawConfig,
-  accountId?: string | null,
-): ResolvedDingTalkAccount {
-  const id = accountId || DEFAULT_ACCOUNT_ID;
-  const dingtalk = cfg.channels?.dingtalk as DingTalkChannelConfig | undefined;
-
-  // If default account, return top-level config
-  if (id === DEFAULT_ACCOUNT_ID) {
-    const rawConfig: DingTalkConfig = {
-      clientId: dingtalk?.clientId ?? "",
-      clientSecret: dingtalk?.clientSecret ?? "",
-      name: dingtalk?.name,
-      enabled: dingtalk?.enabled,
-      dmPolicy: dingtalk?.dmPolicy,
-      groupPolicy: dingtalk?.groupPolicy,
-      allowFrom: dingtalk?.allowFrom,
-      groupAllowFrom: dingtalk?.groupAllowFrom,
-      displayNameResolution: dingtalk?.displayNameResolution,
-      contextVisibility: dingtalk?.contextVisibility,
-      journalTTLDays: dingtalk?.journalTTLDays,
-      ackReaction: dingtalk?.ackReaction,
-      debug: dingtalk?.debug,
-      messageType: dingtalk?.messageType,
-      cardTemplateId: dingtalk?.cardTemplateId,
-      cardTemplateKey: dingtalk?.cardTemplateKey,
-      groups: dingtalk?.groups,
-      accounts: dingtalk?.accounts,
-      maxConnectionAttempts: dingtalk?.maxConnectionAttempts,
-      initialReconnectDelay: dingtalk?.initialReconnectDelay,
-      maxReconnectDelay: dingtalk?.maxReconnectDelay,
-      reconnectJitter: dingtalk?.reconnectJitter,
-      maxReconnectCycles: dingtalk?.maxReconnectCycles,
-      reconnectDeadlineMs: dingtalk?.reconnectDeadlineMs,
-      useConnectionManager: dingtalk?.useConnectionManager,
-      mediaMaxMb: dingtalk?.mediaMaxMb,
-      keepAlive: dingtalk?.keepAlive,
-      bypassProxyForSend: dingtalk?.bypassProxyForSend,
-      proactivePermissionHint: dingtalk?.proactivePermissionHint,
-      cardStreamingMode: dingtalk?.cardStreamingMode,
-      cardRealTimeStream: dingtalk?.cardRealTimeStream,
-      cardStreamInterval: dingtalk?.cardStreamInterval,
-      aicardDegradeMs: dingtalk?.aicardDegradeMs,
-      learningEnabled: dingtalk?.learningEnabled,
-      learningAutoApply: dingtalk?.learningAutoApply,
-      learningNoteTtlMs: dingtalk?.learningNoteTtlMs,
-      convertMarkdownTables: dingtalk?.convertMarkdownTables,
-      cardAtSender: dingtalk?.cardAtSender,
-    };
-    const config = stripRemovedLegacyFieldsFromPublicAccount(rawConfig);
-    return {
-      ...config,
-      accountId: id,
-      configured: Boolean(config.clientId && config.clientSecret),
-    };
-  }
-
-  // If named account, merge channel-level defaults with account-level overrides
-  const accountConfig = dingtalk?.accounts?.[id];
-  if (accountConfig) {
-    const merged = mergeAccountWithDefaults(
-      dingtalk as DingTalkConfig,
-      accountConfig,
-    );
-    const publicMerged = stripRemovedLegacyFieldsFromPublicAccount(merged);
-    return {
-      ...publicMerged,
-      accountId: id,
-      configured: Boolean(merged.clientId && merged.clientSecret),
-    };
-  }
-
-  // Account doesn't exist, return empty config
-  return {
-    clientId: "",
-    clientSecret: "",
-    accountId: id,
-    configured: false,
-  };
-}
+export type CardBlock =
+  | { type: 0; markdown: string }
+  | { type: 1; markdown: string }
+  | { type: 2; markdown: string }
+  | { type: 3; mediaId: string; text?: string };