@oh-my-pi/pi-coding-agent 14.4.4 → 14.5.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "14.4.4",
+	"version": "14.5.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -46,12 +46,13 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.20.0",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/omp-stats": "14.4.4",
-		"@oh-my-pi/pi-agent-core": "14.4.4",
-		"@oh-my-pi/pi-ai": "14.4.4",
-		"@oh-my-pi/pi-natives": "14.4.4",
-		"@oh-my-pi/pi-tui": "14.4.4",
-		"@oh-my-pi/pi-utils": "14.4.4",
+		"@oh-my-pi/omp-stats": "14.5.0",
+		"@oh-my-pi/pi-agent-core": "14.5.0",
+		"@oh-my-pi/pi-ai": "14.5.0",
+		"@oh-my-pi/pi-natives": "14.5.0",
+		"@oh-my-pi/pi-tui": "14.5.0",
+		"@oh-my-pi/pi-utils": "14.5.0",
+		"@puppeteer/browsers": "^2.13.0",
 		"@sinclair/typebox": "^0.34.49",
 		"@xterm/headless": "^6.0.0",
 		"ajv": "^8.20.0",
@@ -62,7 +63,7 @@
 		"linkedom": "^0.18.12",
 		"lru-cache": "11.3.5",
 		"markit-ai": "0.5.3",
-		"puppeteer": "^24.42.0",
+		"puppeteer-core": "^24.42.0",
 		"turndown": "7.2.4",
 		"turndown-plugin-gfm": "1.0.2",
 		"zod": "4.3.6"

package/src/edit/modes/atom.ts

@@ -355,6 +355,19 @@ function applySedToLine(
 	}
 	if (re?.test(currentLine)) {
 		re.lastIndex = 0;
+		const probe = re.exec(currentLine);
+		re.lastIndex = 0;
+		if (probe && probe[0].length === 0) {
+			// Zero-length matches (e.g. `()`, `(?=…)`, `^`, `$`) cause `String.replace`
+			// to insert the replacement at the match position rather than substitute,
+			// which is almost never what models intend. Reject with a pointer to the
+			// dedicated insertion verbs.
+			return {
+				result: currentLine,
+				matched: false,
+				error: `pattern ${JSON.stringify(spec.pattern)} matches an empty string; use \`pre\`/\`post\`/\`splice\` to insert or replace whole lines, or use a non-empty pattern`,
+			};
+		}
 		return { result: currentLine.replace(re, spec.replacement), matched: true };
 	}
 	// Fall back to literal substring match. Models frequently send sed patterns
