Skip to content

Enforce recoverable local worktree and branch pruning - #171

Merged
BunsDev merged 3 commits into
mainfrom
worktree-hygiene
Oct 11, 2026
Merged

BunsDev merged 3 commits into
mainfrom
worktree-hygiene

Conversation

@BunsDev

@BunsDev BunsDev commented Oct 11, 2026 •

Copy link
Copy Markdown
Contributor

Completed sessions can leave local branches behind, and the old removal path could remove a checkout before proving its work landed. This change requires an explicit exact-tip release, fresh merge and activity evidence, and a verified recovery archive before pruning local worktrees and branches.

  • Keep scripts/worktree.sh as the shared entry point; add ownership claims/releases, audits, guarded pruning, and daily/login macOS scheduling. Unknown or active work stays protected.
  • Refuse deletion for dirty or uncertain state, open PRs, paused Git operations, live processes, changed tips, or missing evidence. Verify bundles by restoring exact refs before removal. Remote branches and recovery archives are retained.
  • Make desktop retirement respect project-script retention and refuse a missing-script fallback. Add the procedure to AGENTS/docs and maintenance regressions to normal npm test.

Integrated protected Canvas main 794010c. The only merge conflict was the status page; all landed Canvas, native, Streamer, Browser, attachment, and CI changes are preserved. The production diff is limited to runner retirement guards.

Validation: build and typecheck passed; 779 unit tests passed with one opt-in Knowledge unit skip, including all 75 maintenance tests. Full E2E with MODEX_TEST_OPEN_KNOWLEDGE=1 passed 234 desktop and 7 site tests with no skips, failures, or retries. Source hashes were unchanged through the gate. Only the status and verification docs changed afterward. All four fresh exact-head hosted checks passed: each macOS job verified 779 unit passes plus one opt-in skip, 234 desktop and 7 site cases; each iPhone job passed 28 UI cases. Protected squash landed as 42223e2d05c09e34f4aafc57a57dc2a6f1c6c541, with its signed tree matching the reviewed head.

The user-approved local LaunchAgent is installed at login and every 24 hours with a pinned, checksum-verified runtime. Its first run inspected 39 branches and 31 worktrees: zero eligible releases, zero removals, no errors. Recovery evidence lives outside disposable worktrees. See docs/worktree-hygiene.md and docs/reviews/2026-10-11-worktree-hygiene.md.

@vercel

vercel Bot commented Oct 11, 2026 •

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated
modex Ready Ready Preview Oct 11, 2026 6:20pm UTC

Request Review

@BunsDev BunsDev self-assigned this Oct 11, 2026
Preserve landed Canvas, native, Streamer, Browser and attachment behavior.
Record the current-main verification and delivered hygiene status.

Coven-Harness: Codex CLI / gpt-6-astra
@BunsDev
BunsDev merged commit 42223e2 into main Oct 11, 2026
5 checks passed
@BunsDev
BunsDev deleted the worktree-hygiene branch October 13, 2026 12:48
BunsDev added a commit that referenced this pull request Nov 1, 2026
The CF-7 verification plan said step-to-check linking stayed open; Val
retired it on 2026-10-23. The worktree-hygiene plan's landing box was
unticked though #171 landed. local-models.md placed LM-5 slice 1 on a
branch; it is on main through #423. code-review.md still said nothing
had shipped; CR-1 to CR-7 are on main and in v0.4.0 behind the
modex.codeReview switch. The CF, CR and LM docs now point at the
status checklist table.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

This branch was successfully deployed

1 active deployment
Preview — c8682799 Deployed Oct 11, 2026 by vercel[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant