pi-hashline-edit-pro 4.2.0 → 4.2.1

package/README.md

@@ -153,7 +153,7 @@ Auto-read is enabled by default. After a successful `write`, the extension reads
 
 After `replace`, `insert`, and `undo_last_change`, the result shows the post-edit diff. Inside a same-turn batch, only the batch's last call shows the combined diff, headed by a `batch:` line (`batch N:` when several files batch); earlier calls reply `In batch` (`In batch N` when several files batch). The `+anchor│` and ` anchor│` rows carry the current anchors, so follow-up edits can anchor on the diff directly. The `-anchor│` rows show removed lines with their old anchors, which are stale after the edit. When the context line next to a change is blank or whitespace-only, one more context line is shown in that direction, so the change stays anchored to visible content. Call `read` when you want the full file's anchors.
 
-Auto-read keeps the same 50KB and 2000-line budget as `read`. Change it in `/hashline-config`; both settings persist across sessions.
+Auto-read keeps the same 50KB and 2000-line budget as `read`. Change it in `/hashline-config`; both settings persist across sessions. The post-edit diff shows 1 surrounding line by default; change Diff context in `/hashline-config` (0-10, needs Auto-read) to show more or fewer.
 
 ## Tool result details
 
@@ -170,7 +170,7 @@ All five tools return machine-readable metadata in `details` alongside the model
 
 | Command | Description |
 | --- | --- |
-| `/hashline-config` | Open the settings window: auto-read anchors, `anchor_grep` tool, required `path`, strict input, and boundary dedup. Persists across sessions. |
+| `/hashline-config` | Open the settings window: auto-read anchors, diff context lines, `anchor_grep` tool, required `path`, strict input, and boundary dedup. Persists across sessions. |
 | `/clear-anchors` | Clear the session's anchor claims. Anchors are re-claimed on the next `read`. |
 
 Settings live in `~/.config/pi-hashline-edit-pro/config.json`, created when a setting is first changed in `/hashline-config`:
@@ -181,7 +181,8 @@ Settings live in `~/.config/pi-hashline-edit-pro/config.json`, created when a se
   "anchorGrepEnabled": true,
   "requirePath": false,
   "strictInput": false,
