From edf5ec52bacca7bf830f842d5d10a89fbfc4420e Mon Sep 17 00:00:00 2001
From: Saoud Rizwan <7799382+saoudrizwan@users.noreply.github.com>
Date: Thu, 7 May 2026 23:02:40 -0700
Subject: [PATCH] fix(cli): abort active turn before mode switch (#71)

---
 sdk/apps/cli/src/runtime/run-interactive.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sdk/apps/cli/src/runtime/run-interactive.ts b/sdk/apps/cli/src/runtime/run-interactive.ts
index 5084ba9fb6..80d0fd4cf4 100644
--- a/sdk/apps/cli/src/runtime/run-interactive.ts
+++ b/sdk/apps/cli/src/runtime/run-interactive.ts
@@ -442,6 +442,11 @@ export async function runInteractive(
 			if (mode !== "plan" && mode !== "act") {
 				return;
 			}
+			if (isRunning) {
+				pendingModeChange.current = mode;
+				sessionRuntime.abortAll();
+				return;
+			}
 			await sessionRuntime.applyMode(mode);
 		},
 		onModelChange: async () => {