Merge remote-tracking branch 'origin/main' into bskiser/add-agent-crate

Author: brandonskiser

README.md

@@ -4,6 +4,7 @@
 
 - **macOS**:
   - **DMG**: [Download now](https://desktop-release.q.us-east-1.amazonaws.com/latest/Amazon%20Q.dmg)
+  - **HomeBrew**: ```brew install --cask amazon-q ```
 - **Linux**:
   - [Ubuntu/Debian](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/command-line-installing.html#command-line-installing-ubuntu)
   - [AppImage](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/command-line-installing.html#command-line-installing-appimage)

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

@@ -832,6 +832,26 @@ impl ChatSession {
         }
 
         let (context, report, display_err_message) = match err {
+            ChatError::Auth(AuthError::NoToken) => {
+                execute!(
+                    self.stderr,
+                    style::SetAttribute(Attribute::Bold),
+                    StyledText::error_fg(),
+                    style::Print("Authentication Error\n"),
+                    StyledText::reset_attributes(),
+                    StyledText::reset(),
+                    style::Print("\nYour login session has expired. Please log in again using:\n\n"),
+                    StyledText::success_fg(),
+                    style::Print("    q login\n\n"),
+                    StyledText::reset(),
+                )?;
+
+                self.conversation
+                    .append_transcript("Authentication expired - please log in again".to_string());
+
+                self.inner = Some(ChatState::Exit);
+                return Ok(());
+            },
             ChatError::Interrupted { tool_uses: ref inter } => {
                 execute!(self.stderr, style::Print("\n\n"))?;
 

crates/chat-cli/src/constants.rs

@@ -272,7 +272,7 @@ pub mod tips {
                 StyledText::command("MCP servers")
             ),
             format!(
-                "You can specify wait time (in ms) for mcp server loading with {}. Servers that takes longer than the specified time will continue to load in the background. Use /tools to see pending servers.",
+                "You can specify wait time (in ms) for mcp server loading with {}. Servers that take longer than the specified time will continue to load in the background. Use /tools to see pending servers.",
                 StyledText::command("q settings mcp.initTimeout {timeout in int}")
             ),
             format!(

crates/chat-cli/src/mcp_client/client.rs

@@ -458,8 +458,14 @@ impl McpClientService {
                     ..
                 } = &self.config;
 
+                // Process environment variables in headers
+                let mut processed_headers = headers.clone();
+                for (_, value) in processed_headers.iter_mut() {
+                    *value = substitute_env_vars(value, &os.env);
+                }
+
                 let http_service_builder =
-                    HttpServiceBuilder::new(url, os, url, *timeout, scopes, headers, oauth, messenger);
+                    HttpServiceBuilder::new(url, os, url, *timeout, scopes, &processed_headers, oauth, messenger);
 
                 let (service, auth_client_wrapper) = http_service_builder.try_build(&self).await?;
 
@@ -673,4 +679,33 @@ mod tests {
         assert_eq!(env_vars.get("KEY1").unwrap(), "Value is test_value");
         assert_eq!(env_vars.get("KEY2").unwrap(), "No substitution");
     }
+
+    #[tokio::test]
+    async fn test_http_headers_env_var_processing() {
+        let os = Os::new().await.unwrap();
+        unsafe {
+            os.env.set_var("GITHUB_TOKEN", "github_pat_test123");
+            os.env.set_var("API_KEY", "secret_key_456");
+        }
+
+        // Simulate HTTP headers with environment variables
+        let mut headers = HashMap::new();
+        headers.insert("Authorization".to_string(), "Bearer ${env:GITHUB_TOKEN}".to_string());
+        headers.insert("X-API-Key".to_string(), "${env:API_KEY}".to_string());
+        headers.insert("Content-Type".to_string(), "application/json".to_string());
+
+        // Process headers (same logic as in HTTP transport)
+        let mut processed_headers = headers.clone();
+        for (_, value) in processed_headers.iter_mut() {
+            *value = substitute_env_vars(value, &os.env);
+        }
+
+        // Verify environment variables were substituted
+        assert_eq!(
+            processed_headers.get("Authorization").unwrap(),
+            "Bearer github_pat_test123"
+        );
+        assert_eq!(processed_headers.get("X-API-Key").unwrap(), "secret_key_456");
+        assert_eq!(processed_headers.get("Content-Type").unwrap(), "application/json");
+    }
 }