@xynogen/pix-edit 0.1.15 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-edit",
-	"version": "0.1.15",
+	"version": "0.1.17",
 	"description": "Pi tool — precise text replacement edit with diff rendering",
 	"type": "module",
 	"main": "src/index.ts",
@@ -34,8 +34,8 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@xynogen/pix-pretty": "^1.7.20",
-		"@xynogen/pix-data": "^0.3.0"
+		"@xynogen/pix-pretty": "^1.7.22",
+		"@xynogen/pix-data": "^0.3.4"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-coding-agent": "*",

package/src/edit.test.ts

@@ -19,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() {},
@@ -49,7 +49,9 @@ 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", () => {

package/src/edit.ts

@@ -7,11 +7,13 @@ import type {
 } from "@earendil-works/pi-coding-agent";
 
 import { type CollapseState, tickCollapse } from "@xynogen/pix-data/collapse";
+import { resolveBaseBackground } from "@xynogen/pix-pretty/ansi";
 import { MAX_RENDER_LINES } from "@xynogen/pix-pretty/config";
 import type { ToolContext } from "@xynogen/pix-pretty/context";
 import { parseDiff } from "@xynogen/pix-pretty/diff";
 import {
 	diffThemeCacheKey,
+	renderDiffSummary,
 	renderSplit,
 	resolveDiffColors,
 	summarize,
@@ -114,6 +116,7 @@ export function registerEditTool(
 	pi.registerTool({
 		...origEdit,
 		name: "edit",
+		renderShell: "self",
 
 		async execute(
 			tid: string,
@@ -170,6 +173,7 @@ export function registerEditTool(
 		},
 
 		renderCall(args: EditParams, theme: ThemeLike, renderCtx: RenderContextLike<EditRenderState>) {
+			resolveBaseBackground(theme);
 			const fp = args?.path ?? args?.file_path ?? "";
 			const operations = getEditOperations(args);
 			const text = renderCtx.lastComponent ?? new TextComponent("", 0, 0);
@@ -187,8 +191,12 @@ export function registerEditTool(
 			}
 
 			const { summary } = summarizeEditOperations(operations);
-			const suffix = operations.length === 1 ? summary : `${operations.length} edits ${summary}`;
-			text.setText(fillToolBackground(`${hdr}  ${theme.fg("muted", suffix)}`));
+			const coloredSummary = renderDiffSummary(summary, theme);
+			const suffix =
+				operations.length === 1
+					? coloredSummary
+					: `${theme.fg("muted", `${operations.length} edits`)} ${coloredSummary}`;
+			text.setText(fillToolBackground(`${hdr}  ${suffix}`));
 			return text;
 		},
 
@@ -198,6 +206,7 @@ export function registerEditTool(
 			theme: ThemeLike,
 			renderCtx: RenderContextLike<EditRenderState>,
 		) {
+			resolveBaseBackground(theme);
 			const text = renderCtx.lastComponent ?? new TextComponent("", 0, 0);
 			const d = result.details as Record<string, unknown> | undefined;
 			const isPartial = _opt?.isPartial === true;
@@ -248,7 +257,8 @@ export function registerEditTool(
 					renderCtx.state._edk = key;
 					const loc =
 						(d.editLine as number) > 0 ? ` ${theme.fg("muted", `at line ${d.editLine}`)}` : "";
-					renderCtx.state._edt = `  ${d.summary}${loc}\n${theme.fg("muted", "  rendering diff…")}`;
+					const summary = renderDiffSummary(String(d.summary), theme);
+					renderCtx.state._edt = `  ${summary}${loc}\n${theme.fg("muted", "  rendering diff…")}`;
 					const dc = resolveDiffColors(theme);
 					const diff = parseDiff(
 						d.oldContent as string,
@@ -261,7 +271,8 @@ export function registerEditTool(
 							if (renderCtx.state._edk !== key) return;
 							const loc2 =
 								(d.editLine as number) > 0 ? ` ${theme.fg("muted", `at line ${d.editLine}`)}` : "";
-							renderCtx.state._edt = `  ${d.summary}${loc2}\n${rendered}`;
+							const summary = renderDiffSummary(String(d.summary), theme);
+							renderCtx.state._edt = `  ${summary}${loc2}\n${rendered}`;
 							renderCtx.invalidate();
 						})
 						.catch(() => {
@@ -280,7 +291,8 @@ export function registerEditTool(
 				if (renderCtx.toolCallId) trackInvalidator(renderCtx.toolCallId, renderCtx.invalidate);
 				if (renderCtx.state._edk !== key) {
 					renderCtx.state._edk = key;
-					renderCtx.state._edt = `  ${d.editCount} edits ${d.summary}\n${theme.fg("muted", "  rendering diff…")}`;
+					const summary = renderDiffSummary(String(d.summary), theme);
+					renderCtx.state._edt = `  ${theme.fg("muted", `${d.editCount} edits`)} ${summary}\n${theme.fg("muted", "  rendering diff…")}`;
 					const dc = resolveDiffColors(theme);
 					Promise.all(
 						(
@@ -298,7 +310,8 @@ export function registerEditTool(
 						.then((rendered) => {
 							if (renderCtx.state._edk !== key) return;
 							const body = rendered.join(`\n${theme.fg("muted", "  ···")}\n`);
-							renderCtx.state._edt = `  ${d.editCount} edits ${d.summary}\n${body}`;
+							const summary = renderDiffSummary(String(d.summary), theme);
+							renderCtx.state._edt = `  ${theme.fg("muted", `${d.editCount} edits`)} ${summary}\n${body}`;
 							renderCtx.invalidate();
 						})
 						.catch(() => {