-  "boundaryDedupMode": "on"
+  "boundaryDedupMode": "on",
+  "diffContextLines": 1
 }
 ```
 

package/index.ts

@@ -17,6 +17,7 @@ import {
   toggleRequirePath,
   toggleStrictInput,
   cycleBoundaryDedupMode,
+  adjustDiffContextLines,
 } from "./src/config";
 import { loadHashStore, persistSnapshot, pruneMissing } from "./src/hash-store";
 import { initRegistry, gcRegistrySidecars, clearRegistry, freeAnchors, markServed as markServedScoped } from "./src/anchor-registry";
@@ -31,6 +32,8 @@ import { loadFileKindAndText } from "./src/file-kind";
 import { resolveInCwd } from "./src/fs-write";
 import { valAccess } from "./src/validation";
 import { splitLines } from "./src/utils";
+import { hashSource } from "./src/hashline";
+import { contentChecksum } from "./src/hashline/hasher";
 
 export default function (pi: ExtensionAPI): void {
   regRead(pi);
@@ -87,7 +90,7 @@ export default function (pi: ExtensionAPI): void {
   });
 
   pi.registerCommand("hashline-config", {
-    description: "Open the hashline settings window (auto-read, grep, path, strict input, dedup)",
+    description: "Open the hashline settings window (auto-read, diff context, grep, path, strict input, dedup)",
     handler: async (_args, ctx) => {
       if (!ctx.hasUI) {
         ctx.ui.notify("/hashline-config requires interactive mode", "error");
@@ -98,8 +101,9 @@ export default function (pi: ExtensionAPI): void {
           tui,
           theme,
           done,
-          onToggle: async (key) => {
+          onToggle: async (key, delta) => {
             if (key === "autoRead") autoRead = await toggleAutoRead();
+            else if (key === "diffContextLines") await adjustDiffContextLines(delta ?? 1);
             else if (key === "anchorGrepEnabled") {
               const enabled = await toggleAnchorGrep();
               const active = pi.getActiveTools();
@@ -177,7 +181,7 @@ export default function (pi: ExtensionAPI): void {
           DEFAULT_MAX_LINES,
         );
         const fileLines = splitLines(normalized);
-        persistSnapshot(await loadHashStore(), absolutePath, normalized, fileHashes);
+        persistSnapshot(await loadHashStore(), absolutePath, normalized, fileHashes, fileLines.map((line) => contentChecksum(hashSource(line))));
         markServedScoped(absolutePath, buildServedMap(fileHashes, fileLines, preview.servedHashes), new Set(fileHashes));
         return {
           content: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "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/anchor-registry.ts

@@ -65,6 +65,7 @@ export function foldRegistryEvents(events: RegistryEvent[]): SessionState {
     } else if (event.kind === "allocate") {
       for (const [anchor, checksum] of event.rows) {
         state.owned.set(anchor, { path: event.path, checksum });
+        state.everMinted.add(anchor);
       }
     } else if (event.kind === "free") {
       if (event.anchors) {
@@ -541,9 +542,12 @@ export async function allocateFileAnchors(
     : (() => {
         const state = shadow ? cloneState(current()!) : current()!;
         const reuseIndex = fingerprintIndex(state, path);
+        const reuseTaken = new Map<string, number>();
         const anchors: string[] = checksums.map((checksum) => {
           const candidates = reuseIndex.get(checksum) ?? [];
-          const anchor = candidates.length > 0 ? candidates.shift()! : mintAnchor(state);
+          const taken = reuseTaken.get(checksum) ?? 0;
+          reuseTaken.set(checksum, taken + 1);
+          const anchor = taken < candidates.length ? candidates[taken]! : mintAnchor(state);
           state.everMinted.add(anchor);
           state.owned.set(anchor, { path, checksum });
           return anchor;

package/src/batch.ts

@@ -1,7 +1,7 @@
 import { readFile } from "fs/promises";
 import { constants } from "fs";
 import { relative } from "path";
-import { readConfig } from "./config";
+import { readConfig, getDiffContextLines } from "./config";
 import { throwIfStrictInput, tryResolveEditTarget } from "./edit-common";
 import { readNormFile, safeSnapId } from "./file-reader";
 import { resolveInCwd, writeAtomic, type FileIdentity } from "./fs-write";
@@ -441,7 +441,7 @@ function composeBatchLines(baseContent: string, pieces: BatchPiece[]): string {
   const descending = [...pieces].sort((a, b) => b.start - a.start);
   for (const piece of descending) lines.splice(piece.start - 1, piece.end - piece.start + 1, ...piece.newLines);
   let composed = lines.join("\n");
-  if (lines.length > 0 && baseContent.endsWith("\n")) composed += "\n";
+  if (lines.length > 0 && (baseContent.endsWith("\n") || lines[lines.length - 1] === "")) composed += "\n";
   return composed;
 }
 
@@ -561,6 +561,7 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
       boundaryDedupBelow: [],
     },
     batchVerb(runtime),
+    await getDiffContextLines(),
   );
   changed.details.diff = `${header}\n${changed.details.diff}`;
   changed.details.diffLineNumbers?.unshift(undefined);

package/src/commit.ts

@@ -4,6 +4,7 @@ import { DEDUP_ANCHOR } from "./constants";
 import { HASH_SEP } from "./hashline";
 import { buildChanged, buildNoop, type RMeta, type TResult } from "./replace-response";
 import { saveUndo } from "./replace-undo";
+import { getDiffContextLines } from "./config";
 import { safeSnapId } from "./file-reader";
 import { writeAtomic } from "./fs-write";
 import { servedHashesFromDiff, buildServedMap } from "./served";
@@ -127,7 +128,7 @@ export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promis
     boundaryDedupAbove: pipe.boundaryDedupAbove,
     boundaryDedupBelow: pipe.boundaryDedupBelow,
   };
-  const changed = buildChanged(successInput, meta.verb);
+  const changed = buildChanged(successInput, meta.verb, await getDiffContextLines());
   if (changed.details.diff) {
     markServedScoped(
       mutationTargetPath,

package/src/config-ui.ts

@@ -2,7 +2,7 @@ import { Key, matchesKey, visibleWidth } from "@earendil-works/pi-tui";
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { readConfig, type Config } from "./config";
 
-export type ConfigToggleKey = "autoRead" | "anchorGrepEnabled" | "requirePath" | "strictInput" | "boundaryDedupMode";
+export type ConfigToggleKey = "autoRead" | "anchorGrepEnabled" | "requirePath" | "strictInput" | "boundaryDedupMode" | "diffContextLines";
 
 export interface ConfigRow {
   key: ConfigToggleKey;
@@ -11,11 +11,14 @@ export interface ConfigRow {
   enabled: boolean;
   mode?: string;
   cycle?: string[];
+  value?: number;
+  disabled?: boolean;
 }
 
 export function configRows(config: Config): ConfigRow[] {
   return [
     { key: "autoRead", label: "Auto-read", hint: "Anchors after write + post-edit diffs", enabled: config.autoRead !== false },
+    { key: "diffContextLines", label: "Diff context", hint: "Surrounding lines in post-edit diffs (needs Auto-read)", enabled: config.autoRead !== false, value: config.diffContextLines ?? 1, disabled: config.autoRead === false },
     { key: "anchorGrepEnabled", label: "Anchor grep", hint: "anchor_grep tool (builtin grep off while on)", enabled: config.anchorGrepEnabled === true },
     { key: "requirePath", label: "Require path", hint: "replace + insert need path (RPC visibility)", enabled: config.requirePath === true },
     { key: "strictInput", label: "Strict input", hint: "Reject auto-fixable slips instead of warnings", enabled: config.strictInput === true },
@@ -34,11 +37,16 @@ function modeBox(theme: Theme, mode: string): string {
   return theme.fg("success", `[${mode}]`);
 }
 
+function numberBox(theme: Theme, value: number, disabled?: boolean): string {
+  if (disabled) return theme.fg("dim", `[${value}]`);
+  return theme.fg("accent", `[${value}]`);
+}
+
 export class HashlineConfigOverlay {
   private rows: ConfigRow[];
   private selected = 0;
 
-  constructor(private readonly opts: { tui: { requestRender(force?: boolean): void }; theme: Theme; done: () => void; onToggle: (key: ConfigToggleKey) => Promise<void> }) {
+  constructor(private readonly opts: { tui: { requestRender(force?: boolean): void }; theme: Theme; done: () => void; onToggle: (key: ConfigToggleKey, delta?: number) => Promise<void> }) {
     this.rows = [];
   }
 
@@ -46,9 +54,24 @@ export class HashlineConfigOverlay {
     this.rows = configRows(await readConfig());
   }
 
+  private runToggle(row: ConfigRow, delta?: number): void {
+    this.opts.tui.requestRender(true);
+    void this.opts.onToggle(row.key, delta).then(async () => {
+      this.rows = configRows(await readConfig());
+      this.opts.tui.requestRender(true);
+    }).catch((error: unknown) => {
+      console.error("Failed to toggle hashline setting:", error);
+    });
+  }
+
   private toggleSelected(): void {
     const row = this.rows[this.selected];
-    if (!row) return;
+    if (!row || row.disabled) return;
+    if (row.value !== undefined) {
+      row.value += 1;
+      this.runToggle(row, 1);
+      return;
+    }
     if (row.cycle && row.mode !== undefined) {
       const next = row.cycle[(row.cycle.indexOf(row.mode) + 1) % row.cycle.length] ?? row.cycle[0];
       if (next === undefined) return;
@@ -57,13 +80,14 @@ export class HashlineConfigOverlay {
     } else {
       row.enabled = !row.enabled;
     }
-    this.opts.tui.requestRender(true);
-    void this.opts.onToggle(row.key).then(async () => {
-      this.rows = configRows(await readConfig());
-      this.opts.tui.requestRender(true);
-    }).catch((error: unknown) => {
-      console.error("Failed to toggle hashline setting:", error);
-    });
+    this.runToggle(row);
+  }
+
+  private adjustSelected(delta: number): void {
+    const row = this.rows[this.selected];
+    if (!row || row.disabled || row.value === undefined) return;
+    row.value += delta;
+    this.runToggle(row, delta);
   }
 
   handleInput(data: string): void {
@@ -75,6 +99,14 @@ export class HashlineConfigOverlay {
       this.selected = (this.selected + 1) % this.rows.length;
       return;
     }
+    if (matchesKey(data, Key.right) || data === "+" || data === "=") {
+      this.adjustSelected(1);
+      return;
+    }
+    if (matchesKey(data, Key.left) || data === "-" || data === "_") {
+      this.adjustSelected(-1);
+      return;
+    }
     if (matchesKey(data, Key.space) || matchesKey(data, Key.enter) || data === " " || data === "\r" || data === "\n") {
       this.toggleSelected();
       return;
@@ -96,12 +128,12 @@ export class HashlineConfigOverlay {
     lines.push(theme.fg("border", `├${"─".repeat(innerWidth)}┤`));
     this.rows.forEach((row, index) => {
       const cursor = index === this.selected ? theme.fg("accent", "> ") : "  ";
-      const box = row.mode !== undefined ? modeBox(theme, row.mode) : row.enabled ? theme.fg("success", "[x]") : theme.fg("dim", "[ ]");
-      const label = index === this.selected ? theme.fg("accent", theme.bold(row.label)) : row.label;
+      const box = row.value !== undefined ? numberBox(theme, row.value, row.disabled) : row.mode !== undefined ? modeBox(theme, row.mode) : row.enabled ? theme.fg("success", "[x]") : theme.fg("dim", "[ ]");
+      const label = row.disabled ? theme.fg("dim", row.label) : index === this.selected ? theme.fg("accent", theme.bold(row.label)) : row.label;
       lines.push(padRow(theme, innerWidth, `${cursor}${box} ${label} ${theme.fg("dim", `— ${row.hint}`)}`));
     });
     lines.push(theme.fg("border", `├${"─".repeat(innerWidth)}┤`));
-    lines.push(padRow(theme, innerWidth, theme.fg("dim", " ↑↓ navigate · space toggle · q close")));
+    lines.push(padRow(theme, innerWidth, theme.fg("dim", " ↑↓ navigate · space toggle · ←/→ or -/+ adjust · q close")));
     lines.push(theme.fg("border", `╰${"─".repeat(innerWidth)}╯`));
     return lines;
   }

package/src/config.ts

@@ -5,12 +5,17 @@ import { writeAtomic } from "./fs-write";
 
 export type BoundaryDedupMode = "on" | "off" | "strict";
 
+export const DEFAULT_DIFF_CONTEXT_LINES = 1;
+export const MIN_DIFF_CONTEXT_LINES = 0;
+export const MAX_DIFF_CONTEXT_LINES = 10;
+
 export interface Config {
   autoRead: boolean;
   anchorGrepEnabled: boolean;
   requirePath?: boolean;
   strictInput?: boolean;
   boundaryDedupMode?: BoundaryDedupMode;
+  diffContextLines?: number;
 }
 
 const DEFAULT_CONFIG: Config = {
@@ -18,7 +23,8 @@ const DEFAULT_CONFIG: Config = {
   anchorGrepEnabled: true,
   requirePath: false,
   strictInput: false,
-  boundaryDedupMode: "on"
+  boundaryDedupMode: "on",
+  diffContextLines: DEFAULT_DIFF_CONTEXT_LINES
 };
 
 const BOUNDARY_DEDUP_MODES: BoundaryDedupMode[] = ["on", "strict", "off"];
@@ -30,6 +36,14 @@ function parseBoundaryDedupMode(mode: unknown, legacy: unknown): BoundaryDedupMo
   return DEFAULT_CONFIG.boundaryDedupMode ?? "on";
 }
 
+export function normalizeDiffContextLines(value: unknown): number {
+  if (typeof value !== "number" || !Number.isFinite(value)) return DEFAULT_DIFF_CONTEXT_LINES;
+  const floored = Math.floor(value);
+  if (floored < MIN_DIFF_CONTEXT_LINES) return MIN_DIFF_CONTEXT_LINES;
+  if (floored > MAX_DIFF_CONTEXT_LINES) return MAX_DIFF_CONTEXT_LINES;
+  return floored;
+}
+
 function parseConfig(content: string): Config {
   const parsed = JSON.parse(content) as unknown;
   const autoRead = isRec(parsed) ? parsed.autoRead : undefined;
@@ -41,12 +55,14 @@ function parseConfig(content: string): Config {
   const strictInput = isRec(parsed) ? parsed.strictInput : undefined;
   const boundaryDedupMode = isRec(parsed) ? parsed.boundaryDedupMode : undefined;
   const legacyBoundaryDedup = isRec(parsed) ? parsed.boundaryDedupEnabled : undefined;
+  const diffContextLines = isRec(parsed) ? parsed.diffContextLines : undefined;
   return {
     autoRead,
     anchorGrepEnabled: typeof anchorGrepEnabled === "boolean" ? anchorGrepEnabled : DEFAULT_CONFIG.anchorGrepEnabled,
     requirePath: typeof requirePath === "boolean" ? requirePath : DEFAULT_CONFIG.requirePath,
     strictInput: typeof strictInput === "boolean" ? strictInput : DEFAULT_CONFIG.strictInput,
     boundaryDedupMode: parseBoundaryDedupMode(boundaryDedupMode, legacyBoundaryDedup),
+    diffContextLines: normalizeDiffContextLines(diffContextLines),
   };
 }
 
@@ -103,3 +119,15 @@ export async function cycleBoundaryDedupMode(): Promise<BoundaryDedupMode> {
   await writeConfig(config);
   return next;
 }
+
+export async function getDiffContextLines(): Promise<number> {
+  return normalizeDiffContextLines((await readConfig()).diffContextLines);
+}
+
+export async function adjustDiffContextLines(delta: number): Promise<number> {
+  const config = await readConfig();
+  const next = normalizeDiffContextLines(normalizeDiffContextLines(config.diffContextLines) + delta);
+  config.diffContextLines = next;
+  await writeConfig(config);
+  return next;
+}

package/src/insert.ts

@@ -45,7 +45,7 @@ const insertToolSchema = Type.Object(
     direction: insertDirectionSchema,
     lines: insertLinesSchema,
   },
-  { additionalProperties: false },
+  { additionalProperties: true },
 );
 
 export function buildInsertToolSchema(requirePath: boolean): typeof insertToolSchema {
@@ -57,7 +57,7 @@ export function buildInsertToolSchema(requirePath: boolean): typeof insertToolSc
       direction: insertDirectionSchema,
       lines: insertLinesSchema,
     },
-    { additionalProperties: false },
+    { additionalProperties: true },
   ) as typeof insertToolSchema;
 }
 

package/src/payload-contract.ts

@@ -32,7 +32,7 @@ export const editToolSchema = Type.Object(
     remove_to: removeToSchema,
     replacement_lines: replacementLinesSchema,
   },
-  { additionalProperties: false },
+  { additionalProperties: true },
 );
 
 export function buildEditToolSchema(requirePath: boolean): typeof editToolSchema {
@@ -44,7 +44,7 @@ export function buildEditToolSchema(requirePath: boolean): typeof editToolSchema
       remove_to: removeToSchema,
       replacement_lines: replacementLinesSchema,
     },
-    { additionalProperties: false },
+    { additionalProperties: true },
   ) as typeof editToolSchema;
 }
 

package/src/replace-response.ts

@@ -170,10 +170,10 @@ export function withDedupRows(diff: string, lineNumbers: (number | undefined)[],
   return { diff: out.join("\n"), lineNumbers: nums };
 }
 
-export function buildChanged(input: SuccessInput, verb = "replaced"): TResult {
+export function buildChanged(input: SuccessInput, verb = "replaced", diffContextLines = 1): TResult {
   const { path, result, warnings, snapshotId, originalNormalized, originalHashes, editMeta, resultHashes, boundaryDedupAbove, boundaryDedupBelow } = input;
   const resultLines = visLines(result);
-  const baseDiff = genDiff(originalNormalized, result, 1, resultHashes, originalHashes);
+  const baseDiff = genDiff(originalNormalized, result, diffContextLines, resultHashes, originalHashes);
   const diffResult = withDedupRows(baseDiff.diff, baseDiff.lineNumbers, boundaryDedupAbove, boundaryDedupBelow);
   const addedLines = editMeta.addedLines;
   const removedLines = editMeta.removedLines;

package/src/replace-undo.ts

@@ -11,6 +11,7 @@ import { markServed as markServedScoped, freeAnchors, adoptAnchors } from "./anc
 import { resolveInCwd, writeAtomic, type FileIdentity } from "./fs-write";
 import { toLF, stripBOM, restoreEndings, type LineEnding } from "./normalize";
 import { genDiff, genPatch } from "./replace-diff";
+import { getDiffContextLines } from "./config";
 import { cntDiff, errCode, makePrepareArguments, splitLines } from "./utils";
 import { loadP, loadGuide } from "./prompts";
 import { buildMetrics } from "./replace-response";
@@ -178,13 +179,13 @@ export function regUndo(pi: ExtensionAPI): void {
         const linesAddedByReplace = cntDiff(diffResult.diff, "+");
         const linesRemovedByReplace = cntDiff(diffResult.diff, "-");
         const restoredRange = changedRange(currentNormalized, undo.content);
-        const undoDiffResult = genDiff(currentNormalized, undo.content, 1, undo.hashes, currentHashes);
+        const undoDiffResult = genDiff(currentNormalized, undo.content, await getDiffContextLines(), undo.hashes, currentHashes);
         const undoDiff = undoDiffResult.diff;
 
         try {
           const store = await loadHashStore();
           const undoLines = splitLines(undo.content);
-          persistSnapshot(store, mutationTargetPath, undo.content, undo.hashes);
+          persistSnapshot(store, mutationTargetPath, undo.content, undo.hashes, undoLines.map((line) => contentChecksum(hashSource(line))));
           freeAnchors(mutationTargetPath);
           adoptAnchors(
             mutationTargetPath,

package/src/write-hook.ts

@@ -1,7 +1,7 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { HASH_CLASS } from "./hashline/alphabet";
 import { HASH_SEP } from "./hashline/hash";
-import { ownersForPath } from "./anchor-registry";
+import { servedForPath } from "./anchor-registry";
 import { resolveInCwd } from "./fs-write";
 import { abortIf, splitLines, isRec, normalizeFilePath } from "./utils";
 
@@ -27,7 +27,7 @@ export async function servedHashEchoDenial(rawPath: string, content: string, cwd
   abortIf(signal);
   const { resolved } = await resolveInCwd(rawPath, cwd);
   abortIf(signal);
-  const served = ownersForPath(resolved);
+  const served = servedForPath(resolved);
   if (!served || served.size === 0) return undefined;
   const echo = findServedHashEcho(content, served);
   if (!echo) return undefined;