@oh-my-pi/pi-coding-agent 14.9.7 → 14.9.8

package/CHANGELOG.md

@@ -1,22 +1,39 @@
 # Changelog
 
 ## [Unreleased]
+
+## [14.9.8] - 2026-05-12
+
 ### Breaking Changes
 
 - Changed the `eval` tool input format to a single-line `*** Cell <lang>:"<title>" [t:<duration>] [rst]` header per cell, replacing the `*** Begin <LANG>` / `*** End <LANG>` envelope and the standalone `*** Title:` / `*** Timeout:` / `*** Reset` directives. The lark grammar enforces a fixed attribute order; the runtime parser remains lenient (alias keys, bare positional tokens, single-quoted titles).
 
 ### Added
 
+- Added `:conflicts` read selector (`read <path>:conflicts`) to return a one-line index of all unresolved merge conflicts with stable `#N` IDs for quick inspection
+- Added bulk conflict resolution with `write({ path: "conflict://*", content })` to resolve all currently registered conflicts across files in one call, expanding `@ours`/`@theirs`/`@base`/`@both` per conflict and returning per-file counts
+- Added `read` support for `conflict://<N>` and `read conflict://<N>/<scope>` to inspect unresolved conflict regions captured by a prior read, including `ours`, `theirs`, and `base` side views with original file line alignment
+- Added shorthand content tokens `@ours`, `@theirs`, `@both`, and `@base` to conflict-resolution writes using `path: "conflict://<N>"` so replacement content can be composed from recorded conflict sections
+- Added conflict count metadata to read results so conflict files now show a warning badge (`⚠ N`) in the read tool UI
 - Added support for explicit boolean `rst` values (`rst:true`, `rst:false`, `rst:1`, `rst:0`, `rst:yes`, `rst:no`, `rst:on`, `rst:off`) in `*** Cell` headers
+- Added detection of unresolved git merge conflicts in `read` output: each marker block is registered with a session-stable id and surfaced in a footer with `ours`/`theirs` previews. Resolve a block by calling `write({ path: "conflict://<id>", content })` — the tool splices the recorded marker region (markers and all sides) with the supplied content and routes through the normal writethrough (LSP format/diagnostics, fs-cache invalidation).
 
 ### Changed
 
+- Changed `read` conflict warning footers to show `X of Y` unresolved conflicts when a range only captures part of a file and provide a `read <path>:conflicts` hint for the full list
+- Changed conflict scanning in conflict read paths to inspect the whole file (with a 10 MB cap) so totals better reflect hidden conflicts and truncated scans are called out
+- Changed conflict marker scanning during `read` to only register fully formed, column-0 merge-marker blocks, so indented or malformed marker-like lines are no longer treated as conflicts
+- Changed `write` conflict resolution to validate `conflict://` IDs and report clear errors for malformed or unknown conflict URIs
 - Changed the HTML transcript renderer to parse the new `*** Cell` headers while keeping the older `*** Begin <LANG>` and `===== ... =====` formats renderable for historical sessions.
 - Changed the `eval` tool parser so a stray non-marker line between cells no longer crashes with `null is not an object (evaluating 'BEGIN_RE.exec(lines[i])[1]')`; stray content is consumed without aborting parsing.
 - Changed `*** End` to be an optional, undocumented per-cell terminator (kept in the lark to satisfy GPT-trained models' natural terminator habit during constrained sampling).
 
 ### Fixed
 
+- Fixed single-conflict `write` retries to re-locate the recorded conflict block by exact marker content so shifted line numbers from out-of-band edits no longer prevent resolution
+- Fixed `read conflict://*` handling by rejecting wildcard reads with a clear write-only guidance error
+- Fixed conflict resolution to verify the live file still contains recorded `<<<<<<<` and `>>>>>>>` markers before splicing, preventing stale conflict IDs from silently corrupting out-of-band-edited files
+- Fixed `@base` token handling so two-way conflicts without a base section now return a clear error
 - Improved `*** Cell` header parsing to reject invalid `rst` values with a clear `invalid rst value` error
 
 ## [14.9.7] - 2026-05-12

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "14.9.7",
+	"version": "14.9.8",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"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": "14.9.7",
-		"@oh-my-pi/pi-agent-core": "14.9.7",
-		"@oh-my-pi/pi-ai": "14.9.7",
-		"@oh-my-pi/pi-natives": "14.9.7",
-		"@oh-my-pi/pi-tui": "14.9.7",
-		"@oh-my-pi/pi-utils": "14.9.7",
+		"@oh-my-pi/omp-stats": "14.9.8",
+		"@oh-my-pi/pi-agent-core": "14.9.8",
+		"@oh-my-pi/pi-ai": "14.9.8",
+		"@oh-my-pi/pi-natives": "14.9.8",
+		"@oh-my-pi/pi-tui": "14.9.8",
+		"@oh-my-pi/pi-utils": "14.9.8",
 		"@puppeteer/browsers": "^2.13.0",
 		"@sinclair/typebox": "^0.34.49",
 		"@types/turndown": "5.0.6",

package/scripts/generate-template.ts

@@ -18,10 +18,11 @@ const minifiedCss = css
 	.replace(/\s*([{}:;,])\s*/g, "$1")
 	.trim();
 
-// Inline everything
+// Inline everything; use function replacements so `$'`, `$&`, `$$`, etc. inside
+// the embedded CSS/JS are not interpreted as substitution patterns.
 const template = html
-	.replace("<template-css/>", `<style>${minifiedCss}</style>`)
-	.replace("<template-js/>", `<script>${js}</script>`);
+	.replace("<template-css/>", () => `<style>${minifiedCss}</style>`)
+	.replace("<template-js/>", () => `<script>${js}</script>`);
 
 // Write generated file
 const output = `// Auto-generated by scripts/generate-template.ts - DO NOT EDIT

package/src/export/html/index.ts

@@ -103,9 +103,12 @@ async function generateHtml(sessionData: SessionData, themeName?: string): Promi
 	const themeVars = await generateThemeVars(themeName);
 	const sessionDataBase64 = Buffer.from(JSON.stringify(sessionData)).toBase64();
 
-	return TEMPLATE.replace("<theme-vars/>", `<style>:root { ${themeVars} }</style>`).replace(
+	// Use function replacements so `$'`, `$&`, `$$`, `$n`, etc. in the
+	// substituted CSS/base64 are not interpreted as substitution patterns
+	// (see https://mdn.io/String.replace).
+	return TEMPLATE.replace("<theme-vars/>", () => `<style>:root { ${themeVars} }</style>`).replace(
 		"{{SESSION_DATA}}",
-		sessionDataBase64,
+		() => sessionDataBase64,
 	);
 }