@heyhuynhgiabuu/pi-diff 0.5.3 → 0.5.5

package/dist/core/config.d.ts

@@ -0,0 +1,55 @@
+/**
+ * Full pi-diff.json schema.
+ * All fields are optional — missing fields fall through to env → defaults.
+ */
+export interface PiDiffJson {
+    /** Hunk separator style. */
+    sepStyle?: "auto" | "simple" | "gap" | "context" | "metadata";
+    /** Show line numbers in gutter. */
+    lineNumbers?: boolean;
+    /** Diff indicator style on left edge. */
+    indicatorStyle?: "bar" | "classic" | "none";
+    /** How to render long lines. */
+    longLines?: "wrap" | "scroll";
+    /** Show file-header with filename and stats. */
+    fileHeader?: boolean;
+    /** Named diff color preset. */
+    theme?: string;
+    /** Shiki syntax theme name. */
+    shikiTheme?: string;
+    /** Per-color hex overrides. */
+    colors?: Partial<{
+        bgAdd: string;
+        bgDel: string;
+        bgAddHighlight: string;
+        bgDelHighlight: string;
+        bgGutterAdd: string;
+        bgGutterDel: string;
+        bgEmpty: string;
+        fgAdd: string;
+        fgDel: string;
+        fgDim: string;
+        fgLnum: string;
+        fgRule: string;
+        fgStripe: string;
+        fgSafeMuted: string;
+    }>;
+}
+/**
+ * Load pi-diff.json from project or global paths.
+ * Returns {} if neither file exists.
+ */
+export declare function loadPiDiffConfig(cwd?: string): PiDiffJson;
+/**
+ * Invalidate the cached config (useful for testing).
+ */
+export declare function invalidatePiDiffConfig(): void;
+export declare function configSepStyle(cwd?: string): PiDiffJson["sepStyle"];
+export declare function configLineNumbers(cwd?: string): boolean | undefined;
+export declare function configIndicatorStyle(cwd?: string): PiDiffJson["indicatorStyle"];
+export declare function configLongLines(cwd?: string): PiDiffJson["longLines"];
+export declare function configFileHeader(cwd?: string): boolean | undefined;
+export declare function configTheme(cwd?: string): string | undefined;
+export declare function configShikiTheme(cwd?: string): string | undefined;
+export declare function configColors(cwd?: string): PiDiffJson["colors"];
+//# sourceMappingURL=config.d.ts.map

package/dist/core/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":"AAuBA;;;GAGG;AACH,MAAM,WAAW,UAAU;IAC1B,4BAA4B;IAC5B,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,KAAK,GAAG,SAAS,GAAG,UAAU,CAAC;IAC9D,mCAAmC;IACnC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,yCAAyC;IACzC,cAAc,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,MAAM,CAAC;IAC5C,gCAAgC;IAChC,SAAS,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC9B,gDAAgD;IAChD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+BAA+B;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,+BAA+B;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,cAAc,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,MAAM,CAAC;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;CACH;AAQD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,UAAU,CA0CzD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAE7C;AAuBD,wBAAgB,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,CAEnE;AAED,wBAAgB,iBAAiB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAEnE;AAED,wBAAgB,oBAAoB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAE/E;AAED,wBAAgB,eAAe,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,CAErE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAElE;AAED,wBAAgB,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE5D;AAED,wBAAgB,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEjE;AAED,wBAAgB,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAE/D"}

package/dist/core/config.js

