Conflict RadarPro
Agents working on their own branches at once and where they get in each other's way: a row per file, a column per agent, a line between agents that changed the same lines, each agent's way in one sentence to pick from, and Merge once everything is settled.
oxyn add conflict-radarThe preview stays free for everyone. Pro opens the code of every Pro component, screen, agent-app template, block and kit, plus the Pro CLI.
Rendered from Rust at build time · goes live when visible
When to use
- Several coding agents work on their own branches of the same repo at once.
- Before anything lands, the user needs to see where they overlap, pick one agent's way for each file where they clash, and merge only when every clash is settled and every agent has stopped writing.
- When the agents simply try the same task and the best one wins, use a best-of-N view instead; when the timeline matters, use agent lanes; for one agent's changes, use a change summary.
When not to use
- A 3-way merge editor: use Merge conflict instead.
- Several agents side by side: use Agent Fleet instead.
- What an agent changed at a glance: use Change Summary instead.
Installation
Conflict Radar is part of Oxyn Pro; the preview is free. Pro items install with the oxyn CLI once your licence is signed in; until then Pro members copy the code from this page.
oxyn add conflict-radarUsage
The preview is free. Pro opens the code of every Pro component, screen and template.
Examples
Radar
Rows per file, a column per agent; one agent still writing.
Code Pro
The preview is free. Pro opens the code of every Pro component, screen and template.
Settled
Everyone done: pick a way per conflict, then Merge.
Code Pro
The preview is free. Pro opens the code of every Pro component, screen and template.
Heat
Conflicting cells tinted by how many lines overlap.
Code Pro
The preview is free. Pro opens the code of every Pro component, screen and template.
Merge order
Least-contested branch first.
Code Pro
The preview is free. Pro opens the code of every Pro component, screen and template.
Conflicts only
Only the files where agents clash, four agents.
Code Pro
The preview is free. Pro opens the code of every Pro component, screen and template.
Collapsed
Ways stay folded until a file is opened.
Code Pro
The preview is free. Pro opens the code of every Pro component, screen and template.
API reference
ConflictRadar
| Prop | Type | Default | Description |
|---|---|---|---|
agentsrequired | Vec<RadarAgent> | — | Columns: one agent each. |
filesrequired | Vec<RadarFile> | — | Rows: one file each, with every agent's edit. |
title | String | "Parallel work" | Heading in the bar. |
resolved | Option<BTreeMap<String, String>> | Default::default() | Controlled picks (path → agent id); `None` keeps them inside. |
heat | bool | Default::default() | Tint conflicting cells by how many lines overlap. |
order | bool | Default::default() | Show the suggested merge order. |
conflicts_only | bool | Default::default() | Only rows that conflict. |
default_open | bool | Default::default() | Open the first unsettled conflict's ways on mount. |
on_resolve | EventHandler<(String, String)> | — | A way was picked: (path, agent id). |
on_merge | EventHandler<()> | — | Merge was pressed. |
Read from the Rust signature and doc comments.
Keyboard interactions
| Key | Action |
|---|---|
| Tab | Moves through Merge, the agents, the conflicting files and the ways to settle the one that is open |
| EnterorSpace | On a conflicting file: show or hide its ways; on a way: keep it |
| ↑or↓or←or→ | Move between the ways of the open conflict (radio group) |
Accessibility
- The grid is a table: agents are column headers, files are row headers, and every cell says who changed which lines and whether it was kept (“Birch changed lines 30 to 64, kept”).
- Conflicts and settled files are named in text (“Conflict”, “✓ Birch”), not only by colour.
- The ways to settle a conflict are a radio group.
- The detail line under the table is a polite live region: pointing at or focusing a bar or an agent reads its numbers (files, open conflicts, kept).
From the spec
- The grid is
role=table: agents arecolumnheaders, filesrowheaders, every cell has a label ("Birch changed lines 30 to 64, still writing, conflict"). - Conflicts and settled files are named in text, not only by colour.
- The ways are a
radiogroupwith rovingtabindex; arrows move and keep. - The status line is a polite live region (bar and agent details, Merge result).
- Merge is a real button; when disabled its reason is visible beside it.
Motion & interaction
- Bars grow in from the left (
scaleX 0 → 1) when the row appears; a sheen sweeps an active bar while the agent is still writing. - A conflict draws a line between the clashing agents' columns with a glow running along it until the file is settled; then the line turns
merge.resolvedat 50 % and stops. - Pointing at a bar shows "Birch changed lines 30 to 64, kept" in the status line; pointing at or focusing an agent shows "Atlas: 3 files · 1 open conflict · 0 kept".
- Opening a row folds the ways in under it (fade + 3 px rise); the chevron turns 180°.
- Keeping a way fills its radio (4 px ring), the chip flips Conflict → ✓ name with a small pop.
- Merge morphs into "✓ Merged" with a pop.
Timing
| Transition | Duration | Easing | Notes |
|---|---|---|---|
| Bar grow-in | 500 ms | cubic-bezier(.2,.8,.2,1) | on mount |
| Active sheen | 1600 ms loop | linear | only while active |
| Clash glow | 1800 ms loop | linear | stops when settled |
| Working dot | 1400 ms loop | ease-in-out | opacity 1 → .25 |
| Ways open | 200 ms | cubic-bezier(.2,.8,.2,1) | fade + 3 px |
| Chevron turn | 180 ms | ease | — |
| Chip / Merged pop | 160–200 ms | cubic-bezier(.2,.8,.2,1) | scale .9 → 1 |
| Reduced motion | — | — | no grow, sheen, glow or pulse; static bars, a static line and text carry the state |
Responsive behaviour
- Container query: below 440 px agent names and folders drop (monograms stay), the columns shrink and a way's sentence moves under its name.
- Merge is disabled with the reason beside it (“2 conflicts · 1 working”).
Edge cases (spec)
- Three-way clash: every clashing agent is a way; the line spans the leftmost to rightmost clashing column.
- Agent not in the clash: its bar in that row stays at full strength ("kept") and it is not offered as a way;
resolveignores it. - Controlled picks: pass
resolved; the component then only reportson_resolveand never stores a pick. - Many agents: columns share the width evenly; below 440 px names drop to monograms.
- Long paths: folder and name wrap; below 440 px folders drop.
- Zero-line edits: a bar is at least 6 px wide.
- No conflicts: Merge enables as soon as every agent is done.
- Touch: rows and ways are full-width targets ≥ 34 px tall.
- RTL: chrome mirrors; bars still read by line number from inline-start.
Notes for AI
- Import
ConflictRadarfromoxyn_dioxusand includeSTATUS_INDICATOR_CSSplus the token stylesheet once. - A GPUI version exists:
ConflictRadarElinoxyn_gpui. - Props to set first:
agents,files. - It reads a clock (
now) for live timers; pass one clock for the whole page rather than one per component. - Keep its states and timings as they ship; restyle it through the CSS variables rather than by hand.