---

name: jj-workflow description: | Jujutsu (jj) version control for AI-assisted development. Use when:

• Repo has .jj/ directory (check with jj root)
• Need undo/recovery after breaking changes
• Curating messy history before PR

---

jj Workflow

Mental Model

No staging area. Your working directory is always a commit. Every save is tracked.

• @ = your current change (the working copy)
• @- = parent of current change
• Changes are mutable until pushed

When to Use What

AI Coding Pattern

During implementation, don't think about commits. Just work. jj tracks everything.

Copy# Before risky change
jj describe -m "checkpoint: auth works"
jj new -m "adding OAuth"

# If it breaks
jj op log              # Find good state
jj op restore <id>     # Go back

# When done, curate
jj log -r 'ancestors(@, 10)'
jj squash              # Combine checkpoints
jj describe -m "feat: OAuth support"

Push to GitHub

Copyjj bookmark create feature-x   # Name for pushing
jj git push --allow-new        # Push to remote

Teammates see clean git. They don't know you used jj.

Recovery

The oplog records every operation. Nothing is lost.

Copyjj op log                      # See all operations
jj undo                        # Undo last operation
jj op restore <id>             # Jump to any past state

Bail Out

Copyrm -rf .jj    # Delete jj, keep git unchanged