add update announcement

Author: zixlin7

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

@@ -463,6 +463,9 @@ impl ChatArgs {
 // Maximum number of times to show the changelog announcement per version
 const CHANGELOG_MAX_SHOW_COUNT: i64 = 2;
 
+// Maximum number of times to show the Kiro upgrade announcement
+const KIRO_UPGRADE_MAX_SHOW_COUNT: i64 = 2;
+
 const GREETING_BREAK_POINT: usize = 80;
 
 const RESPONSE_TIMEOUT_CONTENT: &str = "Response timed out - message took too long to generate";
@@ -1207,6 +1210,32 @@ impl ChatSession {
         Ok(())
     }
 
+    async fn show_kiro_upgrade_announcement(&mut self, os: &mut Os) -> Result<bool> {
+        let show_count = os.database.get_kiro_upgrade_show_count()?.unwrap_or(0);
+
+        // Only show if we haven't reached the max count
+        if show_count < KIRO_UPGRADE_MAX_SHOW_COUNT {
+            let announcement_with_styling = crate::constants::kiro_upgrade_announcement();
+
+            draw_box(
+                &mut self.stderr,
+                "",
+                &announcement_with_styling,
+                GREETING_BREAK_POINT,
+                crate::theme::theme().ui.secondary_text,
+            )?;
+
+            execute!(self.stderr, style::Print("\n"))?;
+
+            // Update the show count
+            os.database.set_kiro_upgrade_show_count(show_count + 1)?;
+
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    }
+
     /// Reload built-in tools to reflect experiment changes while preserving MCP tools
     pub async fn reload_builtin_tools(&mut self, os: &mut Os) -> Result<(), ChatError> {
         self.conversation
@@ -1308,6 +1337,11 @@ impl ChatSession {
 
     async fn spawn(&mut self, os: &mut Os) -> Result<()> {
         let is_small_screen = self.terminal_width() < GREETING_BREAK_POINT;
+
+        // Check if Kiro upgrade announcement will be shown
+        let show_count = os.database.get_kiro_upgrade_show_count()?.unwrap_or(0);
+        let kiro_announcement_will_show = show_count < KIRO_UPGRADE_MAX_SHOW_COUNT;
+
         if os
             .database
             .settings
@@ -1324,26 +1358,30 @@ impl ChatSession {
 
             execute!(self.stderr, style::Print(&welcome_text), style::Print("\n\n"),)?;
 
-            let rotating_tips = tips::get_rotating_tips();
-            let tip = &rotating_tips[usize::try_from(rand::random::<u32>()).unwrap_or(0) % rotating_tips.len()];
-            if is_small_screen {
-                // If the screen is small, print the tip in a single line
-                execute!(
-                    self.stderr,
-                    style::Print("💡 ".to_string()),
-                    style::Print(tip),
-                    style::Print("\n")
-                )?;
-            } else {
-                draw_box(
-                    &mut self.stderr,
-                    "Did you know?",
-                    tip,
-                    GREETING_BREAK_POINT,
-                    crate::theme::theme().ui.secondary_text,
-                )?;
+            // Only show rotating tips if Kiro announcement won't be shown
+            if !kiro_announcement_will_show {
+                let rotating_tips = tips::get_rotating_tips();
+                let tip = &rotating_tips[usize::try_from(rand::random::<u32>()).unwrap_or(0) % rotating_tips.len()];
+                if is_small_screen {
+                    // If the screen is small, print the tip in a single line
+                    execute!(
+                        self.stderr,
+                        style::Print("💡 ".to_string()),
+                        style::Print(tip),
+                        style::Print("\n")
+                    )?;
+                } else {
+                    draw_box(
+                        &mut self.stderr,
+                        "Did you know?",
+                        tip,
+                        GREETING_BREAK_POINT,
+                        crate::theme::theme().ui.secondary_text,
+                    )?;
+                }
             }
 
+            // Always show shortcuts and separator
             execute!(
                 self.stderr,
                 style::Print("\n"),
@@ -1361,8 +1399,10 @@ impl ChatSession {
             execute!(self.stderr, style::Print("\n"), StyledText::reset())?;
         }
 
-        // Check if we should show the whats-new announcement
-        self.show_changelog_announcement(os).await?;
+        // Only show changelog if Kiro announcement won't be shown
+        if !kiro_announcement_will_show {
+            self.show_changelog_announcement(os).await?;
+        }
 
         if self.all_tools_trusted() {
             queue!(
@@ -1422,6 +1462,9 @@ impl ChatSession {
             self.conversation.checkpoint_manager = checkpoint_manager;
         }
 
+        // Show Kiro upgrade announcement (limited to 2 times)
+        self.show_kiro_upgrade_announcement(os).await?;
+
         if let Some(user_input) = self.initial_input.take() {
             self.inner = Some(ChatState::HandleInput { input: user_input });
         }

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

@@ -26,30 +26,36 @@ pub fn draw_box(
     let inner_width = box_width - 4; // account for │ and padding
 
     // wrap the single line into multiple lines respecting inner width
-    // Manually wrap the text by splitting at word boundaries
+    // Manually wrap the text by splitting at word boundaries, using visible length for styled text
     let mut wrapped_lines = Vec::new();
     let mut line = String::new();
 
     for word in content.split_whitespace() {
-        if line.len() + word.len() < inner_width {
-            if !line.is_empty() {
-                line.push(' ');
-            }
-            line.push_str(word);
+        let test_line = if line.is_empty() {
+            word.to_string()
+        } else {
+            format!("{} {}", line, word)
+        };
+
+        let visible_len = strip_str(&test_line).len();
+
+        if visible_len <= inner_width {
+            line = test_line;
         } else {
-            // Here we need to account for words that are too long as well
-            if word.len() >= inner_width {
-                let mut start = 0_usize;
-                for (i, _) in word.chars().enumerate() {
-                    if i - start >= inner_width {
-                        wrapped_lines.push(word[start..i].to_string());
-                        start = i;
-                    }
+            // Check if the word alone is too long
+            let word_visible_len = strip_str(word).len();
+            if word_visible_len >= inner_width {
+                // Word is too long, we need to break it (but this is rare with styled text)
+                if !line.is_empty() {
+                    wrapped_lines.push(line);
                 }
-                wrapped_lines.push(word[start..].to_string());
+                wrapped_lines.push(word.to_string());
                 line = String::new();
             } else {
-                wrapped_lines.push(line);
+                // Start a new line with this word
+                if !line.is_empty() {
+                    wrapped_lines.push(line);
+                }
                 line = word.to_string();
             }
         }
@@ -59,13 +65,22 @@ pub fn draw_box(
         wrapped_lines.push(line);
     }
 
-    let side_len = (box_width.saturating_sub(title.len())) / 2;
-    let top_border = format!(
-        "{} {} {}",
-        style::style(format!("╭{}", "─".repeat(side_len - 2))).with(border_color),
-        title,
-        style::style(format!("{}╮", "─".repeat(box_width - side_len - title.len() - 2))).with(border_color)
-    );
+    let top_border = if title.is_empty() {
+        // Closed box with no title
+        format!(
+            "{}",
+            style::style(format!("╭{}╮", "─".repeat(box_width - 2))).with(border_color)
+        )
+    } else {
+        // Box with title
+        let side_len = (box_width.saturating_sub(title.len())) / 2;
+        format!(
+            "{} {} {}",
+            style::style(format!("╭{}", "─".repeat(side_len - 2))).with(border_color),
+            title,
+            style::style(format!("{}╮", "─".repeat(box_width - side_len - title.len() - 2))).with(border_color)
+        )
+    };
 
     execute!(
         output,

crates/chat-cli/src/constants.rs

@@ -220,6 +220,14 @@ Notes:
     }
 }
 
+/// Announcement text for Kiro CLI upgrade
+pub fn kiro_upgrade_announcement() -> String {
+    format!(
+        "Amazon Q Developer CLI users can now upgrade to the Kiro CLI. Run {} to update today. The Kiro CLI leverages the agentic CLI features of Q Developer CLI, and is fully compatible with Q Developer CLI. If you have auto updates enabled, you will be updated on 11/21.",
+        StyledText::command("q update")
+    )
+}
+
 /// Tips and rotating messages
 pub mod tips {
     use super::StyledText;

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

@@ -298,6 +298,17 @@ impl Database {
         Ok(())
     }
 
+    /// Get Kiro upgrade announcement show count from state table
+    pub fn get_kiro_upgrade_show_count(&self) -> Result<Option<i64>, DatabaseError> {
+        self.get_entry::<i64>(Table::State, "kiroUpgrade.showCount")
+    }
+
+    /// Set Kiro upgrade announcement show count in state table
+    pub fn set_kiro_upgrade_show_count(&self, count: i64) -> Result<(), DatabaseError> {
+        self.set_entry(Table::State, "kiroUpgrade.showCount", count)?;
+        Ok(())
+    }
+
     /// Set the client ID used for telemetry requests.
     pub fn set_client_id(&mut self, client_id: Uuid) -> Result<usize, DatabaseError> {
         self.set_json_entry(Table::State, CLIENT_ID_KEY, client_id.to_string())