cli-wechat-bridge 1.0.6 → 1.0.7

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.
@@ -209,6 +285,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 +320,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);

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;

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) {

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() {
@@ -365,7 +367,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 +412,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 +420,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 +454,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 +1882,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 +1895,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 +1906,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 +1918,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

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/wechat-bridge.js

@@ -151,6 +151,7 @@ export function parseCliArgs(argv) {
     let cwd = process.cwd();
     let profile;
     let lifecycle = "persistent";
+    let sessionStartMode = "restore";
     for (let i = 0; i < argv.length; i += 1) {
         const arg = argv[i];
         const next = argv[i + 1];
@@ -190,6 +191,13 @@ export function parseCliArgs(argv) {
                 lifecycle = next;
                 i += 1;
                 break;
+            case "--session-start-mode":
+                if (!next || !["restore", "new"].includes(next)) {
+                    throw new Error(`Invalid session start mode: ${next ?? "(missing)"}`);
+                }
+                sessionStartMode = next;
+                i += 1;
+                break;
             case "--shutdown-on-parent-exit":
                 lifecycle = "companion_bound";
                 break;
@@ -211,11 +219,12 @@ export function parseCliArgs(argv) {
         cwd,
         profile,
         lifecycle,
+        sessionStartMode,
     };
 }
 function printUsageAndExit() {
     process.stdout.write([
-        "Usage: wechat-bridge --adapter <codex|claude|opencode|shell> [--cmd <executable>] [--cwd <path>] [--profile <name-or-path>] [--lifecycle <persistent|companion_bound>]",
+        "Usage: wechat-bridge --adapter <codex|claude|opencode|shell> [--cmd <executable>] [--cwd <path>] [--profile <name-or-path>] [--lifecycle <persistent|companion_bound>] [--session-start-mode <restore|new>]",
         "",
         "Examples:",
         "  wechat-bridge-codex",
@@ -305,6 +314,7 @@ async function main() {
         cwd: options.cwd,
         profile: options.profile,
         lifecycle: options.lifecycle,
+        sessionStartMode: options.sessionStartMode,
         initialSharedSessionId: stateStore.getState().sharedSessionId ?? stateStore.getState().sharedThreadId,
         initialResumeConversationId: stateStore.getState().resumeConversationId,
         initialTranscriptPath: stateStore.getState().transcriptPath,

package/dist/commands/check-update.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-import { checkForUpdate, getCurrentVersion, fetchLatestVersion, compareVersions, } from "../utils/version-checker.js";
+import { checkForUpdate, getCurrentVersion, } from "../utils/version-checker.js";
 async function main() {
     const currentVersion = await getCurrentVersion();
     console.log(`CLI WeChat Bridge Version Check`);

package/dist/companion/local-companion-start.js

@@ -37,6 +37,9 @@ export function formatSwitchFailureMessage(cwd) {
 export function formatRestartUnhealthyMessage(cwd) {
     return `Detected unhealthy companion state for ${cwd}. Restarting bridge...`;
 }
+export function defaultSessionStartMode(adapter) {
+    return adapter === "claude" || adapter === "opencode" ? "new" : "restore";
+}
 export function decideLaunchAction(input) {
     if (input.lockShouldAutoReclaim) {
         return {
@@ -55,6 +58,13 @@ export function decideLaunchAction(input) {
             failureMessage: formatSwitchFailureMessage(input.runningLock.cwd),
         };
     }
+    if (input.sessionStartMode === "new" &&
+        (input.requestedAdapter === "claude" || input.requestedAdapter === "opencode")) {
+        return {
+            kind: "start_bridge",
+            message: `Starting a fresh ${input.requestedAdapter} session for ${input.requestedCwd}...`,
+        };
+    }
     if (!input.endpoint || !input.endpointIsReachable) {
         return {
             kind: "restart_unhealthy",
@@ -99,7 +109,8 @@ export function parseCliArgs(argv) {
                 "       wechat-opencode-start [--cwd <path>] [--profile <name-or-path>] [--timeout-ms <ms>] [...opencode args]",
                 "       local-companion-start [--adapter <codex|claude|opencode>] [--cwd <path>] [--profile <name-or-path>] [--timeout-ms <ms>] [...cli args]",
                 "",
-                "Starts or reuses a Codex, Claude, or OpenCode bridge for the current directory, waits for the local endpoint, then opens the visible companion or panel.",
+                "Starts a bridge for the current directory, waits for the local endpoint, then opens the visible companion or panel.",
+                "Claude and OpenCode launchers start a fresh CLI session by default.",
                 "All adapters are companion-bound: closing the companion/panel also stops the bridge.",
                 "Unknown arguments are forwarded to the visible CLI client.",
                 "",
@@ -144,7 +155,14 @@ export function parseCliArgs(argv) {
         }
         cliArgs.push(arg);
     }
-    return { adapter, cwd, profile, timeoutMs, cliArgs };
+    return {
+        adapter,
+        cwd,
+        profile,
+        timeoutMs,
+        sessionStartMode: defaultSessionStartMode(adapter),
+        cliArgs,
+    };
 }
 function isPidAlive(pid) {
     if (!Number.isInteger(pid) || pid <= 0) {
@@ -247,6 +265,9 @@ export function buildBackgroundBridgeArgs(entryPath, options) {
         args.push("--experimental-strip-types");
     }
     args.push(entryPath, "--adapter", options.adapter, "--cwd", options.cwd, "--lifecycle", lifecycle);
+    if (options.sessionStartMode !== "restore") {
+        args.push("--session-start-mode", options.sessionStartMode);
+    }
     if (options.profile) {
         args.push("--profile", options.profile);
     }
@@ -304,6 +325,7 @@ async function ensureBridgeReady(options) {
         endpoint: endpointResult.endpoint,
         endpointIsReachable: Boolean(endpointResult.endpoint),
         companionIsAlive: isCompanionAlive(endpointResult.endpoint),
+        sessionStartMode: options.sessionStartMode,
     });
     log(options.adapter, decision.message);
     if (decision.kind === "already_active") {
@@ -355,6 +377,8 @@ export async function tryDelegateToDaemon(options, deps = {}) {
         profile: options.profile,
         cliArgs: options.cliArgs,
         openVisible: true,
+        sessionStartMode: options.sessionStartMode,
+        reuseExistingVisible: true,
     });
     if (!response.ok) {
         throw new Error(response.error);
@@ -374,6 +398,7 @@ export async function runVisibleClient(options, runners = {}) {
     return await (runners.localCompanion ?? runLocalCompanion)({
         adapter: options.adapter,
         cwd: options.cwd,
+        sessionStartMode: options.sessionStartMode,
         cliArgs: options.cliArgs,
     });
 }

package/dist/companion/local-companion.js

@@ -13,6 +13,7 @@ function log(adapter, message) {
 function parseCliArgs(argv) {
     let adapter = null;
     let cwd = process.cwd();
+    let sessionStartMode = "restore";
     const cliArgs = [];
     for (let i = 0; i < argv.length; i += 1) {
         const arg = argv[i];
@@ -46,12 +47,20 @@ function parseCliArgs(argv) {
             i += 1;
             continue;
         }
+        if (arg === "--session-start-mode") {
+            if (!next || !["restore", "new"].includes(next)) {
+                throw new Error(`Invalid session start mode: ${next ?? "(missing)"}`);
+            }
+            sessionStartMode = next;
+            i += 1;
+            continue;
+        }
         cliArgs.push(arg);
     }
     if (!adapter) {
         throw new Error("Missing required --adapter <codex|claude|opencode>");
     }
-    return { adapter, cwd, cliArgs };
+    return { adapter, cwd, sessionStartMode, cliArgs };
 }
 function delay(ms) {
     if (ms <= 0) {
@@ -79,14 +88,22 @@ export async function runLocalCompanion(options) {
             extraCliArgs: options.cliArgs,
         });
     }
+    const shouldRestoreInitialSession = options.sessionStartMode !== "new";
     const adapter = createBridgeAdapter({
         kind: initialEndpoint.kind,
         command: initialEndpoint.command,
         cwd: initialEndpoint.cwd,
         profile: initialEndpoint.profile,
-        initialSharedSessionId: initialEndpoint.sharedSessionId ?? initialEndpoint.sharedThreadId,
-        initialResumeConversationId: initialEndpoint.resumeConversationId,
-        initialTranscriptPath: initialEndpoint.transcriptPath,
+        initialSharedSessionId: shouldRestoreInitialSession
+            ? initialEndpoint.sharedSessionId ?? initialEndpoint.sharedThreadId
+            : undefined,
+        initialResumeConversationId: shouldRestoreInitialSession
+            ? initialEndpoint.resumeConversationId
+            : undefined,
+        initialTranscriptPath: shouldRestoreInitialSession
+            ? initialEndpoint.transcriptPath
+            : undefined,
+        sessionStartMode: options.sessionStartMode,
         renderMode: initialEndpoint.kind === "codex" ? "panel" : "companion",
         extraCliArgs: options.cliArgs,
     });