rebase

A procedure for moving a stack of jj, or Jujutsu, changes on top of the newest version of the main code line. Jujutsu is a version-control system, similar to Git, that can keep related changes in a stack.

In plain words
What is it for?
Use it to update a jj changeset stack onto the latest trunk, inspect the resulting history, and identify files that need conflict resolution.
Why use it?
Your work can become based on an older version of the project after teammates update the main line. Rebasing brings the work up to date and reports conflicts for you to decide how to resolve.

Skill for Claude CodeCodex

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/jeffh/claude-plugins/rebase
Any agent
npx skills add jeffh/claude-plugins --skill rebase
Clone the repo
git clone --depth 1 https://github.com/jeffh/claude-plugins

Made for: Claude Code, Codex.

Per session 83 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 537 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00083 $0.00537
Opus 5 $0.00042 $0.00269
Sonnet 5 $0.00017 $0.00107
Haiku 4.5 $0.00008 $0.00054

Measured 3d ago against content hash 122cfbfa3602, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

rebase scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 3d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

jj/skills/rebase/SKILL.md · 59 lines

What it actually says

Rebase Current Stack

Rebase the current changeset stack (from its root through @) onto the latest trunk.

Context expectations

When invoked from /jj:rebase, the latest changes are already fetched and the stack root is already in context. Do not re-fetch. If invoked directly, fetch first:

jj git fetch

Process

  1. Identify the stack root:

    jj log -r 'roots(::@ ~ ::trunk())'
    
    • Finds the earliest changeset in the current stack that's not on trunk
    • If this returns nothing, you're already on trunk — report that and stop
  2. Rebase the stack:

    jj rebase -s 'roots(::@ ~ ::trunk())' -d trunk()
    
    • Rebases the entire stack onto trunk using the same revset for consistency
  3. Show result:

    jj log
    

Handling conflicts

If the rebase reports conflicts:

  1. Run jj status --no-pager to see conflicted files
  2. Report the conflicts to the user
  3. Do NOT attempt to resolve automatically — let the user decide

Edge cases

  • Empty working copy (@ has no changes): Normal in jj; the rebase still works on the stack.
  • Already on trunk: If roots(::@ ~ ::trunk()) returns nothing, tell the user they're up to date.
  • trunk() not configured: Fall back to checking main@origin or master@origin (prefer main@origin):
    jj log -r 'main@origin | master@origin' --no-graph -T 'self.bookmarks()'
    

Notes

  • trunk() is jj's built-in revset for the primary branch (respects repo config)
  • -s rebases the source and all descendants
  • ::@ means "all ancestors of @ including @"; ~ ::trunk() excludes trunk and its ancestors
Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 3d ago First seen · 59 lines · 83 tokens per session scan A 122cfbfa3602

Subscribe to this mod's changes

rebase is a skill published in the GitHub repository jeffh/claude-plugins (12 stars, last pushed 18d ago), licensed Apache-2.0. It adds 83 tokens to every session and 537 once invoked, about $0.0004 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.

Related

Other skills, from other repositories

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.

obra/superpowers · 21 tokens

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.

obra/superpowers · 37 tokens

auto-perf-optimize

Run agent-driven VS Code performance or memory investigations. Use when asked to launch Code OSS, automate a VS Code scenario, run the Chat memory smoke runner, capture renderer heap snapshots, take workflow screenshots, compare run summaries, or drive a repeatable scenario before heap-snapshot analysis.

microsoft/vscode · 62 tokens

chat-perf

Run chat perf benchmarks and memory leak checks against the local dev build or any published VS Code version. Use when investigating chat rendering regressions, validating perf-sensitive changes to chat UI, or checking for memory leaks in the chat response pipeline.

microsoft/vscode · 51 tokens

chat-pet-sprite-creation

Use when creating or changing VS Code chat pet sprite art, sprite sheets, state animations, eye treatments, Stable/Insiders variants, or pet transitions under src/vs/workbench/contrib/chat/browser/widget/media/chatPet.

microsoft/vscode · 53 tokens

cpu-profile-analysis

Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…

microsoft/vscode · 71 tokens