Conflict Radar

Parallel agents drawn as a minimap of each file, with the lines where their changes collide marked before merge.

PROGet Conflict Radar and 168 other Pro components with pro lifetime — Get Pro

Category
AI Agent
Access
Pro
Source
375 lines · one file
States
7 drawn
Added
3 Nov 2026

The decision inside it

Merge waits until every conflict has a choice

Merging parallel agent branches and fixing the collisions afterwards means reading two diffs you didn't write. Merge stays off until each overlap has an answer, so nothing lands half-decided.

When to use it

Use Conflict Radar when several agents change the same codebase or document in parallel and their work is merged. To watch the agents run use Agent Lanes; for one diff use Code Diff View.

Installation

How you get it

Paste this into Claude Code, Cursor, Codex or any coding agent. It installs the file and uses it as it is, instead of writing a new one.

Use Liro's Conflict Radar for this.
Install it: npx shadcn@latest add @liro/conflict-radar
(the @liro registry is set up in components.json, with LIRO_KEY in .env.local)
Import it from @/components/ui/conflict-radar.
Do not rewrite or restyle it. Pass my data through its props
and keep its built-in states.

For the full brief with every prop and the mistakes assistants usually make, use Copy prompt above. Pro components install through the @liro registry with your CLI token: see the Namespaced tab.

Usage

components/merge-check.tsx
import { ConflictRadar, type RadarAgent, type RadarChange, type ConflictChoice } from "@/components/ui/conflict-radar";

export function MergeCheck({ agents, changes, merge }: {
  agents: RadarAgent[];
  changes: RadarChange[];
  merge: (choices: Record<string, ConflictChoice>) => Promise<void>;
}) {
  return <ConflictRadar agents={agents} changes={changes} fileLines={{ "app/pricing/page.tsx": 212 }} onMerge={merge} />;
}

API reference

“Copy prompt” above puts a full brief on your clipboard, install command, dependencies, props, and the mistakes an assistant usually makes with this component.

Props

Read from the component’s own TypeScript interface when the site is built, so this table cannot drift from the file you install.

TypeNotes
agentsRadarAgent[] Yes–
changesRadarChange[] Yes–
fileLinesRecord<string, number> NoLine counts per file, for the minimap's length. Defaults to a little past the last change.
onMerge(choices: Record<string, ConflictChoice>) => void | Promise<void> NoMerges with a choice per conflict id. May return a promise.
titlestring No–
lookLook No–

Dependencies

npm packages

clsxframer-motionlucide-reacttailwind-merge

Liro foundations, installed alongside it

liro-themebutton

States

All of them are drawn by the component. None is left for you to design.

  • Clashes to settle
  • Settling
  • No overlap
  • Merging
  • Merged
  • Merge failed
  • Empty

Accessibility

  • Keyboard reachable throughout, in visual order
  • Focus trapped in overlays, Escape closes them
  • Focus returns to whatever opened it
  • Live regions announce what changed, not that something did
  • Honours prefers-reduced-motion

Responsive behavior

  • Sizes to its container, not the viewport
  • Usable from 320px up
  • Pointer-based interaction, so trackpad and touch both work
  • No hover-only affordances