Cell take all (or resolve generally) then map to another row results in number of conflicted rows going down, but # of cells resolved the same.

[Avni2000]

Eg. 12/12 -> 12/11

[Avni2000]

@coderabbitai should be simple. Could you make a PR addressing this?

[coderabbitai]

Coding Plan

Summary

• The fix is localized to handleCellDrop() - the only function where rows are filtered (other row operations only reorder or restore from consistent snapshots)
• After filtering empty rows, the choices Map is cleaned to remove entries for rows that no longer exist
• This ensures resolvedCount (choices.size) can never exceed totalConflicts (conflict rows count)
• History recording uses the cleaned state to maintain undo/redo consistency

Implementation Steps

Fix Choices Map Synchronization

This phase addresses the root cause by ensuring the choices Map is cleaned up when rows are removed, keeping the resolution counter accurate.

Clean Up Orphaned Choices in handleCellDrop

When dragging a cell to another row causes the source row to become empty and get filtered out, any resolution stored in the choices Map for that row's conflictIndex must also be removed.

• Modify src/web/client/ConflictResolver.tsx in the handleCellDrop() function (around line 480), adding cleanup logic after the existing filteredRows computation
• Collect the set of conflictIndex values from filteredRows (filtering out undefined values)
• Create a new choices Map by cloning choicesRef.current and deleting entries whose key is not in the remaining indices set
• Call setChoices() with the cleaned Map alongside the existing setRows(filteredRows) call
• Update the recordHistory() call to pass the cleaned choices Map instead of choicesRef.current to maintain undo/redo consistency

🤖 Prompt for AI agents

This phase fixes the bug where resolved conflict counts become invalid when rows
are filtered out. The goal is to synchronize the `choices` Map with the `rows`
array by removing orphaned entries.

In `src/web/client/ConflictResolver.tsx`, locate the `handleCellDrop()` function
(around line 480):

- After the existing `filteredRows` computation, collect the set of
`conflictIndex` values from `filteredRows` (filtering out undefined values)
- Create a new choices Map by cloning `choicesRef.current` and deleting entries
whose key is not in the remaining indices set
- Call `setChoices()` with the cleaned Map alongside the existing
`setRows(filteredRows)` call
- Update the `recordHistory()` call to pass the cleaned choices Map instead of
`choicesRef.current`

This ensures that:
- `resolvedCount` (choices.size) can never exceed `totalConflicts` (conflict
rows count)
- Undo/redo operations maintain consistency by using the cleaned state

Research

The web client uses React with local component state for conflict resolution. The ConflictResolver.tsx component maintains two key pieces of state: a choices Map (keyed by conflictIndex) tracking which conflicts have been resolved, and a rows array containing the visual merge rows. The conflict counter displays resolvedCount / totalConflicts where resolvedCount = choices.size and totalConflicts = rows.filter(r => r.type === 'conflict').length. The bug occurs in handleCellDrop() which filters out empty rows but does not clean up corresponding entries in the choices Map.

---

🚀 Next Steps

🤖 All AI agent prompts combined

This phase fixes the bug where resolved conflict counts become invalid when rows
are filtered out. The goal is to synchronize the `choices` Map with the `rows`
array by removing orphaned entries.

In `src/web/client/ConflictResolver.tsx`, locate the `handleCellDrop()` function
(around line 480):

- After the existing `filteredRows` computation, collect the set of
`conflictIndex` values from `filteredRows` (filtering out undefined values)
- Create a new choices Map by cloning `choicesRef.current` and deleting entries
whose key is not in the remaining indices set
- Call `setChoices()` with the cleaned Map alongside the existing
`setRows(filteredRows)` call
- Update the `recordHistory()` call to pass the cleaned choices Map instead of
`choicesRef.current`

This ensures that:
- `resolvedCount` (choices.size) can never exceed `totalConflicts` (conflict
rows count)
- Undo/redo operations maintain consistency by using the cleaned state

💡 Iterate on the plan with: @coderabbitai <feedback>

Example Feedback
- @coderabbitai You can skip phase 3. Add a simple unit test case for phase 2.
- @coderabbitai For design choice 1 go ahead with option 3 and replan.

---

💬 Have feedback or questions? Drop into our discord!

[Avni2000]

@coderabbitai works for me. Make the PR

[coderabbitai]

I've updated the plan above based on your feedback. Ready to proceed when you are!