feat(apply): merge sandbox changes into targets with conflict handling #155

Closed
opened 2026-02-22 23:39:40 +00:00 by freemo · 1 comment
Owner

Metadata

  • Commit Message: feat(apply): merge sandbox changes into targets with conflict handling
  • Branch: feature/m1-apply-pipeline

Background

The sandbox merge/apply pipeline merges git worktree and copy-on-write changes into targets with explicit conflict detection and rollback hooks. PlanApplyService is wired to the merge pipeline and persists apply summary fields (files changed, validations run, conflict details). A validation gating hook gathers ValidationAttachments, runs required validations, and blocks apply on failures.

Acceptance Criteria

  • Implement sandbox merge/apply pipeline for git worktree + copy-on-write strategies with explicit conflict detection and rollback hooks.
  • Wire PlanApplyService to the merge pipeline and persist apply summary fields (files changed, validations run, conflict details).
  • Add validation gating hook: gather ValidationAttachments for the plan resources, run required validations, block apply on failures, record results.
  • Add --allow-empty apply flag behavior aligned with PlanApplyService.guard_empty_changeset.
  • Ensure apply transitions set terminal states (applied, constrained, errored, cancelled) with error details per spec.

Definition of Done

This issue is complete when:

  • All subtasks below are completed and checked off.
  • A Git commit is created where the first line of the commit message matches
    the Commit Message in Metadata exactly, followed by a blank line, then
    additional lines providing relevant details about the implementation. The
    commit body should be appropriate in size for a commit message and relatively
    complete in describing what was done.
  • The commit is pushed to the remote on the branch matching the Branch in
    Metadata exactly.
  • The commit is submitted as a pull request to master, reviewed, and
    merged before this issue is marked done.

Subtasks

  • Implement sandbox merge/apply pipeline for git worktree + copy-on-write strategies with explicit conflict detection and rollback hooks.
  • Wire PlanApplyService to the merge pipeline and persist apply summary fields (files changed, validations run, conflict details).
  • Add validation gating hook: gather ValidationAttachments for the plan resources, run required validations, block apply on failures, record results.
  • Add --allow-empty apply flag behavior aligned with PlanApplyService.guard_empty_changeset.
  • Ensure apply transitions set terminal states (applied, constrained, errored, cancelled) with error details per spec.
  • Update docs/reference/plan_apply.md with apply pipeline and conflict outcomes.
  • Tests (Behave): Add scenarios for apply success, conflict failure, empty changeset guard, and validation-gated apply.
  • Tests (Robot): Add Robot CLI test covering plan diff + plan apply --yes with sandbox merge and validation output.
  • Tests (ASV): Add benchmarks/plan_apply_bench.py for apply runtime baseline.
  • Verify coverage >=97% via nox -s coverage_report. If coverage is <97% then review the current unit test coverage report at build/coverage.xml and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun nox -s coverage_report to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
  • Run nox (all default sessions, including benchmark), fix any errors if needed ensuring nox passes across entire code base, do not ignore any failure even if it seems unrelated to this commit, fix it.

Section: #### M1: Minimal Local Source-Code Workflow (Target: Day 7, recovery path)
Status: Open

## Metadata - **Commit Message**: `feat(apply): merge sandbox changes into targets with conflict handling` - **Branch**: `feature/m1-apply-pipeline` ## Background The sandbox merge/apply pipeline merges git worktree and copy-on-write changes into targets with explicit conflict detection and rollback hooks. `PlanApplyService` is wired to the merge pipeline and persists apply summary fields (files changed, validations run, conflict details). A validation gating hook gathers ValidationAttachments, runs required validations, and blocks apply on failures. ## Acceptance Criteria - [ ] Implement sandbox merge/apply pipeline for git worktree + copy-on-write strategies with explicit conflict detection and rollback hooks. - [ ] Wire `PlanApplyService` to the merge pipeline and persist apply summary fields (files changed, validations run, conflict details). - [ ] Add validation gating hook: gather ValidationAttachments for the plan resources, run required validations, block apply on failures, record results. - [ ] Add `--allow-empty` apply flag behavior aligned with `PlanApplyService.guard_empty_changeset`. - [ ] Ensure apply transitions set terminal states (`applied`, `constrained`, `errored`, `cancelled`) with error details per spec. ## Definition of Done This issue is complete when: - All subtasks below are completed and checked off. - A Git commit is created where the **first line** of the commit message matches the Commit Message in Metadata exactly, followed by a blank line, then additional lines providing relevant details about the implementation. The commit body should be appropriate in size for a commit message and relatively complete in describing what was done. - The commit is pushed to the remote on the branch matching the **Branch** in Metadata exactly. - The commit is submitted as a **pull request** to `master`, reviewed, and **merged** before this issue is marked done. ## Subtasks - [ ] Implement sandbox merge/apply pipeline for git worktree + copy-on-write strategies with explicit conflict detection and rollback hooks. - [ ] Wire `PlanApplyService` to the merge pipeline and persist apply summary fields (files changed, validations run, conflict details). - [ ] Add validation gating hook: gather ValidationAttachments for the plan resources, run required validations, block apply on failures, record results. - [ ] Add `--allow-empty` apply flag behavior aligned with `PlanApplyService.guard_empty_changeset`. - [ ] Ensure apply transitions set terminal states (`applied`, `constrained`, `errored`, `cancelled`) with error details per spec. - [ ] Update `docs/reference/plan_apply.md` with apply pipeline and conflict outcomes. - [ ] Tests (Behave): Add scenarios for apply success, conflict failure, empty changeset guard, and validation-gated apply. - [ ] Tests (Robot): Add Robot CLI test covering `plan diff` + `plan apply --yes` with sandbox merge and validation output. - [ ] Tests (ASV): Add `benchmarks/plan_apply_bench.py` for apply runtime baseline. - [ ] Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%. - [ ] Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes across **entire** code base, do not ignore any failure even if it seems unrelated to this commit, fix it. **Section**: #### M1: Minimal Local Source-Code Workflow (Target: Day 7, recovery path) **Status**: Open
freemo added this to the v3.0.0 milestone 2026-02-22 23:39:40 +00:00
Author
Owner

Expected completion updated (Day 15 rebaseline): Day 18 / 2026-02-26 (previously Day 17 / 2026-02-25)

**Expected completion updated (Day 15 rebaseline):** Day 18 / 2026-02-26 (previously Day 17 / 2026-02-25)
freemo added the due date 2026-02-23 2026-02-23 18:41:24 +00:00
CoreRasurae added reference develop-luis-2 2026-02-25 07:46:53 +00:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

2026-02-23

Reference
cleveragents/cleveragents-core#155
No description provided.