pi-hashline-edit-pro 4.4.3 → 4.5.0

package/src/batch.ts

@@ -15,9 +15,11 @@ import {
   MAX_HASH_LINES,
   type HEdit,
   type PlannedEdit,
+  type StripWarningLocation,
 } from "./hashline";
-import { adoptAnchors, servedForPath } from "./anchor-registry";
-import { restoreEndings, stripBOM, toLF, type LineEnding } from "./normalize";
+import { adoptAnchors, servedForPath, formatAnchorReclaimNotice, takeReclaimedPaths } from "./anchor-registry";
+import { stripBOM, toLF, type LineEnding } from "./normalize";
+import { applySpanEndings, joinSeparators, separatorsForSpans } from "./line-endings";
 import { assertInsertReq, assertReq, normReq } from "./payload-contract";
 import { saveUndo } from "./replace-undo";
 import { buildChanged, buildNoop, type RMetrics, type TResult } from "./replace-response";
@@ -44,6 +46,7 @@ interface BatchBase {
   hashes: string[];
   bom: string;
   ending: LineEnding;
+  separators: LineEnding[];
   identity: FileIdentity;
   hadUtf8DecodeErrors: boolean;
   absolutePath: string;
@@ -64,6 +67,7 @@ export interface BatchPiece {
   noop: boolean;
   foldedLines: number;
   carryIndex?: number;
+  separators?: (LineEnding | undefined)[];
 }
 
 export interface BatchMemberInput {
@@ -77,6 +81,8 @@ export interface BatchMemberInput {
   hedit: HEdit;
   extraWarnings: string[];
   foldedLines?: number;
+  stripWarning?: StripWarningLocation;
+  contentSeparators?: (LineEnding | undefined)[];
 }
 
 interface BatchFailure {
@@ -434,6 +440,7 @@ export async function ensureBatchBase(input: {
     hashes: file.fileHashes.slice(),
     bom: file.bom,
     ending: file.originalEnding,
+    separators: file.endingSeparators,
     identity: file.identity,
     hadUtf8DecodeErrors: file.hadUtf8DecodeErrors,
     absolutePath: file.absolutePath,
@@ -482,6 +489,7 @@ export async function executeBatchMember(input: BatchMemberInput): Promise<TResu
       servedHashes: runtime.served,
       signal: input.signal,
       baseFileLines: base.baseLines,
+      stripWarning: input.stripWarning,
     });
   } catch (error) {
     if (error instanceof RangeStaleError) adoptAnchors(base.absolutePath, error.rangeServedMap);
@@ -497,6 +505,7 @@ export async function executeBatchMember(input: BatchMemberInput): Promise<TResu
   const originalSlice = baseLines.slice(start - 1, end);
   const noop = originalSlice.length === newLines.length && originalSlice.every((line, index) => line === newLines[index]);
   const foldedLines = input.foldedLines ?? 0;
+  const separators = input.contentSeparators ?? input.hedit.content_separators;
   const carryIndex =
     input.kind === "insert" && foldedLines > 0
       ? input.direction === "after"
@@ -513,6 +522,7 @@ export async function executeBatchMember(input: BatchMemberInput): Promise<TResu
     fromHash: input.hedit.hash_bounds[0].hash,
     toHash: input.hedit.hash_bounds[1].hash,
     newLines: [...newLines],
+    ...(separators !== undefined ? { separators } : {}),
     warnings: [...input.extraWarnings, ...planned.warnings],
     noop,
     foldedLines,
@@ -569,12 +579,16 @@ function mergeInsertPairs(pieces: BatchPiece[]): BatchPiece[] {
     consumed.add(partner);
     const before = piece.direction === "before" ? piece : partner;
     const after = piece.direction === "before" ? partner : piece;
+    const beforeSeparators = before.separators ?? before.newLines.map(() => undefined);
+    const afterSeparators = after.separators ?? after.newLines.map(() => undefined);
+    const mergedSeparators = [...beforeSeparators.slice(0, before.newLines.length), ...afterSeparators.slice(1)];
     merged.push({
       ...before,
       order: Math.min(before.order, after.order),
       newLines: [...before.newLines, ...after.newLines.slice(1)],
       warnings: [...before.warnings, ...after.warnings],
       foldedLines: before.foldedLines + after.foldedLines - 1,
+      ...(before.separators !== undefined || after.separators !== undefined ? { separators: mergedSeparators } : {}),
     });
   }
   return merged;
@@ -625,19 +639,29 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
     }
   }
   const composed = composeBatchLines(base.content, effectivePieces);
+  const spans = pieceMappingSpans(effectivePieces);
+  const resultSeparators = separatorsForSpans(base.separators, base.hashes.length, spans, composed, base.ending);
+  applySpanEndings(resultSeparators, effectivePieces.map((piece) => ({
+    start: piece.start - 1,
+    end: piece.end - 1,
+    replacementCount: piece.newLines.length,
+    ...(piece.separators !== undefined ? { endings: piece.separators } : {}),
+  })));
   const warnings = [...runtime.warnings];
   if (base.hadUtf8DecodeErrors) warnings.push("Non-UTF-8 bytes were shown as U+FFFD; this edit rewrote the file as UTF-8.");
   try {
     await throwIfStrictInput(dedupeWarnings(warnings));
     assertNotEmpty(base.content, composed);
     assertLineLimit(composed, paths.displayPath, MAX_HASH_LINES);
-    const finalBytes = base.bom + restoreEndings(composed, base.ending);
+    const finalBytes = base.bom + joinSeparators(composed, resultSeparators);
     assertByteLimit(finalBytes, paths.displayPath);
   } catch (error) {
     discardBatchState(runtime);
     if (error instanceof Error) error.message = withAbortSuffix(error.message, runtime.display);
     throw error;
   }
+  const reclaimNotice = formatAnchorReclaimNotice(takeReclaimedPaths());
+  if (reclaimNotice !== undefined) warnings.push(reclaimNotice);
   if (composed === base.content) {
     const snapshotId = await safeSnapId(paths.absolutePath, "noop edit");
     return combinedNoop(paths.displayPath, member, runtime, snapshotId);
@@ -655,12 +679,11 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
     discardBatchState(runtime);
     throw new Error(`[E_OP_ABORTED] Batch ${runtime.display} aborted: the file changed after the batch started. Call read for fresh anchors and retry.`);
   }
-  const preflightSpans = pieceMappingSpans(effectivePieces);
   try {
     await lineHashes(composed, runtime.target, {
       content: base.content,
       hashes: base.hashes,
-      spans: preflightSpans,
+      spans,
     }, undefined, false, true);
   } catch (error) {
     discardBatchState(runtime);
@@ -671,8 +694,10 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
     content: base.content,
     bom: base.bom,
     originalEnding: base.ending,
+    separators: base.separators,
     hashes: base.hashes,
     resultContent: composed,
+    resultSeparators,
   });
   if (!undo.persisted) {
     discardBatchState(runtime);
@@ -680,7 +705,7 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
   }
   try {
     abortIf(signal);
-    await writeAtomic(paths.absolutePath, base.bom + restoreEndings(composed, base.ending), base.identity);
+    await writeAtomic(paths.absolutePath, base.bom + joinSeparators(composed, resultSeparators), base.identity);
   } catch (error) {
     await undo.restore();
     discardBatchState(runtime);
@@ -688,7 +713,6 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
     throw error;
   }
   const updatedSnapshotId = await safeSnapId(paths.absolutePath, "post-edit");
