@gitwand/core 3.3.0 → 3.5.0

package/dist/secrets/scanner.d.ts

@@ -0,0 +1,28 @@
+import type { ScanFileInput, SecretFinding, SecretsScanConfig } from "./types.js";
+/**
+ * v3.5.0 (D5) — Globs de fichiers générés ignorés PAR DÉFAUT, quel que soit `config.ignore`.
+ * Sans ça, un simple `pnpm install` qui bump une intégrité de lockfile (`integrity: sha512-…`)
+ * déclenche un finding `high_entropy` sur la quasi-totalité des commits réels. Toujours
+ * appliqués en plus des entrées `.gitwandrc` `secrets.ignore[]` de l'utilisateur (additif, jamais
+ * remplacé). MIRROIR EXACT côté Rust : `apps/desktop/src-tauri/src/commands/secrets.rs`
+ * `DEFAULT_IGNORE_GLOBS` — verrouillé par le test de parité (scan-secrets.test.mjs). Toute
+ * modification de cette liste doit être répercutée des deux côtés.
+ */
+export declare const DEFAULT_IGNORE_GLOBS: string[];
+export declare function scanSecrets(files: ScanFileInput[], config: SecretsScanConfig): SecretFinding[];
+/** Entropie de Shannon en bits/char. */
+export declare function shannonEntropy(s: string): number;
+/**
+ * Masque une valeur secrète : ≤3 caractères de tête + `…` + ≤3 caractères de queue.
+ * Pour les correspondances courtes, où révéler 3+3 caractères exposerait (quasi) toute la
+ * valeur, on masque intégralement à la place. Le brut n'est JAMAIS retourné.
+ */
+export declare function redact(match: string): string;
+/**
+ * `true` si la valeur matchée ou le fichier doit être ignoré, d'après `.gitwandrc` `secrets.ignore[]`.
+ * Une entrée `/.../ ` est un littéral regex testé contre la valeur matchée ; toute autre entrée
+ * est un glob de chemin testé contre `path` (via `matchGlob`, le même moteur que les overrides de
+ * politique de merge).
+ */
+export declare function isIgnored(path: string, value: string, ignore: string[]): boolean;
+//# sourceMappingURL=scanner.d.ts.map

package/dist/secrets/scanner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../../src/secrets/scanner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAiB,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAajG;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,EAAE,MAAM,EAYxC,CAAC;AAQF,wBAAgB,WAAW,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,iBAAiB,GAAG,aAAa,EAAE,CA2E9F;AAED,wCAAwC;AACxC,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAUhD;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAS5C;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAehF"}

package/dist/secrets/scanner.js

