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.
A skill your agent uses when running OpenSpec propose, continue, apply, verify, archive, or worktree workflows where proposal artifacts, branches, merges, or archive timing affect git history.
Install Openspec Git Discipline
$ npx skills add intent-driven-dev/intent-driven-template --skill openspec-git-discipline -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install intent-driven-dev/intent-driven-template openspec-git-discipline --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/intent-driven-dev/intent-driven-template.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/openspec-git-discipline .claude/skills/openspec-git-discipline && 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 "openspec-git-discipline" agent skill from https://github.com/intent-driven-dev/intent-driven-template/tree/main/.agents/skills/openspec-git-discipline into .claude/skills/openspec-git-discipline/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "openspec-git-discipline", 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/intent-driven-dev/intent-driven-template/tree/main/.agents/skills/openspec-git-disciplineType 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 intent-driven-dev/intent-driven-template --skill openspec-git-discipline -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install intent-driven-dev/intent-driven-template openspec-git-discipline --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/intent-driven-dev/intent-driven-template.git skills-src && mkdir -p .agents/skills && cp -r skills-src/.agents/skills/openspec-git-discipline .agents/skills/openspec-git-discipline && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "openspec-git-discipline" agent skill from https://github.com/intent-driven-dev/intent-driven-template/tree/main/.agents/skills/openspec-git-discipline into .agents/skills/openspec-git-discipline/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "openspec-git-discipline", 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 intent-driven-dev/intent-driven-template --skill openspec-git-discipline -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install intent-driven-dev/intent-driven-template openspec-git-discipline --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/intent-driven-dev/intent-driven-template.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/.agents/skills/openspec-git-discipline .cursor/skills/openspec-git-discipline && 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 "openspec-git-discipline" agent skill from https://github.com/intent-driven-dev/intent-driven-template/tree/main/.agents/skills/openspec-git-discipline into .cursor/skills/openspec-git-discipline/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "openspec-git-discipline", 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/intent-driven-dev/intent-driven-template.git --path .agents/skills/openspec-git-discipline--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 intent-driven-dev/intent-driven-template --skill openspec-git-discipline -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install intent-driven-dev/intent-driven-template openspec-git-discipline --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/intent-driven-dev/intent-driven-template.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/.agents/skills/openspec-git-discipline .gemini/skills/openspec-git-discipline && 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 "openspec-git-discipline" agent skill from https://github.com/intent-driven-dev/intent-driven-template/tree/main/.agents/skills/openspec-git-discipline into .gemini/skills/openspec-git-discipline/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "openspec-git-discipline", 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 intent-driven-dev/intent-driven-template openspec-git-disciplineInstalls 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 intent-driven-dev/intent-driven-template --skill openspec-git-discipline -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/intent-driven-dev/intent-driven-template.git skills-src && mkdir -p .github/skills && cp -r skills-src/.agents/skills/openspec-git-discipline .github/skills/openspec-git-discipline && 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 "openspec-git-discipline" agent skill from https://github.com/intent-driven-dev/intent-driven-template/tree/main/.agents/skills/openspec-git-discipline into .github/skills/openspec-git-discipline/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "openspec-git-discipline", 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 intent-driven-dev/intent-driven-template --skill openspec-git-discipline -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install intent-driven-dev/intent-driven-template openspec-git-discipline --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/intent-driven-dev/intent-driven-template.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/.agents/skills/openspec-git-discipline .opencode/skills/openspec-git-discipline && 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 "openspec-git-discipline" agent skill from https://github.com/intent-driven-dev/intent-driven-template/tree/main/.agents/skills/openspec-git-discipline into .opencode/skills/openspec-git-discipline/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "openspec-git-discipline", 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.
Facts
- Skill name
openspec-git-discipline- GitHub stars
- 161
- Token cost
- ~746 tokens
- SKILL.md length
- 412 words
- Files
- 1
- Skills in repo
- 10
- Repo updated
- First seen
- Licence
- MIT
At a glance
A skill your agent uses when running OpenSpec propose, continue, apply, verify, archive, or worktree workflows where proposal artifacts, branches, merges, or archive timing affect git history.
- Works in 3 steps: Run git status --short. → Verify openspec/changes// has no… → Verify the proposal change exists on…
- Running OpenSpec propose
- SKILL.md covers Core Rule, Gates, Required Checks and Red Flags
- Calls git
What it does
Openspec Git Discipline is an agent skill from intent-driven-dev/intent-driven-template. Use when running OpenSpec propose, continue, apply, verify, archive, or worktree workflows where proposal artifacts, branches, merges, or archive timing affect git history.
Its SKILL.md is about 750 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts. Compatibility notes: Requires git and OpenSpec workflow artifacts.
It sits in Development, covering Git workflow and Git worktrees. It works with Git. The repository describes itself as: OpenSpec and OpenCode template for intent-driven development with specs, ADRs, C4 diagrams, Gherkin, TDD, Multi-Model Adversarial Spec Authoring, Glossary for Domain Terms, and… The licence is MIT.
When your agent uses it
- Running OpenSpec propose
- Worktree workflows where proposal artifacts
- Archive timing affect git history
Example prompts
- “/openspec-git-discipline”
Requirements
- Compatibility (from SKILL.md): Requires git and OpenSpec workflow artifacts.
Workflow steps
3 steps, taken from the first numbered list in SKILL.md.
- Run git status --short.
- Verify openspec/changes// has no uncommitted proposal files.
- Verify the proposal change exists on main before applying from any branch/worktree.
What it can do on your machine
Read from SKILL.md and the folder at commit 73f54d5. It shows what the files ask for, not the result of running them.
Tool permissions
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.
Runs code
Shell commands in SKILL.md call:
git
From the folder's file list and the shell code blocks in SKILL.md.
Network
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.
Credentials
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
Compatibility
Requires git and OpenSpec workflow artifacts.
From compatibility in the SKILL.md frontmatter.
Context cost
Openspec Git Discipline loads about 746 tokens when it runs. Until then it costs about 49 tokens; SKILL.md has 412 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.
Safety
Auto-check passed
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.
SKILL.md
The full file from intent-driven-dev/intent-driven-template at commit 73f54d5, republished under its MIT licence (© intent-driven-dev). 412 words, ~746 tokens.
Download SKILL.mdSave it as
.claude/skills/openspec-git-discipline/SKILL.md (or your agent's skills folder).- name
- openspec-git-discipline
- description
- Use when running OpenSpec propose, continue, apply, verify, archive, or worktree workflows where proposal artifacts, branches, merges, or archive timing affect git history.
- compatibility
- Requires git and OpenSpec workflow artifacts.
- license
- MIT
OpenSpec Git Discipline
Core Rule
Every OpenSpec state change must cross main before the next lifecycle phase depends on it.
- Propose/continue artifacts may be drafted on a branch, but must be committed and merged to
mainbefore apply starts. - Apply may run on
main, a branch, or a worktree only if that exact proposal change is already available onmain. - Archive may run only from
mainafter implementation is merged back.
Never create commits, branches, or merges unless the user explicitly asks.
Gates
| Moment | Gate |
|---|---|
| Before propose | Prefer main; if not, warn and ask whether to continue intentionally. |
| During continue | Before creating the next artifact, ask the user to commit completed artifact changes or explicitly continue without that checkpoint. |
| After propose | Ask the user to commit proposal artifacts; offer to create a PR branch for review. |
| Before apply | Confirm the proposal change is committed on main; then apply may run from main, a branch, or a worktree. |
| Before archive | Stop unless implementation is merged back to main and archive is running from main. |
| After archive | Ask the user to commit archive/spec sync changes. |
Required Checks
Before apply:
- Run
git status --short. - Verify
openspec/changes/<change>/has no uncommitted proposal files. - Verify the proposal change exists on
mainbefore applying from any branch/worktree.
Use this language if the proposal has not reached main:
I should not apply this yet because the proposal change has not reached
main. A proposal can be drafted on a branch, but apply must start only after that proposal state is available onmain. Please merge or commit the proposal tomainfirst, then I can apply frommain, a branch, or a worktree.
Show full SKILL.md (134 more words)Show less
Before archive:
- Run
git branch --show-currentandgit status --short. - Stop if not on
main. - Stop if implementation work has not been merged back to
main.
Use this language:
I should not archive this yet because archive must run from
mainafter implementation is merged back. Verify makes a change eligible to merge; it does not replace the merge.
Red Flags
- Applying a proposal that exists only on the current branch/worktree.
- Treating worktree visibility as proof that the proposal reached
main. - Creating the next continue artifact without asking about committing the previous one.
- Archiving from a feature branch or before implementation is merged to
main. - Auto-committing, branching, or merging without explicit user approval.
All of these mean: pause, explain the boundary, and ask the user to make the git state explicit.
© intent-driven-dev, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file
Files
Just SKILL.md in .agents/skills/openspec-git-discipline of intent-driven-dev/intent-driven-template.
Open the folder on GitHubat commit 73f54d5
Compare with similar skills
Openspec Git Discipline 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 |
|---|---|---|---|---|---|---|
| Openspec Git Discipline this skillintent-driven-dev/intent-driven-template | 161 | — | ~746 | Automated safety check: Pass | MIT | |
| Finishing a Development Branchobra/superpowers | 297k | 5 repos | ~1.9k | Automated safety check: Pass | MIT | |
| Git Worktree Cleanuplobehub/lobehub | 83k | — | ~2.8k | Automated safety check: Pass | Custom licence | |
| Ccmanager Configkbwo/ccmanager | 1.3k | — | ~1.5k | Automated safety check: Pass | MIT | |
| Git Worktree Managermicrosoft/WindowsAppSDK | 4.7k | — | ~2k | Automated safety check: Pass | MIT | |
| Git Worktree IsolationjnMetaCode/superpowers-zh | 8.3k | 1 repos | ~982 | Automated safety check: Pass | MIT |
Similar skills
Git Worktree Cleanup
lobehub/lobehub
Audits stale Git worktrees and branches with a bundled script, classifies each one, and deletes only after you approve the exact candidates.
Ccmanager Config
kbwo/ccmanager
Set up, review, or repair a CCManager config — .ccmanager.json at a git repository root, or the global ~/.config/ccmanager/config.json.
- Official
Git Worktree Manager
microsoft/WindowsAppSDK
Creates and manages Git worktrees with PowerShell scripts so separate issues and Copilot sessions each get an isolated branch, build and test environment.
Git Worktree Isolation
jnMetaCode/superpowers-zh
Sets up an isolated workspace before feature work or plan execution, preferring native worktree tools and falling back to git worktree, with instructions in Chinese.
Git Commit
tisfeng/Easydict
起草、创建或汇报 Angular-style 本地 Git 提交。用于明确的提交交付；分支集成使用 worktree-rebase-merge，不 push。
More from intent-driven-dev/intent-driven-template
All 10 skills in this repoAcceptance Test Authoring
intent-driven-dev/intent-driven-template
A skill your agent uses when creating or modifying acceptance tests, configuring cucumber-js or behave runners, writing or refactoring step definitions, linting executable Gherkin specs, choosing an…
Adversarial Authoring
intent-driven-dev/intent-driven-template
A skill your agent uses when rules or instructions mention "adversarial-authoring", "adversarial authoring", "must use adversarial-authoring skill", "model council", "cross-model review", or…
Architectural Decision Records
intent-driven-dev/intent-driven-template
A skill your agent uses when documenting, drafting, reviewing, or updating architectural decisions, ADRs, decision logs, tradeoffs, rationale, consequences, alternatives, or architecture decision…
Gherkin Authoring
intent-driven-dev/intent-driven-template
A skill your agent uses when drafting, reviewing, or improving Gherkin, Cucumber scenarios, BDD acceptance criteria, feature examples, Scenario Outlines, Backgrounds, Rules, Doc Strings, Data…
Glossary
intent-driven-dev/intent-driven-template
A skill your agent uses when authoring or reviewing specs, requirements, design docs, ADRs, tasks, glossary entries, domain terms, technical terms, or wording consistency across artifacts
Openspec Bulk Apply Change
intent-driven-dev/intent-driven-template
A skill your agent uses when multiple active OpenSpec changes should be applied concurrently in isolated worktrees with delegated verification and no merge.
Related
Works with
Categories
Questions about Openspec Git Discipline
What does Openspec Git Discipline do?
A skill your agent uses when running OpenSpec propose, continue, apply, verify, archive, or worktree workflows where proposal artifacts, branches, merges, or archive timing affect git history. Openspec Git Discipline is an agent skill from intent-driven-dev/intent-driven-template. Use when running OpenSpec propose, continue, apply, verify, archive, or worktree workflows where proposal artifacts, branches, merges, or archive timing affect git history.
When should I use Openspec Git Discipline?
Openspec Git Discipline fits situations like: running OpenSpec propose; worktree workflows where proposal artifacts; archive timing affect git history.
How do I install Openspec Git Discipline in Claude Code?
Run `npx skills add intent-driven-dev/intent-driven-template --skill openspec-git-discipline -a claude-code`. Or copy the skill folder (.agents/skills/openspec-git-discipline in intent-driven-dev/intent-driven-template) into .claude/skills/openspec-git-discipline in your project. Claude Code loads it when a task matches its description.
How do I install Openspec Git Discipline in Codex?
Run `npx skills add intent-driven-dev/intent-driven-template --skill openspec-git-discipline -a codex`. Or copy the skill folder (.agents/skills/openspec-git-discipline in intent-driven-dev/intent-driven-template) into .agents/skills/openspec-git-discipline in your project. Codex loads it when a task matches its description.
Can I use Openspec Git Discipline in Cursor, Gemini CLI or GitHub Copilot?
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add intent-driven-dev/intent-driven-template --skill openspec-git-discipline -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/openspec-git-discipline, .gemini/skills/openspec-git-discipline, .github/skills/openspec-git-discipline and .opencode/skills/openspec-git-discipline in your project.
What does Openspec Git Discipline need to run?
Going by SKILL.md and its folder, Openspec Git Discipline needs the command-line tools its instructions call (git). Compatibility (from SKILL.md): Requires git and OpenSpec workflow artifacts..
Does Openspec Git Discipline access the network?
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.
Is Openspec Git Discipline safe to install?
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.
What licence does Openspec Git Discipline use?
Openspec Git Discipline is published under the MIT licence (declared in SKILL.md). It allows redistribution, so the full SKILL.md is shown on this page.
How many tokens does Openspec Git Discipline use?
About 746 tokens (SKILL.md is roughly 3k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
What are the alternatives to Openspec Git Discipline?
Skills that share tags, products or a category with Openspec Git Discipline: Finishing a Development Branch (obra/superpowers, 297k stars), Git Worktree Cleanup (lobehub/lobehub, 83k stars), Ccmanager Config (kbwo/ccmanager, 1.3k stars) and Git Worktree Manager (microsoft/WindowsAppSDK, 4.7k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Openspec Git Discipline?
intent-driven-dev (a GitHub organization) maintains it in intent-driven-dev/intent-driven-template, which has 161 GitHub stars. The repository holds 10 skills in this directory. The repository was last updated on October 4, 2026.
Source: intent-driven-dev/intent-driven-template on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.