@gitwand/core 3.3.0 → 3.5.0

package/dist/__tests__/secrets/scanner.test.js

@@ -0,0 +1,211 @@
+import { describe, it, expect } from "vitest";
+import { scanSecrets, shannonEntropy, redact, isIgnored } from "../../secrets/scanner.js";
+function baseConfig(overrides = {}) {
+    return {
+        enabled: true,
+        extraPatterns: [],
+        ignore: [],
+        entropyThreshold: 0,
+        ...overrides,
+    };
+}
+function fileWith(path, lines) {
+    return {
+        path,
+        addedLines: lines.map((text, i) => ({ line: i + 1, text })),
+    };
+}
+describe("v3.5.0 — scanSecrets", () => {
+    it("detects each built-in pattern in a realistic added line", () => {
+        const files = [
+            fileWith("src/config.ts", ['const key = "AKIAABCDEFGHIJKLMNOP";']),
+        ];
+        const findings = scanSecrets(files, baseConfig());
+        expect(findings.length).toBeGreaterThan(0);
+        expect(findings[0].patternId).toBe("aws_access_key_id");
+        expect(findings[0].file).toBe("src/config.ts");
+        expect(findings[0].line).toBe(1);
+        expect(findings[0].severity).toBe("high");
+    });
+    it("detects a github classic PAT", () => {
+        const files = [
+            fileWith("src/x.ts", ['const t = "ghp_ABCDEFABCDEFABCDEFABCDEFABCDEFABCDEF";']),
+        ];
+        const findings = scanSecrets(files, baseConfig());
+        expect(findings.some((f) => f.patternId === "github_pat_classic")).toBe(true);
+    });
+    it("detects a private key header", () => {
+        const files = [fileWith("id_rsa", ["-----BEGIN RSA PRIVATE KEY-----"])];
+        const findings = scanSecrets(files, baseConfig());
+        expect(findings.some((f) => f.patternId === "private_key_header")).toBe(true);
+    });
+    it("detects a user extraPattern", () => {
+        const files = [fileWith("src/x.ts", ['const t = "itok_deadbeefdeadbeef";'])];
+        const config = baseConfig({
+            extraPatterns: [
+                { id: "internal_token", regex: "itok_[0-9a-f]{16}", severity: "high", description: "" },
+            ],
+        });
+        const findings = scanSecrets(files, config);
+        expect(findings.some((f) => f.patternId === "internal_token")).toBe(true);
+    });
+    it("skips a malformed user extraPattern regex without throwing", () => {
+        const files = [fileWith("src/x.ts", ["hello world"])];
+        const config = baseConfig({
+            extraPatterns: [{ id: "bad", regex: "(unterminated[", severity: "high", description: "" }],
+        });
+        expect(() => scanSecrets(files, config)).not.toThrow();
+    });
+    it("an ignore glob suppresses findings on a matching path", () => {
+        const files = [
+            fileWith("fixtures/sample.ts", ['const key = "AKIAABCDEFGHIJKLMNOP";']),
+        ];
+        const config = baseConfig({ ignore: ["fixtures/**"] });
+        const findings = scanSecrets(files, config);
+        expect(findings).toEqual([]);
+    });
+    it("an ignore /regex/ literal suppresses a specific value", () => {
+        const files = [fileWith("src/x.ts", ['const key = "AKIAABCDEFGHIJKLMNOP";'])];
+        const config = baseConfig({ ignore: ["/AKIAABCDEFGHIJKLMNOP/"] });
+        const findings = scanSecrets(files, config);
+        expect(findings).toEqual([]);
+    });
+    it("ignore does not suppress a non-matching path or value", () => {
+        const files = [fileWith("src/x.ts", ['const key = "AKIAABCDEFGHIJKLMNOP";'])];
+        const config = baseConfig({ ignore: ["other/**", "/NOTTHEKEY/"] });
+        const findings = scanSecrets(files, config);
+        expect(findings.length).toBe(1);
+    });
+    it("entropy pass finds a random 40-char base64-like blob when threshold enabled", () => {
+        const files = [
+            fileWith("src/x.ts", ['const token = "aZ3xQ9mK2pL7vN5wR8tY1cB4fH6jD0sE2gU9iO3k";']),
+        ];
+        const config = baseConfig({ entropyThreshold: 4.0 });
+        const findings = scanSecrets(files, config);
+        expect(findings.some((f) => f.patternId === "high_entropy")).toBe(true);
+        const hit = findings.find((f) => f.patternId === "high_entropy");
+        expect(hit?.severity).toBe("low");
+    });
+    it("entropy pass does not flag an English sentence", () => {
+        const files = [
+            fileWith("src/x.ts", ["this is a perfectly normal english sentence about nothing"]),
+        ];
+        const config = baseConfig({ entropyThreshold: 4.0 });
+        const findings = scanSecrets(files, config);
+        expect(findings.filter((f) => f.patternId === "high_entropy")).toEqual([]);
+    });
+    it("entropy pass does not flag a long hex git SHA when threshold set above hex's max entropy", () => {
+        const files = [
+            fileWith("src/x.ts", ["commit deadbeefcafe0123456789abcdef01234567deadbeefcafe0123456789"]),
+        ];
+        const config = baseConfig({ entropyThreshold: 4.5 });
+        const findings = scanSecrets(files, config);
+        expect(findings.filter((f) => f.patternId === "high_entropy")).toEqual([]);
+    });
+    it("entropy pass is skipped entirely when entropyThreshold is 0", () => {
+        const files = [
+            fileWith("src/x.ts", ['const token = "aZ3xQ9mK2pL7vN5wR8tY1cB4fH6jD0sE2gU9iO3k";']),
+        ];
+        const findings = scanSecrets(files, baseConfig({ entropyThreshold: 0 }));
+        expect(findings).toEqual([]);
+    });
+    it("entropy pass does not double-report a token already covered by a regex hit on the same line", () => {
+        const files = [fileWith("src/x.ts", ['const key = "AKIAABCDEFGHIJKLMNOP";'])];
+        const config = baseConfig({ entropyThreshold: 3.0 });
+        const findings = scanSecrets(files, config);
+        // only the regex hit, no additional high_entropy finding for the same token
+        expect(findings.length).toBe(1);
+        expect(findings[0].patternId).toBe("aws_access_key_id");
+    });
+    it("redaction never contains the raw planted secret verbatim", () => {
+        const secret = "AKIAABCDEFGHIJKLMNOP";
+        const files = [fileWith("src/x.ts", [`const key = "${secret}";`])];
+        const findings = scanSecrets(files, baseConfig());
+        for (const f of findings) {
+            expect(f.redactedExcerpt).not.toBe(secret);
+            expect(f.redactedExcerpt.includes(secret)).toBe(false);
+        }
+    });
+    it("enabled: false returns []", () => {
+        const files = [fileWith("src/x.ts", ['const key = "AKIAABCDEFGHIJKLMNOP";'])];
+        const findings = scanSecrets(files, baseConfig({ enabled: false }));
+        expect(findings).toEqual([]);
+    });
+    it("caps total findings at 500", () => {
+        const lines = Array.from({ length: 600 }, (_, i) => `const key${i} = "AKIAABCDEFGHIJKLMNOP";`);
+        const files = [fileWith("src/x.ts", lines)];
+        const findings = scanSecrets(files, baseConfig());
+        expect(findings.length).toBe(500);
+    });
+});
+describe("v3.5.0 — default generated-file ignore globs (D5)", () => {
+    const HIGH_ENTROPY_LINE = "  integrity: sha512-aB3dE5fG7hI9jK1lM3nO5pQ7rS9tU1vW3xY5zA7bC9dE1fG3hI5jK7lM9nO1pQ3rS5tU7vW9xY1zA3bC5dE7fG9==";
+    it("does not flag a pnpm-lock.yaml integrity hash at the default entropy threshold", () => {
+        const files = [fileWith("pnpm-lock.yaml", [HIGH_ENTROPY_LINE])];
+        const findings = scanSecrets(files, baseConfig({ entropyThreshold: 4.0 }));
+        expect(findings).toEqual([]);
+    });
+    it("still flags the same high-entropy content in a non-excluded file", () => {
+        const files = [fileWith("src/config.ts", [HIGH_ENTROPY_LINE])];
+        const findings = scanSecrets(files, baseConfig({ entropyThreshold: 4.0 }));
+        expect(findings.some((f) => f.patternId === "high_entropy")).toBe(true);
+    });
+    it.each([
+        "package-lock.json",
+        "pnpm-lock.yaml",
+        "yarn.lock",
+        "Cargo.lock",
+        "vendor/foo.lock",
+        "assets/app.min.js",
+        "assets/app.min.css",
+        "dist/bundle.js",
+        "build/output.js",
+        "node_modules/pkg/index.js",
+        "coverage/lcov.info.map",
+    ])("suppresses %s by default", (path) => {
+        const files = [fileWith(path, [HIGH_ENTROPY_LINE])];
+        const findings = scanSecrets(files, baseConfig({ entropyThreshold: 4.0 }));
+        expect(findings).toEqual([]);
+    });
+    it("user-supplied ignore entries are additive on top of the built-in defaults", () => {
+        const config = baseConfig({ entropyThreshold: 4.0, ignore: ["custom/**"] });
+        const customFiles = [fileWith("custom/ignored.ts", [HIGH_ENTROPY_LINE])];
+        expect(scanSecrets(customFiles, config)).toEqual([]);
+        // The built-in lockfile default still applies even with a non-empty user ignore list.
+        const lockFiles = [fileWith("pnpm-lock.yaml", [HIGH_ENTROPY_LINE])];
+        expect(scanSecrets(lockFiles, config)).toEqual([]);
+    });
+});
+describe("v3.5.0 — shannonEntropy", () => {
+    it("returns 0 for an empty string", () => {
+        expect(shannonEntropy("")).toBe(0);
+    });
+    it("returns 0 for a single repeated character", () => {
+        expect(shannonEntropy("aaaaaaaaaa")).toBe(0);
+    });
+    it("returns higher entropy for a varied string than a repetitive one", () => {
+        expect(shannonEntropy("aZ3xQ9mK2pL7vN5wR8tY")).toBeGreaterThan(shannonEntropy("aaaaaaaaaaaaaaaaaaaa"));
+    });
+});
+describe("v3.5.0 — redact", () => {
+    it("never returns the raw input verbatim for a long match", () => {
+        const raw = "ghp_ABCDEFABCDEFABCDEFABCDEFABCDEFABCDEF";
+        expect(redact(raw)).not.toBe(raw);
+    });
+    it("fully masks very short matches (no leak via lead+trail)", () => {
+        const raw = "abc";
+        const out = redact(raw);
+        expect(out).not.toContain("abc");
+    });
+});
+describe("v3.5.0 — isIgnored", () => {
+    it("matches a glob against the file path", () => {
+        expect(isIgnored("fixtures/a.ts", "whatever", ["fixtures/**"])).toBe(true);
+        expect(isIgnored("src/a.ts", "whatever", ["fixtures/**"])).toBe(false);
+    });
+    it("matches a /regex/ literal against the value", () => {
+        expect(isIgnored("src/a.ts", "AKIAABCDEFGHIJKLMNOP", ["/AKIAABCDEFGHIJKLMNOP/"])).toBe(true);
+        expect(isIgnored("src/a.ts", "somethingelse", ["/AKIAABCDEFGHIJKLMNOP/"])).toBe(false);
+    });
+});
+//# sourceMappingURL=scanner.test.js.map

