Merge Room
Your agent clears what was never a decision. Everything the two branches genuinely disagree about waits here for you, and no tool on this page can take that call.
Empty. An agent calls resolve_conflict or parse_git_error and the case lands here, split into what it settled and what it will not touch. No agent to hand? File one below.
File a case
The same code an agent calls, wired to the same room. Nothing leaves this tab.
The extension picks the format-aware resolvers and the path is what marks a generated file. Try pnpm-lock.yaml to watch the answer change.
Every other tool in this space asks you to trust that a model got it right. This one refuses to guess.
Twelve patterns in a classifier registry, eight of which apply on their own. Every resolution carries the pattern that produced it, a composite confidence score and a full decision trace. Where the two branches genuinely disagree, the engine stops and says so. That refusal is the product, so it is enforced in the data rather than promised in the copy: nothing exposed on this page can pick a side for you.
The three tools
resolve_conflictA file with conflict markers goes in. Hunks that carry no decision come back resolved; the rest are filed for you, with the reason each one was refused.
{ content: string, filePath?: string }parse_git_errorThe raw output of a git command that failed, in. The cause in plain words and the commands that resolve it, out. Fourteen of the failures you actually hit.
{ output: string }list_casesReads the room back: what is filed, what the engine settled, what is still waiting on you. It is what lets an agent pick up where it left off.
{}
None of these runs git or touches a repository, and none uploads what you pass it. For the real thing against your working tree, there is @gitwand/mcp. WebMCP carries callable tools only, no resources, prompts or sampling, so this page is the zero-install door rather than the whole house. How the engine decides →