fix(cli): add --execution-env-priority flag to plan use #972

2026-03-16T08:11:59Z

hurui200320 commented

2026-03-16 08:11:59 +00:00

Summary

Adds the missing --execution-env-priority flag to the agents plan use command, aligning the CLI with the specification (spec line 12501). The flag accepts fallback (default) or override and controls execution environment routing precedence per ADR-043:

override: The specified execution environment always wins, bypassing devcontainer auto-detection.
fallback: The specified environment defers to auto-detected devcontainers or project-level overrides.

Changes

Domain model (cleveragents.domain.models.core.plan):
- Added ExecutionEnvPriority StrEnum with FALLBACK/OVERRIDE values.
- Changed execution_env_priority field type to ExecutionEnvPriority | None (leverages Pydantic enum validation).
- Added @model_validator enforcing that execution_env_priority requires execution_environment (domain-level fail-fast invariant). Verified validate_assignment=True is set on Plan.model_config.
- Updated Plan.as_cli_dict() to include execution_environment and execution_env_priority, with fallback default of "fallback" for pre-migration data where execution_env_priority is None.
CLI (cleveragents.cli.commands.plan):
- Added --execution-env-priority parameter to use_action.
- Validation: priority requires --execution-environment, enum value validation, case-insensitive input.
- Defaults to "fallback" when --execution-environment is set without explicit priority.
- Updated _print_lifecycle_plan and _plan_spec_dict to display the priority, defaulting to "fallback" for pre-migration data.
- Updated _plan_spec_dict docstring to mention new keys.
- Hoisted ExecutionEnvPriority import to function-entry deferred imports in both _plan_spec_dict and _print_lifecycle_plan (no longer conditional on execution environment being set).
- Guarded service.save_plan(plan) with has_overrides flag so it is only called when CLI overrides were actually applied.
Persistence (cleveragents.infrastructure.database):
- Added execution_environment (String(255), nullable) and execution_env_priority (String(20), nullable) columns to LifecyclePlanModel.
- Updated from_domain()/to_domain() for round-trip serialization including ExecutionEnvPriority enum reconstruction. Uses direct attribute access (plan.execution_environment) instead of defensive getattr — Plan fields always exist on the Pydantic BaseModel.
- Updated LifecyclePlanRepository.update() to persist both fields using direct attribute access.
- Added Alembic migration m4_003_plan_env_columns adding both columns to the v3_plans table. Uses String(255) for execution_environment to accommodate namespaced resource names. Descends from m6_005_profile_guards_json.
Service (cleveragents.application.services.plan_lifecycle_service):
- Added save_plan() public convenience method for callers that need to re-persist after post-creation mutations.
Tests:
- 18 Behave scenarios covering:
  - CLI acceptance criteria (valid values, defaults, validation errors, output display, case-insensitive input, service invocation with call_args verification).
  - Domain model validator invariant: construction with priority but no environment raises ValueError; construction with both fields succeeds.
  - ExecutionEnvPriority enum: values verification, StrEnum subclass assertion.
  - Plan.as_cli_dict(): includes both fields when set, omits both when None, defaults priority to "fallback" for pre-migration data.
  - DB round-trip serialization: from_domain() → to_domain() preserves both fields; preserves None values.
- 5 Robot Framework integration tests.
- Updated pre-existing SimpleNamespace-based plan test fixtures in database_models_lifecycle_coverage_steps, database_models_new_coverage_steps, database_models_coverage_r2_steps, and repositories_error_handling_coverage_steps to include execution_environment and execution_env_priority attributes.
- Simplified Robot helper sys.path pattern to standard approach.
Changelog: Updated per CONTRIBUTING.md requirements.

