Borrowing it
Nothing to install: this file belongs to divinevideo/divine-mobile. 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/divinevideo/divine-mobile/main/.agents/skills/git-separate-tangled-changes-into-prs/SKILL.mdgit clone --depth 1 https://github.com/divinevideo/divine-mobileWrote 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/divinevideo/divine-mobile/git-separate-tangled-changes-into-prs)<a href="https://agentmods.dev/skills/divinevideo/divine-mobile/git-separate-tangled-changes-into-prs"><img src="https://agentmods.dev/badge/skills/divinevideo/divine-mobile/git-separate-tangled-changes-into-prs.svg" alt="Measured on agentmods" height="20"></a>- NVIDIA SkillSpector warn
SkillSpector: 2 findings, 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 189 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.
- high Tool Misuse · line 225 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.
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.00161 | $0.02248 |
| Opus 5 | $0.00081 | $0.01124 |
| Sonnet 5 | $0.00032 | $0.00450 |
| Haiku 4.5 | $0.00016 | $0.00225 |
Grade A, and why
git-separate-tangled-changes-into-prs 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 8d 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 — 248 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Separating Tangled Changes into Clean PRs
Problem
A working tree accumulates uncommitted changes from multiple features over
time. When you need to create focused PRs, the changes are tangled together
— some files have changes from multiple features, generated files (like
.mocks.dart) reflect all features combined, and pre-commit hooks fail on
unrelated WIP code.
Context / Trigger Conditions
- Working tree has 50+ modified/untracked files spanning multiple features
git diff --name-onlyshows files from clearly different features- You need to create a PR for Feature A but Feature B's files cause analysis errors
- Pre-commit hooks run
dart analyze/eslint/ etc. on ALL files (not just staged), so untracked WIP files block commits - Some files have changes from BOTH features (mixed-change files)
Solution
Step 1: Stash Everything Safely
git stash -u -m "descriptive-name-for-safety"
The -u flag includes untracked files. This is your safety net.
Step 2: Create Clean Feature Branch
git checkout main # or the appropriate base
git pull
git checkout -b feature/clean-branch
Step 3: Pop Stash and Handle Conflicts
git stash pop
Common issue: "already exists, no checkout" — happens when untracked files from the stash already exist in the working tree. The tracked file changes still apply, but the stash is preserved (not dropped). This is safe; the files you need are already there.
Merge conflicts: Resolve each one. For files belonging to OTHER features, take the base version:
git checkout --theirs path/to/other-feature-file.dart
For files belonging to THIS feature, take the stash version or resolve manually.
Step 4: Handle Mixed-Change Files
Some files have changes from BOTH features. For these:
- Restore to the base version:
git checkout main -- path/to/file.dart - Re-apply ONLY your feature's changes manually (usually just import changes or a few lines)
Step 5: Deal with Pre-Commit Hooks That Check All Files
If your pre-commit hook analyzes ALL files (not just staged), untracked WIP files from other features will block your commit.
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.
- 8d ago First seen · 248 lines · 161 tokens per session scan A 5f94a9ab6c78
git-separate-tangled-changes-into-prs is a skill published in the GitHub repository divinevideo/divine-mobile (265 stars, last pushed today), licensed MPL-2.0. It adds 161 tokens to every session and 2,248 once invoked, about $0.0008 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
prowler-commit
Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.
gh-auth-isolation
Safely manage multiple GitHub identities (EMU + personal) in agent workflows.
comet-github
A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.
github-skill
Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.
codex-autoresearch
Run autonomous, measurable experiments in a Git repository: change one hypothesis, verify a numeric metric, keep improvements, and revert failures. Use when the user wants Codex to keep iterating toward a numeric target in the foreground or as a detached background run. Do not use for ordinary one-shot coding…
changelog-composer
Generates structured changelogs and release notes from git history and PRs, classifying breaking changes, features, fixes, performance, docs. Triggers on: "generate changelog", "write release notes", "what changed since", "prepare release", "release notes for", "diff since tag".