this contains bug fix from the bug bash for agent generate (#2732)

* fixing bugs

* formatting

---------

Co-authored-by: Xian Wu <[email protected]>

Author: xianwwu

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

@@ -221,31 +221,55 @@ impl AgentSubcommand {
             },
 
             Self::Generate {} => {
-                let agent_name = match session.read_user_input("Enter agent name: ", false) {
-                    Some(input) => input.trim().to_string(),
-                    None => {
+                let agent_name = match crate::util::input("Enter agent name: ", None) {
+                    Ok(input) => input.trim().to_string(),
+                    Err(_) => {
                         return Ok(ChatState::PromptUser {
                             skip_printing_tools: true,
                         });
                     },
                 };
 
-                let agent_description = match session.read_user_input("Enter agent description: ", false) {
-                    Some(input) => input.trim().to_string(),
-                    None => {
+                let agent_description = match crate::util::input("Enter agent description: ", None) {
+                    Ok(input) => input.trim().to_string(),
+                    Err(_) => {
                         return Ok(ChatState::PromptUser {
                             skip_printing_tools: true,
                         });
                     },
                 };
 
                 let scope_options = vec!["Local (current workspace)", "Global (all workspaces)"];
-                let scope_selection = Select::new()
+                let scope_selection = match Select::with_theme(&crate::util::dialoguer_theme())
                     .with_prompt("Agent scope")
                     .items(&scope_options)
                     .default(0)
-                    .interact()
-                    .map_err(|e| ChatError::Custom(format!("Failed to get scope selection: {}", e).into()))?;
+                    .interact_on_opt(&dialoguer::console::Term::stdout())
+                {
+                    Ok(sel) => {
+                        let _ = crossterm::execute!(
+                            std::io::stdout(),
+                            crossterm::style::SetForegroundColor(crossterm::style::Color::Magenta)
+                        );
+                        sel
+                    },
+                    // Ctrl‑C -> Err(Interrupted)
+                    Err(dialoguer::Error::IO(ref e)) if e.kind() == std::io::ErrorKind::Interrupted => {
+                        return Ok(ChatState::PromptUser {
+                            skip_printing_tools: true,
+                        });
+                    },
+                    Err(e) => return Err(ChatError::Custom(format!("Failed to get scope selection: {e}").into())),
+                };
+
+                let scope_selection = match scope_selection {
+                    Some(selection) => selection,
+                    None => {
+                        return Ok(ChatState::PromptUser {
+                            skip_printing_tools: true,
+                        });
+                    },
+                };
 
                 let is_global = scope_selection == 1;
 

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

@@ -1716,25 +1716,19 @@ impl ChatSession {
         // Parse and validate the initial generated config
         let initial_agent_config = match serde_json::from_str::<Agent>(&agent_config_json) {
             Ok(config) => config,
-            Err(err) => {
+            Err(_) => {
                 execute!(
                     self.stderr,
                     style::SetForegroundColor(Color::Red),
-                    style::Print(format!("✗ Failed to parse generated agent config: {}\n\n", err)),
+                    style::Print("✗ The LLM did not generate a valid agent configuration. Please try again.\n\n"),
                     style::SetForegroundColor(Color::Reset)
                 )?;
-                return Err(ChatError::Custom(format!("Invalid agent config: {}", err).into()));
+                return Ok(ChatState::PromptUser {
+                    skip_printing_tools: true,
+                });
             },
         };
 
-        // Display the generated agent config with syntax highlighting
-        execute!(
-            self.stderr,
-            style::SetForegroundColor(Color::Green),
-            style::Print(format!("✓ Generated agent config for '{}':\n\n", agent_name)),
-            style::SetForegroundColor(Color::Reset)
-        )?;
-
         let formatted_json = serde_json::to_string_pretty(&initial_agent_config)
             .map_err(|e| ChatError::Custom(format!("Failed to format JSON: {}", e).into()))?;
 
@@ -1750,9 +1744,9 @@ impl ChatSession {
                     style::Print(format!("✗ Invalid edited configuration: {}\n\n", err)),
                     style::SetForegroundColor(Color::Reset)
                 )?;
-                return Err(ChatError::Custom(
-                    format!("Invalid agent config after editing: {}", err).into(),
-                ));
+                return Ok(ChatState::PromptUser {
+                    skip_printing_tools: true,
+                });
             },
         };