@xynogen/pix-edit 0.2.2 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-edit",
-	"version": "0.2.2",
+	"version": "0.2.4",
 	"description": "Pi tool — precise text replacement edit with diff rendering",
 	"type": "module",
 	"main": "src/index.ts",
@@ -13,6 +13,7 @@
 	},
 	"files": [
 		"src",
+		"!src/**/*.test.*",
 		"README.md",
 		"LICENSE"
 	],
@@ -38,7 +39,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@xynogen/pix-pretty": "^1.11.2",
+		"@xynogen/pix-pretty": "^1.19.0",
 		"@xynogen/pix-runtime": "^0.8.0"
 	},
 	"peerDependencies": {

package/src/edit.ts

@@ -30,6 +30,7 @@ import type {
 import {
 	dotJoin,
 	fillToolBackground,
+	frameToolResult,
 	getTextContent,
 	hideCollapsedToolCall,
 	isTextContent,
@@ -37,6 +38,7 @@ import {
 	renderToolError,
 	setResultDetails,
 	termW,
+	unframeToolResult,
 } from "@xynogen/pix-pretty/utils";
 import { type CollapseState, tickCollapse } from "@xynogen/pix-runtime/collapse";
 
@@ -232,14 +234,15 @@ export function registerEditTool(
 			renderCtx: RenderContextLike<EditRenderState>,
 		) {
 			resolveBaseBackground(theme);
-			const text = renderCtx.lastComponent ?? new TextComponent("", 0, 0);
+			const text = unframeToolResult(renderCtx.lastComponent ?? new TextComponent("", 0, 0));
 			const d = result.details as Record<string, unknown> | undefined;
 			const isPartial = _opt?.isPartial === true;
+			const completed = () => frameToolResult(text, theme, renderCtx.isError);
 			const structuredError =
 				renderCtx.isError && (d?._type === "editInfo" || d?._type === "multiEditInfo");
 			if (renderCtx.isError && (!structuredError || isPartial)) {
 				text.setText(renderToolError(getTextContent(result) || "Error", theme));
-				return text;
+				return isPartial ? text : completed();
 			}
 
 			// Auto-collapse: show summary line after delay
@@ -271,7 +274,7 @@ export function registerEditTool(
 
 			if (renderCtx.isError) {
 				text.setText(renderToolError(getTextContent(result) || "Error", theme));
-				return text;
+				return completed();
 			}
 
 			// Single edit — full split diff
@@ -302,7 +305,7 @@ export function registerEditTool(
 						});
 				}
 				text.setText(renderCtx.state._edt ?? `  ${d.summary}`);
-				return text;
+				return isPartial ? text : completed();
 			}
 
 			// Multi-edit — stacked diffs
@@ -340,13 +343,13 @@ export function registerEditTool(
 						});
 				}
 				text.setText(renderCtx.state._edt ?? `  ${d.editCount} edits ${d.summary}`);
-				return text;
+				return isPartial ? text : completed();
 			}
 
 			const fallback = result.content?.[0];
 			const fallbackText = fallback && isTextContent(fallback) ? fallback.text : "edited";
 			text.setText(fillToolBackground(`  ${theme.fg("dim", String(fallbackText).slice(0, 120))}`));
-			return text;
+			return isPartial ? text : completed();
 		},
 	});
 }

package/src/edit.test.ts

@@ -1,242 +0,0 @@
-import { describe, expect, it } from "bun:test";
-import type { CursorStore, FffState } from "@xynogen/pix-pretty/fff";
-import type {
-	PiPrettyApi,
-	RenderContextLike,
-	TextComponentCtor,
-	ThemeLike,
-} from "@xynogen/pix-pretty/types";
-import { getEditOperations, registerEditTool, summarizeEditOperations } from "./edit";
-
-class MockTextComponent {
-	private text = "";
-	setText(v: string) {
-		this.text = v;
-	}
-	getText() {
-		return this.text;
-	}
-}
-
-describe("registerEditTool", () => {
-	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; renderShell?: string });
-			},
-			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,
-				} satisfies FffState,
-				cursorStore: {
-					store: () => "",
-					get: () => undefined,
-				} as unknown as CursorStore,
-			},
-			(_id: string, _inv: () => void) => {},
-		);
-		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("renders single-step output inline as one compact line, framed when 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,
-				} as unknown as 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, "");
-		// edit today shows summary + diff; the ask is that single-step call already covers summary
-		// so collapsed result stays compact — this test documents current behavior does NOT duplicate
-		const result = {
-			content: [{ type: "text", text: "edited" }],
-			details: {
-				_type: "editInfo",
-				filePath: "app.py",
-				summary: "-1",
-				oldContent: "old line\n",
-				newContent: "new line\n",
-				language: "python",
-				editLine: 1,
-			},
-		};
-		const out =
-			registered
-				.renderResult?.(result, { isPartial: false }, theme, {
-					expanded: false,
-					isError: false,
-					invalidate: () => {},
-					state: {},
-				} as unknown as RenderContextLike)
-				?.getText() ?? "";
-		// collapsed/resting: diff placeholder path covered; when expanded framing should not duplicate header
-		expect(strip(out).split("\n").length).toBeGreaterThanOrEqual(1);
-	});
-
-	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);
-	});
-});
-
-describe("getEditOperations", () => {
-	it("extracts array edits", () => {
-		const ops = getEditOperations({
-			path: "f.ts",
-			edits: [{ oldText: "a", newText: "b" }],
-		});
-		expect(ops).toEqual([{ oldText: "a", newText: "b" }]);
-	});
-
-	it("filters ops where old === new", () => {
-		const ops = getEditOperations({
-			path: "f.ts",
-			edits: [{ oldText: "x", newText: "x" }],
-		});
-		expect(ops).toHaveLength(0);
-	});
-});
-
-describe("summarizeEditOperations", () => {
-	it("returns a summary string", () => {
-		const { summary } = summarizeEditOperations([{ oldText: "a\nb", newText: "c\nd\ne" }]);
-		expect(typeof summary).toBe("string");
-		expect(summary.length).toBeGreaterThan(0);
-	});
-});