Merge conflicts cleanup

Author: ashishrp-aws

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

@@ -704,7 +704,6 @@ export const createMynahUI = (
         onTabChange: connector.onTabChange,
         // TODO: update mynah-ui this type doesn't seem correct https://github.com/aws/mynah-ui/blob/3777a39eb534a91fd6b99d6cf421ce78ee5c7526/src/main.ts#L372
         onStopChatResponse: (tabID: string) => {
-            console.log('stop response started')
             mynahUI.updateStore(tabID, {
                 loadingChat: false,
                 promptInputDisabledState: false,
@@ -756,8 +755,6 @@ export const createMynahUI = (
                 return
             }
 
-            console.log('prompt entered: ', prompt)
-
             /**
              * Update the tab title if coming from the welcome page
              * non cwc panels will have this updated automatically

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

@@ -408,7 +408,6 @@ export class ChatController {
     private async processStopResponseMessage(message: StopResponseMessage) {
         const session = this.sessionStorage.getSession(message.tabID)
         session.tokenSource.cancel()
-        console.log('process stop has been triggered')
         session.setAgenticLoopInProgress(false)
         session.setToolUseWithError(undefined)
 
@@ -700,7 +699,6 @@ export class ChatController {
         this.editorContextExtractor
             .extractContextForTrigger('ChatMessage')
             .then(async (context) => {
-                console.log('message in controller for tool use:', message)
                 const triggerID = message.triggerId
 
                 // Check if this trigger has already been cancelled
@@ -726,7 +724,6 @@ export class ChatController {
 
                 const toolUseWithError = session.toolUseWithError
                 if (!toolUseWithError || !toolUseWithError.toolUse || !toolUseWithError.toolUse.input) {
-                    // Turn off AgentLoop flag if there's no tool use
                     return
                 }
                 session.setToolUseWithError(undefined)
@@ -762,7 +759,7 @@ export class ChatController {
                                     requiresAcceptance: false,
                                 }
                             )
-                            
+
                             if (tool.type === ToolType.FsWrite && toolUse.toolUseId) {
                                 const backup = await tool.tool.getBackup()
                                 session.setFsWriteBackup(toolUse.toolUseId, backup)

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

@@ -281,7 +281,7 @@ export class Messenger {
                         let toolError = undefined
                         try {
                             if (this.isTriggerCancelled(triggerID)) {
-                              return
+                                return
                             }
                             toolUse.toolUseId = cwChatEvent.toolUseEvent.toolUseId ?? ''
                             toolUse.name = cwChatEvent.toolUseEvent.name ?? ''
@@ -530,17 +530,25 @@ export class Messenger {
                         )
                     )
                 }
-          
+
                 // Check if this trigger has been cancelled before sending final message
                 if (this.isTriggerCancelled(triggerID)) {
                     return
                 }
-          
+
+                if (!eventCounts.has('toolUseEvent')) {
+                    session.setAgenticLoopInProgress(false)
+                    session.setContext(undefined)
+
+                    // Mark the trigger as completed when the agentic loop ends
+                    conversationTracker.markTriggerCompleted(triggerID)
+                }
+
                 this.dispatcher.sendChatMessage(
                     new ChatMessage(
                         {
                             message: undefined,
-                            messageType: agenticLoopEnded ? 'answer' : 'answer-stream',
+                            messageType: !session.agenticLoopInProgress ? 'answer' : 'answer-stream',
                             followUps: followUps,
                             followUpsHeader: undefined,
                             relatedSuggestions: undefined,
@@ -566,13 +574,6 @@ export class Messenger {
                         },
                     })
                 }
-                if (!eventCounts.has('toolUseEvent')) {
-                    session.setAgenticLoopInProgress(false)
-                    session.setContext(undefined)
-
-                    // Mark the trigger as completed when the agentic loop ends
-                    conversationTracker.markTriggerCompleted(triggerID)
-                }
 
                 getLogger().info(
                     `All events received. requestId=%s counts=%s`,
@@ -687,7 +688,7 @@ export class Messenger {
             getLogger().debug(`Tool log sending cancelled for tabID: ${tabID}, triggerID: ${triggerID}`)
             return
         }
-          
+
         // Handle read tool and list directory messages
         if (toolUse?.name === ToolType.FsRead || toolUse?.name === ToolType.ListDirectory) {
             return this.sendReadAndListDirToolMessage(toolUse, session, tabID, triggerID, messageIdToUpdate)

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

@@ -4,6 +4,7 @@
  */
 
 import { Writable } from 'stream'
+import { getLogger } from '../../shared/logger/logger'
 import { Messenger } from '../controllers/chat/messenger/messenger'
 import { ToolUse } from '@amzn/codewhisperer-streaming'
 import { CommandValidation } from './executeBash'
@@ -28,7 +29,8 @@ export class ChatStream extends Writable {
         // emitEvent decides to show the streaming message or read/list directory tool message to the user.
         private readonly emitEvent: boolean,
         private readonly validation: CommandValidation,
-        private readonly changeList?: Change[]
+        private readonly changeList?: Change[],
+        private readonly logger = getLogger('chatStream')
     ) {
         super()
         this.logger.debug(
@@ -52,6 +54,7 @@ export class ChatStream extends Writable {
 
         const text = chunk.toString()
         this.accumulatedLogs += text
+        this.logger.debug(`ChatStream received chunk: ${text}, emitEvent to mynahUI: ${this.emitEvent}`)
         this.messenger.sendPartialToolLog(
             this.accumulatedLogs,
             this.tabID,