package/dist/__tests__/secrets/scanner.test.js.map

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

package/dist/__tests__/stats/tiers.test.d.ts

@@ -0,0 +1,16 @@
+/**
+ * summarizeTiers() — "recoverable-before-model" metric (v2.7).
+ *
+ * Design: docs/superpowers/specs/2026-07-07-recoverable-before-model-metric-design.md §4.B
+ *
+ * Pure derived summary over `MergeStats.byType` — not a change to resolution
+ * logic. Tiers:
+ *   trivial              — same_change, delete_no_change, one_side_change,
+ *                           non_overlapping, whitespace_only, reorder_only,
+ *                           insertion_at_boundary, value_only_change, generated_file
+ *   advancedDeterministic — refactoring_aware_merge, token_level_merge
+ *   model                 — llm_proposed
+ *   unresolved            — complex
+ */
+export {};
+//# sourceMappingURL=tiers.test.d.ts.map

package/dist/__tests__/stats/tiers.test.d.ts.map

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

package/dist/__tests__/stats/tiers.test.js

@@ -0,0 +1,97 @@
+/**
+ * summarizeTiers() — "recoverable-before-model" metric (v2.7).
+ *
+ * Design: docs/superpowers/specs/2026-07-07-recoverable-before-model-metric-design.md §4.B
+ *
+ * Pure derived summary over `MergeStats.byType` — not a change to resolution
+ * logic. Tiers:
+ *   trivial              — same_change, delete_no_change, one_side_change,
+ *                           non_overlapping, whitespace_only, reorder_only,
+ *                           insertion_at_boundary, value_only_change, generated_file
+ *   advancedDeterministic — refactoring_aware_merge, token_level_merge
+ *   model                 — llm_proposed
+ *   unresolved            — complex
+ */
+import { describe, it, expect } from "vitest";
+import { summarizeTiers } from "../../stats/tiers.js";
+/** Build a `byType` map with all ConflictTypes defaulted to 0, overridden by `counts`. */
+function byType(counts) {
+    const ALL = [
+        "one_side_change", "same_change", "non_overlapping", "whitespace_only",
+        "delete_no_change", "generated_file", "value_only_change", "reorder_only",
+        "insertion_at_boundary", "token_level_merge", "llm_proposed",
+        "refactoring_aware_merge", "complex",
+    ];
+    const base = Object.fromEntries(ALL.map((t) => [t, 0]));
+    return { ...base, ...counts };
+}
+describe("summarizeTiers — mapping des tiers", () => {
+    it("classe les types triviaux dans 'trivial'", () => {
+        const s = summarizeTiers(byType({
+            same_change: 3, delete_no_change: 1, one_side_change: 2, non_overlapping: 1,
+            whitespace_only: 1, reorder_only: 1, insertion_at_boundary: 1, value_only_change: 1,
+            generated_file: 1,
+        }));
+        expect(s.byTier.trivial).toBe(12);
+        expect(s.byTier.advancedDeterministic).toBe(0);
+        expect(s.byTier.model).toBe(0);
+        expect(s.byTier.unresolved).toBe(0);
+    });
+    it("classe refactoring_aware_merge et token_level_merge dans 'advancedDeterministic'", () => {
+        const s = summarizeTiers(byType({ refactoring_aware_merge: 2, token_level_merge: 3 }));
+        expect(s.byTier.advancedDeterministic).toBe(5);
+    });
+    it("classe llm_proposed dans 'model'", () => {
+        const s = summarizeTiers(byType({ llm_proposed: 4 }));
+        expect(s.byTier.model).toBe(4);
+    });
+    it("classe complex dans 'unresolved'", () => {
+        const s = summarizeTiers(byType({ complex: 7 }));
+        expect(s.byTier.unresolved).toBe(7);
+    });
+});
+describe("summarizeTiers — calcul residual / aiReachable / recoverableBeforeModel", () => {
+    it("residual = advancedDeterministic + model + unresolved (exclut trivial)", () => {
+        const s = summarizeTiers(byType({
+            same_change: 100, // trivial — hors résidu
+            refactoring_aware_merge: 3,
+            token_level_merge: 2,
+            llm_proposed: 4,
+            complex: 1,
+        }));
+        expect(s.residual).toBe(10); // 3 + 2 + 4 + 1
+    });
+    it("aiReachable = model + unresolved", () => {
+        const s = summarizeTiers(byType({ llm_proposed: 4, complex: 1, refactoring_aware_merge: 3 }));
+        expect(s.aiReachable).toBe(5);
+    });
+    it("recoverableBeforeModel = advancedDeterministic / residual", () => {
+        const s = summarizeTiers(byType({
+            refactoring_aware_merge: 6,
+            token_level_merge: 5, // advancedDeterministic = 11
+            llm_proposed: 6,
+            complex: 5, // aiReachable = 11 → residual = 22
+        }));
+        expect(s.recoverableBeforeModel).toBeCloseTo(11 / 22, 10);
+    });
+    it("residual === 0 → recoverableBeforeModel vaut 0 (pas NaN/Infinity)", () => {
+        const s = summarizeTiers(byType({ same_change: 5 })); // tout trivial, rien dans le résidu
+        expect(s.residual).toBe(0);
+        expect(s.recoverableBeforeModel).toBe(0);
+        expect(Number.isNaN(s.recoverableBeforeModel)).toBe(false);
+    });
+    it("byType vide (aucun conflit) → tout à 0, pas de crash", () => {
+        const s = summarizeTiers(byType({}));
+        expect(s.byTier).toEqual({ trivial: 0, advancedDeterministic: 0, model: 0, unresolved: 0 });
+        expect(s.residual).toBe(0);
+        expect(s.aiReachable).toBe(0);
+        expect(s.recoverableBeforeModel).toBe(0);
+    });
+    it("types absents de byType sont traités comme 0 (pas de crash sur objet partiel)", () => {
+        const partial = { same_change: 2 };
+        const s = summarizeTiers(partial);
+        expect(s.byTier.trivial).toBe(2);
+        expect(s.residual).toBe(0);
+    });
+});
+//# sourceMappingURL=tiers.test.js.map

