@gitwand/core 2.0.1 → 2.3.0

package/dist/__tests__/structural/merge.test.js

@@ -0,0 +1,117 @@
+/**
+ * Tests for structural/merge.ts — entity-level merge decisions.
+ * Pure logic, no tree-sitter / WASM dependency.
+ */
+import { describe, it, expect } from "vitest";
+import { mergeEntity, hasEntityConflict } from "../../structural/merge.js";
+// ─── Helpers ─────────────────────────────────────────────────────────────────
+function entity(text) {
+    return {
+        signature: "function:foo",
+        kind: "function",
+        text,
+        startByte: 0,
+        endByte: text.length,
+        startLine: 0,
+    };
+}
+function match(status, base, ours, theirs) {
+    return {
+        signature: "function:foo",
+        status,
+        base: base !== undefined ? entity(base) : null,
+        ours: ours !== undefined ? entity(ours) : null,
+        theirs: theirs !== undefined ? entity(theirs) : null,
+    };
+}
+// ─── Tests ────────────────────────────────────────────────────────────────────
+describe("mergeEntity", () => {
+    it("unchanged → emit ours text (same as theirs)", () => {
+        const result = mergeEntity(match("unchanged", "fn()", "fn()", "fn()"));
+        expect(result.include).toBe(true);
+        expect(result.mergedText).toBe("fn()");
+        expect(result.reason).toBe("unchanged");
+    });
+    it("both-changed-same with text → emit theirs", () => {
+        const result = mergeEntity(match("both-changed-same", "fn()", "fn2()", "fn2()"));
+        expect(result.include).toBe(true);
+        expect(result.mergedText).toBe("fn2()");
+    });
+    it("both-changed-same with both deleted → exclude", () => {
+        const result = mergeEntity(match("both-changed-same", "fn()", undefined, undefined));
+        expect(result.include).toBe(false);
+        expect(result.mergedText).toBeNull();
+        expect(result.reason).toBe("both deleted");
+    });
+    it("ours-only-change → emit ours", () => {
+        const result = mergeEntity(match("ours-only-change", "fn()", "fn2()", "fn()"));
+        expect(result.include).toBe(true);
+        expect(result.mergedText).toBe("fn2()");
+    });
+    it("theirs-only-change → emit theirs", () => {
+        const result = mergeEntity(match("theirs-only-change", "fn()", "fn()", "fn3()"));
+        expect(result.include).toBe(true);
+        expect(result.mergedText).toBe("fn3()");
+    });
+    it("ours-added → include ours text", () => {
+        const result = mergeEntity(match("ours-added", undefined, "fn_new()", undefined));
+        expect(result.include).toBe(true);
+        expect(result.mergedText).toBe("fn_new()");
+    });
+    it("theirs-added → include theirs text", () => {
+        const result = mergeEntity(match("theirs-added", undefined, undefined, "fn_new()"));
+        expect(result.include).toBe(true);
+        expect(result.mergedText).toBe("fn_new()");
+    });
+    it("ours-deleted (theirs unchanged) → exclude", () => {
+        const result = mergeEntity(match("ours-deleted", "fn()", undefined, "fn()"));
+        expect(result.include).toBe(false);
+        expect(result.reason).toBe("ours deleted");
+    });
+    it("ours-deleted (theirs modified) → conflict", () => {
+        const result = mergeEntity(match("ours-deleted", "fn()", undefined, "fn3()"));
+        expect(result.include).toBe(false);
+        expect(result.reason).toContain("conflict:");
+    });
+    it("theirs-deleted (ours unchanged) → exclude", () => {
+        const result = mergeEntity(match("theirs-deleted", "fn()", "fn()", undefined));
+        expect(result.include).toBe(false);
+        expect(result.reason).toBe("theirs deleted");
+    });
+    it("theirs-deleted (ours modified) → conflict", () => {
+        const result = mergeEntity(match("theirs-deleted", "fn()", "fn2()", undefined));
+        expect(result.include).toBe(false);
+        expect(result.reason).toContain("conflict:");
+    });
+    it("both-changed-diff → conflict with null mergedText", () => {
+        const result = mergeEntity(match("both-changed-diff", "fn()", "fn1()", "fn2()"));
+        expect(result.include).toBe(false);
+        expect(result.mergedText).toBeNull();
+        expect(result.reason).toContain("conflict:");
+    });
+});
+describe("hasEntityConflict", () => {
+    it("returns false when all merges are clean", () => {
+        const merges = [
+            mergeEntity(match("unchanged", "a", "a", "a")),
+            mergeEntity(match("ours-added", undefined, "b", undefined)),
+        ];
+        expect(hasEntityConflict(merges)).toBe(false);
+    });
+    it("returns true when any merge has a conflict", () => {
+        const merges = [
+            mergeEntity(match("unchanged", "a", "a", "a")),
+            mergeEntity(match("both-changed-diff", "a", "b", "c")),
+        ];
+        expect(hasEntityConflict(merges)).toBe(true);
+    });
+    it("ours-deleted (unchanged theirs) is NOT a conflict", () => {
+        const merges = [mergeEntity(match("ours-deleted", "fn()", undefined, "fn()"))];
+        expect(hasEntityConflict(merges)).toBe(false);
+    });
+    it("ours-deleted (modified theirs) IS a conflict", () => {
+        const merges = [mergeEntity(match("ours-deleted", "fn()", undefined, "fn_modified()"))];
+        expect(hasEntityConflict(merges)).toBe(true);
+    });
+});
+//# sourceMappingURL=merge.test.js.map

