- name
SKILL.md
技能文件保留在发布者的仓库中。
在终端中粘贴复制的命令。它会把这个 SKILL.md 安装到对应的智能体中。
npx skills add GanyuanRan/Aegis --skill finishing-a-development-branch -a cursor -y在终端中粘贴复制的命令。它会把这个 SKILL.md 安装到对应的智能体中。
npx skills add GanyuanRan/Aegis --skill finishing-a-development-branch -a claude-code -y在终端中粘贴复制的命令。它会把这个 SKILL.md 安装到对应的智能体中。
npx skills add GanyuanRan/Aegis --skill finishing-a-development-branch -a codex -y在终端中粘贴复制的命令。它会把这个 SKILL.md 安装到对应的智能体中。
npx skills add GanyuanRan/Aegis --skill finishing-a-development-branch -a grok -y在 Grok Bot 聊天中发送复制的消息。Bot 会从 GitHub 获取这个 SKILL.md,并添加到你所有 Bot 共享的技能中。
Install this skill: https://github.com/GanyuanRan/Aegis/tree/HEAD/skills/finishing-a-development-branch来自发布者
Integration choice and checkout lifetime are separate. Verify first, mutate only task-owned resources, then prove what was removed or retained.
Core principle: fresh evidence -> authorized integration -> ownership-aware cleanup -> Git/path readback.
Announce at start: explain which branch/worktree lifecycle is being closed.
Read the task's TaskStartSnapshot and current repository state. Record:
HEAD, branch/detached state, upstream divergence, and active Git ops;git worktree list --porcelain;Stop on conflicts, unexplained detached state, failed verification, dirty/untracked state in
a cleanup target, or unknown ownership. Do not infer the base from the names
main or master; use task records, repository authority, or explicit user
direction. Never auto-stash, reset, clean, pull, rebase, amend, force-push, or
bypass hooks.
For a trusted host-managed detached checkout, follow the repository's approved managed-workspace contract: verify host binding, default cwd, root, and HEAD; then use its scoped local-commit and native handoff path. Report detached HEAD in the receipt. This exception does not authorize automatic deletion of the detached checkout or bypass unknown ownership/binding.
If no task-created branch/worktree exists and integration was not requested,
skip this workflow: report the local task commit plus Task clean and
Repository clean; do not invent merge/PR ceremony.
Run the smallest current-authority test set that proves the completed task. If it fails, preserve all work and return to diagnosis. Do not present the branch as ready.
When a task branch actually needs disposition, present only applicable choices:
Push, PR, remote deletion, release, and force operations require explicit user authorization. Discard requires a fresh, exact typed confirmation naming branch, worktree path, and commits/delta to lose. Generic agreement is insufficient.
Verify the target checkout is safe, switch to the recorded base, merge without an implicit pull, and rerun verification on the merged result. If integration or verification fails, preserve both histories and stop.
Push only the authorized task branch and create/update the PR with summary and fresh test evidence. PR creation does not itself prove merge and does not require the temporary worktree to remain.
Retain the branch. Remove a clean task-created temporary worktree by default; retain it only for an explicit ongoing-checkout need and report why.
After exact confirmation, remove only the named clean task-owned worktree, then the named branch. If either differs from the confirmation, stop and ask again.
Use evidence matching the merge strategy:
git cherry for rebased commits; stable patch-id or bounded
changed-path/tree comparison for squashes), not an ancestor-only test;Never delete a branch merely because a PR was opened or a similarly named commit exists.
For a clean task-owned resource:
git worktree remove <exact-path>;git worktree list --porcelain;HEAD, and repository status.Do not use routine --force, global git worktree prune, wildcard deletion, or
cleanup of resources absent from the task ownership record. On Windows, Git may
unregister a worktree while its directory remains locked: re-check registration
and the exact resolved path, remove only a proven task-owned clean residual when
safe, otherwise retain it and report the lock/path. Never widen deletion scope.
Report:
Task clean: yes|no and Repository clean: yes|no independently;Task clean means no uncommitted task-owned delta remains. Repository clean
means no staged, unstaged, or untracked repository state remains.
This is a local Git receipt, not authoritative completion or merge truth beyond the evidence read back.
Called only when branch/worktree integration or explicit lifecycle handling is
in scope. Pairs with using-git-worktrees and
verification-before-completion.
Use when verified work needs integration or cleanup of an existing task-created branch/worktree, or the user explicitly requests merge, PR, or branch lifecycle handling.
---name: finishing-a-development-branchdescription: Use when verified work needs integration or cleanup of an existing task-created branch/worktree, or the user…---# skills/finishing-a-development-branch/SKILL.md常见问题
从发布者处下载 skills/finishing-a-development-branch/SKILL.md,或复制路径后打开仓库。PlugMCP 只收录该技能,不托管文件。
发布者将它存放在 https://github.com/GanyuanRan/Aegis。
Claude、Cursor、Codex 和 Grok Build 可以读取你从发布者仓库添加的 SKILL.md。在聊天中发送技能的 GitHub 文件夹链接,Grok Bot 就会安装它。