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 BeppeTemp/cartographer --skill kb-conflict-resolvegit clone --depth 1 https://github.com/BeppeTemp/cartographerWrote 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/beppetemp/cartographer/kb-conflict-resolve)<a href="https://agentmods.dev/skills/beppetemp/cartographer/kb-conflict-resolve"><img src="https://agentmods.dev/badge/skills/beppetemp/cartographer/kb-conflict-resolve/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/beppetemp/cartographer/kb-conflict-resolve"><img src="https://agentmods.dev/badge/skills/beppetemp/cartographer/kb-conflict-resolve.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.00021 | $0.00753 |
| Opus 5 | $0.00010 | $0.00377 |
| Sonnet 5 | $0.00004 | $0.00151 |
| Haiku 4.5 | $0.00002 | $0.00075 |
Grade A, and why
kb-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 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 — 77 lines — stays where its author put it; the contents beside it link to each section on GitHub.
KB Conflict Resolve — Skill
Purpose
When a git pull --rebase conflicts with a remote commit, Cartographer registers the conflict
and marks the affected concepts as status: degraded. This skill walks the agent through
resolving each conflict so the KB returns to a fully operational state.
When to run this skill
Write operations fail with a message such as "git conflict detected and registered on N
concept(s)", or conflicts_list returns a non-empty list. (At operator level, sync_check
also reports open_conflicts > 0 — it is not advertised to agents under the default
"agent" tools profile.)
Procedure
1. List open conflicts
Call conflicts_list (no arguments). It returns a JSON array of conflict records, each with:
concept_id— the ConceptID of the degraded concept (e.g.shared/notes/c)local_sha— the local HEAD SHA before the rebase was attemptedremote_sha— the remote tip SHA after fetchbranch— the branch name (e.g.main)files— all git paths involved in the same rebase conflictdetected_at— ISO-8601 timestamp of detection
2. Read the current (local) version
For each conflicting concept, call concept_read with its concept_id.
The content reflects the local state after the rebase was aborted — Cartographer resets
to the remote state and adds status: degraded to the frontmatter. The local_sha field
in the conflict record tells you what the pre-conflict local version was (use git show <local_sha> at operator level if you need to compare the two versions directly).
3. Decide the reconciled content
Compare the current (local/remote) content with your original intent. Produce the authoritative reconciled version:
- Merge any non-conflicting additions from both sides.
- Resolve factual discrepancies explicitly (do not silently discard either side).
- Remove
status: degradedfrom the frontmatter.
4. Write the reconciled concept
Call concept_write with:
id: theconcept_idfrom the conflict recordfrontmatter: the reconciled frontmatter withoutstatus: degradedbody: the reconciled markdown body
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 · 77 lines · 21 tokens per session scan A a812eaddd8da
kb-conflict-resolve is a skill published in the GitHub repository BeppeTemp/cartographer (17 stars, last pushed yesterday), licensed Apache-2.0. It adds 21 tokens to every session and 753 once invoked, about $0.0001 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
resolving-merge-conflicts
Use when a git merge or rebase reports conflicts and the operation is in progress.
merge-conflict-resolution
Active merge conflicts. Use when an in-progress merge, rebase, cherry-pick, or revert has conflicted hunks that require intent reconstruction, resolution, proof, and continuation.
github
Use when interacting with GitHub repositories, authentication, remotes, pushes, or repository creation through the GitHub CLI and related git workflows.
comet-github-issue-fix
A workflow for fixing a confirmed Comet-related GitHub issue or review blocker within an isolated scope. It covers matching the work to the relevant workflow, testing the change, checking runtime results, and preparing a careful handoff.
report-issue-local
File a bug or feature request against this MCP server's own repo. Use for server-specific issues — tool logic, service integrations, config problems, or domain bugs that aren't caused by the framework.
auto-repo-setup
Diagnose, repair, and standardize repository setup and safe Git workflows for Claude Code or Codex. Use when a repository will not run, a collaborator is onboarding, dependencies or credentials are missing, the user wants startup sync, SessionStart output is duplicated, project instructions or hooks need auditing, or…