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

package/CHANGELOG.md

@@ -1,22 +1,58 @@
 # Changelog
 
 ## [Unreleased]
+
+## [14.9.9] - 2026-05-12
+
+### Added
+
+- Added new `task.isolation.mode` values `auto`, `apfs`, `btrfs`, `zfs`, `reflink`, `overlayfs`, `projfs`, `block-clone`, and `rcopy` for native PAL-backed task isolation backends
+- Added automatic PAL-backed isolation backend selection so `task.isolation.mode` uses the host's best-available backend
+- Added input-token and output-token totals to `omp stats --summary`.
+
+### Changed
+
+- Changed `task.isolation.enabled=true` migration to map to `task.isolation.mode = "auto"` instead of legacy `worktree` isolation
+- Updated isolation configuration UI labels and descriptions to expose new back-end names (`overlayfs`, `projfs`, etc.) and removed references to deprecated values in guidance text
+
+### Fixed
+
+- Fixed worktree delta capture to include previously untracked file state by baselining untracked patches for both snapshots
+- Fixed task isolation startup to try alternate PAL backends when the preferred one is unavailable, allowing successful fallback instead of immediate failure
+- Mapped legacy `task.isolation.mode` values `worktree`, `fuse-overlay`, and `fuse-projfs` to their new equivalents during settings migration to preserve behavior with older configs
+
+## [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.9",
 	"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.9",
+		"@oh-my-pi/pi-agent-core": "14.9.9",
+		"@oh-my-pi/pi-ai": "14.9.9",
+		"@oh-my-pi/pi-natives": "14.9.9",
+		"@oh-my-pi/pi-tui": "14.9.9",
+		"@oh-my-pi/pi-utils": "14.9.9",
 		"@puppeteer/browsers": "^2.13.0",
 		"@sinclair/typebox": "^0.34.49",
 		"@types/turndown": "5.0.6",

package/scripts/build-binary.ts

@@ -40,6 +40,17 @@ async function main(): Promise<void> {
 					"--root",
 					"../..",
 					"./src/cli.ts",
+					// Worker entrypoints. Bun's `--compile` discovers the literal in
+					// `new Worker("…", …)` at each spawn site, but only actually
+					// emits the worker into the bunfs root when it is listed here as
+					// an explicit additional entry. Paths are relative to this
+					// script's cwd (packages/coding-agent) and the `--root` above
+					// (../..) makes them appear inside the binary at
+					// `/$bunfs/root/packages/<pkg>/src/<worker>.js`, which is
+					// exactly what the literals at the spawn sites resolve to.
+					"../stats/src/sync-worker.ts",
+					"./src/tools/browser/tab-worker-entry.ts",
+					"./src/eval/js/worker-entry.ts",
 					"--outfile",
 					"dist/omp",
 				],

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/cli/stats-cli.ts

