@unlinearity/cli-wechat-bridge 1.0.6 → 1.0.9

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

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import net from "node:net";
+import os from "node:os";
 import path from "node:path";
 import { buildLocalCompanionToken } from "../companion/local-companion-link.js";
 import { ensureWorkspaceChannelDir } from "../wechat/channel-config.js";
@@ -14,6 +15,69 @@ 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_STARTUP_OUTPUT_BUFFER_LIMIT = 4_000;
+function isClaudeWorkspaceTrustPrompt(text) {
+    const compact = text.replace(/\s+/g, " ").trim();
+    return (/Accessing workspace:/i.test(compact) &&
+        /Quick safety check:/i.test(compact) &&
+        /project you created or one you trust/i.test(compact) &&
+        /I trust this folder/i.test(compact));
+}
+function isRecord(value) {
+    return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+export function normalizeClaudeProjectConfigKey(cwd) {
+    return path.resolve(cwd).replace(/\\/g, "/");
+}
+export function ensureClaudeWorkspaceTrustAccepted(cwd, homeDir = process.env.USERPROFILE || process.env.HOME || os.homedir()) {
+    const configPath = path.join(homeDir, ".claude.json");
+    let config = {};
+    try {
+        if (fs.existsSync(configPath)) {
+            const raw = fs.readFileSync(configPath, "utf8");
+            config = raw.trim() ? JSON.parse(raw) : {};
+        }
+    }
+    catch {
+        return false;
+    }
+    if (!isRecord(config)) {
+        return false;
+    }
+    const projectKey = normalizeClaudeProjectConfigKey(cwd);
+    const projects = isRecord(config.projects) ? config.projects : {};
+    const currentProject = isRecord(projects[projectKey])
+        ? projects[projectKey]
+        : {};
+    if (currentProject.hasTrustDialogAccepted === true) {
+        return false;
+    }
+    const nextConfig = {
+        ...config,
+        projects: {
+            ...projects,
+            [projectKey]: {
+                ...currentProject,
+                hasTrustDialogAccepted: true,
+            },
+        },
+    };
+    const tempPath = `${configPath}.tmp-${process.pid}-${Date.now()}`;
+    try {
+        fs.writeFileSync(tempPath, `${JSON.stringify(nextConfig, null, 2)}\n`, "utf8");
+        fs.renameSync(tempPath, configPath);
+        return true;
+    }
+    catch {
+        try {
+            fs.rmSync(tempPath, { force: true });
+        }
+        catch {
+            // Best effort cleanup.
+        }
+        return false;
+    }
+}
 export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
     hookServer = null;
     hookPort = null;
@@ -32,11 +96,20 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
     workingNoticeSent = false;
     workingNoticeDelayMs = CLAUDE_WECHAT_WORKING_NOTICE_DELAY_MS;
     lastCompactCompletionAtMs = 0;
+    startupOutputBuffer = "";
+    hasAutoConfirmedWorkspaceTrustPrompt = false;
     constructor(options) {
         super(options);
-        this.runtimeSessionId = options.initialSharedSessionId ?? options.initialSharedThreadId ?? null;
-        this.resumeConversationId = options.initialResumeConversationId ?? null;
-        this.transcriptPath = options.initialTranscriptPath ?? null;
+        const shouldRestoreInitialSession = options.sessionStartMode !== "new";
+        this.runtimeSessionId = shouldRestoreInitialSession
+            ? options.initialSharedSessionId ?? options.initialSharedThreadId ?? null
+            : null;
+        this.resumeConversationId = shouldRestoreInitialSession
+            ? options.initialResumeConversationId ?? null
+            : null;
+        this.transcriptPath = shouldRestoreInitialSession
+            ? options.initialTranscriptPath ?? null
+            : null;
         if (this.runtimeSessionId) {
             this.state.sharedSessionId = this.runtimeSessionId;
             this.state.activeRuntimeSessionId = this.runtimeSessionId;
@@ -52,6 +125,9 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         if (this.pty) {
             return;
         }
+        this.startupOutputBuffer = "";
+        this.hasAutoConfirmedWorkspaceTrustPrompt = false;
+        ensureClaudeWorkspaceTrustAccepted(this.options.cwd);
         // Validate transcript file exists before launching Claude CLI.
         // After a compact, the old transcript is deleted and the persisted
         // resumeConversationId becomes invalid, causing --resume to crash.
@@ -124,6 +200,7 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         this.pendingCliApprovalHints = null;
         this.flushPendingClaudeHookApprovals();
         this.writeToPty("\u0003");
+        this.scheduleTaskComplete(shared.INTERRUPT_SETTLE_DELAY_MS);
         return true;
     }
     async reset() {
@@ -209,6 +286,9 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
             return;
         }
         this.state.lastOutputAt = nowIso();
+        if (this.maybeAutoConfirmWorkspaceTrustPrompt(text)) {
+            return;
+        }
         if (this.shouldTreatClaudeOutputAsCompactCompletion(text)) {
             this.completeClaudeCompact();
             return;
@@ -241,6 +321,18 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
             return;
         }
     }
+    maybeAutoConfirmWorkspaceTrustPrompt(text) {
+        if (this.hasAcceptedInput || this.hasAutoConfirmedWorkspaceTrustPrompt) {
+            return false;
+        }
+        this.startupOutputBuffer = `${this.startupOutputBuffer}${text}`.slice(-CLAUDE_STARTUP_OUTPUT_BUFFER_LIMIT);
+        if (!isClaudeWorkspaceTrustPrompt(this.startupOutputBuffer)) {
+            return false;
+        }
+        this.hasAutoConfirmedWorkspaceTrustPrompt = true;
+        this.writeToPty("\r");
+        return true;
+    }
     handleExit(exitCode) {
         this.detachLocalTerminal();
         this.clearWechatWorkingNotice(true);
@@ -475,6 +567,9 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         }
         return `${CLAUDE_BRACKETED_PASTE_START}${normalizedText}${CLAUDE_BRACKETED_PASTE_END}`;
     }
