Agent skill

Merge Shepherd

by ivanarama in ivanarama/onebase

Безопасное слияние PR ivanarama/onebase через детерминированный pipelinectl с fallback для base-sync, конфликтов и recovery.

MITAuto-check passedDevelopment

Install Merge Shepherd

skills CLI
$ npx skills add ivanarama/onebase --skill merge-shepherd -a claude-code

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

GitHub CLI
$ gh skill install ivanarama/onebase merge-shepherd --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/ivanarama/onebase.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.claude/skills/merge-shepherd .claude/skills/merge-shepherd && 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
merge-shepherd
GitHub stars
115
Token cost
~856 tokens
SKILL.md length
376 words
Files
2 (incl. references)
Skills in repo
12
Repo updated
First seen
Licence
MIT

At a glance

Безопасное слияние PR ivanarama/onebase через детерминированный pipelinectl с fallback для base-sync, конфликтов и recovery.

  • Development work in your project
  • Calls python

What it does

Merge Shepherd is an agent skill from ivanarama/onebase. Безопасное слияние PR ivanarama/onebase через детерминированный pipelinectl с fallback для base-sync, конфликтов и recovery.

Its SKILL.md is about 860 tokens, which your agent loads only when the skill is triggered. The skill folder holds 2 other files, including reference files (for example `references/legacy-protocol.md`).

It sits in Development. The repository describes itself as: Открытая бизнес-платформа со знакомым DSL для учётных задач, написанная на Go — open business platform with a familiar DSL, in Go. The licence is MIT.

When your agent uses it

  • Development work in your project

Example prompts

  • “/merge-shepherd”

Requirements

  • Python 3

What it can do on your machine

Read from SKILL.md and the folder at commit 62e2a97. 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:

    • python

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

  • Network

    No URLs in SKILL.md.

    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

Merge Shepherd loads about 856 tokens when it runs, and up to ~19k if it reads all its reference files. Until then it costs about 35 tokens; SKILL.md has 376 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~35
When it runs · the whole SKILL.md, loaded when a task matches
~856
With references · SKILL.md plus every file in references/, read only if the agent opens them
~19k

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 ivanarama/onebase at commit 62e2a97, republished under its MIT licence (© ivanarama). 376 words, ~856 tokens.

