kc-pr-reorg

kc-pr-reorg is a skill for Claude Code from iamcxa/kc-claude-plugins. It costs 72 tokens per session (1,026 once invoked), scanned A, original, MIT.

A procedure for reorganizing a feature branch’s commits into logical groups before code review. A feature branch is a separate line of Git development, and a pull request is a proposed change for review.

In plain words
What is it for?
Use it to plan and rebuild grouped commits, reorder work by concern, and clean up a branch with many mixed commits.
Why use it?
It makes a messy history easier to review when feature, test, documentation, and cleanup commits are interleaved.

Skill for Claude Code

Written for Claude Code: $CLAUDE_PLUGIN_ROOT variable. Also seen: mentions CLAUDE.md.

Runs only inside its plugin — its command needs a path that Claude Code sets for a plugin’s own hooks and for nothing else. Install the plugin, not this.

Part of the kc-pr-flow plugin — 7 skills, 3 agents shipped together

Good fit Use it to plan and rebuild grouped commits, reorder work by concern, and clean up a branch with many mixed commits.

Compare 6 skills from other repositories ↓
Install

Getting it into your agent

This one installs as part of its plugin. Adding the marketplace and installing the plugin brings it with everything else the plugin ships.

Claude Code
/plugin marketplace add iamcxa/kc-claude-plugins
Claude Code
/plugin install kc-pr-flow

Made for: Claude Code.

Or install kc-pr-flow, the plugin that ships this one along with the rest of its 7 skills, 3 agents.

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 kc-pr-reorg

README.md
[![agentmods](https://agentmods.dev/badge/skills/iamcxa/kc-claude-plugins/kc-pr-reorg/github.svg)](https://agentmods.dev/skills/iamcxa/kc-claude-plugins/kc-pr-reorg)
Your own site
<a href="https://agentmods.dev/skills/iamcxa/kc-claude-plugins/kc-pr-reorg"><img src="https://agentmods.dev/badge/skills/iamcxa/kc-claude-plugins/kc-pr-reorg/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 kc-pr-reorg

Your own site · 80×15
<a href="https://agentmods.dev/skills/iamcxa/kc-claude-plugins/kc-pr-reorg"><img src="https://agentmods.dev/badge/skills/iamcxa/kc-claude-plugins/kc-pr-reorg.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 72 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,026 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.00072 $0.01026
Opus 5 $0.00036 $0.00513
Sonnet 5 $0.00014 $0.00205
Haiku 4.5 $0.00007 $0.00103

Measured 10d ago against content hash 7d96654de177, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-09, from the pricing page.

Security

Grade A, and why

kc-pr-reorg 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 10d 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.

kc-pr-flow/skills/kc-pr-reorg/SKILL.md · 126 lines

How it starts

The opening of the file, as written. The whole thing — 126 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Commit Reorganization

Non-interactive technique for reorganizing N commits into M logical groups without git rebase -i.

When to Use

  • Feature branch with 5+ commits needing logical grouping
  • Commits interleaved by concern (feat mixed with test mixed with fix)
  • Agent environment where interactive rebase is unavailable
  • PR reviewer needs clean, reviewable history

Technique

1. Backup (BLOCKING — never skip)

git branch backup/<branch>-pre-reorg

2. Analyze

git log --oneline main..HEAD

List all commits. Categorize each by concern (feat, test, refactor, docs, chore). Note original chronological order — you will need it in step 4.

3. Plan Groups

Present a numbered grouping plan to the user. Recommended ordering:

  1. docs/design (context first)
  2. refactor (prep work)
  3. feat (core implementation)
  4. test (validates feat)
  5. chore (tooling, config)

Each group becomes one commit. Commit message descriptions follow the unified language preference — see plugin CLAUDE.md.

Get user approval before proceeding.

4. Reset and Rebuild

# Detach from current history
git reset --soft main        # All changes staged
git reset HEAD -- .          # Unstage all
git reset --hard main        # Clean working tree
git clean -fd                # Remove untracked files (reset --hard misses these!)

Then for each group, cherry-pick its commits in original chronological order within the group:

git cherry-pick --no-commit <commit1> <commit2> ...
git commit -s -m "feat(scope): description"  # description follows unified language preference; prefix stays English

Repeat per group.

5. Verify (BLOCKING — never skip)

git diff backup/<branch>-pre-reorg

Must be empty. If not, something was lost — investigate before force pushing.

6. Force Push

WORKTREE=$(git rev-parse --show-toplevel) || exit $?
"$CLAUDE_PLUGIN_ROOT/scripts/github-repo-write.sh" push \
  --worktree "$WORKTREE" --remote origin --tracked --force-with-lease || exit $?

Read the full file on GitHub · 126 lines

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. 10d ago First seen · 126 lines · 72 tokens per session scan A 7d96654de177

Subscribe to this mod's changes

kc-pr-reorg is a skill published in the GitHub repository iamcxa/kc-claude-plugins (3 stars, last pushed today), licensed MIT. It adds 72 tokens to every session and 1,026 once invoked, about $0.0004 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-08-31.