Borrowing it
Nothing to install: this file belongs to dylanroscover/Embody. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.
curl -O https://raw.githubusercontent.com/dylanroscover/Embody/main/.claude/skills/merge-divergent-tox/SKILL.mdgit clone --depth 1 https://github.com/dylanroscover/EmbodyWrote 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/dylanroscover/embody/merge-divergent-tox)<a href="https://agentmods.dev/skills/dylanroscover/embody/merge-divergent-tox"><img src="https://agentmods.dev/badge/skills/dylanroscover/embody/merge-divergent-tox/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/dylanroscover/embody/merge-divergent-tox"><img src="https://agentmods.dev/badge/skills/dylanroscover/embody/merge-divergent-tox.svg" alt="Reviewed on agentmods" width="80" height="20"></a>- NVIDIA SkillSpector pass
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.00074 | $0.02497 |
| Opus 5 | $0.00037 | $0.01248 |
| Sonnet 5 | $0.00015 | $0.00499 |
| Haiku 4.5 | $0.00007 | $0.00250 |
Grade A, and why
merge-divergent-tox 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 12d 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 — 231 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Merging Divergent .tox / .toe Binaries
Git cannot three-way-merge a .tox. It reports a conflict and offers you
"ours or theirs" -- a choice that silently discards one side's work.
This turns the binary into a reviewable text diff. Phases 0-2 need no TouchDesigner at all and carry no risk. In practice they often answer the whole question, so do not skip them to get to the interesting part.
The rule that governs everything here
This is a THREE-way merge, not a two-way one. Both sides changed the file from a common ancestor. If you compare only ours against theirs, a difference tells you nothing about who moved: an operator present in theirs and absent in ours may be their addition or our deletion, and those demand opposite actions. Always diff each side against the BASE.
Phase 0 -- Triage (no tools)
-
Enumerate every conflicting binary, not just the ones you were asked about.
git diff --name-only --diff-filter=U # active conflicts git diff --stat <base>..<theirs> -- '*.tox' '*.toe' # everything that divergedA file nobody mentioned is exactly the one that breaks later.
-
Find the true per-file content base.
git merge-baseis often wrong -- history rewrites and re-committed blobs move it. Verify per file; if the repo's history was rewritten, compare commit SUBJECTS rather than SHAs to find which commits are genuinely absent. -
Answer the product questions BEFORE opening TouchDesigner. If one side deleted a subsystem the other side extended, that is a product decision, not a merge decision. Resolving it can collapse the hardest files to "take ours" and end the job. Ask the human. This is the highest-leverage step in the skill and it costs nothing.
Phase 1 -- Extract all three sides (git, binary-safe)
Use Bash/Git Bash, not PowerShell -- PowerShell redirection corrupts binary bytes.
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.
- 12d ago First seen · 231 lines · 74 tokens per session scan A d1e6dc79b0fc
merge-divergent-tox is a skill published in the GitHub repository dylanroscover/Embody (171 stars, last pushed today), licensed MIT. It adds 74 tokens to every session and 2,497 once invoked, about $0.0004 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-30.
Other skills, from other repositories
memory-commit
Use when the user explicitly says "remember this", "save this", "ghi nho", "luu lai", "save for next time", or otherwise asks to persist the immediately preceding context. Captures with the appropriate contexttype (decision, preference, fact, skill, task, conversation) so future sessions can retrieve it accurately.
issue-management
Create, update, list and search GitHub issues and PRs, list a repository's labels, run milestones, and check for duplicates.
release-management
Tag a commit, publish a GitHub release, and read, correct or withdraw the tags and releases already there.
pr-management
Manage the lifecycle of a GitHub PR - create, update the description, assign, refresh the branch and merge.
metagit-cli
CLI-only shortcuts for metagit agents — workspace catalog, discovery, prompts, sync, layout, and config. Use instead of MCP or HTTP API when operating from a shell or agentmode session.
metagit-context-pack
Token-efficient workspace onboarding via tiered context packs — map, repo cards, session digest, objectives, approvals, repomix profiles. Use at session start or when scoping work in a metagit-managed workspace.