@@ -0,0 +1,119 @@
+// ---------------------------------------------------------------------------
+// pi-diff.json config loader
+//
+// Config priority (highest first):
+//   1. Environment variables (PI_DIFF_*) — for runtime/tool overrides
+//   2. Project-level pi-diff.json (<cwd>/pi-diff.json)
+//   3. Project-level .pi/pi-diff.json (pi-standard hidden config dir)
+//   4. Global-level pi-diff.json (~/.pi/agent/pi-diff.json)
+//   5. Global-level pi-diff.json (~/.pi/pi-diff.json)
+//   6. Hardcoded defaults
+//
+// The env vars are read by the individual resolvers in diff.ts;
+// this module handles file-based config only.
+// ---------------------------------------------------------------------------
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+// ---------------------------------------------------------------------------
+// Module state — singleton cache
+// ---------------------------------------------------------------------------
+let _cachedConfig = undefined; // null = not loaded, undefined = attempted/no-file
+/**
+ * Load pi-diff.json from project or global paths.
+ * Returns {} if neither file exists.
+ */
+export function loadPiDiffConfig(cwd) {
+    if (_cachedConfig !== undefined)
+        return _cachedConfig ?? {};
+    // When a specific cwd is provided (e.g. for testing), only search that path.
+    // When omitted, search project root then global.
+    const searchPaths = cwd
+        ? [
+            join(cwd, "pi-diff.json"),
+            join(cwd, ".pi", "pi-diff.json"),
+        ]
+        : [
+            join(process.cwd(), "pi-diff.json"),
+            join(process.cwd(), ".pi", "pi-diff.json"),
+            join(homedir(), ".pi", "agent", "pi-diff.json"),
+            join(homedir(), ".pi", "pi-diff.json"),
+        ];
+    // Deduplicate by resolving to absolute paths
+    const seen = new Set();
+    const uniquePaths = [];
+    for (const p of searchPaths) {
+        const abs = p.startsWith("/") ? p : join(process.cwd(), p);
+        if (!seen.has(abs)) {
+            seen.add(abs);
+            uniquePaths.push(abs);
+        }
+    }
+    // Priority: project first, then global. Later files extend/override earlier ones.
+    let merged = {};
+    for (const filePath of uniquePaths) {
+        try {
+            if (!existsSync(filePath))
+                continue;
+            const raw = JSON.parse(readFileSync(filePath, "utf-8"));
+            merged = deepMerge(merged, raw);
+        }
+        catch {
+            // Skip invalid files silently
+        }
+    }
+    _cachedConfig = Object.keys(merged).length > 0 ? merged : null;
+    return merged;
+}
+/**
+ * Invalidate the cached config (useful for testing).
+ */
+export function invalidatePiDiffConfig() {
+    _cachedConfig = undefined;
+}
+/**
+ * Deep-merge two PiDiffJson objects. Later values win.
+ */
+function deepMerge(a, b) {
+    const result = { ...a };
+    for (const key of Object.keys(b)) {
+        const bVal = b[key];
+        if (bVal === undefined)
+            continue;
+        if (key === "colors" && typeof bVal === "object" && bVal !== null) {
+            result.colors = { ...(a.colors || {}), ...bVal };
+        }
+        else {
+            result[key] = bVal;
+        }
+    }
+    return result;
+}
+// ---------------------------------------------------------------------------
+// Config value extractors — return the config value or undefined
+// ---------------------------------------------------------------------------
+export function configSepStyle(cwd) {
+    return loadPiDiffConfig(cwd).sepStyle;
+}
+export function configLineNumbers(cwd) {
+    return loadPiDiffConfig(cwd).lineNumbers;
+}
+export function configIndicatorStyle(cwd) {
+    return loadPiDiffConfig(cwd).indicatorStyle;
+}
+export function configLongLines(cwd) {
+    return loadPiDiffConfig(cwd).longLines;
+}
+export function configFileHeader(cwd) {
+    return loadPiDiffConfig(cwd).fileHeader;
+}
+export function configTheme(cwd) {
+    return loadPiDiffConfig(cwd).theme;
+}
+export function configShikiTheme(cwd) {
+    return loadPiDiffConfig(cwd).shikiTheme;
+}
+export function configColors(cwd) {
+    return loadPiDiffConfig(cwd).colors;
+}
+//# sourceMappingURL=config.js.map

