From d4bc12c2c1c3d2affe1c3715aa696f1aa8d35347 Mon Sep 17 00:00:00 2001
From: Jason Mulligan <jason.mulligan@avoidwork.com>
Date: Sat, 20 Jun 2026 19:39:00 -0400
Subject: [PATCH] fix: remove message array mutations during abort to prevent
 state corruption

---
 src/tui/app.js | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/tui/app.js b/src/tui/app.js
index 4438419..cd8cc79 100644
--- a/src/tui/app.js
+++ b/src/tui/app.js
@@ -898,14 +898,11 @@ export default function App({
 				if (sessionState) {
 					sessionState.popExchange();
 				}
-				// Clear the partial streaming assistant message from UI
-				setMessages((prev) => prev.filter((msg) => !isStreamingMessage(msg)));
 				setStatusMessage("Interrupted.");
 			} else {
 				if (onSaveSession) {
 					onSaveSession();
 				}
-				setMessages((prev) => prev.filter((msg) => !isStreamingMessage(msg)));
 				setStatusMessage("Something went wrong");
 				addMessage({
 					role: "system",
@@ -937,14 +934,9 @@ export default function App({
 			abortControllerRef.current = null;
 		}
 		isStreamingRef.current = false;
-		setMessages((prev) => {
-			const cloned = [...prev];
-			const last = cloned[cloned.length - 1];
-			if (last?.role === "assistant" && last?.streaming) {
-				last.streaming = false;
-			}
-			return cloned;
-		});
+		// Don't modify the message array here — the server's 400 response
+		// can corrupt state when we mutate messages during abort. The
+		// AbortError catch block in handleChat/handleCommand cleans up.
 		setStatusMessage("Interrupted.");
 
 		// Wait for the dispatchProvider promise to resolve (it will throw