Fix cleanup_stale to preserve branches with commits beyond HEAD (#11121) #11132

Closed
HAL9000 wants to merge 3 commits from fix/cleanup-stale-preserve-commits into master

3 Commits

Author SHA1 Message Date
HAL9000 285ea1f4ed chore(ci): re-trigger workflow for af2e1767 lint fix
CI / helm (pull_request) Successful in 47s
CI / push-validation (pull_request) Successful in 39s
CI / build (pull_request) Successful in 1m3s
CI / quality (pull_request) Successful in 1m13s
CI / lint (pull_request) Successful in 1m22s
CI / typecheck (pull_request) Successful in 1m40s
CI / security (pull_request) Successful in 2m4s
CI / unit_tests (pull_request) Failing after 4m32s
CI / integration_tests (pull_request) Successful in 4m30s
CI / coverage (pull_request) Has been skipped
CI / docker (pull_request) Has been skipped
CI / status-check (pull_request) Failing after 3s
2026-05-12 02:03:31 +00:00
HAL9000 af2e176732 fix(ruff): remove unused import os and format git call in sandbox_reexecute_with_changes_steps.py
CI / push-validation (pull_request) Successful in 40s
CI / helm (pull_request) Successful in 50s
CI / build (pull_request) Successful in 57s
CI / lint (pull_request) Successful in 1m10s
CI / quality (pull_request) Successful in 1m18s
CI / typecheck (pull_request) Successful in 1m25s
CI / security (pull_request) Successful in 1m46s
CI / integration_tests (pull_request) Successful in 4m22s
CI / unit_tests (pull_request) Failing after 6m22s
CI / coverage (pull_request) Has been skipped
CI / docker (pull_request) Has been skipped
CI / status-check (pull_request) Failing after 3s
This fixes the ruff lint failure (F401: imported but unused ) that was
causing the CI lint job to fail on PR #11132.
2026-05-12 01:56:15 +00:00
HAL9000 eb29e3bea3 Fix cleanup_stale to preserve branches with commits beyond HEAD (#11121)
CI / push-validation (pull_request) Successful in 48s
CI / helm (pull_request) Successful in 53s
CI / build (pull_request) Successful in 1m8s
CI / lint (pull_request) Failing after 1m31s
CI / quality (pull_request) Successful in 1m29s
CI / typecheck (pull_request) Successful in 1m39s
CI / security (pull_request) Successful in 2m7s
CI / integration_tests (pull_request) Successful in 4m33s
CI / unit_tests (pull_request) Failing after 4m59s
CI / coverage (pull_request) Has been skipped
CI / docker (pull_request) Has been skipped
CI / status-check (pull_request) Failing after 4s
The cleanup_stale method in GitWorktreeSandbox now checks whether a branch
has any commits beyond HEAD before destroying it. Previously, ALL branches
matching cleveragents/plan-{plan_id} were removed regardless of whether they
contained committed LLM output from a previous plan execute. This caused
plan apply to find zero artifacts on re-invoked execute.

The fix uses "git log --oneline HEAD...branch" to detect extra commits.
If present, the branch is preserved (not stale). Only branches with no
committed work are cleaned up as before.

ISSUES CLOSED: #11121
2026-05-11 22:46:51 +00:00