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

Author: brandonskiser

Cargo.lock

@@ -8,7 +8,7 @@ authors = ["Amazon Q CLI Team ([email protected])", "Chay Nabors (nabochay@amazon
 edition = "2024"
 homepage = "https://aws.amazon.com/q/"
 publish = false
-version = "1.18.0"
+version = "1.19.2"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
@@ -18,7 +18,7 @@ amzn-consolas-client = { path = "crates/amzn-consolas-client" }
 amzn-qdeveloper-streaming-client = { path = "crates/amzn-qdeveloper-streaming-client" }
 amzn-toolkit-telemetry-client = { path = "crates/amzn-toolkit-telemetry-client" }
 anstream = "0.6.13"
-arboard = { version = "3.5.0", default-features = false }
+arboard = { version = "3.6.1", default-features = false, features = ["image-data"] }
 assert_cmd = "2.0"
 async-trait = "0.1.87"
 aws-config = "1.0.3"
@@ -74,6 +74,7 @@ parking_lot = "0.12.3"
 paste = "1.0.11"
 pdf-extract = "0.10.0"
 percent-encoding = "2.2.0"
+image = "0.25"
 predicates = "3.0"
 prettyplease = "0.2.32"
 quote = "1.0.40"

Cargo.toml

@@ -22,7 +22,7 @@ phases:
       - . "$HOME/.cargo/env"
       - rustup toolchain install `cat rust-toolchain.toml | grep channel | cut -d '=' -f2 | tr -d ' "'`
       # Install cross only if the musl env var is set and not null
-      - if [ ! -z "${AMAZON_Q_BUILD_MUSL:+x}" ]; then cargo install cross --git https://github.com/cross-rs/cross; fi
+      - if [ ! -z "${AMAZON_Q_BUILD_MUSL:+x}" ]; then cargo install cross --git https://github.com/cross-rs/cross --locked; fi
       # Install python/node via mise (https://mise.jdx.dev/continuous-integration.html)
       - curl --retry 5 --proto '=https' --tlsv1.2 -sSf https://mise.run | sh
       - mise install

build-config/buildspec-linux.yml

@@ -298,7 +298,7 @@ impl std::io::Write for ControlEnd<DestinationStdout> {
             if byte == &10 || byte == &13 {
                 if self.current_event.is_none() {
                     self.current_event
-                        .replace(Event::LegacyPassThrough(LegacyPassThroughOutput::Stderr(
+                        .replace(Event::LegacyPassThrough(LegacyPassThroughOutput::Stdout(
                             Default::default(),
                         )));
                 }
@@ -323,7 +323,7 @@ impl std::io::Write for ControlEnd<DestinationStdout> {
         if start < end {
             if self.current_event.is_none() {
                 self.current_event
-                    .replace(Event::LegacyPassThrough(LegacyPassThroughOutput::Stderr(
+                    .replace(Event::LegacyPassThrough(LegacyPassThroughOutput::Stdout(
                         Default::default(),
                     )));
             }

crates/chat-cli-ui/src/conduit.rs

@@ -71,6 +71,7 @@ owo-colors.workspace = true
 parking_lot.workspace = true
 paste.workspace = true
 percent-encoding.workspace = true
+image.workspace = true
 r2d2.workspace = true
 r2d2_sqlite.workspace = true
 rand.workspace = true

crates/chat-cli/Cargo.toml

@@ -87,7 +87,7 @@ pub fn client(region: Region) -> Client {
     Client::new(
         &aws_types::SdkConfig::builder()
             .http_client(crate::aws_common::http_client::client())
-            .behavior_version(BehaviorVersion::v2025_01_17())
+            .behavior_version(BehaviorVersion::v2025_08_07())
             .endpoint_url(oidc_url(&region))
             .region(region)
             .retry_config(RetryConfig::standard().with_max_attempts(3))

crates/chat-cli/src/auth/builder_id.rs

@@ -17,7 +17,7 @@ pub fn app_name() -> AppName {
 }
 
 pub fn behavior_version() -> BehaviorVersion {
-    BehaviorVersion::v2025_01_17()
+    BehaviorVersion::v2025_08_07()
 }
 
 #[cfg(test)]

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

@@ -76,7 +76,7 @@ fn hook_matches_tool(hook: &Hook, tool_name: &str) -> bool {
 
                     // Use matches_any_pattern for both MCP and built-in tools
                     let mut patterns = std::collections::HashSet::new();
-                    patterns.insert(pattern.clone());
+                    patterns.insert(pattern.as_str());
                     matches_any_pattern(&patterns, tool_name)
                 },
             }

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

@@ -11,6 +11,7 @@ pub mod knowledge;
 pub mod logdump;
 pub mod mcp;
 pub mod model;
+pub mod paste;
 pub mod persist;
 pub mod profile;
 pub mod prompts;
@@ -33,6 +34,7 @@ use knowledge::KnowledgeSubcommand;
 use logdump::LogdumpArgs;
 use mcp::McpArgs;
 use model::ModelArgs;
+use paste::PasteArgs;
 use persist::PersistSubcommand;
 use profile::AgentSubcommand;
 use prompts::PromptsArgs;
@@ -123,6 +125,8 @@ pub enum SlashCommand {
     /// View, manage, and resume to-do lists
     #[command(subcommand)]
     Todos(TodoSubcommand),
+    /// Paste an image from clipboard
+    Paste(PasteArgs),
 }
 
 impl SlashCommand {
@@ -191,6 +195,7 @@ impl SlashCommand {
             // },
             Self::Checkpoint(subcommand) => subcommand.execute(os, session).await,
             Self::Todos(subcommand) => subcommand.execute(os, session).await,
+            Self::Paste(args) => args.execute(os, session).await,
         }
     }
 
@@ -223,6 +228,7 @@ impl SlashCommand {
             },
             Self::Checkpoint(_) => "checkpoint",
             Self::Todos(_) => "todos",
+            Self::Paste(_) => "paste",
         }
     }
 

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

@@ -0,0 +1,40 @@
+use clap::Args;
+use crossterm::execute;
+use crossterm::style::{
+    self,
+    Color,
+};
+
+use crate::cli::chat::util::clipboard::paste_image_from_clipboard;
+use crate::cli::chat::{
+    ChatError,
+    ChatSession,
+    ChatState,
+};
+use crate::os::Os;
+
+#[derive(Debug, Args, PartialEq)]
+pub struct PasteArgs;
+
+impl PasteArgs {
+    pub async fn execute(self, _os: &mut Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
+        match paste_image_from_clipboard() {
+            Ok(path) => Ok(ChatState::HandleInput {
+                input: path.display().to_string(),
+            }),
+            Err(e) => {
+                execute!(
+                    session.stderr,
+                    style::SetForegroundColor(Color::Red),
+                    style::Print("❌ Failed to paste image: "),
+                    style::SetForegroundColor(Color::Reset),
+                    style::Print(format!("{}\n", e))
+                )?;
+
+                Ok(ChatState::PromptUser {
+                    skip_printing_tools: false,
+                })
+            },
+        }
+    }
+}