@@ -674,7 +687,7 @@ export function applyAtomEdits(
 				case "sed": {
 					const { result, matched, error, literalFallback } = applySedToLine(currentLine, edit.spec);
 					if (error) {
-						throw new Error(`Edit sed expression ${JSON.stringify(edit.expression)} failed to compile: ${error}`);
+						throw new Error(`Edit sed expression ${JSON.stringify(edit.expression)} rejected: ${error}`);
 					}
 					if (!matched) {
 						throw new Error(
@@ -786,9 +799,7 @@ export function applyAtomEdits(
 		}
 		if (!anyMatched) {
 			if (lastCompileError !== undefined) {
-				throw new Error(
-					`Edit sed expression ${JSON.stringify(edit.expression)} failed to compile: ${lastCompileError}`,
-				);
+				throw new Error(`Edit sed expression ${JSON.stringify(edit.expression)} rejected: ${lastCompileError}`);
 			}
 			throw new Error(`Edit sed expression ${JSON.stringify(edit.expression)} did not match any line in the file.`);
 		}

package/src/tools/browser.ts

@@ -15,7 +15,7 @@ import type {
 	Page,
 	default as Puppeteer,
 	SerializedAXNode,
-} from "puppeteer";
+} from "puppeteer-core";
 import browserDescription from "../prompts/tools/browser.md" with { type: "text" };
 import type { ToolSession } from "../sdk";
 import { resizeImage } from "../utils/image-resize";
@@ -53,7 +53,7 @@ async function loadPuppeteer(): Promise<typeof Puppeteer> {
 	await Bun.write(path.join(safeDir, "package.json"), "{}");
 	try {
 		process.chdir(safeDir);
-		puppeteerModule = (await import("puppeteer")).default;
+		puppeteerModule = (await import("puppeteer-core")).default;
 		return puppeteerModule;
 	} finally {
 		process.chdir(prev);
@@ -61,50 +61,172 @@ async function loadPuppeteer(): Promise<typeof Puppeteer> {
 }
 
 /**
- * On NixOS, Puppeteer's bundled Chromium is a dynamically-linked FHS binary and
- * cannot run as-is. Detect the platform and resolve a system-installed Chromium
- * so `puppeteer.launch()` can use it instead of the bundled one.
+ * Lazily download Chromium on first browser launch via @puppeteer/browsers.
+ * Skipped when a system Chromium (NixOS) or PUPPETEER_EXECUTABLE_PATH is set.
+ * The browser is cached under ~/.omp/puppeteer (getPuppeteerDir).
+ */
+let chromiumExecutablePromise: Promise<string | undefined> | undefined;
+async function ensureChromiumExecutable(): Promise<string | undefined> {
+	const sysChrome = resolveSystemChromium();
+	if (sysChrome) return sysChrome;
+	const envPath = process.env.PUPPETEER_EXECUTABLE_PATH;
+	if (envPath) return envPath;
+	if (chromiumExecutablePromise) return chromiumExecutablePromise;
+
+	chromiumExecutablePromise = (async () => {
+		const [browsers, revisions] = await Promise.all([
+			import("@puppeteer/browsers"),
+			import("puppeteer-core/internal/revisions.js"),
+		]);
+		const platform = browsers.detectBrowserPlatform();
+		if (!platform) {
+			logger.warn("Could not detect browser platform; relying on puppeteer default resolution");
+			return undefined;
+		}
+		const cacheDir = getPuppeteerDir();
+		const buildId = await browsers.resolveBuildId(
+			browsers.Browser.CHROME,
+			platform,
+			revisions.PUPPETEER_REVISIONS.chrome,
+		);
+		const executablePath = browsers.computeExecutablePath({
+			browser: browsers.Browser.CHROME,
+			buildId,
+			cacheDir,
+			platform,
+		});
+		if (fs.existsSync(executablePath)) return executablePath;
+
+		logger.warn("Downloading Chromium for puppeteer (first browser use)", {
+			buildId,
+			platform,
+			cacheDir,
+		});
+		let lastReportedPercent = -1;
+		await browsers.install({
+			browser: browsers.Browser.CHROME,
+			buildId,
+			cacheDir,
+			platform,
+			downloadProgressCallback: (downloaded, total) => {
+				if (total <= 0) return;
+				const pct = Math.floor((downloaded / total) * 100);
+				if (pct >= lastReportedPercent + 10 || downloaded === total) {
+					lastReportedPercent = pct;
+					logger.debug(
+						`Chromium download: ${pct}% (${Math.round(downloaded / 1_000_000)} / ${Math.round(total / 1_000_000)} MB)`,
+					);
+				}
+			},
+		});
+		return executablePath;
+	})().catch(err => {
+		chromiumExecutablePromise = undefined;
+		throw new ToolError(
+			`Failed to install Chromium for puppeteer: ${(err as Error).message}. ` +
+				"Set PUPPETEER_EXECUTABLE_PATH to use an existing Chrome/Chromium binary, or install one manually.",
+		);
+	});
+	return chromiumExecutablePromise;
+}
+
+/**
+ * Resolve a system-installed Chrome/Chromium so `puppeteer.launch()` can reuse
+ * it instead of forcing a Chromium download. Returns `undefined` when no binary
+ * is found, which lets the caller fall back to a managed download.
  *
- * Detection order:
- *   1. `chromium` on PATH
- *   2. `chromium-browser` on PATH
- *   3. ~/.nix-profile/bin/chromium  (user profile)
- *   4. /run/current-system/sw/bin/chromium  (system profile)
+ * Detection order (per platform):
+ *   - macOS:   Google Chrome → Chromium → Microsoft Edge (system + user Applications)
+ *   - Linux:   PATH lookups (google-chrome, chromium, etc.) → common /usr/bin paths,
+ *              with NixOS-specific profile paths added when /etc/NIXOS exists
+ *   - Windows: Program Files / LocalAppData install paths for Chrome and Edge
  *
- * Returns `undefined` on non-NixOS systems or when no binary is found, which
- * causes Puppeteer to fall back to its default resolution.
+ * Honored regardless of platform: PUPPETEER_EXECUTABLE_PATH callers should bypass
+ * this entirely (handled in ensureChromiumExecutable).
  */
 let _resolvedChromium: string | null | undefined; // undefined = unchecked; null = not found
-function resolveSystemChromium(): string | undefined {
-	if (_resolvedChromium !== undefined) return _resolvedChromium ?? undefined;
+function isExecutableFile(p: string): boolean {
 	try {
-		if (!fs.existsSync("/etc/NIXOS")) {
-			_resolvedChromium = null;
-			return undefined;
-		}
+		const st = fs.statSync(p);
+		return st.isFile();
 	} catch {
-		_resolvedChromium = null;
-		return undefined;
+		return false;
 	}
-	const candidates = [
-		$which("chromium"),
-		$which("chromium-browser"),
-		path.join(os.homedir(), ".nix-profile/bin/chromium"),
-		"/run/current-system/sw/bin/chromium",
-	];
-	for (const candidate of candidates) {
-		if (candidate) {
+}
+
+function systemChromiumCandidates(): string[] {
+	const home = os.homedir();
+	const candidates: string[] = [];
+	switch (process.platform) {
+		case "darwin": {
+			for (const root of ["/Applications", path.join(home, "Applications")]) {
+				candidates.push(
+					path.join(root, "Google Chrome.app/Contents/MacOS/Google Chrome"),
+					path.join(root, "Google Chrome Beta.app/Contents/MacOS/Google Chrome Beta"),
+					path.join(root, "Google Chrome Dev.app/Contents/MacOS/Google Chrome Dev"),
+					path.join(root, "Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary"),
+					path.join(root, "Chromium.app/Contents/MacOS/Chromium"),
+					path.join(root, "Microsoft Edge.app/Contents/MacOS/Microsoft Edge"),
+				);
+			}
+			break;
+		}
+		case "linux": {
+			const names = ["google-chrome-stable", "google-chrome", "chromium", "chromium-browser", "chrome"];
+			for (const name of names) {
+				const found = $which(name);
+				if (found) candidates.push(found);
+			}
+			candidates.push(
+				"/usr/bin/google-chrome-stable",
+				"/usr/bin/google-chrome",
+				"/usr/bin/chromium",
+				"/usr/bin/chromium-browser",
+				"/snap/bin/chromium",
+				"/var/lib/flatpak/exports/bin/com.google.Chrome",
+				"/var/lib/flatpak/exports/bin/org.chromium.Chromium",
+			);
+			let onNixos = false;
 			try {
-				if (fs.existsSync(candidate)) {
-					_resolvedChromium = candidate;
-					logger.debug("NixOS: using system Chromium", { path: candidate });
-					return candidate;
-				}
+				onNixos = fs.existsSync("/etc/NIXOS");
 			} catch {}
+			if (onNixos) {
+				candidates.push(path.join(home, ".nix-profile/bin/chromium"), "/run/current-system/sw/bin/chromium");
+			}
+			break;
+		}
+		case "win32": {
+			const programFiles = process.env.ProgramFiles ?? "C:\\Program Files";
+			const programFilesX86 = process.env["ProgramFiles(x86)"] ?? "C:\\Program Files (x86)";
+			const localAppData = process.env.LOCALAPPDATA ?? path.join(home, "AppData\\Local");
+			candidates.push(
+				path.join(programFiles, "Google\\Chrome\\Application\\chrome.exe"),
+				path.join(programFilesX86, "Google\\Chrome\\Application\\chrome.exe"),
+				path.join(localAppData, "Google\\Chrome\\Application\\chrome.exe"),
+				path.join(programFiles, "Chromium\\Application\\chrome.exe"),
+				path.join(localAppData, "Chromium\\Application\\chrome.exe"),
+				path.join(programFiles, "Microsoft\\Edge\\Application\\msedge.exe"),
+				path.join(programFilesX86, "Microsoft\\Edge\\Application\\msedge.exe"),
+			);
+			break;
+		}
+	}
+	return candidates;
+}
+
+function resolveSystemChromium(): string | undefined {
+	if (_resolvedChromium !== undefined) return _resolvedChromium ?? undefined;
+	const seen = new Set<string>();
+	for (const candidate of systemChromiumCandidates()) {
+		if (!candidate || seen.has(candidate)) continue;
+		seen.add(candidate);
+		if (isExecutableFile(candidate)) {
+			_resolvedChromium = candidate;
+			logger.debug("Using system Chrome/Chromium", { path: candidate });
+			return candidate;
 		}
 	}
 	_resolvedChromium = null;
-	logger.debug("NixOS detected but no Chromium binary found; Puppeteer may fail to launch");
 	return undefined;
 }
 
@@ -674,7 +796,7 @@ export class BrowserTool implements AgentTool<typeof browserSchema, BrowserToolD
 		this.#browser = await puppeteer.launch({
 			headless: this.#currentHeadless,
 			defaultViewport: this.#currentHeadless ? initialViewport : null,
-			executablePath: resolveSystemChromium(),
+			executablePath: await ensureChromiumExecutable(),
 			args: launchArgs,
 			ignoreDefaultArgs: [...STEALTH_IGNORE_DEFAULT_ARGS],
 		});