@heyhuynhgiabuu/pi-diff 0.5.1 → 0.5.3

package/README.md

@@ -168,19 +168,19 @@ All custom theme colors must be `#rrggbb` hex values.
 
 ```ts
 // Open the read-only review markdown for working-tree changes, including untracked files
-review_git_diff({})
+review_git_diff({});
 
 // Review branch changes as main...HEAD
-review_git_diff({ base: "main" })
+review_git_diff({ base: "main" });
 
 // Focus a file from the changed-file list
-review_git_diff({ file: "src/index.ts" })
+review_git_diff({ file: "src/index.ts" });
 
 // Focus a hunk ID shown by the panel
-review_git_diff({ file: "src/index.ts", hunkId: "src/index.ts:10:12" })
+review_git_diff({ file: "src/index.ts", hunkId: "src/index.ts:10:12" });
 
 // Return the older full markdown export with raw unified diff included
-review_git_diff({ base: "main", includeRawDiff: true })
+review_git_diff({ base: "main", includeRawDiff: true });
 ```
 
 - No `base` means working-tree review, including untracked files.
@@ -228,12 +228,13 @@ New content ──┘                                          │
 
 ### Views
 
-| View | Used by | Description |
-|------|---------|-------------|
-| **Split** | `edit` tool | Side-by-side with old on left, new on right. Diagonal stripes fill empty slots. Auto-falls back to unified when terminal < 150 cols or > 20% of lines would wrap. |
-| **Unified** | `write` tool | Single column with `+`/`-` gutter. Compact, works at any terminal width. |
+| View        | Used by      | Description                                                                                                                                                       |
+| ----------- | ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Split**   | `edit` tool  | Side-by-side with old on left, new on right. Diagonal stripes fill empty slots. Auto-falls back to unified when terminal < 150 cols or > 20% of lines would wrap. |
+| **Unified** | `write` tool | Single column with `+`/`-` gutter. Compact, works at any terminal width.                                                                                          |
 
 Both views show:
+
 - Colored border bars (`▌`) for changed lines
 - Line numbers in the gutter
 - Hunk separators (`··· N unmodified lines ···`)
@@ -252,12 +253,12 @@ pi-diff ships with built-in theme presets optimized for different terminal backg
 }
 ```
 
-| Preset | Best for | Description |
-|--------|----------|-------------|
-| `default` | Dark theme bases (~`#1e1e2e`) | Original pi-diff colors — balanced contrast |
-| `midnight` | Pure black (`#000000`) terminals | Subtle tints that don't overwhelm on black |
-| `subtle` | Any dark theme | Minimal backgrounds — barely-there tints for a clean look |
-| `neon` | Low-contrast displays | Higher contrast backgrounds for better visibility |
+| Preset     | Best for                         | Description                                               |
+| ---------- | -------------------------------- | --------------------------------------------------------- |
+| `default`  | Dark theme bases (~`#1e1e2e`)    | Original pi-diff colors — balanced contrast               |
+| `midnight` | Pure black (`#000000`) terminals | Subtle tints that don't overwhelm on black                |
+| `subtle`   | Any dark theme                   | Minimal backgrounds — barely-there tints for a clean look |
+| `neon`     | Low-contrast displays            | Higher contrast backgrounds for better visibility         |
 
 ### Per-Color Overrides
 
@@ -294,6 +295,7 @@ Override individual diff colors in `.pi/settings.json` using hex `#RRGGBB` value
 When no `diffTheme` or `diffColors` is set, pi-diff **automatically derives** background colors from your pi theme's diff foreground colors and tool-state backgrounds. Added/context surfaces use `toolSuccessBg`; removed surfaces use `toolErrorBg`. This ensures diffs look good with any pi theme and terminal background — no configuration needed.
 
 The auto-derive uses different intensity levels:
+
 - **Line backgrounds**: 8–10% of the theme's diff fg color mixed into the matching tool-state background (subtle tint)
 - **Word highlights**: 20–22% (more visible for changed characters)
 - **Gutters**: 5–6% (subtler than line backgrounds)
