From a2e952b3a2f100384e09fc82cc842d5d7fac812f Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sun, 2 Aug 2026 23:53:33 +0000
Subject: [PATCH] fix(B136): resolve listOmniboxB128 merge conflict markers for
 CI

---
 tests/unit/listOmniboxB128.unit.spec.ts | 35 ++++++++++++-------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/tests/unit/listOmniboxB128.unit.spec.ts b/tests/unit/listOmniboxB128.unit.spec.ts
index 0d49037c..ea40fa00 100644
--- a/tests/unit/listOmniboxB128.unit.spec.ts
+++ b/tests/unit/listOmniboxB128.unit.spec.ts
@@ -269,7 +269,23 @@ describe('list omnibox adapters (B128)', () => {
     expect(applied).toEqual({ kind: 'url', state: { page: 1, q: 'ana' } })
   })
 
-<<<<<<< HEAD
+  it('search-only omnibox clears and removes chips', () => {
+    expect(buildSearchOnlyOmniboxSuggestions('')).toEqual([])
+
+    const removed = removeSearchOnlyOmniboxChip({
+      state: { q: 'x', page: 2 },
+      chipId: 'q',
+      withPageReset: (next) => ({ ...next, page: 1 }),
+    })
+    expect(removed).toEqual({ kind: 'url', state: { page: 1, q: undefined } })
+
+    const cleared = clearSearchOnlyOmnibox({
+      state: { q: 'x' },
+      cleared: {},
+    })
+    expect(cleared).toEqual({ kind: 'clear', state: {} })
+  })
+
   it('advisor toggles municipality portfolio filter and suggests by name', () => {
     const base = parseAdvisorListParams({})
     const applied = applyAdvisorOmniboxSuggestion({
@@ -292,22 +308,5 @@ describe('list omnibox adapters (B128)', () => {
     })
     const suggestions = filterAdvisorOmniboxSuggestions(seeds, 'feira')
     expect(suggestions.some((entry) => entry.group === 'Município (carteira)')).toBe(true)
-=======
-  it('search-only omnibox clears and removes chips', () => {
-    expect(buildSearchOnlyOmniboxSuggestions('')).toEqual([])
-
-    const removed = removeSearchOnlyOmniboxChip({
-      state: { q: 'x', page: 2 },
-      chipId: 'q',
-      withPageReset: (next) => ({ ...next, page: 1 }),
-    })
-    expect(removed).toEqual({ kind: 'url', state: { page: 1, q: undefined } })
-
-    const cleared = clearSearchOnlyOmnibox({
-      state: { q: 'x' },
-      cleared: {},
-    })
-    expect(cleared).toEqual({ kind: 'clear', state: {} })
->>>>>>> c2a8e54b (test(B128): cover search-only omnibox exports for knip graph)
   })
 })