Agent skill
trim-pr
Trim a PR before merging - remove complexity that accumulated during development. Use when preparing to merge, cleaning up code, trimming unnecessary complexity, or asked to simplify a PR.
Install this agent skill to your Project
npx add-skill https://github.com/propstreet/claude-powerpack/tree/main/skills/trim-pr
SKILL.md
PR Simplification
Trim complexity that accumulated during development. This is NOT a code review — focus on removing cruft, not evaluating design decisions.
1. Understand the Changes
Determine the PR's base branch and review the full diff and changed files to understand what was built.
2. Look for Accumulated Cruft
During development, code often accumulates:
| Cruft | Fix |
|---|---|
| Repeated code blocks | Extract helper function |
| Debug logging left behind | Remove or convert to proper logging |
| Commented-out code | Delete it (git has history) |
| TODO comments for things already done | Remove them |
| Unused imports/variables | Delete them |
| Overly defensive null checks | Remove if caller guarantees non-null |
| Type casts that worked around WIP types | Fix upstream types now |
| Console.log / print statements | Remove or use proper logger |
| Temporary variable names (temp, foo, xxx) | Use descriptive names |
| Comments referencing PR/PRD/review context | Rewrite for future maintainers |
3. Check for Over-Engineering
Look for complexity added "just in case" that isn't actually needed:
- Unused flexibility: Config options, parameters, or generics that only have one value/type
- Premature abstraction: Interfaces/base classes with single implementation
- Dead code paths: Branches that can never execute given current callers
- Wrapper functions: Functions that just call another function (inline them)
- Speculative generality: "We might need this later" code with no current use
Ask: "Is this complexity earning its keep, or was it added speculatively?"
4. Check for Common Anti-Patterns
Backwards Compatibility Hacks
If you're not shipping a public API, remove:
- Renamed unused
_varskept for "compatibility" - Re-exported types that nothing imports
// removedcomments marking deleted code- Deprecated function wrappers
Error Handling Theater
Remove defensive code that can't actually help:
- Try/catch that just re-throws
- Null checks after operations that guarantee non-null
- Type assertions immediately after type guards
- Validation of values from trusted internal sources
Copy-Paste Artifacts
Look for:
- Duplicate logic that should be a shared function
- Similar but slightly different implementations
- Code comments that describe a different function
5. Clean Up Development-Context Comments
Comments written during development often reference context that won't exist for future maintainers:
Reference PR/Review Context
| Development Comment | Better For Maintainers |
|---|---|
// P2 finding: add null check |
// Guard against null from legacy API |
// Per review feedback |
// Explicit type conversion for clarity |
// Addressing P3 concern about perf |
// Cached to avoid repeated DB calls |
// Fixed in response to CI failure |
// Handle edge case where X is empty |
Reference PRD/Issue Context
| Development Comment | Better For Maintainers |
|---|---|
// PRD Phase 2 scope |
// Extended validation for enterprise users |
// Part of #531 quick win |
// Simplified flow for common case |
// Out of scope for this PR |
(delete — git history has this) |
// MVP implementation, see PRD for full spec |
// Basic implementation — see [doc] for extension points |
Temporal References
| Development Comment | Better For Maintainers |
|---|---|
// TODO: revisit after merge |
(either do it now or delete) |
// Temporary workaround until X ships |
// Workaround for [issue] in [dependency] |
// New approach as of this PR |
(delete — all code was "new" once) |
// Changed from previous implementation |
(delete — git diff shows this) |
Rule of thumb: If a comment only makes sense to someone who read the PR, rewrite it or delete it.
6. Address PR Review Comments
If there are review comments from GitHub Actions, reviewers, or automated tools — address substantive findings, verify they're still valid (reviewers see old commits), and explain trade-offs if not implementing a suggestion.
7. Verify
Run the project's linter, build, and tests to verify nothing broke. Check project docs (README, CONTRIBUTING, CLAUDE.md) for project-specific commands.
Output
Summary table of changes made:
| Issue | Fix | Risk |
|---|---|---|
Duplicate null check in handleSubmit |
Removed redundant check | Low |
Debug console.log in api.ts |
Removed | Low |
Unused IFutureFeature interface |
Deleted | Low |
Risk levels:
- Low: Removed dead code, comments, or unused imports
- Medium: Simplified logic, removed defensive code
- High: Changed behavior, removed "defensive" error handling
If no changes needed, state that the code is already clean and why.
Gotchas
- Named booleans like
isStartingare often MORE readable than inlining conditions. Prefer clarity over minimal code. - Shell constructs like
$(),&&, and variable assignments in Bash calls can trigger permission prompts. Prefer simple, single-command calls when possible.
Quick Checklist
- No commented-out code remaining
- No TODO comments for completed work
- No debug logging/print statements
- No unused imports or variables
- No single-use abstractions
- No duplicate code blocks
- No PR/PRD/review-context comments (rewritten for maintainers)
- All tests pass
- Linting passes
$ARGUMENTS
Recommended Agent Skills
Expand your agent's capabilities with these related and highly-rated skills.
update-pr
Creates comprehensive PR descriptions by systematically reviewing ALL changes - features, bug fixes, tests, docs, and infrastructure. Use when user asks to "update the PR", "prepare PR for review", "write PR description", or "document branch changes". Requires gh CLI.
deep-interview
Start a structured interview to gather requirements for complex features. Use when tackling multi-layer features, validating PRDs, or defining scope for implementation.
ask-expert
Creates expert consultation documents with code extraction, git diffs, and size tracking (125KB limit). Use when user asks to "create an expert consultation document", "prepare code for expert review", "gather architecture context", or needs comprehensive technical documentation for external analysis. Requires Node.js 18+.
debrief
Capture session learnings and update project docs. Use when ending a session, after completing a feature, or when asked to "debrief", "capture learnings", "update project knowledge", or "what did we learn".
analyze-deps
Analyze dependency updates and generate a changelog report with breaking changes, new features, and actionable recommendations. Use after updating packages, before planned upgrades (preflight), or to research what changed between specific versions. Triggers on "analyze deps", "analyze dependencies", "dependency update report", "breaking changes in update", "what changed in dependency update".
mine-history
Extract and synthesize learnings from past Claude Code session transcripts into project documentation. Use when asked to "mine history", "extract learnings from past sessions", "what patterns keep recurring", or "improve docs from history".
Didn't find tool you were looking for?