Download SKILL.mdSave it as .claude/skills/merge-shepherd/SKILL.md (or your agent's skills folder). This skill also uses 1 other file; get the full folder from GitHub.
name
merge-shepherd
description
Безопасное слияние PR ivanarama/onebase через детерминированный pipelinectl с fallback для base-sync, конфликтов и recovery.

MERGE

Обрабатывай только PR с ship и без hold/needs-decision. Решение человека старше сохранённого состояния.

Обычный путь

Если задача PromptPilot уже содержит команду pipelinectl, выполни её. При ручном запуске используй Python окружения PromptPilot:

powershell
python -m promptpilot.project_pipeline --config pipelinectl.json next merge

Команду next <stage> запускай ровно один раз за прогон. Если средство исполнения вернуло идентификатор продолжающегося процесса (session/cell ID), исходный процесс уже работает: опрашивай/возобновляй только этот идентификатор до терминального результата. Пустой вывод или истечение локального окна ожидания не разрешают запускать второй next параллельно.

Разбери поле action:

  • merge — выполни показанную команду complete merge с неизменённым lease;
  • cleanup — merge уже подтверждён GitHub; выполни показанную команду complete merge-cleanup с неизменённым lease, не вызывая merge повторно;
  • wait или empty — ничего не меняй и закончи ИТОГ: ПУСТО;
  • fallback — полностью прочитай references/legacy-protocol.md и продолжи по нему;
  • error — закончи ИТОГ: НЕ СМОГ, не обходя отказ вручную.

pipelinectl берёт быстрый путь только для CLEAN PR с каноничным обычным review-proof, новым trusted ship и зелёными обязательными проверками. Перед compare-and-merge он повторяет стабильный GraphQL snapshot, HEAD/label/proof и CI-гейты. Base-sync, carry, legacy re-ship, конфликт и recovery всегда уходят в полную процедуру.

До merge CLI публикует точный pp:merge-cleanup-intent. Если процесс оборвался после успешного merge, следующий запуск находит intent вне списка открытых PR и возвращает action=cleanup: проверяет серверный MergedEvent, снимает in-work только с закрытых same-repository issues, идемпотентно завершает PLAN-handoff, снимает ship и последним пишет pp:merge-cleanup-done. Обычная очередь не продолжается, пока самый ранний intent не завершён или не передан человеку как неоднозначный. Это recovery служебной транзакции, а не повторное содержательное ревью и не второй merge.

Show full SKILL.md (134 more words)Show less

После успешного merge pipelinectl также распознаёт plan-PR с соседними строками Plan-Issue: #N и Plan-Path: Plans/NNN-slug.md. Он проверяет, что issue открыта и сохраняет approved + plan-in-review, публикует pp:plan-ready, добавляет ready-fix, затем снимает plan-in-review и needs-decision. Это завершение уже одобренного PLAN-handoff, а не новое решение за человека. Если post-merge handoff не завершился, сообщи настоящий блокер: влитый план не даёт права молча оставить issue вне FIX.

Только action=completed означает полезную мутацию и допускает ИТОГ: ГОТОВО. Наблюдение или ожидание без изменений — ИТОГ: ПУСТО. Узкий ИТОГ: УСТАРЕЛО (gate-fallback: <точный error/reason>) допустим только для trusted targeted-fallback envelope, где next уже выполнен, а единственный структурированный gate-fallback доказал смену exact target, HEAD, executable-позиции или истечение target lease до первой внешней мутации. Ошибка команды, авторизации, JSON, API/лимита, CI либо отказ после intent/другой начатой транзакции — это не УСТАРЕЛО; используй настоящий НЕ СМОГ или НУЖЕН ЧЕЛОВЕК.

© ivanarama, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

SKILL.md and 1 other file (references) in .claude/skills/merge-shepherd of ivanarama/onebase.

  • SKILL.md
  • references/legacy-protocol.md

Open the folder on GitHubat commit 62e2a97

Compare with similar skills

Merge Shepherd 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.

Merge Shepherd compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Merge Shepherd this skillivanarama/onebase115—~856Automated safety check: PassMIT
Vercel Composition Patternssupabase/supabase111k58 repos~726Automated safety check: PassMIT
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
Typescript Advanced Typesrolling-scopes/rsschool-app10k25 repos~4.2kAutomated safety check: PassMPL-2.0
PR Babysitteropeninterpreter/openinterpreter69k3 repos~4.2kAutomated safety check: PassApache-2.0
Code Review ChecklistshareAI-lab/learn-claude-code78k4 repos~1.1kAutomated safety check: PassMIT

Similar skills

  • Official

    React composition patterns that scale. An agent skill from supabase/supabase.

    111k GitHub starsUsed in 58 repos~726 tokens
    DevelopmentAuto-check passed
  • 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
  • Typescript Advanced Types

    rolling-scopes/rsschool-app

    Master TypeScript's advanced type system including generics, conditional types, mapped types, template literals, and utility types for building type-safe applications.

    10k GitHub starsUsed in 25 repos~4.2k tokens
    DevelopmentAuto-check passed
  • PR Babysitter

    openinterpreter/openinterpreter

    Watches an open GitHub pull request until it merges, handling review comments, diagnosing CI failures and retrying flaky checks along the way.

    69k GitHub starsUsed in 3 repos~4.2k tokens
    DevelopmentAuto-check passed
  • Code Review Checklist

    shareAI-lab/learn-claude-code

    Reviews code against a five-part checklist covering security, correctness, performance, maintainability and testing, and reports findings in a fixed format.

    78k GitHub starsUsed in 4 repos~1.1k tokens
    DevelopmentAuto-check passed
  • Greploop

    onyx-dot-app/onyx

    Iteratively improves a PR (GitHub), MR (GitLab), or shelved changelist (Perforce) until Greptile gives it a 5/5 confidence score with zero unresolved comments.

    32k GitHub starsUsed in 4 repos~3.3k tokens
    DevelopmentAuto-check passed

More from ivanarama/onebase

All 12 skills in this repo
  • Review Queue

    ivanarama/onebase

    Ревью открытых PR ivanarama/onebase перед мержем через детерминированный pipelinectl с безопасным fallback на полный протокол.

    115 GitHub stars~1.9k tokensUpdated today
    Auto-check passed
  • Plan Approved

    ivanarama/onebase

    Подготовка технического плана для одобренной issue ivanarama/onebase с меткой plan-needed.

    115 GitHub stars~1.5k tokensUpdated today
    Auto-check passed
  • Discussions Watch

    ivanarama/onebase

    Разбор обсуждений (Discussions) ivanarama/onebase — треды, где внешний человек написал и остался без ответа.

    115 GitHub stars~7k tokensUpdated today
    Auto-check passed
  • Fix Approved

    ivanarama/onebase

    Реализация заявок ivanarama/onebase с меткой ready-fix (очевидные дефекты, автоход) или approved (решение человека) и доработка своих PR по замечаниям ревью — фикс в отдельном worktree, тесты, PR с…

    115 GitHub stars~13k tokensUpdated today
    Auto-check passed
  • Tail Issues

    ivanarama/onebase

    Заведение заявок по хвосту ревью ivanarama/onebase — находки, которые ревью пометило [заявка] и которые пережили мерж PR.

    115 GitHub stars~8.4k tokensUpdated today
    Auto-check passed
  • Triage Issues

    ivanarama/onebase

    Триаж открытых ишью ivanarama/onebase — классификация, воспроизведение, план фикса.

    115 GitHub stars~8.4k tokensUpdated today
    Auto-check passed

Categories

Questions about Merge Shepherd

What does Merge Shepherd do?

Безопасное слияние PR ivanarama/onebase через детерминированный pipelinectl с fallback для base-sync, конфликтов и recovery. Merge Shepherd is an agent skill from ivanarama/onebase. Безопасное слияние PR ivanarama/onebase через детерминированный pipelinectl с fallback для base-sync, конфликтов и recovery.

When should I use Merge Shepherd?

Merge Shepherd fits situations like: development work in your project.

How do I install Merge Shepherd in Claude Code?

Run `npx skills add ivanarama/onebase --skill merge-shepherd -a claude-code`. Or copy the skill folder (.claude/skills/merge-shepherd in ivanarama/onebase) into .claude/skills/merge-shepherd in your project. Claude Code loads it when a task matches its description.

How do I install Merge Shepherd in Codex?

Run `npx skills add ivanarama/onebase --skill merge-shepherd -a codex`. Or copy the skill folder (.claude/skills/merge-shepherd in ivanarama/onebase) into .agents/skills/merge-shepherd in your project. Codex loads it when a task matches its description.

Can I use Merge Shepherd 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 ivanarama/onebase --skill merge-shepherd -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/merge-shepherd, .gemini/skills/merge-shepherd, .github/skills/merge-shepherd and .opencode/skills/merge-shepherd in your project.

What does Merge Shepherd need to run?

Going by SKILL.md and its folder, Merge Shepherd needs the command-line tools its instructions call (python). Our summary lists: Python 3.

Does Merge Shepherd access the network?

SKILL.md contains no URLs. Any network use would come from the scripts or tools the agent runs. This is read from the text; nothing was executed.

Is Merge Shepherd 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 Merge Shepherd use?

Merge Shepherd 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 Merge Shepherd use?

About 856 tokens (SKILL.md is roughly 3.4k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full. Its references folder adds about 18k tokens, read only when the agent opens those files.

What are the alternatives to Merge Shepherd?

Skills that share tags, products or a category with Merge Shepherd: Vercel Composition Patterns (supabase/supabase, 111k stars), Finishing a Development Branch (obra/superpowers, 297k stars), Typescript Advanced Types (rolling-scopes/rsschool-app, 10k stars) and PR Babysitter (openinterpreter/openinterpreter, 69k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Merge Shepherd?

ivanarama (a GitHub user) maintains it in ivanarama/onebase, which has 115 GitHub stars. The repository holds 12 skills in this directory. The repository was last updated on October 10, 2026.

Source: ivanarama/onebase on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.