Merge branch 'main' into paste-image

Author: joshrutkowski

Cargo.lock

@@ -1,14 +1,14 @@
 [workspace]
 resolver = "3"
-members = ["crates/amzn-codewhisperer-client", "crates/amzn-codewhisperer-streaming-client", "crates/amzn-consolas-client", "crates/amzn-qdeveloper-streaming-client", "crates/amzn-toolkit-telemetry-client", "crates/aws-toolkit-telemetry-definitions", "crates/chat-cli", "crates/semantic-search-client"]
+members = ["crates/amzn-codewhisperer-client", "crates/amzn-codewhisperer-streaming-client", "crates/amzn-consolas-client", "crates/amzn-qdeveloper-streaming-client", "crates/amzn-toolkit-telemetry-client", "crates/aws-toolkit-telemetry-definitions", "crates/chat-cli", "crates/semantic-search-client", "crates/chat-cli-ui"]
 default-members = ["crates/chat-cli"]
 
 [workspace.package]
 authors = ["Amazon Q CLI Team (q-cli@amazon.com)", "Chay Nabors (nabochay@amazon.com)", "Brandon Kiser (bskiser@amazon.com)", "Felix Ding (dingfeli@amazon.com)"]
 edition = "2024"
 homepage = "https://aws.amazon.com/q/"
 publish = false
-version = "1.17.1"
+version = "1.18.0"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
@@ -72,6 +72,7 @@ objc2-foundation = { version = "0.2.2", features = ["NSString", "NSURL"] }
 owo-colors = "4.2.0"
 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"
@@ -131,7 +132,8 @@ winreg = "0.55.0"
 schemars = "1.0.4"
 jsonschema = "0.30.0"
 zip = "2.2.0"
-rmcp = { version = "0.7.0", features = ["client", "transport-sse-client-reqwest", "reqwest", "transport-streamable-http-client-reqwest", "transport-child-process", "tower", "auth"] }
+rmcp = { version = "0.8.0", features = ["client", "transport-sse-client-reqwest", "reqwest", "transport-streamable-http-client-reqwest", "transport-child-process", "tower", "auth"] }
+chat-cli-ui = { path = "crates/chat-cli-ui" }
 
 [workspace.lints.rust]
 future_incompatible = "warn"

Cargo.toml

@@ -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)

README.md

