chore(merge): batch merge of 7 known-good pull requests #10802
Merged
brent.edwards
merged 22 commits from 2026-04-21 02:42:20 +00:00
chore/merge-batch-1 into master
22 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
6bad73bad7 |
fix(tests): update a2a SDK TDD test to use Client instead of A2AClient
CI / push-validation (pull_request) Successful in 48s
CI / helm (pull_request) Successful in 1m5s
CI / build (pull_request) Successful in 4m17s
CI / docker (pull_request) Has been skipped
CI / lint (pull_request) Successful in 4m5s
CI / typecheck (pull_request) Successful in 5m18s
CI / coverage (pull_request) Successful in 25m54s
CI / quality (pull_request) Successful in 4m19s
CI / security (pull_request) Successful in 5m10s
CI / e2e_tests (pull_request) Successful in 7m19s
CI / integration_tests (pull_request) Successful in 10m29s
CI / unit_tests (pull_request) Successful in 11m16s
CI / status-check (pull_request) Failing after 3s
The a2a-sdk floating constraint (>=0.3.0) in pyproject.toml allows nox's uv pip install to resolve the latest SDK version from PyPI, bypassing uv.lock. A newer a2a-sdk release removed the legacy A2AClient class, causing the TDD test to fail on CI while master (which ran against an older cached version) continued to pass. The modern Client class (a2a.client.Client) exists in all SDK versions including 0.3.25 (locked) and all subsequent releases. Updating the test to check for Client instead of A2AClient makes it forward-compatible and accurately reflects the SDK's current public API. See follow-up issue for the architectural fix: nox should use uv sync --frozen so that uv.lock is always respected for all packages. |
||
|
|
ba7dbe4838 |
fix: update automation profile field names in TDD bug #989 test
CI / push-validation (pull_request) Successful in 28s
CI / helm (pull_request) Successful in 31s
CI / build (pull_request) Successful in 3m56s
CI / lint (pull_request) Successful in 4m7s
CI / quality (pull_request) Successful in 4m32s
CI / typecheck (pull_request) Successful in 4m42s
CI / security (pull_request) Successful in 4m55s
CI / unit_tests (pull_request) Failing after 5m14s
CI / docker (pull_request) Has been skipped
CI / e2e_tests (pull_request) Successful in 6m56s
CI / integration_tests (pull_request) Successful in 7m3s
CI / coverage (pull_request) Successful in 13m27s
CI / status-check (pull_request) Failing after 3s
The test was using legacy phase-transition field names that were renamed to spec-defined task-type semantics: - auto_strategize → decompose_task - auto_execute → create_tool - auto_apply → select_tool - auto_decisions_strategize → edit_code - auto_decisions_execute → execute_command - auto_validation_fix → create_file - auto_strategy_revision → delete_content - auto_reversion_from_apply → access_network - auto_child_plans → install_dependency - auto_retry_transient → modify_config - auto_checkpoint_restore → approve_plan This fix allows the TDD test for issue #989 to run properly instead of failing with TypeError during model instantiation. The test now correctly executes and fails at the assertion level as expected for a TDD bug-capture test. Fixes: Failure preventing PR #10802 batch merge of 7 PRs |
||
|
|
32b5029ea0 |
chore(merge): merge PR #10003 — fix plan cancel worktree cleanup
CI / lint (pull_request) Successful in 4m8s
CI / helm (pull_request) Successful in 26s
CI / quality (pull_request) Successful in 4m24s
CI / push-validation (pull_request) Successful in 28s
CI / typecheck (pull_request) Successful in 4m41s
CI / security (pull_request) Successful in 4m58s
CI / unit_tests (pull_request) Failing after 5m56s
CI / docker (pull_request) Has been skipped
CI / build (pull_request) Successful in 3m33s
CI / integration_tests (pull_request) Successful in 6m44s
CI / e2e_tests (pull_request) Successful in 6m34s
CI / coverage (pull_request) Successful in 13m36s
CI / status-check (pull_request) Failing after 3s
Merged PR #10003 from branch bugfix/cancel-worktree-cleanup Resolved conflict in: - CHANGELOG.md: Accepted incoming version documenting the worktree cleanup fix The PR fixes a critical issue where plan cancellation did not properly clean up the isolated worktree, leaving stale branches behind. This fix ensures the sandbox is properly cleaned when a plan is cancelled. |
||
|
|
7d9a91eb1e |
chore(merge): merge PR #8176 — fix pr-review-pool-supervisor tracking prefix
Merged PR #8176 from branch fix/pr-review-pool-supervisor-prefix-mismatch Resolved conflicts in: - .opencode/agents/pr-review-pool-supervisor.md: Accepted incoming version with corrected tracking prefix AUTO-REV-SUP (instead of AUTO-REV-POOL) - CHANGELOG.md: Accepted incoming version documenting the tracking prefix fix - CONTRIBUTORS.md: Accepted incoming version with updated contributor tracking The PR fixes the tracking prefix inconsistency, changing from AUTO-REV-POOL to AUTO-REV-SUP to match the actual tracking issues created by the agent. This prevents duplicate tracking issues from being created each cycle. |
||
|
|
df8cd4c0a9 |
chore(merge): merge PR #7586 — fix bug-hunt-pool-supervisor tracking prefix
Merged PR #7586 from branch improvement/agent-bug-hunt-pool-supervisor-tracking-prefix Resolved conflicts in: - .opencode/agents/bug-hunt-pool-supervisor.md: Accepted incoming version with improved tracking prefix AUTO-BUG-SUP and restructured tracking procedures - CHANGELOG.md: Accepted incoming version with clearer tracking fix documentation The PR fixes the tracking prefix inconsistency, changing from AUTO-BUG-POOL to AUTO-BUG-SUP for consistency with other agents, and improves the tracking issue format with better structured health reports and announcements. |
||
|
|
bb9695dec3 |
chore(merge): resolve conflicts in context-tiers and subplan-execution
Resolved merge conflicts from PR #5276 (fix/v3.4.0/context-settings-defaults): - context_tiers.py: Accepted PR #5276's corrected default values - _DEFAULT_MAX_TOKENS_HOT: 8000 → 16000 - _DEFAULT_MAX_DECISIONS_WARM: 500 → 100 - _DEFAULT_MAX_DECISIONS_COLD: 5000 → 500 - subplan_execution_service.py: Accepted PR #5276's improved fail-fast logic - Replaced status_map with status_lookup naming - Added fail_fast_ids set tracking for better cancellation handling - Improved edge-case handling for concurrent subplan execution - Enhanced comments explaining fail-fast semantics All linting and type checks pass. |
||
|
|
53d3c18c34
|
Merge remote-tracking branch 'origin/improvement/agent-ca-test-infra-improver-failure-handling' into chore/merge-batch-1 | ||
|
|
27eeaf946e
|
Merge remote-tracking branch 'origin/fix/test-infra-remove-redundant-python-variable-robot-files' into chore/merge-batch-1 | ||
|
|
805fef32a4 |
fix(test): patch get_container at module level after import move
CI / helm (pull_request) Successful in 32s
CI / push-validation (pull_request) Successful in 42s
CI / build (pull_request) Successful in 3m47s
CI / lint (pull_request) Successful in 3m55s
CI / quality (pull_request) Successful in 4m20s
CI / typecheck (pull_request) Successful in 4m32s
CI / security (pull_request) Successful in 4m42s
CI / e2e_tests (pull_request) Successful in 7m0s
CI / integration_tests (pull_request) Successful in 8m20s
CI / unit_tests (pull_request) Successful in 8m52s
CI / docker (pull_request) Successful in 1m33s
CI / coverage (pull_request) Successful in 13m22s
CI / status-check (pull_request) Successful in 3s
The G2 fix moved get_container to a top-level import in plan.py. The Behave step must now patch 'cleveragents.cli.commands.plan.get_container' instead of 'cleveragents.application.container.get_container' so the mock is resolved at the call site. ISSUES CLOSED: #9230 |
||
|
|
770dee16b8 |
fix(plan): address review findings on worktree sandbox cleanup
CI / status-check (pull_request) Blocked by required conditions
CI / helm (pull_request) Successful in 29s
CI / build (pull_request) Successful in 3m47s
CI / lint (pull_request) Successful in 3m57s
CI / quality (pull_request) Successful in 4m14s
CI / unit_tests (pull_request) Failing after 4m18s
CI / typecheck (pull_request) Successful in 4m35s
CI / security (pull_request) Successful in 4m46s
CI / coverage (pull_request) Waiting to run
CI / docker (pull_request) Has been skipped
CI / push-validation (pull_request) Successful in 22s
CI / e2e_tests (pull_request) Successful in 6m54s
CI / integration_tests (pull_request) Successful in 6m58s
- Move get_container and GitWorktreeSandbox imports to module top level (G2: satisfies top-of-file import requirement) - Replace bare 'except Exception' with specific NotFoundError, CleverAgentsError, SQLAlchemyError catches with structlog logging (G3: proper error handling) - Add input validation: empty/whitespace plan_id returns early with warning log (G4: guard against invalid input) - cleanup_stale() now tracks branch_deleted flag and logs partial cleanup warning when branch deletion fails (G5: accurate reporting) - Check off all issue #9230 subtasks (G7: process compliance) ISSUES CLOSED: #9230 |
||
|
|
b907ccd9f8 |
fix(plan): clean up worktree sandbox on plan cancel
CI / helm (pull_request) Successful in 35s
CI / build (pull_request) Successful in 3m51s
CI / lint (pull_request) Successful in 3m56s
CI / quality (pull_request) Successful in 4m21s
CI / typecheck (pull_request) Successful in 4m32s
CI / security (pull_request) Successful in 4m43s
CI / push-validation (pull_request) Successful in 23s
CI / e2e_tests (pull_request) Successful in 7m51s
CI / integration_tests (pull_request) Successful in 8m32s
CI / unit_tests (pull_request) Successful in 9m6s
CI / docker (pull_request) Successful in 1m29s
CI / coverage (pull_request) Successful in 13m28s
CI / status-check (pull_request) Waiting to run
When a user cancels a plan after execute, the git worktree branch and directory created during execute are not cleaned up, causing resource leaks (dangling worktrees accumulate over time). Add GitWorktreeSandbox.cleanup_stale() classmethod in the infrastructure layer with idempotent error handling. _cleanup_sandbox_for_plan() in the CLI layer resolves the plan's linked git-checkout resource and delegates to cleanup_stale(). Called after service.cancel_plan() in the cancel CLI handler. ISSUES CLOSED: #9230 |
||
|
|
1b6e5f8fc3 |
docs(changelog): document bug-hunt-pool-supervisor tracking prefix fix
CI / lint (pull_request) Successful in 26s
CI / quality (pull_request) Successful in 27s
CI / typecheck (pull_request) Successful in 57s
CI / build (pull_request) Successful in 24s
CI / security (pull_request) Successful in 1m25s
CI / push-validation (pull_request) Successful in 21s
CI / helm (pull_request) Successful in 31s
CI / benchmark-publish (pull_request) Has been skipped
CI / e2e_tests (pull_request) Successful in 3m34s
CI / integration_tests (pull_request) Successful in 5m51s
CI / unit_tests (pull_request) Successful in 6m37s
CI / docker (pull_request) Successful in 1m36s
CI / coverage (pull_request) Successful in 13m3s
CI / status-check (pull_request) Successful in 1s
CI / benchmark-regression (pull_request) Successful in 1h0m19s
Added CHANGELOG entry documenting the fix for tracking prefix inconsistency in the bug-hunt-pool-supervisor agent definition. ISSUES CLOSED: #7523 |
||
|
|
9bff689212 |
chore(agents): fix bug-hunt-pool-supervisor tracking prefix AUTO-BUG-POOL → AUTO-BUG-SUP
CI / benchmark-publish (pull_request) Waiting to run
CI / lint (pull_request) Successful in 19s
CI / quality (pull_request) Successful in 19s
CI / build (pull_request) Successful in 20s
CI / typecheck (pull_request) Successful in 43s
CI / helm (pull_request) Successful in 25s
CI / security (pull_request) Successful in 1m1s
CI / benchmark-regression (pull_request) Waiting to run
CI / push-validation (pull_request) Successful in 20s
CI / e2e_tests (pull_request) Successful in 3m10s
CI / integration_tests (pull_request) Successful in 4m45s
CI / unit_tests (pull_request) Successful in 6m1s
CI / docker (pull_request) Successful in 53s
CI / coverage (pull_request) Successful in 7m33s
CI / status-check (pull_request) Successful in 1s
Complete the tracking prefix fix by updating all remaining references: - Embedded CREATE_TRACKING_ISSUE call (lines 195-196) - REVIEW_OWN_ANNOUNCEMENTS call (line 219) - CLOSE_ANNOUNCEMENT_ISSUE call (line 225) - Template header from 'Bug Detection Pool Status' to 'Bug Hunt Status' All 8 instances of AUTO-BUG-SUP are now consistent throughout the file. ISSUES CLOSED: #7523 |
||
|
|
04023d88c3 |
docs: add CHANGELOG and CONTRIBUTORS entries for pr-review-pool-supervisor fix
CI / benchmark-publish (pull_request) Has been skipped
CI / push-validation (pull_request) Successful in 9s
CI / lint (pull_request) Successful in 27s
CI / build (pull_request) Successful in 33s
CI / helm (pull_request) Successful in 36s
CI / quality (pull_request) Successful in 53s
CI / typecheck (pull_request) Successful in 57s
CI / security (pull_request) Successful in 57s
CI / e2e_tests (pull_request) Successful in 4m27s
CI / integration_tests (pull_request) Successful in 4m27s
CI / unit_tests (pull_request) Successful in 5m34s
CI / docker (pull_request) Successful in 2m25s
CI / coverage (pull_request) Successful in 11m2s
CI / status-check (pull_request) Successful in 1s
CI / benchmark-regression (pull_request) Successful in 57m26s
- Added CHANGELOG entry documenting the tracking prefix mismatch fix (#7602) - Updated CONTRIBUTORS.md with latest HAL 9000 contributions - Addresses blocking review requirements for PR #8176 |
||
|
|
b122ec7ed5 |
fix(test-infra): remove redundant ${PYTHON} variable definitions from robot files
CI / lint (pull_request) Successful in 23s
CI / quality (pull_request) Successful in 51s
CI / typecheck (pull_request) Successful in 1m0s
CI / security (pull_request) Successful in 55s
CI / build (pull_request) Successful in 25s
CI / helm (pull_request) Successful in 32s
CI / push-validation (pull_request) Successful in 26s
CI / e2e_tests (pull_request) Successful in 3m38s
CI / integration_tests (pull_request) Successful in 6m42s
CI / unit_tests (pull_request) Successful in 8m19s
CI / docker (pull_request) Successful in 13s
CI / coverage (pull_request) Successful in 15m23s
CI / status-check (pull_request) Successful in 2s
Remove the local ${PYTHON} python (and python3) variable definitions from
the *** Variables *** sections of all affected robot files. These local
definitions were overriding the pabot-injected venv Python path passed via
--variable PYTHON:/path/to/venv/python, causing tests to use the system
Python (which lacks required packages like structlog, sqlalchemy, etc.)
instead of the nox venv Python.
The correct ${PYTHON} value is already set by Setup Test Environment in
common.resource via sys.executable, and pabot passes it via --variable.
The local fallback definitions are redundant and harmful in parallel runs.
Audit found 56 robot files with the pattern (more than the 9 originally
identified in the issue). All occurrences have been removed.
ISSUES CLOSED: #1309
|
||
|
|
3ce17a3b74 |
fix(agents): correct pr-review-pool-supervisor tracking prefix from AUTO-REV-POOL to AUTO-REV-SUP\n\nThe agent definition specified AUTO-REV-POOL as the tracking prefix, but the actual\ntracking issues created by this agent use AUTO-REV-SUP. This mismatch prevented the\nautomation-tracking-manager from finding and closing previous tracking issues,\nresulting in duplicate issues being created each cycle.\n\nChanges:\n- Updated tracking prefix from AUTO-REV-POOL to AUTO-REV-SUP\n- Updated tracking type to PR Review Pool Status\n- Added Tracking Issue Format section documenting the correct format\n\nThis aligns the agent definition with actual observed behavior and resolves the\nsystemic duplicate tracking issue reported by the system watchdog.\n\nISSUES CLOSED: #7602
CI / push-validation (pull_request) Successful in 17s
CI / helm (pull_request) Successful in 24s
CI / lint (pull_request) Successful in 27s
CI / typecheck (pull_request) Successful in 57s
CI / security (pull_request) Successful in 58s
CI / e2e_tests (pull_request) Successful in 3m4s
CI / build (pull_request) Successful in 3m20s
CI / quality (pull_request) Successful in 3m43s
CI / integration_tests (pull_request) Successful in 4m31s
CI / unit_tests (pull_request) Successful in 5m21s
CI / docker (pull_request) Successful in 24s
CI / benchmark-publish (pull_request) Has been skipped
CI / coverage (pull_request) Successful in 10m30s
CI / status-check (pull_request) Successful in 1s
CI / benchmark-regression (pull_request) Successful in 57m17s
|
||
|
|
0f0c621b14 |
chore(agents): fix bug-hunt-pool-supervisor tracking prefix AUTO-BUG-POOL → AUTO-BUG-SUP
CI / benchmark-publish (pull_request) Has been skipped
CI / push-validation (pull_request) Successful in 20s
CI / helm (pull_request) Successful in 22s
CI / lint (pull_request) Successful in 25s
CI / build (pull_request) Successful in 28s
CI / typecheck (pull_request) Successful in 48s
CI / quality (pull_request) Successful in 55s
CI / security (pull_request) Successful in 1m0s
CI / integration_tests (pull_request) Successful in 4m27s
CI / e2e_tests (pull_request) Successful in 7m23s
CI / unit_tests (pull_request) Successful in 8m38s
CI / docker (pull_request) Successful in 11s
CI / coverage (pull_request) Successful in 11m45s
CI / status-check (pull_request) Successful in 1s
CI / benchmark-regression (pull_request) Successful in 57m3s
Complete the tracking prefix fix by updating all remaining references: - Embedded CREATE_TRACKING_ISSUE call (lines 195-196) - REVIEW_OWN_ANNOUNCEMENTS call (line 219) - CLOSE_ANNOUNCEMENT_ISSUE call (line 225) All 8 instances of AUTO-BUG-SUP are now consistent throughout the file. |
||
|
|
00143aad7d |
fix(planning): enforce cancel status for fail-fast parallel subplans
CI / push-validation (pull_request) Successful in 16s
CI / build (pull_request) Successful in 22s
CI / helm (pull_request) Successful in 29s
CI / security (pull_request) Successful in 1m27s
CI / lint (pull_request) Successful in 3m28s
CI / quality (pull_request) Successful in 3m47s
CI / typecheck (pull_request) Successful in 4m26s
CI / e2e_tests (pull_request) Successful in 4m40s
CI / unit_tests (pull_request) Successful in 7m41s
CI / integration_tests (pull_request) Successful in 10m1s
CI / benchmark-publish (pull_request) Has been skipped
CI / docker (pull_request) Successful in 1m38s
CI / coverage (pull_request) Successful in 13m45s
CI / status-check (pull_request) Successful in 1s
CI / benchmark-regression (pull_request) Successful in 57m1s
|
||
|
|
adfee4d195 | fix(context): support spec env aliases for tier defaults | ||
|
|
3a4fde9b0c |
fix(context): correct Settings defaults for context tier limits per spec
Align context tier defaults with the specification and ensure invalid values are rejected via positive-integer validation. Behave coverage locks in the defaults and validation behavior. ISSUES CLOSED: #5230 #4907 |
||
|
|
2a01aa3061 |
chore(agents): improve bug-hunt-pool-supervisor — fix tracking prefix inconsistency
CI / quality (pull_request) Successful in 38s
CI / lint (pull_request) Successful in 39s
CI / typecheck (pull_request) Successful in 55s
CI / security (pull_request) Successful in 56s
CI / push-validation (pull_request) Successful in 17s
CI / build (pull_request) Successful in 32s
CI / helm (pull_request) Successful in 36s
CI / e2e_tests (pull_request) Successful in 2m58s
CI / integration_tests (pull_request) Successful in 6m32s
CI / unit_tests (pull_request) Successful in 7m48s
CI / docker (pull_request) Successful in 10s
CI / coverage (pull_request) Successful in 10m52s
CI / status-check (pull_request) Successful in 1s
CI / benchmark-publish (pull_request) Has been cancelled
CI / benchmark-regression (pull_request) Has been cancelled
Approved proposal: #7523 Pattern: prompt_improvement Evidence: Agent definition specified [AUTO-BUG-POOL] prefix and 'Bug Detection Report' tracking type, but actual tracking issues use [AUTO-BUG-SUP] prefix and 'Bug Hunt Status' type (e.g., issue #7470). Watchdog health audit also references AUTO-BUG-SUP. Definition was out of sync with actual behavior. Fix: Updated all tracking prefix references from AUTO-BUG-POOL to AUTO-BUG-SUP and tracking type from 'Bug Detection Report' to 'Bug Hunt Status'. ISSUES CLOSED: #7523 |
||
|
|
cd35284e31 |
chore(agents): improve ca-test-infra-improver — graceful handling of clone and tool failures
CI / lint (pull_request) Successful in 21s
CI / quality (pull_request) Successful in 33s
CI / typecheck (pull_request) Successful in 53s
CI / security (pull_request) Successful in 58s
CI / build (pull_request) Successful in 26s
CI / helm (pull_request) Successful in 24s
CI / unit_tests (pull_request) Successful in 6m34s
CI / docker (pull_request) Successful in 11s
CI / coverage (pull_request) Successful in 11m4s
CI / e2e_tests (pull_request) Successful in 17m14s
CI / integration_tests (pull_request) Successful in 23m37s
CI / status-check (pull_request) Successful in 1s
CI / benchmark-publish (pull_request) Has been skipped
CI / benchmark-regression (pull_request) Successful in 57m12s
Approved proposal: #1809 Pattern: prompt_improvement — infrastructure failure misreporting Evidence: Agent filed 10+ issues about its own infrastructure failures (clone failures using wrong hostname, tool crashes, environment limitations) instead of handling them gracefully. Issues #1673, #1686, #1691, #1694, #1699, #1713, #1732 were all clone failures; #1695, #1726, #1727, #1740 were tool failures. Fix: Add hostname resolution guidance, clone failure handling with retry logic, tool failure handling with graceful degradation, and explicit scope restriction against filing issues about own environment. ISSUES CLOSED: #1809 |