UX update to Prompt & Context list command

Author: dk19y

crates/chat-cli/src/cli/chat/cli/context/mod.rs

@@ -153,20 +153,19 @@ impl ContextSubcommand {
                             .get_context_files_by_path(os, path.get_path_as_str())
                             .await
                         {
+                            for (file_path, _content) in &context_files {
+                                execute!(session.stderr, style::Print(format!("    {file_path}\n")))?;
+                            }
+                            profile_context_files
+                                .extend(context_files.into_iter().map(|(path, content)| (path, content, false)));
+                        } else {
                             execute!(
                                 session.stderr,
-                                StyledText::success_fg(),
-                                style::Print(format!(
-                                    "({} match{})",
-                                    context_files.len(),
-                                    if context_files.len() == 1 { "" } else { "es" }
-                                )),
-                                StyledText::reset(),
+                                StyledText::secondary_fg(),
+                                style::Print(format!("    {} (no matches)\n", path.get_path_as_str())),
+                                StyledText::reset()
                             )?;
-                            profile_context_files
-                                .extend(context_files.into_iter().map(|(path, content)| (path, content, false)));
                         }
-                        execute!(session.stderr, style::Print("\n"))?;
                     }
                     execute!(session.stderr, style::Print("\n"))?;
                 }
@@ -188,28 +187,23 @@ impl ContextSubcommand {
                     )?;
                 } else {
                     for path in &session_owned_list {
-                        execute!(
-                            session.stderr,
-                            style::Print(format!("    - {} ", path.get_path_as_str()))
-                        )?;
                         if let Ok(context_files) = context_manager
                             .get_context_files_by_path(os, path.get_path_as_str())
                             .await
                         {
+                            for (file_path, _content) in &context_files {
+                                execute!(session.stderr, style::Print(format!("    {file_path}\n")))?;
+                            }
+                            profile_context_files
+                                .extend(context_files.into_iter().map(|(path, content)| (path, content, true)));
+                        } else {
                             execute!(
                                 session.stderr,
-                                StyledText::success_fg(),
-                                style::Print(format!(
-                                    "({} match{})",
-                                    context_files.len(),
-                                    if context_files.len() == 1 { "" } else { "es" }
-                                )),
-                                StyledText::reset(),
+                                StyledText::secondary_fg(),
+                                style::Print(format!("    {} (no matches)\n", path.get_path_as_str())),
+                                StyledText::reset()
                             )?;
-                            profile_context_files
-                                .extend(context_files.into_iter().map(|(path, content)| (path, content, true)));
                         }
-                        execute!(session.stderr, style::Print("\n"))?;
                     }
                     execute!(session.stderr, style::Print("\n"))?;
                 }

crates/chat-cli/src/cli/chat/cli/prompts.rs

@@ -719,11 +719,11 @@ impl PromptsArgs {
                     let (local_exists, global_exists) = (prompts.local.exists(), prompts.global.exists());
 
                     if global_exists {
-                        global_prompts.push(name);
+                        global_prompts.push((name, prompts.global.path.clone()));
                     }
 
                     if local_exists {
-                        local_prompts.push(name);
+                        local_prompts.push((name, prompts.local.path.clone()));
                         // Check for overrides using has_local_override method
                         if global_exists {
                             overridden_globals.push(name);
@@ -733,19 +733,15 @@ impl PromptsArgs {
             }
 
             if !global_prompts.is_empty() {
-                let global_dir = PathResolver::new(os)
-                    .global()
-                    .prompts_dir()
-                    .map_or_else(|_| "global prompts".to_string(), |p| p.display().to_string());
                 queue!(
                     session.stderr,
                     style::SetAttribute(Attribute::Bold),
-                    style::Print(&format!("Global ({global_dir}):")),
+                    style::Print("Global:"),
                     StyledText::reset_attributes(),
                     style::Print("\n"),
                 )?;
-                for name in &global_prompts {
-                    queue!(session.stderr, style::Print("- "), style::Print(name))?;
+                for (_name, path) in &global_prompts {
+                    queue!(session.stderr, style::Print(&path.to_string_lossy()))?;
                     queue!(session.stderr, style::Print("\n"))?;
                 }
             }
@@ -754,20 +750,16 @@ impl PromptsArgs {
                 if !global_prompts.is_empty() {
                     queue!(session.stderr, style::Print("\n"))?;
                 }
-                let local_dir = PathResolver::new(os)
-                    .workspace()
-                    .prompts_dir()
-                    .map_or_else(|_| "local prompts".to_string(), |p| p.display().to_string());
                 queue!(
                     session.stderr,
                     style::SetAttribute(Attribute::Bold),
-                    style::Print(&format!("Local ({local_dir}):")),
+                    style::Print("Local:"),
                     StyledText::reset_attributes(),
                     style::Print("\n"),
                 )?;
-                for name in &local_prompts {
+                for (name, path) in &local_prompts {
                     let has_global_version = overridden_globals.contains(name);
-                    queue!(session.stderr, style::Print("- "), style::Print(name),)?;
+                    queue!(session.stderr, style::Print(&path.to_string_lossy()))?;
                     if has_global_version {
                         queue!(
                             session.stderr,