Skip to main content
Glama

resolve_conflict

Resolve a contradiction between two notes by keeping the older, keeping the newer, or keeping both with a reconciliation note. Records each resolution as a git commit without deleting anything.

Instructions

Resolve a contradiction between two notes (ids from a remember WARNING, or the Conflicts page). Only do this when the user has told you which side is right; if unsure, ask them. a is the older note, b the newer. Actions: keep_a (b is marked superseded), keep_b (a is marked superseded), or keep_both (requires note, a reconciliation explaining how both hold; both stay active). Each resolution is exactly one git commit. Nothing is deleted.

Tool call template

Replace each placeholder with a value matching the input schema. Only required parameters are included; add optional parameters as needed.

{
  "id": 1,
  "jsonrpc": "2.0",
  "method": "tools/call",
  "params": {
    "arguments": {
      "a": "<a>",
      "b": "<b>",
      "action": "<action>"
    },
    "name": "resolve_conflict"
  }
}

Input Schema

NameRequiredDescriptionDefault
aYesId of the first (older) note.
bYesId of the second (newer) note.
whyNoWhy this resolution (recorded as provenance).
noteNoReconciliation text; required for keep_both.
actionYes

Schema Changelog

Changes observed during successful MCP inspections.

  1. First observedv0.1.0

TDQS

A4.6/5.0
Behavior4/5

Does the description disclose side effects, auth requirements, rate limits, or destructive behavior?

With no annotations, the description carries the full burden and does well: it states the effect of each action (which note becomes superseded), that keep_both requires a reconciliation `note`, that each resolution maps to exactly one git commit, and that "nothing is deleted." The remaining gaps are permissions needed and whether a resolution can be undone or re-resolved, so it falls just short of complete.

Agents need to know what a tool does to the world before calling it. Descriptions should go beyond structured annotations to explain consequences.

Conciseness5/5

Is the description appropriately sized, front-loaded, and free of redundancy?

The description is front-loaded with the purpose and source of ids, then flows into preconditions, action semantics, and side effects in a few dense sentences with no filler.

Shorter descriptions cost fewer tokens and are easier for agents to parse. Every sentence should earn its place.

Completeness4/5

Given the tool's complexity, does the description cover enough for an agent to succeed on first attempt?

For a mutating, no-annotation tool with no output schema, the description covers the decision criteria, action effects, and commit semantics. It does not describe what a successful resolution returns or confirm, nor any permission requirements, which is a modest but real gap.

Complex tools with many parameters or behaviors need more documentation. Simple tools need less. This dimension scales expectations accordingly.

Parameters4/5

Does the description clarify parameter syntax, constraints, interactions, or defaults beyond what the schema provides?

Schema coverage is already 80%, so the baseline is 3, and the description adds real meaning on top: it fixes the ordering semantics of `a` (older) and `b` (newer) as the basis for the keep_a/keep_b decision and clarifies that `note` is only meaningful, and required, for keep_both. Only `why` is left to the schema.

Input schemas describe structure but not intent. Descriptions should explain non-obvious parameter relationships and valid value ranges.

Purpose5/5

Does the description clearly state what the tool does and how it differs from similar tools?

The description names a specific verb and resource ("Resolve a contradiction between two notes") and immediately identifies where the conflicting ids come from (a `remember` WARNING or the Conflicts page), which distinguishes it from siblings like `remember`, `recall`, or `read_note` that only surface or create notes.

Agents choose between tools based on descriptions. A clear purpose with a specific verb and resource helps agents select the right tool.

Usage Guidelines5/5

Does the description explain when to use this tool, when not to, or what alternatives exist?

It gives an explicit precondition ("Only do this when the user has told you which side is right") and a fallback behavior when that precondition fails ("if unsure, ask them"), which is exactly the when-to-use/when-not guidance an agent needs before invoking a mutating resolution.

Agents often have multiple tools that could apply. Explicit usage guidance like "use X instead of Y when Z" prevents misuse.