package/dist/__tests__/structural/merge.test.js.map

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

package/dist/__tests__/structural/reconstruct.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Tests for structural/reconstruct.ts — file reconstruction from entity merges.
+ * Pure logic, no tree-sitter / WASM dependency.
+ */
+export {};
+//# sourceMappingURL=reconstruct.test.d.ts.map

package/dist/__tests__/structural/reconstruct.test.d.ts.map

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

package/dist/__tests__/structural/reconstruct.test.js

@@ -0,0 +1,104 @@
+/**
+ * Tests for structural/reconstruct.ts — file reconstruction from entity merges.
+ * Pure logic, no tree-sitter / WASM dependency.
+ */
+import { describe, it, expect } from "vitest";
+import { reconstructFile } from "../../structural/reconstruct.js";
+// ─── Helpers ─────────────────────────────────────────────────────────────────
+function makeEntity(sig, text, start) {
+    return {
+        signature: sig,
+        kind: "function",
+        text,
+        startByte: start,
+        endByte: start + text.length,
+        startLine: 0,
+    };
+}
+function included(sig, mergedText) {
+    return { signature: sig, include: true, mergedText, reason: "test" };
+}
+function excluded(sig) {
+    return { signature: sig, include: false, mergedText: null, reason: "deleted" };
+}
+// ─── Tests ────────────────────────────────────────────────────────────────────
+describe("reconstructFile", () => {
+    it("emits a single entity verbatim", () => {
+        const source = "function foo() {}";
+        const e = makeEntity("function:foo", "function foo() {}", 0);
+        const result = reconstructFile([included("function:foo", "function foo() {}")], [e], [], source);
+        expect(result).toBe("function foo() {}");
+    });
+    it("preserves gap between two entities", () => {
+        const source = "function foo() {}\n\nfunction bar() {}";
+        const foo = makeEntity("function:foo", "function foo() {}", 0);
+        const bar = makeEntity("function:bar", "function bar() {}", 19);
+        const result = reconstructFile([
+            included("function:foo", "function foo() {}"),
+            included("function:bar", "function bar() {}"),
+        ], [foo, bar], [], source);
+        expect(result).toBe(source);
+    });
+    it("uses merged text instead of theirs text when changed", () => {
+        const source = "function foo() {}";
+        const e = makeEntity("function:foo", "function foo() {}", 0);
+        const result = reconstructFile([included("function:foo", "function foo() { return 42; }")], [e], [], source);
+        expect(result).toBe("function foo() { return 42; }");
+    });
+    it("omits deleted entities while preserving surrounding gaps", () => {
+        // theirs: foo\n\nbar — bar is deleted
+        const source = "function foo() {}\n\nfunction bar() {}";
+        const foo = makeEntity("function:foo", "function foo() {}", 0);
+        const bar = makeEntity("function:bar", "function bar() {}", 19);
+        const result = reconstructFile([included("function:foo", "function foo() {}"), excluded("function:bar")], [foo, bar], [], source);
+        // The gap "\n\n" before bar is emitted, but bar's text is omitted
+        expect(result).toBe("function foo() {}\n\n");
+    });
+    it("appends ours-added entities after theirs content", () => {
+        const theirsSource = "function foo() {}";
+        const theirsFoo = makeEntity("function:foo", "function foo() {}", 0);
+        const oursBar = makeEntity("function:bar", "function bar() {}", 99);
+        const result = reconstructFile([
+            included("function:foo", "function foo() {}"),
+            included("function:bar", "function bar() {}"),
+        ], [theirsFoo], [oursBar], theirsSource);
+        expect(result).toContain("function foo() {}");
+        expect(result).toContain("function bar() {}");
+    });
+    it("preserves trailing content from theirs source", () => {
+        const source = "function foo() {}\n// EOF\n";
+        const e = makeEntity("function:foo", "function foo() {}", 0);
+        const result = reconstructFile([included("function:foo", "function foo() {}")], [e], [], source);
+        expect(result).toBe("function foo() {}\n// EOF\n");
+    });
+    it("handles empty entity list", () => {
+        const result = reconstructFile([], [], [], "");
+        expect(result).toBe("");
+    });
+    it("does not double-emit entities that appear in both theirs and ours", () => {
+        const source = "function foo() {}";
+        const e = makeEntity("function:foo", "function foo() {}", 0);
+        const result = reconstructFile([included("function:foo", "function foo() {}")], [e], [e], // same entity in ours
+        source);
+        // Should appear exactly once
+        const count = (result.match(/function foo/g) ?? []).length;
+        expect(count).toBe(1);
+    });
+    it("handles reordered entities by following theirs order", () => {
+        // theirs order: bar then foo
+        const source = "function bar() {}\nfunction foo() {}";
+        const bar = makeEntity("function:bar", "function bar() {}", 0);
+        const foo = makeEntity("function:foo", "function foo() {}", 18);
+        const result = reconstructFile([
+            included("function:bar", "function bar() {}"),
+            included("function:foo", "function foo() {}"),
+        ], [bar, foo], // theirs order
+        [foo, bar], // ours order (reversed)
+        source);
+        // Result should follow theirs order (bar before foo)
+        const barIdx = result.indexOf("function bar");
+        const fooIdx = result.indexOf("function foo");
+        expect(barIdx).toBeLessThan(fooIdx);
+    });
+});
+//# sourceMappingURL=reconstruct.test.js.map

