@pi-archimedes/diff 2.2.0 → 2.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-archimedes/diff",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "type": "module",
   "keywords": [
     "pi-package"
@@ -24,6 +24,8 @@
     "@earendil-works/pi-tui": ">=0.1.0"
   },
   "devDependencies": {
+    "@earendil-works/pi-coding-agent": "^0.84.2",
+    "@earendil-works/pi-tui": "^0.84.2",
     "@types/diff": "^7.0.2",
     "typescript": "^6.0.0"
   },

package/src/ansi/codes.ts

@@ -7,6 +7,7 @@ import { deriveBgFromTheme } from "./colors.js";
 // ---------------------------------------------------------------------------
 
 export const RST = "\x1b[0m";
+export const FG_RST = "\x1b[39m"; // reset foreground only — safe inside background-painted lines
 export const BOLD = "\x1b[1m";
 export const DIM = "\x1b[2m";
 

package/src/ansi/index.ts

@@ -1,7 +1,7 @@
 /** ANSI utilities — barrel re-export. */
 
 export {
-	RST, BOLD, DIM,
+	RST, FG_RST, BOLD, DIM,
 	FG_ADD, FG_DEL, FG_DIM, FG_LNUM, FG_RULE, FG_SAFE_MUTED, FG_STRIPE,
 	BORDER_BAR,
 	DEFAULT_DIFF_BG,

package/src/ansi/manip.ts

@@ -109,7 +109,7 @@ export function shortPath(cwd: string, home: string, p: string): string {
 /** Summarize added/removed counts as colored `+N -M` string. */
 export function summarize(a: number, d: number): string {
 	const p: string[] = [];
-	if (a > 0) p.push(`${C.FG_ADD}+${a}${C.RST}`);
-	if (d > 0) p.push(`${C.FG_DEL}-${d}${C.RST}`);
-	return p.length ? p.join(" ") : `${C.FG_DIM}no changes${C.RST}`;
+	if (a > 0) p.push(`${C.FG_ADD}+${a}${C.FG_RST}`);
+	if (d > 0) p.push(`${C.FG_DEL}-${d}${C.FG_RST}`);
+	return p.length ? p.join(" ") : `${C.FG_DIM}no changes${C.FG_RST}`;
 }

package/src/default-export.test.ts

@@ -0,0 +1,24 @@
+import { describe, expect, it, vi } from "vitest";
+import defaultExport from "./index.js";
+
+describe("diff default export (standalone factory)", () => {
+	it("is a function that registers diff tools on session_start with a per-session theme", () => {
+		expect(typeof defaultExport).toBe("function");
+
+		const on = vi.fn();
+		const registerTool = vi.fn();
+		const pi = { on, registerTool } as any;
+
+		defaultExport(pi);
+
+		const startHandler = on.mock.calls.find((c: Array<unknown>) => c[0] === "session_start")?.[1];
+		expect(typeof startHandler).toBe("function");
+
+		// Mirror of meta's wiring: registerDiffTools(pi, getTheme, readConfig)
+		// runs per session with the session's ctx.theme.
+		startHandler!({}, { ui: { theme: {} } });
+
+		// write/edit tool overrides registered when the SDK loaded
+		expect(registerTool).toHaveBeenCalled();
+	});
+});

package/src/index.ts

@@ -4,7 +4,7 @@
  * Adapted from pi-ui-hephaestus diff renderer.
  */
 
-import type { ExtensionAPI, Theme } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import type { SettingItem } from "@earendil-works/pi-tui";
 
 import { setConfigGetter as setShikiConfig } from "./shiki.js";
@@ -122,3 +122,15 @@ export function registerDiffTools(
 	// Register edit tool override
 	registerEditTool(pi, cwd, home, _sdk.createEditTool);
 }
+
+// ── Default export (for standalone pi.extensions loading) ─────────────────
+
+// Diff tools need a per-session theme, so registration runs on session_start
+// (mirroring meta's wiring: registerDiffTools with a theme getter + config
+// reader). Meta supplies a settings-backed config loader; standalone uses the
+// package defaults.
+export default function (pi: ExtensionAPI): void {
+	pi.on("session_start", (_event, ctx: ExtensionContext) => {
+		registerDiffTools(pi, () => ctx.ui.theme, () => DEFAULT_DIFF_CONFIG);
+	});
+}

package/src/tools/edit.ts

@@ -143,28 +143,48 @@ export function registerEditTool(
 		renderResult(result: any, _opt: any, theme: any, ctx: any) {
 			// Update the call Box background to reflect final state.
 			const box = ctx.state.callBox as Box | undefined;
-			if (box) {
-				const bgKey = ctx.isError ? "toolErrorBg" : "toolSuccessBg";
-				box.setBgFn((s: string) => theme.bg(bgKey, s));
-			}
-			// Show summary below the diff
+			const bgKey = ctx.isError ? "toolErrorBg" : "toolSuccessBg";
+			if (box) box.setBgFn((s: string) => theme.bg(bgKey, s));
+
+			// Build the line to show below the diff.
+			let line: string;
 			if (ctx.isError) {
 				const e = result.content
 					?.filter((c: any) => c.type === "text")
 					.map((c: any) => c.text || "")
 					.join("\n") ?? "Error";
-				return new Text(`\n${theme.fg("error", e)}`, 1, 0);
-			}
-			if (result.details?._type === "editInfo") {
+				line = theme.fg("error", e);
+			} else if (result.details?._type === "editInfo") {
 				const { summary: s, editLine } = result.details;
 				const loc = editLine > 0 ? ` ${theme.fg("muted", `at line ${editLine}`)}` : "";
-				return new Text(`  ${s}${loc}`, 1, 0);
-			}
-			if (result.details?._type === "multiEditInfo") {
+				line = `${s}${loc}`;
+			} else if (result.details?._type === "multiEditInfo") {
 				const { summary: s, editCount, diffLineCount } = result.details;
-				return new Text(`  ${editCount} edits ${s}${typeof diffLineCount === "number" ? ` ${theme.fg("muted", `(${diffLineCount} diff lines)`)}` : ""}`, 1, 0);
+				line = `${editCount} edits ${s}${typeof diffLineCount === "number" ? ` ${theme.fg("muted", `(${diffLineCount} diff lines)`)}` : ""}`;
+			} else {
+				return new Text("", 0, 0);
+			}
+
+			// Render inside the call Box so the line sits on the tool background —
+			// a sibling Text would fall through to the raw terminal background.
+			// Escape sequences terminating with a full \x1b[0m reset would kill the
+			// Box-painted background mid-line, so downgrade them to fg-only resets.
+			// Guard against re-adding on every updateDisplay() pass. Must return
+			// an EMPTY Text (pi re-adds the returned component as a sibling —
+			// returning the attached Text would render the line twice).
+			const safeLine = line.replace(/\x1b\[0m/g, Ansi.FG_RST);
+			const key = `${bgKey}|${safeLine}`;
+			const prev = ctx.state._resText as Text | undefined;
+			const empty = new Text("", 0, 0);
+			if (prev && ctx.state._resKey === key && box && box.children.includes(prev)) return empty;
+			const t = new Text(safeLine, 0, 0);
+			if (box) {
+				if (prev) box.removeChild(prev);
+				box.addChild(t);
 			}
-			return new Text("", 0, 0);
+			ctx.state._resText = t;
+			ctx.state._resKey = key;
+			return box ? empty : t;
 		},
 	});
 }