@oh-my-pi/hashline 17.1.1 → 17.1.2

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [17.1.2] - 2026-07-24
+
+### Changed
+
+- Bare `- ` bullet body rows are now auto-accepted as literal content with a warning when the hunk is unambiguously a Markdown bullet list (every `-` row bullet-shaped and no plain `+new` diff counterpart); ambiguous `-` rows still fail with the teaching error.
+
 ## [17.0.8] - 2026-07-22
 
 ### Changed

package/dist/types/messages.d.ts

@@ -20,6 +20,12 @@ export declare const ABORT_MARKER = "*** Abort";
 export declare const REPLACE_PAIR_COALESCED_WARNING = "Two hunks targeted the same range; kept only the second. One `SWAP N.=M:` hunk per range \u2014 the body is the final content, never old+new.";
 /** Bare body rows auto-converted to literal `+` rows. */
 export declare const BARE_BODY_AUTO_PIPED_WARNING = "Auto-prefixed bare body row(s) with `+`. Body rows must be `+TEXT` literal lines.";
+/**
+ * Bare `-` body rows accepted as literal Markdown bullets. Only emitted when
+ * the hunk is unambiguously a bullet list: every `-` row is bullet-shaped
+ * (`- item`) and the body has no unified-diff `+new` counterpart rows.
+ */
+export declare const MINUS_BULLET_AUTO_PIPED_WARNING = "Auto-prefixed bare `- ` bullet row(s) as literal content. `-` rows never remove lines \u2014 the range does that; always prefix literal body rows with `+`: `+- item`.";
 /** Unified-diff-style `-` row in a hunk body. */
 export declare const MINUS_ROW_REJECTED = "`-` rows are not valid; the range already names the lines being changed. For Markdown bullets or other literal `-` lines, prefix the literal row with `+`: `+- item`.";
 /** Replace hunk with no body. */

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/hashline",
-	"version": "17.1.1",
+	"version": "17.1.2",
 	"description": "Hashline: a compact, line-anchored patch language and applier. Pluggable FS/IO so it works over disk, in-memory, or any custom backend.",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -33,7 +33,7 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-natives": "17.1.1",
