some fnf items (#3389)

Author: zixlin7

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

@@ -95,7 +95,7 @@ impl ContextSubcommand {
                     session.stderr,
                     style::SetAttribute(Attribute::Bold),
                     StyledText::emphasis_fg(),
-                    style::Print(format!("👤 Agent ({}):\n", context_manager.current_profile)),
+                    style::Print(format!("Agent ({}):\n", context_manager.current_profile)),
                     StyledText::reset_attributes(),
                 )?;
 
@@ -108,7 +108,10 @@ impl ContextSubcommand {
                     )?;
                 } else {
                     for path in &agent_owned_list {
-                        execute!(session.stderr, style::Print(format!("    {} ", path.get_path_as_str())))?;
+                        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
@@ -135,7 +138,7 @@ impl ContextSubcommand {
                     session.stderr,
                     style::SetAttribute(Attribute::Bold),
                     StyledText::emphasis_fg(),
-                    style::Print("💬 Session (temporary):\n"),
+                    style::Print("Session (temporary):\n"),
                     StyledText::reset_attributes(),
                 )?;
 
@@ -148,7 +151,10 @@ impl ContextSubcommand {
                     )?;
                 } else {
                     for path in &session_owned_list {
-                        execute!(session.stderr, style::Print(format!("    {} ", path.get_path_as_str())))?;
+                        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
@@ -197,12 +203,11 @@ impl ContextSubcommand {
                         StyledText::reset_attributes()
                     )?;
 
-                    for (filename, content, is_temporary) in &profile_context_files {
+                    for (filename, content, _is_temporary) in &profile_context_files {
                         let est_tokens = TokenCounter::count_tokens(content);
-                        let icon = if *is_temporary { "💬" } else { "👤" };
                         execute!(
                             session.stderr,
-                            style::Print(format!("{icon} {filename} ")),
+                            style::Print(format!("- {filename} ")),
                             StyledText::secondary_fg(),
                             style::Print(format!("(~{est_tokens} tkns)\n")),
                             StyledText::reset(),

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

@@ -116,7 +116,11 @@ pub async fn select_model(os: &Os, session: &mut ChatSession) -> Result<Option<C
                             StyledText::secondary("-- experimental")
                         )
                     } else {
-                        format!("{display_name} {} | {desc}", StyledText::current_item("(current)"))
+                        format!(
+                            "{display_name} {} | {}",
+                            StyledText::current_item("(current)"),
+                            StyledText::secondary(desc)
+                        )
                     }
                 } else {
                     format!("{display_name} {}", StyledText::current_item("(current)"))
@@ -125,7 +129,7 @@ pub async fn select_model(os: &Os, session: &mut ChatSession) -> Result<Option<C
                 if desc.to_lowercase().contains("experimental") {
                     format!("{display_name} {}", StyledText::secondary("-- experimental"))
                 } else {
-                    format!("{display_name} | {desc}")
+                    format!("{display_name} | {}", StyledText::secondary(desc))
                 }
             } else {
                 display_name.to_string()
@@ -135,9 +139,13 @@ pub async fn select_model(os: &Os, session: &mut ChatSession) -> Result<Option<C
 
     let selection: Option<_> = match Select::with_theme(&crate::util::dialoguer_theme())
         .with_prompt(format!(
-            "Press ({}) to navigate · Enter({}) to select model",
+            "{}({}) {} · {}({}) {}",
+            StyledText::secondary("Press "),
             StyledText::current_item("↑↓"),
-            StyledText::current_item("⏎")
+            StyledText::secondary("to navigate"),
+            StyledText::secondary("Enter"),
+            StyledText::current_item("⏎"),
+            StyledText::secondary("to select model")
         ))
         .items(&labels)
         .default(0)

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

@@ -2598,7 +2598,7 @@ impl ChatSession {
                             StyledText::reset_attributes(),
                         )?;
                     }
-                    execute!(self.stdout, style::Print("\n\n"))?;
+                    execute!(self.stdout, style::Print("\n"))?;
 
                     tool_telemetry = tool_telemetry.and_modify(|ev| ev.is_success = Some(true));
                     if let Tool::Custom(_) = &tool.tool {

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

@@ -78,7 +78,7 @@ fn create_skim_options(prompt: &str, multi: bool) -> Result<SkimOptions> {
         .reverse(true)
         .multi(multi)
         .color(Some(format!(
-            "current:{BRAND_COLOR_ANSI}:bold,pointer:{BRAND_COLOR_ANSI},prompt:{SECONDARY_COLOR_ANSI}"
+            "current:{BRAND_COLOR_ANSI}:bold,pointer:{BRAND_COLOR_ANSI},prompt:{SECONDARY_COLOR_ANSI},current_bg:-1"
         )))
         .build()
         .map_err(|e| eyre!("Failed to build skim options: {}", e))

crates/chat-cli/src/constants.rs

@@ -131,16 +131,16 @@ pub mod ui_text {
     pub fn welcome_text() -> String {
         StyledText::brand(
             "⠀⠀⠀⠀⠀⠀⠀
-⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣶⣶⣦⡀⠀⠀⠀⠀⢀⣴⣶⣦⣄⠀⠀⢀⣴⣶⣶⣦⡀⠀⠀⢀⣴⣶⣶⣶⣶⣶⣶⣶⣶⣶⣦⣄⡀⠀⠀⠀⠀⠀⠀⢀⣠⣴⣶⣶⣶⣶⣶⣦⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀
-⠀⠀⠀⠀⠀⠀⠀⢰⣿⠋⠁⠈⠙⣿⡆⠀⢀⣾⡿⠁⠀⠈⢻⡇⢰⣿⠋⠁⠈⠙⣿⡆⢰⣿⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀⠈⠙⠻⣦⠀⠀⠀⠀⣴⡿⠟⠋⠁⠀⠀⠀⠈⠙⠻⢿⣦⠀⠀⠀⠀⠀⠀⠀
-⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⣇⣴⡿⠋⠀⠀⠀⣠⡿⠃⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⢠⣤⣤⣤⣤⣄⠀⠀⠀⠀⣿⡆⠀⠀⣼⡟⠀⠀⠀⠀⣀⣀⣀⠀⠀⠀⠀⢻⣧⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⢀⣴⣶⣶⣦⡀⠀⠀⠀⠀⢀⣴⣶⣦⣄⡀⠀⠀⢀⣴⣶⣶⣦⡀⠀⠀⢀⣴⣶⣶⣶⣶⣶⣶⣶⣶⣶⣦⣄⡀⠀⠀⠀⠀⠀⠀⢀⣠⣴⣶⣶⣶⣶⣶⣦⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⢰⣿⠋⠁⠈⠙⣿⡆⠀⢀⣾⡿⠁⠀⠈⢻⡆⢰⣿⠋⠁⠈⠙⣿⡆⢰⣿⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀⠈⠙⠻⣦⠀⠀⠀⠀⣴⡿⠟⠋⠁⠀⠀⠀⠈⠙⠻⢿⣦⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⣇⣴⡿⠋⠀⠀⠀⢀⣼⠇⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⢠⣤⣤⣤⣤⣄⠀⠀⠀⠀⣿⡆⠀⠀⣼⡟⠀⠀⠀⠀⣀⣀⣀⠀⠀⠀⠀⢻⣧⠀⠀⠀⠀⠀
 ⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡿⠋⠀⠀⠀⢀⣾⡿⠁⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⢸⣿⠉⠉⠉⣿⡇⠀⠀⠀⣿⡇⠀⣼⡟⠀⠀⠀⣰⡿⠟⠛⠻⢿⣆⠀⠀⠀⢻⣧⠀⠀⠀⠀
-⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠙⠁⠀⠀⠀⣼⡟⠁⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⢸⣿⣶⣶⡶⠋⠀⠀⠀⠀⣿⠇⢰⣿⠀⠀⠀⢰⣿⠀⠀⠀⠀⠀⣿⡆⠀⠀⠀⣿⡆
-⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠹⣷⡀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣼⠟⠀⢸⣿⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⣿⡇⠀⠀⠀⣿⡇
-⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⣠⡀⠀⠀⠀⠹⣷⡄⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⣤⣄⠀⠀⠀⠀⠹⣿⡅⠀⠀⠸⣿⠀⠀⠀⠸⣿⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⣿⠇
-⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣾⡟⣷⡀⠀⠀⠀⠘⣿⣆⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⣿⡟⣷⡀⠀⠀⠀⠘⣿⣆⠀⠀⢻⣧⠀⠀⠀⠹⣷⣦⣤⣤⣾⠏⠀⠀⠀⣼⡟
-⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⠹⣷⡀⠀⠀⠀⠈⢻⡇⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⣿⡇⠹⣷⡀⠀⠀⠀⠈⢻⡇⠀⠀⢻⣧⠀⠀⠀⠀⠉⠉⠉⠀⠀⠀⠀⣼⡟
-⠀⠀⠀⠀⠀⠀⠀⠸⣿⣄⡀⢀⣠⣿⠇⠀⠙⣷⡀⠀⠀⢀⣼⠇⠸⣿⣄⡀⢀⣠⣿⠇⠸⣿⣄⡀⢀⣠⣿⠇⠀⠙⣷⡀⠀⠀⢀⣼⠇⠀⠀⠀⠻⣷⣦⣄⡀⠀⠀⠀⢀⣠⣴⣾⠟
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠙⠁⠀⠀⢀⣼⡟⠁⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⢸⣿⣶⣶⡶⠋⠀⠀⠀⠀⣿⠇⢰⣿⠀⠀⠀⢰⣿⠀⠀⠀⠀⠀⣿⡆⠀⠀⠀⣿⡆
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⠀⠀⠀⠹⣷⡀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣼⠟⠀⢸⣿⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⣿⡇⠀⠀⠀⣿⡇
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⣠⡀⠀⠀⠹⣷⡄⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⣤⣄⠀⠀⠀⠀⠹⣿⡅⠀⠀⠸⣿⠀⠀⠀⠸⣿⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⣿⠇
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣾⡟⣷⡀⠀⠀⠘⣿⣆⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⣿⡟⣷⡀⠀⠀⠀⠘⣿⣆⠀⠀⢻⣧⠀⠀⠀⠹⣷⣦⣤⣤⣾⠏⠀⠀⠀⣼⡟
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⠹⣷⡀⠀⠀⠈⢻⡇⠀⢸⣿⠀⠀⠀⠀⣿⡇⢸⣿⠀⠀⠀⠀⣿⡇⠹⣷⡀⠀⠀⠀⠈⢻⡇⠀⠀⢻⣧⠀⠀⠀⠀⠉⠉⠉⠀⠀⠀⠀⣼⡟
+⠀⠀⠀⠀⠀⠀⠀⠸⣿⣄⡀⢀⣠⣿⠇⠀⠙⣷⡀⠀⢀⣼⠇⠀⠸⣿⣄⡀⢀⣠⣿⠇⠸⣿⣄⡀⢀⣠⣿⠇⠀⠙⣷⡀⠀⠀⢀⣼⠇⠀⠀⠀⠻⣷⣦⣄⡀⠀⠀⠀⢀⣠⣴⣾⠟
 ⠀⠀⠀⠀⠀⠀⠀⠀⠈⠻⠿⠿⠟⠁⠀⠀⠀⠈⠻⠿⠿⠟⠁⠀⠀⠈⠻⠿⠿⠟⠁⠀⠀⠈⠻⠿⠿⠟⠁⠀⠀⠀⠈⠻⠿⠿⠟⠁⠀⠀⠀⠀⠀⠈⠙⠻⠿⠿⠿⠿⠟⠋⠁",
         )
     }

crates/chat-cli/src/theme/colors.rs

@@ -88,7 +88,7 @@ impl Default for InteractiveColors {
         Self {
             prompt_symbol: Color::AnsiValue(BRIGHT_MAGENTA),
             profile_indicator: Color::AnsiValue(BRAND_PURPLE),
-            tangent_indicator: Color::AnsiValue(BRIGHT_MAGENTA),
+            tangent_indicator: Color::Yellow,
             usage_low: Color::Green,
             usage_medium: Color::Yellow,
             usage_high: Color::Red,

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

@@ -103,6 +103,7 @@ pub fn dialoguer_theme() -> ColorfulTheme {
 
     ColorfulTheme {
         prompt_prefix: dialoguer::console::style("".into()).for_stderr(),
+        prompt_suffix: dialoguer::console::style("".into()).for_stderr(),
         active_item_prefix: dialoguer::console::style("❯".into())
             .for_stderr()
             .color256(BRAND_COLOR_ANSI),