pi-hashline-edit-pro 0.2.0

package/src/edit-normalize.ts

@@ -0,0 +1,68 @@
+/**
+ * Single normalization layer that maps the dialects a model may emit onto the
+ * canonical hashline edit request before validation runs.
+ *
+ * The only dialect we still absorb is the `file_path` → `path` alias and the
+ * JSON-stringified `edits` array. Pi's native legacy `oldText`/`newText`
+ * shape (whether top-level or as `op: "replace_text"`) is no longer
+ * supported: the hashline protocol requires hash-anchored edits, and the
+ * legacy text-matching path is what produces the
+ * `[E_NO_MATCH] replace_text found no exact unique match` failure mode the
+ * model hits on whitespace/Unicode drift. Any model that still emits the
+ * legacy shape is rejected with a clear error in `assertEditItem` /
+ * `assertEditRequest` so it learns the correct shape on the next turn.
+ *
+ * This runs as the tool's `prepareArguments` hook, which Pi executes before AJV
+ * schema validation and before `execute()`. The output is plain enumerable data
+ * (an `edits` array), so Pi's `structuredClone` of prepareArguments output keeps
+ * every field.
+ */
+
+import { isRecord, hasOwn } from "./utils";
+
+/**
+ * Parse `edits` when a model serializes it as a JSON string instead of an array
+ * (observed with some models, mirrors Pi's built-in edit handling).
+ */
+function coerceEditsArray(edits: unknown): unknown {
+	if (typeof edits !== "string") {
+		return edits;
+	}
+	try {
+		const parsed: unknown = JSON.parse(edits);
+		return Array.isArray(parsed) ? parsed : edits;
+	} catch {
+		return edits;
+	}
+}
+
+
+/**
+ * Normalize a raw edit-tool request into the canonical hashline shape.
+ *
+ * Returns the input unchanged when it is not an object, so malformed payloads
+ * still reach validation and surface a precise error there.
+ */
+export function normalizeEditRequest(input: unknown): unknown {
+	if (!isRecord(input)) {
+		return input;
+	}
+
+	const record: Record<string, unknown> = { ...input };
+
+	// file_path → path alias.
+	if (typeof record.path !== "string" && typeof record.file_path === "string") {
+		record.path = record.file_path;
+		delete record.file_path;
+	}
+
+	const hasEditsField = hasOwn(record, "edits");
+
+	// edits-as-JSON-string → array.
+	if (hasEditsField) {
+		record.edits = coerceEditsArray(record.edits);
+	}
+
+	return record;
+}
+

package/src/edit-render.ts