@@ -314,31 +316,31 @@ All settings are also controllable via environment variables. Add them to your s
 
 ### Theme
 
-| Variable | Default | Description |
-|----------|---------|-------------|
+| Variable     | Default       | Description                                                            |
+| ------------ | ------------- | ---------------------------------------------------------------------- |
 | `DIFF_THEME` | `github-dark` | Shiki theme name (e.g., `dracula`, `one-dark-pro`, `catppuccin-mocha`) |
 
 ### Colors
 
 Override any diff color with hex `#RRGGBB` format:
 
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `DIFF_BG_ADD` | `#162620` | Background for added lines |
-| `DIFF_BG_DEL` | `#2d1919` | Background for removed lines |
-| `DIFF_BG_ADD_HL` | `#234b32` | Word-level emphasis on added text |
-| `DIFF_BG_DEL_HL` | `#502323` | Word-level emphasis on removed text |
-| `DIFF_BG_GUTTER_ADD` | `#12201a` | Gutter background for added lines |
-| `DIFF_BG_GUTTER_DEL` | `#261616` | Gutter background for removed lines |
-| `DIFF_FG_ADD` | `#64b478` | Foreground for `+` signs and add indicators |
-| `DIFF_FG_DEL` | `#c86464` | Foreground for `-` signs and del indicators |
+| Variable             | Default   | Description                                 |
+| -------------------- | --------- | ------------------------------------------- |
+| `DIFF_BG_ADD`        | `#162620` | Background for added lines                  |
+| `DIFF_BG_DEL`        | `#2d1919` | Background for removed lines                |
+| `DIFF_BG_ADD_HL`     | `#234b32` | Word-level emphasis on added text           |
+| `DIFF_BG_DEL_HL`     | `#502323` | Word-level emphasis on removed text         |
+| `DIFF_BG_GUTTER_ADD` | `#12201a` | Gutter background for added lines           |
+| `DIFF_BG_GUTTER_DEL` | `#261616` | Gutter background for removed lines         |
+| `DIFF_FG_ADD`        | `#64b478` | Foreground for `+` signs and add indicators |
+| `DIFF_FG_DEL`        | `#c86464` | Foreground for `-` signs and del indicators |
 
 ### Layout
 
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `DIFF_SPLIT_MIN_WIDTH` | `150` | Minimum terminal columns to use split view |
-| `DIFF_SPLIT_MIN_CODE_WIDTH` | `60` | Minimum code columns per side in split view |
+| Variable                    | Default | Description                                 |
+| --------------------------- | ------- | ------------------------------------------- |
+| `DIFF_SPLIT_MIN_WIDTH`      | `150`   | Minimum terminal columns to use split view  |
+| `DIFF_SPLIT_MIN_CODE_WIDTH` | `60`    | Minimum code columns per side in split view |
 
 ### Example `.envrc`
 
@@ -363,26 +365,26 @@ src/
 
 ### Key internals
 
-| Component | Purpose |
-|-----------|---------|
-| `parseDiff()` | Converts old/new content to structured `DiffLine[]` using `diff.structuredPatch` |
-| `hlBlock()` | Shiki ANSI highlighting with LRU cache (192 entries) |
-| `injectBg()` | Composites diff backgrounds into Shiki ANSI output (fg + bg layering) |
-| `wordDiffAnalysis()` | Single-pass word diff → similarity score + character ranges |
-| `renderSplit()` | Side-by-side renderer with diagonal stripe fillers |
-| `renderUnified()` | Stacked single-column renderer |
-| `wrapAnsi()` | ANSI-aware line wrapping with state carry-forward |
-| `shouldUseSplit()` | Heuristic: split vs unified based on terminal width and wrap ratio |
+| Component            | Purpose                                                                          |
+| -------------------- | -------------------------------------------------------------------------------- |
+| `parseDiff()`        | Converts old/new content to structured `DiffLine[]` using `diff.structuredPatch` |
+| `hlBlock()`          | Shiki ANSI highlighting with LRU cache (192 entries)                             |
+| `injectBg()`         | Composites diff backgrounds into Shiki ANSI output (fg + bg layering)            |
+| `wordDiffAnalysis()` | Single-pass word diff → similarity score + character ranges                      |
+| `renderSplit()`      | Side-by-side renderer with diagonal stripe fillers                               |
+| `renderUnified()`    | Stacked single-column renderer                                                   |
+| `wrapAnsi()`         | ANSI-aware line wrapping with state carry-forward                                |
+| `shouldUseSplit()`   | Heuristic: split vs unified based on terminal width and wrap ratio               |
 
 ### Rendering constants
 
