Merge master into feature/cwltail

aws · Nov 7, 2024 · ec63b88 · ec63b88
2 parents 50cbeee + d4d1ae0
commit ec63b88
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/...s/amazonq/.changes/next-release/Breaking Change-7a7320b8-e8a2-4d61-8f2d-7da04f1716da.json b/...s/amazonq/.changes/next-release/Breaking Change-7a7320b8-e8a2-4d61-8f2d-7da04f1716da.json
@@ -0,0 +1,4 @@
+{
+	"type": "Breaking Change",
+	"description": "Change focus chat keybind to win+alt+i on Windows, cmd+alt+i on macOS, and meta+alt+i on Linux"
+}
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -609,9 +609,9 @@
         "keybindings": [
             {
                 "command": "_aws.amazonq.focusChat.keybinding",
-                "win": "ctrl+win+i",
-                "mac": "ctrl+cmd+i",
-                "linux": "ctrl+meta+i"
+                "win": "win+alt+i",
+                "mac": "cmd+alt+i",
+                "linux": "meta+alt+i"
             },
             {
                 "command": "aws.amazonq.explainCode",

diff --git a/packages/amazonq/src/inlineChat/controller/inlineChatController.ts b/packages/amazonq/src/inlineChat/controller/inlineChatController.ts
@@ -286,6 +286,7 @@ export class InlineChatController {
                     }
                 }
                 if (chatEvent.error) {
+                    getLogger().error('generateAssistantResponse stream error: %s', chatEvent.error)
                     await this.rejectAllChanges(this.task, false)
                     void vscode.window.showErrorMessage(`Amazon Q: ${chatEvent.error.message}`)
                     await this.updateTaskAndLenses(this.task, TaskState.Complete)