@gitwand/core 2.0.1 → 2.3.0

package/dist/structural/entities.js

@@ -0,0 +1,315 @@
+/**
+ * Top-level entity extraction from a tree-sitter AST.
+ *
+ * An "entity" is a top-level declaration in a TypeScript/TSX file:
+ * import, export, function, class, interface, type alias, variable declaration,
+ * or ambient declaration (declare …).
+ *
+ * Each entity carries:
+ *   - `signature`  — stable key for 3-way matching (based on name/kind)
+ *   - `text`       — exact source slice (used in the merged output)
+ *   - byte offsets — for gap-preserving reconstruction
+ */
+// ─── Internal helpers ─────────────────────────────────────────────────────────
+/** Find the first named child with the given field name, or fall back to type search. */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function fieldOrType(node, fieldName, typeName) {
+    return node.childForFieldName?.(fieldName) ?? findChildByType(node, typeName);
+}
+/** Find the first direct child with the given type. */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function findChildByType(node, typeName) {
+    for (let i = 0; i < node.childCount; i++) {
+        const child = node.child(i);
+        if (child.type === typeName)
+            return child;
+    }
+    return undefined;
+}
+/**
+ * Derive a stable signature and kind for a top-level tree-sitter node.
+ *
+ * Signatures are intentionally simple (kind:name) so that a renamed entity
+ * is treated as delete+add rather than a mysterious match. Conservative, correct.
+ *
+ * Covers: TypeScript/TSX/JS/JSX, Python, Go, Rust.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function nodeSignature(node, source) {
+    const type = node.type;
+    // ╔══════════════════════════════════════════════════════╗
+    // ║  TypeScript / JavaScript (shared grammar base)       ║
+    // ╚══════════════════════════════════════════════════════╝
+    // ── import_statement ─────────────────────────────────────
+    if (type === "import_statement") {
+        const sourceNode = fieldOrType(node, "source", "string");
+        const mod = sourceNode
+            ? source.slice(sourceNode.startIndex, sourceNode.endIndex)
+            : String(node.startIndex);
+        return { sig: `import:${mod}`, kind: "import" };
+    }
+    // ── export_statement ─────────────────────────────────────
+    if (type === "export_statement") {
+        const decl = node.childForFieldName?.("declaration");
+        if (decl) {
+            const inner = nodeSignature(decl, source);
+            return { sig: `export:${inner.sig}`, kind: "export" };
+        }
+        const preview = source
+            .slice(node.startIndex, Math.min(node.startIndex + 60, node.endIndex))
+            .replace(/\s+/g, " ")
+            .trim();
+        return { sig: `export:${preview}`, kind: "export" };
+    }
+    // ── function_declaration / generator_function_declaration ─
+    if (type === "function_declaration" || type === "generator_function_declaration") {
+        const name = fieldOrType(node, "name", "identifier");
+        const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anonymous";
+        return { sig: `function:${nameText}`, kind: "function" };
+    }
+    // ── class_declaration / abstract_class_declaration ────────
+    if (type === "class_declaration" || type === "abstract_class_declaration") {
+        const name = fieldOrType(node, "name", "type_identifier") ?? fieldOrType(node, "name", "identifier");
+        const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anonymous";
+        return { sig: `class:${nameText}`, kind: "class" };
+    }
+    // ── interface_declaration ─────────────────────────────────
+    if (type === "interface_declaration") {
+        const name = fieldOrType(node, "name", "type_identifier");
+        const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anon";
+        return { sig: `interface:${nameText}`, kind: "interface" };
+    }
+    // ── type_alias_declaration ────────────────────────────────
+    if (type === "type_alias_declaration") {
+        const name = fieldOrType(node, "name", "type_identifier");
+        const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anon";
+        return { sig: `type:${nameText}`, kind: "type" };
+    }
+    // ── lexical_declaration (const / let) ─────────────────────
+    // ── variable_declaration (var) ────────────────────────────
+    if (type === "lexical_declaration" || type === "variable_declaration") {
+        const names = [];
+        for (let i = 0; i < node.childCount; i++) {
+            const child = node.child(i);
+            if (child.type === "variable_declarator") {
+                const nameNode = child.childForFieldName?.("name");
+                if (nameNode)
+                    names.push(source.slice(nameNode.startIndex, nameNode.endIndex));
+            }
+        }
+        return { sig: `var:${names.join(",")}`, kind: "variable" };
+    }
+    // ── ambient_declaration (declare …) ──────────────────────
+    if (type === "ambient_declaration") {
+        for (let i = 0; i < node.childCount; i++) {
+            const child = node.child(i);
+            if (child.type !== "declare") {
+                const inner = nodeSignature(child, source);
+                return { sig: `declare:${inner.sig}`, kind: "declare" };
+            }
+        }
+        return { sig: `declare:${node.startIndex}`, kind: "declare" };
+    }
+    // ── expression_statement ──────────────────────────────────
+    if (type === "expression_statement") {
+        const preview = source
+            .slice(node.startIndex, Math.min(node.startIndex + 50, node.endIndex))
+            .replace(/\s+/g, " ")
+            .trim();
+        return { sig: `expr:${preview}`, kind: "expression" };
+    }
+    // ╔══════════════════════════════════════════════════════╗
+    // ║  Python                                              ║
+    // ╚══════════════════════════════════════════════════════╝
+    // ── function_definition ───────────────────────────────────
+    if (type === "function_definition") {
+        const name = fieldOrType(node, "name", "identifier");
+        const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anonymous";
+        return { sig: `function:${nameText}`, kind: "function" };
+    }
+    // ── class_definition ──────────────────────────────────────
+    if (type === "class_definition") {
+        const name = fieldOrType(node, "name", "identifier");
+        const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anonymous";
+        return { sig: `class:${nameText}`, kind: "class" };
+    }
+    // ── decorated_definition (wraps function_definition / class_definition) ──
+    if (type === "decorated_definition") {
+        // Find the wrapped definition
+        for (let i = 0; i < node.childCount; i++) {
+            const child = node.child(i);
+            if (child.type === "function_definition" || child.type === "class_definition") {
+                const inner = nodeSignature(child, source);
+                return { sig: `decorated:${inner.sig}`, kind: inner.kind };
+            }
+        }
+        return { sig: `decorated:${node.startIndex}`, kind: "other" };
+    }
+    // ── import_statement (Python) — already handled above (same name) ──
+    // ── import_from_statement (Python) ────────────────────────
+    if (type === "import_from_statement") {
+        const modNode = node.childForFieldName?.("module_name") ?? findChildByType(node, "dotted_name");
+        const mod = modNode ? source.slice(modNode.startIndex, modNode.endIndex) : String(node.startIndex);
+        return { sig: `import_from:${mod}`, kind: "import" };
+    }
+    // ╔══════════════════════════════════════════════════════╗
+    // ║  Go                                                  ║
+    // ╚══════════════════════════════════════════════════════╝
+    // ── function_declaration (Go) ─────────────────────────────
+    // Note: Go also has function_declaration but the name field is "name" with type "identifier"
+    // Already handled above by the JS function_declaration case.
+    // ── method_declaration (Go) ───────────────────────────────
+    if (type === "method_declaration") {
+        const name = fieldOrType(node, "name", "field_identifier") ?? fieldOrType(node, "name", "identifier");
+        const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anonymous";
+        const receiver = node.childForFieldName?.("receiver");
+        const receiverText = receiver ? source.slice(receiver.startIndex, receiver.endIndex).replace(/\s+/g, " ").trim() : "";
+        return { sig: `method:${receiverText}:${nameText}`, kind: "function" };
+    }
+    // ── type_declaration (Go) ─────────────────────────────────
+    if (type === "type_declaration") {
+        // Contains type_spec children
+        const spec = findChildByType(node, "type_spec");
+        if (spec) {
+            const name = fieldOrType(spec, "name", "type_identifier");
+            const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anon";
+            return { sig: `type:${nameText}`, kind: "type" };
+        }
+        return { sig: `type:${node.startIndex}`, kind: "type" };
+    }
+    // ── var_declaration (Go) ───────────────────────────────────
+    if (type === "var_declaration") {
+        const spec = findChildByType(node, "var_spec");
+        if (spec) {
+            const name = findChildByType(spec, "identifier");
+            const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anon";
+            return { sig: `var:${nameText}`, kind: "variable" };
+        }
+        return { sig: `var:${node.startIndex}`, kind: "variable" };
+    }
+    // ── import_declaration (Go) ───────────────────────────────
+    if (type === "import_declaration") {
+        const preview = source
+            .slice(node.startIndex, Math.min(node.startIndex + 60, node.endIndex))
+            .replace(/\s+/g, " ")
+            .trim();
+        return { sig: `import:${preview}`, kind: "import" };
+    }
+    // ╔══════════════════════════════════════════════════════╗
+    // ║  Rust                                                ║
+    // ╚══════════════════════════════════════════════════════╝
+    // ── function_item (Rust) ──────────────────────────────────
+    if (type === "function_item") {
+        const name = fieldOrType(node, "name", "identifier");
+        const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anonymous";
+        return { sig: `function:${nameText}`, kind: "function" };
+    }
+    // ── struct_item (Rust) ────────────────────────────────────
+    if (type === "struct_item") {
+        const name = fieldOrType(node, "name", "type_identifier");
+        const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anon";
+        return { sig: `struct:${nameText}`, kind: "class" };
+    }
+    // ── enum_item (Rust) ──────────────────────────────────────
+    if (type === "enum_item") {
+        const name = fieldOrType(node, "name", "type_identifier");
+        const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anon";
+        return { sig: `enum:${nameText}`, kind: "type" };
+    }
+    // ── trait_item (Rust) ─────────────────────────────────────
+    if (type === "trait_item") {
+        const name = fieldOrType(node, "name", "type_identifier");
+        const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anon";
+        return { sig: `trait:${nameText}`, kind: "interface" };
+    }
+    // ── impl_item (Rust) ──────────────────────────────────────
+    if (type === "impl_item") {
+        // impl Foo or impl Bar for Foo
+        const traitNode = node.childForFieldName?.("trait");
+        const typeNode = node.childForFieldName?.("type");
+        const typeText = typeNode
+            ? source.slice(typeNode.startIndex, typeNode.endIndex).replace(/\s+/g, " ").trim()
+            : String(node.startIndex);
+        const traitText = traitNode
+            ? source.slice(traitNode.startIndex, traitNode.endIndex).replace(/\s+/g, " ").trim()
+            : null;
+        const sig = traitText ? `impl:${traitText} for ${typeText}` : `impl:${typeText}`;
+        return { sig, kind: "class" };
+    }
+    // ── mod_item (Rust) ───────────────────────────────────────
+    if (type === "mod_item") {
+        const name = fieldOrType(node, "name", "identifier");
+        const nameText = name ? source.slice(name.startIndex, name.endIndex) : "__anon";
+        return { sig: `mod:${nameText}`, kind: "declare" };
+    }
+    // ── use_declaration (Rust) ────────────────────────────────
+    if (type === "use_declaration") {
+        const preview = source
+            .slice(node.startIndex, Math.min(node.startIndex + 60, node.endIndex))
+            .replace(/\s+/g, " ")
+            .trim();
+        return { sig: `use:${preview}`, kind: "import" };
+    }
+    // ── attribute_item / inner_attribute_item (Rust — top-level attributes) ──
+    if (type === "attribute_item" || type === "inner_attribute_item") {
+        const preview = source
+            .slice(node.startIndex, Math.min(node.startIndex + 40, node.endIndex))
+            .replace(/\s+/g, " ")
+            .trim();
+        return { sig: `attr:${preview}`, kind: "other" };
+    }
+    // ╔══════════════════════════════════════════════════════╗
+    // ║  Fallback                                            ║
+    // ╚══════════════════════════════════════════════════════╝
+    return { sig: `${type}:${node.startIndex}`, kind: "other" };
+}
+// ─── Public API ───────────────────────────────────────────────────────────────
+/**
+ * Extract top-level entities from a parsed tree-sitter tree.
+ *
+ * Skips unnamed tokens (punctuation, keywords) and ERROR nodes.
+ *
+ * @param tree   - Parsed tree-sitter tree
+ * @param source - Source code (as passed to `parser.parse()`)
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function extractEntities(tree, source) {
+    const entities = [];
+    const root = tree.rootNode;
+    for (let i = 0; i < root.childCount; i++) {
+        const node = root.child(i);
+        // Skip unnamed tokens (semicolons, whitespace nodes) and parse errors
+        if (!node.isNamed || node.type === "ERROR")
+            continue;
+        const { sig, kind } = nodeSignature(node, source);
+        entities.push({
+            signature: sig,
+            kind,
+            text: source.slice(node.startIndex, node.endIndex),
+            startByte: node.startIndex,
+            endByte: node.endIndex,
+            startLine: node.startPosition.row,
+        });
+    }
+    return entities;
+}
+/**
+ * Return `true` if the tree contains at least one ERROR node.
+ *
+ * A tree with ERROR nodes has parse failures and should not be used
+ * for structural merge (we fall back to the hunk-based resolver).
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function hasParseErrors(tree) {
+    function walk(node) {
+        if (node.type === "ERROR")
+            return true;
+        for (let i = 0; i < node.childCount; i++) {
+            if (walk(node.child(i)))
+                return true;
+        }
+        return false;
+    }
+    return walk(tree.rootNode);
+}
+//# sourceMappingURL=entities.js.map

package/dist/structural/entities.js.map

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

package/dist/structural/index.d.ts

@@ -0,0 +1,48 @@
+/**
+ * @gitwand/core v2.3 — Structural (AST-based) merge dispatcher
+ *
+ * Provides `tryStructuralMergeResolve()`, an async entry point that:
+ *
+ * 1. Reconstructs the three file versions (base/ours/theirs) from the
+ *    Git conflict markers in the conflicted content.
+ * 2. Parses each version with tree-sitter (via `web-tree-sitter`, optional peer).
+ * 3. Extracts top-level entities and matches them across the three versions.
+ * 4. Merges entities individually — only auto-resolvable conflicts are handled.
+ * 5. Reconstructs the merged file following theirs entity order.
+ *
+ * Returns `null` (never throws) when:
+ * - `web-tree-sitter` is not installed (graceful degradation)
+ * - The grammar WASM file is unavailable
+ * - Any version has parse errors
+ * - Any entity has a real (both-changed-diff) conflict
+ *
+ * In all these cases the caller falls back to the standard hunk-based resolver.
+ */
+import type { MergeResult } from "../types.js";
+import { type LoaderOptions } from "./parsers/loader.js";
+import { isStructuralLanguage } from "./parsers/grammars/languages.js";
+export type { LoaderOptions as StructuralLoaderOptions };
+export { isStructuralLanguage };
+export type { SupportedLanguage } from "./parsers/grammars/languages.js";
+/**
+ * Returns `true` for `.ts` and `.tsx` files.
+ * @deprecated Use `isStructuralLanguage` — now covers JS/JSX/Python/Go/Rust too.
+ */
+export declare function isTypeScriptFile(filePath: string): boolean;
+/**
+ * Attempt structural (AST-based) merge resolution for a TypeScript/TSX file.
+ *
+ * @param conflictedContent - File content with Git conflict markers
+ * @param filePath          - File path (grammar selection + type detection)
+ * @param opts              - Optional loader overrides (WASM paths, custom loaders)
+ * @returns Merged content string on success, `null` on any failure
+ */
+export declare function tryStructuralMergeResolve(conflictedContent: string, filePath: string, opts?: LoaderOptions): Promise<string | null>;
+/**
+ * Wrap a structurally merged content string in a `MergeResult` object.
+ *
+ * All hunks are marked as auto-resolved via the "structural-merge" resolver.
+ * This keeps the return type compatible with the synchronous `resolve()`.
+ */
+export declare function wrapStructuralResult(conflictedContent: string, mergedContent: string, filePath: string): MergeResult;
+//# sourceMappingURL=index.d.ts.map

