gsd-pi 2.77.0 → 2.78.0-dev.aeeb2ca00

package/packages/pi-coding-agent/src/modes/interactive/components/model-selector.ts

@@ -9,19 +9,32 @@ import {
 	Text,
 	type TUI,
 } from "@gsd/pi-tui";
-import type { ModelRegistry } from "../../../core/model-registry.js";
+import type { ModelRegistry, ProviderAuthMode } from "../../../core/model-registry.js";
 import type { SettingsManager } from "../../../core/settings-manager.js";
 import { theme } from "../theme/theme.js";
 import { DynamicBorder } from "./dynamic-border.js";
 import { keyHint } from "./keybinding-hints.js";
 
-/** Display names for providers in the model selector UI. */
-const PROVIDER_DISPLAY_NAMES: Record<string, string> = {
-	anthropic: "anthropic-api",
-};
-
 export function providerDisplayName(provider: string): string {
-	return PROVIDER_DISPLAY_NAMES[provider] ?? provider;
+	return provider;
+}
+
+/**
+ * Short, user-facing label for a provider's auth mode. Returned strings are
+ * suitable for use as a suffix/badge alongside the provider name.
+ * Returns an empty string for modes that don't need a badge (e.g. "none").
+ */
+export function providerAuthBadge(authMode?: ProviderAuthMode): string {
+	switch (authMode) {
+		case "apiKey":
+			return "API key";
+		case "oauth":
+			return "OAuth";
+		case "externalCli":
+			return "CLI";
+		default:
+			return "";
+	}
 }
 
 function formatTokenCount(count: number): string {
@@ -140,7 +153,8 @@ export class ModelSelectorComponent extends Container implements Focusable {
 			this.scopeHintText = new Text(this.getScopeHintText(), 0, 0);
 			this.addChild(this.scopeHintText);
 		} else {
-			const hintText = "Only showing models with configured API keys (see README for details)";
+			const hintText =
+				"Only showing models with configured credentials (API key, OAuth, or CLI). See README for details.";
 			this.addChild(new Text(theme.fg("warning", hintText), 0, 0));
 		}
 		this.addChild(new Spacer(1));
@@ -409,7 +423,12 @@ export class ModelSelectorComponent extends Container implements Focusable {
 
 			const ctx = formatTokenCount(item.model.contextWindow);
 			const ctxBadge = theme.fg("muted", `${ctx}`);
-			const providerBadge = theme.fg("muted", `[${providerDisplayName(item.provider)}]`);
+			const authMode = this.modelRegistry.getProviderAuthMode(item.provider);
+			const authLabel = providerAuthBadge(authMode);
+			const providerBadgeText = authLabel
+				? `[${providerDisplayName(item.provider)} · ${authLabel}]`
+				: `[${providerDisplayName(item.provider)}]`;
+			const providerBadge = theme.fg("muted", providerBadgeText);
 			const checkmark = isCurrent ? theme.fg("success", " ✓") : "";
 
 			let line: string;
@@ -445,7 +464,19 @@ export class ModelSelectorComponent extends Container implements Focusable {
 		const maxVisible = 12;
 
 		if (this.groupedRows.length === 0) {
-			this.listContainer.addChild(new Text(theme.fg("muted", "  No models available"), 0, 0));
+			this.listContainer.addChild(
+				new Text(theme.fg("muted", "  No providers configured."), 0, 0),
+			);
+			this.listContainer.addChild(
+				new Text(
+					theme.fg(
+						"muted",
+						"  Run /login (OAuth), set an API key, or install a CLI provider. See README.",
+					),
+					0,
+					0,
+				),
+			);
 			return;
 		}
 
@@ -467,11 +498,14 @@ export class ModelSelectorComponent extends Container implements Focusable {
 				// Provider group header — always unselectable
 				const providerLabel = theme.fg("borderAccent", providerDisplayName(row.provider));
 				const count = theme.fg("muted", ` (${row.count})`);
+				const authMode = this.modelRegistry.getProviderAuthMode(row.provider);
+				const authLabel = providerAuthBadge(authMode);
+				const authText = authLabel ? theme.fg("muted", ` · via ${authLabel}`) : "";
 				// Add blank line before header if not the very first visible row
 				if (i > startIndex) {
 					this.listContainer.addChild(new Text("", 0, 0));
 				}
-				this.listContainer.addChild(new Text(`  ${providerLabel}${count}`, 0, 0));
+				this.listContainer.addChild(new Text(`  ${providerLabel}${count}${authText}`, 0, 0));
 			} else {
 				// Model row
 				const isSelected = i === this.selectedGroupIndex;

package/packages/pi-coding-agent/src/modes/interactive/components/tool-execution.ts

@@ -66,6 +66,21 @@ function parseMcpToolName(name: string): { server: string; tool: string } | null
 	return { server: rest.slice(0, delim), tool: rest.slice(delim + 2) };
 }
 
+/**
+ * Prettify a raw tool name for display. Prefers the registered `label`
+ * ("Complete Slice") when available; otherwise strips a leading `gsd_`
+ * prefix and converts snake_case to Title Case.
+ */
+function prettifyToolName(name: string, label?: string): string {
+	if (label && label.trim().length > 0) return label;
+	const stripped = name.replace(/^gsd_/, "");
+	if (stripped.length === 0) return name;
+	return stripped
+		.split("_")
+		.map((word) => (word.length === 0 ? word : word[0].toUpperCase() + word.slice(1)))
+		.join(" ");
+}
+
 type ToolFrameTone = "pending" | "success" | "error";
 
 function trimOuterBlankLines(lines: string[]): string[] {
@@ -131,15 +146,19 @@ function formatCompactArgs(args: unknown, expanded: boolean): string {
 
 	const allPrimitive = entries.every(([, value]) => {
 		const t = typeof value;
-		if (t === "number" || t === "boolean") return true;
-		if (t === "string") return (value as string).length <= COMPACT_ARG_VALUE_LIMIT;
-		return value == null;
+		return t === "number" || t === "boolean" || t === "string" || value == null;
 	});
 
 	if (allPrimitive) {
 		return entries
 			.map(([key, value]) => {
-				if (typeof value === "string") return `${key}=${JSON.stringify(value)}`;
+				if (typeof value === "string") {
+					const truncated =
+						!expanded && value.length > COMPACT_ARG_VALUE_LIMIT
+							? `${value.slice(0, COMPACT_ARG_VALUE_LIMIT - 1)}…`
+							: value;
+					return `${key}=${JSON.stringify(truncated)}`;
+				}
 				if (value == null) return `${key}=null`;
 				return `${key}=${String(value)}`;
 			})
@@ -526,7 +545,7 @@ export class ToolExecutionComponent extends Container {
 		const parsed = parseMcpToolName(this.toolName);
 		const frameLabel = parsed
 			? `Tool ${parsed.server}·${parsed.tool}`
-			: `Tool ${this.normalizedToolName || this.toolName || "unknown"}`;
+			: `Tool ${prettifyToolName(this.toolName, this.toolDefinition?.label) || "unknown"}`;
 		const framed = renderToolFrame(lines, frameWidth, {
 			label: frameLabel,
 			status: frameStatus,
@@ -570,12 +589,30 @@ export class ToolExecutionComponent extends Container {
 					}
 				} catch {
 					// Fall back to default on error
-					this.contentBox.addChild(new Text(theme.fg("toolTitle", theme.bold(this.toolName)), 0, 0));
+					this.contentBox.addChild(
+						new Text(
+							theme.fg(
+								"toolTitle",
+								theme.bold(prettifyToolName(this.toolName, this.toolDefinition?.label)),
+							),
+							0,
+							0,
+						),
+					);
 					customRendererHasContent = true;
 				}
 			} else {
-				// No custom renderCall, show tool name
-				this.contentBox.addChild(new Text(theme.fg("toolTitle", theme.bold(this.toolName)), 0, 0));
+				// No custom renderCall, show prettified tool name
+				this.contentBox.addChild(
+					new Text(
+						theme.fg(
+							"toolTitle",
+							theme.bold(prettifyToolName(this.toolName, this.toolDefinition?.label)),
+						),
+						0,
+						0,
+					),
+				);
 				customRendererHasContent = true;
 			}
 
@@ -1126,7 +1163,9 @@ export class ToolExecutionComponent extends Container {
 			// cleanly. GSD-registered MCP tools have already had their prefix
 			// stripped upstream in partial-builder.ts and won't reach this branch.
 			const parsed = parseMcpToolName(this.toolName);
-			const displayName = parsed ? parsed.tool : this.toolName;
+			const displayName = parsed
+				? parsed.tool
+				: prettifyToolName(this.toolName, this.toolDefinition?.label);
 			const serverPrefix = parsed ? theme.fg("muted", `${parsed.server}\u00b7`) : "";
 			text = serverPrefix + theme.fg("toolTitle", theme.bold(displayName));
 

package/packages/pi-coding-agent/src/modes/interactive/controllers/input-controller.test.ts

@@ -1,7 +1,151 @@
+// GSD2 — Tests for input-controller image pasting behavior
+// Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>
+
+import { describe, it, beforeEach } from "node:test";
 import assert from "node:assert/strict";
 import test from "node:test";
-
 import { setupEditorSubmitHandler } from "./input-controller.js";
+import { ContextualTips } from "../../../core/contextual-tips.js";
+import type { InteractiveModeStateHost } from "../interactive-mode-state.js";
+import type { ImageContent } from "@gsd/pi-ai";
+
+/** Minimal mock host satisfying InteractiveModeStateHost + setupEditorSubmitHandler extras. */
+function createMockHost() {
+	const promptCalls: Array<{ text: string; options?: any }> = [];
+	const historyCalls: string[] = [];
+	let editorText = "";
+
+	const host = {
+		defaultEditor: {
+			onSubmit: undefined as ((text: string) => Promise<void>) | undefined,
+			addToHistory: (text: string) => { historyCalls.push(text); },
+			setText: (text: string) => { editorText = text; },
+			getText: () => editorText,
+		},
+		editor: {
+			setText: (text: string) => { editorText = text; },
+			getText: () => editorText,
+			addToHistory: (text: string) => { historyCalls.push(text); },
+		},
+		session: {
+			isStreaming: false,
+			isCompacting: false,
+			isBashRunning: false,
+			thinkingLevel: undefined,
+			prompt: async (text: string, options?: any) => { promptCalls.push({ text, options }); },
+		},
+		ui: { requestRender: () => {} },
+		footer: {},
+		keybindings: {},
+		statusContainer: {},
+		chatContainer: {},
+		pinnedMessageContainer: {},
+		settingsManager: {},
+		pendingTools: new Map(),
+		toolOutputExpanded: false,
+		hideThinkingBlock: false,
+		isBashMode: false,
+		onInputCallback: undefined,
+		isInitialized: true,
+		loadingAnimation: undefined,
+		pendingWorkingMessage: undefined,
+		defaultWorkingMessage: "Working...",
+		streamingComponent: undefined,
+		streamingMessage: undefined,
+		retryEscapeHandler: undefined,
+		retryLoader: undefined,
+		autoCompactionLoader: undefined,
+		autoCompactionEscapeHandler: undefined,
+		compactionQueuedMessages: [] as Array<{ text: string; mode: "steer" | "followUp" }>,
+		extensionSelector: undefined,
+		extensionInput: undefined,
+		extensionEditor: undefined,
+		editorContainer: {},
+		keybindingsManager: undefined,
+		pendingImages: [] as ImageContent[],
+
+		// Extra methods required by setupEditorSubmitHandler
+		getSlashCommandContext: () => ({}),
+		handleBashCommand: async (_command: string, _excludeFromContext?: boolean) => {},
+		showWarning: (_message: string) => {},
+		showError: (_message: string) => {},
+		showTip: (_message: string) => {},
+		updateEditorBorderColor: () => {},
+		isExtensionCommand: (_text: string) => false,
+		isKnownSlashCommand: (_text: string) => false,
+		queueCompactionMessage: (_text: string, _mode: "steer" | "followUp") => {},
+		updatePendingMessagesDisplay: () => {},
+		flushPendingBashComponents: () => {},
+		contextualTips: new ContextualTips(),
+		getContextPercent: () => undefined,
+		options: { submitPromptsDirectly: true },
+	} satisfies InteractiveModeStateHost & Parameters<typeof setupEditorSubmitHandler>[0];
+
+	return { host, promptCalls, historyCalls };
+}
+
+const TEST_IMAGE: ImageContent = {
+	type: "image",
+	data: "iVBORw0KGgo=",
+	mimeType: "image/png",
+};
+
+describe("input-controller pending images", () => {
+	let host: ReturnType<typeof createMockHost>["host"];
+	let promptCalls: ReturnType<typeof createMockHost>["promptCalls"];
+
+	beforeEach(() => {
+		const mock = createMockHost();
+		host = mock.host;
+		promptCalls = mock.promptCalls;
+		setupEditorSubmitHandler(host);
+	});
+
+	it("passes pending images to session.prompt on submit", async () => {
+		host.pendingImages.push({ ...TEST_IMAGE });
+		await host.defaultEditor.onSubmit!("describe this image");
+
+		assert.equal(promptCalls.length, 1);
+		assert.equal(promptCalls[0].text, "describe this image");
+		assert.ok(promptCalls[0].options?.images);
+		assert.equal(promptCalls[0].options.images.length, 1);
+		assert.equal(promptCalls[0].options.images[0].mimeType, "image/png");
+	});
+
+	it("clears pending images after submit", async () => {
+		host.pendingImages.push({ ...TEST_IMAGE });
+		await host.defaultEditor.onSubmit!("describe this image");
+
+		assert.equal(host.pendingImages.length, 0);
+	});
+
+	it("passes undefined images when no images are pending", async () => {
+		await host.defaultEditor.onSubmit!("hello");
+
+		assert.equal(promptCalls.length, 1);
+		assert.equal(promptCalls[0].options?.images, undefined);
+	});
+
+	it("passes multiple images in order", async () => {
+		const img1: ImageContent = { type: "image", data: "aaa=", mimeType: "image/png" };
+		const img2: ImageContent = { type: "image", data: "bbb=", mimeType: "image/jpeg" };
+		host.pendingImages.push(img1, img2);
+
+		await host.defaultEditor.onSubmit!("describe these images");
+
+		assert.equal(promptCalls[0].options.images.length, 2);
+		assert.equal(promptCalls[0].options.images[0].data, "aaa=");
+		assert.equal(promptCalls[0].options.images[1].data, "bbb=");
+	});
+
+	it("discards pending images on bash command", async () => {
+		host.pendingImages.push({ ...TEST_IMAGE });
+		await host.defaultEditor.onSubmit!("! ls -la");
+
+		assert.equal(host.pendingImages.length, 0);
+		assert.equal(promptCalls.length, 0); // bash commands don't go through prompt
+	});
+});
 
 type HostOptions = {
 	knownSlashCommands?: string[];
@@ -17,6 +161,7 @@ function createHost(options: HostOptions = {}) {
 	const prompted: string[] = [];
 	const errors: string[] = [];
 	const warnings: string[] = [];
+	const tips: string[] = [];
 	const history: string[] = [];
 	const knownSlashCommands = new Set(options.knownSlashCommands ?? []);
 	let editorText = "";
@@ -48,6 +193,7 @@ function createHost(options: HostOptions = {}) {
 		ui: {
 			requestRender() {},
 		},
+		pendingImages: [] as ImageContent[],
 		getSlashCommandContext: () => ({
 			showSettingsSelector: () => {
 				settingsOpened += 1;
@@ -60,6 +206,9 @@ function createHost(options: HostOptions = {}) {
 		showError(message: string) {
 			errors.push(message);
 		},
+		showTip(message: string) {
+			tips.push(message);
+		},
 		updateEditorBorderColor() {},
 		isExtensionCommand() {
 			return false;
@@ -70,6 +219,15 @@ function createHost(options: HostOptions = {}) {
 		queueCompactionMessage() {},
 		updatePendingMessagesDisplay() {},
 		flushPendingBashComponents() {},
+		contextualTips: {
+			recordBashIncluded() {},
+			evaluate() {
+				return undefined;
+			},
+		},
+		getContextPercent() {
+			return undefined;
+		},
 	};
 
 	setupEditorSubmitHandler(host as any);
@@ -79,6 +237,7 @@ function createHost(options: HostOptions = {}) {
 		prompted,
 		errors,
 		warnings,
+		tips,
 		history,
 		getEditorText: () => editorText,
 		getSettingsOpened: () => settingsOpened,

package/packages/pi-coding-agent/src/modes/interactive/controllers/input-controller.ts

@@ -1,7 +1,19 @@
+import type { ImageContent } from "@gsd/pi-ai";
 import { dispatchSlashCommand } from "../slash-command-handlers.js";
 import type { InteractiveModeStateHost } from "../interactive-mode-state.js";
 import type { ContextualTips } from "../../../core/contextual-tips.js";
 
+/**
+ * Consume and clear any pending pasted images from the host.
+ * Returns undefined if there are no pending images.
+ */
+function consumePendingImages(host: InteractiveModeStateHost): ImageContent[] | undefined {
+	if (host.pendingImages.length === 0) return undefined;
+	const images = [...host.pendingImages];
+	host.pendingImages.length = 0;
+	return images;
+}
+
 export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 	getSlashCommandContext: () => any;
 	handleBashCommand: (command: string, excludeFromContext?: boolean) => Promise<void>;
@@ -26,6 +38,7 @@ export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 			const handled = await dispatchSlashCommand(text, host.getSlashCommandContext());
 			if (handled) {
 				host.editor.setText("");
+				consumePendingImages(host); // discard images on slash command
 				return;
 			}
 			if (!host.isKnownSlashCommand(text)) {
@@ -53,10 +66,14 @@ export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 				await host.handleBashCommand(command, isExcluded);
 				host.isBashMode = false;
 				host.updateEditorBorderColor();
+				consumePendingImages(host); // discard images on bash command
 				return;
 			}
 		}
 
+		// Consume pending images for prompt submissions
+		const images = consumePendingImages(host);
+
 		// Evaluate contextual tips before sending to agent
 		const tip = host.contextualTips.evaluate({
 			input: text,
@@ -73,7 +90,7 @@ export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 				host.editor.addToHistory?.(text);
 				host.editor.setText("");
 				try {
-					await host.session.prompt(text);
+					await host.session.prompt(text, { images });
 				} catch (error: unknown) {
 					const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
 					host.showError(errorMessage);
@@ -87,7 +104,7 @@ export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 		if (host.session.isStreaming) {
 			host.editor.addToHistory?.(text);
 			host.editor.setText("");
-			await host.session.prompt(text, { streamingBehavior: "steer" });
+			await host.session.prompt(text, { streamingBehavior: "steer", images });
 			host.updatePendingMessagesDisplay();
 			host.ui.requestRender();
 			return;
@@ -104,7 +121,7 @@ export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 		if (host.options?.submitPromptsDirectly) {
 			host.editor.addToHistory?.(text);
 			try {
-				await host.session.prompt(text);
+				await host.session.prompt(text, { images });
 			} catch (error: unknown) {
 				const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
 				host.showError(errorMessage);

package/packages/pi-coding-agent/src/modes/interactive/interactive-mode-state.ts

@@ -1,3 +1,4 @@
+import type { ImageContent } from "@gsd/pi-ai";
 import type { AgentSessionEvent } from "../../core/agent-session.js";
 
 export interface InteractiveModeStateHost {
@@ -32,6 +33,7 @@ export interface InteractiveModeStateHost {
 	extensionEditor?: any;
 	editorContainer: any;
 	keybindingsManager?: any;
+	pendingImages: ImageContent[];
 }
 
 export type InteractiveModeEvent = AgentSessionEvent;