@oh-my-pi/pi-coding-agent 15.2.3 → 15.2.4

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 ## [Unreleased]
 
+## [15.2.4] - 2026-05-22
+### Breaking Changes
+
+- Replaced the legacy `@@` header and `+`/`<`/`=`/`-` hashline syntax with the new `§PATH` header and `«`/`»`/`≔` operation format, so existing hashline scripts and prompts using old symbols must be updated
+
+### Added
+
+- Added one-anchor `≔ANCHOR` shorthand equivalent to `≔ANCHOR..ANCHOR` for single-line replace/delete
+
+### Changed
+
+- Changed `≔A..B` so an omitted payload now deletes the range, and added an explicit empty payload line to keep a literal blank replacement line
+
+### Removed
+
+- Removed the `hsep` prompt helper and `PI_HL_SEP` payload-prefix configuration because hashline payloads are no longer line-prefixed
+
+### Fixed
+
+- Fixed hashline payload handling in parser and streaming preview to preserve blank lines as actual payload text until the next op, file header, or envelope marker
+
 ## [15.2.3] - 2026-05-22
 ### Breaking Changes
 

package/dist/types/hashline/constants.d.ts

@@ -2,8 +2,6 @@
 export declare const MISMATCH_CONTEXT = 2;
 /** Filler hash used for the interior of a multi-line range; not validated. */
 export declare const RANGE_INTERIOR_HASH = "**";
-/** Header marker introducing a new file section in multi-section input. */
-export declare const FILE_HEADER_PREFIX = "@";
 /** Optional patch envelope start marker; silently consumed when present. */
 export declare const BEGIN_PATCH_MARKER = "*** Begin Patch";
 /** Optional patch envelope end marker; terminates parsing when encountered. */

package/dist/types/hashline/hash.d.ts

@@ -64,47 +64,21 @@ export declare function resolveHashlineGrammarPlaceholders(grammar: string): str
 /** @deprecated Use {@link resolveHashlineGrammarPlaceholders}. */
 export declare const resolveLarkLidPlaceholders: typeof resolveHashlineGrammarPlaceholders;
 /**
- * Single source of truth for the hashline edit payload separator. This is the
- * configured separator that starts inserted/replacement payload lines in
- * hashline edit input (`<separator>TEXT`) and separates inline modify ops from
- * their appended/prepended text.
+ * Hashline edit input markers. File section headers start with {@link HL_FILE_PREFIX};
+ * op lines start with a direction/action sigil: {@link HL_OP_INSERT_BEFORE},
+ * {@link HL_OP_INSERT_AFTER}, or {@link HL_OP_REPLACE}. Payload lines are
+ * verbatim file content and have no per-line marker.
  *
- * Override at runtime with the `PI_HL_SEP` env var (e.g.
- * `PI_HL_SEP=">"`, `PI_HL_SEP="\\"`). The value is read once at module load;
- * the edit grammar, prompt helper, and edit parser derive from it.
- *
- * Default is `~`, chosen empirically. Benchmark across 8 candidate separators
- * x 3 models (glm-4.7:nitro, gpt-5.4-nano, claude-sonnet-4-6), 24-48 runs per
- * cell, hashline variant, 12 sampled tasks per run:
- *
- *   sep | task ✓ | edit ✓ | patch fail      | tok/run
- *   ----|--------|--------|-----------------|--------
- *    +  | 70.8%  | 78.0%  | 27/125 (21.6%)  | 32,127
- *    ÷  | 70.7%  | 90.6%  | 22/211 (10.4%)  | 31,666
- *    ~  | 69.4%  | 94.9%  |  6/107 ( 5.6%)  | 30,529   <-- default
- *    >  | 69.2%  | 91.5%  | 21/219 ( 9.6%)  | 30,777
- *    :  | 66.7%  | 86.4%  | 20/126 (15.9%)  | 33,900
- *    |  | 65.9%  | 86.9%  | 20/127 (15.7%)  | 34,589
- *    \  | 65.5%  | 89.8%  | 16/124 (12.9%)  | 36,010
- *    %  | 63.9%  | 92.8%  | 11/125 ( 8.8%)  | 36,530
- *
- * `~` wins because:
- *   - highest edit-tool success rate (94.9%) of any tested separator
- *   - lowest patch-failure rate (5.6%) — model rarely emits a malformed payload
- *   - cheapest in tokens alongside `>` (no retry overhead from format collisions)
- *   - no line-leading role in any mainstream language, markdown, diff, regex,
- *     or shell, so payload lines are unambiguous to both the parser and models
- *   - task-success is statistically tied with `>` and `÷` (within run-to-run
- *     noise), so the edit-reliability win is free
- *
- * `+` and `÷` lead on raw task-success but at the cost of ~2-4x more patch
- * failures (the model retries until it lands a valid edit). `:`, `|`, `\`
- * collide with line-leading syntax (label/object-key, body separator, escape)
- * and degrade both edit reliability and intent-match.
+ * These constants are the single source of truth for the edit parser, grammar,
+ * renderer, and prompt.
  */
