fix(cortex-tui): clean up agents TUI and improve navigation (#225)

- Remove all emojis from agent selection interface
- Remove @ prefix from agent names for cleaner display
- Fix arrow key navigation to skip separators and disabled items
- Add test for navigation skipping behavior

Co-authored-by: Droid Agent <droid@factory.ai>

Author: echobt

cortex-tui/src/interactive/builders/agents.rs

@@ -281,7 +281,7 @@ pub fn build_agents_selector(
     let mut items = Vec::new();
 
     // Add "Create New Agent" action at the top
-    let create_item = InteractiveItem::new("__create__", "✨ Create New Agent")
+    let create_item = InteractiveItem::new("__create__", "Create New Agent")
         .with_description("Create a new custom agent (AI-assisted or manual)")
         .with_shortcut('n');
     items.push(create_item);
@@ -314,12 +314,8 @@ pub fn build_agents_selector(
         let suffix = if agent.is_subagent { " (subagent)" } else { "" };
         let description = format!("{}{}", agent.description, suffix);
 
-        let item = InteractiveItem::new(
-            format!("builtin:{}", agent.name),
-            format!("@{}", agent.name),
-        )
-        .with_description(description)
-        .with_icon('🤖');
+        let item = InteractiveItem::new(format!("builtin:{}", agent.name), agent.name.clone())
+            .with_description(description);
         items.push(item);
     }
 
@@ -347,12 +343,9 @@ pub fn build_agents_selector(
                 .unwrap_or_default();
             let description = format!("{}{}", agent.description, model_info);
 
-            let item = InteractiveItem::new(
-                format!("project:{}", agent.name),
-                format!("@{}", display_name),
-            )
-            .with_description(description)
-            .with_icon('📁');
+            let item =
+                InteractiveItem::new(format!("project:{}", agent.name), display_name.clone())
+                    .with_description(description);
             items.push(item);
         }
     }
@@ -381,12 +374,8 @@ pub fn build_agents_selector(
                 .unwrap_or_default();
             let description = format!("{}{}", agent.description, model_info);
 
-            let item = InteractiveItem::new(
-                format!("global:{}", agent.name),
-                format!("@{}", display_name),
-            )
-            .with_description(description)
-            .with_icon('🌐');
+            let item = InteractiveItem::new(format!("global:{}", agent.name), display_name.clone())
+                .with_description(description);
             items.push(item);
         }
     }
