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

fix(cli): wrap plan status --format json output in spec-required JSON envelope #11034

Closed
HAL9000 wants to merge 6 commits from bugfix/m3-plan-status-json-envelope into master
pull from: bugfix/m3-plan-status-json-envelope
merge into: cleveragents:master
Conversation 13 Commits 6 Files Changed 8
+849 -12

6 Commits

Author SHA1 Message Date
HAL9000 1e178e0c83 fix(cli): resolve spec compliance blocks for plan status JSON envelope (PR #9827)
CI / benchmark-publish (pull_request) Has been skipped
Details
CI / benchmark-regression (pull_request) Failing after 1m26s
Details
CI / lint (pull_request) Successful in 1m34s
Details
CI / typecheck (pull_request) Successful in 1m58s
Details
CI / security (pull_request) Failing after 12m15s
Details
CI / quality (pull_request) Successful in 1m35s
Details
CI / unit_tests (pull_request) Successful in 5m3s
Details
CI / integration_tests (pull_request) Failing after 3m30s
Details
CI / e2e_tests (pull_request) Failing after 4m29s
Details
CI / coverage (pull_request) Has been cancelled
Details
CI / build (pull_request) Successful in 1m10s
Details
CI / docker (pull_request) Has been cancelled
Details
CI / helm (pull_request) Successful in 49s
Details
CI / push-validation (pull_request) Successful in 41s
Details
CI / status-check (pull_request) Has been cancelled
Details 
Fix 3 root causes of ERRRORED unit test scenarios in
features/plan_status_json_envelope.feature:

1. Missing child_plan_ids and completed_child_plan_ids fields on
   the Plan Pydantic model — without these, setting these attributes
   on mock Plans fails because BaseModel forbids arbitrary attribute
   assignment (extra='forbid'). Added both as list[str] fields with
   default_factory=list to match how _status_output_dict() uses them.

2. Non-existent PlanPhase.SUBMIT enum value — step at line 319 of
   plan_status_json_envelope_steps.py used PlanPhase.SUBMIT which
   doesn't exist in the PlanPhase StrEnum (only ACTION, STRATEGIZE,
   EXECUTE, APPLY). Changed to PlanPhase.ACTION which serves the same
   test purpose: verifying that non-strategize/execute/apply phases
   report all progress steps as 'queued'.

3. Redundant mocked lifecycle service step in scenario at line 150 —
   the Background already patches _get_lifecycle_service for every
   scenario, so repeating it as an And step inside the individual
   scenario caused Behave parallel runner conflicts (undefined step)
   and duplicate setup.

Quality gates verified: lint PASS, typecheck PASS, unit_tests PASS
(687 features, 15674 scenarios all green).

ISSUES CLOSED: #9450
 2026-05-15 00:18:53 +00:00
HAL9000 69dfb8e8a0 bug(cli): plan status --format json returns raw plan dict instead of spec-required JSON envelope
CI / benchmark-publish (pull_request) Has been skipped
Details
CI / helm (pull_request) Successful in 1m3s
Details
CI / push-validation (pull_request) Successful in 1m16s
Details
CI / build (pull_request) Successful in 1m33s
Details
CI / lint (pull_request) Successful in 2m0s
Details
CI / quality (pull_request) Successful in 1m54s
Details
CI / typecheck (pull_request) Successful in 2m6s
Details
CI / benchmark-regression (pull_request) Failing after 2m11s
Details
CI / security (pull_request) Successful in 2m15s
Details
CI / integration_tests (pull_request) Failing after 3m58s
Details
CI / e2e_tests (pull_request) Successful in 5m36s
Details
CI / unit_tests (pull_request) Failing after 7m18s
Details
CI / coverage (pull_request) Has been skipped
Details
CI / docker (pull_request) Has been skipped
Details
CI / status-check (pull_request) Failing after 3s
Details 
Addresses all 5 review blockers for PR #11034:

- BLOCKER 2: Fixed progress step logic for intermediate phases (execute,
  apply). Replaced dead-code ternary with phase-ordering loop so that
  prior phases correctly show "done" (e.g. when Execute is active,
  Strategize shows done; when Apply is active, both Strategize and
  Execute show done). Removed unused _valid_phases variable.

- BLOCKER 3: Fixed Pyright type error at .get("started") call on object.
  Added isinstance(_env_timing, dict) guard before calling .get() since
  _status_output_dict() returns dict[str, object] and .get() returns object.

- SUGGESTION 1: Removed dead code _valid_phases (defined but never used).

- SUGGESTION 3: Fixed leading-space indentation in two CONTRIBUTORS.md
  entries to match the consistent format used by all other entries.