-export declare const HL_EDIT_SEP: string;
-/** Regex-escaped form of {@link HL_EDIT_SEP}, safe for regexes. */
-export declare const HL_EDIT_SEP_RE_RAW: string;
+export declare const HL_OP_INSERT_BEFORE = "\u00AB";
+export declare const HL_OP_INSERT_AFTER = "\u00BB";
+export declare const HL_OP_REPLACE = "\u2254";
+/** All hashline edit op sigils, concatenated for fast membership tests. */
+export declare const HL_OP_CHARS = "\u00AB\u00BB\u2254";
+/** Hashline edit file section header marker. */
+export declare const HL_FILE_PREFIX = "\u00A7";
 /** Stable separator for read/search/hashline display output. Intentionally not configurable. */
 export declare const HL_BODY_SEP = "|";
 /** Regex-escaped form of {@link HL_BODY_SEP}, safe for embedding inside a regex. */

package/dist/types/hashline/parser.d.ts

@@ -1,11 +1,7 @@
 import type { HashlineCursor, HashlineEdit } from "./types";
 export declare function cloneCursor(cursor: HashlineCursor): HashlineCursor;
-export declare function parseHashline(diff: string, opts?: ParseHashlineOptions): HashlineEdit[];
-export interface ParseHashlineOptions {
-    /** File path the diff targets. Used to suppress indent-sensitive false-positive warnings. */
-    path?: string;
-}
-export declare function parseHashlineWithWarnings(diff: string, opts?: ParseHashlineOptions): {
+export declare function parseHashline(diff: string): HashlineEdit[];
+export declare function parseHashlineWithWarnings(diff: string): {
     edits: HashlineEdit[];
     warnings: string[];
 };

package/dist/types/modes/shared.d.ts

@@ -3,4 +3,13 @@ import type { TabBarTheme } from "@oh-my-pi/pi-tui";
 export declare function sanitizeStatusText(text: string): string;
 /** Shared tab bar theme used by model-selector and settings-selector. */
 export declare function getTabBarTheme(): TabBarTheme;
+/**
+ * Suffix appended to the loader's working message to remind users they can
+ * abort with Esc. Rendered with the active theme's bracket glyphs so it stays
+ * visually consistent with badges and other bracketed UI affordances.
+ *
+ * The leading space separates the hint from the message body and is consumed
+ * by `endsWith`/`slice` matching in the loader renderer.
+ */
+export declare function interruptHint(): string;
 export { parseCommandArgs } from "../utils/command-args";

package/dist/types/modes/theme/shimmer.d.ts

@@ -1,13 +1,16 @@
 import type { Theme, ThemeColor } from "./theme";
 type ShimmerTheme = Pick<Theme, "bold" | "fg" | "getFgAnsi">;
+type ShimmerPaletteTier = ThemeColor | {
+    ansi: string;
+};
 /** Three-tier color stack a shimmer character cycles through as the band sweeps. */
 export interface ShimmerPalette {
     /** Color for chars outside / at the edge of the band (intensity < ~0.22). */
-    low: ThemeColor;
+    low: ShimmerPaletteTier;
     /** Color for chars approaching the crest (~0.22 ≤ intensity < ~0.65). */
-    mid: ThemeColor;
+    mid: ShimmerPaletteTier;
     /** Color at the band's crest (intensity ≥ ~0.65). */
-    high: ThemeColor;
+    high: ShimmerPaletteTier;
     /** Whether to bold the crest tier. Default `false`. */
     bold?: boolean;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "15.2.3",
+	"version": "15.2.4",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -47,12 +47,12 @@
 		"@agentclientprotocol/sdk": "0.21.0",
 		"@babel/parser": "^7.29.3",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/omp-stats": "15.2.3",
-		"@oh-my-pi/pi-agent-core": "15.2.3",
-		"@oh-my-pi/pi-ai": "15.2.3",
-		"@oh-my-pi/pi-natives": "15.2.3",
-		"@oh-my-pi/pi-tui": "15.2.3",
-		"@oh-my-pi/pi-utils": "15.2.3",
+		"@oh-my-pi/omp-stats": "15.2.4",
+		"@oh-my-pi/pi-agent-core": "15.2.4",
+		"@oh-my-pi/pi-ai": "15.2.4",
+		"@oh-my-pi/pi-natives": "15.2.4",
+		"@oh-my-pi/pi-tui": "15.2.4",
+		"@oh-my-pi/pi-utils": "15.2.4",
 		"@puppeteer/browsers": "^2.13.0",
 		"@types/turndown": "5.0.6",
 		"@xterm/headless": "^6.0.0",

package/src/config/prompt-templates.ts

@@ -8,7 +8,7 @@ import {
 	parseFrontmatter,
 	prompt,
 } from "@oh-my-pi/pi-utils";
-import { computeLineHash, HL_BODY_SEP, HL_EDIT_SEP } from "../hashline/hash";
+import { computeLineHash, HL_BODY_SEP } from "../hashline/hash";
 import { jtdToTypeScript } from "../tools/jtd-to-typescript";
 import { parseCommandArgs, substituteArgs } from "../utils/command-args";
 
@@ -154,13 +154,6 @@ prompt.registerHelper("hline", function (this: unknown, ...args: unknown[]): str
 	return `${ref}${HL_BODY_SEP}${text}`;
 });
 
-/**
- * {{hsep}} — emit the configured hashline payload separator character.
- * Stays in sync with {@link HL_EDIT_SEP} so edit prompt templates
- * never have to hardcode the payload separator.
- */
-prompt.registerHelper("hsep", (): string => HL_EDIT_SEP);
-
 const INLINE_ARG_SHELL_PATTERN = /\$(?:ARGUMENTS|@(?:\[\d+(?::\d*)?\])?|\d+)/;
 const INLINE_ARG_TEMPLATE_PATTERN = /\{\{[\s\S]*?(?:\b(?:arguments|ARGUMENTS|args)\b|\barg\s+[^}]+)[\s\S]*?\}\}/;
 

