cli-wechat-bridge 1.1.4 → 1.1.6

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

@@ -1,16 +1,73 @@
 import fs from "node:fs";
 import path from "node:path";
 import crypto from "node:crypto";
-import { spawn as spawnChild } from "node:child_process";
-import { detectCliApproval, normalizeOutput, nowIso, truncatePreview, } from "./bridge-utils.js";
+import { spawn as spawnChild, spawnSync } from "node:child_process";
+import { detectCliApproval, } from "./bridge-utils.js";
+import { normalizeOutput, nowIso, summarizeOutput, truncatePreview, } from "../core/text-utils.js";
 import { AbstractPtyAdapter } from "./bridge-adapters.core.js";
 import { killProcessTreeSync } from "./bridge-process-reaper.js";
 import * as shared from "./bridge-adapters.shared.js";
+import { requestCodexVisibleThreadSwitch } from "../companion/codex-visible-client-link.js";
 import { ensureWorkspaceChannelDir } from "../wechat/channel-config.js";
 import { CODEX_REMOTE_AUTH_TOKEN_ENV, LOCAL_CLIENT_PROTOCOL_VERSION, } from "../runtime/runtime-types.js";
+export function parseCodexCliVersion(output) {
+    const match = output.match(/\b(\d+\.\d+\.\d+)\b/);
+    return match?.[1] ?? null;
+}
+export function isCodexVersionInCompatibilityRange(version) {
+    const parts = version.split(".").map((part) => Number(part));
+    if (parts.length !== 3 || parts.some((part) => !Number.isInteger(part))) {
+        return false;
+    }
+    const major = parts[0] ?? -1;
+    const minor = parts[1] ?? -1;
+    return major === 0 && minor >= 149 && minor <= 151;
+}
 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;
 const CODEX_NON_BLOCKING_USER_INPUT_TIMEOUT_MS = 120_000;
