vibe-rebase

vibe-rebase is a skill for Claude Code from OAI-Labs/vibe-flow. It costs 52 tokens per session (1,500 once invoked), scanned A, original, MIT.

A conflict-resolution helper for a pull request whose branch has fallen behind the main branch or cannot be merged cleanly. It rebases the work onto the latest main branch, resolves conflicts, reruns tests, and updates the branch safely.

In plain words
What is it for?
Use it when GitHub reports merge conflicts or a branch is behind or marked dirty, before attempting the final merge.
Why use it?
It handles the case where new changes in main overlap with the pull request. Re-running tests after the rebase helps verify that conflict resolution did not break the code.

Skill for Claude Code

Written for Claude Code: shipped in a Claude Code plugin.

Part of the vibe-flow plugin — 14 skills, 2 agents shipped together

Good fit Use it when GitHub reports merge conflicts or a branch is behind or marked dirty, before attempting the final merge.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/oai-labs/vibe-flow/vibe-rebase
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.

Any agent
npx skills add OAI-Labs/vibe-flow --skill vibe-rebase
Clone the repo
git clone --depth 1 https://github.com/OAI-Labs/vibe-flow

Made for: Claude Code.

Or install vibe-flow, the plugin that ships this one along with the rest of its 14 skills, 2 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 vibe-rebase

README.md
[![agentmods](https://agentmods.dev/badge/skills/oai-labs/vibe-flow/vibe-rebase/github.svg)](https://agentmods.dev/skills/oai-labs/vibe-flow/vibe-rebase)
Your own site
<a href="https://agentmods.dev/skills/oai-labs/vibe-flow/vibe-rebase"><img src="https://agentmods.dev/badge/skills/oai-labs/vibe-flow/vibe-rebase/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 vibe-rebase

Your own site · 80×15
<a href="https://agentmods.dev/skills/oai-labs/vibe-flow/vibe-rebase"><img src="https://agentmods.dev/badge/skills/oai-labs/vibe-flow/vibe-rebase.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 52 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,500 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.00052 $0.01500
Opus 5 $0.00026 $0.00750
Sonnet 5 $0.00010 $0.00300
Haiku 4.5 $0.00005 $0.00150

Measured 10d ago against content hash 3faac7dcec7f, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-11, from the pricing page.

Security

Grade A, and why

vibe-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 10d 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/vibe-flow/skills/vibe-rebase/SKILL.md · 200 lines

How it starts

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

vibe-rebase

Overview

Handle the messy case: main moved forward while PR was in review, now there's a conflict. Dispatch a focused agent to rebase and resolve.

Core principle: Always --force-with-lease, never --force. Tests must pass after rebase.

Announce at start: "I'm using the vibe-rebase skill to resolve branch conflicts."

When to use

  • vibe-merge Step 1 reports mergeStateStatus: BEHIND or DIRTY
  • gh pr view shows mergeable: CONFLICTING
  • User manually reports a conflict

Do NOT use if:

  • PR is already merged
  • Conflict is ambiguous and needs design decision (go to user)
  • Rebase attempts already >= 2 on this PR (go to user / escalate)

The process

Step 1: Preflight

git fetch origin
gh pr view <PR> --json headRefName,baseRefName,mergeable,mergeStateStatus

Confirm:

  • baseRefName is main (or project's base branch)
  • mergeable is CONFLICTING or MERGEABLE but behind
  • We have write access

Find the head branch commit and count commits ahead:

BRANCH=<head>
git log --oneline origin/main..origin/$BRANCH | wc -l

If the branch has > 5 commits → simple rebase may be messy. Consider merge commit instead (keep history). Rebase still preferred for clean squash merge.

Step 2: Check conflict complexity

git checkout origin/$BRANCH
git rebase origin/main --dry-run 2>&1 | grep -c "CONFLICT"

If 0 conflicts expected (just "behind") → rebase is trivial, do it in-process:

git rebase origin/main
git push --force-with-lease origin $BRANCH

Skip to Step 5.

If 1-3 conflicts in isolated files → dispatch T1 agent. If 4+ conflicts OR conflicts in core logic → dispatch T2 or T3 agent.

Step 3: Dispatch rebase agent

Use references/prompt-templates.md section 6 (rebase prompt). Fill:

  • {{BRANCH_NAME}}

Pass additional context:

  • The original issue (so the agent knows the feature's intent)
  • List of conflicted files (from git status preview)
  • Whether tests are present (so agent knows to run them)

Read the full file on GitHub · 200 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. 10d ago First seen · 200 lines · 52 tokens per session scan A 3faac7dcec7f

Subscribe to this mod's changes

vibe-rebase is a skill published in the GitHub repository OAI-Labs/vibe-flow (1 stars, last pushed 1mo ago), licensed MIT. It adds 52 tokens to every session and 1,500 once invoked, about $0.0003 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-31.

Related

Other skills, from other repositories

loop-on-ci

Monitor PR checks and fix failures until green. Uses gh pr checks as the source of truth for PR-attached checks.

Kripu77/software-factory · 28 tokens

pr-watch

Local PR watcher. Monitors CI status, automatically fixes failing checks by reading failure logs and applying targeted fixes, then optionally merges when all checks pass. Local CLI analog to Claude Code's cloud auto-fix feature.

SethGammon/Citadel · 46 tokens

deploy-steward

Mainline deploy steward. Consumes ready PRs, owns a lease on mainline landing, refreshes PR state, updates stale branches, waits for CI and deploy gates, merges or queues one candidate at a time, and opens repair tasks for failures.

SethGammon/Citadel · 56 tokens

merge-review

Reviews pending fleet worktree merges before they're accepted. Reads the merge-check queue, detects file-level conflicts between branches, proposes a safe merge order, and surfaces reconciliation plans for overlapping changes.

SethGammon/Citadel · 40 tokens

branch-and-worktree-workflow

Isolates feature work in its own branch or worktree and integrates it cleanly when done. Use this when starting work that should not disturb the current workspace, when several efforts must proceed in parallel on one repository, or when implementation is finished and the change needs merging, rebasing, or splitting…

cbrock84/headcount · 70 tokens

pr-feedback

Work a reviewer's comments on a pull request to the end - all three comment surfaces enumerated before any is triaged, every comment fixed, declined with a reason, or ticketed, push before you reply. Use when a PR comes back with review feedback or a red check.

jjanczur/tyran · 57 tokens