@gitwand/mcp 1.6.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Laurent Guitton
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,115 @@
+# @gitwand/mcp
+
+[![npm](https://img.shields.io/npm/v/@gitwand/mcp?color=22c55e)](https://www.npmjs.com/package/@gitwand/mcp)
+[![License](https://img.shields.io/badge/license-MIT-8B5CF6)](../../LICENSE)
+
+**MCP server that lets AI agents resolve Git merge conflicts automatically.**
+
+[GitWand](https://github.com/devlint/GitWand) exposes its conflict resolution engine as a [Model Context Protocol](https://modelcontextprotocol.io) server. Plug it into Claude Desktop, Claude Code, Cursor, Windsurf, or any MCP-compatible client and the agent can inspect, preview, and resolve conflicts in your repos without you opening a single conflict marker.
+
+## Install
+
+No install step — run it via `npx`:
+
+```bash
+npx -y @gitwand/mcp --cwd /path/to/your/repo
+```
+
+Or add it to your MCP client config (examples below).
+
+## Configure
+
+### Claude Desktop
+
+Add to `~/Library/Application Support/Claude/claude_desktop_config.json` (macOS) or `%APPDATA%\Claude\claude_desktop_config.json` (Windows):
+
+```json
+{
+  "mcpServers": {
+    "gitwand": {
+      "command": "npx",
+      "args": ["-y", "@gitwand/mcp"]
+    }
+  }
+}
+```
+
+The server defaults to the current working directory. To pin it to a specific repo, add `"--cwd", "/absolute/path/to/repo"` to the `args` array.
+
+### Claude Code
+
+```bash
+claude mcp add gitwand -- npx -y @gitwand/mcp
+```
+
+### Cursor / Windsurf
+
+Same config shape as Claude Desktop — drop it into the `mcpServers` block of your client's config file.
+
+## What the agent can do
+
+Five tools are exposed:
+
+| Tool | What it does |
+|------|--------------|
+| `gitwand_status` | List conflicted files with counts and auto-resolvability score |
+| `gitwand_preview_merge` | Dry-run: return stats and a risk assessment without writing |
+| `gitwand_resolve_conflicts` | Auto-resolve trivial conflicts, return resolutions + pending hunks |
+| `gitwand_explain_hunk` | Full decision trace for one hunk (ours / theirs / base / reasoning) |
+| `gitwand_apply_resolution` | Apply an agent-provided resolution to a specific complex hunk |
+
+Plus three resources (`gitwand://repo/conflicts`, `gitwand://repo/policy`, `gitwand://hunk/{file}/{line}`) for ambient context.
+
+## How it works — the collaboration loop
+
+GitWand handles the trivial conflicts (whitespace, same-change, non-overlapping inserts, value updates, generated files…). The agent handles the complex ones.
+
+1. Agent calls `gitwand_preview_merge` → sees risk level + how many conflicts GitWand can handle alone.
+2. Agent calls `gitwand_resolve_conflicts` → GitWand resolves the easy hunks and returns `pendingHunks` for the rest.
+3. For each pending hunk, the agent reads ours/theirs/base from the response and decides.
+4. Agent calls `gitwand_apply_resolution` with its chosen content — the file is written.
+
+## Resolution patterns
+
+GitWand only auto-resolves when it's certain. The engine tags each hunk with a pattern and a composite confidence score (0–100):
+
+- `same_change` — identical edit on both sides (certain)
+- `one_side_change` — only one branch touched the block (certain)
+- `non_overlapping` — additions in different locations (high)
+- `whitespace_only` — same logic, different indentation (high)
+- `reorder_only` — pure permutation (high)
+- `insertion_at_boundary` — pure insertions, base intact (high)
+- `value_only_change` — scalar updated on one side (medium)
+- `generated_file` — path matches a known generated-file pattern (high)
+- `complex` — overlapping edits — **never auto-resolved**
+
+Format-aware resolvers (JSON, Markdown, YAML, Vue SFC, lockfiles) kick in before pure text matching.
+
+## Configuration
+
+Drop a `.gitwandrc` at the repo root to tune policies:
+
+```json
+{
+  "policy": "prefer-merge",
+  "patternOverrides": {
+    "*.lock": "prefer-theirs",
+    "CHANGELOG.md": "prefer-ours"
+  },
+  "generatedFiles": ["src/generated/**", "**/*.pb.ts"]
+}
+```
+
+Policies: `prefer-ours`, `prefer-theirs`, `prefer-safety`, `prefer-merge`, `strict`.
+
+## Also available
+
+- **[@gitwand/cli](https://www.npmjs.com/package/@gitwand/cli)** — same engine, command-line interface for terminals and CI pipelines.
+- **[GitWand desktop app](https://github.com/devlint/GitWand#desktop-app)** — full Git client with built-in resolution, merge preview, and inline code review.
+
+## Links
+
+- 📖 [Documentation](https://github.com/devlint/GitWand#mcp-server)
+- 🐛 [Issue tracker](https://github.com/devlint/GitWand/issues)
+- 🌐 [Website](https://devlint.github.io/GitWand/)
+- 📜 [License — MIT](../../LICENSE)

package/dist/resources/index.d.ts

@@ -0,0 +1,21 @@
+/**
+ * MCP Resources — context the LLM can read.
+ *
+ * gitwand://repo/conflicts    → current conflict state
+ * gitwand://repo/policy       → .gitwandrc contents
+ * gitwand://hunk/{file}/{line} → raw hunk content for a specific conflict
+ */
+export declare function registerResources(): {
+    uri: string;
+    name: string;
+    description: string;
+    mimeType: string;
+}[];
+export declare function handleResourceRead(uri: string, cwd: string): Promise<{
+    contents: {
+        uri: string;
+        mimeType: string;
+        text: string;
+    }[];
+}>;
+//# sourceMappingURL=index.d.ts.map

package/dist/resources/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/resources/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,wBAAgB,iBAAiB;;;;;IAiBhC;AAmBD,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;;;;;;GAyBhE"}

package/dist/resources/index.js

@@ -0,0 +1,169 @@
+/**
+ * MCP Resources — context the LLM can read.
+ *
+ * gitwand://repo/conflicts    → current conflict state
+ * gitwand://repo/policy       → .gitwandrc contents
+ * gitwand://hunk/{file}/{line} → raw hunk content for a specific conflict
+ */
+import { readFileSync } from "node:fs";
+import { execSync } from "node:child_process";
+import { resolve as resolvePath, join } from "node:path";
+import { resolve } from "@gitwand/core";
+// ─── Resource definitions ──────────────────────────────────
+export function registerResources() {
+    return [
+        {
+            uri: "gitwand://repo/conflicts",
+            name: "Current Conflicts",
+            description: "Lists all conflicted files in the repo with conflict counts, types, and auto-resolvability. Use this to understand the current merge state before taking action.",
+            mimeType: "application/json",
+        },
+        {
+            uri: "gitwand://repo/policy",
+            name: "Merge Policy (.gitwandrc)",
+            description: "The .gitwandrc configuration file that controls GitWand's resolution behavior: merge policies, confidence thresholds, and per-path overrides.",
+            mimeType: "application/json",
+        },
+    ];
+}
+// ─── Resource handlers ─────────────────────────────────────
+function getConflictedFiles(cwd) {
+    try {
+        const output = execSync("git diff --name-only --diff-filter=U", {
+            cwd,
+            encoding: "utf-8",
+        });
+        return output
+            .trim()
+            .split("\n")
+            .filter((f) => f.length > 0);
+    }
+    catch {
+        return [];
+    }
+}
+export async function handleResourceRead(uri, cwd) {
+    // gitwand://repo/conflicts
+    if (uri === "gitwand://repo/conflicts") {
+        return readConflictsResource(cwd);
+    }
+    // gitwand://repo/policy
+    if (uri === "gitwand://repo/policy") {
+        return readPolicyResource(cwd);
+    }
+    // gitwand://hunk/{file}/{line}
+    const hunkMatch = uri.match(/^gitwand:\/\/hunk\/(.+)\/(\d+)$/);
+    if (hunkMatch) {
+        const [, file, lineStr] = hunkMatch;
+        return readHunkResource(cwd, file, parseInt(lineStr, 10));
+    }
+    return {
+        contents: [{
+                uri,
+                mimeType: "text/plain",
+                text: `Unknown resource: ${uri}`,
+            }],
+    };
+}
+async function readConflictsResource(cwd) {
+    const files = getConflictedFiles(cwd);
+    const conflicts = files.map((file) => {
+        const filePath = resolvePath(cwd, file);
+        try {
+            const content = readFileSync(filePath, "utf-8");
+            const result = resolve(content, file, { explainOnly: true });
+            return {
+                path: file,
+                totalConflicts: result.stats.totalConflicts,
+                autoResolvable: result.stats.autoResolved,
+                remaining: result.stats.remaining,
+                byType: Object.entries(result.stats.byType)
+                    .filter(([, count]) => count > 0)
+                    .reduce((acc, [type, count]) => ({ ...acc, [type]: count }), {}),
+            };
+        }
+        catch {
+            return { path: file, error: "Could not read file" };
+        }
+    });
+    return {
+        contents: [{
+                uri: "gitwand://repo/conflicts",
+                mimeType: "application/json",
+                text: JSON.stringify({ files: files.length, conflicts }, null, 2),
+            }],
+    };
+}
+async function readPolicyResource(cwd) {
+    const rcPath = join(cwd, ".gitwandrc");
+    let content;
+    try {
+        content = readFileSync(rcPath, "utf-8");
+    }
+    catch {
+        content = JSON.stringify({
+            message: "No .gitwandrc found. Using default policy (prefer-theirs).",
+            defaults: {
+                policy: "prefer-theirs",
+                minConfidence: "high",
+                resolveWhitespace: true,
+                resolveNonOverlapping: true,
+            },
+        }, null, 2);
+    }
+    return {
+        contents: [{
+                uri: "gitwand://repo/policy",
+                mimeType: "application/json",
+                text: content,
+            }],
+    };
+}
+async function readHunkResource(cwd, file, targetLine) {
+    const filePath = resolvePath(cwd, file);
+    let content;
+    try {
+        content = readFileSync(filePath, "utf-8");
+    }
+    catch {
+        return {
+            contents: [{
+                    uri: `gitwand://hunk/${file}/${targetLine}`,
+                    mimeType: "application/json",
+                    text: JSON.stringify({ error: `File not found: ${file}` }),
+                }],
+        };
+    }
+    const result = resolve(content, file, { explainOnly: true });
+    const hunk = result.resolutions.find((r) => r.hunk.startLine === targetLine);
+    if (!hunk) {
+        return {
+            contents: [{
+                    uri: `gitwand://hunk/${file}/${targetLine}`,
+                    mimeType: "application/json",
+                    text: JSON.stringify({
+                        error: `No hunk at line ${targetLine}`,
+                        availableLines: result.resolutions.map((r) => r.hunk.startLine),
+                    }),
+                }],
+        };
+    }
+    return {
+        contents: [{
+                uri: `gitwand://hunk/${file}/${targetLine}`,
+                mimeType: "application/json",
+                text: JSON.stringify({
+                    file,
+                    line: hunk.hunk.startLine,
+                    type: hunk.hunk.type,
+                    explanation: hunk.hunk.explanation,
+                    confidence: hunk.hunk.confidence,
+                    trace: hunk.hunk.trace,
+                    ours: hunk.hunk.oursLines.join("\n"),
+                    theirs: hunk.hunk.theirsLines.join("\n"),
+                    base: hunk.hunk.baseLines.join("\n"),
+                }, null, 2),
+            }],
+    };
+}
+//# sourceMappingURL=index.js.map

package/dist/resources/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/resources/index.ts"],"names":[],"mappings":"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"}

package/dist/server.d.ts

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+/**
+ * @gitwand/mcp — MCP server for smart Git conflict resolution
+ *
+ * Exposes GitWand's conflict resolution engine as MCP tools and resources
+ * for use with Claude Code, Claude Desktop, Cursor, Windsurf, etc.
+ *
+ * Usage:
+ *   npx @gitwand/mcp                    # stdio transport (default)
+ *   npx @gitwand/mcp --cwd /path/repo   # specify repo directory
+ */
+export {};
+//# sourceMappingURL=server.d.ts.map

package/dist/server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";AAEA;;;;;;;;;GASG"}

package/dist/server.js

@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+/**
+ * @gitwand/mcp — MCP server for smart Git conflict resolution
+ *
+ * Exposes GitWand's conflict resolution engine as MCP tools and resources
+ * for use with Claude Code, Claude Desktop, Cursor, Windsurf, etc.
+ *
+ * Usage:
+ *   npx @gitwand/mcp                    # stdio transport (default)
+ *   npx @gitwand/mcp --cwd /path/repo   # specify repo directory
+ */
+import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { CallToolRequestSchema, ListToolsRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
+import { registerTools, handleToolCall } from "./tools/index.js";
+import { registerResources, handleResourceRead } from "./resources/index.js";
+// ─── Parse CLI args ────────────────────────────────────────
+const args = process.argv.slice(2);
+let cwd = process.cwd();
+for (let i = 0; i < args.length; i++) {
+    if (args[i] === "--cwd" && args[i + 1]) {
+        cwd = args[i + 1];
+        i++;
+    }
+}
+// ─── Server setup ──────────────────────────────────────────
+const server = new Server({
+    name: "gitwand",
+    version: "1.6.0",
+}, {
+    capabilities: {
+        tools: {},
+        resources: {},
+    },
+});
+// ─── Tools ─────────────────────────────────────────────────
+server.setRequestHandler(ListToolsRequestSchema, async () => ({
+    tools: registerTools(),
+}));
+server.setRequestHandler(CallToolRequestSchema, async (request) => {
+    return handleToolCall(request.params.name, request.params.arguments ?? {}, cwd);
+});
+// ─── Resources ─────────────────────────────────────────────
+server.setRequestHandler(ListResourcesRequestSchema, async () => ({
+    resources: registerResources(),
+}));
+server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
+    return handleResourceRead(request.params.uri, cwd);
+});
+// ─── Start ─────────────────────────────────────────────────
+async function main() {
+    const transport = new StdioServerTransport();
+    await server.connect(transport);
+    console.error("[gitwand-mcp] Server started on stdio");
+}
+main().catch((err) => {
+    console.error("[gitwand-mcp] Fatal error:", err);
+    process.exit(1);
+});
+//# sourceMappingURL=server.js.map

package/dist/server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";AAEA;;;;;;;;;GASG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE7E,8DAA8D;AAC9D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAExB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACvC,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAClB,CAAC,EAAE,CAAC;IACN,CAAC;AACH,CAAC;AAED,8DAA8D;AAC9D,MAAM,MAAM,GAAG,IAAI,MAAM,CACvB;IACE,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,OAAO;CACjB,EACD;IACE,YAAY,EAAE;QACZ,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,EAAE;KACd;CACF,CACF,CAAC;AAEF,8DAA8D;AAC9D,MAAM,CAAC,iBAAiB,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAC5D,KAAK,EAAE,aAAa,EAAE;CACvB,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,KAAK,EAAE,OAAY,EAAE,EAAE;IACrE,OAAO,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;AAClF,CAAC,CAAC,CAAC;AAEH,8DAA8D;AAC9D,MAAM,CAAC,iBAAiB,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAChE,SAAS,EAAE,iBAAiB,EAAE;CAC/B,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,iBAAiB,CAAC,yBAAyB,EAAE,KAAK,EAAE,OAAY,EAAE,EAAE;IACzE,OAAO,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC;AAEH,8DAA8D;AAC9D,KAAK,UAAU,IAAI;IACjB,MAAM,SAAS,GAAG,IAAI,oBAAoB,EAAE,CAAC;IAC7C,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAChC,OAAO,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;AACzD,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACnB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;IACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}

package/dist/tools/index.d.ts

@@ -0,0 +1,121 @@
+/**
+ * MCP Tools — what the LLM can invoke.
+ *
+ * gitwand_status              → list conflicted files + complexity
+ * gitwand_resolve_conflicts   → auto-resolve and return results + DecisionTrace
+ * gitwand_preview_merge       → dry-run: simulate resolution, return stats
+ * gitwand_explain_hunk        → explain why a specific hunk is "complex"
+ * gitwand_apply_resolution    → apply a custom resolution to a specific hunk
+ */
+export declare function registerTools(): ({
+    name: string;
+    description: string;
+    inputSchema: {
+        type: "object";
+        properties: {
+            cwd: {
+                type: string;
+                description: string;
+            };
+            files?: undefined;
+            dry_run?: undefined;
+            policy?: undefined;
+            file?: undefined;
+            line?: undefined;
+            content?: undefined;
+        };
+        required?: undefined;
+    };
+} | {
+    name: string;
+    description: string;
+    inputSchema: {
+        type: "object";
+        properties: {
+            cwd: {
+                type: string;
+                description: string;
+            };
+            files: {
+                type: string;
+                items: {
+                    type: string;
+                };
+                description: string;
+            };
+            dry_run: {
+                type: string;
+                description: string;
+            };
+            policy: {
+                type: string;
+                enum: string[];
+                description: string;
+            };
+            file?: undefined;
+            line?: undefined;
+            content?: undefined;
+        };
+        required?: undefined;
+    };
+} | {
+    name: string;
+    description: string;
+    inputSchema: {
+        type: "object";
+        properties: {
+            cwd: {
+                type: string;
+                description: string;
+            };
+            file: {
+                type: string;
+                description: string;
+            };
+            line: {
+                type: string;
+                description: string;
+            };
+            files?: undefined;
+            dry_run?: undefined;
+            policy?: undefined;
+            content?: undefined;
+        };
+        required: string[];
+    };
+} | {
+    name: string;
+    description: string;
+    inputSchema: {
+        type: "object";
+        properties: {
+            cwd: {
+                type: string;
+                description: string;
+            };
+            file: {
+                type: string;
+                description: string;
+            };
+            line: {
+                type: string;
+                description: string;
+            };
+            content: {
+                type: string;
+                description: string;
+            };
+            files?: undefined;
+            dry_run?: undefined;
+            policy?: undefined;
+        };
+        required: string[];
+    };
+})[];
+export declare function handleToolCall(name: string, args: Record<string, unknown>, defaultCwd: string): Promise<{
+    content: {
+        type: "text";
+        text: string;
+    }[];
+}>;
+//# sourceMappingURL=index.d.ts.map

package/dist/tools/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AASH,wBAAgB,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6G5B;AAwGD,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,UAAU,EAAE,MAAM;;;;;GAkBnB"}

package/dist/tools/index.js

@@ -0,0 +1,500 @@
+/**
+ * MCP Tools — what the LLM can invoke.
+ *
+ * gitwand_status              → list conflicted files + complexity
+ * gitwand_resolve_conflicts   → auto-resolve and return results + DecisionTrace
+ * gitwand_preview_merge       → dry-run: simulate resolution, return stats
+ * gitwand_explain_hunk        → explain why a specific hunk is "complex"
+ * gitwand_apply_resolution    → apply a custom resolution to a specific hunk
+ */
+import { readFileSync, writeFileSync } from "node:fs";
+import { execSync } from "node:child_process";
+import { resolve as resolvePath } from "node:path";
+import { resolve } from "@gitwand/core";
+// ─── Tool definitions ──────────────────────────────────────
+export function registerTools() {
+    return [
+        {
+            name: "gitwand_status",
+            description: "List conflicted files in the current Git repo with their complexity and auto-resolvability. Returns a structured JSON report with conflict counts, types, and confidence scores.",
+            inputSchema: {
+                type: "object",
+                properties: {
+                    cwd: {
+                        type: "string",
+                        description: "Working directory (repo root). Defaults to server cwd.",
+                    },
+                },
+            },
+        },
+        {
+            name: "gitwand_resolve_conflicts",
+            description: "Auto-resolve trivial Git merge conflicts using GitWand's pattern-based engine. Returns resolved files, DecisionTrace for each hunk, and pendingHunks for conflicts that need human/LLM review. Writes resolved files to disk unless dry_run is true.",
+            inputSchema: {
+                type: "object",
+                properties: {
+                    cwd: {
+                        type: "string",
+                        description: "Working directory (repo root). Defaults to server cwd.",
+                    },
+                    files: {
+                        type: "array",
+                        items: { type: "string" },
+                        description: "Specific files to resolve. If omitted, discovers all conflicted files from git.",
+                    },
+                    dry_run: {
+                        type: "boolean",
+                        description: "If true, analyze without writing files. Default: false.",
+                    },
+                    policy: {
+                        type: "string",
+                        enum: ["prefer-ours", "prefer-theirs", "prefer-merge", "prefer-safety", "strict"],
+                        description: "Merge policy to use. Default: prefer-theirs.",
+                    },
+                },
+            },
+        },
+        {
+            name: "gitwand_preview_merge",
+            description: "Dry-run conflict resolution on all conflicted files. Shows how many conflicts GitWand can auto-resolve vs. how many need manual/LLM attention. Does NOT modify any files.",
+            inputSchema: {
+                type: "object",
+                properties: {
+                    cwd: {
+                        type: "string",
+                        description: "Working directory (repo root). Defaults to server cwd.",
+                    },
+                },
+            },
+        },
+        {
+            name: "gitwand_explain_hunk",
+            description: "Explain why a specific conflict hunk was classified as its type. Returns the DecisionTrace with each evaluation step and the ours/theirs/base content for context.",
+            inputSchema: {
+                type: "object",
+                properties: {
+                    cwd: {
+                        type: "string",
+                        description: "Working directory (repo root). Defaults to server cwd.",
+                    },
+                    file: {
+                        type: "string",
+                        description: "Path to the conflicted file (relative to cwd).",
+                    },
+                    line: {
+                        type: "number",
+                        description: "Start line of the hunk to explain.",
+                    },
+                },
+                required: ["file", "line"],
+            },
+        },
+        {
+            name: "gitwand_apply_resolution",
+            description: "Apply a custom resolution (provided by the LLM or user) to a specific conflict hunk. Replaces the conflict markers at the given line range with the provided content. Use this for 'complex' hunks that GitWand couldn't auto-resolve.",
+            inputSchema: {
+                type: "object",
+                properties: {
+                    cwd: {
+                        type: "string",
+                        description: "Working directory (repo root). Defaults to server cwd.",
+                    },
+                    file: {
+                        type: "string",
+                        description: "Path to the conflicted file (relative to cwd).",
+                    },
+                    line: {
+                        type: "number",
+                        description: "Start line of the conflict hunk (the <<<<<<< line).",
+                    },
+                    content: {
+                        type: "string",
+                        description: "The resolved content to replace the conflict block with.",
+                    },
+                },
+                required: ["file", "line", "content"],
+            },
+        },
+    ];
+}
+// ─── Helpers ───────────────────────────────────────────────
+function getConflictedFiles(cwd) {
+    try {
+        const output = execSync("git diff --name-only --diff-filter=U", {
+            cwd,
+            encoding: "utf-8",
+        });
+        return output
+            .trim()
+            .split("\n")
+            .filter((f) => f.length > 0);
+    }
+    catch {
+        return [];
+    }
+}
+function serializeResult(file, result) {
+    return {
+        path: file,
+        totalConflicts: result.stats.totalConflicts,
+        autoResolved: result.stats.autoResolved,
+        remaining: result.stats.remaining,
+        validation: {
+            isValid: result.validation.isValid,
+            hasResidualMarkers: result.validation.hasResidualMarkers,
+            syntaxError: result.validation.syntaxError,
+        },
+        resolutions: result.resolutions.map((r) => ({
+            line: r.hunk.startLine,
+            type: r.hunk.type,
+            resolved: r.autoResolved,
+            explanation: r.hunk.explanation,
+            confidence: {
+                score: r.hunk.confidence.score,
+                label: r.hunk.confidence.label,
+                typeClassification: r.hunk.confidence.dimensions.typeClassification,
+                dataRisk: r.hunk.confidence.dimensions.dataRisk,
+                scopeImpact: r.hunk.confidence.dimensions.scopeImpact,
+            },
+            trace: {
+                selected: r.hunk.trace.selected,
+                hasBase: r.hunk.trace.hasBase,
+                summary: r.hunk.trace.summary,
+                steps: r.hunk.trace.steps,
+            },
+        })),
+        pendingHunks: result.resolutions
+            .filter((r) => !r.autoResolved)
+            .map((r) => ({
+            line: r.hunk.startLine,
+            type: r.hunk.type,
+            explanation: r.hunk.explanation,
+            ours: r.hunk.oursLines.join("\n"),
+            theirs: r.hunk.theirsLines.join("\n"),
+            base: r.hunk.baseLines.join("\n"),
+            trace: {
+                selected: r.hunk.trace.selected,
+                summary: r.hunk.trace.summary,
+                steps: r.hunk.trace.steps,
+            },
+        })),
+    };
+}
+function buildPartialContent(content, resolutions) {
+    const lines = content.split("\n");
+    const result = [];
+    let conflictIdx = 0;
+    let inConflict = false;
+    let conflictBuffer = [];
+    for (const line of lines) {
+        if (line.startsWith("<<<<<<<")) {
+            inConflict = true;
+            conflictBuffer = [line];
+        }
+        else if (line.startsWith(">>>>>>>") && inConflict) {
+            conflictBuffer.push(line);
+            const resolution = resolutions[conflictIdx];
+            if (resolution?.autoResolved && resolution.resolvedLines) {
+                result.push(...resolution.resolvedLines);
+            }
+            else {
+                result.push(...conflictBuffer);
+            }
+            conflictIdx++;
+            inConflict = false;
+            conflictBuffer = [];
+        }
+        else if (inConflict) {
+            conflictBuffer.push(line);
+        }
+        else {
+            result.push(line);
+        }
+    }
+    return result.join("\n");
+}
+// ─── Tool handlers ─────────────────────────────────────────
+export async function handleToolCall(name, args, defaultCwd) {
+    const cwd = args.cwd || defaultCwd;
+    switch (name) {
+        case "gitwand_status":
+            return toolStatus(cwd);
+        case "gitwand_resolve_conflicts":
+            return toolResolve(cwd, args);
+        case "gitwand_preview_merge":
+            return toolPreview(cwd);
+        case "gitwand_explain_hunk":
+            return toolExplain(cwd, args);
+        case "gitwand_apply_resolution":
+            return toolApply(cwd, args);
+        default:
+            return { content: [{ type: "text", text: `Unknown tool: ${name}` }], isError: true };
+    }
+}
+async function toolStatus(cwd) {
+    const files = getConflictedFiles(cwd);
+    if (files.length === 0) {
+        return {
+            content: [{ type: "text", text: JSON.stringify({ files: 0, conflicts: [], message: "No conflicted files." }, null, 2) }],
+        };
+    }
+    const conflicts = files.map((file) => {
+        const filePath = resolvePath(cwd, file);
+        try {
+            const content = readFileSync(filePath, "utf-8");
+            const result = resolve(content, file, { explainOnly: true });
+            return {
+                path: file,
+                totalConflicts: result.stats.totalConflicts,
+                autoResolvable: result.stats.autoResolved,
+                remaining: result.stats.remaining,
+                percentage: result.stats.totalConflicts > 0
+                    ? Math.round((result.stats.autoResolved / result.stats.totalConflicts) * 100)
+                    : 0,
+                types: Object.entries(result.stats.byType)
+                    .filter(([, count]) => count > 0)
+                    .map(([type, count]) => ({ type, count: count })),
+            };
+        }
+        catch {
+            return { path: file, error: "Could not read file" };
+        }
+    });
+    const totalConflicts = conflicts.reduce((s, c) => s + (c.totalConflicts ?? 0), 0);
+    const totalResolvable = conflicts.reduce((s, c) => s + (c.autoResolvable ?? 0), 0);
+    return {
+        content: [{
+                type: "text",
+                text: JSON.stringify({
+                    files: files.length,
+                    totalConflicts,
+                    autoResolvable: totalResolvable,
+                    remaining: totalConflicts - totalResolvable,
+                    conflicts,
+                }, null, 2),
+            }],
+    };
+}
+async function toolResolve(cwd, args) {
+    let files = args.files ?? [];
+    const dryRun = args.dry_run ?? false;
+    const policy = args.policy;
+    if (files.length === 0) {
+        files = getConflictedFiles(cwd);
+    }
+    if (files.length === 0) {
+        return {
+            content: [{ type: "text", text: JSON.stringify({ message: "No conflicted files found.", files: [] }, null, 2) }],
+        };
+    }
+    const results = files.map((file) => {
+        const filePath = resolvePath(cwd, file);
+        try {
+            const content = readFileSync(filePath, "utf-8");
+            const result = resolve(content, file, {
+                ...(policy ? { policy: policy } : {}),
+            });
+            // Write resolved content unless dry-run
+            if (!dryRun && result.stats.autoResolved > 0) {
+                const newContent = result.mergedContent ?? buildPartialContent(content, result.resolutions);
+                writeFileSync(filePath, newContent, "utf-8");
+            }
+            return serializeResult(file, result);
+        }
+        catch (err) {
+            return { path: file, error: err.message };
+        }
+    });
+    const totalConflicts = results.reduce((s, r) => s + (r.totalConflicts ?? 0), 0);
+    const totalResolved = results.reduce((s, r) => s + (r.autoResolved ?? 0), 0);
+    return {
+        content: [{
+                type: "text",
+                text: JSON.stringify({
+                    dryRun,
+                    summary: {
+                        files: results.length,
+                        totalConflicts,
+                        autoResolved: totalResolved,
+                        remaining: totalConflicts - totalResolved,
+                        allResolved: totalConflicts - totalResolved === 0,
+                    },
+                    files: results,
+                }, null, 2),
+            }],
+    };
+}
+async function toolPreview(cwd) {
+    const files = getConflictedFiles(cwd);
+    if (files.length === 0) {
+        return {
+            content: [{ type: "text", text: JSON.stringify({ message: "No conflicted files.", risk: "none" }, null, 2) }],
+        };
+    }
+    const previews = files.map((file) => {
+        const filePath = resolvePath(cwd, file);
+        try {
+            const content = readFileSync(filePath, "utf-8");
+            const result = resolve(content, file, { explainOnly: true });
+            return serializeResult(file, result);
+        }
+        catch (err) {
+            return { path: file, error: err.message };
+        }
+    });
+    const totalConflicts = previews.reduce((s, r) => s + (r.totalConflicts ?? 0), 0);
+    const totalResolvable = previews.reduce((s, r) => s + (r.autoResolved ?? 0), 0);
+    const remaining = totalConflicts - totalResolvable;
+    // Risk assessment
+    let risk;
+    if (remaining === 0)
+        risk = "low";
+    else if (remaining <= 2 && files.length <= 3)
+        risk = "medium";
+    else
+        risk = "high";
+    return {
+        content: [{
+                type: "text",
+                text: JSON.stringify({
+                    risk,
+                    summary: {
+                        files: files.length,
+                        totalConflicts,
+                        autoResolvable: totalResolvable,
+                        remaining,
+                        autoResolvePercentage: totalConflicts > 0
+                            ? Math.round((totalResolvable / totalConflicts) * 100)
+                            : 100,
+                    },
+                    files: previews,
+                }, null, 2),
+            }],
+    };
+}
+async function toolExplain(cwd, args) {
+    const file = args.file;
+    const targetLine = args.line;
+    if (!file || targetLine === undefined) {
+        return { content: [{ type: "text", text: "Missing required arguments: file and line." }], isError: true };
+    }
+    const filePath = resolvePath(cwd, file);
+    let content;
+    try {
+        content = readFileSync(filePath, "utf-8");
+    }
+    catch {
+        return { content: [{ type: "text", text: `File not found: ${file}` }], isError: true };
+    }
+    const result = resolve(content, file, { explainOnly: true });
+    const hunk = result.resolutions.find((r) => r.hunk.startLine === targetLine);
+    if (!hunk) {
+        const available = result.resolutions.map((r) => r.hunk.startLine);
+        return {
+            content: [{
+                    type: "text",
+                    text: JSON.stringify({
+                        error: `No conflict hunk found at line ${targetLine}.`,
+                        availableLines: available,
+                    }, null, 2),
+                }],
+            isError: true,
+        };
+    }
+    return {
+        content: [{
+                type: "text",
+                text: JSON.stringify({
+                    file,
+                    line: hunk.hunk.startLine,
+                    type: hunk.hunk.type,
+                    resolved: hunk.autoResolved,
+                    explanation: hunk.hunk.explanation,
+                    resolutionReason: hunk.resolutionReason,
+                    confidence: {
+                        score: hunk.hunk.confidence.score,
+                        label: hunk.hunk.confidence.label,
+                        dimensions: hunk.hunk.confidence.dimensions,
+                        boosters: hunk.hunk.confidence.boosters,
+                        penalties: hunk.hunk.confidence.penalties,
+                    },
+                    trace: {
+                        selected: hunk.hunk.trace.selected,
+                        hasBase: hunk.hunk.trace.hasBase,
+                        summary: hunk.hunk.trace.summary,
+                        steps: hunk.hunk.trace.steps,
+                    },
+                    ours: hunk.hunk.oursLines.join("\n"),
+                    theirs: hunk.hunk.theirsLines.join("\n"),
+                    base: hunk.hunk.baseLines.join("\n"),
+                }, null, 2),
+            }],
+    };
+}
+async function toolApply(cwd, args) {
+    const file = args.file;
+    const targetLine = args.line;
+    const newContent = args.content;
+    if (!file || targetLine === undefined || !newContent) {
+        return { content: [{ type: "text", text: "Missing required arguments: file, line, and content." }], isError: true };
+    }
+    const filePath = resolvePath(cwd, file);
+    let fileContent;
+    try {
+        fileContent = readFileSync(filePath, "utf-8");
+    }
+    catch {
+        return { content: [{ type: "text", text: `File not found: ${file}` }], isError: true };
+    }
+    const lines = fileContent.split("\n");
+    const result = [];
+    let currentLine = 1;
+    let replaced = false;
+    let inConflict = false;
+    for (const line of lines) {
+        if (line.startsWith("<<<<<<<") && currentLine === targetLine) {
+            // Found the target conflict block — replace it
+            inConflict = true;
+            result.push(...newContent.split("\n"));
+            replaced = true;
+        }
+        else if (line.startsWith(">>>>>>>") && inConflict) {
+            // End of the conflict block we're replacing
+            inConflict = false;
+        }
+        else if (!inConflict) {
+            result.push(line);
+        }
+        currentLine++;
+    }
+    if (!replaced) {
+        return {
+            content: [{
+                    type: "text",
+                    text: JSON.stringify({
+                        error: `No conflict marker found at line ${targetLine} in ${file}.`,
+                    }, null, 2),
+                }],
+            isError: true,
+        };
+    }
+    const newFileContent = result.join("\n");
+    writeFileSync(filePath, newFileContent, "utf-8");
+    // Re-analyze to check if conflicts remain
+    const recheck = resolve(newFileContent, file, { explainOnly: true });
+    return {
+        content: [{
+                type: "text",
+                text: JSON.stringify({
+                    applied: true,
+                    file,
+                    line: targetLine,
+                    remainingConflicts: recheck.stats.totalConflicts,
+                    message: recheck.stats.totalConflicts === 0
+                        ? "All conflicts resolved in this file."
+                        : `${recheck.stats.totalConflicts} conflict(s) remaining.`,
+                }, null, 2),
+            }],
+    };
+}
+//# sourceMappingURL=index.js.map

package/dist/tools/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -0,0 +1,54 @@
+{
+  "name": "@gitwand/mcp",
+  "version": "1.6.0",
+  "description": "GitWand MCP server — smart Git conflict resolution for AI agents (Claude, Cursor, Windsurf, Claude Code)",
+  "type": "module",
+  "main": "dist/server.js",
+  "bin": {
+    "gitwand-mcp": "dist/server.js"
+  },
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "keywords": [
+    "mcp",
+    "model-context-protocol",
+    "git",
+    "merge",
+    "conflict",
+    "conflict-resolution",
+    "claude",
+    "claude-code",
+    "cursor",
+    "windsurf",
+    "ai-agent",
+    "gitwand"
+  ],
+  "homepage": "https://github.com/devlint/GitWand#mcp-server",
+  "bugs": {
+    "url": "https://github.com/devlint/GitWand/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/devlint/GitWand.git",
+    "directory": "packages/mcp"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.12.1",
+    "@gitwand/core": "1.6.0"
+  },
+  "devDependencies": {
+    "@types/node": "^25.5.0",
+    "typescript": "^5.4.0"
+  },
+  "author": "Laurent Guitton <lb.guitton@gmail.com>",
+  "license": "MIT",
+  "scripts": {
+    "build": "tsc",
+    "clean": "rm -rf dist"
+  }
+}