merge-prep

merge-prep is a skill for Claude Code, Codex from hmj1026/dhpk. It costs 68 tokens per session (533 once invoked), scanned A, original, MIT.

A session handoff workflow for saving and resuming a long-running OpenSpec change-application session. OpenSpec is an external process for applying a planned change; the live working folder remains the source of truth.

In plain words
What is it for?
Use it when an explicit save is needed near a context limit or when a previous handoff must be resumed or recovered. It produces a report describing the saved or resumed session.
Why use it?
It lets work continue after a context or session boundary without pretending that a commit is required. It preserves handoff details and restores them later without reverting, deleting, or stashing unfinished work.

Skill for Claude CodeCodex

Written for Claude Code and Codex: argument-hint in frontmatter, but also agents/openai.yaml present.

Part of the dhpk plugin — 39 skills, 1 command, 1 agent, 3 hooks shipped together

Good fit Use it when an explicit save is needed near a context limit or when a previous handoff must be resumed or recovered. It produces a report describing the saved or resumed session.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/hmj1026/dhpk/merge-prep
View source ↗ hmj1026/dhpk
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 hmj1026/dhpk --skill merge-prep
Clone the repo
git clone --depth 1 https://github.com/hmj1026/dhpk

Made for: Claude Code, Codex.

Or install dhpk, the plugin that ships this one along with the rest of its 39 skills, 1 command, 1 agent, 3 hooks.

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-prep

README.md
[![agentmods](https://agentmods.dev/badge/skills/hmj1026/dhpk/merge-prep/github.svg)](https://agentmods.dev/skills/hmj1026/dhpk/merge-prep)
Your own site
<a href="https://agentmods.dev/skills/hmj1026/dhpk/merge-prep"><img src="https://agentmods.dev/badge/skills/hmj1026/dhpk/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.

agentmods 80×15 button for merge-prep

Your own site · 80×15
<a href="https://agentmods.dev/skills/hmj1026/dhpk/merge-prep"><img src="https://agentmods.dev/badge/skills/hmj1026/dhpk/merge-prep.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 68 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 533 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.00068 $0.00533
Opus 5.5 $0.00027 $0.00213
Sonnet 5.5 $0.00014 $0.00107
Haiku 4.5 $0.00007 $0.00053

Measured yesterday against content hash 19f622dcd1fd, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

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

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.

generated/claude-marketplace/package/skills/create-pr/references/merge-prep/SKILL.md · 54 lines

What it actually says

Merge Prep

Workflow

Require <source-branch> and resolve --target to {TARGET_BRANCH} or main when omitted. Validate both refs and a clean worktree before analysis. Use native, read-only Git evidence: merge-base, commit log, changed-file summary, and git merge-tree --write-tree <target> <source> (or report UNAVAILABLE when the installed Git cannot provide that read-only operation).

Report commits, files, conflict details, likely conflict patterns, and text-only resolution strategies. Emit copy-pasteable commands for a human to execute later. Never run git checkout, git switch, git merge, git rebase, or a conflict edit. See references/workflow.md for the exact sequence.

When NOT to Use

  • The worktree is dirty or either branch/ref is missing.
  • A merge, checkout, rebase, or conflict resolution should happen now.
  • A write-capable branch operation is requested.

Output

Pre-merge evidence includes source/target refs, merge-base, commits, files, merge-tree output, conflict status, and copy-pasteable manual commands. Conflicts are findings, not permission to mutate. A complete read-only analysis ends PASS (with its conflict status); missing preconditions or unexpected Git failures are terminal BLOCKED/FAIL results. No merge claim is made.

Verification

  • Source and target resolve and git status --porcelain is empty.
  • Native merge-tree analysis ran without changing the worktree.
  • Commit/file/conflict evidence is included, including clean conflicts when none were found.
  • Suggested merge commands are output only and were not executed.

References

Files

What ships with it

3 files 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. yesterday Changed · +2 lines 19f622dcd1fd
  2. 23d ago First seen · 52 lines · 68 tokens per session scan A 7d32a861ba0d

Subscribe to this mod's changes

merge-prep is a skill published in the GitHub repository hmj1026/dhpk (2 stars, last pushed today), licensed MIT. It adds 68 tokens to every session and 533 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-24.

Related

Other skills, from other repositories

add-teams

Adds Microsoft Teams connector to a Power Apps code app. Use when sending Teams messages, posting to channels, or integrating with Teams chat.

microsoft/power-platform-skills · 31 tokens

relations

OPS on-demand: This skill should be used when the user asks to "who do I owe a reply", "relationship…

Lifecycle-Innovations-Limited/claude-ops · 27 tokens

alive:world

The human doesn't know what to work on, or wants to see everything at once. They need the big picture — what's active, what's stale, what needs attention. Renders a live world view grouped by ALIVE domain, then routes to open, tidy, find, history, or map.

alivecontext/alive · 63 tokens

figure-out

Figure things out together — any topic, problem, or idea. Presses relentlessly until shared understanding is reached. Use when understanding is the deliverable rather than a preamble to acting, when figuring it out is the goal, or when the user asks to think through a decision, dig deeper, press an assumption…

doodledood/manifest-dev · 78 tokens

cli

Type-safe CLI argument parsing with commander and @commander-js/extra-typings, the standard parser for this repo's Bun scripts. Use when writing or editing any script that takes arguments (flags, positional parameters, subcommands, nested subcommands, --help) instead of reading existing scripts for the pattern.

bendrucker/claude · 65 tokens

promote

Turn a scratch script into a permanent tool this repo keeps. Use when a check, report, or analysis has proved worth running more than once.

ArcticFox2029/chamnan · 29 tokens