pi-hashline-edit-pro 6.4.3 → 6.4.4

package/README.md

@@ -159,7 +159,7 @@ The extension registers eight tools: `read`, `replace`, `replace_match`, `insert
 
 ### read
 
-`read` returns a text file with every line prefixed by `anchor│content`. The anchor is the line's address. `offset` accepts a 1-indexed line number or a served anchor; with an anchor, `limit` counts the lines to return after it. Anchor offsets are stable across edits and return the same editable rows.
+`read` returns a text file with every line prefixed by `anchor│content`. The anchor is the line's address. `offset` accepts a 1-indexed line number or a served anchor; with an anchor, `limit` counts the lines to return starting at that anchor row. Anchor offsets are stable across edits and return the same editable rows.
 
 | Parameter | Description |
 | --- | --- |
@@ -207,7 +207,7 @@ A deletion keeps blank lines at the edges of the removed range, so the separator
 
 The extension checks the request before any file I/O, so a bad request never touches the file.
 
-Auto-fixable slips fall into two groups. Fixed silently: a reversed range, embedded newlines, and a legacy array payload (a single-element array that holds stringified array text, even with a trailing JS method call, for example `[…].map(s => s)`, is unwrapped). Fixed with a warning: a leftover `anchor│` prefix in `text` or the anchor fields (a prefix of 4 to 5 letters before `│`, for example `abde│`), and diff-preview rows pasted into the replacement.
+Auto-fixable slips fall into two groups. Fixed silently: embedded newlines and a legacy array payload (a single-element array that holds stringified array text, even with a trailing JS method call, for example `[…].map(s => s)`, is unwrapped). Fixed with a warning or a hint: a reversed `remove_from`/`remove_to` range is applied in document order with an `[H_RANGE_REVERSED]` hint; a leftover `anchor│` prefix in `text` or the anchor fields (a prefix of 4 to 5 letters before `│`, for example `abde│`) and diff-preview rows pasted into the replacement are stripped with a warning.
 
 Content containing a NUL byte (`U+0000`) is rejected with `[E_BAD_SHAPE]` before any file I/O: writing it would make the file binary, so use an empty replacement to delete. This applies to the `text` field of both `replace` and `insert`.
 
@@ -473,6 +473,7 @@ Full reference:
 | `[H_INDENT_MISMATCH]` | The new line has fewer leading whitespace characters than a structurally similar row (a reference row near the anchor line for an insert, or the replaced line). The edit applied as sent; the one-line hint names both counts and the reference anchor, for example `[H_INDENT_MISMATCH] new line has 0 leading whitespace characters; Kq3f│ has 2.` Copied or moved blocks are not checked, because their indentation comes from the source lines. |
 | `[H_SEPARATOR_MOVED]` | An insert landed its text directly against the anchor line, and the blank line that separated the anchor from its neighbor was displaced to the other side of the inserted text. The edit applied as sent; the one-line hint names the anchor and which side lost the blank line, for example `[H_SEPARATOR_MOVED] blank separator above Kq3f│ was displaced; add a blank line before Kq3f│ if unintended.` |
 | `[H_SEPARATOR_LOST]` | A pure deletion removed a run of blank lines that sat between two content lines. The edit applied as sent; the one-line hint names the two surviving anchors and the removed count, for example `[H_SEPARATOR_LOST] deletion removed 2 blank lines between Aaaa│ and Dddd│.` |
+| `[H_RANGE_REVERSED]` | The `remove_from` anchor resolved to a line after `remove_to`. The call applied the range in document order; the one-line hint names the line range used. |
 | `[E_NOT_FOUND]` | The path does not exist. |
 | `[E_ACCESS]` | The file is not readable or writable. |
 | `[E_NOT_TEXT]` | The path is a directory, binary file, image, or UTF-16/UTF-32 encoded text; hashline editing only supports text files. |

package/index.ts

@@ -33,7 +33,7 @@ import {
   setDisableOnModelsFromText,
 } from "./src/config";
 import { loadHashStore, pruneMissing } from "./src/hash-store";
-import { initRegistry, gcRegistrySidecars, clearRegistry, freeAnchors, freeAnchorsForPaths, sessionKeyFor, withAnchorSession, releaseRegistrySession, formatAnchorReclaimNotice, takeReclaimedPaths } from "./src/anchor-registry";
+import { type AnchorSessionContext, initRegistry, gcRegistrySidecars, clearRegistry, freeAnchors, freeAnchorsForPaths, sessionKeyFor, withAnchorSession, releaseRegistrySession, formatAnchorReclaimNotice, takeReclaimedPaths } from "./src/anchor-registry";
 import { serveRows } from "./src/served";
 import { finalizeTurn, planAssistantMessage } from "./src/batch";
 import { currentEditFlags } from "./src/edit-common";
@@ -72,6 +72,7 @@ export default function (pi: ExtensionAPI): void {
   let grepFlavorCwd: string | undefined;
   const baseAnchorTools = new Set<string>();
   let gateApplied = false;
+  const pendingRegistrySessionKeys: Array<string | undefined> = [];
 
   async function refreshEditTools(): Promise<void> {
     try {
@@ -144,7 +145,12 @@ export default function (pi: ExtensionAPI): void {
     pi.setActiveTools([...new Set([...base, ...enabled])]);
   }
 
-  pi.on("session_start", async (_event, ctx) => withAnchorSession(ctx, async () => {
+  async function withRegistrySession<T>(ctx: AnchorSessionContext | undefined, fn: () => Promise<T> | T): Promise<T> {
+    pendingRegistrySessionKeys.push(sessionKeyFor(ctx));
+    return withAnchorSession(ctx, fn);
+  }
+
+  pi.on("session_start", async (_event, ctx) => withRegistrySession(ctx, async () => {
     const active = pi.getActiveTools();
     baseAnchorTools.clear();
     for (const tool of ANCHOR_TOOL_NAMES) {
@@ -191,9 +197,9 @@ export default function (pi: ExtensionAPI): void {
     }
   }));
 
-  pi.on("session_shutdown", async (_event, ctx) => {
+  pi.on("session_shutdown", async () => {
     try {
-      const key = sessionKeyFor(ctx);
+      const key = pendingRegistrySessionKeys.shift();
       if (key !== undefined) releaseRegistrySession(key);
     } catch (error) {
       console.error("Failed to release anchor registry session:", error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "6.4.3",
+  "version": "6.4.4",
   "type": "module",
   "description": "Hash-anchored read/replace/insert/grep tools for pi-coding-agent. Every line gets a unique 4-char tokenizer-friendly anchor that stays stable across edits; stale or ambiguous anchors are rejected, never fuzzy-matched. Undo persists across restarts.",
   "main": "index.ts",

package/src/hashline/apply.ts

@@ -166,7 +166,7 @@ export function planEdit(
   const fileHashes = precomputedHashes;
   const warnings: string[] = [];
 
-  const rangeFixed = swapReversedRanges(edit, fileHashes);
+  const rangeFixed = swapReversedRanges(edit, fileHashes, warnings);
   const prefixFixed = stripDiffPrefixes(
     stripBarePrefixes(rangeFixed, warnings, options?.stripWarning),
     warnings,

package/src/hashline/resolve.ts

@@ -265,6 +265,7 @@ export function stripDiffPrefixes(edit: HEdit, warnings: string[], location: Str
 export function swapReversedRanges(
 	edit: HEdit,
 	fileHashes: string[],
+	warnings?: string[],
 ): HEdit {
 	const lineByHash = new Map<string, number>();
 	for (let i = 0; i < fileHashes.length; i++) {
@@ -280,6 +281,7 @@ export function swapReversedRanges(
 	) {
 		return edit;
 	}
+	warnings?.push(`[H_RANGE_REVERSED] "remove_from" refers to line ${startLine} after "remove_to" (line ${endLine}); lines ${endLine}-${startLine} were replaced in document order.`);
 	return { ...edit, hash_bounds: [endRef, startRef] as [Anchor, Anchor] };
 }
 

package/src/replace-match.ts

@@ -4,7 +4,7 @@ import * as Diff from "diff";
 import { execPipeline, noteAnchorError, previewFromPipe, previewError, type ReplaceDetails } from "./replace";
 import { commitEdit } from "./commit";
 import { readNormFile, type NormFile } from "./file-reader";
-import { fmtRegion, MAX_HASH_LINES, parseHashRef, planEdit, preserveDeletionSeparators, resEdit, resolveAnchorLine, stripAnchorRow, type Anchor } from "./hashline";
+import { fmtRegion, MAX_HASH_LINES, parseHashRef, parsePayloadText, planEdit, preserveDeletionSeparators, resEdit, resolveAnchorLine, stripAnchorRow, type Anchor } from "./hashline";
 import { servedForPath, withAnchorSession } from "./anchor-registry";
 import { batchMemberFor, executeBatchMember, noteBatchFailure, registerBatchPlanner, type BatchMemberPlan, type BatchPlannerInput } from "./batch";
 import { loadP, loadGuidelines } from "./prompts";
@@ -16,9 +16,9 @@ import {
   type ReplaceMatchReq,
 } from "./payload-contract";
 import { literalEscapeHints, makePrepareArguments, splitLines } from "./utils";
-import { toLF } from "./normalize";
+import { toLF, type LineEnding } from "./normalize";
 import { isFidelitySensitiveChar } from "./edit-fidelity";
-import { countNewlines } from "./line-endings";
+import { countNewlines, splitWithEndings } from "./line-endings";
 import { MAX_RANGE_STALE_LINES } from "./constants";
 import {
   assertBoundaryLinesServed,
@@ -44,6 +44,7 @@ interface MatchRefs {
 export interface MatchPlan {
   editParams: { remove_from: string; remove_to: string; text: string };
   warnings: string[];
+  contentSeparators: (LineEnding | undefined)[];
   servedOverride?: ReadonlyMap<string, string>;
 }
 
@@ -51,18 +52,46 @@ function formatMatchRange(start: number, end: number): string {
   return start === end ? `line ${start}` : `lines ${start}-${end}`;
 }
 
-function replaceAllOccurrences(text: string, oldText: string, newText: string): { text: string; count: number } {
-  let out = "";
+function replaceAllOccurrences(
+  text: string,
+  oldText: string,
+  newText: string,
+): { text: string; separators: (LineEnding | undefined)[]; count: number } {
+  const parts: string[] = [];
+  const inserted: Array<{ start: number; end: number }> = [];
+  let length = 0;
+  const append = (chunk: string, fromNewText: boolean): void => {
+    if (fromNewText) inserted.push({ start: length, end: length + chunk.length });
+    parts.push(chunk);
+    length += chunk.length;
+  };
   let cursor = 0;
   let count = 0;
   for (;;) {
     const found = text.indexOf(oldText, cursor);
     if (found < 0) break;
-    out += text.slice(cursor, found) + newText;
+    append(text.slice(cursor, found), false);
+    append(newText, true);
     cursor = found + oldText.length;
     count += 1;
   }
-  return count === 0 ? { text, count: 0 } : { text: out + text.slice(cursor), count };
+  if (count === 0) return { text, separators: [], count: 0 };
+  append(text.slice(cursor), false);
+  const replacement = parts.join("");
+  const parsed = splitWithEndings(replacement);
+  const separators: (LineEnding | undefined)[] = [];
+  let offset = 0;
+  let insertedIndex = 0;
+  for (let index = 0; index < parsed.lines.length; index++) {
+    offset += parsed.lines[index]!.length;
+    const ending = parsed.endings[index];
+    if (ending === undefined) continue;
+    while (insertedIndex < inserted.length && inserted[insertedIndex]!.end <= offset) insertedIndex += 1;
+    const fromNewText = insertedIndex < inserted.length && offset >= inserted[insertedIndex]!.start && offset < inserted[insertedIndex]!.end;
+    separators.push(fromNewText ? ending : undefined);
+    offset += ending.length;
+  }
+  return { text: replacement, separators, count };
 }
 
 const RETYPE_DIFF_MAX_CHARS = 20_000;
@@ -206,10 +235,11 @@ export function buildReplaceMatchEdit(
   const rangeText = `${rangeLines.join("\n")}${rangeLines[rangeLines.length - 1] === "" ? "\n" : ""}`;
   const oldText = toLF(req.old_string);
   const newText = toLF(req.new_string);
-  const { text: replacement, count } = replaceAllOccurrences(rangeText, oldText, req.new_string);
+  const { text: replacement, separators: replacementSeparators, count } = replaceAllOccurrences(rangeText, oldText, req.new_string);
   if (count === 0) {
     throw new Error(notFoundMessage(displayPath, start, end, preload.fileHashes, fileLines, rangeText, oldText));
   }
+  const contentSeparators = parsePayloadText(replacement).lines.map((_, index) => replacementSeparators[index]);
   const startRef = fromLine <= toLine ? refs.from : refs.to;
   const endRef = fromLine <= toLine ? refs.to : refs.from;
   const servedOverride = trustRangeServed(fileLines, preload.fileHashes, served, start, end);
@@ -228,6 +258,7 @@ export function buildReplaceMatchEdit(
       text: replacement,
     },
     warnings,
+    contentSeparators,
     ...(servedOverride !== undefined ? { servedOverride } : {}),
   };
 }
@@ -251,6 +282,7 @@ function planReplaceMatchBatchMember(input: BatchPlannerInput): BatchMemberPlan
   return {
     hedit,
     warnings: [...warnings, ...hints, ...resWarnings, ...matchPlan.warnings],
+    contentSeparators: matchPlan.contentSeparators,
     planned,
     foldedLines: 0,
     ...(matchPlan.servedOverride !== undefined ? { servedOverride: matchPlan.servedOverride } : {}),
@@ -286,6 +318,7 @@ export async function replaceMatchPreview(request: unknown, cwd: string, signal?
       noPersist: true,
       preloadedNorm: preload,
       served: plan.servedOverride,
+      endingOverrides: plan.contentSeparators,
       signal,
     });
     return previewFromPipe(pipe);
@@ -367,6 +400,7 @@ export function buildReplaceMatchToolDef(flags: EditToolFlags = DEFAULT_EDIT_FLA
             signal,
             preloadedNorm: preload,
             served: plan.servedOverride,
+            endingOverrides: plan.contentSeparators,
           });
           return commitEdit(pipe, {
             path: pipe.path,

package/src/replace.ts

@@ -158,9 +158,11 @@ function withEndingOverrides(edit: HEdit, overrides: (LineEnding | undefined)[]
   const length = Math.max(edit.content_separators?.length ?? 0, overrides.length);
   const separators: (LineEnding | undefined)[] = new Array(length);
   for (let index = 0; index < length; index++) {
-    separators[index] = overrides[index] ?? edit.content_separators?.[index];
+    separators[index] = index < overrides.length ? overrides[index] : edit.content_separators?.[index];
+  }
+  if (separators.every((ending) => ending === undefined)) {
+    return edit.content_separators === undefined ? edit : { ...edit, content_separators: undefined };
   }
-  if (separators.every((ending) => ending === undefined)) return edit;
   return { ...edit, content_separators: separators };
 }
 

package/tool-prompts/read.md

@@ -1 +1 @@
-Read a text file as `anchor│content` rows: a 4-character anchor (letters only, case-sensitive), `│`, then the line. Target edits by anchor, never by content or line number. `offset` takes a 1-indexed line number or a served anchor; with an anchor, `limit` counts lines after it — no line-number math. Page long files with `offset` and `limit`; when output says truncated, continue from the hinted `offset`. A stale anchor is refused with the current rows and fresh anchors. Images attach visually; binary, directory, and UTF-16/UTF-32 text are rejected; an empty file returns one empty row you can replace to seed content.
+Read a text file as `anchor│content` rows: a 4-character anchor (letters only, case-sensitive), `│`, then the line. Target edits by anchor, never by content or line number. `offset` takes a 1-indexed line number or a served anchor; with an anchor, `limit` counts lines from that anchor row onward — no line-number math. Page long files with `offset` and `limit`; when output says truncated, continue from the hinted `offset`. A stale anchor is refused with the current rows and fresh anchors. Images attach visually; binary, directory, and UTF-16/UTF-32 text are rejected; an empty file returns one empty row you can replace to seed content.