pi-hashline-edit-pro 0.4.3 → 0.6.0

package/src/{edit.ts → replace.ts}

@@ -14,8 +14,8 @@ import {
 	normalizeToLF,
 	restoreLineEndings,
 	stripBom,
-} from "./edit-diff";
-import { normalizeEditRequest } from "./edit-normalize";
+} from "./replace-diff";
+import { normalizeReplaceRequest } from "./replace-normalize";
 import { isRecord, hasOwn } from "./utils";
 import { resolveMutationTargetPath, writeFileAtomically } from "./fs-write";
 import {
@@ -33,9 +33,9 @@ import {
 	buildFullResponse,
 	buildNoopResponse,
 	buildRangesResponse,
-	type EditMeta,
+	type ReplaceMeta,
 	type ReturnMode,
-} from "./edit-response";
+} from "./replace-response";
 import {
 	buildAppliedChangedResultText,
 	createRenderedEditMarkdownTheme,
@@ -44,9 +44,9 @@ import {
 	getRenderablePreviewInput,
 	getRenderedEditTextContent,
 	isAppliedChangedResult,
-	type EditPreview,
-	type EditRenderState,
-} from "./edit-render";
+	type ReplacePreview,
+	type ReplaceRenderState,
+} from "./replace-render";
 
 function stringEnumSchema<const Values extends readonly string[]>(
 	values: Values,
@@ -82,29 +82,16 @@ const returnRangeSchema = Type.Object(
 
 const hashlineEditItemSchema = Type.Object(
 	{
-		op: stringEnumSchema(
-			["replace", "append", "prepend"] as const,
-			{
-				description:
-					'edit operation. "replace" requires "start" + "end" (inclusive range); "append"/"prepend" take an optional "pos" anchor. Every edit must set op. The legacy "replace_text" op is no longer supported; use a hash-anchored "replace" instead.',
-			},
-		),
 		start: Type.Optional(
 			Type.String({
 				description:
-					"required range-start anchor for op \"replace\" (hash anchor like \"aB3x\" copied from read output); no content may follow the anchor",
+					"required range-start anchor (hash anchor like \"aB3x\" copied from read output); no content may follow the anchor",
 			}),
 		),
 		end: Type.Optional(
 			Type.String({
 				description:
-					"required range-end anchor for op \"replace\" (hash anchor like \"aB3x\"). To replace a single line, set start = end = the line's anchor",
-			}),
-		),
-		pos: Type.Optional(
-			Type.String({
-				description:
-					"anchor for op \"append\" or \"prepend\" (hash anchor like \"aB3x\"). Omit for file-boundary insertion (EOF/BOF).",				
+					"required range-end anchor (hash anchor like \"aB3x\"). To replace a single line, set start = end = the line's anchor",
 			}),
 		),
 		lines: Type.Optional(hashlineEditLinesSchema),
@@ -149,14 +136,14 @@ type FullContentPreview = {
 	nextOffset?: number;
 };
 
-export type EditRequestParams = {
+export type ReplaceRequestParams = {
 	path: string;
 	returnMode?: "changed" | "full" | "ranges";
 	returnRanges?: ReturnRange[];
 	edits?: HashlineToolEdit[];
 };
 
-type EditMetrics = {
+type ReplaceMetrics = {
 	edits_attempted: number;
 	edits_noop: number;
 	warnings: number;
@@ -167,7 +154,7 @@ type EditMetrics = {
 	removed_lines?: number;
 };
 
-export type HashlineEditToolDetails = {
+export type HashlineReplaceToolDetails = {
 	diff: string;
 	firstChangedLine?: number;
 	/**
@@ -185,22 +172,22 @@ export type HashlineEditToolDetails = {
 	 * Phase 2 C — opt-in observability surface for hosts. Never echoed in text.
 	 * Hosts can use it for adoption/regression dashboards.
 	 */
-	metrics?: EditMetrics;
+	metrics?: ReplaceMetrics;
 };
 
 const EDIT_DESC = readFileSync(
-	new URL("../prompts/edit.md", import.meta.url),
+	new URL("../prompts/replace.md", import.meta.url),
 	"utf-8",
 ).trim();
 
 const EDIT_PROMPT_SNIPPET = readFileSync(
-	new URL("../prompts/edit-snippet.md", import.meta.url),
+	new URL("../prompts/replace-snippet.md", import.meta.url),
 	"utf-8",
 ).trim();
 
 
 const EDIT_PROMPT_GUIDELINES = readFileSync(
-	new URL("../prompts/edit-guidelines.md", import.meta.url),
+	new URL("../prompts/replace-guidelines.md", import.meta.url),
 	"utf-8",
 )
 	.split("\n")
@@ -209,9 +196,9 @@ const EDIT_PROMPT_GUIDELINES = readFileSync(
 	.map((line) => line.slice(2));
 const ROOT_KEYS = new Set(["path", "returnMode", "returnRanges", "edits"]);
 
-export function assertEditRequest(
+export function assertReplaceRequest(
 	request: unknown,
-): asserts request is EditRequestParams {
+): asserts request is ReplaceRequestParams {
 	if (!isRecord(request)) {
 		throw new Error("[E_BAD_SHAPE] Edit request must be an object.");
 	}
@@ -219,7 +206,7 @@ export function assertEditRequest(
 	for (const legacyKey of ["oldText", "newText", "old_text", "new_text"]) {
 		if (hasOwn(request, legacyKey)) {
 			throw new Error(
-				`[E_LEGACY_SHAPE] "${legacyKey}" is not supported. Use {op:"replace", start:"<HASH>", end:"<HASH", lines:[...]}.`
+				`[E_LEGACY_SHAPE] "${legacyKey}" is not supported. Use {start:"<HASH>", end:"<HASH>", lines:[...]}.`
 			);
 		}
 	}
@@ -320,8 +307,8 @@ async function executeEditPipeline(
 	lastChangedLine?: number;
 	originalHashes?: string[];
 }> {
-	const normalized = normalizeEditRequest(request);
-	assertEditRequest(normalized);
+	const normalized = normalizeReplaceRequest(request);
+	assertReplaceRequest(normalized);
 
 	const params = normalized;
 	const path = params.path;
@@ -400,10 +387,10 @@ async function executeEditPipeline(
 	};
 }
 
-export async function computeEditPreview(
+export async function computeReplacePreview(
 	request: unknown,
 	cwd: string,
-): Promise<EditPreview> {
+): Promise<ReplacePreview> {
 	try {
 		const { path, originalNormalized, result } = await executeEditPipeline(
 			request,
@@ -425,19 +412,19 @@ export async function computeEditPreview(
 
 type EditToolDefinition = ToolDefinition<
 	typeof hashlineEditToolSchema,
-	HashlineEditToolDetails,
-	EditRenderState
+	HashlineReplaceToolDetails,
+	ReplaceRenderState
 > & { renderShell?: "default" | "self" };
 
 const editToolDefinition: EditToolDefinition = {
-	name: "edit",
-	label: "Edit",
+	name: "replace",
+	label: "Replace",
 	description: EDIT_DESC,
 	parameters: hashlineEditToolSchema,
 	promptSnippet: EDIT_PROMPT_SNIPPET,
 	promptGuidelines: EDIT_PROMPT_GUIDELINES,
 	prepareArguments: (args: unknown) =>
-		normalizeEditRequest(args) as EditRequestParams,
+		normalizeReplaceRequest(args) as ReplaceRequestParams,
 	renderShell: "default",
 	renderCall(args, theme, context) {
 		const previewInput = getRenderablePreviewInput(args);
@@ -458,7 +445,7 @@ const editToolDefinition: EditToolDefinition = {
 				context.state.preview = undefined;
 				const previewGeneration = (context.state.previewGeneration ?? 0) + 1;
 				context.state.previewGeneration = previewGeneration;
-				computeEditPreview(previewInput, context.cwd)
+				computeReplacePreview(previewInput, context.cwd)
 					.then((preview) => {
 						if (
 							context.state.argsKey === argsKey &&
@@ -486,7 +473,7 @@ const editToolDefinition: EditToolDefinition = {
 		text.setText(
 			formatEditCall(
 				getRenderablePreviewInput(args) ?? undefined,
-				context.state as EditRenderState,
+				context.state as ReplaceRenderState,
 				context.expanded,
 				theme,
 			),
@@ -504,11 +491,11 @@ const editToolDefinition: EditToolDefinition = {
 
 		const typedResult = result as {
 			content?: Array<{ type: string; text?: string }>;
-			details?: HashlineEditToolDetails;
+			details?: HashlineReplaceToolDetails;
 		};
 		const renderedText = getRenderedEditTextContent(typedResult);
 
-		const renderState = context.state as EditRenderState | undefined;
+		const renderState = context.state as ReplaceRenderState | undefined;
 		const previewBeforeResult = renderState?.preview;
 		if (renderState) {
 			renderState.preview = undefined;
@@ -558,8 +545,8 @@ const editToolDefinition: EditToolDefinition = {
 	},
 
 	async execute(_toolCallId, params, signal, _onUpdate, ctx) {
-		const normalized = normalizeEditRequest(params);
-		assertEditRequest(normalized);
+		const normalized = normalizeReplaceRequest(params);
+		assertReplaceRequest(normalized);
 		const normalizedParams = normalized;
 		const path = normalizedParams.path;
 		const absolutePath = resolveToCwd(path, ctx.cwd);
@@ -622,7 +609,7 @@ const editToolDefinition: EditToolDefinition = {
 			const updatedSnapshotId = (await getFileSnapshot(absolutePath))
 				.snapshotId;
 
-			const editMeta: EditMeta = {
+			const editMeta: ReplaceMeta = {
 				editsAttempted,
 				noopEditsCount: noopEdits?.length ?? 0,
 				firstChangedLine,
@@ -648,6 +635,6 @@ const editToolDefinition: EditToolDefinition = {
 	},
 };
 
-export function registerEditTool(pi: ExtensionAPI): void {
+export function registerReplaceTool(pi: ExtensionAPI): void {
 	pi.registerTool(editToolDefinition);
 }

package/prompts/edit-guidelines.md

@@ -1,3 +0,0 @@
-- Use edit with HASH anchors for all file changes; batch every change to one file into a single edit call.
-- After a successful edit, the returned `--- Anchors ---` block replaces a re-read for nearby follow-up edits.
-- On `[E_STALE_ANCHOR]`, retry with the `>>>` lines quoted in the error instead of re-reading the whole file.

package/prompts/edit-snippet.md

@@ -1 +0,0 @@
-Edit a text file via HASH anchors from read, batching all edits to a file in one call

package/prompts/edit.md

@@ -1,58 +0,0 @@
-Patch a text file using `HASH` anchors copied verbatim from `read`.
-
-Put all operations on one file in a single `edit` call. Stack every region into the `edits` array, even when they are far apart. Anchors within one call must all come from the same pre-edit read; the runtime applies them atomically against that one snapshot, so you do not adjust anchors for line-number shifts between edits in the same call.
-
-Anchors are 4 characters (e.g. `aB3x`), alphabet `A-Za-z0-9-_`. The wire format for `start`/`end`/`pos` is the anchor only — no line number, no trailing content, no line content.
-
-Ops:
-- `replace` — replace the inclusive range `start`..`end`. Both anchors are required. Single line: `start = end`. To delete a range, use `lines: []`. Do NOT use the `pos` field on `replace`; use `start`.
-- `append` — insert `lines` after `pos`; omit `pos` to append at EOF.
-- `prepend` — insert `lines` before `pos`; omit `pos` to prepend at BOF. Use `prepend` at an anchor to insert a new block between line N-1 and N (anchor on the line *after* the insertion point).
-
-Examples:
-
-1. Single line replace:
-```json
-{ "path": "src/main.ts", "edits": [
-  { "op": "replace", "start": "MQXV", "end": "MQXV", "lines": ["const x = 1;"] }
-] }
-```
-
-2. Range replace (3 lines → 3 new lines):
-```json
-{ "path": "src/main.ts", "edits": [
-  { "op": "replace", "start": "ZPMQ", "end": "VRWS", "lines": [
-    "function greet(name) {",
-    "  return `Hello, ${name}`;",
-    "}"
-  }
-] }
-```
-
-3. Multiple regions in one call (delete two non-adjacent ranges, insert before a third anchor):
-```json
-{ "path": "src/server.ts", "edits": [
-  { "op": "replace", "start": "aB3x", "end": "xY7q", "lines": [] },
-  { "op": "replace", "start": "MQXV", "end": "ZPMQ", "lines": [] },
-  { "op": "prepend", "pos": "VRWS", "lines": ["// inserted before VRWS"] }
-] }
-```
-
-Rules:
-- `replace` requires both `start` and `end`. A single-line replace is `start=X, end=X`. To replace more than one line, set `end` to a different line's anchor.
-- `start`, `end`, `pos` are HASH anchors only (e.g. `aB3x`). Other forms are rejected with `[E_BAD_REF]`.
-- `lines` is literal file content. No `HASH│` prefix, no leading `+`/`-` (those are read/diff metadata, not file content). Lines starting with 4 base64 chars + `│` are checked; if detected, the edit is rejected with `[E_BARE_HASH_PREFIX]`. For `.py` files, this becomes a `[W_BARE_HASH_PREFIX]` warning instead (Python syntax like `else:`, `except:` triggers the detector).
-- Copy anchors from the most recent `read` of the file. Do not guess or construct them.
-- All edits in one call must be non-conflicting. The runtime rejects with `[E_EDIT_CONFLICT]` if: two `replace` ranges overlap; two `append`/`prepend` target the same insertion boundary (e.g. two EOF appends on a newline-terminated file); or an `append`/`prepend` falls inside a `replace` range in the same call. Fix: merge into one, use different boundaries, or split into a follow-up `edit` call.
-- If `lines` matches the current content byte-for-byte, the edit is classified as `Classification: noop` (file unchanged, not an error).
-
-On success (`changed` mode, default), the response text contains an `--- Anchors ---` block with fresh `HASH│content` for the changed region (2 lines of context, capped at ~12 lines / 50 KB). Use those for nearby follow-up edits instead of re-reading. If the response says `Anchors omitted; use read for subsequent edits`, the region was too large — call `read` again. For distant follow-ups, or on any error, call `read` again. `full` and `ranges` modes put previews in `details`; the model only needs what's in the text.
-
-Errors are text starting with a bracketed code (e.g. `[E_BAD_SHAPE]`, `[E_STALE_ANCHOR]`, `[E_BAD_OP]`, `[E_INVALID_PATCH]`, `[E_LEGACY_SHAPE]`, `[E_EDIT_CONFLICT]`, `[E_BAD_REF]`, `[E_AMBIGUOUS_ANCHOR]`, `[E_BARE_HASH_PREFIX]`, `[E_WOULD_EMPTY]`). The message tells you what to retry; stale-anchor errors include `>>> HASH│content` lines, ready to copy.
-
-The legacy `oldText`/`newText` shape (top-level or as `op: "replace_text"`) is rejected with `[E_LEGACY_SHAPE]`. Use hash-anchored edits instead.
-
-Auto-read after write:
-- After a successful `write`, the result includes a `--- Auto-read (hashline anchors) ---` block with `HASH│content` for the written file.
-- Use those anchors directly for `edit` calls without a separate `read`.
-- This enables a seamless write → edit workflow with no extra tool calls.