AgentSkillsCN

clean-copy

在新分支上重写当前分支的代码，构建清晰、条理分明且具备良好叙事性的 Git 提交历史，便于审查者理解。适用于在提交 PR 之前，希望对杂乱无章的提交历史进行整理与优化的场景。

SKILL.md
--- frontmatter
name: clean-copy
description: Reimplement the current branch on a new branch with clean, narrative-quality git commit history suitable for reviewer comprehension. Use when you want to clean up messy commit history before opening a PR.
disable-model-invocation: true

Reimplement the current branch on a new branch with a clean, narrative-quality git commit history suitable for reviewer comprehension.

Steps

  1. •

    Validate the source branch

    • •Ensure the current branch has no merge conflicts, uncommitted changes, or other issues.
    • •Confirm it is up to date with main.
    • •Store the current branch name for reference.
  2. •

    Analyze the diff

    • •Study all changes between the current branch and main.
    • •Form a clear understanding of the final intended state.
    • •Note which files changed and the logical groupings of changes.
  3. •

    Create the clean branch

    • •Create a new branch named {branch_name}-clean from main (not from the current branch).
    • •This ensures a fresh starting point for clean commits.
  4. •

    Plan the commit storyline

    • •Break the implementation down into a sequence of self-contained steps.
    • •Each step should reflect a logical stage of development, as if writing a tutorial.
    • •Order commits so each builds naturally on the previous.
    • •Present the plan to the user and wait for explicit approval before proceeding to step 5.
  5. •

    Reimplement the work

    • •Recreate the changes in the clean branch, committing step by step according to your plan.
    • •Each commit must:
      • •Introduce a single coherent idea.
      • •Include a clear commit message and description.
      • •Be atomic: tests should pass (when possible) at each commit.
    • •CRITICAL: If you encounter complexity or blockers that make the approved plan difficult to execute, STOP and consult the user. Do NOT modify the plan or change approach without explicit user approval.
  6. •

    Verify correctness

    • •Confirm that the final state of {branch_name}-clean exactly matches the final state of the original branch.
    • •Run: git diff {original_branch}..{branch_name}-clean (should be empty).
    • •Use --no-verify only when necessary to bypass known issues.

Constraints

  • •Never modify the commit plan after approval without user consent.
  • •If implementation becomes complex or problematic, ask the user how to proceed rather than changing approach autonomously.