cli-wechat-bridge 1.1.5 → 1.1.7

package/bin/_run-entry.mjs

@@ -6,22 +6,37 @@ import { fileURLToPath } from "node:url";
 
 const BIN_DIR = path.dirname(fileURLToPath(import.meta.url));
 const PROJECT_DIR = path.resolve(BIN_DIR, "..");
-const MIN_NODE_MAJOR = 24;
+export const MIN_NODE_VERSION = Object.freeze([22, 13, 0]);
+export const MIN_NODE_VERSION_TEXT = MIN_NODE_VERSION.join(".");
+
+export function isSupportedNodeVersion(version) {
+  const match = /^v?(\d+)(?:\.(\d+))?(?:\.(\d+))?/.exec(version);
+  if (!match) {
+    return false;
+  }
+
+  const current = [Number(match[1]), Number(match[2] ?? 0), Number(match[3] ?? 0)];
+  for (let index = 0; index < MIN_NODE_VERSION.length; index += 1) {
+    if (current[index] !== MIN_NODE_VERSION[index]) {
+      return current[index] > MIN_NODE_VERSION[index];
+    }
+  }
+  return true;
+}
 
 function ensureSupportedNodeVersion() {
   if (process.env.CLI_BRIDGE_SKIP_NODE_CHECK === "1") {
     return;
   }
 
-  const major = Number(process.versions.node.split(".")[0]);
-  if (Number.isFinite(major) && major >= MIN_NODE_MAJOR) {
+  if (isSupportedNodeVersion(process.versions.node)) {
     return;
   }
 
   process.stderr.write(
     [
-      `[cli-wechat-bridge] Node.js >= ${MIN_NODE_MAJOR} is required, but you are running ${process.version}.`,
-      `[cli-wechat-bridge] 需要 Node.js >= ${MIN_NODE_MAJOR}，当前版本为 ${process.version}。`,
+      `[cli-wechat-bridge] Node.js >= ${MIN_NODE_VERSION_TEXT} is required, but you are running ${process.version}.`,
+      `[cli-wechat-bridge] 需要 Node.js >= ${MIN_NODE_VERSION_TEXT}，当前版本为 ${process.version}。`,
       "Install the latest LTS from https://nodejs.org/ (or via nvm), then retry.",
       "Set CLI_BRIDGE_SKIP_NODE_CHECK=1 to bypass this check at your own risk.",
       "",

package/bin/wecom-check-update.mjs

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

package/bin/wecom-claude.mjs

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

package/bin/wecom-codex.mjs

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

package/bin/wecom-daemon.mjs

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

package/bin/wecom-opencode.mjs

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

package/bin/wecom-pi.mjs

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

package/bin/wecom-setup.mjs

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

package/dist/bridge/bridge-adapters.claude.js

@@ -7,7 +7,8 @@ import { buildLocalCompanionToken } from "../companion/local-companion-link.js";
 import { t } from "../i18n/index.js";
 import { ensureWorkspaceChannelDir } from "../wechat/channel-config.js";
 import { buildClaudeFailureMessage, buildClaudeHookScript, buildClaudeHookSettings, buildClaudePermissionDecisionHookOutput, buildClaudePermissionApprovalRequest, extractClaudeAssistantMessageText, extractClaudeResumeConversationId, extractClaudeTranscriptFinalReply, findInjectedClaudePromptIndex, getClaudePermissionAutoResponse, getClaudeWechatOutboundAttachmentDenyMessage, normalizeClaudeAssistantMessage, parseClaudeHookPayload, } from "./claude-hooks.js";
-import { detectCliApproval, isThinkingForwardEnabled, normalizeOutput, nowIso, truncatePreview, } from "./bridge-utils.js";
+import { detectCliApproval, isThinkingForwardEnabled, } from "./bridge-utils.js";
+import { normalizeOutput, nowIso, truncatePreview } from "../core/text-utils.js";
 import { AbstractPtyAdapter } from "./bridge-adapters.core.js";
 import * as shared from "./bridge-adapters.shared.js";
 const { CLAUDE_HOOK_LISTEN_HOST, CLAUDE_WECHAT_WORKING_NOTICE_DELAY_MS, DEFAULT_COLS, DEFAULT_ROWS, MODULE_DIR, buildClaudeCliArgs, delay, isClaudeInvalidResumeError, quotePosixCommandArg, quoteWindowsCommandArg, shouldIncludeClaudeNoAltScreen, } = shared;
@@ -17,6 +18,8 @@ const CLAUDE_COMPACT_DEDUP_MS = 2_000;
 const CLAUDE_BRACKETED_PASTE_START = "\u001b[200~";
 const CLAUDE_BRACKETED_PASTE_END = "\u001b[201~";
 const CLAUDE_REMOTE_ENTER_DELAY_MS = 40;
+const CLAUDE_REMOTE_ENTER_RETRY_DELAYS_MS = [200, 500, 1_000];
+const CLAUDE_INTERACTIVE_READY_TIMEOUT_MS = 10_000;
 const CLAUDE_STARTUP_OUTPUT_BUFFER_LIMIT = 4_000;
 const CLAUDE_SESSION_METADATA_READ_BYTES = 64 * 1024;
 const CLAUDE_MAX_SANITIZED_PROJECT_PATH = 200;
@@ -336,6 +339,12 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
     polledTranscriptSessionId = null;
     pendingResume = null;
     localResumeSessionEndObserved = false;
+    interactiveReady = true;
+    interactiveReadyTimer = null;
+    interactiveReadyWaiters = new Set();
+    remoteSubmitRetryTimer = null;
+    remoteSubmitRetryIndex = 0;
+    remoteSubmitText = null;
     constructor(options) {
         super(options);
         const shouldRestoreInitialSession = options.sessionStartMode !== "new";
@@ -363,6 +372,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         if (this.pty) {
             return;
         }
+        this.beginInteractiveReadinessWait();
         this.startupOutputBuffer = "";
         this.hasAutoConfirmedWorkspaceTrustPrompt = false;
         ensureClaudeWorkspaceTrustAccepted(this.options.cwd);
@@ -384,11 +394,15 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
                 this.state.activeRuntimeSessionId = undefined;
             }
         }
-        await this.startHookServer();
         try {
+            await this.startHookServer();
             await super.start();
+            if (!this.interactiveReady) {
+                this.setStatus("starting", "Waiting for Claude interactive session...");
+            }
         }
         catch (error) {
+            this.rejectInteractiveReadiness(error instanceof Error ? error : new Error(String(error)));
             await this.stopHookServer();
             throw error;
         }
@@ -403,7 +417,18 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         if (this.pendingApproval) {
             throw new Error("A Claude approval request is pending. Reply with /confirm or /deny.");
         }
+        await this.waitForInteractiveReadiness();
+        if (!this.pty) {
+            throw new Error("claude adapter is not running.");
+        }
+        if (this.getState().status === "busy") {
+            throw new Error("claude is still working. Wait for the current reply or use /stop.");
+        }
+        if (this.pendingApproval) {
+            throw new Error("A Claude approval request is pending. Reply with /confirm or /deny.");
+        }
         const normalizedText = normalizeOutput(text).trim();
+        this.clearRemoteSubmitRetry();
         this.pendingInjectedInputs.push({
             normalizedText,
             createdAtMs: Date.now(),
@@ -420,6 +445,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         this.writeToPty(this.buildRemoteInputPayload(text));
         await delay(CLAUDE_REMOTE_ENTER_DELAY_MS);
         this.writeToPty("\r");
+        this.armRemoteSubmitRetry(normalizedText);
         this.armWechatWorkingNotice();
     }
     async listResumeSessions(limit = 10) {
@@ -529,6 +555,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
             return false;
         }
         this.clearWechatWorkingNotice(true);
+        this.clearRemoteSubmitRetry();
         this.pendingCliApprovalHints = null;
         this.flushPendingClaudeHookApprovals();
         if (this.pendingApproval) {
@@ -565,7 +592,8 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         this.state.lastSessionSwitchAt = undefined;
         this.state.lastSessionSwitchSource = undefined;
         this.state.lastSessionSwitchReason = undefined;
-        await super.reset();
+        await this.dispose();
+        await this.start();
     }
     async resolveApproval(action) {
         if (!this.pendingApproval) {
@@ -622,6 +650,8 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         this.rejectPendingResume(new Error("Claude is shutting down during session switching."));
         this.detachLocalTerminal();
         this.clearWechatWorkingNotice(true);
+        this.clearRemoteSubmitRetry();
+        this.rejectInteractiveReadiness(new Error("Claude is shutting down."));
         this.pendingCliApprovalHints = null;
         this.flushPendingClaudeHookApprovals();
         this.stopTranscriptThinkingWatch();
@@ -719,8 +749,12 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
     handleExit(exitCode) {
         this.detachLocalTerminal();
         this.clearWechatWorkingNotice(true);
+        this.clearRemoteSubmitRetry();
         this.pendingCliApprovalHints = null;
         this.rejectPendingResume(new Error("Claude exited before the requested session switch completed."));
+        if (!this.recoveringInvalidResume) {
+            this.rejectInteractiveReadiness(new Error("Claude exited before its interactive session became ready."));
+        }
         void this.stopHookServer();
         if (this.recoveringInvalidResume && !this.shuttingDown) {
             this.clearCompletionTimer();
@@ -995,6 +1029,91 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         }
         return `${CLAUDE_BRACKETED_PASTE_START}${normalizedText}${CLAUDE_BRACKETED_PASTE_END}`;
     }
+    beginInteractiveReadinessWait() {
+        this.clearInteractiveReadinessTimer();
+        this.interactiveReady = false;
+        this.interactiveReadyTimer = setTimeout(() => {
+            this.interactiveReadyTimer = null;
+            this.markInteractiveReady();
+        }, CLAUDE_INTERACTIVE_READY_TIMEOUT_MS);
+        this.interactiveReadyTimer.unref?.();
+    }
+    waitForInteractiveReadiness() {
+        if (this.interactiveReady) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve, reject) => {
+            this.interactiveReadyWaiters.add({ resolve, reject });
+        });
+    }
+    markInteractiveReady() {
+        if (this.interactiveReady) {
+            return;
+        }
+        this.interactiveReady = true;
+        this.clearInteractiveReadinessTimer();
+        for (const waiter of this.interactiveReadyWaiters) {
+            waiter.resolve();
+        }
+        this.interactiveReadyWaiters.clear();
+        if (this.state.status === "starting" && !this.hasAcceptedInput) {
+            this.setStatus("idle", "Claude interactive session is ready.");
+        }
+    }
+    rejectInteractiveReadiness(error) {
+        this.clearInteractiveReadinessTimer();
+        for (const waiter of this.interactiveReadyWaiters) {
+            waiter.reject(error);
+        }
+        this.interactiveReadyWaiters.clear();
+        this.interactiveReady = true;
+    }
+    clearInteractiveReadinessTimer() {
+        if (!this.interactiveReadyTimer) {
+            return;
+        }
+        clearTimeout(this.interactiveReadyTimer);
+        this.interactiveReadyTimer = null;
+    }
+    armRemoteSubmitRetry(normalizedText) {
+        this.clearRemoteSubmitRetry();
+        this.remoteSubmitText = normalizedText;
+        this.remoteSubmitRetryIndex = 0;
+        this.scheduleRemoteSubmitRetry();
+    }
+    scheduleRemoteSubmitRetry() {
+        const delayMs = CLAUDE_REMOTE_ENTER_RETRY_DELAYS_MS[this.remoteSubmitRetryIndex];
+        if (delayMs === undefined || !this.remoteSubmitText) {
+            return;
+        }
+        this.remoteSubmitRetryTimer = setTimeout(() => {
+            this.remoteSubmitRetryTimer = null;
+            if (!this.remoteSubmitText ||
+                !this.pty ||
+                this.state.status !== "busy" ||
+                !this.pendingInjectedInputs.some((input) => input.normalizedText === this.remoteSubmitText)) {
+                this.clearRemoteSubmitRetry();
+                return;
+            }
+            this.writeToPty("\r");
+            this.remoteSubmitRetryIndex += 1;
+            if (this.remoteSubmitRetryIndex >= CLAUDE_REMOTE_ENTER_RETRY_DELAYS_MS.length) {
+                this.clearRemoteSubmitRetry();
+                this.emitClaudeNotice("Claude did not confirm the WeChat message submission. Press Enter in the local Claude terminal to retry.", "warning");
+                return;
+            }
+            this.scheduleRemoteSubmitRetry();
+        }, delayMs);
+        this.remoteSubmitRetryTimer.unref?.();
+    }
+    clearRemoteSubmitRetry() {
+        if (this.remoteSubmitRetryTimer) {
+            clearTimeout(this.remoteSubmitRetryTimer);
+            this.remoteSubmitRetryTimer = null;
+        }
+        this.remoteSubmitRetryIndex = 0;
+        this.remoteSubmitText = null;
+    }
     // Fallback heuristic for older Claude Code versions that lack PostCompact hooks.
     // The structured PostCompact hook event (handled in handleClaudeHookEnvelope) is
     // the reliable signal; this regex match serves as a best-effort fallback.
@@ -1043,6 +1162,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         }
         this.clearCompletionTimer();
         this.clearWechatWorkingNotice(true);
+        this.clearRemoteSubmitRetry();
         this.pendingCliApprovalHints = null;
         this.flushPendingClaudeHookApprovals();
         this.pendingApproval = null;
@@ -1078,6 +1198,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         const completedPreview = this.currentPreview;
         this.clearCompletionTimer();
         this.clearWechatWorkingNotice(true);
+        this.clearRemoteSubmitRetry();
         this.pendingCliApprovalHints = null;
         this.flushPendingClaudeHookApprovals();
         this.pendingApproval = null;
@@ -1167,6 +1288,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         }
     }
     handleClaudeSessionStart(payload) {
+        this.markInteractiveReady();
         if (!payload.session_id) {
             return;
         }
@@ -1289,6 +1411,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         }
         const injectedIndex = findInjectedClaudePromptIndex(prompt, this.pendingInjectedInputs);
         if (injectedIndex >= 0) {
+            this.clearRemoteSubmitRetry();
             this.pendingInjectedInputs.splice(injectedIndex, 1);
             return;
         }
@@ -1331,7 +1454,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         this.state.lastSessionSwitchReason = undefined;
         this.emitClaudeNotice(`Saved Claude conversation ${failedResumeConversationId} is no longer available. Starting a fresh Claude session.`, "warning");
         try {
-            await super.reset();
+            await this.reset();
         }
         catch (error) {
             // recoverFromInvalidResume is invoked fire-and-forget (void) and there is
@@ -1440,6 +1563,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
             this.currentPreview === "(idle)") {
             return;
         }
+        this.clearRemoteSubmitRetry();
         this.clearWechatWorkingNotice(true);
         this.pendingCliApprovalHints = null;
         this.lastAutoApprovedPayload = null;