-  const spans = pieceMappingSpans(effectivePieces);
   let resultHashes: string[];
   try {
     resultHashes = await lineHashes(composed, runtime.target, {
@@ -700,6 +724,8 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
     const detail = error instanceof Error ? error.message : String(error);
     throw new Error(`${detail} File was written; anchor finalization failed. One undo reverts. Call read for fresh anchors.`);
   }
+  const writeReclaim = formatAnchorReclaimNotice(takeReclaimedPaths());
+  if (writeReclaim !== undefined) warnings.push(writeReclaim);
   const range = changedRange(base.content, composed);
   let added = 0;
   let removed = 0;
@@ -746,6 +772,8 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
 async function combinedNoop(path: string, member: PlannedMember, runtime: BatchState, snapshotId: string | undefined): Promise<TResult> {
   const executed = runtime.applied + runtime.noops;
   const warnings = [...runtime.warnings];
+  const reclaimNotice = formatAnchorReclaimNotice(takeReclaimedPaths());
+  if (reclaimNotice !== undefined) warnings.push(reclaimNotice);
   const noop = buildNoop(
     {
       path,

package/src/commit.ts

@@ -6,10 +6,12 @@ import { saveUndo } from "./replace-undo";
 import { getDiffContextLines } from "./config";
 import { safeSnapId } from "./file-reader";
 import { writeAtomic } from "./fs-write";
+import { formatAnchorReclaimNotice, takeReclaimedPaths } from "./anchor-registry";
 import { servedHashesFromDiff, serveRows } from "./served";
 import { lineHashes } from "./hashline";
 import { spanForEdit } from "./replace";
-import { restoreEndings, stripBOM, toLF } from "./normalize";
+import { restoreEndings, stripBOM, toLF, type LineEnding } from "./normalize";
+import { applyEndingOverrides, joinSeparators, separatorsForSpans } from "./line-endings";
 export interface CommitMeta {
   editAnchors?: [string, string];
   anchorCarry?: number;
@@ -21,12 +23,15 @@ export interface CommitMeta {
   noopNoun?: string;
   prefixWarnings?: string[];
   foldedAnchorLines?: number;
+  endingOverrides?: (LineEnding | undefined)[];
 }
 
 export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promise<TResult> {
   const { path, absolutePath, mutationTargetPath, signal } = meta;
   const warnings = [...(meta.prefixWarnings ?? []), ...pipe.warnings];
   const editsAttempted = 1;
+  const readReclaim = formatAnchorReclaimNotice(takeReclaimedPaths());
+  if (readReclaim !== undefined) warnings.push(readReclaim);
 
   if (pipe.result === pipe.originalNormalized) {
     const noopSnapshotId = await safeSnapId(absolutePath, "noop edit");
@@ -47,7 +52,18 @@ export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promis
     );
   }
 
-  const finalFileBytes = pipe.bom + restoreEndings(pipe.result, pipe.originalEnding);
+  const span = pipe.spans?.[0] ?? (meta.editAnchors ? spanForEdit(pipe.originalHashes, meta.editAnchors[0], meta.editAnchors[1], pipe.result) : undefined);
+  if (span && meta.anchorCarry !== undefined) span.carry = meta.anchorCarry;
+  const resultSeparators = span
+    ? separatorsForSpans(pipe.originalSeparators, pipe.originalHashes.length, [span], pipe.result, pipe.originalEnding)
+    : undefined;
+  if (resultSeparators !== undefined && span !== undefined) {
+    applyEndingOverrides(resultSeparators, span.start, pipe.contentSeparators);
+    applyEndingOverrides(resultSeparators, span.start, meta.endingOverrides);
+  }
+  const finalFileBytes = pipe.bom + (resultSeparators !== undefined
+    ? joinSeparators(pipe.result, resultSeparators)
+    : restoreEndings(pipe.result, pipe.originalEnding));
   assertByteLimit(finalFileBytes, path);
 
   if (pipe.hadUtf8DecodeErrors) {
@@ -77,8 +93,10 @@ export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promis
     content: pipe.originalNormalized,
     bom: pipe.bom,
     originalEnding: pipe.originalEnding,
+    separators: pipe.originalSeparators,
     hashes: pipe.originalHashes,
     resultContent: pipe.result,
+    ...(resultSeparators !== undefined ? { resultSeparators } : {}),
   });
   if (!undo.persisted) {
     throw new Error(
@@ -107,8 +125,6 @@ export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promis
     removedLines: pipe.totalRemovedLines,
   };
 
-  const span = meta.editAnchors ? spanForEdit(pipe.originalHashes, meta.editAnchors[0], meta.editAnchors[1], pipe.result) : undefined;
-  if (span && meta.anchorCarry !== undefined) span.carry = meta.anchorCarry;
   let resultHashes: string[];
   try {
     resultHashes = await lineHashes(pipe.result, mutationTargetPath, {
@@ -120,6 +136,8 @@ export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promis
     const detail = error instanceof Error ? error.message : String(error);
     throw new Error(`${detail} File was written; anchor finalization failed. One undo reverts. Call read for fresh anchors.`);
   }
+  const writeReclaim = formatAnchorReclaimNotice(takeReclaimedPaths());
+  if (writeReclaim !== undefined) warnings.push(writeReclaim);
   const successInput = {
     path,
     originalNormalized: pipe.originalNormalized,

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" | "autoReadAll" | "autoReadAllIgnore" | "anchorGrepEnabled" | "requirePath" | "strictInput" | "diffContextLines";
+export type ConfigToggleKey = "autoRead" | "autoReadAll" | "autoReadAllIgnore" | "anchorGrepEnabled" | "copyMoveEnabled" | "requirePath" | "strictInput" | "diffContextLines";
 
 export interface ConfigRow {
   key: ConfigToggleKey;
@@ -23,6 +23,7 @@ export function configRows(config: Config): ConfigRow[] {
     { key: "autoReadAllIgnore", label: "Ignore folders/files", hint: "Extra folders, files, or globs skipped by auto-read all (comma-separated)", enabled: (config.autoReadAllIgnore ?? []).length > 0, folders: config.autoReadAllIgnore ?? [] },
     { 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: "copyMoveEnabled", label: "Copy/move", hint: "copy and move tools (both off while disabled)", enabled: config.copyMoveEnabled !== false },
     { 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 },
   ];

package/src/config.ts

@@ -13,6 +13,7 @@ export const MAX_DIFF_CONTEXT_LINES = 10;
 export interface Config {
   autoRead: boolean;
   anchorGrepEnabled: boolean;
+  copyMoveEnabled?: boolean;
   autoReadAll?: AutoReadAllMode;
   autoReadAllIgnore?: string[];
   requirePath?: boolean;
@@ -23,6 +24,7 @@ export interface Config {
 const DEFAULT_CONFIG: Config = {
   autoRead: true,
   anchorGrepEnabled: true,
+  copyMoveEnabled: true,
   autoReadAll: "off",
   autoReadAllIgnore: [],
   requirePath: false,
@@ -72,6 +74,7 @@ function parseConfig(content: string): Config {
   }
   const autoRead = parsed.autoRead;
   const anchorGrepEnabled = parsed.anchorGrepEnabled;
+  const copyMoveEnabled = parsed.copyMoveEnabled;
   const autoReadAll = parsed.autoReadAll;
   const requirePath = parsed.requirePath;
   const strictInput = parsed.strictInput;
@@ -80,6 +83,7 @@ function parseConfig(content: string): Config {
   return {
     autoRead: typeof autoRead === "boolean" ? autoRead : DEFAULT_CONFIG.autoRead,
     anchorGrepEnabled: typeof anchorGrepEnabled === "boolean" ? anchorGrepEnabled : DEFAULT_CONFIG.anchorGrepEnabled,
+    copyMoveEnabled: typeof copyMoveEnabled === "boolean" ? copyMoveEnabled : DEFAULT_CONFIG.copyMoveEnabled,
     autoReadAll: parseAutoReadAllMode(autoReadAll),
     requirePath: typeof requirePath === "boolean" ? requirePath : DEFAULT_CONFIG.requirePath,
     strictInput: typeof strictInput === "boolean" ? strictInput : DEFAULT_CONFIG.strictInput,
@@ -192,7 +196,7 @@ export async function writeConfig(config: Config): Promise<void> {
 }
 
 
-type ToggleKey = "autoRead" | "anchorGrepEnabled" | "requirePath" | "strictInput";
+type ToggleKey = "autoRead" | "anchorGrepEnabled" | "copyMoveEnabled" | "requirePath" | "strictInput";
 
 async function toggleFlag(key: ToggleKey): Promise<boolean> {
   const config = await updateConfig((c) => { c[key] = !(c[key] === true); });
@@ -200,6 +204,7 @@ async function toggleFlag(key: ToggleKey): Promise<boolean> {
 }
 export const toggleAutoRead = (): Promise<boolean> => toggleFlag("autoRead");
 export const toggleAnchorGrep = (): Promise<boolean> => toggleFlag("anchorGrepEnabled");
+export const toggleCopyMove = (): Promise<boolean> => toggleFlag("copyMoveEnabled");
 export async function cycleAutoReadAllMode(): Promise<AutoReadAllMode> {
   let next: AutoReadAllMode = "off";
   await updateConfig((c) => {

package/src/constants.ts

@@ -9,7 +9,7 @@ export const MAX_GREP_LINE_BYTES = 500;
 export const MAX_DIFF_INPUT_BYTES = 1024 * 1024;
 
 export const HASH_STORE_BUSY_TIMEOUT = 1000;
-export const HASH_STORE_VERSION = 8;
+export const HASH_STORE_VERSION = 9;
 export const NEW_CONTENT_NOT_ARRAY_MSG =
   `[E_BAD_SHAPE] "replacement_lines" must be an array of strings, one per line (use [] to delete).`;
 
@@ -19,6 +19,9 @@ export const NUL_CONTENT_MSG =
 export const ANCHOR_POOL_EXHAUSTED_PREFIX =
   "[E_FILE_TOO_LARGE] The session's anchor pool is exhausted";
 
+export const ANCHOR_RECLAIM_WARNING_CODE = "[W_ANCHOR_RECLAIMED]";
+export const MAX_RECLAIMED_PATHS_REPORTED = 10;
+
 export const AUTO_READ_ALL_CUSTOM_TYPE = "hashline-auto-read-all";
 export const AUTO_READ_ALL_MAX_FILES = 500;
 export const AUTO_READ_ALL_MAX_FILE_BYTES = 200_000;