fix: wire DI persistence and plan execute/apply for M1 lifecycle #957

Merged

freemo merged 2 commits from fix/m1-e2e-plan-execute-apply into master 2026-03-15 21:07:33 +00:00

Conversation 0 Commits 2 Files changed 21 +546 -65

freemo commented 2026-03-15 00:31:03 +00:00

Owner

Copy link

Summary

Fixes 5 bugs preventing the M1 E2E acceptance test (PR #789) from passing, plus updates all existing test mocks to work with the new execute_plan() CLI behavior.

Root Causes & Fixes

1. DI container bypass in _get_lifecycle_service() (action.py + plan.py)

Both action.py and plan.py created PlanLifecycleService(settings=settings) directly, bypassing the container's UnitOfWork. Data was in-memory only and lost between subprocess invocations. Fix: use container.plan_lifecycle_service().

2. plan execute CLI did not process phases

Called service.execute_plan() which is a pure state transition — never invoked PlanExecutor.run_strategize() or run_execute(). Fix: rewrote to detect the plan's phase/state and dispatch synchronously through the executor.

3. plan apply CLI missing plan_id argument

Signature was apply(yes=False) with no positional. The test calls plan apply --yes ${plan_id}. Fix: added optional plan_id positional argument with _lifecycle_apply_with_id() driving through Apply/queued → Apply/processing → Apply/applied.

4. Preflight guardrail action lookup was in-memory only

start_strategize() built action_registry from self._actions dict (empty in a new subprocess). Fix: added self.get_action(plan.action_name) to load the action from DB into the in-memory cache before the guardrail check.

5. Robot Framework Create File syntax bug + branch name

Continuation lines (...) with Create File created 9 arguments instead of 1. Fixed to use Catenate SEPARATOR=\n + Create File. Also fixed --branch main → --branch master.

6. Test mock updates for new execute_plan() behavior

The new execute_plan() calls _get_plan_executor() and service.get_plan(plan_id) for phase/state detection. Updated mocks in 8 Behave step files and 5 Robot helper files to:

• Patch _get_plan_executor in all test setups
• Set service.get_plan.return_value to real Plan objects with correct phase/state
• Fix error-path tests to use plans in executable states so error side_effects trigger
• Fix "Multiple plans eligible" → "Multiple plans ready" message text

Files Changed

Source code:

• src/cleveragents/cli/commands/plan.py — _get_lifecycle_service(), _get_plan_executor(), execute_plan(), apply(), message text fix
• src/cleveragents/cli/commands/action.py — _get_lifecycle_service() container fix
• src/cleveragents/application/services/plan_lifecycle_service.py — action DB preload in start_strategize()
• robot/e2e/m1_acceptance.robot — Create File syntax, branch name

Test mocks (Behave):

• features/steps/cli_lifecycle_coverage_steps.py
• features/steps/cli_lifecycle_robot_alignment_steps.py
• features/steps/m1_sourcecode_smoke_steps.py
• features/steps/plan_cli_commands_r2_steps.py
• features/steps/plan_cli_coverage_boost_steps.py
• features/steps/plan_cli_coverage_r2_steps.py
• features/steps/plan_lifecycle_cli_steps.py
• features/steps/plan_lifecycle_commands_coverage_steps.py

Test mocks (Robot helpers):

• robot/helper_cli_lifecycle.py
• robot/helper_cli_lifecycle_e2e.py
• robot/helper_m1_sourcecode_smoke.py
• robot/helper_m4_e2e_cli.py
• robot/helper_m4_e2e_cli_errors.py

Test Results

M1 Full Plan Lifecycle :: Exercise the complete M1 plan lifecycle ... | PASS |
1 test, 1 passed, 0 failed

Behave unit tests: 254 scenarios passed across 9 affected feature files, 0 failed.

ISSUES CLOSED: #789

## Summary Fixes 5 bugs preventing the M1 E2E acceptance test (PR #789) from passing, plus updates all existing test mocks to work with the new `execute_plan()` CLI behavior. ## Root Causes & Fixes ### 1. DI container bypass in `_get_lifecycle_service()` (action.py + plan.py) Both `action.py` and `plan.py` created `PlanLifecycleService(settings=settings)` directly, bypassing the container's `UnitOfWork`. Data was in-memory only and lost between subprocess invocations. **Fix**: use `container.plan_lifecycle_service()`. ### 2. `plan execute` CLI did not process phases Called `service.execute_plan()` which is a pure state transition — never invoked `PlanExecutor.run_strategize()` or `run_execute()`. **Fix**: rewrote to detect the plan's phase/state and dispatch synchronously through the executor. ### 3. `plan apply` CLI missing `plan_id` argument Signature was `apply(yes=False)` with no positional. The test calls `plan apply --yes ${plan_id}`. **Fix**: added optional `plan_id` positional argument with `_lifecycle_apply_with_id()` driving through Apply/queued → Apply/processing → Apply/applied. ### 4. Preflight guardrail action lookup was in-memory only `start_strategize()` built `action_registry` from `self._actions` dict (empty in a new subprocess). **Fix**: added `self.get_action(plan.action_name)` to load the action from DB into the in-memory cache before the guardrail check. ### 5. Robot Framework `Create File` syntax bug + branch name Continuation lines (`...`) with `Create File` created 9 arguments instead of 1. Fixed to use `Catenate SEPARATOR=\n` + `Create File`. Also fixed `--branch main` → `--branch master`. ### 6. Test mock updates for new `execute_plan()` behavior The new `execute_plan()` calls `_get_plan_executor()` and `service.get_plan(plan_id)` for phase/state detection. Updated mocks in 8 Behave step files and 5 Robot helper files to: - Patch `_get_plan_executor` in all test setups - Set `service.get_plan.return_value` to real Plan objects with correct phase/state - Fix error-path tests to use plans in executable states so error side_effects trigger - Fix "Multiple plans eligible" → "Multiple plans ready" message text ## Files Changed ### Source code: - `src/cleveragents/cli/commands/plan.py` — `_get_lifecycle_service()`, `_get_plan_executor()`, `execute_plan()`, `apply()`, message text fix - `src/cleveragents/cli/commands/action.py` — `_get_lifecycle_service()` container fix - `src/cleveragents/application/services/plan_lifecycle_service.py` — action DB preload in `start_strategize()` - `robot/e2e/m1_acceptance.robot` — `Create File` syntax, branch name ### Test mocks (Behave): - `features/steps/cli_lifecycle_coverage_steps.py` - `features/steps/cli_lifecycle_robot_alignment_steps.py` - `features/steps/m1_sourcecode_smoke_steps.py` - `features/steps/plan_cli_commands_r2_steps.py` - `features/steps/plan_cli_coverage_boost_steps.py` - `features/steps/plan_cli_coverage_r2_steps.py` - `features/steps/plan_lifecycle_cli_steps.py` - `features/steps/plan_lifecycle_commands_coverage_steps.py` ### Test mocks (Robot helpers): - `robot/helper_cli_lifecycle.py` - `robot/helper_cli_lifecycle_e2e.py` - `robot/helper_m1_sourcecode_smoke.py` - `robot/helper_m4_e2e_cli.py` - `robot/helper_m4_e2e_cli_errors.py` ## Test Results ``` M1 Full Plan Lifecycle :: Exercise the complete M1 plan lifecycle ... | PASS | 1 test, 1 passed, 0 failed ``` Behave unit tests: 254 scenarios passed across 9 affected feature files, 0 failed. ISSUES CLOSED: #789

freemo changed target branch from test/e2e-m1-acceptance to master 2026-03-15 00:41:18 +00:00

freemo force-pushed fix/m1-e2e-plan-execute-apply from 9a652b9d47 to 03031375c7 2026-03-15 00:45:24 +00:00 Compare

freemo scheduled this pull request to auto merge when all checks succeed 2026-03-15 00:45:47 +00:00

freemo force-pushed fix/m1-e2e-plan-execute-apply from ea1bc12acf to f95feb6a20 2026-03-15 20:47:28 +00:00 Compare

freemo force-pushed fix/m1-e2e-plan-execute-apply from f95feb6a20 to 5f07316641 2026-03-15 20:50:04 +00:00 Compare

freemo merged commit 5f07316641 into master 2026-03-15 21:07:33 +00:00

freemo deleted branch fix/m1-e2e-plan-execute-apply 2026-03-15 21:07:33 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

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

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

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!957

No description provided.