fix: batchNearby restores dropped ignorable items when bridge fails

When a single target is followed by ignorable messages and then a
boundary (no second target found), the original code silently dropped
those ignorable items — contradicting the documented contract that all
items are preserved in-order.

Fix: track skipped ignorable items in pendingIgnorable, flush them after
the batch result so they're never lost. When bridge succeeds (second
target found), pending items are consumed into the synthesized batch as
expected.

Author: easonliang28

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

@@ -145,10 +145,11 @@ describe("batchNearby", () => {
 			isBoundary,
 			synthesize: synthesizeBatch,
 		})
-		expect(result).toHaveLength(3)
+		expect(result).toHaveLength(4)
 		expect(result[0].text).toBe("match-1")
-		expect(result[1].text).toBe("visible text")
-		expect(result[2].text).toBe("match-2")
+		expect(result[1].text).toBe("") // api_req_started restored after single target
+		expect(result[2].text).toBe("visible text")
+		expect(result[3].text).toBe("match-2")
 	})
 
 	test("multiple batches separated by boundaries", () => {
@@ -186,7 +187,7 @@ describe("batchNearby", () => {
 			isBoundary,
 			synthesize: synthesizeBatch,
 		})
-		expect(result).toHaveLength(2) // api_req_started ignorable → skipped; [BATCH:match-1,match-2, "feedback"]
+		expect(result).toHaveLength(2) // bridge succeeded → pending consumed; [BATCH:match-1,match-2, "feedback"]
 		expect(result[0].text).toBe("BATCH:match-1,match-2")
 		expect(result[1].text).toBe("feedback")
 	})
@@ -204,7 +205,7 @@ describe("batchNearby", () => {
 			isBoundary,
 			synthesize: synthesizeBatch,
 		})
-		expect(result).toHaveLength(2) // api_req_started ignorable → skipped; [BATCH:match-1,match-2, "err"]
+		expect(result).toHaveLength(2) // bridge succeeded → pending consumed; [BATCH:match-1,match-2, "err"]
 		expect(result[0].text).toBe("BATCH:match-1,match-2")
 		expect(result[1].text).toBe("err")
 	})
@@ -222,7 +223,7 @@ describe("batchNearby", () => {
 			isBoundary,
 			synthesize: synthesizeBatch,
 		})
-		expect(result).toHaveLength(2) // api_req_started ignorable → skipped; [BATCH:match-1,match-2, "ck"]
+		expect(result).toHaveLength(2) // bridge succeeded → pending consumed; [BATCH:match-1,match-2, "ck"]
 		expect(result[0].text).toBe("BATCH:match-1,match-2")
 		expect(result[1].text).toBe("ck")
 	})
@@ -240,7 +241,7 @@ describe("batchNearby", () => {
 			isBoundary,
 			synthesize: synthesizeBatch,
 		})
-		expect(result).toHaveLength(2) // api_req_started ignorable → skipped; [BATCH:match-1,match-2, "done"]
+		expect(result).toHaveLength(2) // bridge succeeded → pending consumed; [BATCH:match-1,match-2, "done"]
 		expect(result[0].text).toBe("BATCH:match-1,match-2")
 		expect(result[1].text).toBe("done")
 	})

webview-ui/src/utils/batchNearby.ts

@@ -43,6 +43,7 @@ export function batchNearby<T>(items: T[], options: BatchNearbyOptions<T>): T[]
 			// Start collecting a batch of targets, skipping ignorable messages in between
 			const batch: T[] = [items[i]]
 			let j = i + 1
+			const pendingIgnorable: T[] = []
 
 			while (j < items.length) {
 				if (isBoundary(items[j])) {
@@ -52,16 +53,22 @@ export function batchNearby<T>(items: T[], options: BatchNearbyOptions<T>): T[]
 					batch.push(items[j])
 					j++
 				} else if (isIgnorableBetweenTargets(items[j])) {
-					j++ // skip ignorable messages between targets
+					pendingIgnorable.push(items[j]) // track but don't commit yet
+					j++
 				} else {
 					break // non-ignorable, non-target message stops the batch
 				}
 			}
 
 			if (batch.length > 1) {
+				// Bridge succeeded — pending ignorable items are metadata consumed by the batch
 				result.push(synthesize(batch))
 			} else {
+				// Bridge failed — restore pending ignorable items to preserve in-order semantics
 				result.push(batch[0])
+				if (pendingIgnorable.length > 0) {
+					result.push(...pendingIgnorable)
+				}
 			}
 
 			i = j // items[j] was not consumed — re-examine it on next iteration