Agent skill

Omk Finishing

by KaimingWan in KaimingWan/oh-my-kiro

Branch completion workflow: verify tests → present 4 options (merge/PR/keep/discard) → execute → cleanup worktree.

MITAuto-check passedDevelopment

Install Omk Finishing

skills CLI
$ npx skills add KaimingWan/oh-my-kiro --skill omk-finishing -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install KaimingWan/oh-my-kiro omk-finishing --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/KaimingWan/oh-my-kiro.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/omk-finishing .claude/skills/omk-finishing && rm -rf skills-src

Use ~/.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/

Facts

Skill name
omk-finishing
GitHub stars
107
Token cost
~1.1k tokens
SKILL.md length
353 words
Files
1
Skills in repo
15
Repo updated
First seen
Licence
MIT

At a glance

Branch completion workflow: verify tests → present 4 options (merge/PR/keep/discard) → execute → cleanup worktree.

  • Works in 5 steps: Verify Tests → Determine Base Branch → Present Options → …
  • Implementation is complete
  • SKILL.md covers Trigger Examples, Overview, The Process and Quick Reference, plus 3 more sections
  • Calls git, npm and gh

What it does

Omk Finishing is an agent skill from KaimingWan/oh-my-kiro. Branch completion workflow: verify tests → present 4 options (merge/PR/keep/discard) → execute → cleanup worktree. Trigger when implementation is complete, all tests pass, user says 'done', 'finish', 'merge', 'create PR', 'push', 'wrap up', '@cpu', or when ready to integrate work back to main branch.

Its SKILL.md is about 1.1k tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git worktrees and Pull requests. The licence is MIT.

When your agent uses it

  • Implementation is complete
  • Ready to integrate work back to main branch

Example prompts

  • “finish”
  • “create PR”
  • “wrap up”
  • “/omk-finishing”

Workflow steps

5 steps, taken from the step headings in SKILL.md.

  1. Verify Tests
  2. Determine Base Branch
  3. Present Options
  4. Execute Choice
  5. Cleanup Worktree

What it can do on your machine

Read from SKILL.md and the folder at commit ba228be. 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
    • npm
    • gh

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, npm and gh, 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.

Context cost

Omk Finishing loads about 1.1k tokens when it runs. Until then it costs about 79 tokens; SKILL.md has 353 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~79
When it runs · the whole SKILL.md, loaded when a task matches
~1.1k

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 KaimingWan/oh-my-kiro at commit ba228be, republished under its MIT licence (© KaimingWan). 353 words, ~1,114 tokens.

