菜单
Guide AI agents to use Jujutsu (jj) for version control. Covers core concepts, daily workflows, Git compatibility, conflict resolution, and collaboration with GitHub. Use this skill when working with jj repositories or when the user wants to use Jujutsu instead of Git.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
| name | jujutsu-vcs |
| description | Guide AI agents to use Jujutsu (jj) for version control. Covers core concepts, daily workflows, Git compatibility, conflict resolution, and collaboration with GitHub. Use this skill when working with jj repositories or when the user wants to use Jujutsu instead of Git. |
<essential_principles>
Jujutsu (jj) is a Git-compatible VCS that eliminates common Git pain points. It's designed for safety, simplicity, and powerful history manipulation.
1. Working Copy Is Always a Commit
Unlike Git, your working copy state is always a commit in jj. Every file change is automatically tracked in the current commit—no staging area, no git add. When you run most jj commands, changes are auto-committed.
# In Git: edit → add → commit
# In jj: edit → done (auto-committed)
2. Change IDs vs Commit IDs
Every commit has two identifiers:
Use change IDs in your workflow—they survive rebases and amends.
3. Operations Are Always Reversible
The operation log records every action. Made a mistake? jj undo reverses it. Need to see what happened? jj op log shows everything.
4. Conflicts Are First-Class
Conflicts don't block operations. They're recorded in commits and can be resolved later. No more "rebase in progress" states.
5. Automatic Rebasing
When you edit a commit, all descendants automatically rebase on top of the modified version. Bookmarks and working copy update automatically.
</essential_principles>
<quick_reference>
Essential Commands:
| Task | Command |
|---|---|
| Status | jj st |
| Diff | jj diff |
| Log | jj log |
| Describe commit | jj describe -m "message" |
| Create new commit | jj new |
| Squash into parent | jj squash |
| Edit any commit | jj edit <change-id> |
| Undo last operation | jj undo |
Working with Git repos:
# Clone
jj git clone <url>
# Init in existing Git repo (colocated)
jj git init --colocate
# Fetch and push
jj git fetch
jj git push
</quick_reference>
**What would you like to do with Jujutsu?**Wait for response before proceeding.
| Response | Workflow | |----------|----------| | 1, "start", "clone", "init", "setup" | `workflows/getting-started.md` | | 2, "change", "edit", "commit", "develop", "daily" | `workflows/make-changes.md` | | 3, "history", "rebase", "split", "squash", "amend" | `workflows/work-with-history.md` | | 4, "conflict", "merge", "resolve" | `workflows/resolve-conflicts.md` | | 5, "github", "push", "pull", "pr", "collaborate", "remote" | `workflows/collaborate-github.md` | | 6, "undo", "mistake", "recover", "oops", "operation" | `workflows/recover-mistakes.md` | | 7, "concept", "understand", "what is", "how does" | Route to relevant reference file |After reading the workflow, follow it exactly.
<verification_loop>
After every operation, verify state:
# 1. Check current state
jj st
# 2. View recent history
jj log -r 'ancestors(@, 5)'
# 3. If issues, check operation log
jj op log
Report to user:
</verification_loop>
<reference_index>
Core Knowledge in references/:
| File | Contents |
|---|---|
| core-concepts.md | Working copy, change IDs, automatic rebasing |
| git-command-mapping.md | Git → jj command translation table |
| revsets.md | Selecting commits with the revset language |
| bookmarks.md | Named pointers (like Git branches) |
| common-patterns.md | Typical workflows and patterns |
| troubleshooting.md | Common issues and solutions |
</reference_index>
<workflows_index>
Workflows in workflows/:
| File | Purpose |
|---|---|
| getting-started.md | Initialize repos, clone, basic setup |
| make-changes.md | Daily development workflow |
| work-with-history.md | Edit, split, squash, rebase commits |
| resolve-conflicts.md | Handle and resolve conflicts |
| collaborate-github.md | Push, pull, PRs, remote workflows |
| recover-mistakes.md | Undo operations, restore state |
</workflows_index>
<success_criteria>
A successful jj operation:
jj undo</success_criteria>
Routes code search requests to semantic, structural, repo-discovery, or text-search workflows. Use when the user wants to find code, inspect repository layout, or search by meaning or syntax.
Semantic code search via the `osgrep` CLI. Use when the user wants to find code by behavior, concept, or intent ("where do we validate JWTs?", "where is rate limiting handled?") rather than by exact text. Prefer ripgrep for literal matches and ast-grep for structural patterns.
Use the Doppler CLI to access and manage secrets safely in both ad hoc scripts and long-lived projects. Covers CLI install, env injection, project binding via doppler.yaml, environments, service tokens, Docker, Kubernetes, and CI/CD integration. Use when a task touches secrets and must avoid exposing them in logs, prompts, command history, or tool output.
Guide for writing ast-grep rules to perform structural code search and analysis. Use when users need to search codebases using Abstract Syntax Tree (AST) patterns, find specific code structures, or perform complex code queries that go beyond simple text search. This skill should be used when users ask to search for code patterns, find specific language constructs, or locate code with particular structural characteristics.
Performs comprehensive reverse engineering and architecture analysis of GitHub repositories and application binaries. Identifies inefficiencies, bloat, vulnerabilities, and architectural patterns. Deconstructs from first principles to recommend optimal tech stacks for rewrites and modernization.
Use when building applications that access X's public data, including posts, users, trends, spaces, and direct messages. Reach for this skill when integrating X data into applications, building search or streaming solutions, managing user interactions, or analyzing X platform data.