update to help and model on welcome screen

Author: zixlin7

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

@@ -1407,14 +1407,32 @@ impl ChatSession {
                 }
             }
 
+            // Show model information
+            if let Some(ref model_info) = self.conversation.model_info {
+                let (models, _default_model) = get_available_models(os).await?;
+                if let Some(model_option) = models.iter().find(|option| option.model_id == model_info.model_id) {
+                    let display_name = model_option.model_name.as_deref().unwrap_or(&model_option.model_id);
+                    execute!(
+                        self.stderr,
+                        style::Print("\n"),
+                        StyledText::secondary_fg(),
+                        style::Print("Model: "),
+                        StyledText::reset(),
+                        style::Print(display_name),
+                        StyledText::secondary_fg(),
+                        style::Print(" ("),
+                        StyledText::reset(),
+                        style::Print(&StyledText::command("/model")),
+                        StyledText::secondary_fg(),
+                        style::Print(" to change)\n"),
+                        StyledText::reset(),
+                    )?;
+                }
+            }
+
             execute!(
                 self.stderr,
                 style::Print("\n"),
-                style::Print(&match is_small_screen {
-                    true => ui_text::small_screen_popular_shortcuts(),
-                    false => ui_text::popular_shortcuts(),
-                }),
-                style::Print("\n"),
                 style::Print(
                     "━"
                         .repeat(if is_small_screen { 0 } else { GREETING_BREAK_POINT })
@@ -1441,20 +1459,6 @@ impl ChatSession {
 
         self.stderr.flush()?;
 
-        if let Some(ref model_info) = self.conversation.model_info {
-            let (models, _default_model) = get_available_models(os).await?;
-            if let Some(model_option) = models.iter().find(|option| option.model_id == model_info.model_id) {
-                let display_name = model_option.model_name.as_deref().unwrap_or(&model_option.model_id);
-                execute!(
-                    self.stderr,
-                    StyledText::brand_fg(),
-                    style::Print(format!("🤖 You are chatting with {display_name}\n")),
-                    StyledText::reset(),
-                    style::Print("\n")
-                )?;
-            }
-        }
-
         // Initialize capturing if possible
         if ExperimentManager::is_enabled(os, ExperimentName::Checkpoint) {
             let path = get_shadow_repo_dir(os, self.conversation.conversation_id().to_string())?;

crates/chat-cli/src/constants.rs

@@ -159,23 +159,14 @@ pub mod ui_text {
         "Picking up where we left off...".to_string()
     }
 
-    /// Popular shortcuts text for large screens
+    /// Popular shortcuts text
     pub fn popular_shortcuts() -> String {
         format!(
-            "{} all commands  •  {} new lines  •  {} fuzzy search",
+            "{}Use {}{} for more information and happy coding!{}",
+            StyledText::secondary_fg(),
             StyledText::command("/help"),
-            StyledText::command("ctrl + j"),
-            StyledText::command("ctrl + s")
-        )
-    }
-
-    /// Popular shortcuts text for small screens
-    pub fn small_screen_popular_shortcuts() -> String {
-        format!(
-            "{} all commands\n{} new lines\n{} fuzzy search",
-            StyledText::command("/help"),
-            StyledText::command("ctrl + j"),
-            StyledText::command("ctrl + s")
+            StyledText::secondary_fg(),
+            StyledText::reset()
         )
     }
 }

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

@@ -49,6 +49,9 @@ pub fn render_new_user_welcome(output: &mut impl Write) -> Result<()> {
         )),
     )?;
 
+    // Add the help message
+    execute!(output, style::Print(&ui_text::popular_shortcuts()), style::Print("\n"),)?;
+
     Ok(())
 }