package/dist/core/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,6BAA6B;AAC7B,EAAE;AACF,mCAAmC;AACnC,sEAAsE;AACtE,uDAAuD;AACvD,sEAAsE;AACtE,4DAA4D;AAC5D,sDAAsD;AACtD,0BAA0B;AAC1B,EAAE;AACF,gEAAgE;AAChE,8CAA8C;AAC9C,8EAA8E;AAE9E,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AA4CjC,8EAA8E;AAC9E,iCAAiC;AACjC,8EAA8E;AAE9E,IAAI,aAAa,GAAkC,SAAS,CAAC,CAAC,mDAAmD;AAEjH;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAY;IAC5C,IAAI,aAAa,KAAK,SAAS;QAAE,OAAO,aAAa,IAAI,EAAE,CAAC;IAE5D,6EAA6E;IAC7E,iDAAiD;IACjD,MAAM,WAAW,GAAG,GAAG;QACtB,CAAC,CAAC;YACA,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC;YACzB,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,cAAc,CAAC;SAC/B;QACH,CAAC,CAAC;YACA,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC;YACnC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,cAAc,CAAC;YAC1C,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,cAAc,CAAC;YAC/C,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,cAAc,CAAC;SACrC,CAAC;IAEL,6CAA6C;IAC7C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;IACF,CAAC;IAED,kFAAkF;IAClF,IAAI,MAAM,GAAe,EAAE,CAAC;IAC5B,KAAK,MAAM,QAAQ,IAAI,WAAW,EAAE,CAAC;QACpC,IAAI,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAAE,SAAS;YACpC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAe,CAAC;YACtE,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACR,8BAA8B;QAC/B,CAAC;IACF,CAAC;IAED,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/D,OAAO,MAAM,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB;IACrC,aAAa,GAAG,SAAS,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,SAAS,SAAS,CAAC,CAAa,EAAE,CAAa;IAC9C,MAAM,MAAM,GAAe,EAAE,GAAG,CAAC,EAAE,CAAC;IACpC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAyB,EAAE,CAAC;QAC1D,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACpB,IAAI,IAAI,KAAK,SAAS;YAAE,SAAS;QACjC,IAAI,GAAG,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACnE,MAAM,CAAC,MAAM,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,MAAgC,IAAI,EAAE,CAAC,EAAE,GAAI,IAA+B,EAAE,CAAC;QACxG,CAAC;aAAM,CAAC;YACN,MAAkC,CAAC,GAAG,CAAC,GAAG,IAAe,CAAC;QAC5D,CAAC;IACF,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,8EAA8E;AAC9E,iEAAiE;AACjE,8EAA8E;AAE9E,MAAM,UAAU,cAAc,CAAC,GAAY;IAC1C,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAY;IAC7C,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAY;IAChD,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,cAAc,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAY;IAC3C,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAY;IAC5C,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAY;IACvC,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAY;IAC5C,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAY;IACxC,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;AACrC,CAAC"}

package/dist/core/conflicts.d.ts

@@ -0,0 +1,37 @@
+/** A single merge conflict region within a file. */
+export interface ConflictRegion {
+    /** The ref/branch name from <<<<<<< header. */
+    currentRef: string;
+    /** Lines in the current (ours) side. */
+    current: string[];
+    /** Lines in the base/ancestor side (3-way merge only). */
+    base: string[];
+    /** Lines in the incoming (theirs) side. */
+    incoming: string[];
+    /** The ref/branch name from >>>>>>> footer. */
+    incomingRef: string;
+    /** Whether this is a 3-way conflict (has base section). */
+    hasBase: boolean;
+    /** Starting line number in the file (1-based). */
+    startLine: number;
+}
+/** Result of parsing a file for merge conflicts. */
+export interface ConflictParseResult {
+    regions: ConflictRegion[];
+    hasConflicts: boolean;
+}
+/**
+ * Parse a string of file content for merge conflict markers.
+ * Returns all conflict regions found.
+ */
+export declare function parseConflicts(content: string): ConflictParseResult;
+/**
+ * Check if a string contains merge conflict markers.
+ * Fast check without full parsing.
+ */
+export declare function hasConflictMarkers(content: string): boolean;
+/**
+ * Build a human-readable summary of a conflict region.
+ */
+export declare function formatConflictSummary(region: ConflictRegion): string;
+//# sourceMappingURL=conflicts.d.ts.map

