Remove duplicate except ImportError blocks in cloud_resources_steps.py
(B025 violations in step_sandbox_create, step_sandbox_commit,
step_sandbox_rollback). Apply ruff format to 5 files flagged by the
format check.
- Extract AWS-specific logic into cloud_aws.py and cloud_providers.py to keep all files under the 500-line limit (cloud.py: 490 lines, cloud_aws.py: 498 lines, cloud_providers.py: 181 lines)
- Fix sandbox test regression: change cloud_resources.feature sandbox create scenario from "aws" to "gcp" provider (AWS no longer raises NotImplementedError)
- Add ImportError handling to step_sandbox_create/commit/rollback in cloud_resources_steps.py
- Remove all 9 type: ignore comments from production code using proper type narrowing and boto3/botocore type stubs in typings/
- Move plan_id validation before logger.info() in all three sandbox methods (fail-fast principle)
- Fix exception suppression: discover_aws_resources() now propagates exceptions instead of catching bare Exception
- Move deferred imports (PhysVirt, ResourceCapabilities, _derive_child_id) to module level in cloud_aws.py
- Split cloud_aws_sdk_steps.py (755 lines) into focused modules: cloud_aws_helpers.py, cloud_aws_session_steps.py, cloud_aws_discover_steps.py, cloud_aws_sandbox_steps.py
- Add CHANGELOG.md entry for AWS SDK integration feature
- Update robot/helper_cloud_resources.py to handle ImportError/ NotImplementedError for AWS sandbox operations
ISSUES CLOSED: #1021
Implements real AWS SDK integration for CloudResourceHandler using boto3
as an optional dependency. Key changes:
- Add boto3/botocore as optional [aws] dependency in pyproject.toml
- Implement CloudResourceHandler.resolve() for AWS: builds boto3 session,
verifies credentials via STS get_caller_identity for account-level types,
and returns a BoundResource with the resource ARN as sandbox_path
- Implement discover_aws_resources() to enumerate VPCs, subnets, instances,
S3 buckets, IAM roles, RDS instances, ECS clusters, Lambda functions,
and EKS clusters via the AWS API
- Implement CloudResourceHandler.discover_children() for AWS resource types
using the new discovery function
- Implement CloudSandboxStrategy.create/commit/rollback for AWS using a
tag-based isolation strategy (CleverAgents:PlanId tag)
- GCP and Azure providers still raise NotImplementedError (pending)
- boto3 is optional: handler raises ImportError with helpful install message
when boto3 is not installed
- Credentials are never logged (existing redaction infrastructure preserved)
- Update cloud_resources.feature to reflect new AWS behavior
- Add comprehensive cloud_aws_sdk.feature with 47 BDD scenarios covering
all new code paths with mocked boto3
Closes#1021
Cover the two uncovered code paths introduced by the session create
JSON envelope fix:
1. `_resolve_actor_details(None)` → early `return None` (no actor bound)
2. Actor found in registry path (lines 271-297) — two scenarios:
- Full config actor (options.temperature + direct context_window)
- Graph descriptor actor (graph_descriptor.context_window)
Also remove dead redundant isinstance checks:
- `config_blob.get("options") if isinstance(config_blob, dict) else None`
simplified to `config_blob.get("options")` since config_blob is always
a dict (assigned on the previous line via ternary with {} fallback).
- Outer `if isinstance(config_blob, dict):` wrapper around context_window
logic removed for the same reason.
ISSUES CLOSED: #6441
- Fix `security_template_coverage_boost.feature` assertion for "Session
export to stdout outputs JSON": the export path outputs raw JSON with
a `session_id` key, not a `data` envelope, so revert the erroneous
`"data"` assertion back to `"session_id"`.
- Move all deferred `from cleveragents.application.container import
get_container` imports in session.py to the module-level import
block, consistent with every other CLI command file (action.py,
actor.py, config.py, plan.py, etc.). No circular import exists.
- Update `session_cli_uncovered_branches_steps.py` to patch
`cleveragents.cli.commands.session.get_container` directly (the
correct target after a top-level import) instead of replacing
`sys.modules["cleveragents.application.container"]`.
- Add CHANGELOG.md entry for the session create JSON envelope fix.
ISSUES CLOSED: #6441
Update feature file assertions to match the new nested JSON structure
for session create output. Changed assertions from 'session_id:' to 'id:'
to reflect the new data.session.id structure per spec #6441.
Add ContextTierService mock to step_m5_invoke_project_context_show
so the CLI command can call _get_context_tier_service() without
failing. Also patch _load_policy_json to prevent JSON decode errors
from MagicMock session objects. Update CHANGELOG.md and CONTRIBUTORS.md.
ISSUES CLOSED: #6323
The step assertion checked for 'logging.getLogger("cleveragents.mcp")'
literally, but session.py uses the _MCP_LOGGER_NAME constant so
inspect.getsource() returns 'logging.getLogger(_MCP_LOGGER_NAME)'.
Update the assertion to match the actual source text.
ISSUES CLOSED: #6457
The delete command's output branch used `fmt == OutputFormat.RICH` which
caused --format color to emit a JSON envelope instead of Rich panels.
Align with all other session commands by checking
`fmt not in (OutputFormat.RICH, OutputFormat.COLOR)` for machine-readable
paths. Add BDD scenario and step for --format color to close the coverage gap.
ISSUES CLOSED: #6457
Extend the JSON/YAML envelope messages[].text fix to cover the remaining
three session subcommands that were still producing plain Rich output
instead of structured envelopes for non-rich format paths:
- session delete: route non-rich formats through format_output() with
messages=[{"level": "ok", "text": "Session deleted"}]
- session export: add --output-format/-f option; emit structured envelope
with session_export/contents/integrity data and "Export completed" message
- session import: add --format/-f option; emit structured envelope with
session_import/validation/merge data and "Import completed" message
Also add BDD scenarios to features/session_cli.feature for each new
envelope path, add corresponding step definitions, add CHANGELOG entry
under [Unreleased] Fixed, and assign milestone v3.2.0 to the PR.
ISSUES CLOSED: #6457
Extend the devcontainer cleanup Behave scenario for container-instance resources to assert that the stop command delegates to the lifecycle stop mock, providing regression coverage that both container-instance and devcontainer-instance remain stoppable.
ISSUES CLOSED: #6457
The TDD regression files for bug #968 were incorrectly deleted instead of
updated to assert the spec-compliant fixed behaviour from issue #6325.
Per CONTRIBUTING.md the regression guard must be kept and updated — not
removed — once the bug is fixed.
Restore and update all three files to assert the new expected behaviour:
- plan explain rejects a non-decision-id argument with rc=1
- error output contains "not found"
- decision data fields are absent from output
Also pair the orphaned robot/helper_tdd_plan_explain_plan_id.py with a
restored robot test file and update it to verify rc=1 rejection behaviour.
ISSUES CLOSED: #6325
- Shorten error message in explain_decision_cmd to fit 88-char limit (E501)
- Add `from None` to raise typer.Exit(1) inside except block (B904)
- Fix step definition mock to raise DecisionNotFoundError instead of
returning None, so the exception handler fires and output contains
"not found" as the scenario asserts
ISSUES CLOSED: #6325
Align the automation-profile add command's machine-readable output with the specification by emitting the flat thresholds/flags schema and created timestamp, and add coverage that locks the expected structure.
ISSUES CLOSED: #6345
Implemented test coverage and documentation updates to ensure overlay is properly recognized and communicated across the sandbox strategy validation surface.
- Verification: Confirmed that overlay already exists in the _VALID_STRATEGIES frozenset within src/cleveragents/resource/schema.py (introduced in a prior commit that closed issue #2827).
- Comprehensive audit: Audited strategy validation points to ensure consistency:
- _VALID_STRATEGIES in schema.py
- _IMPLEMENTED_STRATEGIES and _SUPPORTED_STRATEGIES in factory.py
- SandboxStrategy enum definitions in both resource.py and resource_type.py
All include overlay as an allowed strategy.
- Tests: Added a new BDD scenario titled: "Invalid sandbox_strategy error message lists overlay as allowed" to features/consolidated_resource.feature. This asserts that validation errors explicitly list overlay among the allowed values when an invalid strategy is used.
- Documentation: Updated docstring in src/cleveragents/infrastructure/sandbox/strategy_registry.py to reflect that the built-in SandboxFactory handles six strategies, including snapshot and overlay.
- Design considerations: The fix itself was already applied in a previous commit (dbf3b8d7) addressing #2827. Issue #3614, raised by the UAT bot, required additional test coverage and accurate documentation of the available strategies.
- Impact: No behavioral changes beyond ensuring test coverage and documentation are aligned with the existing implementation. The added test guarantees that error messages remain accurate and comprehensive as strategies evolve.
- Affected areas: resource/schema.py, factory.py, resource.py, resource_type.py, features/consolidated_resource.feature, strategy_registry.py.
ISSUES CLOSED: #3614
- Delete examples/resource-types/executable.yaml (orphaned artifact referencing
non-existent ExecutableHandler; flagged in 4 prior reviews as blocking)
- Update agents resource list CLI columns from [ID, Name, Type, Status, Kind,
Location, Description] to spec-required [Name, ID, Type, Phys/Virt, Children,
Projects] per specification line 11051
- Lifecycle state for container resources now shown as a note below the table
- Update resource_list_lifecycle_state.feature to remove Status column header
assertions; add spec-column header scenario
- Add BDD scenario in resource_cli.feature verifying new column headers
- Update CHANGELOG.md and CONTRIBUTORS.md
ISSUES CLOSED: #3077
The executable resource type was not defined in the specification
(docs/specification.md lines 10567-10575). The supported resource types
are: git-checkout, git, fs-mount, fs-directory, fs-file,
container-instance, and devcontainer-instance.
Additionally, the agents resource list output included a Location column
that is not part of the spec-defined columns (Name, ID, Type, Phys/Virt,
Children, Projects per line 11051).
Changes:
- Remove executable type registration from _resource_registry_lsp.py
- Remove executable from BUILTIN_TYPE_NAMES in _resource_type_validation.py
- Update resource list table columns to match spec (Name, ID, Type,
Phys/Virt, Children, Projects) removing Location and Description
- Remove all executable-related test scenarios from
features/resource_type_lsp.feature
- Update robot/helper_resource_type_lsp.py to reflect 3 LSP types
(not 4) and add assertions that executable is absent
ISSUES CLOSED: #3077
The automation-profile remove command was only printing a plain checkmark
message after deletion. The spec requires a Rich Panel titled 'Profile Removed'
containing the profile name, followed by the success message.
Changes:
- Replace plain console.print checkmark with Panel render + success message
- Panel displays 'Name: <profile-name>' under 'Profile Removed' title
- Success message updated to '✓ OK Profile removed' per spec
- Behave feature: add panel assertions to existing remove scenario
- Behave feature: add new 'Remove custom profile shows Profile Removed panel' scenario
- Robot Framework helper: update test_remove_profile() to assert panel presence
ISSUES CLOSED: #2966
- Add create_sandbox() override to _ContainerBaseHandler raising
NotImplementedError, matching CloudResourceHandler pattern (issue #836)
- Add project_access() override to _ContainerBaseHandler raising
NotImplementedError, consistent with all other stub methods
- Rename @then("the import should succeed without errors") step to
@then("the container handler module import should succeed without errors")
to resolve AmbiguousStep collision with tdd_a2a_sdk_dependency_steps.py
- Update container_handler.feature to use renamed step
- Apply ruff format to container.py
ISSUES CLOSED: #2907
Implements the missing cleveragents.resource.handlers.container module
that is referenced by all seven container infrastructure resource types
registered in _resource_registry_container.py.
Previously, any attempt to use container-runtime, container-image,
container-mount, container-exec-env, container-port, container-volume,
or container-network resources raised HandlerResolutionError with
ModuleNotFoundError at runtime.
Changes:
- Add src/cleveragents/resource/handlers/container.py with five handler
classes: ContainerRuntimeHandler, ContainerImageHandler,
ContainerChildHandler (shared by mount/exec-env/port), ContainerVolumeHandler,
ContainerNetworkHandler
- All handlers extend _ContainerBaseHandler which extends BaseResourceHandler
and satisfies the ResourceHandler protocol
- resolve() raises NotImplementedError (container sandbox provisioning
is pending, mirrors CloudResourceHandler pattern)
- content_hash() returns identity hash based on resource type + location
- All CRUD and lifecycle stubs raise NotImplementedError
- Update handlers/__init__.py to export the five new handler classes
- Add features/container_handler.feature with 72 BDD scenarios covering
module importability, protocol conformance, handler resolution, type
labels, CRUD stubs, lifecycle stubs, and registry integration
- Add features/steps/container_handler_steps.py with step definitions
All nox sessions pass: lint, typecheck, unit_tests (72/72 scenarios).
ISSUES CLOSED: #2907
Cover the list branches in _format_rich() and _format_color() that were
left untested, causing the coverage gate to drop below the 97% threshold.
Add two new @when steps (list+rich, list+color), two @then steps for list
panel assertions, and two new feature scenarios exercising those paths.
ISSUES CLOSED: #2921
Issue #4364 is now resolved by the envelope pattern introduced on master.
The scenario "Format output handles all format types for dict" passes
correctly — the TDD inversion was flipping it to a failure.
ISSUES CLOSED: #4364
The format_output() function in src/cleveragents/cli/formatting.py had two
routing bugs that caused incorrect output for the 'rich' and 'color' formats:
1. The 'rich' format had no explicit dispatch branch and silently fell through
to the final JSON fallback, returning raw JSON instead of styled terminal
output. Since 'rich' is the default CLI format (per ADR-021), this meant
all commands using format_output() (version, info, diagnostics) produced
JSON by default.
2. The 'color' format was incorrectly routed to _format_plain() instead of a
color-aware renderer, producing plain text with no ANSI color codes.
Fix:
- Added _format_rich() helper that delegates to RichMaterializer via
OutputSession, producing ANSI-styled terminal output consistent with
format_output_session().
- Added _format_color() helper that delegates to ColorMaterializer via
OutputSession, producing ANSI-colored terminal output.
- Added explicit OutputFormat.RICH dispatch in format_output() routing.
- Fixed OutputFormat.COLOR dispatch to use _format_color() instead of
_format_plain().
Tests:
- Updated existing BDD scenario that was validating the buggy behavior
(expected JSON for rich format) to now assert correct styled output.
- Added new BDD scenarios: 'rich format produces styled terminal output not
JSON' and 'color format produces ANSI-colored output not plain text'.
- Added Robot Framework integration tests in cli_formats.robot and
helper_cli_formats.py verifying end-to-end styled output for both formats.
All nox sessions pass: lint, typecheck, unit_tests, security_scan.
ISSUES CLOSED: #2921
Remove the unsafe `# type: ignore` suppression on line 111 of
`legacy_migrator.py` and replace it with an explicit
`assert existing_plan.id is not None` statement. This provides
proper type narrowing to the type checker while preserving the
logical correctness guaranteed by the preceding `if existing_plan:`
guard.
Also adds a new BDD scenario in `legacy_migrator_coverage.feature`
that explicitly exercises the code path where an existing plan with
a non-None id is found during migration, verifying the assert-based
type narrowing works correctly end-to-end.
ISSUES CLOSED: #3051
- Updated SkeletonCompressorService.compress() to accept
(fragments: tuple[ContextFragment, ...], skeleton_budget: int)
-> tuple[ContextFragment, ...], matching the SkeletonCompressor protocol
- Removed skeleton_ratio and CompressionResult from the public API
- Added @runtime_checkable to SkeletonCompressor protocol in acms_service.py
- Added structural subtype assertion at module level to prevent future
protocol drift
- Rewrote all Behave feature scenarios and step definitions to use
skeleton_budget
- Updated benchmarks and robot helpers to use absolute token budgets
- Removed CompressionResult export from services __init__.py and
vulture_whitelist.py
- The depth_breadth_projection.py call site already correctly computed
and passed skeleton_budget
ISSUES CLOSED: #2925
Fix pre-existing lint, typecheck, and security failures that were
blocking the PR from passing CI:
- Fix E501 line-too-long in session_service.py (remove erroneous
"sha256:" string prefix from dict comprehension on line 268)
- Fix W293 trailing whitespace in tool.py line 249
- Fix typecheck error in session_service.py: data.get("checksum")
can return None, remove invalid string concatenation
- Fix typecheck error in schema.py: add explicit dict[str, Any]
type annotation for wrapper variable to resolve str|None issue
- Fix vulture false positive: add "destination" Protocol parameter
to vulture_whitelist.py
- Fix @tdd_issue/@tdd_issue_1472 tag placement in skill_schema.feature
(remove blank line between tags and scenario)
- Add @tdd_issue/@tdd_issue_1472 tags to all new wrapper key scenarios
- Add Robot integration test for spec-compliant skill: wrapper YAML
Implement skill: wrapper key unwrapping in SkillConfigSchema.from_yaml()
to support the spec-required YAML format with cleveragents: metadata header.
- Strip cleveragents: metadata block from raw YAML before validation
- Unwrap skill: wrapper key if present, with descriptive errors for invalid values
- Maintain backward compatibility with flat YAML format (no wrapper)
- Add Behave scenarios tagged @tdd_issue and @tdd_issue_1472 covering:
* Spec-compliant YAML with skill: wrapper key
* Spec-compliant YAML with cleveragents: header
* skill: with None, string, and list values (error cases)
* Backward compatibility with flat YAML
* cleveragents: header without skill: wrapper
Closes#1472
Changed DiffDisplayMode enum values from side_by_side/context to split/auto
as required by specification §29570, §30139, §30391.
- Renamed SIDE_BY_SIDE="side_by_side" → SPLIT="split" in models.py
- Renamed CONTEXT="context" → AUTO="auto" in models.py
- Renamed side_by_side_diff() → split_diff() in models.py
- Renamed context_diff() → auto_diff() in models.py
- Updated _DIFF_MODE_CYCLE in screen.py to use SPLIT and AUTO
- Updated all BDD feature scenarios and step definitions
- Fixed broken Behave step parameter renames (restored standard 'context' param)
Closes#1449
---
Automated by CleverAgents Bot
Supervisor: Implementation | Agent: task-implementor
Updated step definitions to match the corrected enum values (SPLIT and AUTO instead of SIDE_BY_SIDE and CONTEXT) and updated method names (split_diff instead of side_by_side_diff).
ISSUES CLOSED: #1449
Add Behave feature file and Robot Framework integration tests covering
the two compiler functions fixed in issue #1429:
- _map_node(): SUBGRAPH node's NodeConfig.subgraph is now populated from
node.actor_ref instead of config.get("actor_ref") which always returned None
- compile_actor(): metadata.subgraph_refs is now populated from
node_def.actor_ref instead of node_def.config.get("actor_ref", "") which
always returned an empty string
Three Behave scenarios tagged @tdd_issue @tdd_issue_1429 covering:
1. NodeConfig.subgraph field populated from actor_ref (_map_node fix)
2. metadata.subgraph_refs populated from actor_ref (compile_actor fix)
3. Both fields correct together with a realistic actor ref
Two Robot Framework integration tests in tdd_actor_compiler_actor_ref_1429.robot
with a self-contained Python helper that exercises both code paths in isolation.
ISSUES CLOSED: #1429
Add the missing workflow validation example and keep the #1039 TDD regression active by removing the expected-fail tag and updating scenario narrative.\n\nTo satisfy the required full quality gates, stabilize flaky integration behavior encountered during this issue run: use a shared SQLAlchemy session in resource DAG scripts, isolate RxPY validation temp paths per test run, extend transient subprocess timeouts/retry behavior, and clear stale pabot worker artifacts before integration runs so repeated nox executions are reliable.\n\nISSUES CLOSED: #1039
AuditService.record() was generating its own timestamp internally,
discarding the original DomainEvent.timestamp. This means audit entries
recorded when an event was audited, not when the domain event actually
occurred, breaking forensic accuracy per §Audit Logging (SEC7).
Changes:
- Add `timestamp: datetime | None = None` keyword parameter to
AuditService.record(). When provided, uses it as created_at;
falls back to datetime.now(tz=UTC) for backward compatibility.
Applied to both the async queue path and the synchronous DB path.
- AuditEventSubscriber._handle_event() now passes timestamp=event.timestamp
so the original event creation time is preserved in audit entries.
- Add 3 Behave BDD scenarios covering: full pipeline timestamp
preservation, direct record() with explicit timestamp, and backward
compatibility (record() without timestamp auto-generates created_at).
- Add preserve_event_timestamp Robot integration test and helper subcommand.
- Add static source check in security_audit.robot verifying the
timestamp parameter signature exists.
ISSUES CLOSED: #719
Three BDD scenarios and two Robot Framework integration tests verifying that
_get_service() in automation_profile.py resolves AutomationProfileService
through the DI container rather than manually calling create_engine or
sessionmaker (bug #990).
Bug #990 was fixed by PR #1181 before this TDD test PR merged; the
@tdd_expected_fail tag is therefore absent and these tests serve as
permanent regression guards confirming the fix remains in place.
ISSUES CLOSED: #1031