fixes for merge conflicts

Author: ashishrp-aws

packages/core/src/codewhispererChat/clients/chat/v0/chat.ts

@@ -17,6 +17,7 @@ import { UserWrittenCodeTracker } from '../../../../codewhisperer/tracker/userWr
 import { DocumentReference, PromptMessage } from '../../../controllers/chat/model'
 import { FsWriteBackup } from '../../../../codewhispererChat/tools/fsWrite'
 import { randomUUID } from '../../../../shared/crypto'
+import { getLogger } from '../../../../shared'
 
 export type ToolUseWithError = {
     toolUse: ToolUse

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

@@ -1635,15 +1635,7 @@ export class ChatController {
                 return
             }
 
-            this.cancelTokenSource = new vscode.CancellationTokenSource()
-            await this.messenger.sendAIResponse(
-                response,
-                session,
-                tabID,
-                triggerID,
-                triggerPayload,
-                this.cancelTokenSource.token
-            )
+            await this.messenger.sendAIResponse(response, session, tabID, triggerID, triggerPayload)
         } catch (e: any) {
             this.telemetryHelper.recordMessageResponseError(triggerPayload, tabID, getHttpStatusCode(e) ?? 0)
             // clears session, record telemetry before this call

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

@@ -200,8 +200,7 @@ export class Messenger {
         session: ChatSession,
         tabID: string,
         triggerID: string,
-        triggerPayload: TriggerPayload,
-        cancelToken: vscode.CancellationToken
+        triggerPayload: TriggerPayload
     ) {
         let message = ''
         const messageID = response.$metadata.requestId ?? ''
@@ -519,7 +518,7 @@ export class Messenger {
                 this.telemetryHelper.recordMessageResponseError(triggerPayload, tabID, errorInfo.statusCode ?? 0)
             })
             .finally(async () => {
-                if (session.sessionIdentifier) {
+                if (session.sessionIdentifier && !this.isTriggerCancelled(triggerID)) {
                     this.chatHistoryDb.addMessage(tabID, 'cwc', session.sessionIdentifier, {
                         body: message,
                         type: 'answer' as any,
@@ -724,7 +723,7 @@ export class Messenger {
         if (this.isTriggerCancelled(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)