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.
npx skills add sd0xdev/sd0x-harness --skill merge-prepgit clone --depth 1 https://github.com/sd0xdev/sd0x-harnessWrote 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.
[](https://agentmods.dev/skills/sd0xdev/sd0x-harness/merge-prep)<a href="https://agentmods.dev/skills/sd0xdev/sd0x-harness/merge-prep"><img src="https://agentmods.dev/badge/skills/sd0xdev/sd0x-harness/merge-prep/github.svg" alt="Measured on agentmods" height="20"></a>Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.
<a href="https://agentmods.dev/skills/sd0xdev/sd0x-harness/merge-prep"><img src="https://agentmods.dev/badge/skills/sd0xdev/sd0x-harness/merge-prep.svg" alt="Reviewed on agentmods" width="80" height="20"></a>- NVIDIA SkillSpector pass
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.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5.1 | $0.00069 | $0.01389 |
| Opus 5.5 | $0.00028 | $0.00556 |
| Sonnet 5.5 | $0.00014 | $0.00278 |
| Haiku 4.5 | $0.00007 | $0.00139 |
Grade A, and why
merge-prep 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 1mo 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.
How it starts
The opening of the file, as written. The whole thing — 200 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Merge Prep — Pre-merge Analysis and Preparation
Analyze source branch vs target branch, detect conflicts, output analysis report with suggested commands. v1 is analysis-only — does not execute merge/commit/push.
When NOT to Use
| Scenario | Use Instead |
|---|---|
| Commit code (not merge) | /smart-commit |
| Merge to main (production) | Manual PR flow |
| Just view diff | git diff <target>..<branch> |
| Rebase or squash | Manual operation |
Input
/merge-prep <source-branch> [--target <branch>]
<source-branch>: Branch to merge (required)--target: Target branch (default:{TARGET_BRANCH}ormain)
Workflow
sequenceDiagram
participant C as Claude
participant U as User
C->>C: Step 1: Validate prerequisites
C->>C: Step 2: Pre-merge analysis
C->>U: Show analysis report
U->>C: Acknowledge
C->>C: Step 3: Conflict analysis (if any)
C->>U: Show conflict details + resolution suggestions
C->>C: Step 4: Generate merge commands
C->>U: Output commands for manual execution
Step 1: Validate Prerequisites
# 1a. Verify source branch exists
git rev-parse --verify <branch>
# 1b. Verify target branch exists
git rev-parse --verify <target>
# 1c. Verify working tree is clean
git status --porcelain
| Check | Failure Action |
|---|---|
| Branch doesn't exist | Halt, list available branches |
| Target not found | Halt, suggest creating it |
| Uncommitted changes | Halt, suggest /smart-commit first |
Step 2: Pre-merge Analysis
Run the analysis script:
bash skills/merge-prep/scripts/pre-merge-check.sh <branch> [target]
Script outputs JSON containing:
merge_base: Common ancestorsource_commits: New commits on source branchtarget_commits: Commits on target that source doesn't havehas_conflicts: Whether conflicts existconflict_files: List of conflict filesfile_stats: Affected file statistics
Display analysis report:
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.
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.
- 1mo ago First seen · 200 lines · 69 tokens per session scan A d8825cf56487
merge-prep is a skill published in the GitHub repository sd0xdev/sd0x-harness (194 stars, last pushed 18d ago), licensed MIT. It adds 69 tokens to every session and 1,389 once invoked, about $0.0003 per session on Opus 5.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.
Other skills, from other repositories
update
Safe cc10x upgrade through the Claude Code plugin CLI. Lists every installed scope, refreshes the marketplace, updates each scope, and optionally carries local patches over to the new install. Use this skill when: updating cc10x, upgrading, pulling latest cc10x, syncing plugin, refreshing cache, or checking for new…
resolving-merge-conflicts
Use when a git merge or rebase reports conflicts and the operation is in progress.
generator-fix-integrator
Internal Auto-Harness generator skill for worktree-merge fix integration. Use only inside the parallel Generator integrator when it is addressing named defects from QA or retest.
finishing-a-development-branch
Use 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 merge, PR, or cleanup.
using-git-worktrees
Use when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallback.
comet-archive
Comet Phase 5: Archive. Invoke with /comet-archive. Merge delta specs into main specs with OpenSpec semantics, archive change.