@@ -445,10 +434,10 @@ pub enum AgentCreationMethod {
 /// Build an interactive state for agent creation - step 1: choose location
 pub fn build_agent_location_selector() -> InteractiveState {
     let items = vec![
-        InteractiveItem::new("project", "📁 Project Agent")
+        InteractiveItem::new("project", "Project Agent")
             .with_description("Create in .cortex/agents/ - available only in this project")
             .with_shortcut('p'),
-        InteractiveItem::new("global", "🌐 Global Agent")
+        InteractiveItem::new("global", "Global Agent")
             .with_description("Create in ~/.config/cortex/agents/ - available everywhere")
             .with_shortcut('g'),
     ];
@@ -473,10 +462,10 @@ pub fn build_agent_method_selector(location: AgentLocation) -> InteractiveState
     };
 
     let items = vec![
-        InteractiveItem::new(format!("ai:{}", location_str), "✨ AI-Assisted")
+        InteractiveItem::new(format!("ai:{}", location_str), "AI-Assisted")
             .with_description("Describe what you want and AI will generate the agent configuration")
             .with_shortcut('a'),
-        InteractiveItem::new(format!("manual:{}", location_str), "📝 Manual")
+        InteractiveItem::new(format!("manual:{}", location_str), "Manual")
             .with_description("Configure the agent settings manually")
             .with_shortcut('m'),
     ];
@@ -529,19 +518,19 @@ impl PermissionPreset {
 /// Build an interactive state for permission selection during agent creation
 pub fn build_permission_selector(suggested: Option<PermissionPreset>) -> InteractiveState {
     let items = vec![
-        InteractiveItem::new("readonly", "🔒 Read-only")
+        InteractiveItem::new("readonly", "Read-only")
             .with_description(PermissionPreset::ReadOnly.description())
             .with_current(suggested == Some(PermissionPreset::ReadOnly))
             .with_shortcut('r'),
-        InteractiveItem::new("standard", "📝 Standard")
+        InteractiveItem::new("standard", "Standard")
             .with_description(PermissionPreset::Standard.description())
             .with_current(suggested == Some(PermissionPreset::Standard))
             .with_shortcut('s'),
-        InteractiveItem::new("full", "⚡ Full Access")
+        InteractiveItem::new("full", "Full Access")
             .with_description(PermissionPreset::FullAccess.description())
             .with_current(suggested == Some(PermissionPreset::FullAccess))
             .with_shortcut('f'),
-        InteractiveItem::new("custom", "⚙️ Custom")
+        InteractiveItem::new("custom", "Custom")
             .with_description(PermissionPreset::Custom.description())
             .with_current(suggested == Some(PermissionPreset::Custom))
             .with_shortcut('c'),
@@ -667,7 +656,7 @@ pub fn build_agent_confirm_selector(config: &NewAgentConfig) -> InteractiveState
 
     // Show configuration summary
     items.push(
-        InteractiveItem::new("__info_name__", format!("Name: @{}", config.name)).as_separator(),
+        InteractiveItem::new("__info_name__", format!("Name: {}", config.name)).as_separator(),
     );
 
     if let Some(ref dn) = config.display_name {
@@ -707,19 +696,19 @@ pub fn build_agent_confirm_selector(config: &NewAgentConfig) -> InteractiveState
 
     // Action items
     items.push(
-        InteractiveItem::new("confirm", "✅ Create Agent")
+        InteractiveItem::new("confirm", "Create Agent")
             .with_description("Save the agent configuration")
             .with_shortcut('y'),
     );
 
     items.push(
-        InteractiveItem::new("edit_permissions", "🔒 Edit Permissions")
+        InteractiveItem::new("edit_permissions", "Edit Permissions")
             .with_description("Modify the permission settings")
             .with_shortcut('p'),
     );
 
     items.push(
-        InteractiveItem::new("cancel", "❌ Cancel")
+        InteractiveItem::new("cancel", "Cancel")
             .with_description("Discard and go back")
             .with_shortcut('n'),
     );

cortex-tui/src/interactive/state.rs

@@ -134,25 +134,53 @@ impl InteractiveState {
         self.filtered_indices.get(self.selected).copied()
     }
 
-    /// Move selection up.
+    /// Move selection up, skipping separators and disabled items.
     pub fn select_prev(&mut self) {
         if self.filtered_indices.is_empty() {
             return;
         }
-        if self.selected == 0 {
-            self.selected = self.filtered_indices.len() - 1;
-        } else {
-            self.selected -= 1;
+        let len = self.filtered_indices.len();
+        let start = self.selected;
+        loop {
+            if self.selected == 0 {
+                self.selected = len - 1;
+            } else {
+                self.selected -= 1;
+            }
+            // Stop if we've wrapped around completely
+            if self.selected == start {
+                break;
+            }
+            // Stop if we found a selectable item
+            if let Some(item) = self.selected_item() {
+                if !item.is_separator && !item.disabled {
+                    break;
+                }
+            }
         }
         self.ensure_visible();
     }
 
-    /// Move selection down.
+    /// Move selection down, skipping separators and disabled items.
     pub fn select_next(&mut self) {
         if self.filtered_indices.is_empty() {
             return;
         }
-        self.selected = (self.selected + 1) % self.filtered_indices.len();
+        let len = self.filtered_indices.len();
+        let start = self.selected;
+        loop {
+            self.selected = (self.selected + 1) % len;
+            // Stop if we've wrapped around completely
+            if self.selected == start {
+                break;
+            }
+            // Stop if we found a selectable item
+            if let Some(item) = self.selected_item() {
+                if !item.is_separator && !item.disabled {
+                    break;
+                }
+            }
+        }
         self.ensure_visible();
     }
 
@@ -443,4 +471,40 @@ mod tests {
         assert!(!state.is_checked(1));
         assert_eq!(state.checked.len(), 1);
     }
+
+    #[test]
+    fn test_navigation_skips_separators() {
+        let items = vec![
+            InteractiveItem::new("1", "Item 1"),
+            InteractiveItem::new("sep", "─────").as_separator(),
+            InteractiveItem::new("2", "Item 2"),
+            InteractiveItem::new("disabled", "Disabled").with_disabled(true),
+            InteractiveItem::new("3", "Item 3"),
+        ];
+        let mut state =
+            InteractiveState::new("Test", items, InteractiveAction::Custom("test".into()));
+
+        // Should start at 0 (Item 1)
+        assert_eq!(state.selected, 0);
+
+        // select_next should skip separator (1) and go to Item 2 (2)
+        state.select_next();
+        assert_eq!(state.selected, 2); // Skipped separator at index 1
+
+        // select_next should skip disabled item (3) and go to Item 3 (4)
+        state.select_next();
+        assert_eq!(state.selected, 4); // Skipped disabled at index 3
+
+        // select_next should wrap around and go back to Item 1 (0)
+        state.select_next();
+        assert_eq!(state.selected, 0);
+
+        // select_prev should wrap around to Item 3 (4)
+        state.select_prev();
+        assert_eq!(state.selected, 4);
+
+        // select_prev should skip disabled (3) and go to Item 2 (2)
+        state.select_prev();
+        assert_eq!(state.selected, 2);
+    }
 }