Surgical Rollback
Rollback follows provenance, not the size of the current diff.
Before Mutation
Freeze further implementation. Identify the rollback the user authorized, the pre-change baseline, and protected artifacts. Obtain explicit authorization before creating a revert commit, rewriting history, or pushing shared state; approval for one action does not authorize the others.
Method
- Inspect current status, staged and unstaged diffs, and relevant commits. Classify the exact changes as offending, valid task work, pre-existing user work, or protected state.
- Compare that classification with the pre-turn baseline. If provenance is uncertain, preserve the ambiguous work and ask a focused question rather than inferring that all dirty files belong to the accidental turn.
- Choose the smallest rollback unit. Enumerate paths or hunks for uncommitted work, or identify the exact offending commit for an authorized revert. Mixed files require hunk-level preservation rather than whole-file restoration.
- Remove or restore only the authorized offending delta. Preserve saved plans, unrelated dependency artifacts, accepted downstream logic, and pre-existing work.
- If the user explicitly wants a committed change reverted but retained locally, save its exact patch first. Create and publish the revert only with the corresponding authorizations, then restore the desired patch unstaged if requested. If restoration conflicts, stop and preserve the patch rather than overwriting current work.
- Stop at the rollback boundary. Verify the resulting state; do not silently resume the implementation that was rolled back.
Verification
- Compare
git status --short and both staged and unstaged diffs with the recorded baseline. An initially clean worktree should be clean again only when the rollback scope covers all new work.
- Confirm every protected artifact and retained change remains in its requested staged or unstaged form.
- For a narrowed code correction, run the relevant focused check. If it fails, preserve the narrowed delta, diagnose the failure, and report it without claiming completion.
- After an explicitly authorized publication, compare local state with the authoritative remote branch, not just a potentially stale tracking ref.
- Report exactly what was removed or reverted, what was retained, final status, and any verification limitation.
Failure Modes
- Whole-worktree reset: use the pre-turn baseline and enumerated delta; a dirty file is not proof of agent ownership.
- Revert loses desired local work: preserve the exact patch before the authorized revert and verify its requested restoration afterward.
- Contract correction removes valid downstream behavior: remove only the incorrect fields or flow and check that accepted logic still works.
Provenance
Forged by Lore from six beats in five native OMP sessions (2026-07-17 through 2026-09-01), theme surgical-rollback-preserves-valid-work. Evidence and dossier remain in the private local Lore corpus; transcript paths and project identities are intentionally omitted here.
1---2name: surgical-rollback3description: Removes an offending or unauthorized delta while preserving valid and pre-existing work. Use when asked to undo an accidental implementation, revert only part of a change, or retain desired local work while reversing a commit.4---56# Surgical Rollback78Rollback follows provenance, not the size of the current diff.910## Before Mutation1112Freeze further implementation. Identify the rollback the user authorized, the pre-change baseline, and protected artifacts. Obtain explicit authorization before creating a revert commit, rewriting history, or pushing shared state; approval for one action does not authorize the others.1314## Method15161. Inspect current status, staged and unstaged diffs, and relevant commits. Classify the exact changes as offending, valid task work, pre-existing user work, or protected state.172. Compare that classification with the pre-turn baseline. If provenance is uncertain, preserve the ambiguous work and ask a focused question rather than inferring that all dirty files belong to the accidental turn.183. Choose the smallest rollback unit. Enumerate paths or hunks for uncommitted work, or identify the exact offending commit for an authorized revert. Mixed files require hunk-level preservation rather than whole-file restoration.194. Remove or restore only the authorized offending delta. Preserve saved plans, unrelated dependency artifacts, accepted downstream logic, and pre-existing work.205. If the user explicitly wants a committed change reverted but retained locally, save its exact patch first. Create and publish the revert only with the corresponding authorizations, then restore the desired patch unstaged if requested. If restoration conflicts, stop and preserve the patch rather than overwriting current work.216. Stop at the rollback boundary. Verify the resulting state; do not silently resume the implementation that was rolled back.2223## Verification2425- Compare `git status --short` and both staged and unstaged diffs with the recorded baseline. An initially clean worktree should be clean again only when the rollback scope covers all new work.26- Confirm every protected artifact and retained change remains in its requested staged or unstaged form.27- For a narrowed code correction, run the relevant focused check. If it fails, preserve the narrowed delta, diagnose the failure, and report it without claiming completion.28- After an explicitly authorized publication, compare local state with the authoritative remote branch, not just a potentially stale tracking ref.29- Report exactly what was removed or reverted, what was retained, final status, and any verification limitation.3031## Failure Modes3233- **Whole-worktree reset:** use the pre-turn baseline and enumerated delta; a dirty file is not proof of agent ownership.34- **Revert loses desired local work:** preserve the exact patch before the authorized revert and verify its requested restoration afterward.35- **Contract correction removes valid downstream behavior:** remove only the incorrect fields or flow and check that accepted logic still works.3637## Provenance3839Forged by Lore from six beats in five native OMP sessions (2026-07-17 through 2026-09-01), theme `surgical-rollback-preserves-valid-work`. Evidence and dossier remain in the private local Lore corpus; transcript paths and project identities are intentionally omitted here.
edmundmiller