version: "1.0.1" name: jj-toolkit description: Use for working with Jujutsu (jj) history workflows, including hunk-level split/squash/diffedit/restore via jj-hunk-tool.

Jujutsu Toolkit

Route to one mode and read only its reference:

1. hunk-edit: split, squash, restore, or move exact hunks with

jj-hunk-tool. Read jj-surgeon.md.

1. conflicts: resolve conflicted changes or rebases. Read

conflict-resolution.md.

1. bisect: identify a first bad change. Read

bisect.md.

1. git-interop: bookmarks, colocated repositories, push visibility, and

GitHub boundaries. Read git-interop.md.

1. revsets/templates: write or debug selection and output expressions. Read

revset-reference.md or template-reference.md.

1. workspaces: create, inspect, or clean up parallel workspaces. Read

workspaces.md.

Use model-known jj mechanics for routine operations. Load the upstream jj-surgeon guide only for hunk-level work or when another focused reference routes there.

Non-negotiable: move the bookmark

In a git-colocated repo, moving the bookmark is part of finishing a change, not a follow-up. Committing without it leaves the Git branch behind and the work invisible to git log, gh, CI, and reviewers. This is the most common agent failure mode with jj. A commit with no bookmark on it is not on a branch.

After creating or rewriting a commit stack in a git-colocated repository, confirm its bookmark sits on the intended stack tip and task-owned changes have been committed, leaving @ empty when no unrelated work remains. Do not move bookmarks or empty the working copy for inspection, explanation, or diagnosis. Follow references/git-interop.md. Read it before your first commit, not after.

MIT attribution: references/LICENSE-jj-hunk-tool.