- SUGGESTION 5: Added blank-line separator between consecutive CHANGELOG
  entries that caused run-on rendering.

Closes #9450
 2026-05-14 01:03:56 +00:00
HAL9000 f6f83d39f5 fix(cli): resolve spec compliance blocks for plan status JSON envelope (PR #9827)
CI / benchmark-publish (pull_request) Has been skipped
Details
CI / lint (pull_request) Successful in 47s
Details
CI / quality (pull_request) Successful in 1m0s
Details
CI / typecheck (pull_request) Failing after 1m33s
Details
CI / build (pull_request) Successful in 50s
Details
CI / security (pull_request) Successful in 1m52s
Details
CI / push-validation (pull_request) Successful in 22s
Details
CI / helm (pull_request) Successful in 26s
Details
CI / integration_tests (pull_request) Failing after 3m25s
Details
CI / e2e_tests (pull_request) Successful in 3m35s
Details
CI / unit_tests (pull_request) Failing after 4m28s
Details
CI / coverage (pull_request) Has been skipped
Details
CI / docker (pull_request) Has been skipped
Details
CI / benchmark-regression (pull_request) Failing after 1m4s
Details
CI / status-check (pull_request) Failing after 3s
Details 
Address all 5 blocking issues from Cycle 10 review (ID 7866) for
plan status --format json output.

Changes:
- BLOCKER A: Add optional started_iso parameter to _build_envelope() and
  format_output(). plan_status() now forwards the plan-created-at ISO
  timestamp through to the outer timing.started envelope field, per spec.
- BLOCKER B: Fix child_plans string format - append " complete" suffix
  per spec (e.g. "0/2 complete" instead of "0/2").
- BLOCKER C: Fix progress step status logic so that plans in non-traditional
  phases (ACTION/SUBMIT) report "queued" for Strategize and Execute steps
  instead of incorrectly reporting "done".
- BLOCKER D: Add 5 new Behave scenarios covering timing.started presence,
  child_plans format, and ACTION phase progress reporting.

COMPLIANCE CHECKLIST:
[ ] 1. CHANGELOG.md — added spec compliance follow-up entry under [Unreleased] \u2705
[ ] 2. CONTRIBUTORS.md — updated contribution entry for HAL9000 \u2705
[ ] 3. Commit footer — ISSUES CLOSED: #9450
[CI checks] 4. CI passes - lint \u2713, format \u2713 (typecheck/unit_tests in CI)
[ ] 5. BDD/Behave tests added or updated \u2705
[ ] 6. Epic reference in PR description — v3.2.0 milestone / issue #9450
[ ] 7. Labels via forgejo-label-manager (already present: Type/Bug, State/In Review)
[ ] 8. Milestone assigned to earliest open matching milestone \u2705 v3.2.0

ISSUES CLOSED: #9450
 2026-05-08 08:04:12 +00:00
HAL9000 21a5fa52e2 style(cli): apply ruff format to plan.py and plan_status_json_envelope_steps.py 
Bracket actual work for duration measurement in plan_status so the
reported timing reflects real wall-clock cost instead of ~0ms.

ISSUES CLOSED: #9450
 2026-05-08 08:04:12 +00:00
HAL9000 884e9ffbfd fix(cli): remove triple blank lines and redundant inline import in plan.py 
Remove two triple blank lines (PEP 8 violation) between function
definitions in plan.py that were causing the CI lint gate to fail.
Also remove a redundant inline import of LifecyclePlan inside
_execute_output_dict() since it is already imported at module level.

ISSUES CLOSED: #9450
 2026-05-08 08:04:12 +00:00
HAL9000 cf15e0cc5f fix(cli): wrap plan status --format json output in spec-required JSON envelope 
- Updated plan_status() to build spec-compliant JSON envelope via _status_output_dict()
- Envelope includes: command, status, exit_code, data, timing, messages fields
- data includes: plan_id, phase, state, action, attempt, progress, execution, cost
- Computed elapsed/eta from plan timestamps and estimation_result
- Derived files_modified from plan.changeset.changes count
- Derived child_plans from plan.child_plan_ids/completed_child_plan_ids
- Moved Plan/PlanPhase/ProcessingState imports to module level
- Promoted _get_progress_status to module-level private function
- Added Behave BDD test scenarios in features/plan_status_json_envelope.feature
- Updated cli_output_formats.feature to use spec field name 'state' (not 'processing_state')
- Added CHANGELOG entry for #9450

ISSUES CLOSED: #9450
 2026-05-08 08:04:12 +00:00