happy-imou-cloud 2.0.6 → 2.0.8

package/dist/{runCodex-BRMOT2dJ.cjs → runCodex--QLrOs8X.cjs}

@@ -1,14 +1,13 @@
 'use strict';
 
 var node_crypto = require('node:crypto');
-var api = require('./api-DccDghmF.cjs');
-var persistence = require('./persistence-BrTyBuT7.cjs');
-var index = require('./index-Buq7nurH.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-BMyfwx3p.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-EFAsOnR_.cjs');
+var api = require('./api-CN-WqYd_.cjs');
+var persistence = require('./persistence-DBGkO8gB.cjs');
+var index = require('./index-DM6z3aeG.cjs');
+var names = require('./names-BnV67N_O.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CYc0SIjF.cjs');
 var React = require('react');
 var ink = require('ink');
-var happyProtocol = require('happy-protocol');
 require('axios');
 require('chalk');
 require('fs');
@@ -133,7 +132,6 @@ class CodexSession {
   keepAliveInterval;
   onModeChangeCallback;
   clientSwapCallbacks = [];
-  supersedePendingInteractionsCallback = null;
   constructor(opts) {
     this.path = opts.path;
     this.api = opts.api;
@@ -174,12 +172,6 @@ class CodexSession {
       this.clientSwapCallbacks.splice(index, 1);
     }
   };
-  setPendingInteractionSuperseder = (callback) => {
-    this.supersedePendingInteractionsCallback = callback;
-  };
-  supersedePendingInteractions = (reason) => {
-    return this.supersedePendingInteractionsCallback?.(reason) ?? false;
-  };
   onThinkingChange = (thinking) => {
     this.thinking = thinking;
     this.client.keepAlive(thinking, this.mode);
@@ -320,7 +312,7 @@ const CodexDisplay = ({ messageBuffer, logPath, onExit, title }) => {
   ));
 };
 
