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

Author: ashishrp-aws

package-lock.json

@@ -41,7 +41,7 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.312",
+        "@aws-toolkits/telemetry": "^1.0.313",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

package.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Chat: code blocks in responses flicker, switching tabs during answer streaming makes expand button disappear"
+}

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

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Chat: tab bar buttons disappear when closing non-active tab"
+}

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

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q Chat: chat history list does not truncate markdown"
+}

packages/amazonq/.changes/next-release/Bug Fix-ee90e4d2-aa78-403f-8b58-1464c6419778.json

@@ -525,7 +525,7 @@
         "@aws-sdk/s3-request-presigner": "<3.731.0",
         "@aws-sdk/smithy-client": "<3.731.0",
         "@aws-sdk/util-arn-parser": "<3.731.0",
-        "@aws/mynah-ui": "^4.30.0",
+        "@aws/mynah-ui": "^4.30.1",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^5.0.1",

packages/core/package.json

@@ -116,8 +116,19 @@ body.vscode-high-contrast:not(.vscode-high-contrast-light) {
 
 body .mynah-card-body h1 {
     --mynah-line-height: 1.5rem;
+    font-size: 1.25em;
+}
+
+body .mynah-card-body h2,
+body .mynah-card-body h3,
+body .mynah-card-body h4 {
+    font-size: 1em;
 }
 
 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/core/resources/css/amazonq-webview.css

@@ -179,33 +179,6 @@ 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())
@@ -265,11 +238,6 @@ export class Connector extends BaseConnector {
             return
         }
 
-        if (messageData.type === 'toolMessage') {
-            await this.processToolMessage(messageData)
-            return
-        }
-
         if (messageData.type === 'editorContextCommandMessage') {
             await this.processEditorContextCommandMessage(messageData)
             return

packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts

@@ -78,7 +78,7 @@ export interface ConnectorProps {
     sendMessageToExtension: (message: ExtensionMessage) => void
     onMessageReceived?: (tabID: string, messageData: any, needToShowAPIDocsTab: boolean) => void
     onRunTestMessageReceived?: (tabID: string, showRunTestMessage: boolean) => void
-    onChatAnswerUpdated?: (tabID: string, message: CWCChatItem) => void
+    onChatAnswerUpdated?: (tabID: string, message: ChatItem) => void
     onChatAnswerReceived?: (tabID: string, message: ChatItem, messageData: any) => void
     onWelcomeFollowUpClicked: (tabID: string, welcomeFollowUpType: WelcomeFollowupType) => void
     onAsyncEventProgress: (tabID: string, inProgress: boolean, message: string | undefined) => void

packages/core/src/amazonq/webview/ui/connector.ts

@@ -100,41 +100,6 @@ export const createMynahUI = (
         welcomeCount += 1
     }
 
-    /**
-     * Creates a file list header from context list
-     * @param contextList List of file contexts
-     * @param rootFolderTitle Title for the root folder
-     * @returns Header object with file list
-     */
-    const createFileListHeader = (contextList: any[], rootFolderTitle?: string) => {
-        return {
-            fileList: {
-                fileTreeTitle: '',
-                filePaths: contextList.map((file) => file.relativeFilePath),
-                rootFolderTitle: rootFolderTitle,
-                flatList: true,
-                collapsed: true,
-                hideFileCount: true,
-                details: Object.fromEntries(
-                    contextList.map((file) => [
-                        file.relativeFilePath,
-                        {
-                            label: file.lineRanges
-                                .map((range: { first: number; second: number }) =>
-                                    range.first === -1 || range.second === -1
-                                        ? ''
-                                        : `line ${range.first} - ${range.second}`
-                                )
-                                .join(', '),
-                            description: file.relativeFilePath,
-                            clickable: true,
-                        },
-                    ])
-                ),
-            },
-        }
-    }
-
     // Adding the first tab as CWC tab
     tabsStorage.addTab({
         id: 'tab-1',
@@ -381,11 +346,8 @@ export const createMynahUI = (
         sendMessageToExtension: (message) => {
             ideApi.postMessage(message)
         },
-        onChatAnswerUpdated: (tabID: string, item: CWCChatItem) => {
+        onChatAnswerUpdated: (tabID: string, item: ChatItem) => {
             if (item.messageId !== undefined) {
-                if (item.contextList !== undefined && item.contextList.length > 0) {
-                    item.header = createFileListHeader(item.contextList, item.rootFolderTitle)
-                }
                 mynahUI.updateChatAnswerWithMessageId(tabID, item.messageId, {
                     ...(item.body !== undefined ? { body: item.body } : {}),
                     ...(item.buttons !== undefined ? { buttons: item.buttons } : {}),
@@ -447,7 +409,32 @@ export const createMynahUI = (
             }
 
             if (item.contextList !== undefined && item.contextList.length > 0) {
-                item.header = createFileListHeader(item.contextList, item.rootFolderTitle)
+                item.header = {
+                    fileList: {
+                        fileTreeTitle: '',
+                        filePaths: item.contextList.map((file) => file.relativeFilePath),
+                        rootFolderTitle: item.rootFolderTitle,
+                        flatList: true,
+                        collapsed: true,
+                        hideFileCount: true,
+                        details: Object.fromEntries(
+                            item.contextList.map((file) => [
+                                file.relativeFilePath,
+                                {
+                                    label: file.lineRanges
+                                        .map((range) =>
+                                            range.first === -1 || range.second === -1
+                                                ? ''
+                                                : `line ${range.first} - ${range.second}`
+                                        )
+                                        .join(', '),
+                                    description: file.relativeFilePath,
+                                    clickable: true,
+                                },
+                            ])
+                        ),
+                    },
+                }
             }
 
             if (