Download SKILL.mdSave it as .claude/skills/omk-finishing/SKILL.md (or your agent's skills folder).
name
omk-finishing
description
Branch completion workflow: verify tests → present 4 options (merge/PR/keep/discard) → execute → cleanup worktree. Trigger when implementation is complete, all tests pass, user says 'done', 'finish', 'merge', 'create PR', 'push', 'wrap up', '@cpu', or when ready to integrate work back to main branch.

Trigger Examples

  • "代码写完了,帮我合并"
  • "push and create a PR"
  • "这个分支可以收了"
  • "wrap up this feature branch"
  • "discard this work, start over"

Finishing a Development Branch

Overview

Guide completion of development work by presenting clear options and handling chosen workflow.

Core principle: Verify tests → Present options → Execute choice → Clean up.

Announce at start: "I'm using the finishing-a-development-branch skill to complete this work."

The Process

Step 1: Verify Tests

Before presenting options, verify tests pass:

bash
# Run project's test suite
npm test / cargo test / pytest / go test ./...

If tests fail:

Tests failing (<N> failures). Must fix before completing:

[Show failures]

Cannot proceed with merge/PR until tests pass.

Stop. Don't proceed to Step 2.

If tests pass: Continue to Step 2.

Step 2: Determine Base Branch
bash
# Try common base branches
git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null

Or ask: "This branch split from main - is that correct?"

Step 3: Present Options

Present exactly these 4 options:

Implementation complete. What would you like to do?

1. Merge back to <base-branch> locally
2. Push and create a Pull Request
3. Keep the branch as-is (I'll handle it later)
4. Discard this work

Which option?

Don't add explanation - keep options concise.

Step 4: Execute Choice
Option 1: Merge Locally
bash
# Switch to base branch
git checkout <base-branch>

# Pull latest
git pull

# Merge feature branch
git merge <feature-branch>

# Verify tests on merged result
<test command>

# If tests pass
git branch -d <feature-branch>

Then: Cleanup worktree (Step 5)

Option 2: Push and Create PR
bash
# Push branch
git push -u origin <feature-branch>

# Create PR
gh pr create --title "<title>" --body "$(cat <<'EOF'
## Summary
<2-3 bullets of what changed>

## Test Plan
- [ ] <verification steps>
EOF
)"

Then: Cleanup worktree (Step 5)

Option 3: Keep As-Is

Report: "Keeping branch <name>. Worktree preserved at <path>."

Don't cleanup worktree.

Option 4: Discard

Confirm first:

This will permanently delete:
- Branch <name>
- All commits: <commit-list>
- Worktree at <path>

Type 'discard' to confirm.

Wait for exact confirmation.

If confirmed:

bash
git checkout <base-branch>
git branch -D <feature-branch>

Then: Cleanup worktree (Step 5)

Step 5: Cleanup Worktree

For Options 1, 2, 4:

Check if in worktree:

bash
git worktree list | grep $(git branch --show-current)

If yes:

bash
git worktree remove <worktree-path>

For Option 3: Keep worktree.

Quick Reference

OptionMergePushKeep WorktreeCleanup Branch
1. Merge locally✓--✓
2. Create PR-✓✓-
3. Keep as-is--✓-
4. Discard---✓ (force)
Show full SKILL.md (140 more words)Show less

Common Mistakes

Skipping test verification

  • Problem: Merge broken code, create failing PR
  • Fix: Always verify tests before offering options

Open-ended questions

  • Problem: "What should I do next?" → ambiguous
  • Fix: Present exactly 4 structured options

Automatic worktree cleanup

  • Problem: Remove worktree when might need it (Option 2, 3)
  • Fix: Only cleanup for Options 1 and 4

No confirmation for discard

  • Problem: Accidentally delete work
  • Fix: Require typed "discard" confirmation

Red Flags

Never:

  • Proceed with failing tests
  • Merge without verifying tests on result
  • Delete work without confirmation
  • Force-push without explicit request

Always:

  • Verify tests before offering options
  • Present exactly 4 options
  • Get typed confirmation for Option 4
  • Clean up worktree for Options 1 & 4 only

Integration

Called by:

  • subagent-driven-development (Step 7) - After all tasks complete
  • executing-plans (Step 5) - After all batches complete

Pairs with:

  • using-git-worktrees - Cleans up worktree created by that skill

© KaimingWan, 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 skills/omk-finishing of KaimingWan/oh-my-kiro.

Open the folder on GitHubat commit ba228be

Compare with similar skills

Omk Finishing 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.

Omk Finishing compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Omk Finishing this skillKaimingWan/oh-my-kiro107—~1.1kAutomated safety check: PassMIT
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
Pre-Release PR Triagejamiepine/voicebox57k—~3.1kAutomated safety check: PassMIT
Cap Feature Building WorkflowCapSoftware/Cap23k—~2.5kAutomated safety check: WarnCustom licence
Om Auto Fix Issuego-musicfox/go-musicfox2.6k1 repos~5kAutomated safety check: NotesGPL-3.0
Codewhale Landing Workflowcodewhale-hq/Codewhale41k—~1.6kAutomated safety check: PassMIT

Similar skills

  • 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.

    297k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed
  • Pre-Release PR Triage

    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.

    57k GitHub stars~3.1k tokensUpdated 4 days ago
    DevelopmentAuto-check passed
  • 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.

    23k GitHub stars~2.5k tokensUpdated today
    DevelopmentAuto-check: warnings
  • Om Auto Fix Issue

    go-musicfox/go-musicfox

    Fix or implement a tracker issue end to end from a single command — takes an issue id or a plain problem description (filed first via om-prepare-issue), classifies, then drives the bug autofix chain…

    2.6k GitHub starsUsed in 1 repo~5k tokens
    DevelopmentAuto-check: notes
  • Codewhale Landing Workflow

    codewhale-hq/Codewhale

    Decides how verified work should reach main, directly, in a worktree or on an integration branch, while keeping contributor credit and respecting merge gates.

    41k GitHub stars~1.6k tokensUpdated today
    DevelopmentAuto-check passed
  • Clean Complete Branches

    jtenniswood/espcontrol

    Clean up completed Git branches and worktrees for this repository both locally and on GitHub.

    1.1k GitHub stars~820 tokensUpdated today
    DevelopmentAuto-check passed

More from KaimingWan/oh-my-kiro

All 15 skills in this repo
  • Omk Research

    KaimingWan/oh-my-kiro

    Multi-level research: built-in knowledge → web search → Tavily deep research API.

    107 GitHub stars~827 tokensUpdated 6 mo ago
    Auto-check passed
  • Omk Reviewing

    KaimingWan/oh-my-kiro

    Code and plan review with multi-angle dispatch. An agent skill from KaimingWan/oh-my-kiro.

    107 GitHub stars~1.9k tokensUpdated 6 mo ago
    Auto-check passed
  • Omk Skill Creation

    KaimingWan/oh-my-kiro

    Create high-quality, production-ready skills from scratch. An agent skill from KaimingWan/oh-my-kiro.

    107 GitHub stars~2k tokensUpdated 6 mo ago
    Auto-check passed
  • Omk Youtube

    KaimingWan/oh-my-kiro

    Extract and summarize YouTube video content via subtitle extraction.

    107 GitHub stars~381 tokensUpdated 6 mo ago
    Auto-check passed
  • Documentation Lookup

    KaimingWan/oh-my-kiro

    Fetch current library/framework documentation via Context7. An agent skill from KaimingWan/oh-my-kiro.

    107 GitHub stars~616 tokensUpdated 6 mo ago
    Auto-check passed
  • Omk Coding

    KaimingWan/oh-my-kiro

    Enforces coding best practices: deep-read before modify, LSP-first navigation, TDD red-green-refactor, minimal changes, self-review, verification.

    107 GitHub stars~2.4k tokensUpdated 6 mo ago
    Auto-check passed

Categories

Questions about Omk Finishing

What does Omk Finishing do?

Branch completion workflow: verify tests → present 4 options (merge/PR/keep/discard) → execute → cleanup worktree. Omk Finishing is an agent skill from KaimingWan/oh-my-kiro. Branch completion workflow: verify tests → present 4 options (merge/PR/keep/discard) → execute → cleanup worktree.

When should I use Omk Finishing?

Omk Finishing fits situations like: implementation is complete; ready to integrate work back to main branch.

How do I install Omk Finishing in Claude Code?

Run `npx skills add KaimingWan/oh-my-kiro --skill omk-finishing -a claude-code`. Or copy the skill folder (skills/omk-finishing in KaimingWan/oh-my-kiro) into .claude/skills/omk-finishing in your project. Claude Code loads it when a task matches its description.

How do I install Omk Finishing in Codex?

Run `npx skills add KaimingWan/oh-my-kiro --skill omk-finishing -a codex`. Or copy the skill folder (skills/omk-finishing in KaimingWan/oh-my-kiro) into .agents/skills/omk-finishing in your project. Codex loads it when a task matches its description.

Can I use Omk Finishing 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 KaimingWan/oh-my-kiro --skill omk-finishing -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/omk-finishing, .gemini/skills/omk-finishing, .github/skills/omk-finishing and .opencode/skills/omk-finishing in your project.

What does Omk Finishing need to run?

Going by SKILL.md and its folder, Omk Finishing needs the command-line tools its instructions call (git, npm and gh).

Does Omk Finishing access the network?

SKILL.md contains no URLs. Its commands use git, npm and gh, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Omk Finishing 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 Omk Finishing use?

Omk Finishing is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Omk Finishing use?

About 1.1k tokens (SKILL.md is roughly 4.5k 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 Omk Finishing?

Skills that share tags, products or a category with Omk Finishing: Finishing a Development Branch (obra/superpowers, 297k stars), Pre-Release PR Triage (jamiepine/voicebox, 57k stars), Cap Feature Building Workflow (CapSoftware/Cap, 23k stars) and Om Auto Fix Issue (go-musicfox/go-musicfox, 2.6k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Omk Finishing?

KaimingWan (a GitHub user) maintains it in KaimingWan/oh-my-kiro, which has 107 GitHub stars. The repository holds 15 skills in this directory. The repository was last updated on April 2, 2026.

Source: KaimingWan/oh-my-kiro on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.