cli-wechat-bridge 1.1.6 → 1.1.7

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/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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cli-wechat-bridge",
-  "version": "1.1.6",
-  "description": "CLI WeChat Bridge for Codex, Claude Code, OpenCode, and Pi over WeChat",
+  "version": "1.1.7",
+  "description": "CLI bridge for Codex, Claude Code, OpenCode, and Pi over WeChat and WeCom",
   "type": "module",
   "files": [
     "bin/",
@@ -11,7 +11,8 @@
     "LICENSE.txt"
   ],
   "keywords": [
-    "wechat",
+    "wechat",
+    "wecom",
     "cli",
     "bridge",
     "codex",
@@ -40,7 +41,14 @@
     "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"
+    "wechat-check-update": "bin/wechat-check-update.mjs",
+    "wecom-codex": "bin/wecom-codex.mjs",
+    "wecom-claude": "bin/wecom-claude.mjs",
+    "wecom-opencode": "bin/wecom-opencode.mjs",
+    "wecom-pi": "bin/wecom-pi.mjs",
+    "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",
@@ -74,12 +82,14 @@
     "test": "bun test test",
     "test:bridge": "bun test test/bridge",
     "test:companion": "bun test test/companion",
-    "test:wechat": "bun test test/wechat",
+    "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"
   },
@@ -102,8 +112,8 @@
     "typescript": "^6.0.2",
     "typescript-eslint": "^8.59.3"
   },
-  "engines": {
-    "bun": ">=1.0.0",
-    "node": ">=22.13.0"
-  }
-}
+  "engines": {
+    "bun": ">=1.0.0",
+    "node": ">=22.13.0"
+  }
+}