@gitwand/core 2.0.1 → 2.3.0

package/dist/structural/parsers/grammars/ts.js

@@ -0,0 +1,46 @@
+/**
+ * Grammar loaders for all structural-merge–supported languages.
+ *
+ * Uses the unified language registry from `languages.ts` to map file paths
+ * to the correct `tree-sitter-wasms` grammar WASM.
+ */
+import { loadGrammar } from "../loader.js";
+import { grammarNameForFile, LANGUAGE_SPECS } from "./languages.js";
+// ─── Named loaders (kept for backward compat + direct use) ───────────────────
+/** Load the TypeScript grammar. */
+export async function loadTypeScriptGrammar(opts = {}) {
+    return loadGrammar(LANGUAGE_SPECS.typescript.grammarName, opts);
+}
+/** Load the TSX grammar. */
+export async function loadTsxGrammar(opts = {}) {
+    return loadGrammar(LANGUAGE_SPECS.tsx.grammarName, opts);
+}
+/** Load the JavaScript grammar (also used for JSX). */
+export async function loadJavaScriptGrammar(opts = {}) {
+    return loadGrammar(LANGUAGE_SPECS.javascript.grammarName, opts);
+}
+/** Load the Python grammar. */
+export async function loadPythonGrammar(opts = {}) {
+    return loadGrammar(LANGUAGE_SPECS.python.grammarName, opts);
+}
+/** Load the Go grammar. */
+export async function loadGoGrammar(opts = {}) {
+    return loadGrammar(LANGUAGE_SPECS.go.grammarName, opts);
+}
+/** Load the Rust grammar. */
+export async function loadRustGrammar(opts = {}) {
+    return loadGrammar(LANGUAGE_SPECS.rust.grammarName, opts);
+}
+// ─── Generic loader ───────────────────────────────────────────────────────────
+/**
+ * Load the appropriate grammar for a given file path.
+ * Returns `null` if the file extension is not supported or the grammar WASM
+ * is unavailable.
+ */
+export async function loadGrammarForFile(filePath, opts = {}) {
+    const grammarName = grammarNameForFile(filePath);
+    if (!grammarName)
+        return null;
+    return loadGrammar(grammarName, opts);
+}
+//# sourceMappingURL=ts.js.map

package/dist/structural/parsers/grammars/ts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ts.js","sourceRoot":"","sources":["../../../../src/structural/parsers/grammars/ts.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,WAAW,EAAqC,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEpE,gFAAgF;AAEhF,mCAAmC;AACnC,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAAsB,EAAE;IAClE,OAAO,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AAClE,CAAC;AAED,4BAA4B;AAC5B,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAsB,EAAE;IAC3D,OAAO,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC;AAED,uDAAuD;AACvD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAAsB,EAAE;IAClE,OAAO,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AAClE,CAAC;AAED,+BAA+B;AAC/B,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAsB,EAAE;IAC9D,OAAO,WAAW,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AAC9D,CAAC;AAED,2BAA2B;AAC3B,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAsB,EAAE;IAC1D,OAAO,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AAC1D,CAAC;AAED,6BAA6B;AAC7B,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAsB,EAAE;IAC5D,OAAO,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AAC5D,CAAC;AAED,iFAAiF;AAEjF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,QAAgB,EAChB,OAAsB,EAAE;IAExB,MAAM,WAAW,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACjD,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,CAAC;IAC9B,OAAO,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AACxC,CAAC"}

package/dist/structural/parsers/loader.d.ts

