diff --git a/src-node/claude-code-agent.js b/src-node/claude-code-agent.js
index 3bda06f8b9..94adaa99c6 100644
--- a/src-node/claude-code-agent.js
+++ b/src-node/claude-code-agent.js
@@ -673,8 +673,11 @@ exports.resumeSession = async function (params) {
  * Destroy the current session (clear session ID).
  */
 exports.destroySession = async function () {
+    if (currentAbortController) {
+        currentAbortController.abort();
+        currentAbortController = null;
+    }
     currentSessionId = null;
-    currentAbortController = null;
     _queuedClarification = null;
     return { success: true };
 };
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
index 70ba3806e5..344bbc77ca 100644
--- a/src/nls/root/strings.js
+++ b/src/nls/root/strings.js
@@ -2368,6 +2368,10 @@ define({
     "AI_CHAT_HISTORY_DELETE_CONFIRM": "Delete this session?",
     "AI_CHAT_SWITCH_PROJECT_TITLE": "AI is working",
     "AI_CHAT_SWITCH_PROJECT_MSG": "AI is currently working on a task. Switching projects will stop it. Continue?",
+    "AI_CHAT_NEW_WHILE_STREAMING_TITLE": "AI is working",
+    "AI_CHAT_NEW_WHILE_STREAMING_MSG": "AI is currently working on a task. Starting a new conversation will stop it. Continue?",
+    "AI_CHAT_RESUME_WHILE_STREAMING_TITLE": "AI is working",
+    "AI_CHAT_RESUME_WHILE_STREAMING_MSG": "AI is currently working on a task. Switching to a previous conversation will stop it. Continue?",
     "AI_CHAT_SETTINGS_TITLE": "Claude Code Settings",
     "AI_SETTINGS_API_KEY": "API Key",
     "AI_SETTINGS_BASE_URL": "Base URL",
diff --git a/tracking-repos.json b/tracking-repos.json
index f7af595424..0a5f6dceee 100644
--- a/tracking-repos.json
+++ b/tracking-repos.json
@@ -1,5 +1,5 @@
 {
   "phoenixPro": {
-    "commitID": "2265944a6d1803ba301c4348baa8dd85b14ee652"
+    "commitID": "70c526ad1357d7913f637db242122a1ac27a9aa7"
   }
 }