/workflow:checkpoint-refactor
Multi-phase refactoring with persistent state that survives context limits and session boundaries.
When to Use This Skill
| Use this skill when... |
Use direct refactoring instead when... |
| Refactoring spans 10+ files |
Changing 1-5 files |
| Work will exceed context limits |
Small, focused change |
| Need to resume across sessions |
Single-session task |
| Multiple dependent phases |
Independent file changes |
| Team coordination on large refactor |
Solo quick fix |
Context
- Repo root: !
git rev-parse --show-toplevel
- Plan file exists: !
find . -maxdepth 1 -name REFACTOR_PLAN.md
- Git status: !
git status --porcelain
- Recent commits: !
git log --oneline --max-count=5
Parameters
--init: Create a new refactoring plan interactively
--continue: Resume from the last completed phase
--status: Show current plan progress
--phase=N: Execute a specific phase
Plan File Format
The plan file (REFACTOR_PLAN.md) serves as persistent state. It is the loop's
compact state packet (.claude/rules/loop-integrity.md): a fresh session,
or a sub-agent with no memory of prior phases, must be able to re-enter from this
file alone. Every phase therefore carries not just what to do but what was
verified and what changed — without those, resuming across a context limit
silently redoes or undoes work.
# Refactor Plan: {description}
Created: {date}
Last updated: {date}
Base commit: {hash}
Exit condition: {the literal criterion that ends the whole refactor — e.g. "all phases done, full suite + tsc green on base"}
## Overview
{What is being refactored and why}
## Phase 1: {phase name}
- **Status**: done | in-progress | pending | needs-review
- **Files**: file1.ts, file2.ts, file3.ts
- **Description**: {what this phase does}
- **Acceptance criteria**: {how to verify success — the phase's exit condition}
- **Verifier result**: {what the independent check returned — PASS/FAIL + the criterion it judged; filled in at the phase boundary}
- **Changed since last run**: {what this phase actually touched, so a successor doesn't redo or undo it}
- **Result**: {summary of changes made, filled in after completion}
## Phase 2: {phase name}
- **Status**: pending
- **Files**: file4.ts, file5.ts
- **Description**: {what this phase does}
- **Acceptance criteria**: {how to verify success}
- **Verifier result**: {empty until verified}
- **Changed since last run**: {empty until completed}
- **Result**: {empty until completed}
...
Execution
Execute this multi-phase refactoring workflow:
Step 1: Initialize refactoring plan (--init mode)
If --init flag provided:
- Analyze scope: Read files to be refactored, understand dependencies
- Define phases where each:
- Touches 3-7 files (bounded scope)
- Has clear acceptance criteria (tests, type check)
- Can be committed independently
- Builds on previous phases
- Write plan file: Create
REFACTOR_PLAN.md at repo root
- Record base commit:
git log --format='%H' -1
Phase ordering: Shared utilities/types first, leaf components last, tests alongside implementation.
Step 2: Resume existing refactor (--continue mode)
If --continue flag provided:
- Read
REFACTOR_PLAN.md
- Find next pending phase (status
pending or needs-review)
- Verify all prior phases are
done
- Execute phase (go to Step 4)
Step 3: Check progress (--status mode)
If --status flag provided:
- Read
REFACTOR_PLAN.md
- Parse plan and display status table with phases, descriptions, statuses, file counts
- Exit
Step 4: Execute target phase (--phase=N or selected via Step 2)
For each phase:
- Read context from plan file (current phase's details)
- Read only the files listed for this phase
- Implement changes according to phase description
- Validate with appropriate tool (tsc, ty check, cargo check, or npm/pytest test)
- If validation fails:
- Fix errors if straightforward
- If complex, mark phase as
needs-review with error details
- Commit partial work with
WIP: prefix
- If validation passes, gate
done on an independent verifier when the
acceptance criteria are a judgement (e.g. "the class is now single-purpose"),
not a purely mechanical check (a green suite / clean tsc is already
independent — a failing test does not care how hard you worked):
- Dispatch a fresh
Task sub-agent that reads only this phase's
acceptance criteria and the resulting diff — not the worker's reasoning —
and judges whether the criteria are met. The worker is biased toward
declaring completion; the loop's stop condition must come from outside it
(.claude/rules/loop-integrity.md, Pillar 1). When the criteria are about
behaviour ("endpoint returns X", "the bug no longer reproduces"),
delegate this to agent-patterns-plugin:execution-grounded-review, which
runs the suite first and grounds each criterion in execution evidence
rather than appearance.
- Record the verdict in the phase's Verifier result field (PASS/FAIL +
the criterion judged).
- If the verifier returns FAIL, leave status
in-progress/needs-review
and address the gap before marking done.
- Once verified, update the plan file: set status to
done, fill Verifier
result, Changed since last run, and Result, then commit:
git add -u && git commit -m "refactor phase N: {description}"
- If more phases remain, proceed to next phase or suggest
--continue
Step 5: Sub-agent delegation (for large phases)
For phases with 7+ files, delegate to Task sub-agent with:
- File list to modify
- Phase description and acceptance criteria
- Instructions: run validation, update plan file, stage/commit changes
- If validation fails: mark phase as
needs-review with error details
Recovery Patterns
| Situation |
Action |
| Context limit hit mid-phase |
Start new session, run --continue |
| Phase marked needs-review |
Read plan for details, fix issues, run --phase=N |
| Tests broken after a phase |
Revert phase commit, investigate, re-execute |
| Plan needs adjustment |
Edit REFACTOR_PLAN.md directly, update phases |
| Base branch moved |
Rebase onto new base, re-validate completed phases |
Agentic Optimizations
| Context |
Command |
| Check plan exists |
test -f REFACTOR_PLAN.md && echo "exists" |
| Quick typecheck |
npx tsc --noEmit --pretty 2>&1 | head -20 |
| Quick test |
npm test -- --bail=1 2>&1 | tail -20 |
| Phase commit |
git commit -m "refactor phase N: description" |
| Verify working state |
npx tsc --noEmit && npm test -- --bail=1 |
| Show plan phases |
grep "^## Phase" REFACTOR_PLAN.md |
| Show phase status |
grep -A1 "^## Phase" REFACTOR_PLAN.md | grep Status |
Quick Reference
| Operation |
Command |
| Init new refactor |
/workflow:checkpoint-refactor --init |
| Check progress |
/workflow:checkpoint-refactor --status |
| Resume work |
/workflow:checkpoint-refactor --continue |
| Run specific phase |
/workflow:checkpoint-refactor --phase=3 |
| Manual plan edit |
Edit REFACTOR_PLAN.md directly |
Related Skills
1---2name: workflow-checkpoint-refactor3description: Multi-phase refactoring with checkpoint files that survive context limits. Use when refactoring spans 10+ files, needs phased rollout, or risks running out of context mid-session.4---5
6# /workflow:checkpoint-refactor
7
8Multi-phase refactoring with persistent state that survives context limits and session boundaries.
9
10## When to Use This Skill
11
12| Use this skill when... | Use direct refactoring instead when... |
13|------------------------|---------------------------------------|
14| Refactoring spans 10+ files | Changing 1-5 files |
15| Work will exceed context limits | Small, focused change |
16| Need to resume across sessions | Single-session task |
17| Multiple dependent phases | Independent file changes |
18| Team coordination on large refactor | Solo quick fix |
19
20## Context
21
22- Repo root: !`git rev-parse --show-toplevel`
23- Plan file exists: !`find . -maxdepth 1 -name REFACTOR_PLAN.md`
24- Git status: !`git status --porcelain`
25- Recent commits: !`git log --oneline --max-count=5`
26
27## Parameters
28
29- **`--init`**: Create a new refactoring plan interactively
30- **`--continue`**: Resume from the last completed phase
31- **`--status`**: Show current plan progress
32- **`--phase=N`**: Execute a specific phase
33
34## Plan File Format
35
36The plan file (`REFACTOR_PLAN.md`) serves as persistent state. It is the loop's
37**compact state packet** (`.claude/rules/loop-integrity.md`): a fresh session,
38or a sub-agent with no memory of prior phases, must be able to re-enter from this
39file alone. Every phase therefore carries not just *what to do* but *what was
40verified* and *what changed* — without those, resuming across a context limit
41silently redoes or undoes work.
42
43```markdown
44# Refactor Plan: {description}
45
46Created: {date}
47Last updated: {date}
48Base commit: {hash}
49Exit condition: {the literal criterion that ends the whole refactor — e.g. "all phases done, full suite + tsc green on base"}
50
51## Overview
52{What is being refactored and why}
53
54## Phase 1: {phase name}
55- **Status**: done | in-progress | pending | needs-review
56- **Files**: file1.ts, file2.ts, file3.ts
57- **Description**: {what this phase does}
58- **Acceptance criteria**: {how to verify success — the phase's exit condition}
59- **Verifier result**: {what the independent check returned — PASS/FAIL + the criterion it judged; filled in at the phase boundary}
60- **Changed since last run**: {what this phase actually touched, so a successor doesn't redo or undo it}
61- **Result**: {summary of changes made, filled in after completion}
62
63## Phase 2: {phase name}
64- **Status**: pending
65- **Files**: file4.ts, file5.ts
66- **Description**: {what this phase does}
67- **Acceptance criteria**: {how to verify success}
68- **Verifier result**: {empty until verified}
69- **Changed since last run**: {empty until completed}
70- **Result**: {empty until completed}
71
72...
73```
74
75## Execution
76
77Execute this multi-phase refactoring workflow:
78
79### Step 1: Initialize refactoring plan (--init mode)
80
81If `--init` flag provided:
82
831. Analyze scope: Read files to be refactored, understand dependencies
842. Define phases where each:
85 - Touches 3-7 files (bounded scope)
86 - Has clear acceptance criteria (tests, type check)
87 - Can be committed independently
88 - Builds on previous phases
893. Write plan file: Create `REFACTOR_PLAN.md` at repo root
904. Record base commit: `git log --format='%H' -1`
91
92**Phase ordering**: Shared utilities/types first, leaf components last, tests alongside implementation.
93
94### Step 2: Resume existing refactor (--continue mode)
95
96If `--continue` flag provided:
97
981. Read `REFACTOR_PLAN.md`
992. Find next pending phase (status `pending` or `needs-review`)
1003. Verify all prior phases are `done`
1014. Execute phase (go to Step 4)
102
103### Step 3: Check progress (--status mode)
104
105If `--status` flag provided:
106
1071. Read `REFACTOR_PLAN.md`
1082. Parse plan and display status table with phases, descriptions, statuses, file counts
1093. Exit
110
111### Step 4: Execute target phase (--phase=N or selected via Step 2)
112
113For each phase:
114
1151. Read context from plan file (current phase's details)
1162. Read only the files listed for this phase
1173. Implement changes according to phase description
1184. Validate with appropriate tool (tsc, ty check, cargo check, or npm/pytest test)
1195. If validation fails:
120 - Fix errors if straightforward
121 - If complex, mark phase as `needs-review` with error details
122 - Commit partial work with `WIP:` prefix
1236. If validation passes, **gate `done` on an independent verifier** when the
124 acceptance criteria are a judgement (e.g. "the class is now single-purpose"),
125 not a purely mechanical check (a green suite / clean `tsc` is already
126 independent — a failing test does not care how hard you worked):
127 - Dispatch a fresh `Task` sub-agent that reads **only** this phase's
128 acceptance criteria and the resulting diff — not the worker's reasoning —
129 and judges whether the criteria are met. The worker is biased toward
130 declaring completion; the loop's stop condition must come from outside it
131 (`.claude/rules/loop-integrity.md`, Pillar 1). When the criteria are about
132 **behaviour** ("endpoint returns X", "the bug no longer reproduces"),
133 delegate this to `agent-patterns-plugin:execution-grounded-review`, which
134 runs the suite first and grounds each criterion in execution evidence
135 rather than appearance.
136 - Record the verdict in the phase's **Verifier result** field (PASS/FAIL +
137 the criterion judged).
138 - If the verifier returns FAIL, leave status `in-progress`/`needs-review`
139 and address the gap before marking `done`.
1407. Once verified, update the plan file: set status to `done`, fill **Verifier
141 result**, **Changed since last run**, and **Result**, then commit:
142 `git add -u && git commit -m "refactor phase N: {description}"`
1438. If more phases remain, proceed to next phase or suggest `--continue`
144
145### Step 5: Sub-agent delegation (for large phases)
146
147For phases with 7+ files, delegate to Task sub-agent with:
148- File list to modify
149- Phase description and acceptance criteria
150- Instructions: run validation, update plan file, stage/commit changes
151- If validation fails: mark phase as `needs-review` with error details
152
153## Recovery Patterns
154
155| Situation | Action |
156|-----------|--------|
157| Context limit hit mid-phase | Start new session, run `--continue` |
158| Phase marked needs-review | Read plan for details, fix issues, run `--phase=N` |
159| Tests broken after a phase | Revert phase commit, investigate, re-execute |
160| Plan needs adjustment | Edit REFACTOR_PLAN.md directly, update phases |
161| Base branch moved | Rebase onto new base, re-validate completed phases |
162
163## Agentic Optimizations
164
165| Context | Command |
166|---------|---------|
167| Check plan exists | `test -f REFACTOR_PLAN.md && echo "exists"` |
168| Quick typecheck | `npx tsc --noEmit --pretty 2>&1 \| head -20` |
169| Quick test | `npm test -- --bail=1 2>&1 \| tail -20` |
170| Phase commit | `git commit -m "refactor phase N: description"` |
171| Verify working state | `npx tsc --noEmit && npm test -- --bail=1` |
172| Show plan phases | `grep "^## Phase" REFACTOR_PLAN.md` |
173| Show phase status | `grep -A1 "^## Phase" REFACTOR_PLAN.md \| grep Status` |
174
175## Quick Reference
176
177| Operation | Command |
178|-----------|---------|
179| Init new refactor | `/workflow:checkpoint-refactor --init` |
180| Check progress | `/workflow:checkpoint-refactor --status` |
181| Resume work | `/workflow:checkpoint-refactor --continue` |
182| Run specific phase | `/workflow:checkpoint-refactor --phase=3` |
183| Manual plan edit | Edit `REFACTOR_PLAN.md` directly |
184
185## Related Skills
186
187- [code-review-checklist](../../../code-quality-plugin/skills/code-review-checklist/SKILL.md) - Review refactored code
188- [refactoring-patterns](../../../code-quality-plugin/skills/refactoring-patterns/SKILL.md) - Refactoring techniques
189- [adversarial-review](../../../agent-patterns-plugin/skills/adversarial-review/SKILL.md) - The isolated verifier a judgement-based phase gate delegates to
190- [execution-grounded-review](../../../agent-patterns-plugin/skills/execution-grounded-review/SKILL.md) - The execution-grounded verifier for behaviour-based phase acceptance criteria
191- `.claude/rules/loop-integrity.md` - Why the plan file is a state packet and why `done` is judged independently