pi-hashline-edit-pro 4.5.3 → 5.1.0

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" | "copyMoveEnabled" | "requirePath" | "strictInput" | "diffContextLines";
+export type ConfigToggleKey = "autoRead" | "autoReadAll" | "autoReadAllIgnore" | "anchorGrepEnabled" | "copyMoveEnabled" | "replaceWithinEnabled" | "requirePath" | "strictInput" | "diffContextLines";
 
 export interface ConfigRow {
   key: ConfigToggleKey;
@@ -26,6 +26,7 @@ export function configRows(config: Config): ConfigRow[] {
     { 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, copy, move 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 },
+    { key: "replaceWithinEnabled", label: "Replace within", hint: "replace_within tool (off while disabled)", enabled: config.replaceWithinEnabled !== false },
   ];
 }
 

package/src/config.ts

@@ -14,6 +14,7 @@ export interface Config {
   autoRead: boolean;
   anchorGrepEnabled: boolean;
   copyMoveEnabled?: boolean;
+  replaceWithinEnabled?: boolean;
   autoReadAll?: AutoReadAllMode;
   autoReadAllIgnore?: string[];
   requirePath?: boolean;
@@ -25,6 +26,7 @@ const DEFAULT_CONFIG: Config = {
   autoRead: true,
   anchorGrepEnabled: true,
   copyMoveEnabled: true,
+  replaceWithinEnabled: true,
   autoReadAll: "off",
   autoReadAllIgnore: [],
   requirePath: false,
@@ -75,6 +77,7 @@ function parseConfig(content: string): Config {
   const autoRead = parsed.autoRead;
   const anchorGrepEnabled = parsed.anchorGrepEnabled;
   const copyMoveEnabled = parsed.copyMoveEnabled;
+  const replaceWithinEnabled = parsed.replaceWithinEnabled;
   const autoReadAll = parsed.autoReadAll;
   const requirePath = parsed.requirePath;
   const strictInput = parsed.strictInput;
@@ -84,6 +87,7 @@ function parseConfig(content: string): Config {
     autoRead: typeof autoRead === "boolean" ? autoRead : DEFAULT_CONFIG.autoRead,
     anchorGrepEnabled: typeof anchorGrepEnabled === "boolean" ? anchorGrepEnabled : DEFAULT_CONFIG.anchorGrepEnabled,
     copyMoveEnabled: typeof copyMoveEnabled === "boolean" ? copyMoveEnabled : DEFAULT_CONFIG.copyMoveEnabled,
+    replaceWithinEnabled: typeof replaceWithinEnabled === "boolean" ? replaceWithinEnabled : DEFAULT_CONFIG.replaceWithinEnabled,
     autoReadAll: parseAutoReadAllMode(autoReadAll),
     requirePath: typeof requirePath === "boolean" ? requirePath : DEFAULT_CONFIG.requirePath,
     strictInput: typeof strictInput === "boolean" ? strictInput : DEFAULT_CONFIG.strictInput,
@@ -196,7 +200,7 @@ export async function writeConfig(config: Config): Promise<void> {
 }
 
 
-type ToggleKey = "autoRead" | "anchorGrepEnabled" | "copyMoveEnabled" | "requirePath" | "strictInput";
+type ToggleKey = "autoRead" | "anchorGrepEnabled" | "copyMoveEnabled" | "replaceWithinEnabled" | "requirePath" | "strictInput";
 
 async function toggleFlag(key: ToggleKey): Promise<boolean> {
   const config = await updateConfig((c) => { c[key] = !(c[key] === true); });
@@ -205,6 +209,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 const toggleReplaceWithin = (): Promise<boolean> => toggleFlag("replaceWithinEnabled");
 export async function cycleAutoReadAllMode(): Promise<AutoReadAllMode> {
   let next: AutoReadAllMode = "off";
   await updateConfig((c) => {

package/src/constants.ts

@@ -13,8 +13,14 @@ 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).`;
 
+export const NEW_CONTENT_NOT_STRING_MSG =
+  `[E_BAD_SHAPE] "replacement_lines" must be a string holding the exact text to write. Use "" to delete the range and "\\n" for one blank line; line breaks inside the string separate lines.`;
+
+export const LINES_NOT_STRING_MSG =
+  `[E_BAD_SHAPE] "lines" must be a string holding the exact text to insert. Use "\\n" for one blank line; line breaks inside the string separate lines.`;
+
 export const NUL_CONTENT_MSG =
-  `[E_BAD_SHAPE] Content contains a NUL byte (U+0000); a text file cannot contain NUL, and writing it would break further reads and edits. Remove the NUL byte and retry. An empty replacement ([]) deletes a range or inserts nothing.`;
+  `[E_BAD_SHAPE] Content contains a NUL byte (U+0000); a text file cannot contain NUL, and writing it would break further reads and edits. Remove the NUL byte and retry. An empty replacement ([]) deletes a range.`;
 
 export const ANCHOR_POOL_EXHAUSTED_PREFIX =
   "[E_FILE_TOO_LARGE] The session's anchor pool is exhausted";

package/src/copy-move.ts

@@ -2,7 +2,7 @@ import type { ExtensionAPI, ToolDefinition } from "@earendil-works/pi-coding-age
 import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize, truncateHead, withFileMutationQueue } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { constants } from "node:fs";
-import { execPipeline, noteAnchorError, previewFromPipe, previewError, type PipelineResult, type ReqParams, type ReplaceDetails } from "./replace";
+import { execPipeline, noteAnchorError, previewFromPipe, previewError, type PipelineResult, type ReplaceDetails } from "./replace";
 import { commitEdit } from "./commit";
 import { readNormFile, safeSnapId, type NormFile } from "./file-reader";
 import {
@@ -14,6 +14,7 @@ import {
   resolveAnchorLine,
   stripAnchorRow,
   type Anchor,
+  type HTEdit,
 } from "./hashline";
 import { formatAnchorReclaimNotice, servedForPath, takeReclaimedPaths, withAnchorSession } from "./anchor-registry";
 import { loadP, loadGuide } from "./prompts";
@@ -49,7 +50,7 @@ interface TransferRefs {
 }
 
 export interface TransferPlan {
-  editParams: ReqParams;
+  editParams: HTEdit;
   foldedAnchorLines: number;
   anchorCarry?: number;
   servedOverride?: ReadonlyMap<string, string>;
@@ -157,7 +158,8 @@ export function buildTransferEdit(input: {
     );
   }
   assertRangeVerified(fileLines, preload.fileHashes, insertLine, insertLine, served, displayPath);
-  assertRangeVerified(fileLines, preload.fileHashes, sourceStart, sourceEnd, served, displayPath);
+  assertRangeVerified(fileLines, preload.fileHashes, sourceStart, sourceStart, served, displayPath);
+  assertRangeVerified(fileLines, preload.fileHashes, sourceEnd, sourceEnd, served, displayPath);
   const sourceLines = fileLines.slice(sourceStart - 1, sourceEnd);
   const sourceEndings = endingsForRange(preload.endingSeparators, sourceStart, sourceEnd);
   if (kind === "copy") {
@@ -224,10 +226,10 @@ interface CrossTransferPreparation {
   destinationPreload: NormFile;
   sourceDisplay: string;
   destinationDisplay: string;
-  destinationEdit: ReqParams;
+  destinationEdit: HTEdit;
   destinationFolded: number;
   endingOverrides: (LineEnding | undefined)[];
-  sourceEdit?: ReqParams;
+  sourceEdit?: HTEdit;
 }
 
 async function prepareCrossTransfer(input: {
@@ -271,7 +273,8 @@ async function prepareCrossTransfer(input: {
     throw error;
   }
   try {
-    assertRangeVerified(sourceLines, sourcePreload.fileHashes, sourceStart, sourceEnd, sourceServed, sourceDisplay);
+    assertRangeVerified(sourceLines, sourcePreload.fileHashes, sourceStart, sourceStart, sourceServed, sourceDisplay);
+    assertRangeVerified(sourceLines, sourcePreload.fileHashes, sourceEnd, sourceEnd, sourceServed, sourceDisplay);
   } catch (error) {
     await adopt(sourcePreload.absolutePath, error);
     throw error;
@@ -292,7 +295,7 @@ async function prepareCrossTransfer(input: {
   }
 
   const moved = sourceLines.slice(sourceStart - 1, sourceEnd);
-  const destinationEdit: ReqParams = destinationPreload.normalized.length === 0
+  const destinationEdit: HTEdit = destinationPreload.normalized.length === 0
     ? {
         remove_from: destinationPreload.fileHashes[0]!,
         remove_to: destinationPreload.fileHashes[0]!,
@@ -309,7 +312,7 @@ async function prepareCrossTransfer(input: {
   if (kind === "copy") {
     return { sourcePreload, destinationPreload, sourceDisplay, destinationDisplay, destinationEdit, destinationFolded, endingOverrides };
   }
-  const sourceEdit: ReqParams = {
+  const sourceEdit: HTEdit = {
     remove_from: sourcePreload.fileHashes[sourceStart - 1]!,
     remove_to: sourcePreload.fileHashes[sourceEnd - 1]!,
     replacement_lines: [],
@@ -566,6 +569,7 @@ async function executeCrossFile(
       signal,
       preloadedNorm: prepared.sourcePreload,
       allowEmpty: true,
+      preserveDeletionSeparators: false,
     });
     return commitMovePair({
       source: { pipe: sourcePipe, displayPath: prepared.sourceDisplay, absolutePath: source.absolute, mutationTargetPath: source.resolved, foldedAnchorLines: 0 },
@@ -630,6 +634,7 @@ export async function transferPreview(kind: TransferKind, request: unknown, cwd:
       noPersist: true,
       preloadedNorm: prepared.sourcePreload,
       allowEmpty: true,
+      preserveDeletionSeparators: false,
       signal,
     });
     const destinationPreview = previewFromPipe(destinationPipe);
@@ -671,19 +676,19 @@ function getTransferInput(args: unknown): { path?: string; source_from?: string;
 
 const transferSourceFromSchema = Type.String({
   description:
-    "Bare 4-char anchor from a served anchor│content row (the text before the `│` separator), never the row content. Marks the FIRST source line (inclusive); this anchor and `source_to` resolve the source file.",
+    "4-char anchor of the FIRST source line to copy (never the row content).",
 });
 const transferSourceToSchema = Type.String({
   description:
-    "Bare 4-char anchor from a served anchor│content row (the text before the `│` separator), never the row content. Marks the LAST source line (inclusive); this anchor and `source_from` resolve the source file.",
+    "4-char anchor of the LAST source line to copy.",
 });
 const transferInsertAfterSchema = Type.String({
   description:
-    "Bare 4-char anchor of the destination line after which the block goes; it may live in another file than the source, and the destination file is the one this anchor belongs to. The anchor line is preserved.",
+    "4-char anchor of the destination line; the block goes after it and may live in another file.",
 });
 const transferPathRequiredSchema = Type.String({
   description:
-    "Path to the source or destination file the anchors were served for; required and must match anchor ownership. The anchors still resolve both files.",
+    "Path to the source or destination file the anchors were served for; required and must match anchor ownership.",
 });
 
 const transferToolSchema = Type.Object(
@@ -718,7 +723,6 @@ export function buildTransferToolDef(kind: TransferKind, flags: EditToolFlags =
       guidelines: loadGuide(`../prompts/${kind}-guidelines.md`),
     },
     flags,
-    kind,
   );
   return {
     name: kind,

package/src/edit-common.ts

@@ -13,13 +13,17 @@ export interface EditToolFlags {
   strictInput: boolean;
   autoRead: boolean;
   autoReadAllActive: boolean;
+  replaceWithinEnabled: boolean;
+  copyMoveEnabled: boolean;
 }
 
 export const DEFAULT_EDIT_FLAGS: EditToolFlags = {
   requirePath: false,
   strictInput: false,
   autoRead: true,
-  autoReadAllActive: false
+  autoReadAllActive: false,
+  replaceWithinEnabled: true,
+  copyMoveEnabled: true
 };
 
 export async function currentEditFlags(): Promise<EditToolFlags> {
@@ -28,44 +32,52 @@ export async function currentEditFlags(): Promise<EditToolFlags> {
     requirePath: config.requirePath === true,
     strictInput: config.strictInput === true,
     autoRead: config.autoRead !== false,
-    autoReadAllActive: (config.autoReadAll ?? "off") !== "off"
+    autoReadAllActive: (config.autoReadAll ?? "off") !== "off",
+    replaceWithinEnabled: config.replaceWithinEnabled !== false,
+    copyMoveEnabled: config.copyMoveEnabled !== false
   };
 }
 
+function preferenceGuideline(flags: EditToolFlags): string {
+  const tools = gatedEditOps(["read", "replace", "replace_within", "insert", "copy", "move", "undo_last_change"], flags);
+  return `Prefer the hashline tools for anything that touches files: ${joinOps(tools, { backtick: true })}.`;
+}
+
 export function withReplacePrompts(base: { description: string; snippet: string; guidelines: string[] }, flags: EditToolFlags): { description: string; snippet: string; guidelines: string[] } {
   let description = base.description;
   const snippetParts = [base.snippet];
-  let guidelines = [...base.guidelines];
+  let guidelines = [preferenceGuideline(flags), ...base.guidelines];
   if (!flags.autoRead) {
     description = description.replace(/\n\nExample:[\s\S]*$/, "");
     guidelines = guidelines.filter((guideline) => !guideline.includes("post-edit diff"));
     description = description.replace("and the last call shows the combined diff,", "and the last call shows the combined result,");
   }
+  if (!flags.replaceWithinEnabled) {
+    description = description.replace(/\n?To change only part of a line without retyping the rest, use `replace_within` instead; it preserves every character the request does not name\./, "");
+  }
   const descriptionParts = [description];
   if (flags.requirePath) {
     descriptionParts.push("Also give `path` matching the file the anchors were served for; it is required and must match anchor ownership.");
     snippetParts.push("; include `path` (required)");
-    guidelines.push("`replace`: include `path` matching the file the anchors were served for; it is required.");
   } else {
     descriptionParts.push("Path resolution is anchor-only; do not pass `path`.");
-    guidelines.push("`replace`: path resolution is anchor-only; don't pass `path`.");
   }
   if (flags.strictInput) {
     descriptionParts.push("Strict-input mode is on: auto-fixable slips are rejected instead of fixed with warnings.");
-    guidelines.push("`replace`: strict-input is on: auto-fixable slips are rejected instead of fixed.");
   }
   return { description: descriptionParts.join(" "), snippet: snippetParts.join(""), guidelines };
 }
 
 export function withReadPrompts(base: { description: string; snippet: string; guidelines: string[] }, flags: EditToolFlags): { description: string; snippet: string; guidelines: string[] } {
+  const preference = preferenceGuideline(flags);
   if (flags.autoReadAllActive) {
     const rewritten = base.guidelines
       .filter((guideline) => !guideline.includes("call again after an edit"))
-    return { description: base.description, snippet: base.snippet, guidelines: [...rewritten] };
+    return { description: base.description, snippet: base.snippet, guidelines: [preference, ...rewritten] };
   }
   const withoutAutoReadAll = base.guidelines.filter((guideline) => !guideline.includes("E_AUTO_READ_ALL"))
-  if (flags.autoRead) return { description: base.description, snippet: base.snippet, guidelines: [...withoutAutoReadAll] };
-  const guidelines = [...withoutAutoReadAll];
+  if (flags.autoRead) return { description: base.description, snippet: base.snippet, guidelines: [preference, ...withoutAutoReadAll] };
+  const guidelines = [preference, ...withoutAutoReadAll];
   const mapped = guidelines.map((guideline) => guideline.startsWith("`read`: call again after an edit") ? "`read`: call again after an edit when you need anchors you lack." : guideline);
   return { description: base.description, snippet: base.snippet, guidelines: mapped };
 }
@@ -78,39 +90,84 @@ export function withInsertPrompts(base: { description: string; snippet: string;
   if (flags.requirePath) {
     descriptionParts.push("Also give `path` matching the file the anchor was served for; it is required and must match anchor ownership.");
     snippetParts.push("; include `path` (required)");
-    guidelines.push("`insert`: include `path` matching the file the anchor was served for; it is required.");
   } else {
     descriptionParts.push("Path resolution is anchor-only; do not pass `path`.");
-    guidelines.push("`insert`: path resolution is anchor-only; don't pass `path`.");
   }
   if (flags.strictInput) {
     descriptionParts.push("Strict-input mode is on: auto-fixable slips are rejected instead of fixed with warnings.");
-    guidelines.push("`insert`: strict-input is on: auto-fixable slips are rejected instead of fixed.");
   }
   return { description: descriptionParts.join(" "), snippet: snippetParts.join(""), guidelines };
 }
 
+export function withReplaceWithinPrompts(base: { description: string; snippet: string; guidelines: string[] }, flags: EditToolFlags): { description: string; snippet: string; guidelines: string[] } {
+  const descriptionParts = [base.description];
+  const snippetParts = [base.snippet];
+  const guidelines = [...base.guidelines];
+  if (flags.requirePath) {
+    descriptionParts.push("Also give `path` matching the file the anchors were served for; it is required and must match anchor ownership.");
+    snippetParts.push("; include `path` (required)");
+  } else {
+    descriptionParts.push("Path resolution is anchor-only; do not pass `path`.");
+  }
+  if (flags.strictInput) {
+    descriptionParts.push("Strict-input mode is on: auto-fixable slips are rejected instead of fixed with warnings.");
+  }
+  return { description: descriptionParts.join(" "), snippet: snippetParts.join(""), guidelines };
+}
+
+function gatedEditOps(ops: string[], flags: EditToolFlags): string[] {
+  return ops.filter((op) => {
+    if (op === "replace_within") return flags.replaceWithinEnabled;
+    if (op === "copy" || op === "move") return flags.copyMoveEnabled;
+    return true;
+  });
+}
+
+function joinOps(ops: string[], options?: { backtick?: boolean; separator?: "/" }): string {
+  const formatted = ops.map((op) => (options?.backtick ? `\`${op}\`` : op));
+  if (options?.separator === "/") return formatted.join("/");
+  if (formatted.length <= 1) return formatted[0] ?? "";
+  const last = formatted[formatted.length - 1]!;
+  const head = formatted.slice(0, -1).join(", ");
+  return formatted.length === 2 ? `${head} or ${last}` : `${head}, or ${last}`;
+}
+
+export function withGrepPrompts(base: { description: string; snippet: string }, flags: EditToolFlags): { description: string; snippet: string } {
+  if (flags.copyMoveEnabled) return base;
+  return { ...base, description: base.description.replaceAll("replace, insert, copy, or move", joinOps(gatedEditOps(["replace", "insert", "copy", "move"], flags))) };
+}
+
 export function withUndoPrompts(base: { description: string; snippet: string; guidelines: string[] }, flags: EditToolFlags): { description: string; snippet: string; guidelines: string[] } {
-  if (flags.autoRead) return { description: base.description, snippet: base.snippet, guidelines: [...base.guidelines] };
-  const guidelines = base.guidelines.map((guideline) => guideline.includes("bad diff") ? "`undo_last_change`: only the last `replace`/`insert` per file is undoable; a `write` clears it, so undo right after a bad edit — review what you're restoring." : guideline);
-  return { description: base.description, snippet: base.snippet, guidelines };
+  const ops = gatedEditOps(["replace", "replace_within", "insert", "copy", "move"], flags);
+  let description = base.description;
+  let snippet = base.snippet;
+  let guidelines = [...base.guidelines];
+  if (!flags.autoRead) {
+    guidelines = guidelines.map((guideline) => guideline.includes("bad diff") ? "`undo_last_change`: only the last `replace`/`replace_within`/`insert`/`copy`/`move` per file is undoable; a `write` clears it, so undo right after a bad edit — review what you're restoring." : guideline);
+  }
+  if (ops.length !== 5) {
+    description = description.replaceAll("replace, replace_within, insert, copy, or move", joinOps(ops));
+    snippet = snippet.replaceAll("`replace`, `replace_within`, `insert`, `copy`, or `move`", joinOps(ops, { backtick: true }));
+    guidelines = guidelines.map((guideline) => guideline.replaceAll("`replace`/`replace_within`/`insert`/`copy`/`move`", joinOps(ops, { backtick: true, separator: "/" })));
+  }
+  if (!flags.copyMoveEnabled) {
+    guidelines = guidelines.filter((guideline) => !guideline.includes("cross-file `move`"));
+  }
+  return { description, snippet, guidelines };
 }
 
-export function withTransferPrompts(base: { description: string; snippet: string; guidelines: string[] }, flags: EditToolFlags, toolName: "copy" | "move"): { description: string; snippet: string; guidelines: string[] } {
+export function withTransferPrompts(base: { description: string; snippet: string; guidelines: string[] }, flags: EditToolFlags): { description: string; snippet: string; guidelines: string[] } {
   const descriptionParts = [base.description];
   const snippetParts = [base.snippet];
   const guidelines = [...base.guidelines];
   if (flags.requirePath) {
     descriptionParts.push("Also give `path` matching the source or destination file the anchors were served for; it is required and must match anchor ownership.");
     snippetParts.push("; include `path` (required)");
-    guidelines.push(`\`${toolName}\`: include \`path\` matching the source or destination file the anchors were served for; it is required.`);
   } else {
     descriptionParts.push("Path resolution is anchor-only; do not pass `path`.");
-    guidelines.push(`\`${toolName}\`: path resolution is anchor-only; don't pass \`path\`.`);
   }
   if (flags.strictInput) {
     descriptionParts.push("Strict-input mode is on: auto-fixable slips are rejected instead of fixed with warnings.");
-    guidelines.push(`\`${toolName}\`: strict-input is on: auto-fixable slips are rejected instead of fixed.`);
   }
   return { description: descriptionParts.join(" "), snippet: snippetParts.join(""), guidelines };
 }