-class CodexPermissionHandler extends BaseReasoningProcessor.BasePermissionHandler {
+class CodexPermissionHandler extends names.BasePermissionHandler {
   constructor(session) {
     super(session);
   }
@@ -359,7 +351,7 @@ class CodexSelectionHandler {
       };
       pending.timeoutHandle = setTimeout(() => {
         this.handleSelectionTimeout(request.id, pending);
-      }, BaseReasoningProcessor.getPendingInteractionTimeoutMs());
+      }, names.getPendingInteractionTimeoutMs());
       this.pendingRequests.set(request.id, pending);
       this.session.updateAgentState((currentState) => ({
         ...currentState,
@@ -395,7 +387,7 @@ class CodexSelectionHandler {
   hasPendingRequests() {
     return this.pendingRequests.size > 0;
   }
-  supersedePendingRequests(reason = BaseReasoningProcessor.INTERACTION_SUPERSEDED_ERROR) {
+  supersedePendingRequests(reason = names.INTERACTION_SUPERSEDED_ERROR) {
     const pendingSnapshot = Array.from(this.pendingRequests.entries());
     if (pendingSnapshot.length === 0) {
       return 0;
@@ -507,7 +499,7 @@ class CodexSelectionHandler {
     }
     this.pendingRequests.delete(requestId);
     this.clearPendingRequestTimeout(active);
-    active.reject(new Error(BaseReasoningProcessor.INTERACTION_TIMED_OUT_ERROR));
+    active.reject(new Error(names.INTERACTION_TIMED_OUT_ERROR));
     this.session.updateAgentState((currentState) => {
       const request = currentState.requests?.[requestId] || {
         tool: "AskUserQuestion",
@@ -530,7 +522,7 @@ class CodexSelectionHandler {
             ...request,
             completedAt: Date.now(),
             status: "canceled",
-            reason: BaseReasoningProcessor.INTERACTION_TIMED_OUT_ERROR,
+            reason: names.INTERACTION_TIMED_OUT_ERROR,
             requestKind: "selection"
           }
         }
@@ -544,7 +536,7 @@ class CodexSelectionHandler {
   }
 }
 
-class ReasoningProcessor extends BaseReasoningProcessor.BaseReasoningProcessor {
+class ReasoningProcessor extends names.BaseReasoningProcessor {
   getToolName() {
     return "CodexReasoning";
   }
@@ -784,21 +776,6 @@ function registerCodexRemoteRpcHandlers(clientSession, handlers) {
   clientSession.rpcHandlerManager.registerHandler("switch", handlers.handleSwitchToLocal);
   registerKillSessionHandler.registerKillSessionHandler(clientSession.rpcHandlerManager, handlers.handleKillSession);
 }
-function handleIncomingCodexMessageDuringRemoteTurn(opts) {
-  const reason = opts.reason ?? BaseReasoningProcessor.INTERACTION_SUPERSEDED_ERROR;
-  const supersededPermissions = opts.supersedePermissions(reason);
-  const supersededSelections = opts.supersedeSelections(reason);
-  const interruptedTurn = opts.turnInFlight;
-  const total = supersededPermissions + supersededSelections;
-  if (interruptedTurn) {
-    opts.abortActiveTurn();
-  }
-  if (total > 0 || interruptedTurn) {
-    const message = interruptedTurn ? "Current Codex task was canceled because a new user message arrived. Processing the latest message instead." : "Previous pending interaction was canceled because a new user message arrived. Processing the latest message instead.";
-    opts.onInterrupted(message);
-  }
-  return total > 0 || interruptedTurn;
-}
 async function codexRemoteLauncher(session) {
   const messageBuffer = new registerKillSessionHandler.MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
@@ -816,6 +793,9 @@ async function codexRemoteLauncher(session) {
   let isResponseInProgress = false;
   let taskStartedSent = false;
   let shouldInjectHistoryOnNextSession = false;
+  let shouldCommitAccumulatedResponse = false;
+  let currentAssistantMessageId = null;
+  let currentThinkingMessageId = null;
   const permissionHandler = new CodexPermissionHandler(session.client);
   const selectionHandler = new CodexSelectionHandler(session.client);
   const conversationHistory = new ConversationHistory({ maxMessages: 20, maxCharacters: 5e4 });
@@ -844,6 +824,9 @@ async function codexRemoteLauncher(session) {
     accumulatedResponse = "";
     isResponseInProgress = false;
     taskStartedSent = false;
+    shouldCommitAccumulatedResponse = false;
+    currentAssistantMessageId = null;
+    currentThinkingMessageId = null;
     session.onThinkingChange(false);
   };
   const abortActiveTurn = () => {
@@ -916,11 +899,17 @@ async function codexRemoteLauncher(session) {
             return;
           }
           if (!isResponseInProgress) {
-            messageBuffer.removeLastMessage("system");
-            messageBuffer.addMessage(text, "assistant");
+            if (currentThinkingMessageId) {
+              messageBuffer.removeMessage(currentThinkingMessageId);
+              currentThinkingMessageId = null;
+            }
+            currentAssistantMessageId = messageBuffer.addMessage(text, "assistant");
             isResponseInProgress = true;
           } else {
-            messageBuffer.updateLastMessage(text, "assistant");
+            const updated = currentAssistantMessageId ? messageBuffer.updateMessage(currentAssistantMessageId, text) : false;
+            if (!updated) {
+              currentAssistantMessageId = messageBuffer.addMessage(text, "assistant");
+            }
           }
           accumulatedResponse += text;
           return;
@@ -935,8 +924,8 @@ async function codexRemoteLauncher(session) {
               });
               taskStartedSent = true;
             }
-            if (!isResponseInProgress) {
-              messageBuffer.addMessage("Thinking...", "system");
+            if (!isResponseInProgress && !currentThinkingMessageId) {
+              currentThinkingMessageId = messageBuffer.addMessage("Thinking...", "system");
             }
             return;
           }
@@ -953,7 +942,7 @@ async function codexRemoteLauncher(session) {
         }
         case "tool-call": {
           const toolArgs = msg.args ? index.truncateDisplayMessage(msg.args, 100) : "";
-          const canonicalToolName = happyProtocol.resolveCanonicalToolNameV2(msg.toolName);
+          const canonicalToolName = names.resolveCanonicalToolNameV2(msg.toolName);
           messageBuffer.addMessage(
             `Executing: ${msg.toolName}${toolArgs ? ` ${toolArgs}` : ""}`,
             "tool"
@@ -962,7 +951,7 @@ async function codexRemoteLauncher(session) {
             type: "tool-call",
             name: canonicalToolName,
             callId: msg.callId,
-            input: happyProtocol.attachToolHappierMetaV2(msg.args, {
+            input: names.attachToolHappierMetaV2(msg.args, {
               v: 2,
               protocol: "acp",
               provider: "codex",
@@ -974,7 +963,7 @@ async function codexRemoteLauncher(session) {
           return;
         }
         case "tool-result": {
-          const isError = happyProtocol.inferToolResultError(msg.result);
+          const isError = names.inferToolResultError(msg.result);
           const resultText = index.truncateDisplayMessage(msg.result, 200) || (isError ? "Unknown error" : "");
           messageBuffer.addMessage(
             `${isError ? "Error:" : "Result:"} ${resultText}`.trim(),
@@ -983,12 +972,12 @@ async function codexRemoteLauncher(session) {
           session.runtimeSession.sendCodexMessage({
             type: "tool-call-result",
             callId: msg.callId,
-            output: happyProtocol.attachToolHappierMetaV2(msg.result, {
+            output: names.attachToolHappierMetaV2(msg.result, {
               v: 2,
               protocol: "acp",
               provider: "codex",
               rawToolName: msg.toolName,
-              canonicalToolName: happyProtocol.resolveCanonicalToolNameV2(msg.toolName)
+              canonicalToolName: names.resolveCanonicalToolNameV2(msg.toolName)
             }),
             id: node_crypto.randomUUID(),
             isError
@@ -1031,12 +1020,12 @@ async function codexRemoteLauncher(session) {
           const { call_id, type, ...inputs } = msg;
           messageBuffer.addMessage(`Exec approval requested: ${call_id}`, "tool");
           const rawToolName = "CodexBash";
-          const canonicalToolName = happyProtocol.resolveCanonicalToolNameV2(rawToolName);
+          const canonicalToolName = names.resolveCanonicalToolNameV2(rawToolName);
           session.runtimeSession.sendCodexMessage({
             type: "tool-call",
             name: canonicalToolName,
             callId: call_id,
-            input: happyProtocol.attachToolHappierMetaV2(inputs, {
+            input: names.attachToolHappierMetaV2(inputs, {
               v: 2,
               protocol: "acp",
               provider: "codex",
@@ -1052,12 +1041,12 @@ async function codexRemoteLauncher(session) {
           const filesMsg = changeCount === 1 ? "1 file" : `${changeCount} files`;
           messageBuffer.addMessage(`Modifying ${filesMsg}...`, "tool");
           const rawToolName = "CodexPatch";
-          const canonicalToolName = happyProtocol.resolveCanonicalToolNameV2(rawToolName);
+          const canonicalToolName = names.resolveCanonicalToolNameV2(rawToolName);
           session.runtimeSession.sendCodexMessage({
             type: "tool-call",
             name: canonicalToolName,
             callId: msg.call_id,
-            input: happyProtocol.attachToolHappierMetaV2({
+            input: names.attachToolHappierMetaV2({
               auto_approved: msg.auto_approved,
               changes: msg.changes
             }, {
@@ -1080,7 +1069,7 @@ async function codexRemoteLauncher(session) {
           session.runtimeSession.sendCodexMessage({
             type: "tool-call-result",
             callId: msg.call_id,
-            output: happyProtocol.attachToolHappierMetaV2({
+            output: names.attachToolHappierMetaV2({
               stdout: msg.stdout,
               stderr: msg.stderr,
               success: msg.success
@@ -1089,7 +1078,7 @@ async function codexRemoteLauncher(session) {
               protocol: "acp",
               provider: "codex",
               rawToolName: "CodexPatch",
-              canonicalToolName: happyProtocol.resolveCanonicalToolNameV2("CodexPatch")
+              canonicalToolName: names.resolveCanonicalToolNameV2("CodexPatch")
             }),
             id: node_crypto.randomUUID(),
             isError: !msg.success
@@ -1109,8 +1098,13 @@ async function codexRemoteLauncher(session) {
             const thinkingText = typeof thinkingPayload?.text === "string" ? thinkingPayload.text : "";
             if (thinkingText) {
               reasoningProcessor.processDelta(thinkingText);
-              if (!thinkingText.startsWith("**")) {
-                messageBuffer.updateLastMessage(`[Thinking] ${thinkingText.substring(0, 100)}...`, "system");
+              if (!thinkingText.startsWith("**") && !isResponseInProgress) {
+                const preview = `[Thinking] ${thinkingText.substring(0, 100)}...`;
+                if (currentThinkingMessageId) {
+                  messageBuffer.updateMessage(currentThinkingMessageId, preview, { mode: "replace" });
+                } else {
+                  currentThinkingMessageId = messageBuffer.addMessage(preview, "system");
+                }
               }
             }
           }
@@ -1139,7 +1133,6 @@ async function codexRemoteLauncher(session) {
       model: executionMode.model,
       sandbox: executionMode.sandbox,
       approvalPolicy: executionMode.approvalPolicy,
-      mcpServers: {},
       permissionHandler,
       selectionHandler: {
         handleSelection: (request) => selectionHandler.requestSelection(request)
@@ -1154,20 +1147,6 @@ async function codexRemoteLauncher(session) {
     api.logger.debug("[Codex] Ignoring legacy switch request because Codex is ACP-only");
     emitStatusMessage(message);
   };
-  session.setPendingInteractionSuperseder((reason = BaseReasoningProcessor.INTERACTION_SUPERSEDED_ERROR) => {
-    return handleIncomingCodexMessageDuringRemoteTurn({
-      reason,
-      supersedePermissions: (value) => permissionHandler.supersedePendingRequests(value),
-      supersedeSelections: (value) => selectionHandler.supersedePendingRequests(value),
-      turnInFlight,
-      abortActiveTurn,
-      onInterrupted: (message) => {
-        api.logger.debug("[Codex] Incoming user message interrupted ACP remote turn");
-        messageBuffer.addMessage(message, "status");
-        session.runtimeSession.sendSessionEvent({ type: "message", message });
-      }
-    });
-  });
   async function handleAbort() {
     api.logger.debug("[Codex] Abort requested - stopping current task");
     try {
@@ -1271,6 +1250,7 @@ async function codexRemoteLauncher(session) {
       const turnSignal = abortController.signal;
       try {
         turnInFlight = true;
+        shouldCommitAccumulatedResponse = false;
         const activeBackend = backend ?? createBackend(message.mode);
         if (!activeBackend) {
           throw new Error("Failed to create Codex ACP backend");
@@ -1292,6 +1272,7 @@ async function codexRemoteLauncher(session) {
         await activeBackend.sendPrompt(acpSessionId, promptToSend);
         await waitForResponseCompleteWithAbort(activeBackend, turnSignal);
         reasoningProcessor.completeCurrent();
+        shouldCommitAccumulatedResponse = true;
         shouldInjectHistoryOnNextSession = false;
       } catch (error) {
         api.logger.warn("Error in codex ACP session:", error);
@@ -1314,7 +1295,9 @@ async function codexRemoteLauncher(session) {
         }
       } finally {
         turnInFlight = false;
-        emitFinalAssistantMessage();
+        if (shouldCommitAccumulatedResponse) {
+          emitFinalAssistantMessage();
+        }
         if (!shouldExit) {
           session.runtimeSession.sendCodexMessage({
             type: "task_complete",
@@ -1339,7 +1322,6 @@ async function codexRemoteLauncher(session) {
     await disposeBackend();
     permissionHandler.reset();
     selectionHandler.reset();
-    session.setPendingInteractionSuperseder(null);
     session.removeClientSwapCallback(handleClientSwap);
     if (process.stdin.isTTY) {
       try {
@@ -1411,9 +1393,6 @@ async function syncControlledByUserState(sessionClient, controlledByUser) {
     }));
   });
 }
-function shouldSupersedeCodexPendingInteractions(opts) {
-  return true;
-}
 function resolveInitialCodexPermissionMode(opts) {
   if (opts.permissionMode) {
     return opts.permissionMode;
@@ -1462,7 +1441,7 @@ async function runCodex(opts) {
     machineId,
     metadata: index.initialMachineMetadata
   });
-  const { state, metadata } = BaseReasoningProcessor.createSessionMetadata({
+  const { state, metadata } = names.createSessionMetadata({
     flavor: "codex",
     machineId,
     startedBy: opts.startedBy
@@ -1478,7 +1457,7 @@ async function runCodex(opts) {
   }
   let sessionClient;
   let codexSession = null;
-  const { session: initialSession, reconnectionHandle } = BaseReasoningProcessor.setupOfflineReconnection({
+  const { session: initialSession, reconnectionHandle } = names.setupOfflineReconnection({
     api: api$1,
     sessionTag,
     metadata,
@@ -1520,13 +1499,6 @@ async function runCodex(opts) {
       messageModel = message.meta.model || void 0;
       currentModel = messageModel;
     }
-    if (shouldSupersedeCodexPendingInteractions({
-      startingMode: opts.startingMode,
-      currentMode: codexSession?.mode
-    })) {
-      api.logger.debug("[codex] Incoming user message superseding active remote interaction");
-      codexSession?.supersedePendingInteractions(BaseReasoningProcessor.INTERACTION_SUPERSEDED_ERROR);
-    }
     messageQueue.push(message.content.text, {
       permissionMode: permissionResolution.resolvedPermissionMode,
       model: messageModel
@@ -1566,6 +1538,5 @@ exports.resolveIncomingCodexPermissionMode = resolveIncomingCodexPermissionMode;
 exports.resolveInitialCodexPermissionMode = resolveInitialCodexPermissionMode;
 exports.resolveQueuedCodexPermissionMode = resolveQueuedCodexPermissionMode;
 exports.runCodex = runCodex;
-exports.shouldSupersedeCodexPendingInteractions = shouldSupersedeCodexPendingInteractions;
 exports.supportsAgentStateUpdateEvents = supportsAgentStateUpdateEvents;
 exports.syncControlledByUserState = syncControlledByUserState;

package/dist/{runCodex-DTPmqCyS.mjs → runCodex-B4QAb-Go.mjs}

@@ -1,12 +1,11 @@
 import { randomUUID } from 'node:crypto';
-import { l as logger, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-Emo3rSZH.mjs';
-import { readSettings } from './persistence-Blm1hTQA.mjs';
-import { f as formatDisplayMessage, v as validateCodexAcpSpawn, d as createCodexBackend, t as truncateDisplayMessage, b as stopCaffeinate, i as initialMachineMetadata, n as notifyDaemonSessionStarted } from './index-Dh8UTgm4.mjs';
-import { B as BasePermissionHandler, g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, b as INTERACTION_TIMED_OUT_ERROR, a as BaseReasoningProcessor, c as createSessionMetadata, s as setupOfflineReconnection } from './BaseReasoningProcessor-1EzrE03x.mjs';
-import { h as hashObject, a as MessageBuffer, r as registerKillSessionHandler, M as MessageQueue2 } from './registerKillSessionHandler-Bm7E-03E.mjs';
+import { l as logger, b as connectionState, A as ApiClient, i as isAuthenticationRequiredError } from './api-D-uiH_TF.mjs';
+import { readSettings } from './persistence-DiNg1DPF.mjs';
+import { f as formatDisplayMessage, v as validateCodexAcpSpawn, d as createCodexBackend, t as truncateDisplayMessage, b as stopCaffeinate, i as initialMachineMetadata, n as notifyDaemonSessionStarted } from './index-DhheEtRl.mjs';
+import { B as BasePermissionHandler, g as getPendingInteractionTimeoutMs, I as INTERACTION_SUPERSEDED_ERROR, d as INTERACTION_TIMED_OUT_ERROR, a as BaseReasoningProcessor, b as attachToolHappierMetaV2, r as resolveCanonicalToolNameV2, i as inferToolResultError, c as createSessionMetadata, s as setupOfflineReconnection } from './names-BjEof0E2.mjs';
+import { h as hashObject, a as MessageBuffer, r as registerKillSessionHandler, M as MessageQueue2 } from './registerKillSessionHandler-Cu9rHGsI.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { attachToolHappierMetaV2, resolveCanonicalToolNameV2, inferToolResultError } from 'happy-protocol';
 import 'axios';
 import 'chalk';
 import 'fs';
@@ -131,7 +130,6 @@ class CodexSession {
   keepAliveInterval;
   onModeChangeCallback;
   clientSwapCallbacks = [];
-  supersedePendingInteractionsCallback = null;
   constructor(opts) {
     this.path = opts.path;
     this.api = opts.api;
@@ -172,12 +170,6 @@ class CodexSession {
       this.clientSwapCallbacks.splice(index, 1);
     }
   };
-  setPendingInteractionSuperseder = (callback) => {
-    this.supersedePendingInteractionsCallback = callback;
-  };
-  supersedePendingInteractions = (reason) => {
-    return this.supersedePendingInteractionsCallback?.(reason) ?? false;
-  };
   onThinkingChange = (thinking) => {
     this.thinking = thinking;
     this.client.keepAlive(thinking, this.mode);
@@ -782,21 +774,6 @@ function registerCodexRemoteRpcHandlers(clientSession, handlers) {
   clientSession.rpcHandlerManager.registerHandler("switch", handlers.handleSwitchToLocal);
   registerKillSessionHandler(clientSession.rpcHandlerManager, handlers.handleKillSession);
 }
-function handleIncomingCodexMessageDuringRemoteTurn(opts) {
-  const reason = opts.reason ?? INTERACTION_SUPERSEDED_ERROR;
-  const supersededPermissions = opts.supersedePermissions(reason);
-  const supersededSelections = opts.supersedeSelections(reason);
-  const interruptedTurn = opts.turnInFlight;
-  const total = supersededPermissions + supersededSelections;
-  if (interruptedTurn) {
-    opts.abortActiveTurn();
-  }
-  if (total > 0 || interruptedTurn) {
-    const message = interruptedTurn ? "Current Codex task was canceled because a new user message arrived. Processing the latest message instead." : "Previous pending interaction was canceled because a new user message arrived. Processing the latest message instead.";
-    opts.onInterrupted(message);
-  }
-  return total > 0 || interruptedTurn;
-}
 async function codexRemoteLauncher(session) {
   const messageBuffer = new MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
@@ -814,6 +791,9 @@ async function codexRemoteLauncher(session) {
   let isResponseInProgress = false;
   let taskStartedSent = false;
   let shouldInjectHistoryOnNextSession = false;
+  let shouldCommitAccumulatedResponse = false;
+  let currentAssistantMessageId = null;
+  let currentThinkingMessageId = null;
   const permissionHandler = new CodexPermissionHandler(session.client);
   const selectionHandler = new CodexSelectionHandler(session.client);
   const conversationHistory = new ConversationHistory({ maxMessages: 20, maxCharacters: 5e4 });
@@ -842,6 +822,9 @@ async function codexRemoteLauncher(session) {
     accumulatedResponse = "";
     isResponseInProgress = false;
     taskStartedSent = false;
+    shouldCommitAccumulatedResponse = false;
+    currentAssistantMessageId = null;
+    currentThinkingMessageId = null;
     session.onThinkingChange(false);
   };
   const abortActiveTurn = () => {
@@ -914,11 +897,17 @@ async function codexRemoteLauncher(session) {
             return;
           }
           if (!isResponseInProgress) {
-            messageBuffer.removeLastMessage("system");
-            messageBuffer.addMessage(text, "assistant");
+            if (currentThinkingMessageId) {
+              messageBuffer.removeMessage(currentThinkingMessageId);
+              currentThinkingMessageId = null;
+            }
+            currentAssistantMessageId = messageBuffer.addMessage(text, "assistant");
             isResponseInProgress = true;
           } else {
-            messageBuffer.updateLastMessage(text, "assistant");
+            const updated = currentAssistantMessageId ? messageBuffer.updateMessage(currentAssistantMessageId, text) : false;
+            if (!updated) {
+              currentAssistantMessageId = messageBuffer.addMessage(text, "assistant");
+            }
           }
           accumulatedResponse += text;
           return;
@@ -933,8 +922,8 @@ async function codexRemoteLauncher(session) {
               });
               taskStartedSent = true;
             }
-            if (!isResponseInProgress) {
-              messageBuffer.addMessage("Thinking...", "system");
+            if (!isResponseInProgress && !currentThinkingMessageId) {
+              currentThinkingMessageId = messageBuffer.addMessage("Thinking...", "system");
             }
             return;
           }
@@ -1107,8 +1096,13 @@ async function codexRemoteLauncher(session) {
             const thinkingText = typeof thinkingPayload?.text === "string" ? thinkingPayload.text : "";
             if (thinkingText) {
               reasoningProcessor.processDelta(thinkingText);
-              if (!thinkingText.startsWith("**")) {
-                messageBuffer.updateLastMessage(`[Thinking] ${thinkingText.substring(0, 100)}...`, "system");
+              if (!thinkingText.startsWith("**") && !isResponseInProgress) {
+                const preview = `[Thinking] ${thinkingText.substring(0, 100)}...`;
+                if (currentThinkingMessageId) {
+                  messageBuffer.updateMessage(currentThinkingMessageId, preview, { mode: "replace" });
+                } else {
+                  currentThinkingMessageId = messageBuffer.addMessage(preview, "system");
+                }
               }
             }
           }
@@ -1137,7 +1131,6 @@ async function codexRemoteLauncher(session) {
       model: executionMode.model,
       sandbox: executionMode.sandbox,
       approvalPolicy: executionMode.approvalPolicy,
-      mcpServers: {},
       permissionHandler,
       selectionHandler: {
         handleSelection: (request) => selectionHandler.requestSelection(request)
@@ -1152,20 +1145,6 @@ async function codexRemoteLauncher(session) {
     logger.debug("[Codex] Ignoring legacy switch request because Codex is ACP-only");
     emitStatusMessage(message);
   };
-  session.setPendingInteractionSuperseder((reason = INTERACTION_SUPERSEDED_ERROR) => {
-    return handleIncomingCodexMessageDuringRemoteTurn({
-      reason,
-      supersedePermissions: (value) => permissionHandler.supersedePendingRequests(value),
-      supersedeSelections: (value) => selectionHandler.supersedePendingRequests(value),
-      turnInFlight,
-      abortActiveTurn,
-      onInterrupted: (message) => {
-        logger.debug("[Codex] Incoming user message interrupted ACP remote turn");
-        messageBuffer.addMessage(message, "status");
-        session.runtimeSession.sendSessionEvent({ type: "message", message });
-      }
-    });
-  });
   async function handleAbort() {
     logger.debug("[Codex] Abort requested - stopping current task");
     try {
@@ -1269,6 +1248,7 @@ async function codexRemoteLauncher(session) {
       const turnSignal = abortController.signal;
       try {
         turnInFlight = true;
+        shouldCommitAccumulatedResponse = false;
         const activeBackend = backend ?? createBackend(message.mode);
         if (!activeBackend) {
           throw new Error("Failed to create Codex ACP backend");
@@ -1290,6 +1270,7 @@ async function codexRemoteLauncher(session) {
         await activeBackend.sendPrompt(acpSessionId, promptToSend);
         await waitForResponseCompleteWithAbort(activeBackend, turnSignal);
         reasoningProcessor.completeCurrent();
+        shouldCommitAccumulatedResponse = true;
         shouldInjectHistoryOnNextSession = false;
       } catch (error) {
         logger.warn("Error in codex ACP session:", error);
@@ -1312,7 +1293,9 @@ async function codexRemoteLauncher(session) {
         }
       } finally {
         turnInFlight = false;
-        emitFinalAssistantMessage();
+        if (shouldCommitAccumulatedResponse) {
+          emitFinalAssistantMessage();
+        }
         if (!shouldExit) {
           session.runtimeSession.sendCodexMessage({
             type: "task_complete",
@@ -1337,7 +1320,6 @@ async function codexRemoteLauncher(session) {
     await disposeBackend();
     permissionHandler.reset();
     selectionHandler.reset();
-    session.setPendingInteractionSuperseder(null);
     session.removeClientSwapCallback(handleClientSwap);
     if (process.stdin.isTTY) {
       try {
@@ -1409,9 +1391,6 @@ async function syncControlledByUserState(sessionClient, controlledByUser) {
     }));
   });
 }
-function shouldSupersedeCodexPendingInteractions(opts) {
-  return true;
-}
 function resolveInitialCodexPermissionMode(opts) {
   if (opts.permissionMode) {
     return opts.permissionMode;
@@ -1518,13 +1497,6 @@ async function runCodex(opts) {
       messageModel = message.meta.model || void 0;
       currentModel = messageModel;
     }
-    if (shouldSupersedeCodexPendingInteractions({
-      startingMode: opts.startingMode,
-      currentMode: codexSession?.mode
-    })) {
-      logger.debug("[codex] Incoming user message superseding active remote interaction");
-      codexSession?.supersedePendingInteractions(INTERACTION_SUPERSEDED_ERROR);
-    }
     messageQueue.push(message.content.text, {
       permissionMode: permissionResolution.resolvedPermissionMode,
       model: messageModel
@@ -1560,4 +1532,4 @@ async function runCodex(opts) {
   }
 }
 
-export { resolveIncomingCodexPermissionMode, resolveInitialCodexPermissionMode, resolveQueuedCodexPermissionMode, runCodex, shouldSupersedeCodexPendingInteractions, supportsAgentStateUpdateEvents, syncControlledByUserState };
+export { resolveIncomingCodexPermissionMode, resolveInitialCodexPermissionMode, resolveQueuedCodexPermissionMode, runCodex, supportsAgentStateUpdateEvents, syncControlledByUserState };