@tencent-weixin/openclaw-weixin 2.1.5 → 2.1.7

package/CHANGELOG.md

@@ -4,6 +4,17 @@
 
 This project follows the [Keep a Changelog](https://keepachangelog.com/) format.
 
+## [2.1.7] - 2026-04-07
+
+### Fixed
+
+- **Plugin registration re-entrance:** Lazy-import `monitorWeixinProvider` inside `startAccount` in `channel.ts` to avoid pulling in the monitor → process-message → command-auth chain at plugin registration time, which could re-enter the plugin/provider registry before the account starts.
+- **Initialization side effect:** Lazy-import `resolveSenderCommandAuthorizationWithRuntime` / `resolveDirectDmAuthorizationOutcome` in `process-message.ts` to prevent `ensureContextWindowCacheLoaded` from being triggered during module initialization, which caused `loadOpenClawPlugins` re-entrance.
+
+### Changed
+
+- **Tool-call outbound path:** `sendWeixinOutbound` now applies `StreamingMarkdownFilter` to the outbound text, consistent with the model-output path in `process-message`.
+
 ## [2.1.4] - 2026-04-03
 
 ### Changed

package/CHANGELOG.zh_CN.md

@@ -4,6 +4,17 @@
 
 本项目遵循 [Keep a Changelog](https://keepachangelog.com/) 格式。
 
+## [2.1.7] - 2026-04-07
+
+### 修复
+
+- **插件注册重入：** `channel.ts` 中将 `monitorWeixinProvider` 改为在 `startAccount` 内部懒加载（`await import(...)`），避免插件注册阶段提前拉取 monitor → process-message → command-auth 依赖链，导致 plugin/provider registry 重入。
+- **初始化副作用：** `process-message.ts` 中将 `resolveSenderCommandAuthorizationWithRuntime` / `resolveDirectDmAuthorizationOutcome` 改为懒加载，避免模块初始化时触发宿主的 `ensureContextWindowCacheLoaded` 副作用，进而导致 `loadOpenClawPlugins` 重入。
+
+### 变更
+
+- **tool-call 外发路径：** `sendWeixinOutbound` 现在对发送文本应用 `StreamingMarkdownFilter`，与 `process-message` 中的 model-output 路径保持一致。
+
 ## [2.1.4] - 2026-04-03
 
 ### 变更

package/openclaw.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "openclaw-weixin",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "channels": [
     "openclaw-weixin"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencent-weixin/openclaw-weixin",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "description": "OpenClaw Weixin channel",
   "license": "MIT",
   "author": "Tencent",

package/src/channel.ts

@@ -24,9 +24,11 @@ import {
   waitForWeixinLogin,
 } from "./auth/login-qr.js";
 import type { WeixinQrStartResult, WeixinQrWaitResult } from "./auth/login-qr.js";
-import { monitorWeixinProvider } from "./monitor/monitor.js";
+// Lazy-imported inside startAccount to avoid pulling in the monitor -> process-message ->
+// command-auth chain during plugin registration, which can re-enter plugin/provider registry
+// resolution before the account actually starts.
 import { sendWeixinMediaFile } from "./messaging/send-media.js";
-import { sendMessageWeixin } from "./messaging/send.js";
+import { sendMessageWeixin, StreamingMarkdownFilter } from "./messaging/send.js";
 import { downloadRemoteImageToTemp } from "./cdn/upload.js";
 
 /** Returns true when mediaUrl refers to a local filesystem path (absolute or relative). */
@@ -119,7 +121,10 @@ async function sendWeixinOutbound(params: {
   if (!params.contextToken) {
     aLog.warn(`sendWeixinOutbound: contextToken missing for to=${params.to}, sending without context`);
   }
-  const result = await sendMessageWeixin({ to: params.to, text: params.text, opts: {
+  const f = new StreamingMarkdownFilter();
+  const rawText = params.text ?? "";
+  const filteredText = f.feed(rawText) + f.flush();
+  const result = await sendMessageWeixin({ to: params.to, text: filteredText, opts: {
     baseUrl: account.baseUrl,
     token: account.token,
     contextToken: params.contextToken,
@@ -383,6 +388,7 @@ export const weixinPlugin: ChannelPlugin<ResolvedWeixinAccount> = {
       const logPath = aLog.getLogFilePath();
       ctx.log?.info?.(`[${account.accountId}] weixin logs: ${logPath}`);
 
+      const { monitorWeixinProvider } = await import("./monitor/monitor.js");
       return monitorWeixinProvider({
         baseUrl: account.baseUrl,
         cdnBaseUrl: account.cdnBaseUrl,

package/src/messaging/markdown-filter.ts

@@ -6,22 +6,9 @@
  * holding back the minimum characters needed for pattern disambiguation
  * (e.g. a trailing `*` that might become `***`).
  *
- * Constructs passed through (not filtered):
- * - Code fences (```)
- * - Inline code (`)
- * - Tables (|...|)
- * - Horizontal rules (---, ***, ___)
- * - Bold (**)
- * - Italic/bold-italic wrapping non-CJK content
- *
- * Constructs filtered (markers stripped, content kept):
- * - Italic/bold-italic wrapping CJK content
- * - Headings H5/H6 (#####, ######)
- * - Images (![alt](url)) — removed entirely
- *
  * States:
  * - **sol** (start-of-line): checks for line-start patterns (```, >, #####, indent)
- * - **body**: scans for inline patterns (![, ~~, ***) and outputs safe chars
+ * - **body**: scans for inline patterns (`, ![, ~~, ***) and outputs safe chars
  * - **fence**: inside a fenced code block, passes through until closing ```
  * - **inline**: accumulating content inside an inline marker pair
  */
@@ -29,7 +16,7 @@ export class StreamingMarkdownFilter {
   private buf = "";
   private fence = false;
   private sol = true;
-  private inl: { type: "image" | "bold3" | "italic" | "ubold3" | "uitalic"; acc: string } | null = null;
+  private inl: { type: "code" | "image" | "strike" | "bold3" | "italic" | "ubold3" | "uitalic" | "table"; acc: string } | null = null;
 
   feed(delta: string): string {
     this.buf += delta;
@@ -58,32 +45,26 @@ export class StreamingMarkdownFilter {
     }
 
     if (eof && this.inl) {
-      const markers: Record<string, string> = { image: "![", bold3: "***", italic: "*", ubold3: "___", uitalic: "_" };
-      out += (markers[this.inl.type] ?? "") + this.inl.acc;
+      if (this.inl.type === "table") {
+        out += StreamingMarkdownFilter.extractTableRow(this.inl.acc);
+      } else {
+        const markers: Record<string, string> = { code: "`", image: "![", strike: "~~", bold3: "***", italic: "*", ubold3: "___", uitalic: "_" };
+        out += (markers[this.inl.type] ?? "") + this.inl.acc;
+      }
       this.inl = null;
     }
     return out;
   }
 
-  /** Inside a code fence: pass content and markers through verbatim. */
+  /** Inside a code fence: pass content through, watch for closing ``` at SOL. */
   private pumpFence(eof: boolean): string {
     if (this.sol) {
       if (this.buf.length < 3 && !eof) return "";
       if (this.buf.startsWith("```")) {
+        this.fence = false;
         const nl = this.buf.indexOf("\n", 3);
-        if (nl !== -1) {
-          this.fence = false;
-          const line = this.buf.slice(0, nl + 1);
-          this.buf = this.buf.slice(nl + 1);
-          this.sol = true;
-          return line;
-        }
-        if (eof) {
-          this.fence = false;
-          const line = this.buf;
-          this.buf = "";
-          return line;
-        }
+        this.buf = nl !== -1 ? this.buf.slice(nl + 1) : "";
+        this.sol = true;
         return "";
       }
       this.sol = false;
@@ -112,18 +93,10 @@ export class StreamingMarkdownFilter {
     if (b[0] === "`") {
       if (b.length < 3 && !eof) return "";
       if (b.startsWith("```")) {
+        this.fence = true;
         const nl = b.indexOf("\n", 3);
-        if (nl !== -1) {
-          this.fence = true;
-          const line = b.slice(0, nl + 1);
-          this.buf = b.slice(nl + 1);
-          this.sol = true;
-          return line;
-        }
-        if (eof) {
-          this.buf = "";
-          return b;
-        }
+        this.buf = nl !== -1 ? b.slice(nl + 1) : "";
+        this.sol = true;
         return "";
       }
       this.sol = false;
@@ -131,6 +104,8 @@ export class StreamingMarkdownFilter {
     }
 
     if (b[0] === ">") {
+      if (b.length < 2 && !eof) return "";
+      this.buf = b.length >= 2 && b[1] === " " ? b.slice(2) : b.slice(1);
       this.sol = false;
       return "";
     }
@@ -148,6 +123,13 @@ export class StreamingMarkdownFilter {
       return "";
     }
 
+    if (b[0] === "|") {
+      this.buf = b.slice(1);
+      this.inl = { type: "table", acc: "" };
+      this.sol = false;
+      return "";
+    }
+
     if (b[0] === " " || b[0] === "\t") {
       if (b.search(/[^ \t]/) === -1 && !eof) return "";
       this.sol = false;
@@ -163,13 +145,9 @@ export class StreamingMarkdownFilter {
         let count = 0;
         for (let k = 0; k < j; k++) if (b[k] === ch) count++;
         if (count >= 3) {
-          if (j < b.length) {
-            this.buf = b.slice(j + 1);
-            this.sol = true;
-            return b.slice(0, j + 1);
-          }
-          this.buf = "";
-          return b;
+          this.buf = j < b.length ? b.slice(j + 1) : "";
+          this.sol = true;
+          return "";
         }
       }
       this.sol = false;
@@ -192,15 +170,23 @@ export class StreamingMarkdownFilter {
         this.sol = true;
         return out;
       }
+      if (c === "`") {
+        out += this.buf.slice(0, i);
+        this.buf = this.buf.slice(i + 1);
+        this.inl = { type: "code", acc: "" };
+        return out;
+      }
       if (c === "!" && i + 1 < this.buf.length && this.buf[i + 1] === "[") {
         out += this.buf.slice(0, i);
         this.buf = this.buf.slice(i + 2);
         this.inl = { type: "image", acc: "" };
         return out;
       }
-      if (c === "~") {
-        i++;
-        continue;
+      if (c === "~" && i + 1 < this.buf.length && this.buf[i + 1] === "~") {
+        out += this.buf.slice(0, i);
+        this.buf = this.buf.slice(i + 2);
+        this.inl = { type: "strike", acc: "" };
+        return out;
       }
       if (c === "*") {
         if (i + 2 < this.buf.length && this.buf[i + 1] === "*" && this.buf[i + 2] === "*") {
@@ -251,6 +237,7 @@ export class StreamingMarkdownFilter {
       else if (this.buf.endsWith("__")) hold = 2;
       else if (this.buf.endsWith("*")) hold = 1;
       else if (this.buf.endsWith("_")) hold = 1;
+      else if (this.buf.endsWith("~")) hold = 1;
       else if (this.buf.endsWith("!")) hold = 1;
     }
     out += this.buf.slice(0, this.buf.length - hold);
@@ -265,14 +252,41 @@ export class StreamingMarkdownFilter {
     this.buf = "";
 
     switch (this.inl.type) {
+      case "code": {
+        const idx = this.inl.acc.indexOf("`");
+        if (idx !== -1) {
+          const content = this.inl.acc.slice(0, idx);
+          this.buf = this.inl.acc.slice(idx + 1);
+          this.inl = null;
+          return content;
+        }
+        const nl = this.inl.acc.indexOf("\n");
+        if (nl !== -1) {
+          const r = "`" + this.inl.acc.slice(0, nl + 1);
+          this.buf = this.inl.acc.slice(nl + 1);
+          this.inl = null;
+          this.sol = true;
+          return r;
+        }
+        return "";
+      }
+      case "strike": {
+        const idx = this.inl.acc.indexOf("~~");
+        if (idx !== -1) {
+          const content = this.inl.acc.slice(0, idx);
+          this.buf = this.inl.acc.slice(idx + 2);
+          this.inl = null;
+          return content;
+        }
+        return "";
+      }
       case "bold3": {
         const idx = this.inl.acc.indexOf("***");
         if (idx !== -1) {
           const content = this.inl.acc.slice(0, idx);
           this.buf = this.inl.acc.slice(idx + 3);
           this.inl = null;
-          if (StreamingMarkdownFilter.containsCJK(content)) return content;
-          return `***${content}***`;
+          return content;
         }
         return "";
       }
@@ -282,8 +296,7 @@ export class StreamingMarkdownFilter {
           const content = this.inl.acc.slice(0, idx);
           this.buf = this.inl.acc.slice(idx + 3);
           this.inl = null;
-          if (StreamingMarkdownFilter.containsCJK(content)) return content;
-          return `___${content}___`;
+          return content;
         }
         return "";
       }
@@ -304,8 +317,7 @@ export class StreamingMarkdownFilter {
             const content = this.inl.acc.slice(0, j);
             this.buf = this.inl.acc.slice(j + 1);
             this.inl = null;
-            if (StreamingMarkdownFilter.containsCJK(content)) return content;
-            return `*${content}*`;
+            return content;
           }
         }
         return "";
@@ -327,8 +339,7 @@ export class StreamingMarkdownFilter {
             const content = this.inl.acc.slice(0, j);
             this.buf = this.inl.acc.slice(j + 1);
             this.inl = null;
-            if (StreamingMarkdownFilter.containsCJK(content)) return content;
-            return `_${content}_`;
+            return content;
           }
         }
         return "";
@@ -351,11 +362,30 @@ export class StreamingMarkdownFilter {
         }
         return "";
       }
+      case "table": {
+        const nl = this.inl.acc.indexOf("\n");
+        if (nl !== -1) {
+          const line = this.inl.acc.slice(0, nl);
+          this.buf = this.inl.acc.slice(nl + 1);
+          this.inl = null;
+          this.sol = true;
+          const row = StreamingMarkdownFilter.extractTableRow(line);
+          return row ? row + "\n" : "";
+        }
+        return "";
+      }
     }
     return "";
   }
 
-  private static containsCJK(text: string): boolean {
-    return /[\u2E80-\u9FFF\uAC00-\uD7AF\uF900-\uFAFF]/.test(text);
+  /** Extract cell contents from a table row, or return "" for separator rows. */
+  private static extractTableRow(line: string): string {
+    if (/^[\s|:\-]+$/.test(line) && line.includes("-")) return "";
+    const parts = line.split("|").map(c => c.trim());
+    const cells = parts.slice(
+      parts[0] === "" ? 1 : 0,
+      parts[parts.length - 1] === "" ? parts.length - 1 : parts.length,
+    );
+    return cells.join("\t");
   }
 }