3a8175cdd5
# Conflicts: # src/core/assistant-message/presentAssistantMessage.ts # src/core/prompts/tools/native-tools/index.ts # src/core/task/Task.ts # src/core/tools/codebaseSearchTool.ts # src/core/tools/generateImageTool.ts # src/core/webview/webviewMessageHandler.ts # src/shared/ExtensionMessage.ts # src/shared/WebviewMessage.ts # src/shared/tools.ts