@@ -0,0 +1,161 @@
+import { matchGlob } from "../config.js";
+import { BUILT_IN_PATTERNS } from "./patterns.js";
+/**
+ * v3.5.0 — Scanner de secrets pur (aucune dépendance Node/git).
+ *
+ * Mirroir Rust : `apps/desktop/src-tauri/src/commands/secrets.rs` (`scan_lines`). Toute
+ * modification de comportement ici doit être répercutée côté Rust — voir le test de parité
+ * (Task 7).
+ */
+/** Nombre maximal de findings retournés (défensif — voir apps/desktop/CLAUDE.md P6.4). */
+const MAX_FINDINGS = 500;
+/**
+ * v3.5.0 (D5) — Globs de fichiers générés ignorés PAR DÉFAUT, quel que soit `config.ignore`.
+ * Sans ça, un simple `pnpm install` qui bump une intégrité de lockfile (`integrity: sha512-…`)
+ * déclenche un finding `high_entropy` sur la quasi-totalité des commits réels. Toujours
+ * appliqués en plus des entrées `.gitwandrc` `secrets.ignore[]` de l'utilisateur (additif, jamais
+ * remplacé). MIRROIR EXACT côté Rust : `apps/desktop/src-tauri/src/commands/secrets.rs`
+ * `DEFAULT_IGNORE_GLOBS` — verrouillé par le test de parité (scan-secrets.test.mjs). Toute
+ * modification de cette liste doit être répercutée des deux côtés.
+ */
+export const DEFAULT_IGNORE_GLOBS = [
+    "*.lock",
+    "package-lock.json",
+    "pnpm-lock.yaml",
+    "yarn.lock",
+    "Cargo.lock",
+    "*.min.js",
+    "*.min.css",
+    "dist/**",
+    "build/**",
+    "node_modules/**",
+    "*.map",
+];
+/** Longueur minimale d'un token pour être soumis à la détection par entropie. */
+const MIN_ENTROPY_TOKEN_LENGTH = 20;
+/** Caractères considérés comme faisant partie d'un token candidat à l'entropie. */
+const ENTROPY_TOKEN_RE = /[A-Za-z0-9+/=_-]+/g;
+export function scanSecrets(files, config) {
+    if (!config.enabled)
+        return [];
+    // Built-ins always apply; user `.gitwandrc` entries are additive on top, never a replacement.
+    const effectiveIgnore = [...DEFAULT_IGNORE_GLOBS, ...config.ignore];
+    const allPatterns = [...BUILT_IN_PATTERNS, ...config.extraPatterns];
+    const compiled = allPatterns.flatMap((pattern) => {
+        try {
+            return [{ pattern, re: new RegExp(pattern.regex, "g") }];
+        }
+        catch {
+            // Regex utilisateur malformée — on l'ignore silencieusement, jamais fatal.
+            return [];
+        }
+    });
+    const findings = [];
+    for (const file of files) {
+        for (const { line, text } of file.addedLines) {
+            const matchedRanges = [];
+            for (const { pattern, re } of compiled) {
+                re.lastIndex = 0;
+                let m;
+                while ((m = re.exec(text)) !== null) {
+                    const matchValue = m[0];
+                    if (matchValue.length === 0) {
+                        re.lastIndex++;
+                        continue;
+                    }
+                    matchedRanges.push([m.index, m.index + matchValue.length]);
+                    if (!isIgnored(file.path, matchValue, effectiveIgnore)) {
+                        findings.push({
+                            file: file.path,
+                            line,
+                            patternId: pattern.id,
+                            severity: pattern.severity,
+                            redactedExcerpt: redact(matchValue),
+                        });
+                    }
+                }
+            }
+            if (config.entropyThreshold > 0) {
+                ENTROPY_TOKEN_RE.lastIndex = 0;
+                let tokenMatch;
+                while ((tokenMatch = ENTROPY_TOKEN_RE.exec(text)) !== null) {
+                    const token = tokenMatch[0];
+                    const start = tokenMatch.index;
+                    const end = start + token.length;
+                    if (token.length < MIN_ENTROPY_TOKEN_LENGTH)
+                        continue;
+                    const overlapsRegexHit = matchedRanges.some(([rStart, rEnd]) => start < rEnd && end > rStart);
+                    if (overlapsRegexHit)
+                        continue;
+                    if (shannonEntropy(token) >= config.entropyThreshold) {
+                        if (!isIgnored(file.path, token, effectiveIgnore)) {
+                            findings.push({
+                                file: file.path,
+                                line,
+                                patternId: "high_entropy",
+                                severity: "low",
+                                redactedExcerpt: redact(token),
+                            });
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return findings.slice(0, MAX_FINDINGS);
+}
+/** Entropie de Shannon en bits/char. */
+export function shannonEntropy(s) {
+    if (s.length === 0)
+        return 0;
+    const freq = new Map();
+    for (const ch of s)
+        freq.set(ch, (freq.get(ch) ?? 0) + 1);
+    let entropy = 0;
+    for (const count of freq.values()) {
+        const p = count / s.length;
+        entropy -= p * Math.log2(p);
+    }
+    return entropy;
+}
+/**
+ * Masque une valeur secrète : ≤3 caractères de tête + `…` + ≤3 caractères de queue.
+ * Pour les correspondances courtes, où révéler 3+3 caractères exposerait (quasi) toute la
+ * valeur, on masque intégralement à la place. Le brut n'est JAMAIS retourné.
+ */
+export function redact(match) {
+    const VISIBLE_EDGE = 3;
+    const MIN_LENGTH_FOR_PARTIAL_REVEAL = 12;
+    if (match.length < MIN_LENGTH_FOR_PARTIAL_REVEAL) {
+        return "*".repeat(match.length);
+    }
+    const lead = match.slice(0, VISIBLE_EDGE);
+    const trail = match.slice(-VISIBLE_EDGE);
+    return `${lead}…${trail}`;
+}
+/**
+ * `true` si la valeur matchée ou le fichier doit être ignoré, d'après `.gitwandrc` `secrets.ignore[]`.
+ * Une entrée `/.../ ` est un littéral regex testé contre la valeur matchée ; toute autre entrée
+ * est un glob de chemin testé contre `path` (via `matchGlob`, le même moteur que les overrides de
+ * politique de merge).
+ */
+export function isIgnored(path, value, ignore) {
+    for (const entry of ignore) {
+        if (entry.length >= 2 && entry.startsWith("/") && entry.endsWith("/")) {
+            const body = entry.slice(1, -1);
+            try {
+                if (new RegExp(body).test(value))
+                    return true;
+            }
+            catch {
+                // Regex d'ignore malformée — on l'ignore silencieusement.
+                continue;
+            }
+        }
+        else if (matchGlob(entry, path)) {
+            return true;
+        }
+    }
+    return false;
+}
+//# sourceMappingURL=scanner.js.map

package/dist/secrets/scanner.js.map

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

package/dist/secrets/types.d.ts

@@ -0,0 +1,47 @@
+/**
+ * v3.5.0 — Types partagés du scanner de secrets.
+ *
+ * Mirroir Rust : `apps/desktop/src-tauri/src/types.rs` (SecretFinding, SecretPatternInput,
+ * SecretsScanConfig). Toute modification de forme ici doit être répercutée côté Rust — voir le
+ * test de parité (Task 7).
+ */
+export type SecretSeverity = "high" | "medium" | "low";
+/** Un détecteur built-in ou fourni par l'utilisateur via `.gitwandrc`. */
+export interface SecretPattern {
+    /** Identifiant stable, ex: "aws_access_key_id", "github_pat_classic". */
+    id: string;
+    /** Sous-ensemble commun Rust+JS — PAS de lookaround / backreferences. */
+    regex: string;
+    severity: SecretSeverity;
+    /** Description par défaut en anglais ; l'UI affiche une clé i18n par id quand elle existe. */
+    description: string;
+}
+/** Entrée du scanner pur (l'appelant extrait ceci depuis `git diff --cached`). */
+export interface ScanFileInput {
+    path: string;
+    addedLines: Array<{
+        line: number;
+        text: string;
+    }>;
+}
+/** Config effective : built-ins + extensions utilisateur, résolue par l'appelant. */
+export interface SecretsScanConfig {
+    /** Interrupteur maître (app setting ET .gitwandrc secrets.enabled). */
+    enabled: boolean;
+    /** Depuis .gitwandrc secrets.patterns[]. */
+    extraPatterns: SecretPattern[];
+    /** Chemins glob OU littéraux /regex/ à ignorer, depuis .gitwandrc. */
+    ignore: string[];
+    /** Bits/char Shannon sur tokens longs ; 0 désactive la détection par entropie. */
+    entropyThreshold: number;
+}
+export interface SecretFinding {
+    file: string;
+    line: number;
+    /** id built-in, id utilisateur, ou "high_entropy". */
+    patternId: string;
+    severity: SecretSeverity;
+    /** Excerpt masqué au centre — JAMAIS le secret brut. */
+    redactedExcerpt: string;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/secrets/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/secrets/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEvD,0EAA0E;AAC1E,MAAM,WAAW,aAAa;IAC5B,yEAAyE;IACzE,EAAE,EAAE,MAAM,CAAC;IACX,yEAAyE;IACzE,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,cAAc,CAAC;IACzB,8FAA8F;IAC9F,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,kFAAkF;AAClF,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACnD;AAED,qFAAqF;AACrF,MAAM,WAAW,iBAAiB;IAChC,uEAAuE;IACvE,OAAO,EAAE,OAAO,CAAC;IACjB,4CAA4C;IAC5C,aAAa,EAAE,aAAa,EAAE,CAAC;IAC/B,sEAAsE;IACtE,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,kFAAkF;IAClF,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,sDAAsD;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,cAAc,CAAC;IACzB,wDAAwD;IACxD,eAAe,EAAE,MAAM,CAAC;CACzB"}

package/dist/secrets/types.js

@@ -0,0 +1,9 @@
+/**
+ * v3.5.0 — Types partagés du scanner de secrets.
+ *
+ * Mirroir Rust : `apps/desktop/src-tauri/src/types.rs` (SecretFinding, SecretPatternInput,
+ * SecretsScanConfig). Toute modification de forme ici doit être répercutée côté Rust — voir le
+ * test de parité (Task 7).
+ */
+export {};
+//# sourceMappingURL=types.js.map

package/dist/secrets/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/secrets/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG"}

package/dist/stats/tiers.d.ts

@@ -0,0 +1,30 @@
+/**
+ * "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. Answers: of the residual left after the cheap deterministic passes,
+ * how much is still recoverable deterministically before the model is ever
+ * invoked?
+ *
+ * Design note: these fields are deliberately NOT added to `MergeStats` —
+ * that struct is a serialized public contract (CLI --json reports, MCP
+ * output), and derived metrics stay derived. `summarizeTiers` is a TS-side
+ * helper consumed separately by CLI/desktop/MCP. (An earlier revision cited
+ * the Rust↔TS parity probe as the reason; that probe covers git commands,
+ * not resolution structs — the contract argument is the real one.)
+ */
+import type { ConflictType } from "../types.js";
+export type ResolutionTier = "trivial" | "advancedDeterministic" | "model" | "unresolved";
+export interface TierSummary {
+    byTier: Record<ResolutionTier, number>;
+    /** advancedDeterministic + model + unresolved — everything past the cheap trivial passes. */
+    residual: number;
+    /** model + unresolved — the bucket a new deterministic pattern must shrink. */
+    aiReachable: number;
+    /** advancedDeterministic / residual, 0 when residual === 0 (never NaN/Infinity). */
+    recoverableBeforeModel: number;
+}
+export declare function summarizeTiers(byType: Record<ConflictType, number>): TierSummary;
+//# sourceMappingURL=tiers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tiers.d.ts","sourceRoot":"","sources":["../../src/stats/tiers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,uBAAuB,GAAG,OAAO,GAAG,YAAY,CAAC;AAE1F,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACvC,6FAA6F;IAC7F,QAAQ,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,WAAW,EAAE,MAAM,CAAC;IACpB,oFAAoF;IACpF,sBAAsB,EAAE,MAAM,CAAC;CAChC;AA2BD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,WAAW,CAiBhF"}

package/dist/stats/tiers.js

@@ -0,0 +1,57 @@
+/**
+ * "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. Answers: of the residual left after the cheap deterministic passes,
+ * how much is still recoverable deterministically before the model is ever
+ * invoked?
+ *
+ * Design note: these fields are deliberately NOT added to `MergeStats` —
+ * that struct is a serialized public contract (CLI --json reports, MCP
+ * output), and derived metrics stay derived. `summarizeTiers` is a TS-side
+ * helper consumed separately by CLI/desktop/MCP. (An earlier revision cited
+ * the Rust↔TS parity probe as the reason; that probe covers git commands,
+ * not resolution structs — the contract argument is the real one.)
+ */
+/**
+ * ConflictType → tier. Exhaustive over the `ConflictType` union — a future
+ * addition to that union fails to compile here until classified.
+ *
+ * `token_level_merge` sits in `advancedDeterministic` even though it never
+ * auto-applies without user confirmation (see packages/core/CLAUDE.md) —
+ * "recoverable deterministically" means "doesn't need the model", not
+ * "applied without a human in the loop".
+ */
+const TIER_BY_TYPE = {
+    same_change: "trivial",
+    delete_no_change: "trivial",
+    one_side_change: "trivial",
+    non_overlapping: "trivial",
+    whitespace_only: "trivial",
+    reorder_only: "trivial",
+    insertion_at_boundary: "trivial",
+    value_only_change: "trivial",
+    generated_file: "trivial",
+    refactoring_aware_merge: "advancedDeterministic",
+    token_level_merge: "advancedDeterministic",
+    llm_proposed: "model",
+    complex: "unresolved",
+};
+export function summarizeTiers(byType) {
+    const byTier = {
+        trivial: 0,
+        advancedDeterministic: 0,
+        model: 0,
+        unresolved: 0,
+    };
+    for (const [type, tier] of Object.entries(TIER_BY_TYPE)) {
+        byTier[tier] += byType[type] ?? 0;
+    }
+    const residual = byTier.advancedDeterministic + byTier.model + byTier.unresolved;
+    const aiReachable = byTier.model + byTier.unresolved;
+    const recoverableBeforeModel = residual === 0 ? 0 : byTier.advancedDeterministic / residual;
+    return { byTier, residual, aiReachable, recoverableBeforeModel };
+}
+//# sourceMappingURL=tiers.js.map

package/dist/stats/tiers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tiers.js","sourceRoot":"","sources":["../../src/stats/tiers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAgBH;;;;;;;;GAQG;AACH,MAAM,YAAY,GAAyC;IACzD,WAAW,EAAE,SAAS;IACtB,gBAAgB,EAAE,SAAS;IAC3B,eAAe,EAAE,SAAS;IAC1B,eAAe,EAAE,SAAS;IAC1B,eAAe,EAAE,SAAS;IAC1B,YAAY,EAAE,SAAS;IACvB,qBAAqB,EAAE,SAAS;IAChC,iBAAiB,EAAE,SAAS;IAC5B,cAAc,EAAE,SAAS;IACzB,uBAAuB,EAAE,uBAAuB;IAChD,iBAAiB,EAAE,uBAAuB;IAC1C,YAAY,EAAE,OAAO;IACrB,OAAO,EAAE,YAAY;CACtB,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,MAAoC;IACjE,MAAM,MAAM,GAAmC;QAC7C,OAAO,EAAE,CAAC;QACV,qBAAqB,EAAE,CAAC;QACxB,KAAK,EAAE,CAAC;QACR,UAAU,EAAE,CAAC;KACd,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAqC,EAAE,CAAC;QAC5F,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,qBAAqB,GAAG,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC;IACjF,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC;IACrD,MAAM,sBAAsB,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,GAAG,QAAQ,CAAC;IAE5F,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,sBAAsB,EAAE,CAAC;AACnE,CAAC"}

package/dist/types.d.ts

@@ -16,7 +16,7 @@ export interface MergeInput {
     filePath: string;
 }
 /** Classification du type de conflit */
-export type ConflictType = "one_side_change" | "same_change" | "non_overlapping" | "whitespace_only" | "delete_no_change" | "generated_file" | "value_only_change" | "reorder_only" | "insertion_at_boundary" | "llm_proposed" | "refactoring_aware_merge" | "complex";
+export type ConflictType = "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";
 /** Niveau de confiance discret (label seuil, utilisé dans les options) */
 export type Confidence = "certain" | "high" | "medium" | "low";
 /**
@@ -255,6 +255,35 @@ export interface DecisionTrace {
      * `undefined` pour tous les autres types de conflit.
      */
     llmTrace?: LlmTrace;
+    /**
+     * v2.7 — Proposition de fusion token-level (uniquement si
+     * `selected === "token_level_merge"`). `undefined` pour tous les autres types.
+     */
+    tokenMergeTrace?: TokenMergeTrace;
+}
+/** Détail de résolution pour une ligne du hunk. */
+export interface TokenMergeLineDetail {
+    /** Index de la ligne dans le hunk (0-based, aligné sur base/ours/theirs). */
+    lineIndex: number;
+    /** Quelle passe a résolu cette ligne. */
+    resolvedBy: "pass1" | "pass2";
+    /** Contenu final proposé pour cette ligne. */
+    resolvedLine: string;
+    /** Indices de tokens modifiés par ours (uniquement renseigné pour pass2). */
+    oursTokenIndices?: number[];
+    /** Indices de tokens modifiés par theirs (uniquement renseigné pour pass2). */
+    theirsTokenIndices?: number[];
+}
+/** Proposition complète de fusion token-level pour un hunk. */
+export interface TokenMergeTrace {
+    /** Lignes fusionnées proposées — appliquées telles quelles si l'utilisateur accepte. */
+    mergedLines: string[];
+    /** Nombre de lignes résolues par la passe 1 (décomposition ligne-par-ligne). */
+    pass1Count: number;
+    /** Nombre de lignes résolues par la passe 2 (diff token-level). */
+    pass2Count: number;
+    /** Détail par ligne, pour l'annotation visuelle dans le panneau de proposition. */
+    lineDetails: TokenMergeLineDetail[];
 }
 /**
  * Input canonique pour la classification d'un hunk.

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": "3.3.0",
+  "version": "3.5.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",