pi-hashline-edit-pro 0.3.6 → 0.3.7

package/index.ts

@@ -4,6 +4,8 @@ import { join, isAbsolute } from "path";
 import { computeLineHashes, formatHashlineRegion } from "./src/hashline";
 import { registerEditTool } from "./src/edit";
 import { registerReadTool } from "./src/read";
+import { normalizeToLF } from "./src/edit-diff";
+import { getVisibleLines } from "./src/utils";
 
 export default function (pi: ExtensionAPI): void {
   registerReadTool(pi);
@@ -22,9 +24,8 @@ export default function (pi: ExtensionAPI): void {
       const content = await readFile(absolutePath, "utf-8");
 
       // Normalize and compute hashline output
-      const normalized = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-      const lines = normalized.split("\n");
-      const visibleLines = normalized.endsWith("\n") ? lines.slice(0, -1) : lines;
+		const normalized = normalizeToLF(content);
+		const visibleLines = getVisibleLines(normalized);
 
       if (visibleLines.length === 0) return;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "Strict hashline read/edit tool override for pi-coding-agent with hash-anchored edits (4-char, 24-bit)",
   "repository": {
     "type": "git",

package/src/edit-response.ts

@@ -6,6 +6,7 @@ import {
 	formatHashlineRegion,
 } from "./hashline";
 import { formatHashlineReadPreview } from "./read";
+import { getVisibleLines } from "./utils";
 
 type ToolResult = {
 	content: Array<{ type: "text"; text: string }>;
@@ -96,11 +97,6 @@ export interface SuccessResponseInput {
 
 // ─── Helpers ────────────────────────────────────────────────────────────
 
-function getVisibleLines(text: string): string[] {
-	if (text.length === 0) return [];
-	const lines = text.split("\n");
-	return text.endsWith("\n") ? lines.slice(0, -1) : lines;
-}
 
 function countDiffLines(diff: string, marker: "+" | "-"): number {
 	if (!diff) return 0;

package/src/hashline/apply.ts

@@ -6,10 +6,12 @@ import {
 	assertNoBareHashPrefixLines,
 	maybeWarnSuspiciousUnicodeEscapePlaceholder,
 	formatMismatchError,
+	describeEdit,
 	type ResolvedHashlineEdit,
 	type NoopEdit,
 	type HashlineEdit,
 } from "./resolve";
+import { countVisibleLines } from "../utils";
 
 
 type LineIndex = {
@@ -58,16 +60,6 @@ function assertDoesNotEmptyFile(originalContent: string, result: string): void {
 	}
 }
 
-function describeEdit(edit: ResolvedHashlineEdit): string {
-	switch (edit.op) {
-		case "replace":
-			return `replace ${edit.start.hash}-${edit.end.hash}`;
-		case "append":
-			return edit.pos ? `append after ${edit.pos.hash}` : "append at EOF";
-		case "prepend":
-			return edit.pos ? `prepend before ${edit.pos.hash}` : "prepend at BOF";
-	}
-}
 
 function throwEditConflict(
 	left: { index: number; label: string },
@@ -521,13 +513,6 @@ export function computeChangedLineRange(
 ): { firstChangedLine: number; lastChangedLine: number } | null {
 	if (original === result) return null;
 
-	function countVisibleLines(text: string): number {
-		if (text.length === 0) {
-			return 0;
-		}
-		const lines = text.split("\n");
-		return text.endsWith("\n") ? lines.length - 1 : lines.length;
-	}
 
 	if (original.length === 0) {
 		return {

package/src/hashline/index.ts

@@ -26,6 +26,7 @@ export {
 	type ResolvedHashlineEdit,
 	type HashlineToolEdit,
 	type NoopEdit,
+	describeEdit,
 	resolveEditAnchors,
 	validateAnchorEdits,
 	assertNoBareHashPrefixLines,

package/src/hashline/resolve.ts

@@ -303,6 +303,21 @@ export function assertNoBareHashPrefixLines(
 	);
 }
 
+
+/**
+ * Human-readable label for a resolved edit (used in warnings and conflict errors).
+ */
+export function describeEdit(edit: ResolvedHashlineEdit): string {
+	switch (edit.op) {
+		case "replace":
+			return `replace ${edit.start.hash}-${edit.end.hash}`;
+		case "append":
+			return edit.pos ? `append after ${edit.pos.hash}` : "append at EOF";
+		case "prepend":
+			return edit.pos ? `prepend before ${edit.pos.hash}` : "prepend at BOF";
+	}
+}
+
 export function validateAnchorEdits(
 	edits: HashlineEdit[],
 	fileLines: string[],
@@ -327,16 +342,6 @@ export function validateAnchorEdits(
 		return result;
 	};
 
-	function describeEdit(edit: ResolvedHashlineEdit): string {
-		switch (edit.op) {
-			case "replace":
-				return `replace ${edit.start.hash}-${edit.end.hash}`;
-			case "append":
-				return edit.pos ? `append after ${edit.pos.hash}` : "append at EOF";
-			case "prepend":
-				return edit.pos ? `prepend before ${edit.pos.hash}` : "prepend at BOF";
-		}
-	}
 
 	for (const edit of edits) {
 		throwIfAborted(signal);

package/src/read.ts

@@ -17,6 +17,7 @@ import { computeLineHashes, formatHashlineRegion } from "./hashline";
 import { resolveToCwd } from "./path-utils";
 import { throwIfAborted } from "./runtime";
 import { getFileSnapshot } from "./snapshot";
+import { getVisibleLines } from "./utils";
 
 const READ_DESC = readFileSync(
 	new URL("../prompts/read.md", import.meta.url),
@@ -55,21 +56,13 @@ function normalizePositiveInteger(
 	return value;
 }
 
-function getPreviewLines(text: string): string[] {
-	if (text.length === 0) {
-		return [];
-	}
-
-	const lines = text.split("\n");
-	return text.endsWith("\n") ? lines.slice(0, -1) : lines;
-}
 
 export function formatHashlineReadPreview(
 	text: string,
 	options: { offset?: number; limit?: number },
 	precomputedHashes?: string[],
 ): { text: string; truncation?: TruncationResult; nextOffset?: number } {
-	const allLines = getPreviewLines(text);
+	const allLines = getVisibleLines(text);
 	const totalLines = allLines.length;
 	const startLine = normalizePositiveInteger(options.offset, "offset") ?? 1;
 	if (totalLines === 0) {

package/src/utils.ts

@@ -9,3 +9,19 @@ export function isRecord(value: unknown): value is Record<string, unknown> {
 export function hasOwn(record: Record<string, unknown>, key: string): boolean {
 	return Object.hasOwn(record, key);
 }
+
+/**
+ * Return the visible lines of a text (excluding the terminal-newline sentinel).
+ */
+export function getVisibleLines(text: string): string[] {
+	if (text.length === 0) return [];
+	const lines = text.split("\n");
+	return text.endsWith("\n") ? lines.slice(0, -1) : lines;
+}
+
+/**
+ * Count the visible lines of a text (excluding the terminal-newline sentinel).
+ */
+export function countVisibleLines(text: string): number {
+	return getVisibleLines(text).length;
+}