cli-wechat-bridge 1.1.6 → 1.1.7

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

@@ -18,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;
@@ -337,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";
@@ -364,6 +372,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         if (this.pty) {
             return;
         }
+        this.beginInteractiveReadinessWait();
         this.startupOutputBuffer = "";
         this.hasAutoConfirmedWorkspaceTrustPrompt = false;
         ensureClaudeWorkspaceTrustAccepted(this.options.cwd);
@@ -385,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;
         }
@@ -404,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(),
@@ -421,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) {
@@ -530,6 +555,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
             return false;
         }
         this.clearWechatWorkingNotice(true);
+        this.clearRemoteSubmitRetry();
         this.pendingCliApprovalHints = null;
         this.flushPendingClaudeHookApprovals();
         if (this.pendingApproval) {
@@ -566,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) {
@@ -623,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();
@@ -720,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();
@@ -996,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.
@@ -1044,6 +1162,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         }
         this.clearCompletionTimer();
         this.clearWechatWorkingNotice(true);
+        this.clearRemoteSubmitRetry();
         this.pendingCliApprovalHints = null;
         this.flushPendingClaudeHookApprovals();
         this.pendingApproval = null;
@@ -1079,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;
@@ -1168,6 +1288,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         }
     }
     handleClaudeSessionStart(payload) {
+        this.markInteractiveReady();
         if (!payload.session_id) {
             return;
         }
@@ -1290,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;
         }
@@ -1332,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
@@ -1441,6 +1563,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
             this.currentPreview === "(idle)") {
             return;
         }
+        this.clearRemoteSubmitRetry();
         this.clearWechatWorkingNotice(true);
         this.pendingCliApprovalHints = null;
         this.lastAutoApprovedPayload = null;

package/dist/bridge/bridge-process-reaper.js

@@ -113,7 +113,7 @@ function normalizeBridgeProcessRecord(value) {
     }
     return record;
 }
-export function parseWindowsBridgeProcessProbeOutput(stdout, currentPid = process.pid) {
+function parseWindowsProcessProbeRecords(stdout) {
     const trimmed = stdout.trim();
     if (!trimmed) {
         return [];
@@ -128,7 +128,13 @@ export function parseWindowsBridgeProcessProbeOutput(stdout, currentPid = proces
     const values = Array.isArray(parsed) ? parsed : [parsed];
     return values
         .map(normalizeBridgeProcessRecord)
-        .filter((record) => Boolean(record))
+        .filter((record) => Boolean(record));
+}
+export function parseWindowsProcessRecordProbeOutput(stdout, currentPid = process.pid) {
+    return (parseWindowsProcessProbeRecords(stdout).find((record) => record.pid !== currentPid) ?? null);
+}
+export function parseWindowsBridgeProcessProbeOutput(stdout, currentPid = process.pid) {
+    return parseWindowsProcessProbeRecords(stdout)
         .filter((record) => record.pid !== currentPid && isWechatBridgeCommandLine(record.commandLine));
 }
 export function parsePosixBridgeProcessProbeOutput(stdout, currentPid = process.pid) {
@@ -195,10 +201,37 @@ export function listPeerBridgeProcesses(currentPid = process.pid) {
         ? listWindowsBridgeProcesses(currentPid)
         : listPosixBridgeProcesses(currentPid);
 }
+function getWindowsProcessRecordByPid(pid, currentPid = process.pid) {
+    const probe = spawnSync("powershell.exe", [
+        "-NoLogo",
+        "-NoProfile",
+        "-NonInteractive",
+        "-ExecutionPolicy",
+        "Bypass",
+        "-Command",
+        [
+            "$ErrorActionPreference='Stop';",
+            `Get-CimInstance Win32_Process -Filter 'ProcessId = ${pid}'`,
+            "| Select-Object ProcessId,ParentProcessId,Name,CommandLine",
+            "| ConvertTo-Json -Compress",
+        ].join(" "),
+    ], {
+        encoding: "utf8",
+        windowsHide: true,
+        timeout: 8_000,
+    });
+    if (probe.status !== 0 || typeof probe.stdout !== "string") {
+        return null;
+    }
+    return parseWindowsProcessRecordProbeOutput(probe.stdout, currentPid);
+}
 export function getProcessRecordByPid(pid, currentPid = process.pid) {
     if (!Number.isInteger(pid) || pid <= 0 || pid === currentPid) {
         return null;
     }
+    if (process.platform === "win32") {
+        return getWindowsProcessRecordByPid(pid, currentPid);
+    }
     return listAllProcessesRaw(currentPid).find((record) => record.pid === pid) ?? null;
 }
 export function listWechatDaemonProcesses(params = {}) {

package/dist/bridge/bridge-state.js

@@ -79,6 +79,9 @@ export function normalizeBridgeLockPayload(value) {
         startedAt: record.startedAt,
         lifecycle: record.lifecycle === "companion_bound" ? "companion_bound" : "persistent",
         legacyLifecycleFallback: hasExplicitLifecycle ? undefined : true,
+        ...(record.channelId === "wechat" || record.channelId === "wecom"
+            ? { channelId: record.channelId }
+            : {}),
     };
 }
 export function readBridgeLockFile() {
@@ -148,11 +151,13 @@ function buildLockConflictError(lock) {
  * pid is alive but belongs to something else, and "unknown" when the command
  * line could not be resolved (probe failure, restricted permissions).
  */
-export function classifyLockHolderProcess(pid) {
-    if (!isPidAlive(pid)) {
+export function classifyLockHolderProcess(pid, dependencies = {}) {
+    const isProcessAlive = dependencies.isPidAlive ?? isPidAlive;
+    const getProcessRecord = dependencies.getProcessRecordByPid ?? getProcessRecordByPid;
+    if (!isProcessAlive(pid)) {
         return "unknown";
     }
-    const record = getProcessRecordByPid(pid);
+    const record = getProcessRecord(pid);
     if (!record) {
         return "unknown";
     }
@@ -200,6 +205,7 @@ export class BridgeStateStore {
             cwd: options.cwd,
             startedAt: new Date(this.bridgeStartedAtMs).toISOString(),
             lifecycle: options.lifecycle,
+            channelId: options.channelId,
         };
         this.acquireLock();
         const shouldRestoreSessionState = options.sessionStartMode !== "new";
@@ -231,6 +237,7 @@ export class BridgeStateStore {
             resumeConversationId: persistedResumeConversationId,
             transcriptPath: persistedTranscriptPath,
             lastActivityAt: persisted?.lastActivityAt,
+            channelId: options.channelId,
             pendingConfirmation: null,
             pendingUserInput: null,
         };