A cleanup routine for local development after a GitHub pull request has been merged. It synchronizes the main branch, removes the finished branch and worktrees, updates the related issue, and records lessons.

Use it after a merge to update local main, delete merged branches, remove temporary worktrees, close the linked issue, and capture review learnings.

It prevents leftover branches, worktrees, and outdated issue labels from cluttering the project. It also keeps local files and project tracking aligned with the merged code.

How xsovad06/sova configures Claude Code

Reuse

Borrowing it

Nothing to install: this file belongs to xsovad06/sova. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.

Copy the file

curl -O https://raw.githubusercontent.com/xsovad06/sova/main/.claude/commands/after-merge.md

Clone the repo

git clone --depth 1 https://github.com/xsovad06/sova

Made for: Claude Code.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

README.md

[![agentmods](https://agentmods.dev/badge/commands/xsovad06/sova/after-merge/github.svg)](https://agentmods.dev/commands/xsovad06/sova/after-merge)

Your own site

<a href="https://agentmods.dev/commands/xsovad06/sova/after-merge"><img src="https://agentmods.dev/badge/commands/xsovad06/sova/after-merge/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

Your own site · 80×15

<a href="https://agentmods.dev/commands/xsovad06/sova/after-merge"><img src="https://agentmods.dev/badge/commands/xsovad06/sova/after-merge.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

Per session 30 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.

When invoked 923 The whole file, excluding the scripts and references it only reads on demand.

Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.

Origin original No closer match found in the catalogue.

Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

Model	Per session	Once invoked
Fable 5.1	$0.00030	$0.00923
Opus 5.5	$0.00012	$0.00369
Sonnet 5.5	$0.00006	$0.00185
Haiku 4.5	$0.00003	$0.00092

Measured 14d ago against content hash 1f7e86030977, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

after-merge scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 14d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.claude/commands/after-merge.md · 81 lines

How it starts

The opening of the file, as written. The whole thing — 81 lines — stays where its author put it; the contents beside it link to each section on GitHub.

After Merge Cleanup

The /integrate-pr workflow is the preferred path (it merges, audits and cleans up in one run); this command is kept for PRs merged outside it.

Run this after a PR has been merged to clean up local state and capture learnings.

Instructions

Each shell block below runs as its own shell invocation, so each one assigns every variable it reads.

Get the PR from $ARGUMENTS (PR number or branch name). If empty, check for recently merged PRs:
```
gh pr list --author @me --state merged --limit 5
```

Switch to the base branch and pull (from the primary checkout, not a worktree):

BASE=$(gh pr view <PR_NUMBER> --json baseRefName --jq .baseRefName)
git checkout "$BASE"
git pull origin "$BASE"

Clean up worktrees (if any exist for this ticket). Do this before deleting the branch: git refuses to delete a branch that a worktree still has checked out.
```
git worktree list
```
Remove worktrees for the merged ticket. Do not pass --force: if a worktree has uncommitted changes, leave it in place and report it rather than discarding the work.
```
git worktree remove .claude/worktrees/<ID>
```
Prune dangling worktree references (directories removed but entries remain):
```
git worktree prune
```
Delete the merged branch locally:
```
git branch -d <branch-name>
```
If -d refuses ("not fully merged", expected after a rebase merge), confirm BASE=$(gh pr view <PR_NUMBER> --json baseRefName --jq .baseRefName); git diff "origin/$BASE" <branch-name> prints nothing, then git branch -D <branch-name>. If the diff is non-empty only because the base branch moved on after the merge, compare against the PR's merge commit instead (gh pr view <PR_NUMBER> --json mergeCommit --jq .mergeCommit.oid); if that is not empty either, keep the branch and report it.

Close linked issue and clean up labels:

gh issue close <ISSUE_NUMBER> 2>/dev/null || true

Remove stale workflow labels that are no longer meaningful on a closed issue:

gh issue edit <ISSUE_NUMBER> --remove-label "agent:in-review" --remove-label "agent:in-progress" --remove-label "sova:revise" --remove-label "sova:block" 2>/dev/null || true

Read the full file on GitHub · 81 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

14d ago Changed 1f7e86030977
16d ago Changed · +11 lines · +3 tokens per session a62723c2a7eb
2mo ago First seen · 70 lines · 27 tokens per session scan A b1464e7140ce

Subscribe to this mod's changes

after-merge is a command published in the GitHub repository xsovad06/sova (2 stars, last pushed yesterday), licensed Apache-2.0. It adds 30 tokens to every session and 923 once invoked, about $0.0001 per session on Opus 5.5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.

Code review Git and workflow ai-agents automation autonomous-development cli developer-tools pr

merge

Consolidate feature branch changes and create final PR to main. This completes the v5.0 feature branch workflow after all task PRs have been merged.

opensesh/KARIMO · 0 tokens

update

Check for and apply KARIMO updates from GitHub releases.

opensesh/KARIMO · 0 tokens

code-review

Review the current branch changes for bugs and style issues.

Goldziher/ai-rulez · 11 tokens

pr-ready

Run the project's pre-commit review loop to determine whether the current branch is ready to push — lint, tests, parallel pr-review-toolkit agents plus an over-engineering audit, fix-and-re-run until convergence.

costajohnt/oss-autopilot · 45 tokens

end

End a work session - a settlement pass that reconciles uncommitted / unpushed work + session context into git, the tracker, and a session snapshot file. --session (aliases --snapshot, --pre-compact, --compact) skips settlement and only writes the shared snapshot, keeping the session going.

restarter/lets-workflow · 63 tokens

address-pr-feedback

Systematically address PR review comments. Fetches all threads, categorizes by status (acknowledged, silently fixed, unaddressed), and guides user through posting replies and implementing fixes with explicit approval.

axiomantic/spellbook · 43 tokens

sova: Command for Claude Code