package/dist/__tests__/structural/reconstruct.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reconstruct.test.js","sourceRoot":"","sources":["../../../src/__tests__/structural/reconstruct.test.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIlE,gFAAgF;AAEhF,SAAS,UAAU,CAAC,GAAW,EAAE,IAAY,EAAE,KAAa;IAC1D,OAAO;QACL,SAAS,EAAE,GAAG;QACd,IAAI,EAAE,UAAU;QAChB,IAAI;QACJ,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM;QAC5B,SAAS,EAAE,CAAC;KACb,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW,EAAE,UAAkB;IAC/C,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACvE,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW;IAC3B,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;AACjF,CAAC;AAED,iFAAiF;AAEjF,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,MAAM,GAAG,mBAAmB,CAAC;QACnC,MAAM,CAAC,GAAG,UAAU,CAAC,cAAc,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,eAAe,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;QACjG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,MAAM,GAAG,wCAAwC,CAAC;QACxD,MAAM,GAAG,GAAG,UAAU,CAAC,cAAc,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,UAAU,CAAC,cAAc,EAAE,mBAAmB,EAAE,EAAE,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,eAAe,CAC5B;YACE,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;YAC7C,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;SAC9C,EACD,CAAC,GAAG,EAAE,GAAG,CAAC,EACV,EAAE,EACF,MAAM,CACP,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,MAAM,GAAG,mBAAmB,CAAC;QACnC,MAAM,CAAC,GAAG,UAAU,CAAC,cAAc,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,eAAe,CAC5B,CAAC,QAAQ,CAAC,cAAc,EAAE,+BAA+B,CAAC,CAAC,EAC3D,CAAC,CAAC,CAAC,EACH,EAAE,EACF,MAAM,CACP,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,sCAAsC;QACtC,MAAM,MAAM,GAAG,wCAAwC,CAAC;QACxD,MAAM,GAAG,GAAG,UAAU,CAAC,cAAc,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,UAAU,CAAC,cAAc,EAAE,mBAAmB,EAAE,EAAE,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,eAAe,CAC5B,CAAC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,EACzE,CAAC,GAAG,EAAE,GAAG,CAAC,EACV,EAAE,EACF,MAAM,CACP,CAAC;QACF,kEAAkE;QAClE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,YAAY,GAAG,mBAAmB,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,cAAc,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,UAAU,CAAC,cAAc,EAAE,mBAAmB,EAAE,EAAE,CAAC,CAAC;QAEpE,MAAM,MAAM,GAAG,eAAe,CAC5B;YACE,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;YAC7C,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;SAC9C,EACD,CAAC,SAAS,CAAC,EACX,CAAC,OAAO,CAAC,EACT,YAAY,CACb,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,MAAM,GAAG,6BAA6B,CAAC;QAC7C,MAAM,CAAC,GAAG,UAAU,CAAC,cAAc,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,eAAe,CAC5B,CAAC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC,EAC/C,CAAC,CAAC,CAAC,EACH,EAAE,EACF,MAAM,CACP,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,MAAM,GAAG,mBAAmB,CAAC;QACnC,MAAM,CAAC,GAAG,UAAU,CAAC,cAAc,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,eAAe,CAC5B,CAAC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC,EAC/C,CAAC,CAAC,CAAC,EACH,CAAC,CAAC,CAAC,EAAE,sBAAsB;QAC3B,MAAM,CACP,CAAC;QACF,6BAA6B;QAC7B,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QAC3D,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,6BAA6B;QAC7B,MAAM,MAAM,GAAG,sCAAsC,CAAC;QACtD,MAAM,GAAG,GAAG,UAAU,CAAC,cAAc,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,UAAU,CAAC,cAAc,EAAE,mBAAmB,EAAE,EAAE,CAAC,CAAC;QAEhE,MAAM,MAAM,GAAG,eAAe,CAC5B;YACE,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;YAC7C,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;SAC9C,EACD,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,eAAe;QAC3B,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,wBAAwB;QACpC,MAAM,CACP,CAAC;QACF,qDAAqD;QACrD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/__tests__/structural/structural-index.test.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Integration tests for structural/index.ts
+ *
+ * `tryStructuralMergeResolve` requires web-tree-sitter (optional peer),
+ * which is not installed in the test environment.
+ *
+ * These tests verify:
+ *  - Graceful degradation when web-tree-sitter is absent (returns null).
+ *  - The `isTypeScriptFile` / `isStructuralLanguage` guards.
+ *  - `wrapStructuralResult` produces a valid MergeResult.
+ *  - `reconstructVersions` (via the public API) extracts ours/theirs correctly.
+ */
+export {};
+//# sourceMappingURL=structural-index.test.d.ts.map