package/dist/core/conflicts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflicts.d.ts","sourceRoot":"","sources":["../../src/core/conflicts.ts"],"names":[],"mappings":"AAgBA,oDAAoD;AACpD,MAAM,WAAW,cAAc;IAC9B,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,wCAAwC;IACxC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,0DAA0D;IAC1D,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,2CAA2C;IAC3C,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,+CAA+C;IAC/C,WAAW,EAAE,MAAM,CAAC;IACpB,2DAA2D;IAC3D,OAAO,EAAE,OAAO,CAAC;IACjB,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,oDAAoD;AACpD,MAAM,WAAW,mBAAmB;IACnC,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;CACtB;AAWD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB,CAkEnE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE3D;AAMD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAUpE"}

package/dist/core/conflicts.js

@@ -0,0 +1,109 @@
+// ---------------------------------------------------------------------------
+// Merge conflict parsing and rendering
+//
+// Detects and renders Git merge conflict markers:
+//   <<<<<<< <ref>
+//   <current changes>
+//   ||||||| <base ref>
+//   <base changes>
+//   =======
+//   <incoming changes>
+//   >>>>>>> <ref>
+//
+// Supports both 2-way (current + incoming) and 3-way (current + base + incoming)
+// conflict styles.
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+// Parser
+// ---------------------------------------------------------------------------
+const CONFLICT_START_RE = /^<<<<<<<[ \t]*(.*)$/;
+const CONFLICT_SEP_RE = /^=======$/;
+const CONFLICT_BASE_RE = /^\|\|\|\|\|\|\|[ \t]*(.*)$/;
+const CONFLICT_END_RE = /^>>>>>>>[ \t]*(.*)$/;
+/**
+ * Parse a string of file content for merge conflict markers.
+ * Returns all conflict regions found.
+ */
+export function parseConflicts(content) {
+    const lines = content.split("\n");
+    const regions = [];
+    let i = 0;
+    while (i < lines.length) {
+        const startMatch = lines[i].match(CONFLICT_START_RE);
+        if (!startMatch) {
+            i++;
+            continue;
+        }
+        // Found a conflict start
+        const startLine = i + 1; // 1-based
+        const currentRef = (startMatch[1] ?? "").trim();
+        const current = [];
+        const base = [];
+        const incoming = [];
+        let hasBase = false;
+        let state = "current";
+        let endRef = "";
+        i++; // advance past <<<<<<<
+        while (i < lines.length) {
+            const line = lines[i];
+            if (CONFLICT_BASE_RE.test(line)) {
+                state = "base";
+                hasBase = true;
+                i++;
+                continue;
+            }
+            if (CONFLICT_SEP_RE.test(line)) {
+                state = "incoming";
+                i++;
+                continue;
+            }
+            const endMatch = lines[i].match(CONFLICT_END_RE);
+            if (endMatch) {
+                endRef = (endMatch[1] ?? "").trim();
+                i++;
+                break;
+            }
+            if (state === "current")
+                current.push(line);
+            else if (state === "base")
+                base.push(line);
+            else
+                incoming.push(line);
+            i++;
+        }
+        regions.push({
+            currentRef,
+            current,
+            base,
+            incoming,
+            incomingRef: endRef,
+            hasBase,
+            startLine,
+        });
+    }
+    return { regions, hasConflicts: regions.length > 0 };
+}
+/**
+ * Check if a string contains merge conflict markers.
+ * Fast check without full parsing.
+ */
+export function hasConflictMarkers(content) {
+    return /^<<<<<<<[ \t]?/m.test(content);
+}
+// ---------------------------------------------------------------------------
+// Rendering helpers
+// ---------------------------------------------------------------------------
+/**
+ * Build a human-readable summary of a conflict region.
+ */
+export function formatConflictSummary(region) {
+    const currentLabel = region.currentRef || "current";
+    const incomingLabel = region.incomingRef || "incoming";
+    const currentLines = region.current.length;
+    const incomingLines = region.incoming.length;
+    if (region.hasBase) {
+        return `Conflict: ${currentLabel} (${currentLines} lines) vs ${incomingLabel} (${incomingLines} lines) [3-way]`;
+    }
+    return `Conflict: ${currentLabel} (${currentLines} lines) vs ${incomingLabel} (${incomingLines} lines)`;
+}
+//# sourceMappingURL=conflicts.js.map

