@oh-my-pi/pi-coding-agent 14.5.3 → 14.5.5

package/src/edit/line-hash.ts

@@ -676,18 +676,48 @@ export const HASHLINE_BIGRAM_RE_SRC = `(?:${HASHLINE_BIGRAMS.join("|")})`;
 export const HASHLINE_CONTENT_SEPARATOR = "|";
 
 const RE_SIGNIFICANT = /[\p{L}\p{N}]/u;
+const RE_STRUCTURAL_STRIP = /[\s{}]/g;
+
+/**
+ * Bigram returned for lines that contain only whitespace and `{`/`}`.
+ * Picks the English ordinal suffix for the line number (`1` → `st`,
+ * `2` → `nd`, `3` → `rd`, `11`/`12`/`13` → `th`, else `th`) so the
+ * line digits + bigram BPE-merge into a single ordinal token (`1st`, `42nd`,
+ * `100th`, …). Brace-only lines therefore cost one token for the whole
+ * `LINE+ID` anchor instead of two.
+ */
+function structuralBigram(line: number): string {
+	const mod100 = line % 100;
+	if (mod100 >= 11 && mod100 <= 13) return "th";
+	switch (line % 10) {
+		case 1:
+			return "st";
+		case 2:
+			return "nd";
+		case 3:
+			return "rd";
+		default:
+			return "th";
+	}
+}
 
 /**
  * Compute a short BPE-bigram hash of a single line.
  *
  * Uses xxHash32 on a trailing-whitespace-trimmed, CR-stripped line, mapped into
- * {@link HASHLINE_BIGRAMS} via modulo. For lines containing no alphanumeric
- * characters (only punctuation/symbols/whitespace), the line number is mixed in
- * to reduce hash collisions. The line input should not include a trailing newline.
+ * {@link HASHLINE_BIGRAMS} via modulo. Lines that contain only whitespace and
+ * `{`/`}` collapse to an ordinal-suffix bigram (see {@link structuralBigram})
+ * so brace-only structure shares one merged ordinal token. For other lines
+ * containing no alphanumeric characters, the line number is mixed in to reduce hash collisions.
+ * The line input should not include a trailing newline.
  */
 export function computeLineHash(idx: number, line: string): string {
 	line = line.replace(/\r/g, "").trimEnd();
 
+	if (line.replace(RE_STRUCTURAL_STRIP, "").length === 0) {
+		return structuralBigram(idx);
+	}
+
 	let seed = 0;
 	if (!RE_SIGNIFICANT.test(line)) {
 		seed = idx;

package/src/edit/modes/apply-patch.ts

@@ -22,17 +22,19 @@ export const applyPatchSchema = Type.Object({
 
 export type ApplyPatchParams = Static<typeof applyPatchSchema>;
 
+export type ApplyPatchEntry = PatchEditEntry & { path: string };
+
 /**
  * Parse the envelope and lower each hunk to a `PatchEditEntry` so it can
  * be routed through `executePatchSingle`.
  */
-export function expandApplyPatchToEntries(params: ApplyPatchParams): PatchEditEntry[] {
+export function expandApplyPatchToEntries(params: ApplyPatchParams): ApplyPatchEntry[] {
 	const hunks = parseApplyPatch(params.input);
 	if (hunks.length === 0) {
 		throw new ApplyPatchError("No files were modified.");
 	}
 	return hunks.map(
-		(h): PatchEditEntry => ({
+		(h): ApplyPatchEntry => ({
 			path: h.path,
 			op: h.op,
 			rename: h.rename,
@@ -41,10 +43,10 @@ export function expandApplyPatchToEntries(params: ApplyPatchParams): PatchEditEn
 	);
 }
 
-export function expandApplyPatchToPreviewEntries(params: ApplyPatchParams): PatchEditEntry[] {
+export function expandApplyPatchToPreviewEntries(params: ApplyPatchParams): ApplyPatchEntry[] {
 	const hunks = parseApplyPatchStreaming(params.input);
 	return hunks.map(
-		(h): PatchEditEntry => ({
+		(h): ApplyPatchEntry => ({
 			path: h.path,
 			op: h.op,
 			rename: h.rename,

package/src/edit/modes/atom.lark

@@ -0,0 +1,27 @@
+%import common.LF
+
+start: file_section+
+
+file_section: file_header (line_change | whole_file_change)
+file_header: "---" filename LF
+
+filename: /(.+)/
+
+line_change: line* mutation_line line*
+line: insert_line | delete_line | set_line | move_line | blank
+mutation_line: insert_line | delete_line | set_line
+
+whole_file_change: blank* whole_file_line blank*
+whole_file_line: remove_file | move_file
+remove_file: "!rm" LF
+move_file: "!mv" WS destination LF
+destination: /(?:[^ \t\r\n]+|"[^"\r\n]+"|'[^'\r\n]+')/
+
+insert_line: "+" /(.*)/ LF
+delete_line: "-" LID LF
+set_line: LID "=" /(.*)/ LF
+move_line: ("@" LID | "$" | "^") LF
+
+LID: /[1-9][0-9]*[a-z]{2}/
+WS: /[ \t]+/
+blank: LF