Terminal UI redesign, modeled after codex CLI. (#91)

Author: stippi

Cargo.lock

@@ -2,3 +2,7 @@
 members = ["crates/code_assistant", "crates/command_executor", "crates/fs_explorer", "crates/llm", "crates/sandbox", "crates/web"]
 
 resolver = "2"
+
+[patch.crates-io]
+crossterm = { git = "https://github.com/nornagon/crossterm", branch = "nornagon/color-query" }
+ratatui = { git = "https://github.com/nornagon/ratatui", branch = "nornagon-v0.29.0-patch" }

Cargo.toml

@@ -20,12 +20,18 @@ tempfile = "3.23"
 
 # Terminal UI
 rustyline = "12.0.0"
-crossterm = "0.27.0"
+crossterm = { version = "0.28.1", features = ["bracketed-paste", "event-stream"] }
 unicode-width = "0.1"
-ratatui = "0.29"
-tui-textarea = "0.7"
+ratatui = { version = "0.29", features = [
+    "scrolling-regions",
+    "unstable-backend-writer",
+    "unstable-rendered-line-info",
+    "unstable-widget-ref",
+] }
+textwrap = "0.16"
 # Pin to 0.3.6 to avoid incompatibility with ratatui 0.29 (0.3.7 requires ratatui-core)
 tui-markdown = "=0.3.6"
+derive_more = { version = "2", features = ["is_variant"] }
 
 # GPUI related
 gpui = "0.2.2"
@@ -64,13 +70,17 @@ rand = "0.8.5"
 # Diff visualization
 similar = { version = "2.7.0", features = ["inline"] }
 async-channel = "2.5.0"
+indexmap = "2"
 
 # Base64 encoding for images
 base64 = "0.22"
 
 # Image processing
 image = "0.25"
 
+# Clipboard access for paste
+arboard = "3"
+
 # Agent Client Protocol
 agent-client-protocol = { version = "0.9", features = ["unstable"] }
 tokio-util = { version = "0.7", features = ["compat"] }

crates/code_assistant/Cargo.toml

@@ -568,7 +568,9 @@ impl UserInterface for ACPUserUI {
                 for attachment in attachments {
                     #[allow(clippy::single_match)]
                     match attachment {
-                        crate::persistence::DraftAttachment::Image { content, mime_type } => {
+                        crate::persistence::DraftAttachment::Image {
+                            content, mime_type, ..
+                        } => {
                             self.send_session_update(acp::SessionUpdate::UserMessageChunk(
                                 Self::content_chunk(acp::ContentBlock::Image(
                                     acp::ImageContent::new(content, mime_type),

crates/code_assistant/src/acp/ui.rs

@@ -892,7 +892,15 @@ pub enum DraftAttachment {
     #[serde(rename = "text")]
     Text { content: String },
     #[serde(rename = "image")]
-    Image { content: String, mime_type: String }, // Base64 encoded
+    Image {
+        content: String,
+        mime_type: String,
+        /// Image dimensions (optional, for display purposes)
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        width: Option<u32>,
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        height: Option<u32>,
+    },
     #[serde(rename = "file")]
     File {
         content: String,

crates/code_assistant/src/persistence.rs

@@ -1,5 +1,26 @@
 //! Tool use filtering system to control which tool blocks are allowed and when to truncate responses
 
+/// Check if a tool is a read/explore operation (doesn't modify state).
+/// Used by the UI to render these tools in compact mode.
+pub fn is_explore_tool(tool_name: &str) -> bool {
+    matches!(
+        tool_name,
+        "read_files"
+            | "list_files"
+            | "list_projects"
+            | "search_files"
+            | "glob_files"
+            | "web_fetch"
+            | "web_search"
+    )
+}
+
+/// Check if a tool is a write/edit operation that should show diffs.
+#[allow(dead_code)]
+pub fn is_write_tool(tool_name: &str) -> bool {
+    matches!(tool_name, "edit" | "write_file" | "replace_in_file")
+}
+
 /// Trait for filtering tool use blocks during parsing
 /// This allows controlling which tools can be used and when to stop parsing
 pub trait ToolUseFilter: Send + Sync {
@@ -54,20 +75,11 @@ impl SmartToolFilter {
         Self {}
     }
 
-    /// Check if a tool is a "read" operation (doesn't modify state)
+    /// Check if a tool is a "read" operation (doesn't modify state).
+    /// Includes explore tools plus utility tools (name_session, update_plan)
+    /// that are safe to chain.
     fn is_read_tool(&self, tool_name: &str) -> bool {
-        matches!(
-            tool_name,
-            "read_files"
-                | "name_session"
-                | "update_plan"
-                | "list_files"
-                | "list_projects"
-                | "search_files"
-                | "glob_files"
-                | "web_fetch"
-                | "web_search"
-        )
+        is_explore_tool(tool_name) || matches!(tool_name, "name_session" | "update_plan")
     }
 }
 

crates/code_assistant/src/tools/tool_use_filter.rs

@@ -752,6 +752,8 @@ async fn handle_start_message_edit(
                             } => Some(DraftAttachment::Image {
                                 content: data.clone(),
                                 mime_type: media_type.clone(),
+                                width: None,
+                                height: None,
                             }),
                             _ => None,
                         })

crates/code_assistant/src/ui/backend.rs

@@ -37,7 +37,9 @@ impl AttachmentView {
 
     fn render_content(&self, cx: &mut Context<Self>) -> gpui::AnyElement {
         match &self.attachment {
-            DraftAttachment::Image { mime_type, content } => {
+            DraftAttachment::Image {
+                mime_type, content, ..
+            } => {
                 // Try to parse and render the actual image
                 let parsed_image = image::parse_base64_image(mime_type, content);
 

crates/code_assistant/src/ui/gpui/attachment.rs

@@ -239,6 +239,8 @@ impl InputArea {
                     let attachment = DraftAttachment::Image {
                         content: base64::engine::general_purpose::STANDARD.encode(&image.bytes),
                         mime_type: image.format.mime_type().to_string(),
+                        width: None,
+                        height: None,
                     };
 
                     self.attachments.push(attachment);

crates/code_assistant/src/ui/gpui/input_area.rs

@@ -503,7 +503,11 @@ impl Gpui {
                     // Add attachments
                     for attachment in attachments {
                         match attachment {
-                            crate::persistence::DraftAttachment::Image { content, mime_type } => {
+                            crate::persistence::DraftAttachment::Image {
+                                content,
+                                mime_type,
+                                ..
+                            } => {
                                 new_message.add_image_block(&mime_type, &content, cx);
                             }
                             crate::persistence::DraftAttachment::Text { content } => {