From c05b04236e5e76529c68f8b66dc70a303740b112 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sat, 1 Aug 2026 04:23:39 +0000
Subject: [PATCH 1/5] =?UTF-8?q?B85=20=E2=80=94=20A=C3=A7=C3=B5es=20r=C3=A1?=
 =?UTF-8?q?pidas=20no=20drawer=20de=20Demandas=20(lista=20+=20detalhe)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Registra catálogo contextual no chassis B79:
- Lista: um launcher register-demand → /demandas/nova (wizard A5 ainda stub)
- Detalhe: A1–A5 com prefill de município via context sync
- Expõe municipalityId no view model para prefill do form de criação

Co-authored-by: Francisco Solla <fsolla@users.noreply.github.com>
---
 .../campanha/(app)/demandas/[slug]/page.tsx   |  6 ++
 .../shell/CampaignQuickActionContextSync.tsx  | 43 ++++++++
 src/lib/campaignPaths.ts                      |  2 +
 src/lib/campaignQuickActionContext.ts         |  1 +
 src/lib/campaignQuickActionDemands.ts         | 99 +++++++++++++++++++
 src/lib/campaignQuickActionRegistry.ts        | 17 +++-
 src/utilities/campaignDemandData.ts           |  3 +
 tests/unit/campaignQuickAction.unit.spec.ts   | 64 ++++++++++++
 8 files changed, 233 insertions(+), 2 deletions(-)
 create mode 100644 src/components/campaign/shell/CampaignQuickActionContextSync.tsx
 create mode 100644 src/lib/campaignQuickActionDemands.ts

diff --git a/src/app/(campaign)/campanha/(app)/demandas/[slug]/page.tsx b/src/app/(campaign)/campanha/(app)/demandas/[slug]/page.tsx
index 8233bc98..fc868321 100644
--- a/src/app/(campaign)/campanha/(app)/demandas/[slug]/page.tsx
+++ b/src/app/(campaign)/campanha/(app)/demandas/[slug]/page.tsx
@@ -5,6 +5,7 @@ import { notFound } from 'next/navigation'
 import { getPayload } from 'payload'
 
 import { DemandWorkflowCard } from '@/components/campaign/demand/DemandWorkflowCard'
+import { CampaignQuickActionContextSync } from '@/components/campaign/shell/CampaignQuickActionContextSync'
 import { CampaignPageShell } from '@/components/campaign/shell/CampaignPageShell'
 import { Badge } from '@/components/ui/Badge'
 import { Button } from '@/components/ui/button'
