@openclaw-china/wecom 2026.3.18 → 2026.3.19

package/dist/index.d.ts

@@ -476,6 +476,10 @@ interface PluginRuntime {
                         mediaUrl?: string;
                         mediaUrls?: string[];
                     }) => Promise<void>;
+                    onSkip?: (payload: unknown, info: {
+                        kind: string;
+                        reason: string;
+                    }) => void;
                     onError?: (err: unknown, info: {
                         kind: string;
                     }) => void;

package/dist/index.js

@@ -1729,6 +1729,7 @@ var CHANNEL_ORDER = [
   "wecom",
   "wecom-app",
   "wecom-kf",
+  "wechat-mp",
   "feishu-china"
 ];
 var CHANNEL_DISPLAY_LABELS = {
@@ -1737,6 +1738,7 @@ var CHANNEL_DISPLAY_LABELS = {
   wecom: "WeCom\uFF08\u4F01\u4E1A\u5FAE\u4FE1-\u667A\u80FD\u673A\u5668\u4EBA\uFF09",
   "wecom-app": "WeCom App\uFF08\u81EA\u5EFA\u5E94\u7528-\u53EF\u63A5\u5165\u5FAE\u4FE1\uFF09",
   "wecom-kf": "WeCom KF\uFF08\u5FAE\u4FE1\u5BA2\u670D\uFF09",
+  "wechat-mp": "WeChat MP\uFF08\u5FAE\u4FE1\u516C\u4F17\u53F7\uFF09",
   qqbot: "QQBot\uFF08QQ \u673A\u5668\u4EBA\uFF09"
 };
 var CHANNEL_GUIDE_LINKS = {
@@ -1745,6 +1747,7 @@ var CHANNEL_GUIDE_LINKS = {
   wecom: `${GUIDES_BASE}/wecom/configuration.md`,
   "wecom-app": `${GUIDES_BASE}/wecom-app/configuration.md`,
   "wecom-kf": "https://github.com/BytePioneer-AI/openclaw-china/blob/main/extensions/wecom-kf/README.md",
+  "wechat-mp": `${GUIDES_BASE}/wechat-mp/configuration.md`,
   qqbot: `${GUIDES_BASE}/qqbot/configuration.md`
 };
 var CHINA_CLI_STATE_KEY = /* @__PURE__ */ Symbol.for("@openclaw-china/china-cli-state");
@@ -1954,7 +1957,9 @@ function isChannelConfigured(cfg, channelId) {
     case "wecom-app":
       return hasTokenPair(channelCfg);
     case "wecom-kf":
-      return hasNonEmptyString(channelCfg.corpId) && hasNonEmptyString(channelCfg.corpSecret) && hasNonEmptyString(channelCfg.token) && hasNonEmptyString(channelCfg.encodingAESKey);
+      return hasNonEmptyString(channelCfg.corpId) && hasNonEmptyString(channelCfg.token) && hasNonEmptyString(channelCfg.encodingAESKey);
+    case "wechat-mp":
+      return hasNonEmptyString(channelCfg.appId) && hasNonEmptyString(channelCfg.token);
     default:
       return false;
   }
@@ -2215,6 +2220,15 @@ async function configureWecomKf(prompter, cfg) {
   section("\u914D\u7F6E WeCom KF\uFF08\u5FAE\u4FE1\u5BA2\u670D\uFF09");
   showGuideLink("wecom-kf");
   const existing = getChannelConfig(cfg, "wecom-kf");
+  Ve(
+    [
+      "\u5411\u5BFC\u987A\u5E8F\uFF1AwebhookPath / token / encodingAESKey / corpId / open_kfid / corpSecret",
+      "\u57FA\u7840\u5FC5\u586B\uFF1AcorpId / token / encodingAESKey / open_kfid",
+      "corpSecret \u4F1A\u4F5C\u4E3A\u6700\u540E\u4E00\u4E2A\u53C2\u6570\u8BE2\u95EE\uFF1B\u9996\u6B21\u63A5\u5165\u53EF\u5148\u7559\u7A7A\uFF0C\u5F85\u56DE\u8C03 URL \u6821\u9A8C\u901A\u8FC7\u5E76\u70B9\u51FB\u201C\u5F00\u59CB\u4F7F\u7528\u201D\u540E\u518D\u8865",
+      "webhookPath \u9ED8\u8BA4\u503C\uFF1A/wecom-kf"
+    ].join("\n"),
+    "\u53C2\u6570\u8BF4\u660E"
+  );
   const webhookPath = await prompter.askText({
     label: "Webhook \u8DEF\u5F84\uFF08\u9ED8\u8BA4 /wecom-kf\uFF09",
     defaultValue: toTrimmedString(existing.webhookPath) ?? "/wecom-kf",
@@ -2235,19 +2249,14 @@ async function configureWecomKf(prompter, cfg) {
     defaultValue: toTrimmedString(existing.corpId),
     required: true
   });
-  const corpSecret = await prompter.askSecret({
-    label: "\u5FAE\u4FE1\u5BA2\u670D Secret",
-    existingValue: toTrimmedString(existing.corpSecret),
-    required: true
-  });
   const openKfId = await prompter.askText({
     label: "open_kfid",
     defaultValue: toTrimmedString(existing.openKfId),
     required: true
   });
-  const welcomeText = await prompter.askText({
-    label: "\u6B22\u8FCE\u8BED\uFF08\u53EF\u9009\uFF09",
-    defaultValue: toTrimmedString(existing.welcomeText),
+  const corpSecret = await prompter.askSecret({
+    label: "\u5FAE\u4FE1\u5BA2\u670D Secret\uFF08\u6700\u540E\u586B\u5199\uFF1B\u9996\u6B21\u63A5\u5165\u53EF\u5148\u7559\u7A7A\uFF09",
+    existingValue: toTrimmedString(existing.corpSecret),
     required: false
   });
   return mergeChannelConfig(cfg, "wecom-kf", {
@@ -2255,8 +2264,72 @@ async function configureWecomKf(prompter, cfg) {
     token,
     encodingAESKey,
     corpId,
-    corpSecret,
     openKfId,
+    corpSecret: corpSecret || void 0
+  });
+}
+async function configureWechatMp(prompter, cfg) {
+  section("\u914D\u7F6E WeChat MP\uFF08\u5FAE\u4FE1\u516C\u4F17\u53F7\uFF09");
+  showGuideLink("wechat-mp");
+  const existing = getChannelConfig(cfg, "wechat-mp");
+  const webhookPath = await prompter.askText({
+    label: "Webhook \u8DEF\u5F84\uFF08\u9ED8\u8BA4 /wechat-mp\uFF09",
+    defaultValue: toTrimmedString(existing.webhookPath) ?? "/wechat-mp",
+    required: true
+  });
+  const appId = await prompter.askText({
+    label: "\u516C\u4F17\u53F7 appId",
+    defaultValue: toTrimmedString(existing.appId),
+    required: true
+  });
+  const appSecret = await prompter.askSecret({
+    label: "\u516C\u4F17\u53F7 appSecret\uFF08\u4E3B\u52A8\u53D1\u9001\u9700\u8981\uFF09",
+    existingValue: toTrimmedString(existing.appSecret),
+    required: false
+  });
+  const token = await prompter.askSecret({
+    label: "\u670D\u52A1\u5668\u914D\u7F6E token",
+    existingValue: toTrimmedString(existing.token),
+    required: true
+  });
+  const messageMode = await prompter.askSelect(
+    "\u6D88\u606F\u52A0\u89E3\u5BC6\u6A21\u5F0F",
+    [
+      { value: "plain", label: "plain\uFF08\u660E\u6587\uFF09" },
+      { value: "safe", label: "safe\uFF08\u5B89\u5168\u6A21\u5F0F\uFF09" },
+      { value: "compat", label: "compat\uFF08\u517C\u5BB9\u6A21\u5F0F\uFF09" }
+    ],
+    toTrimmedString(existing.messageMode) ?? "safe"
+  );
+  let encodingAESKey = toTrimmedString(existing.encodingAESKey);
+  if (messageMode !== "plain") {
+    encodingAESKey = await prompter.askSecret({
+      label: "EncodingAESKey\uFF08safe/compat \u5FC5\u586B\uFF09",
+      existingValue: encodingAESKey,
+      required: true
+    });
+  }
+  const replyMode = await prompter.askSelect(
+    "\u56DE\u590D\u6A21\u5F0F",
+    [
+      { value: "passive", label: "passive\uFF085 \u79D2\u5185\u88AB\u52A8\u56DE\u590D\uFF09" },
+      { value: "active", label: "active\uFF08\u5BA2\u670D\u6D88\u606F\u4E3B\u52A8\u53D1\u9001\uFF09" }
+    ],
+    toTrimmedString(existing.replyMode) ?? "passive"
+  );
+  const welcomeText = await prompter.askText({
+    label: "\u6B22\u8FCE\u8BED\uFF08\u53EF\u9009\uFF09",
+    defaultValue: toTrimmedString(existing.welcomeText),
+    required: false
+  });
+  return mergeChannelConfig(cfg, "wechat-mp", {
+    webhookPath,
+    appId,
+    appSecret: appSecret || void 0,
+    token,
+    encodingAESKey: messageMode === "plain" ? void 0 : encodingAESKey,
+    messageMode,
+    replyMode,
     welcomeText: welcomeText || void 0
   });
 }
@@ -2318,6 +2391,8 @@ async function configureSingleChannel(channel, prompter, cfg) {
       return configureWecomApp(prompter, cfg);
     case "wecom-kf":
       return configureWecomKf(prompter, cfg);
+    case "wechat-mp":
+      return configureWechatMp(prompter, cfg);
     case "qqbot":
       return configureQQBot(prompter, cfg);
     default:
@@ -2459,6 +2534,7 @@ var SUPPORTED_CHANNELS = [
   "wecom",
   "wecom-app",
   "wecom-kf",
+  "wechat-mp",
   "qqbot"
 ];
 var CHINA_INSTALL_HINT_SHOWN_KEY = /* @__PURE__ */ Symbol.for("@openclaw-china/china-install-hint-shown");
@@ -7181,6 +7257,8 @@ function normalizeWecomWsCallback(frame) {
 var MESSAGE_CONTEXT_TTL_MS = 6 * 60 * 1e3;
 var EVENT_CONTEXT_TTL_MS = 10 * 1e3;
 var STREAM_FINISH_GRACE_MS = 2500;
+var WECOM_WS_THINKING_MESSAGE = "<think></think>";
+var WECOM_WS_FINISH_FALLBACK_MESSAGE = "\u2705 \u5904\u7406\u5B8C\u6210\u3002";
 var messageContexts = /* @__PURE__ */ new Map();
 var eventContexts = /* @__PURE__ */ new Map();
 var messageBySessionKey = /* @__PURE__ */ new Map();
@@ -7342,6 +7420,8 @@ function registerWecomWsMessageContext(params) {
     pendingAutoImagePaths: [],
     createdAt: now2(),
     updatedAt: now2(),
+    placeholderContent: "",
+    suppressVisibleFallback: false,
     started: false,
     finished: false,
     queue: Promise.resolve(),
@@ -7367,6 +7447,7 @@ async function sendWecomWsMessagePlaceholder(params) {
         finish: false
       })
     );
+    context.placeholderContent = content;
     context.started = true;
     context.updatedAt = now2();
   });
@@ -7405,6 +7486,16 @@ function bindWecomWsRouteContext(params) {
   }
   context.updatedAt = now2();
 }
+function markWecomWsMessageContextSkipped(params) {
+  pruneMessageContexts();
+  const key = messageKey(params.accountId.trim(), params.reqId.trim());
+  const context = messageContexts.get(key);
+  if (!context || context.finished) return;
+  const reason = String(params.reason ?? "").trim();
+  if (!reason) return;
+  context.suppressVisibleFallback = true;
+  context.updatedAt = now2();
+}
 async function appendWecomWsActiveStreamChunk(params) {
   const result = await appendWecomWsActiveStreamReply({
     accountId: params.accountId,
@@ -7465,6 +7556,7 @@ async function appendWecomWsActiveStreamReply(params) {
       context.msgItems.push(...acceptedMsgItems);
     }
     if (chunk.trim()) {
+      context.placeholderContent = "";
       context.content = appendStreamSnapshotContent(context.content, chunk);
       await context.send(
         buildWecomWsRespondMessageCommand({
@@ -7520,13 +7612,15 @@ async function finishWecomWsMessageContext(params) {
     const finalContent = errorMessage ? context.content ? `${context.content}
 
 ${errorMessage}` : errorMessage : context.content;
-    const sendFinish = context.started || Boolean(finalContent) || context.msgItems.length > 0;
+    const fallbackContent = !finalContent && !context.suppressVisibleFallback && context.placeholderContent === WECOM_WS_THINKING_MESSAGE ? WECOM_WS_FINISH_FALLBACK_MESSAGE : void 0;
+    const finishContent = finalContent || fallbackContent;
+    const sendFinish = context.started || Boolean(finishContent) || context.msgItems.length > 0;
     if (sendFinish) {
       await context.send(
         buildWecomWsRespondMessageCommand({
           reqId: context.reqId,
           streamId: context.streamId,
-          content: finalContent || void 0,
+          content: finishContent,
           finish: true,
           msgItems: context.msgItems
         })
@@ -8056,6 +8150,9 @@ async function dispatchWecomMessage(params) {
           if (!normalized.trim()) return;
           await hooks.onChunk(normalized);
         },
+        onSkip: (_payload, info) => {
+          hooks.onSkip?.(info);
+        },
         onError: (err, info) => {
           hooks.onError?.(err);
           logger.error(`${info.kind} reply failed: ${String(err)}`);
@@ -9378,6 +9475,7 @@ async function fetchAndSaveWecomDocMcpConfig(params) {
 var activeConnections = /* @__PURE__ */ new Map();
 var processedMessageIds = /* @__PURE__ */ new Map();
 var PROCESSED_MESSAGE_TTL_MS = 10 * 60 * 1e3;
+var WECOM_WS_SHUTDOWN_GRACE_MS = 1e3;
 var activatedTargets = /* @__PURE__ */ new Map();
 function getOrCreateConnection(accountId) {
   let conn = activeConnections.get(accountId);
@@ -9493,7 +9591,11 @@ function summarizeWecomReplyFrame(frame) {
   }
   return JSON.stringify(summary);
 }
-function createSdkLogger(logger) {
+function isExpectedShutdownWsLog(message) {
+  const lowered = message.toLowerCase();
+  return lowered.includes("invalid websocket frame") || lowered.includes("invalid opcode") || lowered.includes("websocket connection closed: code: 1006");
+}
+function createSdkLogger(logger, opts) {
   return {
     debug(message, ...args) {
       logger.debug(formatLogMessage(message, args));
@@ -9502,13 +9604,27 @@ function createSdkLogger(logger) {
       logger.info(formatLogMessage(message, args));
     },
     warn(message, ...args) {
-      logger.warn(formatLogMessage(message, args));
+      const formatted = formatLogMessage(message, args);
+      if (opts?.isShuttingDown?.() && isExpectedShutdownWsLog(formatted)) {
+        logger.debug(`wecom ws shutdown noise suppressed: ${formatted}`);
+        return;
+      }
+      logger.warn(formatted);
     },
     error(message, ...args) {
-      logger.error(formatLogMessage(message, args));
+      const formatted = formatLogMessage(message, args);
+      if (opts?.isShuttingDown?.() && isExpectedShutdownWsLog(formatted)) {
+        logger.debug(`wecom ws shutdown noise suppressed: ${formatted}`);
+        return;
+      }
+      logger.error(formatted);
     }
   };
 }
+function isExpectedShutdownWsError(error) {
+  const message = error.message.toLowerCase();
+  return message.includes("invalid websocket frame") || message.includes("invalid opcode");
+}
 function requireActiveClient(accountId) {
   const conn = activeConnections.get(accountId);
   if (!conn?.client) {
@@ -9634,6 +9750,8 @@ async function startWecomWsGateway(opts) {
   }
   conn.promise = new Promise((resolve4, reject) => {
     let finished = false;
+    let shuttingDown = false;
+    let shutdownTimer = null;
     const client = new WSClient({
       botId: account.botId ?? "",
       secret: account.secret ?? "",
@@ -9641,18 +9759,18 @@ async function startWecomWsGateway(opts) {
       heartbeatInterval: account.heartbeatIntervalMs,
       reconnectInterval: account.reconnectInitialDelayMs,
       maxReconnectAttempts: -1,
-      logger: createSdkLogger(logger)
+      logger: createSdkLogger(logger, { isShuttingDown: () => shuttingDown })
     });
     conn.client = client;
-    const finish = (err) => {
+    const cleanup = (err) => {
       if (finished) return;
       finished = true;
+      if (shutdownTimer) {
+        clearTimeout(shutdownTimer);
+        shutdownTimer = null;
+      }
       abortSignal?.removeEventListener("abort", onAbort);
       client.removeAllListeners();
-      try {
-        client.disconnect();
-      } catch {
-      }
       clearWecomWsReplyContextsForAccount(account.accountId);
       clearActivatedTargetsForAccount(account.accountId);
       conn.client = null;
@@ -9668,9 +9786,27 @@ async function startWecomWsGateway(opts) {
       if (err) reject(err);
       else resolve4();
     };
+    const beginShutdown = (err) => {
+      if (finished) return;
+      if (shuttingDown) {
+        return;
+      }
+      shuttingDown = true;
+      abortSignal?.removeEventListener("abort", onAbort);
+      shutdownTimer = setTimeout(() => {
+        logger.warn(`wecom ws shutdown timed out for account ${account.accountId}; forcing cleanup`);
+        cleanup(err);
+      }, WECOM_WS_SHUTDOWN_GRACE_MS);
+      shutdownTimer.unref?.();
+      try {
+        client.disconnect();
+      } catch (disconnectErr) {
+        cleanup(disconnectErr);
+      }
+    };
     const onAbort = () => {
       logger.info("abort signal received, stopping wecom ws gateway");
-      finish();
+      beginShutdown();
     };
     const handleMessageCallback = (frame) => {
       const callback = normalizeWecomWsCallback(toWecomWsFrame(frame));
@@ -9717,7 +9853,7 @@ async function startWecomWsGateway(opts) {
             void sendWecomWsMessagePlaceholder({
               accountId: account.accountId,
               reqId: callback.reqId,
-              content: "\u23F3"
+              content: WECOM_WS_THINKING_MESSAGE
             }).catch((err) => {
               logger.warn(`wecom ws placeholder ack failed: ${String(err)}`);
             });
@@ -9730,6 +9866,13 @@ async function startWecomWsGateway(opts) {
               runId: context.runId
             });
           },
+          onSkip: (info) => {
+            markWecomWsMessageContextSkipped({
+              accountId: account.accountId,
+              reqId: callback.reqId,
+              reason: info.reason
+            });
+          },
           onChunk: async (text) => {
             await appendWecomWsActiveStreamChunk({
               accountId: account.accountId,
@@ -9919,13 +10062,20 @@ async function startWecomWsGateway(opts) {
       setStatus?.({
         accountId: account.accountId,
         mode: "ws",
-        running: true,
+        running: !shuttingDown,
         connectionState: "disconnected",
         lastDisconnectAt: Date.now(),
         lastDisconnectReason: reason
       });
+      if (shuttingDown) {
+        cleanup();
+      }
     });
     client.on("error", (error) => {
+      if (shuttingDown && isExpectedShutdownWsError(error)) {
+        logger.debug(`wecom ws shutdown noise suppressed: ${error.message}`);
+        return;
+      }
       logger.error(`wecom ws sdk error: ${error.message}`);
       setStatus?.({
         accountId: account.accountId,
@@ -9935,17 +10085,17 @@ async function startWecomWsGateway(opts) {
       });
     });
     conn.stop = () => {
-      finish();
+      beginShutdown();
     };
     if (abortSignal?.aborted) {
-      finish();
+      beginShutdown();
       return;
     }
     abortSignal?.addEventListener("abort", onAbort, { once: true });
     try {
       client.connect();
     } catch (err) {
-      finish(err);
+      cleanup(err);
     }
   });
   return conn.promise;