@gitwand/core 2.3.0 → 2.5.0

package/dist/__tests__/resolvers/lockfile-yarn.test.js

@@ -0,0 +1,165 @@
+/**
+ * Tests du resolver lockfile-yarn (yarn.lock) — GitWand
+ *
+ * Fixtures :
+ *   F1 — bloc de package ajouté d'un seul côté
+ *   F2 — même bloc, version différente → prefer theirs
+ *   F3 — yarn.lock minimal
+ *   F4 — deux packages différents ajoutés de chaque côté
+ *   F5 — détection du nom `yarn.lock` → bon resolver utilisé
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── base lockfile ─────────────────────────────────────────────────────────────
+const baseLock = `# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+react@^18.0.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz"
+  integrity sha512-react
+
+vue@^3.0.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.0.tgz"
+  integrity sha512-vue
+`;
+// ─── F1 — bloc de package ajouté d'un seul côté ──────────────────────────────
+describe("F1 — yarn.lock : bloc de package ajouté d'un seul côté (diff3)", () => {
+    const oursLock = baseLock + `
+axios@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz"
+  integrity sha512-axios
+`;
+    const input = [
+        `<<<<<<< ours`,
+        ...oursLock.split("\n"),
+        `||||||| base`,
+        ...baseLock.split("\n"),
+        `=======`,
+        ...baseLock.split("\n"),
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver lockfile-yarn", () => {
+        const result = resolve(input, "yarn.lock");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient le bloc de package ajouté", () => {
+        const result = resolve(input, "yarn.lock");
+        expect(result.mergedContent).toContain("axios@^1.0.0:");
+        expect(result.mergedContent).toContain("react@^18.0.0:");
+        expect(result.mergedContent).toContain("vue@^3.0.0:");
+    });
+    it("la raison mentionne [lockfile-yarn]", () => {
+        const result = resolve(input, "yarn.lock");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[lockfile-yarn\]/i);
+    });
+});
+// ─── F2 — même bloc, version différente ───────────────────────────────────────
+describe("F2 — yarn.lock : même bloc, version différente → prefer theirs (diff3)", () => {
+    const oursLock = baseLock.replace('"18.2.0"', '"18.3.0"').replace("sha512-react", "sha512-react-ours");
+    const theirsLock = baseLock.replace('"18.2.0"', '"18.3.1"').replace("sha512-react", "sha512-react-theirs");
+    const input = [
+        `<<<<<<< ours`,
+        ...oursLock.split("\n"),
+        `||||||| base`,
+        ...baseLock.split("\n"),
+        `=======`,
+        ...theirsLock.split("\n"),
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "yarn.lock")).not.toThrow();
+    });
+    it("la raison mentionne [lockfile-yarn]", () => {
+        const result = resolve(input, "yarn.lock");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[lockfile-yarn\]/i);
+    });
+});
+// ─── F3 — yarn.lock minimal ───────────────────────────────────────────────────
+describe("F3 — yarn.lock minimal : ne plante pas", () => {
+    const minimal = `# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.\n# yarn lockfile v1\n`;
+    const input = [
+        `<<<<<<< ours`,
+        ...minimal.split("\n"),
+        `||||||| base`,
+        ...minimal.split("\n"),
+        `=======`,
+        ...minimal.split("\n"),
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "yarn.lock")).not.toThrow();
+    });
+    it("produit un résultat avec au moins un hunk", () => {
+        const result = resolve(input, "yarn.lock");
+        expect(result.hunks.length).toBeGreaterThanOrEqual(1);
+    });
+});
+// ─── F4 — deux packages différents ajoutés de chaque côté ────────────────────
+describe("F4 — yarn.lock : packages différents ajoutés de chaque côté (diff3)", () => {
+    const oursLock = baseLock + `
+lodash@^4.0.0:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"
+  integrity sha512-lodash
+`;
+    const theirsLock = baseLock + `
+date-fns@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.0.0.tgz"
+  integrity sha512-datefns
+`;
+    const input = [
+        `<<<<<<< ours`,
+        ...oursLock.split("\n"),
+        `||||||| base`,
+        ...baseLock.split("\n"),
+        `=======`,
+        ...theirsLock.split("\n"),
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout avec les deux packages", () => {
+        const result = resolve(input, "yarn.lock");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient les deux packages ajoutés", () => {
+        const result = resolve(input, "yarn.lock");
+        expect(result.mergedContent).toContain("lodash@^4.0.0:");
+        expect(result.mergedContent).toContain("date-fns@^3.0.0:");
+        expect(result.mergedContent).toContain("react@^18.0.0:");
+        expect(result.mergedContent).toContain("vue@^3.0.0:");
+    });
+    it("la raison mentionne [lockfile-yarn]", () => {
+        const result = resolve(input, "yarn.lock");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[lockfile-yarn\]/i);
+    });
+});
+// ─── F5 — détection du nom de fichier ────────────────────────────────────────
+describe("F5 — yarn.lock : détection du nom de fichier", () => {
+    const oursLock = baseLock + `
+zod@^3.0.0:
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.0.tgz"
+  integrity sha512-zod
+`;
+    const input = [
+        `<<<<<<< ours`,
+        ...oursLock.split("\n"),
+        `||||||| base`,
+        ...baseLock.split("\n"),
+        `=======`,
+        ...baseLock.split("\n"),
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("le nom yarn.lock active le bon resolver", () => {
+        const result = resolve(input, "yarn.lock");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[lockfile-yarn\]/i);
+    });
+    it("le nom dans un sous-dossier est aussi détecté", () => {
+        const result = resolve(input, "apps/desktop/yarn.lock");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[lockfile-yarn\]/i);
+    });
+});
+//# sourceMappingURL=lockfile-yarn.test.js.map

package/dist/__tests__/resolvers/lockfile-yarn.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lockfile-yarn.test.js","sourceRoot":"","sources":["../../../src/__tests__/resolvers/lockfile-yarn.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,kFAAkF;AAElF,MAAM,QAAQ,GAAG;;;;;;;;;;;;CAYhB,CAAC;AAEF,gFAAgF;AAEhF,QAAQ,CAAC,gEAAgE,EAAE,GAAG,EAAE;IAC9E,MAAM,QAAQ,GAAG,QAAQ,GAAG;;;;;CAK7B,CAAC;IAEA,MAAM,KAAK,GAAG;QACZ,cAAc;QACd,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QACvB,cAAc;QACd,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QACvB,SAAS;QACT,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QACvB,gBAAgB;KACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QACzD,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,iFAAiF;AAEjF,QAAQ,CAAC,wEAAwE,EAAE,GAAG,EAAE;IACtF,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;IACvG,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;IAE3G,MAAM,KAAK,GAAG;QACZ,cAAc;QACd,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QACvB,cAAc;QACd,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QACvB,SAAS;QACT,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;QACzB,gBAAgB;KACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,iFAAiF;AAEjF,QAAQ,CAAC,wCAAwC,EAAE,GAAG,EAAE;IACtD,MAAM,OAAO,GAAG,wFAAwF,CAAC;IAEzG,MAAM,KAAK,GAAG;QACZ,cAAc;QACd,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;QACtB,cAAc;QACd,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;QACtB,SAAS;QACT,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;QACtB,gBAAgB;KACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,gFAAgF;AAEhF,QAAQ,CAAC,qEAAqE,EAAE,GAAG,EAAE;IACnF,MAAM,QAAQ,GAAG,QAAQ,GAAG;;;;;CAK7B,CAAC;IAEA,MAAM,UAAU,GAAG,QAAQ,GAAG;;;;;CAK/B,CAAC;IAEA,MAAM,KAAK,GAAG;QACZ,cAAc;QACd,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QACvB,cAAc;QACd,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QACvB,SAAS;QACT,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;QACzB,gBAAgB;KACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QACzD,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QACzD,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,gFAAgF;AAEhF,QAAQ,CAAC,8CAA8C,EAAE,GAAG,EAAE;IAC5D,MAAM,QAAQ,GAAG,QAAQ,GAAG;;;;;CAK7B,CAAC;IAEA,MAAM,KAAK,GAAG;QACZ,cAAc;QACd,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QACvB,cAAc;QACd,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QACvB,SAAS;QACT,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QACvB,gBAAgB;KACjB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/__tests__/resolvers/markdown.test.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Tests du resolver Markdown (GitWand)
+ *
+ * Fixtures :
+ *   F1 — section ajoutée d'un seul côté
+ *   F2 — même section modifiée des deux côtés → conflit ou fallback
+ *   F3 — Markdown minimal (texte sans heading)
+ *   F4 — README avec section ## Features ajoutée d'un côté
+ *   F5 — CHANGELOG avec entrée de version ajoutée
+ */
+export {};
+//# sourceMappingURL=markdown.test.d.ts.map