+		"@oh-my-pi/pi-natives": "17.1.2",
 		"lru-cache": "11.5.2"
 	},
 	"devDependencies": {

package/src/messages.ts

@@ -52,6 +52,14 @@ export const REPLACE_PAIR_COALESCED_WARNING = `Two hunks targeted the same range
 export const BARE_BODY_AUTO_PIPED_WARNING =
 	"Auto-prefixed bare body row(s) with `+`. Body rows must be `+TEXT` literal lines.";
 
+/**
+ * Bare `-` body rows accepted as literal Markdown bullets. Only emitted when
+ * the hunk is unambiguously a bullet list: every `-` row is bullet-shaped
+ * (`- item`) and the body has no unified-diff `+new` counterpart rows.
+ */
+export const MINUS_BULLET_AUTO_PIPED_WARNING =
+	"Auto-prefixed bare `- ` bullet row(s) as literal content. `-` rows never remove lines — the range does that; always prefix literal body rows with `+`: `+- item`.";
+
 /** Unified-diff-style `-` row in a hunk body. */
 export const MINUS_ROW_REJECTED =
 	"`-` rows are not valid; the range already names the lines being changed. For Markdown bullets or other literal `-` lines, prefix the literal row with `+`: `+- item`.";

package/src/parser.ts

@@ -10,6 +10,7 @@ import {
 	DELETE_TAKES_NO_BODY,
 	EMPTY_BLOCK,
 	EMPTY_INSERT,
+	MINUS_BULLET_AUTO_PIPED_WARNING,
 	MINUS_ROW_REJECTED,
 	MOVE_TAKES_NO_BODY,
 	REM_TAKES_NO_BODY,
@@ -43,6 +44,13 @@ function isSkippableCommentLine(line: string): boolean {
  */
 const BARE_LITERAL_VALUE_RE = /^\s*(?:"[^"]*"|'[^']*'|[-+]?\d+(?:\.\d+)?)\s*,?\s*$/;
 
+/**
+ * Markdown-bullet shape: optional indent, `-`, exactly one space, then
+ * content. Unified-diff `-` rows almost never match — code lines get the `-`
+ * glued on (`-old()`) and indented deletions carry multiple spaces (`-    x`).
+ */
+const MD_BULLET_ROW_RE = /^\s*- \S/;
+
 function detectApplyPatchContamination(text: string, _hasPending: boolean): string | null {
 	const trimmed = text.trimStart();
 	if (trimmed.length === 0) return null;
@@ -93,7 +101,7 @@ interface PendingComment {
 	text: string;
 }
 
-type PayloadRow = { kind: "literal"; text: string; lineNum: number; bare?: boolean };
+type PayloadRow = { kind: "literal"; text: string; lineNum: number; bare?: boolean; minus?: boolean };
 
 interface Pending {
 	target: BlockTarget;
@@ -284,8 +292,12 @@ export class Executor {
 			if (this.#pending.target.kind === "delete") throw new Error(`line ${lineNum}: ${DELETE_TAKES_NO_BODY}`);
 			if (this.#pending.target.kind === "delete_block")
 				throw new Error(`line ${lineNum}: ${DELETE_BLOCK_TAKES_NO_BODY}`);
-			if (text.trimStart().charCodeAt(0) === 45 /* - */) throw new Error(`line ${lineNum}: ${MINUS_ROW_REJECTED}`);
-			if (!this.#warnings.includes(BARE_BODY_AUTO_PIPED_WARNING)) this.#warnings.push(BARE_BODY_AUTO_PIPED_WARNING);
+			const row: PayloadRow = { kind: "literal", text, lineNum, bare: true };
+			// `-` rows are held and judged at flush time by #resolveMinusRows,
+			// once the whole body is visible.
+			if (text.trimStart().charCodeAt(0) === 45 /* - */) row.minus = true;
+			else if (!this.#warnings.includes(BARE_BODY_AUTO_PIPED_WARNING))
+				this.#warnings.push(BARE_BODY_AUTO_PIPED_WARNING);
 			this.#commitDeferredBlanks(this.#pending);
 			// Defer read-output line-number stripping to #flushPending: a bare
 			// "N:text" row is only a copy-paste artifact from snapshot output
@@ -294,7 +306,7 @@ export class Executor {
 			// with "digits:" (YAML ports "42:hello", timestamps "12:30") when it
 			// sits next to an unprefixed sibling. Rows with an explicit "+" go
 			// through #handleLiteralPayload and are never bare, never stripped.
-			this.#pending.payloads.push({ kind: "literal", text, lineNum, bare: true });
+			this.#pending.payloads.push(row);
 			return;
 		}
 		if (text.trim().length === 0) return;
@@ -326,6 +338,38 @@ export class Executor {
 		pending.deferredBlanks = [];
 	}
 
+	/**
+	 * Judge bare `-` body rows once the whole hunk body is known. They are
+	 * usually unified-diff contamination (`-old` next to `+new`) and inserting
+	 * them would corrupt the file, so they are rejected — EXCEPT when the body
+	 * is unambiguously a Markdown bullet list: every `-` row is bullet-shaped
+	 * (`- item`) and the body is either fully bare or already contains an
+	 * explicit `+- item` sibling. Those rows are kept as literal content with a
+	 * warning instead of failing the patch.
+	 */
+	#resolveMinusRows(payloads: readonly PayloadRow[]): void {
+		let firstMinus: PayloadRow | undefined;
+		let allBulletShaped = true;
+		let hasExplicit = false;
+		let hasExplicitBullet = false;
+		for (const row of payloads) {
+			if (row.minus) {
+				firstMinus ??= row;
+				allBulletShaped &&= MD_BULLET_ROW_RE.test(row.text);
+			} else if (!row.bare) {
+				hasExplicit = true;
+				hasExplicitBullet ||= MD_BULLET_ROW_RE.test(row.text);
+			}
+		}
+		if (firstMinus === undefined) return;
+		if (allBulletShaped && (!hasExplicit || hasExplicitBullet)) {
+			if (!this.#warnings.includes(MINUS_BULLET_AUTO_PIPED_WARNING))
+				this.#warnings.push(MINUS_BULLET_AUTO_PIPED_WARNING);
+			return;
+		}
+		throw new Error(`line ${firstMinus.lineNum}: ${MINUS_ROW_REJECTED}`);
+	}
+
 	/**
 	 * Strip a single read-output line-number prefix (`N:`) from every bare body
 	 * row, but only when *all* bare rows carry one. A uniform set of prefixes is
@@ -388,6 +432,7 @@ export class Executor {
 		const pending = this.#pending;
 		if (!pending) return;
 		const { target, lineNum, payloads } = pending;
+		this.#resolveMinusRows(payloads);
 		this.#stripBarePrefixesIfUniform(payloads);
 		this.#pending = undefined;
 		if (target.kind === "delete") {