pi-hashline-edit-pro 0.9.7 → 0.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "0.9.7",
+  "version": "0.10.0",
   "description": "Strict hashline read/replace tool for pi-coding-agent with hash-anchored edits (3-char, 18-bit, perfect hashing)",
   "main": "index.ts",
   "repository": {
@@ -41,11 +41,13 @@
   },
   "scripts": {
     "test": "vitest run",
-    "test:watch": "vitest"
+    "test:watch": "vitest",
+    "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
     "@earendil-works/pi-coding-agent": "^0.74.0",
     "@types/node": "^22.0.0",
-    "vitest": "^4.1.8"
+    "vitest": "^4.1.8",
+    "typescript": "^5.8.0"
   }
 }

package/prompts/replace.md

@@ -48,6 +48,32 @@ Examples:
 ] }
 ```
 
+⚠️ Common mistake: do not copy the `HASH│` prefix into `new_lines`.
+
+Wrong:
+```json
+{ "old_range": ["F4T", "F4T"], "new_lines": ["F4T│import { x } from \"./x\";"] }
+```
+
+Right:
+```json
+{ "old_range": ["F4T", "F4T"], "new_lines": ["import { x } from \"./x\";"] }
+```
+
+`old_range` uses the hash anchor. `new_lines` uses literal file content only — the same text that appears after the `│` in `read` output.
+
+⚠️ Common mistake: `old_range` is only the 3-character HASH, not the full `HASH│content` line.
+
+Wrong:
+```json
+{ "old_range": ["F4T│import { x } from \"./x\";", "F4T│import { x } from \"./x\";"], "new_lines": [...] }
+```
+
+Right:
+```json
+{ "old_range": ["F4T", "F4T"], "new_lines": [...] }
+```
+
 Rules:
 - `old_range` is a pair `[start, end]`. A single-line replace is `old_range: ["X", "X"]`.
 - To delete a range, use `new_lines: []`.
@@ -69,6 +95,6 @@ Error recovery:
 - `[E_LEGACY_SHAPE]` — old `oldText`/`newText` format detected. Use `{old_range, new_lines}` instead.
 - `[E_EDIT_CONFLICT]` — two edits overlap on the same line range. Make edits non-overlapping.
 - `[E_AMBIGUOUS_ANCHOR]` — hash collision. Call `read` to get fresh anchors.
-- `[E_BARE_HASH_PREFIX]` — edit line starts with `HASH│`. Use literal file content in `new_lines`, not read output.
+- `[E_BARE_HASH_PREFIX]` — a `new_lines` entry starts with `HASH│`. Remove the hash prefix; keep only the literal line content that appears after `│` in `read` output. `old_range` uses hashes, `new_lines` does not.
 - `[E_INVALID_PATCH]` — diff prefixes (`+`/`-`) in `new_lines`. Use literal content only.
 - `[E_WOULD_EMPTY]` — edit would empty a non-empty file.

package/src/hashline/index.ts

@@ -12,6 +12,7 @@ export {
 	HASHLINE_BARE_PREFIX_RE,
 	computeLineHashes,
 	computeLineHash,
+	ensureHasherReady,
 } from "./hash";
 
 export {

package/src/hashline/parse.ts

@@ -15,14 +15,18 @@ function diagnoseHashRef(ref: string): string {
 	const trimmed = ref.trim();
 
 	if (!trimmed.length) {
-		return `[E_BAD_REF] Invalid anchor. Expected a 3-character base64 anchor (e.g. \"aB3\").`;
+		return `[E_BAD_REF] Invalid anchor. Expected a 3-character base64 anchor (e.g. "aB3").`;
 	}
 
 	if (/^\d+/.test(trimmed)) {
-		return `[E_BAD_REF] Invalid anchor. Use the hash alone (e.g. \"aB3\") — no line numbers or trailing content.`;
+		return `[E_BAD_REF] Invalid anchor. Use the hash alone (e.g. "aB3") — no line numbers or trailing content.`;
 	}
 
-	return `[E_BAD_REF] Invalid anchor \"${trimmed}\". Expected a 3-character base64 anchor (e.g. \"aB3\").`;
+	if (trimmed.includes("│")) {
+		return `[E_BAD_REF] Invalid anchor "${trimmed}". old_range must contain the 3-character hash only — remove everything from "│" onward (including the separator).`;
+	}
+
+	return `[E_BAD_REF] Invalid anchor "${trimmed}". Expected a 3-character base64 anchor (e.g. "aB3").`;
 }
 
 function parseAnchorRef(ref: string): Anchor {

package/src/hashline/resolve.ts

@@ -209,19 +209,23 @@ export function assertNoBareHashPrefixLines(
 	}
 	if (suspects.length === 0) return [];
 
+	const locations = suspects
+		.map((s) => `edit ${s.editIndex}, new_lines[${s.lineIndex}]`)
+		.join("; ");
+
 	const fileHashSet = new Set(fileHashes);
 	const matched = suspects.filter((s) => fileHashSet.has(s.hash));
 	const matchedCount = matched.length;
-	const exampleLine = `${suspects[0]!.hash}│${suspects[0]!.line}`;
 
+	const exampleLine = `${suspects[0]!.hash}│${suspects[0]!.line}`;
 
 	const linesHint =
 		matchedCount === 0
 			? `None match file line hashes.`
-			: `${matchedCount} match file line hashes — likely a copied hash.`;
+			: `${matchedCount} match file line hashes — strong evidence the prefix was copied from read output.`;
 
 	throw new Error(
-		`[E_BARE_HASH_PREFIX] ${suspects.length} edit line(s) start with a hash-like prefix (e.g. ${JSON.stringify(exampleLine)}). ${linesHint} Use literal file content in \"lines\" — never paste HASH│content from read output.`
+		`[E_BARE_HASH_PREFIX] ${suspects.length} edit line(s) start with a hash-like prefix (${locations}). Example: ${JSON.stringify(exampleLine)}. ${linesHint} Remove the "HASH│" prefix from each affected new_lines entry; keep only the literal line content that appears after "│" in read output. Remember: old_range uses hash anchors, new_lines uses file content only.`
 	);
 }
 

