@oh-my-pi/pi-coding-agent 15.10.1 → 15.10.3

package/src/tui/code-cell.ts

@@ -32,8 +32,6 @@ export interface CodeCellOptions {
 	 */
 	codeTail?: boolean;
 	expanded?: boolean;
-	/** Animate the cell border with a sweeping segment while pending/running. */
-	animate?: boolean;
 	width: number;
 }
 
@@ -147,10 +145,7 @@ export function renderCodeCell(options: CodeCellOptions, theme: Theme): string[]
 		sections.push({ label: theme.fg("toolTitle", "Output"), lines: outputLines });
 	}
 
-	return renderOutputBlock(
-		{ header: title, headerMeta: meta, state, sections, width, animate: options.animate },
-		theme,
-	);
+	return renderOutputBlock({ header: title, headerMeta: meta, state, sections, width }, theme);
 }
 
 export interface MarkdownCellOptions {

package/src/tui/hyperlink.ts

@@ -5,6 +5,7 @@
  * sequences when the active terminal supports hyperlinks and the user setting
  * permits it. Falls back to plain text when disabled.
  */
+import * as url from "node:url";
 import { TERMINAL } from "@oh-my-pi/pi-tui";
 import { settings } from "../config/settings";
 import {
@@ -28,21 +29,12 @@ function buildLinkId(uri: string): string {
 	return (h >>> 0).toString(16).padStart(8, "0");
 }
 
-/** Build a `file://` URI for an absolute path with optional line/col query params. */
-function buildFileUri(absPath: string, opts?: { line?: number; col?: number }): string {
-	// Normalize backslashes for Windows paths before constructing the URL.
-	const normalized = absPath.replaceAll("\\", "/");
-	const prefix = normalized.startsWith("/") ? "file://" : "file:///";
-	// Split on slashes, encode each component, reassemble.
-	const encoded = normalized
-		.split("/")
-		.map(segment => encodeURIComponent(segment))
-		.join("/");
-	const params: string[] = [];
-	if (opts?.line !== undefined) params.push(`line=${opts.line}`);
-	if (opts?.col !== undefined) params.push(`col=${opts.col}`);
-	const query = params.length > 0 ? `?${params.join("&")}` : "";
-	return `${prefix}${encoded}${query}`;
+/** Build a properly encoded `file://` URI with optional line/col query params. */
+function buildFileUri(filePath: string, opts?: { line?: number; col?: number }): string {
+	const uri = url.pathToFileURL(filePath);
+	if (opts?.line !== undefined) uri.searchParams.set("line", String(opts.line));
+	if (opts?.col !== undefined) uri.searchParams.set("col", String(opts.col));
+	return uri.href;
 }
 
 /**
@@ -104,21 +96,19 @@ export function urlHyperlink(url: string, displayText: string): string {
 }
 
 /**
- * Wrap `displayText` in an OSC 8 hyperlink pointing at the given absolute file path.
+ * Wrap `displayText` in an OSC 8 hyperlink pointing at a filesystem path.
  *
  * Returns `displayText` unchanged when hyperlinks are disabled or when
  * the text already contains an OSC 8 sequence (prevents double-wrapping).
+ * Relative paths resolve against the current working directory before URI
+ * encoding so the OSC 8 target is always a valid `file://` URL.
  *
- * The caller is responsible for passing an absolute path. Relative paths
- * produce invalid `file://` URIs and are accepted silently to avoid runtime
- * errors in renderer hot paths.
- *
- * @param absPath - Absolute filesystem path
+ * @param filePath - Filesystem path
  * @param displayText - Text to render as the hyperlink anchor (may contain ANSI codes)
  * @param opts - Optional line/col position appended as `?line=N&col=M` query params
  */
-export function fileHyperlink(absPath: string, displayText: string, opts?: { line?: number; col?: number }): string {
-	return wrapHyperlink(buildFileUri(absPath, opts), displayText);
+export function fileHyperlink(filePath: string, displayText: string, opts?: { line?: number; col?: number }): string {
+	return wrapHyperlink(buildFileUri(filePath, opts), displayText);
 }
 
 /**

package/src/tui/output-block.ts

@@ -17,8 +17,6 @@ export interface OutputBlockOptions {
 	width: number;
 	applyBg?: boolean;
 	contentPaddingLeft?: number;
-	/** Animate the border with a sweeping dark segment (pending/running state). */
-	animate?: boolean;
 	/** Override the state-derived border color. Used for muted "legacy" tool
 	 * frames that should not visually compete with framed-output tools. */
 	borderColor?: ThemeColor;
@@ -37,59 +35,6 @@ export function isFramedBlockComponent(component: Component): boolean {
 	return (component as FramedBlockComponent)[FRAMED_BLOCK_COMPONENT] === true;
 }
 
-const BORDER_SHIMMER_TICK_MS = 1000 / 30;
-/** Duration of one full left↔right↔left bounce of the bottom-edge segment, in
- * ms. Position is derived from the wall clock against this fixed cycle so a
- * resize only nudges the segment proportionally instead of teleporting it. */
-const BORDER_BOUNCE_MS = 3000;
-/** Length, in border cells, of the moving segment. */
-const BORDER_SEGMENT_LEN = 8;
-
-/**
- * Monotonic frame counter for animated borders, quantized to the TUI's ~30fps
- * render cap so the cache key advances once per animation frame — fine enough
- * for a smooth segment sweep, coarse enough to coalesce multiple render passes
- * land inside the same frame.
- */
-export function borderShimmerTick(): number {
-	return Math.floor(Date.now() / BORDER_SHIMMER_TICK_MS);
-}
-
-/** Ease-in-out so the segment decelerates into and accelerates out of each wall. */
-function easeInOutQuad(t: number): number {
-	return t < 0.5 ? 2 * t * t : 1 - (-2 * t + 2) ** 2 / 2;
-}
-
-/**
- * Column of the travelling segment's center on the bottom edge for a box of
- * inner width `W` at time `now`. The segment bounces left → right → left across
- * the bottom border: a triangle wave over one full there-and-back cycle, eased
- * per leg so it slows as it nears each wall before reversing. Position is
- * derived from the wall clock against a fixed cycle, so a resize shifts the
- * center proportionally — no reset.
- */
-export function borderSegmentHeadCol(W: number, now: number): number {
-	if (W <= 1) return 0;
-	const phase = (((now % BORDER_BOUNCE_MS) + BORDER_BOUNCE_MS) % BORDER_BOUNCE_MS) / BORDER_BOUNCE_MS;
-	// Triangle: 0→1 rightward over the first half, 1→0 leftward over the second.
-	const leg = phase < 0.5 ? phase * 2 : 2 - phase * 2;
-	return easeInOutQuad(leg) * (W - 1);
-}
-
-/**
- * Scale a truecolor foreground escape toward black by `factor`. Returns
- * undefined for 256-color escapes (no RGB to scale) so callers fall back to a
- * dimmer theme color.
- */
-function darkenFgAnsi(ansi: string, factor: number): string | undefined {
-	const m = /38;2;(\d+);(\d+);(\d+)/.exec(ansi);
-	if (!m) return undefined;
-	const r = Math.round(Number(m[1]) * factor);
-	const g = Math.round(Number(m[2]) * factor);
-	const b = Math.round(Number(m[3]) * factor);
-	return `\x1b[38;2;${r};${g};${b}m`;
-}
-
 type BlockRow =
 	| { kind: "bar"; leftChar: string; rightChar: string; label?: string; meta?: string }
 	| { kind: "bottom"; leftChar: string; rightChar: string }
@@ -135,8 +80,7 @@ export function renderOutputBlock(options: OutputBlockOptions, theme: Theme): st
 	const contentWidth = Math.max(0, lineWidth - visibleWidth(v) - contentPaddingLeft - visibleWidth(v));
 	const contentLeftPadding = contentPaddingLeft > 0 ? padding(contentPaddingLeft) : "";
 
-	// ── Layout pass: collect row descriptors so the border perimeter length is
-	// known before the moving segment is positioned. ──
+	// ── Layout pass: collect row descriptors before emitting the bordered lines. ──
 	const rows: BlockRow[] = [];
 	rows.push({
 		kind: "bar",
@@ -185,39 +129,6 @@ export function renderOutputBlock(options: OutputBlockOptions, theme: Theme): st
 	rows.push({ kind: "bottom", leftChar: theme.boxSharp.bottomLeft, rightChar: theme.boxSharp.bottomRight });
 
 	const H = rows.length;
-	const W = lineWidth;
-	const animate = (options.animate ?? false) && (state === "running" || state === "pending") && W >= 2 && H >= 2;
-
-	// ── Segment geometry: one dark run bounces left ↔ right along the bottom
-	// edge only. The top, interior separators, and side borders stay the flat
-	// accent color. ──
-	const segLen = animate ? Math.min(BORDER_SEGMENT_LEN, W) : 0;
-	const head = animate ? borderSegmentHeadCol(W, Date.now()) : 0;
-	const segHalf = segLen / 2;
-	const segAnsi = animate ? (darkenFgAnsi(theme.getFgAnsi(borderColor), 0.4) ?? theme.getFgAnsi("borderMuted")) : "";
-	const seg = (text: string) => `${segAnsi}${text}\x1b[39m`;
-
-	// A bottom-edge column is lit when it lies within half a segment of the
-	// travelling center.
-	const isLit = (col: number): boolean => Math.abs(col - head) < segHalf;
-	// Color a run of bottom-edge glyphs starting at column `startCol`, grouping
-	// consecutive same-state cells so each run emits a single escape pair.
-	const colorEdge = (glyphs: string, startCol: number): string => {
-		let out = "";
-		let runLit: boolean | null = null;
-		let buf = "";
-		for (let i = 0; i < glyphs.length; i++) {
-			const lit = isLit(startCol + i);
-			if (lit !== runLit) {
-				if (runLit !== null) out += (runLit ? seg : border)(buf);
-				buf = "";
-				runLit = lit;
-			}
-			buf += glyphs[i];
-		}
-		if (runLit !== null) out += (runLit ? seg : border)(buf);
-		return out;
-	};
 
 	const renderBar = (row: { leftChar: string; rightChar: string; label?: string; meta?: string }): string => {
 		const leftGlyphs = `${row.leftChar}${cap}`;
@@ -245,11 +156,7 @@ export function renderOutputBlock(options: OutputBlockOptions, theme: Theme): st
 		const rightGlyph = row.rightChar;
 		const fillCount = Math.max(0, lineWidth - visibleWidth(leftGlyphs) - visibleWidth(rightGlyph));
 		const fillGlyphs = h.repeat(fillCount);
-		if (!animate) return `${border(leftGlyphs)}${border(fillGlyphs)}${border(rightGlyph)}`;
-		const leftStr = colorEdge(leftGlyphs, 0);
-		const fillStr = colorEdge(fillGlyphs, visibleWidth(leftGlyphs));
-		const rightStr = colorEdge(rightGlyph, lineWidth - visibleWidth(rightGlyph));
-		return `${leftStr}${fillStr}${rightStr}`;
+		return `${border(leftGlyphs)}${border(fillGlyphs)}${border(rightGlyph)}`;
 	};
 
 	const renderContent = (inner: string): string => `${border(v)}${contentLeftPadding}${inner}${border(v)}`;
@@ -302,8 +209,6 @@ export class CachedOutputBlock {
 		h.optional(options.state);
 		h.optional(options.borderColor);
 		h.bool(options.applyBg ?? true);
-		h.bool(options.animate ?? false);
-		if (options.animate) h.u32(borderShimmerTick());
 		if (options.sections) {
 			for (const s of options.sections) {
 				h.optional(s.label);

package/src/utils/commit-message-generator.ts

@@ -8,7 +8,7 @@ import { completeSimple } from "@oh-my-pi/pi-ai";
 import { logger, prompt } from "@oh-my-pi/pi-utils";
 
 import type { ModelRegistry } from "../config/model-registry";
-import { resolveModelRoleValue } from "../config/model-resolver";
+import { getModelMatchPreferences, resolveModelRoleValue } from "../config/model-resolver";
 import type { Settings } from "../config/settings";
 import MODEL_PRIO from "../priority.json" with { type: "json" };
 import commitSystemPrompt from "../prompts/system/commit-message-system.md" with { type: "text" };
@@ -51,7 +51,7 @@ function getSmolModelCandidates(
 		candidates.push({ model, thinkingLevel });
 	};
 
-	const matchPreferences = { usageOrder: settings.getStorage()?.getModelUsageOrder() };
+	const matchPreferences = getModelMatchPreferences(settings);
 	const configuredSmol = resolveModelRoleValue(settings.getModelRole("smol"), availableModels, {
 		settings,
 		matchPreferences,

package/src/utils/enhanced-paste.ts

@@ -7,6 +7,8 @@ const PASTE_EVENT_NAME_BASE64 = Buffer.from("Paste event", "utf8").toString("bas
 
 const IMAGE_MIME_PRIORITY = ["image/png", "image/jpeg", "image/webp", "image/gif"] as const;
 const TEXT_MIME_TYPE = "text/plain";
+/** Kitty's "give me the list of available MIME types" sentinel — see `TARGETS_MIME` in `kitty/clipboard.py`. */
+const MIME_LISTING_TARGET = ".";
 
 type PasteReadKind = "image" | "text";
 
@@ -18,6 +20,7 @@ export interface Osc5522Packet {
 interface PasteListingState {
 	phase: "listing";
 	mimes: string[];
+	kittyDotPayload?: true;
 	pw?: string;
 	loc?: string;
 }
@@ -144,6 +147,25 @@ export class EnhancedPasteController {
 		if (!mimeType) return;
 
 		if (state.phase === "listing") {
+			// Kitty (as of writing) implements the "list available MIME types"
+			// response shape by sending a single DATA packet with `mime="."` and
+			// the available types packed into the payload as a whitespace-
+			// separated list (see `fulfill_read_request` in
+			// kovidgoyal/kitty:kitty/clipboard.py). The 5522-mode ancillary
+			// spec instead encodes each type as its own DATA packet with an
+			// empty payload. Support both — fall through to the per-packet
+			// form when the dot sentinel has no payload, or when the packet
+			// already names a concrete MIME type.
+			if (mimeType === MIME_LISTING_TARGET) {
+				if (!packet.payload) return;
+				const listing = decodeBase64Utf8(packet.payload);
+				if (!listing) return;
+				state.kittyDotPayload = true;
+				for (const candidate of listing.split(/\s+/)) {
+					if (candidate && candidate !== MIME_LISTING_TARGET) state.mimes.push(candidate);
+				}
+				return;
+			}
 			state.mimes.push(mimeType);
 			return;
 		}
@@ -192,11 +214,17 @@ export class EnhancedPasteController {
 			chunks: [],
 		};
 
-		const metadata = [`type=read`, `mime=${Buffer.from(selected.mimeType, "utf8").toString("base64")}`];
+		const encodedMime = Buffer.from(selected.mimeType, "utf8").toString("base64");
+		const metadata = ["type=read"];
 		if (state.loc) metadata.push(`loc=${state.loc}`);
 		if (state.pw) {
 			metadata.push(`pw=${state.pw}`, `name=${PASTE_EVENT_NAME_BASE64}`);
 		}
-		this.#handlers.write(`${OSC5522_PREFIX}${metadata.join(":")}${OSC_TERMINATOR_ST}`);
+		if (state.kittyDotPayload) {
+			this.#handlers.write(`${OSC5522_PREFIX}${metadata.join(":")};${encodedMime}${OSC_TERMINATOR_BEL}`);
+			return;
+		}
+		metadata.push(`mime=${encodedMime}`);
+		this.#handlers.write(`${OSC5522_PREFIX}${metadata.join(":")}${OSC_TERMINATOR_BEL}`);
 	}
 }

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

@@ -114,8 +114,34 @@ interface CodexResponse {
 	usage?: CodexUsage;
 }
 
+/**
+ * Known Codex "image placeholder" answers — short prose the assistant emits in
+ * place of a real answer when it produced a screenshot instead of text. These
+ * carry no information, so callers treat them as non-answers and advance the
+ * chain to a provider that returns text. Extend by adding the normalized
+ * literal below; no regex tuning required.
+ */
+const IMAGE_PLACEHOLDER_ANSWERS: ReadonlySet<string> = new Set([
+	"see attached image",
+	"attached image",
+	"see the attached image",
+	"see image",
+	"see image above",
+	"image above",
+	"see image below",
+	"image below",
+]);
+
 function isImagePlaceholderAnswer(text: string): boolean {
-	return text.trim().toLowerCase() === "(see attached image)";
+	// Strip surrounding brackets/quotes and trailing punctuation, lowercase,
+	// then match against the known-placeholder set.
+	const normalized = text
+		.trim()
+		.replace(/^[[("'`*_]+/, "")
+		.replace(/[\])"'`*_.!?]+$/, "")
+		.trim()
+		.toLowerCase();
+	return IMAGE_PLACEHOLDER_ANSWERS.has(normalized);
 }
 
 function addSource(sources: SearchSource[], source: SearchSource): void {
@@ -423,15 +449,18 @@ async function callCodexSearch(
 
 	const finalAnswer = answerParts.join("\n\n").trim();
 	const streamedAnswer = streamedAnswerParts.join("").trim();
-	if (isImagePlaceholderAnswer(finalAnswer) && streamedAnswer.length === 0) {
+	// Throw to advance the chain whenever Codex emitted nothing but image
+	// placeholder prose — including the case where the streamed delta itself
+	// is the placeholder (the model occasionally streams the same text it
+	// publishes as the final output_text).
+	const finalIsPlaceholder = finalAnswer.length > 0 && isImagePlaceholderAnswer(finalAnswer);
+	const streamedIsPlaceholder = streamedAnswer.length > 0 && isImagePlaceholderAnswer(streamedAnswer);
+	const hasFinalText = finalAnswer.length > 0 && !finalIsPlaceholder;
+	const hasStreamedText = streamedAnswer.length > 0 && !streamedIsPlaceholder;
+	if (!hasFinalText && !hasStreamedText && sources.length === 0) {
 		throw new SearchProviderError("codex", "Codex returned image-only response", 502);
 	}
-	const answer =
-		finalAnswer.length > 0 && !isImagePlaceholderAnswer(finalAnswer)
-			? finalAnswer
-			: streamedAnswer.length > 0
-				? streamedAnswer
-				: finalAnswer;
+	const answer = hasFinalText ? finalAnswer : hasStreamedText ? streamedAnswer : "";
 
 	// Fallback: when Codex omits url_citation annotations, scrape markdown links
 	// and bare URLs from the synthesized answer so callers still receive sources.