@xynogen/pix-edit 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-edit",
-	"version": "0.2.1",
+	"version": "0.2.3",
 	"description": "Pi tool — precise text replacement edit with diff rendering",
 	"type": "module",
 	"main": "src/index.ts",
@@ -38,7 +38,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.test.ts

@@ -16,6 +16,10 @@ class MockTextComponent {
 	getText() {
 		return this.text;
 	}
+	render(_width: number) {
+		return this.text.split("\n");
+	}
+	invalidate() {}
 }
 
 describe("registerEditTool", () => {
@@ -76,7 +80,7 @@ describe("registerEditTool", () => {
 			() => {},
 		);
 		const theme: ThemeLike = {
-			fg: (_key: string, value: string) => value,
+			fg: (key: string, value: string) => `[${key}]${value}[/${key}]`,
 			bold: (value: string) => value,
 		};
 		const result = registered.renderResult?.(
@@ -102,8 +106,10 @@ describe("registerEditTool", () => {
 			} as unknown as RenderContextLike,
 		);
 
-		expect(result?.getText()).toContain("rendering diff");
-		expect(result?.getText()).not.toContain("✓ edit");
+		const lines = result?.render(80) ?? [];
+		expect(lines[0]).toBe(`[success]${"─".repeat(80)}[/success]`);
+		expect(lines.join("\n")).toContain("rendering diff");
+		expect(lines.join("\n")).not.toContain("✓ edit");
 	});
 
 	it("renders single-step output inline as one compact line, framed when expanded", () => {
@@ -183,7 +189,7 @@ describe("registerEditTool", () => {
 			() => {},
 		);
 		const theme: ThemeLike = {
-			fg: (_key: string, value: string) => value,
+			fg: (key: string, value: string) => `[${key}]${value}[/${key}]`,
 			bold: (value: string) => value,
 		};
 		const diagnostic = "oldText was not found in sample.ts";
@@ -199,19 +205,26 @@ describe("registerEditTool", () => {
 				editLine: 0,
 			},
 		};
-		const render = (state: Record<string, unknown>, expanded = false) =>
+		const render = (state: Record<string, unknown>, expanded = false, isPartial = false) =>
 			registered
-				.renderResult?.(result, { isPartial: false }, theme, {
+				.renderResult?.(result, { isPartial }, theme, {
 					expanded,
 					isError: true,
 					invalidate: () => {},
 					state,
 				} as unknown as RenderContextLike)
-				?.getText() ?? "";
+				?.render(80) ?? [];
 
-		expect(render({ timer: 1 })).toContain(diagnostic);
-		expect(render({ collapsed: true })).toContain("✗  edit sample.ts · failed");
-		expect(render({ collapsed: true }, true)).toContain(diagnostic);
+		expect(render({ timer: 1 })[0]).toBe(`[error]${"─".repeat(80)}[/error]`);
+		expect(render({ timer: 1 }).join("\n")).toContain(diagnostic);
+		const collapsed = render({ collapsed: true }).join("\n");
+		expect(collapsed).toContain("edit");
+		expect(collapsed).toContain("sample.ts");
+		expect(collapsed).toContain("failed");
+		expect(render({ collapsed: true })[0]).not.toContain("────");
+		expect(render({ collapsed: true }, true).join("\n")).toContain(diagnostic);
+		expect(render({ collapsed: true }, true)[0]).toContain("[error]────");
+		expect(render({}, false, true)[0]).not.toContain("[error]────");
 	});
 });
 

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";
 
@@ -133,6 +135,7 @@ export function registerEditTool(
 			try {
 				result = (await origEdit.execute(
 					tid,
+					// SAFETY: EditParams preserves the built-in edit schema and only adds legacy aliases.
 					params as unknown as Parameters<typeof origEdit.execute>[1],
 					sig,
 					upd,
@@ -202,7 +205,7 @@ export function registerEditTool(
 				)
 			)
 				return text;
-			const hdr = `${theme.fg("toolTitle", theme.bold("edit"))} ${theme.fg("muted", sp(fp))}`;
+			const hdr = `${theme.fg("toolTitle", theme.bold("edit"))} ${theme.fg("dim", sp(fp))}`;
 
 			if (operations.length === 0) {
 				text.setText(fillToolBackground(hdr));
@@ -211,7 +214,7 @@ export function registerEditTool(
 
 			const { summary } = summarizeEditOperations(operations);
 			const coloredSummary = renderDiffSummary(summary, theme);
-			const paint = (s: string) => theme.fg("dim", s);
+			const paint = (s: string) => theme.fg("muted", s);
 			const suffix = dotJoin(
 				[
 					hdr,
@@ -231,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
@@ -270,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
@@ -301,7 +305,7 @@ export function registerEditTool(
 						});
 				}
 				text.setText(renderCtx.state._edt ?? `  ${d.summary}`);
-				return text;
+				return isPartial ? text : completed();
 			}
 
 			// Multi-edit — stacked diffs
@@ -339,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();
 		},
 	});
 }