@unlinearity/cli-wechat-bridge 1.1.5 → 1.2.0

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

@@ -1,3 +1,11 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (c) 2026 UNLINEARITY <unlinearity@gmail.com>
+// Source: https://github.com/UNLINEARITY/CLI-WeChat-Bridge
+// This file is part of CLI-WeChat-Bridge. Modifications and derivative works
+// must be released under AGPL-3.0-or-later with full source code; see
+// LICENSE.txt. Network services built on it must offer source to users.
+import { NativeTerminalControl, readClaudePermissionMode } from "./native-terminal-control.js";
+import { ClaudeNativeControls } from "./claude-native-controls.js";
 import fs from "node:fs";
 import net from "node:net";
 import os from "node:os";
@@ -7,7 +15,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 +26,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 +347,26 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
     polledTranscriptSessionId = null;
     pendingResume = null;
     localResumeSessionEndObserved = false;
+    interactiveReady = true;
+    interactiveReadyTimer = null;
+    interactiveReadyWaiters = new Set();
+    remoteSubmitRetryTimer = null;
+    remoteSubmitRetryIndex = 0;
+    remoteSubmitText = null;
+    terminalControl = new NativeTerminalControl({
+        write: (text) => this.writeToPty(text),
+        identity: () => JSON.stringify([this.state.pid, this.runtimeSessionId, this.resumeConversationId]),
+        isPromptEmpty: () => readClaudePermissionMode(this.terminalControl.text) !== null,
+        assertReady: () => {
+            if (!this.pty || this.state.status !== "idle" || this.pendingApproval || this.pendingResume) {
+                throw new Error("Claude must be idle with no pending approval before using remote controls.");
+            }
+        },
+    });
+    nativeControls = new ClaudeNativeControls(this.terminalControl, () => this.resumeConversationId ?? this.runtimeSessionId ?? "");
+    async listModels() { return this.nativeControls.listModels(); }
+    async selectModel(modelId) { return this.nativeControls.selectModel(modelId); }
+    async setPlanMode(enabled) { return this.nativeControls.setPlanMode(enabled); }
     constructor(options) {
         super(options);
         const shouldRestoreInitialSession = options.sessionStartMode !== "new";
@@ -363,6 +394,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         if (this.pty) {
             return;
         }
+        this.beginInteractiveReadinessWait();
         this.startupOutputBuffer = "";
         this.hasAutoConfirmedWorkspaceTrustPrompt = false;
         ensureClaudeWorkspaceTrustAccepted(this.options.cwd);
@@ -384,16 +416,22 @@ 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;
         }
     }
     async sendInput(text) {
+        if (this.terminalControl.active)
+            throw new Error("A Claude control operation is in progress.");
         if (!this.pty) {
             throw new Error("claude adapter is not running.");
         }
@@ -403,7 +441,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,12 +469,15 @@ 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) {
         return listClaudeResumeSessions(this.options.cwd, limit);
     }
     async resumeSession(sessionId) {
+        if (this.terminalControl.active)
+            throw new Error("A CLI control operation is in progress. Wait for it to finish before switching sessions.");
         if (!this.pty) {
             throw new Error("Claude is not running yet.");
         }
@@ -522,6 +574,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         return findClaudeResumeSessionFile(this.options.cwd, sessionId);
     }
     async interrupt() {
+        this.terminalControl.cancel("The remote control operation was interrupted.");
         if (!this.pty) {
             return false;
         }
@@ -529,6 +582,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
             return false;
         }
         this.clearWechatWorkingNotice(true);
+        this.clearRemoteSubmitRetry();
         this.pendingCliApprovalHints = null;
         this.flushPendingClaudeHookApprovals();
         if (this.pendingApproval) {
@@ -551,6 +605,8 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         return true;
     }
     async reset() {
+        if (this.terminalControl.active)
+            throw new Error("A CLI control operation is in progress. Wait for it to finish before switching sessions.");
         this.rejectPendingResume(new Error("Claude was reset during session switching."));
         this.clearWechatWorkingNotice(true);
         this.pendingCliApprovalHints = null;
@@ -565,7 +621,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) {
@@ -619,9 +676,12 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         return ok ? 1 : 0;
     }
     async dispose() {
+        this.terminalControl.cancel("Claude is shutting down.");
         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();
@@ -646,6 +706,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         this.startHookHealthCheck();
     }
     handleData(rawText) {
+        this.terminalControl.feed(rawText);
         this.renderLocalOutput(rawText);
         const text = normalizeOutput(rawText);
         if (!text) {
@@ -717,10 +778,15 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         return true;
     }
     handleExit(exitCode) {
+        this.terminalControl.cancel("Claude exited during the control operation.");
         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();
@@ -869,6 +935,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         }
         this.localTerminalInputListener = (chunk) => {
             const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+            this.terminalControl.localInput(text);
             this.writeToPty(text);
         };
         process.stdin.on("data", this.localTerminalInputListener);
@@ -897,10 +964,11 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         }
     }
     resizePtyToTerminal() {
-        if (!this.pty || !process.stdout.isTTY) {
+        if (!this.pty) {
             return;
         }
         try {
+            this.terminalControl.resize(process.stdout.columns || DEFAULT_COLS, process.stdout.rows || DEFAULT_ROWS);
             this.pty.resize?.(process.stdout.columns || DEFAULT_COLS, process.stdout.rows || DEFAULT_ROWS);
         }
         catch {
@@ -995,6 +1063,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 +1196,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         }
         this.clearCompletionTimer();
         this.clearWechatWorkingNotice(true);
+        this.clearRemoteSubmitRetry();
         this.pendingCliApprovalHints = null;
         this.flushPendingClaudeHookApprovals();
         this.pendingApproval = null;
@@ -1078,6 +1232,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 +1322,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         }
     }
     handleClaudeSessionStart(payload) {
+        this.markInteractiveReady();
         if (!payload.session_id) {
             return;
         }
@@ -1289,6 +1445,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 +1488,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 +1597,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
             this.currentPreview === "(idle)") {
             return;
         }
+        this.clearRemoteSubmitRetry();
         this.clearWechatWorkingNotice(true);
         this.pendingCliApprovalHints = null;
         this.lastAutoApprovedPayload = null;