@oh-my-pi/pi-coding-agent 15.3.0 → 15.3.2

package/src/tools/read.ts

@@ -118,22 +118,8 @@ function formatTextWithMode(
 	startNum: number,
 	shouldAddHashLines: boolean,
 	shouldAddLineNumbers: boolean,
-	truncatedLines?: ReadonlySet<number>,
 ): string {
-	if (shouldAddHashLines) {
-		if (!truncatedLines || truncatedLines.size === 0) return formatHashLines(text, startNum);
-		// Column-truncated lines hash differently from the on-disk line that the
-		// edit verifier reads back. Drop the anchor (`LINE|TEXT` instead of
-		// `LINE+HASH|TEXT`) so the model treats the line as un-anchorable rather
-		// than copying a hash that will be rejected as stale.
-		const lines = text.split("\n");
-		return lines
-			.map((line, i) => {
-				const ln = startNum + i;
-				return truncatedLines.has(ln) ? `${ln}${HL_BODY_SEP}${line}` : formatHashLine(ln, line);
-			})
-			.join("\n");
-	}
+	if (shouldAddHashLines) return formatHashLines(text, startNum);
 	if (shouldAddLineNumbers) return prependLineNumbers(text, startNum);
 	return text;
 }
@@ -1045,14 +1031,12 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 			}
 
 			const collectedLines = streamResult.lines;
-			const truncatedLineNumbers = new Set<number>();
 			if (!rawSelector && maxColumns > 0) {
 				for (let i = 0; i < collectedLines.length; i++) {
 					const { text, wasTruncated } = truncateLine(collectedLines[i], maxColumns);
 					if (wasTruncated) {
 						collectedLines[i] = text;
 						columnTruncated = maxColumns;
-						truncatedLineNumbers.add(range.startLine + i);
 					}
 				}
 			}
@@ -1062,15 +1046,7 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 			}
 
 			const blockText = collectedLines.join("\n");
-			blocks.push(
-				formatTextWithMode(
-					blockText,
-					range.startLine,
-					shouldAddHashLines,
-					shouldAddLineNumbers,
-					truncatedLineNumbers,
-				),
-			);
+			blocks.push(formatTextWithMode(blockText, range.startLine, shouldAddHashLines, shouldAddLineNumbers));
 		}
 
 		let outputText = blocks.join("\n\n…\n\n");
@@ -1814,14 +1790,12 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 					// view — column truncation surfaces separately via `.limits()`.
 					const rawSelector = isRawSelector(parsed);
 					const maxColumns = resolveOutputMaxColumns(this.session.settings);
-					const truncatedLineNumbers = new Set<number>();
 					if (!rawSelector && maxColumns > 0) {
 						for (let i = 0; i < collectedLines.length; i++) {
 							const { text, wasTruncated } = truncateLine(collectedLines[i], maxColumns);
 							if (wasTruncated) {
 								collectedLines[i] = text;
 								columnTruncated = maxColumns;
-								truncatedLineNumbers.add(startLineDisplay + i);
 							}
 						}
 					}
@@ -1855,13 +1829,7 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 					let capturedDisplayContent: { text: string; startLine: number } | undefined;
 					const formatText = (text: string, startNum: number): string => {
 						capturedDisplayContent = { text, startLine: startNum };
-						return formatTextWithMode(
-							text,
-							startNum,
-							shouldAddHashLines,
-							shouldAddLineNumbers,
-							truncatedLineNumbers,
-						);
+						return formatTextWithMode(text, startNum, shouldAddHashLines, shouldAddLineNumbers);
 					};
 
 					let outputText: string;

package/src/utils/clipboard.ts

@@ -1,6 +1,7 @@
 import { execSync } from "node:child_process";
 import type { ClipboardImage } from "@oh-my-pi/pi-natives";
 import * as native from "@oh-my-pi/pi-natives";
