fix(chat): keep nearby batching boundaries in sync

Author: easonliang28

webview-ui/src/components/chat/ChatView.tsx

@@ -1281,17 +1281,12 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 
 		// Messages that can be safely skipped over when batching tool asks.
 		// These are low-information or invisible messages that don't affect semantics:
-		// - api_req_started / api_req_finished (API request metadata rows)
+		// - api_req_started (API request metadata row)
 		// - empty text rows (partial streaming with no visible content)
 		// - reasoning rows (hidden from user by default)
 		const isIgnorableBetweenTargets = (msg: ClineMessage): boolean => {
 			if (msg.type !== "say") return false
-			return (
-				msg.say === "api_req_started" ||
-				msg.say === "api_req_finished" ||
-				(msg.say === "text" && !msg.text?.trim()) ||
-				msg.say === "reasoning"
-			)
+			return msg.say === "api_req_started" || (msg.say === "text" && !msg.text?.trim()) || msg.say === "reasoning"
 		}
 
 		// Semantic boundaries that stop batching. When we hit one of these,
@@ -1316,8 +1311,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 		}
 
 		// Consolidate tool asks into batches, allowing ignorable messages between targets.
-		// Unlike batchConsecutive which only merges truly adjacent items, batchNearby
-		// skips over api_req_started/finished, empty text rows, and reasoning rows that
+		// batchNearby skips over api_req_started, empty text rows, and reasoning rows that
 		// models like qwen insert between tool calls during streaming.
 		const readFileBatched = batchNearby(filtered, {
 			isTarget: isReadFileAsk,

webview-ui/src/utils/__tests__/batchConsecutive.spec.ts

@@ -39,7 +39,8 @@ const isBoundary = (m: TestItem): boolean => {
 		m.say === "completion_result" ||
 		m.say === "checkpoint_saved" ||
 		m.say === "error" ||
-		m.say === "condense_context"
+		m.say === "condense_context" ||
+		m.say === "codebase_search_result"
 	)
 }
 
@@ -246,8 +247,32 @@ describe("batchNearby", () => {
 		expect(result[1].text).toBe("done")
 	})
 
-	test("non-ignorable non-target message stops batching", () => {
-		const messages = [msg("match-1", "ask"), msg("command_output", "say", "command_output"), msg("match-2", "ask")]
+	test("non-ignorable non-target message stops batching and restores pending ignorable messages", () => {
+		const messages = [
+			msg("match-1", "ask"),
+			msg("", "say", "api_req_started"),
+			msg("command_output", "say", "command_output"),
+			msg("match-2", "ask"),
+		]
+		const result = batchNearby(messages, {
+			isTarget: isMatch,
+			isIgnorableBetweenTargets,
+			isBoundary,
+			synthesize: synthesizeBatch,
+		})
+		expect(result).toHaveLength(4)
+		expect(result[0].text).toBe("match-1")
+		expect(result[1].say).toBe("api_req_started")
+		expect(result[2].text).toBe("command_output")
+		expect(result[3].text).toBe("match-2")
+	})
+
+	test("codebase_search_result stops batching", () => {
+		const messages = [
+			msg("match-1", "ask"),
+			msg("search result", "say", "codebase_search_result"),
+			msg("match-2", "ask"),
+		]
 		const result = batchNearby(messages, {
 			isTarget: isMatch,
 			isIgnorableBetweenTargets,
@@ -256,7 +281,7 @@ describe("batchNearby", () => {
 		})
 		expect(result).toHaveLength(3)
 		expect(result[0].text).toBe("match-1")
-		expect(result[1].text).toBe("command_output")
+		expect(result[1].say).toBe("codebase_search_result")
 		expect(result[2].text).toBe("match-2")
 	})
 

webview-ui/src/utils/__tests__/batchNearby.spec.ts

@@ -1,9 +1,8 @@
 /**
  * Batch tool asks that are near each other, allowing ignorable messages in between.
  *
- * Unlike `batchConsecutive` which only merges truly adjacent items, this function
- * merges items of the same type even when separated by low-information or invisible
- * messages (e.g., api_req_started/finished, empty text rows, partial streaming).
+ * This function merges items of the same type even when separated by low-information
+ * or invisible messages (e.g., api_req_started, empty text rows, partial streaming).
  *
  * It stops merging when it hits a "semantic boundary": user feedback, visible assistant
  * text, completion result, different tool group, checkpoint, error, etc.