@xynogen/pix-search 0.2.1 → 0.3.0

package/README.md

@@ -18,8 +18,9 @@ file picker with its own query input:
 - **Git recency** — recently modified files (from `git log`) rank higher.
 - **Depth penalty** — shallower entries win ties.
 
-Picking a result inserts the path into the prompt (quoted automatically when it
-contains a space). Keys: `↑`/`↓` move, `⏎` insert, `Esc` cancel (a cancelled
+Picking a result inserts `<path>…</path>` into the prompt; the model receives
+that span verbatim, and `@xynogen/pix-display` renders it as an `@name` chip
+when installed. Keys: `↑`/`↓` move, `⏎` insert, `Esc` cancel (a cancelled
 pick inserts a literal `@`, so the keystroke is never swallowed).
 
 `@` mid-token (e.g. an email `user@host`) is left as a literal `@` — only a
@@ -31,6 +32,6 @@ boundary `@` opens the picker.
 pi install npm:@xynogen/pix-search
 ```
 
-Standalone — **not** bundled by `@xynogen/pix-core`. It replaces the input
-editor component (via `setEditorComponent`), so run it alone if another
-extension also customizes the editor.
+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.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-search",
-	"version": "0.2.1",
+	"version": "0.3.0",
 	"description": "Pi extension — @ file picker overlay with fuzzy + git recency ranking",
 	"type": "module",
 	"main": "src/index.ts",

package/src/editor.ts

@@ -1,60 +1,51 @@
-/**
- * Custom editor that opens the file picker when `@` is typed at a token
- * boundary (line start or after whitespace), instead of inserting a literal
- * `@` and relying on the inline autocomplete dropdown.
- *
- * The editor stays dumb about UI plumbing: it calls the injected `openPicker`
- * callback (wired to `ctx.ui.custom` in the extension) and inserts whatever
- * token comes back. A cancelled pick inserts a literal `@` so the keystroke is
- * never silently swallowed.
- */
+/** 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 { CustomEditor } from "@earendil-works/pi-coding-agent";
-import type { EditorTheme, TUI } from "@earendil-works/pi-tui";
-import { atToken } from "./rank.ts";
-
-// The CustomEditor constructor wants pi-coding-agent's KeybindingsManager,
-// which is a structural superset of pi-tui's. The factory hands us a value the
-// host already typed correctly, so we take it as the constructor's own param
-// type rather than re-importing a non-exported type.
-type KbManager = ConstructorParameters<typeof CustomEditor>[2];
+/** Picked paths are marked as `<path>…</path>`; pix-display renders the span as a chip. */
+export function pathToken(path: string): string {
+	return `<path>${path}</path> `;
+}
 
 export type OpenPicker = () => Promise<string | null>;
 
-/** True when a literal `@` at the cursor should start an @-mention: the cursor
- *  is at line start or the preceding character is whitespace. */
+/** A mention starts at the beginning of a line or after whitespace. */
 export function atStartsMention(before: string): boolean {
 	return before === "" || /\s$/.test(before);
 }
 
-export class AtEditor extends CustomEditor {
-	constructor(
-		tui: TUI,
-		theme: EditorTheme,
-		keybindings: KbManager,
-		private readonly openPicker: OpenPicker,
-	) {
-		super(tui, theme, keybindings);
-	}
-
-	handleInput(data: string): void {
-		if (data === "@") {
-			const cursor = this.getCursor();
-			const line = this.getLines()[cursor.line] ?? "";
+export function attachPicker(
+	editor: CustomEditor,
+	tui: TUI,
+	openPicker: OpenPicker,
+	onError: (message: string) => void,
+): void {
+	const handleInput = editor.handleInput.bind(editor);
+	let inPaste = false;
+	const runPicker = async () => {
+		try {
+			const path = await openPicker();
+			editor.insertTextAtCursor(path ? pathToken(path) : "@");
+		} catch (error) {
+			editor.insertTextAtCursor("@");
+			onError(`File picker failed: ${error instanceof Error ? error.message : String(error)}`);
+		} finally {
+			tui.requestRender();
+		}
+	};
+	editor.handleInput = (data: string) => {
+		// Bracketed paste can arrive in separate chunks; a pasted @ is not a shortcut.
+		for (const marker of data.matchAll(/\x1b\[(200|201)~/g)) {
+			inPaste = marker[1] === "200";
+		}
+		if (!inPaste && data === "@") {
+			const cursor = editor.getCursor();
+			const line = editor.getLines()[cursor.line] ?? "";
 			if (atStartsMention(line.slice(0, cursor.col))) {
-				void this.runPicker();
+				void runPicker();
 				return;
 			}
 		}
-		super.handleInput(data);
-	}
-
-	private async runPicker(): Promise<void> {
-		const path = await this.openPicker();
-		this.insertTextAtCursor(path ? `${atToken(path)} ` : "@");
-		// The insert resolves outside the TUI input loop (after the overlay
-		// promise), so nothing schedules a frame — request one or the inserted
-		// text stays invisible until the next keystroke.
-		this.tui.requestRender();
-	}
+		handleInput(data);
+	};
 }

package/src/extension.ts

@@ -1,13 +1,14 @@
 /**
- * pix-search — replaces the input editor with one that opens a file-picker
+ * pix-search — adds input handling that opens a file-picker
  * overlay when you type `@` at a token boundary. The picker owns its own query
  * input, so spaces in the query work natively (no `@"…"` quoting). It lists
  * both files and their containing folders (so you can @-mention a directory),
  * ranked by fuzzy score + git recency, with a live preview of the selection.
  */
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { AtEditor } from "./editor.ts";
+import { CustomEditor, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { showTransientMessage } from "@xynogen/pix-pretty/transient-error";
+import { attachPicker } from "./editor.ts";
 import { FilePicker } from "./picker.ts";
 import { withDirectories } from "./rank.ts";
 import { loadRecency, type RecencyMap } from "./recency.ts";
@@ -15,6 +16,7 @@ import { rgFiles } from "./rg.ts";
 
 export default function (pi: ExtensionAPI): void {
 	pi.on("session_start", async (_event, ctx) => {
+		if (ctx.mode !== "tui") return;
 		const cwd = ctx.cwd;
 
 		// Warm the git-recency cache in the background; picker reads whatever is
@@ -51,6 +53,23 @@ export default function (pi: ExtensionAPI): void {
 				{ overlay: true, overlayOptions: { anchor: "center", width: "60%", maxHeight: "60%" } },
 			);
 
-		ctx.ui.setEditorComponent((tui, theme, kb) => new AtEditor(tui, theme, kb, openPicker));
+		const previous = ctx.ui.getEditorComponent();
+		ctx.ui.setEditorComponent((tui, theme, kb) => {
+			const editor = previous?.(tui, theme, kb) ?? new CustomEditor(tui, theme, kb);
+			// 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) =>
+					showTransientMessage(ctx.ui, message, "error"),
+				);
+			} else {
+				showTransientMessage(
+					ctx.ui,
+					"pix-search: @ picker requires a CustomEditor; existing editor kept.",
+					"warning",
+				);
+			}
+			return editor;
+		});
 	});
 }

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/rank.ts

@@ -50,11 +50,6 @@ export function rankFiles(
 	return ranked.slice(0, limit);
 }
 
-/** Quote a path for insertion into the prompt only when it contains a space. */
-export function atToken(path: string): string {
-	return path.includes(" ") ? `@"${path}"` : `@${path}`;
-}
-
 /**
  * Expand a flat file list into files + the directories that contain them, so
  * the picker can offer folders as selectable targets. Directories keep a