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

Author: laileni-aws

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

@@ -125,6 +125,7 @@ export class Connector extends BaseConnector {
                 padding: messageData.padding ?? undefined,
                 fullWidth: messageData.fullWidth ?? undefined,
                 codeBlockActions: messageData.codeBlockActions ?? undefined,
+                rootFolderTitle: messageData.rootFolderTitle ?? undefined,
             }
 
             if (messageData.relatedSuggestions !== undefined) {
@@ -288,14 +289,15 @@ export class Connector extends BaseConnector {
         }
 
         if (messageData.type === 'asyncEventProgressMessage') {
-            const enableStopAction = true
+            const enableStopAction = false
+            const isPromptInputDisabled = true
             this.onAsyncEventProgress(
                 messageData.tabID,
                 messageData.inProgress,
                 messageData.message ?? undefined,
                 messageData.messageId ?? undefined,
                 enableStopAction,
-                false
+                isPromptInputDisabled
             )
             return
         }

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

@@ -66,6 +66,7 @@ export interface CWCChatItem extends ChatItem {
     codeBlockLanguage?: string
     contextList?: Context[]
     title?: string
+    rootFolderTitle?: string
 }
 
 export interface Context {

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

@@ -443,7 +443,7 @@ export const createMynahUI = (
             }
 
             if (item.contextList !== undefined && item.contextList.length > 0) {
-                item.header = createFileListHeader(item.contextList, item.title)
+                item.header = createFileListHeader(item.contextList, item.rootFolderTitle)
             }
 
             if (

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

@@ -1505,7 +1505,7 @@ export class ChatController {
         let response: MessengerResponseType | undefined = undefined
         session.createNewTokenSource()
         try {
-            if (!session.context) {
+            if (!session.context && triggerPayload.context.length) {
                 // Only show context for the first message in the loop
                 this.messenger.sendContextMessage(tabID, triggerID, triggerPayload.documentReferences)
                 session.setContext(triggerPayload.context)

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

@@ -134,7 +134,7 @@ export class Messenger {
             new ChatMessage(
                 {
                     message: '',
-                    messageType: 'answer',
+                    messageType: 'answer-stream',
                     followUps: undefined,
                     followUpsHeader: undefined,
                     relatedSuggestions: undefined,
@@ -143,7 +143,8 @@ export class Messenger {
                     userIntent: undefined,
                     codeBlockLanguage: undefined,
                     contextList: mergedRelevantDocuments,
-                    title: 'Context',
+                    title: '',
+                    rootFolderTitle: 'Context',
                     buttons: undefined,
                     fileList: undefined,
                     canBeVoted: false,
@@ -496,11 +497,16 @@ export class Messenger {
                     )
                 }
 
+                const agenticLoopEnded = !eventCounts.has('toolUseEvent')
+                if (agenticLoopEnded) {
+                    // Reset context for the next request
+                    session.setContext(undefined)
+                }
                 this.dispatcher.sendChatMessage(
                     new ChatMessage(
                         {
                             message: undefined,
-                            messageType: 'answer',
+                            messageType: agenticLoopEnded ? 'answer' : 'answer-stream',
                             followUps: followUps,
                             followUpsHeader: undefined,
                             relatedSuggestions: undefined,
@@ -524,11 +530,6 @@ export class Messenger {
                             toolUse.input !== '' && { toolUses: [{ ...toolUse }] }),
                     },
                 })
-                const agenticLoopEnded = !eventCounts.has('toolUseEvent')
-                if (agenticLoopEnded) {
-                    // Reset context for the next request
-                    session.setContext(undefined)
-                }
 
                 getLogger().info(
                     `All events received. requestId=%s counts=%s`,
@@ -850,6 +851,20 @@ export class Messenger {
     }
 
     private showChatExceptionMessage(e: ChatException, tabID: string, requestID: string | undefined) {
+        const title = 'An error occurred while processing your request.'
+        // TODO: once the server sends the correct exception back, fix this
+        if (e.statusCode && e.statusCode === '500') {
+            // Send throttling message
+            this.dispatcher.sendErrorMessage(
+                new ErrorMessage(
+                    title,
+                    'We are experiencing heavy traffic, please try again shortly.'.trimEnd().trimStart(),
+                    tabID
+                )
+            )
+            return
+        }
+
         let message = 'This error is reported to the team automatically. We will attempt to fix it as soon as possible.'
         if (e.errorMessage !== undefined) {
             message += `\n\nDetails: ${e.errorMessage}`
@@ -865,9 +880,7 @@ export class Messenger {
             message += `\n\nRequest ID: ${requestID}`
         }
 
-        this.dispatcher.sendErrorMessage(
-            new ErrorMessage('An error occurred while processing your request.', message.trimEnd().trimStart(), tabID)
-        )
+        this.dispatcher.sendErrorMessage(new ErrorMessage(title, message.trimEnd().trimStart(), tabID))
     }
 
     public sendOpenSettingsMessage(triggerId: string, tabID: string) {

packages/core/src/codewhispererChat/view/connector/connector.ts

@@ -352,6 +352,7 @@ export interface ChatMessageProps {
     readonly fullWidth?: boolean
     readonly padding?: boolean
     readonly codeBlockActions?: CodeBlockActions | null
+    readonly rootFolderTitle?: string
 }
 
 export class ChatMessage extends UiMessage {
@@ -375,6 +376,7 @@ export class ChatMessage extends UiMessage {
     readonly padding?: boolean
     readonly codeBlockActions?: CodeBlockActions | null
     readonly canBeVoted?: boolean = false
+    readonly rootFolderTitle?: string
     override type = 'chatMessage'
 
     constructor(props: ChatMessageProps, tabID: string) {
@@ -398,6 +400,7 @@ export class ChatMessage extends UiMessage {
         this.fullWidth = props.fullWidth
         this.padding = props.padding
         this.codeBlockActions = props.codeBlockActions
+        this.rootFolderTitle = props.rootFolderTitle
     }
 }