Merge main branch and resolve conflicts

Resolved merge conflicts in streaming.rs by keeping the main branch structure
while applying the improved timeout error message.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>

Author: echobt

src/cortex-tui/src/app/state.rs

@@ -460,9 +460,14 @@ impl AppState {
 // ============================================================================
 
 impl AppState {
-    /// Start streaming a response
-    pub fn start_streaming(&mut self, tool: Option<String>) {
-        self.streaming.start(tool);
+    /// Start streaming a response.
+    ///
+    /// # Arguments
+    /// * `tool` - Optional tool name being executed
+    /// * `reset_timer` - If true, resets the prompt elapsed timer (use for new user prompts).
+    ///   If false, preserves existing timer (use for tool continuations).
+    pub fn start_streaming(&mut self, tool: Option<String>, reset_timer: bool) {
+        self.streaming.start(tool, reset_timer);
         // Use typewriter only if streaming animation is enabled
         if self.streaming_enabled {
             self.typewriter = Some(Typewriter::dynamic(String::new(), 500.0));

src/cortex-tui/src/app/streaming.rs

@@ -21,13 +21,20 @@ pub struct StreamingState {
 }
 
 impl StreamingState {
-    pub fn start(&mut self, tool: Option<String>) {
+    /// Start streaming with option to reset the prompt timer.
+    ///
+    /// # Arguments
+    /// * `tool` - Optional tool name being executed
+    /// * `reset_timer` - If true, resets `prompt_started_at` to now (use for new user prompts).
+    ///   If false, preserves existing timer (use for tool continuations).
+    pub fn start(&mut self, tool: Option<String>, reset_timer: bool) {
         self.is_streaming = true;
         self.thinking = true;
         self.current_tool = tool;
         self.task_started_at = Some(Instant::now());
-        // Only set prompt_started_at if not already set (first call in a turn)
-        if self.prompt_started_at.is_none() {
+        // Reset prompt timer only when explicitly requested (new user prompt)
+        // or when not yet set (first call)
+        if reset_timer || self.prompt_started_at.is_none() {
             self.prompt_started_at = Some(Instant::now());
         }
     }

src/cortex-tui/src/runner/event_loop/core.rs

@@ -446,6 +446,9 @@ impl EventLoop {
                 task.abort();
             }
 
+            // Reset ESC timer after cancellation to prevent accidental quit
+            self.app_state.reset_esc();
+
             self.stream_controller.reset();
         }
     }

src/cortex-tui/src/runner/event_loop/input.rs

@@ -368,24 +368,45 @@ impl EventLoop {
             return Ok(());
         }
 
-        // Check if app is idle (nothing active that ESC should cancel)
-        let is_idle = !self.app_state.streaming.is_streaming
-            && self.app_state.pending_approval.is_none()
-            && !self.app_state.has_queued_messages()
-            && !self.app_state.autocomplete.visible;
-
-        if is_idle {
-            if self.app_state.handle_esc() {
-                self.app_state.set_quit();
-                return Ok(());
-            } else {
-                self.app_state.toasts.info("Press ESC again to quit");
-                self.render(terminal)?;
-                return Ok(());
-            }
+        // Priority 2: If streaming is active, cancel it
+        if self.app_state.streaming.is_streaming {
+            self.cancel_streaming();
+            self.render(terminal)?;
+            return Ok(());
         }
 
-        Ok(())
+        // Priority 3: If there are queued messages, cancel them
+        if self.app_state.has_queued_messages() {
+            let count = self.app_state.queued_count();
+            self.app_state.clear_message_queue();
+            self.add_system_message(&format!("Cancelled {} queued message(s)", count));
+            self.render(terminal)?;
+            return Ok(());
+        }
+
+        // Priority 4: If there's pending approval, reject it
+        if self.app_state.pending_approval.is_some() {
+            self.app_state.reject();
+            self.render(terminal)?;
+            return Ok(());
+        }
+
+        // Priority 5: If autocomplete is visible, hide it (already handled in handle_autocomplete_key)
+        if self.app_state.autocomplete.visible {
+            self.app_state.autocomplete.hide();
+            self.render(terminal)?;
+            return Ok(());
+        }
+
+        // Priority 6: Double-tap ESC to quit when idle
+        if self.app_state.handle_esc() {
+            self.app_state.set_quit();
+            Ok(())
+        } else {
+            self.app_state.toasts.info("Press ESC again to quit");
+            self.render(terminal)?;
+            Ok(())
+        }
     }
 
     /// Handle autocomplete navigation keys
@@ -596,7 +617,9 @@ impl EventLoop {
         match event {
             AppEvent::StreamingStarted => {
                 self.stream_controller.start_processing();
-                self.app_state.start_streaming(None);
+                // Don't reset timer here - this is triggered by backend TaskStarted event
+                // which could be either a new prompt or a continuation
+                self.app_state.start_streaming(None, false);
             }
 
             AppEvent::StreamingChunk(chunk) => {