Merge pull request #5114 from Kilo-Org/christiaan/kilocode_change

Remove unnecessary kilocode_change

src/core/task/Task.ts

@@ -141,7 +141,7 @@ import { MessageQueueService } from "../message-queue/MessageQueueService"
 
 import { isAnyRecognizedKiloCodeError, isPaymentRequiredError } from "../../shared/kilocode/errorUtils"
 import { getAppUrl } from "@roo-code/types"
-import { mergeApiMessages, addOrMergeUserContent } from "./kilocode"
+import { addOrMergeUserContent } from "./kilocode"
 import { AutoApprovalHandler, checkAutoApproval } from "../auto-approval"
 import { MessageManager } from "../message-manager"
 import { validateAndFixToolResultIds } from "./validateToolResultIds"
@@ -865,18 +865,6 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			const reasoningSummary = handler.getSummary?.()
 			const reasoningDetails = handler.getReasoningDetails?.()
 
-			// kilocode_change start: prevent consecutive same-role messages, this happens when returning from subtask
-			const lastMessage = this.apiConversationHistory.at(-1)
-			if (lastMessage && lastMessage.role === message.role) {
-				this.apiConversationHistory[this.apiConversationHistory.length - 1] = mergeApiMessages(
-					lastMessage,
-					message,
-				)
-				await this.saveApiConversationHistory()
-				return
-			}
-			// kilocode_change end
-
 			// Start from the original assistant message
 			const messageWithTs: any = {
 				...message,