-| Constant | Value | Description |
-|----------|-------|-------------|
-| `MAX_PREVIEW_LINES` | 60 | Max lines in edit preview (split view) |
-| `MAX_RENDER_LINES` | 150 | Max lines in write result (unified view) |
-| `MAX_HL_CHARS` | 80,000 | Skip syntax highlighting above this |
-| `CACHE_LIMIT` | 192 | LRU cache entries for highlighted blocks |
-| `WORD_DIFF_MIN_SIM` | 0.15 | Minimum similarity for word-level emphasis |
+| Constant            | Value  | Description                                |
+| ------------------- | ------ | ------------------------------------------ |
+| `MAX_PREVIEW_LINES` | 60     | Max lines in edit preview (split view)     |
+| `MAX_RENDER_LINES`  | 150    | Max lines in write result (unified view)   |
+| `MAX_HL_CHARS`      | 80,000 | Skip syntax highlighting above this        |
+| `CACHE_LIMIT`       | 192    | LRU cache entries for highlighted blocks   |
+| `WORD_DIFF_MIN_SIM` | 0.15   | Minimum similarity for word-level emphasis |
 
 ## Exports
 
@@ -391,7 +393,8 @@ The extension exports a `__testing` object for unit testing:
 ```typescript
 import { __testing } from "@heyhuynhgiabuu/pi-diff";
 
-const { parseDiff, renderSplit, renderUnified, normalizeShikiContrast } = __testing;
+const { parseDiff, renderSplit, renderUnified, normalizeShikiContrast } =
+  __testing;
 ```
 
 ## Development