@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "amzn-codewhisperer-client"
-version = "0.1.10613"
+version = "0.1.11582"
 authors = ["Grant Gurvis <grangurv@amazon.com>"]
 build = false
 exclude = [

crates/amzn-codewhisperer-client/Cargo.toml

@@ -16,6 +16,8 @@ impl super::Client {
     ///   - [`code_scan_name(impl Into<String>)`](crate::operation::start_code_analysis::builders::StartCodeAnalysisFluentBuilder::code_scan_name) / [`set_code_scan_name(Option<String>)`](crate::operation::start_code_analysis::builders::StartCodeAnalysisFluentBuilder::set_code_scan_name):<br>required: **false**<br>Code analysis scan name<br>
     ///   - [`code_diff_metadata(CodeDiffMetadata)`](crate::operation::start_code_analysis::builders::StartCodeAnalysisFluentBuilder::code_diff_metadata) / [`set_code_diff_metadata(Option<CodeDiffMetadata>)`](crate::operation::start_code_analysis::builders::StartCodeAnalysisFluentBuilder::set_code_diff_metadata):<br>required: **false**<br>(undocumented)<br>
     ///   - [`profile_arn(impl Into<String>)`](crate::operation::start_code_analysis::builders::StartCodeAnalysisFluentBuilder::profile_arn) / [`set_profile_arn(Option<String>)`](crate::operation::start_code_analysis::builders::StartCodeAnalysisFluentBuilder::set_profile_arn):<br>required: **false**<br>(undocumented)<br>
+    ///   - [`language_model_id(impl Into<String>)`](crate::operation::start_code_analysis::builders::StartCodeAnalysisFluentBuilder::language_model_id) / [`set_language_model_id(Option<String>)`](crate::operation::start_code_analysis::builders::StartCodeAnalysisFluentBuilder::set_language_model_id):<br>required: **false**<br>Unique identifier for the model<br>
+    ///   - [`client_type(Origin)`](crate::operation::start_code_analysis::builders::StartCodeAnalysisFluentBuilder::client_type) / [`set_client_type(Option<Origin>)`](crate::operation::start_code_analysis::builders::StartCodeAnalysisFluentBuilder::set_client_type):<br>required: **false**<br>Enum to represent the origin application conversing with Sidekick.<br>
     /// - On success, responds with
     ///   [`StartCodeAnalysisOutput`](crate::operation::start_code_analysis::StartCodeAnalysisOutput)
     ///   with field(s):

crates/amzn-codewhisperer-client/src/client/start_code_analysis.rs

@@ -18,6 +18,10 @@ pub struct StartCodeAnalysisInput {
     pub code_diff_metadata: ::std::option::Option<crate::types::CodeDiffMetadata>,
     #[allow(missing_docs)] // documentation missing in model
     pub profile_arn: ::std::option::Option<::std::string::String>,
+    /// Unique identifier for the model
+    pub language_model_id: ::std::option::Option<::std::string::String>,
+    /// Enum to represent the origin application conversing with Sidekick.
+    pub client_type: ::std::option::Option<crate::types::Origin>,
 }
 impl StartCodeAnalysisInput {
     #[allow(missing_docs)] // documentation missing in model
@@ -56,6 +60,16 @@ impl StartCodeAnalysisInput {
     pub fn profile_arn(&self) -> ::std::option::Option<&str> {
         self.profile_arn.as_deref()
     }
+
+    /// Unique identifier for the model
+    pub fn language_model_id(&self) -> ::std::option::Option<&str> {
+        self.language_model_id.as_deref()
+    }
+
+    /// Enum to represent the origin application conversing with Sidekick.
+    pub fn client_type(&self) -> ::std::option::Option<&crate::types::Origin> {
+        self.client_type.as_ref()
+    }
 }
 impl StartCodeAnalysisInput {
     /// Creates a new builder-style object to manufacture
@@ -78,6 +92,8 @@ pub struct StartCodeAnalysisInputBuilder {
     pub(crate) code_scan_name: ::std::option::Option<::std::string::String>,
     pub(crate) code_diff_metadata: ::std::option::Option<crate::types::CodeDiffMetadata>,
     pub(crate) profile_arn: ::std::option::Option<::std::string::String>,
+    pub(crate) language_model_id: ::std::option::Option<::std::string::String>,
+    pub(crate) client_type: ::std::option::Option<crate::types::Origin>,
 }
 impl StartCodeAnalysisInputBuilder {
     /// Adds a key-value pair to `artifacts`.
@@ -213,6 +229,40 @@ impl StartCodeAnalysisInputBuilder {
         &self.profile_arn
     }
 
+    /// Unique identifier for the model
+    pub fn language_model_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.language_model_id = ::std::option::Option::Some(input.into());
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn set_language_model_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.language_model_id = input;
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn get_language_model_id(&self) -> &::std::option::Option<::std::string::String> {
+        &self.language_model_id
+    }
+
+    /// Enum to represent the origin application conversing with Sidekick.
+    pub fn client_type(mut self, input: crate::types::Origin) -> Self {
+        self.client_type = ::std::option::Option::Some(input);
+        self
+    }
+
+    /// Enum to represent the origin application conversing with Sidekick.
+    pub fn set_client_type(mut self, input: ::std::option::Option<crate::types::Origin>) -> Self {
+        self.client_type = input;
+        self
+    }
+
+    /// Enum to represent the origin application conversing with Sidekick.
+    pub fn get_client_type(&self) -> &::std::option::Option<crate::types::Origin> {
+        &self.client_type
+    }
+
     /// Consumes the builder and constructs a
     /// [`StartCodeAnalysisInput`](crate::operation::start_code_analysis::StartCodeAnalysisInput).
     pub fn build(
@@ -229,6 +279,8 @@ impl StartCodeAnalysisInputBuilder {
             code_scan_name: self.code_scan_name,
             code_diff_metadata: self.code_diff_metadata,
             profile_arn: self.profile_arn,
+            language_model_id: self.language_model_id,
+            client_type: self.client_type,
         })
     }
 }

crates/amzn-codewhisperer-client/src/operation/start_code_analysis/_start_code_analysis_input.rs

@@ -248,4 +248,38 @@ impl StartCodeAnalysisFluentBuilder {
     pub fn get_profile_arn(&self) -> &::std::option::Option<::std::string::String> {
         self.inner.get_profile_arn()
     }
+
+    /// Unique identifier for the model
+    pub fn language_model_id(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
+        self.inner = self.inner.language_model_id(input.into());
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn set_language_model_id(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
+        self.inner = self.inner.set_language_model_id(input);
+        self
+    }
+
+    /// Unique identifier for the model
+    pub fn get_language_model_id(&self) -> &::std::option::Option<::std::string::String> {
+        self.inner.get_language_model_id()
+    }
+
+    /// Enum to represent the origin application conversing with Sidekick.
+    pub fn client_type(mut self, input: crate::types::Origin) -> Self {
+        self.inner = self.inner.client_type(input);
+        self
+    }
+
+    /// Enum to represent the origin application conversing with Sidekick.
+    pub fn set_client_type(mut self, input: ::std::option::Option<crate::types::Origin>) -> Self {
+        self.inner = self.inner.set_client_type(input);
+        self
+    }
+
+    /// Enum to represent the origin application conversing with Sidekick.
+    pub fn get_client_type(&self) -> &::std::option::Option<crate::types::Origin> {
+        self.inner.get_client_type()
+    }
 }

crates/amzn-codewhisperer-client/src/operation/start_code_analysis/builders.rs

@@ -476,6 +476,8 @@ pub(crate) mod shape_notifications_feature;
 
 pub(crate) mod shape_progress_updates;
 
+pub(crate) mod shape_reasoning_content;
+
 pub(crate) mod shape_span;
 
 pub(crate) mod shape_sso_identity_details;
@@ -506,6 +508,8 @@ pub(crate) mod shape_git_state;
 
 pub(crate) mod shape_image_source;
 
+pub(crate) mod shape_reasoning_text;
+
 pub(crate) mod shape_shell_state;
 
 pub(crate) mod shape_target_file_info;

crates/amzn-codewhisperer-client/src/protocol_serde.rs

@@ -57,5 +57,11 @@ pub fn ser_assistant_response_message(
         crate::protocol_serde::shape_cache_point::ser_cache_point(&mut object_17, var_16)?;
         object_17.finish();
     }
+    if let Some(var_18) = &input.reasoning_content {
+        #[allow(unused_mut)]
+        let mut object_19 = object.key("reasoningContent").start_object();
+        crate::protocol_serde::shape_reasoning_content::ser_reasoning_content(&mut object_19, var_18)?;
+        object_19.finish();
+    }
     Ok(())
 }

crates/amzn-codewhisperer-client/src/protocol_serde/shape_assistant_response_message.rs

@@ -45,13 +45,25 @@ where
                                         .transpose()?,
                                 );
                             },
+                            "currentUsageWithPrecision" => {
+                                builder = builder.set_current_usage_with_precision(
+                                    ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
+                                        .map(|v| v.to_f64_lossy()),
+                                );
+                            },
                             "usageLimit" => {
                                 builder = builder.set_usage_limit(
                                     ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
                                         .map(i32::try_from)
                                         .transpose()?,
                                 );
                             },
+                            "usageLimitWithPrecision" => {
+                                builder = builder.set_usage_limit_with_precision(
+                                    ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
+                                        .map(|v| v.to_f64_lossy()),
+                                );
+                            },
                             _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
                         }
                     },