package/dist/__tests__/structural/structural-index.test.d.ts.map

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

package/dist/__tests__/structural/structural-index.test.js

@@ -0,0 +1,108 @@
+/**
+ * Integration tests for structural/index.ts
+ *
+ * `tryStructuralMergeResolve` requires web-tree-sitter (optional peer),
+ * which is not installed in the test environment.
+ *
+ * These tests verify:
+ *  - Graceful degradation when web-tree-sitter is absent (returns null).
+ *  - The `isTypeScriptFile` / `isStructuralLanguage` guards.
+ *  - `wrapStructuralResult` produces a valid MergeResult.
+ *  - `reconstructVersions` (via the public API) extracts ours/theirs correctly.
+ */
+import { describe, it, expect } from "vitest";
+import { tryStructuralMergeResolve, wrapStructuralResult, isTypeScriptFile, isStructuralLanguage, } from "../../structural/index.js";
+// ─── isTypeScriptFile ─────────────────────────────────────────────────────────
+describe("isTypeScriptFile", () => {
+    it("accepts .ts", () => expect(isTypeScriptFile("src/app.ts")).toBe(true));
+    it("accepts .tsx", () => expect(isTypeScriptFile("src/comp.tsx")).toBe(true));
+    it("rejects .d.ts", () => expect(isTypeScriptFile("types.d.ts")).toBe(false));
+    it("rejects .js", () => expect(isTypeScriptFile("src/app.js")).toBe(false));
+});
+// ─── isStructuralLanguage ─────────────────────────────────────────────────────
+describe("isStructuralLanguage", () => {
+    it("accepts .ts, .tsx, .js, .jsx, .py, .go, .rs", () => {
+        for (const ext of [".ts", ".tsx", ".js", ".jsx", ".py", ".go", ".rs"]) {
+            expect(isStructuralLanguage(`src/file${ext}`)).toBe(true);
+        }
+    });
+    it("rejects .d.ts", () => expect(isStructuralLanguage("types.d.ts")).toBe(false));
+    it("rejects .css", () => expect(isStructuralLanguage("style.css")).toBe(false));
+});
+// ─── tryStructuralMergeResolve — graceful degradation ────────────────────────
+const SIMPLE_CONFLICT = `\
+function foo() {
+<<<<<<< ours
+  return 1;
+||||||| base
+  return 0;
+=======
+  return 2;
+>>>>>>> theirs
+}
+`;
+describe("tryStructuralMergeResolve", () => {
+    it("returns null for unsupported file types", async () => {
+        const result = await tryStructuralMergeResolve(SIMPLE_CONFLICT, "styles.css");
+        expect(result).toBeNull();
+    });
+    it("returns null for .d.ts files", async () => {
+        const result = await tryStructuralMergeResolve(SIMPLE_CONFLICT, "types.d.ts");
+        expect(result).toBeNull();
+    });
+    it("returns null gracefully when web-tree-sitter is not installed", async () => {
+        // web-tree-sitter is an optional peer dep — not installed in test env.
+        // The loader returns null, and tryStructuralMergeResolve returns null.
+        const result = await tryStructuralMergeResolve(SIMPLE_CONFLICT, "src/app.ts");
+        expect(result).toBeNull();
+    });
+    it("returns null gracefully for Python files too", async () => {
+        const result = await tryStructuralMergeResolve(SIMPLE_CONFLICT, "src/app.py");
+        expect(result).toBeNull();
+    });
+    it("never throws — always returns string | null", async () => {
+        await expect(tryStructuralMergeResolve(SIMPLE_CONFLICT, "src/app.ts")).resolves.not.toThrow();
+    });
+});
+// ─── wrapStructuralResult ─────────────────────────────────────────────────────
+describe("wrapStructuralResult", () => {
+    const conflicted = `// header\n<<<<<<< ours\nreturn 1;\n||||||| base\nreturn 0;\n=======\nreturn 2;\n>>>>>>> theirs\n// footer\n`;
+    const merged = "// header\nreturn 1;\n// footer\n";
+    it("returns filePath correctly", () => {
+        const result = wrapStructuralResult(conflicted, merged, "src/app.ts");
+        expect(result.filePath).toBe("src/app.ts");
+    });
+    it("sets mergedContent to the provided merged string", () => {
+        const result = wrapStructuralResult(conflicted, merged, "src/app.ts");
+        expect(result.mergedContent).toBe(merged);
+    });
+    it("marks all resolutions as autoResolved", () => {
+        const result = wrapStructuralResult(conflicted, merged, "src/app.ts");
+        expect(result.stats.totalConflicts).toBe(1);
+        expect(result.stats.autoResolved).toBe(1);
+        expect(result.stats.remaining).toBe(0);
+        for (const r of result.resolutions) {
+            expect(r.autoResolved).toBe(true);
+        }
+    });
+    it("extracts the correct number of hunks", () => {
+        const twoConflicts = [
+            "<<<<<<< ours\na\n=======\nb\n>>>>>>> theirs",
+            "<<<<<<< ours\nc\n=======\nd\n>>>>>>> theirs",
+        ].join("\n");
+        const result = wrapStructuralResult(twoConflicts, "merged", "src/app.ts");
+        expect(result.hunks).toHaveLength(2);
+        expect(result.stats.totalConflicts).toBe(2);
+    });
+    it("validation result is present and valid for a clean merged content", () => {
+        const result = wrapStructuralResult(conflicted, merged, "src/app.ts");
+        expect(result.validation.isValid).toBe(true);
+        expect(result.validation.hasResidualMarkers).toBe(false);
+    });
+    it("validation detects residual conflict markers if merged content has them", () => {
+        const result = wrapStructuralResult(conflicted, "<<<<<<< ours\nreturn 1;\n", "src/app.ts");
+        expect(result.validation.hasResidualMarkers).toBe(true);
+        expect(result.validation.isValid).toBe(false);
+    });
+});
+//# sourceMappingURL=structural-index.test.js.map

