@oh-my-pi/pi-coding-agent 14.6.2 → 14.6.3

package/CHANGELOG.md

@@ -2,7 +2,58 @@
 
 ## [Unreleased]
 
+## [14.6.3] - 2026-05-03
+
+### Breaking Changes
+
+- Renamed hashline separator configuration from `PI_HASHLINE_SEP` to `PI_HL_SEP` and changed the default payload separator from `\\` to `>`
+
+### Added
+
+- Added inline hashline edit syntax so `< ANCHOR${sep}TEXT` prepended text to an anchored line and `+ ANCHOR${sep}TEXT` appended text to it without requiring a multi-line payload block
+- Added a `memory.backend` setting (off, local, hindsight) under a new Memory settings tab to control which memory subsystem is active
+- Added Hindsight memory settings (`hindsight.*`) for API connection, bank identification, and recall/retain policy
+- Added `retain`, `recall`, and `reflect` tools for direct long-term memory search, retention, and reflection when using the Hindsight backend
+- Added `hindsight.scoping` setting (`global`, `per-project`, `per-project-tagged`) that controls whether memories are shared across projects, isolated per cwd, or tagged so global + project memories merge on recall (default: `per-project-tagged`)
+- Added `search_code`, `search_commits`, and `search_repos` ops to the `github` tool so the search surface mirrors `gh search`'s subcommands
+
+### Changed
+
+- Changed `hindsight` tool retains to enqueue memory writes and return `Memory queued.` immediately instead of waiting on a network request
+- Changed `hindsight` tool memory writes to use automatic background batching (up to 16 items or 5 seconds) so tool calls do not block
+- Changed failed `hindsight` queue flushes to be surfaced as UI warning notices rather than failing the foreground `hindsight` tool call
+- Changed hashline read/search previews and diff output to keep `|` as the anchor-to-text separator while using the separate configured edit payload separator
+- Mapped invalid `hindsight.scoping` settings back to the default `per-project-tagged` behavior with a warning
+- Changed `/memory view`, `/memory clear`, and `/memory enqueue` to route through the selected memory backend instead of being hardcoded to local memories
+- Changed compaction context assembly to include backend-provided recall context when available
+- Updated multi-path `search`, `find`, `ast-edit`, and `ast-grep` calls to skip missing base paths, returning matches from remaining paths and reporting skipped paths in output
+- Replaced `hindsight.dynamicBankId` (boolean) with the explicit `hindsight.scoping` enum; legacy values are migrated automatically (`dynamicBankId=true` → `scoping="per-project"`)
+- Changed `search_repos` to run as a global repository search using query qualifiers without applying the `repo` filter
+
+### Deprecated
+
+- Set explicit `hindsight.scoping` now takes precedence over legacy `hindsight.dynamicBankId` when migrating old settings
+
+### Removed
+
+- Removed legacy `hindsight.dynamicBankId` and `hindsight.agentName` fields from the active settings model
+- Removed `hindsight.agentName` and the `HINDSIGHT_AGENT_NAME` / `HINDSIGHT_CHANNEL_ID` / `HINDSIGHT_USER_ID` env vars; the legacy `agent::project::channel::user` bank tuple is gone. A user-set `agentName` is migrated onto `hindsight.bankId`.
+
+### Fixed
+
+- Fixed pending `hindsight` queued memory writes to flush on agent end, clear, and enqueue operations so tool-invoked facts are not dropped when sessions transition
+- Fixed retained memory writes from the `hindsight` tool to include session context and tags consistently in background batches
+- Fixed inline hashline modify operations to fail fast when combined with a delete or replace on the same target line
+- Fixed hashline parsing of payload blocks to handle a shared extra leading symbol prefix (such as markdown `>>`) on all payload lines by stripping it as an auto-correction instead of rejecting the edit
+- Forwarded project scoping tags to `hindsight` retain, recall, and reflect operations so manual memory commands honor the active tagging mode
+- Fixed legacy migrations by mapping existing `memories.enabled` values to `memory.backend` on load to preserve prior enable/disable behavior
+- Fixed memory retention so recalled `<memories>` blocks and legacy `<hindsight_memories>` / `<relevant_memories>` blocks are stripped before storing transcripts and do not feed back as new memory
+- Fixed `search_code` output to include each match path, repository, shortened SHA, and a one-line matching fragment
+- Fixed `search_commits` output to show shortened SHAs with commit message first lines
+- Fixed `search_repos` output formatting to return repository summaries including language, stars, forks, issues, visibility, and key status fields
+
 ## [14.6.2] - 2026-05-03