@@ -0,0 +1,74 @@
+/**
+ * Grammar loader for web-tree-sitter.
+ *
+ * Handles environment detection, WASM loading, and in-process caching.
+ *
+ * `web-tree-sitter` is an **optional** peer dependency — if it is not
+ * installed, every function here returns `null` gracefully and the
+ * structural merge is silently skipped.
+ */
+/** A loaded tree-sitter Language (opaque to callers). */
+export type Language = unknown;
+/** A ready-to-use tree-sitter Parser (opaque to callers). */
+export type TSParser = unknown;
+export type Environment = "node" | "tauri" | "browser";
+export interface LoaderOptions {
+    /** Base URL used by the browser adapter to locate grammar WASM files. */
+    grammarBaseUrl?: string;
+    /** Directory used by the Tauri adapter to locate grammar WASM files. */
+    grammarDir?: string;
+    /**
+     * URL for `web-tree-sitter.wasm` — the web-tree-sitter runtime WASM.
+     * Pass this when the runtime cannot auto-discover the file (e.g. inside a
+     * Vite bundle where the hashed asset URL is not predictable).
+     * Example: `"/grammars/web-tree-sitter.wasm"`.
+     *
+     * Internally mapped to `locateFile` for web-tree-sitter v0.26+ (Emscripten).
+     */
+    wasmPath?: string;
+    /**
+     * Custom WASM bytes loader — overrides environment detection entirely.
+     * Receives the grammar name (e.g. "tree-sitter-typescript") and must
+     * return the raw WASM bytes.
+     */
+    customLoader?: (grammarName: string) => Promise<Uint8Array>;
+}
+/**
+ * Detect the current runtime environment.
+ * Priority: Tauri (window.__TAURI_INTERNALS__) > Node.js (process.versions.node) > browser.
+ */
+export declare function detectEnvironment(): Environment;
+/**
+ * Ensure web-tree-sitter's WASM runtime is initialized.
+ *
+ * Idempotent — safe to call multiple times; initialization runs only once.
+ *
+ * @returns The Parser class, or `null` if web-tree-sitter is unavailable.
+ */
+export declare function ensureParserInitialized(_opts?: LoaderOptions): Promise<any | null>;
+/**
+ * Load and cache a tree-sitter grammar by name.
+ *
+ * Returns `null` (never throws) if:
+ * - `web-tree-sitter` is not installed
+ * - The grammar WASM file cannot be found or loaded
+ *
+ * @param grammarName - e.g. "tree-sitter-typescript"
+ * @param opts        - Optional WASM path / loader overrides
+ */
+export declare function loadGrammar(grammarName: string, opts?: LoaderOptions): Promise<Language | null>;
+/**
+ * Create a configured tree-sitter Parser instance.
+ *
+ * Returns `null` if web-tree-sitter is unavailable.
+ *
+ * @param language - A language object returned by `loadGrammar()`
+ * @param opts     - Loader options (passed to `ensureParserInitialized`)
+ */
+export declare function createParser(language: Language, opts?: LoaderOptions): Promise<TSParser | null>;
+/**
+ * Reset the in-process grammar cache and initialization state.
+ * Intended for use in tests only.
+ */
+export declare function _resetCache(): void;
+//# sourceMappingURL=loader.d.ts.map

package/dist/structural/parsers/loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/structural/parsers/loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,yDAAyD;AACzD,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC;AAE/B,6DAA6D;AAC7D,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC;AAE/B,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;AAEvD,MAAM,WAAW,aAAa;IAC5B,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,wEAAwE;IACxE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,YAAY,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CAC7D;AAaD;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,WAAW,CAY/C;AAuCD;;;;;;GAMG;AAEH,wBAAsB,uBAAuB,CAAC,KAAK,GAAE,aAAkB,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAsB5F;AA0BD;;;;;;;;;GASG;AACH,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,EACnB,IAAI,GAAE,aAAkB,GACvB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAyB1B;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,QAAQ,EAClB,IAAI,GAAE,aAAkB,GACvB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAQ1B;AAED;;;GAGG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAKlC"}

package/dist/structural/parsers/loader.js

