@oh-my-pi/pi-coding-agent 15.9.1 → 15.9.5

package/src/modes/controllers/input-controller.ts

@@ -1,11 +1,12 @@
 import * as fs from "node:fs/promises";
 import type { AutocompleteProvider, SlashCommand } from "@oh-my-pi/pi-tui";
-import { $env, sanitizeText } from "@oh-my-pi/pi-utils";
+import { $env, logger, sanitizeText } from "@oh-my-pi/pi-utils";
 import { getRoleInfo } from "../../config/model-registry";
 import { isSettingsInitialized, settings } from "../../config/settings";
 import { renderSegmentTrack } from "../../modes/components/segment-track";
 import { TinyTitleDownloadProgressComponent } from "../../modes/components/tiny-title-download-progress";
 import { expandEmoticons } from "../../modes/emoji-autocomplete";
+import { materializeImageReferenceLinks } from "../../modes/image-references";
 import { createPromptActionAutocompleteProvider } from "../../modes/prompt-action-autocomplete";
 import type { InteractiveModeContext } from "../../modes/types";
 import type { AgentSessionEvent } from "../../session/agent-session";
@@ -253,6 +254,8 @@ export class InputController {
 				if (this.ctx.onInputCallback) {
 					this.ctx.editor.setText("");
 					this.ctx.pendingImages = [];
+					this.ctx.pendingImageLinks = [];
+					this.ctx.editor.imageLinks = undefined;
 					this.ctx.onInputCallback({ text: "", cancelled: false, started: true });
 				}
 				return;
@@ -260,12 +263,15 @@ export class InputController {
 
 			const runner = this.ctx.session.extensionRunner;
 			let inputImages = this.ctx.pendingImages.length > 0 ? [...this.ctx.pendingImages] : undefined;
+			let inputImageLinks = this.ctx.pendingImageLinks.length > 0 ? [...this.ctx.pendingImageLinks] : undefined;
 
 			if (runner?.hasHandlers("input")) {
 				const result = await runner.emitInput(text, inputImages, "interactive");
 				if (result?.handled) {
 					this.ctx.editor.setText("");
 					this.ctx.pendingImages = [];
+					this.ctx.pendingImageLinks = [];
+					this.ctx.editor.imageLinks = undefined;
 					return;
 				}
 				if (result?.text !== undefined) {
@@ -273,6 +279,10 @@ export class InputController {
 				}
 				if (result?.images !== undefined) {
 					inputImages = result.images;
+					inputImageLinks = await materializeImageReferenceLinks(
+						inputImages,
+						this.ctx.sessionManager.putBlob.bind(this.ctx.sessionManager),
+					);
 				}
 			}
 
@@ -356,8 +366,10 @@ export class InputController {
 			if (this.ctx.session.isStreaming) {
 				this.ctx.editor.addToHistory(text);
 				this.ctx.editor.setText("");
+				this.ctx.editor.imageLinks = undefined;
 				const images = inputImages && inputImages.length > 0 ? [...inputImages] : undefined;
 				this.ctx.pendingImages = [];
+				this.ctx.pendingImageLinks = [];
 				// Record the signature so the queued message's eventual delivery
 				// (a user-role `message_start` event) leaves any draft the user has
 				// typed since queuing intact. Same protection as #783, applied to
@@ -406,16 +418,28 @@ export class InputController {
 							}
 						}
 					})
-					.catch(() => {});
+					.catch(err => {
+						logger.warn("title-generator: uncaught auto-title error", {
+							sessionId: this.ctx.session.sessionId,
+							reason: "uncaught-auto-title-error",
+							error: err instanceof Error ? err.message : String(err),
+						});
+					});
 			}
 
 			if (this.ctx.onInputCallback) {
 				// Include any pending images from clipboard paste
+				this.ctx.editor.imageLinks = undefined;
 				const images = inputImages && inputImages.length > 0 ? [...inputImages] : undefined;
 				this.ctx.pendingImages = [];
+				this.ctx.pendingImageLinks = [];
 
 				// Render user message immediately, then let session events catch up
-				const submission = this.ctx.startPendingSubmission({ text, images });
+				const submission = this.ctx.startPendingSubmission({
+					text,
+					images,
+					imageLinks: inputImageLinks,
+				});
 
 				this.ctx.onInputCallback(submission);
 			}
@@ -679,11 +703,25 @@ export class InputController {
 					}
 				}
 
