@oh-my-pi/pi-coding-agent 13.15.2 → 13.16.0

package/src/tui/tree-list.ts

@@ -10,42 +10,71 @@ export interface TreeListOptions<T> {
 	items: T[];
 	expanded?: boolean;
 	maxCollapsed?: number;
+	/** Strict total-line budget for collapsed mode. When set (and not expanded),
+	 *  rendered item lines plus the trailing summary line must fit within this budget.
+	 */
+	maxCollapsedLines?: number;
 	itemType?: string;
+	/** Called once per item with `isLast: false` during budget calculation;
+	 *  line count MUST NOT vary based on `isLast`. */
 	renderItem: (item: T, context: TreeContext) => string | string[];
 }
 
 export function renderTreeList<T>(options: TreeListOptions<T>, theme: Theme): string[] {
-	const { items, expanded = false, maxCollapsed = 8, itemType = "item", renderItem } = options;
-	const lines: string[] = [];
+	const { items, expanded = false, maxCollapsed = 8, maxCollapsedLines, itemType = "item", renderItem } = options;
 	const maxItems = expanded ? items.length : Math.min(items.length, maxCollapsed);
+	const linesBudget = !expanded && maxCollapsedLines !== undefined ? maxCollapsedLines : Infinity;
 
+	// Pre-render each candidate item once.
+	// isLast cannot be known at this point (fittingCount is not yet determined);
+	// renderItem implementations MUST NOT vary line count based on isLast.
+	const preRendered: string[][] = [];
 	for (let i = 0; i < maxItems; i++) {
-		const isLast = i === maxItems - 1 && (expanded || items.length <= maxCollapsed);
-		const branch = getTreeBranch(isLast, theme);
-		const prefix = `${theme.fg("dim", branch)} `;
-		const continuePrefix = `${theme.fg("dim", getTreeContinuePrefix(isLast, theme))}`;
-		const context: TreeContext = {
+		const rendered = renderItem(items[i], {
 			index: i,
-			isLast,
+			isLast: false,
 			depth: 0,
 			theme,
-			prefix,
-			continuePrefix,
-		};
-		const rendered = renderItem(items[i], context);
-		if (Array.isArray(rendered)) {
-			if (rendered.length === 0) continue;
-			lines.push(`${prefix}${replaceTabs(rendered[0])}`);
-			for (let j = 1; j < rendered.length; j++) {
-				lines.push(`${continuePrefix}${replaceTabs(rendered[j])}`);
-			}
-		} else {
-			lines.push(`${prefix}${replaceTabs(rendered)}`);
+			prefix: "",
+			continuePrefix: "",
+		});
+		preRendered.push(Array.isArray(rendered) ? rendered : rendered ? [rendered] : []);
+	}
+
+	// Determine how many items fit within the line budget.
+	let fittingCount = maxItems;
+	let fittedLineCount = 0;
+	if (linesBudget !== Infinity) {
+		fittingCount = 0;
+		for (let i = 0; i < maxItems; i++) {
+			const count = preRendered[i]!.length;
+			const remainingAfter = items.length - (i + 1);
+			const reservedSummaryLines = remainingAfter > 0 ? 1 : 0;
+			if (fittedLineCount + count + reservedSummaryLines > linesBudget) break;
+			fittedLineCount += count;
+			fittingCount = i + 1;
+		}
+	}
+
+	const remaining = items.length - fittingCount;
+	const hasSummary = !expanded && remaining > 0 && (linesBudget === Infinity || fittedLineCount < linesBudget);
+
+	// Emit pre-rendered content with correct isLast-based branch prefixes.
+	const lines: string[] = [];
+	for (let i = 0; i < fittingCount; i++) {
+		const isLast = !hasSummary && i === fittingCount - 1;
+		const branch = getTreeBranch(isLast, theme);
+		const prefix = `${theme.fg("dim", branch)} `;
+		const continuePrefix = `${theme.fg("dim", getTreeContinuePrefix(isLast, theme))}`;
+		const itemLines = preRendered[i]!;
+		if (itemLines.length === 0) continue;
+		lines.push(`${prefix}${replaceTabs(itemLines[0]!)}`);
+		for (let j = 1; j < itemLines.length; j++) {
+			lines.push(`${continuePrefix}${replaceTabs(itemLines[j]!)}`);
 		}
 	}
 
-	if (!expanded && items.length > maxItems) {
-		const remaining = items.length - maxItems;
+	if (hasSummary) {
 		lines.push(`${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", formatMoreItems(remaining, itemType))}`);
 	}
 

package/src/utils/image-input.ts

@@ -1,12 +1,14 @@
 import * as fs from "node:fs/promises";
+import type { ImageContent } from "@oh-my-pi/pi-ai";
 import { formatBytes } from "@oh-my-pi/pi-utils";
 import { resolveReadPath } from "../tools/path-utils";
+import { convertToPng } from "./image-convert";
 import { formatDimensionNote, resizeImage } from "./image-resize";
 import { detectSupportedImageMimeTypeFromFile } from "./mime";
 
 export const MAX_IMAGE_INPUT_BYTES = 20 * 1024 * 1024;
 const MAX_IMAGE_METADATA_HEADER_BYTES = 256 * 1024;
-
+export const SUPPORTED_INPUT_IMAGE_MIME_TYPES = new Set(["image/png", "image/jpeg", "image/gif", "image/webp"]);
 export interface ImageMetadata {
 	mimeType: string;
 	bytes: number;
@@ -25,6 +27,14 @@ export interface LoadedImageInput {
 	bytes: number;
 }
 
+export async function ensureSupportedImageInput(image: ImageContent): Promise<ImageContent | null> {
+	if (SUPPORTED_INPUT_IMAGE_MIME_TYPES.has(image.mimeType)) {
+		return image;
+	}
+	const converted = await convertToPng(image.data, image.mimeType);
+	return converted ? { type: "image", data: converted.data, mimeType: converted.mimeType } : null;
+}
+
 export interface ReadImageMetadataOptions {
 	path: string;
 	cwd: string;

package/src/web/search/providers/codex.ts

@@ -6,7 +6,7 @@
  * Returns synthesized answers with web search sources.
  */
 import * as os from "node:os";
-import { getAgentDbPath, readSseJson } from "@oh-my-pi/pi-utils";
+import { $env, getAgentDbPath, readSseJson } from "@oh-my-pi/pi-utils";
 import packageJson from "../../../../package.json" with { type: "json" };
 import { AgentStorage } from "../../../session/agent-storage";
 import type { SearchResponse, SearchSource } from "../../../web/search/types";
@@ -21,6 +21,11 @@ const JWT_CLAIM_PATH = "https://api.openai.com/auth";
 const DEFAULT_INSTRUCTIONS =
 	"You are a helpful assistant with web search capabilities. Search the web to answer the user's question accurately and cite your sources.";
 
+function getModel(): string {
+	const configuredModel = $env.PI_CODEX_WEB_SEARCH_MODEL?.trim();
+	return configuredModel ? configuredModel : DEFAULT_MODEL;
+}
+
 export interface CodexSearchParams {
 	signal?: AbortSignal;
 	query: string;
@@ -188,8 +193,10 @@ async function callCodexSearch(
 	const url = `${CODEX_BASE_URL}${CODEX_RESPONSES_PATH}`;
 	const headers = buildCodexHeaders(auth.accessToken, auth.accountId);
 
+	const requestedModel = getModel();
+
 	const body: Record<string, unknown> = {
-		model: DEFAULT_MODEL,
+		model: requestedModel,
 		stream: true,
 		store: false,
 		input: [
@@ -226,7 +233,7 @@ async function callCodexSearch(
 	// Parse SSE stream
 	const answerParts: string[] = [];
 	const sources: SearchSource[] = [];
-	let model = DEFAULT_MODEL;
+	let model = requestedModel;
 	let requestId = "";
 	let usage: { inputTokens: number; outputTokens: number; totalTokens: number } | undefined;