@xynogen/pix-edit 0.1.16 → 0.1.18

package/package.json

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

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,
@@ -171,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);
@@ -188,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;
 		},
 
@@ -199,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;
@@ -249,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,
@@ -262,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(() => {
@@ -281,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(
 						(
@@ -299,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(() => {

package/src/extension.ts

@@ -7,8 +7,8 @@ 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 { shortPath } from "@xynogen/pix-pretty/utils";
+import { once } from "@xynogen/pix-runtime/once";
 import { registerEditTool } from "./edit.js";
-import { once } from "./once.ts";
 
 export default function pixEditExtension(pi: PiPrettyApi): void {
 	once(pi, "pix-edit", () => {

package/src/once.ts

@@ -1,27 +0,0 @@
-/**
- * Per-instance idempotency guard for extension activation.
- *
- * pix-core (the meta-package) invokes this package's factory, and a standalone
- * install makes Pi invoke it again — sometimes against the SAME `pi`. We must
- * dedupe that. But Pi rebuilds the extension runtime on /new, /resume, /fork,
- * and /reload, handing the factory a BRAND-NEW `pi`; that must re-register.
- *
- * Keying the registry on the `pi` instance satisfies both: same instance =>
- * skip, new instance => run. The registry lives on globalThis because jiti
- * (`moduleCache: false`) re-evaluates this module on every load pass, so a
- * module-scoped WeakMap would not be shared between the aggregator pass and the
- * standalone pass within a single session.
- */
-export function once(pi: object, key: string, fn: () => void): void {
-	const g = globalThis as { __pixOnce?: 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>();
-		registry.set(pi, loaded);
-	}
-	if (loaded.has(key)) return;
-	loaded.add(key);
-	fn();
-}