package/dist/__tests__/stats/tiers.test.js.map

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

package/dist/__tests__/types.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.test.d.ts.map

package/dist/__tests__/types.test.d.ts.map

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

package/dist/__tests__/types.test.js

@@ -0,0 +1,26 @@
+import { describe, it, expect } from "vitest";
+describe("types : token_level_merge", () => {
+    it("ConflictType accepte 'token_level_merge'", () => {
+        const t = "token_level_merge";
+        expect(t).toBe("token_level_merge");
+    });
+    it("DecisionTrace peut porter un tokenMergeTrace optionnel", () => {
+        const trace = {
+            steps: [],
+            selected: "token_level_merge",
+            summary: "test",
+            hasBase: true,
+            tokenMergeTrace: {
+                mergedLines: ["a", "b"],
+                pass1Count: 1,
+                pass2Count: 1,
+                lineDetails: [
+                    { lineIndex: 0, resolvedBy: "pass1", resolvedLine: "a" },
+                    { lineIndex: 1, resolvedBy: "pass2", resolvedLine: "b" },
+                ],
+            },
+        };
+        expect(trace.tokenMergeTrace?.mergedLines).toEqual(["a", "b"]);
+    });
+});
+//# sourceMappingURL=types.test.js.map

package/dist/__tests__/types.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.test.js","sourceRoot":"","sources":["../../src/__tests__/types.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAG9C,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,CAAC,GAAiB,mBAAmB,CAAC;QAC5C,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,MAAM,KAAK,GAAkB;YAC3B,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,mBAAmB;YAC7B,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,IAAI;YACb,eAAe,EAAE;gBACf,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;gBACvB,UAAU,EAAE,CAAC;gBACb,UAAU,EAAE,CAAC;gBACb,WAAW,EAAE;oBACX,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE;oBACxD,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE;iBACzD;aACF;SACF,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/classifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"classifier.d.ts","sourceRoot":"","sources":["../src/classifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAyD,MAAM,YAAY,CAAC;AA6GvH;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,aAAa,GAAG,cAAc,CA6BpE"}
+{"version":3,"file":"classifier.d.ts","sourceRoot":"","sources":["../src/classifier.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAyD,MAAM,YAAY,CAAC;AAiHvH;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,aAAa,GAAG,cAAc,CAgCpE"}

package/dist/classifier.js

@@ -16,9 +16,11 @@ import whitespaceOnly from "./patterns/whitespace-only.js";
 import reorderOnly from "./patterns/reorder-only.js";
 import insertionAtBoundary from "./patterns/insertion-at-boundary.js";
 import valueOnlyChange from "./patterns/value-only-change.js";
+import tokenLevelMerge from "./patterns/token-level-merge.js"; // v2.7 — priority 65
 import llmProposed from "./patterns/llm-proposed.js"; // v2.5 — priority 998
 import refactoringAwareMerge from "./patterns/refactoring-aware-merge.js"; // v2.6 — priority 970
 import complex from "./patterns/complex.js";
+import { getLastTokenMergeResult } from "./patterns/token-level-merge.js";
 // ─── Registre ────────────────────────────────────────────────
 /**
  * Registre ordonné des patterns.
@@ -34,6 +36,7 @@ const PATTERNS = [
     reorderOnly, // priority 55  ← v1.4
     insertionAtBoundary, // priority 57  ← v1.4
     valueOnlyChange, // priority 60
+    tokenLevelMerge, // priority 65 ← v2.7 (jamais auto-appliqué, cf. assemble.ts)
     refactoringAwareMerge, // priority 970 ← v2.6 (OFF par défaut, activé par resolve())
     llmProposed, // priority 998 ← v2.5 (OFF par défaut, activé par resolveAsync)
     complex, // priority 999 (fallback — detect() always true)
@@ -90,6 +93,7 @@ function buildSummary(type, h) {
         case "reorder_only": return "Mêmes lignes, ordre différent — résolution : accepter l'ordre theirs.";
         case "insertion_at_boundary": return "Insertions pures des deux côtés — résolution par union.";
         case "value_only_change": return "Même structure, valeur(s) volatile(s) différente(s) — résolution : accepter theirs.";
+        case "token_level_merge": return "Fusion ligne/token proposée — confirmation utilisateur requise avant application.";
         case "llm_proposed": return "LLM fallback activé — résolution déléguée à l'endpoint LLM configuré.";
         case "complex": return "Conflit complexe — toutes les heuristiques automatiques ont échoué.";
         default: return `Type détecté : ${type}.`;
@@ -118,6 +122,9 @@ export function classifyConflict(hunk) {
     for (const pattern of eligible) {
         if (pattern.detect(hunk)) {
             const trace = buildTrace(hunk, eligible, allSorted, pattern);
+            if (pattern.type === "token_level_merge") {
+                trace.tokenMergeTrace = getLastTokenMergeResult() ?? undefined;
+            }
             return {
                 type: pattern.type,
                 confidence: pattern.confidence(hunk),

package/dist/classifier.js.map

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

package/dist/config.d.ts

@@ -173,6 +173,37 @@ export interface GitWandrcConfig {
          */
         maxRefactoringsPerSide?: number;
     };
