fix: hide non-user-generated messages when reloading history

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

@@ -3,7 +3,7 @@
  * Will be deleted or merged.
  */
 
 import * as path from 'path'
 import {
     ChatTriggerType,
     CodeWhispererStreamingServiceException,
@@ -524,6 +524,7 @@
         let currentRequestInput = { ...initialRequestInput }
         let finalResult: Result<AgenticChatResultWithMetadata, string> | null = null
         let iterationCount = 0
+        let shouldDisplayMessage = true
         metric.recordStart()
 
         while (iterationCount < maxAgentLoopIterations) {
@@ -574,8 +575,10 @@
                     userIntent: currentMessage.userInputMessage?.userIntent,
                     origin: currentMessage.userInputMessage?.origin,
                     userInputMessageContext: currentMessage.userInputMessage?.userInputMessageContext,
+                    shouldDisplayMessage: shouldDisplayMessage,
                 })
             }
+            shouldDisplayMessage = true
 
             // Phase 4: Response Processing
             const result = await this.#processGenerateAssistantResponseResponseWithTimeout(
@@ -620,6 +623,7 @@
                             name: result.data!.toolUses[k].name,
                             input: result.data!.toolUses[k].input,
                         })),
+                    shouldDisplayMessage: shouldDisplayMessage,
                 })
             } else {
                 this.#features.logging.warn('No ChatResult body in response, skipping adding to history')
@@ -641,6 +645,7 @@
                 toolResults = await this.#processToolUses(pendingToolUses, chatResultStream, session, tabId, token)
                 if (toolResults.some(toolResult => this.#shouldSendBackErrorContent(toolResult))) {
                     content = 'There was an error processing one or more tool uses. Try again, do not apologize.'
+                    shouldDisplayMessage = false
                 }
                 metric.setDimension('cwsprChatConversationType', 'AgenticChatWithToolUse')
             } else {
@@ -653,6 +658,7 @@
                 if (result.error.startsWith('ToolUse input is invalid JSON:')) {
                     content =
                         'Your toolUse input is incomplete because it is too large. Break this task down into multiple tool uses with smaller input. Do not apologize.'
+                    shouldDisplayMessage = false
                 }
             }
             currentRequestInput = this.#updateRequestInputWithToolResults(currentRequestInput, toolResults, content)

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tabBarController.ts

@@ -218,7 +218,7 @@ export class TabBarController {
     async restoreTab(selectedTab?: Tab | null) {
         if (selectedTab) {
             const messages = selectedTab.conversations.flatMap((conv: Conversation) =>
-                conv.messages.flatMap(msg => messageToChatMessage(msg))
+                conv.messages.filter(msg => msg.shouldDisplayMessage != false).flatMap(msg => messageToChatMessage(msg))
             )
 
             const { tabId } = await this.#features.chat.openTab({ newTabOptions: { data: { messages } } })

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/chatDb/chatDb.ts

@@ -15,8 +15,8 @@
     TabType,
     updateOrCreateConversation,
 } from './util'
 import * as crypto from 'crypto'
 import * as path from 'path'
 import { Features } from '@aws/language-server-runtimes/server-interface/server'
 import { ConversationItemGroup } from '@aws/language-server-runtimes/protocol'
 import { ChatMessage, ToolResultStatus } from '@amzn/codewhisperer-streaming'
@@ -313,8 +313,9 @@
 
             const tabData = historyId ? tabCollection.findOne({ historyId }) : undefined
             const tabTitle =
-                (message.type === 'prompt' && message.body.trim().length > 0 ? message.body : tabData?.title) ||
-                'Amazon Q Chat'
+                (message.type === 'prompt' && message.shouldDisplayMessage !== false && message.body.trim().length > 0
+                    ? message.body
+                    : tabData?.title) || 'Amazon Q Chat'
             message = this.formatChatHistoryMessage(message)
             if (tabData) {
                 this.#features.logging.log(`Updating existing tab with historyId=${historyId}`)