@xynogen/pix-pretty 1.7.6 → 1.7.8

package/README.md

@@ -1,38 +1,39 @@
 # pix-pretty
 
-Complete rendering and formatting solution for Pi Coding Agent with syntax highlighting, file icons, tree views, FFF search, paste chip formatting, and reasoning tag cleanup.
+Rendering and formatting library for Pi Coding Agent with syntax highlighting, file icons, tree views, FFF search integration, and gate-dialog overlay.
 
-## Features
+## What it does
 
-### Tool Output Rendering
+This package is a **library + a small extension** that other pix packages
+consume. It does not register user-facing tools itself — the tool renderers
+(`pix-read`, `pix-bash`, `pix-ls`, `pix-find`, `pix-grep`, `pix-edit`,
+`pix-write`) import from it. The extension entry point (`src/index.ts`) only
+initializes the syntax-highlight theme from Pi settings, clears the highlight
+cache, and registers two FFF slash commands (`/fff-health`, `/fff-rescan`)
+once `pix-grep` has brought the FFF finder online.
 
-- **Syntax highlighting** - Uses `cli-highlight` (highlight.js-backed) for code blocks
-- **File icons** - Visual file type indicators in ls/find output
-- **Tree views** - Hierarchical directory display
-- **FFF search** - Fast full-text search integration with `@ff-labs/fff-node`
-- **Diff rendering** - Enhanced git diff and edit/write tool output
-- **Image metadata** - Display image dimensions and format info
-- **Bash exit summary** - Command status and timing info
+### Rendering
 
-### Paste Chip Formatting
+- **Syntax highlighting** — `cli-highlight` (highlight.js-backed)
+- **File icons** — type-aware icons in ls/find output
+- **Tree views** — hierarchical directory display for ls
+- **Diff rendering** — side-by-side split diff for edit/write
+- **Bash exit summary** — colored status, line count, truncation notice
 
-- **Image path collapsing** - Converts `/tmp/pi-clipboard-abc.png` → `[paste image #1]`
-- **Text paste markers** - Long pasted text → `[paste text +42 lines]`
-- **Atomic deletion** - Delete entire paste markers as single units
-- **Type-aware labels** - Visual distinction between image and text pastes
+### Shared overlay
 
-### Permission Dialog Overlay
+- **Gate overlay** (`./gate-overlay`) — the one permission-dialog component
+  shared by `pix-gate` and `pix-sudo`. Two modes: `confirm` (SelectList) and
+  `sudo` (SelectList + masked password). Returns
+  `{ action: "approved" | "denied" | "timeout", password? }`. Padded with
+  `Box` `paddingX=2`, `paddingY=1`. The simpler `./confirm` export is the
+  plain boolean Yes/No dialog.
 
-- **Shared gate overlay** - `showOverlay(ui, config)` (export `./gate-overlay`) is the one permission-dialog component used by both `pix-gate` and `pix-sudo`. Two modes: `mode:"confirm"` shows a SelectList only; `mode:"sudo"` shows a SelectList then a masked password stage. Returns `{ action: "approved" | "denied" | "timeout", password? }`. All dialogs are padded (`Box` `paddingX=2`, `paddingY=1`). The simpler `./confirm` export stays for plain boolean Yes/No prompts — `gate-overlay` is its richer multi-choice, password-capable sibling.
+UI features that used to live here have moved to [`pix-display`](packages/pix-display):
+paste chip rendering and reasoning-tag (`<think>`/`<thinking>`) → native
+`thinking` content blocks.
 
