- Home
- Skills
- Code Quality & Review
- Untangle Commits
Works with the AI Agents you already use
Untangle Commits
Split a messy working tree into clean, atomic Conventional Commits, hunk by hunk, with a backup first and a plan you approve.
Free
Untangle Commits
Example session with this skill installed
I have about 500 lines of uncommitted changes across 7 files: a dark mode toggle, a null-check fix in the cart, a rename of utils/date.ts, and some formatting. Split this into clean commits before I open the PR.
- Read your context and instructions
- Compiled the untangle commits
- Generated the document
Summary (illustrative example)
Backed up your work and read the full diff: 7 files, 12 hunks, 1 untracked file. No merge or rebase in progress, nothing staged.
Backup saved to .git/untangle-backup.patch. Restore anytime with:
git reset --hard $(cat .git/untangle-base.txt) && git apply --binary .git/untangle-backup.patch
Proposed commit plan (waiting for your approval)
| # | Message | Hunks / files | Why separate |
|---|---|---|---|
| 1 | refactor(utils): rename date helpers to formatDate/parseDate | 1, 4, 9 + utils/date.ts | no behaviour change |
| 2 | fix(cart): guard against missing item price | 5 + tests/cart.test.ts | user-facing bug |
| 3 | feat(theme): add dark mode toggle | 2, 6, 7, 10 + new ThemeToggle.tsx | new behaviour, tests included |
| 4 | style: apply prettier to header and footer | 3, 11 | formatting only |
Left out (needs your call):
- Hunk 8:
console.log("cart", items)debug print incart.ts - Hunk 12:
.env.localchange (looks like local config/secret)
Next steps
- Reply "go" (or edit the plan) and I will stage each group with
pick_hunks.py+git apply --cached, checkgit diff --cached --statagainst each row, run yournpm run typecheckon the staged state, and commit. - Final report:
git log --onelineof the 4 new commits and a cleangit statusapart from the left-out items.
Nothing will be pushed.
ThemeToggle.tsx
PDF · document
Example file from a real run - the skill writes it into your workspace.
Connects securely to your tools. The creator never sees your data.
About this skill
Your agent wrote 600 lines across 9 files and now it's one blob. Untangle Commits makes your agent:
- back up the full diff and print the one-line restore command before touching anything,
- read every hunk and group them by intent (refactor, fix, feat, test, style), not by file,
- show you a commit plan and wait for approval,
- stage individual hunks non-interactively (no
git add -pneeded) using a small offline Python helper, - verify each staged commit and optionally run your fast checks on it,
- write Conventional Commit messages and report the final log.
It never pushes, never force-pushes, never deletes untracked files and never edits your code, and it flags secrets and debug prints instead of committing them.
Hunks that mix two concerns may need manual patch editing and can end up kept whole. Not meant for rewriting already-pushed history.
How to use
- 1
Connect your agent to the Agensi MCP
Copy the prompt and paste it into Claude, ChatGPT, Cursor or any agent that supports MCP. It sets up the connection for you. Manual setup
- 2
Sign in to Agensi
Your agent shows a sign-in link. Sign in and click Allow.
- 3
Ask for what you need
Your agent loads this skill and uses it on your task. It always asks before any payment.
Reviews
No reviews yet
Be one of the first to try it. Every listed skill goes through the trust checks below.
Security scanned
Checked by our 8-point scan before listing
1 use
Times used to date
Free forever
No account required to browse
Trust & safety
Security scan
Security scan passed 26 days ago
- Free with an Agensi account
Requires