rebase-expert

rebase-expert is an agent for Claude Code from jpoutrin/product-forge. It costs 29 tokens per session (1,321 once invoked), scanned A, original, MIT.

A Git rebase specialist that helps replay local commits on top of newer changes from a remote repository. Rebase means moving your work so it starts from a later point in the project history.

In plain words
What is it for?
Use it to rebase local work onto remote updates, perform interactive history edits, detect conflicts, and verify that the rebase finished correctly.
Why use it?
It checks the repository state, fetches remote updates, looks for conflicts, and guides conflict resolution. This helps avoid starting a rebase with unsuitable local changes or an unclear remote branch.

Agent for Claude Code

Written for Claude Code: shipped in a Claude Code plugin. Also seen: model in frontmatter.

Part of the git-workflow plugin — 11 skills, 8 agents shipped together

Good fit Use it to rebase local work onto remote updates, perform interactive history edits, detect conflicts, and verify that the rebase finished correctly.

Compare 6 agents from other repositories ↓
Install with agentmods
npx agentmods add agents/jpoutrin/product-forge/rebase-expert
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.

Clone the repo
git clone --depth 1 https://github.com/jpoutrin/product-forge

Made for: Claude Code.

Or install git-workflow, the plugin that ships this one along with the rest of its 11 skills, 8 agents.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for rebase-expert

README.md
[![agentmods](https://agentmods.dev/badge/agents/jpoutrin/product-forge/rebase-expert/github.svg)](https://agentmods.dev/agents/jpoutrin/product-forge/rebase-expert)
Your own site
<a href="https://agentmods.dev/agents/jpoutrin/product-forge/rebase-expert"><img src="https://agentmods.dev/badge/agents/jpoutrin/product-forge/rebase-expert/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for rebase-expert

Your own site · 80×15
<a href="https://agentmods.dev/agents/jpoutrin/product-forge/rebase-expert"><img src="https://agentmods.dev/badge/agents/jpoutrin/product-forge/rebase-expert.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 29 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 1,321 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
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.1 $0.00029 $0.01321
Opus 5.5 $0.00012 $0.00528
Sonnet 5.5 $0.00006 $0.00264
Haiku 4.5 $0.00003 $0.00132

Measured 1mo ago against content hash f93cf80b2a90, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

rebase-expert 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 1mo 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.

plugins/git-workflow/agents/rebase-expert.md · 229 lines

How it starts

The opening of the file, as written. The whole thing — 229 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Rebase Expert Agent

Description: Git rebase specialist that safely rebases local commits on top of remote changes with conflict detection and resolution guidance.

Model: Haiku (optimized for speed and cost on frequent operations)

Capabilities

  • Fetch latest remote changes
  • Detect potential rebase conflicts before executing
  • Execute standard or interactive rebases
  • Guide through conflict resolution
  • Verify rebase completion and show results
  • Handle rebase failures and provide recovery steps

Activation

This agent is invoked by the /rebase command with arguments:

  • (default): Standard rebase
  • --interactive: Interactive rebase for commit editing

Workflow

Step 1: Verify Git State

Ensure:

  • We're in a git repository
  • Current branch tracks a remote branch
  • No uncommitted changes (offer to stash if needed)

Commands:

git rev-parse --git-dir
git branch -vv
git status

Step 2: Fetch Latest Remote Changes

Get the latest updates from the remote:

git fetch origin

Identify the tracking branch (e.g., origin/main, origin/feature/my-feature)

Step 3: Check for Conflicts

Simulate the rebase to detect conflicts:

git rebase --dry-run origin/<branch>

Warn user if conflicts are likely. Show which files would conflict.

Step 4: Execute Rebase

Run the actual rebase:

git rebase origin/<branch>
# or for interactive mode:
git rebase -i origin/<branch>

Monitor for:

  • Successful completion
  • Conflicts that need resolution
  • Rebase failures

Step 5: Handle Conflicts (if any)

If conflicts occur:

  1. Display conflicted files: git status
  2. Show conflict markers in affected files
  3. Guide user through resolution steps
  4. After resolution, continue: git rebase --continue
  5. If issues, allow abort: git rebase --abort

Step 6: Confirm Success

Show final state:

git log --oneline -n 10
git status

Display:

  • Number of commits rebased
  • New commit positions
  • Confirmation that branch is in sync with remote

Read the full file on GitHub · 229 lines

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. 1mo ago First seen · 229 lines · 29 tokens per session scan A f93cf80b2a90

Subscribe to this mod's changes

rebase-expert is an agent published in the GitHub repository jpoutrin/product-forge (16 stars, last pushed 7mo ago), licensed MIT. It adds 29 tokens to every session and 1,321 once invoked, about $0.0001 per session on Opus 5.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-09-03.

Related

Other agents, from other repositories

plastic-node-work

Dispatched for a work node by Plastic's node-graph runner. Given the node input path the dispatch line names, make the node's code changes inside the node worktree, commit them there, and reply with the YAML return the dispatch line names. Never spawned outside a runner dispatch.

zalom/plastic · 65 tokens

pr-ghostwriter

Kod değişikliklerinden PR açıklaması, commit mesajı ve changelog üretir. Gerçek diff'i okuyarak değişikliğin ne, neden ve nasıl olduğunu açıklar. Kullanıcı PR açmak, commit mesajı yazmak veya release notu hazırlamak istediğinde kullanılır. Jenerik açıklama üretmez — her zaman gerçek değişikliğe özgü yazar.

komunite/kalfa · 81 tokens

copilot-integration

GitHub Copilot CLI integration agent for data analysis, experiment design, and GitHub workflow automation. Use PROACTIVELY for tasks requiring GitHub integration, data analysis, or when leveraging multiple AI models (Claude, GPT, Gemini).

weorbitant/claude-code-agentic-research-orchestrator · 53 tokens

Historical Context Reviewer

Git history analysis to learn from past issues, patterns, and architectural decisions.

nathanvale/side-quest-marketplace-old · 18 tokens

Demonstrate

Agent for demonstrating VS Code features.

microsoft/vscode · 10 tokens

playwright-test-generator

Use this agent when you need to create automated browser tests using Playwright Examples: Context: User wants to generate a test for the test plan item.

microsoft/playwright · 151 tokens