Merge remote-tracking branch 'origin/main' into bskiser/fix-token-refresh

Author: brandonskiser

Cargo.lock

@@ -64,10 +64,10 @@ version = "1.5.5"
 version = "1.2.4"
 
 [dependencies.aws-smithy-http]
-version = "0.60.12"
+version = "0.62.1"
 
 [dependencies.aws-smithy-json]
-version = "0.61.2"
+version = "0.61.3"
 
 [dependencies.aws-smithy-runtime]
 version = "1.7.8"

crates/amzn-codewhisperer-client/Cargo.toml

@@ -67,11 +67,11 @@ version = "1.2.4"
 version = "0.60.6"
 
 [dependencies.aws-smithy-http]
-version = "0.60.12"
+version = "0.62.1"
 features = ["event-stream"]
 
 [dependencies.aws-smithy-json]
-version = "0.61.2"
+version = "0.61.3"
 
 [dependencies.aws-smithy-runtime]
 version = "1.7.8"

crates/amzn-codewhisperer-streaming-client/Cargo.toml

@@ -67,10 +67,10 @@ version = "1.5.5"
 version = "1.2.4"
 
 [dependencies.aws-smithy-http]
-version = "0.60.12"
+version = "0.62.1"
 
 [dependencies.aws-smithy-json]
-version = "0.61.2"
+version = "0.61.3"
 
 [dependencies.aws-smithy-runtime]
 version = "1.7.8"

crates/amzn-consolas-client/Cargo.toml

@@ -70,11 +70,11 @@ version = "1.2.4"
 version = "0.60.6"
 
 [dependencies.aws-smithy-http]
-version = "0.60.12"
+version = "0.62.1"
 features = ["event-stream"]
 
 [dependencies.aws-smithy-json]
-version = "0.61.2"
+version = "0.61.3"
 
 [dependencies.aws-smithy-runtime]
 version = "1.7.8"

crates/amzn-qdeveloper-streaming-client/Cargo.toml

@@ -38,10 +38,10 @@ version = "1.1.3"
 version = "1.1.3"
 
 [dependencies.aws-smithy-http]
-version = "0.60.3"
+version = "0.62.1"
 
 [dependencies.aws-smithy-json]
-version = "0.60.3"
+version = "0.61.3"
 
 [dependencies.aws-smithy-runtime]
 version = "1.1.3"

crates/amzn-toolkit-telemetry-client/Cargo.toml

@@ -187,7 +187,7 @@ winreg = "0.55.0"
 
 [dev-dependencies]
 assert_cmd = "2.0"
-criterion = "0.5.1"
+criterion = "0.6.0"
 mockito = "1.7.0"
 paste = "1.0.11"
 predicates = "3.0"

crates/chat-cli/Cargo.toml

@@ -276,6 +276,7 @@ const HELP_TEXT: &str = color_print::cstr! {"
 <em>Ctrl(^) + j</em>           <black!>Insert new-line to provide multi-line prompt. Alternatively, [Alt(⌥) + Enter(⏎)]</black!>
 <em>Ctrl(^) + s</em>           <black!>Fuzzy search commands and context files. Use Tab to select multiple items.</black!>
                       <black!>Change the keybind to ctrl+x with: q settings chat.skimCommandKey x (where x is any key)</black!>
+<em>chat.editMode</em>         <black!>Set editing mode (vim or emacs) using: q settings chat.editMode vi/emacs</black!>
 
 "};
 

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

@@ -1,6 +1,6 @@
-# Fig Desktop
+# Amazon Q Desktop
 
-This is the main Fig app written in Rust. It should be
+This is the main Amazon Q Desktop written in Rust. It should be
 ready to run and start developing with if you follow the
 instructions in the [root README](../README.md).
 
@@ -10,4 +10,4 @@ instructions in the [root README](../README.md).
 1. Run `cargo run`.
 1. Once the UI opens, right click anywhere to inspect element, go to the console tab, and set `window.location.href`
 to the URL of the dashboard development server.
-
+   - Alternatively, you can use the `DASHBOARD_URL` environment variable instead of manually setting `window.location.href`, e,g. `DASHBOARD_URL=http://localhost:3433 cargo run`.

crates/fig_desktop/README.md

@@ -99,7 +99,7 @@ winapi = { version = "0.3", features = ["consoleapi"] }
 
 [dev-dependencies]
 assert_cmd = "2.0"
-criterion = "0.5.1"
+criterion = "0.6.0"
 insta.workspace = true
 paste = "1.0.11"
 predicates = "3.0"