@@ -0,0 +1,181 @@
+/**
+ * Grammar loader for web-tree-sitter.
+ *
+ * Handles environment detection, WASM loading, and in-process caching.
+ *
+ * `web-tree-sitter` is an **optional** peer dependency — if it is not
+ * installed, every function here returns `null` gracefully and the
+ * structural merge is silently skipped.
+ */
+// ─── Module-level cache ───────────────────────────────────────────────────────
+const grammarCache = new Map();
+let parserInitialized = false;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let _ParserClass = null;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let _LanguageClass = null;
+// ─── Environment detection ────────────────────────────────────────────────────
+/**
+ * Detect the current runtime environment.
+ * Priority: Tauri (window.__TAURI_INTERNALS__) > Node.js (process.versions.node) > browser.
+ */
+export function detectEnvironment() {
+    if (typeof window !== "undefined" &&
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        window.__TAURI_INTERNALS__ != null) {
+        return "tauri";
+    }
+    if (typeof process !== "undefined" && process.versions?.node) {
+        return "node";
+    }
+    return "browser";
+}
+// ─── web-tree-sitter dynamic import ──────────────────────────────────────────
+/**
+ * Try to dynamically import `web-tree-sitter`.
+ * Returns `null` (never throws) if the package is not installed.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+async function tryImportTreeSitter() {
+    if (_ParserClass !== null)
+        return _ParserClass;
+    try {
+        // web-tree-sitter is an optional peerDependency — TypeScript cannot
+        // resolve it at compile time when it is not installed.
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore: optional peer — may not be installed
+        const mod = await import("web-tree-sitter");
+        // v0.26+ exports named exports (Parser, Language, …) with no default.
+        // Earlier versions (≤0.22) had a single default export (the Parser class)
+        // with Language available as Parser.Language.
+        // Support both shapes.
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const anyMod = mod;
+        if (anyMod.Parser) {
+            // v0.26+ shape: { Parser, Language, … }
+            _ParserClass = anyMod.Parser;
+            _LanguageClass = anyMod.Language;
+        }
+        else {
+            // pre-v0.22 shape: default export is the Parser class; Language is Parser.Language
+            const ParserDefault = anyMod.default ?? anyMod;
+            _ParserClass = ParserDefault;
+            _LanguageClass = ParserDefault.Language;
+        }
+        return _ParserClass;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Ensure web-tree-sitter's WASM runtime is initialized.
+ *
+ * Idempotent — safe to call multiple times; initialization runs only once.
+ *
+ * @returns The Parser class, or `null` if web-tree-sitter is unavailable.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function ensureParserInitialized(_opts = {}) {
+    const Parser = await tryImportTreeSitter();
+    if (!Parser)
+        return null;
+    if (!parserInitialized) {
+        // `wasmPath` lets the caller override where web-tree-sitter finds its own
+        // runtime WASM (web-tree-sitter.wasm).  This is needed in bundled
+        // environments (Vite, Tauri) where the file is served as a static asset.
+        //
+        // web-tree-sitter v0.26+ uses the Emscripten `locateFile` callback to
+        // resolve the WASM URL — there is no `wasmPath` option in that API.
+        const initOpts = _opts.wasmPath
+            ? {
+                locateFile: (path) => path.endsWith(".wasm") ? _opts.wasmPath : path,
+            }
+            : {};
+        await Parser.init(initOpts);
+        parserInitialized = true;
+    }
+    return Parser;
+}
+// ─── WASM bytes loading ───────────────────────────────────────────────────────
+async function loadWasmForEnv(env, grammarName, opts) {
+    if (env === "node") {
+        // vite-ignore: Node-only adapter uses `createRequire` — never bundled for browser/Tauri
+        const { loadGrammarBytes } = await import(/* @vite-ignore */ "./adapters/node.js");
+        return loadGrammarBytes(grammarName);
+    }
+    if (env === "tauri") {
+        // vite-ignore: Tauri adapter uses @tauri-apps/plugin-fs — not available in web builds
+        const { loadGrammarBytes } = await import(/* @vite-ignore */ "./adapters/tauri.js");
+        return loadGrammarBytes(grammarName, { grammarDir: opts.grammarDir });
+    }
+    // browser
+    const { loadGrammarBytes } = await import("./adapters/browser.js");
+    return loadGrammarBytes(grammarName, { grammarBaseUrl: opts.grammarBaseUrl });
+}
+// ─── Public API ───────────────────────────────────────────────────────────────
+/**
+ * Load and cache a tree-sitter grammar by name.
+ *
+ * Returns `null` (never throws) if:
+ * - `web-tree-sitter` is not installed
+ * - The grammar WASM file cannot be found or loaded
+ *
+ * @param grammarName - e.g. "tree-sitter-typescript"
+ * @param opts        - Optional WASM path / loader overrides
+ */
+export async function loadGrammar(grammarName, opts = {}) {
+    const cached = grammarCache.get(grammarName);
+    if (cached !== undefined)
+        return cached;
+    const Parser = await ensureParserInitialized(opts);
+    if (!Parser)
+        return null;
+    try {
+        let wasmBytes;
+        if (opts.customLoader) {
+            wasmBytes = await opts.customLoader(grammarName);
+        }
+        else {
+            const env = detectEnvironment();
+            wasmBytes = await loadWasmForEnv(env, grammarName, opts);
+        }
+        // Use the module-level Language class (v0.26+ separate export;
+        // fall back to Parser.Language for older versions).
+        const LanguageClass = _LanguageClass ?? Parser.Language;
+        const language = await LanguageClass.load(wasmBytes);
+        grammarCache.set(grammarName, language);
+        return language;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Create a configured tree-sitter Parser instance.
+ *
+ * Returns `null` if web-tree-sitter is unavailable.
+ *
+ * @param language - A language object returned by `loadGrammar()`
+ * @param opts     - Loader options (passed to `ensureParserInitialized`)
+ */
+export async function createParser(language, opts = {}) {
+    const Parser = await ensureParserInitialized(opts);
+    if (!Parser)
+        return null;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const parser = new Parser();
+    parser.setLanguage(language);
+    return parser;
+}
+/**
+ * Reset the in-process grammar cache and initialization state.
+ * Intended for use in tests only.
+ */
+export function _resetCache() {
+    grammarCache.clear();
+    parserInitialized = false;
+    _ParserClass = null;
+    _LanguageClass = null;
+}
+//# sourceMappingURL=loader.js.map

package/dist/structural/parsers/loader.js.map

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

package/dist/structural/reconstruct.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Merged file reconstruction from entity merge results.
+ *
+ * Follows theirs entity order (to preserve incoming structure), interpolating
+ * the inter-entity whitespace/comments from the theirs source verbatim.
+ * Entities that only exist in ours (ours-added) are appended at the end.
+ */
+import type { TopLevelEntity } from "./entities.js";
+import type { EntityMergeResult } from "./merge.js";
+/**
+ * Reconstruct the merged source file from entity merge results.
+ *
+ * Strategy:
+ *   1. Walk theirs entities in order.
+ *      - Emit the source gap (whitespace, comments) between consecutive
+ *        entities, taken verbatim from `theirsSource`.
+ *      - Emit the merged text for each entity (or skip if deleted).
+ *   2. Emit the trailing content from `theirsSource` after the last entity.
+ *   3. Append any entities that only exist in ours (ours-added), separated
+ *      by a newline.
+ *
+ * @param merges         - Merge decision per entity signature
+ * @param theirsEntities - Top-level entities from the theirs version (ordered)
+ * @param oursEntities   - Top-level entities from the ours version (ordered)
+ * @param theirsSource   - Full source text of the theirs version (for gaps)
+ */
+export declare function reconstructFile(merges: EntityMergeResult[], theirsEntities: TopLevelEntity[], oursEntities: TopLevelEntity[], theirsSource: string): string;
+//# sourceMappingURL=reconstruct.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"reconstruct.d.ts","sourceRoot":"","sources":["../../src/structural/reconstruct.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,iBAAiB,EAAE,EAC3B,cAAc,EAAE,cAAc,EAAE,EAChC,YAAY,EAAE,cAAc,EAAE,EAC9B,YAAY,EAAE,MAAM,GACnB,MAAM,CA2CR"}

package/dist/structural/reconstruct.js

@@ -0,0 +1,63 @@
+/**
+ * Merged file reconstruction from entity merge results.
+ *
+ * Follows theirs entity order (to preserve incoming structure), interpolating
+ * the inter-entity whitespace/comments from the theirs source verbatim.
+ * Entities that only exist in ours (ours-added) are appended at the end.
+ */
+/**
+ * Reconstruct the merged source file from entity merge results.
+ *
+ * Strategy:
+ *   1. Walk theirs entities in order.
+ *      - Emit the source gap (whitespace, comments) between consecutive
+ *        entities, taken verbatim from `theirsSource`.
+ *      - Emit the merged text for each entity (or skip if deleted).
+ *   2. Emit the trailing content from `theirsSource` after the last entity.
+ *   3. Append any entities that only exist in ours (ours-added), separated
+ *      by a newline.
+ *
+ * @param merges         - Merge decision per entity signature
+ * @param theirsEntities - Top-level entities from the theirs version (ordered)
+ * @param oursEntities   - Top-level entities from the ours version (ordered)
+ * @param theirsSource   - Full source text of the theirs version (for gaps)
+ */
+export function reconstructFile(merges, theirsEntities, oursEntities, theirsSource) {
+    const mergeMap = new Map(merges.map((m) => [m.signature, m]));
+    const theirsSigSet = new Set(theirsEntities.map((e) => e.signature));
+    const parts = [];
+    let lastEnd = 0;
+    // ── 1. Follow theirs entity order ────────────────────────
+    for (const entity of theirsEntities) {
+        const merge = mergeMap.get(entity.signature);
+        // Emit the gap between the previous entity and this one (whitespace / comments)
+        const gap = theirsSource.slice(lastEnd, entity.startByte);
+        if (gap)
+            parts.push(gap);
+        if (merge?.include && merge.mergedText !== null) {
+            parts.push(merge.mergedText);
+        }
+        // If the entity is excluded (deleted / conflicted), we still advance
+        // lastEnd to skip over the theirs text for that entity.
+        lastEnd = entity.endByte;
+    }
+    // ── 2. Trailing content after the last theirs entity ─────
+    const trailing = theirsSource.slice(lastEnd);
+    if (trailing)
+        parts.push(trailing);
+    // ── 3. Append ours-added entities ────────────────────────
+    for (const entity of oursEntities) {
+        if (theirsSigSet.has(entity.signature))
+            continue; // already handled above
+        const merge = mergeMap.get(entity.signature);
+        if (!merge?.include || merge.mergedText === null)
+            continue;
+        // Ensure there's at least one newline separator before the appended entity
+        const last = parts[parts.length - 1] ?? "";
+        if (last !== "" && !last.endsWith("\n"))
+            parts.push("\n");
+        parts.push(merge.mergedText);
+    }
+    return parts.join("");
+}
+//# sourceMappingURL=reconstruct.js.map

package/dist/structural/reconstruct.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reconstruct.js","sourceRoot":"","sources":["../../src/structural/reconstruct.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,eAAe,CAC7B,MAA2B,EAC3B,cAAgC,EAChC,YAA8B,EAC9B,YAAoB;IAEpB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAErE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,4DAA4D;IAC5D,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAE7C,gFAAgF;QAChF,MAAM,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,GAAG;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEzB,IAAI,KAAK,EAAE,OAAO,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YAChD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC/B,CAAC;QACD,qEAAqE;QACrE,wDAAwD;QAExD,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED,4DAA4D;IAC5D,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,QAAQ;QAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEnC,4DAA4D;IAC5D,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE,CAAC;QAClC,IAAI,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC;YAAE,SAAS,CAAC,wBAAwB;QAE1E,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK,EAAE,OAAO,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI;YAAE,SAAS;QAE3D,2EAA2E;QAC3E,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,IAAI,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE1D,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxB,CAAC"}

package/dist/types.d.ts

@@ -66,6 +66,19 @@ export interface ConfidenceScore {
          * 100 si la base est disponible (diff3 ou zdiff3), 0 sinon (diff2).
          */
         baseAvailability: number;
+        /**
+         * v2.1 — Pénalité « instabilité algorithmique » : 0 = pas de signal, 100 =
+         * refactoring massif détecté des deux côtés (block-moves majoritaires).
+         * Optionnel pour rétro-compat — les patterns qui ne la set pas voient
+         * `undefined`. Consommée par `makeScore` avec un poids de −0.10.
+         *
+         * Alimentée à terme par `detectBlockMove` (primitive livrée en v2.1,
+         * branchement scoring repoussé à v2.6 refactoring-aware merge où le signal
+         * devient actionnable). En v2.1 la dimension existe et est modélisée, mais
+         * aucun pattern ne la set encore — le score reste numériquement identique
+         * pour la rétro-compat stricte.
+         */
+        algorithmStability?: number;
     };
     /** Facteurs ayant augmenté le score (justifications de haute confiance) */
     boosters: string[];
@@ -252,5 +265,17 @@ export interface GitWandOptions {
      * Exemple : `["src/**\/*.generated.ts", "*.pb.go", "api/openapi-client/**"]`.
      */
     generatedFiles?: string[];
+    /**
+     * v2.2 — Désactive globalement les FormatProfile.
+     *
+     * Quand `true`, les résolveurs JSON et YAML sautent le lookup `profileForFile`
+     * et se comportent exactement comme en v2.1 (les arrays modifiés des deux
+     * côtés retombent en fallback textuel). Utile pour rollback ponctuel,
+     * debug d'un profil mal calibré, ou scénarios où un profil tiers introduit
+     * des suppressions silencieuses inattendues.
+     *
+     * Défaut: `false` (profils actifs).
+     */
+    disableFormatProfiles?: boolean;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitwand/core",
-  "version": "2.0.1",
+  "version": "2.3.0",
   "description": "GitWand core — automatic Git conflict resolution engine (powers @gitwand/cli, @gitwand/mcp, and the GitWand desktop app)",
   "type": "module",
   "main": "dist/index.js",
@@ -38,14 +38,28 @@
   },
   "license": "MIT",
   "author": "Laurent Guitton <lb.guitton@gmail.com>",
+  "peerDependencies": {
+    "tree-sitter-wasms": ">=0.1.0",
+    "web-tree-sitter": ">=0.20.0"
+  },
+  "peerDependenciesMeta": {
+    "web-tree-sitter": {
+      "optional": true
+    },
+    "tree-sitter-wasms": {
+      "optional": true
+    }
+  },
   "dependencies": {
     "smol-toml": "^1.3.0",
     "yaml": "^2.5.0"
   },
   "devDependencies": {
     "@types/node": "^25.5.0",
+    "tree-sitter-wasms": "^0.1.13",
     "typescript": "^5.4.0",
-    "vitest": "^3.0.0"
+    "vitest": "^3.0.0",
+    "web-tree-sitter": "~0.20.7"
   },
   "scripts": {
     "build": "tsc",