Finishing a Development Branch
obra/superpowers
Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.
Create an isolated Rigor worktree with its copy-on-write gem bundle.
$ npx skills add rigortype/rigor --skill rigor-worktree -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install rigortype/rigor rigor-worktree --agent claude-codeProject scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).
$ git clone --depth 1 https://github.com/rigortype/rigor.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.claude/skills/rigor-worktree .claude/skills/rigor-worktree && rm -rf skills-srcUse ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.
Claude Code skills documentation · loads skills from .claude/skills/
Install the "rigor-worktree" agent skill from https://github.com/rigortype/rigor/tree/master/.claude/skills/rigor-worktree into .claude/skills/rigor-worktree/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rigor-worktree", then confirm the skill loads.Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$skill-installer install https://github.com/rigortype/rigor/tree/master/.claude/skills/rigor-worktreeType this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
$ npx skills add rigortype/rigor --skill rigor-worktree -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install rigortype/rigor rigor-worktree --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/rigortype/rigor.git skills-src && mkdir -p .agents/skills && cp -r skills-src/.claude/skills/rigor-worktree .agents/skills/rigor-worktree && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "rigor-worktree" agent skill from https://github.com/rigortype/rigor/tree/master/.claude/skills/rigor-worktree into .agents/skills/rigor-worktree/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rigor-worktree", then confirm the skill loads.Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add rigortype/rigor --skill rigor-worktree -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install rigortype/rigor rigor-worktree --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/rigortype/rigor.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/.claude/skills/rigor-worktree .cursor/skills/rigor-worktree && rm -rf skills-srcUse ~/.cursor/skills/ instead of .cursor/skills for a personal install.
Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/
Install the "rigor-worktree" agent skill from https://github.com/rigortype/rigor/tree/master/.claude/skills/rigor-worktree into .cursor/skills/rigor-worktree/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rigor-worktree", then confirm the skill loads.Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gemini skills install https://github.com/rigortype/rigor.git --path .claude/skills/rigor-worktree--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
$ npx skills add rigortype/rigor --skill rigor-worktree -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install rigortype/rigor rigor-worktree --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/rigortype/rigor.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/.claude/skills/rigor-worktree .gemini/skills/rigor-worktree && rm -rf skills-srcUse ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.
Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/
Install the "rigor-worktree" agent skill from https://github.com/rigortype/rigor/tree/master/.claude/skills/rigor-worktree into .gemini/skills/rigor-worktree/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rigor-worktree", then confirm the skill loads.Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gh skill install rigortype/rigor rigor-worktreeInstalls for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
$ npx skills add rigortype/rigor --skill rigor-worktree -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/rigortype/rigor.git skills-src && mkdir -p .github/skills && cp -r skills-src/.claude/skills/rigor-worktree .github/skills/rigor-worktree && rm -rf skills-srcUse ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.
GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/
Install the "rigor-worktree" agent skill from https://github.com/rigortype/rigor/tree/master/.claude/skills/rigor-worktree into .github/skills/rigor-worktree/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rigor-worktree", then confirm the skill loads.GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add rigortype/rigor --skill rigor-worktree -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install rigortype/rigor rigor-worktree --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/rigortype/rigor.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/.claude/skills/rigor-worktree .opencode/skills/rigor-worktree && rm -rf skills-srcUse ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.
OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/
Install the "rigor-worktree" agent skill from https://github.com/rigortype/rigor/tree/master/.claude/skills/rigor-worktree into .opencode/skills/rigor-worktree/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "rigor-worktree", then confirm the skill loads.OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
rigor-worktreeCreate an isolated Rigor worktree with its copy-on-write gem bundle.
Rigor Worktree is an agent skill from rigortype/rigor. Create an isolated Rigor worktree with its copy-on-write gem bundle. Use for parallel work, a subagent checkout, or a dependency-bump branch; not for ordinary branch work that needs no isolation.
Its SKILL.md is about 1.6k tokens, which your agent loads only when the skill is triggered. The skill folder holds 3 other files (for example `evals/README.md` and `evals/trigger-eval.json`).
It sits in Development, covering Git worktrees. It works with Ruby and Git. The repository describes itself as: Inference-first static analysis for Ruby. The licence is MPL-2.0.
Read from SKILL.md and the folder at commit 57a67cf. It shows what the files ask for, not the result of running them.
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
Shell commands in SKILL.md call:
gitbundlemakeFrom the folder's file list and the shell code blocks in SKILL.md.
No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.
From URLs in SKILL.md, links to its own repository left out.
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
Rigor Worktree loads about 1.6k tokens when it runs. Until then it costs about 53 tokens; SKILL.md has 806 words of instructions outside code blocks.
Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.
The automated check found no risky patterns in SKILL.md.
Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.
The full file from rigortype/rigor at commit 57a67cf, republished under its MPL-2.0 licence (© rigortype). 806 words, ~1,569 tokens.
.claude/skills/rigor-worktree/SKILL.md (or your agent's skills folder). This skill also uses 2 other files; get the full folder from GitHub.A worktree is the isolation boundary for parallel work: a lib-editing
agent gets its own tree so the exe/rigor another agent invokes is not
the code being rewritten under it, and a branch with its own
Gemfile.lock can bundle install without touching anyone else.
bin/rigor-worktree [--with-references] [--with-tools] <branch> [start-point]<branch> — an existing branch is checked out; a new name is created
from <start-point> (default origin/master).$RIGOR_WT_ROOT/<slug>, default
<main>/../rigor-wt/<slug> (~/repo/ruby/rigor-wt/<slug> in the usual
layout). <slug> is the branch with a leading codex/ stripped and
/ → -.The script runs git worktree add, then populates the bundle:
vendor/bundle (~126M, ~9800 files) is copy-on-write cloned from
the main clone — cp -Rc / clonefile(2) on APFS, a reflink on
btrfs/xfs, a plain copy elsewhere. A few seconds, near-zero disk until
blocks diverge, and the copy is writable and isolated..bundle/config is copied (BUNDLE_PATH: "vendor/bundle", a relative
path — it only resolves because the real vendor/bundle is now
in-tree).No .git/info/exclude entry is needed: the real vendor/bundle/
directory matches the stock .gitignore /vendor/bundle/, so
git status stays clean.
The main clone must have a populated vendor/bundle first — the script
refuses otherwise. Run make setup there once if needed.
references/ submodules are NOT populated in a worktree. A worktree
shares .git, but submodule working trees are per-checkout, so every
references/* directory is empty. A spec that reads a reference checkout
(spec/docs/c_effects_raises_gate_spec.rb is the clear one; the
builtin-catalog extraction target reads references/ruby too) then
skips — not fails — silently, and a worker believes its gate ran
when only the fixture arm did. Options:
--with-references — CoW-clones every populated references/*
checkout and re-points each copied .git file at the shared module
store. Fine because references/ is read-only here. The script
then compares each copy's top-level entries against the main
clone's and exits non-zero if one did not land, because the cheap
looks do not discriminate: a checkout copied one level deep still
lists under ls references/ and still answers git -C references/<name> rev-parse HEAD, while the gate that reads it skips.make init-submodules inside the worktree.Verify a reference-reading gate actually executed (not pending /
skipped) before believing it.
.git is shared across all worktrees.
git stash in a worktree — the stash stack is per-repo, so a
stash/pop can pop another session's WIP into your tree. Take
baselines with git checkout <sha> -- <path> … git checkout HEAD -- <path>, and commit before any baseline swap.git submodule deinit / git submodule update --init that
removes a registration — it deregisters the submodule for the main
clone. Adding a checkout in a worktree is fine; removing a
registration is never fine. Repair:
git submodule update --init --filter=blob:none references/<name>.Push with an explicit refspec, never -u. A worktree branch
created from master can carry branch.<name>.merge = refs/heads/master
(autoSetupMerge), and this environment sets push.default = tracking —
so git push -u origin <branch> resolves the destination through the
upstream config and lands the branch's commits on remote master
directly, bypassing the PR flow. Always push as
git push origin <branch>:refs/heads/<branch> (which also makes the
-> mapping visible in the output — read it). If it ever happens,
restore with
git push --force-with-lease=refs/heads/master:<pushed-sha> origin <prev-sha>:refs/heads/master
before anyone fetches.
--with-toolsAlso CoW-clones tool/steep/vendor and tool/sorbet/vendor (each its
own bundle under tool/*/Gemfile). Only needed for a branch that runs
make steep-check or touches the Sorbet adapter.
Gemfile.lockRun bundle install in the worktree. It re-resolves against the cloned
bundle and diverges only the blocks it changes — the main clone and
sibling worktrees are untouched. This is the whole point of cloning
rather than symlinking.
The clone is pinned to the main clone's vendor/bundle at creation time.
If master later bumps a gem, an existing worktree keeps the old gems
until you bundle install in it.
The local gate in a worktree is make verify-changed; the full suite is
CI's, on the Draft PR. When a heavy job must run locally anyway — a
full-suite reproduction, a corpus rigor check — run it in the
foreground with a generous timeout, never run_in_background (a
backgrounded full run is the known stall, and a detached wait cannot
always be woken), and one heavy job on the machine at a time: the
host OOM on record (2026-09-01) struck while a corpus rigor check over
eleven survey targets ran alongside four resumed workers. Implementation
parallel, heavy verification serial.
git worktree remove <path> # --force if the tree is dirty
git worktree pruneThe CoW clone's disk is reclaimed with the directory.
bin/rigor-worktree <branch> — bundle cloned, .bundle/config copied,
git status clean.--with-references if any gate this branch runs reads a
references/ checkout; otherwise expect silent skips.--with-tools for a Steep / Sorbet branch.git stash, no submodule deregistration, commit
before baseline swaps.bundle install in the worktree if the branch moved Gemfile.lock.© rigortype, MPL-2.0. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file
SKILL.md and 2 other files in .claude/skills/rigor-worktree of rigortype/rigor.
Open the folder on GitHubat commit 57a67cf
Rigor Worktree next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.
| Skill | Stars | Used in | Tokens | Auto-check | Licence | Repo updated |
|---|---|---|---|---|---|---|
| Rigor Worktree this skillrigortype/rigor | 106 | — | ~1.6k | Automated safety check: Pass | MPL-2.0 | |
| Finishing a Development Branchobra/superpowers | 296k | 5 repos | ~1.9k | Automated safety check: Pass | MIT | |
| Finishing A Development Branchfarm-fe/farm | 5.6k | 34 repos | ~1.8k | Automated safety check: Pass | MIT | |
| Git Worktree Cleanuplobehub/lobehub | 83k | — | ~2.8k | Automated safety check: Pass | Custom licence | |
| Pre-Release PR Triagejamiepine/voicebox | 57k | — | ~3.1k | Automated safety check: Pass | MIT | |
| Ccmanager Configkbwo/ccmanager | 1.3k | — | ~1.5k | Automated safety check: Pass | MIT |
obra/superpowers
Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.
farm-fe/farm
A skill your agent uses when implementation is complete, all tests pass, and you need to decide how to integrate the work - guides completion of development work by presenting structured options for…
lobehub/lobehub
Audits stale Git worktrees and branches with a bundled script, classifies each one, and deletes only after you approve the exact candidates.
jamiepine/voicebox
Sorts a backlog of open pull requests into must-merge, candidate, superseded and deferred, writes a triage doc and works the merge loop before a release.
kbwo/ccmanager
Set up, review, or repair a CCManager config — .ccmanager.json at a git repository root, or the global ~/.config/ccmanager/config.json.
CapSoftware/Cap
Builds a Cap feature in an isolated Git worktree with disposable dev resources, verification, a recorded demo and a neutral pull request, started with /building.
rigortype/rigor
Measure Rigor's baseline drift across the tagged history of a real OSS Ruby project.
rigortype/rigor
Adjudicate a rigor unused report safely before proposing dead-code removal.
rigortype/rigor
Reduce an existing .rigor-baseline.yml rule by rule by triaging sites, fixing or intentionally suppressing them, and regenerating the baseline.
rigortype/rigor
Validate that a project's Rigor configuration, plugins, paths, and baseline are actually healthy.
rigortype/rigor
Author a new Rigor plugin, choosing plugins/ for production support or examples/ for a contract walkthrough.
rigortype/rigor
Author a Rigor plugin in an adopting project or standalone rigor- gem for a DSL, framework, or metaprogramming pattern.
Categories
Create an isolated Rigor worktree with its copy-on-write gem bundle. Rigor Worktree is an agent skill from rigortype/rigor. Create an isolated Rigor worktree with its copy-on-write gem bundle.
Rigor Worktree fits situations like: A subagent checkout; A dependency-bump branch; not for ordinary branch work that needs no isolation.
Run `npx skills add rigortype/rigor --skill rigor-worktree -a claude-code`. Or copy the skill folder (.claude/skills/rigor-worktree in rigortype/rigor) into .claude/skills/rigor-worktree in your project. Claude Code loads it when a task matches its description.
Run `npx skills add rigortype/rigor --skill rigor-worktree -a codex`. Or copy the skill folder (.claude/skills/rigor-worktree in rigortype/rigor) into .agents/skills/rigor-worktree in your project. Codex loads it when a task matches its description.
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add rigortype/rigor --skill rigor-worktree -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/rigor-worktree, .gemini/skills/rigor-worktree, .github/skills/rigor-worktree and .opencode/skills/rigor-worktree in your project.
Going by SKILL.md and its folder, Rigor Worktree needs the command-line tools its instructions call (git, bundle and make).
SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.
Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.
Rigor Worktree is published under the MPL-2.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
About 1.6k tokens (SKILL.md is roughly 6.3k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
Skills that share tags, products or a category with Rigor Worktree: Finishing a Development Branch (obra/superpowers, 296k stars), Finishing A Development Branch (farm-fe/farm, 5.6k stars), Git Worktree Cleanup (lobehub/lobehub, 83k stars) and Pre-Release PR Triage (jamiepine/voicebox, 57k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
rigortype (a GitHub organization) maintains it in rigortype/rigor, which has 106 GitHub stars. The repository holds 36 skills in this directory. The repository was last updated on October 8, 2026.
Source: rigortype/rigor on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.