This release fixes issues for SREs watching stability and regressions.
✓ No known CVEs patched in this version
Topics
Summary
AI summaryFix harvest deadlock by increasing merge lock timeout and cleaning up staged squash-merge artifacts.
Changes in this release
| Type | Severity | Summary | CVE |
|---|---|---|---|
| Bugfix | Medium |
Increase MergeLock acquisition timeout from 300s to 3600s Increase MergeLock acquisition timeout from 300s to 3600s Source: llm_adapter@2026-07-15 Confidence: low |
— |
| Bugfix | Medium |
Reset staged changes in _harvest_under_lock to clear leftover squash-merge artifacts Reset staged changes in _harvest_under_lock to clear leftover squash-merge artifacts Source: llm_adapter@2026-07-15 Confidence: low |
— |
| Bugfix | Medium |
Ensure force_clean_workspace properly unstages files before restoring workspace Ensure force_clean_workspace properly unstages files before restoring workspace Source: llm_adapter@2026-07-15 Confidence: low |
— |
Full changelog
What's Changed
Bug Fix
-
fix: prevent harvest deadlock when merge agent holds lock during parallel execution
When running parallel specs, the merge lock acquisition timeout (300s) was shorter than typical merge agent sessions (5–30min). This caused waiting harvesters to time out and left staged-but-uncommitted squash-merge artifacts that blocked all subsequent dispatches.
Changes:
- Increase
MergeLockdefault acquisition timeout from 300s to 3600s (matchingstale_timeout) so waiters no longer time out while the merge agent is legitimately running - Add
git reset HEADin_harvest_under_lockto clear leftover staged changes from prior failed squash merges - Fix
force_clean_workspaceto properly unstage files withgit reset HEADbefore restoring the working tree — previouslygit checkout -- .alone could not remediate staged-but-uncommitted files
- Increase
Weekly OSS security release digest.
The CVE patches and breaking changes that affected production tools this week. One email, every Sunday.
No spam, unsubscribe anytime.
Share this release
About Agent-fox
All releases →Related context
Related tools
Beta — feedback welcome: [email protected]