@openclaw-china/dingtalk 2026.3.7 → 2026.3.8-2

package/dist/index.js

@@ -4215,13 +4215,24 @@ var coerce = {
   date: ((arg) => ZodDate.create({ ...arg, coerce: true }))
 };
 var NEVER = INVALID;
-var DingtalkConfigSchema = external_exports.object({
+function toTrimmedString(value) {
+  if (value === void 0 || value === null) return void 0;
+  const next = String(value).trim();
+  return next ? next : void 0;
+}
+var optionalCoercedString = external_exports.preprocess(
+  (value) => toTrimmedString(value),
+  external_exports.string().min(1).optional()
+);
+var DingtalkAccountSchema = external_exports.object({
+  /** 账户显示名 */
+  name: external_exports.string().optional(),
   /** 是否启用钉钉渠道 */
   enabled: external_exports.boolean().optional().default(true),
   /** 钉钉应用 AppKey (clientId) */
-  clientId: external_exports.string().optional(),
+  clientId: optionalCoercedString,
   /** 钉钉应用 AppSecret (clientSecret) */
-  clientSecret: external_exports.string().optional(),
+  clientSecret: optionalCoercedString,
   /** 单聊策略: open=开放, pairing=配对, allowlist=白名单 */
   dmPolicy: external_exports.enum(["open", "pairing", "allowlist"]).optional().default("open"),
   /** 群聊策略: open=开放, allowlist=白名单, disabled=禁用 */
@@ -4252,6 +4263,29 @@ var DingtalkConfigSchema = external_exports.object({
     keepDays: external_exports.number().optional()
   }).optional()
 });
+DingtalkAccountSchema.extend({
+  defaultAccount: external_exports.string().optional(),
+  accounts: external_exports.record(DingtalkAccountSchema).optional()
+});
+var DEFAULT_ACCOUNT_ID = "default";
+var DINGTALK_ACCOUNT_KEYS = [
+  "name",
+  "clientId",
+  "clientSecret",
+  "dmPolicy",
+  "groupPolicy",
+  "requireMention",
+  "allowFrom",
+  "groupAllowFrom",
+  "historyLimit",
+  "textChunkLimit",
+  "longTaskNoticeDelayMs",
+  "enableAICard",
+  "gatewayToken",
+  "gatewayPassword",
+  "maxFileSizeMB",
+  "inboundMedia"
+];
 var DEFAULT_INBOUND_MEDIA_DIR = join(homedir(), ".openclaw", "media", "dingtalk", "inbound");
 var DEFAULT_INBOUND_MEDIA_KEEP_DAYS = 7;
 var DEFAULT_INBOUND_MEDIA_TEMP_DIR = join(tmpdir(), "dingtalk-media");
@@ -4265,16 +4299,116 @@ function resolveInboundMediaKeepDays(config) {
 function resolveInboundMediaTempDir() {
   return DEFAULT_INBOUND_MEDIA_TEMP_DIR;
 }
+function cloneIfObject(value) {
+  if (value && typeof value === "object") {
+    return structuredClone(value);
+  }
+  return value;
+}
+function baseLooksLikeConcreteAccount(cfg) {
+  if (!cfg) return false;
+  return Boolean(
+    toTrimmedString(cfg.clientId) || toTrimmedString(cfg.clientSecret) || toTrimmedString(cfg.gatewayToken) || toTrimmedString(cfg.gatewayPassword) || toTrimmedString(cfg.name)
+  );
+}
+function listConfiguredAccountIds(cfg) {
+  const accounts = cfg.channels?.dingtalk?.accounts;
+  if (!accounts || typeof accounts !== "object") return [];
+  return Object.keys(accounts).filter(Boolean);
+}
+function listDingtalkAccountIds(cfg) {
+  const ids = new Set(listConfiguredAccountIds(cfg));
+  if (ids.size === 0) return [DEFAULT_ACCOUNT_ID];
+  if (baseLooksLikeConcreteAccount(cfg.channels?.dingtalk) && !ids.has(DEFAULT_ACCOUNT_ID)) {
+    ids.add(DEFAULT_ACCOUNT_ID);
+  }
+  return Array.from(ids).sort((a, b) => a.localeCompare(b));
+}
+function resolveDefaultDingtalkAccountId(cfg) {
+  const dingtalkConfig = cfg.channels?.dingtalk;
+  const preferred = toTrimmedString(dingtalkConfig?.defaultAccount);
+  if (preferred && listDingtalkAccountIds(cfg).includes(preferred)) {
+    return preferred;
+  }
+  const ids = listDingtalkAccountIds(cfg);
+  if (ids.includes(DEFAULT_ACCOUNT_ID)) return DEFAULT_ACCOUNT_ID;
+  return ids[0] ?? DEFAULT_ACCOUNT_ID;
+}
+function resolveDingtalkAccountId(cfg, rawAccountId) {
+  return toTrimmedString(rawAccountId) ?? resolveDefaultDingtalkAccountId(cfg);
+}
+function resolveAccountConfig(cfg, accountId) {
+  const accounts = cfg.channels?.dingtalk?.accounts;
+  if (!accounts || typeof accounts !== "object") return void 0;
+  return accounts[accountId];
+}
+function extractBaseAccountPatch(cfg) {
+  const patch = {};
+  const patchRecord = patch;
+  if (!cfg) return patch;
+  for (const key of DINGTALK_ACCOUNT_KEYS) {
+    const value = cfg[key];
+    if (value !== void 0) {
+      patchRecord[key] = cloneIfObject(value);
+    }
+  }
+  return patch;
+}
+function moveDingtalkSingleAccountConfigToDefaultAccount(cfg) {
+  const dingtalkConfig = cfg.channels?.dingtalk;
+  if (!dingtalkConfig) {
+    return cfg;
+  }
+  const accounts = dingtalkConfig.accounts ?? {};
+  if (accounts[DEFAULT_ACCOUNT_ID]) {
+    return cfg;
+  }
+  if (!baseLooksLikeConcreteAccount(dingtalkConfig)) {
+    return cfg;
+  }
+  const patch = extractBaseAccountPatch(dingtalkConfig);
+  if (Object.keys(patch).length === 0) {
+    return cfg;
+  }
+  const nextChannel = { ...dingtalkConfig };
+  for (const key of DINGTALK_ACCOUNT_KEYS) {
+    delete nextChannel[key];
+  }
+  return {
+    ...cfg,
+    channels: {
+      ...cfg.channels,
+      dingtalk: {
+        ...nextChannel,
+        accounts: {
+          ...accounts,
+          [DEFAULT_ACCOUNT_ID]: {
+            ...patch
+          }
+        }
+      }
+    }
+  };
+}
+function mergeDingtalkAccountConfig(cfg, accountId) {
+  const base = cfg.channels?.dingtalk ?? {};
+  const { accounts: _ignored, defaultAccount: _ignored2, ...baseConfig } = base;
+  const account = resolveAccountConfig(cfg, accountId) ?? {};
+  return { ...baseConfig, ...account };
+}
 function isConfigured(config) {
-  return Boolean(config?.clientId && config?.clientSecret);
+  const credentials = resolveDingtalkCredentials(config);
+  return Boolean(credentials);
 }
 function resolveDingtalkCredentials(config) {
-  if (!config?.clientId || !config?.clientSecret) {
+  const clientId = toTrimmedString(config?.clientId);
+  const clientSecret = toTrimmedString(config?.clientSecret);
+  if (!clientId || !clientSecret) {
     return void 0;
   }
   return {
-    clientId: config.clientId,
-    clientSecret: config.clientSecret
+    clientId,
+    clientSecret
   };
 }
 function createDingtalkClient(opts) {
@@ -5291,7 +5425,20 @@ async function finalizeInboundMediaFile(options) {
     await fsPromises.mkdir(datedDir, { recursive: true });
     await fsPromises.rename(current, target);
     return target;
-  } catch {
+  } catch (error) {
+    const code = error?.code ?? "";
+    if (code === "EXDEV") {
+      try {
+        await fsPromises.copyFile(current, target);
+        try {
+          await fsPromises.unlink(current);
+        } catch {
+        }
+        return target;
+      } catch {
+        return current;
+      }
+    }
     return current;
   }
 }
@@ -6370,7 +6517,7 @@ function isCommandLike(value) {
   }
   return typeof value.command === "function" && typeof value.description === "function" && typeof value.action === "function";
 }
-function toTrimmedString(value) {
+function toTrimmedString2(value) {
   if (typeof value !== "string") {
     return void 0;
   }
@@ -6403,7 +6550,7 @@ function getPreferredAccountConfig(channelCfg) {
   if (!isRecord(accounts)) {
     return void 0;
   }
-  const defaultAccountId = toTrimmedString(channelCfg.defaultAccount);
+  const defaultAccountId = toTrimmedString2(channelCfg.defaultAccount);
   if (defaultAccountId) {
     const preferred = accounts[defaultAccountId];
     if (isRecord(preferred)) {
@@ -6540,12 +6687,12 @@ async function configureDingtalk(prompter, cfg) {
   const existing = getChannelConfig(cfg, "dingtalk");
   const clientId = await prompter.askText({
     label: "DingTalk clientId\uFF08AppKey\uFF09",
-    defaultValue: toTrimmedString(existing.clientId),
+    defaultValue: toTrimmedString2(existing.clientId),
     required: true
   });
   const clientSecret = await prompter.askSecret({
     label: "DingTalk clientSecret\uFF08AppSecret\uFF09",
-    existingValue: toTrimmedString(existing.clientSecret),
+    existingValue: toTrimmedString2(existing.clientSecret),
     required: true
   });
   const enableAICard = await prompter.askConfirm(
@@ -6564,12 +6711,12 @@ async function configureFeishu(prompter, cfg) {
   const existing = getChannelConfig(cfg, "feishu-china");
   const appId = await prompter.askText({
     label: "Feishu appId",
-    defaultValue: toTrimmedString(existing.appId),
+    defaultValue: toTrimmedString2(existing.appId),
     required: true
   });
   const appSecret = await prompter.askSecret({
     label: "Feishu appSecret",
-    existingValue: toTrimmedString(existing.appSecret),
+    existingValue: toTrimmedString2(existing.appSecret),
     required: true
   });
   const sendMarkdownAsCard = await prompter.askConfirm(
@@ -6588,17 +6735,17 @@ async function configureWecom(prompter, cfg) {
   const existing = getChannelConfig(cfg, "wecom");
   const webhookPath = await prompter.askText({
     label: "Webhook \u8DEF\u5F84\uFF08\u9700\u4E0E\u4F01\u4E1A\u5FAE\u4FE1\u540E\u53F0\u914D\u7F6E\u4E00\u81F4\uFF0C\u9ED8\u8BA4 /wecom\uFF09",
-    defaultValue: toTrimmedString(existing.webhookPath) ?? "/wecom",
+    defaultValue: toTrimmedString2(existing.webhookPath) ?? "/wecom",
     required: true
   });
   const token = await prompter.askSecret({
     label: "WeCom token",
-    existingValue: toTrimmedString(existing.token),
+    existingValue: toTrimmedString2(existing.token),
     required: true
   });
   const encodingAESKey = await prompter.askSecret({
     label: "WeCom encodingAESKey",
-    existingValue: toTrimmedString(existing.encodingAESKey),
+    existingValue: toTrimmedString2(existing.encodingAESKey),
     required: true
   });
   return mergeChannelConfig(cfg, "wecom", {
@@ -6614,17 +6761,17 @@ async function configureWecomApp(prompter, cfg) {
   const existingAsr = isRecord(existing.asr) ? existing.asr : {};
   const webhookPath = await prompter.askText({
     label: "Webhook \u8DEF\u5F84\uFF08\u9700\u4E0E\u4F01\u4E1A\u5FAE\u4FE1\u540E\u53F0\u914D\u7F6E\u4E00\u81F4\uFF0C\u9ED8\u8BA4 /wecom-app\uFF09",
-    defaultValue: toTrimmedString(existing.webhookPath) ?? "/wecom-app",
+    defaultValue: toTrimmedString2(existing.webhookPath) ?? "/wecom-app",
     required: true
   });
   const token = await prompter.askSecret({
     label: "WeCom App token",
-    existingValue: toTrimmedString(existing.token),
+    existingValue: toTrimmedString2(existing.token),
     required: true
   });
   const encodingAESKey = await prompter.askSecret({
     label: "WeCom App encodingAESKey",
-    existingValue: toTrimmedString(existing.encodingAESKey),
+    existingValue: toTrimmedString2(existing.encodingAESKey),
     required: true
   });
   const patch = {
@@ -6634,12 +6781,12 @@ async function configureWecomApp(prompter, cfg) {
   };
   const corpId = await prompter.askText({
     label: "corpId",
-    defaultValue: toTrimmedString(existing.corpId),
+    defaultValue: toTrimmedString2(existing.corpId),
     required: true
   });
   const corpSecret = await prompter.askSecret({
     label: "corpSecret",
-    existingValue: toTrimmedString(existing.corpSecret),
+    existingValue: toTrimmedString2(existing.corpSecret),
     required: true
   });
   const agentId = await prompter.askNumber({
@@ -6667,17 +6814,17 @@ async function configureWecomApp(prompter, cfg) {
     );
     asr.appId = await prompter.askText({
       label: "ASR appId\uFF08\u817E\u8BAF\u4E91\uFF09",
-      defaultValue: toTrimmedString(existingAsr.appId),
+      defaultValue: toTrimmedString2(existingAsr.appId),
       required: true
     });
     asr.secretId = await prompter.askSecret({
       label: "ASR secretId\uFF08\u817E\u8BAF\u4E91\uFF09",
-      existingValue: toTrimmedString(existingAsr.secretId),
+      existingValue: toTrimmedString2(existingAsr.secretId),
       required: true
     });
     asr.secretKey = await prompter.askSecret({
       label: "ASR secretKey\uFF08\u817E\u8BAF\u4E91\uFF09",
-      existingValue: toTrimmedString(existingAsr.secretKey),
+      existingValue: toTrimmedString2(existingAsr.secretKey),
       required: true
     });
   }
@@ -6691,12 +6838,12 @@ async function configureQQBot(prompter, cfg) {
   const existingAsr = isRecord(existing.asr) ? existing.asr : {};
   const appId = await prompter.askText({
     label: "QQBot appId",
-    defaultValue: toTrimmedString(existing.appId),
+    defaultValue: toTrimmedString2(existing.appId),
     required: true
   });
   const clientSecret = await prompter.askSecret({
     label: "QQBot clientSecret",
-    existingValue: toTrimmedString(existing.clientSecret),
+    existingValue: toTrimmedString2(existing.clientSecret),
     required: true
   });
   const asrEnabled = await prompter.askConfirm(
@@ -6710,17 +6857,17 @@ async function configureQQBot(prompter, cfg) {
     Ve("ASR \u5F00\u901A\u65B9\u5F0F\u8BE6\u60C5\u8BF7\u67E5\u770B\u914D\u7F6E\u6587\u6863\u3002", "\u63D0\u793A");
     asr.appId = await prompter.askText({
       label: "ASR appId\uFF08\u817E\u8BAF\u4E91\uFF09",
-      defaultValue: toTrimmedString(existingAsr.appId),
+      defaultValue: toTrimmedString2(existingAsr.appId),
       required: true
     });
     asr.secretId = await prompter.askSecret({
       label: "ASR secretId\uFF08\u817E\u8BAF\u4E91\uFF09",
-      existingValue: toTrimmedString(existingAsr.secretId),
+      existingValue: toTrimmedString2(existingAsr.secretId),
       required: true
     });
     asr.secretKey = await prompter.askSecret({
       label: "ASR secretKey\uFF08\u817E\u8BAF\u4E91\uFF09",
-      existingValue: toTrimmedString(existingAsr.secretKey),
+      existingValue: toTrimmedString2(existingAsr.secretKey),
       required: true
     });
   }
@@ -7628,11 +7775,14 @@ var dingtalkOutbound = {
    * 发送文本消息
    */
   sendText: async (params) => {
-    const { cfg, to, text } = params;
-    const dingtalkCfg = cfg.channels?.dingtalk;
-    if (!dingtalkCfg) {
+    const { cfg, to, text, accountId } = params;
+    if (!cfg.channels?.dingtalk) {
       throw new Error("DingTalk channel not configured");
     }
+    const dingtalkCfg = mergeDingtalkAccountConfig(
+      cfg,
+      resolveDingtalkAccountId(cfg, accountId)
+    );
     const { targetId, chatType } = parseTarget(to);
     const result = await sendMessageDingtalk({
       cfg: dingtalkCfg,
@@ -7651,11 +7801,14 @@ var dingtalkOutbound = {
    * 发送媒体消息（含回退逻辑）
    */
   sendMedia: async (params) => {
-    const { cfg, to, text, mediaUrl } = params;
-    const dingtalkCfg = cfg.channels?.dingtalk;
-    if (!dingtalkCfg) {
+    const { cfg, to, text, mediaUrl, accountId } = params;
+    if (!cfg.channels?.dingtalk) {
       throw new Error("DingTalk channel not configured");
     }
+    const dingtalkCfg = mergeDingtalkAccountConfig(
+      cfg,
+      resolveDingtalkAccountId(cfg, accountId)
+    );
     const { targetId, chatType } = parseTarget(to);
     if (text?.trim()) {
       await sendMessageDingtalk({
@@ -8418,6 +8571,7 @@ async function handleDingtalkMessage(params) {
   const {
     cfg,
     raw,
+    accountId = DEFAULT_ACCOUNT_ID,
     enableAICard = false
   } = params;
   const logger = createLogger("dingtalk", {
@@ -8435,8 +8589,9 @@ async function handleDingtalkMessage(params) {
       mentionedBot: ctx.mentionedBot
     })}`
   );
-  const dingtalkCfg = cfg?.channels;
-  const channelCfg = dingtalkCfg?.dingtalk;
+  const pluginCfg = cfg ?? {};
+  const hasChannelConfig = Boolean(pluginCfg.channels?.dingtalk);
+  const channelCfg = hasChannelConfig ? mergeDingtalkAccountConfig(pluginCfg, accountId) : void 0;
   const inboundMediaDir = resolveInboundMediaDir(channelCfg);
   const inboundMediaKeepDays = resolveInboundMediaKeepDays(channelCfg);
   const inboundMediaTempDir = resolveInboundMediaTempDir();
@@ -8516,6 +8671,7 @@ async function handleDingtalkMessage(params) {
     const route = resolveAgentRoute({
       cfg,
       channel: "dingtalk",
+      accountId,
       peer: {
         kind: isGroup ? "group" : "dm",
         id: isGroup ? ctx.conversationId : ctx.senderId
@@ -8607,7 +8763,11 @@ async function handleDingtalkMessage(params) {
         downloadedRichTextImages = [];
       }
     }
-    const inboundCtx = buildInboundContext(ctx, route?.sessionKey, route?.accountId);
+    const inboundCtx = buildInboundContext(
+      ctx,
+      route?.sessionKey,
+      route?.accountId ?? accountId
+    );
     if (audioRecognition) {
       inboundCtx.Transcript = audioRecognition;
     }
@@ -8979,15 +9139,15 @@ function trimMessageDedupeCache(now) {
     processedMessages.delete(oldest);
   }
 }
-function isDuplicateMessage(streamMessageId, now) {
-  const previous = processedMessages.get(streamMessageId);
+function isDuplicateMessage(messageKey, now) {
+  const previous = processedMessages.get(messageKey);
   if (typeof previous === "number" && now - previous < MESSAGE_DEDUP_TTL_MS) {
     return true;
   }
   if (typeof previous === "number") {
-    processedMessages.delete(streamMessageId);
+    processedMessages.delete(messageKey);
   }
-  processedMessages.set(streamMessageId, now);
+  processedMessages.set(messageKey, now);
   trimMessageDedupeCache(now);
   return false;
 }
@@ -9035,6 +9195,7 @@ function processDingtalkInbound(params) {
     onParseError
   } = params;
   const streamMessageId = payload?.headers?.messageId;
+  const dedupeKey = streamMessageId ? `${accountId}:${streamMessageId}` : void 0;
   if (streamMessageId) {
     try {
       client.socketCallBackResponse(streamMessageId, { success: true });
@@ -9043,7 +9204,7 @@ function processDingtalkInbound(params) {
       logger.error(`failed to ACK message ${streamMessageId}: ${String(err)}`);
     }
   }
-  if (streamMessageId && isDuplicateMessage(streamMessageId, Date.now())) {
+  if (dedupeKey && isDuplicateMessage(dedupeKey, Date.now())) {
     onDedupeHit?.(streamMessageId);
     logger.debug(`duplicate message ignored: ${streamMessageId}`);
     return;
@@ -9073,7 +9234,7 @@ function processDingtalkInbound(params) {
   }
 }
 function registerDingtalkBotHandler(params) {
-  const dingtalkCfg = params.config?.channels?.dingtalk;
+  const dingtalkCfg = params.config ? mergeDingtalkAccountConfig(params.config, params.accountId) : void 0;
   params.client.registerCallbackListener(TOPIC_ROBOT, (payload) => {
     processDingtalkInbound({
       payload,
@@ -9114,8 +9275,19 @@ var DISCONNECT_GRACE_MS = 15e3;
 var RECONNECT_BASE_DELAY_MS = 1e3;
 var RECONNECT_MAX_DELAY_MS = 6e4;
 var RECONNECT_JITTER_RATIO = 0.2;
-var currentAccountId = null;
-var currentPromise = null;
+var activeConnections = /* @__PURE__ */ new Map();
+function getOrCreateConnection(accountId) {
+  let conn = activeConnections.get(accountId);
+  if (!conn) {
+    conn = {
+      client: null,
+      promise: null,
+      stop: null
+    };
+    activeConnections.set(accountId, conn);
+  }
+  return conn;
+}
 function toRecord(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     return {};
@@ -9350,7 +9522,7 @@ async function runGatewaySession(params) {
   }
 }
 async function runGatewayLoop(params) {
-  const { config, dingtalkCfg, accountId, logger, signal } = params;
+  const { config, dingtalkCfg, accountId, logger, signal, conn, setStatus } = params;
   const metrics = createGatewayMetrics();
   const stateRef = { state: "idle" };
   let reconnectAttempt = 0;
@@ -9367,6 +9539,7 @@ async function runGatewayLoop(params) {
       logger.error(`[gateway] fatal client init error: ${String(err)}`);
       throw err;
     }
+    conn.client = client;
     try {
       sessionResult = await runGatewaySession({
         client,
@@ -9382,6 +9555,9 @@ async function runGatewayLoop(params) {
       sessionResult = { kind: "reconnect", reason: "session_error" };
     } finally {
       safeDisconnect(client, logger);
+      if (conn.client === client) {
+        conn.client = null;
+      }
     }
     if (sessionResult.kind === "stopped" || signal.aborted) {
       break;
@@ -9400,33 +9576,46 @@ async function runGatewayLoop(params) {
     logger.warn(
       `[gateway] reconnect scheduled in ${delayMs}ms (attempt=${reconnectAttempt}, reason=${sessionResult.reason})`
     );
+    setStatus?.({
+      accountId,
+      state: "reconnecting",
+      reconnectAttempt,
+      reconnectReason: sessionResult.reason,
+      lastReconnectAt: metrics.lastReconnectAt
+    });
     const keepRunning = await sleepWithAbort(delayMs, signal);
     if (!keepRunning) {
       break;
     }
   }
   transitionState({ ref: stateRef, next: "stopped", logger, reason: "abort/stop" });
+  setStatus?.({
+    accountId,
+    state: "stopped",
+    reconnectCountTotal: metrics.reconnectCountTotal,
+    ackFailCount: metrics.ackFailCount,
+    dedupeHitCount: metrics.dedupeHitCount,
+    parseErrorCount: metrics.parseErrorCount
+  });
   logger.info(
     `[gateway] stopped; reconnects=${metrics.reconnectCountTotal} ackFail=${metrics.ackFailCount} dedupeHit=${metrics.dedupeHitCount} parseErr=${metrics.parseErrorCount}`
   );
 }
 async function monitorDingtalkProvider(opts = {}) {
-  const { config, runtime: runtime2, abortSignal, accountId = "default" } = opts;
+  const { config, runtime: runtime2, abortSignal, accountId = DEFAULT_ACCOUNT_ID, setStatus } = opts;
   const logger = createLogger2("dingtalk", {
     log: runtime2?.log,
     error: runtime2?.error
   });
-  if (currentPromise) {
-    if (currentAccountId && currentAccountId !== accountId) {
-      throw new Error(`DingTalk already running for account ${currentAccountId}`);
-    }
+  const conn = getOrCreateConnection(accountId);
+  if (conn.promise) {
     logger.debug(`existing gateway for account ${accountId} is active, reusing promise`);
-    return currentPromise;
+    return conn.promise;
   }
-  const dingtalkCfg = config?.channels?.dingtalk;
-  if (!dingtalkCfg) {
-    throw new Error("DingTalk configuration not found");
+  if (!config?.channels?.dingtalk) {
+    throw new Error(`DingTalk configuration not found for account ${accountId}`);
   }
+  const dingtalkCfg = mergeDingtalkAccountConfig(config, accountId);
   await ensureGatewayHttpEnabled({ dingtalkCfg, logger });
   const stopController = new AbortController();
   const stopSignal = stopController.signal;
@@ -9438,23 +9627,43 @@ async function monitorDingtalkProvider(opts = {}) {
   } else {
     abortSignal?.addEventListener("abort", onAbort, { once: true });
   }
-  currentAccountId = accountId;
+  conn.stop = () => {
+    logger.info("stop requested, stopping Stream gateway");
+    stopController.abort();
+  };
   const runPromise = runGatewayLoop({
     config,
     dingtalkCfg,
     accountId,
     logger,
-    signal: stopSignal
+    signal: stopSignal,
+    conn,
+    setStatus
   }).finally(() => {
     abortSignal?.removeEventListener("abort", onAbort);
-    if (currentPromise === runPromise) {
-      currentAccountId = null;
-      currentPromise = null;
+    if (conn.promise === runPromise) {
+      conn.client = null;
+      conn.stop = null;
+      conn.promise = null;
+      activeConnections.delete(accountId);
     }
   });
-  currentPromise = runPromise;
+  conn.promise = runPromise;
   return runPromise;
 }
+function stopDingtalkMonitorForAccount(accountId = DEFAULT_ACCOUNT_ID) {
+  const conn = activeConnections.get(accountId);
+  if (!conn) return;
+  if (conn.stop) {
+    conn.stop();
+    return;
+  }
+  if (conn.client) {
+    const logger = createLogger2("dingtalk");
+    safeDisconnect(conn.client, logger);
+  }
+  activeConnections.delete(accountId);
+}
 
 // src/onboarding.ts
 function setDingtalkDmPolicy(cfg, dmPolicy2) {
@@ -9560,13 +9769,19 @@ var dingtalkOnboardingAdapter = {
    * 获取渠道配置状态
    */
   getStatus: async (params) => {
-    const dingtalkCfg = params.cfg.channels?.dingtalk;
-    const configured = isConfigured(dingtalkCfg);
+    const accountIds = listDingtalkAccountIds(params.cfg);
+    const configuredAccountId = accountIds.find(
+      (accountId) => isConfigured(mergeDingtalkAccountConfig(params.cfg, accountId))
+    );
+    const configured = Boolean(configuredAccountId);
+    const defaultAccountId = resolveDefaultDingtalkAccountId(params.cfg);
     const statusLines = [];
     if (!configured) {
       statusLines.push("\u9489\u9489: \u9700\u8981\u914D\u7F6E\u5E94\u7528\u51ED\u8BC1");
     } else {
-      statusLines.push("\u9489\u9489: \u5DF2\u914D\u7F6E");
+      statusLines.push(
+        configuredAccountId && configuredAccountId !== DEFAULT_ACCOUNT_ID ? `\u9489\u9489: \u5DF2\u914D\u7F6E (${configuredAccountId})` : `\u9489\u9489: \u5DF2\u914D\u7F6E${defaultAccountId !== DEFAULT_ACCOUNT_ID ? ` (default=${defaultAccountId})` : ""}`
+      );
     }
     return {
       channel: "dingtalk",
@@ -9580,7 +9795,8 @@ var dingtalkOnboardingAdapter = {
    * 交互式配置向导
    */
   configure: async (params) => {
-    const dingtalkCfg = params.cfg.channels?.dingtalk;
+    const defaultAccountId = resolveDefaultDingtalkAccountId(params.cfg);
+    const dingtalkCfg = mergeDingtalkAccountConfig(params.cfg, defaultAccountId);
     const resolved = resolveDingtalkCredentials(dingtalkCfg);
     const hasConfigCreds = Boolean(
       dingtalkCfg?.clientId?.trim() && dingtalkCfg?.clientSecret?.trim()
@@ -9710,7 +9926,6 @@ var dingtalkOnboardingAdapter = {
 };
 
 // src/channel.ts
-var DEFAULT_ACCOUNT_ID = "default";
 var meta = {
   id: "dingtalk",
   label: "DingTalk",
@@ -9722,19 +9937,36 @@ var meta = {
   order: 71
 };
 function resolveDingtalkAccount(params) {
-  const { cfg, accountId = DEFAULT_ACCOUNT_ID } = params;
-  const dingtalkCfg = cfg.channels?.dingtalk;
-  const parsed = dingtalkCfg ? DingtalkConfigSchema.safeParse(dingtalkCfg) : null;
-  const config = parsed?.success ? parsed.data : void 0;
-  const credentials = resolveDingtalkCredentials(config);
+  const { cfg } = params;
+  const accountId = resolveDingtalkAccountId(cfg, params.accountId);
+  const merged = mergeDingtalkAccountConfig(cfg, accountId);
+  const baseEnabled = cfg.channels?.dingtalk?.enabled !== false;
+  const enabled = baseEnabled && merged.enabled !== false;
+  const credentials = resolveDingtalkCredentials(merged);
   const configured = Boolean(credentials);
   return {
     accountId,
-    enabled: config?.enabled ?? true,
+    enabled,
     configured,
     clientId: credentials?.clientId
   };
 }
+function canStoreDefaultAccountInAccounts(cfg) {
+  return Boolean(cfg.channels?.dingtalk?.accounts?.[DEFAULT_ACCOUNT_ID]);
+}
+function resolveRuntimeCandidate(params) {
+  const runtimeRecord = params.runtime && typeof params.runtime === "object" ? params.runtime : void 0;
+  const runtimeChannel = runtimeRecord?.channel && typeof runtimeRecord.channel === "object" ? runtimeRecord.channel : void 0;
+  const channelRuntime = params.channelRuntime && typeof params.channelRuntime === "object" ? params.channelRuntime : void 0;
+  const resolvedChannel = channelRuntime ?? (runtimeChannel?.routing || runtimeChannel?.reply || runtimeChannel?.session || runtimeChannel?.text ? runtimeChannel : void 0);
+  if (!resolvedChannel) {
+    return runtimeRecord;
+  }
+  return {
+    ...runtimeRecord ?? {},
+    channel: resolvedChannel
+  };
+}
 var dingtalkPlugin = {
   id: "dingtalk",
   /**
@@ -9768,8 +10000,11 @@ var dingtalkPlugin = {
       additionalProperties: false,
       properties: {
         enabled: { type: "boolean" },
+        name: { type: "string" },
+        defaultAccount: { type: "string" },
         clientId: { type: "string" },
         clientSecret: { type: "string" },
+        connectionMode: { type: "string", enum: ["stream", "webhook"] },
         dmPolicy: { type: "string", enum: ["open", "pairing", "allowlist"] },
         groupPolicy: { type: "string", enum: ["open", "allowlist", "disabled"] },
         requireMention: { type: "boolean" },
@@ -9789,6 +10024,40 @@ var dingtalkPlugin = {
             dir: { type: "string" },
             keepDays: { type: "number", minimum: 0 }
           }
+        },
+        accounts: {
+          type: "object",
+          additionalProperties: {
+            type: "object",
+            additionalProperties: false,
+            properties: {
+              name: { type: "string" },
+              enabled: { type: "boolean" },
+              clientId: { type: "string" },
+              clientSecret: { type: "string" },
+              connectionMode: { type: "string", enum: ["stream", "webhook"] },
+              dmPolicy: { type: "string", enum: ["open", "pairing", "allowlist"] },
+              groupPolicy: { type: "string", enum: ["open", "allowlist", "disabled"] },
+              requireMention: { type: "boolean" },
+              allowFrom: { type: "array", items: { type: "string" } },
+              groupAllowFrom: { type: "array", items: { type: "string" } },
+              historyLimit: { type: "integer", minimum: 0 },
+              textChunkLimit: { type: "integer", minimum: 1 },
+              longTaskNoticeDelayMs: { type: "integer", minimum: 0 },
+              enableAICard: { type: "boolean" },
+              gatewayToken: { type: "string" },
+              gatewayPassword: { type: "string" },
+              maxFileSizeMB: { type: "number", minimum: 0 },
+              inboundMedia: {
+                type: "object",
+                additionalProperties: false,
+                properties: {
+                  dir: { type: "string" },
+                  keepDays: { type: "number", minimum: 0 }
+                }
+              }
+            }
+          }
         }
       }
     }
@@ -9806,7 +10075,7 @@ var dingtalkPlugin = {
      * 列出所有账户 ID
      * Requirements: 2.1
      */
-    listAccountIds: (_cfg) => [DEFAULT_ACCOUNT_ID],
+    listAccountIds: (cfg) => listDingtalkAccountIds(cfg),
     /**
      * 解析账户配置
      * Requirements: 2.2
@@ -9815,19 +10084,38 @@ var dingtalkPlugin = {
     /**
      * 获取默认账户 ID
      */
-    defaultAccountId: () => DEFAULT_ACCOUNT_ID,
+    defaultAccountId: (cfg) => resolveDefaultDingtalkAccountId(cfg),
     /**
      * 设置账户启用状态
      */
     setAccountEnabled: (params) => {
-      const existingConfig = params.cfg.channels?.dingtalk ?? {};
+      const accountId = resolveDingtalkAccountId(params.cfg, params.accountId);
+      const seededCfg = moveDingtalkSingleAccountConfigToDefaultAccount(params.cfg);
+      const existing = seededCfg.channels?.dingtalk ?? {};
+      if (accountId === DEFAULT_ACCOUNT_ID && !canStoreDefaultAccountInAccounts(seededCfg)) {
+        return {
+          ...seededCfg,
+          channels: {
+            ...seededCfg.channels,
+            dingtalk: {
+              ...existing,
+              enabled: params.enabled
+            }
+          }
+        };
+      }
+      const accounts = existing.accounts ?? {};
+      const account = accounts[accountId] ?? {};
       return {
-        ...params.cfg,
+        ...seededCfg,
         channels: {
-          ...params.cfg.channels,
+          ...seededCfg.channels,
           dingtalk: {
-            ...existingConfig,
-            enabled: params.enabled
+            ...existing,
+            accounts: {
+              ...accounts,
+              [accountId]: { ...account, enabled: params.enabled }
+            }
           }
         }
       };
@@ -9836,21 +10124,68 @@ var dingtalkPlugin = {
      * 删除账户配置
      */
     deleteAccount: (params) => {
-      const next = { ...params.cfg };
-      const nextChannels = { ...params.cfg.channels };
-      delete nextChannels.dingtalk;
-      if (Object.keys(nextChannels).length > 0) {
-        next.channels = nextChannels;
-      } else {
-        delete next.channels;
+      const accountId = resolveDingtalkAccountId(params.cfg, params.accountId);
+      const seededCfg = moveDingtalkSingleAccountConfigToDefaultAccount(params.cfg);
+      const existing = seededCfg.channels?.dingtalk;
+      if (!existing) return seededCfg;
+      const accounts = existing.accounts ?? {};
+      if (!accounts[accountId]) {
+        if (accountId === DEFAULT_ACCOUNT_ID && Object.keys(accounts).length === 0 && !canStoreDefaultAccountInAccounts(seededCfg)) {
+          const next = { ...seededCfg };
+          const nextChannels = { ...seededCfg.channels };
+          delete nextChannels.dingtalk;
+          if (Object.keys(nextChannels).length > 0) {
+            next.channels = nextChannels;
+          } else {
+            delete next.channels;
+          }
+          return next;
+        }
+        return seededCfg;
+      }
+      const { [accountId]: _removed, ...remainingAccounts } = accounts;
+      const remainingIds = Object.keys(remainingAccounts).sort((a, b) => a.localeCompare(b));
+      const preferred = existing.defaultAccount?.trim();
+      let nextDefaultAccount = preferred;
+      if (preferred && !remainingAccounts[preferred]) {
+        nextDefaultAccount = remainingIds.includes(DEFAULT_ACCOUNT_ID) ? DEFAULT_ACCOUNT_ID : remainingIds[0] ?? "";
+      }
+      const nextChannel = {
+        ...existing,
+        accounts: remainingIds.length > 0 ? remainingAccounts : void 0,
+        defaultAccount: nextDefaultAccount || void 0
+      };
+      const hasNonTrivialRootConfig = Object.entries(nextChannel).some(
+        ([key, value]) => key !== "enabled" && key !== "accounts" && key !== "defaultAccount" && value !== void 0
+      );
+      if (remainingIds.length === 0 && !hasNonTrivialRootConfig) {
+        const next = { ...seededCfg };
+        const nextChannels = { ...seededCfg.channels };
+        delete nextChannels.dingtalk;
+        if (Object.keys(nextChannels).length > 0) {
+          next.channels = nextChannels;
+        } else {
+          delete next.channels;
+        }
+        return next;
       }
-      return next;
+      return {
+        ...seededCfg,
+        channels: {
+          ...seededCfg.channels,
+          dingtalk: nextChannel
+        }
+      };
     },
     /**
      * 检查账户是否已配置
      * Requirements: 2.3
      */
-    isConfigured: (_account, cfg) => isConfigured(cfg.channels?.dingtalk),
+    isConfigured: (_account, cfg, accountId) => {
+      const id = accountId ?? _account.accountId;
+      const merged = mergeDingtalkAccountConfig(cfg, id);
+      return Boolean(merged.clientId && merged.clientSecret);
+    },
     /**
      * 描述账户信息
      */
@@ -9862,7 +10197,11 @@ var dingtalkPlugin = {
     /**
      * 解析白名单
      */
-    resolveAllowFrom: (params) => params.cfg.channels?.dingtalk?.allowFrom ?? [],
+    resolveAllowFrom: (params) => {
+      const accountId = resolveDingtalkAccountId(params.cfg, params.accountId);
+      const merged = mergeDingtalkAccountConfig(params.cfg, accountId);
+      return merged.allowFrom ?? [];
+    },
     /**
      * 格式化白名单条目
      */
@@ -9885,16 +10224,40 @@ var dingtalkPlugin = {
    * 设置向导适配器
    */
   setup: {
-    resolveAccountId: () => DEFAULT_ACCOUNT_ID,
+    resolveAccountId: (params) => resolveDingtalkAccountId(params.cfg, params.accountId),
     applyAccountConfig: (params) => {
-      const existingConfig = params.cfg.channels?.dingtalk ?? {};
+      const accountId = resolveDingtalkAccountId(params.cfg, params.accountId);
+      const seededCfg = moveDingtalkSingleAccountConfigToDefaultAccount(params.cfg);
+      const existing = seededCfg.channels?.dingtalk ?? {};
+      if (accountId === DEFAULT_ACCOUNT_ID && !canStoreDefaultAccountInAccounts(seededCfg)) {
+        return {
+          ...seededCfg,
+          channels: {
+            ...seededCfg.channels,
+            dingtalk: {
+              ...existing,
+              ...params.config,
+              enabled: true
+            }
+          }
+        };
+      }
+      const accounts = existing.accounts ?? {};
       return {
-        ...params.cfg,
+        ...seededCfg,
         channels: {
-          ...params.cfg.channels,
+          ...seededCfg.channels,
           dingtalk: {
-            ...existingConfig,
-            enabled: true
+            ...existing,
+            enabled: true,
+            accounts: {
+              ...accounts,
+              [accountId]: {
+                ...accounts[accountId],
+                ...params.config,
+                enabled: true
+              }
+            }
           }
         }
       };
@@ -9921,11 +10284,13 @@ var dingtalkPlugin = {
     startAccount: async (ctx) => {
       ctx.setStatus?.({ accountId: ctx.accountId });
       ctx.log?.info(`[dingtalk] starting provider for account ${ctx.accountId}`);
-      if (ctx.runtime) {
-        const candidate = ctx.runtime;
-        if (candidate.channel?.routing?.resolveAgentRoute && candidate.channel?.reply?.dispatchReplyFromConfig) {
-          setDingtalkRuntime(ctx.runtime);
-        }
+      const runtimeCandidate = resolveRuntimeCandidate({
+        runtime: ctx.runtime,
+        channelRuntime: ctx.channelRuntime
+      });
+      const candidate = runtimeCandidate;
+      if (candidate?.channel?.routing?.resolveAgentRoute && candidate.channel?.reply?.dispatchReplyFromConfig) {
+        setDingtalkRuntime(runtimeCandidate);
       }
       return monitorDingtalkProvider({
         config: ctx.cfg,
@@ -9934,9 +10299,14 @@ var dingtalkPlugin = {
           error: ctx.log?.error ?? console.error
         },
         abortSignal: ctx.abortSignal,
-        accountId: ctx.accountId
+        accountId: ctx.accountId,
+        setStatus: ctx.setStatus
       });
-    }
+    },
+    stopAccount: async (ctx) => {
+      stopDingtalkMonitorForAccount(ctx.accountId);
+    },
+    getStatus: () => ({ connected: true })
   }
 };
 
@@ -9950,6 +10320,8 @@ var plugin = {
     additionalProperties: false,
     properties: {
       enabled: { type: "boolean" },
+      name: { type: "string" },
+      defaultAccount: { type: "string" },
       clientId: { type: "string" },
       clientSecret: { type: "string" },
       dmPolicy: { type: "string", enum: ["open", "pairing", "allowlist"] },
@@ -9959,7 +10331,54 @@ var plugin = {
       groupAllowFrom: { type: "array", items: { type: "string" } },
       historyLimit: { type: "integer", minimum: 0 },
       textChunkLimit: { type: "integer", minimum: 1 },
-      longTaskNoticeDelayMs: { type: "integer", minimum: 0 }
+      longTaskNoticeDelayMs: { type: "integer", minimum: 0 },
+      connectionMode: { type: "string", enum: ["stream", "webhook"] },
+      enableAICard: { type: "boolean" },
+      gatewayToken: { type: "string" },
+      gatewayPassword: { type: "string" },
+      maxFileSizeMB: { type: "number", minimum: 1 },
+      inboundMedia: {
+        type: "object",
+        additionalProperties: false,
+        properties: {
+          dir: { type: "string" },
+          keepDays: { type: "number", minimum: 0 }
+        }
+      },
+      accounts: {
+        type: "object",
+        additionalProperties: {
+          type: "object",
+          additionalProperties: false,
+          properties: {
+            name: { type: "string" },
+            enabled: { type: "boolean" },
+            clientId: { type: "string" },
+            clientSecret: { type: "string" },
+            dmPolicy: { type: "string", enum: ["open", "pairing", "allowlist"] },
+            groupPolicy: { type: "string", enum: ["open", "allowlist", "disabled"] },
+            requireMention: { type: "boolean" },
+            allowFrom: { type: "array", items: { type: "string" } },
+            groupAllowFrom: { type: "array", items: { type: "string" } },
+            historyLimit: { type: "integer", minimum: 0 },
+            textChunkLimit: { type: "integer", minimum: 1 },
+            longTaskNoticeDelayMs: { type: "integer", minimum: 0 },
+            connectionMode: { type: "string", enum: ["stream", "webhook"] },
+            enableAICard: { type: "boolean" },
+            gatewayToken: { type: "string" },
+            gatewayPassword: { type: "string" },
+            maxFileSizeMB: { type: "number", minimum: 1 },
+            inboundMedia: {
+              type: "object",
+              additionalProperties: false,
+              properties: {
+                dir: { type: "string" },
+                keepDays: { type: "number", minimum: 0 }
+              }
+            }
+          }
+        }
+      }
     }
   },
   /**