merge-queue

merge-queue is a skill for Claude Code from a5c-ai/babysitter. It costs 29 tokens per session (291 once invoked), scanned A, original, MIT.

A merge-queue process for collecting changes from several agent branches, resolving conflicts, merging them in dependency order, and checking the combined result.

In plain words
What is it for?
Use it to gather pending branches, choose conflict-resolution strategies, merge with attribution, and run integration tests, linting, and builds.
Why use it?
It reduces integration problems when multiple agents edit related parts of the same codebase.

Skill for Claude Code

Written for Claude Code: allowed-tools in frontmatter. Also seen: names the AskUserQuestion tool.

Good fit Use it to gather pending branches, choose conflict-resolution strategies, merge with attribution…

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/a5c-ai/babysitter/merge-queue
About the project

Babysitter is a workflow engine for AI coding agents that enforces predefined steps, quality checks, human approvals, and decision records. It is used to coordinate complex, repeatable agent workflows across supported coding tools. The catalogue contains skills, agents, instructions, settings, a plugin, and an MCP integration for its workflow.

a5c-ai/babysitter · 1,772 stars · on GitHub · a5c.ai

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Any agent
npx skills add a5c-ai/babysitter --skill merge-queue
Clone the repo
git clone --depth 1 https://github.com/a5c-ai/babysitter

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.

agentmods badge for merge-queue

README.md
[![agentmods](https://agentmods.dev/badge/skills/a5c-ai/babysitter/merge-queue.svg)](https://agentmods.dev/skills/a5c-ai/babysitter/merge-queue)
Your own site
<a href="https://agentmods.dev/skills/a5c-ai/babysitter/merge-queue"><img src="https://agentmods.dev/badge/skills/a5c-ai/babysitter/merge-queue.svg" alt="Measured on agentmods" height="20"></a>
Per session 29 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 291 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.

ModelPer sessionOnce invoked
Fable 5.1 $0.00029 $0.00291
Opus 5 $0.00015 $0.00146
Sonnet 5 $0.00006 $0.00058
Haiku 4.5 $0.00003 $0.00029

Measured 3d ago against content hash 0468a9868636, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-06, from the pricing page.

Security

Grade A, and why

merge-queue 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 3d 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.

library/methodologies/gastown/skills/merge-queue/SKILL.md · 35 lines

What it actually says

  • When multiple agents have worked on overlapping areas
  • When integration testing is needed before landing
  • When conflict resolution requires coordination

Process

  1. Collect pending changes from all agent branches
  2. Detect conflicts between branches and target
  3. Resolve conflicts (auto-resolve where possible)
  4. Merge in dependency order with attribution
  5. Verify integration (tests, lint, build)

Conflict Strategies

  • auto: Attempt automatic resolution, escalate on failure
  • manual: Always require human review
  • theirs: Prefer incoming changes
  • ours: Prefer target branch changes

Tool Use

Invoke via babysitter process: methodologies/gastown/gastown-merge-queue

Files

What ships with it

1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

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.

  1. 3d ago First seen · 35 lines · 29 tokens per session scan A 0468a9868636

Subscribe to this mod's changes

merge-queue is a skill published in the GitHub repository a5c-ai/babysitter (1,772 stars, last pushed yesterday), licensed MIT. It adds 29 tokens to every session and 291 once invoked, about $0.0001 per session on Opus 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-09-03.