package/dist/core/conflicts.js.map

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

package/dist/core/resolve-lines.d.ts

@@ -0,0 +1,45 @@
+/**
+ * resolve-lines.ts — Hunk-based line number resolution
+ *
+ * Matches an `existing_code` snippet from an LLM review comment against
+ * parsed diff hunks to backfill `startLine`/`endLine`. Ported from
+ * alibaba/open-code-review's internal/diff/resolver.go three-tier approach.
+ *
+ * Tiers:
+ *   1. New-side match (context + added lines with new-file line numbers)
+ *   2. Old-side match (context + deleted lines with old-file line numbers)
+ *   3. File-content scan (consecutive match in full new-file content)
+ */
+import type { ParsedDiff } from "./diff.js";
+export interface ResolvedLines {
+    startLine: number;
+    endLine: number;
+}
+export interface Unresolved {
+    unresolved: true;
+}
+export type LinesResult = ResolvedLines | Unresolved;
+/**
+ * Resolve line numbers for an `existing_code` snippet against a parsed diff.
+ *
+ * Tries three tiers:
+ *   1. New-side hunk match (context + added lines)
+ *   2. Old-side hunk match (context + deleted lines)
+ *   3. Full file-content scan (if `fileContent` is provided)
+ *
+ * @param existingCode - The code snippet from the LLM comment
+ * @param parsedDiff   - Parsed diff for the file (from parsePatchFiles or parseDiff)
+ * @param fileContent  - Optional full new-file content for fallback scan
+ * @returns Resolved line numbers or Unresolved
+ */
+export declare function resolveLines(existingCode: string, parsedDiff: ParsedDiff, fileContent?: string): LinesResult;
+/**
+ * Convenience wrapper: resolve from a raw unified diff string instead of
+ * a pre-parsed ParsedDiff. Parses the diff internally.
+ *
+ * @param existingCode - The code snippet from the LLM comment
+ * @param unifiedDiff  - Raw unified diff text (single file)
+ * @param fileContent  - Optional full new-file content for fallback scan
+ */
+export declare function resolveLinesFromPatch(existingCode: string, unifiedDiff: string, fileContent?: string): LinesResult;
+//# sourceMappingURL=resolve-lines.d.ts.map

package/dist/core/resolve-lines.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-lines.d.ts","sourceRoot":"","sources":["../../src/core/resolve-lines.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAY,UAAU,EAAE,MAAM,WAAW,CAAC;AAOtD,MAAM,WAAW,aAAa;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,UAAU;IAC1B,UAAU,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG,UAAU,CAAC;AAoKrD;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAC3B,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,UAAU,EACtB,WAAW,CAAC,EAAE,MAAM,GAClB,WAAW,CAkCb;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACpC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GAClB,WAAW,CASb"}

package/dist/core/resolve-lines.js

