omp-wechat 1.7.0 → 1.9.0

package/dist/index.js

@@ -30,6 +30,7 @@ var __toESM = (mod, isNodeMode, target) => {
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __require = import.meta.require;
 
 // node_modules/qrcode-terminal/vendor/QRCode/QRMode.js
 var require_QRMode = __commonJS((exports, module) => {
@@ -1188,6 +1189,11 @@ var logger = {
 var STATE_DIR = join3(homedir2(), ".omp-wechat");
 var CREDENTIALS_FILE = join3(STATE_DIR, "credentials.json");
 var SYNC_BUF_FILE = join3(STATE_DIR, "sync_buf.txt");
+var CHANNEL_VERSION = "2.2.0";
+var BOT_AGENT = "OMP-Wechat/1.7.0";
+function baseInfo() {
+  return { channel_version: CHANNEL_VERSION, bot_agent: BOT_AGENT };
+}
 function loadCredentials() {
   try {
     return JSON.parse(readFileSync(CREDENTIALS_FILE, "utf8"));
@@ -1241,7 +1247,15 @@ async function apiFetch(creds, endpoint, body, timeoutMs = 15000) {
     const text = await res.text();
     if (!res.ok)
       throw new Error(`${endpoint} ${res.status}: ${text}`);
-    return JSON.parse(text);
+    const data = JSON.parse(text);
+    const ret = typeof data.ret === "number" ? data.ret : undefined;
+    const errcode = typeof data.errcode === "number" ? data.errcode : undefined;
+    if (ret !== undefined && ret !== 0 || errcode !== undefined && errcode !== 0) {
+      const code = errcode ?? ret ?? 0;
+      const errmsg = typeof data.errmsg === "string" ? data.errmsg : "";
+      throw new Error(`${endpoint} error ret=${ret} errcode=${errcode}${errmsg ? `: ${errmsg}` : ""} (code ${code})`);
+    }
+    return data;
   } catch (err) {
     clearTimeout(timer);
     throw err;
@@ -1251,7 +1265,7 @@ async function getUpdates(creds, buf) {
   try {
     const resp = await apiFetch(creds, "ilink/bot/getupdates", {
       get_updates_buf: buf,
-      base_info: { channel_version: "0.1.0" }
+      base_info: baseInfo()
     }, 35000);
     return resp;
   } catch (err) {
@@ -1272,7 +1286,7 @@ async function sendMessage(creds, to, text, contextToken, clientId) {
       item_list: [{ type: 1, text_item: { text } }],
       context_token: contextToken
     },
-    base_info: { channel_version: "0.1.0" }
+    base_info: baseInfo()
   }, 15000);
 }
 var typingTicketCache = new Map;
@@ -1284,7 +1298,7 @@ async function ensureTypingTicket(creds, userId) {
   try {
     const resp = await apiFetch(creds, "ilink/bot/getconfig", {
       ilink_user_id: userId,
-      base_info: { channel_version: "2.0.1" }
+      base_info: baseInfo()
     }, 15000);
     const data = resp;
     if (data.typing_ticket) {
@@ -1306,10 +1320,9 @@ async function sendTyping(creds, userId, command) {
   try {
     await apiFetch(creds, "ilink/bot/sendtyping", {
       ilink_user_id: userId,
-      to_user_id: userId,
       typing_ticket: ticket,
-      command,
-      base_info: { channel_version: "2.0.1" }
+      status: command,
+      base_info: baseInfo()
     }, 1e4);
   } catch (err) {
     logger.debug(`sendTyping failed for ${userId}: ${err}`);
@@ -1491,6 +1504,64 @@ function listAllowed() {
   return loadAccess().allowFrom;
 }
 
+// src/utils/runtime-compat.ts
+import { spawnSync as nodeSpawnSync } from "child_process";
+import { createServer as createNetServer } from "net";
+function isBun() {
+  return typeof globalThis.Bun !== "undefined" && typeof globalThis.Bun.sleep === "function";
+}
+function sleep(ms) {
+  if (isBun()) {
+    return globalThis.Bun.sleep(ms);
+  }
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function spawnSync(cmd, opts = {}) {
+  if (isBun()) {
+    const res2 = globalThis.Bun.spawnSync(cmd, opts);
+    return {
+      exitCode: res2.exitCode,
+      stdout: Buffer.isBuffer(res2.stdout) ? res2.stdout : Buffer.from(res2.stdout ?? []),
+      stderr: Buffer.isBuffer(res2.stderr) ? res2.stderr : Buffer.from(res2.stderr ?? [])
+    };
+  }
+  const [command, ...args] = cmd;
+  const res = nodeSpawnSync(command, args, {
+    cwd: opts.cwd,
+    stdio: ["pipe", opts.stdout ?? "pipe", opts.stderr ?? "pipe"]
+  });
+  return {
+    exitCode: res.status ?? (res.error || res.signal ? 1 : 0),
+    stdout: res.stdout ?? Buffer.alloc(0),
+    stderr: res.stderr ?? Buffer.alloc(0)
+  };
+}
+function listenPort(port) {
+  if (isBun()) {
+    const server2 = globalThis.Bun.serve({
+      port,
+      hostname: "127.0.0.1",
+      fetch() {
+        return new Response("ok");
+      }
+    });
+    return Promise.resolve({ stop: () => server2.stop(true) });
+  }
+  const { promise, resolve, reject } = Promise.withResolvers();
+  const server = createNetServer((socket) => {
+    socket.end("ok");
+  });
+  server.once("error", (err) => {
+    reject(err);
+  });
+  server.listen(port, "127.0.0.1", () => {
+    resolve({
+      stop: () => server.close()
+    });
+  });
+  return promise;
+}
+
 // src/ilink/login.ts
 var import_qrcode_terminal = __toESM(require_main(), 1);
 var DEFAULT_BASE_URL = "https://ilinkai.weixin.qq.com/";
@@ -1511,13 +1582,9 @@ async function login() {
   }
   try {
     import_qrcode_terminal.default.generate(qrUrl, { small: true });
-  } catch {
-    logger.info("Installing qrcode-terminal...");
-    Bun.spawnSync(["bun", "install", "qrcode-terminal"], {
-      cwd: process.cwd(),
-      stderr: "inherit"
-    });
-    import_qrcode_terminal.default.generate(qrUrl, { small: true });
+  } catch (err) {
+    logger.error("qrcode-terminal failed to render QR code:", err);
+    throw new Error("Could not render QR code. Please confirm the plugin's dependencies are installed (qrcode-terminal).");
   }
   process.stderr.write(`
 Scan the QR code above with WeChat, or open this link:
@@ -1560,7 +1627,7 @@ Scan the QR code above with WeChat, or open this link:
         return;
       }
     }
-    await Bun.sleep(POLL_INTERVAL_MS);
+    await sleep(POLL_INTERVAL_MS);
   }
   throw new Error("Login timeout, please run login again");
 }
@@ -1873,7 +1940,7 @@ async function uploadAndSendFile(creds, to, contextToken, filePath, maxSizeBytes
       filesize: ciphertext.length,
       no_need_thumb: true,
       aeskey: aesKey.toString("hex"),
-      base_info: { channel_version: "0.1.0" }
+      base_info: baseInfo()
     }, 15000);
     const uploadFullUrl = uploadParams.upload_full_url?.trim();
     if (!uploadFullUrl && !uploadParams.upload_param) {
@@ -1908,7 +1975,7 @@ async function uploadAndSendFile(creds, to, contextToken, filePath, maxSizeBytes
         lastError = err;
         if (attempt < UPLOAD_MAX_RETRIES) {
           logger.warn(`CDN upload attempt ${attempt}/${UPLOAD_MAX_RETRIES} failed, retrying:`, err);
-          await Bun.sleep(1000 * attempt);
+          await sleep(1000 * attempt);
         }
       }
     }
@@ -1920,7 +1987,7 @@ async function uploadAndSendFile(creds, to, contextToken, filePath, maxSizeBytes
     }
     const media = {
       encrypt_query_param: encryptQueryParam,
-      aes_key: aesKey.toString("base64"),
+      aes_key: Buffer.from(aesKey.toString("hex"), "utf8").toString("base64"),
       encrypt_type: 1
     };
     const item = mediaType === 1 /* IMAGE */ ? {
@@ -1931,7 +1998,6 @@ async function uploadAndSendFile(creds, to, contextToken, filePath, maxSizeBytes
       file_item: {
         media,
         file_name: fileName,
-        md5: rawMd5,
         len: String(data.length)
       }
     };
@@ -1948,7 +2014,7 @@ async function uploadAndSendFile(creds, to, contextToken, filePath, maxSizeBytes
             item_list: [item],
             context_token: contextToken
           },
-          base_info: { channel_version: "0.1.0" }
+          base_info: baseInfo()
         }, 15000);
         logger.info(`Sent ${mediaType === 1 /* IMAGE */ ? "image" : "file"} to ${to}: ${fileName} (${data.length} bytes)`);
         return { status: "sent", mediaType, bytes: data.length };
@@ -1956,7 +2022,7 @@ async function uploadAndSendFile(creds, to, contextToken, filePath, maxSizeBytes
         lastSendError = err;
         if (attempt < SEND_MAX_RETRIES) {
           logger.warn(`Send retry ${attempt + 1}/${SEND_MAX_RETRIES}:`, err);
-          await Bun.sleep(1000 * (attempt + 1));
+          await sleep(1000 * (attempt + 1));
         }
       }
     }
@@ -1997,9 +2063,6 @@ function stripMarkdown(text) {
   return result.trim();
 }
 
-// src/engine/session.ts
-import { createAgentSession, SessionManager } from "@oh-my-pi/pi-coding-agent";
-
 // src/engine/session-store.ts
 import { join as join7 } from "path";
 import { homedir as homedir6 } from "os";
@@ -2137,6 +2200,17 @@ function clearAllSessions() {
 // src/engine/session.ts
 import { mkdirSync as mkdirSync6, readdirSync as readdirSync3, statSync as statSync4 } from "fs";
 import { join as join8 } from "path";
+var sdkPromise = null;
+function loadSdk() {
+  sdkPromise ??= (async () => {
+    try {
+      return await import("@oh-my-pi/pi-coding-agent");
+    } catch {
+      return await import("@earendil-works/pi-coding-agent");
+    }
+  })();
+  return sdkPromise;
+}
 function outboxInstructions(outboxDir) {
   return `## File delivery to WeChat
 
@@ -2195,9 +2269,10 @@ class ChatSession {
     }
     ensureSessionsDir();
     const sessionDir = sessionDirFor(chatId);
-    const sessionManager = await SessionManager.continueRecent(config.cwd || process.cwd(), sessionDir);
+    const sdk = await loadSdk();
+    const sessionManager = await sdk.SessionManager.continueRecent(config.cwd || process.cwd(), sessionDir);
     logger.info(`Session dir: ${sessionDir} (resumed=${sessionManager.getSessionFile() !== null})`);
-    const { session, modelFallbackMessage } = await createAgentSession({
+    const { session, modelFallbackMessage } = await sdk.createAgentSession({
       sessionManager,
       enableMCP: false,
       enableLsp: false,
@@ -2589,7 +2664,7 @@ class WeChatBridge {
     this.commands.register(new ModelCommand);
     this.commands.register(new NewSessionCommand);
   }
-  start() {
+  async start() {
     const config = loadConfig();
     let creds;
     try {
@@ -2600,7 +2675,7 @@ class WeChatBridge {
     if (this.pollActive) {
       return this.state;
     }
-    if (!this.acquireLock()) {
+    if (!await this.acquireLock()) {
       logger.debug("Another poll loop is running (port lock held), skipping");
       return { running: false, config, creds, lastError: "another instance running" };
     }
@@ -2653,15 +2728,9 @@ class WeChatBridge {
   getPoolStatus() {
     return this.pool?.getPoolStatus() ?? { count: 0, max: 0, chats: [] };
   }
-  acquireLock() {
+  async acquireLock() {
     try {
-      this.lockServer = Bun.serve({
-        port: LOCK_PORT,
-        hostname: "127.0.0.1",
-        fetch() {
-          return new Response("ok");
-        }
-      });
+      this.lockServer = await listenPort(LOCK_PORT);
       return true;
     } catch {
       return false;
@@ -2669,7 +2738,7 @@ class WeChatBridge {
   }
   releaseLock() {
     if (this.lockServer) {
-      this.lockServer.stop(true);
+      this.lockServer.stop();
       this.lockServer = null;
     }
   }
@@ -2685,9 +2754,9 @@ class WeChatBridge {
           logger.warn(`getupdates error ret=${resp.ret} errmsg=${resp.errmsg ?? ""} (${failures}/${MAX_FAILURES})`);
           if (failures >= MAX_FAILURES) {
             failures = 0;
-            await Bun.sleep(BACKOFF_MS);
+            await sleep(BACKOFF_MS);
           } else {
-            await Bun.sleep(RETRY_MS);
+            await sleep(RETRY_MS);
           }
           continue;
         }
@@ -2708,9 +2777,9 @@ class WeChatBridge {
         logger.error(`Poll error (${failures}/${MAX_FAILURES}):`, err);
         if (failures >= MAX_FAILURES) {
           failures = 0;
-          await Bun.sleep(BACKOFF_MS);
+          await sleep(BACKOFF_MS);
         } else {
-          await Bun.sleep(RETRY_MS);
+          await sleep(RETRY_MS);
         }
       }
     }
@@ -2879,7 +2948,7 @@ ${truncated}
             return;
           }
           logger.warn(`[${chatId}] Send retry ${retries}/${MAX_SEND_RETRIES}:`, err);
-          await Bun.sleep(1000 * retries);
+          await sleep(1000 * retries);
         }
       }
     }
@@ -2958,21 +3027,21 @@ function installLaunchd() {
   mkdirSync7(getLogDir(), { recursive: true });
   const plist = plistPath();
   if (existsSync3(plist)) {
-    Bun.spawnSync(["launchctl", "unload", plist], { stderr: "ignore" });
+    spawnSync(["launchctl", "unload", plist], { stderr: "ignore" });
   }
   writeFileSync4(plist, generatePlist());
-  const result = Bun.spawnSync(["launchctl", "load", plist], { stderr: "inherit" });
+  const result = spawnSync(["launchctl", "load", plist], { stderr: "inherit" });
   if (result.exitCode !== 0) {
     throw new Error("launchctl load failed");
   }
-  Bun.spawnSync(["launchctl", "start", PLIST_LABEL], { stderr: "inherit" });
+  spawnSync(["launchctl", "start", PLIST_LABEL], { stderr: "inherit" });
 }
 function uninstallLaunchd() {
   const plist = plistPath();
   if (!existsSync3(plist)) {
     throw new Error("No launchd service found (may not be installed)");
   }
-  Bun.spawnSync(["launchctl", "unload", plist], { stderr: "inherit" });
+  spawnSync(["launchctl", "unload", plist], { stderr: "inherit" });
   rmSync3(plist);
 }
 function servicePath() {
@@ -3015,20 +3084,20 @@ function installSystemd() {
   const svc = servicePath();
   mkdirSync7(getLogDir(), { recursive: true });
   if (existsSync3(svc)) {
-    Bun.spawnSync(["sudo", "systemctl", "stop", SERVICE_NAME], { stderr: "inherit" });
+    spawnSync(["sudo", "systemctl", "stop", SERVICE_NAME], { stderr: "inherit" });
   }
   const tmp = `/tmp/${SERVICE_NAME}.service`;
   writeFileSync4(tmp, generateService());
-  let result = Bun.spawnSync(["sudo", "te", tmp, svc], { stderr: "inherit" });
+  let result = spawnSync(["sudo", "te", tmp, svc], { stderr: "inherit" });
   if (result.exitCode !== 0) {
-    result = Bun.spawnSync(["sudo", "cp", tmp, svc], { stderr: "inherit" });
+    result = spawnSync(["sudo", "cp", tmp, svc], { stderr: "inherit" });
   }
   rmSync3(tmp);
   if (result.exitCode !== 0) {
     throw new Error("Failed to write service file (need sudo)");
   }
-  Bun.spawnSync(["sudo", "systemctl", "daemon-reload"], { stderr: "inherit" });
-  result = Bun.spawnSync(["sudo", "systemctl", "enable", "--now", SERVICE_NAME], { stderr: "inherit" });
+  spawnSync(["sudo", "systemctl", "daemon-reload"], { stderr: "inherit" });
+  result = spawnSync(["sudo", "systemctl", "enable", "--now", SERVICE_NAME], { stderr: "inherit" });
   if (result.exitCode !== 0) {
     throw new Error("systemctl enable failed");
   }
@@ -3038,10 +3107,10 @@ function uninstallSystemd() {
   if (!existsSync3(svc)) {
     throw new Error("No systemd service found (may not be installed)");
   }
-  Bun.spawnSync(["sudo", "systemctl", "stop", SERVICE_NAME], { stderr: "inherit" });
-  Bun.spawnSync(["sudo", "systemctl", "disable", SERVICE_NAME], { stderr: "inherit" });
-  Bun.spawnSync(["sudo", "rm", svc], { stderr: "inherit" });
-  Bun.spawnSync(["sudo", "systemctl", "daemon-reload"], { stderr: "inherit" });
+  spawnSync(["sudo", "systemctl", "stop", SERVICE_NAME], { stderr: "inherit" });
+  spawnSync(["sudo", "systemctl", "disable", SERVICE_NAME], { stderr: "inherit" });
+  spawnSync(["sudo", "rm", svc], { stderr: "inherit" });
+  spawnSync(["sudo", "systemctl", "daemon-reload"], { stderr: "inherit" });
 }
 var WIN_TASK_NAME = "OMP-Wechat";
 function winScriptPath() {
@@ -3091,22 +3160,22 @@ function installWinTask() {
   mkdirSync7(join9(homedir7(), ".omp-wechat"), { recursive: true });
   mkdirSync7(getLogDir(), { recursive: true });
   writeFileSync4(winScriptPath(), generateWinScript());
-  Bun.spawnSync(["schtasks", "/end", "/tn", WIN_TASK_NAME], { stderr: "ignore" });
-  Bun.spawnSync(["schtasks", "/delete", "/tn", WIN_TASK_NAME, "/f"], { stderr: "ignore" });
+  spawnSync(["schtasks", "/end", "/tn", WIN_TASK_NAME], { stderr: "ignore" });
+  spawnSync(["schtasks", "/delete", "/tn", WIN_TASK_NAME, "/f"], { stderr: "ignore" });
   const scriptPath = winScriptPath();
   const taskCmd = `powershell.exe -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File "${scriptPath}"`;
-  const result = Bun.spawnSync(["schtasks", "/create", "/tn", WIN_TASK_NAME, "/tr", taskCmd, "/sc", "onlogon", "/rl", "limited", "/f"], { stderr: "inherit" });
+  const result = spawnSync(["schtasks", "/create", "/tn", WIN_TASK_NAME, "/tr", taskCmd, "/sc", "onlogon", "/rl", "limited", "/f"], { stderr: "inherit" });
   if (result.exitCode !== 0) {
     throw new Error("schtasks /create failed");
   }
-  const runResult = Bun.spawnSync(["schtasks", "/run", "/tn", WIN_TASK_NAME], { stderr: "inherit" });
+  const runResult = spawnSync(["schtasks", "/run", "/tn", WIN_TASK_NAME], { stderr: "inherit" });
   if (runResult.exitCode !== 0) {
     logger.warn(`schtasks /run failed (exit ${runResult.exitCode}) \u2014 task will start at next logon`);
   }
 }
 function uninstallWinTask() {
-  Bun.spawnSync(["schtasks", "/end", "/tn", WIN_TASK_NAME], { stderr: "ignore" });
-  const result = Bun.spawnSync(["schtasks", "/delete", "/tn", WIN_TASK_NAME, "/f"], { stderr: "inherit" });
+  spawnSync(["schtasks", "/end", "/tn", WIN_TASK_NAME], { stderr: "ignore" });
+  const result = spawnSync(["schtasks", "/delete", "/tn", WIN_TASK_NAME, "/f"], { stderr: "inherit" });
   if (result.exitCode !== 0) {
     throw new Error("Failed to delete scheduled task (may not be installed)");
   }
@@ -3116,7 +3185,7 @@ function uninstallWinTask() {
   }
 }
 function winTaskExists() {
-  const r = Bun.spawnSync(["schtasks", "/query", "/tn", WIN_TASK_NAME, "/fo", "list"], {
+  const r = spawnSync(["schtasks", "/query", "/tn", WIN_TASK_NAME, "/fo", "list"], {
     stdout: "ignore",
     stderr: "ignore"
   });
@@ -3171,20 +3240,25 @@ function isServiceInstalled() {
 // src/index.ts
 var bridge = null;
 var daemonState = null;
-function wechatExtension(pi) {
+async function wechatExtension(pi) {
   if (pi.pi && typeof pi.setLabel === "function") {
     pi.setLabel("OMP-Wechat Bridge");
   }
   bridge = new WeChatBridge;
-  daemonState = bridge.start();
+  daemonState = await bridge.start();
   if (daemonState.running) {
     logger.info("WeChat bridge started at extension load");
   } else {
     logger.debug("WeChat bridge not running, starting 30s retry", { lastError: daemonState.lastError });
-    setInterval(() => {
+    setInterval(async () => {
       if (daemonState?.running)
         return;
-      daemonState = bridge.start();
+      try {
+        daemonState = await bridge.start();
+      } catch (err) {
+        logger.error("WeChat bridge restart failed:", err);
+        return;
+      }
       if (daemonState.running) {
         logger.info("WeChat bridge: took over from failed instance");
       }
@@ -3192,7 +3266,12 @@ function wechatExtension(pi) {
   }
   pi.on("session_start", async (_event, ctx) => {
     if (bridge && !daemonState?.running) {
-      daemonState = bridge.start();
+      try {
+        daemonState = await bridge.start();
+      } catch (err) {
+        logger.error("WeChat bridge start failed:", err);
+        return;
+      }
       if (daemonState.running) {
         ctx.ui.notify("WeChat bridge started", "info");
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omp-wechat",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "OMP/Pi extension: bridge WeChat messages to OMP's AI engine via the iLink Bot API",
   "type": "module",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
     "README.md"
   ],
   "scripts": {
-    "build": "bun build src/index.ts --outdir dist --target bun --external omp-legacy-pi-modules --external '@oh-my-pi/*'",
+    "build": "bun build src/index.ts --outdir dist --target bun --external omp-legacy-pi-modules --external '@oh-my-pi/*' --external '@earendil-works/*'",
     "typecheck": "tsc --noEmit"
   },
   "omp": {