@@ -437,7 +440,8 @@ export default function piDiffExtension(pi: any): void {
 ```
 
 Extensions can:
-- **Register tools** — `pi.registerTool(definition)` 
+
+- **Register tools** — `pi.registerTool(definition)`
 - **Listen to events** — `pi.on("session_start" | "input" | "before_tool_call" | ...)`
 - **Register commands** — `pi.registerCommand("/name", handler)`
 - **Register providers** — `pi.registerProvider("name", config)`

package/dist/core/diff.d.ts

@@ -1,8 +1,19 @@
+/** Hunk metadata attached to separator DiffLines. */
+export interface HunkMeta {
+    oldStart: number;
+    oldLines: number;
+    newStart: number;
+    newLines: number;
+    /** Function context from hunk header, e.g. "function foo() {" */
+    context?: string;
+}
 export interface DiffLine {
     type: "add" | "del" | "ctx" | "sep";
     oldNum: number | null;
     newNum: number | null;
     content: string;
+    /** Hunk metadata — present on first sep and between-hunk seps if available. */
+    hunkMeta?: HunkMeta;
 }
 export interface ParsedDiff {
     lines: DiffLine[];
@@ -10,5 +21,44 @@ export interface ParsedDiff {
     removed: number;
     chars: number;
 }
+/**
+ * Parse a unified diff/patch string into one or more ParsedDiff.
+ * Each file in the patch gets its own entry.
+ */
+export declare function parsePatchFiles(patch: string): ParsedDiff[];
+/** Style for rendering hunk separators between change blocks. */
+export type HunkSeparatorStyle = "auto" | "simple" | "gap" | "context" | "metadata";
+/**
+ * Resolve hunk separator style from env var PI_DIFF_SEP_STYLE.
+ * Call once during extension init, or with force=true to re-read.
+ */
+export declare function resolveSepStyle(): HunkSeparatorStyle;
+/**
+ * Get the current separator style (resolved once via resolveSepStyle()).
+ */
+export declare function getSepStyle(): HunkSeparatorStyle;
+/**
+ * Generate a hunk separator label for the unified view.
+ * Returns the full label including spacing, or "···" for empty/default.
+ * If `content` is non-empty, it is used directly (e.g. "───── Edit 2 ─────").
+ */
+export declare function sepLabelUnified(style: HunkSeparatorStyle, hunkMeta: HunkMeta | undefined, gap: number | null, content?: string): string;
+/**
+ * Generate a hunk separator label for the split view.
+ * Wraps the content in "··· ... ···".
+ * If `content` is non-empty, it is used directly (e.g. "───── Edit 2 ─────").
+ */
+export declare function sepLabelSplit(style: HunkSeparatorStyle, hunkMeta: HunkMeta | undefined, gap: number | null, content?: string): string;
+/** A paired block of deletions and additions within a hunk. */
+export interface HunkBlock {
+    deletions: DiffLine[];
+    additions: DiffLine[];
+}
+/**
+ * Walk a ParsedDiff and extract hunk blocks.
+ * Each block is a group of consecutive deletes followed by consecutive adds.
+ * Context and separator lines are skipped.
+ */
+export declare function computeHunkBlocks(diff: ParsedDiff): HunkBlock[];
 export declare function parseDiff(oldContent: string, newContent: string, ctx?: number): ParsedDiff;
 //# sourceMappingURL=diff.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/core/diff.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,QAAQ;IACxB,IAAI,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;IACpC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,UAAU;IAC1B,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,SAAI,GAAG,UAAU,CA+BrF"}
+{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/core/diff.ts"],"names":[],"mappings":"AAMA,qDAAqD;AACrD,MAAM,WAAW,QAAQ;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,iEAAiE;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,QAAQ;IACxB,IAAI,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;IACpC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IAC1B,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACd;AAeD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,EAAE,CAyB3D;AA+FD,iEAAiE;AACjE,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,GAAG,SAAS,GAAG,UAAU,CAAC;AAIpF;;;GAGG;AACH,wBAAgB,eAAe,IAAI,kBAAkB,CAQpD;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,kBAAkB,CAEhD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC9B,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAC9B,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,OAAO,CAAC,EAAE,MAAM,GACd,MAAM,CA2BR;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC5B,KAAK,EAAE,kBAAkB,EACzB,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAC9B,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,OAAO,CAAC,EAAE,MAAM,GACd,MAAM,CA4BR;AASD,+DAA+D;AAC/D,MAAM,WAAW,SAAS;IACzB,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,SAAS,EAAE,QAAQ,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,CA8B/D;AAED,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,SAAI,GAAG,UAAU,CA2CrF"}

package/dist/core/diff.js

@@ -1,16 +1,287 @@
 import * as Diff from "diff";
+// ---------------------------------------------------------------------------
+// Unified diff patch parsing
+//
+// Parses git/unified diff strings (output of `git diff`, `Diff.formatPatch`,
+// or similar) into our internal ParsedDiff representation. Preserves hunk
+// function context from hunk headers.
+//
+// Handles these formats:
+//   diff --git a/file.ts b/file.ts \n --- a/file.ts \n +++ b/file.ts
+//   --- a/file.ts \n +++ b/file.ts  (no diff --git prefix)
+//   @@ -start,count +start,count @@ func_name (with or without func context)
+// ---------------------------------------------------------------------------
+/**
+ * Parse a unified diff/patch string into one or more ParsedDiff.
+ * Each file in the patch gets its own entry.
+ */
+export function parsePatchFiles(patch) {
+    if (!patch || !patch.trim())
+        return [];
+    // Split into file sections
+    const lines = patch.split("\n");
+    const sections = [];
+    let cur = [];
+    // Split by "+++ " or "diff --git " (start of a new file)
+    for (let i = 0; i < lines.length; i++) {
+        const l = lines[i];
+        if (l.startsWith("diff --git ") || (l.startsWith("--- ") && cur.length > 0 && cur[0]?.startsWith("+++"))) {
+            if (cur.length > 0)
+                sections.push(cur);
+            cur = [];
+        }
+        cur.push(l);
+    }
+    if (cur.length > 0)
+        sections.push(cur);
+    const result = [];
+    for (const sec of sections) {
+        const parsed = parseOneFile(sec);
+        if (parsed)
+            result.push(parsed);
+    }
+    return result.length > 0 ? result : [parseOneFile(lines) ?? emptyDiff()];
+}
+/** Parse a single file section into a ParsedDiff. */
+function parseOneFile(lines) {
+    const all = [];
+    let added = 0, removed = 0;
+    let i = 0;
+    while (i < lines.length) {
+        const raw = lines[i];
+        const hdr = parseHunkHeader(raw);
+        if (!hdr) {
+            i++;
+            continue;
+        }
+        // Emit sep for this hunk's metadata (synthetic at position 0 for first)
+        if (all.length === 0 || all.filter((l) => l.type !== "sep").length > 0) {
+            // After some non-sep content, push a sep for the next hunk
+            all.push({ type: "sep", oldNum: null, newNum: null, content: "", hunkMeta: hdr });
+        }
+        else {
+            // Already have only seps (first hunk) — update the last sep's metadata
+            all[all.length - 1] = { type: "sep", oldNum: null, newNum: null, content: "", hunkMeta: hdr };
+        }
+        let oL = hdr.oldStart;
+        let nL = hdr.newStart;
+        // Advance past the hunk header
+        i++;
+        // Process hunk content lines (until next hunk header or end)
+        while (i < lines.length) {
+            const line = lines[i];
+            if (line.startsWith("@@"))
+                break; // next hunk header — outer loop handles it
+            if (line.startsWith("\\ ")) {
+                i++;
+                continue; // "\"
+            }
+            if (/^(---|\+\+\+|diff --git|index |new file|old mode|new mode|deleted|rename|similarity|copy)/.test(line)) {
+                i++;
+                continue; // skip headers/metadata
+            }
+            if (line.length === 0 || line[0] === " ") {
+                all.push({ type: "ctx", oldNum: oL++, newNum: nL++, content: line.slice(1) });
+            }
+            else if (line[0] === "+") {
+                all.push({ type: "add", oldNum: null, newNum: nL++, content: line.slice(1) });
+                added++;
+            }
+            else if (line[0] === "-") {
+                all.push({ type: "del", oldNum: oL++, newNum: null, content: line.slice(1) });
+                removed++;
+            }
+            i++;
+        }
+    }
+    if (all.length === 0)
+        return null;
+    // Compute chars from content lines only (not seps)
+    let chars = 0;
+    for (const l of all) {
+        if (l.type !== "sep")
+            chars += l.content.length;
+    }
+    return { lines: all, added, removed, chars };
+}
+/**
+ * Parse a hunk header line like:
+ *   @@ -oldStart,oldCount +newStart,newCount @@ optional func context
+ */
+function parseHunkHeader(line) {
+    const m = line.match(/^@@\s+-(\d+)(?:,(\d+))?\s+\+(\d+)(?:,(\d+))?\s+@@(?:\s+(.*))?$/);
+    if (!m)
+        return null;
+    const oldStart = Number(m[1]);
+    const oldLines = m[2] ? Number(m[2]) : 1;
+    const newStart = Number(m[3]);
+    const newLines = m[4] ? Number(m[4]) : 1;
+    const context = m[5]?.trim() || undefined;
+    return { oldStart, oldLines, newStart, newLines, context };
+}
+function emptyDiff() {
+    return { lines: [], added: 0, removed: 0, chars: 0 };
+}
+let _sepStyle = "auto";
+/**
+ * Resolve hunk separator style from env var PI_DIFF_SEP_STYLE.
+ * Call once during extension init, or with force=true to re-read.
+ */
+export function resolveSepStyle() {
+    const fromEnv = process.env.PI_DIFF_SEP_STYLE;
+    if (fromEnv && ["auto", "simple", "gap", "context", "metadata"].includes(fromEnv)) {
+        _sepStyle = fromEnv;
+    }
+    else {
+        _sepStyle = "auto";
+    }
+    return _sepStyle;
+}
+/**
+ * Get the current separator style (resolved once via resolveSepStyle()).
+ */
+export function getSepStyle() {
+    return _sepStyle;
+}
+/**
+ * Generate a hunk separator label for the unified view.
+ * Returns the full label including spacing, or "···" for empty/default.
+ * If `content` is non-empty, it is used directly (e.g. "───── Edit 2 ─────").
+ */
+export function sepLabelUnified(style, hunkMeta, gap, content) {
+    // Custom content (e.g. multi-edit separators) takes precedence
+    if (content)
+        return ` ${content} `;
+    const ctx = hunkMeta?.context;
+    switch (style) {
+        case "simple":
+            return "···";
+        case "gap":
+            if (gap && gap > 0)
+                return ` ${gap} unmodified lines `;
+            return "···";
+        case "context":
+            if (ctx)
+                return ` ${ctx} `;
+            if (gap && gap > 0)
+                return ` ${gap} unmodified lines `;
+            return "···";
+        case "metadata": {
+            if (!hunkMeta)
+                return "···";
+            const hdr = `@@ -${hunkMeta.oldStart},${hunkMeta.oldLines} +${hunkMeta.newStart},${hunkMeta.newLines} @@`;
+            const label = ctx ? `${hdr} ${ctx}` : hdr;
+            return ` ${label} `;
+        }
+        case "auto":
+        default:
+            if (ctx && gap && gap > 0)
+                return ` ${ctx} — +${gap} lines `;
+            if (ctx)
+                return ` ${ctx} `;
+            if (gap && gap > 0)
+                return ` +${gap} lines `;
+            return "···";
+    }
+}
+/**
+ * Generate a hunk separator label for the split view.
+ * Wraps the content in "··· ... ···".
+ * If `content` is non-empty, it is used directly (e.g. "───── Edit 2 ─────").
+ */
+export function sepLabelSplit(style, hunkMeta, gap, content) {
+    // Custom content (e.g. multi-edit separators) takes precedence
+    if (content)
+        return `${content}`;
+    const ctx = hunkMeta?.context;
+    switch (style) {
+        case "simple":
+            return "···";
+        case "gap":
+            if (gap && gap > 0)
+                return `··· ${gap} lines ···`;
+            return "···";
+        case "context":
+            if (ctx && gap && gap > 0)
+                return `··· ${ctx} — ${gap} lines ···`;
+            if (ctx)
+                return `··· ${ctx} ···`;
+            if (gap && gap > 0)
+                return `··· ${gap} lines ···`;
+            return "···";
+        case "metadata": {
+            if (!hunkMeta)
+                return "···";
+            const hdr = `@@ -${hunkMeta.oldStart},${hunkMeta.oldLines} +${hunkMeta.newStart},${hunkMeta.newLines} @@`;
+            const content = ctx ? `${hdr} ${ctx}` : hdr;
+            return `··· ${content} ···`;
+        }
+        case "auto":
+        default:
+            if (ctx && gap && gap > 0)
+                return `··· ${ctx} — +${gap} lines ···`;
+            if (ctx)
+                return `··· ${ctx} ···`;
+            if (gap && gap > 0)
+                return `··· +${gap} lines ···`;
+            return "···";
+    }
+}
+/**
+ * Walk a ParsedDiff and extract hunk blocks.
+ * Each block is a group of consecutive deletes followed by consecutive adds.
+ * Context and separator lines are skipped.
+ */
+export function computeHunkBlocks(diff) {
+    const blocks = [];
+    let i = 0;
+    const lines = diff.lines;
+    while (i < lines.length) {
+        if (lines[i].type === "sep" || lines[i].type === "ctx") {
+            i++;
+            continue;
+        }
+        // Collect consecutive deletions
+        const deletions = [];
+        while (i < lines.length && lines[i].type === "del") {
+            deletions.push(lines[i]);
+            i++;
+        }
+        // Collect consecutive additions
+        const additions = [];
+        while (i < lines.length && lines[i].type === "add") {
+            additions.push(lines[i]);
+            i++;
+        }
+        if (deletions.length === 0 && additions.length === 0)
+            continue;
+        blocks.push({ deletions, additions });
+    }
+    return blocks;
+}
 export function parseDiff(oldContent, newContent, ctx = 3) {
     const patch = Diff.structuredPatch("", "", oldContent, newContent, "", "", { context: ctx });
     const lines = [];
     let added = 0;
     let removed = 0;
     for (let hi = 0; hi < patch.hunks.length; hi++) {
+        const h = patch.hunks[hi];
+        const meta = {
+            oldStart: h.oldStart,
+            oldLines: h.oldLines,
+            newStart: h.newStart,
+            newLines: h.newLines,
+        };
+        // Emit hunk metadata as a synthetic sep (position 0 for first hunk,
+        // between-hunk sep for subsequent). This ensures every hunk has metadata.
         if (hi > 0) {
             const prev = patch.hunks[hi - 1];
-            const gap = patch.hunks[hi].oldStart - (prev.oldStart + prev.oldLines);
-            lines.push({ type: "sep", oldNum: null, newNum: gap > 0 ? gap : null, content: "" });
+            const gap = h.oldStart - (prev.oldStart + prev.oldLines);
+            lines.push({ type: "sep", oldNum: null, newNum: gap > 0 ? gap : null, content: "", hunkMeta: meta });
+        }
+        else {
+            lines.push({ type: "sep", oldNum: null, newNum: null, content: "", hunkMeta: meta });
         }
-        const h = patch.hunks[hi];
         let oL = h.oldStart;
         let nL = h.newStart;
         for (const raw of h.lines) {

package/dist/core/diff.js.map

@@ -1 +1 @@
-{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/core/diff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAgB7B,MAAM,UAAU,SAAS,CAAC,UAAkB,EAAE,UAAkB,EAAE,GAAG,GAAG,CAAC;IACxE,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7F,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;QAChD,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YACjC,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;YACvE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QACtF,CAAC;QACD,MAAM,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1B,IAAI,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC;QACpB,IAAI,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;YAC3B,IAAI,GAAG,KAAK,8BAA8B;gBAAE,SAAS;YACrD,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YAClB,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;gBAChB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBACvE,KAAK,EAAE,CAAC;YACT,CAAC;iBAAM,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;gBACvB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBACvE,OAAO,EAAE,CAAC;YACX,CAAC;iBAAM,CAAC;gBACP,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACxE,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;AAChF,CAAC"}
+{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/core/diff.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -21,7 +21,7 @@
  *   • Async rendering with invalidate() for non-blocking preview
  */
 import type { BundledLanguage } from "shiki";
-import { type ParsedDiff, parseDiff } from "./core/diff.js";
+import { computeHunkBlocks, type ParsedDiff, getSepStyle, parseDiff, parsePatchFiles, resolveSepStyle } from "./core/diff.js";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 /** Resolved ANSI colors for diff rendering — theme overrides hardcoded defaults. */
 interface DiffColors {
@@ -33,8 +33,12 @@ declare function normalizeShikiContrast(ansi: string): string;
 declare function renderUnified(diff: ParsedDiff, language: BundledLanguage | undefined, max?: number, dc?: DiffColors): Promise<string>;
 declare function renderSplit(diff: ParsedDiff, language: BundledLanguage | undefined, max?: number, dc?: DiffColors): Promise<string>;
 export declare const __testing: {
+    computeHunkBlocks: typeof computeHunkBlocks;
     normalizeShikiContrast: typeof normalizeShikiContrast;
+    getSepStyle: typeof getSepStyle;
     parseDiff: typeof parseDiff;
+    parsePatchFiles: typeof parsePatchFiles;
+    resolveSepStyle: typeof resolveSepStyle;
     renderSplit: typeof renderSplit;
     renderUnified: typeof renderUnified;
 };

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,EAAiB,KAAK,UAAU,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3E,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,CA8HjB;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,CA6JjB;AAMD,eAAO,MAAM,SAAS;;;;;CAKrB,CAAC;AAmCF,wBAA8B,qBAAqB,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA0dnF"}
+{"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"}