+    // 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.
     shouldTreatClaudeOutputAsCompactCompletion(text) {
         if (this.state.status !== "busy" &&
             this.state.status !== "awaiting_approval" &&
@@ -604,6 +699,10 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
                 this.handleClaudeStopFailure(payload);
                 this.respondToClaudeHook(params.socket, params.requestId);
                 return;
+            case "PostCompact":
+                this.completeClaudeCompact();
+                this.respondToClaudeHook(params.socket, params.requestId);
+                return;
             default:
                 this.respondToClaudeHook(params.socket, params.requestId);
                 return;

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

@@ -7,7 +7,7 @@ import { AbstractPtyAdapter } from "./bridge-adapters.core.js";
 import * as shared from "./bridge-adapters.shared.js";
 import { ensureWorkspaceChannelDir } from "../wechat/channel-config.js";
 import { CODEX_REMOTE_AUTH_TOKEN_ENV, LOCAL_CLIENT_PROTOCOL_VERSION, } from "../runtime/runtime-types.js";
-const { CODEX_APP_SERVER_HOST, CODEX_APP_SERVER_LOG_LIMIT, CODEX_APP_SERVER_READY_TIMEOUT_MS, CODEX_FINAL_REPLY_SETTLE_DELAY_MS, CODEX_RECENT_SESSION_KEY_LIMIT, CODEX_RPC_CONNECT_RETRY_MS, CODEX_RPC_RECONNECT_TIMEOUT_MS, CODEX_SESSION_FALLBACK_SCAN_INTERVAL_MS, CODEX_SESSION_LOCAL_MIRROR_FALLBACK_WINDOW_MS, CODEX_SESSION_POLL_INTERVAL_MS, CODEX_STARTUP_WARMUP_MS, CODEX_THREAD_SIGNAL_TTL_MS, INTERRUPT_SETTLE_DELAY_MS, appendBoundedLog, buildCliEnvironment, buildCodexApprovalRequest, buildCodexCliArgs, buildCodexDynamicToolCallFailureResponse, buildCodexMcpServerElicitationDeclineResponse, buildCodexPermissionsRequestApprovalResponse, buildCodexUserInputRequest, coerceWebSocketMessageData, delay, describeUnknownError, extractCodexFinalTextFromItem, extractCodexThreadFollowIdFromStatusChanged, extractCodexThreadStartedThreadId, extractCodexUserMessageText, findCodexSessionFile, findRecentCodexSessionFileForCwd, getCodexRpcRequestId, getCodexApprovalAutoResponse, getCodexWechatOutboundAttachmentDenyMessage, getNotificationThreadId, getNotificationTurnId, isRecord, isRecentIsoTimestamp, listCodexResumeSessions, normalizeComparablePath, normalizeCodexRpcError, reserveLocalPort, resolveSpawnTarget, shouldAutoCompleteCodexWechatTurnAfterFinalReply, shouldIgnoreCodexSessionReplayEntry, shouldRecoverCodexStaleBusyState, waitForTcpPort, } = shared;
+const { CODEX_APP_SERVER_HOST, CODEX_APP_SERVER_READY_TIMEOUT_MS, CODEX_FINAL_REPLY_SETTLE_DELAY_MS, CODEX_RECENT_SESSION_KEY_LIMIT, CODEX_RPC_CONNECT_RETRY_MS, CODEX_RPC_RECONNECT_TIMEOUT_MS, CODEX_SESSION_FALLBACK_SCAN_INTERVAL_MS, CODEX_SESSION_LOCAL_MIRROR_FALLBACK_WINDOW_MS, CODEX_SESSION_POLL_INTERVAL_MS, CODEX_STARTUP_WARMUP_MS, CODEX_THREAD_SIGNAL_TTL_MS, INTERRUPT_SETTLE_DELAY_MS, appendBoundedLog, buildCodexApprovalRequest, buildCodexCliArgs, buildCodexDynamicToolCallFailureResponse, buildCodexMcpServerElicitationDeclineResponse, buildCodexPermissionsRequestApprovalResponse, buildCodexUserInputRequest, coerceWebSocketMessageData, delay, describeUnknownError, extractCodexFinalTextFromItem, extractCodexThreadFollowIdFromStatusChanged, extractCodexThreadStartedThreadId, extractCodexUserMessageText, findCodexSessionFile, findRecentCodexSessionFileForCwd, getCodexRpcRequestId, getCodexApprovalAutoResponse, getCodexWechatOutboundAttachmentDenyMessage, getNotificationThreadId, getNotificationTurnId, isRecord, isRecentIsoTimestamp, listCodexResumeSessions, normalizeComparablePath, normalizeCodexRpcError, reserveLocalPort, resolveSpawnTarget, shouldAutoCompleteCodexWechatTurnAfterFinalReply, shouldIgnoreCodexSessionReplayEntry, shouldRecoverCodexStaleBusyState, waitForTcpPort, } = shared;
 const CODEX_LOCAL_THREAD_ANNOUNCE_SETTLE_MS = 150;
 export class CodexPtyAdapter extends AbstractPtyAdapter {
     runtimeKind = "codex_runtime_host";
@@ -64,7 +64,9 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
     localClientInstanceId = `${process.pid}-${Date.now().toString(36)}`;
     constructor(options) {
         super(options);
-        this.resumeThreadId = options.initialSharedSessionId ?? options.initialSharedThreadId ?? null;
+        this.resumeThreadId = options.sessionStartMode === "new"
+            ? null
+            : options.initialSharedSessionId ?? options.initialSharedThreadId ?? null;
         if (this.resumeThreadId && options.renderMode !== "panel") {
             this.state.sharedSessionId = this.resumeThreadId;
             this.state.sharedThreadId = this.resumeThreadId;
@@ -493,9 +495,27 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             this.sessionPartialLine = "";
             this.seedSessionReplayCutoff(startedAtMs);
         }
-        let content;
+        let chunk;
         try {
-            content = fs.readFileSync(this.sessionFilePath, "utf8");
+            const stat = fs.statSync(this.sessionFilePath);
+            if (stat.size < this.sessionReadOffset) {
+                this.sessionReadOffset = 0;
+                this.sessionPartialLine = "";
+            }
+            if (stat.size === this.sessionReadOffset) {
+                return;
+            }
+            const fd = fs.openSync(this.sessionFilePath, "r");
+            try {
+                const bytesToRead = stat.size - this.sessionReadOffset;
+                const buf = Buffer.alloc(bytesToRead);
+                fs.readSync(fd, buf, 0, bytesToRead, this.sessionReadOffset);
+                chunk = buf.toString("utf8");
+                this.sessionReadOffset = stat.size;
+            }
+            finally {
+                fs.closeSync(fd);
+            }
         }
         catch {
             this.sessionFilePath = null;
@@ -503,15 +523,6 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             this.sessionPartialLine = "";
             return;
         }
-        if (content.length < this.sessionReadOffset) {
-            this.sessionReadOffset = 0;
-            this.sessionPartialLine = "";
-        }
-        if (content.length === this.sessionReadOffset) {
-            return;
-        }
-        const chunk = content.slice(this.sessionReadOffset);
-        this.sessionReadOffset = content.length;
         const lines = `${this.sessionPartialLine}${chunk}`.split(/\r?\n/);
         this.sessionPartialLine = lines.pop() ?? "";
         for (const line of lines) {
@@ -1625,10 +1636,14 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         const requestId = ++this.rpcRequestCounter;
         const requestKey = this.rpcRequestKey(requestId);
         const responsePromise = new Promise((resolve, reject) => {
+            const timer = setTimeout(() => {
+                this.pendingRpcRequests.delete(requestKey);
+                reject(new Error(`Codex RPC request timed out after 30s (method: ${method})`));
+            }, 30_000);
             this.pendingRpcRequests.set(requestKey, {
                 method,
-                resolve,
-                reject,
+                resolve: (value) => { clearTimeout(timer); resolve(value); },
+                reject: (err) => { clearTimeout(timer); reject(err); },
             });
         });
         try {

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

@@ -20,21 +20,29 @@ export class LocalCompanionProxyAdapter {
     reconnectShutdownTimer = null;
     constructor(options) {
         this.options = options;
+        const shouldRestoreInitialSession = options.sessionStartMode !== "new";
+        const initialSharedSessionId = shouldRestoreInitialSession
+            ? options.initialSharedSessionId ?? options.initialSharedThreadId
+            : undefined;
         this.state = {
             kind: options.kind,
             status: "stopped",
             cwd: options.cwd,
             command: options.command,
             profile: options.profile,
-            sharedSessionId: options.initialSharedSessionId ?? options.initialSharedThreadId,
+            sharedSessionId: initialSharedSessionId,
             sharedThreadId: options.kind === "codex" || options.kind === "opencode"
-                ? options.initialSharedSessionId ?? options.initialSharedThreadId
+                ? initialSharedSessionId
                 : undefined,
             activeRuntimeSessionId: options.kind === "claude" || options.kind === "opencode"
-                ? options.initialSharedSessionId ?? options.initialSharedThreadId
+                ? initialSharedSessionId
+                : undefined,
+            resumeConversationId: shouldRestoreInitialSession && options.kind === "claude"
+                ? options.initialResumeConversationId
+                : undefined,
+            transcriptPath: shouldRestoreInitialSession && options.kind === "claude"
+                ? options.initialTranscriptPath
                 : undefined,
-            resumeConversationId: options.kind === "claude" ? options.initialResumeConversationId : undefined,
-            transcriptPath: options.kind === "claude" ? options.initialTranscriptPath : undefined,
         };
     }
     setEventSink(sink) {
@@ -286,6 +294,7 @@ export class LocalCompanionProxyAdapter {
         }
     }
     detachPanelSocket() {
+        this.rejectPendingRequests("Companion socket disconnected unexpectedly.");
         this.detachMessageListener?.();
         this.detachMessageListener = null;
         if (this.socket) {
@@ -385,7 +394,14 @@ export class LocalCompanionProxyAdapter {
         }
         const id = `${++this.requestCounter}`;
         const response = new Promise((resolve, reject) => {
-            this.pendingRequests.set(id, { resolve, reject });
+            const timer = setTimeout(() => {
+                this.pendingRequests.delete(id);
+                reject(new Error(`${this.options.kind} companion request timed out after 30s (command: ${payload.command})`));
+            }, 30_000);
+            this.pendingRequests.set(id, {
+                resolve: (value) => { clearTimeout(timer); resolve(value); },
+                reject: (err) => { clearTimeout(timer); reject(err); },
+            });
         });
         sendLocalCompanionMessage(socket, {
             type: "request",
@@ -580,15 +596,21 @@ export class AbstractPtyAdapter {
             return;
         }
         this.shuttingDown = true;
+        const pty = this.pty;
+        this.pty = null;
+        this.state.status = "stopped";
+        this.state.pid = undefined;
         try {
-            this.pty.kill();
+            const exitPromise = new Promise((resolve) => {
+                const timeout = setTimeout(resolve, 3_000);
+                pty.onExit(() => { clearTimeout(timeout); resolve(); });
+            });
+            pty.kill();
+            await exitPromise;
         }
         catch {
             // Best effort shutdown.
         }
-        this.pty = null;
-        this.state.status = "stopped";
-        this.state.pid = undefined;
     }
     getState() {
         return JSON.parse(JSON.stringify(this.state));

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

@@ -1,12 +1,13 @@
 import { spawn as spawnChildProcess } from "node:child_process";
 import { OPENCODE_SERVER_HOST, OPENCODE_SERVER_READY_TIMEOUT_MS, OPENCODE_SSE_RECONNECT_DELAY_MS, OPENCODE_SESSION_IDLE_SETTLE_MS, OPENCODE_WECHAT_WORKING_NOTICE_DELAY_MS, buildCliEnvironment, isRecord, describeUnknownError, resolveSpawnTarget, reserveLocalPort, waitForTcpPort, delay, } from "./bridge-adapters.shared.js";
 import { killProcessTreeSync } from "./bridge-process-reaper.js";
-import { WECHAT_OUTBOUND_ATTACHMENT_DENY_MESSAGE, containsWechatOutboundAttachmentPath, buildOneTimeCode, isWechatOutboundAttachmentMutationTool, isWechatOutboundAttachmentWriteCommand, normalizeOutput, nowIso, truncatePreview, OutputBatcher, } from "./bridge-utils.js";
+import { WECHAT_OUTBOUND_ATTACHMENT_DENY_MESSAGE, buildOneTimeCode, isWechatOutboundAttachmentMutationTool, isWechatOutboundAttachmentWriteCommand, normalizeOutput, nowIso, truncatePreview, OutputBatcher, } from "./bridge-utils.js";
 const OPENCODE_DEBUG_ENABLED = /^(1|true|yes|on)$/i.test(process.env.WECHAT_OPENCODE_DEBUG ?? "");
 const OPENCODE_DUPLICATE_EVENT_TTL_MS = 150;
 const OPENCODE_WECHAT_MIRROR_SUPPRESSION_TTL_MS = 30_000;
 const OPENCODE_RECENT_LOCAL_PROMPT_TTL_MS = 10_000;
 const OPENCODE_LOCAL_SESSION_CREATE_FOLLOW_TTL_MS = 5_000;
+const OPENCODE_TUI_SELECT_RETRY_DELAYS_MS = [250, 750, 1_500];
 /* ------------------------------------------------------------------ */
 /*  Adapter                                                            */
 /* ------------------------------------------------------------------ */
@@ -82,7 +83,7 @@ export class OpenCodeServerAdapter {
             this.startSseListener();
             if (this.options.renderMode === "companion") {
                 await this.startNativeClient();
-                await this.syncVisibleSessionToShared({ force: true });
+                await this.syncVisibleSessionToShared({ force: true, retry: true });
             }
             else {
                 this.state.pid = serverProcess.pid;
@@ -177,6 +178,7 @@ export class OpenCodeServerAdapter {
             clearTrackedTurn: true,
             syncVisible: true,
             forceVisibleSync: true,
+            retryVisibleSync: true,
         });
     }
     async interrupt() {
@@ -283,21 +285,25 @@ export class OpenCodeServerAdapter {
         if (this.nativeProcess) {
             const proc = this.nativeProcess;
             this.nativeProcess = null;
-            try {
-                killProcessTreeSync(proc.pid);
-            }
-            catch {
-                // Best effort.
+            if (proc.pid != null) {
+                try {
+                    killProcessTreeSync(proc.pid);
+                }
+                catch {
+                    // Best effort.
+                }
             }
         }
         if (this.serverProcess) {
             const proc = this.serverProcess;
             this.serverProcess = null;
-            try {
-                killProcessTreeSync(proc.pid);
-            }
-            catch {
-                // Best effort.
+            if (proc.pid != null) {
+                try {
+                    killProcessTreeSync(proc.pid);
+                }
+                catch {
+                    // Best effort.
+                }
             }
         }
         this.client = null;
@@ -365,7 +371,7 @@ export class OpenCodeServerAdapter {
         if (this.nativeProcess) {
             return;
         }
-        const env = buildCliEnvironment(this.options.kind);
+        const env = this.buildNativeClientEnv();
         const attachArgs = await this.buildNativeAttachArgs();
         const target = resolveSpawnTarget(this.options.command, this.options.kind, { env });
         const startedAt = nowIso();
@@ -410,6 +416,7 @@ export class OpenCodeServerAdapter {
     }
     async buildNativeAttachArgs() {
         const args = ["attach", this.getServerUrl()];
+        args.push("--dir", this.options.cwd);
         const sessionId = this.activeSessionId;
         if (sessionId && (await this.hasSession(sessionId))) {
             args.push("--session", sessionId);
@@ -417,6 +424,16 @@ export class OpenCodeServerAdapter {
         args.push(...(this.options.extraCliArgs ?? []));
         return args;
     }
+    buildNativeClientEnv() {
+        const env = buildCliEnvironment(this.options.kind);
+        if (this.activeSessionId) {
+            env.OPENCODE_ROUTE = JSON.stringify({
+                type: "session",
+                sessionID: this.activeSessionId,
+            });
+        }
+        return env;
+    }
     async createSdkClient() {
         try {
             const { createOpencodeClient } = await import("@opencode-ai/sdk/v2");
@@ -441,6 +458,21 @@ export class OpenCodeServerAdapter {
         if (!this.client) {
             return;
         }
+        if (this.options.sessionStartMode === "new") {
+            const session = this.unwrapOrThrow(await this.client.session.create({
+                directory: this.options.cwd,
+                workspace: this.activeWorkspaceId ?? undefined,
+            }));
+            this.switchSharedSession(session, {
+                source: "local",
+                reason: "local_follow",
+                syncVisible: false,
+            });
+            this.state.lastSessionSwitchAt = undefined;
+            this.state.lastSessionSwitchSource = undefined;
+            this.state.lastSessionSwitchReason = undefined;
+            return;
+        }
         let listedSessions = [];
         try {
             const result = await this.client.session.list();
@@ -1854,7 +1886,9 @@ export class OpenCodeServerAdapter {
             this.recordSessionSwitch(sessionId, options.source, options.reason, options.notify);
         }
         if (options.syncVisible !== false && (changed || options.forceVisibleSync)) {
-            void this.syncVisibleSessionSelection(typeof session === "string" ? { id: session } : session);
+            void this.syncVisibleSessionSelection(typeof session === "string" ? { id: session } : session, {
+                retry: options.retryVisibleSync,
+            });
         }
         return changed;
     }
@@ -1865,7 +1899,7 @@ export class OpenCodeServerAdapter {
         await this.syncVisibleSessionSelection({
             id: this.activeSessionId,
             workspaceID: this.activeWorkspaceId ?? undefined,
-        }, { force: options.force });
+        }, { force: options.force, retry: options.retry });
     }
     async syncVisibleSessionSelection(session, options = {}) {
         if (!this.client?.tui ||
@@ -1876,13 +1910,9 @@ export class OpenCodeServerAdapter {
         this.suppressedTuiSessionSelectId = session.id;
         this.logDebug(`[opencode-adapter:tui] selectSession session=${session.id} workspace=${session.workspaceID ?? this.activeWorkspaceId ?? "(none)"}`);
         try {
-            const result = await this.client.tui.selectSession({
-                directory: this.options.cwd,
-                workspace: session.workspaceID ?? this.activeWorkspaceId ?? undefined,
-                sessionID: session.id,
-            });
-            if (result.error !== undefined) {
-                throw result.error;
+            await this.sendVisibleSessionSelection(session);
+            if (options.retry === true) {
+                this.scheduleVisibleSessionSelectionRetries(session);
             }
         }
         catch (err) {
@@ -1892,6 +1922,33 @@ export class OpenCodeServerAdapter {
             this.logDebug(`[opencode-adapter:tui] selectSession failed for ${session.id}: ${describeUnknownError(err)}`);
         }
     }
+    async sendVisibleSessionSelection(session) {
+        if (!this.client?.tui) {
+            return;
+        }
+        const result = await this.client.tui.selectSession({
+            directory: this.options.cwd,
+            workspace: session.workspaceID ?? this.activeWorkspaceId ?? undefined,
+            sessionID: session.id,
+        });
+        if (result.error !== undefined) {
+            throw result.error;
+        }
+    }
+    scheduleVisibleSessionSelectionRetries(session) {
+        for (const retryDelayMs of OPENCODE_TUI_SELECT_RETRY_DELAYS_MS) {
+            setTimeout(() => {
+                if (this.shuttingDown ||
+                    this.options.renderMode !== "companion" ||
+                    this.activeSessionId !== session.id) {
+                    return;
+                }
+                void this.sendVisibleSessionSelection(session).catch((err) => {
+                    this.logDebug(`[opencode-adapter:tui] selectSession retry failed for ${session.id}: ${describeUnknownError(err)}`);
+                });
+            }, retryDelayMs).unref?.();
+        }
+    }
     isLocalSessionNavigationCommand(command) {
         if (!command) {
             return false;

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

@@ -2,13 +2,10 @@ import fs from "node:fs";
 import path from "node:path";
 import net from "node:net";
 import { fileURLToPath } from "node:url";
-import { spawn as spawnChild, spawnSync } from "node:child_process";
+import { spawnSync } from "node:child_process";
 import { spawn as spawnPty } from "node-pty";
-import { attachLocalCompanionMessageListener, buildLocalCompanionToken, clearLocalCompanionEndpoint, sendLocalCompanionMessage, writeLocalCompanionEndpoint, } from "../companion/local-companion-link.js";
-import { ensureWorkspaceChannelDir } from "../wechat/channel-config.js";
-import { buildClaudeFailureMessage, buildClaudeHookSettings, buildClaudePermissionDecisionHookOutput, buildClaudePermissionApprovalRequest, extractClaudeResumeConversationId, findInjectedClaudePromptIndex, normalizeClaudeAssistantMessage, parseClaudeHookPayload, } from "./claude-hooks.js";
-import { WECHAT_OUTBOUND_ATTACHMENT_DENY_MESSAGE, containsWechatOutboundAttachmentPath, containsWechatOutboundAttachmentPathDeep, detectCliApproval, isWechatOutboundAttachmentWriteCommand, isHighRiskShellCommand, normalizeOutput, nowIso, truncatePreview, } from "./bridge-utils.js";
-import { coerceWebSocketMessageData, describeUnknownError, getCodexRpcRequestId, getLocalCompanionCommandName, getNotificationThreadId, getNotificationTurnId, getSharedSessionIdFromAdapterState, isRecentIsoTimestamp, isRecord, normalizeCodexRpcError, quotePosixCommandArg, quoteWindowsCommandArg, } from "./bridge-adapter-common.js";
+import { WECHAT_OUTBOUND_ATTACHMENT_DENY_MESSAGE, containsWechatOutboundAttachmentPath, containsWechatOutboundAttachmentPathDeep, isWechatOutboundAttachmentWriteCommand, isHighRiskShellCommand, normalizeOutput, truncatePreview, } from "./bridge-utils.js";
+import { getNotificationThreadId, isRecord, } from "./bridge-adapter-common.js";
 export { coerceWebSocketMessageData, describeUnknownError, getCodexRpcRequestId, getLocalCompanionCommandName, getNotificationThreadId, getNotificationTurnId, getSharedSessionIdFromAdapterState, isRecentIsoTimestamp, isRecord, normalizeCodexRpcError, quotePosixCommandArg, quoteWindowsCommandArg, } from "./bridge-adapter-common.js";
 export const DEFAULT_COLS = 120;
 export const DEFAULT_ROWS = 30;

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

@@ -1,4 +1,5 @@
 import { spawnSync } from "node:child_process";
+import path from "node:path";
 const PEER_BRIDGE_EXIT_TIMEOUT_MS = 4_000;
 const PEER_BRIDGE_EXIT_POLL_MS = 100;
 function isPidAlive(pid) {
@@ -24,7 +25,30 @@ function isRecord(value) {
 }
 export function isWechatBridgeCommandLine(commandLine) {
     return (/wechat-bridge\.(?:ts|js|mjs)/i.test(commandLine) &&
-        /(?:^|\s)--adapter(?:\s|=)/i.test(commandLine));
+        /(?:^|\s|["'])--adapter(?:(?:["']?\s)|=)/i.test(commandLine));
+}
+export function isWechatDaemonCommandLine(commandLine) {
+    return /wechat-daemon\.(?:ts|js|mjs)/i.test(commandLine);
+}
+function normalizeComparablePath(filePath) {
+    const normalized = path.resolve(filePath);
+    return process.platform === "win32" ? normalized.toLowerCase() : normalized;
+}
+function extractCommandLineOption(commandLine, optionName) {
+    const escaped = optionName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const pattern = new RegExp(`(?:^|\\s|["'])--${escaped}(?:(?:["']?\\s+)|=)(?:"([^"]+)"|'([^']+)'|(\\S+))`, "i");
+    const match = pattern.exec(commandLine);
+    return match?.[1] ?? match?.[2] ?? match?.[3] ?? null;
+}
+export function isWechatDaemonCommandLineForCwd(commandLine, cwd) {
+    if (!isWechatDaemonCommandLine(commandLine)) {
+        return false;
+    }
+    const commandCwd = extractCommandLineOption(commandLine, "cwd");
+    if (!commandCwd) {
+        return true;
+    }
+    return normalizeComparablePath(commandCwd) === normalizeComparablePath(cwd);
 }
 /**
  * Detects `opencode serve` command lines spawned by the bridge adapter.
@@ -165,6 +189,21 @@ export function listPeerBridgeProcesses(currentPid = process.pid) {
         ? listWindowsBridgeProcesses(currentPid)
         : listPosixBridgeProcesses(currentPid);
 }
+export function getProcessRecordByPid(pid, currentPid = process.pid) {
+    if (!Number.isInteger(pid) || pid <= 0 || pid === currentPid) {
+        return null;
+    }
+    return listAllProcessesRaw(currentPid).find((record) => record.pid === pid) ?? null;
+}
+export function listWechatDaemonProcesses(params = {}) {
+    const currentPid = params.currentPid ?? process.pid;
+    const excludePids = new Set(params.excludePids ?? []);
+    return listAllProcessesRaw(currentPid)
+        .filter((record) => !excludePids.has(record.pid))
+        .filter((record) => params.cwd
+        ? isWechatDaemonCommandLineForCwd(record.commandLine, params.cwd)
+        : isWechatDaemonCommandLine(record.commandLine));
+}
 /**
  * List all managed OpenCode child processes (`serve` and `attach`) whose parent
  * PID is no longer alive. These are orphaned processes left behind when a bridge
@@ -289,9 +328,14 @@ export function killProcessTreeSync(pid) {
     }
     else {
         try {
-            process.kill(pid);
+            process.kill(-pid);
+        }
+        catch {
+            try {
+                process.kill(pid);
+            }
+            catch { /* best effort */ }
         }
-        catch { /* best effort */ }
     }
 }
 export async function reapPeerBridgeProcesses(params = {}) {

package/dist/bridge/bridge-state.js

@@ -169,14 +169,17 @@ export class BridgeStateStore {
             lifecycle: options.lifecycle,
         };
         this.acquireLock();
+        const shouldRestoreSessionState = options.sessionStartMode !== "new";
         const persisted = this.readStateFile();
-        const persistedSharedSessionId = resolveRestorableSharedSessionId(persisted, options);
-        const persistedResumeConversationId = options.adapter === "claude" &&
+        const persistedSharedSessionId = resolveRestorableSharedSessionId(shouldRestoreSessionState ? persisted : null, options);
+        const persistedResumeConversationId = shouldRestoreSessionState &&
+            options.adapter === "claude" &&
             persisted?.cwd === options.cwd &&
             typeof persisted.resumeConversationId === "string"
             ? persisted.resumeConversationId
             : undefined;
-        const persistedTranscriptPath = options.adapter === "claude" &&
+        const persistedTranscriptPath = shouldRestoreSessionState &&
+            options.adapter === "claude" &&
             persisted?.cwd === options.cwd &&
             typeof persisted.transcriptPath === "string"
             ? persisted.transcriptPath

package/dist/bridge/bridge-utils.js

@@ -268,8 +268,8 @@ function formatPromptByteSize(bytes) {
 }
 function formatWechatInboundAttachmentPrompt(attachments) {
     const lines = [
-        "[WeChat inbound attachments]",
-        "The user sent attachment files through WeChat. They have been saved locally. Read the local paths directly if the user's request requires inspecting them.",
+        "[WeChat inbound attachments — ACTION REQUIRED]",
+        "The user sent the following files through WeChat. You MUST use the Read tool to read each file path below BEFORE responding. Do NOT skip reading these files — the user expects you to see their content (including images).",
     ];
     attachments.forEach((attachment, index) => {
         const sizeText = formatPromptByteSize(attachment.sizeBytes);
@@ -280,6 +280,8 @@ function formatWechatInboundAttachmentPrompt(attachments) {
         ].filter(Boolean);
         lines.push(`${index + 1}. ${metadata.join(" ")} path=${attachment.path}`);
     });
+    lines.push("");
+    lines.push("Remember: Read each path above with the Read tool NOW. Images are viewable via Read.");
     return lines.join("\n");
 }
 export function buildWechatInboundPrompt(text, attachments = []) {