@@ -176,6 +176,8 @@ async function printStatsSummary(): Promise<void> {
 	console.log(`  Requests: ${formatNumber(overall.totalRequests)} (${formatNumber(overall.failedRequests)} errors)`);
 	console.log(`  Error Rate: ${formatPercent(overall.errorRate)}`);
 	console.log(`  Total Tokens: ${formatNumber(overall.totalInputTokens + overall.totalOutputTokens)}`);
+	console.log(`  Input Tokens: ${formatNumber(overall.totalInputTokens)}`);
+	console.log(`  Output Tokens: ${formatNumber(overall.totalOutputTokens)}`);
 	console.log(`  Cache Rate: ${formatPercent(overall.cacheRate)}`);
 	console.log(`  Total Cost: ${formatCost(overall.totalCost)}`);
 	console.log(`  Premium Requests: ${formatNumber(normalizePremiumRequests(overall.totalPremiumRequests ?? 0))}`);

package/src/cli.ts

@@ -84,8 +84,30 @@ function isSubcommand(first: string | undefined): boolean {
 	return commands.some(e => e.name === first || e.aliases?.includes(first));
 }
 
+/**
+ * Smoke-test entry. Spawns the stats sync worker, pings it, exits.
+ *
+ * Purpose: catch the silent worker-load regressions that hit compiled
+ * binaries (issues #1011 and #1027). Neither `--version` nor
+ * `stats --summary` actually spawns a Worker on a fresh install — the
+ * sync path early-returns when no session files exist. This probe is the
+ * minimal end-to-end test that proves `new Worker(...)` resolves and the
+ * bundled worker module evaluates successfully. Wired into
+ * `scripts/install-tests/run-ci.sh` so binary / source-link / tarball
+ * installs all exercise it on every CI run.
+ */
+async function runSmokeTest(): Promise<void> {
+	const { smokeTestSyncWorker } = await import("@oh-my-pi/omp-stats");
+	await smokeTestSyncWorker();
+	process.stdout.write("smoke-test: ok\n");
+}
+
 /** Run the CLI with the given argv (no `process.argv` prefix). */
-export function runCli(argv: string[]): Promise<void> {
+export async function runCli(argv: string[]): Promise<void> {
+	if (argv[0] === "--smoke-test") {
+		await runSmokeTest();
+		return;
+	}
 	// --help and --version are handled by run() directly, don't rewrite those.
 	// Everything else that isn't a known subcommand routes to "launch".
 	const first = argv[0];

package/src/config/settings-schema.ts

@@ -2067,25 +2067,46 @@ export const SETTINGS_SCHEMA = {
 	// Delegation
 	"task.isolation.mode": {
 		type: "enum",
-		values: ["none", "worktree", "fuse-overlay", "fuse-projfs"] as const,
+		values: [
+			"none",
+			"auto",
+			"apfs",
+			"btrfs",
+			"zfs",
+			"reflink",
+			"overlayfs",
+			"projfs",
+			"block-clone",
+			"rcopy",
+		] as const,
 		default: "none",
 		ui: {
 			tab: "tasks",
 			label: "Isolation Mode",
 			description:
-				"Isolation mode for subagents (none, git worktree, fuse-overlayfs on Unix, or ProjFS on Windows via fuse-projfs; unsupported modes fall back to worktree)",
+				'Isolation backend for subagents. "auto" lets the native PAL pick the best available backend (CoW-aware filesystems, then overlayfs/ProjFS, then a git worktree / recursive-copy fallback).',
 			options: [
 				{ value: "none", label: "None", description: "No isolation" },
-				{ value: "worktree", label: "Worktree", description: "Git worktree isolation" },
+				{ value: "auto", label: "Auto", description: "Let the PAL pick the best available backend" },
+				{ value: "apfs", label: "APFS", description: "macOS clonefile reflink (APFS)" },
+				{ value: "btrfs", label: "btrfs", description: "btrfs subvolume snapshot" },
+				{ value: "zfs", label: "ZFS", description: "ZFS snapshot + clone" },
+				{ value: "reflink", label: "Reflink", description: "Linux FICLONE per-file reflink" },
+				{
+					value: "overlayfs",
+					label: "Overlayfs",
+					description: "Linux kernel overlay (or fuse-overlayfs fallback)",
+				},
+				{ value: "projfs", label: "ProjFS", description: "Windows Projected File System" },
 				{
-					value: "fuse-overlay",
-					label: "Fuse Overlay",
-					description: "COW overlay via fuse-overlayfs (Unix only)",
+					value: "block-clone",
+					label: "Block clone",
+					description: "Windows FSCTL_DUPLICATE_EXTENTS_TO_FILE (NTFS/ReFS)",
 				},
 				{
-					value: "fuse-projfs",
-					label: "Fuse ProjFS",
-					description: "COW overlay via ProjFS (Windows only; falls back to worktree if unavailable)",
+					value: "rcopy",
+					label: "Recursive copy",
+					description: "git worktree if available, otherwise recursive copy",
 				},
 			],
 		},

package/src/config/settings.ts

@@ -598,11 +598,28 @@ export class Settings {
 		const isolationObj = taskObj?.isolation as Record<string, unknown> | undefined;
 		if (isolationObj && "enabled" in isolationObj) {
 			if (typeof isolationObj.enabled === "boolean") {
-				isolationObj.mode = isolationObj.enabled ? "worktree" : "none";
+				isolationObj.mode = isolationObj.enabled ? "auto" : "none";
 			}
 			delete isolationObj.enabled;
 		}
 
+		// task.isolation.mode: legacy values from before the pi-iso PAL refactor.
+		// `worktree` was git worktree → now lives under `rcopy`. `fuse-overlay`
+		// and `fuse-projfs` are now the platform-named `overlayfs` / `projfs`
+		// kinds; the PAL falls back internally when the chosen one isn't
+		// available, so we don't need the old TS-side platform guards.
+		if (isolationObj && typeof isolationObj.mode === "string") {
+			const legacy: Record<string, string> = {
+				worktree: "rcopy",
+				"fuse-overlay": "overlayfs",
+				"fuse-projfs": "projfs",
+			};
+			const mapped = legacy[isolationObj.mode as string];
+			if (mapped !== undefined) {
+				isolationObj.mode = mapped;
+			}
+		}
+
 		// edit.mode: removed "atom" variant is now "hashline"
 		const editObj = raw.edit as Record<string, unknown> | undefined;
 		if (editObj) {

package/src/edit/streaming.ts

@@ -287,7 +287,7 @@ const hashlineStrategy: EditStreamingStrategy<HashlineArgs> = {
 			sections = splitHashlineInputs(args.input, { cwd: ctx.cwd, path: args.path });
 		} catch {
 			// Single-section fallback keeps the original error rendering for the
-			// "haven't typed `@PATH` yet" case.
+			// "haven't typed `@@ PATH` yet" case.
 			const result = await computeHashlineDiff({ input: args.input, path: args.path }, ctx.cwd, {
 				autoDropPureInsertDuplicates: ctx.hashlineAutoDropPureInsertDuplicates,
 			});

package/src/eval/js/context-manager.ts

@@ -1,14 +1,13 @@
-import { logger, Snowflake } from "@oh-my-pi/pi-utils";
+import { isCompiledBinary, logger, Snowflake } from "@oh-my-pi/pi-utils";
 import type { ToolSession } from "../../tools";
 import { ToolAbortError, ToolError } from "../../tools/tool-errors";
 import { callSessionTool, type JsStatusEvent } from "./tool-bridge";
 import { WorkerCore } from "./worker-core";
-// Imported with `type: "file"` so Bun's bundler statically discovers the worker entry and
-// embeds it inside `bun build --compile` single-file binaries. Mirrors the browser tab
-// worker setup; see packages/coding-agent/src/tools/browser/tab-supervisor.ts for the
-// rationale.
-// @ts-expect-error -- Bun file-URL import attribute is not modeled by tsgo.
-import jsWorkerEntryUrl from "./worker-entry.ts" with { type: "file" };
+// Worker entry. See `tab-supervisor.ts` for the rationale behind the
+// literal-string + `new URL(import.meta.url)` hybrid: the literal is what
+// Bun's `--compile` bundler discovers, the `new URL` form is what makes dev
+// runs portable across cwds. The worker is registered as an additional
+// `--compile` entrypoint in `scripts/build-binary.ts`.
 import type {
 	JsDisplayOutput,
 	RunErrorPayload,
@@ -344,7 +343,9 @@ async function raceWithTimeout<T>(promise: Promise<T>, timeoutMs: number, reason
 
 async function spawnJsWorker(): Promise<WorkerHandle> {
 	try {
-		const worker = new Worker(jsWorkerEntryUrl, { type: "module" });
+		const worker = isCompiledBinary()
+			? new Worker("./packages/coding-agent/src/eval/js/worker-entry.ts", { type: "module" })
+			: new Worker(new URL("./worker-entry.ts", import.meta.url).href, { type: "module" });
 		return wrapBunWorker(worker);
 	} catch (err) {
 		logger.warn("Bun Worker spawn failed; using inline JS eval worker (no sync-loop guard)", {

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,
 	);
 }