@@ -0,0 +1,204 @@
+/**
+ * resolve-lines.ts — Hunk-based line number resolution
+ *
+ * Matches an `existing_code` snippet from an LLM review comment against
+ * parsed diff hunks to backfill `startLine`/`endLine`. Ported from
+ * alibaba/open-code-review's internal/diff/resolver.go three-tier approach.
+ *
+ * Tiers:
+ *   1. New-side match (context + added lines with new-file line numbers)
+ *   2. Old-side match (context + deleted lines with old-file line numbers)
+ *   3. File-content scan (consecutive match in full new-file content)
+ */
+import { parsePatchFiles } from "./diff.js";
+// ---------------------------------------------------------------------------
+// Normalization
+// ---------------------------------------------------------------------------
+/**
+ * Normalize a single code line for comparison.
+ * - Trims leading/trailing whitespace
+ * - Strips leading `+` or `-` diff markers
+ * - Re-trims after stripping
+ */
+function normalizeLine(s) {
+    s = s.trim();
+    s = s.startsWith("+") || s.startsWith("-") ? s.slice(1).trim() : s.trim();
+    return s;
+}
+/**
+ * Split `existing_code` into normalized non-empty lines.
+ * Empty lines after normalization are dropped (mirrors OCR behavior).
+ */
+function splitAndNormalize(code) {
+    const raw = code.split("\n");
+    const result = [];
+    for (const line of raw) {
+        const n = normalizeLine(line);
+        if (n === "")
+            continue;
+        result.push(n);
+    }
+    return result;
+}
+/**
+ * Reconstruct hunks from a flat ParsedDiff.
+ * Each `sep` marker with HunkMeta starts a new hunk. Context lines
+ * appear on both sides; `add` lines on new-side only; `del` lines on
+ * old-side only.
+ */
+function reconstructHunks(parsed) {
+    const hunks = [];
+    let currentHunk = null;
+    let oldNum = 0;
+    let newNum = 0;
+    for (const line of parsed.lines) {
+        if (line.type === "sep" && line.hunkMeta) {
+            // Start a new hunk (or the first one)
+            currentHunk = { newSide: [], oldSide: [] };
+            hunks.push(currentHunk);
+            oldNum = line.hunkMeta.oldStart;
+            newNum = line.hunkMeta.newStart;
+            continue;
+        }
+        if (!currentHunk)
+            continue; // lines before first sep — shouldn't happen
+        switch (line.type) {
+            case "ctx":
+                currentHunk.newSide.push({ lineNum: newNum++, content: normalizeLine(line.content) });
+                currentHunk.oldSide.push({ lineNum: oldNum++, content: normalizeLine(line.content) });
+                break;
+            case "add":
+                currentHunk.newSide.push({ lineNum: newNum++, content: normalizeLine(line.content) });
+                break;
+            case "del":
+                currentHunk.oldSide.push({ lineNum: oldNum++, content: normalizeLine(line.content) });
+                break;
+            // "sep" without hunkMeta (e.g., multi-edit separators) — skip
+        }
+    }
+    return hunks;
+}
+// ---------------------------------------------------------------------------
+// Sliding-window match
+// ---------------------------------------------------------------------------
+/**
+ * Scan `sideLines` for a consecutive run matching all `targetLines`.
+ * Returns the matching file line range, or undefined.
+ */
+function matchConsecutive(sideLines, targetLines) {
+    if (targetLines.length === 0 || sideLines.length < targetLines.length)
+        return undefined;
+    for (let i = 0; i <= sideLines.length - targetLines.length; i++) {
+        let matched = true;
+        for (let j = 0; j < targetLines.length; j++) {
+            if (sideLines[i + j].content !== targetLines[j]) {
+                matched = false;
+                break;
+            }
+        }
+        if (matched) {
+            return {
+                startLine: sideLines[i].lineNum,
+                endLine: sideLines[i + targetLines.length - 1].lineNum,
+            };
+        }
+    }
+    return undefined;
+}
+// ---------------------------------------------------------------------------
+// File-content fallback
+// ---------------------------------------------------------------------------
+/**
+ * Scan full file content line-by-line for a consecutive match of target lines.
+ * Returns 1-based line numbers.
+ */
+function matchInFileContent(fileContent, targetLines) {
+    if (!fileContent || targetLines.length === 0)
+        return undefined;
+    const fileLines = fileContent.split("\n");
+    if (fileLines.length < targetLines.length)
+        return undefined;
+    for (let i = 0; i <= fileLines.length - targetLines.length; i++) {
+        let matched = true;
+        for (let j = 0; j < targetLines.length; j++) {
+            const fileLine = fileLines[i + j].replace(/\r$/, "").trim();
+            if (fileLine !== targetLines[j]) {
+                matched = false;
+                break;
+            }
+        }
+        if (matched) {
+            return { startLine: i + 1, endLine: i + targetLines.length };
+        }
+    }
+    return undefined;
+}
+// ---------------------------------------------------------------------------
+// Public API
+// ---------------------------------------------------------------------------
+/**
+ * Resolve line numbers for an `existing_code` snippet against a parsed diff.
+ *
+ * Tries three tiers:
+ *   1. New-side hunk match (context + added lines)
+ *   2. Old-side hunk match (context + deleted lines)
+ *   3. Full file-content scan (if `fileContent` is provided)
+ *
+ * @param existingCode - The code snippet from the LLM comment
+ * @param parsedDiff   - Parsed diff for the file (from parsePatchFiles or parseDiff)
+ * @param fileContent  - Optional full new-file content for fallback scan
+ * @returns Resolved line numbers or Unresolved
+ */
+export function resolveLines(existingCode, parsedDiff, fileContent) {
+    if (!existingCode || !parsedDiff || parsedDiff.lines.length === 0) {
+        return { unresolved: true };
+    }
+    const targetLines = splitAndNormalize(existingCode);
+    if (targetLines.length === 0) {
+        return { unresolved: true };
+    }
+    const hunks = reconstructHunks(parsedDiff);
+    if (hunks.length === 0) {
+        return { unresolved: true };
+    }
+    // Tier 1: New-side match (context + added → new-file line numbers)
+    for (const hunk of hunks) {
+        const result = matchConsecutive(hunk.newSide, targetLines);
+        if (result)
+            return result;
+    }
+    // Tier 2: Old-side match (context + deleted → old-file line numbers)
+    for (const hunk of hunks) {
+        const result = matchConsecutive(hunk.oldSide, targetLines);
+        if (result)
+            return result;
+    }
+    // Tier 3: File-content fallback
+    if (fileContent) {
+        const result = matchInFileContent(fileContent, targetLines);
+        if (result)
+            return result;
+    }
+    return { unresolved: true };
+}
+/**
+ * Convenience wrapper: resolve from a raw unified diff string instead of
+ * a pre-parsed ParsedDiff. Parses the diff internally.
+ *
+ * @param existingCode - The code snippet from the LLM comment
+ * @param unifiedDiff  - Raw unified diff text (single file)
+ * @param fileContent  - Optional full new-file content for fallback scan
+ */
+export function resolveLinesFromPatch(existingCode, unifiedDiff, fileContent) {
+    const parsed = parsePatchFiles(unifiedDiff);
+    if (parsed.length === 0)
+        return { unresolved: true };
+    // For multi-file patches, try each file's diff
+    for (const pd of parsed) {
+        const result = resolveLines(existingCode, pd, fileContent);
+        if (!("unresolved" in result))
+            return result;
+    }
+    return { unresolved: true };
+}
+//# sourceMappingURL=resolve-lines.js.map

