fix: CTRL+C handling during multi-select, auto completion for /agent generate (#2741)

* fixing bugs

* formatting

* fix: CTRL+C handling during multi-select, auto completion for /agent generate

* set use legacy mcp config to false

---------

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

Author: xianwwu

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

@@ -96,20 +96,31 @@ pub enum AgentSubcommand {
     Swap { name: Option<String> },
 }
 
-fn prompt_mcp_server_selection(servers: &[McpServerInfo]) -> eyre::Result<Vec<&McpServerInfo>> {
+fn prompt_mcp_server_selection(servers: &[McpServerInfo]) -> eyre::Result<Option<Vec<&McpServerInfo>>> {
     let items: Vec<String> = servers
         .iter()
         .map(|server| format!("{} ({})", server.name, server.config.command))
         .collect();
 
-    let selections = MultiSelect::new()
+    let selections = match MultiSelect::new()
         .with_prompt("Select MCP servers (use Space to toggle, Enter to confirm)")
         .items(&items)
-        .interact()?;
-
-    let selected_servers: Vec<&McpServerInfo> = selections.iter().filter_map(|&i| servers.get(i)).collect();
+        .interact_on_opt(&dialoguer::console::Term::stdout())
+    {
+        Ok(sel) => sel,
+        Err(dialoguer::Error::IO(ref e)) if e.kind() == std::io::ErrorKind::Interrupted => {
+            return Ok(None);
+        },
+        Err(e) => return Err(eyre::eyre!("Failed to get MCP server selection: {e}")),
+    };
+
+    let selected_servers: Vec<&McpServerInfo> = selections
+        .unwrap_or_default()
+        .iter()
+        .filter_map(|&i| servers.get(i))
+        .collect();
 
-    Ok(selected_servers)
+    Ok(Some(selected_servers))
 }
 
 impl AgentSubcommand {
@@ -280,7 +291,12 @@ impl AgentSubcommand {
                 let selected_servers = if mcp_servers.is_empty() {
                     Vec::new()
                 } else {
-                    prompt_mcp_server_selection(&mcp_servers).map_err(|e| ChatError::Custom(e.to_string().into()))?
+                    match prompt_mcp_server_selection(&mcp_servers)
+                        .map_err(|e| ChatError::Custom(e.to_string().into()))?
+                    {
+                        Some(servers) => servers,
+                        None => return Ok(ChatState::default()),
+                    }
                 };
 
                 let mcp_servers_json = if !selected_servers.is_empty() {

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

@@ -665,6 +665,7 @@ IMPORTANT: Return ONLY raw JSON with NO markdown formatting, NO code blocks, NO
 Your task is to generate an agent configuration file for an agent named '{}' with the following description: {}\n\n\
 The configuration must conform to this JSON schema:\n{}\n\n\
 We have a prepopulated template: {} \n\n\
+Please change the useLegacyMcpJson field to false. 
 Please generate the prompt field using user provided description, and fill in the MCP tools that user has selected {}. 
 Return only the JSON configuration, no additional text.",
    agent_name, agent_description, schema, prepopulated_content, selected_servers

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

@@ -67,6 +67,7 @@ pub const COMMANDS: &[&str] = &[
     "/agent rename",
     "/agent set",
     "/agent schema",
+    "/agent generate",
     "/prompts",
     "/context",
     "/context help",