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 agentmods add skills/sonichi/sutando/engine-conflict-resolvenpx skills add sonichi/sutando --skill engine-conflict-resolvegit clone --depth 1 https://github.com/sonichi/sutandoWrote 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/sonichi/sutando/engine-conflict-resolve)<a href="https://agentmods.dev/skills/sonichi/sutando/engine-conflict-resolve"><img src="https://agentmods.dev/badge/skills/sonichi/sutando/engine-conflict-resolve.svg" alt="Measured on agentmods" 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 | $0.00087 | $0.02398 |
| Opus 5 | $0.00044 | $0.01199 |
| Sonnet 5 | $0.00017 | $0.00480 |
| Haiku 4.5 | $0.00009 | $0.00240 |
Grade A, and why
engine-conflict-resolve 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 5d 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 — 192 lines — stays where its author put it; the contents beside it link to each section on GitHub.
engine-conflict-resolve
Anyone running Sutando from a git checkout can ask it to pull the latest main/release — and when the update conflicts with their local changes, ask Sutando to resolve the merge itself. This skill is that protocol: reproduce the merge in a scratch worktree, resolve the conflicts there semantically, propose the result, and land it in the live checkout only after the owner explicitly confirms.
The first producer of the pending state is the desktop app's git-aware engine
updater: on a conflicted update it aborts completely and records
ENGINE_UPDATE_PENDING.json; the app's "Resolve with Sutando" button then
writes a task file tasks/task-engine-conflict-<epoch>.txt
(source: desktop-app, interaction_type: system_event) whose body names the
pending file and the engine checkout. That task is one entry path, not the
feature: the scripts take the pending-file shape as input from any producer
(a ref-based entry point — merge any two refs with no pending file — plus a
chat-facing command are queued follow-ups).
Iron rule: never modify the live checkout until the owner confirms. All
merge work happens in a scratch worktree; only apply.py touches the live
checkout, and only behind the updater's own lock and staleness guards.
Protocol
1. Prepare — reproduce the merge in a scratch worktree
Take --pending and --engine verbatim from the task body (both paths may
contain spaces — always double-quote).
python3 skills/engine-conflict-resolve/scripts/prepare.py \
--pending "<…/ENGINE_UPDATE_PENDING.json>" \
--engine "<…/engine/sutando>"
{"status": "clean", "merged_sha": …}— the merge replays cleanly (the recorded conflict no longer reproduces). Skip step 2 but still RUN step 3: onlypropose.pyrecords the proposalapply.pywill accept. Report "merged cleanly, no conflicts remained".{"status": "conflicts", "scratch": …, "conflicting_files": […]}— resolve in the scratch (step 2).{"status": "error", "reason": "pending-stale", …}— the checkout moved since the conflict was recorded. Do NOT improvise: report to the owner that the state is stale and that relaunching the app (or re-running the updater) will re-detect. Stop.- Re-running prepare is safe: an existing scratch for the same merge is reused.
What ships with it
6 files 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.
- 5d ago First seen · 192 lines · 87 tokens per session scan A 44a9e0445e82
engine-conflict-resolve is a skill published in the GitHub repository sonichi/sutando (391 stars, last pushed today), licensed MIT. It adds 87 tokens to every session and 2,398 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
contacts
Manage contacts, communication channels, access control, and invite links.
app-builder
Build and edit small, personal visual tools and artifacts — dashboards, trackers, calculators, data visualizations, charts, simple landing pages, and slide decks the user wants for THEMSELVES. This is the right skill whenever the user asks to "visualize this," "make a chart," or "build an artifact" for their own use…
assistant-migration
Migrate from ChatGPT, Claude, OpenClaw, Hermes, Manus, and other AI assistants into Vellum by inspecting their data exports, conversation archives, files, prompts, custom instructions, memory, saved memories, tools, GPTs, workflows, integrations, and relationships, then mapping as much as safely possible into Vellum…
gmail
Manage Gmail email — drafting, sending, organizing, filters, vacation replies, and inbox analysis.
guardian-verify-setup
Set up channel verification for phone, Telegram, Slack, Discord, or email channels via outbound verification flow.
schedule
Reminders, automations, and recurring page, dashboard, or status monitoring (cron, RRULE, or fire-at).