@agent-wechat/wechat 0.3.0 → 0.4.0

package/dist/index.js

@@ -1106,6 +1106,21 @@ function resolveWeChatAccount(cfg, accountId) {
   };
 }
 
+// src/runtime.ts
+var runtime = null;
+function setWeChatRuntime(next) {
+  runtime = next;
+}
+function getWeChatRuntime() {
+  if (!runtime) {
+    throw new Error("WeChat runtime not initialized");
+  }
+  return runtime;
+}
+
+// src/monitor.ts
+import { execSync } from "node:child_process";
+
 // ../shared/dist/client.js
 function normalizeUrl(base) {
   const url = base.startsWith("http") ? base : `http://${base}`;
@@ -5486,20 +5501,6 @@ var agentConfigSchema = external_exports.object({
 
 // src/monitor.ts
 import { createReplyPrefixOptions } from "openclaw/plugin-sdk";
-
-// src/runtime.ts
-var runtime = null;
-function setWeChatRuntime(next) {
-  runtime = next;
-}
-function getWeChatRuntime() {
-  if (!runtime) {
-    throw new Error("WeChat runtime not initialized");
-  }
-  return runtime;
-}
-
-// src/monitor.ts
 var MEDIA_TYPES = /* @__PURE__ */ new Set([3, 34]);
 var HISTORY_CONTEXT_MARKER = "[Chat messages since your last reply - for context]";
 var CURRENT_MESSAGE_MARKER = "[Current message - respond to this]";
@@ -5552,8 +5553,16 @@ function enqueueWeChatSystemEvent(text, contextKey) {
   } catch {
   }
 }
+function enqueueAndWakeSystemEvent(text, contextKey, log) {
+  enqueueWeChatSystemEvent(text, contextKey);
+  try {
+    execSync("openclaw system event --mode now", { timeout: 5e3, stdio: "ignore" });
+  } catch {
+    log?.info?.("Failed to trigger heartbeat wake \u2014 agent will see event on next prompt");
+  }
+}
 async function startWeChatMonitor(opts) {
-  const { account, abortSignal, runtime: runtime2, setStatus, log } = opts;
+  const { account, abortSignal, setStatus, log } = opts;
   const client = new WeChatClient({ baseUrl: account.serverUrl, token: account.token });
   const lastSeenId = /* @__PURE__ */ new Map();
   let lastAuthCheck = 0;
@@ -5581,12 +5590,13 @@ async function startWeChatMonitor(opts) {
             authStatus: auth.status
           });
           if (prevStatus === "logged_in" && !isLinked) {
-            const msg = auth.status === "app_not_running" ? "[WeChat] Application stopped. It will restart automatically \u2014 you may need to log in again." : "[WeChat] Session lost. Please log in again using the wechat_login tool.";
-            enqueueWeChatSystemEvent(msg, "wechat:auth_lost");
+            const msg = auth.status === "app_not_running" ? "[WeChat] Application stopped. It will restart automatically \u2014 credentials may be cached, so you can try reconnecting using the wechat_login tool." : "[WeChat] Session ended. You can try reconnecting using the wechat_login tool \u2014 if credentials are cached, login may complete automatically.";
+            enqueueAndWakeSystemEvent(msg, "wechat:auth_lost", log);
           } else if (prevStatus === void 0 && !isLinked) {
-            enqueueWeChatSystemEvent(
-              "[WeChat] Not logged in. Use the wechat_login tool to authenticate.",
-              "wechat:auth_required"
+            enqueueAndWakeSystemEvent(
+              "[WeChat] Not logged in. Use the wechat_login tool to authenticate \u2014 if credentials are cached from a previous session, login may complete automatically.",
+              "wechat:auth_required",
+              log
             );
           }
           prevStatus = auth.status;
@@ -5604,9 +5614,10 @@ async function startWeChatMonitor(opts) {
             lastError: String(err)
           });
           if (prevStatus === "logged_in") {
-            enqueueWeChatSystemEvent(
+            enqueueAndWakeSystemEvent(
               "[WeChat] Cannot reach agent-wechat server. The container may have stopped.",
-              "wechat:server_unreachable"
+              "wechat:server_unreachable",
+              log
             );
           }
           prevStatus = void 0;
@@ -5768,7 +5779,8 @@ ${replyBlock}` : replyBlock;
     senderId,
     isGroup,
     timestamp,
-    hasMedia
+    hasMedia,
+    isMentioned: isGroup && msg.isMentioned === true
   };
 }
 function buildSegments(processed) {
@@ -5800,6 +5812,18 @@ async function dispatchSegment(segment, client, chatId, chat, liveAccount, cfg,
   log?.info?.(
     `[wechat:${liveAccount.accountId}] Dispatching segment: ${segment.length} msg(s), last=${msg.localId}${mediaPath ? ` media=${mediaPath}` : ""}`
   );
+  if (isGroup) {
+    const wechatCfg = cfg?.channels?.wechat;
+    const groupEntry = wechatCfg?.groups?.[chatId];
+    const defaultEntry = wechatCfg?.groups?.["*"];
+    const requireMention = groupEntry?.requireMention ?? defaultEntry?.requireMention ?? true;
+    if (requireMention && !lastMsg.isMentioned) {
+      log?.info?.(
+        `[wechat:${liveAccount.accountId}] Skipping group message (mention required, not mentioned) in ${chatId}`
+      );
+      return;
+    }
+  }
   try {
     const route = core.channel.routing.resolveAgentRoute({
       cfg,
@@ -5886,6 +5910,7 @@ async function dispatchSegment(segment, client, chatId, chat, liveAccount, cfg,
       Provider: "wechat",
       Surface: "wechat",
       MessageSid: `wechat:${chatId}:${msg.localId}`,
+      WasMentioned: isGroup ? lastMsg.isMentioned : void 0,
       OriginatingChannel: "wechat",
       OriginatingTo: `wechat:${chatId}`,
       ...mediaPath ? { MediaPath: mediaPath, MediaUrl: mediaPath, MediaType: mediaMime } : {},
@@ -6289,24 +6314,26 @@ function readOrGenerateToken() {
   return token;
 }
 var wechatOnboardingAdapter = {
-  getStatus: async ({
-    account
-  }) => {
-    if (!account.serverUrl) {
+  channel: "wechat",
+  getStatus: async ({ cfg }) => {
+    const account = resolveWeChatAccount(cfg);
+    if (!account?.serverUrl) {
       return {
+        channel: "wechat",
         configured: false,
-        lines: ["Not configured. Run: openclaw channels setup wechat"]
+        statusLines: ["Not configured. Run: openclaw channels setup wechat"]
       };
     }
     const client = new WeChatClient({ baseUrl: account.serverUrl, token: account.token });
-    const lines = [];
+    const statusLines = [];
     try {
       await client.status();
-      lines.push(`Connected to ${account.serverUrl}`);
+      statusLines.push(`Connected to ${account.serverUrl}`);
     } catch {
       return {
+        channel: "wechat",
         configured: true,
-        lines: [
+        statusLines: [
           `Server URL: ${account.serverUrl}`,
           "Cannot reach server \u2014 is the agent-wechat container running?"
         ]
@@ -6315,45 +6342,44 @@ var wechatOnboardingAdapter = {
     try {
       const auth = await client.authStatus();
       if (auth.status === "logged_in") {
-        lines.push(
+        statusLines.push(
           `Logged in${auth.loggedInUser ? ` as ${auth.loggedInUser}` : ""}`
         );
       } else {
-        lines.push("Not logged in. Run: openclaw channels login --channel wechat");
+        statusLines.push("Not logged in. Run: openclaw channels login --channel wechat");
       }
     } catch {
-      lines.push("Could not check auth status");
+      statusLines.push("Could not check auth status");
     }
-    lines.push(`DM policy: ${account.dmPolicy}`);
+    statusLines.push(`DM policy: ${account.dmPolicy}`);
     if (account.allowFrom.length > 0) {
-      lines.push(`Allowed senders: ${account.allowFrom.join(", ")}`);
+      statusLines.push(`Allowed senders: ${account.allowFrom.join(", ")}`);
     }
-    lines.push(`Group policy: ${account.groupPolicy}`);
-    return { configured: true, lines };
+    statusLines.push(`Group policy: ${account.groupPolicy}`);
+    return { channel: "wechat", configured: true, statusLines };
   },
-  configure: async ({
-    prompter,
-    cfg,
-    setCfg
-  }) => {
-    const existingUrl = cfg?.channels?.wechat?.serverUrl ?? "http://localhost:6174";
+  configure: async ({ prompter, cfg }) => {
+    const wechatCfg = {
+      ...cfg?.channels?.wechat ?? {}
+    };
+    const existingUrl = wechatCfg.serverUrl ?? "http://localhost:6174";
     const serverUrl = await prompter.text({
       message: "Agent-wechat server URL",
-      default: existingUrl
+      initialValue: existingUrl
     });
-    setCfg("channels.wechat.serverUrl", serverUrl);
-    const existingToken = cfg?.channels?.wechat?.token ?? "";
+    wechatCfg.serverUrl = serverUrl;
+    const existingToken = wechatCfg.token ?? "";
     const localDefault = existingToken || readOrGenerateToken();
     const token = await prompter.text({
       message: "Auth token (leave empty to use local token)",
-      default: localDefault
+      initialValue: localDefault
     });
-    setCfg("channels.wechat.token", token || localDefault);
+    wechatCfg.token = token || localDefault;
     const client = new WeChatClient({ baseUrl: serverUrl, token: token || void 0 });
     try {
       await client.status();
     } catch {
-      setCfg("channels.wechat.enabled", false);
+      wechatCfg.enabled = false;
       throw new Error(
         `Cannot reach ${serverUrl}. Ensure the agent-wechat container is running.`
       );
@@ -6363,10 +6389,10 @@ var wechatOnboardingAdapter = {
       if (auth.status !== "logged_in") {
         const wantsLink = await prompter.confirm({
           message: "WeChat not logged in. Link now?",
-          default: true
+          initialValue: true
         });
         if (wantsLink) {
-          await prompter.note?.(
+          await prompter.note(
             "Starting login \u2014 watch for QR code or phone confirmation.",
             "WeChat Login"
           );
@@ -6375,52 +6401,37 @@ var wechatOnboardingAdapter = {
               onEvent: (event) => {
                 switch (event.type) {
                   case "status":
-                    prompter.log?.(`Status: ${event.message}`);
+                    prompter.note?.(event.message, "Status");
                     break;
                   case "qr":
-                    prompter.log?.("Scan this QR code with WeChat:\n");
-                    if (event.qrData) {
-                      try {
-                        const qrTerminalMod = require_main();
-                        const qrInput = event.qrBinaryData ? Buffer.from(event.qrBinaryData).toString("utf-8") : event.qrData;
-                        qrTerminalMod.generate(qrInput, { small: true }, (qr) => {
-                          prompter.log?.(qr);
-                        });
-                      } catch {
-                        if (event.qrDataUrl) {
-                          prompter.log?.("(QR data URL available \u2014 open in browser to scan)");
-                        }
-                      }
-                    }
-                    prompter.log?.("\nWaiting for scan...\n");
+                    prompter.note?.("Scan QR code with WeChat", "Login");
                     break;
                   case "phone_confirm":
-                    prompter.log?.(
-                      `
-${event.message || "Please confirm login on your phone"}
-`
+                    prompter.note?.(
+                      event.message || "Please confirm login on your phone",
+                      "Confirm"
                     );
                     break;
                   case "login_success":
-                    prompter.log?.("\nLogin successful!");
+                    prompter.note?.("Login successful!", "Done");
                     break;
                   case "login_timeout":
-                    prompter.log?.("\nLogin timed out.");
+                    prompter.note?.("Login timed out. Please try again.", "Timeout");
                     break;
                   case "error":
-                    prompter.log?.(`
-Error: ${event.message}`);
+                    prompter.note?.(`Error: ${event.message}`, "Error");
                     break;
                 }
               }
             });
           } catch (err) {
-            prompter.log?.(
-              `Login failed: ${err instanceof Error ? err.message : String(err)}`
+            prompter.note?.(
+              `Login failed: ${err instanceof Error ? err.message : String(err)}`,
+              "Error"
             );
           }
         } else {
-          await prompter.note?.(
+          await prompter.note(
             "Run `openclaw channels login --channel wechat` later to link.",
             "WeChat"
           );
@@ -6430,54 +6441,45 @@ Error: ${event.message}`);
     }
     const dmPolicy = await prompter.select({
       message: "DM (direct message) policy",
-      choices: [
+      options: [
         { label: "Disabled \u2014 ignore all DMs", value: "disabled" },
-        {
-          label: "Allowlist \u2014 only respond to specific senders",
-          value: "allowlist"
-        },
+        { label: "Allowlist \u2014 only respond to specific senders", value: "allowlist" },
         { label: "Open \u2014 respond to all DMs", value: "open" }
       ]
     });
-    setCfg("channels.wechat.dmPolicy", dmPolicy);
+    wechatCfg.dmPolicy = dmPolicy;
     if (dmPolicy === "allowlist") {
-      const allowFrom = await prompter.multiText({
-        message: "Allowed WeChat IDs (wxid_xxx), one per line",
-        hint: "Enter wxid values, press Enter after each. Empty line to finish."
+      const raw = await prompter.text({
+        message: "Allowed WeChat IDs (comma-separated wxid_xxx values)"
       });
-      setCfg("channels.wechat.allowFrom", allowFrom);
+      wechatCfg.allowFrom = raw.split(",").map((s) => s.trim()).filter(Boolean);
     }
     const groupPolicy = await prompter.select({
       message: "Group chat policy",
-      choices: [
-        {
-          label: "Disabled \u2014 ignore all group messages",
-          value: "disabled"
-        },
-        {
-          label: "Allowlist \u2014 only respond in specific groups",
-          value: "allowlist"
-        },
-        {
-          label: "Open \u2014 respond in all groups (when mentioned)",
-          value: "open"
-        }
+      options: [
+        { label: "Disabled \u2014 ignore all group messages", value: "disabled" },
+        { label: "Allowlist \u2014 only respond in specific groups", value: "allowlist" },
+        { label: "Open \u2014 respond in all groups (when mentioned)", value: "open" }
       ]
     });
-    setCfg("channels.wechat.groupPolicy", groupPolicy);
+    wechatCfg.groupPolicy = groupPolicy;
     if (groupPolicy === "allowlist") {
-      const groupAllowFrom = await prompter.multiText({
-        message: "Allowed group IDs (xxx@chatroom), one per line",
-        hint: "Enter chatroom IDs, press Enter after each. Empty line to finish."
+      const raw = await prompter.text({
+        message: "Allowed group IDs (comma-separated xxx@chatroom values)"
       });
-      setCfg("channels.wechat.groupAllowFrom", groupAllowFrom);
+      wechatCfg.groupAllowFrom = raw.split(",").map((s) => s.trim()).filter(Boolean);
     }
-    setCfg("channels.wechat.enabled", true);
+    wechatCfg.enabled = true;
+    const newCfg = {
+      ...cfg,
+      channels: { ...cfg.channels, wechat: wechatCfg }
+    };
+    return { cfg: newCfg };
   }
 };
 
 // src/status.ts
-async function collectWeChatStatusIssues(accounts) {
+function collectWeChatStatusIssues(accounts) {
   const issues = [];
   for (const snapshot of accounts) {
     if (!snapshot.connected) {
@@ -6534,7 +6536,8 @@ function createWeChatLoginTool(account) {
       },
       required: ["action"]
     },
-    execute: async (_toolCallId, args) => {
+    execute: async (_toolCallId, params) => {
+      const args = params;
       const action = args.action;
       const force = args.force;
       const timeoutMs = args.timeoutMs;
@@ -6657,6 +6660,7 @@ var meta = {
   label: "WeChat",
   selectionLabel: "WeChat (\u5FAE\u4FE1)",
   blurb: "WeChat messaging via agent-wechat container.",
+  docsPath: "wechat",
   aliases: ["weixin"],
   order: 80
 };
@@ -6773,14 +6777,16 @@ var wechatPlugin = {
         cfg
       );
       if (!account?.serverUrl) {
-        return { channel: "wechat", ok: false, error: "No serverUrl configured" };
+        throw new Error("No serverUrl configured");
       }
       const client = new WeChatClient({ baseUrl: account.serverUrl, token: account.token });
       const result = await client.sendMessage({ chatId: to, text });
+      if (!result.success) {
+        throw new Error(result.error ?? "Send failed");
+      }
       return {
         channel: "wechat",
-        ok: result.success,
-        error: result.error ?? void 0
+        messageId: `wechat:${to}:${Date.now()}`
       };
     },
     sendMedia: async ({ cfg, to, text, mediaUrl }) => {
@@ -6788,68 +6794,64 @@ var wechatPlugin = {
         cfg
       );
       if (!account?.serverUrl) {
-        return { channel: "wechat", ok: false, error: "No serverUrl configured" };
+        throw new Error("No serverUrl configured");
       }
       const client = new WeChatClient({ baseUrl: account.serverUrl, token: account.token });
       if (mediaUrl) {
-        try {
-          const fsmod = await import("fs/promises");
-          const pathmod = await import("path");
-          let base64;
-          let mimeType;
-          let filename;
-          if (mediaUrl.startsWith("http://") || mediaUrl.startsWith("https://")) {
-            const res = await fetch(mediaUrl);
-            const buffer = await res.arrayBuffer();
-            base64 = Buffer.from(buffer).toString("base64");
-            mimeType = res.headers.get("content-type") ?? "application/octet-stream";
-            const urlPath = new URL(mediaUrl).pathname;
-            filename = pathmod.basename(urlPath) || "file";
-          } else {
-            const buf = await fsmod.readFile(mediaUrl);
-            base64 = buf.toString("base64");
-            filename = pathmod.basename(mediaUrl);
-            const ext = pathmod.extname(mediaUrl).toLowerCase().replace(".", "");
-            const extMime = {
-              png: "image/png",
-              jpg: "image/jpeg",
-              jpeg: "image/jpeg",
-              gif: "image/gif",
-              webp: "image/webp"
-            };
-            mimeType = extMime[ext] ?? "application/octet-stream";
-          }
-          const isImage = mimeType.startsWith("image/");
-          const result2 = isImage ? await client.sendMessage({
-            chatId: to,
-            text: text || void 0,
-            image: { data: base64, mimeType }
-          }) : await client.sendMessage({
-            chatId: to,
-            text: text || void 0,
-            file: { data: base64, filename }
-          });
-          return {
-            channel: "wechat",
-            ok: result2.success,
-            error: result2.error ?? void 0
-          };
-        } catch (err) {
-          return {
-            channel: "wechat",
-            ok: false,
-            error: `Failed to send media: ${err}`
+        const fsmod = await import("fs/promises");
+        const pathmod = await import("path");
+        let base64;
+        let mimeType;
+        let filename;
+        if (mediaUrl.startsWith("http://") || mediaUrl.startsWith("https://")) {
+          const res = await fetch(mediaUrl);
+          const buffer = await res.arrayBuffer();
+          base64 = Buffer.from(buffer).toString("base64");
+          mimeType = res.headers.get("content-type") ?? "application/octet-stream";
+          const urlPath = new URL(mediaUrl).pathname;
+          filename = pathmod.basename(urlPath) || "file";
+        } else {
+          const buf = await fsmod.readFile(mediaUrl);
+          base64 = buf.toString("base64");
+          filename = pathmod.basename(mediaUrl);
+          const ext = pathmod.extname(mediaUrl).toLowerCase().replace(".", "");
+          const extMime = {
+            png: "image/png",
+            jpg: "image/jpeg",
+            jpeg: "image/jpeg",
+            gif: "image/gif",
+            webp: "image/webp"
           };
+          mimeType = extMime[ext] ?? "application/octet-stream";
+        }
+        const isImage = mimeType.startsWith("image/");
+        const result2 = isImage ? await client.sendMessage({
+          chatId: to,
+          text: text || void 0,
+          image: { data: base64, mimeType }
+        }) : await client.sendMessage({
+          chatId: to,
+          text: text || void 0,
+          file: { data: base64, filename }
+        });
+        if (!result2.success) {
+          throw new Error(result2.error ?? "Send media failed");
         }
+        return {
+          channel: "wechat",
+          messageId: `wechat:${to}:${Date.now()}`
+        };
       }
       const result = await client.sendMessage({
         chatId: to,
         text: text || void 0
       });
+      if (!result.success) {
+        throw new Error(result.error ?? "Send failed");
+      }
       return {
         channel: "wechat",
-        ok: result.success,
-        error: result.error ?? void 0
+        messageId: `wechat:${to}:${Date.now()}`
       };
     }
   },
@@ -6868,7 +6870,8 @@ var wechatPlugin = {
         cfg: ctx.cfg
       });
     },
-    loginWithQrStart: async ({ cfg, accountId, force, timeoutMs }) => {
+    loginWithQrStart: async ({ accountId, force, timeoutMs }) => {
+      const cfg = getWeChatRuntime().config.loadConfig();
       const account = resolveWeChatAccount(
         cfg,
         accountId ?? void 0
@@ -6878,7 +6881,7 @@ var wechatPlugin = {
       }
       const client = new WeChatClient({ baseUrl: account.serverUrl, token: account.token });
       try {
-        const result = await loginStart(client, accountId, { timeoutMs, force });
+        const result = await loginStart(client, accountId ?? DEFAULT_ACCOUNT_ID2, { timeoutMs, force });
         return result;
       } catch (err) {
         return {
@@ -6886,7 +6889,8 @@ var wechatPlugin = {
         };
       }
     },
-    logoutAccount: async ({ cfg, accountId }) => {
+    logoutAccount: async ({ accountId }) => {
+      const cfg = getWeChatRuntime().config.loadConfig();
       const account = resolveWeChatAccount(
         cfg,
         accountId ?? void 0
@@ -6901,7 +6905,7 @@ var wechatPlugin = {
       }
     },
     loginWithQrWait: async ({ accountId, timeoutMs }) => {
-      const result = await loginWait(accountId, { timeoutMs });
+      const result = await loginWait(accountId ?? DEFAULT_ACCOUNT_ID2, { timeoutMs });
       return result;
     }
   },
@@ -6985,11 +6989,11 @@ Error: ${event.message}`);
     collectStatusIssues: collectWeChatStatusIssues
   },
   // ---- Agent tools adapter ----
-  agentTools: ({ cfg }) => {
+  agentTools: (({ cfg }) => {
     const account = resolveWeChatAccount(cfg);
     if (!account?.serverUrl) return [];
     return [createWeChatLoginTool(account)];
-  },
+  }),
   // ---- Directory adapter ----
   directory: {
     self: async ({ cfg }) => {

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "@agent-wechat/wechat",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "type": "module",
   "files": [
     "dist",
     "openclaw.plugin.json"
   ],
   "devDependencies": {
+    "@types/node": "^22",
     "esbuild": "^0.25.0",
+    "openclaw": "^2026.2.22",
+    "typescript": "^5.4.5",
     "@agent-wechat/shared": "0.1.0"
   },
   "openclaw": {
@@ -37,6 +40,7 @@
     "directory": "packages/openclaw-extension"
   },
   "scripts": {
-    "build": "esbuild index.ts --bundle --format=esm --platform=node --outfile=dist/index.js --external:openclaw"
+    "build": "esbuild index.ts --bundle --format=esm --platform=node --outfile=dist/index.js --external:openclaw",
+    "typecheck": "tsc --noEmit"
   }
 }