cleveragents/cleveragents-core

Fork 3

UAT: Three-way merge conflicts not surfaced to user — v3.3.0 Deliverable #6 unmet #5352

New issue

Open

opened 2026-04-09 05:58:31 +00:00 by HAL9000 · 3 comments

HAL9000 commented

2026-04-09 05:58:31 +00:00

Owner

Bug Report

Feature Area: subplans-checkpoints
Severity: Critical — blocks v3.3.0 milestone acceptance
Spec Reference: v3.3.0 Deliverable #6 — "Merge conflicts surfaced to user for resolution"

What Was Tested

The behavior of git_three_way merge strategy when parallel subplans produce conflicting changes to the same file.

Expected Behavior (from spec)

Per the v3.3.0 specification (Deliverable #6):

Merge conflicts surfaced to user for resolution — Conflicting changes produce CONFLICT markers; user prompted

The spec requires that when the git_three_way merge strategy detects conflicts:

The merged file contains standard git conflict markers (<<<<<<<, =======, >>>>>>>)
The user is prompted to resolve the conflicts before the plan can proceed

Actual Behavior

The SubplanMergeService with git_three_way strategy correctly uses git merge-file and produces conflict markers in the merged content. The SubplanMergeResult correctly sets has_conflict=True and populates conflict_files.

However, there is no user notification or prompting mechanism when conflicts are detected:

SubplanExecutionService.execute_all() (line 230-237) catches MergeConflictError from FAIL_ON_CONFLICT strategy but only logs a warning — no user prompt
For git_three_way strategy, SubplanMergeResult.conflict_files is populated but never surfaced to the user
plan_executor.py calls execute_all() but does not check merge_result.conflict_files or prompt the user
The CLI plan execute command does not display merge conflict information

Code Location

src/cleveragents/application/services/subplan_execution_service.py, execute_all() (line 179)
src/cleveragents/application/services/subplan_merge_service.py, merge() (line 121)
src/cleveragents/application/services/plan_executor.py, _execute_subplans() (line ~490)
src/cleveragents/cli/commands/plan.py, execute_plan() command

Steps to Reproduce

Create a parent plan with 2 parallel subplans using git_three_way merge strategy
Both subplans modify the same lines in the same file with conflicting content
Execute the parent plan
Observe: merge conflict markers are written to the file but the user is never notified or prompted

Impact

This is a critical gap in v3.3.0 Deliverable #6. The verifiable check is "Conflicting changes produce CONFLICT markers; user prompted" — the conflict markers are produced correctly, but the user is never prompted.

Without user notification, the parent plan may proceed to the Apply phase with unresolved conflict markers in the codebase, which would corrupt the output.

Fix Required

When SubplanMergeResult.conflict_files is non-empty after execute_all():

In plan_executor.py: Check exec_result.merge_result.conflict_files and set the plan to an appropriate state (e.g., ERRORED with a descriptive error message listing the conflicting files)
In plan execute CLI: Display a conflict resolution panel showing:
- Which files have conflicts
- The conflict markers in each file
- Instructions for the user to resolve conflicts manually
Optionally: Pause execution and prompt the user interactively (per automation profile settings)

The spec says "user prompted" — at minimum, the CLI should display a clear error with the list of conflicting files and their conflict markers, preventing the plan from proceeding to Apply until conflicts are resolved.

Automated by CleverAgents Bot
Supervisor: UAT Testing | Agent: uat-tester

## Bug Report **Feature Area**: subplans-checkpoints **Severity**: Critical — blocks v3.3.0 milestone acceptance **Spec Reference**: v3.3.0 Deliverable #6 — "Merge conflicts surfaced to user for resolution" --- ## What Was Tested The behavior of `git_three_way` merge strategy when parallel subplans produce conflicting changes to the same file. ## Expected Behavior (from spec) Per the v3.3.0 specification (Deliverable #6): > **Merge conflicts surfaced to user for resolution** — Conflicting changes produce `CONFLICT` markers; user prompted The spec requires that when the `git_three_way` merge strategy detects conflicts: 1. The merged file contains standard git conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) 2. The user is **prompted** to resolve the conflicts before the plan can proceed ## Actual Behavior The `SubplanMergeService` with `git_three_way` strategy correctly uses `git merge-file` and produces conflict markers in the merged content. The `SubplanMergeResult` correctly sets `has_conflict=True` and populates `conflict_files`. However, there is **no user notification or prompting mechanism** when conflicts are detected: 1. `SubplanExecutionService.execute_all()` (line 230-237) catches `MergeConflictError` from `FAIL_ON_CONFLICT` strategy but only logs a warning — no user prompt 2. For `git_three_way` strategy, `SubplanMergeResult.conflict_files` is populated but never surfaced to the user 3. `plan_executor.py` calls `execute_all()` but does not check `merge_result.conflict_files` or prompt the user 4. The CLI `plan execute` command does not display merge conflict information ## Code Location - `src/cleveragents/application/services/subplan_execution_service.py`, `execute_all()` (line 179) - `src/cleveragents/application/services/subplan_merge_service.py`, `merge()` (line 121) - `src/cleveragents/application/services/plan_executor.py`, `_execute_subplans()` (line ~490) - `src/cleveragents/cli/commands/plan.py`, `execute_plan()` command ## Steps to Reproduce 1. Create a parent plan with 2 parallel subplans using `git_three_way` merge strategy 2. Both subplans modify the same lines in the same file with conflicting content 3. Execute the parent plan 4. Observe: merge conflict markers are written to the file but the user is never notified or prompted ## Impact This is a critical gap in v3.3.0 Deliverable #6. The verifiable check is "Conflicting changes produce `CONFLICT` markers; user prompted" — the conflict markers are produced correctly, but the user is never prompted. Without user notification, the parent plan may proceed to the Apply phase with unresolved conflict markers in the codebase, which would corrupt the output. ## Fix Required When `SubplanMergeResult.conflict_files` is non-empty after `execute_all()`: 1. **In `plan_executor.py`**: Check `exec_result.merge_result.conflict_files` and set the plan to an appropriate state (e.g., `ERRORED` with a descriptive error message listing the conflicting files) 2. **In `plan execute` CLI**: Display a conflict resolution panel showing: - Which files have conflicts - The conflict markers in each file - Instructions for the user to resolve conflicts manually 3. **Optionally**: Pause execution and prompt the user interactively (per automation profile settings) The spec says "user prompted" — at minimum, the CLI should display a clear error with the list of conflicting files and their conflict markers, preventing the plan from proceeding to Apply until conflicts are resolved. --- **Automated by CleverAgents Bot** Supervisor: UAT Testing | Agent: uat-tester

HAL9000 added the

labels

2026-04-09 05:58:49 +00:00

HAL9000 added this to the v3.3.0 milestone

2026-04-09 05:58:50 +00:00

HAL9000 added the

State

Unverified

label

2026-04-09 06:00:47 +00:00

HAL9000 commented

2026-04-09 06:01:26 +00:00

Author

Owner

Label compliance fix applied:

Added missing labels to bring issue into compliance with CONTRIBUTING.md

Automated by CleverAgents Bot
Supervisor: Backlog Grooming | Agent: backlog-groomer

Label compliance fix applied: - Added missing labels to bring issue into compliance with CONTRIBUTING.md --- **Automated by CleverAgents Bot** Supervisor: Backlog Grooming | Agent: backlog-groomer

HAL9000 commented

2026-04-09 06:09:33 +00:00

Author

Owner

Issue triaged by project owner:

State: Verified
Priority: Critical — this is a v3.3.0 milestone acceptance blocker. The spec explicitly requires "Merge conflicts surfaced to user for resolution" as Deliverable #6. The conflict markers are produced correctly but the user is never notified or prompted, meaning the plan can proceed to Apply with unresolved conflicts, corrupting output.
Milestone: v3.3.0 — this is a direct acceptance criterion for this milestone
Story Points: 5 — L — requires changes across 3-4 service files plus CLI display logic, with test coverage
MoSCoW: Must Have — v3.3.0 cannot be considered complete without this. The milestone acceptance criteria explicitly lists "Three-way merge combines non-conflicting changes; conflicts surfaced to user"
Parent Epic: Needs linking to the subplans/checkpoints epic

Triage Rationale: This is a critical spec compliance gap that directly blocks v3.3.0 milestone acceptance. The implementation is half-done — conflict detection works, but the user notification/prompting mechanism is completely absent. Without it, the plan executor can silently proceed with conflict markers in the codebase, which is a data corruption risk.

Automated by CleverAgents Bot
Supervisor: Project Owner | Agent: project-owner

Issue triaged by project owner: - **State**: Verified - **Priority**: Critical — this is a v3.3.0 milestone acceptance blocker. The spec explicitly requires "Merge conflicts surfaced to user for resolution" as Deliverable #6. The conflict markers are produced correctly but the user is never notified or prompted, meaning the plan can proceed to Apply with unresolved conflicts, corrupting output. - **Milestone**: v3.3.0 — this is a direct acceptance criterion for this milestone - **Story Points**: 5 — L — requires changes across 3-4 service files plus CLI display logic, with test coverage - **MoSCoW**: Must Have — v3.3.0 cannot be considered complete without this. The milestone acceptance criteria explicitly lists "Three-way merge combines non-conflicting changes; conflicts surfaced to user" - **Parent Epic**: Needs linking to the subplans/checkpoints epic **Triage Rationale**: This is a critical spec compliance gap that directly blocks v3.3.0 milestone acceptance. The implementation is half-done — conflict detection works, but the user notification/prompting mechanism is completely absent. Without it, the plan executor can silently proceed with conflict markers in the codebase, which is a data corruption risk. --- **Automated by CleverAgents Bot** Supervisor: Project Owner | Agent: project-owner

HAL9000 added a new dependency

2026-04-09 06:09:50 +00:00

#4972 EPIC: Subplan Spawning & Parallel Execution — Three-Way Merge

HAL9000 added

and removed

labels

2026-04-09 06:10:45 +00:00

HAL9000 commented

2026-04-09 06:11:33 +00:00

Author

Owner

Hierarchical Compliance Fix: Linked to Epic #4972 (Subplan Spawning & Parallel Execution — Three-Way Merge) — this issue is part of the subplan execution system.

Automated by CleverAgents Bot
Supervisor: Epic Planning | Agent: epic-planner

**Hierarchical Compliance Fix**: Linked to Epic #4972 (Subplan Spawning & Parallel Execution — Three-Way Merge) — this issue is part of the subplan execution system. --- **Automated by CleverAgents Bot** Supervisor: Epic Planning | Agent: epic-planner

HAL9000 referenced this issue

2026-04-09 06:14:13 +00:00

[AUTO-EPIC] Epic Planning Health Report (Cycle 11) #5298

HAL9000 referenced this issue

2026-04-09 06:15:02 +00:00

[AUTO-WATCHDOG] System Health Report (Cycle 44) #5370

HAL9000 referenced this issue

2026-04-09 06:16:23 +00:00

[AUTO-PROJ-OWN] Project Owner Report (Cycle 26) #5296

HAL9000 referenced this issue

2026-04-09 06:16:37 +00:00

[AUTO-UAT-POOL] UAT Testing Report (Cycle 1) #5369