@unlinearity/cli-wechat-bridge 1.0.5 → 1.0.6

package/README.md

@@ -6,9 +6,12 @@
 
 <p align="center">
   <a href="https://github.com/UNLINEARITY/CLI-WeChat-Bridge"><img alt="GitHub stars" src="https://img.shields.io/github/stars/UNLINEARITY/CLI-WeChat-Bridge?label=Stars&amp;style=for-the-badge&amp;logo=github&amp;color=0891b2&amp;labelColor=1c1917"></a>
-  <a href="https://www.npmjs.com/package/@unlinearity/cli-wechat-bridge"><img alt="npm version" src="https://img.shields.io/npm/v/@unlinearity/cli-wechat-bridge?label=npm&amp;style=for-the-badge&amp;logo=npm&amp;color=cb3837&amp;labelColor=1c1917"></a>
-  <a href="https://www.npmjs.com/package/@unlinearity/cli-wechat-bridge"><img alt="npm downloads" src="https://img.shields.io/npm/dm/@unlinearity/cli-wechat-bridge?label=Downloads&amp;style=for-the-badge&amp;logo=npm&amp;color=16a34a&amp;labelColor=1c1917"></a>
-  <a href="https://github.com/UNLINEARITY/CLI-WeChat-Bridge/blob/main/LICENSE.txt"><img alt="License" src="https://img.shields.io/github/license/UNLINEARITY/CLI-WeChat-Bridge?label=License&amp;style=for-the-badge&amp;color=7c3aed&amp;labelColor=1c1917"></a>
+  <a href="https://www.npmjs.com/package/cli-wechat-bridge"><img alt="npm version" src="https://img.shields.io/npm/v/cli-wechat-bridge?label=npm&amp;style=for-the-badge&amp;logo=npm&amp;color=cb3837&amp;labelColor=1c1917"></a>
+  <a href="https://www.npmjs.com/package/cli-wechat-bridge"><img alt="npm downloads" src="https://img.shields.io/npm/dm/cli-wechat-bridge?label=Downloads&amp;style=for-the-badge&amp;logo=npm&amp;color=16a34a&amp;labelColor=1c1917"></a>
+  <a href="https://www.npmjs.com/package/@unlinearity/cli-wechat-bridge"><img alt="scoped npm downloads" src="https://img.shields.io/npm/dm/@unlinearity/cli-wechat-bridge?label=Scoped%20downloads&amp;style=for-the-badge&amp;logo=npm&amp;color=15803d&amp;labelColor=1c1917"></a>
+  <a href="https://www.npmjs.com/package/cli-wechat-bridge">
+  <img alt="License" src="https://img.shields.io/npm/l/cli-wechat-bridge?label=License&style=for-the-badge&color=7c3aed&labelColor=1c1917">
+</a>
 </p>
 
 **命令行工具的微信桥接**：本项目用于桥接微信消息与本地运行的 [`Codex`](https://github.com/openai/codex)、[`Claude Code`](https://code.claude.com/docs/en/overview)、`OpenCode` 或持久化 `powershell.exe` 会话，并将本地输出、审批请求与运行状态同步回微信。
@@ -48,11 +51,13 @@
 正式版本可以直接从 npm 安装：
 
 ```bash
-npm install -g @unlinearity/cli-wechat-bridge@latest
+npm install -g cli-wechat-bridge@latest
 ```
 
 安装后可在任意项目目录中直接使用 `wechat-daemon`、`wechat-codex-start`、`wechat-claude-start`、`wechat-opencode-start` 等命令。
 
+兼容说明：旧包名 `@unlinearity/cli-wechat-bridge` 会继续同步发布，已经安装旧包名的用户可以正常升级；新用户优先使用更短的 `cli-wechat-bridge`。
+
 如果你希望从源码运行或参与开发，也可以克隆仓库并安装依赖：
 
 ```bash
@@ -150,12 +155,12 @@ wechat-daemon
 | 指令 | 行为 |
 | --- | --- |
 | `/codex` | 切换到 Codex |
-| `/claude` | 切换到 Claude Code |
-| `/opencode` | 切换到 OpenCode |
-
-daemon 启动后，后续切换都可以直接从微信发起；如果对应 CLI 还没有可见窗口，daemon 会自动打开或复用它，不需要再手动运行 `wechat-codex`、`wechat-claude` 或 `wechat-opencode`。
-
-daemon 的 v1 行为是：
+| `/claude` | 切换到 Claude Code |
+| `/opencode` | 切换到 OpenCode |
+
+daemon 启动后，后续切换都可以直接从微信发起；如果对应 CLI 还没有可见窗口，daemon 会自动打开或复用它，不需要再手动运行 `wechat-codex`、`wechat-claude` 或 `wechat-opencode`。
+
+daemon 的 v1 行为是：
 
 - daemon 绑定启动时的工作目录；暂不支持在微信里切换工作目录；
 - 启动时会自动接管并清理旧的单 bridge 进程、失效 lock 和旧 endpoint；
@@ -484,7 +489,7 @@ wechat-check-update
 如果你使用 npm 全局安装，当前推荐直接执行：
 
 ```bash
-npm install -g @unlinearity/cli-wechat-bridge@latest
+npm install -g cli-wechat-bridge@latest
 ```
 
 升级后请重启正在运行的 bridge 和 companion 终端，确保它们加载同一版本。
@@ -515,7 +520,7 @@ npm install -g .
 请确认已经执行以下之一：
 
 ```bash
-npm install -g @unlinearity/cli-wechat-bridge@latest
+npm install -g cli-wechat-bridge@latest
 npm install -g .
 npm link
 ```

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

@@ -3,14 +3,17 @@ import net from "node:net";
 import path from "node:path";
 import { buildLocalCompanionToken } from "../companion/local-companion-link.js";
 import { ensureWorkspaceChannelDir } from "../wechat/channel-config.js";
-import { buildClaudeFailureMessage, buildClaudeHookScript, buildClaudeHookSettings, buildClaudePermissionDecisionHookOutput, buildClaudePermissionApprovalRequest, extractClaudeAssistantMessageText, extractClaudeResumeConversationId, extractClaudeTranscriptFinalReply, findInjectedClaudePromptIndex, normalizeClaudeAssistantMessage, parseClaudeHookPayload, } from "./claude-hooks.js";
+import { buildClaudeFailureMessage, buildClaudeHookScript, buildClaudeHookSettings, buildClaudePermissionDecisionHookOutput, buildClaudePermissionApprovalRequest, extractClaudeAssistantMessageText, extractClaudeResumeConversationId, extractClaudeTranscriptFinalReply, findInjectedClaudePromptIndex, getClaudePermissionAutoResponse, getClaudeWechatOutboundAttachmentDenyMessage, normalizeClaudeAssistantMessage, parseClaudeHookPayload, } from "./claude-hooks.js";
 import { detectCliApproval, normalizeOutput, nowIso, truncatePreview, } from "./bridge-utils.js";
 import { AbstractPtyAdapter } from "./bridge-adapters.core.js";
 import * as shared from "./bridge-adapters.shared.js";
-const { CLAUDE_HOOK_LISTEN_HOST, CLAUDE_WECHAT_WORKING_NOTICE_DELAY_MS, DEFAULT_COLS, DEFAULT_ROWS, MODULE_DIR, buildClaudeCliArgs, isClaudeInvalidResumeError, quotePosixCommandArg, quoteWindowsCommandArg, shouldIncludeClaudeNoAltScreen, } = shared;
+const { CLAUDE_HOOK_LISTEN_HOST, CLAUDE_WECHAT_WORKING_NOTICE_DELAY_MS, DEFAULT_COLS, DEFAULT_ROWS, MODULE_DIR, buildClaudeCliArgs, delay, isClaudeInvalidResumeError, quotePosixCommandArg, quoteWindowsCommandArg, shouldIncludeClaudeNoAltScreen, } = shared;
 const CLAUDE_COMPACT_OUTPUT_LINE_RE = /^Compacted(?:\s*\(.*full summary.*\))?$/i;
 const CLAUDE_COMPACT_FAILURE_RE = /Error:\s*Error during compaction:|(?:^|\b)API Error:|\b(?:compact|compaction)\s+failed\b|^Error:/i;
 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;
 export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
     hookServer = null;
     hookPort = null;
@@ -99,7 +102,8 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
         this.pendingCliApprovalHints = null;
         this.clearWechatWorkingNotice(true);
         this.setStatus("busy");
-        this.writeToPty(text.replace(/\r?\n/g, "\r"));
+        this.writeToPty(this.buildRemoteInputPayload(text));
+        await delay(CLAUDE_REMOTE_ENTER_DELAY_MS);
         this.writeToPty("\r");
         this.armWechatWorkingNotice();
     }
@@ -464,6 +468,13 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
             timestamp: nowIso(),
         });
     }
+    buildRemoteInputPayload(text) {
+        const normalizedText = text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+        if (!normalizedText.includes("\n")) {
+            return normalizedText;
+        }
+        return `${CLAUDE_BRACKETED_PASTE_START}${normalizedText}${CLAUDE_BRACKETED_PASTE_END}`;
+    }
     shouldTreatClaudeOutputAsCompactCompletion(text) {
         if (this.state.status !== "busy" &&
             this.state.status !== "awaiting_approval" &&
@@ -707,6 +718,25 @@ export class ClaudeCompanionAdapter extends AbstractPtyAdapter {
     }
     handleClaudePermissionRequest(requestId, payload, socket) {
         this.clearWechatWorkingNotice();
+        const denyMessage = getClaudeWechatOutboundAttachmentDenyMessage(payload);
+        if (denyMessage) {
+            this.pendingApproval = null;
+            this.state.pendingApproval = null;
+            this.state.pendingApprovalOrigin = undefined;
+            if (this.state.status === "awaiting_approval") {
+                this.setStatus("busy");
+            }
+            this.respondToClaudeHook(socket, requestId, buildClaudePermissionDecisionHookOutput("deny", denyMessage));
+            return;
+        }
+        const autoResponse = getClaudePermissionAutoResponse(payload);
+        if (autoResponse) {
+            if (!this.pendingApproval && !this.state.pendingApproval) {
+                this.setStatus("busy", `Claude approval auto-approved: ${truncatePreview(autoResponse.reason, 180)}`);
+            }
+            this.respondToClaudeHook(socket, requestId, buildClaudePermissionDecisionHookOutput(autoResponse.action));
+            return;
+        }
         this.flushPendingClaudeHookApprovals();
         this.pendingHookApprovals.set(requestId, {
             requestId,

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, buildCodexUserInputRequest, coerceWebSocketMessageData, delay, describeUnknownError, extractCodexFinalTextFromItem, extractCodexThreadFollowIdFromStatusChanged, extractCodexThreadStartedThreadId, extractCodexUserMessageText, findCodexSessionFile, findRecentCodexSessionFileForCwd, getCodexRpcRequestId, getNotificationThreadId, getNotificationTurnId, isRecord, isRecentIsoTimestamp, listCodexResumeSessions, normalizeComparablePath, normalizeCodexRpcError, reserveLocalPort, resolveSpawnTarget, shouldAutoCompleteCodexWechatTurnAfterFinalReply, shouldIgnoreCodexSessionReplayEntry, shouldRecoverCodexStaleBusyState, waitForTcpPort, } = shared;
+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_LOCAL_THREAD_ANNOUNCE_SETTLE_MS = 150;
 export class CodexPtyAdapter extends AbstractPtyAdapter {
     runtimeKind = "codex_runtime_host";
@@ -24,6 +24,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
     cleanPanelExitInProgress = false;
     rpcRequestCounter = 0;
     pendingRpcRequests = new Map();
+    subscribedThreadIds = new Set();
     sharedThreadId = null;
     announcedThreadId = null;
     pendingThreadAnnouncement = null;
@@ -194,6 +195,27 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         }
         return await super.resolveApproval(action);
     }
+    async submitUserInput(answers) {
+        if (!this.pendingUserInputRequest) {
+            return false;
+        }
+        const request = this.pendingUserInputRequest;
+        const responseAnswers = {};
+        for (const [questionId, values] of Object.entries(answers)) {
+            responseAnswers[questionId] = {
+                answers: values,
+            };
+        }
+        this.sendRpcMessage({
+            id: request.requestId,
+            result: {
+                answers: responseAnswers,
+            },
+        });
+        this.clearPendingUserInputState();
+        this.setStatus("busy", "Codex user input submitted.");
+        return true;
+    }
     async dispose() {
         this.resetTurnTracking({ preserveThread: false });
         if (this.isEmbeddedCliMode()) {
@@ -752,6 +774,9 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         if (this.pendingApproval) {
             throw new Error("A Codex approval request is pending. Reply with /confirm <code> or /deny.");
         }
+        if (this.pendingUserInputRequest || this.state.pendingUserInput) {
+            throw new Error("Codex is waiting for user input. Reply with /answer and your response, or use /stop.");
+        }
         if (this.pendingTurnStart || this.activeTurn || this.state.status === "busy") {
             const origin = this.state.activeTurnOrigin;
             if (origin === "local") {
@@ -766,6 +791,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         this.rememberInjectedInput(text);
         this.clearPendingApprovalState();
         const threadId = await this.ensureThreadStarted();
+        const subscribedBeforeTurnStart = await this.tryEnsureSharedThreadSubscribed(threadId);
         this.pendingTurnStart = true;
         this.pendingTurnThreadId = threadId;
         this.interruptPendingTurnStart = false;
@@ -793,6 +819,9 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
                 turnId,
                 origin: "wechat",
             });
+            if (!subscribedBeforeTurnStart) {
+                await this.tryEnsureSharedThreadSubscribed(threadId);
+            }
             if (this.interruptPendingTurnStart) {
                 await this.requestActiveTurnInterrupt();
                 this.armInterruptFallback();
@@ -813,11 +842,15 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         if (this.isNativePanelMode() && !this.nativeProcess) {
             return false;
         }
-        const turnPending = this.pendingTurnStart || this.state.status === "busy" || this.state.status === "awaiting_approval";
+        const turnPending = this.pendingTurnStart ||
+            this.state.status === "busy" ||
+            this.state.status === "awaiting_approval" ||
+            this.state.status === "awaiting_input";
         if (!turnPending) {
             return false;
         }
         this.clearPendingApprovalState();
+        this.clearPendingUserInputState();
         if (this.pendingTurnStart && !this.activeTurn) {
             this.interruptPendingTurnStart = true;
             this.armInterruptFallback();
@@ -980,6 +1013,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
     attachRpcSocket(socket) {
         this.rpcSocket = socket;
         this.rpcShuttingDown = false;
+        this.subscribedThreadIds.clear();
         socket.addEventListener("message", (event) => {
             this.handleRpcMessageData(event.data);
         });
@@ -991,6 +1025,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         const socket = this.rpcSocket;
         this.rpcSocket = null;
         this.rpcShuttingDown = true;
+        this.subscribedThreadIds.clear();
         this.rejectPendingRpcRequests("Codex websocket connection closed.");
         if (!socket) {
             this.rpcShuttingDown = false;
@@ -1028,6 +1063,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             cleanPanelExitInProgress: this.cleanPanelExitInProgress,
         });
         this.rpcSocket = null;
+        this.subscribedThreadIds.clear();
         this.rejectPendingRpcRequests("Codex websocket connection closed.");
         this.rpcShuttingDown = false;
         if (expectedShutdown) {
@@ -1156,9 +1192,44 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             throw new Error("Codex did not return a thread id for the bridge session.");
         }
         this.rememberBridgeOwnedThreadSignal(threadId);
+        this.subscribedThreadIds.add(threadId);
         this.updateSharedThread(threadId);
         return threadId;
     }
+    async tryEnsureSharedThreadSubscribed(threadId) {
+        if (this.subscribedThreadIds.has(threadId)) {
+            return true;
+        }
+        try {
+            await this.ensureSharedThreadSubscribed(threadId);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    async ensureSharedThreadSubscribed(threadId) {
+        if (this.subscribedThreadIds.has(threadId)) {
+            return;
+        }
+        const response = await this.sendRpcRequest("thread/resume", {
+            threadId,
+            cwd: this.options.cwd,
+            approvalPolicy: "on-request",
+            approvalsReviewer: "user",
+            sandbox: "workspace-write",
+            excludeTurns: true,
+        });
+        const resumedThreadId = this.extractThreadIdFromResponse(response);
+        if (!resumedThreadId) {
+            throw new Error("Codex did not return a thread id while subscribing the bridge client.");
+        }
+        this.rememberBridgeOwnedThreadSignal(resumedThreadId);
+        this.subscribedThreadIds.add(resumedThreadId);
+        if (resumedThreadId !== this.sharedThreadId) {
+            this.updateSharedThread(resumedThreadId);
+        }
+    }
     async resumeSharedThread(threadId, options = {}) {
         const trimmedThreadId = threadId.trim();
         if (!trimmedThreadId) {
@@ -1180,12 +1251,14 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             approvalPolicy: "on-request",
             approvalsReviewer: "user",
             sandbox: "workspace-write",
+            excludeTurns: true,
         });
         const resumedThreadId = this.extractThreadIdFromResponse(response);
         if (!resumedThreadId) {
             throw new Error("Codex did not return a thread id while resuming the saved thread.");
         }
         this.rememberBridgeOwnedThreadSignal(resumedThreadId);
+        this.subscribedThreadIds.add(resumedThreadId);
         this.sessionFilePath = null;
         this.sessionReadOffset = 0;
         this.sessionPartialLine = "";
@@ -1238,7 +1311,9 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         this.clearInterruptTimer();
         this.interruptTimer = setTimeout(() => {
             this.interruptTimer = null;
-            if (this.state.status !== "busy" && this.state.status !== "awaiting_approval") {
+            if (this.state.status !== "busy" &&
+                this.state.status !== "awaiting_approval" &&
+                this.state.status !== "awaiting_input") {
                 return;
             }
             this.resetTurnTracking({ preserveThread: true });
@@ -1263,6 +1338,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             pendingTurnStart: this.pendingTurnStart,
             hasActiveTurn: Boolean(this.activeTurn),
             hasPendingApproval: Boolean(this.pendingApproval || this.pendingApprovalRequest),
+            hasPendingUserInput: Boolean(this.pendingUserInputRequest || this.state.pendingUserInput),
             activeTurnId: this.state.activeTurnId,
         })) {
             return;
@@ -1301,6 +1377,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         this.interruptPendingTurnStart = false;
         this.pendingThreadFollowId = null;
         this.clearPendingApprovalState();
+        this.clearPendingUserInputState();
         this.queuedTurnNotifications = [];
         this.queuedTurnServerRequests = [];
         this.turnFinalMessages.clear();
@@ -1503,6 +1580,11 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         this.state.pendingApproval = null;
         this.state.pendingApprovalOrigin = undefined;
     }
+    clearPendingUserInputState() {
+        this.pendingUserInputRequest = null;
+        this.state.pendingUserInput = null;
+        this.state.pendingUserInputOrigin = undefined;
+    }
     cleanupTurnArtifacts(turnId) {
         this.clearFinalReplyCompletionTimerForTurn(turnId);
         this.turnFinalMessages.delete(turnId);
@@ -1570,6 +1652,13 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         socket.send(JSON.stringify(payload));
     }
     async respondToApprovalRequest(request, action) {
+        if (request.method === "item/permissions/requestApproval") {
+            this.sendRpcMessage({
+                id: request.requestId,
+                result: buildCodexPermissionsRequestApprovalResponse(request.params, action),
+            });
+            return;
+        }
         const decision = action === "confirm" ? "accept" : "decline";
         this.sendRpcMessage({
             id: request.requestId,
@@ -1754,6 +1843,15 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
                         this.setStatus("busy", "Codex approval resolved.");
                     }
                 }
+                if (requestId !== null &&
+                    this.pendingUserInputRequest &&
+                    requestId === this.pendingUserInputRequest.requestId &&
+                    trackedTurn.turnId === this.pendingUserInputRequest.turnId) {
+                    this.clearPendingUserInputState();
+                    if (this.state.status === "awaiting_input") {
+                        this.setStatus("busy", "Codex user input resolved.");
+                    }
+                }
                 return;
             }
             case "turn/completed": {
@@ -1764,8 +1862,24 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         }
     }
     handleRpcServerRequest(requestId, method, params) {
+        if (method === "mcpServer/elicitation/request") {
+            this.sendRpcMessage({
+                id: requestId,
+                result: buildCodexMcpServerElicitationDeclineResponse(),
+            });
+            return;
+        }
+        if (method === "item/tool/call") {
+            this.sendRpcMessage({
+                id: requestId,
+                result: buildCodexDynamicToolCallFailureResponse(),
+            });
+            return;
+        }
         if (method !== "item/commandExecution/requestApproval" &&
-            method !== "item/fileChange/requestApproval") {
+            method !== "item/fileChange/requestApproval" &&
+            method !== "item/permissions/requestApproval" &&
+            method !== "item/tool/requestUserInput") {
             this.sendRpcMessage({
                 id: requestId,
                 error: {
@@ -1793,16 +1907,57 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             });
             return;
         }
-        const trackedTurn = this.identifyTrackedTurn("server/request", params);
+        const trackedTurn = this.identifyTrackedTurn("server/request", params) ??
+            this.fallbackTrackedTurnForServerRequest(params);
         if (!trackedTurn) {
+            this.sendRpcMessage({
+                id: requestId,
+                error: {
+                    code: -32602,
+                    message: "Invalid Codex server request payload: missing threadId or turnId.",
+                },
+            });
             return;
         }
         this.handleTrackedTurnStarted(trackedTurn);
         this.handleTrackedTurnServerRequest(requestId, method, params, trackedTurn);
     }
     handleTrackedTurnServerRequest(requestId, method, params, trackedTurn) {
+        if (method === "item/tool/requestUserInput") {
+            this.handleTrackedTurnUserInputRequest(requestId, params, trackedTurn);
+            return;
+        }
+        const denyMessage = getCodexWechatOutboundAttachmentDenyMessage(method, params);
+        if (denyMessage) {
+            this.sendRpcMessage({
+                id: requestId,
+                result: method === "item/permissions/requestApproval"
+                    ? buildCodexPermissionsRequestApprovalResponse(params, "deny")
+                    : { decision: "decline" },
+            });
+            this.state.lastOutputAt = nowIso();
+            this.setStatus("busy", `Codex approval auto-denied: ${truncatePreview(denyMessage, 180)}`);
+            return;
+        }
+        const autoResponse = getCodexApprovalAutoResponse(method, params);
+        if (autoResponse) {
+            this.sendRpcMessage({
+                id: requestId,
+                result: autoResponse.result,
+            });
+            this.state.lastOutputAt = nowIso();
+            this.setStatus("busy", `Codex approval auto-approved: ${truncatePreview(autoResponse.reason, 180)}`);
+            return;
+        }
         const request = buildCodexApprovalRequest(method, params);
         if (!request) {
+            this.sendRpcMessage({
+                id: requestId,
+                error: {
+                    code: -32602,
+                    message: "Invalid Codex approval request payload.",
+                },
+            });
             return;
         }
         this.pendingApprovalRequest = {
@@ -1811,18 +1966,63 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             threadId: trackedTurn.threadId,
             turnId: trackedTurn.turnId,
             origin: trackedTurn.origin,
+            params,
         };
         this.pendingApproval = request;
         this.state.pendingApproval = request;
         this.state.pendingApprovalOrigin = trackedTurn.origin;
         this.state.lastOutputAt = nowIso();
-        this.setStatus("awaiting_approval", "Codex approval is required.");
+        this.setStatus("awaiting_approval", `Codex approval is required: ${truncatePreview(request.commandPreview, 180)}`);
         this.emit({
             type: "approval_required",
             request,
             timestamp: nowIso(),
         });
     }
+    fallbackTrackedTurnForServerRequest(params) {
+        if (this.activeTurn) {
+            return null;
+        }
+        const threadId = getNotificationThreadId(params);
+        const turnId = getNotificationTurnId(params);
+        if (!threadId || !turnId) {
+            return null;
+        }
+        return {
+            threadId,
+            turnId,
+            origin: this.bridgeOwnedTurnIds.has(turnId) ? "wechat" : "local",
+        };
+    }
+    handleTrackedTurnUserInputRequest(requestId, params, trackedTurn) {
+        const request = buildCodexUserInputRequest(params);
+        if (!request) {
+            this.sendRpcMessage({
+                id: requestId,
+                error: {
+                    code: -32602,
+                    message: "Invalid Codex user input request payload.",
+                },
+            });
+            return;
+        }
+        this.pendingUserInputRequest = {
+            requestId,
+            method: "item/tool/requestUserInput",
+            threadId: trackedTurn.threadId,
+            turnId: trackedTurn.turnId,
+            origin: trackedTurn.origin,
+        };
+        this.state.pendingUserInput = request;
+        this.state.pendingUserInputOrigin = trackedTurn.origin;
+        this.state.lastOutputAt = nowIso();
+        this.setStatus("awaiting_input", "Codex is waiting for user input.");
+        this.emit({
+            type: "user_input_required",
+            request,
+            timestamp: nowIso(),
+        });
+    }
     handleThreadStatusChanged(params) {
         const threadId = extractCodexThreadFollowIdFromStatusChanged(params);
         if (!threadId) {
@@ -1935,6 +2135,10 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             this.pendingApprovalRequest.turnId === trackedTurn.turnId) {
             this.clearPendingApprovalState();
         }
+        if (this.pendingUserInputRequest &&
+            this.pendingUserInputRequest.turnId === trackedTurn.turnId) {
+            this.clearPendingUserInputState();
+        }
         if (this.activeTurn?.turnId === trackedTurn.turnId) {
             this.setActiveTurn(null);
         }
@@ -2023,6 +2227,8 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             this.pendingTurnStart ||
             this.pendingApproval ||
             this.pendingApprovalRequest ||
+            this.pendingUserInputRequest ||
+            this.state.pendingUserInput ||
             !this.collectTurnOutput(turnId)) {
             return;
         }
@@ -2039,6 +2245,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
         const finalText = this.collectTurnOutput(turnId);
         const lastActivityAtMs = this.turnLastActivityAtMs.get(turnId) ?? null;
         const pendingApproval = Boolean(this.pendingApproval || this.pendingApprovalRequest);
+        const pendingUserInput = Boolean(this.pendingUserInputRequest || this.state.pendingUserInput);
         const nowMs = Date.now();
         if (!shouldAutoCompleteCodexWechatTurnAfterFinalReply({
             candidateTurnId: turnId,
@@ -2046,6 +2253,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             activeTurnOrigin: activeTurn?.origin,
             pendingTurnStart: this.pendingTurnStart,
             hasPendingApproval: pendingApproval,
+            hasPendingUserInput: pendingUserInput,
             hasFinalOutput: Boolean(finalText),
             hasCompletedTurn: this.hasCompletedTurn(turnId),
             lastActivityAtMs,
@@ -2056,6 +2264,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
                 activeTurn.origin === "wechat" &&
                 !this.pendingTurnStart &&
                 !pendingApproval &&
+                !pendingUserInput &&
                 finalText &&
                 typeof lastActivityAtMs === "number") {
                 const remainingMs = CODEX_FINAL_REPLY_SETTLE_DELAY_MS - (nowMs - lastActivityAtMs);
@@ -2073,6 +2282,7 @@ export class CodexPtyAdapter extends AbstractPtyAdapter {
             return;
         }
         this.clearPendingApprovalState();
+        this.clearPendingUserInputState();
         this.setActiveTurn(null);
         this.cleanupTurnArtifacts(turnId);
         this.state.lastOutputAt = nowIso();