update copy (#3452)

* final copy

* handling small screen

* revert the alignment change

Author: zixlin7

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

@@ -1216,16 +1216,26 @@ impl ChatSession {
         // 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();
+            let is_small_screen = self.terminal_width() < GREETING_BREAK_POINT;
 
-            draw_box(
-                &mut self.stderr,
-                "",
-                &announcement_with_styling,
-                GREETING_BREAK_POINT,
-                crate::theme::theme().ui.secondary_text,
-            )?;
+            if is_small_screen {
+                // If the screen is small, print the announcement without a box
+                execute!(
+                    self.stderr,
+                    style::Print(&announcement_with_styling),
+                    style::Print("\n")
+                )?;
+            } else {
+                draw_box(
+                    &mut self.stderr,
+                    "",
+                    &announcement_with_styling,
+                    GREETING_BREAK_POINT,
+                    crate::theme::theme().ui.secondary_text,
+                )?;
 
-            execute!(self.stderr, style::Print("\n"))?;
+                execute!(self.stderr, style::Print("\n"))?;
+            }
 
             // Update the show count
             os.database.set_kiro_upgrade_show_count(show_count + 1)?;
@@ -1381,6 +1391,9 @@ impl ChatSession {
                 }
             }
 
+            // Show Kiro upgrade announcement before shortcuts (limited to 2 times)
+            self.show_kiro_upgrade_announcement(os).await?;
+
             // Always show shortcuts and separator
             execute!(
                 self.stderr,
@@ -1462,9 +1475,6 @@ 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

@@ -27,42 +27,52 @@ pub fn draw_box(
 
     // wrap the single line into multiple lines respecting inner width
     // Manually wrap the text by splitting at word boundaries, using visible length for styled text
+    // First split by newlines to preserve explicit line breaks
     let mut wrapped_lines = Vec::new();
-    let mut line = String::new();
 
-    for word in content.split_whitespace() {
-        let test_line = if line.is_empty() {
-            word.to_string()
-        } else {
-            format!("{} {}", line, word)
-        };
+    for paragraph in content.split('\n') {
+        if paragraph.is_empty() {
+            // Preserve empty lines
+            wrapped_lines.push(String::new());
+            continue;
+        }
 
-        let visible_len = strip_str(&test_line).len();
-
-        if visible_len <= inner_width {
-            line = test_line;
-        } else {
-            // 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.to_string());
-                line = String::new();
+        let mut line = String::new();
+
+        for word in paragraph.split_whitespace() {
+            let test_line = if line.is_empty() {
+                word.to_string()
             } else {
-                // Start a new line with this word
-                if !line.is_empty() {
-                    wrapped_lines.push(line);
+                format!("{} {}", line, word)
+            };
+
+            let visible_len = strip_str(&test_line).len();
+
+            if visible_len <= inner_width {
+                line = test_line;
+            } else {
+                // 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.to_string());
+                    line = String::new();
+                } else {
+                    // Start a new line with this word
+                    if !line.is_empty() {
+                        wrapped_lines.push(line);
+                    }
+                    line = word.to_string();
                 }
-                line = word.to_string();
             }
         }
-    }
 
-    if !line.is_empty() {
-        wrapped_lines.push(line);
+        if !line.is_empty() {
+            wrapped_lines.push(line);
+        }
     }
 
     let top_border = if title.is_empty() {

crates/chat-cli/src/constants.rs

@@ -223,9 +223,10 @@ Notes:
 /// Announcement text for Kiro CLI upgrade
 pub fn kiro_upgrade_announcement() -> String {
     format!(
-        "Q CLI users can now upgrade to the Kiro CLI. Type {} to update today. The Kiro CLI leverages the agentic features of Q CLI and can be used with your existing Q Developer subscription. If you have auto updates enabled for the Q CLI, unless you disable that setting, Q CLI will auto update to Kiro CLI on 11/24. Kiro CLI is licensed as AWS Content under your Agreement and the AWS Intellectual Property License ({}). By updating to Kiro CLI, you agree to the AWS Intellectual Property License.",
+        "Kiro CLI is the next update of the Q CLI. Your existing Q Developer CLI workflows and subscription continue to work without any changes. You can update to Kiro CLI manually with {} today, or wait for the auto-update on 11/24 to apply the change. To learn more, go to {}.\n\nKiro CLI is licensed under, and by updating to it you agree to, the AWS Intellectual Property License ({}).",
         StyledText::command("q update"),
-        StyledText::command("https://aws.amazon.com/legal/aws-ip-license-terms/")
+        StyledText::command("kiro.dev/cli/upgrade"),
+        StyledText::command("kiro.dev/license")
     )
 }