cleveragents/cleveragents-core
4
0
Fork 3
Code Issues 6.0k Pull Requests 115 Actions Packages Projects Releases Wiki Activity

fix(cli): make plan correct accept plan_id as primary identifier #1055

Merged
brent.edwards merged 3 commits from bugfix/m3-plan-correct-plan-id into master 2026-03-21 18:45:18 +00:00
Conversation 2 Commits 3 Files Changed 2
+83 -19
brent.edwards commented 2026-03-18 19:29:38 +00:00
Member
Copy Link
Copy Source

Summary

  • plan correct now accepts a plan_id as its positional argument (in addition to decision_id). When a plan_id is given, the root decision is automatically selected as the correction target.
  • The positional parameter is renamed from decision_id to identifier with updated help text reflecting dual use.
  • Backward compatibility is fully preserved: decision_id inputs continue to work exactly as before.

How it works

  1. Try container.plan_lifecycle_service().get_plan(identifier) to check if the identifier is a plan_id
  2. If it resolves to a real Plan object, use it as resolved_plan_id and auto-select the root decision (parent_decision_id is None)
  3. If lookup fails (ResourceNotFoundError) or the result is not a Plan instance, fall back to treating the identifier as a decision_id (original behavior)

Verification

  • nox -s lint — All checks passed
  • nox -s typecheck — 0 errors, 1 pre-existing warning
  • nox -s unit_tests (correction features) — 150 scenarios passed, 683 steps passed, 0 failures

ISSUES CLOSED: #969

## Summary - **`plan correct` now accepts a plan_id** as its positional argument (in addition to decision_id). When a plan_id is given, the root decision is automatically selected as the correction target. - The positional parameter is renamed from `decision_id` to `identifier` with updated help text reflecting dual use. - Backward compatibility is fully preserved: decision_id inputs continue to work exactly as before. ## How it works 1. Try `container.plan_lifecycle_service().get_plan(identifier)` to check if the identifier is a plan_id 2. If it resolves to a real `Plan` object, use it as `resolved_plan_id` and auto-select the root decision (`parent_decision_id is None`) 3. If lookup fails (`ResourceNotFoundError`) or the result is not a `Plan` instance, fall back to treating the identifier as a decision_id (original behavior) ## Verification - `nox -s lint` — All checks passed - `nox -s typecheck` — 0 errors, 1 pre-existing warning - `nox -s unit_tests` (correction features) — 150 scenarios passed, 683 steps passed, 0 failures ISSUES CLOSED: #969
brent.edwards added the
Type
Bug
 label 2026-03-18 19:41:33 +00:00
brent.edwards added this to the v3.2.0 milestone 2026-03-18 19:41:35 +00:00
freemo approved these changes 2026-03-19 04:55:19 +00:00
Dismissed
freemo left a comment
Owner
Copy Link
Copy Source

Code Review — PR #1055 fix(cli): make plan correct accept plan_id as primary identifier

Well-scoped fix. The resolution logic (try get_plan(identifier) → auto-select root decision → fall back to decision_id) is clean and backward-compatible. The parameter rename from decision_id to identifier with updated help text accurately reflects the dual-use behavior. The docstring and examples are properly updated.

Approved. No issues found.

## Code Review — PR #1055 `fix(cli): make plan correct accept plan_id as primary identifier` Well-scoped fix. The resolution logic (try `get_plan(identifier)` → auto-select root decision → fall back to decision_id) is clean and backward-compatible. The parameter rename from `decision_id` to `identifier` with updated help text accurately reflects the dual-use behavior. The docstring and examples are properly updated. **Approved.** No issues found.
freemo requested review from freemo 2026-03-19 05:16:22 +00:00
freemo requested review from hamza.khyari 2026-03-19 05:16:22 +00:00
brent.edwards force-pushed bugfix/m3-plan-correct-plan-id from ed2f6ee63a to f5eda6f846 2026-03-19 22:12:39 +00:00 Compare
brent.edwards dismissed freemo's review 2026-03-19 22:12:39 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

