@gitwand/core 2.3.0 → 2.5.0

package/dist/__tests__/patterns/complex.test.js

@@ -0,0 +1,198 @@
+/**
+ * Tests du pattern complex (priority 999)
+ *
+ * Fallback universel — toujours détecté quand aucun autre pattern ne s'applique.
+ * Jamais auto-résolu : stats.autoResolved === 0.
+ * Ne pas utiliser toBe sur mergedContent pour complex (ne résout pas).
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── Cas qui doivent matcher complex ─────────────────────────
+describe("complex : modifications conflictuelles sur la même zone (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  level: "warn",`,
+        `  format: "json",`,
+        `||||||| base`,
+        `  level: "info",`,
+        `  format: "text",`,
+        `=======`,
+        `  level: "error",`,
+        `  format: "logfmt",`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en complex", () => {
+        const result = resolve(input, "src/logger.ts");
+        expect(result.hunks[0].type).toBe("complex");
+    });
+    it("n'est pas auto-résolu (autoResolved === 0)", () => {
+        const result = resolve(input, "src/logger.ts");
+        expect(result.stats.autoResolved).toBe(0);
+    });
+});
+describe("complex : restructuration incompatible (diff2)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `export default class UserService {`,
+        `  constructor(private db: Database) {}`,
+        `  async getUser(id: string) {`,
+        `    return this.db.find(id);`,
+        `  }`,
+        `}`,
+        `=======`,
+        `export const userService = {`,
+        `  getUser: async (id: string, db: Database) => db.find(id),`,
+        `};`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en complex", () => {
+        const result = resolve(input, "src/user-service.ts");
+        expect(result.hunks[0].type).toBe("complex");
+    });
+    it("n'est pas auto-résolu", () => {
+        const result = resolve(input, "src/user-service.ts");
+        expect(result.stats.autoResolved).toBe(0);
+    });
+});
+describe("complex : logique métier conflictuelle (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  if (user.role === "admin") {`,
+        `    return true;`,
+        `  }`,
+        `  return user.permissions.includes("write");`,
+        `||||||| base`,
+        `  return user.isAdmin;`,
+        `=======`,
+        `  const allowed = ["admin", "editor", "moderator"];`,
+        `  return allowed.includes(user.role);`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en complex", () => {
+        const result = resolve(input, "src/auth.ts");
+        expect(result.hunks[0].type).toBe("complex");
+    });
+    it("n'est pas auto-résolu", () => {
+        const result = resolve(input, "src/auth.ts");
+        expect(result.stats.autoResolved).toBe(0);
+    });
+});
+describe("complex : renommages incompatibles (diff2)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  const fetchUserData = async (userId: string) => {`,
+        `    const response = await apiClient.get(\`/users/\${userId}\`);`,
+        `    return response.data;`,
+        `  };`,
+        `=======`,
+        `  const loadProfile = async (profileId: string) => {`,
+        `    const res = await http.request("GET", \`/profiles/\${profileId}\`);`,
+        `    return res.json();`,
+        `  };`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en complex", () => {
+        const result = resolve(input, "src/api.ts");
+        expect(result.hunks[0].type).toBe("complex");
+    });
+    it("n'est pas auto-résolu", () => {
+        const result = resolve(input, "src/api.ts");
+        expect(result.stats.autoResolved).toBe(0);
+    });
+});
+describe("complex : changements structurels incompatibles sur le même bloc (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `type Status = "active" | "inactive" | "pending" | "banned";`,
+        `||||||| base`,
+        `type Status = "active" | "inactive";`,
+        `=======`,
+        `enum Status {`,
+        `  Active = "active",`,
+        `  Inactive = "inactive",`,
+        `  Archived = "archived",`,
+        `}`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en complex", () => {
+        const result = resolve(input, "src/types.ts");
+        expect(result.hunks[0].type).toBe("complex");
+    });
+    it("n'est pas auto-résolu", () => {
+        const result = resolve(input, "src/types.ts");
+        expect(result.stats.autoResolved).toBe(0);
+    });
+});
+// ─── Vérification que complex n'absorbe pas les patterns auto-résolubles ────
+describe("complex : ne capture pas les patterns auto-résolubles", () => {
+    it("same_change (prio 10) ne tombe pas en complex", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `const x = 1;`,
+            `=======`,
+            `const x = 1;`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("complex");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("delete_no_change (prio 20) ne tombe pas en complex", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `=======`,
+            `  someOldLine: true,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        // delete_no_change détecté en diff2 avec confiance "medium" (48) — non auto-résolu
+        // par défaut (seuil "high"), mais le type est bien delete_no_change, PAS complex.
+        expect(result.hunks[0].type).not.toBe("complex");
+        expect(result.hunks[0].type).toBe("delete_no_change");
+    });
+    it("one_side_change (prio 30) ne tombe pas en complex", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  timeout: 3000,`,
+            `||||||| base`,
+            `  timeout: 3000,`,
+            `=======`,
+            `  timeout: 9000,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("complex");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("whitespace_only (prio 50) ne tombe pas en complex", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `    const y = 2;`,
+            `=======`,
+            `  const y = 2;`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("complex");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+    it("complex a un score sous le seuil high (non auto-résolu)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  foo: "completely",`,
+            `  bar: "different",`,
+            `||||||| base`,
+            `  foo: "original",`,
+            `=======`,
+            `  baz: "also",`,
+            `  qux: "different",`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("complex");
+        // makeScore(100, 100, 0) → 100 − 100×0.40 = 60 — sous le seuil "high" (68)
+        expect(result.hunks[0].confidence.score).toBeLessThan(68);
+        expect(result.stats.autoResolved).toBe(0);
+    });
+});
+//# sourceMappingURL=complex.test.js.map

package/dist/__tests__/patterns/complex.test.js.map

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

package/dist/__tests__/patterns/delete-no-change.test.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Tests du pattern delete_no_change (priority 20)
+ *
+ * Détection (diff3) : un côté supprime (vide), l'autre n'a pas changé par
+ * rapport à la base. Cas : (ours vide ET theirs === base) OU (theirs vide
+ * ET ours === base).
+ * Détection (diff2) : ours vide OU theirs vide.
+ * Auto-résolu (la suppression gagne).
+ */
+export {};
+//# sourceMappingURL=delete-no-change.test.d.ts.map

