fix for merge conflicts

Author: ashishrp-aws

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

@@ -708,7 +708,7 @@ export class ChatController {
                         customization: getSelectedCustomization(),
                         toolResults: toolResults,
                         origin: Origin.IDE,
-                        chatHistory: this.chatHistoryManager.getHistory(),
+                        chatHistory: this.chatHistoryStorage.getHistory(tabID).getHistory(),
                         context: session.context ?? [],
                         relevantTextDocuments: [],
                         additionalContents: [],
@@ -1064,146 +1064,6 @@ export class ChatController {
         }
     }
 
-    private async processToolUseMessage(message: CustomFormActionMessage) {
-        const tabID = message.tabID
-        if (!tabID) {
-            return
-        }
-        this.editorContextExtractor
-            .extractContextForTrigger('ChatMessage')
-            .then(async (context) => {
-                const triggerID = randomUUID()
-                this.triggerEventsStorage.addTriggerEvent({
-                    id: triggerID,
-                    tabID: message.tabID,
-                    message: undefined,
-                    type: 'chat_message',
-                    context,
-                })
-                const session = this.sessionStorage.getSession(tabID)
-                const toolUse = session.toolUse
-                if (!toolUse || !toolUse.input) {
-                    return
-                }
-                session.setToolUse(undefined)
-
-                const toolResults: ToolResult[] = []
-
-                const result = ToolUtils.tryFromToolUse(toolUse)
-                if ('type' in result) {
-                    const tool: Tool = result
-
-                    try {
-                        await ToolUtils.validate(tool)
-
-                        const chatStream = new ChatStream(this.messenger, tabID, triggerID, toolUse.toolUseId)
-                        const output = await ToolUtils.invoke(tool, chatStream)
-
-                        toolResults.push({
-                            content: [
-                                output.output.kind === OutputKind.Text
-                                    ? { text: output.output.content }
-                                    : { json: output.output.content },
-                            ],
-                            toolUseId: toolUse.toolUseId,
-                            status: ToolResultStatus.SUCCESS,
-                        })
-                    } catch (e: any) {
-                        toolResults.push({
-                            content: [{ text: e.message }],
-                            toolUseId: toolUse.toolUseId,
-                            status: ToolResultStatus.ERROR,
-                        })
-                    }
-                } else {
-                    const toolResult: ToolResult = result
-                    toolResults.push(toolResult)
-                }
-
-                await this.generateResponse(
-                    {
-                        message: '',
-                        trigger: ChatTriggerType.ChatMessage,
-                        query: undefined,
-                        codeSelection: context?.focusAreaContext?.selectionInsideExtendedCodeBlock,
-                        fileText: context?.focusAreaContext?.extendedCodeBlock ?? '',
-                        fileLanguage: context?.activeFileContext?.fileLanguage,
-                        filePath: context?.activeFileContext?.filePath,
-                        matchPolicy: context?.activeFileContext?.matchPolicy,
-                        codeQuery: context?.focusAreaContext?.names,
-                        userIntent: undefined,
-                        customization: getSelectedCustomization(),
-                        toolResults: toolResults,
-                        origin: Origin.IDE,
-                        chatHistory: this.chatHistoryStorage.getHistory(tabID).getHistory(),
-                        context: [],
-                        relevantTextDocuments: [],
-                        additionalContents: [],
-                        documentReferences: [],
-                        useRelevantDocuments: false,
-                        contextLengths: {
-                            ...defaultContextLengths,
-                        },
-                    },
-                    triggerID
-                )
-            })
-            .catch((e) => {
-                this.processException(e, tabID)
-            })
-    }
-
-    private async processPromptMessageAsNewThread(message: PromptMessage) {
-        const session = this.sessionStorage.getSession(message.tabID)
-        session.clearListOfReadFiles()
-        session.setShowDiffOnFileWrite(false)
-        this.editorContextExtractor
-            .extractContextForTrigger('ChatMessage')
-            .then(async (context) => {
-                const triggerID = randomUUID()
-                this.triggerEventsStorage.addTriggerEvent({
-                    id: triggerID,
-                    tabID: message.tabID,
-                    message: message.message,
-                    type: 'chat_message',
-                    context,
-                })
-
-                // Save the context for the agentic loop
-                session.setContext(message.context)
-
-                await this.generateResponse(
-                    {
-                        message: message.message ?? '',
-                        trigger: ChatTriggerType.ChatMessage,
-                        query: message.message,
-                        codeSelection: context?.focusAreaContext?.selectionInsideExtendedCodeBlock,
-                        fileText: context?.focusAreaContext?.extendedCodeBlock ?? '',
-                        fileLanguage: context?.activeFileContext?.fileLanguage,
-                        filePath: context?.activeFileContext?.filePath,
-                        matchPolicy: context?.activeFileContext?.matchPolicy,
-                        codeQuery: context?.focusAreaContext?.names,
-                        userIntent: this.userIntentRecognizer.getFromPromptChatMessage(message),
-                        customization: getSelectedCustomization(),
-                        chatHistory: this.chatHistoryStorage.getHistory(message.tabID).getHistory(),
-                        origin: Origin.IDE,
-                        context: message.context ?? [],
-                        relevantTextDocuments: [],
-                        additionalContents: [],
-                        documentReferences: [],
-                        useRelevantDocuments: false,
-                        contextLengths: {
-                            ...defaultContextLengths,
-                        },
-                    },
-                    triggerID
-                )
-            })
-            .catch((e) => {
-                this.processException(e, message.tabID)
-            })
-    }
-
     private async generateStaticTextResponse(responseType: StaticTextResponseType, triggerID: string) {
         // Loop while we waiting for tabID to be set
         const triggerEvent = this.triggerEventsStorage.getTriggerEvent(triggerID)