Merge branch 'main' of github.com:aws/amazon-q-developer-cli into kiran-garre/todo-list-usage

Author: kiran-garre

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/line_tracker.rs

@@ -13,6 +13,10 @@ pub struct FileLineTracker {
     pub before_fswrite_lines: usize,
     /// Line count after `fs_write` executes
     pub after_fswrite_lines: usize,
+    /// Lines added by agent in the current operation
+    pub lines_added_by_agent: usize,
+    /// Lines removed by agent in the current operation
+    pub lines_removed_by_agent: usize,
     /// Whether or not this is the first `fs_write` invocation
     pub is_first_write: bool,
 }
@@ -23,6 +27,8 @@ impl Default for FileLineTracker {
             prev_fswrite_lines: 0,
             before_fswrite_lines: 0,
             after_fswrite_lines: 0,
+            lines_added_by_agent: 0,
+            lines_removed_by_agent: 0,
             is_first_write: true,
         }
     }
@@ -34,7 +40,6 @@ impl FileLineTracker {
     }
 
     pub fn lines_by_agent(&self) -> isize {
-        let lines = (self.after_fswrite_lines as isize) - (self.before_fswrite_lines as isize);
-        lines.abs()
+        (self.lines_added_by_agent + self.lines_removed_by_agent) as isize
     }
 }

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",

crates/chat-cli/src/cli/chat/tools/fs_write.rs

@@ -247,11 +247,57 @@ impl FsWrite {
 
         let tracker = line_tracker.entry(path.to_string_lossy().to_string()).or_default();
         tracker.after_fswrite_lines = after_lines;
+
+        // Calculate actual lines added and removed by analyzing the diff
+        let (lines_added, lines_removed) = self.calculate_diff_lines(os).await?;
+        tracker.lines_added_by_agent = lines_added;
+        tracker.lines_removed_by_agent = lines_removed;
+
         tracker.is_first_write = false;
 
         Ok(())
     }
 
+    async fn calculate_diff_lines(&self, os: &Os) -> Result<(usize, usize)> {
+        let path = self.path(os);
+
+        let result = match self {
+            FsWrite::Create { .. } => {
+                // For create operations, all lines in the new file are added
+                let new_content = os.fs.read_to_string(&path).await?;
+                let lines_added = new_content.lines().count();
+                (lines_added, 0)
+            },
+            FsWrite::StrReplace { old_str, new_str, .. } => {
+                // Use actual diff analysis for accurate line counting
+                let diff = similar::TextDiff::from_lines(old_str, new_str);
+                let mut lines_added = 0;
+                let mut lines_removed = 0;
+
+                for change in diff.iter_all_changes() {
+                    match change.tag() {
+                        similar::ChangeTag::Insert => lines_added += 1,
+                        similar::ChangeTag::Delete => lines_removed += 1,
+                        similar::ChangeTag::Equal => {},
+                    }
+                }
+                (lines_added, lines_removed)
+            },
+            FsWrite::Insert { new_str, .. } => {
+                // For insert operations, all lines in new_str are added
+                let lines_added = new_str.lines().count();
+                (lines_added, 0)
+            },
+            FsWrite::Append { new_str, .. } => {
+                // For append operations, all lines in new_str are added
+                let lines_added = new_str.lines().count();
+                (lines_added, 0)
+            },
+        };
+
+        Ok(result)
+    }
+
     pub fn queue_description(&self, os: &Os, output: &mut impl Write) -> Result<()> {
         let cwd = os.env.current_dir()?;
         self.print_relative_path(os, output)?;

docs/knowledge-management.md

@@ -177,7 +177,7 @@ Each agent maintains its own isolated knowledge base, ensuring that knowledge co
 Knowledge bases are stored in the following directory structure:
 
 ```
-~/.q/knowledge_bases/
+~/.aws/amazonq/knowledge_bases/
 ├── q_cli_default/          # Default agent knowledge base
 │   ├── contexts.json       # Metadata for all contexts
 │   ├── context-id-1/       # Individual context storage
@@ -186,13 +186,13 @@ Knowledge bases are stored in the following directory structure:
 │   └── context-id-2/
 │       ├── data.json
 │       └── bm25_data.json
-├── my-custom-agent/        # Custom agent knowledge base
+├── my-custom-agent_<alphanumeric-code>/        # Custom agent knowledge base
 │   ├── contexts.json
 │   ├── context-id-3/
 │   │   └── data.json
 │   └── context-id-4/
 │       └── data.json
-└── another-agent/          # Another agent's knowledge base
+└── another-agent_<alphanumeric-code>/          # Another agent's knowledge base
     ├── contexts.json
     └── context-id-5/
         └── data.json