+    /**
+     * v3.5.0 — Scanner de secrets sur les lignes ajoutées en staging.
+     *
+     * ```jsonc
+     * {
+     *   "secrets": {
+     *     "enabled": true,
+     *     "patterns": [
+     *       { "id": "internal_token", "regex": "itok_[0-9a-f]{32}", "severity": "high" }
+     *     ],
+     *     "ignore": ["fixtures/**", "/AKIAFAKEFAKEFAKEFAKE/"],
+     *     "entropyThreshold": 4.0
+     *   }
+     * }
+     * ```
+     */
+    secrets?: {
+        /** Master switch, combiné au setting applicatif `secretsScannerEnabled` (défaut: true). */
+        enabled?: boolean;
+        /** Patterns supplémentaires, en plus du catalogue built-in. */
+        patterns?: Array<{
+            id: string;
+            regex: string;
+            severity: "high" | "medium" | "low";
+            description: string;
+        }>;
+        /** Glob de chemin OU littéral `/regex/` sur la valeur matchée. */
+        ignore?: string[];
+        /** Seuil d'entropie Shannon (bits/char) pour la détection de secrets à haute entropie, [0, 8]. 0 désactive. */
+        entropyThreshold?: number;
+    };
 }
 /**
  * Parse une configuration GitWandrc depuis une string JSON.

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAIH;;;;;;;;GAQG;AACH,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,QAAQ,GAAG,KAAK,CAAC;AAI5D;;GAEG;AACH,MAAM,MAAM,WAAW,GACnB,aAAa,GACb,eAAe,GACf,cAAc,GACd,eAAe,GACf,QAAQ,CAAC;AAIb;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,6FAA6F;IAC7F,UAAU,EAAE,OAAO,CAAC;IACpB,gDAAgD;IAChD,eAAe,EAAE,OAAO,CAAC;IACzB,kDAAkD;IAClD,cAAc,EAAE,OAAO,CAAC;IACxB,gDAAgD;IAChD,mBAAmB,EAAE,OAAO,CAAC;IAC7B,iEAAiE;IACjE,aAAa,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC;CACtD;AAED,iEAAiE;AACjE,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,YAAY,CA2ChE;AAED,+DAA+D;AAC/D,eAAO,MAAM,cAAc,EAAE,WAA6B,CAAC;AAI3D;;;;;;;;;;;;GAYG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAapE;AAiBD;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,WAAW,EAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC7C,WAAW,CAmBb;AAID;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,iCAAiC;IACjC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,iCAAiC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACvC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B;;;;;;;;;OASG;IACH,UAAU,CAAC,EAAE;QACX,KAAK,CAAC,EAAE,eAAe,CAAC;QACxB,gEAAgE;QAChE,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC;KACjC,CAAC;IACF;;;;;;;;;;;;;;;;;;;OAmBG;IACH,WAAW,CAAC,EAAE;QACZ,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,OAAO,CAAC,EAAE,eAAe,CAAC;KAC3B,CAAC;IACF;;;;;;;;;;;OAWG;IACH,gBAAgB,CAAC,EAAE;QACjB,iDAAiD;QACjD,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB;;WAEG;QACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CA4GnE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/config.js

@@ -246,6 +246,45 @@ export function parseGitwandrc(json) {
                 result.refactoringAware = refactoringAware;
             }
         }
+        // v3.5.0 — Secrets scanner config.
+        if (parsed.secrets && typeof parsed.secrets === "object") {
+            const sec = parsed.secrets;
+            const secrets = {};
+            if (typeof sec.enabled === "boolean")
+                secrets.enabled = sec.enabled;
+            if (Array.isArray(sec.patterns)) {
+                const validSeverities = ["high", "medium", "low"];
+                const patterns = sec.patterns
+                    .filter((p) => typeof p === "object" &&
+                    p !== null &&
+                    typeof p.id === "string" &&
+                    p.id !== "" &&
+                    typeof p.regex === "string")
+                    .map((p) => ({
+                    id: p.id,
+                    regex: p.regex,
+                    severity: validSeverities.includes(p.severity ?? "")
+                        ? p.severity
+                        : "medium",
+                    description: typeof p.description === "string" ? p.description : "",
+                }));
+                if (patterns.length > 0)
+                    secrets.patterns = patterns;
+            }
+            if (Array.isArray(sec.ignore)) {
+                const ignore = sec.ignore.filter((i) => typeof i === "string" && i.length > 0);
+                if (ignore.length > 0)
+                    secrets.ignore = ignore;
+            }
+            if (typeof sec.entropyThreshold === "number" &&
+                sec.entropyThreshold >= 0 &&
+                sec.entropyThreshold <= 8) {
+                secrets.entropyThreshold = sec.entropyThreshold;
+            }
+            if (Object.keys(secrets).length > 0) {
+                result.secrets = secrets;
+            }
+        }
         return result;
     }
     catch {

package/dist/config.js.map

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

package/dist/index.d.ts

@@ -31,7 +31,7 @@ export type { JsonPatchOp } from "./format-profiles/types.js";
 export { tryResolveJsonConflict, stripJsoncComments } from "./resolvers/json.js";
 export { tryResolveMarkdownConflict, parseSections, extractFrontmatter } from "./resolvers/markdown.js";
 export { tryResolveYamlConflict } from "./resolvers/yaml.js";
-export { tryResolveImportConflict, isImportBlock } from "./resolvers/imports.js";
+export { tryResolveImportConflict, isImportBlock, extractImportSources } from "./resolvers/imports.js";
 export { tryResolveVueConflict, parseSfcBlocks } from "./resolvers/vue.js";
 export { tryResolveCssConflict, parseCssRules } from "./resolvers/css.js";
 export { tryResolveLockfileNpmConflict } from "./resolvers/lockfile-npm.js";
@@ -39,7 +39,7 @@ export { tryResolveYarnLockConflict } from "./resolvers/lockfile-yarn.js";
 export { tryResolvePnpmLockConflict } from "./resolvers/lockfile-pnpm.js";
 export { matchGlob, effectivePolicyForFile, policyToConfig, parseGitwandrc, DEFAULT_POLICY, } from "./config.js";
 export { tryFormatAwareResolve, isJsonFile, isMarkdownFile, isYamlFile, isJsFile, isVueFile, isCssFile, isNpmLockfile, isYarnLockfile, isPnpmLockfile, isLockfile, } from "./resolvers/dispatcher.js";
-export type { MergeInput, MergeResult, MergeStats, ConflictHunk, ConflictType, Confidence, ConfidenceScore, HunkResolution, GitWandOptions, DecisionTrace, TraceStep, ValidationResult, ExternalValidationResult, LlmEndpoint, LlmFallbackConfig, LlmTrace, RefactoringKind, Refactoring, } from "./types.js";
+export type { MergeInput, MergeResult, MergeStats, ConflictHunk, ConflictType, Confidence, ConfidenceScore, HunkResolution, GitWandOptions, DecisionTrace, TraceStep, ValidationResult, ExternalValidationResult, LlmEndpoint, LlmFallbackConfig, LlmTrace, RefactoringKind, Refactoring, TokenMergeTrace, TokenMergeLineDetail, } from "./types.js";
 export { detectRefactorings, invertRefactorings, replayRefactorings, mergeRefactorings, tryRefMerge, } from "./refactoring/index.js";
 export type { RefMergeResult } from "./refactoring/index.js";
 export { tryLlmFallbackResolve } from "./resolvers/llm-fallback.js";
@@ -56,4 +56,9 @@ export type { YarnLockMergeResult } from "./resolvers/lockfile-yarn.js";
 export type { PnpmLockMergeResult } from "./resolvers/lockfile-pnpm.js";
 export type { ImportSortStrategy } from "./resolvers/imports.js";
 export type { MergePolicy, PolicyConfig, GitWandrcConfig } from "./config.js";
+export { summarizeTiers } from "./stats/tiers.js";
+export type { ResolutionTier, TierSummary } from "./stats/tiers.js";
+export { scanSecrets, shannonEntropy, redact, isIgnored, DEFAULT_IGNORE_GLOBS } from "./secrets/scanner.js";
+export { BUILT_IN_PATTERNS } from "./secrets/patterns.js";
+export type { SecretSeverity, SecretPattern, ScanFileInput, SecretsScanConfig, SecretFinding, } from "./secrets/types.js";
 //# sourceMappingURL=index.d.ts.map