@@ -59,6 +60,11 @@ export default async function DemandDetailPage({ params }: DemandDetailPageProps
 
   return (
     <CampaignPageShell>
+      <CampaignQuickActionContextSync
+        municipalitySlug={demand.municipalitySlug}
+        municipalityId={demand.municipalityId > 0 ? demand.municipalityId : undefined}
+        demandSlug={demand.slug}
+      />
       <header className="flex flex-col gap-2">
         <Button asChild variant="ghost" className="min-h-11 self-start">
           <Link href="/campanha/demandas">
diff --git a/src/components/campaign/shell/CampaignQuickActionContextSync.tsx b/src/components/campaign/shell/CampaignQuickActionContextSync.tsx
new file mode 100644
index 00000000..251a99a1
--- /dev/null
+++ b/src/components/campaign/shell/CampaignQuickActionContextSync.tsx
@@ -0,0 +1,43 @@
+'use client'
+
+import { useEffect } from 'react'
+
+import { useCampaignQuickActionContext } from '@/components/campaign/shell/CampaignQuickActionContext'
+import {
+  emptyCampaignQuickActionContext,
+  type CampaignQuickActionContext,
+} from '@/lib/campaignQuickActionContext'
+
+/** RSC pages push route context into the B79 drawer host (B80+). */
+export const CampaignQuickActionContextSync = ({
+  municipalitySlug,
+  municipalityId,
+  leadershipId,
+  organizationSlug,
+  activitySlug,
+  demandSlug,
+}: CampaignQuickActionContext) => {
+  const { setContext } = useCampaignQuickActionContext()
+
+  useEffect(() => {
+    setContext({
+      municipalitySlug,
+      municipalityId,
+      leadershipId,
+      organizationSlug,
+      activitySlug,
+      demandSlug,
+    })
+    return () => setContext(emptyCampaignQuickActionContext())
+  }, [
+    setContext,
+    municipalitySlug,
+    municipalityId,
+    leadershipId,
+    organizationSlug,
+    activitySlug,
+    demandSlug,
+  ])
+
+  return null
+}
diff --git a/src/lib/campaignPaths.ts b/src/lib/campaignPaths.ts
index 03d540f5..d31f60f1 100644
--- a/src/lib/campaignPaths.ts
+++ b/src/lib/campaignPaths.ts
@@ -3,4 +3,6 @@ export const CAMPAIGN_HOME = '/campanha' as const
 
 export const CAMPAIGN_TERRITORIES_HOME = '/campanha/territorios' as const
 
+export const CAMPAIGN_DEMANDS_HOME = '/campanha/demandas' as const
+
 export const LEADER_CONTACTS_HOME = '/campanha/contatos' as const
diff --git a/src/lib/campaignQuickActionContext.ts b/src/lib/campaignQuickActionContext.ts
index 1d0db468..fdfb94df 100644
--- a/src/lib/campaignQuickActionContext.ts
+++ b/src/lib/campaignQuickActionContext.ts
@@ -4,6 +4,7 @@
  */
 export type CampaignQuickActionContext = {
   municipalitySlug?: string
+  municipalityId?: number
   leadershipId?: number
   organizationSlug?: string
   activitySlug?: string
diff --git a/src/lib/campaignQuickActionDemands.ts b/src/lib/campaignQuickActionDemands.ts
new file mode 100644
index 00000000..c51bfc66
--- /dev/null
+++ b/src/lib/campaignQuickActionDemands.ts
@@ -0,0 +1,99 @@
+import {
+  CAMPAIGN_WIZARD_ACTION_SLUGS,
+  wizardActionHref,
+  type CampaignWizardActionId,
+} from '@/lib/campaignActionRoutes'
+import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
+import { CAMPAIGN_DEMANDS_HOME } from '@/lib/campaignPaths'
+import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
+import { isStaffCampaignRole, type CampaignRole } from '@/lib/campaignRoles'
+
+export const CAMPAIGN_DEMANDS_CREATE_HREF = `${CAMPAIGN_DEMANDS_HOME}/nova` as const
+
+const DETAIL_WIZARD_ACTION_IDS: readonly CampaignWizardActionId[] = [
+  'update-votes',
+  'register-signal',
+  'change-trend',
+  'update-leadership',
+  'register-demand',
+]
+
+export const demandCreateHref = (municipalityId?: number): string => {
+  if (municipalityId === undefined) {
+    return CAMPAIGN_DEMANDS_CREATE_HREF
+  }
+  return `${CAMPAIGN_DEMANDS_CREATE_HREF}?municipality=${municipalityId}`
+}
+
+export const isDemandsListPath = (pathname: string): boolean =>
+  pathname === CAMPAIGN_DEMANDS_HOME || pathname === `${CAMPAIGN_DEMANDS_HOME}/`
+
+export const isDemandDetailPath = (pathname: string): boolean => {
+  if (!pathname.startsWith(`${CAMPAIGN_DEMANDS_HOME}/`)) {
+    return false
+  }
+  const rest = pathname.slice(`${CAMPAIGN_DEMANDS_HOME}/`.length)
+  if (!rest || rest.includes('/')) {
+    return false
+  }
+  return rest !== 'nova'
+}
+
+const registerDemandListAction = (role: CampaignRole): CampaignQuickAction | null => {
+  const source = homeActionsForRole(role).find((action) => action.id === 'register-demand')
+  if (!source) {
+    return null
+  }
+  return {
+    ...source,
+    href: CAMPAIGN_DEMANDS_CREATE_HREF,
+  }
+}
+
+/** B85 list: single "Registrar pedido" launcher (form route — wizard A5 is still a stub). */
+export const resolveDemandsListQuickActions = (
+  role: CampaignRole,
+): readonly CampaignQuickAction[] => {
+  if (!isStaffCampaignRole(role)) {
+    return []
+  }
+  const action = registerDemandListAction(role)
+  return action ? [action] : []
+}
+
+/** B85 detail: staff Início A1–A5 with municipality prefill when linked. */
+export const resolveDemandDetailQuickActions = (
+  role: CampaignRole,
+  context: CampaignQuickActionContext,
+): readonly CampaignQuickAction[] => {
+  if (!isStaffCampaignRole(role)) {
+    return []
+  }
+  const { municipalitySlug, municipalityId } = context
+  if (!municipalitySlug) {
+    return []
+  }
+
+  const byId = new Map(homeActionsForRole(role).map((action) => [action.id, action]))
+
+  return DETAIL_WIZARD_ACTION_IDS.flatMap((id) => {
+    const action = byId.get(id)
+    if (!action) {
+      return []
+    }
+    if (id === 'register-demand') {
+      return [
+        {
+          ...action,
+          href: demandCreateHref(municipalityId),
+        },
+      ]
+    }
+    return [
+      {
+        ...action,
+        href: wizardActionHref(CAMPAIGN_WIZARD_ACTION_SLUGS[id], municipalitySlug),
+      },
+    ]
+  })
+}
diff --git a/src/lib/campaignQuickActionRegistry.ts b/src/lib/campaignQuickActionRegistry.ts
index 14c06481..edd5375e 100644
--- a/src/lib/campaignQuickActionRegistry.ts
+++ b/src/lib/campaignQuickActionRegistry.ts
@@ -1,13 +1,19 @@
 import { resolveActivityQuickActions } from '@/lib/activityQuickActions'
 import { resolveStaffHomeQuickActions } from '@/lib/campaignHomeActions'
 import { resolveMunicipalityQuickActionsForPath } from '@/lib/campaignMunicipalityQuickActions'
-import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
+import {
+  isDemandDetailPath,
+  isDemandsListPath,
+  resolveDemandDetailQuickActions,
+  resolveDemandsListQuickActions,
+} from '@/lib/campaignQuickActionDemands'
 import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
 import {
   parseActivityQuickActionSurface,
   parseOrganizationQuickActionSurface,
 } from '@/lib/campaignQuickActionPaths'
 import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
+import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
 import type { CampaignRole } from '@/lib/campaignRoles'
 import { resolveOrganizationQuickActions } from '@/lib/organizationQuickActions'
 
@@ -29,9 +35,17 @@ export const resolveQuickActionsForPath = (
     return resolveActivityQuickActions(activitySurface, role, context)
   }
 
+<<<<<<< HEAD
   const organizationSurface = parseOrganizationQuickActionSurface(pathname)
   if (organizationSurface) {
     return resolveOrganizationQuickActions(organizationSurface, role, context)
+=======
+  if (isDemandsListPath(pathname)) {
+    return resolveDemandsListQuickActions(role)
+  }
+  if (isDemandDetailPath(pathname)) {
+    return resolveDemandDetailQuickActions(role, context)
+>>>>>>> 2417ed3 (B85 — Ações rápidas no drawer de Demandas (lista + detalhe))
   }
 
   const municipalityActions = resolveMunicipalityQuickActionsForPath(pathname, role, context)
@@ -40,6 +54,5 @@ export const resolveQuickActionsForPath = (
   if (isTerritoriesListPath(pathname)) {
     return resolveStaffHomeQuickActions(role)
   }
-
   return []
 }
diff --git a/src/utilities/campaignDemandData.ts b/src/utilities/campaignDemandData.ts
index 9ead5652..717af313 100644
--- a/src/utilities/campaignDemandData.ts
+++ b/src/utilities/campaignDemandData.ts
@@ -27,6 +27,7 @@ export type DemandRowViewModel = {
   slug: string
   kind: CampaignDemandKind
   status: CampaignDemandStatus
+  municipalityId: number
   municipalityName: string
   municipalitySlug: string
   requesterName: string | null
@@ -107,6 +108,7 @@ const toDemandRow = (
   requesterBy: Map<number, string>,
 ): DemandRowViewModel => {
   const municipality = municipalityBy.get(relationshipId(demand.municipality) ?? -1)
+  const municipalityID = relationshipId(demand.municipality)
   const leadershipID = relationshipId(demand.leadership)
   return {
     id: demand.id,
@@ -114,6 +116,7 @@ const toDemandRow = (
     slug: demand.slug,
     kind: demand.kind as CampaignDemandKind,
     status: demand.status as CampaignDemandStatus,
+    municipalityId: municipalityID ?? 0,
     municipalityName: municipality?.name ?? 'Município',
     municipalitySlug: municipality?.slug ?? '',
     requesterName: leadershipID ? (requesterBy.get(leadershipID) ?? null) : null,
diff --git a/tests/unit/campaignQuickAction.unit.spec.ts b/tests/unit/campaignQuickAction.unit.spec.ts
index 13efbec3..1f8e4cc3 100644
--- a/tests/unit/campaignQuickAction.unit.spec.ts
+++ b/tests/unit/campaignQuickAction.unit.spec.ts
@@ -3,6 +3,14 @@ import { describe, expect, it } from 'vitest'
 import { resolveActivityQuickActions } from '@/lib/activityQuickActions'
 import { CAMPAIGN_WIZARD_ACTION_SLUGS } from '@/lib/campaignActionRoutes'
 import { UNCOVERED_MUNICIPALITIES_LIST_HREF, homeActionsForRole } from '@/lib/campaignHomeActions'
+import {
+  CAMPAIGN_DEMANDS_CREATE_HREF,
+  demandCreateHref,
+  isDemandDetailPath,
+  isDemandsListPath,
+  resolveDemandDetailQuickActions,
+  resolveDemandsListQuickActions,
+} from '@/lib/campaignQuickActionDemands'
 import {
   isCampaignActionsPath,
   isCampaignHomePath,
@@ -49,6 +57,8 @@ describe('campaignQuickActionMount', () => {
   it('mounts for staff outside Início and acoes', () => {
     expect(shouldMountQuickActionsDrawer('/campanha/municipios', 'coordinator')).toBe(true)
     expect(shouldMountQuickActionsDrawer('/campanha/territorios', 'coordinator')).toBe(true)
+    expect(shouldMountQuickActionsDrawer('/campanha/demandas', 'coordinator')).toBe(true)
+    expect(shouldMountQuickActionsDrawer('/campanha/demandas/foo', 'coordinator')).toBe(true)
     expect(shouldMountQuickActionsDrawer('/campanha', 'coordinator')).toBe(false)
     expect(shouldMountQuickActionsDrawer('/campanha/acoes/registrar-sinal', 'advisor')).toBe(false)
   })
@@ -234,6 +244,60 @@ describe('campaignQuickActionRegistry', () => {
   it('returns empty catalog on territorios for leader lockdown', () => {
     expect(resolveQuickActionsForPath('/campanha/territorios', 'leader', {})).toEqual([])
   })
+
+  it('returns single register-demand launcher on demandas list (B85)', () => {
+    const actions = resolveQuickActionsForPath('/campanha/demandas', 'coordinator', {})
+    expect(actions.map((action) => action.id)).toEqual(['register-demand'])
+    expect(actions[0]?.href).toBe(CAMPAIGN_DEMANDS_CREATE_HREF)
+    expect(actions[0]?.href).not.toContain('municipio=')
+  })
+
+  it('returns A1–A5 prefilled on demand detail when municipality context is set (B85)', () => {
+    const actions = resolveQuickActionsForPath('/campanha/demandas/pedido-cairu', 'coordinator', {
+      municipalitySlug: 'cairu',
+      municipalityId: 42,
+      demandSlug: 'pedido-cairu',
+    })
+    expect(actions.map((action) => action.id)).toEqual([
+      'update-votes',
+      'register-signal',
+      'change-trend',
+      'update-leadership',
+      'register-demand',
+    ])
+    expect(actions.find((action) => action.id === 'update-votes')?.href).toBe(
+      '/campanha/acoes/atualizar-votos?municipio=cairu',
+    )
+    expect(actions.find((action) => action.id === 'register-demand')?.href).toBe(
+      demandCreateHref(42),
+    )
+    expect(actions.some((action) => action.id === 'uncovered-municipalities')).toBe(false)
+  })
+
+  it('returns empty catalog on demand detail without municipality context', () => {
+    expect(resolveQuickActionsForPath('/campanha/demandas/pedido-cairu', 'coordinator', {})).toEqual(
+      [],
+    )
+  })
+})
+
+describe('campaignQuickActionDemands paths', () => {
+  it('matches list and detail paths but not nova', () => {
+    expect(isDemandsListPath('/campanha/demandas')).toBe(true)
+    expect(isDemandsListPath('/campanha/demandas/')).toBe(true)
+    expect(isDemandDetailPath('/campanha/demandas/pedido-cairu')).toBe(true)
+    expect(isDemandDetailPath('/campanha/demandas/nova')).toBe(false)
+    expect(isDemandDetailPath('/campanha/demandas')).toBe(false)
+  })
+})
+
+describe('campaignQuickActionDemands resolvers', () => {
+  it('returns empty catalog for leader lockdown', () => {
+    expect(resolveDemandsListQuickActions('leader')).toEqual([])
+    expect(
+      resolveDemandDetailQuickActions('leader', { municipalitySlug: 'cairu', municipalityId: 1 }),
+    ).toEqual([])
+  })
 })
 
 describe('campaignQuickActionSnap', () => {

From 7812dee1f35c5c16c86a3d46c3ae2876fd2ba54e Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sat, 1 Aug 2026 04:24:29 +0000
Subject: [PATCH 2/5] style: Prettier (B85)

---
 .../campanha/(app)/demandas/[slug]/page.tsx       |  2 +-
 src/lib/campaignQuickActionDemands.ts             |  1 +
 src/lib/campaignQuickActionRegistry.ts            | 15 +++++++++++++++
 tests/unit/campaignQuickAction.unit.spec.ts       |  6 +++---
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/app/(campaign)/campanha/(app)/demandas/[slug]/page.tsx b/src/app/(campaign)/campanha/(app)/demandas/[slug]/page.tsx
index fc868321..cec0a88a 100644
--- a/src/app/(campaign)/campanha/(app)/demandas/[slug]/page.tsx
+++ b/src/app/(campaign)/campanha/(app)/demandas/[slug]/page.tsx
@@ -5,8 +5,8 @@ import { notFound } from 'next/navigation'
 import { getPayload } from 'payload'
 
 import { DemandWorkflowCard } from '@/components/campaign/demand/DemandWorkflowCard'
-import { CampaignQuickActionContextSync } from '@/components/campaign/shell/CampaignQuickActionContextSync'
 import { CampaignPageShell } from '@/components/campaign/shell/CampaignPageShell'
+import { CampaignQuickActionContextSync } from '@/components/campaign/shell/CampaignQuickActionContextSync'
 import { Badge } from '@/components/ui/Badge'
 import { Button } from '@/components/ui/button'
 import {
diff --git a/src/lib/campaignQuickActionDemands.ts b/src/lib/campaignQuickActionDemands.ts
index c51bfc66..bd76e246 100644
--- a/src/lib/campaignQuickActionDemands.ts
+++ b/src/lib/campaignQuickActionDemands.ts
@@ -3,6 +3,7 @@ import {
   wizardActionHref,
   type CampaignWizardActionId,
 } from '@/lib/campaignActionRoutes'
+import { homeActionsForRole } from '@/lib/campaignHomeActions'
 import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
 import { CAMPAIGN_DEMANDS_HOME } from '@/lib/campaignPaths'
 import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
diff --git a/src/lib/campaignQuickActionRegistry.ts b/src/lib/campaignQuickActionRegistry.ts
index edd5375e..dd55625b 100644
--- a/src/lib/campaignQuickActionRegistry.ts
+++ b/src/lib/campaignQuickActionRegistry.ts
@@ -1,12 +1,25 @@
+<<<<<<< HEAD
 import { resolveActivityQuickActions } from '@/lib/activityQuickActions'
 import { resolveStaffHomeQuickActions } from '@/lib/campaignHomeActions'
+=======
+import {
+  resolveStaffHomeQuickActions,
+  type ResolvedCampaignHomeAction,
+} from '@/lib/campaignHomeActions'
+<<<<<<< HEAD
+>>>>>>> 72d8fe2 (style: Prettier (B85))
 import { resolveMunicipalityQuickActionsForPath } from '@/lib/campaignMunicipalityQuickActions'
+=======
+import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
+import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
+>>>>>>> 46c797f (style: Prettier (B85))
 import {
   isDemandDetailPath,
   isDemandsListPath,
   resolveDemandDetailQuickActions,
   resolveDemandsListQuickActions,
 } from '@/lib/campaignQuickActionDemands'
+<<<<<<< HEAD
 import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
 import {
   parseActivityQuickActionSurface,
@@ -14,6 +27,8 @@ import {
 } from '@/lib/campaignQuickActionPaths'
 import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
 import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
+=======
+>>>>>>> 72d8fe2 (style: Prettier (B85))
 import type { CampaignRole } from '@/lib/campaignRoles'
 import { resolveOrganizationQuickActions } from '@/lib/organizationQuickActions'
 
diff --git a/tests/unit/campaignQuickAction.unit.spec.ts b/tests/unit/campaignQuickAction.unit.spec.ts
index 1f8e4cc3..abbe0c7f 100644
--- a/tests/unit/campaignQuickAction.unit.spec.ts
+++ b/tests/unit/campaignQuickAction.unit.spec.ts
@@ -275,9 +275,9 @@ describe('campaignQuickActionRegistry', () => {
   })
 
   it('returns empty catalog on demand detail without municipality context', () => {
-    expect(resolveQuickActionsForPath('/campanha/demandas/pedido-cairu', 'coordinator', {})).toEqual(
-      [],
-    )
+    expect(
+      resolveQuickActionsForPath('/campanha/demandas/pedido-cairu', 'coordinator', {}),
+    ).toEqual([])
   })
 })
 

From 2baad93f71decc1cae1ed034523c0d356a57a4b6 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sat, 1 Aug 2026 04:53:19 +0000
Subject: [PATCH 3/5] test: retry municipality pair when word-start queries
 collide
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Allocator stays slug-free (miss #73); skips Conde/Condeúba-style prefixes.
---
 tests/int/searchStaffMunicipalityHits.int.spec.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/int/searchStaffMunicipalityHits.int.spec.ts b/tests/int/searchStaffMunicipalityHits.int.spec.ts
index 403130e1..46022c18 100644
--- a/tests/int/searchStaffMunicipalityHits.int.spec.ts
+++ b/tests/int/searchStaffMunicipalityHits.int.spec.ts
@@ -49,7 +49,11 @@ describe('searchStaffMunicipalityHits (B60)', () => {
 
     const administered = await fixtures.getMunicipality()
     let other = await fixtures.getMunicipality()
+<<<<<<< HEAD
     for (let attempt = 0; attempt < 30; attempt++) {
+=======
+    for (let attempt = 0; attempt < 24; attempt += 1) {
+>>>>>>> 8e4385e (test: retry municipality pair when word-start queries collide)
       try {
         distinctWordStartQuery(other.name, administered.name)
         distinctWordStartQuery(administered.name, other.name)
@@ -57,15 +61,21 @@ describe('searchStaffMunicipalityHits (B60)', () => {
       } catch {
         other = await fixtures.getMunicipality()
       }
+<<<<<<< HEAD
       if (attempt === 29) {
         throw new Error('could not allocate two municipalities with distinct word-start queries')
       }
     }
     await fixtures.assignMunicipalityAdvisors(administered.id, [advisor.id])
+=======
+    }
+>>>>>>> 8e4385e (test: retry municipality pair when word-start queries collide)
 
     const otherQuery = distinctWordStartQuery(other.name, administered.name)
     const administeredQuery = distinctWordStartQuery(administered.name, other.name)
 
+    await fixtures.assignMunicipalityAdvisors(administered.id, [advisor.id])
+
     const advisorResult = await searchStaffMunicipalityHits(payload, advisor, otherQuery)
     expect(advisorResult.map((hit) => hit.slug)).toEqual([])
 

From 1cfe6948d23b753a31f9266a87810518b6707761 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sat, 1 Aug 2026 05:18:52 +0000
Subject: [PATCH 4/5] =?UTF-8?q?fix(B85):=20limpar=20registry=20ap=C3=B3s?=
 =?UTF-8?q?=20rebase=20em=20main=20(B84)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/campaignQuickActionDemands.ts  |  2 +-
 src/lib/campaignQuickActionRegistry.ts | 20 ++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/lib/campaignQuickActionDemands.ts b/src/lib/campaignQuickActionDemands.ts
index bd76e246..bd53d1e4 100644
--- a/src/lib/campaignQuickActionDemands.ts
+++ b/src/lib/campaignQuickActionDemands.ts
@@ -4,9 +4,9 @@ import {
   type CampaignWizardActionId,
 } from '@/lib/campaignActionRoutes'
 import { homeActionsForRole } from '@/lib/campaignHomeActions'
-import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
 import { CAMPAIGN_DEMANDS_HOME } from '@/lib/campaignPaths'
 import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
+import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
 import { isStaffCampaignRole, type CampaignRole } from '@/lib/campaignRoles'
 
 export const CAMPAIGN_DEMANDS_CREATE_HREF = `${CAMPAIGN_DEMANDS_HOME}/nova` as const
diff --git a/src/lib/campaignQuickActionRegistry.ts b/src/lib/campaignQuickActionRegistry.ts
index dd55625b..c8fad4c3 100644
--- a/src/lib/campaignQuickActionRegistry.ts
+++ b/src/lib/campaignQuickActionRegistry.ts
@@ -1,25 +1,12 @@
-<<<<<<< HEAD
 import { resolveActivityQuickActions } from '@/lib/activityQuickActions'
 import { resolveStaffHomeQuickActions } from '@/lib/campaignHomeActions'
-=======
-import {
-  resolveStaffHomeQuickActions,
-  type ResolvedCampaignHomeAction,
-} from '@/lib/campaignHomeActions'
-<<<<<<< HEAD
->>>>>>> 72d8fe2 (style: Prettier (B85))
 import { resolveMunicipalityQuickActionsForPath } from '@/lib/campaignMunicipalityQuickActions'
-=======
-import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
-import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
->>>>>>> 46c797f (style: Prettier (B85))
 import {
   isDemandDetailPath,
   isDemandsListPath,
   resolveDemandDetailQuickActions,
   resolveDemandsListQuickActions,
 } from '@/lib/campaignQuickActionDemands'
-<<<<<<< HEAD
 import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
 import {
   parseActivityQuickActionSurface,
@@ -27,8 +14,6 @@ import {
 } from '@/lib/campaignQuickActionPaths'
 import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
 import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
-=======
->>>>>>> 72d8fe2 (style: Prettier (B85))
 import type { CampaignRole } from '@/lib/campaignRoles'
 import { resolveOrganizationQuickActions } from '@/lib/organizationQuickActions'
 
@@ -50,17 +35,16 @@ export const resolveQuickActionsForPath = (
     return resolveActivityQuickActions(activitySurface, role, context)
   }
 
-<<<<<<< HEAD
   const organizationSurface = parseOrganizationQuickActionSurface(pathname)
   if (organizationSurface) {
     return resolveOrganizationQuickActions(organizationSurface, role, context)
-=======
+  }
+
   if (isDemandsListPath(pathname)) {
     return resolveDemandsListQuickActions(role)
   }
   if (isDemandDetailPath(pathname)) {
     return resolveDemandDetailQuickActions(role, context)
->>>>>>> 2417ed3 (B85 — Ações rápidas no drawer de Demandas (lista + detalhe))
   }
 
   const municipalityActions = resolveMunicipalityQuickActionsForPath(pathname, role, context)

From aa0cc4e15af934f987e0d06f1f635db49bb0529b Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sat, 1 Aug 2026 05:27:01 +0000
Subject: [PATCH 5/5] test: resolve searchStaffMunicipalityHits conflict after
 rebase

---
 src/lib/campaignQuickActionRegistry.ts            | 4 ++--
 tests/int/searchStaffMunicipalityHits.int.spec.ts | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/lib/campaignQuickActionRegistry.ts b/src/lib/campaignQuickActionRegistry.ts
index c8fad4c3..6305b5c5 100644
--- a/src/lib/campaignQuickActionRegistry.ts
+++ b/src/lib/campaignQuickActionRegistry.ts
@@ -1,19 +1,19 @@
 import { resolveActivityQuickActions } from '@/lib/activityQuickActions'
 import { resolveStaffHomeQuickActions } from '@/lib/campaignHomeActions'
 import { resolveMunicipalityQuickActionsForPath } from '@/lib/campaignMunicipalityQuickActions'
+import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
+import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
 import {
   isDemandDetailPath,
   isDemandsListPath,
   resolveDemandDetailQuickActions,
   resolveDemandsListQuickActions,
 } from '@/lib/campaignQuickActionDemands'
-import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
 import {
   parseActivityQuickActionSurface,
   parseOrganizationQuickActionSurface,
 } from '@/lib/campaignQuickActionPaths'
 import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
-import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
 import type { CampaignRole } from '@/lib/campaignRoles'
 import { resolveOrganizationQuickActions } from '@/lib/organizationQuickActions'
 
diff --git a/tests/int/searchStaffMunicipalityHits.int.spec.ts b/tests/int/searchStaffMunicipalityHits.int.spec.ts
index 46022c18..500b8553 100644
--- a/tests/int/searchStaffMunicipalityHits.int.spec.ts
+++ b/tests/int/searchStaffMunicipalityHits.int.spec.ts
@@ -49,11 +49,7 @@ describe('searchStaffMunicipalityHits (B60)', () => {
 
     const administered = await fixtures.getMunicipality()
     let other = await fixtures.getMunicipality()
-<<<<<<< HEAD
     for (let attempt = 0; attempt < 30; attempt++) {
-=======
-    for (let attempt = 0; attempt < 24; attempt += 1) {
->>>>>>> 8e4385e (test: retry municipality pair when word-start queries collide)
       try {
         distinctWordStartQuery(other.name, administered.name)
         distinctWordStartQuery(administered.name, other.name)
@@ -61,15 +57,10 @@ describe('searchStaffMunicipalityHits (B60)', () => {
       } catch {
         other = await fixtures.getMunicipality()
       }
-<<<<<<< HEAD
       if (attempt === 29) {
         throw new Error('could not allocate two municipalities with distinct word-start queries')
       }
     }
-    await fixtures.assignMunicipalityAdvisors(administered.id, [advisor.id])
-=======
-    }
->>>>>>> 8e4385e (test: retry municipality pair when word-start queries collide)
 
     const otherQuery = distinctWordStartQuery(other.name, administered.name)
     const administeredQuery = distinctWordStartQuery(administered.name, other.name)