Conductor Revert

1---
2name: conductor-revert
3description: Git-aware undo by logical work unit (track, phase, or task)
4metadata:
5  argument-hint: "[track-id | track-id:phase | track-id:task]"
6---
7 
8# Revert Track
9 
10Revert changes by logical work unit with full git awareness. Supports reverting entire tracks, specific phases, or individual tasks.
11 
12## Use this skill when
13 
14- Working on revert track tasks or workflows
15- Needing guidance, best practices, or checklists for revert track
16 
17## Do not use this skill when
18 
19- The task is unrelated to revert track
20- You need a different domain or tool outside this scope
21 
22## Instructions
23 
24- Clarify goals, constraints, and required inputs.
25- Apply relevant best practices and validate outcomes.
26- Provide actionable steps and verification.
27- If detailed examples are required, open `resources/implementation-playbook.md`.
28 
29## Pre-flight Checks
30 
311. Verify Conductor is initialized:
32   - Check `conductor/tracks.md` exists
33   - If missing: Display error and suggest running `/conductor:setup` first
34 
352. Verify git repository:
36   - Run `git status` to confirm git repo
37   - Check for uncommitted changes
38   - If uncommitted changes exist:
39 
40     ```
41     WARNING: Uncommitted changes detected
42 
43     Files with changes:
44     {list of files}
45 
46     Options:
47     1. Stash changes and continue
48     2. Commit changes first
49     3. Cancel revert
50     ```
51 
523. Verify git is clean enough to revert:
53   - No merge in progress
54   - No rebase in progress
55   - If issues found: Halt and explain resolution steps
56 
57## Target Selection
58 
59### If argument provided:
60 
61Parse the argument format:
62 
63**Full track:** `{trackId}`
64 
65- Example: `auth_20250115`
66- Reverts all commits for the entire track
67 
68**Specific phase:** `{trackId}:phase{N}`
69 
70- Example: `auth_20250115:phase2`
71- Reverts commits for phase N and all subsequent phases
72 
73**Specific task:** `{trackId}:task{X.Y}`
74 
75- Example: `auth_20250115:task2.3`
76- Reverts commits for task X.Y only
77 
78### If no argument:
79 
80Display guided selection menu:
81 
82```
83What would you like to revert?
84 
85Currently In Progress:
861. [~] Task 2.3 in dashboard_20250112 (most recent)
87 
88Recently Completed:
892. [x] Task 2.2 in dashboard_20250112 (1 hour ago)
903. [x] Phase 1 in dashboard_20250112 (3 hours ago)
914. [x] Full track: auth_20250115 (yesterday)
92 
93Options:
945. Enter specific reference (track:phase or track:task)
956. Cancel
96 
97Select option:
98```
99 
100## Commit Discovery
101 
102### For Task Revert
103 
1041. Search git log for task-specific commits:
105 
106   ```bash
107   git log --oneline --grep="{trackId}" --grep="Task {X.Y}" --all-match
108   ```
109 
1102. Also find the plan.md update commit:
111 
112   ```bash
113   git log --oneline --grep="mark task {X.Y} complete" --grep="{trackId}" --all-match
114   ```
115 
1163. Collect all matching commit SHAs
117 
118### For Phase Revert
119 
1201. Determine task range for the phase by reading plan.md
1212. Search for all task commits in that phase:
122 
123   ```bash
124   git log --oneline --grep="{trackId}" | grep -E "Task {N}\.[0-9]"
125   ```
126 
1273. Find phase verification commit if exists
1284. Find all plan.md update commits for phase tasks
1295. Collect all matching commit SHAs in chronological order
130 
131### For Full Track Revert
132 
1331. Find ALL commits mentioning the track:
134 
135   ```bash
136   git log --oneline --grep="{trackId}"
137   ```
138 
1392. Find track creation commits:
140 
141   ```bash
142   git log --oneline -- "conductor/tracks/{trackId}/"
143   ```
144 
1453. Collect all matching commit SHAs in chronological order
146 
147## Execution Plan Display
148 
149Before any revert operations, display full plan:
150 
151```
152================================================================================
153                           REVERT EXECUTION PLAN
154================================================================================
155 
156Target: {description of what's being reverted}
157 
158Commits to revert (in reverse chronological order):
159  1. abc1234 - feat: add chart rendering (dashboard_20250112)
160  2. def5678 - chore: mark task 2.3 complete (dashboard_20250112)
161  3. ghi9012 - feat: add data hooks (dashboard_20250112)
162  4. jkl3456 - chore: mark task 2.2 complete (dashboard_20250112)
163 
164Files that will be affected:
165  - src/components/Dashboard.tsx (modified)
166  - src/hooks/useData.ts (will be deleted - was created in these commits)
167  - conductor/tracks/dashboard_20250112/plan.md (modified)
168 
169Plan updates:
170  - Task 2.2: [x] -> [ ]
171  - Task 2.3: [~] -> [ ]
172 
173================================================================================
174                              !! WARNING !!
175================================================================================
176 
177This operation will:
178- Create {N} revert commits
179- Modify {M} files
180- Reset {P} tasks to pending status
181 
182This CANNOT be easily undone without manual intervention.
183 
184================================================================================
185 
186Type 'YES' to proceed, or anything else to cancel:
187```
188 
189**CRITICAL: Require explicit 'YES' confirmation. Do not proceed on 'y', 'yes', or enter.**
190 
191## Revert Execution
192 
193Execute reverts in reverse chronological order (newest first):
194 
195```
196Executing revert plan...
197 
198[1/4] Reverting abc1234...
199      git revert --no-edit abc1234
200      ✓ Success
201 
202[2/4] Reverting def5678...
203      git revert --no-edit def5678
204      ✓ Success
205 
206[3/4] Reverting ghi9012...
207      git revert --no-edit ghi9012
208      ✓ Success
209 
210[4/4] Reverting jkl3456...
211      git revert --no-edit jkl3456
212      ✓ Success
213```
214 
215### On Merge Conflict
216 
217If any revert produces a merge conflict:
218 
219```
220================================================================================
221                           MERGE CONFLICT DETECTED
222================================================================================
223 
224Conflict occurred while reverting: {sha} - {message}
225 
226Conflicted files:
227  - src/components/Dashboard.tsx
228 
229Options:
2301. Show conflict details
2312. Abort revert sequence (keeps completed reverts)
2323. Open manual resolution guide
233 
234IMPORTANT: Reverts 1-{N} have been completed. You may need to manually
235resolve this conflict before continuing or fully undo the revert sequence.
236 
237Select option:
238```
239 
240**HALT immediately on any conflict. Do not attempt automatic resolution.**
241 
242## Plan.md Updates
243 
244After successful git reverts, update plan.md:
245 
2461. Read current plan.md
2472. For each reverted task, change marker:
248   - `[x]` -> `[ ]`
249   - `[~]` -> `[ ]`
2503. Write updated plan.md
2514. Update metadata.json:
252   - Decrement `tasks.completed`
253   - Update `status` if needed
254   - Update `updated` timestamp
255 
256**Do NOT commit plan.md changes** - they are part of the revert operation
257 
258## Track Status Updates
259 
260### If reverting entire track:
261 
262- In tracks.md: Change `[x]` or `[~]` to `[ ]`
263- Consider offering to delete the track directory entirely
264 
265### If reverting to incomplete state:
266 
267- In tracks.md: Ensure marked as `[~]` if partially complete, `[ ]` if fully reverted
268 
269## Verification
270 
271After revert completion:
272 
273```
274================================================================================
275                           REVERT COMPLETE
276================================================================================
277 
278Summary:
279  - Reverted {N} commits
280  - Reset {P} tasks to pending
281  - {M} files affected
282 
283Git log now shows:
284  {recent commit history}
285 
286Plan.md status:
287  - Task 2.2: [ ] Pending
288  - Task 2.3: [ ] Pending
289 
290================================================================================
291 
292Verify the revert was successful:
293  1. Run tests: {test command}
294  2. Check application: {relevant check}
295 
296If issues are found, you may need to:
297  - Fix conflicts manually
298  - Re-implement the reverted tasks
299  - Use 'git revert HEAD~{N}..HEAD' to undo the reverts
300 
301================================================================================
302```
303 
304## Safety Rules
305 
3061. **NEVER use `git reset --hard`** - Only use `git revert`
3072. **NEVER use `git push --force`** - Only safe push operations
3083. **NEVER auto-resolve conflicts** - Always halt for human intervention
3094. **ALWAYS show full plan** - User must see exactly what will happen
3105. **REQUIRE explicit 'YES'** - Not 'y', not enter, only 'YES'
3116. **HALT on ANY error** - Do not attempt to continue past failures
3127. **PRESERVE history** - Revert commits are preferred over history rewriting
313 
314## Edge Cases
315 
316### Track Never Committed
317 
318```
319No commits found for track: {trackId}
320 
321The track exists but has no associated commits. This may mean:
322- Implementation never started
323- Commits used different format
324 
325Options:
3261. Delete track directory only
3272. Cancel
328```
329 
330### Commits Already Reverted
331 
332```
333Some commits appear to already be reverted:
334  - abc1234 was reverted by xyz9876
335 
336Options:
3371. Skip already-reverted commits
3382. Cancel and investigate
339```
340 
341### Remote Already Pushed
342 
343```
344WARNING: Some commits have been pushed to remote
345 
346Commits on remote:
347  - abc1234 (origin/main)
348  - def5678 (origin/main)
349 
350Reverting will create new revert commits that you'll need to push.
351This is the safe approach (no force push required).
352 
353Continue with revert? (YES/no):
354```
355 
356## Undo the Revert
357 
358If user needs to undo the revert itself:
359 
360```
361To undo this revert operation:
362 
363  git revert HEAD~{N}..HEAD
364 
365This will create new commits that restore the reverted changes.
366 
367Alternatively, if not yet pushed:
368  git reset --soft HEAD~{N}
369  git checkout -- .
370 
371(Use with caution - this discards the revert commits)
372```
373