package/src/edit/index.ts

@@ -35,7 +35,7 @@ export * from "./apply-patch";
 export * from "./diff";
 export * from "./file-read-cache";
 
-// Resolve the `$HFMT$` and `$HSEP$` placeholders in the hashline Lark grammar.
+// Resolve the `$HFMT$`, `$HOP_*$`, `$HOP_CHARS$`, and `$HFILE$` placeholders in the hashline Lark grammar.
 const hashlineGrammar = resolveHashlineGrammarPlaceholders(hashlineGrammarTemplate);
 
 export * from "../hashline";

package/src/edit/renderer.ts

@@ -6,6 +6,7 @@ import type { Component } from "@oh-my-pi/pi-tui";
 import { Text, visibleWidth, wrapTextWithAnsi } from "@oh-my-pi/pi-tui";
 import { sanitizeText } from "@oh-my-pi/pi-utils";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import { HL_FILE_PREFIX } from "../hashline/hash";
 import type { FileDiagnosticsResult } from "../lsp";
 import { renderDiff as renderDiffColored } from "../modes/components/diff";
 import { getLanguageFromPath, type Theme } from "../modes/theme/theme";
@@ -328,7 +329,6 @@ function getCallPreview(
 }
 
 const MISSING_APPLY_PATCH_END_ERROR = "The last line of the patch must be '*** End Patch'";