package/dist/__tests__/structural/structural-index.test.js.map

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

package/dist/diff/block-move.d.ts

@@ -0,0 +1,53 @@
+/**
+ * GitWand — Détection de blocs déplacés (block-move)
+ *
+ * Approche Rabin-Karp : on hash chaque fenêtre de N lignes consécutives dans
+ * `base`, `ours` et `theirs`, on cherche les fenêtres présentes dans **ours et
+ * theirs mais pas dans base** (ou à des positions différentes), et on les
+ * confirme littéralement (anti-collision).
+ *
+ * Usage v2.1 : primitive seule, exposée via `src/index.ts`. Les patterns
+ * peuvent l'utiliser pour pénaliser le score de confiance de `complex` quand
+ * un refactor massif est détecté côté ours et côté theirs (signal « pas
+ * d'auto-résolution »). Cette dimension `algorithmStability` est wired dans
+ * `ConfidenceScore` au commit suivant — mais aucun pattern ne la consomme
+ * encore (la primitive sert pour la v2.6 refactoring-aware merge).
+ */
+/** Un bloc déplacé entre `ours` et `theirs`, absent de `base` à cette position. */
+export interface MovedBlock {
+    /** Les lignes brutes du bloc (depuis `ours`, non normalisées). */
+    block: string[];
+    /** Position de début dans `ours` (inclus). */
+    oursPos: number;
+    /** Position de début dans `theirs` (inclus). */
+    theirsPos: number;
+    /** Position dans `base` si la fenêtre y existe, sinon `null`. */
+    basePos: number | null;
+}
+/** Options pour `detectBlockMove`. */
+export interface BlockMoveOptions {
+    /** Taille de la fenêtre de hash. Défaut 5 — équilibre robustesse vs sensibilité. */
+    windowSize?: number;
+    /**
+     * Diversité minimale de tokens uniques (split sur whitespace + ponctuation)
+     * dans la fenêtre normalisée — sous ce seuil, on skip pour éviter les faux
+     * positifs sur les boucles `for (let i = 0; ...)` répétées. Défaut 4.
+     */
+    minTokenDiversity?: number;
+}
+/**
+ * Détecte les blocs de N lignes consécutives présents à la fois dans `ours` et
+ * `theirs` mais absents (ou à une autre position) dans `base`.
+ *
+ * Heuristique anti-faux-positif :
+ *  1. Whitespace trim sur chaque ligne pour le hash (le contenu du bloc reste
+ *     original dans la sortie).
+ *  2. Filtre `minTokenDiversity` : la fenêtre doit contenir suffisamment de
+ *     tokens distincts pour ne pas matcher du code triviale répété.
+ *  3. Confirmation littérale : après match de hash, comparaison ligne-à-ligne.
+ *  4. Compaction : blocs adjacents fusionnés en un seul `MovedBlock` plus grand.
+ *
+ * @returns tableau de blocs déplacés détectés (vide si rien)
+ */
+export declare function detectBlockMove(base: string[], ours: string[], theirs: string[], opts?: BlockMoveOptions): MovedBlock[];
+//# sourceMappingURL=block-move.d.ts.map