package/dist/__tests__/resolvers/markdown.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"markdown.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/resolvers/markdown.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG"}

package/dist/__tests__/resolvers/markdown.test.js

@@ -0,0 +1,188 @@
+/**
+ * Tests du resolver Markdown (GitWand)
+ *
+ * Fixtures :
+ *   F1 — section ajoutée d'un seul côté
+ *   F2 — même section modifiée des deux côtés → conflit ou fallback
+ *   F3 — Markdown minimal (texte sans heading)
+ *   F4 — README avec section ## Features ajoutée d'un côté
+ *   F5 — CHANGELOG avec entrée de version ajoutée
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── F1 — section ajoutée d'un seul côté ─────────────────────────────────────
+describe("F1 — Markdown : section ajoutée d'un seul côté (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `# My Project`,
+        ``,
+        `## Introduction`,
+        ``,
+        `This is my project.`,
+        ``,
+        `## Installation`,
+        ``,
+        `Run \`npm install\`.`,
+        `||||||| base`,
+        `# My Project`,
+        ``,
+        `## Introduction`,
+        ``,
+        `This is my project.`,
+        `=======`,
+        `# My Project`,
+        ``,
+        `## Introduction`,
+        ``,
+        `This is my project.`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver markdown", () => {
+        const result = resolve(input, "README.md");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient la section ajoutée", () => {
+        const result = resolve(input, "README.md");
+        expect(result.mergedContent).toContain("## Installation");
+    });
+    it("la raison mentionne [markdown]", () => {
+        const result = resolve(input, "README.md");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[markdown\]/i);
+    });
+});
+// ─── F2 — même section modifiée des deux côtés ────────────────────────────────
+describe("F2 — Markdown : même section modifiée des deux côtés (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `# My Project`,
+        ``,
+        `## Introduction`,
+        ``,
+        `This is my awesome project with many features.`,
+        `||||||| base`,
+        `# My Project`,
+        ``,
+        `## Introduction`,
+        ``,
+        `This is my project.`,
+        `=======`,
+        `# My Project`,
+        ``,
+        `## Introduction`,
+        ``,
+        `This is my project, now with TypeScript support.`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "README.md")).not.toThrow();
+    });
+    it("la raison mentionne [markdown]", () => {
+        const result = resolve(input, "README.md");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[markdown\]/i);
+    });
+});
+// ─── F3 — Markdown minimal ────────────────────────────────────────────────────
+describe("F3 — Markdown minimal : ne plante pas", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `Some text on ours side.`,
+        `=======`,
+        `Some text on theirs side.`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "NOTES.md")).not.toThrow();
+    });
+    it("produit un résultat avec au moins un hunk", () => {
+        const result = resolve(input, "NOTES.md");
+        expect(result.hunks.length).toBeGreaterThanOrEqual(1);
+    });
+});
+// ─── F4 — README avec section ## Features ajoutée d'un côté ──────────────────
+describe("F4 — README : ajout de section ## Features (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `# GitWand`,
+        ``,
+        `## Overview`,
+        ``,
+        `GitWand is a Git client.`,
+        ``,
+        `## Features`,
+        ``,
+        `- Auto-resolve conflicts`,
+        `- AI-powered merge`,
+        `||||||| base`,
+        `# GitWand`,
+        ``,
+        `## Overview`,
+        ``,
+        `GitWand is a Git client.`,
+        `=======`,
+        `# GitWand`,
+        ``,
+        `## Overview`,
+        ``,
+        `GitWand is a Git client.`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver markdown", () => {
+        const result = resolve(input, "README.md");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient la section Features", () => {
+        const result = resolve(input, "README.md");
+        expect(result.mergedContent).toContain("## Features");
+        expect(result.mergedContent).toContain("Auto-resolve conflicts");
+    });
+    it("la raison mentionne [markdown]", () => {
+        const result = resolve(input, "README.md");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[markdown\]/i);
+    });
+});
+// ─── F5 — CHANGELOG avec entrée de version ajoutée ───────────────────────────
+describe("F5 — CHANGELOG : entrée de version ajoutée d'un côté (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `# Changelog`,
+        ``,
+        `## [2.1.0] - 2025-04-01`,
+        ``,
+        `### Added`,
+        `- New conflict resolver for YAML files`,
+        ``,
+        `## [2.0.0] - 2025-01-15`,
+        ``,
+        `### Breaking Changes`,
+        `- Revamped API`,
+        `||||||| base`,
+        `# Changelog`,
+        ``,
+        `## [2.0.0] - 2025-01-15`,
+        ``,
+        `### Breaking Changes`,
+        `- Revamped API`,
+        `=======`,
+        `# Changelog`,
+        ``,
+        `## [2.0.0] - 2025-01-15`,
+        ``,
+        `### Breaking Changes`,
+        `- Revamped API`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver markdown", () => {
+        const result = resolve(input, "CHANGELOG.md");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient l'entrée de version ajoutée", () => {
+        const result = resolve(input, "CHANGELOG.md");
+        expect(result.mergedContent).toContain("## [2.1.0]");
+        expect(result.mergedContent).toContain("## [2.0.0]");
+    });
+    it("la raison mentionne [markdown]", () => {
+        const result = resolve(input, "CHANGELOG.md");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[markdown\]/i);
+    });
+});
+//# sourceMappingURL=markdown.test.js.map

package/dist/__tests__/resolvers/markdown.test.js.map

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

package/dist/__tests__/resolvers/vue.test.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Tests du resolver Vue SFC (GitWand)
+ *
+ * Fixtures :
+ *   F1 — modification dans <template> d'un seul côté
+ *   F2 — modification dans <script setup> d'un seul côté
+ *   F3 — fichier .vue minimal
+ *   F4 — ajout d'un <style scoped> d'un côté
+ *   F5 — conflit dans <template> des deux côtés → conflit ou fallback
+ */
+export {};
+//# sourceMappingURL=vue.test.d.ts.map

