@sunnoy/wecom 2.2.0 → 2.3.0

package/wecom/channel-plugin.js

@@ -36,6 +36,7 @@ import {
 } from "./constants.js";
 import { uploadAndSendMedia } from "./media-uploader.js";
 import { getExtendedMediaLocalRoots } from "./openclaw-compat.js";
+import { extractParentAgentId } from "./parent-resolver.js";
 import { sendWsMessage, startWsMonitor } from "./ws-monitor.js";
 import { getWsClient } from "./ws-state.js";
 
@@ -262,6 +263,7 @@ export const wecomChannelPlugin = {
         websocketUrl: { type: "string" },
         sendThinkingMessage: { type: "boolean" },
         welcomeMessage: { type: "string" },
+        welcomeMessagesFile: { type: "string" },
         dmPolicy: { enum: ["pairing", "allowlist", "open", "disabled"] },
         allowFrom: { type: "array", items: { type: "string" } },
         groupPolicy: { enum: ["open", "allowlist", "disabled"] },
@@ -291,6 +293,10 @@ export const wecomChannelPlugin = {
       secret: { label: "Secret", sensitive: true },
       websocketUrl: { label: "WebSocket URL", placeholder: DEFAULT_WS_URL },
       welcomeMessage: { label: "Welcome Message" },
+      welcomeMessagesFile: {
+        label: "Welcome Messages File",
+        placeholder: "welcome-messages.json",
+      },
       "agent.corpSecret": { sensitive: true, label: "Application Secret" },
       "agent.replyFormat": { label: "Reply Format", placeholder: "text" },
       "agent.callback.token": { label: "Callback Token" },
@@ -404,6 +410,7 @@ export const wecomChannelPlugin = {
       try {
         if (!target.toParty && !target.toTag) {
           const wsTarget = target.chatId || target.toUser || to;
+          logger.debug(`[wecom] sendText: trying WS accountId=${resolvedAccountId} target=${wsTarget}`);
           return await sendWsMessage({
             to: wsTarget,
             content: text,
@@ -411,9 +418,17 @@ export const wecomChannelPlugin = {
           });
         }
       } catch (error) {
-        logger.warn(`[wecom] WS sendText failed, falling back to Agent API: ${error.message}`);
+        logger.warn(`[wecom] WS sendText failed (accountId=${resolvedAccountId}), falling back: ${error.message}`);
+      }
+
+      // Webhook fallback for accounts without Agent API (e.g. WS bot mode)
+      const account = resolveAccount(cfg, resolvedAccountId);
+      if (!account?.agentCredentials && account?.config?.webhooks?.default) {
+        logger.debug(`[wecom] sendText: Agent API unavailable, using webhook fallback accountId=${resolvedAccountId}`);
+        return sendViaWebhook({ cfg, accountId: resolvedAccountId, webhookName: "default", text });
       }
 
+      logger.debug(`[wecom] sendText: trying Agent API accountId=${resolvedAccountId}`);
       return sendViaAgent({
         cfg,
         accountId: resolvedAccountId,
@@ -631,6 +646,55 @@ export const wecomChannelPlugin = {
       };
     },
   },
+  hooks: {
+    /**
+     * Ensure announce delivery uses a valid WeCom channel accountId.
+     *
+     * When a dynamic agent (e.g. wecom-yoyo-dm-xxx) spawns a sub-agent,
+     * the announce delivery may reference the dynamic agent ID as accountId.
+     * This hook resolves it to the actual WeCom account (e.g. yoyo) so the
+     * outbound sendText can find valid WS/Agent API credentials.
+     */
+    subagent_delivery_target: async (event, ctx) => {
+      const origin = event.requesterOrigin;
+      if (!origin?.channel || origin.channel !== CHANNEL_ID) return;
+
+      const cfg = ctx?.cfg ?? getOpenclawConfig();
+
+      // Check whether current accountId already resolves to a valid account
+      const currentAccount = resolveAccount(cfg, origin.accountId);
+      if (currentAccount?.enabled) return;
+
+      // Try to extract the base account from a dynamic agent ID
+      const baseId = extractParentAgentId(origin.accountId);
+      if (baseId && baseId !== origin.accountId) {
+        const baseAccount = resolveAccount(cfg, baseId);
+        if (baseAccount?.enabled) {
+          logger.info(`[wecom] subagent_delivery_target: ${origin.accountId} → ${baseId}`);
+          return { origin: { ...origin, accountId: baseId } };
+        }
+      }
+
+      // Fallback to default account
+      const defaultId = resolveDefaultAccountId(cfg);
+      if (defaultId && defaultId !== origin.accountId) {
+        logger.info(`[wecom] subagent_delivery_target: fallback → ${defaultId}`);
+        return { origin: { ...origin, accountId: defaultId } };
+      }
+    },
+
+    subagent_spawned: async (event) => {
+      logger.info(
+        `[wecom] subagent spawned: child=${event.childSessionKey} requester=${event.requesterSessionKey}`,
+      );
+    },
+
+    subagent_ended: async (event) => {
+      logger.info(
+        `[wecom] subagent ended: target=${event.targetSessionKey} reason=${event.reason} outcome=${event.outcome}`,
+      );
+    },
+  },
 };
 
 export const wecomChannelPluginTesting = {};

package/wecom/constants.js

@@ -26,6 +26,10 @@ export const REQID_FLUSH_DEBOUNCE_MS = 1_000;
 export const PENDING_REPLY_TTL_MS = 5 * 60 * 1000;
 export const PENDING_REPLY_MAX_SIZE = 50;
 
+// WeCom stream messages expire ~6 minutes after creation. Rotate the stream
+// before hitting that hard limit so the user never sees a dead stream.
+export const STREAM_MAX_LIFETIME_MS = 5 * 60 * 1000;
+
 export const IMAGE_MAX_BYTES = 10 * 1024 * 1024;
 export const VIDEO_MAX_BYTES = 10 * 1024 * 1024;
 export const VOICE_MAX_BYTES = 2 * 1024 * 1024;
@@ -43,7 +47,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
   [
     "终于唤醒我啦，我已经准备就绪！😄",
@@ -53,7 +58,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
   [
     "欢迎回来，准备开始今天的工作吧！✨",
@@ -63,7 +69,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
   [
     "嗨，我已经在线！🤖",
@@ -73,7 +80,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
   [
     "今天也一起高效开工吧！🚀",
@@ -83,7 +91,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
   [
     "叮咚，你的数字助手已就位！🎉",
@@ -93,7 +102,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
   [
     "灵感加载完成，随时可以开聊！💡",
@@ -103,7 +113,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
 ];
 export const DEFAULT_WELCOME_MESSAGE = DEFAULT_WELCOME_MESSAGES[0];