-const HL_INPUT_HEADER_PREFIX = "@";
 
 function normalizeHashlineInputPreviewPath(rawPath: string): string {
 	const trimmed = rawPath.trim();
@@ -342,13 +342,11 @@ function normalizeHashlineInputPreviewPath(rawPath: string): string {
 }
 
 function parseHashlineInputPreviewHeader(line: string): string | null {
-	if (!line.startsWith(HL_INPUT_HEADER_PREFIX)) return null;
-	// The real parser (`parseHashlineHeaderLine` in `hashline/input.ts`) strips
-	// every leading "@" before resolving the path so canonical "@@ PATH" headers
-	// (and stray "@ PATH" / "@@@ PATH" runs) all route to the same file. Mirror
-	// that here so the renderer doesn't surface a literal "@ " in the title.
+	if (!line.startsWith(HL_FILE_PREFIX)) return null;
+	// Mirror hashline/input.ts: strip every leading file marker so canonical
+	// `§ PATH` headers and stray `§§ PATH` / `§§§PATH` runs render clean paths.
 	let prefixEnd = 0;
-	while (prefixEnd < line.length && line[prefixEnd] === HL_INPUT_HEADER_PREFIX) prefixEnd++;
+	while (prefixEnd < line.length && line[prefixEnd] === HL_FILE_PREFIX) prefixEnd++;
 	const body = line.slice(prefixEnd).trim();
 	const previewPath = normalizeHashlineInputPreviewPath(body);
 	return previewPath.length > 0 ? previewPath : null;

package/src/edit/streaming.ts

@@ -22,6 +22,8 @@ import {
 	containsRecognizableHashlineOperations,
 	END_PATCH_MARKER,
 	type HashlineInputSection,
+	HL_FILE_PREFIX,
+	HL_OP_CHARS,
 	splitHashlineInputs,
 } from "../hashline";
 import type { Theme } from "../modes/theme/theme";
@@ -77,8 +79,19 @@ const STREAMING_FALLBACK_LINES = 12;
 const STREAMING_FALLBACK_WIDTH = 80;
 
 function isHashlineHeaderLine(line: string): boolean {
+	return line.trimEnd().startsWith(HL_FILE_PREFIX);
+}
+
+function parseHashlineHeaderPath(line: string): string {
 	const trimmed = line.trimEnd();
-	return trimmed.startsWith("@") && trimmed.length > 1;
+	let prefixEnd = 0;
+	while (prefixEnd < trimmed.length && trimmed[prefixEnd] === HL_FILE_PREFIX) prefixEnd++;
+	return trimmed.slice(prefixEnd).trim();
+}
+
+function isHashlineOpLine(line: string): boolean {
+	const first = line[0];
+	return first !== undefined && HL_OP_CHARS.includes(first);
 }
 
 function isHashlineEnvelopeMarkerLine(line: string): boolean {
@@ -358,11 +371,11 @@ function buildApplyPatchNaturalOrderPreviews(input: string): PerFileDiffPreview[
 }
 
 /**
- * Hashline equivalent: emit each section's `~payload` lines as `+added`
- * lines in the order the model typed them. We deliberately omit op headers
- * and removal targets from the streaming preview because their content
- * lives in the file and would require a costly re-apply per tick; the
- * complete unified diff is shown once streaming finishes.
+ * Hashline equivalent: emit each payload line as a `+added` line in the
+ * order the model typed it. We deliberately omit op headers and removal
+ * targets from the streaming preview because their content lives in the file
+ * and would require a costly re-apply per tick; the complete unified diff is
+ * shown once streaming finishes.
  */
 function buildHashlineNaturalOrderPreviews(
 	input: string,
@@ -382,13 +395,12 @@ function buildHashlineNaturalOrderPreviews(
 	for (const raw of lines) {
 		if (isHashlineEnvelopeMarkerLine(raw)) continue;
 		if (isHashlineHeaderLine(raw)) {
-			currentPath = raw.trimEnd().slice(1).trim();
+			currentPath = parseHashlineHeaderPath(raw);
 			if (currentPath) ensure(currentPath);
 			continue;
 		}
-		if (raw.startsWith("~")) {
-			ensure(currentPath).push(`+${raw.slice(1)}`);
-		}
+		if (isHashlineOpLine(raw) || !currentPath) continue;
+		ensure(currentPath).push(`+${raw}`);
 	}
 	if (groups.size === 0) return null;
 	const previews: PerFileDiffPreview[] = [];
@@ -409,7 +421,7 @@ const hashlineStrategy: EditStreamingStrategy<HashlineArgs> = {
 		if (input.length === 0) return null;
 		if (ctx.isStreaming) {
 			// Skip the costly per-tick re-apply and avoid `Diff.structuredPatch`
-			// reordering by showing the model's `~payload` lines in input order.
+			// reordering by showing payload lines in input order.
 			return buildHashlineNaturalOrderPreviews(input, args.path);
 		}
 		ctx.signal.throwIfAborted();
@@ -419,7 +431,7 @@ const hashlineStrategy: EditStreamingStrategy<HashlineArgs> = {
 			sections = splitHashlineInputs(input, { cwd: ctx.cwd, path: args.path });
 		} catch {
 			// Single-section fallback keeps the original error rendering for the
-			// "haven't typed `@@ PATH` yet" case.
+			// "haven't typed `§ PATH` yet" case.
 			const result = await computeHashlineDiff({ input, path: args.path }, ctx.cwd, {
 				autoDropPureInsertDuplicates: ctx.hashlineAutoDropPureInsertDuplicates,
 			});

package/src/hashline/constants.ts

@@ -4,9 +4,6 @@ export const MISMATCH_CONTEXT = 2;
 /** Filler hash used for the interior of a multi-line range; not validated. */
 export const RANGE_INTERIOR_HASH = "**";
 
-/** Header marker introducing a new file section in multi-section input. */
-export const FILE_HEADER_PREFIX = "@";
-
 /** Optional patch envelope start marker; silently consumed when present. */
 export const BEGIN_PATCH_MARKER = "*** Begin Patch";
 

package/src/hashline/diff.ts

@@ -30,7 +30,7 @@ export async function computeHashlineSectionDiff(
 		const rawContent = await readHashlineFileText(Bun.file(absolutePath), absolutePath, section.path);
 		const { text: content } = stripBom(rawContent);
 		const normalized = normalizeToLF(content);
-		const result = applyHashlineEdits(normalized, parseHashline(section.diff, { path: section.path }), options);
+		const result = applyHashlineEdits(normalized, parseHashline(section.diff), options);
 		if (normalized === result.lines) return { error: `No changes would be made to ${section.path}.` };
 		return generateDiffString(normalized, result.lines);
 	} catch (err) {

package/src/hashline/execute.ts

@@ -106,7 +106,7 @@ async function preflightHashlineSection(options: ExecuteHashlineSingleOptions &
 	const { session, path: sectionPath, diff } = options;
 
 	const absolutePath = resolvePlanPath(session, sectionPath);
-	const { edits } = parseHashlineWithWarnings(diff, { path: sectionPath });
+	const { edits } = parseHashlineWithWarnings(diff);
 	enforcePlanModeWrite(session, sectionPath, { op: "update" });
 
 	const source = await readHashlineFile(absolutePath, sectionPath);
@@ -139,7 +139,7 @@ async function executeHashlineSection(
 	} = options;
 
 	const absolutePath = resolvePlanPath(session, sourcePath);
-	const { edits, warnings: parseWarnings } = parseHashlineWithWarnings(diff, { path: sourcePath });
+	const { edits, warnings: parseWarnings } = parseHashlineWithWarnings(diff);
 	enforcePlanModeWrite(session, sourcePath, { op: "update" });
 
 	const source = await readHashlineFile(absolutePath, sourcePath);

package/src/hashline/grammar.lark

@@ -3,20 +3,19 @@ begin_patch: "*** Begin Patch" LF
 end_patch: "*** End Patch" LF?
 
 hunk: update_hunk
-update_hunk: "@@ " filename LF line_op*
+update_hunk: "$HFILE$" filename LF line_op*
 
 filename: /(.+)/
 
-line_op: insert_before | insert_after | replace | delete | blank
-insert_before: ("<" | "< ") anchor LF payload+
-insert_after: ("+" | "+ ") anchor LF payload+
-replace: ("=" | "= ") range LF payload*
-delete: ("-" | "- ") range LF
-payload: $HSEP$ /(.*)/ LF
+line_op: insert_before | insert_after | replace | blank
+insert_before: "$HOP_INSERT_BEFORE$" anchor LF payload+
+insert_after: "$HOP_INSERT_AFTER$" anchor LF payload+
+replace: "$HOP_REPLACE$" range LF payload*
+payload: /[^$HOP_CHARS$$HFILE$\n][^\n]*/ LF | LF
 blank: LF
 
 anchor: LID | "EOF" | "BOF"
-range: LID ".." LID
+range: LID (".." LID)?
 LID: /[1-9]\d*$HFMT$/
 
 %import common.LF

package/src/hashline/hash.ts

@@ -75,7 +75,13 @@ export function describeAnchorExamples(linePrefix = ""): string {
  * pass through unchanged.
  */
 export function resolveHashlineGrammarPlaceholders(grammar: string): string {
-	return grammar.replaceAll("$HFMT$", "[a-z]{2}").replaceAll("$HSEP$", JSON.stringify(HL_EDIT_SEP));
+	return grammar
+		.replaceAll("$HFMT$", "[a-z]{2}")
+		.replaceAll("$HOP_INSERT_BEFORE$", HL_OP_INSERT_BEFORE)
+		.replaceAll("$HOP_INSERT_AFTER$", HL_OP_INSERT_AFTER)
+		.replaceAll("$HOP_REPLACE$", HL_OP_REPLACE)
+		.replaceAll("$HOP_CHARS$", HL_OP_CHARS)
+		.replaceAll("$HFILE$", HL_FILE_PREFIX);
 }
 
 /** @deprecated Use {@link resolveHashlineGrammarPlaceholders}. */
@@ -84,51 +90,23 @@ export const resolveLarkLidPlaceholders = resolveHashlineGrammarPlaceholders;
 const regexEscape = (str: string): string => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 
 /**
- * Single source of truth for the hashline edit payload separator. This is the
- * configured separator that starts inserted/replacement payload lines in
- * hashline edit input (`<separator>TEXT`) and separates inline modify ops from
- * their appended/prepended text.
+ * Hashline edit input markers. File section headers start with {@link HL_FILE_PREFIX};
+ * op lines start with a direction/action sigil: {@link HL_OP_INSERT_BEFORE},
+ * {@link HL_OP_INSERT_AFTER}, or {@link HL_OP_REPLACE}. Payload lines are
+ * verbatim file content and have no per-line marker.
  *
- * Override at runtime with the `PI_HL_SEP` env var (e.g.
- * `PI_HL_SEP=">"`, `PI_HL_SEP="\\"`). The value is read once at module load;
- * the edit grammar, prompt helper, and edit parser derive from it.
- *
- * Default is `~`, chosen empirically. Benchmark across 8 candidate separators
- * x 3 models (glm-4.7:nitro, gpt-5.4-nano, claude-sonnet-4-6), 24-48 runs per
- * cell, hashline variant, 12 sampled tasks per run:
- *
- *   sep | task ✓ | edit ✓ | patch fail      | tok/run
- *   ----|--------|--------|-----------------|--------
- *    +  | 70.8%  | 78.0%  | 27/125 (21.6%)  | 32,127
- *    ÷  | 70.7%  | 90.6%  | 22/211 (10.4%)  | 31,666
- *    ~  | 69.4%  | 94.9%  |  6/107 ( 5.6%)  | 30,529   <-- default
- *    >  | 69.2%  | 91.5%  | 21/219 ( 9.6%)  | 30,777
- *    :  | 66.7%  | 86.4%  | 20/126 (15.9%)  | 33,900
- *    |  | 65.9%  | 86.9%  | 20/127 (15.7%)  | 34,589
- *    \  | 65.5%  | 89.8%  | 16/124 (12.9%)  | 36,010
- *    %  | 63.9%  | 92.8%  | 11/125 ( 8.8%)  | 36,530
- *
- * `~` wins because:
- *   - highest edit-tool success rate (94.9%) of any tested separator
- *   - lowest patch-failure rate (5.6%) — model rarely emits a malformed payload
- *   - cheapest in tokens alongside `>` (no retry overhead from format collisions)
- *   - no line-leading role in any mainstream language, markdown, diff, regex,
- *     or shell, so payload lines are unambiguous to both the parser and models
- *   - task-success is statistically tied with `>` and `÷` (within run-to-run
- *     noise), so the edit-reliability win is free
- *
- * `+` and `÷` lead on raw task-success but at the cost of ~2-4x more patch
- * failures (the model retries until it lands a valid edit). `:`, `|`, `\`
- * collide with line-leading syntax (label/object-key, body separator, escape)
- * and degrade both edit reliability and intent-match.
+ * These constants are the single source of truth for the edit parser, grammar,
+ * renderer, and prompt.
  */
-export const HL_EDIT_SEP = (() => {
-	const sep = process.env.PI_HL_SEP?.trim();
-	return sep?.length === 1 ? sep : "~";
-})();
+export const HL_OP_INSERT_BEFORE = "«";
+export const HL_OP_INSERT_AFTER = "»";
+export const HL_OP_REPLACE = "≔";
+
+/** All hashline edit op sigils, concatenated for fast membership tests. */
+export const HL_OP_CHARS = `${HL_OP_INSERT_BEFORE}${HL_OP_INSERT_AFTER}${HL_OP_REPLACE}`;
 
-/** Regex-escaped form of {@link HL_EDIT_SEP}, safe for regexes. */
-export const HL_EDIT_SEP_RE_RAW = regexEscape(HL_EDIT_SEP);
+/** Hashline edit file section header marker. */
+export const HL_FILE_PREFIX = "§";
 
 /** Stable separator for read/search/hashline display output. Intentionally not configurable. */
 export const HL_BODY_SEP = "|";

package/src/hashline/input.ts

@@ -1,8 +1,11 @@
 import * as path from "node:path";
-import { ABORT_MARKER, BEGIN_PATCH_MARKER, END_PATCH_MARKER, FILE_HEADER_PREFIX } from "./constants";
-import { HL_EDIT_SEP } from "./hash";
+import { ABORT_MARKER, BEGIN_PATCH_MARKER, END_PATCH_MARKER } from "./constants";
+import { HL_FILE_PREFIX, HL_OP_CHARS } from "./hash";
 import type { SplitHashlineOptions } from "./types";
 
+const regexEscape = (str: string): string => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+const HASHLINE_OP_LINE_RE = new RegExp(`^[${regexEscape(HL_OP_CHARS)}]`);
+
 export interface HashlineInputSection {
 	path: string;
 	diff: string;
@@ -26,19 +29,18 @@ function normalizeHashlinePath(rawPath: string, cwd?: string): string {
 
 function parseHashlineHeaderLine(line: string, cwd?: string): HashlineInputSection | null {
 	const trimmed = line.trimEnd();
-	if (!trimmed.startsWith(FILE_HEADER_PREFIX)) return null;
-	// Some models occasionally emit unified-diff-style "@@ path" (or even longer
-	// runs of "@"). Strip every leading "@" before resolving the path so those
-	// stray headers still route to the right file.
+	if (!trimmed.startsWith(HL_FILE_PREFIX)) return null;
+	// Strip a run of leading header markers so canonical `§PATH` and
+	// runaway-prefix forms like `§§PATH` / `§§§PATH` route to the same file.
 	let prefixEnd = 0;
-	while (prefixEnd < trimmed.length && trimmed[prefixEnd] === FILE_HEADER_PREFIX) prefixEnd++;
+	while (prefixEnd < trimmed.length && trimmed[prefixEnd] === HL_FILE_PREFIX) prefixEnd++;
 	const rest = trimmed.slice(prefixEnd);
 	if (rest.trim().length === 0) {
-		throw new Error(`Input header "${FILE_HEADER_PREFIX}" is empty; provide a file path.`);
+		throw new Error(`Input header "${HL_FILE_PREFIX}" is empty; provide a file path.`);
 	}
 	const parsedPath = normalizeHashlinePath(rest, cwd);
 	if (parsedPath.length === 0) {
-		throw new Error(`Input header "${FILE_HEADER_PREFIX}" is empty; provide a file path.`);
+		throw new Error(`Input header "${HL_FILE_PREFIX}" is empty; provide a file path.`);
 	}
 	return { path: parsedPath, diff: "" };
 }
@@ -64,7 +66,7 @@ function stripLeadingBlankLines(input: string): string {
 
 export function containsRecognizableHashlineOperations(input: string): boolean {
 	for (const line of input.split(/\r?\n/)) {
-		if (/^[+<=-]\s+/.test(line) || line.startsWith(HL_EDIT_SEP)) return true;
+		if (HASHLINE_OP_LINE_RE.test(line)) return true;
 	}
 	return false;
 }
@@ -79,7 +81,7 @@ function normalizeFallbackInput(input: string, options: SplitHashlineOptions): s
 	if (!options.path || !containsRecognizableHashlineOperations(input)) return input;
 	const fallbackPath = normalizeHashlinePath(options.path, options.cwd);
 	if (fallbackPath.length === 0) return input;
-	return `${FILE_HEADER_PREFIX} ${fallbackPath}\n${input}`;
+	return `${HL_FILE_PREFIX}${fallbackPath}\n${input}`;
 }
 
 export function splitHashlineInput(input: string, options: SplitHashlineOptions = {}): { path: string; diff: string } {
@@ -95,8 +97,8 @@ export function splitHashlineInputs(input: string, options: SplitHashlineOptions
 	if (parseHashlineHeaderLine(firstLine, options.cwd) === null) {
 		const preview = JSON.stringify(firstLine.slice(0, 120));
 		throw new Error(
-			`input must begin with "@@ PATH" on the first non-blank line; got: ${preview}. ` +
-				`Example: "@@ src/foo.ts" then edit ops.`,
+			`input must begin with "${HL_FILE_PREFIX}PATH" on the first non-blank line; got: ${preview}. ` +
+				`Example: "${HL_FILE_PREFIX}src/foo.ts" then edit ops.`,
 		);
 	}