brent.edwards force-pushed bugfix/m3-plan-correct-plan-id from f5eda6f846 to 14a7cdc2db 2026-03-19 22:33:53 +00:00 Compare
brent.edwards force-pushed bugfix/m3-plan-correct-plan-id from 14a7cdc2db to a449989730 2026-03-19 22:52:56 +00:00 Compare
brent.edwards added 1 commit 2026-03-19 23:43:25 +00:00
Merge branch 'master' into bugfix/m3-plan-correct-plan-id
CI / lint (pull_request) Successful in 23s
Details
CI / typecheck (pull_request) Successful in 50s
Details
CI / quality (pull_request) Successful in 32s
Details
CI / security (pull_request) Successful in 44s
Details
CI / benchmark-publish (pull_request) Has been skipped
Details
CI / build (pull_request) Successful in 28s
Details
CI / integration_tests (pull_request) Successful in 4m17s
Details
CI / coverage (pull_request) Successful in 6m39s
Details
CI / e2e_tests (pull_request) Failing after 12m29s
Details
CI / unit_tests (pull_request) Failing after 12m55s
Details
CI / benchmark-regression (pull_request) Failing after 22m24s
Details
CI / docker (pull_request) Has been cancelled
Details
dc817fe53e
brent.edwards force-pushed bugfix/m3-plan-correct-plan-id from 6767fadfdd to 9db59c3965 2026-03-21 14:48:29 +00:00 Compare
brent.edwards commented 2026-03-21 14:48:39 +00:00
Author
Member
Copy Link
Copy Source

Fixed all CI failures. Single root cause: a leftover duplicate code block in plan.py (lines 2809-2818) that referenced the old decision_id variable after it was renamed to identifier. This duplicate block was from an earlier iteration of the plan_id resolution logic that already exists above (lines 2778-2804). Removed the duplicate.

Locally verified all nox quality gates:

  • nox -s lint — PASS (0 errors)
  • nox -s typecheck — PASS (0 errors, 1 pre-existing warning)
  • nox -s unit_tests — PASS (12,214 scenarios, 0 failures)
  • nox -s integration_tests — PASS (1,672 tests, 0 failures)
  • nox -s e2e_tests — PASS (37 tests, 0 failures)
  • nox -s coverage_report — PASS (98% >= 97%)
Fixed all CI failures. Single root cause: a leftover duplicate code block in `plan.py` (lines 2809-2818) that referenced the old `decision_id` variable after it was renamed to `identifier`. This duplicate block was from an earlier iteration of the plan_id resolution logic that already exists above (lines 2778-2804). Removed the duplicate. **Locally verified all nox quality gates:** - `nox -s lint` — PASS (0 errors) - `nox -s typecheck` — PASS (0 errors, 1 pre-existing warning) - `nox -s unit_tests` — PASS (12,214 scenarios, 0 failures) - `nox -s integration_tests` — PASS (1,672 tests, 0 failures) - `nox -s e2e_tests` — PASS (37 tests, 0 failures) - `nox -s coverage_report` — PASS (98% >= 97%)
brent.edwards merged commit c2a2c5c4bf into master 2026-03-21 18:45:18 +00:00
brent.edwards deleted branch bugfix/m3-plan-correct-plan-id 2026-03-21 18:45:18 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
hamza.khyari
freemo
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.
 overdue
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 Label
Type
Bug
Milestone
No items
No Milestone v3.2.0
Projects
Clear projects
No project
Assignees
Clear assignees
aditya (Aditya Chhabra) aleenaumair (Aleena Umair) brent.edwards (Brent Edwards) CoreRasurae (Luis Mendes) drew (Drew Morris) eugen.thaci (Eugen Thaci) freemo (Jeffrey Phillips Freeman) HAL9000 (HAL 9000) HAL9001 (HAL9001) hamza.khyari (Hamza Khyari) hurui200320 (Rui Hu) justin.morris khird (Kyle Hird) org.cleveragents
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Blocks
#969 bug(cli): plan correct expects decision_id as first positional but M3 acceptance test passes plan_id
cleveragents/cleveragents-core
Reference: cleveragents/cleveragents-core#1055
Delete Branch "bugfix/m3-plan-correct-plan-id"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?