+
 ### Added
 
 - Added `statusLine.sessionAccent` to disable session-name accent coloring for the editor border and status line gap ([#918](https://github.com/can1357/oh-my-pi/issues/918))
@@ -13,8 +64,8 @@
 
 - Fixed SSH ControlMaster socket paths to use OpenSSH's connection hash (`%C`) so connections to the same host with different users, ports, or jump hosts do not share a master session.
 
-
 ## [14.6.1] - 2026-05-02
+
 ### Changed
 
 - Updated GitHub call headers to display operation-specific titles and contextual metadata such as repository, branch, issue/PR IDs, and search query snippets for supported operations
@@ -25,6 +76,7 @@
 - Fixed GitHub tool output fallbacks that previously always showed a GitHub Run Watch heading so they now show the actual operation and clear `no output`/`request failed` status messaging
 
 ## [14.6.0] - 2026-05-02
+
 ### Breaking Changes
 
 - Reworked autoresearch storage and protocol. State now lives in `~/.omp/autoresearch/<project>.db` (SQLite) and per-run logs in `~/.omp/autoresearch/<project>/runs/<id>/benchmark.log`. The repo-side artifacts `autoresearch.md`, `autoresearch.sh`, `autoresearch.checks.sh`, `autoresearch.program.md`, `autoresearch.ideas.md`, `autoresearch.jsonl`, `.autoresearch/`, and `autoresearch.config.json` are no longer read or written; they are deleted by `/autoresearch clear`. Any existing data is not migrated.
@@ -64,6 +116,7 @@
 - Fixed `log_experiment keep` silently dropping the iteration's diff on an autoresearch branch. The previous logic filtered out every path that was already dirty when `run_experiment` ran — but in the iteration cycle the agent's edits always land before `run_experiment`, so the entire iteration was filtered away and nothing was committed. On an autoresearch branch, `keep` now treats every currently-dirty path as the iteration's change and commits it.
 
 ## [14.5.14] - 2026-05-01
+
 ### Changed
 
 - Changed markdown conversion and archive tooling to defer loading heavy dependencies (Turndown, fflate, and browser agent content) until first use, reducing startup overhead for CLI startup and command initialization
@@ -105,6 +158,7 @@
 - Fixed eval startup messaging to report `eval` as unavailable when Python is unreachable and JavaScript backend is disabled
 
 ### Fixed
+
 - Stabilized MCP tool ordering so reconnects and refreshes no longer reorder the tools array sent to the model. Anthropic prompt caching is keyed on byte-identical tool definitions; previously, the order depended on connection sequence and a single MCP server reconnect could shuffle tools across servers and invalidate the tools cache breakpoint.
 - Skipped redundant system-prompt rebuilds in `AgentSession.refreshMCPTools` when the active tool set is unchanged. MCP transport flapping (e.g. routine 5-minute SSE reconnects) used to call `rebuildSystemPrompt` on every reconnect even though the resulting prompt was byte-identical, eating CPU and risking cache misses if the rebuild ever became non-deterministic. The applied-tool signature also covers `customWireName` so a wire-name flip with the rest of the tool metadata constant still forces a rebuild.
 
@@ -135,6 +189,7 @@
 - Fixed plan mode to auto-redirect `write` and `edit` calls targeting a bare `PLAN.md` (or any same-basename cwd-relative path) to the canonical `local://PLAN.md` plan artifact instead of rejecting them
 
 ## [14.5.11] - 2026-04-30
+
 ### Breaking Changes
 
 - `todo_write`: renamed `replace` op to `init` and reshaped its input to `list: [{phase: string, items: string[]}]`. Tasks no longer accept a `status` field; all start `pending` and the first auto-promotes to `in_progress`. The `append` op's `items` is now `string[]` (was `{id, label}[]`)
@@ -206,6 +261,7 @@
 - Fixed hash mismatch errors to include likely-shifted anchor hints when a unique matching line is found elsewhere in the file
 
 ## [14.5.8] - 2026-04-29
+
 ### Breaking Changes
 
 - Changed the task runner toggle from `just.enabled` to `runCommand.enabled`, so existing configurations using `just.enabled` must be migrated
@@ -231,12 +287,15 @@
 ### Fixed
 
 - Fixed hook editors to recognize Ctrl+Enter when terminals include NumLock or keypad Enter metadata.
+
 ## [14.5.6] - 2026-04-29
+
 ### Changed
 
 - Removed the atom edit mode's multi-anchor auto-rebase rejection so stale-but-uniquely-rebasable block edits apply with warnings instead of failing.
 
 ## [14.5.5] - 2026-04-29
+
 ### Breaking Changes
 
 - Rejected atom diffs with unrecognized operations (including lone '-' lines) by throwing parse errors instead of treating them as inserts
@@ -255,6 +314,7 @@
 - Fixed bracket-corruption caused by botched block rewrites by automatically removing a newly introduced duplicate adjacent line when removing it restores the original `{}`, `()`, and `[]` balance and by warning when automatic removal is unsafe
 
 ## [14.5.4] - 2026-04-28
+
 ### Breaking Changes
 
 - Changed the `atom` edit mode from JSON `{ path, edits }` calls to the compact file-oriented `input` patch language that was previously exposed as `atomd`; `atomd` is no longer a separate edit variant
@@ -308,6 +368,7 @@
 - Fixed `splice_block` for same-line `(` bodies so inline call sites like `int(port)` can be replaced correctly
 
 ## [14.5.2] - 2026-04-26
+
 ### Breaking Changes
 
 - Removed support for sed-style string expressions and required `sed` to be specified as an object with `pat` and `rep` (and optional `g`, `F`, `i` flags)
@@ -332,6 +393,7 @@
 - Removed the hand-rolled JSON unescape fallback in the streaming edit-arg renderer; partial fragments that fail `JSON.parse` are now surfaced raw rather than partially decoded with a non-spec-compliant unescaper that mishandled lone surrogates
 
 ## [14.4.3] - 2026-04-26
+
 ### Added
 
 - Added `irc` tool for agent-to-agent messaging with `list` and `send` operations, including optional broadcast to `all` and optional suppression of reply waits
@@ -351,6 +413,7 @@
 - Fixed `/btw` request replacement so issuing a new query cleanly aborts the previous active request
 
 ## [14.4.2] - 2026-04-26
+
 ### Breaking Changes
 
 - Changed `/todo append` from JSON payload input to `/todo append [<phase>] <task...>` with optional quoted tokens and automatic phase creation
@@ -388,6 +451,7 @@
 - Fixed `poll` wait duration parsing to fall back to `30s` when the provided value is an empty string
 
 ## [14.4.1] - 2026-04-26
+
 ### Breaking Changes
 
 - Replaced the legacy `gh_repo_view`, `gh_issue_view`, `gh_pr_view`, `gh_pr_diff`, `gh_pr_checkout`, `gh_pr_push`, `gh_run_watch`, `gh_search_issues`, and `gh_search_prs` tool names with only `github`, which requires updating existing callers that invoked the old `gh_*` tools
@@ -589,6 +653,7 @@
 
 - Fixed task calls in `schema-free` and `independent` modes to return clear mode-specific errors when disallowed `context` or `schema` inputs are provided
 - Fixed newly generated session IDs to use UUIDv7 for new, forked, and branched sessions while preserving resumed session IDs
+
 ## [14.1.1] - 2026-04-14
 
 ### Breaking Changes
@@ -630,7 +695,7 @@
 - Changed Vim page-scroll commands `C-f`, `C-b`, `C-u`, and `C-d` to move in viewport-height based increments instead of fixed constants
 - Changed `z` command behavior so `zt`, `zb`, and `z.` now align cursor movement to first non-blank in the line
 - Changed `:g`/`:v` global command handling to process matching lines safely by working in reverse order and preserving file structure
-- Changed vim tab breadcrumb rendering from ` → ` to `→` in the editor view
+- Changed vim tab breadcrumb rendering from `→` to `→` in the editor view
 - Changed custom tool and task execution contexts to no longer expose a shared `searchDb` accessor, removing direct access to native grep/glob/fuzzyFind search backends from extension callbacks
 - Changed the `task` tool `schema` field to require JSON-encoded JTD schema text instead of a schema object, matching prompt guidance and task-subagent invocation
 - Changed chunk edit payloads to encode selectors as `path: "file:selector"` and updated chunk tool guidance and examples to match
@@ -664,6 +729,7 @@
 - Fixed retained Python kernel ownership so `AgentSession.dispose()` only shuts down kernels owned by that session, including warmup-created kernels
 
 ## [14.1.0] - 2026-04-11
+
 ### Added
 
 - Added richer tool rendering details in session export HTML, including metadata badges, argument formatting, and todo task tree styling for exported tool and workflow messages
@@ -705,6 +771,7 @@
 - Blocked destructive SQL execution in read-mode SQLite access by using read-only connections and rejecting bound-parameter raw SQL
 
 ## [14.0.5] - 2026-04-11
+
 ### Added
 
 - Added `designer` model role for UI/UX design tasks with Gemini 3.1 Pro as default model
@@ -751,6 +818,7 @@
 - Fixed MCP config docs and schema to use `~/.omp/agent/mcp.json` for user-scoped OMP-native MCP config while keeping project config at `<cwd>/.omp/mcp.json`
 
 ## [14.0.4] - 2026-04-10
+
 ### Added
 
 - Added `PI_CHUNK_AUTOINDENT` environment variable to control whether chunk read/edit tools normalize indentation to canonical tabs or preserve literal file whitespace
@@ -777,6 +845,7 @@
 - Fixed cached Ollama discovery rows so upgraded installs switch to the OpenAI Responses transport instead of staying on the old completions transport
 
 ## [14.0.2] - 2026-04-09
+
 ### Added
 
 - Added `/force` slash command to force the next agent turn to use a specific tool

package/README.md

@@ -12,3 +12,24 @@ Package-specific references:
 - [MCP runtime lifecycle](../../docs/mcp-runtime-lifecycle.md)
 - [MCP server/tool authoring](../../docs/mcp-server-tool-authoring.md)
 - [DEVELOPMENT](./DEVELOPMENT.md)
+
+## Memory backends
+
+The agent supports three mutually-exclusive memory backends, selected via the `memory.backend` setting (Settings → Memory tab, or `~/.omp/config.yml`):
+
+- `off` (default) — no memory subsystem runs.
+- `local` — existing rollout-summarisation pipeline; writes `memory_summary.md` and consolidated artifacts under the agent dir.
+- `hindsight` — talks to a [Hindsight](https://hindsight.vectorize.io) server (Cloud or self-hosted Docker), retains transcripts every Nth user turn, recalls memories on the first turn of a session, and exposes `retain`, `recall`, and `reflect`.
+
+### Hindsight quickstart
+
+1. Run a Hindsight server (Cloud or `docker run -p 8888:8888 ghcr.io/vectorize-io/hindsight:latest`).
+2. Set `memory.backend = "hindsight"` and `hindsight.apiUrl = "http://localhost:8888"` (or your Cloud URL).
+3. Optional environment overrides (env wins over settings):
+   - `HINDSIGHT_API_URL`, `HINDSIGHT_API_TOKEN` — connection
+   - `HINDSIGHT_BANK_ID`, `HINDSIGHT_DYNAMIC_BANK_ID`, `HINDSIGHT_AGENT_NAME` — bank addressing
+   - `HINDSIGHT_AUTO_RECALL`, `HINDSIGHT_AUTO_RETAIN`, `HINDSIGHT_RETAIN_MODE` — lifecycle
+   - `HINDSIGHT_RECALL_BUDGET`, `HINDSIGHT_RECALL_MAX_TOKENS` — recall sizing
+   - `HINDSIGHT_BANK_MISSION`, `HINDSIGHT_DEBUG`
+
+Switching backends mid-session is honoured on the next system-prompt rebuild and the next `/memory` slash command. Existing users with `memories.enabled = true|false` are migrated to `memory.backend = "local"|"off"` exactly once on first launch.

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "14.6.2",
+	"version": "14.6.3",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -46,12 +46,12 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.20.0",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/omp-stats": "14.6.2",
-		"@oh-my-pi/pi-agent-core": "14.6.2",
-		"@oh-my-pi/pi-ai": "14.6.2",
-		"@oh-my-pi/pi-natives": "14.6.2",
-		"@oh-my-pi/pi-tui": "14.6.2",
-		"@oh-my-pi/pi-utils": "14.6.2",
+		"@oh-my-pi/omp-stats": "14.6.3",
+		"@oh-my-pi/pi-agent-core": "14.6.3",
+		"@oh-my-pi/pi-ai": "14.6.3",
+		"@oh-my-pi/pi-natives": "14.6.3",
+		"@oh-my-pi/pi-tui": "14.6.3",
+		"@oh-my-pi/pi-utils": "14.6.3",
 		"@puppeteer/browsers": "^2.13.0",
 		"@sinclair/typebox": "^0.34.49",
 		"@xterm/headless": "^6.0.0",
@@ -371,6 +371,22 @@
 			"types": "./src/memories/*.ts",
 			"import": "./src/memories/*.ts"
 		},
+		"./memory-backend": {
+			"types": "./src/memory-backend/index.ts",
+			"import": "./src/memory-backend/index.ts"
+		},
+		"./memory-backend/*": {
+			"types": "./src/memory-backend/*.ts",
+			"import": "./src/memory-backend/*.ts"
+		},
+		"./hindsight": {
+			"types": "./src/hindsight/index.ts",
+			"import": "./src/hindsight/index.ts"
+		},
+		"./hindsight/*": {
+			"types": "./src/hindsight/*.ts",
+			"import": "./src/hindsight/*.ts"
+		},
 		"./modes": {
 			"types": "./src/modes/index.ts",
 			"import": "./src/modes/index.ts"

package/src/cli/grievances-cli.ts

@@ -19,17 +19,31 @@ export interface ListGrievancesOptions {
 	json: boolean;
 }
 
-function openDb(): Database | null {
+export interface CleanGrievancesOptions {
+	/** Delete a single grievance by id. */
+	id?: number;
+	/** Delete every grievance recorded for this tool name. */
+	tool?: string;
+	/** Delete every grievance regardless of tool/id. */
+	all?: boolean;
+	/** Output the deletion count as JSON instead of a status message. */
+	json?: boolean;
+}
+
+function openDb(readonly: boolean): Database | null {
 	try {
-		const db = new Database(getAutoQaDbPath(), { readonly: true });
-		return db;
+		// bun:sqlite rejects `{ readonly: false }` — it requires either readonly,
+		// readwrite, or create flags to be explicit. Use the default constructor
+		// (readwrite + create) for write mode and only pass `readonly: true` when
+		// listing.
+		return readonly ? new Database(getAutoQaDbPath(), { readonly: true }) : new Database(getAutoQaDbPath());
 	} catch {
 		return null;
 	}
 }
 
 export async function listGrievances(options: ListGrievancesOptions): Promise<void> {
-	const db = openDb();
+	const db = openDb(true);
 	if (!db) {
 		if (options.json) {
 			console.log("[]");
@@ -76,3 +90,74 @@ export async function listGrievances(options: ListGrievancesOptions): Promise<vo
 		db.close();
 	}
 }
+
+/**
+ * Delete grievances from the auto-QA database.
+ *
+ * Selectors are mutually exclusive in intent — exactly one of `id`, `tool`, or
+ * `all` is required. Multiple selectors are rejected to prevent ambiguous deletes
+ * (e.g. `--id 5 --all` would be a footgun). Returns silently when the database
+ * does not exist yet.
+ */
+export async function cleanGrievances(options: CleanGrievancesOptions): Promise<void> {
+	const selectors = [options.id !== undefined, !!options.tool, !!options.all].filter(Boolean).length;
+	if (selectors === 0) {
+		console.error(chalk.red("Specify exactly one of --id, --tool, or --all."));
+		process.exitCode = 1;
+		return;
+	}
+	if (selectors > 1) {
+		console.error(chalk.red("--id, --tool, and --all are mutually exclusive."));
+		process.exitCode = 1;
+		return;
+	}
+
+	const db = openDb(false);
+	if (!db) {
+		if (options.json) {
+			console.log(JSON.stringify({ deleted: 0 }));
+		} else {
+			console.log(
+				chalk.dim("No grievances database found. Enable auto-QA with PI_AUTO_QA=1 or the dev.autoqa setting."),
+			);
+		}
+		return;
+	}
+
+	try {
+		let deleted = 0;
+		if (options.id !== undefined) {
+			const result = db.prepare("DELETE FROM grievances WHERE id = ?").run(options.id);
+			deleted = Number(result.changes);
+		} else if (options.tool) {
+			const result = db.prepare("DELETE FROM grievances WHERE tool = ?").run(options.tool);
+			deleted = Number(result.changes);
+		} else {
+			const result = db.prepare("DELETE FROM grievances").run();
+			deleted = Number(result.changes);
+			// Reset the autoincrement counter so a fresh slate starts at #1 again.
+			// `sqlite_sequence` only exists if AUTOINCREMENT was ever used; ignore failures.
+			try {
+				db.prepare("DELETE FROM sqlite_sequence WHERE name = 'grievances'").run();
+			} catch {
+				/* sequence table missing on a brand-new db — nothing to reset */
+			}
+		}
+
+		if (options.json) {
+			console.log(JSON.stringify({ deleted }));
+			return;
+		}
+
+		if (deleted === 0) {
+			console.log(chalk.dim("No matching grievances to delete."));
+			return;
+		}
+
+		const scope =
+			options.id !== undefined ? `#${options.id}` : options.tool ? `for ${options.tool}` : "(all entries)";
+		console.log(chalk.green(`Deleted ${deleted} grievance${deleted === 1 ? "" : "s"} ${scope}.`));
+	} finally {
+		db.close();
+	}
+}

package/src/commands/grievances.ts

@@ -1,20 +1,46 @@
 /**
- * View recently reported tool issues from automated QA.
+ * View and clean recently reported tool issues from automated QA.
  */
-import { Command, Flags } from "@oh-my-pi/pi-utils/cli";
-import { listGrievances } from "../cli/grievances-cli";
+import { Args, Command, Flags } from "@oh-my-pi/pi-utils/cli";
+import { cleanGrievances, listGrievances } from "../cli/grievances-cli";
 
 export default class Grievances extends Command {
-	static description = "View reported tool issues (auto-QA grievances)";
+	static description = "View or clean reported tool issues (auto-QA grievances)";
+
+	static args = {
+		// Positional action: "list" (default) or "clean". A positional arg keeps
+		// the historical `omp grievances` invocation working unchanged while
+		// reusing the same command surface for the new clean sub-action.
+		action: Args.string({
+			description: "list (default) or clean",
+			required: false,
+			options: ["list", "clean"],
+			default: "list",
+		}),
+	};
 
 	static flags = {
-		limit: Flags.integer({ char: "n", description: "Number of recent issues to show", default: 20 }),
-		tool: Flags.string({ char: "t", description: "Filter by tool name" }),
+		limit: Flags.integer({ char: "n", description: "Number of recent issues to show (list)", default: 20 }),
+		tool: Flags.string({ char: "t", description: "Filter by tool name (list, clean)" }),
 		json: Flags.boolean({ char: "j", description: "Output as JSON", default: false }),
+		id: Flags.integer({ description: "Delete a single grievance by id (clean)" }),
+		all: Flags.boolean({ description: "Delete every grievance (clean)", default: false }),
 	};
 
+	static examples = [
+		"omp grievances",
+		"omp grievances list --tool find",
+		"omp grievances clean --id 209",
+		"omp grievances clean --tool find",
+		"omp grievances clean --all",
+	];
+
 	async run(): Promise<void> {
-		const { flags } = await this.parse(Grievances);
+		const { args, flags } = await this.parse(Grievances);
+		if (args.action === "clean") {
+			await cleanGrievances({ id: flags.id, tool: flags.tool, all: flags.all, json: flags.json });
+			return;
+		}
 		await listGrievances({ limit: flags.limit, tool: flags.tool, json: flags.json });
 	}
 }

package/src/config/prompt-templates.ts

@@ -8,7 +8,7 @@ import {
 	parseFrontmatter,
 	prompt,
 } from "@oh-my-pi/pi-utils";
-import { computeLineHash, HASHLINE_CONTENT_SEPARATOR } from "../edit/line-hash";
+import { computeLineHash, HL_BODY_SEP, HL_EDIT_SEP } from "../edit/line-hash";
 import { jtdToTypeScript } from "../tools/jtd-to-typescript";
 import { parseCommandArgs, substituteArgs } from "../utils/command-args";
 
@@ -53,10 +53,10 @@ interface HashlineHelperState {
 	byLine: Map<number, HashlineHelperRef>;
 }
 
-const HASHLINE_HELPER_STATE = Symbol("hashlineHelperState");
+const HL_HELPER_STATE = Symbol("hashlineHelperState");
 
 interface HashlineHelperStateHolder {
-	[HASHLINE_HELPER_STATE]?: HashlineHelperState;
+	[HL_HELPER_STATE]?: HashlineHelperState;
 }
 
 function isHelperOptions(value: unknown): value is prompt.HelperOptions {
@@ -78,10 +78,10 @@ function getHashlineHelperState(context: unknown, options: prompt.HelperOptions
 	}
 
 	const holder = holderTarget as HashlineHelperStateHolder;
-	if (!holder[HASHLINE_HELPER_STATE]) {
-		holder[HASHLINE_HELPER_STATE] = { byLine: new Map() };
+	if (!holder[HL_HELPER_STATE]) {
+		holder[HL_HELPER_STATE] = { byLine: new Map() };
 	}
-	return holder[HASHLINE_HELPER_STATE];
+	return holder[HL_HELPER_STATE];
 }
 
 function isLineNumberArg(value: unknown): boolean {
@@ -156,9 +156,16 @@ prompt.registerHelper("hline", function (this: unknown, ...args: unknown[]): str
 	const { num, ref, text } = formatHashlineRef(lineNum, content);
 	const state = getHashlineHelperState(this, options);
 	rememberHashlineRef(state, num, ref);
-	return `${ref}${HASHLINE_CONTENT_SEPARATOR}${text}`;
+	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]*?\}\}/;