@heyhuynhgiabuu/pi-diff 0.4.0 → 0.5.0

package/dist/index.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * pi-diff — Shiki-powered terminal diff renderer for pi.
  *
@@ -21,52 +20,16 @@
  *   • Large-diff fallback (skip highlighting, still show diff)
  *   • Async rendering with invalidate() for non-blocking preview
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.__testing = void 0;
-exports.default = diffRendererExtension;
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-const cli_1 = require("@shikijs/cli");
-const Diff = __importStar(require("diff"));
-const diff_js_1 = require("./core/diff.js");
-const command_js_1 = require("./review/command.js");
-const export_js_1 = require("./review/export.js");
-const git_js_1 = require("./review/git.js");
-const hunk_preview_js_1 = require("./review/hunk-preview.js");
-const interactive_js_1 = require("./review/interactive.js");
+import { existsSync, readFileSync } from "node:fs";
+import { extname, relative } from "node:path";
+import { codeToANSI } from "@shikijs/cli";
+import * as Diff from "diff";
+import { parseDiff } from "./core/diff.js";
+import { registerReviewDiffCommand } from "./review/command.js";
+import { formatReviewMarkdown } from "./review/export.js";
+import { countReviewDiffLines, readGitDiff } from "./review/git.js";
+import { applyDiffPalette as applySharedDiffPalette, lang as detectDiffLanguage, renderSplit as renderSharedSplit, resolveDiffColors as resolveSharedDiffColors, themeCacheKey as sharedThemeCacheKey, } from "./review/hunk-preview.js";
+import { formatInteractiveReviewPanel } from "./review/interactive.js";
 const DIFF_PRESETS = {
     default: {
         name: "default",
@@ -245,8 +208,8 @@ function loadDiffConfig() {
     const paths = [`${process.cwd()}/.pi/settings.json`, `${process.env.HOME ?? ""}/.pi/settings.json`];
     for (const p of paths) {
         try {
-            if ((0, node_fs_1.existsSync)(p)) {
-                const raw = JSON.parse((0, node_fs_1.readFileSync)(p, "utf-8"));
+            if (existsSync(p)) {
+                const raw = JSON.parse(readFileSync(p, "utf-8"));
                 if (raw.diffTheme || raw.diffColors) {
                     return { diffTheme: raw.diffTheme, diffColors: raw.diffColors };
                 }
@@ -681,7 +644,7 @@ function lnum(n, w, fg = FG_LNUM) {
 function shortPath(cwd, home, p) {
     if (!p)
         return "";
-    const r = (0, node_path_1.relative)(cwd, p);
+    const r = relative(cwd, p);
     if (!r.startsWith("..") && !r.startsWith("/"))
         return r;
     return p.replace(home, "~");
@@ -777,14 +740,14 @@ const EXT_LANG = {
     vue: "vue",
 };
 function lang(fp) {
-    return EXT_LANG[(0, node_path_1.extname)(fp).slice(1).toLowerCase()];
+    return EXT_LANG[extname(fp).slice(1).toLowerCase()];
 }
 // ---------------------------------------------------------------------------
 // Shiki ANSI cache + pre-warm
 // ---------------------------------------------------------------------------
 // Pre-warm the Shiki singleton (loads WASM grammars + theme) so the first
 // diff render doesn't pay the ~200-500ms startup cost.
-(0, cli_1.codeToANSI)("", "typescript", THEME).catch(() => { });
+codeToANSI("", "typescript", THEME).catch(() => { });
 const _cache = new Map();
 function _touch(k, v) {
     _cache.delete(k);
@@ -807,7 +770,7 @@ async function hlBlock(code, language) {
     if (hit)
         return _touch(k, hit);
     try {
-        const ansi = normalizeShikiContrast(await (0, cli_1.codeToANSI)(code, language, THEME));
+        const ansi = normalizeShikiContrast(await codeToANSI(code, language, THEME));
         const out = (ansi.endsWith("\n") ? ansi.slice(0, -1) : ansi).split("\n");
         return _touch(k, out);
     }
@@ -875,9 +838,13 @@ function injectBg(ansiLine, ranges, baseBg, hlBg) {
             if (m !== -1) {
                 const seq = ansiLine.slice(i, m + 1);
                 out += seq;
-                // Re-inject bg after full reset
-                if (seq === "\x1b[0m")
+                // Re-inject bg after any reset-like sequence.
+                // Shiki uses \x1b[39m (fg reset) between tokens — technically this
+                // doesn't clear background per ANSI spec, but some terminal
+                // emulators may treat it as a broader reset.
+                if (seq === "\x1b[0m" || seq === "\x1b[39m" || seq === "\x1b[49m") {
                     out += inHL ? hlBg : baseBg;
+                }
                 i = m + 1;
                 continue;
             }
@@ -995,14 +962,19 @@ async function renderUnified(diff, language, max = MAX_RENDER_LINES, dc = DEFAUL
         // 1:1 paired → word diff emphasis
         const isPaired = dels.length === 1 && adds.length === 1;
         const wd = isPaired ? wordDiffAnalysis(dels[0].l.content, adds[0].l.content) : null;
-        if (isPaired && wd && wd.similarity >= WORD_DIFF_MIN_SIM && canHL) {
+        // Word-diff emphasis — only use when BOTH sides have ranges.
+        // When diffWords treats trailing punctuation as "common" while removing
+        // adjacent chars, only one side gets word highlights, creating a confusing
+        // visual ("off by 1" perception). Skip word-level in that case.
+        const wdBalanced = wd && wd.oldRanges.length > 0 && wd.newRanges.length > 0;
+        if (isPaired && wdBalanced && wd.similarity >= WORD_DIFF_MIN_SIM && canHL) {
             const delBody = injectBg(dels[0].hl, wd.oldRanges, BG_DEL, BG_DEL_W);
             const addBody = injectBg(adds[0].hl, wd.newRanges, BG_ADD, BG_ADD_W);
             emitRow(dels[0].l.oldNum, "-", BG_GUTTER_DEL, `${dc.fgDel}${BOLD}`, delBody, BG_DEL);
             emitRow(adds[0].l.newNum, "+", BG_GUTTER_ADD, `${dc.fgAdd}${BOLD}`, addBody, BG_ADD);
             continue;
         }
-        if (isPaired && wd && wd.similarity >= WORD_DIFF_MIN_SIM && !canHL) {
+        if (isPaired && wdBalanced && wd.similarity >= WORD_DIFF_MIN_SIM && !canHL) {
             const pwd = plainWordDiff(dels[0].l.content, adds[0].l.content);
             emitRow(dels[0].l.oldNum, "-", BG_GUTTER_DEL, `${dc.fgDel}${BOLD}`, `${BG_DEL}${pwd.old}`, BG_DEL);
             emitRow(adds[0].l.newNum, "+", BG_GUTTER_ADD, `${dc.fgAdd}${BOLD}`, `${BG_ADD}${pwd.new}`, BG_ADD);
@@ -1166,9 +1138,9 @@ async function renderSplit(diff, language, max = MAX_PREVIEW_LINES, dc = DEFAULT
 // ---------------------------------------------------------------------------
 // Extension
 // ---------------------------------------------------------------------------
-exports.__testing = {
+export const __testing = {
     normalizeShikiContrast,
-    parseDiff: diff_js_1.parseDiff,
+    parseDiff,
     renderSplit,
     renderUnified,
 };
@@ -1193,9 +1165,9 @@ function normalizeOptionalPositiveInteger(value, name) {
         throw new Error(`${name} must be a positive integer`);
     return number;
 }
-async function diffRendererExtension(pi) {
+export default async function diffRendererExtension(pi) {
     // Apply diff theme palette from settings/presets before rendering
-    (0, hunk_preview_js_1.applyDiffPalette)();
+    applySharedDiffPalette();
     let createWriteTool, createEditTool, getMarkdownTheme, TextComponent, MarkdownComponent;
     try {
         const sdk = await import("@earendil-works/pi-coding-agent");
@@ -1215,8 +1187,7 @@ async function diffRendererExtension(pi) {
     const cwd = process.cwd();
     const home = process.env.HOME ?? "";
     const sp = (p) => shortPath(cwd, home, p);
-    const reviewComments = [];
-    (0, command_js_1.registerReviewDiffCommand)(pi, cwd);
+    registerReviewDiffCommand(pi, cwd);
     pi.registerTool({
         name: "review_git_diff",
         label: "Review Git Diff",
@@ -1271,18 +1242,18 @@ Examples:
         async execute(_tid, params = {}) {
             try {
                 const safeParams = params ?? {};
-                const diff = await (0, git_js_1.readGitDiff)(cwd, reviewGitDiffMode(safeParams));
+                const diff = await readGitDiff(cwd, reviewGitDiffMode(safeParams));
                 const maxLinesPerHunk = reviewGitDiffMaxLines(safeParams);
                 const markdown = safeParams.includeRawDiff || safeParams.raw
-                    ? (0, export_js_1.formatReviewMarkdown)(diff, { includeRawDiff: true, maxLinesPerHunk })
-                    : (0, interactive_js_1.formatInteractiveReviewPanel)(diff, reviewComments, {
+                    ? formatReviewMarkdown(diff, { includeRawDiff: true, maxLinesPerHunk })
+                    : formatInteractiveReviewPanel(diff, [], {
                         file: safeParams.file,
                         hunkId: safeParams.hunkId,
                         maxFiles: normalizeOptionalPositiveInteger(safeParams.maxFiles, "maxFiles"),
                         maxHunks: normalizeOptionalPositiveInteger(safeParams.maxHunks, "maxHunks"),
                         maxLinesPerHunk,
                     });
-                const counts = (0, git_js_1.countReviewDiffLines)(diff);
+                const counts = countReviewDiffLines(diff);
                 return {
                     content: [{ type: "text", text: markdown }],
                     details: {
@@ -1292,7 +1263,7 @@ Examples:
                         fileCount: diff.files.length,
                         insertions: counts.insertions,
                         deletions: counts.deletions,
-                        commentCount: reviewComments.length,
+                        commentCount: 0,
                         focusedFile: safeParams.file,
                         focusedHunk: safeParams.hunkId,
                     },
@@ -1333,113 +1304,6 @@ Examples:
             return text;
         },
     });
-    pi.registerTool({
-        name: "review_git_comment",
-        label: "Draft Review Comment",
-        description: "Draft an inline code-review comment for the current interactive Git review. This stores comments in memory for the current Pi session and does not modify files or submit anything externally.",
-        promptSnippet: "Draft an inline comment for the current Git review session.",
-        parameters: {
-            type: "object",
-            properties: {
-                file: { type: "string", description: "Changed file path to comment on." },
-                line: { type: "number", description: "Optional old/new line number to comment on." },
-                hunkId: { type: "string", description: "Optional hunk id from review_git_diff output." },
-                body: { type: "string", description: "Comment body." },
-            },
-            required: ["file", "body"],
-            additionalProperties: false,
-        },
-        async execute(_tid, params) {
-            const file = typeof params?.file === "string" ? params.file.trim() : "";
-            const body = typeof params?.body === "string" ? params.body.trim() : "";
-            if (!file)
-                return {
-                    content: [{ type: "text", text: "Error: file is required" }],
-                    details: { error: "file required" },
-                };
-            if (!body)
-                return {
-                    content: [{ type: "text", text: "Error: body is required" }],
-                    details: { error: "body required" },
-                };
-            const comment = (0, interactive_js_1.createReviewComment)({
-                comments: reviewComments,
-                file,
-                body,
-                line: normalizeOptionalPositiveInteger(params.line, "line"),
-                hunkId: typeof params.hunkId === "string" && params.hunkId.trim() ? params.hunkId.trim() : undefined,
-            });
-            reviewComments.push(comment);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: `Drafted ${comment.id} on ${comment.file}${comment.line ? `:${comment.line}` : ""}\n\n${comment.body}`,
-                    },
-                ],
-                details: { _type: "reviewGitComment", comment, commentCount: reviewComments.length },
-            };
-        },
-        renderCall(args, theme, ctx) {
-            const text = ctx.lastComponent ?? new TextComponent("", 0, 0);
-            text.setText(`${theme.fg("toolTitle", theme.bold("review_git_comment"))} ${theme.fg("accent", args?.file ?? "")}`);
-            return text;
-        },
-        renderResult(result, _opt, theme, ctx) {
-            const text = ctx.lastComponent ?? new TextComponent("", 0, 0);
-            if (ctx.isError || result.details?.error) {
-                text.setText(`\n${theme.fg("error", result.details?.error ?? "review_git_comment failed")}`);
-                return text;
-            }
-            const comment = result.details?.comment;
-            text.setText(`  ${theme.fg("success", `✓ drafted ${comment?.id ?? "comment"}`)}${theme.fg("muted", ` (${result.details?.commentCount ?? 0} total)`)}`);
-            return text;
-        },
-    });
-    pi.registerTool({
-        name: "review_git_comments",
-        label: "Review Comments",
-        description: "List or clear drafted interactive Git review comments for the current Pi session.",
-        promptSnippet: "List or clear drafted review comments.",
-        parameters: {
-            type: "object",
-            properties: {
-                clear: { type: "boolean", description: "Clear all drafted comments when true." },
-            },
-            additionalProperties: false,
-        },
-        async execute(_tid, params = {}) {
-            if (params?.clear) {
-                const cleared = reviewComments.length;
-                reviewComments.length = 0;
-                return {
-                    content: [{ type: "text", text: `Cleared ${cleared} drafted review comments.` }],
-                    details: { _type: "reviewGitComments", cleared, commentCount: 0 },
-                };
-            }
-            const markdown = (0, interactive_js_1.formatReviewComments)(reviewComments);
-            return {
-                content: [{ type: "text", text: markdown }],
-                details: { _type: "reviewGitComments", markdown, commentCount: reviewComments.length },
-            };
-        },
-        renderCall(_args, theme, ctx) {
-            const text = ctx.lastComponent ?? new TextComponent("", 0, 0);
-            text.setText(theme.fg("toolTitle", theme.bold("review_git_comments")));
-            return text;
-        },
-        renderResult(result, _opt, theme, ctx) {
-            if (MarkdownComponent && getMarkdownTheme && typeof result.details?.markdown === "string") {
-                return new MarkdownComponent(result.details.markdown, 0, 0, getMarkdownTheme());
-            }
-            const text = ctx.lastComponent ?? new TextComponent("", 0, 0);
-            const cleared = typeof result.details?.cleared === "number"
-                ? `cleared ${result.details.cleared}`
-                : `${result.details?.commentCount ?? 0} drafted`;
-            text.setText(`  ${theme.fg("muted", cleared)} review comments`);
-            return text;
-        },
-    });
     // =======================================================================
     // write
     // =======================================================================
@@ -1451,8 +1315,8 @@ Examples:
             const fp = params.path ?? params.file_path ?? "";
             let old = null;
             try {
-                if (fp && (0, node_fs_1.existsSync)(fp))
-                    old = (0, node_fs_1.readFileSync)(fp, "utf-8");
+                if (fp && existsSync(fp))
+                    old = readFileSync(fp, "utf-8");
             }
             catch {
                 old = null;
@@ -1461,8 +1325,8 @@ Examples:
             const content = params.content ?? "";
             // Store in details — the only custom field TUI preserves in renderResult
             if (old !== null && old !== content) {
-                const diff = (0, diff_js_1.parseDiff)(old, content);
-                const lg = (0, hunk_preview_js_1.lang)(fp);
+                const diff = parseDiff(old, content);
+                const lg = detectDiffLanguage(fp);
                 result.details = { _type: "diff", summary: summarize(diff.added, diff.removed), diff, language: lg };
             }
             else if (old === null) {
@@ -1476,7 +1340,7 @@ Examples:
         },
         renderCall(args, theme, ctx) {
             const fp = args?.path ?? args?.file_path ?? "";
-            const isNew = !fp || !(0, node_fs_1.existsSync)(fp);
+            const isNew = !fp || !existsSync(fp);
             const label = isNew ? "create" : "write";
             const text = ctx.lastComponent ?? new TextComponent("", 0, 0);
             const hdr = `${theme.fg("toolTitle", theme.bold(label))} ${theme.fg("accent", sp(fp))}`;
@@ -1488,11 +1352,11 @@ Examples:
             }
             // New file preview with Shiki
             if (args?.content && ctx.argsComplete && isNew) {
-                const previewKey = `create:${(0, hunk_preview_js_1.themeCacheKey)(theme)}:${fp}:${String(args.content).length}`;
+                const previewKey = `create:${sharedThemeCacheKey(theme)}:${fp}:${String(args.content).length}`;
                 if (ctx.state._previewKey !== previewKey) {
                     ctx.state._previewKey = previewKey;
                     ctx.state._previewText = hdr;
-                    const lg = (0, hunk_preview_js_1.lang)(fp);
+                    const lg = detectDiffLanguage(fp);
                     hlBlock(args.content, lg)
                         .then((lines) => {
                         if (ctx.state._previewKey !== previewKey)
@@ -1527,12 +1391,12 @@ Examples:
             const d = result.details;
             if (d?._type === "diff") {
                 const w = termW();
-                const key = `wd:${(0, hunk_preview_js_1.themeCacheKey)(theme)}:${w}:${d.summary}:${d.diff?.lines?.length ?? 0}:${d.language ?? ""}`;
+                const key = `wd:${sharedThemeCacheKey(theme)}:${w}:${d.summary}:${d.diff?.lines?.length ?? 0}:${d.language ?? ""}`;
                 if (ctx.state._wdk !== key) {
                     ctx.state._wdk = key;
                     ctx.state._wdt = `  ${d.summary}\n${theme.fg("muted", "  rendering diff…")}`;
-                    const dc = (0, hunk_preview_js_1.resolveDiffColors)(theme);
-                    (0, hunk_preview_js_1.renderSplit)(d.diff, d.language, MAX_RENDER_LINES, dc, w)
+                    const dc = resolveSharedDiffColors(theme);
+                    renderSharedSplit(d.diff, d.language, MAX_RENDER_LINES, dc, w)
                         .then((rendered) => {
                         if (ctx.state._wdk !== key)
                             return;
@@ -1555,11 +1419,11 @@ Examples:
             }
             if (d?._type === "new") {
                 const { lines: lineCount, content: rawContent, filePath: fp } = d;
-                const pk = `nf:${(0, hunk_preview_js_1.themeCacheKey)(theme)}:${fp}:${lineCount}`;
+                const pk = `nf:${sharedThemeCacheKey(theme)}:${fp}:${lineCount}`;
                 if (ctx.state._nfk !== pk) {
                     ctx.state._nfk = pk;
                     ctx.state._nft = `  ${theme.fg("success", `✓ new file (${lineCount} lines)`)}`;
-                    const lg = (0, hunk_preview_js_1.lang)(fp);
+                    const lg = detectDiffLanguage(fp);
                     if (rawContent) {
                         hlBlock(rawContent, lg)
                             .then((hlLines) => {
@@ -1602,7 +1466,7 @@ Examples:
         return oldText && oldText !== newText ? [{ oldText, newText }] : [];
     }
     function summarizeEditOperations(operations) {
-        const diffs = operations.map((edit) => (0, diff_js_1.parseDiff)(edit.oldText, edit.newText));
+        const diffs = operations.map((edit) => parseDiff(edit.oldText, edit.newText));
         const totalAdded = diffs.reduce((sum, diff) => sum + diff.added, 0);
         const totalRemoved = diffs.reduce((sum, diff) => sum + diff.removed, 0);
         return {
@@ -1625,8 +1489,8 @@ Examples:
             if (operations.length === 1) {
                 let editLine = 0;
                 try {
-                    if (fp && (0, node_fs_1.existsSync)(fp)) {
-                        const f = (0, node_fs_1.readFileSync)(fp, "utf-8");
+                    if (fp && existsSync(fp)) {
+                        const f = readFileSync(fp, "utf-8");
                         const idx = f.indexOf(operations[0].newText);
                         if (idx >= 0)
                             editLine = f.slice(0, idx).split("\n").length;
@@ -1655,15 +1519,15 @@ Examples:
                 text.setText(hdr);
                 return text;
             }
-            const pk = JSON.stringify({ fp, operations, theme: (0, hunk_preview_js_1.themeCacheKey)(theme), w: termW() });
+            const pk = JSON.stringify({ fp, operations, theme: sharedThemeCacheKey(theme), w: termW() });
             if (ctx.state._pk !== pk) {
                 ctx.state._pk = pk;
                 ctx.state._pt = `${hdr}  ${theme.fg("muted", "(rendering…)")}`;
-                const lg = (0, hunk_preview_js_1.lang)(fp);
-                const dc = (0, hunk_preview_js_1.resolveDiffColors)(theme);
+                const lg = detectDiffLanguage(fp);
+                const dc = resolveSharedDiffColors(theme);
                 if (operations.length === 1) {
-                    const diff = (0, diff_js_1.parseDiff)(operations[0].oldText, operations[0].newText);
-                    (0, hunk_preview_js_1.renderSplit)(diff, lg, MAX_PREVIEW_LINES, dc, termW())
+                    const diff = parseDiff(operations[0].oldText, operations[0].newText);
+                    renderSharedSplit(diff, lg, MAX_PREVIEW_LINES, dc, termW())
                         .then((rendered) => {
                         if (ctx.state._pk !== pk)
                             return;
@@ -1681,7 +1545,7 @@ Examples:
                     const { diffs, summary } = summarizeEditOperations(operations);
                     const maxShown = Math.min(operations.length, 3);
                     const previewLines = Math.max(8, Math.floor(MAX_PREVIEW_LINES / maxShown));
-                    Promise.all(diffs.slice(0, maxShown).map((diff, index) => (0, hunk_preview_js_1.renderSplit)(diff, lg, previewLines, dc, termW())
+                    Promise.all(diffs.slice(0, maxShown).map((diff, index) => renderSharedSplit(diff, lg, previewLines, dc, termW())
                         .then((rendered) => `Edit ${index + 1}/${operations.length}\n${rendered}`)
                         .catch(() => `Edit ${index + 1}/${operations.length}  ${summarize(diff.added, diff.removed)}`)))
                         .then((sections) => {