Skip to content

v0.26.0

Choose a tag to compare

@luongnv89 luongnv89 released this 09 Oct 11:34
· 4 commits to main since this release

Features

  • pr-review, auto-pilot: clean up the local checkout after every merge. The new shared gi-postmerge.py removes clean worktrees still on the merged branch, switches the checkout from that branch to the updated base (stash-first, fast-forward only), deletes the squash-merged local branch that git branch -d always refuses, and prunes stale remote-tracking refs. It never forces anything on its own. A worktree with tracked changes, untracked or ignored files (found even under status.showUntrackedFiles=no), a lock or an operation in progress, a checkout mid-merge, a diverged base, a branch with commits the PR never had, and a fork branch not at the PR head are kept and reported. Untracked or ignored files are deleted only after an interactive /issue-pr-review user confirms the exact list shown (--remove-worktree PATH=DIGEST; a file added after the answer, or new history in a nested git repo, refuses the removal), never in auto mode; nested git repos are named in the prompt. Auto-pilot's parallel lanes keep a worktree holding untracked files, a lock or an operation in progress as blocked_dirty. A stash pop that conflicts names the unmerged paths and keeps the stash. A checkout on an unrelated branch stays put, and only the local base is fast-forwarded. /issue-pr-review runs it after its auto-merge and on a PR it finds already merged. /auto-pilot runs it after every merge (sequential, parallel lanes, partial and critical-issue merges) and on a merged PR found at resume. Both now re-read the PR state when gh pr merge exits non-zero, because gh merges on the server before its local cleanup can fail, and then run the cleanup with --delete-remote. The contract and the manual procedure live in the new runtime doc docs/post-merge-cleanup.md, shipped only to the two merging skills. (#535)

Contributions by @luongnv89.

Full Changelog: v0.25.0...v0.26.0