-### Reasoning Tag Rendering
-
-- **Live streaming** - Splits `<think>`/`<thinking>` regions into native Pi `thinking` content blocks token-by-token during streaming
-- **Finalized cleanup** - On `message_end`, re-splits every affected text block for persistence (the finalized message bypasses the live rebuild)
-- **Partial-tag safety** - Strips trailing half-streamed tags (e.g. `<thin`) so they never flash as literal text
-- **Visual distinction** - Uses Pi's native `thinking` block rendering (dim + italic via `thinkingText` theme token) — no ANSI injection, no markdown blockquote shim
-
-## Installation
+## Install
 
 ```bash
 pi install npm:@xynogen/pix-pretty
@@ -42,40 +43,38 @@ pi install npm:@xynogen/pix-pretty
 
 ### Environment Variables
 
-**Tool rendering:**
-
-- `PRETTY_THEME` - Color theme for syntax highlighting
-- `PRETTY_MAX_HL_CHARS` - Max characters to highlight (default: 80000)
-- `PRETTY_MAX_PREVIEW_LINES` - Max lines in preview output
-- `PRETTY_CACHE_LIMIT` - FFF cache size limit
-- `PRETTY_ICONS` - Enable/disable file icons
-- `PRETTY_DISABLE_TOOLS` - Comma-separated list of tools to skip rendering
-- `PRETTY_IMAGE_PROTOCOL` - Protocol for image display (tmux passthrough)
-- `PRETTY_FFF_DIR` - Override FFF state dir (default: `~/.cache/pi/fff`)
-
-## Architecture
-
-This package combines two rendering systems:
-
-1. **Theme + FFF commands** (`src/index.ts`) - Initialises syntax-highlight theme from Pi settings, clears highlight cache, and registers FFF slash commands. Tool renderers live in the standalone `pix-{read,bash,ls,find,grep,edit,write}` packages — each self-registers via its own Pi extension entry point.
-2. **Paste chip formatting** (`src/paste-chips.ts`) - Custom editor component for paste markers.
-3. **Reasoning tag rendering** (`src/thinking.ts`) - Converts leaked `<think>`/`<thinking>` tags into native Pi `thinking` content blocks (dim + italic via `thinkingText` theme token).
+- `PRETTY_THEME` — color theme for syntax highlighting
+- `PRETTY_MAX_HL_CHARS` — max characters to highlight (default: 80000)
+- `PRETTY_MAX_PREVIEW_LINES` — max lines in preview output
+- `PRETTY_CACHE_LIMIT` — FFF cache size limit
+- `PRETTY_ICONS` — icon mode (`nerd` or `none`)
+- `PRETTY_MAX_RENDER_LINES` — max lines in edit/write diff render (default: 150)
+- `PRETTY_FFF_DIR` — override FFF state dir (default: `~/.cache/pi/fff`)
 
-Both work independently but complement each other for a cohesive visual experience.
+## Public exports
 
-## Origin
+The package exposes its sub-modules via `exports`:
 
-Tool rendering replaced `npm:@heyhuynhgiabuu/pi-pretty` (which was previously replaced by `npm:@heyhuynhgiabuu/pi-diff`). This package is a clean reimplementation — no code was copied directly. Developed independently; changes are not submitted back and upstream changes are not pulled in.
-
-Key divergences from upstream:
-
-1. **Highlight engine: shiki → cli-highlight** - Simpler, no WASM, synchronous
-2. **FFF state dir** - `~/.pi/agent/pi-pretty/fff` → `~/.cache/pi/fff` (XDG cache)
-3. **Split diff view for edit/write tools** - Full side-by-side diff with gutter, line numbers, syntax highlighting
-4. **Paste chip formatting** - Custom editor component for Pi's paste marker system (not in upstream)
-5. **Reasoning tag rendering** - Converts leaked `<think>`/`<thinking>` tags into native Pi `thinking` content blocks (not in upstream)
-
-Paste chip formatting and reasoning tag rendering are original additions with no upstream equivalent.
+```
+@xynogen/pix-pretty            (default — extension entry)
+@xynogen/pix-pretty/ansi
+@xynogen/pix-pretty/confirm
+@xynogen/pix-pretty/progress
+@xynogen/pix-pretty/config
+@xynogen/pix-pretty/diff
+@xynogen/pix-pretty/diff-render
+@xynogen/pix-pretty/highlight
+@xynogen/pix-pretty/lang
+@xynogen/pix-pretty/icons
+@xynogen/pix-pretty/renderers
+@xynogen/pix-pretty/fff
+@xynogen/pix-pretty/types
+@xynogen/pix-pretty/utils
+@xynogen/pix-pretty/resize
+@xynogen/pix-pretty/context
+@xynogen/pix-pretty/gate-overlay
+@xynogen/pix-pretty/modal-frame
+```
 
 ## Full distro
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@xynogen/pix-pretty",
-	"version": "1.7.6",
-	"description": "Enhanced tool output rendering with syntax highlighting, file icons, tree views, FFF search, and paste chip formatting",
+	"version": "1.7.8",
+	"description": "Enhanced tool output rendering with syntax highlighting, file icons, tree views, diff rendering, and FFF search",
 	"type": "module",
 	"main": "src/index.ts",
 	"exports": {

package/src/README.md

@@ -1,66 +1,36 @@
-# pretty (vendored)
+# pix-pretty/src
 
-Local fork of [`@heyhuynhgiabuu/pi-pretty`](https://github.com/buddingnewinsights/pi-pretty)
-(v0.5.1). Enhances built-in `read` / `bash` / `ls` / `find` / `grep` /
-`multi_grep` tool output with syntax highlighting, file icons, tree views, and
-FFF-backed search.
+> **Historical doc — kept for reference only.**
+>
+> This file originally described pix-pretty as a vendored fork of
+> `@heyhuynhgiabuu/pi-pretty`. That is no longer accurate: pix-pretty has
+> been completely reimplemented. The current source layout, exports, and
+> dependency graph live in the package-level [`README.md`](../README.md).
+>
+> The notes below remain only as a record of two behavioral decisions that
+> differ from the original upstream; both are still in force.
 
-## Why vendored
+## Behavioral decisions that survive the rewrite
 
-We need two behavioral changes the upstream package does not expose as config,
-so the source is copied here 1:1 and patched:
+These two changes were made when pix-pretty was a vendored fork and are
+preserved in the reimplementation:
 
 1. **Highlight engine: shiki → cli-highlight.**
-   Upstream uses `@shikijs/cli` (`codeToANSI`, TextMate grammars + WASM).
-   This fork uses [`cli-highlight`](https://www.npmjs.com/package/cli-highlight)
-   (highlight.js-backed, synchronous). The `hlBlock` interface, language table,
+   Upstream used `@shikijs/cli` (`codeToANSI`, TextMate grammars + WASM).
+   The reimplementation uses [`cli-highlight`](https://www.npmjs.com/package/cli-highlight)
+   (highlight.js-backed, synchronous). `HLJS_LANG_ALIAS` maps shiki-style ids
+   (`tsx`, `jsx`, `jsonc`, `mdx`, `make`, `svelte`, `vue`) onto
+   highlight.js-supported ids. The `hlBlock` interface, language table,
    line-number layout, and low-contrast normalization are unchanged.
 
 2. **FFF state dir: `~/.pi/agent/pi-pretty/fff` → `~/.cache/pi/fff`.**
-   `getPiPrettyFffDir()` now resolves to `$XDG_CACHE_HOME/pi/fff`
-   (default `~/.cache/pi/fff`), overridable with `PRETTY_FFF_DIR`.
+   `getPiPrettyFffDir()` resolves to `$XDG_CACHE_HOME/pi/fff` (default
+   `~/.cache/pi/fff`), overridable with `PRETTY_FFF_DIR`.
 
-Everything else (bash exit summary, ls tree, find grouping, grep highlighting,
-image metadata, tmux passthrough, `/fff-health`, `/fff-rescan`, multi_grep
-ripgrep fallback) is byte-for-byte upstream.
+## What moved out
 
-## Diff vs upstream
+- **Paste chip formatting** → [`@xynogen/pix-display`](../pix-display)
+- **Reasoning tag (`<think>`/`<thinking>`) rendering** →
+  [`@xynogen/pix-display`](../pix-display)
 
-- `index.ts`
-  - imports: `@shikijs/cli` + `shiki` types → `cli-highlight` (lazy `require`)
-    with local `BundledLanguage`/`BundledTheme = string` aliases.
-  - `FORCE_COLOR=3` default before chalk init (shiki always emitted truecolor;
-    chalk decides level once at load). Respects an explicit `FORCE_COLOR` /
-    `NO_COLOR`.
-  - `HLJS_LANG_ALIAS` maps shiki-style ids (`tsx`, `jsx`, `jsonc`, `mdx`,
-    `make`, `svelte`, `vue`) onto highlight.js-supported ids.
-  - `hlBlock()` calls `highlight(code, { language, ignoreIllegals: true })`
-    instead of `await codeToANSI(...)`. Still async-typed so call sites match.
-  - `getPiPrettyFffDir()` → `~/.cache/pi/fff`.
-- `fff-helpers.ts`, `multi-grep-fallback.ts` — unchanged.
-
-## Runtime deps & module resolution
-
-`cli-highlight` and `@ff-labs/fff-node` are installed into pi's npm root
-(`~/.pi/agent/npm/node_modules`) by `setup.sh`. Because the extensions dir is a
-symlink into dotfiles and Node dereferences symlinks before resolving bare
-imports, `setup.sh` also creates a git-ignored
-`extensions/node_modules` → `~/.pi/agent/npm/node_modules` bridge next to the
-real source so `require("cli-highlight")` / `import("@ff-labs/fff-node")`
-resolve.
-
-The upstream `npm:@heyhuynhgiabuu/pi-pretty` package is uninstalled by
-`setup.sh` — both register the same tool names and pi does not share tool-name
-ownership across extensions.
-
-## Env vars
-
-Same as upstream (`PRETTY_THEME`, `PRETTY_MAX_HL_CHARS`,
-`PRETTY_MAX_PREVIEW_LINES`, `PRETTY_CACHE_LIMIT`, `PRETTY_ICONS`,
-`PRETTY_DISABLE_TOOLS`, `PRETTY_IMAGE_PROTOCOL`) plus:
-
-- `PRETTY_FFF_DIR` — override the FFF state dir (default `~/.cache/pi/fff`).
-
-## License
-
-MIT — upstream by huynhgiabuu. See upstream repo.
+See the package-level README for the current export map.

package/src/diff.test.ts

@@ -0,0 +1,23 @@
+import { describe, expect, it } from "bun:test";
+
+import { parseDiff } from "./diff.js";
+
+const OLD = "line1\nline2\nline3";
+const NEW = "line1\nCHANGED\nline3";
+
+describe("parseDiff baseLine", () => {
+	it("is snippet-relative when baseLine omitted (default 0)", () => {
+		const { lines } = parseDiff(OLD, NEW);
+		const del = lines.find((l) => l.type === "del");
+		expect(del?.oldNum).toBe(2); // line2 is the 2nd line of the snippet
+	});
+
+	it("shifts gutter numbers to absolute when baseLine given", () => {
+		// Snippet begins at file line 84 → snippet line 2 becomes file line 85.
+		const { lines } = parseDiff(OLD, NEW, 3, 84);
+		const del = lines.find((l) => l.type === "del");
+		const add = lines.find((l) => l.type === "add");
+		expect(del?.oldNum).toBe(85);
+		expect(add?.newNum).toBe(85);
+	});
+});

package/src/diff.ts

@@ -22,6 +22,9 @@ export function parseDiff(
 	oldContent: string,
 	newContent: string,
 	ctx = 3,
+	// 1-based file line where the snippet begins; shifts gutter numbers from
+	// snippet-relative to absolute. 0 = no shift (snippet-relative, the default).
+	baseLine = 0,
 ): ParsedDiff {
 	const patch = Diff.structuredPatch("", "", oldContent, newContent, "", "", {
 		context: ctx,
@@ -42,8 +45,9 @@ export function parseDiff(
 			});
 		}
 		const h = patch.hunks[hi];
-		let oL = h.oldStart;
-		let nL = h.newStart;
+		const shift = baseLine > 0 ? baseLine - 1 : 0;
+		let oL = h.oldStart + shift;
+		let nL = h.newStart + shift;
 		for (const raw of h.lines) {
 			if (raw === "\") continue;
 			const ch = raw[0];

package/src/index.ts

@@ -1,7 +1,10 @@
 /**
- * pi-pretty — Pretty terminal output for pi built-in tools.
+ * pix-pretty — Pretty terminal output for pi built-in tools.
  *
- * Pure rendering library — no Pi lifecycle hooks or extensions.
+ * Primarily a rendering library (highlight/diff/icons/fff, imported by the tool
+ * packages). This default export is also a thin Pi extension: on load it inits
+ * the pretty theme, clears the highlight cache, and registers the FFF slash
+ * commands (/fff-health, /fff-rescan). pix-core activates it for that purpose.
  * UI features (paste chips, thinking blocks) live in pix-display.
  */
 
@@ -30,9 +33,3 @@ export default function piPrettyExtension(pi: PiPrettyApi): void {
 	// Commands become available once pix-grep initialises the finder.
 	registerFffCommands(pi, fffState);
 }
-
-/**
- * piPrettyExtension still exports a default function for packages that
- * import it as an extension (pix-core activates it for theme + FFF).
- * UI extensions (paste-chips, thinking) moved to pix-display.
- */