@xynogen/pix-edit 0.1.6 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-edit",
-	"version": "0.1.6",
+	"version": "0.1.9",
 	"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": "*"
+		"@xynogen/pix-pretty": "^1.7.9"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-coding-agent": "*",

package/src/edit.test.ts

@@ -1,4 +1,6 @@
 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,
@@ -18,15 +20,31 @@ class MockTextComponent {
 describe("registerEditTool", () => {
 	it("registers a tool named 'edit'", () => {
 		const tools: string[] = [];
+		const mockPi: PiPrettyApi = {
+			registerTool(t: unknown) {
+				tools.push((t as { name: string }).name);
+			},
+			registerCommand() {},
+			on() {},
+		};
+
 		registerEditTool(
-			{ registerTool: (t: any) => tools.push(t.name) } as any,
-			() => ({ execute: async () => ({ content: [] }) }) as any,
+			mockPi,
+			() => ({ execute: async () => ({ content: [], details: undefined }) }),
 			{
 				cwd: process.cwd(),
 				sp: (p: string) => p,
-				TextComponent: MockTextComponent as any,
-				fffState: {} as any,
-				cursorStore: {} as any,
+				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) => {},
 		);
@@ -39,7 +57,7 @@ describe("getEditOperations", () => {
 		const ops = getEditOperations({
 			path: "f.ts",
 			edits: [{ oldText: "a", newText: "b" }],
-		} as any);
+		});
 		expect(ops).toEqual([{ oldText: "a", newText: "b" }]);
 	});
 
@@ -47,7 +65,7 @@ describe("getEditOperations", () => {
 		const ops = getEditOperations({
 			path: "f.ts",
 			edits: [{ oldText: "x", newText: "x" }],
-		} as any);
+		});
 		expect(ops).toHaveLength(0);
 	});
 });

package/src/edit.ts

@@ -71,6 +71,20 @@ export function getEditOperations(input: EditParams): EditOperation[] {
 	return oldText && oldText !== newText ? [{ oldText, newText }] : [];
 }
 
+// 1-based file line where `needle` begins post-edit, for absolute diff gutters.
+// 0 = file unreadable or needle not found (renderer falls back to relative).
+// Duplicate identical edits collapse to the first match — acceptable.
+function opEditLine(filePath: string, needle: string): number {
+	try {
+		if (!filePath || !existsSync(filePath)) return 0;
+		const f = readFileSync(filePath, "utf-8");
+		const idx = f.indexOf(needle);
+		return idx >= 0 ? f.slice(0, idx).split("\n").length : 0;
+	} catch {
+		return 0;
+	}
+}
+
 export function summarizeEditOperations(operations: EditOperation[]) {
 	const diffs = operations.map((e) => parseDiff(e.oldText, e.newText));
 	const totalAdded = diffs.reduce((sum, d) => sum + d.added, 0);
@@ -122,20 +136,10 @@ export function registerEditTool(
 			const { diffs, summary } = summarizeEditOperations(operations);
 
 			if (operations.length === 1) {
-				let editLine = 0;
-				try {
-					if (fp && existsSync(fp)) {
-						const f = readFileSync(fp, "utf-8");
-						const idx = f.indexOf(operations[0].newText);
-						if (idx >= 0) editLine = f.slice(0, idx).split("\n").length;
-					}
-				} catch {
-					editLine = 0;
-				}
 				setResultDetails(result, {
 					_type: "editInfo",
 					summary,
-					editLine,
+					editLine: opEditLine(fp, operations[0].newText),
 					oldContent: operations[0].oldText,
 					newContent: operations[0].newText,
 					language: fileLang,
@@ -154,6 +158,7 @@ export function registerEditTool(
 					newContent: op.newText,
 					language: fileLang,
 					filePath: fp,
+					editLine: opEditLine(fp, op.newText),
 				})),
 			});
 			return result;
@@ -212,6 +217,8 @@ export function registerEditTool(
 					const diff = parseDiff(
 						d.oldContent as string,
 						d.newContent as string,
+						3,
+						d.editLine as number,
 					);
 					renderSplit(
 						diff,
@@ -253,9 +260,15 @@ export function registerEditTool(
 								oldContent: string;
 								newContent: string;
 								language?: string;
+								editLine?: number;
 							}>
 						).map((op) => {
-							const diff = parseDiff(op.oldContent, op.newContent);
+							const diff = parseDiff(
+								op.oldContent,
+								op.newContent,
+								3,
+								op.editLine ?? 0,
+							);
 							return renderSplit(diff, op.language, MAX_RENDER_LINES, dc);
 						}),
 					)

package/src/once.ts

@@ -14,7 +14,8 @@
  */
 export function once(pi: object, key: string, fn: () => void): void {
 	const g = globalThis as { __pixOnce?: WeakMap<object, Set<string>> };
-	const registry = (g.__pixOnce ??= new WeakMap<object, Set<string>>());
+	if (!g.__pixOnce) g.__pixOnce = new WeakMap<object, Set<string>>();
+	const registry = g.__pixOnce;
 	let loaded = registry.get(pi);
 	if (!loaded) {
 		loaded = new Set<string>();