Refactor
Improve code structure without changing behavior, then create a GH Issue + PR.From its SKILL.md
npx -y skills add pillip/claude-dev-kit --skill refactorAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
One thing to look at
- 11 stars11 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.
SKILL.md
7.0 KB, as published. Nobody here has run it
Kit Preamble — refactor
Kit Script Root
Kit root: ${CLAUDE_PLUGIN_ROOT}
- Absolute path above → plugin install (substituted at load time; no project
scripts/dir): prefix every kit script command with it, e.g.bash <kit-root>/scripts/checkpoint.sh …. Absolute paths also work from worktrees. - Literal
${…}placeholder above → standalone layout: run commands as written.
Project Context Detection
Run these checks silently at the start. Use results to adapt behavior:
[ -f issues.md ]— if true, this project uses the sprint system. Respect issue numbering and STATUS.md.[ -f docs/sprint_state.md ]— if true and Status showsrunning, a sprint is active. Be aware of parallel work in worktrees.[ -f docs/prd_digest.md ]— if true, read it for quick project context before starting.
Kit Rules
- Verify
gh auth statusbefore any GitHub operation.
Checkpoint Rules — MANDATORY
Every phase in this skill that has a CHECKPOINT block must be verified. Run the verification command after completing each phase. Blocking gates exit non-zero on failure: STOP immediately, report, do NOT proceed. Advisory gates always exit 0 and print an ADVISORY: line on failure: report the gap, self-correct, then continue (ISSUE-031). Never skip running either tier.
Slug convention: After creating the worktree, store the branch slug (e.g., refactor/extract-views-helpers) for use in checkpoint commands.
Argument Validation (run before anything else)
- If
$ARGUMENTSis empty or blank, ask the user: "Which file or directory would you like to refactor? Please provide a path." - If a path is provided, verify it exists using Glob or Read. If the path does not exist, stop with: "Target path not found:
<path>. Please provide a valid file or directory path."
Steps:
- Ensure
ghauthenticated (gh auth status). - Read the target file or module from $ARGUMENTS.
- Read existing tests for the target to understand current behavior.
- Identify code smells (long functions, duplication, deep nesting, tight coupling, etc.).
- Present a prioritized list of proposed refactorings with rationale.
- After user approval, create worktree + auto-freeze in one step:
WT="$(bash scripts/wt_setup.sh refactor/<slug>)"wt_setup.shcreates the worktree and writes the freeze marker inside.claude-kit/freeze-dir.txtatomically. All subsequent file operations happen inside$WT/.
CHECKPOINT — ADVISORY (report & continue) Run:
bash scripts/checkpoint.sh --skill refactor --phase worktree --issue "$SLUG"Advisory: exits 0 even on failure, printing anADVISORY:line — report the gap, self-correct, then continue.
- Apply refactorings one at a time inside
$WT/, running tests after each step. - Confirm all tests pass after the final change.
CHECKPOINT — MANDATORY — NEVER SKIP Run:
bash scripts/checkpoint.sh --skill refactor --phase test --issue "$SLUG"If exit code ≠ 0: STOP immediately and report the failure. Do NOT proceed.
- Create GH Issue:
gh issue create --title "refactor: <concise description>" --body "<body>"- Body must include: identified code smells, applied refactoring patterns, affected files, and test results.
- Commit + push (from
$WT/).
CHECKPOINT — ADVISORY (report & continue) Run:
bash scripts/checkpoint.sh --skill refactor --phase push --issue "$SLUG"Advisory: exits 0 even on failure, printing anADVISORY:line — report the gap, self-correct, then continue.
- Create PR:
gh pr create --title "refactor: <concise description>" --body "Closes #<issue_number>\n\n<details>"
- Report the PR URL to the user — continue with
/reviewand/ship.
Sprint Integration (optional)
If issues.md exists in the project root, register this work in the sprint ecosystem:
- Read
issues.mdto find the next available ISSUE-NNN number. - Append a new issue entry via the registry wrapper:
Issue fields:bash scripts/registry_edit.sh issues.md -- bash -c '<append issue entry>'- Title: same as GH Issue title
- Track: platform
- Priority: P2
- Status: done (PR already created)
- GH-Issue:
<number> - PR:
<pr_url> - Depends-On: none
- This allows team-lead to track standalone skill work in sprint_state.md.
If issues.md does not exist, skip this step silently.
Error Handling
- If
gh auth statusfails: stop and instruct the user to rungh auth login. - If no tests exist for the target: warn the user and suggest writing tests before refactoring.
- If tests fail after a refactoring step: revert the step and report the issue. Do NOT push or create PR.
Rollback
- Use
bash scripts/wt_cleanup.sh <branch>for safe worktree removal — the wrapper cd's to main root and removes the worktree in a single subshell. - If failure occurs after worktree creation but before PR:
bash scripts/wt_cleanup.sh <branch>git push origin --delete <branch>(remote cleanup, if pushed)
- If failure occurs after PR creation:
gh pr close <pr_number>then clean up worktree and branch as above.
Shared Registry Files
IMPORTANT: Never commit issues.md, STATUS.md, or CHANGELOG.md to the feature branch.
These are registry files managed only on main. Always use bash scripts/registry_edit.sh <file> -- bash -c '<update command>' — the wrapper resolves the main repo root internally.
Guidelines
- Never change observable behavior — structure-only changes.
- Run tests after EVERY individual step — green-to-green transitions only.
- Keep each commit small and focused on one transformation.
- If test coverage is below 70% for the target code, warn the user and suggest adding tests first.
- If you discover a bug during refactoring, stop — file it as a separate issue.
- Use well-known refactoring patterns: Extract Method, Move Function, Replace Conditional with Polymorphism, Introduce Parameter Object.
Execution Principles (absorbed from the refactorer persona — ISSUE-034)
- Preserve observable behavior: if a test must change, you are rewriting, not refactoring. Add tests first where coverage is thin.
- One refactoring transformation per commit; no new abstractions "for the future" — solve today's readability/maintenance problem.
- After every step, all existing tests still pass. If you discover a bug, file it as a separate issue — do not fix it here.