package/src/read.ts

@@ -16,7 +16,7 @@ import { throwIfAborted } from "./runtime";
 import { getFileSnapshot } from "./snapshot";
 import { getVisibleLines } from "./utils";
 import { loadPrompt, loadPromptGuidelines } from "./prompts";
-import { validateFileAccess, validateFileKind, isTextFile } from "./validation";
+import { validateFileAccess, assertTextFile } from "./validation";
 
 const READ_DESC = loadPrompt("../prompts/read.md", {
 	DEFAULT_MAX_LINES: String(DEFAULT_MAX_LINES),
@@ -140,8 +140,6 @@ export function registerReadTool(pi: ExtensionAPI): void {
 
 			throwIfAborted(signal);
 			const file = await loadFileKindAndText(absolutePath);
-			validateFileKind(file, rawPath);
-
 			if (file.kind === "image") {
 				const builtinRead = createReadTool(ctx.cwd);
 				const executeBuiltinRead = builtinRead.execute as unknown as (
@@ -153,6 +151,7 @@ export function registerReadTool(pi: ExtensionAPI): void {
 				) => ReturnType<typeof builtinRead.execute>;
 				return executeBuiltinRead(_toolCallId, params, signal, _onUpdate, ctx);
 			}
+			assertTextFile(file, rawPath);
 
 			throwIfAborted(signal);
 			const normalized = normalizeToLF(stripBom(file.text).text);

package/src/replace.ts

@@ -44,18 +44,18 @@ import {
 	type ReplaceRenderState,
 } from "./replace-render";
 import { loadPrompt, loadPromptGuidelines } from "./prompts";
-import { validateFileAccess, validateFileKind, isTextFile } from "./validation";
+import { validateFileAccess, assertTextFile } from "./validation";
 
 
 const hashlineEditNewLinesSchema = Type.Array(Type.String(), {
 	description:
-		"replacement content, one array entry per line, no HASH| prefix",
+		"literal replacement file content, one string per line. Must not include the HASH│ prefix from read output.",
 });
 
 const hasheditOldRangeSchema = Type.Array(
 	Type.String({ description: "anchor (3-char HASH)" }),
 	{
-		description: "inclusive line range to replace [start, end]",
+		description: "inclusive line range to replace [start_hash, end_hash]. Each element must be the 3-character hash anchor only; do not include the │ separator or line content.",
 		minItems: 2,
 		maxItems: 2,
 	},
@@ -169,7 +169,7 @@ async function executeEditPipeline(
 
 	throwIfAborted(signal);
 	const file = await loadFileKindAndText(absolutePath);
-	validateFileKind(file, path);
+	assertTextFile(file, path);
 
 	throwIfAborted(signal);
 	const { bom, text: rawContent } = stripBom(file.text);
@@ -390,17 +390,16 @@ const editToolDefinition: EditToolDefinition = {
 
 			if (originalNormalized === result) {
 				const noopSnapshotId = (await getFileSnapshot(absolutePath)).snapshotId;
-				return buildNoopResponse({
-					path,
-					noopEdits,
-					originalNormalized,
-					snapshotId: noopSnapshotId,
-					editMeta: {
-						editsAttempted,
-						noopEditsCount: noopEdits?.length ?? 0,
-					},
-					warnings,
-				});
+			return buildNoopResponse({
+				path,
+				noopEdits,
+				snapshotId: noopSnapshotId,
+				editMeta: {
+					editsAttempted,
+					noopEditsCount: noopEdits?.length ?? 0,
+				},
+				warnings,
+			});
 			}
 
 			if (hadUtf8DecodeErrors) {

package/src/validation.ts

@@ -22,7 +22,7 @@ export async function validateFileAccess(
 	}
 }
 
-export function validateFileKind(file: LoadedFile, path: string): void {
+export function validateFileKind(file: LoadedFile, path: string): asserts file is { kind: "text"; text: string; hadUtf8DecodeErrors?: true } {
 	if (file.kind === "directory") {
 		throw new Error(`Path is a directory: ${path}. Use ls to inspect directories.`);
 	}
@@ -34,6 +34,10 @@ export function validateFileKind(file: LoadedFile, path: string): void {
 	}
 }
 
+export function assertTextFile(file: LoadedFile, path: string): asserts file is { kind: "text"; text: string; hadUtf8DecodeErrors?: true } {
+	validateFileKind(file, path);
+}
+
 export function isTextFile(file: LoadedFile): file is { kind: "text"; text: string; hadUtf8DecodeErrors?: true } {
 	return file.kind === "text";
 }