+const CODEX_RESUME_REPLAY_SETTLE_MS = 5_000;
+function getCodexThreadStatusType(value) {
+    if (typeof value === "string") {
+        return value;
+    }
+    return isRecord(value) && typeof value.type === "string" ? value.type : null;
+}
+function getCodexThreadTitle(thread) {
+    const name = typeof thread.name === "string" ? normalizeOutput(thread.name).trim() : "";
+    const preview = typeof thread.preview === "string" ? normalizeOutput(thread.preview).trim() : "";
+    const threadId = typeof thread.id === "string" ? thread.id : "";
+    return truncatePreview(name || preview || `Codex thread ${threadId.slice(0, 8)}`, 120);
+}
+export function buildCodexResumeCandidatesFromThreadList(response, cwd, limit) {
+    if (!isRecord(response) || !Array.isArray(response.data)) {
+        throw new Error("Codex returned an invalid thread/list response.");
+    }
+    const currentCwd = normalizeComparablePath(cwd);
+    return response.data
+        .filter((thread) => isRecord(thread))
+        .filter((thread) => typeof thread.id === "string")
+        .filter((thread) => {
+        const threadCwd = typeof thread.cwd === "string" ? thread.cwd : "";
+        return threadCwd && normalizeComparablePath(threadCwd) === currentCwd;
+    })
+        .filter((thread) => typeof thread.parentThreadId !== "string")
+        .map((thread) => {
+        const updatedAt = typeof thread.updatedAt === "number" && Number.isFinite(thread.updatedAt)
+            ? thread.updatedAt * 1_000
+            : 0;
+        const threadId = thread.id;
+        return {
+            sessionId: threadId,
+            threadId,
+            title: getCodexThreadTitle(thread),
+            lastUpdatedAt: new Date(updatedAt).toISOString(),
+            source: "codex",
+        };
+    })
+        .sort((left, right) => Date.parse(right.lastUpdatedAt) - Date.parse(left.lastUpdatedAt))
+        .slice(0, Math.max(1, limit));
+}
 export class CodexPtyAdapter extends AbstractPtyAdapter {
     runtimeKind = "codex_runtime_host";
     appServer = null;
@@ -27,8 +84,12 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
     rpcRequestCounter = 0;
     pendingRpcRequests = new Map();
     subscribedThreadIds = new Set();
+    pendingThreadSubscriptions = new Map();
     sharedThreadId = null;
     announcedThreadId = null;
+    localThreadFollowBlockedUntilMs = 0;
+    pendingThreadStatusChecks = new Map();
+    threadStatusCheckEpoch = 0;
     pendingThreadAnnouncement = null;
     activeTurn = null;
     bridgeOwnedTurnIds = new Set();
@@ -37,6 +98,9 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
     pendingTurnThreadId = null;
     interruptPendingTurnStart = false;
     pendingThreadFollowId = null;
+    pendingVisibleResume = null;
+    bridgeResumeReplayThreadId = null;
+    bridgeResumeReplayUntilMs = 0;
     pendingApprovalRequests = [];
     pendingUserInputRequest = null;
     pendingUserInputTimer = null;
@@ -65,6 +129,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
     finalReplyCompletionTimer = null;
     finalReplyCompletionTurnId = null;
     resumeThreadId;
+    codexCliVersion = null;
     localClientInstanceId = `${process.pid}-${Date.now().toString(36)}`;
     constructor(options) {
         super(options);
@@ -83,6 +148,13 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         if (this.isHeadlessRuntimeMode()) {
             this.setStatus("starting", `Starting ${this.options.kind} runtime host...`);
         }
+        this.codexCliVersion = this.detectCodexCliVersion();
+        const compatibility = this.codexCliVersion
+            ? isCodexVersionInCompatibilityRange(this.codexCliVersion)
+                ? `compatible=${this.codexCliVersion}`
+                : `outside-supported-range=${this.codexCliVersion}`
+            : "unknown-version";
+        this.setStatus("starting", `Codex protocol compatibility: ${compatibility}.`);
         await this.startAppServer();
         await this.connectRpcClient();
         await this.restoreInitialSharedThreadIfNeeded();
@@ -165,13 +237,16 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         this.writeToPty("\r");
     }
     async listResumeSessions(limit = 10) {
+        if (this.usesRpcTurnTransport()) {
+            return await this.listAppServerResumeSessions(limit);
+        }
         return listCodexResumeSessions(this.options.cwd, limit);
     }
     async resumeSession(threadId) {
-        if (this.isNativePanelMode()) {
-            throw new Error('WeChat /resume is disabled in codex mode. Use /resume directly inside "wechat-codex"; WeChat will follow the active local thread.');
+        if (!this.isHeadlessRuntimeMode()) {
+            throw new Error('WeChat /resume requires the managed "wechat-codex" visible client.');
         }
-        await this.resumeSharedThread(threadId);
+        await this.resumeVisibleSharedThread(threadId);
     }
     async interrupt() {
         if (this.usesRpcTurnTransport()) {
@@ -292,6 +367,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             profile: this.options.profile,
             sharedSessionId: this.state.sharedSessionId,
             sharedThreadId: this.state.sharedThreadId,
+            codexVisibleThreadId: this.state.sharedThreadId,
             resumeConversationId: this.state.resumeConversationId,
             transcriptPath: this.state.transcriptPath,
             startedAt: this.state.startedAt ?? nowIso(),
@@ -359,6 +435,24 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         }
         return this.isNativePanelMode() ? Boolean(this.nativeProcess) : Boolean(this.pty);
     }
+    detectCodexCliVersion() {
+        try {
+            const target = resolveSpawnTarget(this.options.command, "codex", {
+                forwardArgs: ["--version"],
+            });
+            const result = spawnSync(target.file, target.args, {
+                cwd: this.options.cwd,
+                env: this.buildEnv(),
+                encoding: "utf8",
+                timeout: 5_000,
+                windowsHide: true,
+            });
+            return parseCodexCliVersion(`${result.stdout ?? ""}\n${result.stderr ?? ""}`);
+        }
+        catch {
+            return null;
+        }
+    }
     shouldPollSessionLog() {
         return (this.isCodexClientRunning() ||
             this.pendingTurnStart ||
@@ -610,7 +704,9 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             if (this.sessionFilePath && candidate.modifiedAtMs <= currentSessionModifiedAtMs) {
                 return;
             }
-            if (!this.activeTurn || this.activeTurn.threadId === candidate.threadId) {
+            if (!this.activeTurn ||
+                this.activeTurn.threadId === candidate.threadId ||
+                this.activeTurn.origin === "wechat") {
                 this.trackLocalSharedThread(candidate.threadId, {
                     reason: "local_session_fallback",
                     signal: "session_fallback",
@@ -1286,13 +1382,18 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         if (this.subscribedThreadIds.has(threadId)) {
             return true;
         }
-        try {
-            await this.ensureSharedThreadSubscribed(threadId);
-            return true;
-        }
-        catch {
-            return false;
+        const pending = this.pendingThreadSubscriptions.get(threadId);
+        if (pending) {
+            return await pending;
         }
+        const attempt = this.ensureSharedThreadSubscribed(threadId)
+            .then(() => true)
+            .catch(() => false)
+            .finally(() => {
+            this.pendingThreadSubscriptions.delete(threadId);
+        });
+        this.pendingThreadSubscriptions.set(threadId, attempt);
+        return await attempt;
     }
     async ensureSharedThreadSubscribed(threadId) {
         if (this.subscribedThreadIds.has(threadId)) {
@@ -1310,10 +1411,177 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         if (!resumedThreadId) {
             throw new Error("Codex did not return a thread id while subscribing the bridge client.");
         }
+        if (resumedThreadId !== threadId) {
+            throw new Error(`Codex opened ${resumedThreadId}, expected ${threadId}.`);
+        }
+        this.validateCodexThreadWorkspaceIfPresent(response, threadId);
         this.rememberBridgeOwnedThreadSignal(resumedThreadId);
         this.subscribedThreadIds.add(resumedThreadId);
-        if (resumedThreadId !== this.sharedThreadId) {
-            this.updateSharedThread(resumedThreadId);
+    }
+    async listAppServerResumeSessions(limit) {
+        const boundedLimit = Math.max(1, Math.min(100, limit));
+        const baseParams = {
+            limit: boundedLimit,
+            sortKey: "updated_at",
+            sortDirection: "desc",
+            sourceKinds: ["cli", "vscode"],
+            archived: false,
+            cwd: this.options.cwd,
+        };
+        try {
+            const fastResponse = await this.sendRpcRequest("thread/list", {
+                ...baseParams,
+                useStateDbOnly: true,
+            });
+            const fastCandidates = buildCodexResumeCandidatesFromThreadList(fastResponse, this.options.cwd, boundedLimit);
+            if (fastCandidates.length > 0) {
+                return fastCandidates;
+            }
+        }
+        catch {
+            // Older supported app-server builds may not understand useStateDbOnly.
+            // The scan-and-repair request below is also the authoritative fallback.
+        }
+        const response = await this.sendRpcRequest("thread/list", baseParams);
+        return buildCodexResumeCandidatesFromThreadList(response, this.options.cwd, boundedLimit);
+    }
+    validateCodexResumeThread(response, targetThreadId) {
+        if (!isRecord(response) || !isRecord(response.thread)) {
+            throw new Error("Codex returned an invalid thread response.");
+        }
+        const thread = response.thread;
+        if (thread.id !== targetThreadId) {
+            throw new Error(`Codex opened ${String(thread.id)}, expected ${targetThreadId}.`);
+        }
+        if (typeof thread.cwd !== "string" ||
+            normalizeComparablePath(thread.cwd) !== normalizeComparablePath(this.options.cwd)) {
+            throw new Error(`Codex thread ${targetThreadId} does not belong to ${this.options.cwd}.`);
+        }
+        if (typeof thread.parentThreadId === "string") {
+            throw new Error(`Codex thread ${targetThreadId} is a subagent thread and cannot be resumed.`);
+        }
+        if (thread.ephemeral === true) {
+            throw new Error(`Codex thread ${targetThreadId} is ephemeral and cannot be resumed.`);
+        }
+        if (getCodexThreadStatusType(thread.status) === "active") {
+            throw new Error(`Codex thread ${targetThreadId} is still active. Stop its running task before resuming it from WeChat.`);
+        }
+        return thread;
+    }
+    validateCodexThreadWorkspaceIfPresent(response, targetThreadId) {
+        if (!isRecord(response) || !isRecord(response.thread)) {
+            return;
+        }
+        const thread = response.thread;
+        if (typeof thread.id === "string" && thread.id !== targetThreadId) {
+            throw new Error(`Codex opened ${thread.id}, expected ${targetThreadId}.`);
+        }
+        if (typeof thread.cwd === "string" &&
+            normalizeComparablePath(thread.cwd) !== normalizeComparablePath(this.options.cwd)) {
+            throw new Error(`Codex thread ${targetThreadId} does not belong to ${this.options.cwd}.`);
+        }
+        if (typeof thread.parentThreadId === "string") {
+            throw new Error(`Codex thread ${targetThreadId} is a subagent thread.`);
+        }
+        if (thread.ephemeral === true) {
+            throw new Error(`Codex thread ${targetThreadId} is ephemeral.`);
+        }
+    }
+    async resumeVisibleSharedThread(threadId) {
+        const targetThreadId = threadId.trim();
+        if (!targetThreadId) {
+            throw new Error("A thread id is required to resume a Codex thread.");
+        }
+        if (this.pendingVisibleResume) {
+            throw new Error("Codex is already switching visible threads.");
+        }
+        if (this.pendingApproval || this.pendingApprovalRequests.length > 0) {
+            throw new Error("A Codex approval request is pending. Reply with /confirm or /deny.");
+        }
+        if (this.pendingUserInputRequest || this.state.pendingUserInput) {
+            throw new Error("Codex is waiting for user input. Reply with /answer or use /stop.");
+        }
+        if (this.pendingTurnStart ||
+            this.activeTurn ||
+            this.state.status === "busy" ||
+            this.state.status === "awaiting_approval" ||
+            this.state.status === "awaiting_input") {
+            throw new Error("codex is still working. Wait for the current reply or use /stop.");
+        }
+        if (this.state.status !== "idle") {
+            throw new Error(`Codex cannot switch threads while its status is ${this.state.status}.`);
+        }
+        const previousThreadId = this.sharedThreadId;
+        let targetSubscribed = false;
+        this.pendingVisibleResume = { targetThreadId };
+        this.setStatus("starting", `Codex resume validating thread ${targetThreadId.slice(0, 12)}...`);
+        try {
+            const readResponse = await this.sendRpcRequest("thread/read", {
+                threadId: targetThreadId,
+                includeTurns: false,
+            });
+            this.validateCodexResumeThread(readResponse, targetThreadId);
+            this.setStatus("starting", `Codex resume validated thread ${targetThreadId.slice(0, 12)}.`);
+            this.rememberBridgeOwnedThreadSignal(targetThreadId);
+            this.setStatus("starting", `Codex resume requesting thread ${targetThreadId.slice(0, 12)}.`);
+            const resumeResponse = await this.sendRpcRequest("thread/resume", {
+                threadId: targetThreadId,
+                approvalPolicy: "on-request",
+                approvalsReviewer: "user",
+                sandbox: "workspace-write",
+                excludeTurns: true,
+            });
+            targetSubscribed = true;
+            this.validateCodexResumeThread(resumeResponse, targetThreadId);
+            this.subscribedThreadIds.add(targetThreadId);
+            this.setStatus("starting", `Codex resume switching visible thread ${targetThreadId.slice(0, 12)}.`);
+            const visibleThreadId = await this.switchVisibleCodexThread(targetThreadId);
+            if (visibleThreadId !== targetThreadId) {
+                throw new Error(`The visible Codex client opened ${visibleThreadId}, expected ${targetThreadId}.`);
+            }
+            this.sessionFilePath = null;
+            this.sessionReadOffset = 0;
+            this.sessionPartialLine = "";
+            this.sessionFinalText = null;
+            this.pendingThreadFollowId = null;
+            this.updateSharedThread(targetThreadId, {
+                source: "wechat",
+                reason: "wechat_resume",
+                notify: true,
+            });
+            this.bridgeResumeReplayThreadId = targetThreadId;
+            this.bridgeResumeReplayUntilMs = Date.now() + CODEX_RESUME_REPLAY_SETTLE_MS;
+            this.setStatus("starting", `Codex resume committed thread ${targetThreadId.slice(0, 12)}.`);
+            this.setStatus("idle");
+            if (previousThreadId && previousThreadId !== targetThreadId) {
+                await this.unsubscribeCodexThreadBestEffort(previousThreadId);
+            }
+        }
+        catch (error) {
+            if (targetSubscribed && targetThreadId !== previousThreadId) {
+                await this.unsubscribeCodexThreadBestEffort(targetThreadId);
+            }
+            this.setStatus("idle", `Codex resume failed for ${targetThreadId.slice(0, 12)}: ${describeUnknownError(error)}`);
+            throw error;
+        }
+        finally {
+            this.pendingVisibleResume = null;
+        }
+    }
+    async switchVisibleCodexThread(threadId) {
+        return await requestCodexVisibleThreadSwitch({
+            cwd: this.options.cwd,
+            instanceId: this.localClientInstanceId,
+            threadId,
+        });
+    }
+    async unsubscribeCodexThreadBestEffort(threadId) {
+        try {
+            await this.sendRpcRequest("thread/unsubscribe", { threadId });
+            this.subscribedThreadIds.delete(threadId);
+        }
+        catch {
+            // A failed unsubscribe must not undo an otherwise successful visible switch.
         }
     }
     async resumeSharedThread(threadId, options = {}) {
@@ -1343,6 +1611,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         if (!resumedThreadId) {
             throw new Error("Codex did not return a thread id while resuming the saved thread.");
         }
+        this.validateCodexThreadWorkspaceIfPresent(response, resumedThreadId);
         this.rememberBridgeOwnedThreadSignal(resumedThreadId);
         this.subscribedThreadIds.add(resumedThreadId);
         this.sessionFilePath = null;
@@ -1490,6 +1759,9 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             this.completedTurnOrder = [];
         }
         this.pendingInjectedInputs = [];
+        this.threadStatusCheckEpoch += 1;
+        this.pendingThreadStatusChecks.clear();
+        this.clearBridgeResumeReplay();
         this.recentBridgeThreadSignalAtById.clear();
         this.sessionFinalText = null;
         this.nextSessionFallbackScanAtMs = 0;
@@ -1556,6 +1828,10 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             });
         }
     }
+    blockLateLocalThreadFollow() {
+        this.localThreadFollowBlockedUntilMs =
+            Date.now() + CODEX_LOCAL_THREAD_ANNOUNCE_SETTLE_MS;
+    }
     clearPendingThreadAnnouncement() {
         if (!this.pendingThreadAnnouncement) {
             return;
@@ -1614,12 +1890,29 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         pending.timer.unref?.();
     }
     trackLocalSharedThread(threadId, options) {
+        const weakSignal = options.signal === "status_changed" ||
+            options.signal === "thread_started" ||
+            options.signal === "session_fallback";
+        if (weakSignal && Date.now() < this.localThreadFollowBlockedUntilMs) {
+            return;
+        }
+        if (options.signal === "user_message" || options.signal === "turn_started") {
+            this.localThreadFollowBlockedUntilMs = 0;
+        }
+        if (this.pendingVisibleResume) {
+            return;
+        }
+        this.interruptWechatTurnForLocalThreadSwitch(threadId);
         if (!this.isNativePanelMode()) {
+            const threadChanged = this.sharedThreadId !== threadId;
             this.updateSharedThread(threadId, {
                 source: "local",
                 reason: options.reason,
                 notify: true,
             });
+            if (threadChanged) {
+                void this.tryEnsureSharedThreadSubscribed(threadId);
+            }
             return;
         }
         this.updateSharedThread(threadId, {
@@ -1655,6 +1948,34 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         }
         this.schedulePendingThreadAnnouncement();
     }
+    interruptWechatTurnForLocalThreadSwitch(nextThreadId) {
+        const activeTurn = this.activeTurn;
+        if (!activeTurn ||
+            activeTurn.origin !== "wechat" ||
+            activeTurn.threadId === nextThreadId) {
+            return;
+        }
+        const interruptedTurnId = activeTurn.turnId;
+        void this.sendRpcRequest("turn/interrupt", {
+            threadId: activeTurn.threadId,
+            turnId: interruptedTurnId,
+        }).catch(() => undefined);
+        this.clearInterruptTimer();
+        this.clearFinalReplyCompletionTimerForTurn(interruptedTurnId);
+        this.clearPendingApprovalState();
+        this.clearPendingUserInputState();
+        this.pendingThreadFollowId = null;
+        this.cleanupTurnArtifacts(interruptedTurnId);
+        this.rememberCompletedTurn(interruptedTurnId);
+        this.bridgeOwnedTurnIds.add(interruptedTurnId);
+        this.setActiveTurn(null);
+        this.setStatus("idle");
+        this.emit({
+            type: "task_failed",
+            message: "The active WeChat task was interrupted because the local Codex terminal switched threads.",
+            timestamp: nowIso(),
+        });
+    }
     rememberBridgeOwnedThreadSignal(threadId) {
         const cutoff = Date.now() - CODEX_THREAD_SIGNAL_TTL_MS;
         for (const [candidateThreadId, recordedAtMs] of this.recentBridgeThreadSignalAtById.entries()) {
@@ -1675,6 +1996,20 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         }
         return true;
     }
+    isBridgeResumeReplay(threadId) {
+        if (this.bridgeResumeReplayThreadId !== threadId) {
+            return false;
+        }
+        if (Date.now() >= this.bridgeResumeReplayUntilMs) {
+            this.clearBridgeResumeReplay();
+            return false;
+        }
+        return true;
+    }
+    clearBridgeResumeReplay() {
+        this.bridgeResumeReplayThreadId = null;
+        this.bridgeResumeReplayUntilMs = 0;
+    }
     clearPendingApprovalState() {
         this.pendingApprovalRequests = [];
         this.pendingApproval = null;
@@ -2171,7 +2506,71 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         if (!threadId) {
             return;
         }
-        if (!this.activeTurn || this.activeTurn.threadId === threadId) {
+        if (this.pendingVisibleResume) {
+            return;
+        }
+        if (this.isBridgeResumeReplay(threadId)) {
+            return;
+        }
+        const notificationCwd = typeof params.cwd === "string"
+            ? params.cwd
+            : isRecord(params.thread) && typeof params.thread.cwd === "string"
+                ? params.thread.cwd
+                : null;
+        if (notificationCwd &&
+            normalizeComparablePath(notificationCwd) !== normalizeComparablePath(this.options.cwd)) {
+            return;
+        }
+        if (!this.isTrustedThreadStatus(threadId, Boolean(notificationCwd))) {
+            this.queueThreadStatusCwdCheck(threadId);
+            return;
+        }
+        this.applyThreadStatusChanged(threadId);
+    }
+    isTrustedThreadStatus(threadId, hasCwd) {
+        if (hasCwd || this.isNativePanelMode()) {
+            return true;
+        }
+        return (this.subscribedThreadIds.has(threadId) ||
+            this.activeTurn?.threadId === threadId ||
+            this.pendingTurnThreadId === threadId ||
+            this.pendingVisibleResume?.targetThreadId === threadId);
+    }
+    queueThreadStatusCwdCheck(threadId) {
+        if (this.pendingThreadStatusChecks.has(threadId)) {
+            return;
+        }
+        const epoch = this.threadStatusCheckEpoch;
+        const check = this.sendRpcRequest("thread/read", {
+            threadId,
+            includeTurns: false,
+        })
+            .then((response) => {
+            if (epoch !== this.threadStatusCheckEpoch) {
+                return;
+            }
+            if (!isRecord(response) || !isRecord(response.thread)) {
+                return;
+            }
+            const thread = response.thread;
+            if (thread.id === threadId &&
+                typeof thread.cwd === "string" &&
+                normalizeComparablePath(thread.cwd) === normalizeComparablePath(this.options.cwd) &&
+                typeof thread.parentThreadId !== "string" &&
+                thread.ephemeral !== true) {
+                this.applyThreadStatusChanged(threadId);
+            }
+        })
+            .catch(() => undefined)
+            .finally(() => {
+            this.pendingThreadStatusChecks.delete(threadId);
+        });
+        this.pendingThreadStatusChecks.set(threadId, check);
+    }
+    applyThreadStatusChanged(threadId) {
+        if (!this.activeTurn ||
+            this.activeTurn.threadId === threadId ||
+            this.activeTurn.origin === "wechat") {
             this.trackLocalSharedThread(threadId, {
                 reason: "local_follow",
                 signal: "status_changed",
@@ -2186,16 +2585,24 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         if (!threadId) {
             return;
         }
+        if (this.isBridgeResumeReplay(threadId)) {
+            return;
+        }
         if (this.isRecentlyBridgeOwnedThread(threadId)) {
             return;
         }
         const thread = isRecord(params.thread) ? params.thread : null;
-        if (thread && typeof thread.cwd === "string") {
-            if (normalizeComparablePath(thread.cwd) !== normalizeComparablePath(this.options.cwd)) {
+        if (thread) {
+            if ((typeof thread.cwd === "string" &&
+                normalizeComparablePath(thread.cwd) !== normalizeComparablePath(this.options.cwd)) ||
+                typeof thread.parentThreadId === "string" ||
+                thread.ephemeral === true) {
                 return;
             }
         }
-        if (!this.activeTurn || this.activeTurn.threadId === threadId) {
+        if (!this.activeTurn ||
+            this.activeTurn.threadId === threadId ||
+            this.activeTurn.origin === "wechat") {
             this.trackLocalSharedThread(threadId, {
                 reason: "local_follow",
                 signal: "thread_started",
@@ -2209,9 +2616,14 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         if (this.activeTurn?.turnId === trackedTurn.turnId) {
             return;
         }
+        if (trackedTurn.origin === "local") {
+            this.clearBridgeResumeReplay();
+        }
         if (trackedTurn.origin === "local" &&
             trackedTurn.threadId !== this.sharedThreadId) {
-            if (!this.activeTurn || this.activeTurn.threadId === trackedTurn.threadId) {
+            if (!this.activeTurn ||
+                this.activeTurn.threadId === trackedTurn.threadId ||
+                this.activeTurn.origin === "wechat") {
                 this.trackLocalSharedThread(trackedTurn.threadId, {
                     reason: "local_turn",
                     signal: "turn_started",
@@ -2285,6 +2697,9 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         if (this.activeTurn?.turnId === trackedTurn.turnId) {
             this.setActiveTurn(null);
         }
+        if (completedTrackedTurn.origin === "wechat") {
+            this.blockLateLocalThreadFollow();
+        }
         this.cleanupTurnArtifacts(trackedTurn.turnId);
         if (this.state.status !== "stopped" &&
             (!this.activeTurn || this.activeTurn.turnId === trackedTurn.turnId)) {
@@ -2424,6 +2839,9 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         if (!activeTurn || !finalText) {
             return;
         }
+        if (activeTurn.origin === "wechat") {
+            this.blockLateLocalThreadFollow();
+        }
         this.clearPendingApprovalState();
         this.clearPendingUserInputState();
         this.setActiveTurn(null);
@@ -2484,11 +2902,12 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         this.appServerAuthToken = null;
     }
     describeAppServerLog() {
-        const summary = normalizeOutput(this.appServerLog).trim();
-        if (!summary) {
+        const normalized = normalizeOutput(this.appServerLog).trim();
+        if (!normalized) {
             return "";
         }
-        return ` Recent app-server log: ${truncatePreview(summary, 220)}`;
+        const summary = summarizeOutput(normalized, 500);
+        return ` Recent app-server log: ${summary}`;
     }
     terminateCodexClient() {
         this.shuttingDown = true;

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

@@ -3,7 +3,8 @@ import path from "node:path";
 import { spawn as spawnPty } from "node-pty";
 import { t } from "../i18n/index.js";
 import { attachLocalCompanionMessageListener, buildLocalCompanionToken, clearLocalCompanionEndpoint, clearLocalCompanionOccupancy, sendLocalCompanionMessage, updateLocalCompanionOccupancy, writeLocalCompanionEndpoint, } from "../companion/local-companion-link.js";
-import { detectCliApproval, normalizeOutput, nowIso, truncatePreview, } from "./bridge-utils.js";
+import { detectCliApproval, } from "./bridge-utils.js";
+import { normalizeOutput, nowIso, truncatePreview } from "../core/text-utils.js";
 import * as shared from "./bridge-adapters.shared.js";
 import { LOCAL_CLIENT_PROTOCOL_VERSION } from "../runtime/runtime-types.js";
 const { CODEX_APP_SERVER_HOST, INTERRUPT_SETTLE_DELAY_MS, buildCliEnvironment, buildPtySpawnOptions, buildSpawnDiagnostic, getLocalCompanionCommandName, getSharedSessionIdFromAdapterState, LOCAL_COMPANION_RECONNECT_GRACE_MS, resolveSpawnTarget, spawnFallbackProcess, } = shared;