fix(tui): address second review findings

- Abort agent task on quit to prevent hanging on active API streams.
  Log panics from the agent task instead of silently dropping them.
- Use saturating_add in scroll_down to prevent u16 wrapping.
- Show bash commands inline in TUI tool call display.
- Extract push_message_lines helper to deduplicate build_text logic.
- Make ChatMessage and ChatRole private (only used within chat.rs).
- Fix theme doc referencing unimplemented config section.

Author: hakula139

crates/oxide-code/src/main.rs

@@ -94,8 +94,12 @@ async fn run_tui(client: &Client, model: &str) -> Result<()> {
 
     tui::terminal::restore();
 
-    if let Ok(Err(e)) = agent_handle.await {
-        warn!("agent loop error: {e}");
+    // Cancel the agent loop — it may be blocked on an API stream.
+    agent_handle.abort();
+    match agent_handle.await {
+        Ok(Err(e)) => warn!("agent loop error: {e}"),
+        Err(e) if !e.is_cancelled() => warn!("agent task panicked: {e}"),
+        _ => {}
     }
 
     result

crates/oxide-code/src/tui/app.rs

@@ -123,9 +123,13 @@ impl App {
                 // TODO: Render thinking in a dimmed / collapsible block.
                 self.status_bar.set_status(Status::Streaming);
             }
-            AgentEvent::ToolCallStart { name, .. } => {
+            AgentEvent::ToolCallStart { name, input, .. } => {
                 self.chat.commit_streaming();
-                self.chat.push_tool_call(&name, None);
+                // Show bash commands inline for visibility.
+                let title = (name == "bash")
+                    .then(|| input.get("command").and_then(serde_json::Value::as_str))
+                    .flatten();
+                self.chat.push_tool_call(&name, title);
                 self.status_bar.set_status(Status::ToolRunning);
             }
             AgentEvent::ToolCallEnd { title, .. } => {

crates/oxide-code/src/tui/components/chat.rs

@@ -11,17 +11,15 @@ use crate::tui::theme::Theme;
 
 // ── Chat Message ──
 
-/// A rendered chat message. Stores the role and content text for display.
-/// Future PRs will add tool call blocks, markdown rendering, and collapsed
-/// sections.
+/// A rendered chat message with role and content text.
 #[derive(Debug, Clone)]
-pub(crate) struct ChatMessage {
-    pub(crate) role: ChatRole,
-    pub(crate) content: String,
+struct ChatMessage {
+    role: ChatRole,
+    content: String,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum ChatRole {
+enum ChatRole {
     User,
     Assistant,
 }
@@ -119,7 +117,7 @@ impl ChatView {
             .content_height
             .get()
             .saturating_sub(self.viewport_height);
-        self.scroll_offset = (self.scroll_offset + lines).min(max);
+        self.scroll_offset = self.scroll_offset.saturating_add(lines).min(max);
         if self.scroll_offset >= max {
             self.auto_scroll = true;
         }
@@ -130,49 +128,47 @@ impl ChatView {
         let mut lines: Vec<Line<'_>> = Vec::new();
 
         for msg in &self.messages {
-            // Single blank line between messages.
-            if !lines.is_empty() {
-                lines.push(Line::raw(""));
-            }
-
-            // Role label.
-            let (label, style) = match msg.role {
-                ChatRole::User => ("❯ You", self.theme.accent()),
-                ChatRole::Assistant => ("⟡ Assistant", self.theme.secondary()),
-            };
-            lines.push(Line::from(vec![
-                Span::raw("  "),
-                Span::styled(label, style),
-            ]));
-
-            // Content lines (immediately after label, no blank line).
-            for line in msg.content.trim().lines() {
-                lines.push(Line::from(vec![
-                    Span::raw("    "),
-                    Span::styled(line, self.theme.text()),
-                ]));
-            }
+            self.push_message_lines(&mut lines, msg.role, &msg.content);
         }
 
         // Streaming buffer (not yet committed).
         if !self.streaming_buffer.is_empty() {
-            if !lines.is_empty() {
-                lines.push(Line::raw(""));
-            }
-            lines.push(Line::from(vec![
-                Span::raw("  "),
-                Span::styled("⟡ Assistant", self.theme.secondary()),
-            ]));
-            for line in self.streaming_buffer.trim().lines() {
-                lines.push(Line::from(vec![
-                    Span::raw("    "),
-                    Span::styled(line, self.theme.text()),
-                ]));
-            }
+            self.push_message_lines(&mut lines, ChatRole::Assistant, &self.streaming_buffer);
         }
 
         Text::from(lines)
     }
+
+    /// Append a role label and content lines for a single message.
+    fn push_message_lines<'a>(
+        &'a self,
+        lines: &mut Vec<Line<'a>>,
+        role: ChatRole,
+        content: &'a str,
+    ) {
+        // Single blank line between messages.
+        if !lines.is_empty() {
+            lines.push(Line::raw(""));
+        }
+
+        // Role label.
+        let (label, style) = match role {
+            ChatRole::User => ("❯ You", self.theme.accent()),
+            ChatRole::Assistant => ("⟡ Assistant", self.theme.secondary()),
+        };
+        lines.push(Line::from(vec![
+            Span::raw("  "),
+            Span::styled(label, style),
+        ]));
+
+        // Content lines (immediately after label, no blank line).
+        for line in content.trim().lines() {
+            lines.push(Line::from(vec![
+                Span::raw("    "),
+                Span::styled(line, self.theme.text()),
+            ]));
+        }
+    }
 }
 
 impl Component for ChatView {

crates/oxide-code/src/tui/theme.rs

@@ -5,9 +5,7 @@ use ratatui::style::{Color, Modifier, Style};
 /// The default theme uses Catppuccin Mocha colors with a transparent
 /// background (respects the user's terminal theme). All components reference
 /// the theme via [`Theme::default()`] rather than hardcoding colors.
-///
-/// Users can override individual color slots in the `[tui.theme]` config
-/// section. The built-in palette is named `"default"`.
+/// Named color slots are designed for future user-configurable overrides.
 #[expect(
     dead_code,
     reason = "all color slots are part of the theme API; not all consumed yet"