+import { logger } from "@oh-my-pi/pi-utils";
 
 function hasDisplay(): boolean {
 	return process.platform !== "linux" || Boolean(process.env.DISPLAY || process.env.WAYLAND_DISPLAY);
@@ -80,7 +81,7 @@ if ($img -ne $null) {
 }
 `;
 
-const POWERSHELL_TIMEOUT_MS = 5000;
+const POWERSHELL_TIMEOUT_MS = 8000;
 
 /**
  * Read a clipboard image through the Windows host's PowerShell.
@@ -104,6 +105,12 @@ async function readImageViaPowerShell(): Promise<ClipboardImage | null> {
 		try {
 			stdout = await new Response(proc.stdout).text();
 			await proc.exited;
+		} catch (err) {
+			// powershell.exe is a Windows process reached over WSL interop; if it
+			// doesn't reap cleanly, swallow the error so the dispatcher can fall
+			// through to the native bridge instead of throwing.
+			logger.warn("clipboard: powershell read failed", { error: String(err) });
+			return null;
 		} finally {
 			clearTimeout(timer);
 		}
@@ -136,8 +143,12 @@ export async function readImageFromClipboard(): Promise<ClipboardImage | null> {
 	if (isWsl()) {
 		const image = await readImageViaPowerShell();
 		if (image) return image;
-		// Fall through: arboard may still succeed on a future WSLg release.
-	} else if (!hasDisplay()) {
+		// Fall through: arboard may still succeed on a future WSLg release —
+		// but only when we actually have a display server. Headless WSL has
+		// no display, so arboard would reject anyway.
+	}
+
+	if (!hasDisplay()) {
 		return null;
 	}
 

package/src/utils/image-resize.ts

@@ -23,16 +23,27 @@ export interface ResizedImage {
 // binding constraint once images are downsized to 1568px (Anthropic's internal threshold).
 const DEFAULT_MAX_BYTES = 500 * 1024;
 
-const DEFAULT_OPTIONS: Required<ImageResizeOptions> = {
+const DEFAULT_OPTIONS: Required<Omit<ImageResizeOptions, "excludeWebP">> = {
 	// Anthropic's "internal recommended size" — Claude internally caps images at
 	// 1568px on the longest edge before vision processing.
 	maxWidth: 1568,
 	maxHeight: 1568,
 	maxBytes: DEFAULT_MAX_BYTES,
 	jpegQuality: 80,
-	excludeWebP: Bun.env.OMP_NO_WEBP !== undefined,
 };
 
+/**
+ * Read `OMP_NO_WEBP` per-call so runtime toggles take effect.
+ * Only `"1"` and `"true"` (case-insensitive) enable exclusion — an empty string
+ * or `"0"` MUST be treated as disabled.
+ */
+function isWebPExcluded(): boolean {
+	const raw = Bun.env.OMP_NO_WEBP;
+	if (raw === undefined) return false;
+	const v = raw.toLowerCase();
+	return v === "1" || v === "true";
+}
+
 /** Pick the smallest of N encoded buffers. */
 function pickSmallest(...candidates: Array<{ buffer: Uint8Array; mimeType: string }>): {
 	buffer: Uint8Array;
@@ -62,7 +73,8 @@ Buffer.prototype.toBase64 = function (this: Buffer) {
  * off the JS thread when the terminal (`.bytes()`) is awaited.
  */
 export async function resizeImage(img: ImageContent, options?: ImageResizeOptions): Promise<ResizedImage> {
-	const opts = { ...DEFAULT_OPTIONS, ...options };
+	const excludeWebP = options?.excludeWebP ?? isWebPExcluded();
+	const opts = { ...DEFAULT_OPTIONS, ...options, excludeWebP };
 	const inputBuffer = Buffer.from(img.data, "base64");
 
 	try {
@@ -75,7 +87,12 @@ export async function resizeImage(img: ImageContent, options?: ImageResizeOption
 		// still get JPEG-compressed.
 		const originalSize = inputBuffer.length;
 		const comfortableSize = opts.maxBytes / 4;
-		if (originalWidth <= opts.maxWidth && originalHeight <= opts.maxHeight && originalSize <= comfortableSize) {
+		if (
+			originalWidth <= opts.maxWidth &&
+			originalHeight <= opts.maxHeight &&
+			originalSize <= comfortableSize &&
+			!(opts.excludeWebP && sourceMime === "image/webp")
+		) {
 			return {
 				buffer: inputBuffer,
 				mimeType: sourceMime,
@@ -251,7 +268,13 @@ export async function resizeImage(img: ImageContent, options?: ImageResizeOption
 			},
 		};
 	} catch {
-		// Failed to load image
+		// Bun.Image rejected the input — we cannot decode/re-encode it.
+		// When the caller demanded WebP exclusion AND the original is WebP,
+		// returning the original buffer would silently violate that contract,
+		// so surface an explicit error instead.
+		if (excludeWebP && (img.mimeType === "image/webp" || !img.mimeType)) {
+			throw new Error("resizeImage: failed to decode image and cannot honor excludeWebP for a WebP source");
+		}
 		return {
 			buffer: inputBuffer,
 			mimeType: img.mimeType,