@unlinearity/cli-wechat-bridge 1.1.3 → 1.1.4

package/dist/utils/doctor.js

@@ -7,7 +7,7 @@ import { normalizeBridgeLockPayload, shouldAutoReclaimBridgeLock, } from "../bri
 import { readLocalCompanionEndpoint as readWorkspaceEndpoint, } from "../companion/local-companion-link.js";
 import { isDaemonEndpointAlive, } from "../daemon/daemon-link.js";
 import { t } from "../i18n/index.js";
-import { DEFAULT_BASE_URL, resolveChannelDataDir } from "../wechat/channel-config.js";
+import { DEFAULT_BASE_URL, getWorkspaceAdapterEndpointFile, getWorkspaceChannelPaths, resolveChannelDataDir, } from "../wechat/channel-config.js";
 const STATE_OK = "[ok]";
 const STATE_WARN = "[warn]";
 const STATE_FAIL = "[fail]";
@@ -174,8 +174,7 @@ function isBridgeAdapterKind(value) {
     return (value === "codex" ||
         value === "claude" ||
         value === "opencode" ||
-        value === "pi" ||
-        value === "shell");
+        value === "pi");
 }
 export function parseDoctorCliArgs(argv, mode = "generic", fallbackCwd = process.cwd()) {
     let cwd = fallbackCwd;
@@ -417,8 +416,6 @@ function chooseCliChecks(options) {
                 return [{ name: "opencode", label: "OpenCode", optional: false }];
             case "pi":
                 return [{ name: "pi", label: "Pi", optional: false }];
-            case "shell":
-                return [];
             default:
                 return [];
         }
@@ -432,11 +429,6 @@ function chooseCliChecks(options) {
 }
 function appendCliLines(lines, options, deps) {
     const clis = chooseCliChecks(options);
-    if (options.mode === "bridge" && options.adapter === "shell") {
-        section(lines, msg("section.adapterCli"));
-        lines.push(row(STATE_OK, msg("label.shell"), msg("adapterCli.shellNative")));
-        return;
-    }
     if (clis.length === 0) {
         return;
     }
@@ -519,6 +511,18 @@ async function appendEndpointSummary(lines, label, endpoint, options, lock, deps
         lines.push(detail(msg("issue", { issue })));
     }
 }
+function endpointFileState(filePath) {
+    if (!fs.existsSync(filePath)) {
+        return "missing";
+    }
+    try {
+        JSON.parse(fs.readFileSync(filePath, "utf8"));
+        return "readable";
+    }
+    catch {
+        return "corrupted";
+    }
+}
 async function appendWorkspaceEndpointLines(lines, options, lock, deps) {
     const adapters = chooseEndpointAdapters(options, lock);
     const seenEndpoints = new Set();
@@ -527,12 +531,20 @@ async function appendWorkspaceEndpointLines(lines, options, lock, deps) {
         if (endpoint) {
             seenEndpoints.add(`${endpoint.kind}:${endpoint.instanceId}:${endpoint.port}`);
         }
+        else if (endpointFileState(getWorkspaceAdapterEndpointFile(options.cwd, adapter)) ===
+            "corrupted") {
+            // A torn or otherwise unparsable endpoint file must not read as a
+            // healthy "none" — surface it so the operator knows to clear it.
+            lines.push(row(STATE_WARN, msg("label.workspaceEndpoint", { adapter }), msg("endpoint.corrupted")));
+            continue;
+        }
         await appendEndpointSummary(lines, msg("label.workspaceEndpoint", { adapter }), endpoint, { ...options, adapter }, lock, deps);
     }
     const legacyEndpoint = deps.readLocalCompanionEndpoint(options.cwd);
     const legacyLabel = msg("label.legacyEndpoint");
     if (!legacyEndpoint) {
-        lines.push(row(STATE_OK, legacyLabel, msg("none")));
+        const legacyFileState = endpointFileState(getWorkspaceChannelPaths(options.cwd).endpointFile);
+        lines.push(row(legacyFileState === "corrupted" ? STATE_WARN : STATE_OK, legacyLabel, legacyFileState === "corrupted" ? msg("endpoint.corrupted") : msg("none")));
         return;
     }
     const legacyKey = `${legacyEndpoint.kind}:${legacyEndpoint.instanceId}:${legacyEndpoint.port}`;

package/dist/wechat/channel-config.js

@@ -16,7 +16,6 @@ export const CHANNEL_DATA_DIR = resolveChannelDataDir();
 export const CREDENTIALS_FILE = path.join(CHANNEL_DATA_DIR, "account.json");
 export const SYNC_BUF_FILE = path.join(CHANNEL_DATA_DIR, "sync_buf.txt");
 export const CONTEXT_CACHE_FILE = path.join(CHANNEL_DATA_DIR, "context_tokens.json");
-export const BRIDGE_STATE_FILE = path.join(CHANNEL_DATA_DIR, "bridge-state.json");
 export const BRIDGE_LOG_FILE = path.join(CHANNEL_DATA_DIR, "bridge.log");
 // Hard cap for bridge.log. Long-running daemons otherwise grow it without bound.
 export const BRIDGE_LOG_MAX_BYTES = 5 * 1024 * 1024; // 5 MiB
@@ -48,7 +47,6 @@ export function appendBoundedLog(filePath, line) {
 }
 export const BRIDGE_LOCK_FILE = path.join(CHANNEL_DATA_DIR, "bridge.lock.json");
 export const DAEMON_ENDPOINT_FILE = path.join(CHANNEL_DATA_DIR, "daemon-endpoint.json");
-export const CODEX_PANEL_ENDPOINT_FILE = path.join(CHANNEL_DATA_DIR, "codex-panel-endpoint.json");
 export const WORKSPACES_DIR = path.join(CHANNEL_DATA_DIR, "workspaces");
 export const INBOUND_MESSAGE_CLAIMS_DIR = path.join(CHANNEL_DATA_DIR, "inbound-message-claims");
 export const INBOUND_ATTACHMENTS_DIR = path.join(CHANNEL_DATA_DIR, "inbound-attachments");

package/dist/wechat/setup.js

@@ -166,17 +166,11 @@ function printPostLoginHelp(log) {
     log("This WeChat account is now authorized for the bridge.");
     log("");
     log("Start from any project directory with one of:");
-    log("  wechat-codex-start");
-    log("  wechat-claude-start");
-    log("  wechat-opencode-start");
-    log("  wechat-pi-start");
-    log("  wechat-bridge-shell");
-    log("");
-    log("Manual two-terminal mode is also available:");
-    log("  wechat-bridge-codex  +  wechat-codex");
-    log("  wechat-bridge-claude +  wechat-claude");
-    log("  wechat-bridge-opencode + wechat-opencode");
-    log("  wechat-bridge-pi + wechat-pi");
+    log("  wechat-codex");
+    log("  wechat-claude");
+    log("  wechat-opencode");
+    log("  wechat-pi");
+    log("  wechat-daemon");
     log("");
     log("Run wechat-setup again any time you need to refresh the login.");
 }

package/dist/wechat/wechat-transport.js

@@ -3,6 +3,7 @@ import { createCipheriv, createDecipheriv } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { CONTEXT_CACHE_FILE, CREDENTIALS_FILE, ensureChannelDataDir, INBOUND_ATTACHMENTS_DIR, INBOUND_MESSAGE_CLAIMS_DIR, migrateLegacyChannelFiles, SYNC_BUF_FILE, } from "./channel-config.js";
+import { writeJsonFileAtomic } from "../utils/atomic-file.js";
 export const DEFAULT_LONG_POLL_TIMEOUT_MS = 35_000;
 const CDN_BASE_URL = "https://novac2c.cdn.weixin.qq.com/c2c";
 const CHANNEL_VERSION = "0.3.0";
@@ -10,6 +11,7 @@ const RECENT_MESSAGE_CACHE_SIZE = 500;
 const BYTES_PER_MB = 1024 * 1024;
 const SEND_TIMEOUT_MS = 15_000;
 const INBOUND_DOWNLOAD_TIMEOUT_MS = 30_000;
+const CDN_UPLOAD_TIMEOUT_MS = 60_000;
 const CDN_MAX_RETRIES = 3;
 const ERROR_CAUSE_DEPTH_LIMIT = 4;
 const INBOUND_MESSAGE_CLAIM_TTL_MS = 10 * 60 * 1000;
@@ -305,13 +307,7 @@ export function classifyWechatTransportError(error) {
     return { kind: "unknown", retryable: false };
 }
 function writeJsonFile(filePath, value) {
-    ensureChannelDataDir();
-    const data = JSON.stringify(value, null, 2);
-    // Atomic write via temp file + rename, so a crash mid-write cannot leave a
-    // truncated/half-written JSON that would break readers on the next launch.
-    const tempPath = `${filePath}.${process.pid}.tmp`;
-    fs.writeFileSync(tempPath, data, "utf-8");
-    fs.renameSync(tempPath, filePath);
+    writeJsonFileAtomic(filePath, value);
 }
 function randomWechatUin() {
     const uint32 = crypto.randomBytes(4).readUInt32BE(0);
@@ -343,8 +339,11 @@ async function apiFetch(params) {
             body: params.body,
             signal: controller.signal,
         });
-        clearTimeout(timer);
+        // Keep the abort timer armed until the body has been fully read: a server
+        // that sends headers and then stalls would otherwise leave res.text()
+        // pending forever, freezing the long-poll loop with no timeout at all.
         const text = await res.text();
+        clearTimeout(timer);
         if (!res.ok) {
             throw new Error(`HTTP ${res.status}: ${text}`);
         }
@@ -495,12 +494,18 @@ async function uploadBufferToCdn(params) {
     let downloadParam;
     let lastError;
     for (let attempt = 1; attempt <= CDN_MAX_RETRIES; attempt += 1) {
+        // Abort guard mirrors the download path: without it a stalled CDN upload
+        // hangs the send queue forever (no timeout, no signal).
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), CDN_UPLOAD_TIMEOUT_MS);
         try {
             const res = await fetch(cdnUrl, {
                 method: "POST",
                 headers: { "Content-Type": "application/octet-stream" },
                 body: new Uint8Array(ciphertext),
+                signal: controller.signal,
             });
+            clearTimeout(timer);
             if (res.status >= 400 && res.status < 500) {
                 const errMsg = res.headers.get("x-error-message") ?? (await res.text());
                 throw new Error(`CDN client error ${res.status}: ${errMsg}`);
@@ -516,6 +521,7 @@ async function uploadBufferToCdn(params) {
             break;
         }
         catch (err) {
+            clearTimeout(timer);
             lastError = err;
             if (err instanceof Error && err.message.includes("client error")) {
                 throw err;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unlinearity/cli-wechat-bridge",
-  "version": "1.1.3",
-  "description": "CLI WeChat Bridge for Codex, Claude Code, OpenCode, Pi, and PowerShell over WeChat",
+  "version": "1.1.4",
+  "description": "CLI WeChat Bridge for Codex, Claude Code, OpenCode, and Pi over WeChat",
   "type": "module",
   "files": [
     "bin/",
@@ -34,18 +34,12 @@
     "access": "public"
   },
   "bin": {
-    "wechat-bridge": "bin/wechat-bridge.mjs",
-    "wechat-bridge-codex": "bin/wechat-bridge-codex.mjs",
     "wechat-codex": "bin/wechat-codex.mjs",
     "wechat-codex-start": "bin/wechat-codex-start.mjs",
     "wechat-claude": "bin/wechat-claude.mjs",
     "wechat-claude-start": "bin/wechat-claude-start.mjs",
-    "wechat-bridge-claude": "bin/wechat-bridge-claude.mjs",
-    "wechat-bridge-shell": "bin/wechat-bridge-shell.mjs",
-    "wechat-bridge-opencode": "bin/wechat-bridge-opencode.mjs",
     "wechat-opencode": "bin/wechat-opencode.mjs",
     "wechat-opencode-start": "bin/wechat-opencode-start.mjs",
-    "wechat-bridge-pi": "bin/wechat-bridge-pi.mjs",
     "wechat-pi": "bin/wechat-pi.mjs",
     "wechat-pi-start": "bin/wechat-pi-start.mjs",
     "wechat-daemon": "bin/wechat-daemon.mjs",
@@ -72,5 +66,8 @@
   "engines": {
     "bun": ">=1.0.0",
     "node": ">=24.0.0"
+  },
+  "scripts": {
+    "postinstall": "node scripts/ensure-node-pty-permissions.mjs"
   }
 }

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

@@ -0,0 +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).`,
+  );
+}

package/bin/wechat-bridge-claude.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/bridge/wechat-bridge.js", ["--adapter", "claude"]);

package/bin/wechat-bridge-codex.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/bridge/wechat-bridge.js", ["--adapter", "codex"]);

package/bin/wechat-bridge-opencode.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/bridge/wechat-bridge.js", ["--adapter", "opencode"]);

package/bin/wechat-bridge-pi.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/bridge/wechat-bridge.js", ["--adapter", "pi"]);

package/bin/wechat-bridge-shell.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/bridge/wechat-bridge.js", ["--adapter", "shell"]);

package/bin/wechat-bridge.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runJsEntry } from "./_run-entry.mjs";
-
-runJsEntry("dist/bridge/wechat-bridge.js");