package/dist/core/resolve-lines.js.map

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

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAOH,OAAO,KAAK,EAAE,eAAe,EAAgB,MAAM,OAAO,CAAC;AAG3D,OAAO,EAAE,iBAAiB,EAAiB,KAAK,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,EAAkC,MAAM,gBAAgB,CAAC;AAC7K,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AA2cpE,oFAAoF;AACpF,UAAU,UAAU;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACd;AAuKD,iBAAS,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIpD;AAuVD,iBAAe,aAAa,CAC3B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,eAAe,GAAG,SAAS,EACrC,GAAG,SAAmB,EACtB,EAAE,GAAE,UAAgC,GAClC,OAAO,CAAC,MAAM,CAAC,CA6HjB;AAMD,iBAAe,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,eAAe,GAAG,SAAS,EACrC,GAAG,SAAoB,EACvB,EAAE,GAAE,UAAgC,GAClC,OAAO,CAAC,MAAM,CAAC,CAkKjB;AAMD,eAAO,MAAM,SAAS;;;;;;;;;CASrB,CAAC;AAIF,wBAA8B,qBAAqB,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA4gBnF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAOH,OAAO,KAAK,EAAE,eAAe,EAAgB,MAAM,OAAO,CAAC;AAG3D,OAAO,EAAE,iBAAiB,EAAiB,KAAK,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,EAAkC,MAAM,gBAAgB,CAAC;AAE7K,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AA8cpE,oFAAoF;AACpF,UAAU,UAAU;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACd;AAuKD,iBAAS,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIpD;AAuVD,iBAAe,aAAa,CAC3B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,eAAe,GAAG,SAAS,EACrC,GAAG,SAAmB,EACtB,EAAE,GAAE,UAAgC,GAClC,OAAO,CAAC,MAAM,CAAC,CA6HjB;AAMD,iBAAe,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,eAAe,GAAG,SAAS,EACrC,GAAG,SAAoB,EACvB,EAAE,GAAE,UAAgC,GAClC,OAAO,CAAC,MAAM,CAAC,CAkKjB;AAMD,eAAO,MAAM,SAAS;;;;;;;;;CASrB,CAAC;AAIF,wBAA8B,qBAAqB,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA4gBnF"}

