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 wan-huiyan/agent-traffic-control --skill git-diff-2dot-vs-3dot-merge-safetygit clone --depth 1 https://github.com/wan-huiyan/agent-traffic-controlWrote 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/wan-huiyan/agent-traffic-control/git-diff-2dot-vs-3dot-merge-safety)<a href="https://agentmods.dev/skills/wan-huiyan/agent-traffic-control/git-diff-2dot-vs-3dot-merge-safety"><img src="https://agentmods.dev/badge/skills/wan-huiyan/agent-traffic-control/git-diff-2dot-vs-3dot-merge-safety/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/wan-huiyan/agent-traffic-control/git-diff-2dot-vs-3dot-merge-safety"><img src="https://agentmods.dev/badge/skills/wan-huiyan/agent-traffic-control/git-diff-2dot-vs-3dot-merge-safety.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.00054 | $0.02319 |
| Opus 5 | $0.00027 | $0.01159 |
| Sonnet 5 | $0.00011 | $0.00464 |
| Haiku 4.5 | $0.00005 | $0.00232 |
Grade A, and why
git-diff-2dot-vs-3dot-merge-safety 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.
How it starts
The opening of the file, as written. The whole thing — 191 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Git Diff 2-dot vs 3-dot — Merge Safety Assessment
Problem
You're reviewing a PR before merging and run git diff origin/main..pr-branch --stat.
The output shows files being deleted — files that just landed on main via another
PR yesterday and that you absolutely don't want to lose. Looks like merging this PR
will wipe them out.
It won't. The 2-dot diff is showing the symmetric difference between two trees, not "what the branch will change about main." Files added to main AFTER the PR's branch point appear in the diff as "deletions" simply because the branch's tree doesn't have them yet. GitHub's 3-way merge will preserve them.
Same trap appears when assessing a "divergent" local commit: git log main..origin/main
may show commits "missing" that are actually present under a different SHA (squash
merges produce new hashes; rebases rewrite history).
Context / Trigger Conditions
Any of these:
- PR review:
git diff origin/main..pr-branch --statshows file deletions, BUTgh pr view N --json mergeable,mergeStateStatusreturns{"mergeable":"MERGEABLE","mergeStateStatus":"CLEAN"}. - Divergent local branch:
git statussays "Your branch and 'origin/main' have diverged, and have N and M different commits each, respectively." But you don't recall making real local commits. - Suspicious orphan commit:
git log origin/main..local-branchshows a commit you'd expect to be on origin already (e.g., an[auto-docs]commit from a sibling session, or a cherry-pick from a since-merged PR). - About to take a destructive action — demanding a rebase, force-push, or
git reset --hard origin/main"to clean up" — based purely on a 2-dot diff.
Solution
For "will this PR delete files?" questions
# WRONG — shows everything different between trees, including files
# added on main since the branch point
git diff origin/main..pr-branch --stat # misleading
# RIGHT — shows only what THIS BRANCH changed since the merge-base
git diff origin/main...pr-branch --stat # symmetric, since merge-base
git diff origin/main...pr-branch --diff-filter=D --name-only # ONLY deletions
# If the second command is empty, the PR deletes nothing.
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.
- 10d ago First seen · 191 lines · 54 tokens per session scan A 0f08635a3e5d
git-diff-2dot-vs-3dot-merge-safety is a skill published in the GitHub repository wan-huiyan/agent-traffic-control (3 stars, last pushed 5d ago), licensed MIT. It adds 54 tokens to every session and 2,319 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.
Other skills, from other repositories
cloudflare-workers-ci-cd
Complete CI/CD guide for Cloudflare Workers using GitHub Actions and GitLab CI. Use for automated testing, deployment pipelines, preview environments, secrets management, or encountering deployment failures, workflow errors, environment configuration issues.
claude-code-bash-patterns
Claude Code Bash tool patterns with hooks, automation, git workflows. Use for PreToolUse hooks, command chaining, CLI orchestration, custom commands, or encountering bash permissions, command failures, security guards, hook configurations.
bump-sdk-version
Bump the FutureSearch SDK version across all files. Use when releasing a new SDK version, updating version numbers, or the user says bump version, release, version bump.
pr-check
PR review compliance: fetch review comments from an open PR, categorize as resolved/unresolved/dismissed, critically evaluate fixable items, implement approved fixes, and reply inline. Pass --unattended to halt on human-judgment items (emitted as Pending-Human) instead of prompting via AskUserQuestion.
babysit
PR babysitter: monitors CI status, auto-rebases when behind, auto-fixes CI where possible, delegates review comment handling to dlc:pr-check, and re-requests review after fixes. Designed for /loop usage with Remote Control.
git-ops
Git hygiene: clean up merged branches, prune stale remotes, and verify repository state.