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

package/src/export/html/template.macro.ts

@@ -17,8 +17,9 @@ export async function getTemplate(): Promise<string> {
 		.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.
 	return 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>`);
 }

package/src/modes/components/read-tool-group.ts

@@ -22,6 +22,7 @@ type ReadToolResultDetails = {
 		from?: string;
 		to?: string;
 	};
+	conflictCount?: number;
 };
 
 type ReadToolGroupOptions = {
@@ -41,6 +42,7 @@ type ReadEntry = {
 	status: "pending" | "success" | "warning" | "error";
 	correctedFrom?: string;
 	contentText?: string;
+	conflictCount?: number;
 };
 
 /** Number of code lines to show in collapsed preview mode */
@@ -91,6 +93,9 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 		} else {
 			entry.correctedFrom = undefined;
 		}
+		const conflictCount =
+			typeof details?.conflictCount === "number" && details.conflictCount > 0 ? details.conflictCount : undefined;
+		entry.conflictCount = conflictCount;
 		entry.status = result.isError ? "error" : suffixResolution ? "warning" : "success";
 		// Store the text content for preview/expanded display
 		const textContent = result.content?.find(c => c.type === "text")?.text;
@@ -212,6 +217,10 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 		if (entry.correctedFrom) {
 			pathDisplay += theme.fg("dim", ` (corrected from ${shortenPath(entry.correctedFrom)})`);
 		}
+		if (entry.conflictCount && entry.conflictCount > 0) {
+			const n = entry.conflictCount;
+			pathDisplay += ` ${theme.fg("warning", `(⚠ ${n} conflict${n === 1 ? "" : "s"})`)}`;
+		}
 		return pathDisplay;
 	}
 

package/src/prompts/tools/read.md

@@ -18,6 +18,7 @@ The `read` tool is multi-purpose and more capable than it looks — inspects fil
 |`:50+150`|Read 150 lines starting at line 50|
 |`:20+1`|Read exactly one line|
 |`:raw`|Read verbatim text without anchors or summarization|
+|`:conflicts`|Return a one-line-per-block index of every merge conflict in the file|
 
 # Filesystem
 - Reading a directory path returns a list of dirents.