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

Author: grl-wang

packages/core/package.nls.json

@@ -459,6 +459,7 @@
     "AWS.amazonq.executeBash.reject": "Reject",
     "AWS.amazonq.chat.directive.pairProgrammingModeOn": "You are using **pair programming mode**: Q can now list files, preview code diffs and allow you to run shell commands.",
     "AWS.amazonq.chat.directive.pairProgrammingModeOff": "You turned off **pair programming mode**. Q will not include code diffs or run commands in the chat.",
+    "AWS.amazonq.chat.directive.permission.readAndList": "I need permission to read files and list directories outside the workspace.",
     "AWS.amazonq.chat.directive.runCommandToProceed": "Run the command to proceed.",
     "AWS.toolkit.lambda.walkthrough.quickpickTitle": "Application Builder Walkthrough",
     "AWS.toolkit.lambda.walkthrough.title": "Get started building your application",

packages/core/resources/css/amazonq-webview.css

@@ -130,6 +130,6 @@ div.mynah-card.padding-large {
 }
 
 .mynah-chat-wrapper {
-    padding: 0.75rem 1.25rem !important; /* 12px top/bottom, 20px left/right */
+    padding: 0.75rem 1.25rem;
     box-sizing: border-box;
 }

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

@@ -394,7 +394,7 @@ export class Connector extends BaseConnector {
                 if (answer.header) {
                     answer.header.status = {
                         icon: 'cancel' as MynahIconsType,
-                        text: 'Rejected',
+                        text: 'Change discarded',
                         status: 'error',
                     }
                     answer.header.buttons = []

packages/core/src/amazonq/webview/ui/tabs/generator.ts

@@ -56,6 +56,18 @@ export class TabDataGenerator {
         if (tabType === 'welcome') {
             return {}
         }
+        const programmerModeCard: ChatItem | undefined = {
+            type: ChatItemType.ANSWER,
+            title: 'NEW FEATURE',
+            header: {
+                icon: 'code-block',
+                iconStatus: 'primary',
+                body: '## Pair programmer mode',
+            },
+            fullWidth: true,
+            canBeDismissed: true,
+            body: 'Pair code with Amazon Q, your virtual pair programmer that can work alongside you autonomously making real-time code changes on your behalf. \n\n Switch off pair programmer mode to get read-only responses from Q.',
+        }
 
         const regionProfileCard: ChatItem | undefined =
             this.regionProfile === undefined
@@ -67,6 +79,15 @@ export class TabDataGenerator {
                       messageId: 'regionProfile',
                   }
 
+        const welcomeMessage = `Hi! I'm Amazon Q.
+
+You can ask me to:
+• Create new projects and files
+• Make changes to your codebase
+• Explain how to do things
+
+Enter \`/\` to view quick actions. Use \`@\` to add saved prompts, files, folders, or your entire workspace as context.`
+
         const tabData: MynahUIDataModel = {
             tabTitle: taskName ?? TabTypeDataMap[tabType].title,
             promptInputInfo:
@@ -76,10 +97,11 @@ export class TabDataGenerator {
             contextCommands: this.getContextCommands(tabType),
             chatItems: needWelcomeMessages
                 ? [
+                      ...(tabType === 'cwc' || tabType === 'unknown' ? [programmerModeCard] : []),
                       ...(regionProfileCard ? [regionProfileCard] : []),
                       {
                           type: ChatItemType.ANSWER,
-                          body: isSMUS ? qChatIntroMessageForSMUS : TabTypeDataMap[tabType].welcome,
+                          body: isSMUS ? qChatIntroMessageForSMUS : welcomeMessage,
                       },
                       {
                           type: ChatItemType.ANSWER,
@@ -88,7 +110,7 @@ export class TabDataGenerator {
                   ]
                 : [...(regionProfileCard ? [regionProfileCard] : [])],
             promptInputOptions:
-                tabType === 'cwc'
+                tabType === 'cwc' || tabType === 'unknown'
                     ? [
                           {
                               type: 'switch',

packages/core/src/amazonq/webview/ui/texts/constants.ts

@@ -25,7 +25,7 @@ export const uiComponentsTexts = {
     copyToClipboard: 'Copied to clipboard',
     noMoreTabsTooltip: 'You can only open ten conversation tabs at a time.',
     codeSuggestionWithReferenceTitle: 'Some suggestions contain code with references.',
-    spinnerText: 'Generating your answer...',
+    spinnerText: 'Thinking...',
     changeAccepted: 'Change accepted',
     changeRejected: 'Change rejected',
     acceptChange: 'Accept change',

packages/core/src/codewhispererChat/constants.ts

@@ -55,3 +55,14 @@ export const defaultContextLengths: ContextLengths = {
 }
 
 export const defaultStreamingResponseTimeoutInMs = 180_000
+
+export const ignoredDirectoriesAndFiles = [
+    // Dependency directories
+    'node_modules',
+    // Build outputs
+    'dist',
+    'build',
+    'out',
+    // OS specific files
+    '.DS_Store',
+]

packages/core/src/codewhispererChat/controllers/chat/controller.ts

@@ -1651,7 +1651,26 @@ export class ChatController {
 
             await this.messenger.sendAIResponse(response, session, tabID, triggerID, triggerPayload)
         } catch (e: any) {
-            this.telemetryHelper.recordMessageResponseError(triggerPayload, tabID, getHttpStatusCode(e) ?? 0)
+            let errorMessage: string
+            let requestID: string | undefined
+
+            if (e instanceof CodeWhispererStreamingServiceException) {
+                errorMessage = e.message
+                requestID = e.$metadata.requestId
+            } else {
+                errorMessage = 'Error is not CodeWhispererStreamingServiceException. '
+                if (e instanceof Error || e?.message) {
+                    errorMessage += `Error message is: ${e.message}`
+                }
+            }
+
+            this.telemetryHelper.recordMessageResponseError(
+                triggerPayload,
+                tabID,
+                getHttpStatusCode(e) ?? 0,
+                requestID,
+                errorMessage
+            )
             // clears session, record telemetry before this call
             this.processException(e, tabID)
         }

packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts

@@ -53,8 +53,6 @@ import {
     MynahIconsType,
     DetailedList,
     MynahUIDataModel,
-    MynahIcons,
-    Status,
 } from '@aws/mynah-ui'
 import { Database } from '../../../../shared/db/chatDb/chatDb'
 import { TabType } from '../../../../amazonq/webview/ui/storages/tabsStorage'
@@ -376,7 +374,11 @@ export class Messenger {
                                     changeList,
                                     explanation
                                 )
-                                await ToolUtils.queueDescription(tool, chatStream)
+                                await ToolUtils.queueDescription(
+                                    tool,
+                                    chatStream,
+                                    chatStream.validation.requiresAcceptance
+                                )
                                 if (session.messageIdToUpdate === undefined && tool.type === ToolType.FsRead) {
                                     // Store the first messageId in a chain of tool uses
                                     session.setMessageIdToUpdate(toolUse.toolUseId)
@@ -538,7 +540,13 @@ export class Messenger {
 
                 followUps = []
                 relatedSuggestions = []
-                this.telemetryHelper.recordMessageResponseError(triggerPayload, tabID, errorInfo.statusCode ?? 0)
+                this.telemetryHelper.recordMessageResponseError(
+                    triggerPayload,
+                    tabID,
+                    errorInfo.statusCode ?? 0,
+                    errorInfo.requestId,
+                    errorInfo.errorMessage
+                )
             })
             .finally(async () => {
                 if (session.sessionIdentifier && !this.isTriggerCancelled(triggerID)) {
@@ -748,13 +756,17 @@ export class Messenger {
         }
 
         // Handle read tool and list directory messages
-        if (toolUse?.name === ToolType.FsRead || toolUse?.name === ToolType.ListDirectory) {
+        if (
+            (toolUse?.name === ToolType.FsRead || toolUse?.name === ToolType.ListDirectory) &&
+            !validation.requiresAcceptance
+        ) {
             return this.sendReadAndListDirToolMessage(toolUse, session, tabID, triggerID, messageIdToUpdate)
         }
 
         // Handle file write tool, execute bash tool and bash command output log messages
         const buttons: ChatItemButton[] = []
         let header: ChatItemHeader | undefined = undefined
+        let messageID: string = toolUse?.toolUseId ?? ''
         if (toolUse?.name === ToolType.ExecuteBash && message.startsWith('```shell')) {
             if (validation.requiresAcceptance) {
                 const buttons: ChatItemButton[] = [
@@ -802,29 +814,20 @@ export class Messenger {
                 {
                     id: 'reject-code-diff',
                     status: 'clear',
-                    icon: 'cancel' as MynahIconsType,
+                    icon: 'revert' as MynahIconsType,
+                    text: 'Undo',
                 },
             ]
-            const status: {
-                icon?: MynahIcons | MynahIconsType
-                status?: {
-                    status?: Status
-                    icon?: MynahIcons | MynahIconsType
-                    text?: string
-                }
-            } = {
-                status: {
-                    text: 'Accepted',
-                    status: 'success',
-                },
-            }
             header = {
                 buttons,
-                ...status,
                 fileList,
             }
         } else if (toolUse?.name === ToolType.ListDirectory || toolUse?.name === ToolType.FsRead) {
             if (validation.requiresAcceptance) {
+                /** For Read and List Directory tools
+                 * requiredAcceptance = false, we use messageID = toolID and we keep on updating this messageID
+                 * requiredAcceptance = true, IDE sends messageID != toolID, some default value, as this overlaps with previous message. */
+                messageID = 'toolUse'
                 const buttons: ChatItemButton[] = [
                     {
                         id: 'confirm-tool-use',
@@ -840,7 +843,6 @@ export class Messenger {
                     },
                 ]
                 header = {
-                    body: 'shell',
                     buttons,
                 }
             }
@@ -859,7 +861,7 @@ export class Messenger {
                     followUpsHeader: undefined,
                     relatedSuggestions: undefined,
                     triggerID,
-                    messageID: toolUse?.toolUseId ?? '',
+                    messageID,
                     userIntent: undefined,
                     codeBlockLanguage: undefined,
                     contextList: undefined,

packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts

@@ -38,7 +38,7 @@ import { TriggerEvent, TriggerEventsStorage } from '../../storages/triggerEvents
 import globals from '../../../shared/extensionGlobals'
 import { getLogger } from '../../../shared/logger/logger'
 import { codeWhispererClient } from '../../../codewhisperer/client/codewhisperer'
-import { isAwsError } from '../../../shared/errors'
+import { getTelemetryReasonDesc, isAwsError } from '../../../shared/errors'
 import { ChatMessageInteractionType } from '../../../codewhisperer/client/codewhispereruserclient'
 import { supportedLanguagesList } from '../chat/chatRequest/converter'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
@@ -603,7 +603,13 @@ export class CWCTelemetryHelper {
         this.messageStorage.delete(tabID)
     }
 
-    public recordMessageResponseError(triggerPayload: TriggerPayload, tabID: string, responseCode: number) {
+    public recordMessageResponseError(
+        triggerPayload: TriggerPayload,
+        tabID: string,
+        responseCode: number,
+        requestID?: string,
+        errorReason?: string
+    ) {
         const triggerEvent = this.triggerEventsStorage.getLastTriggerEventByTabID(tabID)
 
         telemetry.amazonq_messageResponseError.emit({
@@ -617,8 +623,10 @@ export class CWCTelemetryHelper {
             cwsprChatActiveEditorImportCount: triggerPayload.codeQuery?.fullyQualifiedNames?.used?.length,
             cwsprChatResponseCode: responseCode,
             cwsprChatRequestLength: triggerPayload.message?.length ?? 0,
-            cwsprChatConversationType: 'Chat',
+            cwsprChatConversationType: triggerPayload.origin ? 'AgenticChat' : 'Chat',
             credentialStartUrl: AuthUtil.instance.startUrl,
+            requestId: requestID,
+            reasonDesc: getTelemetryReasonDesc(errorReason),
         })
     }
 

packages/core/src/codewhispererChat/tools/chatStream.ts

@@ -29,7 +29,7 @@ export class ChatStream extends Writable {
         private readonly messageIdToUpdate: string | undefined,
         // emitEvent decides to show the streaming message or read/list directory tool message to the user.
         private readonly emitEvent: boolean,
-        private readonly validation: CommandValidation,
+        readonly validation: CommandValidation,
         private readonly isReadorList: boolean,
         private readonly changeList?: Change[],
         private readonly explanation?: string,
@@ -45,7 +45,13 @@ export class ChatStream extends Writable {
         if (this.explanation) {
             this.messenger.sendDirectiveMessage(tabID, triggerID, this.explanation)
         }
-        if (validation.requiresAcceptance && this.toolUse?.name === 'executeBash') {
+        if (validation.requiresAcceptance && isReadorList) {
+            this.messenger.sendDirectiveMessage(
+                tabID,
+                triggerID,
+                i18n('AWS.amazonq.chat.directive.permission.readAndList')
+            )
+        } else if (validation.requiresAcceptance && this.toolUse?.name === 'executeBash') {
             this.messenger.sendDirectiveMessage(
                 tabID,
                 triggerID,