@xynogen/pix-search 0.2.2 → 0.3.2

package/README.md

@@ -32,6 +32,22 @@ boundary `@` opens the picker.
 pi install npm:@xynogen/pix-search
 ```
 
-Standalone — **not** bundled by `@xynogen/pix-core`. It wraps whatever editor
-is already installed (via `getEditorComponent`/`setEditorComponent`), so it
-composes with `pix-display` in either load order.
+> Standalone and opt-in. [`@xynogen/pix-core`](https://www.npmjs.com/package/@xynogen/pix-core) does not bundle it. It replaces Pi's built-in `@` autocomplete. It wraps the installed editor, so it works with `pix-display` in either load order.
+
+## Full distro
+
+This package is part of [Pix](https://github.com/xynogen/pix-mono). The installer sets up Pi and the full distro. See [Install](https://github.com/xynogen/pix-mono#install) for the notes for each OS.
+
+```bash
+# Linux / macOS
+curl -fsSL https://raw.githubusercontent.com/xynogen/pix-mono/main/scripts/install.sh | sh
+```
+
+```powershell
+# Windows
+irm https://raw.githubusercontent.com/xynogen/pix-mono/main/scripts/install.ps1 | iex
+```
+
+## License
+
+MIT. See [LICENSE](LICENSE).

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-search",
-	"version": "0.2.2",
+	"version": "0.3.2",
 	"description": "Pi extension — @ file picker overlay with fuzzy + git recency ranking",
 	"type": "module",
 	"main": "src/index.ts",
@@ -49,6 +49,7 @@
 	},
 	"dependencies": {
 		"@vscode/ripgrep": "^1.18.0",
-		"@xynogen/pix-pretty": "^1.21.0"
+		"@xynogen/pix-pretty": "^1.29.0",
+		"@xynogen/pix-runtime": "^0.12.0"
 	}
 }

package/src/editor.ts

@@ -1,10 +1,12 @@
 /** Add the @ picker to an editor without replacing its paste state or rendering. */
 import type { CustomEditor } from "@earendil-works/pi-coding-agent";
 import type { TUI } from "@earendil-works/pi-tui";
+import { chipTag } from "@xynogen/pix-pretty/chips";
+import { getErrorMessage } from "@xynogen/pix-pretty/utils";
 
-/** Picked paths are marked as `<path>…</path>`; pix-display renders the span as a chip. */
+/** Picked paths use the shared `<path>` chip tag. pix-display renders it as a chip. */
 export function pathToken(path: string): string {
-	return `<path>${path}</path> `;
+	return `${chipTag.path(path)} `;
 }
 
 export type OpenPicker = () => Promise<string | null>;
@@ -28,7 +30,7 @@ export function attachPicker(
 			editor.insertTextAtCursor(path ? pathToken(path) : "@");
 		} catch (error) {
 			editor.insertTextAtCursor("@");
-			onError(`File picker failed: ${error instanceof Error ? error.message : String(error)}`);
+			onError(`File picker failed: ${getErrorMessage(error)}`);
 		} finally {
 			tui.requestRender();
 		}

package/src/extension.ts

@@ -7,6 +7,8 @@
  */
 
 import { CustomEditor, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { warnBinaryMissing } from "@xynogen/pix-pretty/tool-status";
+import { showTransientMessage } from "@xynogen/pix-pretty/transient-error";
 import { attachPicker } from "./editor.ts";
 import { FilePicker } from "./picker.ts";
 import { withDirectories } from "./rank.ts";
@@ -21,9 +23,12 @@ export default function (pi: ExtensionAPI): void {
 		// Warm the git-recency cache in the background; picker reads whatever is
 		// ready when it opens (empty until the first git log returns).
 		let recency: RecencyMap = new Map();
-		void loadRecency(cwd).then((map) => {
-			recency = map;
-		});
+		void loadRecency(cwd).then(
+			(map) => {
+				recency = map;
+			},
+			(err: unknown) => warnBinaryMissing(ctx.ui, err),
+		);
 
 		// Open the picker overlay and resolve with the chosen path (or null).
 		const openPicker = () =>
@@ -58,9 +63,12 @@ export default function (pi: ExtensionAPI): void {
 			// ponytail: cursor access requires CustomEditor. Keep other editors intact;
 			// add a public cursor adapter if a non-CustomEditor integration is needed.
 			if (editor instanceof CustomEditor) {
-				attachPicker(editor, tui, openPicker, (message) => ctx.ui.notify(message, "error"));
+				attachPicker(editor, tui, openPicker, (message) =>
+					showTransientMessage(ctx.ui, message, "error"),
+				);
 			} else {
-				ctx.ui.notify(
+				showTransientMessage(
+					ctx.ui,
 					"pix-search: @ picker requires a CustomEditor; existing editor kept.",
 					"warning",
 				);

package/src/picker.ts

@@ -233,6 +233,9 @@ export class FilePicker {
 			lines: rows,
 			color: (s) => theme.fg("accent", s),
 			fg: (s) => theme.fg("text", s),
+			// Solid modal fill so the terminal doesn't bleed through, matching the
+			// gate/confirm/ask overlays. Skipped when the theme lacks bg (mock themes).
+			bg: theme.bg ? (s) => theme.bg?.("customMessageBg", s) ?? s : undefined,
 		});
 		this.cachedWidth = width;
 		return this.cachedLines;

package/src/recency.ts

@@ -4,7 +4,7 @@
  * Cached per session, refreshed on demand.
  */
 
-import { execFile } from "node:child_process";
+import { runGit } from "@xynogen/pix-runtime/os";
 
 const MAX_COMMITS = 200;
 const DECAY = 0.97; // exponential decay per commit position
@@ -28,32 +28,16 @@ export function buildRecencyScores(gitOutput: string): RecencyMap {
 	return scores;
 }
 
+/**
+ * Recency scores for files in `cwd` (empty outside a repo, on abort, or on
+ * git failure). A missing git binary rejects with BinaryMissingError so the
+ * caller can show the install hint once.
+ */
 export async function loadRecency(cwd: string, signal?: AbortSignal): Promise<RecencyMap> {
-	return new Promise((resolve) => {
-		if (signal?.aborted) {
-			resolve(new Map());
-			return;
-		}
-
-		const child = execFile(
-			"git",
-			["log", "--name-only", "--pretty=format:", `-n${MAX_COMMITS}`, "--diff-filter=ACMR"],
-			{ cwd, maxBuffer: 2 * 1024 * 1024, signal },
-			(err, stdout) => {
-				if (err || !stdout) {
-					resolve(new Map());
-					return;
-				}
-				resolve(buildRecencyScores(stdout));
-			},
-		);
-
-		signal?.addEventListener(
-			"abort",
-			() => {
-				child.kill("SIGKILL");
-			},
-			{ once: true },
-		);
-	});
+	if (signal?.aborted) return new Map();
+	const stdout = await runGit(
+		["log", "--name-only", "--pretty=format:", `-n${MAX_COMMITS}`, "--diff-filter=ACMR"],
+		{ cwd, signal, timeoutMs: 15_000, maxBuffer: 2 * 1024 * 1024 },
+	);
+	return stdout ? buildRecencyScores(stdout) : new Map();
 }

package/src/rg.ts

@@ -7,16 +7,25 @@
 
 import { spawn } from "node:child_process";
 import { basename } from "node:path";
+import { resolveTool } from "@xynogen/pix-runtime/binaries";
 
-// Bundled ripgrep: @vscode/ripgrep pulls a prebuilt rg per-platform on install
-// and exposes its absolute path, so users no longer need rg on PATH. Fall back
-// to a bare "rg" (PATH lookup) if the postinstall binary download was skipped
-// (e.g. npm_config_ignore_scripts).
-let RG_BIN = "rg";
-try {
-	RG_BIN = (require("@vscode/ripgrep") as { rgPath: string }).rgPath;
-} catch {
-	/* bundled binary unavailable — fall back to PATH `rg` */
+/**
+ * rg resolution: pix-runtime (binary.json → <agentDir>/bin, where Pi downloads
+ * rg → PATH). `@vscode/ripgrep`'s bundled copy is only the last fallback, for
+ * hosts where Pi has not fetched rg yet. Resolved lazily, once per process.
+ */
+let rgBin: string | undefined;
+export function rgBinary(): string {
+	if (rgBin) return rgBin;
+	rgBin = resolveTool("rg")?.path;
+	if (!rgBin) {
+		try {
+			rgBin = (require("@vscode/ripgrep") as { rgPath: string }).rgPath;
+		} catch {
+			rgBin = "rg";
+		}
+	}
+	return rgBin;
 }
 
 const TIMEOUT_MS = 3_000;
@@ -28,7 +37,7 @@ function spawnRg(args: string[], cwd: string, signal: AbortSignal): Promise<stri
 			return;
 		}
 
-		const child = spawn(RG_BIN, args, {
+		const child = spawn(rgBinary(), args, {
 			cwd,
 			stdio: ["ignore", "pipe", "ignore"],
 			// ponytail: no env filtering — inherits .gitignore respect from rg defaults