Review Fixes (Brent Edwards, Review #2384)

P2 #1 — Defensive getattr: Replaced getattr(plan, "execution_environment", None) with direct plan.execution_environment access in both LifecyclePlanModel.from_domain() and LifecyclePlanRepository.update(). Plan is a Pydantic BaseModel with default=None, so the field always exists. Updated 4 pre-existing SimpleNamespace-based test fixtures to include the new attributes.
P2 #2 — Late conditional import: Hoisted ExecutionEnvPriority import from inside conditional blocks to function-entry deferred imports in both _plan_spec_dict and _print_lifecycle_plan.
P3 — Migration naming: Acknowledged as deferred (cosmetic only). Updated m4_003 to descend from m6_005_profile_guards_json (post-rebase chain fix).
Rebase: Branch rebased onto latest master with merge conflict in CHANGELOG.md resolved.

Deferred Items

Partial failure atomicity (#8 from review): If save_plan() fails after use_action() succeeds, the plan exists in the DB without CLI overrides. This requires service-layer restructuring beyond the scope of this ticket.
Alembic migration naming (#11 from review): Migration m4_003 depends on m6_005, creating non-sequential naming. Renaming an existing migration risks breaking the chain for anyone who has already applied it.

Quality Gates

Session	Result
lint	PASS
typecheck	PASS (0 errors)
unit_tests	PASS (11,125 scenarios, 0 failures)
integration_tests	PASS (1,562 tests, 0 failures)
coverage_report	97% (threshold: 97%)

Closes #886

## Summary Adds the missing `--execution-env-priority` flag to the `agents plan use` command, aligning the CLI with the specification (spec line 12501). The flag accepts `fallback` (default) or `override` and controls execution environment routing precedence per ADR-043: - **`override`**: The specified execution environment always wins, bypassing devcontainer auto-detection. - **`fallback`**: The specified environment defers to auto-detected devcontainers or project-level overrides. ### Changes - **Domain model** (`cleveragents.domain.models.core.plan`): - Added `ExecutionEnvPriority` StrEnum with `FALLBACK`/`OVERRIDE` values. - Changed `execution_env_priority` field type to `ExecutionEnvPriority | None` (leverages Pydantic enum validation). - Added `@model_validator` enforcing that `execution_env_priority` requires `execution_environment` (domain-level fail-fast invariant). Verified `validate_assignment=True` is set on `Plan.model_config`. - Updated `Plan.as_cli_dict()` to include `execution_environment` and `execution_env_priority`, with fallback default of `"fallback"` for pre-migration data where `execution_env_priority` is `None`. - **CLI** (`cleveragents.cli.commands.plan`): - Added `--execution-env-priority` parameter to `use_action`. - Validation: priority requires `--execution-environment`, enum value validation, case-insensitive input. - Defaults to `"fallback"` when `--execution-environment` is set without explicit priority. - Updated `_print_lifecycle_plan` and `_plan_spec_dict` to display the priority, defaulting to `"fallback"` for pre-migration data. - Updated `_plan_spec_dict` docstring to mention new keys. - Hoisted `ExecutionEnvPriority` import to function-entry deferred imports in both `_plan_spec_dict` and `_print_lifecycle_plan` (no longer conditional on execution environment being set). - Guarded `service.save_plan(plan)` with `has_overrides` flag so it is only called when CLI overrides were actually applied. - **Persistence** (`cleveragents.infrastructure.database`): - Added `execution_environment` (`String(255)`, nullable) and `execution_env_priority` (`String(20)`, nullable) columns to `LifecyclePlanModel`. - Updated `from_domain()`/`to_domain()` for round-trip serialization including `ExecutionEnvPriority` enum reconstruction. Uses direct attribute access (`plan.execution_environment`) instead of defensive `getattr` — Plan fields always exist on the Pydantic BaseModel. - Updated `LifecyclePlanRepository.update()` to persist both fields using direct attribute access. - Added Alembic migration `m4_003_plan_env_columns` adding both columns to the `v3_plans` table. Uses `String(255)` for `execution_environment` to accommodate namespaced resource names. Descends from `m6_005_profile_guards_json`. - **Service** (`cleveragents.application.services.plan_lifecycle_service`): - Added `save_plan()` public convenience method for callers that need to re-persist after post-creation mutations. - **Tests**: - 18 Behave scenarios covering: - CLI acceptance criteria (valid values, defaults, validation errors, output display, case-insensitive input, service invocation with `call_args` verification). - Domain model validator invariant: construction with priority but no environment raises `ValueError`; construction with both fields succeeds. - `ExecutionEnvPriority` enum: values verification, `StrEnum` subclass assertion. - `Plan.as_cli_dict()`: includes both fields when set, omits both when `None`, defaults priority to `"fallback"` for pre-migration data. - DB round-trip serialization: `from_domain()` → `to_domain()` preserves both fields; preserves `None` values. - 5 Robot Framework integration tests. - Updated pre-existing `SimpleNamespace`-based plan test fixtures in `database_models_lifecycle_coverage_steps`, `database_models_new_coverage_steps`, `database_models_coverage_r2_steps`, and `repositories_error_handling_coverage_steps` to include `execution_environment` and `execution_env_priority` attributes. - Simplified Robot helper `sys.path` pattern to standard approach. - **Changelog**: Updated per CONTRIBUTING.md requirements. ### Review Fixes (Brent Edwards, Review #2384) - **P2 #1 — Defensive `getattr`**: Replaced `getattr(plan, "execution_environment", None)` with direct `plan.execution_environment` access in both `LifecyclePlanModel.from_domain()` and `LifecyclePlanRepository.update()`. Plan is a Pydantic BaseModel with `default=None`, so the field always exists. Updated 4 pre-existing `SimpleNamespace`-based test fixtures to include the new attributes. - **P2 #2 — Late conditional import**: Hoisted `ExecutionEnvPriority` import from inside conditional blocks to function-entry deferred imports in both `_plan_spec_dict` and `_print_lifecycle_plan`. - **P3 — Migration naming**: Acknowledged as deferred (cosmetic only). Updated `m4_003` to descend from `m6_005_profile_guards_json` (post-rebase chain fix). - **Rebase**: Branch rebased onto latest `master` with merge conflict in `CHANGELOG.md` resolved. ### Deferred Items - **Partial failure atomicity** (#8 from review): If `save_plan()` fails after `use_action()` succeeds, the plan exists in the DB without CLI overrides. This requires service-layer restructuring beyond the scope of this ticket. - **Alembic migration naming** (#11 from review): Migration `m4_003` depends on `m6_005`, creating non-sequential naming. Renaming an existing migration risks breaking the chain for anyone who has already applied it. ### Quality Gates | Session | Result | |---------|--------| | lint | PASS | | typecheck | PASS (0 errors) | | unit_tests | PASS (11,125 scenarios, 0 failures) | | integration_tests | PASS (1,562 tests, 0 failures) | | coverage_report | 97% (threshold: 97%) | Closes #886

hurui200320 added this to the v3.3.0 milestone 2026-03-16 08:12:13 +00:00

hurui200320 added the

Type

Task

label 2026-03-16 08:12:15 +00:00

hurui200320 commented

2026-03-16 08:38:02 +00:00

Code Review — PR #972 (`fix(cli): add --execution-env-priority flag to plan use`)

Self-review by: @hurui200320
Ticket: #886
Branch: feature/m3-plan-use-env-priority

Verdict: REQUEST CHANGES

The specification compliance of the flag implementation is strong — the flag name, allowed values, default behavior, validation, and output all exactly match the spec. The code is well-structured and follows existing patterns consistently. However, several issues need to be addressed before merge.

Blocking Issues

1. CHANGELOG.md not updated

Severity: High
Ref: CONTRIBUTING.md, Pull Request Process, item #6
Description: CONTRIBUTING.md explicitly requires every PR to include a changelog entry. CHANGELOG.md has no changes in this PR.
Fix: Add an entry under the appropriate version section documenting the new --execution-env-priority flag.

2. `execution_env_priority` (and `execution_environment`) not persisted to database

Severity: High (pre-existing pattern)
Files: src/cleveragents/cli/commands/plan.py:1571-1646, src/cleveragents/infrastructure/database/models.py (LifecyclePlanModel), src/cleveragents/application/services/plan_lifecycle_service.py:716-718
Description: The use_action CLI handler calls service.use_action() at line 1571, which creates and persists the plan to the database. The execution_env_priority (and other overrides like execution_environment, actors, etc.) are set on the in-memory plan object after the persist call. No re-persist follows. Additionally, LifecyclePlanModel has no columns for execution_environment or execution_env_priority, so even a re-persist would not save them. This means the values are lost on process restart or any subsequent plan status/plan execute call.
Note: This is a pre-existing architectural gap that affects all CLI overrides, not something introduced by this PR. However, ticket subtask ST-2 explicitly states "Pass priority value through to plan_lifecycle_service.py plan creation," which implies the service should receive and persist this value.
Fix: Either (a) add execution_env_priority (and execution_environment) as columns to LifecyclePlanModel, update from_domain()/to_domain()/update(), and add a re-persist call after mutations; or (b) pass the value as a parameter to service.use_action() so it's set before the initial persist. If this is intentionally deferred to a future PR, the subtask and acceptance criteria should be updated to reflect that.

3. Missing model-level validation for priority-without-environment invariant

Severity: High
File: src/cleveragents/domain/models/core/plan.py:694-697
Description: The business rule that execution_env_priority requires execution_environment is enforced only in the CLI layer (plan.py:1624-1629). There is no @model_validator on the Plan class. Any code path that creates a Plan outside the CLI (service layer, API, tests, deserialization) can silently violate this invariant. CONTRIBUTING.md's "Fail-Fast" and "Argument Validation" principles require domain-level validation.

Fix: Add a @model_validator(mode="after") to Plan:

@model_validator(mode="after")
def validate_env_priority_requires_environment(self) -> Plan:
    if self.execution_env_priority and not self.execution_environment:
        raise ValueError("execution_env_priority requires execution_environment to be set")
    return self

Major Issues

4. `Plan.as_cli_dict()` omits `execution_environment` and `execution_env_priority`

Severity: Major
File: src/cleveragents/domain/models/core/plan.py:914-1014
Description: The _plan_spec_dict() function in the CLI correctly includes both fields, but the model's own as_cli_dict() method does not. Any code path that uses as_cli_dict() (programmatic API consumers, other CLI commands) will silently omit these fields.

Fix: Add to as_cli_dict():

if self.execution_environment:
    result["execution_environment"] = self.execution_environment
    if self.execution_env_priority:
        result["execution_env_priority"] = self.execution_env_priority

5. Robot Framework integration tests use mocks (CONTRIBUTING.md violation)

Severity: Major (pre-existing pattern)
File: robot/helper_plan_use_env_priority.py (throughout)
Ref: CONTRIBUTING.md, Test Isolation and Mock Placement
Description: CONTRIBUTING.md states mocks are "permitted only in unit tests" and "integration tests must exercise real services...mocking of any kind is strictly prohibited in integration tests." The Robot helper uses MagicMock and patch extensively. This follows an established codebase-wide pattern (20+ existing helpers), but technically violates the guidelines.
Fix: Either rewrite the Robot tests to exercise the real service stack without mocks, or document this as an accepted deviation from the guideline.

6. Tests do not verify `use_action()` was actually called

Severity: Major
File: features/steps/plan_use_env_priority_steps.py:203-219
Description: The Then steps verify plan attribute values by reading context.mock_service.use_action.return_value, but no scenario asserts that use_action() was actually called or checks the arguments passed to it. If a refactor changed the CLI to skip use_action(), these tests could still pass.
Fix: Add mock_service.use_action.assert_called_once() and verify call_args in at least one scenario.

Minor Issues

7. Model field typed as `str | None` instead of `ExecutionEnvPriority | None`

File: src/cleveragents/domain/models/core/plan.py:694
Description: The field accepts any string, relying solely on CLI-layer validation. Any programmatic caller can set arbitrary values. This matches the existing execution_environment pattern but misses Pydantic's built-in enum validation.
Fix: Change to ExecutionEnvPriority | None or add a @field_validator.

8. Naming inconsistency: `execution_env_priority` vs `execution_environment`

Files: Model, CLI, enum names
Description: Abbreviated env in execution_env_priority but full environment in execution_environment. This flows through the model field, CLI flag, and enum class names.
Fix: Consider execution_environment_priority / --execution-environment-priority for consistency. This is easier to change now than later.

9. No test for case-insensitive input handling

File: features/plan_use_env_priority.feature
Description: The CLI normalizes via .lower(), so OVERRIDE and Override should work, but no scenario tests this. If .lower() were removed, existing tests would still pass.
Fix: Add a scenario with uppercase input.

10. Behave Scenario 6 output assertion is fragile

File: features/plan_use_env_priority.feature:41
Description: Checks only that output contains the label "Execution Env Priority" but not the value. The test could pass even if the priority value were missing.
Fix: Strengthen to assert both label and value are present.

11. Robot helper uses aggressive `sys.path`/`sys.modules` manipulation

File: robot/helper_plan_use_env_priority.py:14-26
Description: The path filtering heuristic and module purging loop are fragile. Only 1 other helper uses this pattern; most use the simpler sys.path.insert(0, _SRC).
Fix: Use the standard simpler pattern unless there's a documented reason.

Positive Observations

Spec compliance is exact: Flag name, values, default, and behavior all match the specification precisely.
CLI validation is correct: The TOCTOU pattern is safe — the same .lower() is applied to both validation and storage in single-threaded CLI code.
Error messages are clear: No internal details leaked; valid values are listed on failure.
Deferred import pattern is correct and consistent with 11 other such imports in the file.
Behave step naming is well-namespaced with "plan env priority" prefix; no conflicts with existing steps.
Linting passes: All changed files pass ruff checks.
No security vulnerabilities: No injection vectors, no dangerous downstream usage of the priority value.

## Code Review — PR #972 (`fix(cli): add --execution-env-priority flag to plan use`) **Self-review by:** @hurui200320 **Ticket:** #886 **Branch:** `feature/m3-plan-use-env-priority` --- ### Verdict: **REQUEST CHANGES** The specification compliance of the flag implementation is strong — the flag name, allowed values, default behavior, validation, and output all exactly match the spec. The code is well-structured and follows existing patterns consistently. However, several issues need to be addressed before merge. --- ### Blocking Issues #### 1. CHANGELOG.md not updated - **Severity:** High - **Ref:** CONTRIBUTING.md, Pull Request Process, item #6 - **Description:** CONTRIBUTING.md explicitly requires every PR to include a changelog entry. `CHANGELOG.md` has no changes in this PR. - **Fix:** Add an entry under the appropriate version section documenting the new `--execution-env-priority` flag. #### 2. `execution_env_priority` (and `execution_environment`) not persisted to database - **Severity:** High (pre-existing pattern) - **Files:** `src/cleveragents/cli/commands/plan.py:1571-1646`, `src/cleveragents/infrastructure/database/models.py` (`LifecyclePlanModel`), `src/cleveragents/application/services/plan_lifecycle_service.py:716-718` - **Description:** The `use_action` CLI handler calls `service.use_action()` at line 1571, which creates and persists the plan to the database. The `execution_env_priority` (and other overrides like `execution_environment`, actors, etc.) are set on the in-memory plan object *after* the persist call. No re-persist follows. Additionally, `LifecyclePlanModel` has **no columns** for `execution_environment` or `execution_env_priority`, so even a re-persist would not save them. This means the values are lost on process restart or any subsequent `plan status`/`plan execute` call. - **Note:** This is a **pre-existing architectural gap** that affects all CLI overrides, not something introduced by this PR. However, ticket subtask ST-2 explicitly states "Pass priority value through to `plan_lifecycle_service.py` plan creation," which implies the service should receive and persist this value. - **Fix:** Either (a) add `execution_env_priority` (and `execution_environment`) as columns to `LifecyclePlanModel`, update `from_domain()`/`to_domain()`/`update()`, and add a re-persist call after mutations; or (b) pass the value as a parameter to `service.use_action()` so it's set before the initial persist. If this is intentionally deferred to a future PR, the subtask and acceptance criteria should be updated to reflect that. #### 3. Missing model-level validation for priority-without-environment invariant - **Severity:** High - **File:** `src/cleveragents/domain/models/core/plan.py:694-697` - **Description:** The business rule that `execution_env_priority` requires `execution_environment` is enforced only in the CLI layer (`plan.py:1624-1629`). There is no `@model_validator` on the `Plan` class. Any code path that creates a `Plan` outside the CLI (service layer, API, tests, deserialization) can silently violate this invariant. CONTRIBUTING.md's "Fail-Fast" and "Argument Validation" principles require domain-level validation. - **Fix:** Add a `@model_validator(mode="after")` to `Plan`: ```python @model_validator(mode="after") def validate_env_priority_requires_environment(self) -> Plan: if self.execution_env_priority and not self.execution_environment: raise ValueError("execution_env_priority requires execution_environment to be set") return self ``` --- ### Major Issues #### 4. `Plan.as_cli_dict()` omits `execution_environment` and `execution_env_priority` - **Severity:** Major - **File:** `src/cleveragents/domain/models/core/plan.py:914-1014` - **Description:** The `_plan_spec_dict()` function in the CLI correctly includes both fields, but the model's own `as_cli_dict()` method does not. Any code path that uses `as_cli_dict()` (programmatic API consumers, other CLI commands) will silently omit these fields. - **Fix:** Add to `as_cli_dict()`: ```python if self.execution_environment: result["execution_environment"] = self.execution_environment if self.execution_env_priority: result["execution_env_priority"] = self.execution_env_priority ``` #### 5. Robot Framework integration tests use mocks (CONTRIBUTING.md violation) - **Severity:** Major (pre-existing pattern) - **File:** `robot/helper_plan_use_env_priority.py` (throughout) - **Ref:** CONTRIBUTING.md, Test Isolation and Mock Placement - **Description:** CONTRIBUTING.md states mocks are "permitted only in unit tests" and "integration tests must exercise real services...mocking of any kind is strictly prohibited in integration tests." The Robot helper uses `MagicMock` and `patch` extensively. This follows an established codebase-wide pattern (20+ existing helpers), but technically violates the guidelines. - **Fix:** Either rewrite the Robot tests to exercise the real service stack without mocks, or document this as an accepted deviation from the guideline. #### 6. Tests do not verify `use_action()` was actually called - **Severity:** Major - **File:** `features/steps/plan_use_env_priority_steps.py:203-219` - **Description:** The `Then` steps verify plan attribute values by reading `context.mock_service.use_action.return_value`, but no scenario asserts that `use_action()` was actually called or checks the arguments passed to it. If a refactor changed the CLI to skip `use_action()`, these tests could still pass. - **Fix:** Add `mock_service.use_action.assert_called_once()` and verify `call_args` in at least one scenario. --- ### Minor Issues #### 7. Model field typed as `str | None` instead of `ExecutionEnvPriority | None` - **File:** `src/cleveragents/domain/models/core/plan.py:694` - **Description:** The field accepts any string, relying solely on CLI-layer validation. Any programmatic caller can set arbitrary values. This matches the existing `execution_environment` pattern but misses Pydantic's built-in enum validation. - **Fix:** Change to `ExecutionEnvPriority | None` or add a `@field_validator`. #### 8. Naming inconsistency: `execution_env_priority` vs `execution_environment` - **Files:** Model, CLI, enum names - **Description:** Abbreviated `env` in `execution_env_priority` but full `environment` in `execution_environment`. This flows through the model field, CLI flag, and enum class names. - **Fix:** Consider `execution_environment_priority` / `--execution-environment-priority` for consistency. This is easier to change now than later. #### 9. No test for case-insensitive input handling - **File:** `features/plan_use_env_priority.feature` - **Description:** The CLI normalizes via `.lower()`, so `OVERRIDE` and `Override` should work, but no scenario tests this. If `.lower()` were removed, existing tests would still pass. - **Fix:** Add a scenario with uppercase input. #### 10. Behave Scenario 6 output assertion is fragile - **File:** `features/plan_use_env_priority.feature:41` - **Description:** Checks only that output contains the label `"Execution Env Priority"` but not the value. The test could pass even if the priority value were missing. - **Fix:** Strengthen to assert both label and value are present. #### 11. Robot helper uses aggressive `sys.path`/`sys.modules` manipulation - **File:** `robot/helper_plan_use_env_priority.py:14-26` - **Description:** The path filtering heuristic and module purging loop are fragile. Only 1 other helper uses this pattern; most use the simpler `sys.path.insert(0, _SRC)`. - **Fix:** Use the standard simpler pattern unless there's a documented reason. --- ### Positive Observations - **Spec compliance is exact**: Flag name, values, default, and behavior all match the specification precisely. - **CLI validation is correct**: The TOCTOU pattern is safe — the same `.lower()` is applied to both validation and storage in single-threaded CLI code. - **Error messages are clear**: No internal details leaked; valid values are listed on failure. - **Deferred import pattern is correct and consistent** with 11 other such imports in the file. - **Behave step naming is well-namespaced** with `"plan env priority"` prefix; no conflicts with existing steps. - **Linting passes**: All changed files pass ruff checks. - **No security vulnerabilities**: No injection vectors, no dangerous downstream usage of the priority value.

hurui200320 force-pushed feature/m3-plan-use-env-priority from 022e43f916 to 8df51f61d2

2026-03-16 09:13:41 +00:00

Compare

hurui200320 commented

2026-03-16 09:14:21 +00:00

Review Response — Commit `8df51f61`

Addressed all actionable items from the self-review. Force-pushed an amended commit. Here is the disposition of each item:

Blocking Issues

1. CHANGELOG.md not updated — FIXED

Added entry under ## Unreleased describing the new --execution-env-priority flag, domain model changes, and model validation. References (#886).

2. `execution_env_priority` not persisted to database — DEFERRED

This is a pre-existing architectural gap that affects all CLI overrides (execution_environment, actor overrides, etc.). The LifecyclePlanModel has no columns for any of these fields. Fixing this requires:

Adding columns to LifecyclePlanModel for execution_environment and execution_env_priority
Updating from_domain() / to_domain() / update() methods
Adding an Alembic migration
Either re-persisting after mutations or passing values through use_action() signature

This is a cross-cutting concern that should be addressed as a separate issue covering all CLI overrides. The subtask "Pass priority value through to plan_lifecycle_service.py plan creation" is satisfied in that the value is correctly set on the Plan domain object returned by the service; the gap is that the service does not re-persist after CLI mutations (same as all other overrides).

3. Missing model-level validation — FIXED

Added @model_validator(mode="after") named validate_env_priority_requires_environment to the Plan class. Enforces the invariant that execution_env_priority requires execution_environment to be set. With validate_assignment=True in the model config, this fires on every field assignment, providing defense-in-depth for all code paths (CLI, service, API, deserialization).

Major Issues

4. `Plan.as_cli_dict()` omits fields — FIXED

Added execution_environment and execution_env_priority (with .value for stable string output) to as_cli_dict(), conditionally included when execution environment is set.

5. Robot Framework integration tests use mocks — DEFERRED

This is a pre-existing codebase-wide pattern used by 20+ Robot helpers. Rewriting just this helper to use real services would be inconsistent with the rest of the test suite. This should be addressed as a comprehensive effort across all Robot helpers, not piecemeal per PR.

6. Tests do not verify `use_action()` was called — FIXED

Added step_verify_use_action_called step definition with mock_service.use_action.assert_called_once(). Used in Scenario 1 ("Plan use with --execution-env-priority override and --execution-environment") to verify the service was actually invoked.

Minor Issues

7. Model field typed as `str | None` — FIXED

Changed execution_env_priority field type from str | None to ExecutionEnvPriority | None. This leverages Pydantic's built-in enum validation via coercion. Note: this is actually more consistent with the existing codebase pattern — phase: PlanPhase and processing_state: ProcessingState are both typed as their enum types, not str. The execution_environment: str | None pattern is the outlier. Updated all output sites to use .value for explicit string serialization.

8. Naming inconsistency — NOT CHANGED (spec-driven)

The CLI flag name --execution-env-priority comes directly from the specification (CLI Synopsis line 331). The model field name execution_env_priority follows standard kebab-to-snake-case mapping. Changing this would deviate from the spec. If the naming should be aligned, that would require a spec amendment first.

9. No test for case-insensitive input — FIXED

Added Scenario 8: "Plan use accepts uppercase --execution-env-priority value" that passes "OVERRIDE" and verifies it normalizes to "override".

10. Behave Scenario 6 output assertion fragile — FIXED

Strengthened Scenario 6 to assert both the label "Execution Env Priority" AND the value "override" are present in the output.

11. Robot helper aggressive sys.path manipulation — FIXED

Replaced the aggressive sys.path rebuild + sys.modules flush pattern with the standard simpler approach: if _SRC not in sys.path: sys.path.insert(0, _SRC). This matches the pattern used by helper_action_cli_spec.py and others.

Quality Gates (post-fix)

Session	Result
lint	PASS
typecheck	PASS (0 errors)
unit_tests	PASS (10,823 scenarios, 0 failures)
integration_tests	2 pre-existing failures (Cli Plan Context Commands — FileNotFoundError, unrelated)
coverage_report	97% (threshold: 97%)

## Review Response — Commit `8df51f61` Addressed all actionable items from the self-review. Force-pushed an amended commit. Here is the disposition of each item: --- ### Blocking Issues #### 1. CHANGELOG.md not updated — **FIXED** Added entry under `## Unreleased` describing the new `--execution-env-priority` flag, domain model changes, and model validation. References `(#886)`. #### 2. `execution_env_priority` not persisted to database — **DEFERRED** This is a **pre-existing architectural gap** that affects all CLI overrides (`execution_environment`, actor overrides, etc.). The `LifecyclePlanModel` has no columns for any of these fields. Fixing this requires: - Adding columns to `LifecyclePlanModel` for `execution_environment` and `execution_env_priority` - Updating `from_domain()` / `to_domain()` / `update()` methods - Adding an Alembic migration - Either re-persisting after mutations or passing values through `use_action()` signature This is a cross-cutting concern that should be addressed as a separate issue covering all CLI overrides. The subtask "Pass priority value through to `plan_lifecycle_service.py` plan creation" is satisfied in that the value is correctly set on the Plan domain object returned by the service; the gap is that the service does not re-persist after CLI mutations (same as all other overrides). #### 3. Missing model-level validation — **FIXED** Added `@model_validator(mode="after")` named `validate_env_priority_requires_environment` to the `Plan` class. Enforces the invariant that `execution_env_priority` requires `execution_environment` to be set. With `validate_assignment=True` in the model config, this fires on every field assignment, providing defense-in-depth for all code paths (CLI, service, API, deserialization). --- ### Major Issues #### 4. `Plan.as_cli_dict()` omits fields — **FIXED** Added `execution_environment` and `execution_env_priority` (with `.value` for stable string output) to `as_cli_dict()`, conditionally included when execution environment is set. #### 5. Robot Framework integration tests use mocks — **DEFERRED** This is a **pre-existing codebase-wide pattern** used by 20+ Robot helpers. Rewriting just this helper to use real services would be inconsistent with the rest of the test suite. This should be addressed as a comprehensive effort across all Robot helpers, not piecemeal per PR. #### 6. Tests do not verify `use_action()` was called — **FIXED** Added `step_verify_use_action_called` step definition with `mock_service.use_action.assert_called_once()`. Used in Scenario 1 ("Plan use with --execution-env-priority override and --execution-environment") to verify the service was actually invoked. --- ### Minor Issues #### 7. Model field typed as `str | None` — **FIXED** Changed `execution_env_priority` field type from `str | None` to `ExecutionEnvPriority | None`. This leverages Pydantic's built-in enum validation via coercion. Note: this is actually **more consistent** with the existing codebase pattern — `phase: PlanPhase` and `processing_state: ProcessingState` are both typed as their enum types, not `str`. The `execution_environment: str | None` pattern is the outlier. Updated all output sites to use `.value` for explicit string serialization. #### 8. Naming inconsistency — **NOT CHANGED (spec-driven)** The CLI flag name `--execution-env-priority` comes directly from the specification (CLI Synopsis line 331). The model field name `execution_env_priority` follows standard kebab-to-snake-case mapping. Changing this would deviate from the spec. If the naming should be aligned, that would require a spec amendment first. #### 9. No test for case-insensitive input — **FIXED** Added Scenario 8: "Plan use accepts uppercase --execution-env-priority value" that passes `"OVERRIDE"` and verifies it normalizes to `"override"`. #### 10. Behave Scenario 6 output assertion fragile — **FIXED** Strengthened Scenario 6 to assert both the label `"Execution Env Priority"` AND the value `"override"` are present in the output. #### 11. Robot helper aggressive sys.path manipulation — **FIXED** Replaced the aggressive `sys.path` rebuild + `sys.modules` flush pattern with the standard simpler approach: `if _SRC not in sys.path: sys.path.insert(0, _SRC)`. This matches the pattern used by `helper_action_cli_spec.py` and others. --- ### Quality Gates (post-fix) | Session | Result | |---------|--------| | lint | PASS | | typecheck | PASS (0 errors) | | unit_tests | PASS (10,823 scenarios, 0 failures) | | integration_tests | 2 pre-existing failures (Cli Plan Context Commands — FileNotFoundError, unrelated) | | coverage_report | 97% (threshold: 97%) |

hurui200320 force-pushed feature/m3-plan-use-env-priority from 8df51f61d2 to ad3e4708c4

2026-03-16 10:20:18 +00:00

Compare

hurui200320 commented

2026-03-16 10:20:58 +00:00

Review Response — Commit `ad3e4708`

Addressed the remaining deferred item (issue 2: persistence) from the self-review. Force-pushed an amended commit. Here is the updated disposition:

Previously Deferred — Now Resolved

2. `execution_env_priority` (and `execution_environment`) not persisted to database — FIXED

This was previously deferred as a pre-existing architectural gap, but the ticket's acceptance criterion explicitly states "Flag value is persisted on the Plan model when creating the plan." The persistence gap has now been fully addressed:

DB model columns (LifecyclePlanModel): Added execution_environment and execution_env_priority as String(20) nullable columns.
from_domain(): Serializes ExecutionEnvPriority enum to its .value string with null guard.
to_domain(): Reconstructs ExecutionEnvPriority enum from stored string, with null handling.
Repository update(): Writes both fields during plan updates using the same getattr + .value pattern as other optional enum fields.
PlanLifecycleService.save_plan(): New public convenience method that delegates to _commit_plan(), giving callers a clean API to re-persist after post-creation mutations. No-op in non-persisted (in-memory) mode.
CLI use_action: Calls service.save_plan(plan) after applying all CLI overrides (environment, priority, actors, automation profile), ensuring the values survive across sessions.
Alembic migration m4_003_plan_env_columns: Adds both columns to v3_plans with nullable constraint and batch-mode DDL for SQLite compatibility.

Test coverage for persistence:

Scenario 1 now asserts save_plan.assert_called_once() to verify the re-persist path.
Scenario 4 (default fallback) also asserts save_plan.assert_called_once() to verify persistence on the default path.

Note: This approach (re-persist after mutation) is intentionally scoped to the fields introduced by this PR. The broader architectural gap (other CLI overrides like actor overrides also not being persisted) remains a separate concern — those fields were already not persisted before this PR, and this PR does not regress them. A separate issue should be created to address the remaining unpersisted CLI overrides.

Items Unchanged from Previous Response

All other items from the self-review remain as addressed in commit 8df51f6:

1. CHANGELOG.md — Updated (now also mentions persistence).
3. Model-level validation — @model_validator added.
4. as_cli_dict() omissions — Both fields added.
5. Robot mocks — Deferred (pre-existing codebase-wide pattern).
6. Tests verify use_action() called — Step added.
7. Field typed as enum — ExecutionEnvPriority | None.
8. Naming — Spec-driven, not changed.
9. Case-insensitive test — Scenario 8 added.
10. Fragile output assertion — Strengthened.
11. Robot sys.path — Simplified.

Quality Gates (post-fix)

Session	Result
lint	PASS
typecheck	PASS (0 errors)
unit_tests	PASS (10,823 scenarios, 0 failures)
integration_tests	PASS (1,516 tests, 0 failures)
coverage_report	97% (threshold: 97%)

## Review Response — Commit `ad3e4708` Addressed the remaining deferred item (issue 2: persistence) from the self-review. Force-pushed an amended commit. Here is the updated disposition: --- ### Previously Deferred — Now Resolved #### 2. `execution_env_priority` (and `execution_environment`) not persisted to database — **FIXED** This was previously deferred as a pre-existing architectural gap, but the ticket's acceptance criterion explicitly states "Flag value is persisted on the Plan model when creating the plan." The persistence gap has now been fully addressed: - **DB model columns** (`LifecyclePlanModel`): Added `execution_environment` and `execution_env_priority` as `String(20)` nullable columns. - **`from_domain()`**: Serializes `ExecutionEnvPriority` enum to its `.value` string with null guard. - **`to_domain()`**: Reconstructs `ExecutionEnvPriority` enum from stored string, with null handling. - **Repository `update()`**: Writes both fields during plan updates using the same `getattr` + `.value` pattern as other optional enum fields. - **`PlanLifecycleService.save_plan()`**: New public convenience method that delegates to `_commit_plan()`, giving callers a clean API to re-persist after post-creation mutations. No-op in non-persisted (in-memory) mode. - **CLI `use_action`**: Calls `service.save_plan(plan)` after applying all CLI overrides (environment, priority, actors, automation profile), ensuring the values survive across sessions. - **Alembic migration** `m4_003_plan_env_columns`: Adds both columns to `v3_plans` with nullable constraint and batch-mode DDL for SQLite compatibility. **Test coverage for persistence:** - Scenario 1 now asserts `save_plan.assert_called_once()` to verify the re-persist path. - Scenario 4 (default fallback) also asserts `save_plan.assert_called_once()` to verify persistence on the default path. **Note:** This approach (re-persist after mutation) is intentionally scoped to the fields introduced by this PR. The broader architectural gap (other CLI overrides like actor overrides also not being persisted) remains a separate concern — those fields were already not persisted before this PR, and this PR does not regress them. A separate issue should be created to address the remaining unpersisted CLI overrides. --- ### Items Unchanged from Previous Response All other items from the self-review remain as addressed in commit `8df51f6`: - **1. CHANGELOG.md** — Updated (now also mentions persistence). - **3. Model-level validation** — `@model_validator` added. - **4. `as_cli_dict()` omissions** — Both fields added. - **5. Robot mocks** — Deferred (pre-existing codebase-wide pattern). - **6. Tests verify `use_action()` called** — Step added. - **7. Field typed as enum** — `ExecutionEnvPriority | None`. - **8. Naming** — Spec-driven, not changed. - **9. Case-insensitive test** — Scenario 8 added. - **10. Fragile output assertion** — Strengthened. - **11. Robot `sys.path`** — Simplified. --- ### Quality Gates (post-fix) | Session | Result | |---------|--------| | lint | PASS | | typecheck | PASS (0 errors) | | unit_tests | PASS (10,823 scenarios, 0 failures) | | integration_tests | PASS (1,516 tests, 0 failures) | | coverage_report | 97% (threshold: 97%) |

hurui200320 referenced this pull request

2026-03-16 10:21:14 +00:00

fix(cli): add missing `--execution-env-priority` flag to `plan use` #886

freemo reviewed 2026-03-16 16:14:07 +00:00

freemo left a comment

PM Day 36 Triage: --execution-env-priority flag for plan use. Closes #886. Self-reviews identified and fixed Blocking issues (CHANGELOG, DB persistence gap, model validation). DB persistence now properly implemented with Alembic migration. Reviewer needed: @hamza.khyari. M4 scope.

hurui200320 force-pushed feature/m3-plan-use-env-priority from ad3e4708c4 to 200365acbd

2026-03-17 07:28:04 +00:00

Compare

hurui200320 commented

2026-03-17 07:59:29 +00:00

Self-QA Review — Verdict: ✅ Approve

This PR has been through an automated self-review and fix loop (2 cycles). The code is now ready for external review.

Loop Summary

Cycle	Review Verdict	Findings	Fixes Applied
1	Request Changes	17 (6 major, 6 minor, 5 nits)	11 fixes applied, 2 deferred
2	Approve	6 minor non-blocking	— (approval threshold met)

Cycle 1 — Findings & Fixes

Major fixes applied:

Column sizing: String(20) → String(255) for execution_environment column (DB model + Alembic migration) to accommodate future resource names like local/my-dev-container.
Domain validator test coverage: Added 2 Behave scenarios testing @model_validator independently of CLI (priority without environment raises ValueError; both fields set succeeds).
DB round-trip test coverage: Added 2 Behave scenarios testing LifecyclePlanModel.from_domain() → to_domain() for both set and None values.
as_cli_dict() test coverage: Added 3 Behave scenarios (fields set, fields None, pre-migration fallback default).
Stronger assertion: save_plan now verified with call_args identity check, not just call count.
Conditional save: Added has_overrides guard so save_plan() only fires when CLI overrides are actually applied.

Minor fixes applied:

Hoisted duplicate ExecutionEnvPriority import above conditional branches.
Added pre-migration fallback default ("fallback") in as_cli_dict(), _plan_spec_dict(), and _print_lifecycle_plan().
Added 3 ExecutionEnvPriority enum test scenarios.
Updated _plan_spec_dict docstring.

Deferred (documented, out of scope):

Partial failure atomicity for save_plan() — requires service-layer restructuring beyond #886.
Alembic migration naming (m4_003 depends on m6_004) — renaming risks breaking migration chain; cosmetic only.

Cycle 2 — Remaining Minor Items (Non-blocking)

Triplicated fallback-default logic could be DRY'd into a Plan.effective_env_priority property.
Validator test step uses overly broad except (ValueError, Exception).
ExecutionEnvPriority import in use_action() hoisted unconditionally — could be guarded.
Scenario 2 (fallback path) missing save_plan assertion.
Repository update() path not independently tested for new fields.
Pre-migration fallback not tested in _plan_spec_dict() / _print_lifecycle_plan() output paths.

None of these affect functional correctness — they are code style and test quality refinements.

Quality Gates (All Passing)

Gate	Result
`nox -e lint`	✅ PASS
`nox -e typecheck`	✅ PASS (0 errors)
`nox -e unit_tests`	✅ PASS (10,833 scenarios)
`nox -e integration_tests`	✅ PASS (1,516 tests)
`nox -e coverage_report`	✅ PASS (97%)

Full implementation notes posted to ticket #886.

## Self-QA Review — Verdict: ✅ Approve This PR has been through an automated self-review and fix loop (2 cycles). The code is now ready for external review. --- ### Loop Summary | Cycle | Review Verdict | Findings | Fixes Applied | |-------|---------------|----------|---------------| | 1 | Request Changes | 17 (6 major, 6 minor, 5 nits) | 11 fixes applied, 2 deferred | | 2 | **Approve** | 6 minor non-blocking | — (approval threshold met) | ### Cycle 1 — Findings & Fixes **Major fixes applied:** 1. **Column sizing:** `String(20)` → `String(255)` for `execution_environment` column (DB model + Alembic migration) to accommodate future resource names like `local/my-dev-container`. 2. **Domain validator test coverage:** Added 2 Behave scenarios testing `@model_validator` independently of CLI (priority without environment raises `ValueError`; both fields set succeeds). 3. **DB round-trip test coverage:** Added 2 Behave scenarios testing `LifecyclePlanModel.from_domain()` → `to_domain()` for both set and `None` values. 4. **`as_cli_dict()` test coverage:** Added 3 Behave scenarios (fields set, fields `None`, pre-migration fallback default). 5. **Stronger assertion:** `save_plan` now verified with `call_args` identity check, not just call count. 6. **Conditional save:** Added `has_overrides` guard so `save_plan()` only fires when CLI overrides are actually applied. **Minor fixes applied:** - Hoisted duplicate `ExecutionEnvPriority` import above conditional branches. - Added pre-migration fallback default (`"fallback"`) in `as_cli_dict()`, `_plan_spec_dict()`, and `_print_lifecycle_plan()`. - Added 3 `ExecutionEnvPriority` enum test scenarios. - Updated `_plan_spec_dict` docstring. **Deferred (documented, out of scope):** - Partial failure atomicity for `save_plan()` — requires service-layer restructuring beyond #886. - Alembic migration naming (`m4_003` depends on `m6_004`) — renaming risks breaking migration chain; cosmetic only. ### Cycle 2 — Remaining Minor Items (Non-blocking) 1. Triplicated fallback-default logic could be DRY'd into a `Plan.effective_env_priority` property. 2. Validator test step uses overly broad `except (ValueError, Exception)`. 3. `ExecutionEnvPriority` import in `use_action()` hoisted unconditionally — could be guarded. 4. Scenario 2 (fallback path) missing `save_plan` assertion. 5. Repository `update()` path not independently tested for new fields. 6. Pre-migration fallback not tested in `_plan_spec_dict()` / `_print_lifecycle_plan()` output paths. None of these affect functional correctness — they are code style and test quality refinements. ### Quality Gates (All Passing) | Gate | Result | |------|--------| | `nox -e lint` | ✅ PASS | | `nox -e typecheck` | ✅ PASS (0 errors) | | `nox -e unit_tests` | ✅ PASS (10,833 scenarios) | | `nox -e integration_tests` | ✅ PASS (1,516 tests) | | `nox -e coverage_report` | ✅ PASS (97%) | --- Full implementation notes posted to [ticket #886](https://git.cleverthis.com/cleveragents/cleveragents-core/issues/886#issuecomment-66074).

hurui200320 force-pushed feature/m3-plan-use-env-priority from 200365acbd to 55c7bc73f1

2026-03-17 08:19:14 +00:00

Compare

freemo commented

2026-03-17 18:23:25 +00:00

PM Status — Day 37 — Rebase Required

This PR has merge conflicts and cannot be merged in its current state. 42% of all open PRs (21 of 50) have conflicts — this is a project-wide issue that must be resolved.

@hurui200320 — Please rebase this PR onto master by Day 39 EOD (2026-03-19). If you cannot rebase by then, please post a comment explaining the blocker.

PM rebase request — Day 37

## PM Status — Day 37 — Rebase Required This PR has **merge conflicts** and cannot be merged in its current state. 42% of all open PRs (21 of 50) have conflicts — this is a project-wide issue that must be resolved. @hurui200320 — Please rebase this PR onto `master` by **Day 39 EOD (2026-03-19)**. If you cannot rebase by then, please post a comment explaining the blocker. --- *PM rebase request — Day 37*

brent.edwards approved these changes 2026-03-17 19:52:47 +00:00

Dismissed

brent.edwards left a comment

Code Review — PR #972 `fix(cli): add --execution-env-priority to plan use`

Reviewer: @brent.edwards | Size: L (+795, 11 files) | Focus: Domain model, CLI, migration, persistence

No P0 or P1 findings.

This is a well-structured feature implementation:

ExecutionEnvPriority as StrEnum with Pydantic model validator is the correct pattern
Migration has proper upgrade()/downgrade() with batch_alter_table for SQLite
has_overrides flag avoids unnecessary DB writes — good optimization
save_plan() public API on PlanLifecycleService is clean
DB round-trip tested in Behave scenarios

P2:should-fix (2)

1. Defensive getattr on fields that always exist — repositories.py:1365: getattr(plan, "execution_environment", None). Since Plan is a Pydantic BaseModel with default=None, the field always exists. Use plan.execution_environment directly — the getattr creates a false impression of optional attributes.

2. Late conditional import of ExecutionEnvPriority inside _plan_spec_dict rendering function — fragile, import failure surfaces only when displaying a plan with an execution environment. Move to module-level.

P3:nit (1)

3. Migration naming jumps from m6_004 to m4_003 which is confusing. PR description acknowledges this as deferred — acceptable.

Verdict: APPROVED with P2 comments. Both are minor and can be fixed in follow-up.

## Code Review — PR #972 `fix(cli): add --execution-env-priority to plan use` **Reviewer:** @brent.edwards | **Size:** L (+795, 11 files) | **Focus:** Domain model, CLI, migration, persistence --- ### No P0 or P1 findings. This is a well-structured feature implementation: - `ExecutionEnvPriority` as `StrEnum` with Pydantic model validator is the correct pattern - Migration has proper `upgrade()`/`downgrade()` with `batch_alter_table` for SQLite - `has_overrides` flag avoids unnecessary DB writes — good optimization - `save_plan()` public API on `PlanLifecycleService` is clean - DB round-trip tested in Behave scenarios --- ### P2:should-fix (2) **1.** Defensive `getattr` on fields that always exist — `repositories.py:1365`: `getattr(plan, "execution_environment", None)`. Since `Plan` is a Pydantic BaseModel with `default=None`, the field always exists. Use `plan.execution_environment` directly — the `getattr` creates a false impression of optional attributes. **2.** Late conditional import of `ExecutionEnvPriority` inside `_plan_spec_dict` rendering function — fragile, import failure surfaces only when displaying a plan with an execution environment. Move to module-level. --- ### P3:nit (1) **3.** Migration naming jumps from `m6_004` to `m4_003` which is confusing. PR description acknowledges this as deferred — acceptable. --- **Verdict:** APPROVED with P2 comments. Both are minor and can be fixed in follow-up.

hurui200320 force-pushed feature/m3-plan-use-env-priority from 55c7bc73f1 to 3d2fc8b383

2026-03-18 07:57:40 +00:00

Compare

hurui200320 dismissed brent.edwards's review 2026-03-18 07:57:41 +00:00

Reason:

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

hurui200320 commented

2026-03-18 07:58:49 +00:00

Review Response — Brent Edwards Review #2384

Addressed both P2 items from @brent.edwards's review. Branch rebased onto latest master and force-pushed as commit 3d2fc8b3.

P2 #1 — Defensive `getattr` on always-present fields — FIXED

Replaced getattr(plan, "execution_environment", None) with direct plan.execution_environment access in:

LifecyclePlanModel.from_domain() (cleveragents.infrastructure.database.models)
LifecyclePlanRepository.update() (cleveragents.infrastructure.database.repositories)

Same for execution_env_priority: replaced getattr(plan, "execution_env_priority", None) is not None with plan.execution_env_priority is not None.

Since Plan is a Pydantic BaseModel with default=None for both fields, they always exist. The getattr created a false impression of optional attributes.

Ripple fix: Four pre-existing SimpleNamespace-based test fixtures that simulate Plan objects needed execution_environment=None and execution_env_priority=None added:

_make_plan_object() in database_models_new_coverage_steps.py
plan_domain_stateless in database_models_lifecycle_coverage_steps.py
_base_plan_ns() in database_models_coverage_r2_steps.py
_make_fake_plan() in repositories_error_handling_coverage_steps.py

P2 #2 — Late conditional import of `ExecutionEnvPriority` — FIXED

Hoisted ExecutionEnvPriority import from inside conditional if plan.execution_environment: blocks to function-entry deferred imports in:

_plan_spec_dict() — added to existing from cleveragents.domain.models.core.plan import ... deferred import
_print_lifecycle_plan() — added to existing from cleveragents.domain.models.core.plan import ... deferred import

The imports are now eagerly resolved when the function is called, rather than lazily when a plan happens to have an execution environment. Import failures will now surface immediately, not only on specific code paths.

P3 — Migration naming — DEFERRED (acknowledged)

Migration m4_003 now descends from m6_005_profile_guards_json (updated post-rebase to fix the Alembic multiple-heads issue). The non-sequential naming (m4_003 depending on m6_005) remains cosmetic and is documented in the PR description.

Rebase

Branch rebased onto latest master (20efab90). One merge conflict in CHANGELOG.md was resolved (both master's new entries and our entry preserved).

Quality Gates (All Passing)

Gate	Result
`nox -e lint`	✅ PASS
`nox -e typecheck`	✅ PASS (0 errors)
`nox -e unit_tests`	✅ PASS (11,125 scenarios)
`nox -e integration_tests`	✅ PASS (1,562 tests)
`nox -e coverage_report`	✅ PASS (97%)

## Review Response — Brent Edwards Review #2384 Addressed both P2 items from @brent.edwards's review. Branch rebased onto latest `master` and force-pushed as commit `3d2fc8b3`. --- ### P2 #1 — Defensive `getattr` on always-present fields — **FIXED** Replaced `getattr(plan, "execution_environment", None)` with direct `plan.execution_environment` access in: - `LifecyclePlanModel.from_domain()` (`cleveragents.infrastructure.database.models`) - `LifecyclePlanRepository.update()` (`cleveragents.infrastructure.database.repositories`) Same for `execution_env_priority`: replaced `getattr(plan, "execution_env_priority", None) is not None` with `plan.execution_env_priority is not None`. Since `Plan` is a Pydantic `BaseModel` with `default=None` for both fields, they always exist. The `getattr` created a false impression of optional attributes. **Ripple fix**: Four pre-existing `SimpleNamespace`-based test fixtures that simulate `Plan` objects needed `execution_environment=None` and `execution_env_priority=None` added: - `_make_plan_object()` in `database_models_new_coverage_steps.py` - `plan_domain_stateless` in `database_models_lifecycle_coverage_steps.py` - `_base_plan_ns()` in `database_models_coverage_r2_steps.py` - `_make_fake_plan()` in `repositories_error_handling_coverage_steps.py` --- ### P2 #2 — Late conditional import of `ExecutionEnvPriority` — **FIXED** Hoisted `ExecutionEnvPriority` import from inside conditional `if plan.execution_environment:` blocks to function-entry deferred imports in: - `_plan_spec_dict()` — added to existing `from cleveragents.domain.models.core.plan import ...` deferred import - `_print_lifecycle_plan()` — added to existing `from cleveragents.domain.models.core.plan import ...` deferred import The imports are now eagerly resolved when the function is called, rather than lazily when a plan happens to have an execution environment. Import failures will now surface immediately, not only on specific code paths. --- ### P3 — Migration naming — **DEFERRED (acknowledged)** Migration `m4_003` now descends from `m6_005_profile_guards_json` (updated post-rebase to fix the Alembic multiple-heads issue). The non-sequential naming (`m4_003` depending on `m6_005`) remains cosmetic and is documented in the PR description. --- ### Rebase Branch rebased onto latest `master` (`20efab90`). One merge conflict in `CHANGELOG.md` was resolved (both master's new entries and our entry preserved). ### Quality Gates (All Passing) | Gate | Result | |------|--------| | `nox -e lint` | ✅ PASS | | `nox -e typecheck` | ✅ PASS (0 errors) | | `nox -e unit_tests` | ✅ PASS (11,125 scenarios) | | `nox -e integration_tests` | ✅ PASS (1,562 tests) | | `nox -e coverage_report` | ✅ PASS (97%) |

hurui200320 force-pushed feature/m3-plan-use-env-priority from 3d2fc8b383 to a1e6c63f5d

2026-03-18 08:03:34 +00:00

Compare

hurui200320 merged commit 48ecf4c00c into master

2026-03-18 08:13:56 +00:00

hurui200320 deleted branch feature/m3-plan-use-env-priority

2026-03-18 08:13:57 +00:00

hurui200320 referenced this issue from a commit

2026-03-18 08:13:57 +00:00

fix(cli): add --execution-env-priority flag to plan use (#972)

Sign in to join this conversation.

3 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: cleveragents/cleveragents-core#972

fix(cli): add --execution-env-priority flag to plan use #972

Summary

Changes

Review Fixes (Brent Edwards, Review #2384)

Deferred Items

Quality Gates

Code Review — PR #972 (fix(cli): add --execution-env-priority flag to plan use)

Verdict: REQUEST CHANGES

Blocking Issues

1. CHANGELOG.md not updated

2. execution_env_priority (and execution_environment) not persisted to database

3. Missing model-level validation for priority-without-environment invariant

Major Issues

4. Plan.as_cli_dict() omits execution_environment and execution_env_priority

5. Robot Framework integration tests use mocks (CONTRIBUTING.md violation)

6. Tests do not verify use_action() was actually called

Minor Issues

7. Model field typed as str | None instead of ExecutionEnvPriority | None

8. Naming inconsistency: execution_env_priority vs execution_environment

9. No test for case-insensitive input handling

10. Behave Scenario 6 output assertion is fragile

11. Robot helper uses aggressive sys.path/sys.modules manipulation

Positive Observations

Review Response — Commit 8df51f61

Blocking Issues

1. CHANGELOG.md not updated — FIXED

2. execution_env_priority not persisted to database — DEFERRED

3. Missing model-level validation — FIXED

Major Issues

4. Plan.as_cli_dict() omits fields — FIXED

5. Robot Framework integration tests use mocks — DEFERRED

6. Tests do not verify use_action() was called — FIXED

Minor Issues

7. Model field typed as str | None — FIXED

8. Naming inconsistency — NOT CHANGED (spec-driven)

9. No test for case-insensitive input — FIXED

10. Behave Scenario 6 output assertion fragile — FIXED

11. Robot helper aggressive sys.path manipulation — FIXED

Quality Gates (post-fix)

Review Response — Commit ad3e4708

Previously Deferred — Now Resolved

2. execution_env_priority (and execution_environment) not persisted to database — FIXED

Items Unchanged from Previous Response

Quality Gates (post-fix)

Self-QA Review — Verdict: ✅ Approve

Loop Summary

Cycle 1 — Findings & Fixes

Cycle 2 — Remaining Minor Items (Non-blocking)

Quality Gates (All Passing)

PM Status — Day 37 — Rebase Required

Code Review — PR #972 fix(cli): add --execution-env-priority to plan use

No P0 or P1 findings.

P2:should-fix (2)

P3:nit (1)

Review Response — Brent Edwards Review #2384

P2 #1 — Defensive getattr on always-present fields — FIXED

P2 #2 — Late conditional import of ExecutionEnvPriority — FIXED

P3 — Migration naming — DEFERRED (acknowledged)

Rebase

Quality Gates (All Passing)

Code Review — PR #972 (`fix(cli): add --execution-env-priority flag to plan use`)

2. `execution_env_priority` (and `execution_environment`) not persisted to database

4. `Plan.as_cli_dict()` omits `execution_environment` and `execution_env_priority`

6. Tests do not verify `use_action()` was actually called

7. Model field typed as `str | None` instead of `ExecutionEnvPriority | None`

8. Naming inconsistency: `execution_env_priority` vs `execution_environment`

11. Robot helper uses aggressive `sys.path`/`sys.modules` manipulation

Review Response — Commit `8df51f61`

2. `execution_env_priority` not persisted to database — DEFERRED

4. `Plan.as_cli_dict()` omits fields — FIXED

6. Tests do not verify `use_action()` was called — FIXED

7. Model field typed as `str | None` — FIXED

Review Response — Commit `ad3e4708`

2. `execution_env_priority` (and `execution_environment`) not persisted to database — FIXED

Code Review — PR #972 `fix(cli): add --execution-env-priority to plan use`

P2 #1 — Defensive `getattr` on always-present fields — FIXED

P2 #2 — Late conditional import of `ExecutionEnvPriority` — FIXED