Merge branch 'feature/agentic-chat' into feature/agentic-chat

Author: ashishrp-aws

package-lock.json

@@ -0,0 +1,22 @@
+{
+	"date": "2025-04-11",
+	"version": "1.58.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "inline chat activates properly when using 'aws.experiments.amazonqChatLSP' feature flag"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: code blocks in responses flicker, switching tabs during answer streaming makes expand button disappear"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: tab bar buttons disappear when closing non-active tab"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: chat history list does not truncate markdown"
+		}
+	]
+}

packages/amazonq/.changes/1.58.0.json

@@ -1,3 +1,10 @@
+## 1.58.0 2025-04-11
+
+- **Bug Fix** inline chat activates properly when using 'aws.experiments.amazonqChatLSP' feature flag
+- **Bug Fix** Amazon Q Chat: code blocks in responses flicker, switching tabs during answer streaming makes expand button disappear
+- **Bug Fix** Amazon Q Chat: tab bar buttons disappear when closing non-active tab
+- **Bug Fix** Amazon Q Chat: chat history list does not truncate markdown
+
 ## 1.57.0 2025-04-10
 
 - **Bug Fix** Fix bug where generate fix does not work

packages/amazonq/.changes/next-release/Bug Fix-45379b8c-1faa-4b04-951a-26e234c6dc03.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.58.0-SNAPSHOT",
+    "version": "1.59.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/.changes/next-release/Bug Fix-9d840c3e-80a2-45a0-961f-8441b2339860.json

@@ -128,7 +128,3 @@ body .mynah-card-body h4 {
 div.mynah-card.padding-large {
     padding: var(--mynah-sizing-4) var(--mynah-sizing-3);
 }
-
-div.mynah-chat-items-container .mynah-chat-item-card.no-padding > .mynah-card {
-    padding: 0;
-}

packages/amazonq/.changes/next-release/Bug Fix-e8dc0bd0-b232-429c-b16a-f3bf993b19b4.json

@@ -179,6 +179,33 @@ export class Connector extends BaseConnector {
         }
     }
 
+    private processToolMessage = async (messageData: any): Promise<void> => {
+        if (this.onChatAnswerUpdated === undefined) {
+            return
+        }
+        const answer: CWCChatItem = {
+            type: messageData.messageType,
+            messageId: messageData.messageID ?? messageData.triggerID,
+            body: messageData.message,
+            followUp: messageData.followUps,
+            canBeVoted: messageData.canBeVoted ?? false,
+            codeReference: messageData.codeReference,
+            userIntent: messageData.contextList,
+            codeBlockLanguage: messageData.codeBlockLanguage,
+            contextList: messageData.contextList,
+            title: messageData.title,
+            buttons: messageData.buttons,
+            fileList: messageData.fileList,
+            header: messageData.header ?? undefined,
+            padding: messageData.padding ?? undefined,
+            fullWidth: messageData.fullWidth ?? undefined,
+            codeBlockActions: messageData.codeBlockActions ?? undefined,
+            rootFolderTitle: messageData.rootFolderTitle,
+        }
+        this.onChatAnswerUpdated(messageData.tabID, answer)
+        return
+    }
+
     private storeChatItem(tabId: string, messageId: string, item: ChatItem): void {
         if (!this.chatItems.has(tabId)) {
             this.chatItems.set(tabId, new Map())
@@ -238,6 +265,11 @@ export class Connector extends BaseConnector {
             return
         }
 
+        if (messageData.type === 'toolMessage') {
+            await this.processToolMessage(messageData)
+            return
+        }
+
         if (messageData.type === 'editorContextCommandMessage') {
             await this.processEditorContextCommandMessage(messageData)
             return
@@ -370,45 +402,43 @@ export class Connector extends BaseConnector {
                 }
                 break
             case 'run-shell-command':
-                answer.header = {
-                    body: 'shell',
-                    status: {
+                if (answer.header) {
+                    answer.header.status = {
                         icon: 'ok' as MynahIconsType,
                         text: 'Accepted',
                         status: 'success',
-                    },
+                    }
+                    answer.header.buttons = []
                 }
                 break
             case 'reject-shell-command':
-                answer.header = {
-                    body: 'shell',
-                    status: {
+                if (answer.header) {
+                    answer.header.status = {
                         icon: 'cancel' as MynahIconsType,
                         text: 'Rejected',
                         status: 'error',
-                    },
+                    }
+                    answer.header.buttons = []
                 }
                 break
             case 'confirm-tool-use':
-                answer.header = {
-                    icon: 'shell' as MynahIconsType,
-                    body: 'shell',
-                    status: {
+                if (answer.header) {
+                    answer.header.status = {
                         icon: 'ok' as MynahIconsType,
                         text: 'Accepted',
                         status: 'success',
-                    },
+                    }
+                    answer.header.buttons = []
                 }
                 break
             case 'reject-tool-use':
-                answer.header = {
-                    icon: 'shell' as MynahIconsType,
-                    body: 'shell',
-                    status: {
+                if (answer.header) {
+                    answer.header.status = {
                         icon: 'cancel' as MynahIconsType,
                         text: 'Rejected',
                         status: 'error',
-                    },
+                    }
+                    answer.header.buttons = []
                 }
                 break
             default: