aws
diff --git a/‎AmazonQ.md‎
Lines changed: 76 additions & 0 deletions b/‎AmazonQ.md‎
Lines changed: 76 additions & 0 deletions
diff --git a/‎Cargo.lock‎
Lines changed: 1 addition & 0 deletions b/‎Cargo.lock‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Cargo.toml‎
Lines changed: 1 addition & 0 deletions b/‎Cargo.toml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎codebase-summary.md‎
Lines changed: 97 additions & 0 deletions b/‎codebase-summary.md‎
Lines changed: 97 additions & 0 deletions
diff --git a/‎crates/aws-toolkit-telemetry-definitions/def.json‎
Lines changed: 7 additions & 1 deletion b/‎crates/aws-toolkit-telemetry-definitions/def.json‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎crates/fig_telemetry/src/event.rs‎
Lines changed: 1 addition & 0 deletions b/‎crates/fig_telemetry/src/event.rs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎crates/fig_telemetry/src/lib.rs‎
Lines changed: 4 additions & 2 deletions b/‎crates/fig_telemetry/src/lib.rs‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎crates/fig_telemetry_core/src/lib.rs‎
Lines changed: 7 additions & 1 deletion b/‎crates/fig_telemetry_core/src/lib.rs‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎crates/fig_util/src/directories.rs‎
Lines changed: 13 additions & 0 deletions b/‎crates/fig_util/src/directories.rs‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎crates/q_cli/Cargo.toml‎
Lines changed: 1 addition & 0 deletions b/‎crates/q_cli/Cargo.toml‎
Lines changed: 1 addition & 0 deletions
@@ -0,0 +1,76 @@
+# Amazon Q Development Guidelines
+
+Always follow these guidelines when assisting in development for the Amazon Q CLI.
+
+## AmazonQ.md
+
+DO NOT create or modify an AmazonQ.md file unless I explicitly tell you to do so.
+
+## Rust Best Practices
+
+### File Operations
+
+When working with file operations in Rust:
+
+1. Prefer using the simpler `fs::read_to_string()` and `fs::write()` functions over verbose `File::open()` + `read_to_string()` or `File::create()` + `write_all()` combinations
+2. Avoid the `#[allow(clippy::verbose_file_reads)]` annotation by using the recommended methods
+3. Use `serde_json::to_string_pretty()` + `fs::write()` instead of creating a file and then writing to it with `serde_json::to_writer_pretty()`
+4. Keep imports organized by functionality (e.g., group path-related imports together)
+
+## Git
+
+### Committing Changes
+
+Follow the git best practice of committing early and often. Run `git commit` often, but DO NOT ever run `git push`
+
+BEFORE committing a change, ALWAYS do the following steps:
+
+1. Run `cargo build` and fix any problems. Prefer running it against just the crate you're modifying for shorter runtimes
+2. Run `cargo test` and fix any problems. Prefer running it against just the crate you're modifying for shorter runtimes
+3. Run `cargo +nightly fmt` to auto-format the code
+4. Commit the changes
+
+### Commit Messages
+
+All commit messages should follow the [Conventional Commits](https://www.conventionalcommits.org/) specification and include best practices:
+
+```
+<type>[optional scope]: <description>
+
+[optional body]
+
+[optional footer(s)]
+
+🤖 Assisted by [Amazon Q Developer](https://aws.amazon.com/q/developer)
+```
+
+Types:
+- feat: A new feature
+- fix: A bug fix
+- docs: Documentation only changes
+- style: Changes that do not affect the meaning of the code
+- refactor: A code change that neither fixes a bug nor adds a feature
+- perf: A code change that improves performance
+- test: Adding missing tests or correcting existing tests
+- chore: Changes to the build process or auxiliary tools
+- ci: Changes to CI configuration files and scripts
+
+Best practices:
+- Use the imperative mood ("add" not "added" or "adds")
+- Don't end the subject line with a period
+- Limit the subject line to 50 characters
+- Capitalize the subject line
+- Separate subject from body with a blank line
+- Use the body to explain what and why vs. how
+- Wrap the body at 72 characters
+
+Example:
+```
+feat(lambda): Add Go implementation of DDB stream forwarder
+
+Replace Node.js Lambda function with Go implementation to reduce cold
+start times. The new implementation supports forwarding to multiple SQS
+queues and maintains the same functionality as the original.
+
+🤖 Assisted by [Amazon Q Developer](https://aws.amazon.com/q/developer)
+```
@@ -78,6 +78,7 @@ fig_util = { path = "crates/fig_util" }
 flate2 = "1.1.0"
 flume = "0.11.0"
 futures = "0.3.26"
+glob = "0.3.2"
 globset = "0.4.16"
 hex = "0.4.3"
 http = "1.2.0"
 
@@ -0,0 +1,97 @@
+# Amazon Q Developer CLI Codebase Summary
+
+## Overview
+
+The **Amazon Q Developer CLI** is part of a monorepo that houses the core code for the Amazon Q Developer desktop application and command-line interface. Amazon Q Developer is an AI assistant built by AWS to help developers with various tasks.
+
+## Key Components
+
+1. **q_cli**: The main CLI tool that allows users to interact with Amazon Q Developer from the command line
+2. **fig_desktop**: The Rust desktop application that uses tao/wry for windowing and webviews
+3. **Web Applications**: React apps for autocomplete functionality and dashboard interface
+4. **IDE Extensions**: VSCode, JetBrains, and GNOME extensions
+
+## Project Structure
+
+- `crates/` - Contains all internal Rust crates
+- `packages/` - Contains all internal npm packages
+- `proto/` - Protocol buffer message specifications for inter-process communication
+- `extensions/` - IDE extensions
+- `build-scripts/` - Python scripts for building, signing, and testing
+- `tests/` - Integration tests
+
+## Amazon Q Chat Implementation
+
+### Core Components
+
+1. **Chat Module Structure**
+   - The chat functionality is implemented in the `q_cli/src/cli/chat` directory
+   - Main components include conversation state management, input handling, response parsing, and tool execution
+
+2. **User Interface**
+   - Provides an interactive terminal-based chat interface
+   - Uses `rustyline` for command-line input with features like history, completion, and highlighting
+   - Displays a welcome message with usage suggestions and available commands
+   - Supports special commands like `/help`, `/quit`, `/clear`, and `/acceptall`
+
+3. **Conversation Management**
+   - `ConversationState` class maintains the chat history and context
+   - Tracks user messages, assistant responses, and tool executions
+   - Manages conversation history with a maximum limit (100 messages)
+   - Preserves environmental context like working directory and shell state
+
+4. **Input Handling**
+   - `InputSource` handles reading user input with support for multi-line inputs
+   - `Command` parser interprets user input as questions, commands, or special commands
+   - Supports command completion for special commands like `/help` and `/clear`
+
+5. **Response Parsing**
+   - `ResponseParser` processes streaming responses from the Amazon Q service
+   - Handles markdown formatting and syntax highlighting
+   - Manages tool use requests from the assistant
+
+### Tool Integration
+
+The chat implementation includes a robust tool system that allows Amazon Q to interact with the user's environment:
+
+1. **Available Tools**:
+   - `fs_read`: Reads files or lists directories (similar to `cat` or `ls`)
+   - `fs_write`: Creates or modifies files with various operations (create, append, replace)
+   - `execute_bash`: Executes shell commands in the user's environment
+   - `use_aws`: Makes AWS CLI API calls with specified services and operations
+
+2. **Tool Execution Flow**:
+   - Amazon Q requests to use a tool via the API
+   - The CLI parses the request and validates parameters
+   - The tool is executed with appropriate permissions checks
+   - Results are returned to Amazon Q for further processing
+   - The conversation continues with the tool results incorporated
+
+3. **Security Considerations**:
+   - Tools that modify the system (like `fs_write` and `execute_bash`) require user confirmation
+   - The `/acceptall` command can toggle automatic acceptance for the session
+   - Tool responses are limited to prevent excessive output (30KB limit)
+
+### Technical Implementation
+
+1. **API Communication**:
+   - Uses a streaming client to communicate with the Amazon Q service
+   - Handles asynchronous responses and tool requests
+   - Manages timeouts and connection errors
+
+2. **Display Formatting**:
+   - Uses `crossterm` for terminal control and styling
+   - Implements markdown parsing and syntax highlighting
+   - Displays spinners during processing
+
+3. **Error Handling**:
+   - Comprehensive error types and handling for various failure scenarios
+   - Graceful degradation when services are unavailable
+   - Signal handling for user interruptions
+
+4. **Configuration**:
+   - Respects user settings for editor mode (vi/emacs)
+   - Region checking for service availability
+   - Telemetry for usage tracking
+
+The implementation provides a seamless interface between the user and Amazon Q's AI capabilities, with powerful tools that allow the assistant to help with file operations, command execution, and AWS service interactions, all within a terminal-based chat interface.
@@ -149,6 +149,11 @@
       "name": "codewhispererterminal_isToolValid",
       "type": "boolean",
       "description": "If the use of tool as instructed by the model is valid"
+    },
+    {
+      "name": "codewhispererterminal_contextFileLength",
+      "type": "int",
+      "description": "The length of the files included as part of context management"
     }
   ],
   "metrics": [
@@ -167,7 +172,8 @@
       "metadata": [
         { "type": "amazonqConversationId" },
         { "type": "credentialStartUrl", "required": false },
-        { "type": "codewhispererterminal_inCloudshell" }
+        { "type": "codewhispererterminal_inCloudshell" },
+        { "type": "codewhispererterminal_contextFileLength", "required": false }
       ]
     },
     {
 
@@ -178,6 +178,7 @@ pub(crate) mod tests {
         AppTelemetryEvent::new(EventType::ChatAddedMessage {
             conversation_id: "XXX".into(),
             message_id: "YYY".into(),
+            context_file_length: Some(5),
         })
         .await
     }
 
@@ -336,6 +336,7 @@ impl Client {
             EventType::ChatAddedMessage {
                 conversation_id,
                 message_id,
+                ..
             } => {
                 self.send_cw_telemetry_chat_add_message_event(conversation_id.clone(), message_id.clone())
                     .await;
@@ -685,10 +686,11 @@ pub async fn send_end_chat(conversation_id: String) {
     dispatch_or_send_event(event).await;
 }
 
-pub async fn send_chat_added_message(conversation_id: String, message_id: String) {
+pub async fn send_chat_added_message(conversation_id: String, message_id: String, context_file_length: Option<usize>) {
     let event = AppTelemetryEvent::new(EventType::ChatAddedMessage {
         conversation_id,
         message_id,
+        context_file_length,
     })
     .await;
     dispatch_or_send_event(event).await;
@@ -784,7 +786,7 @@ mod test {
         send_doctor_check_failed("").await;
         send_dashboard_page_viewed("/").await;
         send_menu_bar_actioned(Some("Settings")).await;
-        send_chat_added_message("debug".to_owned(), "debug".to_owned()).await;
+        send_chat_added_message("debug".to_owned(), "debug".to_owned(), Some(123)).await;
 
         finish_telemetry_unwrap().await;
 
 
@@ -284,13 +284,18 @@ impl Event {
                 }
                 .into_metric_datum(),
             ),
-            EventType::ChatAddedMessage { conversation_id, .. } => Some(
+            EventType::ChatAddedMessage {
+                conversation_id,
+                context_file_length,
+                ..
+            } => Some(
                 CodewhispererterminalAddChatMessage {
                     create_time: self.created_time,
                     value: None,
                     amazonq_conversation_id: Some(conversation_id.into()),
                     credential_start_url: self.credential_start_url.map(Into::into),
                     codewhispererterminal_in_cloudshell: in_cloudshell(),
+                    codewhispererterminal_context_file_length: context_file_length.map(|l| l as i64).map(Into::into),
                 }
                 .into_metric_datum(),
             ),
@@ -399,6 +404,7 @@ pub enum EventType {
     ChatAddedMessage {
         conversation_id: String,
         message_id: String,
+        context_file_length: Option<usize>,
     },
     MigrateClientId {
         old_client_id: String,
 
@@ -323,6 +323,19 @@ pub fn utc_backup_dir() -> Result<PathBuf> {
     Ok(backups_dir()?.join(now))
 }
 
+/// The directory to the directory containing config for the `/context` feature in `q chat`.
+pub fn chat_global_context_path<Ctx: FsProvider + EnvProvider>(ctx: &Ctx) -> Result<PathBuf> {
+    Ok(home_dir_ctx(ctx)?
+        .join(".aws")
+        .join("amazonq")
+        .join("global_context.json"))
+}
+
+/// The directory to the directory containing config for the `/context` feature in `q chat`.
+pub fn chat_profiles_dir<Ctx: FsProvider + EnvProvider>(ctx: &Ctx) -> Result<PathBuf> {
+    Ok(home_dir_ctx(ctx)?.join(".aws").join("amazonq").join("profiles"))
+}
+
 /// The desktop app socket path
 ///
 /// - MacOS: `$TMPDIR/cwrun/desktop.sock`
 
@@ -55,6 +55,7 @@ fig_telemetry.workspace = true
 fig_util.workspace = true
 flume.workspace = true
 futures.workspace = true
+glob.workspace = true
 globset.workspace = true
 indicatif.workspace = true
 indoc.workspace = true
Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,7 @@ pub(crate) mod tests {`
`178`	`178`	`AppTelemetryEvent::new(EventType::ChatAddedMessage {`
`179`	`179`	`conversation_id: "XXX".into(),`
`180`	`180`	`message_id: "YYY".into(),`
	`181`	`+ context_file_length: Some(5),`
`181`	`182`	`})`
`182`	`183`	`.await`
`183`	`184`	`}`