stage-cli: Skill for Claude Code

.agents/skills/rebase-origin-main/SKILL.md

rebase-origin-main is a skill for Claude Code, Codex from ReviewStage/stage-cli. It costs 23 tokens per session (914 once invoked), scanned A, original, MIT.

A procedure for rebasing the current Git branch onto origin/main, which is the remote repository's main branch, and resolving conflicts along the way. It explains how to interpret Git's labels during a rebase.

In plain words
What is it for?
Fetching the latest main branch, starting a rebase, inspecting conflicts, resolving them one at a time, and completing the rebase.
Why use it?
It helps incorporate the latest main-branch changes while preserving the work on the current branch.

Skill for Claude CodeCodex

Written for no agent in particular: nothing here depends on one. Also seen: installed under .agents/ (shared by several agents).

This is ReviewStage/stage-cli's own configuration. It tells Claude Code and Codex how to work on stage-cli itself, so it is not a mod to install elsewhere. Copy it as a starting point and replace the rules that are about this project. Everything stage-cli configures →

Reuse

Borrowing it

Nothing to install: this file belongs to ReviewStage/stage-cli. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.

Copy the file
curl -O https://raw.githubusercontent.com/ReviewStage/stage-cli/main/.agents/skills/rebase-origin-main/SKILL.md
Clone the repo
git clone --depth 1 https://github.com/ReviewStage/stage-cli

Made for: Claude Code, Codex.

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-origin-main

README.md
[![agentmods](https://agentmods.dev/badge/skills/reviewstage/stage-cli/rebase-origin-main/github.svg)](https://agentmods.dev/skills/reviewstage/stage-cli/rebase-origin-main)
Your own site
<a href="https://agentmods.dev/skills/reviewstage/stage-cli/rebase-origin-main"><img src="https://agentmods.dev/badge/skills/reviewstage/stage-cli/rebase-origin-main/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-origin-main

Your own site · 80×15
<a href="https://agentmods.dev/skills/reviewstage/stage-cli/rebase-origin-main"><img src="https://agentmods.dev/badge/skills/reviewstage/stage-cli/rebase-origin-main.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 23 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 914 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. Third-party audits
  • NVIDIA SkillSpector warn 7 Sept 2026
SkillSpector: 1 finding, up to high

These are SkillSpector’s own severities. On a checked sample its high-severity flags on skills were ~96% false positives — a documented command, a public API, a “never do X” rule — so we show them as a caution to read, not a verdict. Why →

  • high Tool Misuse · line 99
    Tool parameters are crafted to achieve unintended or unsafe behavior. Parameter abuse can bypass intended safety checks (e.g. shell=True, --force, dangerous glob patterns).
    Fix: Validate all tool parameters against an allowlist. Reject dangerous parameter values (shell=True, --force, -rf /) and use safe defaults.
How audits are shown
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.00023 $0.00914
Opus 5.5 $0.00009 $0.00366
Sonnet 5.5 $0.00005 $0.00183
Haiku 4.5 $0.00002 $0.00091

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

Security

Grade A, and why

rebase-origin-main 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.

.agents/skills/rebase-origin-main/SKILL.md · 117 lines

How it starts

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

Rebase with origin/main

Overview

Fetches the latest origin/main, rebases the current branch onto it, and resolves every conflict that arises — one commit at a time — until the rebase completes cleanly.

Warning: Rebase Flips ours/theirs

During a rebase, git's labels are inverted from what you expect:

Label Means
HEAD / ours (top of conflict) origin/main — the base being rebased onto
theirs (bottom of conflict) Your commit being replayed

Always resolve conflicts to preserve the intent of your commit while incorporating origin/main's context.

Workflow

1. Fetch & Start

git fetch origin
git rebase origin/main

If the output says Successfully rebased — done. No conflicts.

2. Detect Conflicts

git status

Look for lines with both modified, added by us, deleted by them, etc.

3. Resolve Each Conflicted File

For each conflicted file:

  1. Read the file — find all conflict markers (<<<<<<<, =======, >>>>>>>)
  2. Understand both sides:
    • Above ======= (HEAD) = origin/main's version
    • Below ======= = your commit's change
  3. Resolve by editing the file to the correct merged result — no conflict markers left
  4. Verify no conflict markers remain: grep -En "<<<<<<<|=======|>>>>>>>" <file>
  5. Stage the resolved file: git add <file>

If a conflict is ambiguous — where preserving both sides isn't clear — stop and ask the user before resolving.

4. Continue

After all conflicts in the current commit are staged:

git rebase --continue

Git will either move to the next commit (go back to step 2) or report success.

5. Handle Edge Cases

Situation Command
A commit becomes empty after resolution git rebase --skip
You need to abort entirely git rebase --abort
Binary file conflict Show the user and ask which version to keep

6. Verify

After a clean rebase, confirm the branch looks correct:

Read the full file on GitHub · 117 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 · 117 lines · 23 tokens per session scan A 9bae81f656f7

Subscribe to this mod's changes

rebase-origin-main is a skill published in the GitHub repository ReviewStage/stage-cli (274 stars, last pushed 1mo ago), licensed MIT. It adds 23 tokens to every session and 914 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-08-30.