package/dist/__tests__/patterns/delete-no-change.test.d.ts.map

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

package/dist/__tests__/patterns/delete-no-change.test.js

@@ -0,0 +1,178 @@
+/**
+ * Tests du pattern delete_no_change (priority 20)
+ *
+ * Détection (diff3) : un côté supprime (vide), l'autre n'a pas changé par
+ * rapport à la base. Cas : (ours vide ET theirs === base) OU (theirs vide
+ * ET ours === base).
+ * Détection (diff2) : ours vide OU theirs vide.
+ * Auto-résolu (la suppression gagne).
+ */
+import { describe, it, expect } from "vitest";
+import { resolve } from "../../resolver.js";
+// ─── Cas qui doivent matcher delete_no_change ─────────────────
+describe("delete_no_change : ours supprime, theirs inchangé (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `||||||| base`,
+        `  legacyFlag: true,`,
+        `=======`,
+        `  legacyFlag: true,`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en delete_no_change", () => {
+        const result = resolve(input, "src/config.ts");
+        expect(result.hunks[0].type).toBe("delete_no_change");
+    });
+    it("auto-résout (autoResolved === 1)", () => {
+        const result = resolve(input, "src/config.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+describe("delete_no_change : theirs supprime, ours inchangé (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  deprecatedOption: false,`,
+        `||||||| base`,
+        `  deprecatedOption: false,`,
+        `=======`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en delete_no_change", () => {
+        const result = resolve(input, "src/config.ts");
+        expect(result.hunks[0].type).toBe("delete_no_change");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/config.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+describe("delete_no_change : ours supprime multi-lignes (diff3)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `||||||| base`,
+        `  // Old comment block`,
+        `  // that spans multiple lines`,
+        `  oldVar = 42;`,
+        `=======`,
+        `  // Old comment block`,
+        `  // that spans multiple lines`,
+        `  oldVar = 42;`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en delete_no_change", () => {
+        const result = resolve(input, "src/legacy.ts");
+        expect(result.hunks[0].type).toBe("delete_no_change");
+    });
+    it("auto-résout", () => {
+        const result = resolve(input, "src/legacy.ts");
+        expect(result.stats.autoResolved).toBe(1);
+    });
+});
+describe("delete_no_change : ours vide (diff2)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `=======`,
+        `  someRemovedLine: true,`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en delete_no_change", () => {
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("delete_no_change");
+    });
+    // En diff2, le score de confiance est "low" (60 − pénalité 30 = 30) — sous le seuil
+    // auto-résolution par défaut (high = 68). Le pattern est détecté mais pas appliqué.
+    it("ne plante pas — confiance low en diff2", () => {
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("delete_no_change");
+        // makeScore(60, 30, 0) → 60 − 30×0.40 = 48 → "medium" (sous le seuil "high" pour auto-résolution)
+        expect(result.hunks[0].confidence.label).toBe("medium");
+    });
+});
+describe("delete_no_change : theirs vide (diff2)", () => {
+    const input = [
+        `<<<<<<< ours`,
+        `  anotherOldLine = "legacy";`,
+        `=======`,
+        `>>>>>>> theirs`,
+    ].join("\n");
+    it("classifie en delete_no_change", () => {
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("delete_no_change");
+    });
+    // En diff2, confiance "low" — pas auto-résolu par défaut
+    it("ne plante pas — confiance low en diff2", () => {
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("delete_no_change");
+        // makeScore(60, 30, 0) → 60 − 30×0.40 = 48 → "medium" (sous le seuil "high" pour auto-résolution)
+        expect(result.hunks[0].confidence.label).toBe("medium");
+    });
+});
+// ─── Cas qui ne doivent PAS matcher delete_no_change ─────────
+describe("delete_no_change : cas qui ne doivent pas matcher", () => {
+    it("ne matche pas si les deux côtés ont du contenu différent (les deux ont modifié)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  flag: true,`,
+            `||||||| base`,
+            `  flag: false,`,
+            `=======`,
+            `  flag: "maybe",`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("delete_no_change");
+    });
+    it("ne matche pas si ours modifie (sans supprimer) et theirs === base", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  value: 99,`,
+            `||||||| base`,
+            `  value: 1,`,
+            `=======`,
+            `  value: 1,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // ours modifie, theirs inchangé → one_side_change (prio 30)
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("delete_no_change");
+    });
+    it("ne matche pas si les deux côtés suppriment (same_change)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `||||||| base`,
+            `  removed: true,`,
+            `=======`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // Les deux suppriment → same_change (prio 10)
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).toBe("same_change");
+    });
+    it("ne matche pas si ours et theirs ont des contenus distincts non vides", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  optionA: 1,`,
+            `=======`,
+            `  optionB: 2,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("delete_no_change");
+    });
+    it("ne matche pas si ours ajoute par rapport à la base (theirs garde la base)", () => {
+        const input = [
+            `<<<<<<< ours`,
+            `  existing: true,`,
+            `  newField: "added",`,
+            `||||||| base`,
+            `  existing: true,`,
+            `=======`,
+            `  existing: true,`,
+            `>>>>>>> theirs`,
+        ].join("\n");
+        // ours ajoute une ligne → insertion, pas suppression
+        const result = resolve(input, "src/test.ts");
+        expect(result.hunks[0].type).not.toBe("delete_no_change");
+    });
+});
+//# sourceMappingURL=delete-no-change.test.js.map

package/dist/__tests__/patterns/delete-no-change.test.js.map

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

package/dist/__tests__/patterns/llm-proposed.test.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 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
+ */
+export {};
+//# sourceMappingURL=llm-proposed.test.d.ts.map

package/dist/__tests__/patterns/llm-proposed.test.d.ts.map

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