@sunnoy/wecom 2.2.1 → 2.3.0

package/README.md

@@ -180,7 +180,8 @@ npm test
 | `channels.wecom.secret` | string | 是 | 企业微信 AI 机器人 Secret |
 | `channels.wecom.websocketUrl` | string | 否 | WS 地址，默认 `wss://openws.work.weixin.qq.com` |
 | `channels.wecom.sendThinkingMessage` | boolean | 否 | 是否先发送 `<think></think>` 占位，默认 `true` |
-| `channels.wecom.welcomeMessage` | string | 否 | 进入会话欢迎语 |
+| `channels.wecom.welcomeMessage` | string | 否 | 进入会话欢迎语（非空时固定使用该字符串） |
+| `channels.wecom.welcomeMessagesFile` | string | 否 | 欢迎语列表文件路径。支持：`{ "messages": [ ... ] }` 或顶层数组；每条欢迎语可为**一行一个字符串的数组**（推荐，易读），或单条字符串（可含 `\\n`）。相对路径基于 OpenClaw 状态目录（`~/.openclaw` 或 `OPENCLAW_STATE_DIR`）。未设置 `welcomeMessage` 时从该文件随机选取；**修改文件后无需重启服务**（按 mtime 自动重读） |
 | `channels.wecom.adminUsers` | string[] | 否 | 管理员用户 ID，可绕过命令白名单 |
 | `channels.wecom.defaultAccount` | string | 否 | 多账号模式默认账号 |
 

package/index.js

@@ -1,7 +1,8 @@
-import { emptyPluginConfigSchema } from "openclaw/plugin-sdk";
 import { logger } from "./logger.js";
 import { wecomChannelPlugin } from "./wecom/channel-plugin.js";
 import { createWeComMcpTool } from "./wecom/mcp-tool.js";
+import { createImageStudioTool } from "./wecom/image-studio-tool.js";
+import { resolveQwenImageToolsConfig, wecomPluginConfigSchema } from "./wecom/plugin-config.js";
 import { setOpenclawConfig, setRuntime } from "./wecom/state.js";
 import { buildReplyMediaGuidance } from "./wecom/ws-monitor.js";
 import { listAccountIds, resolveAccount } from "./wecom/accounts.js";