@@ -0,0 +1,280 @@
+/**
+ * TUI rendering helpers for the edit tool.
+ *
+ * Extracted from `src/edit.ts` to separate presentation (color themes, diff
+ * formatting, Markdown rendering) from tool execution logic.
+ */
+
+import type { Theme } from "@earendil-works/pi-coding-agent";
+import { normalizeEditRequest } from "./edit-normalize";
+import type { EditRequestParams, HashlineEditToolDetails } from "./edit";
+import { isRecord } from "./utils";
+
+// ─── Theme type aliases ─────────────────────────────────────────────────
+
+export type FgTheme = Pick<Theme, "fg">;
+export type CallTheme = Pick<Theme, "fg" | "bold">;
+export type RenderedMarkdownTheme = Pick<
+	Theme,
+	"fg" | "bold" | "italic" | "underline" | "strikethrough"
+>;
+
+// ─── Render state ───────────────────────────────────────────────────────
+
+export type EditPreview = { diff: string } | { error: string };
+
+export type EditRenderState = {
+	argsKey?: string;
+	preview?: EditPreview;
+	previewGeneration?: number;
+};
+
+// ─── Preview input extraction ───────────────────────────────────────────
+
+
+export function getRenderablePreviewInput(
+	args: unknown,
+): EditRequestParams | null {
+	let normalized: unknown;
+	try {
+		normalized = normalizeEditRequest(args);
+	} catch {
+		return null;
+	}
+	if (!isRecord(normalized) || typeof normalized.path !== "string") {
+		return null;
+	}
+
+	const request: EditRequestParams = { path: normalized.path };
+	if (Array.isArray(normalized.edits)) {
+		request.edits = normalized.edits as any;
+	}
+
+	return request.edits !== undefined ? request : null;
+}
+
+// ─── Diff formatting ────────────────────────────────────────────────────
+
+export function colorDiffLines(lines: string[], theme: FgTheme): string[] {
+	return lines.map((line) => {
+		if (line.startsWith("+") && !line.startsWith("+++")) {
+			return theme.fg("success", line);
+		}
+		if (line.startsWith("-") && !line.startsWith("---")) {
+			return theme.fg("error", line);
+		}
+		return theme.fg("dim", line);
+	});
+}
+
+export function formatPreviewDiff(
+	diff: string,
+	expanded: boolean,
+	theme: FgTheme,
+): string {
+	const lines = diff.split("\n");
+	const maxLines = expanded ? 40 : 16;
+	const shown = colorDiffLines(lines.slice(0, maxLines), theme);
+
+	if (lines.length > maxLines) {
+		shown.push(
+			theme.fg("muted", `... ${lines.length - maxLines} more diff lines`),
+		);
+	}
+	return shown.join("\n");
+}
+
+export function formatResultDiff(diff: string, theme: FgTheme): string {
+	return colorDiffLines(diff.split("\n"), theme).join("\n");
+}
+
+// ─── Edit call formatting ───────────────────────────────────────────────
+
+export function formatEditCall(
+	args: EditRequestParams | undefined,
+	state: EditRenderState,
+	expanded: boolean,
+	theme: CallTheme,
+): string {
+	const path = args?.path;
+	const pathDisplay =
+		typeof path === "string" && path.length > 0
+			? theme.fg("accent", path)
+			: theme.fg("toolOutput", "...");
+	let text = `${theme.fg("toolTitle", theme.bold("edit"))} ${pathDisplay}`;
+
+	if (!state.preview) {
+		return text;
+	}
+
+	if ("error" in state.preview) {
+		text += `\n\n${theme.fg("error", state.preview.error)}`;
+		return text;
+	}
+
+	if (state.preview.diff) {
+		text += `\n\n${formatPreviewDiff(state.preview.diff, expanded, theme)}`;
+	}
+	return text;
+}
+
+// ─── Result text extraction ─────────────────────────────────────────────
+
+export function getRenderedEditTextContent(result: {
+	content?: Array<{ type: string; text?: string }>;
+}): string | undefined {
+	const textContent = result.content?.find(
+		(entry): entry is { type: "text"; text: string } =>
+			entry.type === "text" && typeof entry.text === "string",
+	);
+	return textContent?.text;
+}
+
+export function extractRenderedWarnings(
+	text: string | undefined,
+): string | undefined {
+	return text?.match(/(?:^|\n)Warnings:\n[\s\S]*$/)?.[0]?.trimStart();
+}
+
+// ─── Result classification ──────────────────────────────────────────────
+
+export function isAppliedChangedResult(
+	details: HashlineEditToolDetails | undefined,
+): boolean {
+	const metrics = details?.metrics;
+	return (
+		metrics?.classification === "applied" &&
+		metrics.return_mode === "changed" &&
+		metrics.added_lines !== undefined &&
+		metrics.removed_lines !== undefined
+	);
+}
+
+export function buildAppliedChangedResultText(
+	text: string | undefined,
+	details: HashlineEditToolDetails | undefined,
+	preview: EditPreview | undefined,
+	theme: FgTheme,
+): string | undefined {
+	const previewDiff =
+		preview && !("error" in preview) ? preview.diff : undefined;
+	const sections: string[] = [];
+
+	if (details?.diff && details.diff !== previewDiff) {
+		sections.push(formatResultDiff(details.diff, theme));
+	}
+
+	const warnings = extractRenderedWarnings(text);
+	if (warnings) sections.push(warnings);
+
+	return sections.length > 0 ? sections.join("\n\n") : undefined;
+}
+
+// ─── Markdown rendering ─────────────────────────────────────────────────
+
+function trimEdgeEmptyLines(lines: string[]): string[] {
+	let start = 0;
+	let end = lines.length;
+
+	while (start < end && lines[start] === "") {
+		start++;
+	}
+	while (end > start && lines[end - 1] === "") {
+		end--;
+	}
+
+	return lines.slice(start, end);
+}
+
+function isRenderedEditSectionBoundary(line: string): boolean {
+	return (
+		line === "--- Anchors ---" ||
+		line === "Warnings:" ||
+		line === "Structure outline:" ||
+		/^--- Range \d+ ---$/.test(line)
+	);
+}
+
+export function formatRenderedEditResultMarkdown(text: string): string {
+	const lines = text.split("\n");
+	const sections: string[] = [];
+	let plainLines: string[] = [];
+
+	const flushPlainLines = () => {
+		const trimmed = trimEdgeEmptyLines(plainLines);
+		if (trimmed.length > 0) {
+			sections.push(trimmed.join("\n"));
+		}
+		plainLines = [];
+	};
+
+	let index = 0;
+	while (index < lines.length) {
+		const line = lines[index]!;
+
+		if (line.startsWith("--- Anchors ")) {
+			flushPlainLines();
+			const title = line.replace(/^---\s*/, "").replace(/\s*---$/, "");
+			index++;
+			const bodyLines: string[] = [];
+			while (
+				index < lines.length &&
+				!isRenderedEditSectionBoundary(lines[index]!)
+			) {
+				bodyLines.push(lines[index]!);
+				index++;
+			}
+			sections.push(
+				[
+					`#### ${title}`,
+					"```text",
+					...trimEdgeEmptyLines(bodyLines),
+					"```",
+				].join("\n"),
+			);
+			continue;
+		}
+
+		plainLines.push(line);
+		index++;
+	}
+
+	flushPlainLines();
+
+	return sections.join("\n\n");
+}
+
+export function createRenderedEditMarkdownTheme(theme: RenderedMarkdownTheme) {
+	return {
+		heading: (text: string) => theme.fg("mdHeading", text),
+		link: (text: string) => theme.fg("mdLink", text),
+		linkUrl: (text: string) => theme.fg("mdLinkUrl", text),
+		code: (text: string) => theme.fg("mdCode", text),
+		codeBlock: (text: string) => theme.fg("mdCodeBlock", text),
+		codeBlockBorder: (text: string) => theme.fg("mdCodeBlockBorder", text),
+		quote: (text: string) => theme.fg("mdQuote", text),
+		quoteBorder: (text: string) => theme.fg("mdQuoteBorder", text),
+		hr: (text: string) => theme.fg("mdHr", text),
+		listBullet: (text: string) => theme.fg("mdListBullet", text),
+		bold: (text: string) => theme.bold(text),
+		italic: (text: string) => (theme.italic ? theme.italic(text) : text),
+		underline: (text: string) =>
+			theme.underline ? theme.underline(text) : text,
+		strikethrough: (text: string) =>
+			theme.strikethrough ? theme.strikethrough(text) : text,
+		highlightCode: (code: string, lang?: string) =>
+			code.split("\n").map((line) => {
+				if (lang === "diff") {
+					if (line.startsWith("+") && !line.startsWith("+++")) {
+						return theme.fg("toolDiffAdded", line);
+					}
+					if (line.startsWith("-") && !line.startsWith("---")) {
+						return theme.fg("toolDiffRemoved", line);
+					}
+					return theme.fg("toolDiffContext", line);
+				}
+
+				return theme.fg("mdCodeBlock", line);
+			}),
+	};
+}