cli-wechat-bridge 1.1.6 → 1.1.8

package/dist/i18n/messages-en.js

@@ -11,7 +11,7 @@ export const messages = {
     "bridge.fatalError": "Bridge error: {message}",
     "bridge.backlogIgnored": "Ignored {count} backlog message(s) sent before the bridge started (they will not be processed).\nIf you actually sent them after the bridge started, your system clock is likely skewed by more than {graceSeconds}s — sync the clock and restart the bridge.",
     // === Daemon welcome & control ===
-    "daemon.welcome": "WeChat Daemon ready.\nCWD: {cwd}\nActive: {adapter}\n\nCommands: /claude, /codex, /opencode, /pi, /stop, /confirm, /deny, /status\n{bindings}\n\nManage: /bind [emoji] cmd, /unbind [emoji], /bindings",
+    "daemon.welcome": "WeChat Daemon ready.\nCWD: {cwd}\nActive: {adapter}\n\nCommands: /claude, /codex, /opencode, /pi, /stop, /confirm, /deny, /status, /model, /plan\n{bindings}\n\nManage: /bind [emoji] cmd, /unbind [emoji], /bindings",
     "daemon.noActiveAdapter": "No active terminal is selected. Send /codex, /claude, /opencode, or /pi to start one.",
     "daemon.switchResult.new": "Started a new visible CLI.",
     "daemon.switchResult.reused": "Reused the existing visible CLI.",
@@ -59,6 +59,7 @@ export const messages = {
     "doctor.label.codePage": "Console code page",
     "doctor.codePage.nonAsciiWarning": "{codePage} (not UTF-8 and the data directory path contains non-ASCII characters; hook scripts from older versions break in this environment — upgrade to the latest release)",
     "doctor.label.connectivity": "WeChat connectivity",
+    "doctor.label.wecomConnectivity": "WeCom connectivity",
     "doctor.connectivity.ok": "reachable ({baseUrl})",
     "doctor.connectivity.unreachable": "cannot reach {baseUrl} (check network and firewall)",
     "doctor.connectivity.proxyHint": "cannot reach {baseUrl}. Proxy {proxy} detected, but Node fetch ignores proxy environment variables by default; if your network requires the proxy, set NODE_USE_ENV_PROXY=1 and retry.",
@@ -82,6 +83,7 @@ export const messages = {
     "doctor.dataDirMissing": "(will be created on first run)",
     "doctor.credentialsFound": "found",
     "doctor.credentialsMissing": "not found (run wechat-setup first)",
+    "doctor.credentialsMissingWecom": "not found (run wecom-setup first)",
     "doctor.mode.bridge": "standalone bridge",
     "doctor.mode.generic": "generic",
     "doctor.notSpecified": "(not specified)",

package/dist/i18n/messages-zh.js

@@ -11,7 +11,7 @@ export const messages = {
     "bridge.fatalError": "桥接错误: {message}",
     "bridge.backlogIgnored": "已忽略 {count} 条桥接启动前的积压消息（不会自动处理）。\n如果你是在桥接启动后才发送的消息却看到此提示，说明本机系统时钟可能不准（偏差超过 {graceSeconds} 秒），请校准时间后重启桥接。",
     // === Daemon 欢迎 & 控制 ===
-    "daemon.welcome": "微信 Daemon 就绪。\n工作目录: {cwd}\n当前: {adapter}\n\n命令: /claude, /codex, /opencode, /pi, /stop, /confirm, /deny, /status\n{bindings}\n\n管理: /bind [表情] 命令, /unbind [表情], /bindings",
+    "daemon.welcome": "微信 Daemon 就绪。\n工作目录: {cwd}\n当前: {adapter}\n\n命令: /claude, /codex, /opencode, /pi, /stop, /confirm, /deny, /status, /model, /plan\n{bindings}\n\n管理: /bind [表情] 命令, /unbind [表情], /bindings",
     "daemon.noActiveAdapter": "未选择活跃终端。发送 /codex、/claude、/opencode 或 /pi 启动一个。",
     "daemon.switchResult.new": "已启动新的可见 CLI。",
     "daemon.switchResult.reused": "已复用现有的可见 CLI。",
@@ -59,6 +59,7 @@ export const messages = {
     "doctor.label.codePage": "控制台代码页",
     "doctor.codePage.nonAsciiWarning": "{codePage}（非 UTF-8，且数据目录路径含非 ASCII 字符；旧版本的 hook 脚本在此环境下会乱码失效，请升级到最新版本）",
     "doctor.label.connectivity": "微信服务可达性",
+    "doctor.label.wecomConnectivity": "企业微信服务可达性",
     "doctor.connectivity.ok": "可达 ({baseUrl})",
     "doctor.connectivity.unreachable": "无法访问 {baseUrl}（检查网络与防火墙）",
     "doctor.connectivity.proxyHint": "无法访问 {baseUrl}。检测到代理 {proxy}，但 Node fetch 默认不使用代理环境变量；若必须经代理出网，请设置 NODE_USE_ENV_PROXY=1 后重试。",
@@ -82,6 +83,7 @@ export const messages = {
     "doctor.dataDirMissing": "(首次运行会创建)",
     "doctor.credentialsFound": "已找到",
     "doctor.credentialsMissing": "未找到 (先运行 wechat-setup)",
+    "doctor.credentialsMissingWecom": "未找到 (先运行 wecom-setup)",
     "doctor.mode.bridge": "独立桥接",
     "doctor.mode.generic": "通用",
     "doctor.notSpecified": "(未指定)",

package/dist/runtime/legacy-adapter-runtime.js

@@ -25,6 +25,21 @@ export class LegacyAdapterRuntime {
         }
         await this.adapter.createSession();
     }
+    async listModels() {
+        if (!this.adapter.listModels)
+            throw new Error("Model listing is not supported by this companion.");
+        return this.adapter.listModels();
+    }
+    async selectModel(modelId) {
+        if (!this.adapter.selectModel)
+            throw new Error("Model selection is not supported by this companion.");
+        return this.adapter.selectModel(modelId);
+    }
+    async setPlanMode(enabled) {
+        if (!this.adapter.setPlanMode)
+            throw new Error("Plan mode is not supported by this companion.");
+        return this.adapter.setPlanMode(enabled);
+    }
     async interrupt() {
         return await this.adapter.interrupt();
     }

package/dist/runtime/runtime-types.js

@@ -3,3 +3,6 @@ export const CODEX_REMOTE_AUTH_TOKEN_ENV = "WECHAT_BRIDGE_CODEX_REMOTE_AUTH_TOKE
 export function hasLocalClientEndpointProvider(runtime) {
     return typeof runtime.getLocalClientEndpoint === "function";
 }
+export function hasVisibleClientSessionPreparer(runtime) {
+    return typeof runtime.prepareVisibleClientSession === "function";
+}

package/dist/utils/doctor.js

@@ -74,11 +74,11 @@ function defaultGetWindowsCodePage() {
         return null;
     }
 }
-async function defaultFetchServerDate() {
+async function defaultFetchServerDate(baseUrl = DEFAULT_BASE_URL) {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), SERVER_DATE_TIMEOUT_MS);
     try {
-        const res = await fetch(DEFAULT_BASE_URL, {
+        const res = await fetch(baseUrl, {
             method: "GET",
             signal: controller.signal,
         });
@@ -179,6 +179,7 @@ function isBridgeAdapterKind(value) {
 export function parseDoctorCliArgs(argv, mode = "generic", fallbackCwd = process.cwd()) {
     let cwd = fallbackCwd;
     let adapter;
+    let channelId = "wechat";
     for (let i = 0; i < argv.length; i += 1) {
         const arg = argv[i];
         const next = argv[i + 1];
@@ -195,11 +196,17 @@ export function parseDoctorCliArgs(argv, mode = "generic", fallbackCwd = process
             i += 1;
             continue;
         }
+        if (arg === "--channel" && (next === "wechat" || next === "wecom")) {
+            channelId = next;
+            i += 1;
+            continue;
+        }
     }
     return {
         mode,
         cwd: path.resolve(cwd),
         adapter,
+        ...(channelId === "wecom" ? { channelId } : {}),
     };
 }
 function statusTag(status) {
@@ -582,10 +589,15 @@ export async function buildDoctorReport(options = {}, rawDeps = {}) {
         }
     }
     const proxyUrl = pickProxyEnvValue(deps.env);
-    const serverDate = await deps.fetchServerDate();
+    const connectivityUrl = doctorOptions.channelId === "wecom"
+        ? "https://open.work.weixin.qq.com"
+        : DEFAULT_BASE_URL;
+    const serverDate = await deps.fetchServerDate(connectivityUrl);
     if (serverDate) {
-        lines.push(row(STATE_OK, msg("label.connectivity"), msg("connectivity.ok", {
-            baseUrl: DEFAULT_BASE_URL,
+        lines.push(row(STATE_OK, msg(doctorOptions.channelId === "wecom"
+            ? "label.wecomConnectivity"
+            : "label.connectivity"), msg("connectivity.ok", {
+            baseUrl: connectivityUrl,
         })));
         const skewMs = deps.now() - serverDate.getTime();
         const skewSeconds = Math.round(Math.abs(skewMs) / 1000);
@@ -595,9 +607,11 @@ export async function buildDoctorReport(options = {}, rawDeps = {}) {
             : msg("clock.skewWarning", { skewSeconds })));
     }
     else {
-        lines.push(row(STATE_WARN, msg("label.connectivity"), proxyUrl && deps.env.NODE_USE_ENV_PROXY !== "1"
-            ? msg("connectivity.proxyHint", { baseUrl: DEFAULT_BASE_URL, proxy: proxyUrl })
-            : msg("connectivity.unreachable", { baseUrl: DEFAULT_BASE_URL })));
+        lines.push(row(STATE_WARN, msg(doctorOptions.channelId === "wecom"
+            ? "label.wecomConnectivity"
+            : "label.connectivity"), proxyUrl && deps.env.NODE_USE_ENV_PROXY !== "1"
+            ? msg("connectivity.proxyHint", { baseUrl: connectivityUrl, proxy: proxyUrl })
+            : msg("connectivity.unreachable", { baseUrl: connectivityUrl })));
     }
     try {
         await deps.loadNodePty();
@@ -612,9 +626,15 @@ export async function buildDoctorReport(options = {}, rawDeps = {}) {
     const dataDir = deps.resolveDataDir();
     const dataDirExists = deps.exists(dataDir);
     lines.push(row(dataDirExists ? STATE_OK : STATE_FAIL, msg("label.dataDir"), dataDirExists ? dataDir : `${dataDir} ${msg("dataDirMissing")}`));
-    const credFile = path.join(dataDir, "account.json");
+    const credFile = doctorOptions.channelId === "wecom"
+        ? path.join(dataDir, "wecom", "account.json")
+        : path.join(dataDir, "account.json");
     const credExists = deps.exists(credFile);
-    lines.push(row(credExists ? STATE_OK : STATE_FAIL, msg("label.credentials"), credExists ? msg("credentialsFound") : msg("credentialsMissing")));
+    lines.push(row(credExists ? STATE_OK : STATE_FAIL, msg("label.credentials"), credExists
+        ? msg("credentialsFound")
+        : msg(doctorOptions.channelId === "wecom"
+            ? "credentialsMissingWecom"
+            : "credentialsMissing")));
     section(lines, msg("section.runtime"));
     lines.push(fieldRow(msg("label.mode"), formatMode(doctorOptions.mode)));
     lines.push(fieldRow(msg("label.cwd"), doctorOptions.cwd));

package/dist/utils/version-checker.js

@@ -179,16 +179,16 @@ export async function checkForUpdate(forceCheck = false) {
  */
 export function formatUpdateMessage(versionInfo) {
     const { current, latest } = versionInfo;
-    return `
-[Update Available] Version ${latest} is available (current: ${current})
-
-Update instructions:
-   cd CLI-WeChat-Bridge
-   git pull
-   bun install
-   npm install -g .
-
-For more information:
-   https://github.com/UNLINEARITY/CLI-WeChat-Bridge/releases
+    return `
+[Update Available] Version ${latest} is available (current: ${current})
+
+Update instructions:
+   cd CLI-WeChat-Bridge
+   git pull
+   bun install
+   npm install -g .
+
+For more information:
+   https://github.com/UNLINEARITY/CLI-WeChat-Bridge/releases
 `;
 }

package/dist/wechat/setup.js

@@ -11,6 +11,7 @@ import fs from "node:fs";
 import readline from "node:readline";
 import { BOT_TYPE, CONTEXT_CACHE_FILE, CREDENTIALS_FILE, DEFAULT_BASE_URL, ensureChannelDataDir, migrateLegacyChannelFiles, SYNC_BUF_FILE, } from "./channel-config.js";
 import { isWechatSyncSessionTimeout } from "./wechat-transport.js";
+import { isDirectModuleRun } from "../core/direct-run.js";
 const CHANNEL_VERSION = "0.3.0";
 export function loadExistingCredentials() {
     try {
@@ -130,18 +131,74 @@ async function askYesNo(prompt) {
         rl.close();
     }
 }
-async function printQRCode(qrContent, write) {
+// eslint-disable-next-line no-control-regex
+const ANSI_SGR_RE = /\u001b\[[0-9;]*m/g;
+function resolveLoginTerminal() {
+    const columns = process.stdout.columns;
+    return {
+        platform: process.platform,
+        isTTY: process.stdout.isTTY === true,
+        columns: typeof columns === "number" && Number.isFinite(columns) && columns > 0
+            ? columns
+            : undefined,
+    };
+}
+export function getQRCodeVisibleWidth(qr) {
+    return Math.max(0, ...qr
+        .replace(/\r/g, "")
+        .split("\n")
+        .map((line) => Array.from(line.replace(ANSI_SGR_RE, "")).length));
+}
+export function selectQRCodePresentation(params) {
+    if (!params.isTTY ||
+        typeof params.columns !== "number" ||
+        !Number.isFinite(params.columns) ||
+        params.columns <= 0 ||
+        params.renderedWidth + 1 > params.columns) {
+        return "url_only";
+    }
+    return "qr_with_url";
+}
+export function formatQRCodeLoginInstruction(presentation) {
+    return presentation === "qr_with_url"
+        ? "Scan the QR code above with WeChat, then confirm the login on your phone. If scanning fails, open the browser URL above.\n"
+        : "The QR code was not rendered in this terminal. Open the browser URL above, then confirm the login in WeChat.\n";
+}
+async function generateQRCode(qrContent, options) {
+    const qrterm = await import("qrcode-terminal");
+    return await new Promise((resolve, reject) => {
+        try {
+            qrterm.default.generate(qrContent, options, resolve);
+        }
+        catch (error) {
+            reject(error);
+        }
+    });
+}
+export async function printQRCode(qrContent, write, terminal = resolveLoginTerminal(), qrMode = "small", qrGenerator = generateQRCode) {
+    if (!terminal.isTTY) {
+        return "url_only";
+    }
     try {
-        const qrterm = await import("qrcode-terminal");
-        await new Promise((resolve) => {
-            qrterm.default.generate(qrContent, { small: true }, (qr) => {
-                write(`${qr}\n`);
-                resolve();
-            });
+        const qr = await qrGenerator(qrContent, {
+            small: qrMode === "small",
         });
+        const presentation = selectQRCodePresentation({
+            isTTY: terminal.isTTY,
+            columns: terminal.columns,
+            renderedWidth: getQRCodeVisibleWidth(qr),
+        });
+        if (presentation === "qr_with_url") {
+            write(`${qr}\n`);
+        }
+        write(presentation === "qr_with_url"
+            ? `If scanning fails, open this short-lived WeChat login URL in a browser. Do not share it:\n${qrContent}\n\n`
+            : `Open this short-lived WeChat login URL in a browser. Do not share it:\n${qrContent}\n\n`);
+        return presentation;
     }
     catch {
-        write(`Open this QR code URL in a browser: ${qrContent}\n\n`);
+        write(`The QR code could not be rendered. Open this short-lived WeChat login URL in a browser. Do not share it:\n${qrContent}\n\n`);
+        return "url_only";
     }
 }
 function saveCredentials(account) {
@@ -174,16 +231,54 @@ function printPostLoginHelp(log) {
     log("");
     log("Run wechat-setup again any time you need to refresh the login.");
 }
+export function parseWechatSetupCliArgs(argv) {
+    let qrMode = "small";
+    for (let index = 0; index < argv.length; index += 1) {
+        const arg = argv[index];
+        if (arg === "--help" || arg === "-h") {
+            return { help: true, qrMode };
+        }
+        if (arg === "--qr-mode") {
+            const value = argv[index + 1];
+            if (value !== "small" && value !== "normal") {
+                throw new Error("--qr-mode requires small or normal.");
+            }
+            qrMode = value;
+            index += 1;
+            continue;
+        }
+        if (arg === "--qr-mode=small" || arg === "--qr-mode=normal") {
+            qrMode = arg.endsWith("=small") ? "small" : "normal";
+            continue;
+        }
+        throw new Error(`Unknown wechat-setup option: ${arg}`);
+    }
+    return { help: false, qrMode };
+}
+export function formatWechatSetupUsage() {
+    return [
+        "Usage: wechat-setup [--qr-mode <small|normal>]",
+        "",
+        "Log in to WeChat and save bridge credentials.",
+        "QR mode defaults to small; use --qr-mode normal when the terminal renders small QR blocks incorrectly.",
+        "",
+    ].join("\n");
+}
 export async function runWechatLogin(options = {}) {
     const baseUrl = options.baseUrl ?? DEFAULT_BASE_URL;
     const log = options.log ?? ((message) => console.log(message));
     const write = options.write ?? ((message) => process.stdout.write(message));
     const timeoutMs = options.timeoutMs ?? 480_000;
     const pollIntervalMs = options.pollIntervalMs ?? 1_000;
+    const terminal = options.terminal ?? resolveLoginTerminal();
+    const qrMode = options.qrMode ?? "small";
+    if (!terminal.isTTY) {
+        throw new Error("WeChat login requires an interactive terminal. Run wechat-setup directly in PowerShell, Command Prompt, or a terminal window.");
+    }
     log("Fetching WeChat login QR code...\n");
     const qrResp = await fetchQRCode(baseUrl);
-    await printQRCode(qrResp.qrcode_img_content, write);
-    log("Scan the QR code above with WeChat, then confirm the login on your phone.\n");
+    const presentation = await printQRCode(qrResp.qrcode_img_content, write, terminal, qrMode);
+    log(formatQRCodeLoginInstruction(presentation));
     const deadline = Date.now() + timeoutMs;
     let scannedPrinted = false;
     while (Date.now() < deadline) {
@@ -252,7 +347,12 @@ export async function ensureWechatCredentials(options = {}) {
     const login = options.login ?? (() => runWechatLogin(options));
     return login();
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
+    const cliOptions = parseWechatSetupCliArgs(argv);
+    if (cliOptions.help) {
+        console.log(formatWechatSetupUsage());
+        return;
+    }
     migrateLegacyChannelFiles((message) => console.log(message));
     const existing = loadExistingCredentials();
     if (existing) {
@@ -266,10 +366,10 @@ async function main() {
             return;
         }
     }
-    await runWechatLogin({ requireUserId: true });
+    await runWechatLogin({ requireUserId: true, qrMode: cliOptions.qrMode });
     printPostLoginHelp((message) => console.log(message));
 }
-const isDirectRun = Boolean(import.meta.main);
+const isDirectRun = isDirectModuleRun(import.meta.url, process.argv, import.meta.main);
 if (isDirectRun) {
     main().catch((err) => {
         const message = err instanceof Error ? err.message : String(err);

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);
         }