feat(plans): implement conflict detection and structured conflict report for three-way merge (#11000) #11240

Merged

HAL9000 merged 4 commits from pr_fix-11000-conflict-report into master 2026-05-28 17:14:16 +00:00

Conversation 4 Commits 4 Files changed 4 +779

HAL9000 commented 2026-05-17 10:15:35 +00:00

Owner

Copy link

Summary

This PR implements conflict detection and structured conflict reporting for three-way plan merges.

Changes

New Domain Models

• ConflictType (StrEnum): Enumerates merge conflict types: MODIFY_MODIFY, MODIFY_DELETE, DELETE_MODIFY, DELETE_DELETE, ADD_ADD
• ConflictContext: Holds the three competing versions during merge (ancestor_value, parent_value, subplan_value)
• ConflictReport: Structured conflict report with auto-resolution via resolved_value property
• MergeResult: Complete three-way merge output with merged_config, conflicts, and auto_resolved
• ThreeWayMergeConflictDetector: Main detection engine with detect(), detect_diff_text(), and describe_all()

Key Features

• Classifies conflicts into five distinct types based on ancestor/parent/subplan states
• Auto-resolves convergent (non-conflicting) changes
• Provides human-readable summaries via detect_diff_text()
• Provides serialisable conflict reports via describe_all()

Files

• src/cleveragents/domain/models/planconfig/merge_conflict.py (new - 302 lines)
• src/cleveragents/domain/models/planconfig/__init__.py (modified)

Closes: #9558

Closes #9558

## Summary This PR implements conflict detection and structured conflict reporting for three-way plan merges. ## Changes ### New Domain Models - **ConflictType** (StrEnum): Enumerates merge conflict types: MODIFY_MODIFY, MODIFY_DELETE, DELETE_MODIFY, DELETE_DELETE, ADD_ADD - **ConflictContext**: Holds the three competing versions during merge (ancestor_value, parent_value, subplan_value) - **ConflictReport**: Structured conflict report with auto-resolution via resolved_value property - **MergeResult**: Complete three-way merge output with merged_config, conflicts, and auto_resolved - **ThreeWayMergeConflictDetector**: Main detection engine with detect(), detect_diff_text(), and describe_all() ### Key Features - Classifies conflicts into five distinct types based on ancestor/parent/subplan states - Auto-resolves convergent (non-conflicting) changes - Provides human-readable summaries via detect_diff_text() - Provides serialisable conflict reports via describe_all() ### Files - `src/cleveragents/domain/models/planconfig/merge_conflict.py` (new - 302 lines) - `src/cleveragents/domain/models/planconfig/__init__.py` (modified) Closes: #9558 Closes #9558

HAL9000 added 1 commit 2026-05-17 10:15:38 +00:00

feat(plans): implement conflict detection and structured conflict report for three-way merge (#11000) ... abe4b249b1

Add ThreeWayMergeConflictDetector with ConflictType enum (MODIFY_MODIFY, MODIFY_DELETE,
DELETE_MODIFY, DELETE_DELETE, ADD_ADD), ConflictContext per-field tracking,
ConflictReport with auto-resolution heuristics, and MergeResult output.

Also adds human-readable detect_diff_text() output and serialisable describe_all() summary.

Closes #9558

HAL9000 added the

State

In Review

label 2026-05-17 20:40:51 +00:00

HAL9000 added the

controller-managed

label 2026-05-28 13:42:05 +00:00

HAL9000 added 1 commit 2026-05-28 13:42:55 +00:00

chore: re-trigger CI [controller] 058758ad12

HAL9000 added the

MoSCoW

Must have

Priority

High

Type

Feature

labels 2026-05-28 13:43:03 +00:00

HAL9000 added this to the v3.3.0 milestone 2026-05-28 13:43:05 +00:00

HAL9000 force-pushed pr_fix-11000-conflict-report from 058758ad12 to 4990263700 2026-05-28 14:02:33 +00:00 Compare

HAL9000 added 1 commit 2026-05-28 14:10:10 +00:00

fix(planconfig): remove stale noqa directive and fix MergeResult.auto_resolved factory ... a19306e465

- Remove unused `noqa: F401` from planconfig __init__.py (lint RUF100)
- Fix `auto_resolved` field default_factory: list → dict to match
  declared type `dict[str, str | None]` (typecheck reportAssignmentType)

HAL9000 added 1 commit 2026-05-28 15:13:50 +00:00

test(planconfig): add BDD coverage for ThreeWayMergeConflictDetector ... e9d225edf3

Add feature file and Behave steps covering all reachable code paths in
merge_conflict.py: MODIFY_MODIFY/DELETE/ADD_ADD conflict types, auto-
resolution for MODIFY_DELETE/DELETE_MODIFY/convergent ADD_ADD, DELETE_DELETE
absence, detect_diff_text formatting, describe_all status types, and direct
_analyse_field call for the unreachable ADD_ADD branch.

Restores coverage above the 96.5% threshold after the merge_conflict module
was added with zero test coverage.

ISSUES CLOSED: #11000

HAL9000 added the

auto/claimed-merge

label 2026-05-28 15:50:11 +00:00

HAL9000 commented 2026-05-28 15:50:12 +00:00

Author

Owner

Copy link

Claimed by merge_drive.py (pid 935671) until 2026-05-28T17:20:11.850350+00:00.

This claim is advisory and will be released when the cycle ends, or after the TTL by a sibling driver's expired-claim sweep.

<!-- merge_drive.py: claim --> Claimed by `merge_drive.py` (pid 935671) until `2026-05-28T17:20:11.850350+00:00`. This claim is advisory and will be released when the cycle ends, or after the TTL by a sibling driver's expired-claim sweep.

HAL9000 force-pushed pr_fix-11000-conflict-report from e9d225edf3 to 6c6200ebce 2026-05-28 15:50:16 +00:00 Compare

HAL9000 added

auto/needs-implementer

and removed

auto/claimed-merge

labels 2026-05-28 16:14:47 +00:00

HAL9000 commented 2026-05-28 16:14:48 +00:00

Author

Owner

Copy link

Released by merge_drive.py (pid 935671). terminal_state=ci-fail-on-rebased-sha, op_label=auto/needs-implementer

<!-- merge_drive.py: release --> Released by `merge_drive.py` (pid 935671). terminal_state=`ci-fail-on-rebased-sha`, op_label=`auto/needs-implementer`

HAL9000 added the

auto/claimed-merge

label 2026-05-28 16:52:17 +00:00

HAL9000 commented 2026-05-28 16:52:17 +00:00

Author

Owner

Copy link

Claimed by merge_drive.py (pid 935671) until 2026-05-28T18:22:17.542732+00:00.

This claim is advisory and will be released when the cycle ends, or after the TTL by a sibling driver's expired-claim sweep.

<!-- merge_drive.py: claim --> Claimed by `merge_drive.py` (pid 935671) until `2026-05-28T18:22:17.542732+00:00`. This claim is advisory and will be released when the cycle ends, or after the TTL by a sibling driver's expired-claim sweep.

HAL9000 force-pushed pr_fix-11000-conflict-report from 6c6200ebce to cb27538a73 2026-05-28 16:52:21 +00:00 Compare

HAL9001 approved these changes 2026-05-28 17:14:14 +00:00

HAL9001 left a comment

Copy link

Approved by the controller reviewer stage (workflow 12).

Approved by the controller reviewer stage (workflow 12).

HAL9000 merged commit 790424a214 into master 2026-05-28 17:14:16 +00:00

HAL9000 removed the

auto/claimed-merge

label 2026-05-28 17:14:16 +00:00

HAL9000 referenced this pull request from a commit 2026-05-28 19:45:38 +00:00

Merge pull request 'feat(plans): implement conflict detection and structured conflict report for three-way merge (#11000)' (#11240) from pr_fix-11000-conflict-report into master

Sign in to join this conversation.

Reviewers

No reviewers

HAL9001

Labels

Clear labels   

auto/needs-reevaluation

Controller deferred this PR; awaiting Phase 6+ scope-evaluator or operator re-enablement.

  

controller-managed

Auto-agents controller manages this PR/issue (see tools/controller/deploy/RUNBOOK.md). Remove this label to abandon controller management.

  

auto/blocked-by-deps

PR blocked by an open issue dependency. Operator must close the dep (or remove the dependency link) before the merge driver can act. Auto-cleared by merge_drive when no open deps remain.

  

auto/ci-timeout

Most recent merge cycle hit CI timeout. Driver excludes this PR while last merge_cycle row is < 30 min old; label persists thereafter as visible history.

  

auto/claimed-implementer

Currently being processed by an implementer worker.

  

auto/claimed-merge

Currently being processed by the merge driver.

  

auto/claimed-reviewer

Currently being processed by a reviewer worker.

  

auto/driver-down

Merge driver heartbeat stale; pipeline halted. Closed automatically on next clean tick.

  

auto/invariant-violation

Detected master commit violating the strict merge invariant. Tracked as an issue (not a PR label); kept here for label completeness.

  

auto/last-attempt-tier-0

In-cycle escalation: most recent attempt ran at the Tier 0 slot (`tier-0`). Slot's model defined in .opencode/models/tiers.yaml.

  

auto/last-attempt-tier-1

In-cycle escalation: most recent attempt ran at the Tier 1 slot (`tier-1`). Slot's model defined in .opencode/models/tiers.yaml.

  

auto/last-attempt-tier-2

In-cycle escalation: most recent attempt ran at the Tier 2 slot (`tier-2`). Slot's model defined in .opencode/models/tiers.yaml. Gated behind IMPLEMENTER_ESCALATION_TIER2_ENABLED.

  

auto/last-attempt-tier-min

In-cycle escalation: most recent attempt ran at the Tier -1 slot (`tier-min`). Slot's model defined in .opencode/models/tiers.yaml. Suffix is ``-min`` (not ``--1``) so the Forgejo UI reads naturally.

  

Automation Tracking

Tracking issues used by the AI Automation system for agents to communicate and report.

  

auto/needs-conflict-resolution

Rebase conflict needs LLM conflict-resolver.

  

auto/needs-implementer

Failing CI needs implementer attention.

  

auto/postmortem

Documenting a driver incident or rollback.

  

auto/ready-to-merge

Reviewer has APPROVED this PR and no later REQUEST_CHANGES is outstanding. The merge driver requires this label to even consider a PR for merging. Set by the reviewer worker on APPROVE; cleared on REQUEST_CHANGES.

  

auto/restart-throttled

Train repeatedly lost master-tempo races. Driver excludes via merge_cycle until cooldown elapses; label persists as visible history.

  

auto/revert

Revert PR backing out an invariant violation. Fast-tracked through the merge driver.

  

auto/sentinel

Sentinel PR duplicated from upstream into a personal fork by tools/duplicate_prs_to_fork.py for pipeline testing. Lives only in the fork; the canonical pipeline never sees it.

  

auto/stale-inactivity

No implementer activity for N days. Flagged for human review. Auto-cleared on next push to head branch.

  

auto/unstable

Repeatedly fails on current master (>= 3 ci-fail-on-rebased-sha releases in 12 h). Excluded from driver until human triage.

  

Blocked

A ticket in a blocked state and unable to complete until some other task is completed first.

  

Bounty

$100

A bounty of $100 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$1000

A bounty of $1000 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$10000

A bounty of $10000 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$20

A bounty of $20 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$2000

A bounty of $2000 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$250

A bounty of $250 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$50

A bounty of $50 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$500

A bounty of $500 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$5000

A bounty of $5000 for any open-source contributor who provides a MR that solves this issue

  

Bounty

$750

A bounty of $750 for any open-source contributor who provides a MR that solves this issue

  

MoSCoW

Could have

Could have feature in order to satisfy the epic/legendary.

  

MoSCoW

Must have

Must have feature in order to satisfy the epic/legendary.

  

MoSCoW

Should have

Should have feature in order to satisfy the epic/legendary.

  

Needs Feedback

There are questions in the ticket that can not be completed until the project owner provides clarity.

  

Points

1

1 man-hours worth of work for an expert with no learning curve.

  

Points

13

13 man-hours worth of work for an expert with no learning curve.

  

Points

2

2 man-hours worth of work for an expert with no learning curve.

  

Points

21

21 man-hours worth of work for an expert with no learning curve.

  

Points

3

3 man-hours worth of work for an expert with no learning curve.

  

Points

34

34 man-hours worth of work for an expert with no learning curve.

  

Points

5

5 man-hours worth of work for an expert with no learning curve.

  

Points

55

55 man-hours worth of work for an expert with no learning curve.

  

Points

8

8 man-hours worth of work for an expert with no learning curve.

  

Points

88

88 man-hours worth of work for an expert with no learning curve.

  

Priority

Backlog

This ticket has backlogged priority and is not to be worked on yet

  

Priority

CI Blocker

Critical priority issue that blocks CI/CD pipeline and prevents PR merges

  

Priority

Critical

The priority is critical

  

Priority

High

The priority is high

  

Priority

Low

The priority is low

  

Priority

Medium

The priority is medium

  

Signed-off: Owner

When an epic or legendary is in review it must be signed off by owner, tech lead, and scrum master before being marked as completed.

  

Signed-off: Scrum Master

When an epic or legendary is in review it must be signed off by owner, tech lead, and scrum master before being marked as completed.

  

Signed-off: Tech Lead

When an epic or legendary is in review it must be signed off by owner, tech lead, and scrum master before being marked as completed.

  

Spike

A ticket for learning a tool or technology that is needed to be able to do future planning and design.

  

State

Completed

The ticket has been fully implemented, completed, and merged with the source code. This label should only be applied once a ticket is closed.

  

State

Duplicate

A ticket that represents the same content as an existing ticket.

  

State

In Progress

A ticket that is actively being developed.

  

State

In Review

A ticket that has had some code completed to implement but is waiting to pass peer review and is not yet merged in.

  

State

Paused

This ticket's work started but wasn't finished. It's on hold (likely in a feature branch) and will be resumed later, either due to a blocker or a delay.

  

State

Unverified

All new tickets start in this state. A developer may set it to show the ticket is unverified. This means we haven't agreed to work on it. It will either move to a verified state or be closed as wontdo.

  

State

Verified

The issue has been verified by a developer as legitimate. It will be worked on and verified tickets are now considered part of the backlog.

  

State

Wont Do

This ticket has been decided it wont be done. This may mean the bug has been determined to not be real (cant verify) or the feature is one we have decided we dont want to adopt.

  

Type

Automation

Any edits or discussion about the AI automated coding system.

  

Type

Bug

Something that doesnt work as intended.

  

Type

Discussion

Anytime a ticket represents a discussion about a subject and doesnt fall into one of the other categories.

  

Type

Documentation

An error or improvement needed in the documentation.

  

Type

Epic

Any first tier epic. That is, an epic which contains only issues as children and will not have sub-epics.

  

Type

Feature

Some new functionality not present.

  

Type

Legendary

A type of Epic which will contain other Epics.

  

Type

Refactor

A code change that restructures existing code without changing its external behavior.

  

Type

Support

Someone needs help using the project.

  

Type

Task

A generic task that doesnt fit into the other type categories.

  

Type

Testing

Work exclusively focusing on fixing or expanding testing.

No labels

auto/needs-reevaluation

controller-managed

auto/blocked-by-deps

auto/ci-timeout

auto/claimed-implementer

auto/claimed-merge

auto/claimed-reviewer

auto/driver-down

auto/invariant-violation

auto/last-attempt-tier-0

auto/last-attempt-tier-1

auto/last-attempt-tier-2

auto/last-attempt-tier-min

Automation Tracking

auto/needs-conflict-resolution

auto/needs-implementer

auto/postmortem

auto/ready-to-merge

auto/restart-throttled

auto/revert

auto/sentinel

auto/stale-inactivity

auto/unstable

Blocked

Bounty

$100

Bounty

$1000

Bounty

$10000

Bounty

$20

Bounty

$2000

Bounty

$250

Bounty

$50

Bounty

$500

Bounty

$5000

Bounty

$750

MoSCoW

Could have

MoSCoW

Must have

MoSCoW

Should have

Needs Feedback

Points

1

Points

13

Points

2

Points

21

Points

3

Points

34

Points

5

Points

55

Points

8

Points

88

Priority

Backlog

Priority

CI Blocker

Priority

Critical

Priority

High

Priority

Low

Priority

Medium

Signed-off: Owner

Signed-off: Scrum Master

Signed-off: Tech Lead

Spike

State

Completed

State

Duplicate

State

In Progress

State

In Review

State

Paused

State

Unverified

State

Verified

State

Wont Do

Type

Automation

Type

Bug

Type

Discussion

Type

Documentation

Type

Epic

Type

Feature

Type

Legendary

Type

Refactor

Type

Support

Type

Task

Type

Testing

Milestone

Clear milestone

No items

No milestone

v3.3.0

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

cleveragents/cleveragents-core!11240

No description provided.