@@ -11,7 +12,7 @@ const plugin = {
   id: "wecom",
   name: "Enterprise WeChat",
   description: "Enterprise WeChat AI Bot channel plugin for OpenClaw",
-  configSchema: emptyPluginConfigSchema(),
+  configSchema: wecomPluginConfigSchema,
   register(api) {
     logger.info("Registering WeCom WS plugin");
     setRuntime(api.runtime);
@@ -19,6 +20,14 @@ const plugin = {
     api.registerChannel({ plugin: wecomChannelPlugin });
     api.registerTool(createWeComMcpTool(), { name: "wecom_mcp" });
 
+    const qwenImageToolsConfig = resolveQwenImageToolsConfig(api.pluginConfig);
+    if (qwenImageToolsConfig.enabled) {
+      api.registerTool(createImageStudioTool(qwenImageToolsConfig), { name: "image_studio" });
+      logger.info(
+        `[image_studio] Registered with provider "${qwenImageToolsConfig.provider}" using qwen(generate=${qwenImageToolsConfig.models.qwen.generate}, edit=${qwenImageToolsConfig.models.qwen.edit}) wan(generate=${qwenImageToolsConfig.models.wan.generate}, edit=${qwenImageToolsConfig.models.wan.edit})`,
+      );
+    }
+
     // Register HTTP callback endpoints for all accounts that have callback config
     for (const accountId of listAccountIds(api.config)) {
       const account = resolveAccount(api.config, accountId);

package/openclaw.plugin.json

@@ -8,7 +8,143 @@
   "configSchema": {
     "type": "object",
     "additionalProperties": true,
-    "properties": {}
+    "properties": {
+      "qwenImageTools": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "enabled": {
+            "type": "boolean"
+          },
+          "provider": {
+            "type": "string"
+          },
+          "route": {
+            "type": "string",
+            "enum": [
+              "auto",
+              "qwen",
+              "wan"
+            ]
+          },
+          "endpoint": {
+            "type": "string"
+          },
+          "endpoints": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "qwen": {
+                "type": "string"
+              },
+              "wan": {
+                "type": "string"
+              },
+              "task": {
+                "type": "string"
+              }
+            }
+          },
+          "timeoutMs": {
+            "type": "integer",
+            "minimum": 1000
+          },
+          "models": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "generate": {
+                "type": "string"
+              },
+              "edit": {
+                "type": "string"
+              },
+              "qwen": {
+                "type": "object",
+                "additionalProperties": false,
+                "properties": {
+                  "generate": {
+                    "type": "string"
+                  },
+                  "edit": {
+                    "type": "string"
+                  }
+                }
+              },
+              "wan": {
+                "type": "object",
+                "additionalProperties": false,
+                "properties": {
+                  "generate": {
+                    "type": "string"
+                  },
+                  "edit": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          },
+          "defaults": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "size": {
+                "type": "string"
+              },
+              "aspect": {
+                "type": "string",
+                "enum": [
+                  "landscape",
+                  "square",
+                  "portrait"
+                ]
+              },
+              "n": {
+                "type": "integer",
+                "minimum": 1
+              },
+              "watermark": {
+                "type": "boolean"
+              },
+              "promptExtend": {
+                "type": "boolean"
+              },
+              "qwen": {
+                "type": "object",
+                "additionalProperties": false,
+                "properties": {
+                  "landscape": {
+                    "type": "string"
+                  },
+                  "square": {
+                    "type": "string"
+                  },
+                  "portrait": {
+                    "type": "string"
+                  }
+                }
+              },
+              "wan": {
+                "type": "object",
+                "additionalProperties": false,
+                "properties": {
+                  "landscape": {
+                    "type": "string"
+                  },
+                  "square": {
+                    "type": "string"
+                  },
+                  "portrait": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   },
   "channels": [
     "wecom"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sunnoy/wecom",
-    "version": "2.2.1",
+    "version": "2.3.0",
     "description": "Enterprise WeChat AI Bot channel plugin for OpenClaw",
     "type": "module",
     "main": "index.js",
@@ -8,7 +8,6 @@
         "index.js",
         "wecom",
         "dynamic-agent.js",
-
         "logger.js",
         "README.md",
         "LICENSE",
@@ -60,7 +59,7 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@wecom/aibot-node-sdk": "^1.0.2",
+        "@wecom/aibot-node-sdk": "^1.0.3",
         "file-type": "^21.3.0"
     }
 }

package/wecom/accounts.js

@@ -9,6 +9,7 @@ const RESERVED_KEYS = new Set([
   "websocketUrl",
   "sendThinkingMessage",
   "welcomeMessage",
+  "welcomeMessagesFile",
   "allowFrom",
   "dmPolicy",
   "groupPolicy",
@@ -32,6 +33,7 @@ const SHARED_MULTI_ACCOUNT_KEYS = new Set([
   "websocketUrl",
   "sendThinkingMessage",
   "welcomeMessage",
+  "welcomeMessagesFile",
   "allowFrom",
   "dmPolicy",
   "groupPolicy",

package/wecom/callback-inbound.js

@@ -321,10 +321,6 @@ async function processCallbackMessage({ parsedMsg, account, config, runtime }) {
       ? generateAgentId(peerKind, peerId, account.accountId)
       : null;
 
-  if (dynamicAgentId) {
-    await ensureDynamicAgentListed(dynamicAgentId, account.config.workspaceTemplate);
-  }
-
   const route = core.routing.resolveAgentRoute({
     cfg: config,
     channel: CHANNEL_ID,
@@ -337,9 +333,17 @@ async function processCallbackMessage({ parsedMsg, account, config, runtime }) {
     config.bindings.some(
       (b) => b.match?.channel === CHANNEL_ID && b.match?.accountId === account.accountId,
     );
+
   if (dynamicAgentId && !hasExplicitBinding) {
+    const routeAgentId = route.agentId;
+    // Use the account's configured agentId as the base for property inheritance
+    // (model, subagents, tools). route.agentId may resolve to "main" when
+    // there is no explicit binding, but the account's agentId points to the
+    // actual parent agent whose properties the dynamic agent should inherit.
+    const baseAgentId = account.config.agentId || routeAgentId;
+    await ensureDynamicAgentListed(dynamicAgentId, account.config.workspaceTemplate, baseAgentId);
+    route.sessionKey = route.sessionKey.replace(`agent:${routeAgentId}:`, `agent:${dynamicAgentId}:`);
     route.agentId = dynamicAgentId;
-    route.sessionKey = `agent:${dynamicAgentId}:${peerKind}:${peerId}`;
   }
 
   // Build a body object that mirrors the WS frame.body structure expected by

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

@@ -47,7 +47,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
   [
     "终于唤醒我啦，我已经准备就绪！😄",
@@ -57,7 +58,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
   [
     "欢迎回来，准备开始今天的工作吧！✨",
@@ -67,7 +69,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
   [
     "嗨，我已经在线！🤖",
@@ -77,7 +80,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
   [
     "今天也一起高效开工吧！🚀",
@@ -87,7 +91,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
   [
     "叮咚，你的数字助手已就位！🎉",
@@ -97,7 +102,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
   [
     "灵感加载完成，随时可以开聊！💡",
@@ -107,7 +113,8 @@ export const DEFAULT_WELCOME_MESSAGES = [
     "/compact 压缩对话",
     "/help 帮助",
     "/status 查看状态",
-    "/reasoning stream 打开思考动画",
+    "你可以让我生成和编辑图片了",
+    "你可以用语音跟我对话",
   ].join("\n"),
 ];
 export const DEFAULT_WELCOME_MESSAGE = DEFAULT_WELCOME_MESSAGES[0];