@xynogen/pix-edit 0.1.12 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-edit",
-	"version": "0.1.12",
+	"version": "0.1.14",
 	"description": "Pi tool — precise text replacement edit with diff rendering",
 	"type": "module",
 	"main": "src/index.ts",
@@ -34,7 +34,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@xynogen/pix-pretty": "^1.7.9",
+		"@xynogen/pix-pretty": "^1.7.20",
 		"@xynogen/pix-data": "^0.3.0"
 	},
 	"peerDependencies": {

package/src/edit.test.ts

@@ -1,11 +1,7 @@
 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 {
-	getEditOperations,
-	registerEditTool,
-	summarizeEditOperations,
-} from "./edit";
+import { getEditOperations, registerEditTool, summarizeEditOperations } from "./edit";
 
 class MockTextComponent {
 	private text = "";
@@ -72,9 +68,7 @@ describe("getEditOperations", () => {
 
 describe("summarizeEditOperations", () => {
 	it("returns a summary string", () => {
-		const { summary } = summarizeEditOperations([
-			{ oldText: "a\nb", newText: "c\nd\ne" },
-		]);
+		const { summary } = summarizeEditOperations([{ oldText: "a\nb", newText: "c\nd\ne" }]);
 		expect(typeof summary).toBe("string");
 		expect(summary.length).toBeGreaterThan(0);
 	});

package/src/edit.ts

@@ -30,7 +30,9 @@ import type {
 import {
 	fillToolBackground,
 	getTextContent,
+	hideCollapsedToolCall,
 	isTextContent,
+	renderCollapsedToolRow,
 	renderToolError,
 	setResultDetails,
 	termW,
@@ -167,14 +169,16 @@ export function registerEditTool(
 			return result;
 		},
 
-		renderCall(
-			args: EditParams,
-			theme: ThemeLike,
-			renderCtx: RenderContextLike<EditRenderState>,
-		) {
+		renderCall(args: EditParams, theme: ThemeLike, renderCtx: RenderContextLike<EditRenderState>) {
 			const fp = args?.path ?? args?.file_path ?? "";
 			const operations = getEditOperations(args);
 			const text = renderCtx.lastComponent ?? new TextComponent("", 0, 0);
+			if (
+				hideCollapsedToolCall(renderCtx.state as CollapseState, renderCtx.expanded, (value) =>
+					text.setText(value),
+				)
+			)
+				return text;
 			const hdr = `${theme.fg("toolTitle", theme.bold("edit"))} ${theme.fg("accent", sp(fp))}`;
 
 			if (operations.length === 0) {
@@ -183,10 +187,7 @@ export function registerEditTool(
 			}
 
 			const { summary } = summarizeEditOperations(operations);
-			const suffix =
-				operations.length === 1
-					? summary
-					: `${operations.length} edits ${summary}`;
+			const suffix = operations.length === 1 ? summary : `${operations.length} edits ${summary}`;
 			text.setText(fillToolBackground(`${hdr}  ${theme.fg("muted", suffix)}`));
 			return text;
 		},
@@ -211,23 +212,26 @@ export function registerEditTool(
 					d?._type === "editInfo"
 						? (d.summary as string)
 						: d?._type === "multiEditInfo"
-							? `${d.editCount} edits ${d.summary}`
+							? `${d.editCount} edits · ${d.summary}`
 							: "edited";
-				text.setText(fillToolBackground(`  ${theme.fg("muted", summary)}`));
+				let filePath = "";
+				if (d?._type === "editInfo") filePath = String(d.filePath ?? "");
+				else if (d?._type === "multiEditInfo") {
+					const ops = d.ops as Array<Record<string, unknown>> | undefined;
+					filePath = String(ops?.[0]?.filePath ?? "");
+				}
+				text.setText(renderCollapsedToolRow(theme, "edit", sp(filePath), summary));
 				return text;
 			}
 
 			// Single edit — full split diff
 			if (d?._type === "editInfo") {
 				const key = `ed:${diffThemeCacheKey(theme)}:${termW()}:${d.summary}:${(d.oldContent as string).length}:${(d.newContent as string).length}:${d.language ?? ""}`;
-				if (renderCtx.toolCallId)
-					trackInvalidator(renderCtx.toolCallId, renderCtx.invalidate);
+				if (renderCtx.toolCallId) trackInvalidator(renderCtx.toolCallId, renderCtx.invalidate);
 				if (renderCtx.state._edk !== key) {
 					renderCtx.state._edk = key;
 					const loc =
-						(d.editLine as number) > 0
-							? ` ${theme.fg("muted", `at line ${d.editLine}`)}`
-							: "";
+						(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 dc = resolveDiffColors(theme);
 					const diff = parseDiff(
@@ -236,18 +240,11 @@ export function registerEditTool(
 						3,
 						d.editLine as number,
 					);
-					renderSplit(
-						diff,
-						d.language as string | undefined,
-						MAX_RENDER_LINES,
-						dc,
-					)
+					renderSplit(diff, d.language as string | undefined, MAX_RENDER_LINES, dc)
 						.then((rendered) => {
 							if (renderCtx.state._edk !== key) return;
 							const loc2 =
-								(d.editLine as number) > 0
-									? ` ${theme.fg("muted", `at line ${d.editLine}`)}`
-									: "";
+								(d.editLine as number) > 0 ? ` ${theme.fg("muted", `at line ${d.editLine}`)}` : "";
 							renderCtx.state._edt = `  ${d.summary}${loc2}\n${rendered}`;
 							renderCtx.invalidate();
 						})
@@ -264,8 +261,7 @@ export function registerEditTool(
 			// Multi-edit — stacked diffs
 			if (d?._type === "multiEditInfo") {
 				const key = `med:${diffThemeCacheKey(theme)}:${termW()}:${d.summary}:${d.editCount}:${d.diffLineCount}`;
-				if (renderCtx.toolCallId)
-					trackInvalidator(renderCtx.toolCallId, renderCtx.invalidate);
+				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…")}`;
@@ -279,12 +275,7 @@ export function registerEditTool(
 								editLine?: number;
 							}>
 						).map((op) => {
-							const diff = parseDiff(
-								op.oldContent,
-								op.newContent,
-								3,
-								op.editLine ?? 0,
-							);
+							const diff = parseDiff(op.oldContent, op.newContent, 3, op.editLine ?? 0);
 							return renderSplit(diff, op.language, MAX_RENDER_LINES, dc);
 						}),
 					)
@@ -300,20 +291,13 @@ export function registerEditTool(
 							renderCtx.invalidate();
 						});
 				}
-				text.setText(
-					renderCtx.state._edt ?? `  ${d.editCount} edits ${d.summary}`,
-				);
+				text.setText(renderCtx.state._edt ?? `  ${d.editCount} edits ${d.summary}`);
 				return text;
 			}
 
 			const fallback = result.content?.[0];
-			const fallbackText =
-				fallback && isTextContent(fallback) ? fallback.text : "edited";
-			text.setText(
-				fillToolBackground(
-					`  ${theme.fg("dim", String(fallbackText).slice(0, 120))}`,
-				),
-			);
+			const fallbackText = fallback && isTextContent(fallback) ? fallback.text : "edited";
+			text.setText(fillToolBackground(`  ${theme.fg("dim", String(fallbackText).slice(0, 120))}`));
 			return text;
 		},
 	});

package/src/extension.ts

@@ -4,15 +4,8 @@ import {
 	type EditToolInput,
 } from "@earendil-works/pi-coding-agent";
 import { CursorStore, fffState } from "@xynogen/pix-pretty/fff";
-import {
-	attachResizeListener,
-	trackInvalidator,
-} from "@xynogen/pix-pretty/resize";
-import type {
-	PiPrettyApi,
-	TextComponentCtor,
-	ToolFactory,
-} from "@xynogen/pix-pretty/types";
+import { attachResizeListener, trackInvalidator } from "@xynogen/pix-pretty/resize";
+import type { PiPrettyApi, TextComponentCtor, ToolFactory } from "@xynogen/pix-pretty/types";
 import { shortPath } from "@xynogen/pix-pretty/utils";
 import { registerEditTool } from "./edit.js";
 import { once } from "./once.ts";