package/dist/index.js

@@ -25,6 +25,7 @@ import { extname, relative } from "node:path";
 import { codeToANSI } from "@shikijs/cli";
 import * as Diff from "diff";
 import { computeHunkBlocks, getSepStyle, parseDiff, parsePatchFiles, resolveSepStyle, sepLabelSplit, sepLabelUnified } from "./core/diff.js";
+import { configIndicatorStyle } from "./core/config.js";
 import { resolveLinesFromPatch } from "./core/resolve-lines.js";
 import { registerReviewDiffCommand } from "./review/command.js";
 import { applyDiffPalette as applySharedDiffPalette, lang as detectDiffLanguage, renderSplit as renderSharedSplit, resolveDiffColors as resolveSharedDiffColors, themeCacheKey as sharedThemeCacheKey, } from "./review/hunk-preview.js";
@@ -381,7 +382,10 @@ let FG_LNUM = "\x1b[38;2;100;100;100m";
 let FG_RULE = "\x1b[38;2;50;50;50m";
 let FG_SAFE_MUTED = "\x1b[38;2;139;148;158m";
 let FG_STRIPE = "\x1b[38;2;40;40;40m"; // gray diagonal stripes on terminal default bg
-const BORDER_BAR = "▌";
+function getBorderBar() {
+    const style = configIndicatorStyle();
+    return style === "none" ? " " : "▌";
+}
 /** Generate a dense diagonal stripe fill for empty filler cells.
  *  Solid ╱ characters — uniform direction like CSS diagonal hatching. */
 function stripes(w, _rowOffset) {
@@ -913,7 +917,7 @@ async function renderUnified(diff, language, max = MAX_RENDER_LINES, dc = DEFAUL
     /** Emit a single stacked row with compact gutter + left border bar. */
     function emitRow(num, sign, gutterBg, signFg, body, bodyBg = "") {
         const borderFg = sign === "-" ? dc.fgDel : sign === "+" ? dc.fgAdd : "";
-        const border = borderFg ? `${borderFg}${BORDER_BAR}${RST}` : `${BG_BASE} `;
+        const border = borderFg ? `${borderFg}${getBorderBar()}${RST}` : `${BG_BASE} `;
         const numFg = borderFg || FG_LNUM;
         const gutter = `${border}${gutterBg}${lnum(num, nw, numFg)}${signFg}${sign}${RST} ${DIVIDER} `;
         const contGutter = `${border}${gutterBg}${" ".repeat(nw + 1)}${RST} ${DIVIDER} `;
@@ -1072,7 +1076,7 @@ async function renderSplit(diff, language, max = MAX_PREVIEW_LINES, dc = DEFAULT
         const num = isDel ? line.oldNum : isAdd ? line.newNum : side === "left" ? line.oldNum : line.newNum;
         // Border bar + colored line numbers for changed lines
         const borderFg = isDel ? dc.fgDel : isAdd ? dc.fgAdd : "";
-        const border = borderFg ? `${borderFg}${BORDER_BAR}${RST}` : ` ${BG_BASE}`;
+        const border = borderFg ? `${borderFg}${getBorderBar()}${RST}` : ` ${BG_BASE}`;
         const numFg = borderFg || FG_LNUM;
         let body;
         if (ranges && ranges.length > 0) {