fix for conflicts

Author: ashishrp-aws

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

@@ -759,7 +759,7 @@ export class ChatController {
                             const chatStream = new ChatStream(this.messenger, tabID, triggerID, toolUse, {
                                 requiresAcceptance: false,
                             })
-                            
+
                             if (tool.type === ToolType.FsWrite && toolUse.toolUseId) {
                                 const backup = await tool.tool.getBackup()
                                 session.setFsWriteBackup(toolUse.toolUseId, backup)
@@ -771,7 +771,11 @@ export class ChatController {
                                 return
                             }
 
-                            const output = await ToolUtils.invoke(tool, chatStream, cancellationToken)
+                            const output = await ToolUtils.invoke(
+                                tool,
+                                chatStream,
+                                ConversationTracker.getInstance().getTokenForTrigger(triggerID)
+                            )
                             ToolUtils.validateOutput(output)
 
                             toolResults.push({

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

@@ -10,7 +10,6 @@ import { ToolUse } from '@amzn/codewhisperer-streaming'
 import { CommandValidation } from './executeBash'
 import { Change } from 'diff'
 import { ConversationTracker } from '../storages/conversationTracker'
-import { ChatSession } from '../clients/chat/v0/chat'
 
 /**
  * A writable stream that feeds each chunk/line to the chat UI.