@oh-my-pi/pi-coding-agent 15.10.4 → 15.10.5

package/src/modes/controllers/extension-ui-controller.ts

@@ -30,6 +30,11 @@ export class ExtensionUiController {
 	#extensionTerminalInputUnsubscribers = new Set<() => void>();
 	#hookWidgetsAbove = new Map<string, ExtensionUiComponent>();
 	#hookWidgetsBelow = new Map<string, ExtensionUiComponent>();
+	// Single-file dialog surface (`editorContainer` + focus) is shared by the
+	// selector / input / editor modals, so only one may be presented at a time;
+	// the rest queue. See `#presentDialog`.
+	#dialogActive = false;
+	#dialogQueue: Array<() => void> = [];
 	constructor(private ctx: InteractiveModeContext) {}
 
 	/**
@@ -528,58 +533,47 @@ export class ExtensionUiController {
 		dialogOptions?: InteractiveSelectorDialogOptions,
 		extra?: { slider?: HookSelectorSlider },
 	): Promise<string | undefined> {
-		const { promise, finish, attachAbort } = this.#createHookDialogState(
-			() => this.hideHookSelector(),
-			dialogOptions?.signal,
-		);
-		const maxVisible = Math.max(4, Math.min(15, this.ctx.ui.terminal.rows - 12));
-		this.ctx.hookSelector = new HookSelectorComponent(
-			title,
-			options,
-			option => {
-				this.hideHookSelector();
-				finish(option);
-			},
-			() => {
-				this.hideHookSelector();
-				finish(undefined);
-			},
-			{
-				onLeft: dialogOptions?.onLeft
-					? () => {
-							this.hideHookSelector();
-							dialogOptions.onLeft?.();
-							finish(undefined);
-						}
-					: undefined,
-				onRight: dialogOptions?.onRight
-					? () => {
-							this.hideHookSelector();
-							dialogOptions.onRight?.();
-							finish(undefined);
-						}
-					: undefined,
-				onExternalEditor: dialogOptions?.onExternalEditor,
-				helpText: dialogOptions?.helpText,
-				initialIndex: dialogOptions?.initialIndex,
-				timeout: dialogOptions?.timeout,
-				onTimeout: dialogOptions?.onTimeout,
-				tui: this.ctx.ui,
-				outline: dialogOptions?.outline,
-				disabledIndices: dialogOptions?.disabledIndices,
-				selectionMarker: dialogOptions?.selectionMarker,
-				checkedIndices: dialogOptions?.checkedIndices,
-				markableCount: dialogOptions?.markableCount,
-				maxVisible,
-				slider: extra?.slider,
-			},
-		);
-		this.ctx.editorContainer.clear();
-		this.ctx.editorContainer.addChild(this.ctx.hookSelector);
-		this.ctx.ui.setFocus(this.ctx.hookSelector);
-		this.ctx.ui.requestRender();
-		attachAbort();
-		return promise;
+		return this.#presentDialog(dialogOptions?.signal, settle => {
+			const maxVisible = Math.max(4, Math.min(15, this.ctx.ui.terminal.rows - 12));
+			this.ctx.hookSelector = new HookSelectorComponent(
+				title,
+				options,
+				option => settle(option),
+				() => settle(undefined),
+				{
+					onLeft: dialogOptions?.onLeft
+						? () => {
+								dialogOptions.onLeft?.();
+								settle(undefined);
+							}
+						: undefined,
+					onRight: dialogOptions?.onRight
+						? () => {
+								dialogOptions.onRight?.();
+								settle(undefined);
+							}
+						: undefined,
+					onExternalEditor: dialogOptions?.onExternalEditor,
+					helpText: dialogOptions?.helpText,
+					initialIndex: dialogOptions?.initialIndex,
+					timeout: dialogOptions?.timeout,
+					onTimeout: dialogOptions?.onTimeout,
+					tui: this.ctx.ui,
+					outline: dialogOptions?.outline,
+					disabledIndices: dialogOptions?.disabledIndices,
+					selectionMarker: dialogOptions?.selectionMarker,
+					checkedIndices: dialogOptions?.checkedIndices,
+					markableCount: dialogOptions?.markableCount,
+					maxVisible,
+					slider: extra?.slider,
+				},
+			);
+			this.ctx.editorContainer.clear();
+			this.ctx.editorContainer.addChild(this.ctx.hookSelector);
+			this.ctx.ui.setFocus(this.ctx.hookSelector);
+			this.ctx.ui.requestRender();
+			return () => this.hideHookSelector();
+		});
 	}
 	/**
 	 * Hide the hook selector.
@@ -609,33 +603,24 @@ export class ExtensionUiController {
 		placeholder?: string,
 		dialogOptions?: ExtensionUIDialogOptions,
 	): Promise<string | undefined> {
-		const { promise, finish, attachAbort } = this.#createHookDialogState(
-			() => this.hideHookInput(),
-			dialogOptions?.signal,
-		);
-		this.ctx.hookInput = new HookInputComponent(
-			title,
-			placeholder,
-			value => {
-				this.hideHookInput();
-				finish(value);
-			},
-			() => {
-				this.hideHookInput();
-				finish(undefined);
-			},
-			{
-				timeout: dialogOptions?.timeout,
-				onTimeout: dialogOptions?.onTimeout,
-				tui: this.ctx.ui,
-			},
-		);
-		this.ctx.editorContainer.clear();
-		this.ctx.editorContainer.addChild(this.ctx.hookInput);
-		this.ctx.ui.setFocus(this.ctx.hookInput);
-		this.ctx.ui.requestRender();
-		attachAbort();
-		return promise;
+		return this.#presentDialog(dialogOptions?.signal, settle => {
+			this.ctx.hookInput = new HookInputComponent(
+				title,
+				placeholder,
+				value => settle(value),
+				() => settle(undefined),
+				{
+					timeout: dialogOptions?.timeout,
+					onTimeout: dialogOptions?.onTimeout,
+					tui: this.ctx.ui,
+				},
+			);
+			this.ctx.editorContainer.clear();
+			this.ctx.editorContainer.addChild(this.ctx.hookInput);
+			this.ctx.ui.setFocus(this.ctx.hookInput);
+			this.ctx.ui.requestRender();
+			return () => this.hideHookInput();
+		});
 	}
 
 	/**
@@ -659,31 +644,21 @@ export class ExtensionUiController {
 		dialogOptions?: ExtensionUIDialogOptions,
 		editorOptions?: { promptStyle?: boolean },
 	): Promise<string | undefined> {
-		const { promise, finish, attachAbort } = this.#createHookDialogState(
-			() => this.hideHookEditor(),
-			dialogOptions?.signal,
-		);
-		this.ctx.hookEditor = new HookEditorComponent(
-			this.ctx.ui,
-			title,
-			prefill,
-			value => {
-				this.hideHookEditor();
-				finish(value);
-			},
-			() => {
-				this.hideHookEditor();
-				finish(undefined);
-			},
-			editorOptions,
-		);
-
-		this.ctx.editorContainer.clear();
-		this.ctx.editorContainer.addChild(this.ctx.hookEditor);
-		this.ctx.ui.setFocus(this.ctx.hookEditor);
-		this.ctx.ui.requestRender();
-		attachAbort();
-		return promise;
+		return this.#presentDialog(dialogOptions?.signal, settle => {
+			this.ctx.hookEditor = new HookEditorComponent(
+				this.ctx.ui,
+				title,
+				prefill,
+				value => settle(value),
+				() => settle(undefined),
+				editorOptions,
+			);
+			this.ctx.editorContainer.clear();
+			this.ctx.editorContainer.addChild(this.ctx.hookEditor);
+			this.ctx.ui.setFocus(this.ctx.hookEditor);
+			this.ctx.ui.requestRender();
+			return () => this.hideHookEditor();
+		});
 	}
 
 	/**
@@ -834,37 +809,78 @@ export class ExtensionUiController {
 		}
 	}
 
-	#createHookDialogState(
-		hide: () => void,
+	/**
+	 * Present a modal dialog on the shared editor surface, serializing against any
+	 * dialog already open. `present` builds the component, swaps it into
+	 * `editorContainer`, steals focus, and returns a `hide` closure; it is invoked
+	 * with a single `settle` callback that the component fires on submit/cancel.
+	 *
+	 * Because selector / input / editor all clear `editorContainer` and re-focus,
+	 * showing a second one while the first is open would orphan the first — its
+	 * promise would hang until the caller's signal aborts. So at most one dialog is
+	 * presented at a time and the rest queue (FIFO). `settle` (or an abort) hides
+	 * the current dialog and hands the surface to the next queued request. A request
+	 * whose signal aborts before its turn resolves `undefined` and is never shown.
+	 */
+	#presentDialog(
 		signal: AbortSignal | undefined,
-	): {
-		promise: Promise<string | undefined>;
-		finish: (value: string | undefined) => void;
-		attachAbort: () => void;
-	} {
-		const { promise, resolve } = Promise.withResolvers<string | undefined>();
+		present: (settle: (value: string | undefined) => void) => () => void,
+	): Promise<string | undefined> {
+		const { promise, resolve, reject } = Promise.withResolvers<string | undefined>();
 		let settled = false;
-		const onAbort = () => {
-			hide();
-			if (!settled) {
-				settled = true;
-				resolve(undefined);
-			}
-		};
-		const finish = (value: string | undefined) => {
+		let started = false;
+		let hide: (() => void) | undefined;
+
+		function onAbort(): void {
+			settle(undefined);
+		}
+
+		const settle = (value: string | undefined): void => {
 			if (settled) return;
 			settled = true;
 			signal?.removeEventListener("abort", onAbort);
+			if (started) {
+				hide?.();
+				this.#dialogActive = false;
+				this.#advanceDialogQueue();
+			}
 			resolve(value);
 		};
-		const attachAbort = () => {
-			if (!signal) return;
-			if (signal.aborted) {
-				onAbort();
-			} else {
-				signal.addEventListener("abort", onAbort, { once: true });
+
+		const startPresentation = (): void => {
+			if (settled) {
+				// Aborted before its turn arrived — never present, hand off the surface.
+				this.#advanceDialogQueue();
+				return;
+			}
+			started = true;
+			this.#dialogActive = true;
+			try {
+				hide = present(settle);
+			} catch (error) {
+				settled = true;
+				signal?.removeEventListener("abort", onAbort);
+				this.#dialogActive = false;
+				reject(error);
+				this.#advanceDialogQueue();
 			}
 		};
-		return { promise, finish, attachAbort };
+
+		if (signal?.aborted) {
+			resolve(undefined);
+			return promise;
+		}
+		signal?.addEventListener("abort", onAbort, { once: true });
+
+		if (this.#dialogActive) {
+			this.#dialogQueue.push(startPresentation);
+		} else {
+			startPresentation();
+		}
+		return promise;
+	}
+
+	#advanceDialogQueue(): void {
+		this.#dialogQueue.shift()?.();
 	}
 }

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

@@ -397,11 +397,8 @@ export class InputController {
 
 			// Queue input during compaction
 			if (this.ctx.session.isCompacting) {
-				if (this.ctx.pendingImages.length > 0) {
-					this.ctx.showStatus("Compaction in progress. Retry after it completes to send images.");
-					return;
-				}
-				this.ctx.queueCompactionMessage(text, "steer");
+				const images = inputImages && inputImages.length > 0 ? [...inputImages] : undefined;
+				this.ctx.queueCompactionMessage(text, "steer", images);
 				return;
 			}
 
@@ -636,7 +633,8 @@ export class InputController {
 		// the queued entry is later re-parsed into a skill invocation is a
 		// separate concern owned by the compaction-resume path.
 		if (this.ctx.session.isCompacting) {
-			this.ctx.queueCompactionMessage(text, "followUp");
+			const images = this.ctx.pendingImages.length > 0 ? [...this.ctx.pendingImages] : undefined;
+			this.ctx.queueCompactionMessage(text, "followUp", images);
 			return;
 		}
 
@@ -657,11 +655,20 @@ export class InputController {
 			return;
 		}
 
+		// Forward any pending clipboard-pasted images alongside the queued text;
+		// otherwise the follow-up would drop the image (mirrors the Enter/steer path).
+		const images = this.ctx.pendingImages.length > 0 ? [...this.ctx.pendingImages] : undefined;
+
 		if (this.ctx.session.isStreaming) {
 			this.ctx.editor.addToHistory(text);
 			this.ctx.editor.setText("");
-			await this.ctx.withLocalSubmission(text, () =>
-				this.ctx.session.prompt(text, { streamingBehavior: "followUp" }),
+			this.ctx.editor.imageLinks = undefined;
+			this.ctx.pendingImages = [];
+			this.ctx.pendingImageLinks = [];
+			await this.ctx.withLocalSubmission(
+				text,
+				() => this.ctx.session.prompt(text, { streamingBehavior: "followUp", images }),
+				{ imageCount: images?.length ?? 0 },
 			);
 			this.ctx.updatePendingMessagesDisplay();
 			this.ctx.ui.requestRender();
@@ -671,7 +678,12 @@ export class InputController {
 		// Not streaming — just submit normally
 		this.ctx.editor.addToHistory(text);
 		this.ctx.editor.setText("");
-		await this.ctx.withLocalSubmission(text, () => this.ctx.session.prompt(text));
+		this.ctx.editor.imageLinks = undefined;
+		this.ctx.pendingImages = [];
+		this.ctx.pendingImageLinks = [];
+		await this.ctx.withLocalSubmission(text, () => this.ctx.session.prompt(text, { images }), {
+			imageCount: images?.length ?? 0,
+		});
 	}
 
 	restoreQueuedMessagesToEditor(options?: { abort?: boolean; currentText?: string }): number {
@@ -717,10 +729,24 @@ export class InputController {
 		this.ctx.pendingImageLinks.push(imageLink);
 		this.ctx.editor.imageLinks = this.ctx.pendingImageLinks;
 		const imageNum = this.ctx.pendingImages.length;
-		this.ctx.editor.insertText(`[Image #${imageNum}] `);
+		const dims = await this.#imageDimensions(imageData);
+		const label = dims ? `[Image #${imageNum}, ${dims.width}x${dims.height}]` : `[Image #${imageNum}]`;
+		this.ctx.editor.insertText(`${label} `);
 		this.ctx.ui.requestRender(false, { allowUnknownViewportMutation: true });
 	}
 
+	/** Probe pixel dimensions for the marker label (`[Image #N, WxH]`). Returns undefined when the
+	 *  header can't be decoded, so the caller falls back to a bare `[Image #N]`. */
+	async #imageDimensions(image: ImageContent): Promise<{ width: number; height: number } | undefined> {
+		try {
+			const { width, height } = await new Bun.Image(Buffer.from(image.data, "base64")).metadata();
+			if (width && height) return { width, height };
+		} catch {
+			// Unknown/corrupt header — fall back to a bare label.
+		}
+		return undefined;
+	}
+
 	async #normalizeAndInsertPastedImage(image: ImageContent, unsupportedMessage: string): Promise<boolean> {
 		let imageData = await ensureSupportedImageInput(image);
 		if (!imageData) {

package/src/modes/controllers/mcp-command-controller.ts

@@ -802,7 +802,7 @@ export class MCPCommandController {
 				await this.ctx.session.refreshMCPTools(this.ctx.mcpManager.getTools());
 			}
 			if (state === "connected") {
-				block.setStatus(theme.fg("success", `✓ Connected to "${name}"`));
+				block.setStatus(theme.fg("success", `${theme.status.enabled} Connected to "${name}"`));
 			} else if (state === "connecting") {
 				block.setStatus(theme.fg("muted", `◌ "${name}" is still connecting...`));
 			} else {
@@ -873,10 +873,10 @@ export class MCPCommandController {
 
 			// Show success message
 			const scopeLabel = scope === "user" ? "user" : "project";
-			const lines = ["", theme.fg("success", `✓ Added server "${name}" to ${scopeLabel} config`), ""];
+			const lines = ["", theme.fg("success", `+ Added server "${name}" to ${scopeLabel} config`), ""];
 
 			if (isConnected) {
-				lines.push(theme.fg("success", `✓ Successfully connected to server`));
+				lines.push(theme.fg("success", `${theme.status.enabled} Successfully connected to server`));
 				lines.push("");
 			} else if (isConnecting) {
 				lines.push(theme.fg("muted", `◌ Server is connecting in background...`));
@@ -1096,7 +1096,7 @@ export class MCPCommandController {
 			// Reload MCP manager
 			await this.#reloadMCP();
 
-			this.#showMessage(["", theme.fg("success", `✓ Removed server "${name}" from ${scope} config`), ""].join("\n"));
+			this.#showMessage(["", theme.fg("success", `- Removed server "${name}" from ${scope} config`), ""].join("\n"));
 		} catch (error) {
 			this.ctx.showError(`Failed to remove server: ${error instanceof Error ? error.message : String(error)}`);
 		}
@@ -1156,7 +1156,7 @@ export class MCPCommandController {
 
 			const lines = [
 				"",
-				theme.fg("success", `✓ Successfully connected to "${name}"`),
+				theme.fg("success", `${theme.status.enabled} Successfully connected to "${name}"`),
 				"",
 				`  Server: ${connection.serverInfo.name} v${connection.serverInfo.version}`,
 				`  Tools: ${tools.length}`,
@@ -1243,12 +1243,18 @@ export class MCPCommandController {
 								? theme.fg("muted", "Connecting")
 								: theme.fg("warning", "Not connected yet");
 					this.#showMessage(
-						["", theme.fg("success", `✓ Enabled "${name}"`), "", `  Status: ${status}`, ""].join("\n"),
+						[
+							"",
+							theme.fg("success", `${theme.status.enabled} Enabled "${name}"`),
+							"",
+							`  Status: ${status}`,
+							"",
+						].join("\n"),
 					);
 				} else {
 					await this.ctx.mcpManager?.disconnectServer(name);
 					await this.ctx.session.refreshMCPTools(this.ctx.mcpManager?.getTools() ?? []);
-					this.#showMessage(["", theme.fg("success", `✓ Disabled "${name}"`), ""].join("\n"));
+					this.#showMessage(["", theme.fg("muted", `${theme.status.disabled} Disabled "${name}"`), ""].join("\n"));
 				}
 				return;
 			}
@@ -1279,7 +1285,9 @@ export class MCPCommandController {
 
 			const lines = [
 				"",
-				theme.fg("success", `✓ ${enabled ? "Enabled" : "Disabled"} "${name}" (${found.scope} config)`),
+				enabled
+					? theme.fg("success", `${theme.status.enabled} Enabled "${name}" (${found.scope} config)`)
+					: theme.fg("muted", `${theme.status.disabled} Disabled "${name}" (${found.scope} config)`),
 			];
 			if (status) {
 				lines.push("");
@@ -1317,7 +1325,7 @@ export class MCPCommandController {
 			await this.#reloadMCP();
 
 			this.#showMessage(
-				["", theme.fg("success", `✓ Cleared auth for "${name}" (${found.scope} config)`), ""].join("\n"),
+				["", theme.fg("success", `- Cleared auth for "${name}" (${found.scope} config)`), ""].join("\n"),
 			);
 		} catch (error) {
 			this.ctx.showError(`Failed to clear auth: ${error instanceof Error ? error.message : String(error)}`);
@@ -1411,7 +1419,12 @@ export class MCPCommandController {
 			await this.#reloadMCP();
 			const connectedCount = this.ctx.mcpManager?.getConnectedServers().length ?? 0;
 			this.#showMessage(
-				["", theme.fg("success", "✓ MCP reload complete"), `  Connected servers: ${connectedCount}`, ""].join("\n"),
+				[
+					"",
+					theme.fg("success", `${theme.icon.loop} MCP reload complete`),
+					`  Connected servers: ${connectedCount}`,
+					"",
+				].join("\n"),
 			);
 		} catch (error) {
 			this.ctx.showError(`Failed to reload MCP: ${error instanceof Error ? error.message : String(error)}`);
@@ -1442,9 +1455,12 @@ export class MCPCommandController {
 				await this.ctx.session.refreshMCPTools(this.ctx.mcpManager.getTools());
 				const serverTools = this.ctx.mcpManager.getTools().filter(t => t.mcpServerName === name);
 				this.#showMessage(
-					["\n", theme.fg("success", `✓ Reconnected to "${name}"`), `  Tools: ${serverTools.length}`, "\n"].join(
+					[
 						"\n",
-					),
+						theme.fg("success", `${theme.status.enabled} Reconnected to "${name}"`),
+						`  Tools: ${serverTools.length}`,
+						"\n",
+					].join("\n"),
 				);
 			} else {
 				this.ctx.showError(`Failed to reconnect to "${name}". Check server status and logs.`);

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

@@ -1,6 +1,7 @@
 import { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import { getOAuthProviders } from "@oh-my-pi/pi-ai/utils/oauth";
-import type { OAuthProvider } from "@oh-my-pi/pi-ai/utils/oauth/types";
+import { PASTE_CODE_LOGIN_PROVIDERS } from "@oh-my-pi/pi-ai";
+import { getOAuthProviders } from "@oh-my-pi/pi-ai/oauth";
+import type { OAuthProvider } from "@oh-my-pi/pi-ai/oauth/types";
 import type { Component, OverlayHandle } from "@oh-my-pi/pi-tui";
 import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
 import { getAgentDbPath, getProjectDir, normalizePathForComparison } from "@oh-my-pi/pi-utils";
@@ -57,14 +58,6 @@ import type { SessionObserverRegistry } from "../session-observer-registry";
 import { computeContextBreakdown } from "../utils/context-usage";
 import { buildCopyTargets } from "../utils/copy-targets";
 
-const CALLBACK_SERVER_PROVIDERS = new Set<OAuthProvider>([
-	"anthropic",
-	"openai-codex",
-	"gitlab-duo",
-	"google-gemini-cli",
-	"google-antigravity",
-]);
-
 const MANUAL_LOGIN_TIP = "Tip: You can complete pairing with /login <redirect URL>.";
 
 export class SelectorController {
@@ -928,7 +921,7 @@ export class SelectorController {
 	async #handleOAuthLogin(providerId: string): Promise<void> {
 		this.ctx.showStatus(`Logging in to ${providerId}…`);
 		const manualInput = this.ctx.oauthManualInput;
-		const useManualInput = CALLBACK_SERVER_PROVIDERS.has(providerId as OAuthProvider);
+		const useManualInput = PASTE_CODE_LOGIN_PROVIDERS.has(providerId);
 		try {
 			await this.ctx.session.modelRegistry.authStorage.login(providerId as OAuthProvider, {
 				onAuth: (info: { url: string; instructions?: string }) => {

package/src/modes/controllers/ssh-command-controller.ts

@@ -209,7 +209,7 @@ export class SSHCommandController {
 			const scopeLabel = scope === "user" ? "user" : "project";
 			const lines = [
 				"",
-				theme.fg("success", `✓ Added SSH host "${name}" to ${scopeLabel} config`),
+				theme.fg("success", `+ Added SSH host "${name}" to ${scopeLabel} config`),
 				"",
 				`  Host: ${host}`,
 			];
@@ -368,7 +368,7 @@ export class SSHCommandController {
 			await this.ctx.session.refreshSshTool();
 
 			this.#showMessage(
-				["", theme.fg("success", `✓ Removed SSH host "${name}" from ${scope} config`), ""].join("\n"),
+				["", theme.fg("success", `- Removed SSH host "${name}" from ${scope} config`), ""].join("\n"),
 			);
 		} catch (error) {
 			this.ctx.showError(`Failed to remove host: ${error instanceof Error ? error.message : String(error)}`);

package/src/modes/image-references.ts

@@ -3,30 +3,36 @@ 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;
+/** Matches `[Image #N]`/`[Image #N, WxH]` and `[Paste #N, +X lines]`/`[Paste #N, Y chars]` tokens.
+ *  Group 1 is the kind (`Image`/`Paste`), group 2 the 1-based index. The optional metadata
+ *  tail (`, …`) is captured loosely (no `]`/newline) so future label tweaks keep matching. */
+export const PLACEHOLDER_REGEX = /\[(Image|Paste) #([1-9]\d*)(?:,[^\]\n]*)?\]/g;
 
 type ImageBlobWriter = (data: Buffer, options?: { extension?: string }) => Promise<BlobPutResult>;
 type ImageBlobWriterSync = (data: Buffer, options?: { extension?: string }) => BlobPutResult;
 
-export interface ImageReferenceRenderers {
+export type PlaceholderKind = "image" | "paste";
+
+export interface PlaceholderRenderers {
 	renderText: (text: string) => string;
-	renderReference: (label: string, index: number) => string;
+	renderReference: (label: string, kind: PlaceholderKind, index: number) => string;
 }
 
-export function renderImageReferences(text: string, renderers: ImageReferenceRenderers): string {
-	IMAGE_REFERENCE_REGEX.lastIndex = 0;
+export function renderPlaceholders(text: string, renderers: PlaceholderRenderers): string {
+	PLACEHOLDER_REGEX.lastIndex = 0;
 	let result = "";
 	let last = 0;
 	let matched = false;
 
 	for (;;) {
-		const match = IMAGE_REFERENCE_REGEX.exec(text);
+		const match = PLACEHOLDER_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]));
+		const kind: PlaceholderKind = match[1] === "Paste" ? "paste" : "image";
+		result += renderers.renderReference(match[0], kind, Number(match[2]));
 		last = match.index + match[0].length;
 	}
 

package/src/modes/interactive-mode.ts

@@ -2806,8 +2806,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#uiHelpers.updatePendingMessagesDisplay();
 	}
 
-	queueCompactionMessage(text: string, mode: "steer" | "followUp"): void {
-		this.#uiHelpers.queueCompactionMessage(text, mode);
+	queueCompactionMessage(text: string, mode: "steer" | "followUp", images?: ImageContent[]): void {
+		this.#uiHelpers.queueCompactionMessage(text, mode, images);
 	}
 
 	flushCompactionQueue(options?: { willRetry?: boolean }): Promise<void> {

package/src/modes/rpc/rpc-mode.ts

@@ -10,7 +10,7 @@
  * - Events: AgentSessionEvent objects streamed as they occur
  * - Extension UI: Extension UI requests are emitted, client responds with extension_ui_response
  */
-import { getOAuthProviders } from "@oh-my-pi/pi-ai/utils/oauth";
+import { getOAuthProviders } from "@oh-my-pi/pi-ai/oauth";
 import { $env, readJsonl, Snowflake } from "@oh-my-pi/pi-utils";
 import {
 	type ExtensionUIContext,

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

@@ -1,20 +1,12 @@
 import type { AuthStorage } from "@oh-my-pi/pi-ai";
-import type { OAuthProvider } from "@oh-my-pi/pi-ai/utils/oauth/types";
+import { PASTE_CODE_LOGIN_PROVIDERS } from "@oh-my-pi/pi-ai";
+import type { OAuthProvider } from "@oh-my-pi/pi-ai/oauth/types";
 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";
 import type { SetupSceneHost, SetupTab } from "./types";
 
-/** Providers whose OAuth flow needs a pasted code/redirect URL rather than a callback server. */
-const CALLBACK_SERVER_PROVIDERS: Partial<Record<OAuthProvider, true>> = {
-	anthropic: true,
-	"openai-codex": true,
-	"gitlab-duo": true,
-	"google-gemini-cli": true,
-	"google-antigravity": true,
-};
-
 function loginUrlLink(url: string): string {
 	return `\x1b]8;;${url}\x07Open login URL\x1b]8;;\x07`;
 }
@@ -119,7 +111,7 @@ export class SignInTab implements SetupTab {
 
 	async #login(providerId: string): Promise<void> {
 		if (this.#loggingInProvider || this.#disposed) return;
-		const useManualInput = CALLBACK_SERVER_PROVIDERS[providerId as OAuthProvider] === true;
+		const useManualInput = PASTE_CODE_LOGIN_PROVIDERS.has(providerId);
 		this.#selector.stopValidation();
 		this.#loggingInProvider = providerId;
 		this.#statusLines = [theme.fg("dim", "Starting OAuth flow…")];