ux changes

Author: zixlin7

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

@@ -91,7 +91,9 @@ impl CheckpointSubcommand {
             execute!(
                 session.stderr,
                 StyledText::error_fg(),
-                style::Print("\nCheckpoint is disabled. Enable it with: kiro-cli settings chat.enableCheckpoint true\n"),
+                style::Print(
+                    "\nCheckpoint is disabled. Enable it with: kiro-cli settings chat.enableCheckpoint true\n"
+                ),
                 StyledText::reset(),
             )?;
             return Ok(ChatState::PromptUser {

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

@@ -19,6 +19,7 @@ use crate::cli::chat::{
     ChatSession,
     ChatState,
 };
+use crate::constants::context_text;
 use crate::constants::help_text::{
     CONTEXT_DESCRIPTION,
     context_long_help,
@@ -238,7 +239,8 @@ impl ContextSubcommand {
                                 session.stderr,
                                 StyledText::warning_fg(),
                                 style::Print(format!(
-                                    "Total token count exceeds limit: {context_files_max_size}. The following files will be automatically dropped when interacting with Kiro. Consider removing them. \n\n"
+                                    "{} \n\n",
+                                    context_text::context_limit_warning(context_files_max_size)
                                 )),
                                 StyledText::reset(),
                             )?;

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

@@ -56,12 +56,13 @@ use crate::cli::issue;
 use crate::constants::ui_text;
 use crate::os::Os;
 
-/// q (Kiro Chat)
 #[derive(Debug, PartialEq, Parser)]
-#[command(color = clap::ColorChoice::Always, term_width = 0, after_long_help = &ui_text::extra_help())]
+#[command(
+    color = clap::ColorChoice::Always, term_width = 0, after_long_help = &ui_text::extra_help(), override_usage = "/<COMMAND>",
+)]
 pub enum SlashCommand {
     /// Quit the application
-    #[command(aliases = ["q", "exit"])]
+    #[command(aliases = ["/q", "/exit"])]
     Quit,
     /// Clear the conversation history
     Clear(ClearArgs),

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

@@ -109,20 +109,36 @@ pub async fn select_model(os: &Os, session: &mut ChatSession) -> Result<Option<C
             let description = model.description();
             if Some(model.model_id.as_str()) == active_model_id {
                 if let Some(desc) = description {
-                    format!("{display_name} (active) | {desc}")
+                    if desc.to_lowercase().contains("experimental") {
+                        format!(
+                            "{display_name} {} {}",
+                            StyledText::current_item("(current)"),
+                            StyledText::secondary("-- experimental")
+                        )
+                    } else {
+                        format!("{display_name} {} | {desc}", StyledText::current_item("(current)"))
+                    }
                 } else {
-                    format!("{display_name} (active)")
+                    format!("{display_name} {}", StyledText::current_item("(current)"))
                 }
             } else if let Some(desc) = description {
-                format!("{display_name} | {desc}")
+                if desc.to_lowercase().contains("experimental") {
+                    format!("{display_name} {}", StyledText::secondary("-- experimental"))
+                } else {
+                    format!("{display_name} | {desc}")
+                }
             } else {
                 display_name.to_string()
             }
         })
         .collect();
 
     let selection: Option<_> = match Select::with_theme(&crate::util::dialoguer_theme())
-        .with_prompt("Select a model for this chat session")
+        .with_prompt(format!(
+            "Press ({}) to navigate · Enter({}) to select model",
+            StyledText::current_item("↑↓"),
+            StyledText::current_item("⏎")
+        ))
         .items(&labels)
         .default(0)
         .interact_on_opt(&dialoguer::console::Term::stdout())

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

@@ -14,7 +14,7 @@ use crate::cli::chat::{
 use crate::os::Os;
 use crate::theme::StyledText;
 
-/// Commands for persisting and loading conversation state
+/// Use any of these commands to manage your Kiro session. All commands start with '/'.
 #[deny(missing_docs)]
 #[derive(Debug, PartialEq, Subcommand)]
 pub enum PersistSubcommand {

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

@@ -16,17 +16,12 @@ use crate::cli::chat::{
     get_subscription_status_with_spinner,
     with_spinner,
 };
+use crate::constants::subscription_text;
 use crate::os::Os;
 use crate::theme::StyledText;
 use crate::util::system_info::is_remote;
 
-const SUBSCRIBE_TITLE_TEXT: &str = color_print::cstr! { "<white!,bold>Subscribe to Kiro Developer Pro</white!,bold>" };
-
-const SUBSCRIBE_TEXT: &str = color_print::cstr! { "During the upgrade, you'll be asked to link your Builder ID to the AWS account that will be billed the monthly subscription fee.
-
-Need help? Visit our subscription support page> <blue!>https://docs.aws.amazon.com/console/amazonq/upgrade-builder-id</blue!>" };
-
-/// Arguments for the subscribe command to manage Kiro Developer Pro subscriptions
+/// Arguments for the subscribe command to manage Developer Pro subscriptions
 #[deny(missing_docs)]
 #[derive(Debug, PartialEq, Args)]
 pub struct SubscribeArgs {
@@ -41,7 +36,7 @@ impl SubscribeArgs {
             execute!(
                 session.stderr,
                 StyledText::warning_fg(),
-                style::Print("\nYour Kiro Developer Pro subscription is managed through IAM Identity Center.\n\n"),
+                style::Print(format!("\n{}\n\n", subscription_text::idc_subscription_message())),
                 StyledText::reset(),
             )?;
         } else if self.manage {
@@ -52,7 +47,7 @@ impl SubscribeArgs {
                         queue!(
                             session.stderr,
                             StyledText::warning_fg(),
-                            style::Print("You don't seem to have a Kiro Developer Pro subscription. "),
+                            style::Print(format!("{}. ", subscription_text::no_subscription_message())),
                             StyledText::secondary_fg(),
                             style::Print("Use "),
                             StyledText::success_fg(),
@@ -109,7 +104,7 @@ async fn upgrade_to_pro(os: &mut Os, session: &mut ChatSession) -> Result<(), Ch
                 queue!(
                     session.stderr,
                     StyledText::warning_fg(),
-                    style::Print("Your Builder ID already has a Kiro Developer Pro subscription.\n\n"),
+                    style::Print(format!("{}\n\n", subscription_text::already_subscribed_message())),
                     StyledText::reset(),
                 )?;
                 return Ok(());
@@ -129,9 +124,10 @@ async fn upgrade_to_pro(os: &mut Os, session: &mut ChatSession) -> Result<(), Ch
     // Upgrade information
     queue!(
         session.stderr,
-        style::Print(SUBSCRIBE_TITLE_TEXT),
+        StyledText::primary_fg(),
+        style::Print(subscription_text::subscribe_title()),
         StyledText::secondary_fg(),
-        style::Print(format!("\n\n{SUBSCRIBE_TEXT}\n\n")),
+        style::Print(format!("\n\n{}\n\n", subscription_text::SUBSCRIBE_INFO)),
         StyledText::reset(),
         cursor::Show
     )?;

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

@@ -53,7 +53,9 @@ impl TangentArgs {
             execute!(
                 session.stderr,
                 StyledText::error_fg(),
-                style::Print("\nTangent mode is disabled. Enable it with: kiro-cli settings chat.enableTangentMode true\n"),
+                style::Print(
+                    "\nTangent mode is disabled. Enable it with: kiro-cli settings chat.enableTangentMode true\n"
+                ),
                 StyledText::reset(),
             )?;
             return Ok(ChatState::PromptUser {

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

@@ -3447,7 +3447,7 @@ impl ChatSession {
                         self.stderr,
                         style::Print(format!(
                             "\n(To exit the CLI, press Ctrl+C or Ctrl+D again or type {})\n\n",
-                            "/quit".green()
+                            StyledText::brand("/quit")
                         ))
                     )
                     .unwrap_or_default();

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

@@ -67,11 +67,19 @@ pub fn get_available_commands(os: &Os) -> Vec<String> {
 /// Format commands for skim display
 /// Create a standard set of skim options with consistent styling
 fn create_skim_options(prompt: &str, multi: bool) -> Result<SkimOptions> {
+    use crate::theme::{
+        BRAND_COLOR_ANSI,
+        SECONDARY_COLOR_ANSI,
+    };
+
     SkimOptionsBuilder::default()
         .height("100%".to_string())
         .prompt(prompt.to_string())
         .reverse(true)
         .multi(multi)
+        .color(Some(format!(
+            "current:{BRAND_COLOR_ANSI}:bold,pointer:{BRAND_COLOR_ANSI},prompt:{SECONDARY_COLOR_ANSI}"
+        )))
         .build()
         .map_err(|e| eyre!("Failed to build skim options: {}", e))
 }
@@ -210,7 +218,11 @@ pub fn select_context_paths_with_skim(context_manager: &ContextManager) -> Resul
 pub fn select_command(os: &Os, context_manager: &ContextManager, tools: &[String]) -> Result<Option<String>> {
     let commands = get_available_commands(os);
 
-    match launch_skim_selector(&commands, "Select command: ", false)? {
+    match launch_skim_selector(
+        &commands,
+        "Commands: Press (↑↓) to navigate · Enter(⏎) to select command",
+        false,
+    )? {
         Some(selections) if !selections.is_empty() => {
             let selected_command = &selections[0];
 

crates/chat-cli/src/constants.rs

@@ -28,7 +28,7 @@ pub mod ui_text {
 
     /// Changelog header text
     pub fn changelog_header() -> String {
-        format!("{}\n\n", StyledText::emphasis("What's New in Kiro CLI"))
+        format!("{}\n\n", StyledText::primary("✨ What's New in Kiro CLI"))
     }
 
     /// Trust all tools warning text
@@ -63,65 +63,38 @@ pub mod ui_text {
 
         // MCP section
         help.push('\n');
-        help.push_str(&StyledText::brand("MCP:"));
-        help.push('\n');
-        help.push_str(&StyledText::secondary(
-            "You can now configure the Kiro CLI to use MCP servers.",
-        ));
-        help.push_str(&StyledText::secondary(
-            "\nLearn how: https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/qdev-mcp.html",
+        help.push_str(&StyledText::primary(
+            "💡 Did you know, You can now configure Kiro to use MCP servers. Learn how at https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/qdev-mcp.html",
         ));
 
-        // Tips section
+        // Shortcuts section
         help.push_str("\n\n");
-        help.push_str(&StyledText::brand("Tips:"));
+        help.push_str(&StyledText::clap_heading("Shortcuts:"));
         help.push('\n');
 
-        // Command execution tip
+        // Multi-line prompt shortcut
         help.push_str(&format!(
-            "{}          {}",
-            StyledText::primary("!{command}"),
-            StyledText::secondary("Quickly execute a command in your current session")
+            "{}        {}",
+            StyledText::primary("^ + J"),
+            StyledText::secondary("Ctrl(^) + J or Alt(⌥) + Enter(⏎) to insert new-line for multi-line prompt")
         ));
         help.push('\n');
 
-        // Multi-line prompt tip
+        // Fuzzy search shortcut
         help.push_str(&format!(
-            "{}         {}",
-            StyledText::primary("Ctrl(^) + j"),
-            StyledText::secondary("Insert new-line to provide multi-line prompt")
-        ));
-        help.push_str(&format!(
-            "\n                    {}",
-            StyledText::secondary("Alternatively, [Alt(⌥) + Enter(⏎)]")
+            "{}        {}",
+            StyledText::primary("^ + s"),
+            StyledText::secondary(
+                "Ctrl(^) + s for fuzzy search commands and context files, use tab to select multiple items"
+            )
         ));
         help.push('\n');
 
-        // Fuzzy search tip
+        // Tangent mode shortcut
         help.push_str(&format!(
-            "{}         {}",
-            StyledText::primary("Ctrl(^) + s"),
-            StyledText::secondary("Fuzzy search commands and context files")
-        ));
-        help.push_str(&format!(
-            "\n                    {}",
-            StyledText::secondary("Use Tab to select multiple items")
-        ));
-        help.push_str(&format!(
-            "\n                    {}",
-            StyledText::secondary("Change the keybind using: kiro-cli settings chat.skimCommandKey x")
-        ));
-        help.push('\n');
-
-        // Tangent mode tip
-        help.push_str(&format!(
-            "{}         {}",
-            StyledText::primary("Ctrl(^) + t"),
-            StyledText::secondary("Toggle tangent mode for isolated conversations")
-        ));
-        help.push_str(&format!(
-            "\n                    {}",
-            StyledText::secondary("Change the keybind using: kiro-cli settings chat.tangentModeKey x")
+            "{}        {}",
+            StyledText::primary("^ + t"),
+            StyledText::secondary("Ctrl(^) + t to toggle tangent mode for isolated conversations")
         ));
         help.push('\n');
 
@@ -133,15 +106,28 @@ pub mod ui_text {
         ));
         help.push_str(&format!(
             "\n                    {}",
-            StyledText::secondary("Change using: kiro-cli settings chat.skimCommandKey x")
+            StyledText::secondary("Change these keybinding at anytime using: kiro-cli settings chat.skimCommandKey x")
         ));
 
         help
     }
 
     /// Welcome text with ASCII art logo for large screens
     pub fn welcome_text() -> String {
-        StyledText::brand("KIRO")
+        StyledText::brand(
+            "⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣤⣤⣀⠀⠀⠀⠀⠀⠀⢀⣤⣤⣄⡀⠀⠀⠀⣀⣤⣤⣄⡀⠀⠀⠀⢀⣠⣤⣤⣤⣤⣤⣤⣤⣤⣄⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⣤⣤⣄⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⠀⣾⠟⠉⠉⠻⣷⡄⠀⠀⢀⣾⠟⠋⠉⠻⣿⡄⠀⣼⡟⠉⠉⠙⣿⡆⠀⢠⣿⠋⠉⠉⠉⠉⠉⠉⠉⠉⠙⠛⠿⣶⣄⠀⠀⠀⠀⢀⣴⡿⠟⠋⠉⠉⠉⠉⠛⠻⣷⣄⠀⠀⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⢀⣴⡿⠃⠀⠀⠀⢠⣿⠇⠀⣿⡇⠀⠀⠀⢸⣿⠀⢸⡟⠀⠀⠀⠀⣀⣀⣀⣀⠀⠀⠀⠀⠈⢿⣆⠀⠀⣰⡿⠋⠀⠀⠀⠀⣀⡀⠀⠀⠀⠀⠹⣷⡄⠀⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⣿⡿⠋⠀⠀⠀⣀⣴⡿⠃⠀⠀⣿⡇⠀⠀⠀⢸⣿⠀⢸⡇⠀⠀⠀⠀⣿⡟⠛⠛⣿⡆⠀⠀⠀⢸⣿⠀⣸⡿⠁⠀⠀⢀⣶⡿⠛⠻⢿⣦⠀⠀⠀⠘⣿⡄⠀⠀⠀⠀
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠙⠋⠀⠀⠀⢠⣾⡟⠁⠀⠀⠀⠀⣿⡇⠀⠀⠀⢸⣿⠀⢸⡇⠀⠀⠀⠀⣿⣷⣶⣶⠿⠃⠀⠀⠀⢸⣿⠀⣿⡇⠀⠀⠀⣾⡟⠀⠀⠀⠈⢿⡇⠀⠀⠀⢻⣧
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢻⣧⡀⠀⠀⠀⠀⣿⡇⠀⠀⠀⢸⣿⠀⢸⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣿⠃⠀⣿⡇⠀⠀⠀⣿⡇⠀⠀⠀⠀⢸⡇⠀⠀⠀⢸⣿
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⣠⣶⡀⠀⠀⠀⠹⣷⣄⠀⠀⠀⣿⡇⠀⠀⠀⢸⣿⠀⢸⡇⠀⠀⠀⠀⣤⣤⣄⠀⠀⠀⠀⢿⣿⠁⠀⠀⣿⡇⠀⠀⠀⢿⣇⠀⠀⠀⠀⣼⡇⠀⠀⠀⣸⡿
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣾⡟⠹⣿⡄⠀⠀⠀⠘⢿⣦⠀⠀⣿⡇⠀⠀⠀⢸⣿⠀⢸⡇⠀⠀⠀⠀⣿⡏⢿⣦⠀⠀⠀⠀⠻⣷⡀⠀⢹⣷⠀⠀⠀⠘⢿⣦⣤⣤⣾⠟⠀⠀⠀⢠⣿⠇
+⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⣿⡇⠀⠘⣿⣄⠀⠀⠀⠀⢿⣧⠀⣿⡇⠀⠀⠀⢸⣿⠀⢸⣇⠀⠀⠀⠀⣿⡇⠈⢻⣧⠀⠀⠀⠀⢹⣷⠀⠀⢻⣧⡀⠀⠀⠀⠉⠉⠉⠁⠀⠀⠀⣠⣾⠏
+⠀⠀⠀⠀⠀⠀⠀⠈⣿⣄⡀⢀⣠⣿⠃⠀⠀⠈⢿⣦⡀⠀⣀⣾⠏⠀⢿⣧⡀⠀⣀⣾⠏⠀⠸⣿⣄⠀⢀⣼⡿⠀⠀⠀⢻⣷⣀⠀⣀⣼⡿⠀⠀⠀⠙⠿⣦⣄⣀⡀⠀⠀⣀⣀⣤⣾⠟⠁
+⠀⠀⠀⠀⠀⠀⠀⠀⠈⠛⠛⠛⠛⠁⠀⠀⠀⠀⠀⠙⠛⠛⠛⠉⠀⠀⠀⠙⠛⠛⠛⠉⠀⠀⠀⠈⠛⠛⠛⠋⠀⠀⠀⠀⠀⠉⠛⠛⠛⠋⠀⠀⠀⠀⠀⠀⠈⠙⠛⠛⠛⠛⠛⠛⠉",
+        )
     }
 
     /// Resume conversation text
@@ -170,6 +156,48 @@ pub mod ui_text {
     }
 }
 
+/// Subscription-related text constants
+pub mod subscription_text {
+    use super::PRODUCT_NAME;
+
+    /// Title for subscription upgrade dialog
+    pub fn subscribe_title() -> String {
+        format!("Subscribe to {PRODUCT_NAME} Pro")
+    }
+
+    /// Subscription upgrade information text
+    pub const SUBSCRIBE_INFO: &str = "During the upgrade, you'll be asked to link your Builder ID to the AWS account that will be billed the monthly subscription fee.
+
+Need help? Visit our subscription support page> https://docs.aws.amazon.com/console/amazonq/upgrade-builder-id";
+
+    /// Message for IDC users about subscription management
+    pub fn idc_subscription_message() -> String {
+        format!("Your {PRODUCT_NAME} Pro subscription is managed through IAM Identity Center.")
+    }
+
+    /// Message when user doesn't have an active subscription
+    pub fn no_subscription_message() -> String {
+        format!("You don't seem to have a {PRODUCT_NAME} Pro subscription.")
+    }
+
+    /// Message when user already has an active subscription
+    pub fn already_subscribed_message() -> String {
+        format!("Your Builder ID already has a {PRODUCT_NAME} Pro subscription.")
+    }
+}
+
+/// Context-related text constants
+pub mod context_text {
+    use super::PRODUCT_NAME;
+
+    /// Warning message when context files exceed token limit
+    pub fn context_limit_warning(context_files_max_size: usize) -> String {
+        format!(
+            "Total token count exceeds limit: {context_files_max_size}. The following files will be automatically dropped when interacting with {PRODUCT_NAME}. Consider removing them."
+        )
+    }
+}
+
 /// Help text constants for CLI commands
 pub mod help_text {
     /// Context command description