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.
npx skills add MarcusJellinghaus/mcp-tools-py --skill rebasegit clone --depth 1 https://github.com/MarcusJellinghaus/mcp-tools-pyWrote 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.
[](https://agentmods.dev/skills/marcusjellinghaus/mcp-tools-py/rebase)<a href="https://agentmods.dev/skills/marcusjellinghaus/mcp-tools-py/rebase"><img src="https://agentmods.dev/badge/skills/marcusjellinghaus/mcp-tools-py/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.
<a href="https://agentmods.dev/skills/marcusjellinghaus/mcp-tools-py/rebase"><img src="https://agentmods.dev/badge/skills/marcusjellinghaus/mcp-tools-py/rebase.svg" alt="Reviewed on agentmods" width="80" height="20"></a>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.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5.1 | $0.00010 | $0.01114 |
| Opus 5.5 | $0.00004 | $0.00446 |
| Sonnet 5.5 | $0.00002 | $0.00223 |
| Haiku 4.5 | $0.00001 | $0.00111 |
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 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.
This is a copy
100% identical to rebase — 0 lines differ, which has more behind it and is treated as the original. This page carries a canonical link to it rather than competing with it.
How it starts
The opening of the file, as written. The whole thing — 98 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Rebase Branch onto Base Branch
First Step
Call mcp__mcp-workspace__git with command "status" before doing anything else.
Rebase the current feature branch onto its base branch and resolve conflicts.
Core philosophy: Main is the source of truth. The feature branch adapts to main. For source code conflicts, preserve main's improvements and rework the feature branch code to fit.
Note on --ours/--theirs during rebase: --ours = main (the branch being rebased onto), --theirs = feature branch commits being replayed.
If the rebase becomes complex, suggest switching to cherry-picking as an alternative approach.
Determine Base Branch
Call mcp__mcp-workspace__get_base_branch to detect the correct base branch. Use the returned branch name in subsequent git commands.
Base Branch Confirmation
If the base branch is not main or master, ask the user to confirm before proceeding. Display the detected base branch and wait for explicit approval.
Pre-flight Checks (Abort if any fail)
- Working directory is clean (no uncommitted changes)
- Not already in rebase/merge state
- Not on main/master branch
- Remote origin exists
pr_info/does not exist on the base branch — if it does, abort with error:"pr_info/ exists on <BASE_BRANCH>. This folder should only exist on feature branches. Check your branch setup."
Workflow
- Call
mcp__mcp-workspace__gitwith command"fetch"and args["origin"] git rebase origin/${BASE_BRANCH}- For each conflict:
- If file is under
pr_info/: auto-resolve withgit checkout --theirs <file>(keep feature branch version), thengit add <file>— no user input needed - For all other files: resolve manually, preserving main's improvements; rework feature branch changes to fit
- Verify no conflict markers remain
git add <file>git rebase --continue
- If file is under
- Run code checks:
mcp__mcp-tools-py__run_pytest_check,mcp__mcp-tools-py__run_pylint_check,mcp__mcp-tools-py__run_mypy_check - Fix any issues from merge
- Report summary and ask for user confirmation
git push --force-with-lease
What ships with it
1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.
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.
- 1mo ago First seen · 98 lines · 10 tokens per session scan A c5f8f9e9e5d8
rebase is a skill published in the GitHub repository MarcusJellinghaus/mcp-tools-py (19 stars, last pushed 8d ago), licensed MIT. It adds 10 tokens to every session and 1,114 once invoked, about $0.0000 per session on Opus 5.5. A static security scan graded it A with 0 findings. It is 100% identical to rebase, differing in 0 lines, and is treated as a copy.
Other skills, from other repositories
release
MUST READ before preparing a release commit or GitHub release -- the blocking GitHub preflight (dev/releasepreflight.py), project.save() versioning, changelog, README, template sync verification, fresh-install smoke, and the post-push GitHub release procedure (references/github-release.md).
merge-divergent-tox
Merge or compare two divergent TouchDesigner .tox/.toe binaries that git cannot three-way-merge. Load when a merge/rebase conflicts on a .tox or .toe, when asked to merge, port, reconcile, or diff two versions of a TD component, or when comparing a component across branches, machines, or TD builds.
servicenow-studio-gitlab-app
Wire a ServiceNow scoped app (App Engine Studio / Fluent) to a GitLab repository and drive its promotion two ways — Path A: native Studio source control (servicenowsourcecontrol → importrepository / applyremotesourcecontrolchanges, handing off to servicenowcicd for publish/install), or Path B: GitLab-CI-driven…
gitlab-merge-request-review
Review and merge GitLab merge requests via the gitlab-api MCP server — by default the MRs assigned to you or where you are a reviewer, optionally scoped to a project, group, or the whole instance. Read an MR, gate it on a green pipeline (pipeline → jobs → job log), then approve, accept/merge, or set…
gitlab-merge-request-create
Open a new GitLab merge request against a project via the gitlab-api MCP server — from a source branch into a target branch, with title, description, assignees, reviewers, labels, and remove-source-branch/squash options. Use when the agent must create/open an MR for a project. Do NOT use to review, approve, or merge…
repository-manager-merge-and-reconcile
Land a branch into a shared base that dozens of other lanes are landing into at the same time, and reconcile it when it conflicts. Covers the serialized merge queue, per-repository gate declarations, differential gating against a base ref that is legitimately red, measuring the MERGED tree rather than the branch tip…