package/dist/__tests__/resolvers/vue.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vue.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/resolvers/vue.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG"}

package/dist/__tests__/resolvers/vue.test.js

@@ -0,0 +1,225 @@
+/**
+ * Tests du resolver Vue SFC (GitWand)
+ *
+ * Fixtures :
+ *   F1 — modification dans <template> d'un seul côté
+ *   F2 — modification dans <script setup> d'un seul côté
+ *   F3 — fichier .vue minimal
+ *   F4 — ajout d'un <style scoped> d'un côté
+ *   F5 — conflit dans <template> des deux côtés → conflit ou fallback
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── F1 — modification dans <template> d'un seul côté ────────────────────────
+describe("F1 — Vue : modification dans <template> d'un seul côté (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `<template>`,
+        `  <div class="app">`,
+        `    <h1>Hello World</h1>`,
+        `    <p>Welcome to my app</p>`,
+        `  </div>`,
+        `</template>`,
+        ``,
+        `<script setup>`,
+        `const title = 'Hello World';`,
+        `</script>`,
+        `||||||| base`,
+        `<template>`,
+        `  <div class="app">`,
+        `    <h1>Hello World</h1>`,
+        `  </div>`,
+        `</template>`,
+        ``,
+        `<script setup>`,
+        `const title = 'Hello World';`,
+        `</script>`,
+        `=======`,
+        `<template>`,
+        `  <div class="app">`,
+        `    <h1>Hello World</h1>`,
+        `  </div>`,
+        `</template>`,
+        ``,
+        `<script setup>`,
+        `const title = 'Hello World';`,
+        `</script>`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver vue", () => {
+        const result = resolve(input, "App.vue");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient la modification du template", () => {
+        const result = resolve(input, "App.vue");
+        expect(result.mergedContent).toContain("Welcome to my app");
+    });
+    it("la raison mentionne [vue]", () => {
+        const result = resolve(input, "App.vue");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[vue\]/i);
+    });
+});
+// ─── F2 — modification dans <script setup> d'un seul côté ────────────────────
+describe("F2 — Vue : modification dans <script setup> d'un seul côté (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `<template>`,
+        `  <button @click="handleClick">Click me</button>`,
+        `</template>`,
+        ``,
+        `<script setup lang="ts">`,
+        `import { ref } from 'vue';`,
+        `import { useRouter } from 'vue-router';`,
+        ``,
+        `const count = ref(0);`,
+        `const router = useRouter();`,
+        ``,
+        `function handleClick() {`,
+        `  count.value++;`,
+        `}`,
+        `</script>`,
+        `||||||| base`,
+        `<template>`,
+        `  <button @click="handleClick">Click me</button>`,
+        `</template>`,
+        ``,
+        `<script setup lang="ts">`,
+        `import { ref } from 'vue';`,
+        ``,
+        `const count = ref(0);`,
+        ``,
+        `function handleClick() {`,
+        `  count.value++;`,
+        `}`,
+        `</script>`,
+        `=======`,
+        `<template>`,
+        `  <button @click="handleClick">Click me</button>`,
+        `</template>`,
+        ``,
+        `<script setup lang="ts">`,
+        `import { ref } from 'vue';`,
+        ``,
+        `const count = ref(0);`,
+        ``,
+        `function handleClick() {`,
+        `  count.value++;`,
+        `}`,
+        `</script>`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver vue", () => {
+        const result = resolve(input, "Button.vue");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient le code ajouté dans script setup", () => {
+        const result = resolve(input, "Button.vue");
+        expect(result.mergedContent).toContain("useRouter");
+    });
+    it("la raison mentionne [vue]", () => {
+        const result = resolve(input, "Button.vue");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[vue\]/i);
+    });
+});
+// ─── F3 — fichier .vue minimal ────────────────────────────────────────────────
+describe("F3 — Vue minimal : ne plante pas", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `<template><div>Ours</div></template>`,
+        `=======`,
+        `<template><div>Theirs</div></template>`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "Minimal.vue")).not.toThrow();
+    });
+    it("produit un résultat avec au moins un hunk", () => {
+        const result = resolve(input, "Minimal.vue");
+        expect(result.hunks.length).toBeGreaterThanOrEqual(1);
+    });
+});
+// ─── F4 — ajout d'un <style scoped> d'un côté ────────────────────────────────
+describe("F4 — Vue : ajout d'un <style scoped> d'un côté (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `<template>`,
+        `  <div class="card">Card content</div>`,
+        `</template>`,
+        ``,
+        `<script setup lang="ts">`,
+        `// component logic`,
+        `</script>`,
+        ``,
+        `<style scoped>`,
+        `.card {`,
+        `  padding: 16px;`,
+        `  border-radius: 8px;`,
+        `  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);`,
+        `}`,
+        `</style>`,
+        `||||||| base`,
+        `<template>`,
+        `  <div class="card">Card content</div>`,
+        `</template>`,
+        ``,
+        `<script setup lang="ts">`,
+        `// component logic`,
+        `</script>`,
+        `=======`,
+        `<template>`,
+        `  <div class="card">Card content</div>`,
+        `</template>`,
+        ``,
+        `<script setup lang="ts">`,
+        `// component logic`,
+        `</script>`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("auto-résout via le resolver vue", () => {
+        const result = resolve(input, "Card.vue");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient le bloc style ajouté", () => {
+        const result = resolve(input, "Card.vue");
+        expect(result.mergedContent).toContain("<style scoped>");
+        expect(result.mergedContent).toContain(".card");
+    });
+    it("la raison mentionne [vue]", () => {
+        const result = resolve(input, "Card.vue");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[vue\]/i);
+    });
+});
+// ─── F5 — conflit dans <template> des deux côtés ─────────────────────────────
+describe("F5 — Vue : conflit dans <template> des deux côtés (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `<template>`,
+        `  <div class="app">`,
+        `    <h1>My Awesome App</h1>`,
+        `    <p>Version 2.0</p>`,
+        `  </div>`,
+        `</template>`,
+        `||||||| base`,
+        `<template>`,
+        `  <div class="app">`,
+        `    <h1>My App</h1>`,
+        `  </div>`,
+        `</template>`,
+        `=======`,
+        `<template>`,
+        `  <div class="app">`,
+        `    <h1>My Great App</h1>`,
+        `    <span>Beta</span>`,
+        `  </div>`,
+        `</template>`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("ne lève pas d'exception", () => {
+        expect(() => resolve(input, "App.vue")).not.toThrow();
+    });
+    it("la raison mentionne [vue]", () => {
+        const result = resolve(input, "App.vue");
+        expect(result.resolutions[0].resolutionReason).toMatch(/\[vue\]/i);
+    });
+});
+//# sourceMappingURL=vue.test.js.map

package/dist/__tests__/resolvers/vue.test.js.map

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

package/dist/__tests__/resolvers/yaml.test.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Tests du resolver YAML (GitWand)
+ *
+ * Fixtures :
+ *   F1 — clé ajoutée d'un seul côté
+ *   F2 — même clé modifiée des deux côtés → conflit non résolvable
+ *   F3 — YAML minimal (1 ligne)
+ *   F4 — conflit dans values.yaml Helm (clés indépendantes)
+ *   F5 — conflit dans un workflow GitHub Actions
+ */
+export {};
+//# sourceMappingURL=yaml.test.d.ts.map

package/dist/__tests__/resolvers/yaml.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"yaml.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/resolvers/yaml.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG"}