When should I use the jj-spr-recovery skill?

Use it when your JJ+SPR stack is in a 'bad state,' such as when PRs are merged out of order on GitHub or when you see 'ghost' changes that are empty but still in your local graph.

What if I don't use a 'dev' bookmark in Jujutsu?

The skill is flexible; if the 'dev' bookmark isn't found, it automatically falls back to using 'trunk()..' for revsets and 'main@origin' or 'master@origin' for rebase targets.

Does this skill perform actions automatically?

No, it follows a safety-first approach. It diagnoses the state of your stack and presents a proposed plan for your approval before closing PRs or abandoning changes.

What is a 'ghost change' in the context of this skill?

A ghost change is a local commit that appears as (empty) because its content was already merged into the main branch through a different path, but the local commit hasn't been abandoned yet.

JJ SPR Stack Recovery

Name: JJ SPR Stack Recovery
Author: edmondop

byedmondop

0•

开发者工具

Restores and synchronizes broken Jujutsu (jj) and Super Pull Request (SPR) development stacks.

This skill automates the recovery of jj+SPR stacks that have fallen into a broken or inconsistent state. It is specifically designed to handle common issues like manual GitHub web merges, out-of-order PR landings, and 'ghost' changes where content exists in the trunk but remains as an empty commit in the local graph. By performing a multi-step diagnosis and cleanup—including closing orphaned PRs, stripping stale metadata, and rebasing the stack—it ensures your local development environment perfectly mirrors the remote repository state.

主要功能

010 GitHub stars

02Comprehensive stack diagnosis and PR mapping

03Safe closing of orphaned or stale synthetic base PRs

04Bulk stripping of stale Pull Request URLs from commit messages

05Guided rebase and recreation of the SPR stack

06Automated identification and removal of 'ghost' changes

使用场景

01Repairing PRs that show incorrect diffs due to stale parent PRs or synthetic bases

02Fixing a stack after a colleague merges a PR via the GitHub UI instead of using jj spr land

03Cleaning up a local graph containing empty changes after a trunk rebase

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add edmondop/jj-claude-plugin jj-spr-recovery

For use in Claude.ai and ChatGPT

主要功能

010 GitHub stars

02Comprehensive stack diagnosis and PR mapping

03Safe closing of orphaned or stale synthetic base PRs

04Bulk stripping of stale Pull Request URLs from commit messages

05Guided rebase and recreation of the SPR stack

06Automated identification and removal of 'ghost' changes

使用场景

01Repairing PRs that show incorrect diffs due to stale parent PRs or synthetic bases

02Fixing a stack after a colleague merges a PR via the GitHub UI instead of using jj spr land

03Cleaning up a local graph containing empty changes after a trunk rebase

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add edmondop/jj-claude-plugin jj-spr-recovery

For use in Claude.ai and ChatGPT