@xynogen/pix-find 0.1.20 → 0.1.24

package/README.md

@@ -20,7 +20,7 @@ After a configurable delay (default 10 seconds), completed output collapses to a
 }
 ```
 
-Set `collapse.tools.find: false` to disable for this tool only. See `@xynogen/pix-data/collapse` for the full API.
+Set `collapse.tools.find: false` to disable for this tool only. See `@xynogen/pix-runtime/collapse` for the full API.
 
 ## Install
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-find",
-	"version": "0.1.20",
+	"version": "0.1.24",
 	"description": "Pi tool — glob file search",
 	"type": "module",
 	"main": "src/index.ts",
@@ -34,9 +34,9 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@xynogen/pix-data": "^0.4.0",
-		"@xynogen/pix-pretty": "^1.7.22",
-		"@xynogen/pix-runtime": "^0.4.0"
+		"@xynogen/pix-data": "^0.4.3",
+		"@xynogen/pix-pretty": "^1.11.2",
+		"@xynogen/pix-runtime": "^0.5.3"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-coding-agent": "*"

package/src/find.test.ts

@@ -110,9 +110,75 @@ describe("registerFindTool", () => {
 
 		expect(result?.getText()).toContain("src/one.ts");
 		expect(result?.getText()).toContain("src/two.ts");
+		// No floating count header in the framed view — the collapsed row carries it.
 		expect(result?.getText()).not.toContain("2 files");
 	});
 
+	it("frames single-file output like multi-file (no inline row)", () => {
+		const registered: { renderResult?: (...args: unknown[]) => MockTextComponent } = {};
+		const mockPi: PiPrettyApi = {
+			registerTool(tool: unknown) {
+				Object.assign(registered, tool);
+			},
+			registerCommand() {},
+			on() {},
+		};
+		registerFindTool(
+			mockPi,
+			() => ({ execute: async () => ({ content: [], details: undefined }) }),
+			{
+				cwd: process.cwd(),
+				sp: (p: string) => p,
+				TextComponent: MockTextComponent as unknown as TextComponentCtor,
+				fffState: {
+					module: null,
+					finder: null,
+					partialIndex: false,
+					dbDir: null,
+				} satisfies FffState,
+				cursorStore: { store: () => "", get: () => undefined } as unknown as CursorStore,
+			},
+		);
+		const theme: ThemeLike = { fg: (_k: string, v: string) => v, bold: (v: string) => v };
+		const strip = (s: string) => s.replace(/\u001b\[[0-9;]*m/g, "");
+		const result = {
+			content: [{ type: "text", text: "src/a.ts" }],
+			details: { _type: "findResult", text: "src/a.ts", pattern: "*.ts", matchCount: 1 } as never,
+		};
+		const out =
+			registered
+				.renderResult?.(result, { isPartial: false }, theme, {
+					expanded: false,
+					isError: false,
+					invalidate: () => {},
+					state: {},
+				} as unknown as RenderContextLike)
+				?.getText() ?? "";
+		// Single result is framed just like multi — one shape, no inline row.
+		expect(out).toContain("─");
+		expect(out).toContain("src/a.ts");
+		expect(strip(out)).not.toContain("file");
+		const multi = {
+			content: [{ type: "text", text: "a.ts\nb.ts\nc.ts" }],
+			details: {
+				_type: "findResult",
+				text: "a.ts\nb.ts\nc.ts",
+				pattern: "*.ts",
+				matchCount: 3,
+			} as never,
+		};
+		const multiOut =
+			registered
+				.renderResult?.(multi, { isPartial: false }, theme, {
+					expanded: false,
+					isError: false,
+					invalidate: () => {},
+					state: {},
+				} as unknown as RenderContextLike)
+				?.getText() ?? "";
+		expect(multiOut).toContain("─");
+	});
+
 	it("collapses structured errors and restores the exact diagnostic on expansion", () => {
 		const registered: { renderResult?: (...args: unknown[]) => MockTextComponent } = {};
 		const mockPi: PiPrettyApi = {
@@ -159,7 +225,7 @@ describe("registerFindTool", () => {
 				?.getText() ?? "";
 
 		expect(render({ timer: 1 })).toContain(diagnostic);
-		expect(render({ collapsed: true })).toContain("✗ find [ in src · failed");
+		expect(render({ collapsed: true })).toContain("✗  find [ in src · failed");
 		expect(render({ collapsed: true }, true)).toContain(diagnostic);
 	});
 });

package/src/find.ts

@@ -20,6 +20,7 @@ import {
 	getTextContent,
 	hideCollapsedToolCall,
 	makeTextResult,
+	pluralize,
 	renderCollapsedToolRow,
 	renderDimPreview,
 	renderToolError,
@@ -93,19 +94,35 @@ export function registerFindTool(
 			}
 
 			// SDK fallback
-			const result = await origFind.execute(tid, effectiveParams, sig, upd as never, toolCtx);
-			const textContent = getTextContent(result);
-			const matchCount = textContent ? textContent.trim().split("\n").filter(Boolean).length : 0;
-
-			setResultDetails<FindResultDetails>(result, {
-				_type: "findResult",
-				text: textContent,
-				pattern: params.pattern,
-				path: params.path,
-				matchCount,
-			});
-
-			return result;
+			try {
+				const result = await origFind.execute(tid, effectiveParams, sig, upd as never, toolCtx);
+				const textContent = getTextContent(result);
+				const matchCount = textContent ? textContent.trim().split("\n").filter(Boolean).length : 0;
+
+				setResultDetails<FindResultDetails>(result, {
+					_type: "findResult",
+					text: textContent,
+					pattern: params.pattern,
+					path: params.path,
+					matchCount,
+				});
+
+				return result;
+			} catch (error) {
+				const text = error instanceof Error ? error.message : String(error);
+				if (sig?.aborted || /aborted/i.test(text)) throw error;
+				return {
+					content: [{ type: "text" as const, text }],
+					details: {
+						_type: "findResult" as const,
+						text,
+						pattern: params.pattern,
+						path: params.path,
+						matchCount: 0,
+					},
+					isError: true,
+				};
+			}
 		},
 
 		renderCall(args: FindParams, theme: ThemeLike, renderCtx: RenderContextLike) {
@@ -148,7 +165,9 @@ export function registerFindTool(
 			const cs = renderCtx.state as CollapseState;
 			if (!isPartial && tickCollapse("find", cs, renderCtx.invalidate, renderCtx.expanded)) {
 				const summary =
-					d?._type === "findResult" && d.matchCount != null ? `${d.matchCount} files` : "found";
+					d?._type === "findResult" && d.matchCount != null
+						? pluralize(d.matchCount, "file")
+						: "found";
 				const target = d?._type === "findResult" ? d.pattern : "";
 				const scope = d?._type === "findResult" && d.path ? ` in ${sp(d.path)}` : "";
 				text.setText(
@@ -169,7 +188,13 @@ export function registerFindTool(
 			}
 
 			const output = getTextContent(result) || "found";
-			text.setText(renderDimPreview(output, theme));
+			// One framed shape; rules follow status color. Count lives in the collapsed row.
+			text.setText(
+				renderDimPreview(output, theme, {
+					frame: true,
+					paint: (s: string) => theme.fg(renderCtx.isError ? "error" : "success", s),
+				}),
+			);
 			return text;
 		},
 	});