package/dist/structural/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/structural/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAIH,OAAO,KAAK,EAAE,WAAW,EAA8D,MAAM,aAAa,CAAC;AAE3G,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAKvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAIvE,YAAY,EAAE,aAAa,IAAI,uBAAuB,EAAE,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAChC,YAAY,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAIzE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE1D;AAiDD;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC7C,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,aAAkB,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA2CxB;AAID;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,iBAAiB,EAAE,MAAM,EACzB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,GACf,WAAW,CAyDb"}

package/dist/structural/index.js

@@ -0,0 +1,177 @@
+/**
+ * @gitwand/core v2.3 — Structural (AST-based) merge dispatcher
+ *
+ * Provides `tryStructuralMergeResolve()`, an async entry point that:
+ *
+ * 1. Reconstructs the three file versions (base/ours/theirs) from the
+ *    Git conflict markers in the conflicted content.
+ * 2. Parses each version with tree-sitter (via `web-tree-sitter`, optional peer).
+ * 3. Extracts top-level entities and matches them across the three versions.
+ * 4. Merges entities individually — only auto-resolvable conflicts are handled.
+ * 5. Reconstructs the merged file following theirs entity order.
+ *
+ * Returns `null` (never throws) when:
+ * - `web-tree-sitter` is not installed (graceful degradation)
+ * - The grammar WASM file is unavailable
+ * - Any version has parse errors
+ * - Any entity has a real (both-changed-diff) conflict
+ *
+ * In all these cases the caller falls back to the standard hunk-based resolver.
+ */
+import { parseConflictMarkers } from "../parser.js";
+import { validateMergedContent } from "../resolver/validation.js";
+import { loadGrammarForFile } from "./parsers/grammars/ts.js";
+import { createParser } from "./parsers/loader.js";
+import { extractEntities, hasParseErrors } from "./entities.js";
+import { matchEntities } from "./matching.js";
+import { mergeEntity, hasEntityConflict } from "./merge.js";
+import { reconstructFile } from "./reconstruct.js";
+import { isStructuralLanguage } from "./parsers/grammars/languages.js";
+export { isStructuralLanguage };
+// ─── Backward-compat alias ────────────────────────────────────────────────────
+/**
+ * Returns `true` for `.ts` and `.tsx` files.
+ * @deprecated Use `isStructuralLanguage` — now covers JS/JSX/Python/Go/Rust too.
+ */
+export function isTypeScriptFile(filePath) {
+    return /\.(ts|tsx)$/i.test(filePath) && !/\.d\.ts$/i.test(filePath);
+}
+/**
+ * Reconstruct the three clean file versions from a conflicted file.
+ *
+ * - `ours`   = text segments + ours lines from each conflict hunk
+ * - `theirs` = text segments + theirs lines from each conflict hunk
+ * - `base`   = text segments + base lines (diff3) or ours lines (diff2 fallback)
+ */
+function reconstructVersions(conflictedContent) {
+    const { segments } = parseConflictMarkers(conflictedContent);
+    const oursLines = [];
+    const theirsLines = [];
+    const baseLines = [];
+    for (const seg of segments) {
+        if (seg.type === "text") {
+            oursLines.push(...seg.lines);
+            theirsLines.push(...seg.lines);
+            baseLines.push(...seg.lines);
+        }
+        else {
+            const { conflict } = seg;
+            oursLines.push(...conflict.oursLines);
+            theirsLines.push(...conflict.theirsLines);
+            // Use diff3 base if available; fall back to ours (conservative)
+            baseLines.push(...(conflict.baseLines.length > 0 ? conflict.baseLines : conflict.oursLines));
+        }
+    }
+    return {
+        base: baseLines.join("\n"),
+        ours: oursLines.join("\n"),
+        theirs: theirsLines.join("\n"),
+    };
+}
+// ─── Main entry point ─────────────────────────────────────────────────────────
+/**
+ * Attempt structural (AST-based) merge resolution for a TypeScript/TSX file.
+ *
+ * @param conflictedContent - File content with Git conflict markers
+ * @param filePath          - File path (grammar selection + type detection)
+ * @param opts              - Optional loader overrides (WASM paths, custom loaders)
+ * @returns Merged content string on success, `null` on any failure
+ */
+export async function tryStructuralMergeResolve(conflictedContent, filePath, opts = {}) {
+    // Only handle supported languages
+    if (!isStructuralLanguage(filePath))
+        return null;
+    // Load tree-sitter grammar (returns null if optional peer not installed)
+    const language = await loadGrammarForFile(filePath, opts);
+    if (!language)
+        return null;
+    // Create parser
+    const parser = await createParser(language, opts);
+    if (!parser)
+        return null;
+    // Reconstruct the three file versions
+    const { base, ours, theirs } = reconstructVersions(conflictedContent);
+    // Parse all three versions
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const p = parser;
+    const [baseTree, oursTree, theirsTree] = [base, ours, theirs].map((src) => p.parse(src));
+    // Abort on parse errors in any version
+    if (hasParseErrors(baseTree) || hasParseErrors(oursTree) || hasParseErrors(theirsTree)) {
+        return null;
+    }
+    // Extract top-level entities
+    const baseEntities = extractEntities(baseTree, base);
+    const oursEntities = extractEntities(oursTree, ours);
+    const theirsEntities = extractEntities(theirsTree, theirs);
+    // 3-way entity matching
+    const matches = matchEntities(baseEntities, oursEntities, theirsEntities);
+    // Entity-level merge decisions
+    const merges = matches.map(mergeEntity);
+    // Abort if any entity has a real conflict
+    if (hasEntityConflict(merges))
+        return null;
+    // Reconstruct the merged file
+    const mergedContent = reconstructFile(merges, theirsEntities, oursEntities, theirs);
+    return mergedContent;
+}
+// ─── MergeResult wrapper ──────────────────────────────────────────────────────
+/**
+ * Wrap a structurally merged content string in a `MergeResult` object.
+ *
+ * All hunks are marked as auto-resolved via the "structural-merge" resolver.
+ * This keeps the return type compatible with the synchronous `resolve()`.
+ */
+export function wrapStructuralResult(conflictedContent, mergedContent, filePath) {
+    const { segments } = parseConflictMarkers(conflictedContent);
+    const hunks = segments
+        .filter((s) => s.type === "conflict")
+        .map((s) => ({
+        baseLines: s.conflict.baseLines,
+        oursLines: s.conflict.oursLines,
+        theirsLines: s.conflict.theirsLines,
+        startLine: s.conflict.startLine,
+        type: "complex",
+        confidence: {
+            score: 100,
+            label: "certain",
+            dimensions: {
+                typeClassification: 100,
+                dataRisk: 0,
+                scopeImpact: 0,
+                fileFrequency: 0,
+                baseAvailability: s.conflict.baseLines.length > 0 ? 100 : 0,
+            },
+            boosters: ["structural-merge"],
+            penalties: [],
+        },
+        explanation: "Résolu via merge structurel (tree-sitter AST)",
+        trace: {
+            steps: [],
+            selected: "complex",
+            summary: "Résolu via analyse structurelle AST — merge par entités TypeScript",
+            hasBase: s.conflict.baseLines.length > 0,
+        },
+    }));
+    const resolutions = hunks.map((hunk) => ({
+        hunk,
+        resolvedLines: null,
+        autoResolved: true,
+        resolutionReason: "structural-merge: résolu via analyse AST tree-sitter",
+    }));
+    const byType = hunks.length > 0 ? { complex: hunks.length } : {};
+    const validation = validateMergedContent(mergedContent, filePath);
+    return {
+        filePath,
+        mergedContent,
+        hunks,
+        resolutions,
+        stats: {
+            totalConflicts: hunks.length,
+            autoResolved: hunks.length,
+            remaining: 0,
+            byType,
+        },
+        validation,
+    };
+}
+//# sourceMappingURL=index.js.map

