cli-wechat-bridge 1.1.7 → 1.1.8

package/dist/wechat/wechat-transport.js

@@ -332,6 +332,15 @@ async function apiFetch(params) {
     const url = new URL(params.endpoint, base).toString();
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), params.timeoutMs);
+    const abortFromCaller = () => controller.abort(params.signal?.reason);
+    if (params.signal) {
+        if (params.signal.aborted) {
+            abortFromCaller();
+        }
+        else {
+            params.signal.addEventListener("abort", abortFromCaller, { once: true });
+        }
+    }
     try {
         const res = await fetch(url, {
             method: "POST",
@@ -353,6 +362,9 @@ async function apiFetch(params) {
         clearTimeout(timer);
         throw err;
     }
+    finally {
+        params.signal?.removeEventListener("abort", abortFromCaller);
+    }
 }
 function encryptAesEcb(plaintext, key) {
     const cipher = createCipheriv("aes-128-ecb", key, null);
@@ -812,6 +824,8 @@ export class WeChatTransport {
     recentMessageOrder = [];
     contextTokenCache;
     syncBuffer = "";
+    stopped = false;
+    activePollControllers = new Set();
     constructor(logger) {
         this.logger = logger;
         migrateLegacyChannelFiles((message) => this.logger.log(message));
@@ -855,73 +869,96 @@ export class WeChatTransport {
             ? "Reset sync state and cleared cached context tokens."
             : "Reset sync state.";
     }
+    stop() {
+        if (this.stopped) {
+            return;
+        }
+        this.stopped = true;
+        for (const controller of this.activePollControllers) {
+            controller.abort();
+        }
+        this.activePollControllers.clear();
+    }
     async pollMessages(options = {}) {
+        if (this.stopped) {
+            return { messages: [], ignoredBacklogCount: 0 };
+        }
         const timeoutMs = options.timeoutMs ?? DEFAULT_LONG_POLL_TIMEOUT_MS;
         const account = this.requireAccount();
-        let response = await this.getUpdates(account, timeoutMs);
-        if (isWechatSyncSessionTimeout(response) && this.syncBuffer) {
-            this.logger.log("WeChat sync session timed out. Clearing local sync cursor and retrying once.");
-            this.clearSyncBuffer();
-            response = await this.getUpdates(account, timeoutMs);
-        }
-        if (isWechatSyncSessionTimeout(response)) {
-            throw new Error('WeChat session timed out. Run "wechat-setup" to log in again.');
-        }
-        const isError = (response.ret !== undefined && response.ret !== 0) ||
-            (response.errcode !== undefined && response.errcode !== 0);
-        if (isError) {
-            throw new Error(`getUpdates failed: ret=${response.ret} errcode=${response.errcode} errmsg=${response.errmsg ?? ""}`);
-        }
-        if (response.get_updates_buf) {
-            this.syncBuffer = response.get_updates_buf;
-            this.saveSyncBuffer(this.syncBuffer);
-        }
-        const messages = [];
-        let ignoredBacklogCount = 0;
-        for (const rawMessage of response.msgs ?? []) {
-            if (rawMessage.message_type !== MSG_TYPE_USER) {
-                continue;
+        const controller = new AbortController();
+        this.activePollControllers.add(controller);
+        try {
+            let response = await this.getUpdates(account, timeoutMs, controller.signal);
+            if (isWechatSyncSessionTimeout(response) && this.syncBuffer && !this.stopped) {
+                this.logger.log("WeChat sync session timed out. Clearing local sync cursor and retrying once.");
+                this.clearSyncBuffer();
+                response = await this.getUpdates(account, timeoutMs, controller.signal);
             }
-            const extracted = extractInboundMessageContent(rawMessage);
-            if (!extracted.text && extracted.attachments.length === 0) {
-                continue;
+            if (this.stopped) {
+                return { messages: [], ignoredBacklogCount: 0 };
             }
-            const senderId = rawMessage.from_user_id ?? "unknown";
-            if (rawMessage.context_token) {
-                this.cacheContextToken(senderId, rawMessage.context_token);
+            if (isWechatSyncSessionTimeout(response)) {
+                throw new Error('WeChat session timed out. Run "wechat-setup" to log in again.');
             }
-            // Filter pre-start backlog BEFORE claiming/remembering the message so a
-            // skipped message is not permanently locked away from other processes.
-            // A missing create_time_ms is treated as fresh rather than dropped.
-            const createdAtMs = rawMessage.create_time_ms ?? 0;
-            if (typeof options.minCreatedAtMs === "number" &&
-                Number.isFinite(createdAtMs) &&
-                createdAtMs > 0 &&
-                createdAtMs < options.minCreatedAtMs) {
-                ignoredBacklogCount += 1;
-                continue;
+            const isError = (response.ret !== undefined && response.ret !== 0) ||
+                (response.errcode !== undefined && response.errcode !== 0);
+            if (isError) {
+                throw new Error(`getUpdates failed: ret=${response.ret} errcode=${response.errcode} errmsg=${response.errmsg ?? ""}`);
             }
-            const messageKey = buildMessageKey(rawMessage);
-            if (!this.rememberMessage(messageKey)) {
-                continue;
+            if (response.get_updates_buf) {
+                this.syncBuffer = response.get_updates_buf;
+                this.saveSyncBuffer(this.syncBuffer);
             }
-            if (!tryClaimInboundMessage(buildScopedMessageClaimKey(account.accountId, messageKey))) {
-                continue;
+            const messages = [];
+            let ignoredBacklogCount = 0;
+            for (const rawMessage of response.msgs ?? []) {
+                if (rawMessage.message_type !== MSG_TYPE_USER) {
+                    continue;
+                }
+                const extracted = extractInboundMessageContent(rawMessage);
+                if (!extracted.text && extracted.attachments.length === 0) {
+                    continue;
+                }
+                const senderId = rawMessage.from_user_id ?? "unknown";
+                if (rawMessage.context_token) {
+                    this.cacheContextToken(senderId, rawMessage.context_token);
+                }
+                // Filter pre-start backlog BEFORE claiming/remembering the message so a
+                // skipped message is not permanently locked away from other processes.
+                // A missing create_time_ms is treated as fresh rather than dropped.
+                const createdAtMs = rawMessage.create_time_ms ?? 0;
+                if (typeof options.minCreatedAtMs === "number" &&
+                    Number.isFinite(createdAtMs) &&
+                    createdAtMs > 0 &&
+                    createdAtMs < options.minCreatedAtMs) {
+                    ignoredBacklogCount += 1;
+                    continue;
+                }
+                const messageKey = buildMessageKey(rawMessage);
+                if (!this.rememberMessage(messageKey)) {
+                    continue;
+                }
+                if (!tryClaimInboundMessage(buildScopedMessageClaimKey(account.accountId, messageKey))) {
+                    continue;
+                }
+                const { attachments, failureLines } = await this.downloadInboundAttachments(extracted.attachments, rawMessage);
+                const text = appendInboundAttachmentFailureText(extracted.text, failureLines);
+                messages.push({
+                    senderId,
+                    sender: normalizeSender(senderId),
+                    sessionId: rawMessage.session_id ?? "",
+                    text,
+                    attachments,
+                    contextToken: rawMessage.context_token,
+                    createdAt: formatTimestamp(rawMessage.create_time_ms),
+                    createdAtMs,
+                });
             }
-            const { attachments, failureLines } = await this.downloadInboundAttachments(extracted.attachments, rawMessage);
-            const text = appendInboundAttachmentFailureText(extracted.text, failureLines);
-            messages.push({
-                senderId,
-                sender: normalizeSender(senderId),
-                sessionId: rawMessage.session_id ?? "",
-                text,
-                attachments,
-                contextToken: rawMessage.context_token,
-                createdAt: formatTimestamp(rawMessage.create_time_ms),
-                createdAtMs,
-            });
+            return { messages, ignoredBacklogCount };
+        }
+        finally {
+            this.activePollControllers.delete(controller);
         }
-        return { messages, ignoredBacklogCount };
     }
     async downloadInboundAttachments(descriptors, rawMessage) {
         const attachments = [];
@@ -1166,7 +1203,7 @@ export class WeChatTransport {
         }
         return stat;
     }
-    async getUpdates(account, timeoutMs) {
+    async getUpdates(account, timeoutMs, signal) {
         try {
             const raw = await apiFetch({
                 baseUrl: account.baseUrl,
@@ -1177,6 +1214,7 @@ export class WeChatTransport {
                 }),
                 token: account.token,
                 timeoutMs,
+                signal,
             });
             return JSON.parse(raw);
         }

package/package.json

@@ -1,46 +1,46 @@
-{
-  "name": "cli-wechat-bridge",
-  "version": "1.1.7",
+{
+  "name": "cli-wechat-bridge",
+  "version": "1.1.8",
   "description": "CLI bridge for Codex, Claude Code, OpenCode, and Pi over WeChat and WeCom",
-  "type": "module",
-  "files": [
-    "bin/",
-    "dist/",
-    "scripts/ensure-node-pty-permissions.mjs",
-    "README.md",
-    "LICENSE.txt"
-  ],
-  "keywords": [
+  "type": "module",
+  "files": [
+    "bin/",
+    "dist/",
+    "scripts/ensure-node-pty-permissions.mjs",
+    "README.md",
+    "LICENSE.txt"
+  ],
+  "keywords": [
     "wechat",
     "wecom",
-    "cli",
-    "bridge",
-    "codex",
-    "claude",
-    "opencode",
-    "pi",
-    "terminal"
-  ],
-  "author": "UNLINEARITY",
-  "license": "AGPL-3.0-or-later",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/UNLINEARITY/CLI-WeChat-Bridge.git"
-  },
-  "bugs": {
-    "url": "https://github.com/UNLINEARITY/CLI-WeChat-Bridge/issues"
-  },
-  "homepage": "https://github.com/UNLINEARITY/CLI-WeChat-Bridge#readme",
-  "publishConfig": {
-    "access": "public"
-  },
-  "bin": {
-    "wechat-codex": "bin/wechat-codex.mjs",
-    "wechat-claude": "bin/wechat-claude.mjs",
-    "wechat-opencode": "bin/wechat-opencode.mjs",
-    "wechat-pi": "bin/wechat-pi.mjs",
-    "wechat-daemon": "bin/wechat-daemon.mjs",
-    "wechat-setup": "bin/wechat-setup.mjs",
+    "cli",
+    "bridge",
+    "codex",
+    "claude",
+    "opencode",
+    "pi",
+    "terminal"
+  ],
+  "author": "UNLINEARITY",
+  "license": "AGPL-3.0-or-later",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/UNLINEARITY/CLI-WeChat-Bridge.git"
+  },
+  "bugs": {
+    "url": "https://github.com/UNLINEARITY/CLI-WeChat-Bridge/issues"
+  },
+  "homepage": "https://github.com/UNLINEARITY/CLI-WeChat-Bridge#readme",
+  "publishConfig": {
+    "access": "public"
+  },
+  "bin": {
+    "wechat-codex": "bin/wechat-codex.mjs",
+    "wechat-claude": "bin/wechat-claude.mjs",
+    "wechat-opencode": "bin/wechat-opencode.mjs",
+    "wechat-pi": "bin/wechat-pi.mjs",
+    "wechat-daemon": "bin/wechat-daemon.mjs",
+    "wechat-setup": "bin/wechat-setup.mjs",
     "wechat-check-update": "bin/wechat-check-update.mjs",
     "wecom-codex": "bin/wecom-codex.mjs",
     "wecom-claude": "bin/wecom-claude.mjs",
@@ -49,71 +49,73 @@
     "wecom-daemon": "bin/wecom-daemon.mjs",
     "wecom-setup": "bin/wecom-setup.mjs",
     "wecom-check-update": "bin/wecom-check-update.mjs"
-  },
-  "scripts": {
-    "postinstall": "node scripts/ensure-node-pty-permissions.mjs",
-    "clean": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\"",
-    "build": "npm run clean && tsc -p tsconfig.build.json",
-    "prepack": "npm run build",
-    "lint": "eslint bin src test",
-    "lint:fix": "eslint bin src test --fix",
-    "typecheck:src": "tsc -p tsconfig.typecheck.src.json --noEmit --pretty false",
-    "quality": "npm run lint && npm run typecheck:src && bun test test && npm run build",
-    "smoke:global": "node scripts/smoke-global-install.mjs",
-    "publish:dual": "node scripts/publish-dual.mjs",
-    "setup": "node --no-warnings --experimental-strip-types src/wechat/setup.ts",
-    "start": "node --no-warnings --experimental-strip-types src/wechat/wechat-channel.ts",
-    "check": "node --no-warnings --experimental-strip-types src/wechat/wechat-channel.ts --check",
-    "bridge": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts",
-    "daemon": "node --no-warnings --experimental-strip-types src/daemon/wechat-daemon.ts",
-    "bridge:codex": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts --adapter codex",
-    "codex:panel": "node --no-warnings --experimental-strip-types src/companion/codex-remote-client.ts",
-    "codex:start": "node --no-warnings --experimental-strip-types src/companion/local-companion-start.ts",
-    "claude:start": "node --no-warnings --experimental-strip-types src/companion/local-companion-start.ts --adapter claude",
-    "claude:companion": "node --no-warnings --experimental-strip-types src/companion/local-companion.ts --adapter claude",
-    "bridge:claude": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts --adapter claude",
-    "bridge:opencode": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts --adapter opencode",
-    "opencode:panel": "node --no-warnings --experimental-strip-types src/companion/local-companion.ts --adapter opencode",
-    "opencode:start": "node --no-warnings --experimental-strip-types src/companion/local-companion-start.ts --adapter opencode",
-    "bridge:pi": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts --adapter pi",
-    "pi:companion": "node --no-warnings --experimental-strip-types src/companion/local-companion.ts --adapter pi",
-    "pi:start": "node --no-warnings --experimental-strip-types src/companion/local-companion-start.ts --adapter pi",
-    "bridge:bun": "bun src/bridge/wechat-bridge.ts",
-    "test": "bun test test",
-    "test:bridge": "bun test test/bridge",
-    "test:companion": "bun test test/companion",
+  },
+  "scripts": {
+    "postinstall": "node scripts/ensure-node-pty-permissions.mjs",
+    "clean": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\"",
+    "build": "npm run clean && tsc -p tsconfig.build.json",
+    "prepack": "npm run build",
+    "lint": "eslint bin src test",
+    "lint:fix": "eslint bin src test --fix",
+    "typecheck:src": "tsc -p tsconfig.typecheck.src.json --noEmit --pretty false",
+    "quality": "npm run lint && npm run typecheck:src && bun test test && npm run build",
+    "smoke:global": "node scripts/smoke-global-install.mjs",
+    "smoke:cli-compat": "node scripts/smoke-cli-compatibility.mjs",
+    "publish:dual": "node scripts/publish-dual.mjs",
+    "setup": "node --no-warnings --experimental-strip-types src/wechat/setup.ts",
+    "start": "node --no-warnings --experimental-strip-types src/wechat/wechat-channel.ts",
+    "check": "node --no-warnings --experimental-strip-types src/wechat/wechat-channel.ts --check",
+    "bridge": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts",
+    "daemon": "node --no-warnings --experimental-strip-types src/daemon/wechat-daemon.ts",
+    "bridge:codex": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts --adapter codex",
+    "codex:panel": "node --no-warnings --experimental-strip-types src/companion/codex-remote-client.ts",
+    "codex:start": "node --no-warnings --experimental-strip-types src/companion/local-companion-start.ts",
+    "claude:start": "node --no-warnings --experimental-strip-types src/companion/local-companion-start.ts --adapter claude",
+    "claude:companion": "node --no-warnings --experimental-strip-types src/companion/local-companion.ts --adapter claude",
+    "bridge:claude": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts --adapter claude",
+    "bridge:opencode": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts --adapter opencode",
+    "opencode:panel": "node --no-warnings --experimental-strip-types src/companion/local-companion.ts --adapter opencode",
+    "opencode:start": "node --no-warnings --experimental-strip-types src/companion/local-companion-start.ts --adapter opencode",
+    "bridge:pi": "node --no-warnings --experimental-strip-types src/bridge/wechat-bridge.ts --adapter pi",
+    "pi:companion": "node --no-warnings --experimental-strip-types src/companion/local-companion.ts --adapter pi",
+    "pi:start": "node --no-warnings --experimental-strip-types src/companion/local-companion-start.ts --adapter pi",
+    "bridge:bun": "bun src/bridge/wechat-bridge.ts",
+    "test": "bun test test",
+    "test:bridge": "bun test test/bridge",
+    "test:companion": "bun test test/companion",
     "test:wechat": "bun test test/wechat",
     "test:wecom": "bun test test/wecom",
-    "test:watch": "bun test --watch test"
-  },
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.30.0",
-    "@opencode-ai/sdk": "^1.18.0",
-    "@wecom/aibot-node-sdk": "1.0.7",
-    "node-pty": "^1.1.0",
-    "qrcode-terminal": "^0.12.0"
-  },
-  "overrides": {
-    "@hono/node-server": "2.1.1",
-    "body-parser": "2.3.0",
-    "brace-expansion": "5.0.9",
-    "express-rate-limit": "8.6.2",
-    "fast-uri": "3.1.5",
-    "hono": "4.13.3",
-    "ip-address": "10.5.0",
-    "path-to-regexp": "8.4.2",
-    "qs": "6.15.3"
-  },
-  "devDependencies": {
-    "@eslint/js": "^10.0.1",
-    "@types/bun": "latest",
-    "@types/node": "^24.12.4",
-    "eslint": "^10.3.0",
-    "typescript": "^6.0.2",
-    "typescript-eslint": "^8.59.3"
-  },
-  "engines": {
-    "bun": ">=1.0.0",
-    "node": ">=22.13.0"
-  }
-}
+    "test:watch": "bun test --watch test"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.30.0",
+    "@opencode-ai/sdk": "^1.18.0",
+    "@wecom/aibot-node-sdk": "1.0.7",
+    "@xterm/headless": "^6.0.0",
+    "node-pty": "^1.1.0",
+    "qrcode-terminal": "^0.12.0"
+  },
+  "overrides": {
+    "@hono/node-server": "2.1.1",
+    "body-parser": "2.3.0",
+    "brace-expansion": "5.0.9",
+    "express-rate-limit": "8.6.2",
+    "fast-uri": "3.1.5",
+    "hono": "4.13.3",
+    "ip-address": "10.5.0",
+    "path-to-regexp": "8.4.2",
+    "qs": "6.15.3"
+  },
+  "devDependencies": {
+    "@eslint/js": "^10.0.1",
+    "@types/bun": "latest",
+    "@types/node": "^24.12.4",
+    "eslint": "^10.3.0",
+    "typescript": "^6.0.2",
+    "typescript-eslint": "^8.59.3"
+  },
+  "engines": {
+    "bun": ">=1.0.0",
+    "node": ">=22.13.0"
+  }
+}

package/scripts/ensure-node-pty-permissions.mjs

@@ -1,73 +1,73 @@
-#!/usr/bin/env node
-
-// Ensure the bundled node-pty `spawn-helper` is executable.
-//
-// node-pty ships its prebuilt `spawn-helper` binaries with mode 0644 (no exec
-// bit) in the published tarball. On macOS/Linux that makes `posix_spawnp`
-// fail when node-pty tries to fork a PTY, so the bridge silently drops to the
-// non-PTY fallback. The Claude adapter relies on PTY interactive mode, so the
-// fallback surfaces to users as:
-//
-//   Error: Input must be provided ... when using --print
-//
-// Restoring the exec bit after install fixes PTY spawning. This runs on
-// postinstall and is idempotent; it never fails the install.
-
-import fs from "node:fs";
-import path from "node:path";
-import { createRequire } from "node:module";
-
-if (process.platform === "win32") {
-  process.exit(0);
-}
-
-const require = createRequire(import.meta.url);
-
-let nodePtyDir;
-try {
-  nodePtyDir = path.dirname(require.resolve("node-pty/package.json"));
-} catch {
-  // node-pty is optional in unsupported environments; nothing to fix.
-  process.exit(0);
-}
-
-const candidates = [
-  "prebuilds/darwin-arm64/spawn-helper",
-  "prebuilds/darwin-x64/spawn-helper",
-  "prebuilds/linux-x64/spawn-helper",
-  "prebuilds/linux-arm64/spawn-helper",
-  "build/Release/spawn-helper",
-];
-
-let fixed = 0;
-for (const relative of candidates) {
-  const helperPath = path.join(nodePtyDir, relative);
-  let stats;
-  try {
-    stats = fs.statSync(helperPath);
-  } catch {
-    continue;
-  }
-  if (!stats.isFile()) {
-    continue;
-  }
-  if ((stats.mode & 0o111) !== 0) {
-    continue;
-  }
-  try {
-    fs.chmodSync(helperPath, stats.mode | 0o755);
-    fixed += 1;
-  } catch (error) {
-    console.warn(
-      `[cli-wechat-bridge] Could not make node-pty spawn-helper executable: ${helperPath}\n` +
-        `  ${error instanceof Error ? error.message : String(error)}\n` +
-        "  PTY mode may be unavailable; run --doctor for details.",
-    );
-  }
-}
-
-if (fixed > 0) {
-  console.log(
-    `[cli-wechat-bridge] Restored executable bit on ${fixed} node-pty spawn-helper binary(ies).`,
-  );
-}
+#!/usr/bin/env node
+
+// Ensure the bundled node-pty `spawn-helper` is executable.
+//
+// node-pty ships its prebuilt `spawn-helper` binaries with mode 0644 (no exec
+// bit) in the published tarball. On macOS/Linux that makes `posix_spawnp`
+// fail when node-pty tries to fork a PTY, so the bridge silently drops to the
+// non-PTY fallback. The Claude adapter relies on PTY interactive mode, so the
+// fallback surfaces to users as:
+//
+//   Error: Input must be provided ... when using --print
+//
+// Restoring the exec bit after install fixes PTY spawning. This runs on
+// postinstall and is idempotent; it never fails the install.
+
+import fs from "node:fs";
+import path from "node:path";
+import { createRequire } from "node:module";
+
+if (process.platform === "win32") {
+  process.exit(0);
+}
+
+const require = createRequire(import.meta.url);
+
+let nodePtyDir;
+try {
+  nodePtyDir = path.dirname(require.resolve("node-pty/package.json"));
+} catch {
+  // node-pty is optional in unsupported environments; nothing to fix.
+  process.exit(0);
+}
+
+const candidates = [
+  "prebuilds/darwin-arm64/spawn-helper",
+  "prebuilds/darwin-x64/spawn-helper",
+  "prebuilds/linux-x64/spawn-helper",
+  "prebuilds/linux-arm64/spawn-helper",
+  "build/Release/spawn-helper",
+];
+
+let fixed = 0;
+for (const relative of candidates) {
+  const helperPath = path.join(nodePtyDir, relative);
+  let stats;
+  try {
+    stats = fs.statSync(helperPath);
+  } catch {
+    continue;
+  }
+  if (!stats.isFile()) {
+    continue;
+  }
+  if ((stats.mode & 0o111) !== 0) {
+    continue;
+  }
+  try {
+    fs.chmodSync(helperPath, stats.mode | 0o755);
+    fixed += 1;
+  } catch (error) {
+    console.warn(
+      `[cli-wechat-bridge] Could not make node-pty spawn-helper executable: ${helperPath}\n` +
+        `  ${error instanceof Error ? error.message : String(error)}\n` +
+        "  PTY mode may be unavailable; run --doctor for details.",
+    );
+  }
+}
+
+if (fixed > 0) {
+  console.log(
+    `[cli-wechat-bridge] Restored executable bit on ${fixed} node-pty spawn-helper binary(ies).`,
+  );
+}