@gitwand/core 2.3.0 → 2.5.0

package/dist/__tests__/patterns/llm-proposed.test.js

@@ -0,0 +1,306 @@
+/**
+ * Tests du pattern llm_proposed (v2.5) et de la pipeline LLM fallback.
+ *
+ * Couvre :
+ * 1. Comportement du PatternPlugin (flag module-level, confidence, priority)
+ * 2. tryLlmFallbackResolve (endpoint mock, parsing, validation, trace)
+ * 3. Intégration resolveAsync avec mock endpoint déterministe
+ */
+import { describe, it, expect, afterEach } from "vitest";
+import llmProposed, { setLlmFallbackEnabled, isLlmFallbackEnabled, } from "../../patterns/llm-proposed.js";
+import { tryLlmFallbackResolve } from "../../resolvers/llm-fallback.js";
+import { resolveAsync } from "../../resolver/index.js";
+// ─── Helpers ──────────────────────────────────────────────────
+/** Hunk fictif minimal pour les tests unitaires du pattern */
+const SIMPLE_HUNK = {
+    oursLines: ["  level: 'warn',", "  format: 'json',"],
+    baseLines: ["  level: 'info',", "  format: 'text',"],
+    theirsLines: ["  level: 'error',", "  format: 'logfmt',"],
+    startLine: 10,
+    endLine: 20,
+};
+/** Conflit diff3 simple pour les tests d'intégration */
+const COMPLEX_DIFF3 = [
+    `<<<<<<< ours`,
+    `  level: "warn",`,
+    `  format: "json",`,
+    `||||||| base`,
+    `  level: "info",`,
+    `  format: "text",`,
+    `=======`,
+    `  level: "error",`,
+    `  format: "logfmt",`,
+    `>>>>>>> theirs`,
+].join("\n");
+/** Endpoint mock déterministe — retourne toujours une résolution valide */
+function makeMockEndpoint(responseText) {
+    return {
+        async call(_prompt) {
+            return responseText;
+        },
+    };
+}
+// ─── 1. PatternPlugin unit tests ──────────────────────────────
+describe("llm_proposed PatternPlugin — métadonnées", () => {
+    it("a le bon type", () => {
+        expect(llmProposed.type).toBe("llm_proposed");
+    });
+    it("a la bonne priorité (998, juste avant complex 999)", () => {
+        expect(llmProposed.priority).toBe(998);
+    });
+    it("requires === 'both' (évalué quelle que soit la disponibilité de la base)", () => {
+        expect(llmProposed.requires).toBe("both");
+    });
+});
+describe("llm_proposed PatternPlugin — flag module-level", () => {
+    afterEach(() => {
+        // Toujours réinitialiser le flag après chaque test
+        setLlmFallbackEnabled(false);
+    });
+    it("detect() retourne false par défaut (LLM désactivé)", () => {
+        expect(llmProposed.detect(SIMPLE_HUNK)).toBe(false);
+    });
+    it("isLlmFallbackEnabled() retourne false par défaut", () => {
+        expect(isLlmFallbackEnabled()).toBe(false);
+    });
+    it("detect() retourne true après setLlmFallbackEnabled(true)", () => {
+        setLlmFallbackEnabled(true);
+        expect(llmProposed.detect(SIMPLE_HUNK)).toBe(true);
+    });
+    it("detect() retourne false après reset setLlmFallbackEnabled(false)", () => {
+        setLlmFallbackEnabled(true);
+        setLlmFallbackEnabled(false);
+        expect(llmProposed.detect(SIMPLE_HUNK)).toBe(false);
+    });
+});
+describe("llm_proposed PatternPlugin — confidence", () => {
+    it("typeClassification = 50 (incertitude LLM)", () => {
+        const score = llmProposed.confidence(SIMPLE_HUNK);
+        expect(score.dimensions.typeClassification).toBe(50);
+    });
+    it("dataRisk = 60 (risque d'hallucination)", () => {
+        const score = llmProposed.confidence(SIMPLE_HUNK);
+        expect(score.dimensions.dataRisk).toBe(60);
+    });
+    it("score composite trop bas pour auto-résolution (label low ou medium)", () => {
+        const score = llmProposed.confidence(SIMPLE_HUNK);
+        // score = 50 - 60*0.40 = 50 - 24 = 26 → "low"
+        expect(score.label).toBe("low");
+        expect(score.score).toBeLessThan(44);
+    });
+    it("penalties liste les risques LLM", () => {
+        const score = llmProposed.confidence(SIMPLE_HUNK);
+        expect(score.penalties.length).toBeGreaterThan(0);
+        expect(score.penalties.some((p) => p.toLowerCase().includes("llm") || p.toLowerCase().includes("déterministe"))).toBe(true);
+    });
+});
+// ─── 2. tryLlmFallbackResolve ─────────────────────────────────
+describe("tryLlmFallbackResolve — sans endpoint", () => {
+    it("retourne lines: null quand endpoint absent", async () => {
+        const hunk = {
+            ...SIMPLE_HUNK,
+            type: "llm_proposed",
+            confidence: llmProposed.confidence(SIMPLE_HUNK),
+            explanation: llmProposed.explanation(SIMPLE_HUNK),
+            trace: {
+                steps: [],
+                selected: "llm_proposed",
+                summary: "test",
+                hasBase: true,
+            },
+            zdiff3: false,
+        };
+        const result = await tryLlmFallbackResolve(hunk, "src/config.ts", "// contexte fictif", { enabled: true });
+        expect(result.lines).toBeNull();
+        expect(result.llmTrace.accepted).toBe(false);
+        expect(result.reason).toMatch(/endpoint/i);
+    });
+});
+describe("tryLlmFallbackResolve — endpoint mock", () => {
+    const MOCK_HUNK = {
+        oursLines: [`  level: "warn",`, `  format: "json",`],
+        baseLines: [`  level: "info",`, `  format: "text",`],
+        theirsLines: [`  level: "error",`, `  format: "logfmt",`],
+        startLine: 10,
+        endLine: 20,
+        type: "llm_proposed",
+        confidence: llmProposed.confidence(SIMPLE_HUNK),
+        explanation: llmProposed.explanation(SIMPLE_HUNK),
+        trace: {
+            steps: [],
+            selected: "llm_proposed",
+            summary: "LLM fallback activé",
+            hasBase: true,
+        },
+        zdiff3: false,
+    };
+    it("extrait les lignes d'un bloc fencé valide", async () => {
+        const endpoint = makeMockEndpoint("```\n  level: \"warn\",\n  format: \"json\",\n```");
+        const result = await tryLlmFallbackResolve(MOCK_HUNK, "src/config.ts", "", {
+            enabled: true,
+            endpoint,
+        });
+        expect(result.lines).not.toBeNull();
+        expect(result.lines).toEqual([`  level: "warn",`, `  format: "json",`]);
+        expect(result.llmTrace.accepted).toBe(true);
+    });
+    it("retourne lines: null pour CANNOT_RESOLVE", async () => {
+        const endpoint = makeMockEndpoint("CANNOT_RESOLVE");
+        const result = await tryLlmFallbackResolve(MOCK_HUNK, "src/config.ts", "", {
+            enabled: true,
+            endpoint,
+        });
+        expect(result.lines).toBeNull();
+        expect(result.llmTrace.accepted).toBe(false);
+        expect(result.reason).toMatch(/cannot_resolve|refusé/i);
+    });
+    it("retourne lines: null quand l'endpoint throw une erreur", async () => {
+        const endpoint = {
+            async call() { throw new Error("network timeout"); },
+        };
+        const result = await tryLlmFallbackResolve(MOCK_HUNK, "src/config.ts", "", {
+            enabled: true,
+            endpoint,
+        });
+        expect(result.lines).toBeNull();
+        expect(result.llmTrace.accepted).toBe(false);
+        expect(result.reason).toMatch(/erreur|network timeout/i);
+    });
+    it("LlmTrace — promptHash est un hash SHA-256 hexadécimal (64 chars)", async () => {
+        const endpoint = makeMockEndpoint("```\n  level: \"warn\",\n```");
+        const result = await tryLlmFallbackResolve(MOCK_HUNK, "src/config.ts", "", {
+            enabled: true,
+            endpoint,
+        });
+        expect(result.llmTrace.promptHash).toMatch(/^[0-9a-f]{64}$/);
+    });
+    it("LlmTrace — rawResponseTruncated est ≤ 500 chars", async () => {
+        const longResponse = "x".repeat(1000);
+        const endpoint = makeMockEndpoint(longResponse);
+        const result = await tryLlmFallbackResolve(MOCK_HUNK, "src/config.ts", "", {
+            enabled: true,
+            endpoint,
+        });
+        expect(result.llmTrace.rawResponseTruncated.length).toBeLessThanOrEqual(500);
+    });
+    it("LlmTrace — calledAt est un ISO 8601 valide", async () => {
+        const endpoint = makeMockEndpoint("```\n  level: \"warn\",\n```");
+        const result = await tryLlmFallbackResolve(MOCK_HUNK, "src/config.ts", "", {
+            enabled: true,
+            endpoint,
+        });
+        expect(() => new Date(result.llmTrace.calledAt)).not.toThrow();
+        expect(new Date(result.llmTrace.calledAt).toISOString()).toBe(result.llmTrace.calledAt);
+    });
+    it("LlmTrace — model par défaut est claude-sonnet-4-6", async () => {
+        const endpoint = makeMockEndpoint("```\n  level: \"warn\",\n```");
+        const result = await tryLlmFallbackResolve(MOCK_HUNK, "src/config.ts", "", {
+            enabled: true,
+            endpoint,
+        });
+        expect(result.llmTrace.model).toBe("claude-sonnet-4-6");
+    });
+    it("refus si validationScore < minPostMergeScore (marqueurs résiduels)", async () => {
+        // Endpoint qui retourne des marqueurs de conflit résiduels
+        const endpoint = makeMockEndpoint("```\n<<<<<<< ours\n  bad content\n>>>>>>> theirs\n```");
+        const result = await tryLlmFallbackResolve(MOCK_HUNK, "src/config.ts", "", {
+            enabled: true,
+            endpoint,
+            minPostMergeScore: 80,
+        });
+        expect(result.lines).toBeNull();
+        expect(result.llmTrace.validationScore).toBe(0);
+        expect(result.llmTrace.accepted).toBe(false);
+    });
+});
+// ─── 3. resolveAsync — intégration LLM fallback ───────────────
+describe("resolveAsync — sans llmFallback", () => {
+    it("un hunk complex reste complex et non résolu", async () => {
+        const result = await resolveAsync(COMPLEX_DIFF3, "src/config.ts");
+        expect(result.hunks[0].type).toBe("complex");
+        expect(result.stats.autoResolved).toBe(0);
+        expect(result.mergedContent).toBeNull();
+    });
+});
+describe("resolveAsync — avec llmFallback enabled sans endpoint", () => {
+    it("le hunk reste complex quand l'endpoint est absent (flag LLM non activé)", async () => {
+        // Sans endpoint, llmEnabled = false → setLlmFallbackEnabled jamais appelé
+        // → classification normale → "complex"
+        const result = await resolveAsync(COMPLEX_DIFF3, "src/config.ts", {
+            llmFallback: { enabled: true }, // enabled mais pas d'endpoint → llmEnabled = false
+        });
+        expect(result.hunks[0].type).toBe("complex");
+        expect(result.stats.autoResolved).toBe(0);
+        expect(result.mergedContent).toBeNull();
+    });
+});
+describe("resolveAsync — avec llmFallback enabled et endpoint mock", () => {
+    // Note : on utilise validationLevel: "off" pour éviter la validation parse-tree
+    // sur des contenus partiels (lignes de code hors d'un fichier complet).
+    // En production, l'appelant fournit un fichier complet qui parse correctement.
+    it("résout le hunk complex via LLM, mergedContent non null", async () => {
+        const resolvedLines = `  level: "warn",\n  format: "json",`;
+        const endpoint = makeMockEndpoint(`\`\`\`\n${resolvedLines}\n\`\`\``);
+        const result = await resolveAsync(COMPLEX_DIFF3, "src/config.ts", {
+            llmFallback: { enabled: true, endpoint },
+            validationLevel: "off",
+        });
+        expect(result.stats.autoResolved).toBe(1);
+        expect(result.mergedContent).not.toBeNull();
+        expect(result.hunks[0].type).toBe("llm_proposed");
+    });
+    it("la DecisionTrace contient llmTrace quand résolu par LLM", async () => {
+        const resolvedLines = `  level: "warn",\n  format: "json",`;
+        const endpoint = makeMockEndpoint(`\`\`\`\n${resolvedLines}\n\`\`\``);
+        const result = await resolveAsync(COMPLEX_DIFF3, "src/config.ts", {
+            llmFallback: { enabled: true, endpoint },
+            validationLevel: "off",
+        });
+        const hunk = result.resolutions[0].hunk;
+        expect(hunk.trace.llmTrace).toBeDefined();
+        expect(hunk.trace.llmTrace.accepted).toBe(true);
+        expect(hunk.trace.llmTrace.promptHash).toMatch(/^[0-9a-f]{64}$/);
+    });
+    it("reste non résolu si l'endpoint retourne CANNOT_RESOLVE", async () => {
+        const endpoint = makeMockEndpoint("CANNOT_RESOLVE");
+        const result = await resolveAsync(COMPLEX_DIFF3, "src/config.ts", {
+            llmFallback: { enabled: true, endpoint },
+            validationLevel: "off",
+        });
+        expect(result.stats.autoResolved).toBe(0);
+        expect(result.mergedContent).toBeNull();
+        // La trace LLM est quand même attachée pour l'audit
+        expect(result.resolutions[0].hunk.trace.llmTrace).toBeDefined();
+        expect(result.resolutions[0].hunk.trace.llmTrace.accepted).toBe(false);
+    });
+    it("les hunks déjà résolus (non-complex) ne sont pas re-classifiés llm_proposed", async () => {
+        // Conflit trivial + conflit complexe
+        const mixedInput = [
+            `<<<<<<< ours`,
+            `const x = 1;`,
+            `||||||| base`,
+            `const x = 1;`,
+            `=======`,
+            `const x = 1;`,
+            `>>>>>>> theirs`,
+            `some text`,
+            `<<<<<<< ours`,
+            `  level: "warn",`,
+            `||||||| base`,
+            `  level: "info",`,
+            `=======`,
+            `  level: "error",`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const endpoint = makeMockEndpoint("```\n  level: \"warn\",\n```");
+        const result = await resolveAsync(mixedInput, "src/config.ts", {
+            llmFallback: { enabled: true, endpoint },
+            validationLevel: "off",
+        });
+        // Premier hunk : same_change, auto-résolu par le moteur déterministe
+        expect(result.hunks[0].type).toBe("same_change");
+        // Deuxième hunk : llm_proposed, résolu via LLM
+        expect(result.hunks[1].type).toBe("llm_proposed");
+    });
+});
+//# sourceMappingURL=llm-proposed.test.js.map

package/dist/__tests__/patterns/llm-proposed.test.js.map

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

package/dist/__tests__/patterns/non-overlapping.test.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Tests du pattern non_overlapping (priority 40)
+ *
+ * Nécessite diff3 (base obligatoire).
+ * Détection : l'algorithme mergeNonOverlapping() interne réussit —
+ * les zones modifiées par ours et theirs ne se chevauchent pas.
+ * Cas typique : ours ajoute des lignes en haut, theirs ajoute en bas.
+ * Auto-résolu en combinant les deux ensembles de changements.
+ */
+export {};
+//# sourceMappingURL=non-overlapping.test.d.ts.map

package/dist/__tests__/patterns/non-overlapping.test.d.ts.map

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

package/dist/__tests__/patterns/non-overlapping.test.js

@@ -0,0 +1,240 @@
+/**
+ * Tests du pattern non_overlapping (priority 40)
+ *
+ * Nécessite diff3 (base obligatoire).
+ * Détection : l'algorithme mergeNonOverlapping() interne réussit —
+ * les zones modifiées par ours et theirs ne se chevauchent pas.
+ * Cas typique : ours ajoute des lignes en haut, theirs ajoute en bas.
+ * Auto-résolu en combinant les deux ensembles de changements.
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── Cas qui doivent matcher non_overlapping ─────────────────
+describe("non_overlapping : ours insère en haut, theirs insère en bas (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  INSERTED_BY_OURS,`,
+        `  alpha,`,
+        `  beta,`,
+        `||||||| base`,
+        `  alpha,`,
+        `  beta,`,
+        `=======`,
+        `  alpha,`,
+        `  beta,`,
+        `  INSERTED_BY_THEIRS,`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en non_overlapping", () => {
+        const result = resolve(input, "src/list.ts");
+        expect(result.hunks[0].type).toBe("non_overlapping");
+    });
+    it("auto-résout (autoResolved === 1)", () => {
+        const result = resolve(input, "src/list.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient les insertions des deux côtés", () => {
+        const result = resolve(input, "src/list.ts");
+        const merged = result.mergedContent;
+        expect(merged).toContain("INSERTED_BY_OURS");
+        expect(merged).toContain("INSERTED_BY_THEIRS");
+        expect(merged).toContain("alpha");
+        expect(merged).toContain("beta");
+    });
+});
+describe("non_overlapping : ours modifie première ligne, theirs modifie dernière ligne (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  host: "prod.example.com",`,
+        `  port: 5432,`,
+        `  name: "mydb",`,
+        `||||||| base`,
+        `  host: "localhost",`,
+        `  port: 5432,`,
+        `  name: "mydb",`,
+        `=======`,
+        `  host: "localhost",`,
+        `  port: 5432,`,
+        `  name: "production_db",`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en non_overlapping", () => {
+        const result = resolve(input, "src/db-config.ts");
+        expect(result.hunks[0].type).toBe("non_overlapping");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/db-config.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat combine les deux modifications", () => {
+        const result = resolve(input, "src/db-config.ts");
+        const merged = result.mergedContent;
+        expect(merged).toContain("prod.example.com");
+        expect(merged).toContain("production_db");
+    });
+});
+describe("non_overlapping : ours ajoute avant, theirs ajoute au milieu (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  alpha,`,
+        `  INSERTED_BY_OURS,`,
+        `  beta,`,
+        `  gamma,`,
+        `||||||| base`,
+        `  alpha,`,
+        `  beta,`,
+        `  gamma,`,
+        `=======`,
+        `  alpha,`,
+        `  beta,`,
+        `  INSERTED_BY_THEIRS,`,
+        `  gamma,`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en non_overlapping", () => {
+        const result = resolve(input, "src/items.ts");
+        expect(result.hunks[0].type).toBe("non_overlapping");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/items.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+describe("non_overlapping : modifications sur lignes distinctes (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  firstName: "John",`,
+        `  age: 30,`,
+        `  city: "Paris",`,
+        `||||||| base`,
+        `  firstName: "John",`,
+        `  age: 25,`,
+        `  city: "Paris",`,
+        `=======`,
+        `  firstName: "Jane",`,
+        `  age: 25,`,
+        `  city: "Paris",`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en non_overlapping", () => {
+        const result = resolve(input, "src/user.ts");
+        expect(result.hunks[0].type).toBe("non_overlapping");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/user.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+describe("non_overlapping : ajout d'imports dans des branches (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `import { ComponentA } from "./a";`,
+        `import { NewFromOurs } from "./ours";`,
+        `import { ComponentB } from "./b";`,
+        `||||||| base`,
+        `import { ComponentA } from "./a";`,
+        `import { ComponentB } from "./b";`,
+        `=======`,
+        `import { ComponentA } from "./a";`,
+        `import { ComponentB } from "./b";`,
+        `import { NewFromTheirs } from "./theirs";`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en non_overlapping", () => {
+        const result = resolve(input, "src/imports.ts");
+        expect(result.hunks[0].type).toBe("non_overlapping");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/imports.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("le résultat contient les imports des deux branches", () => {
+        const result = resolve(input, "src/imports.ts");
+        const merged = result.mergedContent;
+        expect(merged).toContain("NewFromOurs");
+        expect(merged).toContain("NewFromTheirs");
+    });
+});
+// ─── Cas qui ne doivent PAS matcher non_overlapping ──────────
+describe("non_overlapping : cas qui ne doivent pas matcher", () => {
+    it("ne matche pas si les deux côtés modifient la même ligne", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  value: "ours",`,
+            `||||||| base`,
+            `  value: "base",`,
+            `=======`,
+            `  value: "theirs",`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // Les deux modifient la même ligne → pas non_overlapping
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("non_overlapping");
+    });
+    it("ne matche pas si les deux insèrent la même ligne (same_change prioritaire)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  foo,`,
+            `  SAME_INSERTION,`,
+            `||||||| base`,
+            `  foo,`,
+            `=======`,
+            `  foo,`,
+            `  SAME_INSERTION,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // same_change (prio 10) prend la main
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+    it("ne matche pas sans base (diff2)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  alpha,`,
+            `  OURS,`,
+            `  beta,`,
+            `=======`,
+            `  alpha,`,
+            `  beta,`,
+            `  THEIRS,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // Sans base on ne peut pas appliquer non_overlapping
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("non_overlapping");
+    });
+    it("ne matche pas si les deux côtés modifient des zones adjacentes qui se chevauchent", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  a: 1,`,
+            `  b: 20,`,
+            `  c: 30,`,
+            `||||||| base`,
+            `  a: 1,`,
+            `  b: 2,`,
+            `  c: 3,`,
+            `=======`,
+            `  a: 1,`,
+            `  b: 200,`,
+            `  c: 300,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // Les deux modifient b et c → chevauchement
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("non_overlapping");
+    });
+    it("ne matche pas si ours === theirs (same_change prioritaire)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  x: 42,`,
+            `||||||| base`,
+            `  x: 1,`,
+            `=======`,
+            `  x: 42,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+});
+//# sourceMappingURL=non-overlapping.test.js.map

package/dist/__tests__/patterns/non-overlapping.test.js.map

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

package/dist/__tests__/patterns/one-side-change.test.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Tests du pattern one_side_change (priority 30)
+ *
+ * Nécessite diff3 (base obligatoire).
+ * Détection : (ours === base ET theirs ≠ base) OU (ours ≠ base ET theirs === base).
+ * Un seul côté a modifié par rapport à la base — l'autre est resté identique.
+ * Auto-résolu en prenant le côté qui a changé.
+ */
+export {};
+//# sourceMappingURL=one-side-change.test.d.ts.map

package/dist/__tests__/patterns/one-side-change.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"one-side-change.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/patterns/one-side-change.test.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG"}