package/dist/structural/index.js.map

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

package/dist/structural/matching.d.ts

@@ -0,0 +1,46 @@
+/**
+ * 3-way entity matching for structural merge.
+ *
+ * Matches top-level entities across the three file versions (base / ours /
+ * theirs) using their `signature` as a stable key. Each entity triple is
+ * assigned a status that describes what happened to it during the merge.
+ */
+import type { TopLevelEntity } from "./entities.js";
+export type EntityMatchStatus = 
+/** Text identical in all three versions */
+"unchanged"
+/** Changed in ours, unchanged in theirs */
+ | "ours-only-change"
+/** Changed in theirs, unchanged in ours */
+ | "theirs-only-change"
+/** Both sides made the same change (or both deleted) */
+ | "both-changed-same"
+/** Both sides changed differently — unresolvable at entity level */
+ | "both-changed-diff"
+/** Added only by ours (not in base, not in theirs) */
+ | "ours-added"
+/** Added only by theirs (not in base, not in ours) */
+ | "theirs-added"
+/** Deleted by ours (was in base and theirs) */
+ | "ours-deleted"
+/** Deleted by theirs (was in base and ours) */
+ | "theirs-deleted";
+export interface EntityMatch {
+    signature: string;
+    status: EntityMatchStatus;
+    base: TopLevelEntity | null;
+    ours: TopLevelEntity | null;
+    theirs: TopLevelEntity | null;
+}
+/**
+ * Compute 3-way entity matches between base, ours, and theirs.
+ *
+ * The returned array covers every unique signature found across all three
+ * versions. Order follows: base order → ours-only → theirs-only sigs.
+ *
+ * @param base   - Entities extracted from the base (ancestor) version
+ * @param ours   - Entities extracted from our version (current branch)
+ * @param theirs - Entities extracted from their version (incoming branch)
+ */
+export declare function matchEntities(base: TopLevelEntity[], ours: TopLevelEntity[], theirs: TopLevelEntity[]): EntityMatch[];
+//# sourceMappingURL=matching.d.ts.map

package/dist/structural/matching.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"matching.d.ts","sourceRoot":"","sources":["../../src/structural/matching.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAIpD,MAAM,MAAM,iBAAiB;AAC3B,2CAA2C;AACzC,WAAW;AACb,2CAA2C;GACzC,kBAAkB;AACpB,2CAA2C;GACzC,oBAAoB;AACtB,wDAAwD;GACtD,mBAAmB;AACrB,oEAAoE;GAClE,mBAAmB;AACrB,sDAAsD;GACpD,YAAY;AACd,sDAAsD;GACpD,cAAc;AAChB,+CAA+C;GAC7C,cAAc;AAChB,+CAA+C;GAC7C,gBAAgB,CAAC;AAErB,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,IAAI,EAAE,cAAc,GAAG,IAAI,CAAC;IAC5B,IAAI,EAAE,cAAc,GAAG,IAAI,CAAC;IAC5B,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;CAC/B;AA4CD;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,cAAc,EAAE,EACtB,IAAI,EAAE,cAAc,EAAE,EACtB,MAAM,EAAE,cAAc,EAAE,GACvB,WAAW,EAAE,CA8Bf"}