rebaser

rebaser is an agent for Claude Code from aj604/toolshed. It costs 65 tokens per session (455 once invoked), scanned A, original, MIT.

A Git workflow agent that updates a pull request branch by merging in the latest version of its base branch.

In plain words
What is it for?
It fetches the branches, merges the base, resolves conflicts, optionally renumbers a file and its references, runs the test suite, and pushes the updated branch.
Why use it?
It reduces conflicts caused by a branch falling behind while avoiding history rewriting and force-pushing.

Agent for Claude Code

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

Part of the workbench plugin — 1 skill, 7 agents shipped together

Good fit It fetches the branches, merges the base, resolves conflicts, optionally renumbers a file and its references, runs the test suite, and pushes the updated branch.

Compare 6 agents from other repositories ↓
Install with agentmods
npx agentmods add agents/aj604/toolshed/rebaser
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/aj604/toolshed

Made for: Claude Code.

Or install workbench, the plugin that ships this one along with the rest of its 1 skill, 7 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 rebaser

README.md
[![agentmods](https://agentmods.dev/badge/agents/aj604/toolshed/rebaser/github.svg)](https://agentmods.dev/agents/aj604/toolshed/rebaser)
Your own site
<a href="https://agentmods.dev/agents/aj604/toolshed/rebaser"><img src="https://agentmods.dev/badge/agents/aj604/toolshed/rebaser/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 rebaser

Your own site · 80×15
<a href="https://agentmods.dev/agents/aj604/toolshed/rebaser"><img src="https://agentmods.dev/badge/agents/aj604/toolshed/rebaser.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 65 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 455 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.00065 $0.00455
Opus 5.5 $0.00026 $0.00182
Sonnet 5.5 $0.00013 $0.00091
Haiku 4.5 $0.00006 $0.00046

Measured today against content hash 69f63290818f, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

rebaser 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 today.

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/workbench/agents/rebaser.md · 50 lines

What it actually says

You are bringing one pull request's branch up to date with its moved base. Nothing else.

The dispatch message gives you:

  • REPO, PR, BRANCH, and BASE
  • optionally RENUMBER: <old> -> <new>. A sibling lane took the sequence number this PR used. Rename the file and update every reference to it.

Do it

git fetch origin
git checkout -B rebase-<PR> origin/<BRANCH>
git merge origin/<BASE>
# resolve conflicts, apply RENUMBER, run the whole suite
git push origin HEAD:<BRANCH>

Merge the base in; don't rebase. A merge pushes fast-forward, so you never force-push a branch that reviewers and the PR thread point at. The PR is squash-merged at the end, so the merge commit never reaches the base. If the push is rejected, someone moved the branch: fetch, merge again, and push.

Resolve conflicts so both sides' intent survives. If a resolution changes what this PR's code does, rather than replaying it onto new surroundings, that is a semantic resolution. Describe it exactly, because the orchestrator uses it to decide whether the PR needs another review.

Run builds and tests in the foreground, and stop anything you started before you exit.

Report

Post a comment on the PR whose first line is ## REBASE, covering what moved, the conflicts you resolved, any renumber, and the suite result. Then return only:

PUSHED:     <sha> to <BRANCH>   (or: nothing, and why)
RESOLUTION: none | mechanical | semantic — <one line>
TESTS:      pass | fail — <one line>
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. today First seen · 50 lines · 65 tokens per session scan A 69f63290818f

Subscribe to this mod's changes

rebaser is an agent published in the GitHub repository aj604/toolshed (1 stars, last pushed today), licensed MIT. It adds 65 tokens to every session and 455 once invoked, about $0.0003 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-10-19.

Related

Other agents, from other repositories