+				const imageLink = (
+					await materializeImageReferenceLinks(
+						[
+							{
+								type: "image",
+								data: imageData.data,
+								mimeType: imageData.mimeType,
+							},
+						],
+						this.ctx.sessionManager.putBlob.bind(this.ctx.sessionManager),
+					)
+				)?.[0];
 				this.ctx.pendingImages.push({
 					type: "image",
 					data: imageData.data,
 					mimeType: imageData.mimeType,
 				});
+				this.ctx.pendingImageLinks.push(imageLink);
+				this.ctx.editor.imageLinks = this.ctx.pendingImageLinks;
 				// Insert placeholder at cursor like Claude does
 				const imageNum = this.ctx.pendingImages.length;
 				const placeholder = `[Image #${imageNum}]`;

package/src/modes/image-references.ts

@@ -0,0 +1,111 @@
+import type { ImageContent } from "@oh-my-pi/pi-ai";
+import { logger } from "@oh-my-pi/pi-utils";
+import { type BlobPutResult, blobExtensionForImageMimeType } from "../session/blob-store";
+import { fileHyperlink } from "../tui/hyperlink";
+
+const IMAGE_REFERENCE_REGEX = /\[Image #([1-9]\d*)\]/g;
+
+type ImageBlobWriter = (data: Buffer, options?: { extension?: string }) => Promise<BlobPutResult>;
+type ImageBlobWriterSync = (data: Buffer, options?: { extension?: string }) => BlobPutResult;
+
+export interface ImageReferenceRenderers {
+	renderText: (text: string) => string;
+	renderReference: (label: string, index: number) => string;
+}
+
+export function renderImageReferences(text: string, renderers: ImageReferenceRenderers): string {
+	IMAGE_REFERENCE_REGEX.lastIndex = 0;
+	let result = "";
+	let last = 0;
+	let matched = false;
+
+	for (;;) {
+		const match = IMAGE_REFERENCE_REGEX.exec(text);
+		if (match === null) break;
+		matched = true;
+		if (match.index > last) {
+			result += renderers.renderText(text.slice(last, match.index));
+		}
+		result += renderers.renderReference(match[0], Number(match[1]));
+		last = match.index + match[0].length;
+	}
+
+	if (!matched) {
+		return renderers.renderText(text);
+	}
+	if (last < text.length) {
+		result += renderers.renderText(text.slice(last));
+	}
+	return result;
+}
+
+export function imageReferenceHyperlink(
+	label: string,
+	index: number,
+	imageLinks: readonly (string | undefined)[] | undefined,
+	renderLabel: (text: string) => string,
+): string {
+	const rendered = renderLabel(label);
+	const target = imageLinks?.[index - 1];
+	return target ? fileHyperlink(target, rendered) : rendered;
+}
+
+async function materializeImageReferenceLinkAsync(
+	image: ImageContent,
+	index: number,
+	putBlob: ImageBlobWriter,
+): Promise<string | undefined> {
+	try {
+		const result = await putBlob(Buffer.from(image.data, "base64"), {
+			extension: blobExtensionForImageMimeType(image.mimeType),
+		});
+		return result.displayPath;
+	} catch (error) {
+		logger.warn("Failed to write image reference blob", {
+			index,
+			mimeType: image.mimeType,
+			error: error instanceof Error ? error.message : String(error),
+		});
+		return undefined;
+	}
+}
+
+function materializeImageReferenceLink(
+	image: ImageContent,
+	index: number,
+	putBlob: ImageBlobWriterSync,
+): string | undefined {
+	try {
+		const result = putBlob(Buffer.from(image.data, "base64"), {
+			extension: blobExtensionForImageMimeType(image.mimeType),
+		});
+		return result.displayPath;
+	} catch (error) {
+		logger.warn("Failed to write image reference blob", {
+			index,
+			mimeType: image.mimeType,
+			error: error instanceof Error ? error.message : String(error),
+		});
+		return undefined;
+	}
+}
+
+export async function materializeImageReferenceLinks(
+	images: readonly ImageContent[] | undefined,
+	putBlob: ImageBlobWriter,
+): Promise<(string | undefined)[] | undefined> {
+	if (!images || images.length === 0) return undefined;
+	const links = await Promise.all(
+		images.map((image, index) => materializeImageReferenceLinkAsync(image, index + 1, putBlob)),
+	);
+	return links.some(link => link !== undefined) ? links : undefined;
+}
+
+export function materializeImageReferenceLinksSync(
+	images: readonly ImageContent[] | undefined,
+	putBlob: ImageBlobWriterSync,
+): (string | undefined)[] | undefined {
+	if (!images || images.length === 0) return undefined;
+	const links = images.map((image, index) => materializeImageReferenceLink(image, index + 1, putBlob));
+	return links.some(link => link !== undefined) ? links : undefined;
+}

package/src/modes/interactive-mode.ts

@@ -96,6 +96,7 @@ import type { AssistantMessageComponent } from "./components/assistant-message";
 import type { BashExecutionComponent } from "./components/bash-execution";
 import { CustomEditor } from "./components/custom-editor";
 import { DynamicBorder } from "./components/dynamic-border";
+import { ErrorBannerComponent } from "./components/error-banner";
 import type { EvalExecutionComponent } from "./components/eval-execution";
 import type { HookEditorComponent } from "./components/hook-editor";
 import type { HookInputComponent } from "./components/hook-input";
@@ -264,6 +265,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	todoContainer: Container;
 	btwContainer: Container;
 	omfgContainer: Container;
+	errorBannerContainer: Container;
 	editor: CustomEditor;
 	editorContainer: Container;
 	hookWidgetContainerAbove: Container;
@@ -288,6 +290,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	todoPhases: TodoPhase[] = [];
 	hideThinkingBlock = false;
 	pendingImages: ImageContent[] = [];
+	pendingImageLinks: (string | undefined)[] = [];
 	compactionQueuedMessages: CompactionQueuedMessage[] = [];
 	pendingTools = new Map<string, ToolExecutionHandle>();
 	pendingBashComponents: BashExecutionComponent[] = [];
@@ -404,6 +407,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.todoContainer = new Container();
 		this.btwContainer = new Container();
 		this.omfgContainer = new Container();
+		this.errorBannerContainer = new Container();
 		this.editor = new CustomEditor(getEditorTheme());
 		this.editor.setUseTerminalCursor(this.ui.getShowHardwareCursor());
 		this.editor.setAutocompleteMaxVisible(settings.get("autocompleteMaxVisible"));
@@ -565,6 +569,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.ui.addChild(this.todoContainer);
 		this.ui.addChild(this.btwContainer);
 		this.ui.addChild(this.omfgContainer);
+		this.ui.addChild(this.errorBannerContainer);
 		this.ui.addChild(this.statusLine); // Only renders hook statuses (main status in editor border)
 		this.ui.addChild(this.hookWidgetContainerAbove);
 		this.ui.addChild(this.editorContainer);
@@ -896,12 +901,14 @@ export class InteractiveMode implements InteractiveModeContext {
 	startPendingSubmission(input: {
 		text: string;
 		images?: ImageContent[];
+		imageLinks?: (string | undefined)[];
 		customType?: string;
 		display?: boolean;
 	}): SubmittedUserInput {
 		const submission: SubmittedUserInput = {
 			text: input.text,
 			images: input.images,
+			imageLinks: input.imageLinks,
 			customType: input.customType,
 			display: input.display,
 			cancelled: false,
@@ -913,22 +920,28 @@ export class InteractiveMode implements InteractiveModeContext {
 			const imageCount = submission.images?.length ?? 0;
 			this.optimisticUserMessageSignature = `${submission.text}\u0000${imageCount}`;
 			this.#pendingSubmissionDispose = this.recordLocalSubmission(submission.text, imageCount);
-			this.addMessageToChat({
-				role: "user",
-				content: [{ type: "text", text: submission.text }, ...(submission.images ?? [])],
-				attribution: "user",
-				timestamp: Date.now(),
-			});
+			this.addMessageToChat(
+				{
+					role: "user",
+					content: [{ type: "text", text: submission.text }, ...(submission.images ?? [])],
+					attribution: "user",
+					timestamp: Date.now(),
+				},
+				{ imageLinks: input.imageLinks },
+			);
 		} else {
 			this.optimisticUserMessageSignature = undefined;
 			this.#pendingSubmissionDispose = undefined;
 		}
 		this.editor.setText("");
-		// Reconciliation checkpoint: the rebuild below replays the whole transcript
-		// into native scrollback, so retire frozen block snapshots and let every
-		// block render its current state.
-		this.chatContainer.thaw();
-		this.ui.refreshNativeScrollbackIfDirty({ allowUnknownViewport: true });
+		this.editor.imageLinks = undefined;
+		// Reconciliation checkpoint: only retire frozen block snapshots after TUI
+		// proves the native viewport is at the tail and replays scrollback safely.
+		// Unknown host viewports stay frozen; thawing them would expose live rows
+		// over stale native history and can yank or duplicate when ED3 is unsafe.
+		if (this.ui.refreshNativeScrollbackIfDirty()) {
+			this.chatContainer.thaw();
+		}
 		this.ensureLoadingAnimation();
 		this.ui.requestRender();
 		return submission;
@@ -956,6 +969,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 		if (!submission.customType) {
 			this.pendingImages = submission.images ? [...submission.images] : [];
+			this.pendingImageLinks = submission.imageLinks ? [...submission.imageLinks] : [];
+			this.editor.imageLinks = this.pendingImageLinks;
 			this.rebuildChatFromMessages();
 			this.editor.setText(submission.text);
 		}
@@ -2492,6 +2507,19 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#uiHelpers.showError(message);
 	}
 
+	showPinnedError(message: string): void {
+		if (this.isBackgrounded) return;
+		this.errorBannerContainer.clear();
+		this.errorBannerContainer.addChild(new ErrorBannerComponent(message));
+		this.ui.requestRender();
+	}
+
+	clearPinnedError(): void {
+		if (this.errorBannerContainer.children.length === 0) return;
+		this.errorBannerContainer.clear();
+		this.ui.requestRender();
+	}
+
 	showWarning(message: string): void {
 		this.#uiHelpers.showWarning(message);
 	}
@@ -2622,7 +2650,10 @@ export class InteractiveMode implements InteractiveModeContext {
 		return this.#uiHelpers.isKnownSlashCommand(text);
 	}
 
-	addMessageToChat(message: AgentMessage, options?: { populateHistory?: boolean }): Component[] {
+	addMessageToChat(
+		message: AgentMessage,
+		options?: { populateHistory?: boolean; imageLinks?: readonly (string | undefined)[] },
+	): Component[] {
 		return this.#uiHelpers.addMessageToChat(message, options);
 	}
 
@@ -2633,7 +2664,10 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#uiHelpers.renderSessionContext(sessionContext, options);
 	}
 
-	renderInitialMessages(prebuiltContext?: SessionContext, options?: { preserveExistingChat?: boolean }): void {
+	renderInitialMessages(
+		prebuiltContext?: SessionContext,
+		options?: { preserveExistingChat?: boolean; clearTerminalHistory?: boolean },
+	): void {
 		this.#uiHelpers.renderInitialMessages(prebuiltContext, options);
 	}
 
@@ -2706,6 +2740,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#btwController.dispose();
 		this.#omfgController.dispose();
 		this.#extensionUiController.clearExtensionTerminalInputListeners();
+		this.clearPinnedError();
 		this.#planReviewContainer = undefined;
 	}
 

package/src/modes/setup-wizard/scenes/sign-in.ts

@@ -1,6 +1,6 @@
 import type { AuthStorage } from "@oh-my-pi/pi-ai";
 import type { OAuthProvider } from "@oh-my-pi/pi-ai/utils/oauth/types";
-import { Input, matchesKey, truncateToWidth } from "@oh-my-pi/pi-tui";
+import { Input, matchesKey, wrapTextWithAnsi } from "@oh-my-pi/pi-tui";
 import { getAgentDbPath } from "@oh-my-pi/pi-utils";
 import { OAuthSelectorComponent } from "../../components/oauth-selector";
 import { theme } from "../../theme/theme";
@@ -15,6 +15,10 @@ const CALLBACK_SERVER_PROVIDERS: Partial<Record<OAuthProvider, true>> = {
 	"google-antigravity": true,
 };
 
+function loginUrlLink(url: string): string {
+	return `\x1b]8;;${url}\x07Open login URL\x1b]8;;\x07`;
+}
+
 interface PromptState {
 	message: string;
 	placeholder?: string;
@@ -33,6 +37,7 @@ export class SignInTab implements SetupTab {
 	#authStorage: AuthStorage;
 	#selector: OAuthSelectorComponent;
 	#statusLines: string[] = [];
+	#authUrl: string | undefined;
 	#prompt: PromptState | undefined;
 	#promptResolve: ((value: string) => void) | undefined;
 	#loginAbort: AbortController | undefined;
@@ -72,22 +77,31 @@ export class SignInTab implements SetupTab {
 	}
 
 	render(width: number): string[] {
-		const lines = [theme.fg("muted", "Pick a provider to sign in — you can connect more than one."), ""];
+		const lines: string[] = [];
 		if (this.#loggingInProvider) {
-			lines.push(theme.bold(`Signing in to ${this.#loggingInProvider}`), "");
+			lines.push(theme.bold(`Signing in to ${this.#loggingInProvider}`));
 		} else {
+			lines.push(theme.fg("muted", "Pick a provider to sign in — you can connect more than one."), "");
 			lines.push(...this.#selector.render(width));
 		}
-		if (this.#statusLines.length > 0) {
-			lines.push("", ...this.#statusLines.map(line => truncateToWidth(line, width)));
+
+		const urlLines = this.#authUrl ? wrapTextWithAnsi(theme.fg("dim", this.#authUrl), width) : [];
+		if (this.#authUrl) {
+			lines.push(theme.fg("accent", `Browser login: ${loginUrlLink(this.#authUrl)}`), ...urlLines.slice(0, 2));
 		}
 		if (this.#prompt) {
-			lines.push("", theme.fg("warning", this.#prompt.message));
+			lines.push(theme.fg("warning", this.#prompt.message));
 			if (this.#prompt.placeholder) {
 				lines.push(theme.fg("dim", this.#prompt.placeholder));
 			}
 			lines.push(this.#prompt.input.render(width)[0] ?? "");
 		}
+		if (urlLines.length > 2) {
+			lines.push(...urlLines);
+		}
+		if (this.#statusLines.length > 0) {
+			lines.push(...this.#statusLines.flatMap(line => wrapTextWithAnsi(line, width)));
+		}
 		return lines;
 	}
 
@@ -109,6 +123,7 @@ export class SignInTab implements SetupTab {
 		this.#selector.stopValidation();
 		this.#loggingInProvider = providerId;
 		this.#statusLines = [theme.fg("dim", "Starting OAuth flow…")];
+		this.#authUrl = undefined;
 		this.#loginAbort = new AbortController();
 		this.host.restoreFocus();
 		this.host.requestRender();
@@ -116,7 +131,8 @@ export class SignInTab implements SetupTab {
 			await this.#authStorage.login(providerId as OAuthProvider, {
 				signal: this.#loginAbort.signal,
 				onAuth: info => {
-					this.#statusLines.push(theme.fg("accent", `Open this URL: ${info.url}`));
+					this.#authUrl = info.url;
+					this.#statusLines = [];
 					if (info.instructions) {
 						this.#statusLines.push(theme.fg("warning", info.instructions));
 					}
@@ -140,6 +156,7 @@ export class SignInTab implements SetupTab {
 				theme.fg("success", `${theme.status.success} Signed in to ${providerId}`),
 				theme.fg("dim", `Credentials saved to ${getAgentDbPath()}`),
 			];
+			this.#authUrl = undefined;
 			this.#loggingInProvider = undefined;
 			this.#loginAbort = undefined;
 			this.#selector.stopValidation();
@@ -150,12 +167,14 @@ export class SignInTab implements SetupTab {
 			if (this.#disposed) return;
 			if (this.#loginAbort?.signal.aborted) {
 				this.#statusLines = [theme.fg("dim", "Login cancelled.")];
+				this.#authUrl = undefined;
 			} else {
 				const message = error instanceof Error ? error.message : String(error);
 				this.#statusLines = [
 					theme.fg("error", `Login failed: ${message}`),
 					theme.fg("dim", "Choose another provider or press Esc to continue."),
 				];
+				this.#authUrl = undefined;
 			}
 			this.#loggingInProvider = undefined;
 			this.#loginAbort = undefined;
@@ -174,6 +193,7 @@ export class SignInTab implements SetupTab {
 			this.#resolvePrompt(value);
 		};
 		input.onEscape = () => {
+			this.#loginAbort?.abort();
 			this.#resolvePrompt("");
 		};
 		this.host.setFocus(input);

package/src/modes/types.ts

@@ -40,6 +40,7 @@ export type CompactionQueuedMessage = {
 export type SubmittedUserInput = {
 	text: string;
 	images?: ImageContent[];
+	imageLinks?: (string | undefined)[];
 	customType?: string;
 	display?: boolean;
 	cancelled: boolean;
@@ -75,6 +76,7 @@ export interface InteractiveModeContext {
 	todoContainer: Container;
 	btwContainer: Container;
 	omfgContainer: Container;
+	errorBannerContainer: Container;
 	editor: CustomEditor;
 	editorContainer: Container;
 	hookWidgetContainerAbove: Container;
@@ -106,6 +108,7 @@ export interface InteractiveModeContext {
 	planModePlanFilePath?: string;
 	hideThinkingBlock: boolean;
 	pendingImages: ImageContent[];
+	pendingImageLinks: (string | undefined)[];
 	compactionQueuedMessages: CompactionQueuedMessage[];
 	pendingTools: Map<string, ToolExecutionHandle>;
 	pendingBashComponents: BashExecutionComponent[];
@@ -157,6 +160,8 @@ export interface InteractiveModeContext {
 	// UI helpers
 	showStatus(message: string, options?: { dim?: boolean }): void;
 	showError(message: string): void;
+	showPinnedError(message: string): void;
+	clearPinnedError(): void;
 	showWarning(message: string): void;
 	showNewVersionNotification(newVersion: string): void;
 	clearEditor(): void;
@@ -171,6 +176,7 @@ export interface InteractiveModeContext {
 	startPendingSubmission(input: {
 		text: string;
 		images?: ImageContent[];
+		imageLinks?: (string | undefined)[];
 		customType?: string;
 		display?: boolean;
 	}): SubmittedUserInput;
@@ -191,7 +197,10 @@ export interface InteractiveModeContext {
 	 */
 	withLocalSubmission<T>(text: string, fn: () => Promise<T>, options?: { imageCount?: number }): Promise<T>;
 	isKnownSlashCommand(text: string): boolean;
-	addMessageToChat(message: AgentMessage, options?: { populateHistory?: boolean }): Component[];
+	addMessageToChat(
+		message: AgentMessage,
+		options?: { populateHistory?: boolean; imageLinks?: readonly (string | undefined)[] },
+	): Component[];
 	renderSessionContext(
 		sessionContext: SessionContext,
 		options?: { updateFooter?: boolean; populateHistory?: boolean },

package/src/modes/utils/ui-helpers.ts

@@ -18,6 +18,7 @@ import {
 import { SkillMessageComponent } from "../../modes/components/skill-message";
 import { ToolExecutionComponent } from "../../modes/components/tool-execution";
 import { UserMessageComponent } from "../../modes/components/user-message";
+import { materializeImageReferenceLinksSync } from "../../modes/image-references";
 import { theme } from "../../modes/theme/theme";
 import type { CompactionQueuedMessage, InteractiveModeContext } from "../../modes/types";
 import {
@@ -40,6 +41,18 @@ type QueuedMessages = {
 	followUp: string[];
 };
 
+function imageLinksForMessage(
+	message: Extract<AgentMessage, { role: "developer" | "user" }>,
+	putBlobSync: InteractiveModeContext["sessionManager"]["putBlobSync"],
+): (string | undefined)[] | undefined {
+	if (typeof message.content === "string") return undefined;
+	const images = message.content.filter(
+		(content): content is ImageContent =>
+			content.type === "image" && typeof content.data === "string" && typeof content.mimeType === "string",
+	);
+	return materializeImageReferenceLinksSync(images, putBlobSync);
+}
+
 export class UiHelpers {
 	constructor(private ctx: InteractiveModeContext) {}
 
@@ -84,7 +97,10 @@ export class UiHelpers {
 		this.ctx.ui.requestRender();
 	}
 
-	addMessageToChat(message: AgentMessage, options?: { populateHistory?: boolean }): Component[] {
+	addMessageToChat(
+		message: AgentMessage,
+		options?: { populateHistory?: boolean; imageLinks?: readonly (string | undefined)[] },
+	): Component[] {
 		switch (message.role) {
 			case "bashExecution": {
 				const component = new BashExecutionComponent(message.command, this.ctx.ui, message.excludeFromContext);
@@ -253,7 +269,10 @@ export class UiHelpers {
 				const textContent = this.ctx.getUserMessageText(message);
 				if (textContent) {
 					const isSynthetic = message.role === "developer" ? true : (message.synthetic ?? false);
-					const userComponent = new UserMessageComponent(textContent, isSynthetic);
+					const imageLinks =
+						options?.imageLinks ??
+						imageLinksForMessage(message, this.ctx.sessionManager.putBlobSync.bind(this.ctx.sessionManager));
+					const userComponent = new UserMessageComponent(textContent, isSynthetic, imageLinks);
 					this.ctx.chatContainer.addChild(userComponent);
 					if (options?.populateHistory && message.role === "user" && !isSynthetic) {
 						this.ctx.editor.addToHistory(textContent);
@@ -513,6 +532,8 @@ export class UiHelpers {
 		}
 		this.ctx.editor.setText("");
 		this.ctx.pendingImages = [];
+		this.ctx.pendingImageLinks = [];
+		this.ctx.editor.imageLinks = undefined;
 		this.ctx.ui.requestRender();
 	}
 

package/src/prompts/agents/explore.md

@@ -4,6 +4,7 @@ description: Fast read-only codebase scout returning compressed context for hand
 tools: read, search, find, web_search
 model: pi/smol
 thinking-level: med
+read-summarize: false
 output:
   properties:
     summary:

package/src/prompts/agents/librarian.md

@@ -4,6 +4,7 @@ description: Researches external libraries and APIs by reading source code. Retu
 tools: read, search, find, bash, lsp, web_search, ast_grep
 model: pi/smol
 thinking-level: minimal
+read-summarize: false
 output:
   properties:
     answer:

package/src/prompts/ci-green-request.md

@@ -14,7 +14,7 @@ Do not stop after a single fix attempt.
 2. If any run fails, inspect failing job output and logs.
 3. Identify root cause and make minimal correct fix.
 4. Run local verification if it reduces chance of another failing push.
-5. Push the branch.
+{{#if headTag}}5. Push the branch and tag `{{headTag}}` atomically: `git push --atomic "{{remote}}" "{{branch}}" "+refs/tags/{{headTag}}"`.{{else}}5. Push the branch.{{/if}}
 6. Watch workflow runs for new HEAD commit again.
 7. Repeat until workflow runs for latest HEAD commit succeed.
 </procedure>
@@ -26,11 +26,13 @@ Do not stop after a single fix attempt.
 
 {{#if headTag}}
 <instruction>
-Once CI is green, ensure the final commit is tagged `{{headTag}}` and push that tag.
+Always push the branch and tag together atomically so the tag never points at an un-pushed or non-green commit:
+`git push --atomic "{{remote}}" "{{branch}}" "+refs/tags/{{headTag}}"`.
+The `--atomic` flag makes the branch and tag update succeed or fail as one ref transaction; `+refs/tags/{{headTag}}` force-moves the tag to the new HEAD. Do not push the branch first and retag later.
 </instruction>
 {{/if}}
 
 <critical>
 The task is complete only when the workflow runs for the latest HEAD commit succeed.
-{{#if headTag}}The final green commit must be tagged `{{headTag}}` and that tag must be pushed.{{/if}}
+{{#if headTag}}The latest HEAD commit must carry tag `{{headTag}}`, pushed atomically with the branch via `git push --atomic`.{{/if}}
 </critical>

package/src/prompts/dry-balance-bench.md

@@ -0,0 +1,8 @@
+Write a 20-line poem about balancing OAuth accounts across many providers.
+
+Form:
+- Exactly 20 lines, no title, no stanza breaks.
+- Each line is terse and image-driven, in the spirit of haiku: 7 words or fewer, no end punctuation.
+- Let the imagery carry the theme — tokens, scopes, refresh cycles, expiry, consent, revocation — rather than naming them literally.
+
+Output only the 20 lines. No preamble, no commentary, no code fences.

package/src/prompts/system/project-prompt.md

@@ -3,6 +3,7 @@ PROJECT
 
 <workstation>
 {{#list environment prefix="- " join="\n"}}{{label}}: {{value}}{{/list}}
+{{#if model}}- Model: {{model}}{{/if}}
 </workstation>
 
 {{#if contextFiles.length}}