package/dist/diff/block-move.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"block-move.d.ts","sourceRoot":"","sources":["../../src/diff/block-move.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,mFAAmF;AACnF,MAAM,WAAW,UAAU;IACzB,kEAAkE;IAClE,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,8CAA8C;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,sCAAsC;AACtC,MAAM,WAAW,gBAAgB;IAC/B,oFAAoF;IACpF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAKD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,MAAM,EAAE,EAChB,IAAI,CAAC,EAAE,gBAAgB,GACtB,UAAU,EAAE,CA4Dd"}

package/dist/diff/block-move.js

@@ -0,0 +1,192 @@
+/**
+ * GitWand — Détection de blocs déplacés (block-move)
+ *
+ * Approche Rabin-Karp : on hash chaque fenêtre de N lignes consécutives dans
+ * `base`, `ours` et `theirs`, on cherche les fenêtres présentes dans **ours et
+ * theirs mais pas dans base** (ou à des positions différentes), et on les
+ * confirme littéralement (anti-collision).
+ *
+ * Usage v2.1 : primitive seule, exposée via `src/index.ts`. Les patterns
+ * peuvent l'utiliser pour pénaliser le score de confiance de `complex` quand
+ * un refactor massif est détecté côté ours et côté theirs (signal « pas
+ * d'auto-résolution »). Cette dimension `algorithmStability` est wired dans
+ * `ConfidenceScore` au commit suivant — mais aucun pattern ne la consomme
+ * encore (la primitive sert pour la v2.6 refactoring-aware merge).
+ */
+const DEFAULT_WINDOW_SIZE = 5;
+const DEFAULT_MIN_TOKEN_DIVERSITY = 4;
+/**
+ * Détecte les blocs de N lignes consécutives présents à la fois dans `ours` et
+ * `theirs` mais absents (ou à une autre position) dans `base`.
+ *
+ * Heuristique anti-faux-positif :
+ *  1. Whitespace trim sur chaque ligne pour le hash (le contenu du bloc reste
+ *     original dans la sortie).
+ *  2. Filtre `minTokenDiversity` : la fenêtre doit contenir suffisamment de
+ *     tokens distincts pour ne pas matcher du code triviale répété.
+ *  3. Confirmation littérale : après match de hash, comparaison ligne-à-ligne.
+ *  4. Compaction : blocs adjacents fusionnés en un seul `MovedBlock` plus grand.
+ *
+ * @returns tableau de blocs déplacés détectés (vide si rien)
+ */
+export function detectBlockMove(base, ours, theirs, opts) {
+    const W = opts?.windowSize ?? DEFAULT_WINDOW_SIZE;
+    const minDiv = opts?.minTokenDiversity ?? DEFAULT_MIN_TOKEN_DIVERSITY;
+    if (ours.length < W || theirs.length < W)
+        return [];
+    // ─── 1. Hash de chaque fenêtre dans les trois fichiers ─────
+    const hashOurs = hashWindows(ours, W);
+    const hashTheirs = hashWindows(theirs, W);
+    const hashBase = hashWindows(base, W);
+    // Index : pour chaque hash, la première position dans chaque fichier.
+    const oursIndex = buildPositionIndex(hashOurs);
+    const theirsIndex = buildPositionIndex(hashTheirs);
+    const baseIndex = buildPositionIndex(hashBase);
+    // ─── 2. Pour chaque hash présent dans ours ET theirs, vérifier ─
+    const candidates = [];
+    for (const [hash, oursPositions] of oursIndex) {
+        const theirsPositions = theirsIndex.get(hash);
+        if (!theirsPositions)
+            continue;
+        // Considérer la première occurrence de chaque côté (les suivantes sont
+        // gérées par compaction au step 3 si elles sont adjacentes).
+        const oursPos = oursPositions[0];
+        const theirsPos = theirsPositions[0];
+        // Confirmation littérale (anti-collision Rabin-Karp).
+        if (!windowsMatch(ours, oursPos, theirs, theirsPos, W))
+            continue;
+        // Filtre de diversité de tokens.
+        const block = ours.slice(oursPos, oursPos + W);
+        if (countDistinctTokens(block) < minDiv)
+            continue;
+        // Position dans base : si la fenêtre y existe avec exactement le même
+        // contenu, on note la position (utile au consommateur pour qualifier le
+        // déplacement). Sinon `null` — la fenêtre est purement nouvelle des deux
+        // côtés.
+        const basePositions = baseIndex.get(hash);
+        let basePos = null;
+        if (basePositions) {
+            for (const bp of basePositions) {
+                if (windowsMatch(ours, oursPos, base, bp, W)) {
+                    basePos = bp;
+                    break;
+                }
+            }
+            // Si la fenêtre est dans base à la même position relative dans les trois
+            // fichiers (delta de position négligeable), ce n'est pas un block-move.
+            if (basePos !== null && Math.abs(oursPos - basePos) < W && Math.abs(theirsPos - basePos) < W) {
+                continue;
+            }
+        }
+        candidates.push({ block, oursPos, theirsPos, basePos });
+    }
+    // ─── 3. Compaction : fusionner les blocs adjacents avec le même delta ─
+    return compactAdjacent(candidates, W);
+}
+// ─── Utils internes ───────────────────────────────────────────
+/** Polynomial rolling hash — base 257, modulo 2^32 (overflow naturel JS bit-ops). */
+function hashWindows(lines, W) {
+    const n = lines.length;
+    if (n < W)
+        return [];
+    const hashes = new Array(n - W + 1);
+    // Pré-calcule un hash sur la ligne normalisée (trim) pour stabilité whitespace.
+    const lineHashes = lines.map((l) => stringHash(l.trim()));
+    // Fenêtre : combine W line-hashes via une formule polynomiale.
+    for (let i = 0; i + W <= n; i++) {
+        let h = 0;
+        for (let k = 0; k < W; k++) {
+            h = (Math.imul(h, 257) + lineHashes[i + k]) | 0;
+        }
+        hashes[i] = h;
+    }
+    return hashes;
+}
+/** Hash 32-bit d'une chaîne (variante djb2). */
+function stringHash(s) {
+    let h = 5381;
+    for (let i = 0; i < s.length; i++) {
+        h = (Math.imul(h, 33) ^ s.charCodeAt(i)) | 0;
+    }
+    return h;
+}
+/** Index hash → liste des positions où il apparaît. */
+function buildPositionIndex(hashes) {
+    const index = new Map();
+    for (let i = 0; i < hashes.length; i++) {
+        const h = hashes[i];
+        let arr = index.get(h);
+        if (!arr) {
+            arr = [];
+            index.set(h, arr);
+        }
+        arr.push(i);
+    }
+    return index;
+}
+/** Compare littéralement deux fenêtres (ligne par ligne, contenu brut). */
+function windowsMatch(a, aPos, b, bPos, W) {
+    for (let k = 0; k < W; k++) {
+        if (a[aPos + k] !== b[bPos + k])
+            return false;
+    }
+    return true;
+}
+/** Nombre de tokens distincts dans un bloc (split simple sur whitespace + ponctuation). */
+function countDistinctTokens(block) {
+    const tokens = new Set();
+    for (const line of block) {
+        for (const t of line.split(/[\s{}[\](),:;"'`=<>+\-*/!?]+/)) {
+            if (t.length > 0)
+                tokens.add(t);
+        }
+    }
+    return tokens.size;
+}
+/**
+ * Fusionne les blocs adjacents avec la même paire (deltaOurs, deltaTheirs).
+ * Deux candidats sont adjacents si la fenêtre suivante commence à exactement
+ * `oursPos + 1` (et idem en theirs) — typique d'un grand bloc de longueur
+ * L > W découpé en (L - W + 1) fenêtres qui se chevauchent.
+ *
+ * On track séparément la position de la *dernière* fenêtre fusionnée (`lastOursPos`,
+ * `lastTheirsPos`) parce que `current.oursPos` reste figé sur le début du bloc
+ * compacté. Un `basePos` non-null d'un candidat plus tardif gagne sur un null
+ * antérieur (la moved-block info est précieuse).
+ */
+function compactAdjacent(candidates, W) {
+    if (candidates.length === 0)
+        return [];
+    const sorted = [...candidates].sort((a, b) => a.oursPos - b.oursPos);
+    const result = [];
+    let current = sorted[0];
+    let lastOursPos = current.oursPos;
+    let lastTheirsPos = current.theirsPos;
+    for (let i = 1; i < sorted.length; i++) {
+        const next = sorted[i];
+        const isAdjacent = next.oursPos === lastOursPos + 1 &&
+            next.theirsPos === lastTheirsPos + 1;
+        if (isAdjacent) {
+            current = {
+                ...current,
+                block: [...current.block, next.block[W - 1]],
+                // basePos : si le candidat suivant en a un et nous pas (ou vice versa),
+                // on garde celui qui est non-null. Si les deux en ont un avec un delta
+                // constant vs oursPos, on garde le premier (sémantique : le bloc commence
+                // à la position d'origine du déplacement).
+                basePos: current.basePos ?? next.basePos,
+            };
+            lastOursPos = next.oursPos;
+            lastTheirsPos = next.theirsPos;
+        }
+        else {
+            result.push(current);
+            current = next;
+            lastOursPos = next.oursPos;
+            lastTheirsPos = next.theirsPos;
+        }
+    }
+    result.push(current);
+    return result;
+}
+//# sourceMappingURL=block-move.js.map