@xynogen/pix-edit 0.1.14 → 0.1.16

package/README.md

@@ -8,13 +8,13 @@ Replaces Pi's default `edit` tool with an enhanced version that renders a side-b
 
 ## Auto-collapse
 
-After a configurable delay (default 10 seconds) the diff card automatically collapses. Controlled via the `collapse` section of `~/.pi/agent/pix.json`:
+After a configurable delay (default 10 seconds), a completed diff collapses to a one-line status row. Structured failures use a compact `✗` row after the delay. Expanding restores the existing bounded diff or exact diagnostic without restarting the elapsed timer. This is controlled via the `collapse` section of `~/.pi/agent/pix.json`:
 
 ```jsonc
 {
   "collapse": {
     "enabled": true,
-    "delayMs": 10000,
+    "delaySec": 10,
     "tools": { "edit": true }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-edit",
-	"version": "0.1.14",
+	"version": "0.1.16",
 	"description": "Pi tool — precise text replacement edit with diff rendering",
 	"type": "module",
 	"main": "src/index.ts",

package/src/edit.test.ts

@@ -1,6 +1,11 @@
 import { describe, expect, it } from "bun:test";
 import type { CursorStore, FffState } from "@xynogen/pix-pretty/fff";
-import type { PiPrettyApi, TextComponentCtor } from "@xynogen/pix-pretty/types";
+import type {
+	PiPrettyApi,
+	RenderContextLike,
+	TextComponentCtor,
+	ThemeLike,
+} from "@xynogen/pix-pretty/types";
 import { getEditOperations, registerEditTool, summarizeEditOperations } from "./edit";
 
 class MockTextComponent {
@@ -14,11 +19,11 @@ class MockTextComponent {
 }
 
 describe("registerEditTool", () => {
-	it("registers a tool named 'edit'", () => {
-		const tools: string[] = [];
+	it("registers a self-rendered edit tool", () => {
+		const tools: Array<{ name: string; renderShell?: string }> = [];
 		const mockPi: PiPrettyApi = {
 			registerTool(t: unknown) {
-				tools.push((t as { name: string }).name);
+				tools.push(t as { name: string; renderShell?: string });
 			},
 			registerCommand() {},
 			on() {},
@@ -44,7 +49,114 @@ describe("registerEditTool", () => {
 			},
 			(_id: string, _inv: () => void) => {},
 		);
-		expect(tools).toEqual(["edit"]);
+		expect(tools).toHaveLength(1);
+		expect(tools[0]?.name).toBe("edit");
+		expect(tools[0]?.renderShell).toBe("self");
+	});
+
+	it("restores the bounded diff when an elapsed card is expanded", () => {
+		const registered: { renderResult?: (...args: unknown[]) => MockTextComponent } = {};
+		const mockPi: PiPrettyApi = {
+			registerTool(tool: unknown) {
+				Object.assign(registered, tool);
+			},
+			registerCommand() {},
+			on() {},
+		};
+		registerEditTool(
+			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 },
+				cursorStore: { store: () => "", get: () => undefined } as unknown as CursorStore,
+			},
+			() => {},
+		);
+		const theme: ThemeLike = {
+			fg: (_key: string, value: string) => value,
+			bold: (value: string) => value,
+		};
+		const result = registered.renderResult?.(
+			{
+				content: [{ type: "text", text: "edited" }],
+				details: {
+					_type: "editInfo",
+					filePath: "sample.ts",
+					summary: "+1 -1",
+					oldContent: "old",
+					newContent: "new",
+					language: "typescript",
+					editLine: 1,
+				},
+			},
+			undefined,
+			theme,
+			{
+				expanded: true,
+				isError: false,
+				invalidate: () => {},
+				state: { collapsed: true },
+			} as unknown as RenderContextLike,
+		);
+
+		expect(result?.getText()).toContain("rendering diff");
+		expect(result?.getText()).not.toContain("✓ edit");
+	});
+
+	it("collapses structured errors and restores the exact diagnostic on expansion", () => {
+		const registered: { renderResult?: (...args: unknown[]) => MockTextComponent } = {};
+		const mockPi: PiPrettyApi = {
+			registerTool(tool: unknown) {
+				Object.assign(registered, tool);
+			},
+			registerCommand() {},
+			on() {},
+		};
+		registerEditTool(
+			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 },
+				cursorStore: { store: () => "", get: () => undefined } as unknown as CursorStore,
+			},
+			() => {},
+		);
+		const theme: ThemeLike = {
+			fg: (_key: string, value: string) => value,
+			bold: (value: string) => value,
+		};
+		const diagnostic = "oldText was not found in sample.ts";
+		const result = {
+			content: [{ type: "text", text: diagnostic }],
+			details: {
+				_type: "editInfo",
+				filePath: "sample.ts",
+				summary: "+1 -1",
+				oldContent: "old",
+				newContent: "new",
+				language: "typescript",
+				editLine: 0,
+			},
+		};
+		const render = (state: Record<string, unknown>, expanded = false) =>
+			registered
+				.renderResult?.(result, { isPartial: false }, theme, {
+					expanded,
+					isError: true,
+					invalidate: () => {},
+					state,
+				} as unknown as RenderContextLike)
+				?.getText() ?? "";
+
+		expect(render({ timer: 1 })).toContain(diagnostic);
+		expect(render({ collapsed: true })).toContain("✗ edit sample.ts · failed");
+		expect(render({ collapsed: true }, true)).toContain(diagnostic);
 	});
 });
 

package/src/edit.ts

@@ -114,6 +114,7 @@ export function registerEditTool(
 	pi.registerTool({
 		...origEdit,
 		name: "edit",
+		renderShell: "self",
 
 		async execute(
 			tid: string,
@@ -199,15 +200,18 @@ export function registerEditTool(
 			renderCtx: RenderContextLike<EditRenderState>,
 		) {
 			const text = renderCtx.lastComponent ?? new TextComponent("", 0, 0);
-			if (renderCtx.isError) {
+			const d = result.details as Record<string, unknown> | undefined;
+			const isPartial = _opt?.isPartial === true;
+			const structuredError =
+				renderCtx.isError && (d?._type === "editInfo" || d?._type === "multiEditInfo");
+			if (renderCtx.isError && (!structuredError || isPartial)) {
 				text.setText(renderToolError(getTextContent(result) || "Error", theme));
 				return text;
 			}
-			const d = result.details as Record<string, unknown> | undefined;
 
 			// Auto-collapse: show summary line after delay
 			const cs = renderCtx.state as CollapseState;
-			if (tickCollapse("edit", cs, renderCtx.invalidate)) {
+			if (!isPartial && tickCollapse("edit", cs, renderCtx.invalidate, renderCtx.expanded)) {
 				const summary =
 					d?._type === "editInfo"
 						? (d.summary as string)
@@ -220,7 +224,20 @@ export function registerEditTool(
 					const ops = d.ops as Array<Record<string, unknown>> | undefined;
 					filePath = String(ops?.[0]?.filePath ?? "");
 				}
-				text.setText(renderCollapsedToolRow(theme, "edit", sp(filePath), summary));
+				text.setText(
+					renderCollapsedToolRow(
+						theme,
+						"edit",
+						sp(filePath),
+						renderCtx.isError ? "failed" : summary,
+						renderCtx.isError ? "error" : "success",
+					),
+				);
+				return text;
+			}
+
+			if (renderCtx.isError) {
+				text.setText(renderToolError(getTextContent(result) || "Error", theme));
 				return text;
 			}