@oh-my-pi/pi-ai 17.4.0 → 17.4.2

package/src/providers/anthropic.ts

@@ -914,7 +914,15 @@ async function resizeAnthropicManyImageContent(
 	let changed = false;
 	const next = await Promise.all(
 		content.map(async block => {
-			if (block.type !== "image") return block;
+			// Remotely referenced blocks never put base64 on the wire, so their size
+			// cannot violate the many-image request budget — and resizing would
+			// desync fallback bytes from the advertised remote image.
+			if (
+				block.type !== "image" ||
+				block.url ||
+				(block.providerFile?.provider === "anthropic" && block.providerFile.id)
+			)
+				return block;
 			let resized = anthropicManyImageResizeCache.get(block);
 			if (resized === undefined) {
 				resized = await limit(() => resizeAnthropicManyImageBlock(block));
@@ -971,19 +979,14 @@ async function prepareAnthropicManyImageContext(context: Context, supportsImages
 	return { ...context, messages };
 }
 
+type AnthropicImageSource =
+	| { type: "base64"; media_type: AnthropicImageMediaType; data: string }
+	| { type: "url"; url: string }
+	| { type: "file"; file_id: string };
+
 type AnthropicToolResultContent =
 	| string
-	| Array<
-			| { type: "text"; text: string }
-			| {
-					type: "image";
-					source: {
-						type: "base64";
-						media_type: AnthropicImageMediaType;
-						data: string;
-					};
-			  }
-	  >;
+	| Array<{ type: "text"; text: string } | { type: "image"; source: AnthropicImageSource }>;
 
 /**
  * Convert content blocks to Anthropic API format
@@ -992,17 +995,7 @@ function convertContentBlocks(
 	content: (TextContent | ImageContent)[],
 	supportsImages = true,
 ): AnthropicToolResultContent {
-	const blocks: Array<
-		| { type: "text"; text: string }
-		| {
-				type: "image";
-				source: {
-					type: "base64";
-					media_type: AnthropicImageMediaType;
-					data: string;
-				};
-		  }
-	> = [];
+	const blocks: Array<{ type: "text"; text: string } | { type: "image"; source: AnthropicImageSource }> = [];
 	let sawText = false;
 	let sawImage = false;
 
@@ -1020,21 +1013,22 @@ function convertContentBlocks(
 			continue;
 		}
 
-		const mediaType = normalizeAnthropicImageMediaType(block.mimeType);
-		if (!mediaType) {
-			blocks.push({ type: "text", text: `[unsupported image: ${block.mimeType}]` });
-			continue;
+		let source: AnthropicImageSource;
+		if (block.providerFile?.provider === "anthropic" && block.providerFile.id) {
+			source = { type: "file", file_id: block.providerFile.id };
+		} else if (block.url) {
+			source = { type: "url", url: block.url };
+		} else {
+			const mediaType = normalizeAnthropicImageMediaType(block.mimeType);
+			if (!mediaType) {
+				blocks.push({ type: "text", text: `[unsupported image: ${block.mimeType}]` });
+				continue;
+			}
+			source = { type: "base64", media_type: mediaType, data: block.data };
 		}
 
 		sawImage = true;
-		blocks.push({
-			type: "image",
-			source: {
-				type: "base64",
-				media_type: mediaType,
-				data: block.data,
-			},
-		});
+		blocks.push({ type: "image", source });
 	}
 
 	if (!supportsImages) {

package/src/providers/cursor/exec-modern.ts

@@ -74,6 +74,8 @@ import type { ToolResultMessage } from "../../types";
  * and their translation are consumed together.
  */
 export {
+	cursorEditOwnedReadPath,
+	cursorRawReadPath,
 	omitUndefinedArgs,
 	piEscapeRegexLiteral,
 	piGrepSkip,

package/src/providers/cursor-pi-args.ts

@@ -43,8 +43,9 @@ export function piReadPath(readPath: string, offset?: number, limit?: number): s
 	const start = offset !== undefined ? Math.max(1, Math.floor(offset)) : undefined;
 	const count = limit !== undefined ? Math.floor(limit) : undefined;
 	if (start === undefined && count === undefined) return readPath;
-	if (start === undefined) return `${readPath}:raw:1+${count}`;
-	return count === undefined ? `${readPath}:raw:${start}-` : `${readPath}:raw:${start}+${count}`;
+	const base = readPath.split(":").some(chunk => chunk.toLowerCase() === "raw") ? readPath : `${readPath}:raw`;
+	if (start === undefined) return `${base}:1+${count}`;
+	return count === undefined ? `${base}:${start}-` : `${base}:${start}+${count}`;
 }
 
 const READ_RANGE_CHUNK_RE = /^L?(\d+)(?:(\.\.|[-+])L?(\d+)?)?$/i;
@@ -77,6 +78,41 @@ export function piReadPathHasRange(readPath: string): boolean {
 	return preceding !== undefined && isReadRangeList(preceding);
 }
 
+/**
+ * Force a Cursor exec read onto `read`'s verbatim `:raw` selector.
+ *
+ * Native `editToolCall` (StrReplace) materializes via `readArgs` then
+ * `writeArgs`. The server treats the read result as file bytes and writes
+ * them back. A hashline-formatted native read (`[path#TAG]` + `LINE:`
+ * prefixes) poisons that cycle: the write would persist the markup.
+ * `:raw` is the existing selector that drops both. A path that already
+ * carries `raw` is left alone; a range-only selector gets `raw` inserted
+ * so the range still applies without the gutter.
+ */
+export function cursorRawReadPath(readPath: string): string {
+	const chunks = readPath.split(":");
+	if (chunks.some(chunk => chunk.toLowerCase() === "raw")) return readPath;
+	if (piReadPathHasRange(readPath)) {
+		const last = chunks.pop()!;
+		return `${chunks.join(":")}:raw:${last}`;
+	}
+	return `${readPath}:raw`;
+}
+
+/**
+ * Path the edit-owned materialization read should execute.
+ *
+ * Range is composed first (`piReadPath` already uses `:raw` for a range),
+ * then a whole-file path is forced onto `:raw`. The caller must drop
+ * `offset`/`limit` after this so the bridge's `piReadPath` cannot append a
+ * second `:raw` onto the already-composed selector.
+ */
+export function cursorEditOwnedReadPath(readPath: string, offset?: number, limit?: number): string | null {
+	const ranged = piReadPath(readPath, offset, limit);
+	if (ranged === null) return null;
+	return cursorRawReadPath(ranged);
+}
+
 /**
  * The same range as {@link piReadPath}, rendered for a transcript block rather
  * than for execution.