@oh-my-pi/pi-coding-agent 3.34.0 → 3.36.0

package/src/core/tools/web-search/auth.ts

@@ -11,7 +11,7 @@
 import * as os from "node:os";
 import * as path from "node:path";
 import { getConfigDirPaths } from "../../../config";
-import type { AnthropicAuthConfig, AuthJson, ModelsJson } from "./types";
+import type { AnthropicAuthConfig, AnthropicOAuthCredential, AuthJson, ModelsJson } from "./types";
 
 const DEFAULT_BASE_URL = "https://api.anthropic.com";
 
@@ -76,6 +76,11 @@ export function isOAuthToken(apiKey: string): boolean {
 	return apiKey.includes("sk-ant-oat");
 }
 
+function normalizeAnthropicOAuthCredentials(entry: AuthJson["anthropic"] | undefined): AnthropicOAuthCredential[] {
+	if (!entry) return [];
+	return Array.isArray(entry) ? entry : [entry];
+}
+
 /**
  * Find Anthropic auth config using 4-tier priority:
  *   1. ANTHROPIC_SEARCH_API_KEY / ANTHROPIC_SEARCH_BASE_URL
@@ -126,13 +131,16 @@ export async function findAnthropicAuth(): Promise<AnthropicAuthConfig | null> {
 	}
 
 	// 3. OAuth credentials in auth.json (with 5-minute expiry buffer, check all config dirs)
+	const expiryBuffer = 5 * 60 * 1000; // 5 minutes
+	const now = Date.now();
 	for (const configDir of configDirs) {
 		const authJson = await readJson<AuthJson>(path.join(configDir, "auth.json"));
-		if (authJson?.anthropic?.type === "oauth" && authJson.anthropic.access) {
-			const expiryBuffer = 5 * 60 * 1000; // 5 minutes
-			if (authJson.anthropic.expires > Date.now() + expiryBuffer) {
+		const credentials = normalizeAnthropicOAuthCredentials(authJson?.anthropic);
+		for (const credential of credentials) {
+			if (credential.type !== "oauth" || !credential.access) continue;
+			if (credential.expires > now + expiryBuffer) {
 				return {
-					apiKey: authJson.anthropic.access,
+					apiKey: credential.access,
 					baseUrl: DEFAULT_BASE_URL,
 					isOAuth: true,
 				};

package/src/core/tools/web-search/types.ts

@@ -90,14 +90,18 @@ export interface ModelsJson {
 }
 
 /** auth.json structure for OAuth credentials */
+export interface AnthropicOAuthCredential {
+	type: "oauth";
+	access: string;
+	refresh?: string;
+	/** Expiry timestamp in milliseconds */
+	expires: number;
+}
+
+export type AnthropicAuthJsonEntry = AnthropicOAuthCredential | AnthropicOAuthCredential[];
+
 export interface AuthJson {
-	anthropic?: {
-		type: "oauth";
-		access: string;
-		refresh?: string;
-		/** Expiry timestamp in milliseconds */
-		expires: number;
-	};
+	anthropic?: AnthropicAuthJsonEntry;
 }
 
 /** Anthropic API response types */

package/src/main.ts

@@ -289,6 +289,9 @@ async function buildSessionOptions(
 			process.exit(1);
 		}
 		options.model = model;
+		settingsManager.applyOverrides({
+			modelRoles: { default: `${model.provider}/${model.id}` },
+		});
 	} else if (scopedModels.length > 0 && !parsed.continue && !parsed.resume) {
 		options.model = scopedModels[0].model;
 	}

package/src/modes/interactive/components/oauth-selector.ts

@@ -70,8 +70,7 @@ export class OAuthSelectorComponent extends Container {
 			const isAvailable = provider.available;
 
 			// Check if user is logged in for this provider
-			const credentials = this.authStorage.get(provider.id);
-			const isLoggedIn = credentials?.type === "oauth";
+			const isLoggedIn = this.authStorage.hasOAuth(provider.id);
 			const statusIndicator = isLoggedIn ? theme.fg("success", ` ${theme.status.success} logged in`) : "";
 
 			let line = "";

package/src/modes/interactive/components/tool-execution.ts

@@ -369,20 +369,23 @@ export class ToolExecutionComponent extends Container {
 			this.contentBox.setBgFn(bgFn);
 			this.contentBox.clear();
 
-			// Render call component
-			try {
-				const callComponent = renderer.renderCall(this.args, theme);
-				if (callComponent) {
-					// Ensure component has invalidate() method for Component interface
-					const component = callComponent as any;
-					if (!component.invalidate) {
-						component.invalidate = () => {};
+			const shouldRenderCall = !this.result || !renderer.mergeCallAndResult;
+			if (shouldRenderCall) {
+				// Render call component
+				try {
+					const callComponent = renderer.renderCall(this.args, theme);
+					if (callComponent) {
+						// Ensure component has invalidate() method for Component interface
+						const component = callComponent as any;
+						if (!component.invalidate) {
+							component.invalidate = () => {};
+						}
+						this.contentBox.addChild(component);
 					}
-					this.contentBox.addChild(component);
+				} catch {
+					// Fall back to default on error
+					this.contentBox.addChild(new Text(theme.fg("toolTitle", theme.bold(this.toolLabel)), 0, 0));
 				}
-			} catch {
-				// Fall back to default on error
-				this.contentBox.addChild(new Text(theme.fg("toolTitle", theme.bold(this.toolLabel)), 0, 0));
 			}
 
 			// Render result component if we have a result

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

@@ -38,6 +38,7 @@ import { VoiceSupervisor } from "../../core/voice-supervisor";
 import { disableProvider, enableProvider } from "../../discovery";
 import { getChangelogPath, parseChangelog } from "../../utils/changelog";
 import { copyToClipboard, readImageFromClipboard } from "../../utils/clipboard";
+import { resizeImage } from "../../utils/image-resize";
 import { registerAsyncCleanup } from "../cleanup";
 import { ArminComponent } from "./components/armin";
 import { AssistantMessageComponent } from "./components/assistant-message";
@@ -1139,7 +1140,9 @@ export class InteractiveMode {
 			if (this.session.isStreaming) {
 				this.editor.addToHistory(text);
 				this.editor.setText("");
-				await this.session.prompt(text, { streamingBehavior: "steer" });
+				const images = this.pendingImages.length > 0 ? [...this.pendingImages] : undefined;
+				this.pendingImages = [];
+				await this.session.prompt(text, { streamingBehavior: "steer", images });
 				this.updatePendingMessagesDisplay();
 				this.ui.requestRender();
 				return;
@@ -1154,7 +1157,7 @@ export class InteractiveMode {
 			if (!hasUserMessages && !this.sessionManager.getSessionTitle()) {
 				const registry = this.session.modelRegistry;
 				const smolModel = this.settingsManager.getModelRole("smol");
-				generateSessionTitle(text, registry, smolModel)
+				generateSessionTitle(text, registry, smolModel, this.session.sessionId)
 					.then(async (title) => {
 						if (title) {
 							await this.sessionManager.setSessionTitle(title);
@@ -1481,11 +1484,14 @@ export class InteractiveMode {
 	}
 
 	private sendCompletionNotification(): void {
+		if (this.isBackgrounded === false) return;
 		if (isNotificationSuppressed()) return;
 		const method = this.settingsManager.getNotificationOnComplete();
 		if (method === "off") return;
 		const protocol = method === "auto" ? detectNotificationProtocol() : method;
-		sendNotification(protocol, "Agent complete");
+		const title = this.sessionManager.getSessionTitle();
+		const message = title ? `${title}: Complete` : "Complete";
+		sendNotification(protocol, message);
 	}
 
 	/** Extract text content from a user message */
@@ -1504,22 +1510,24 @@ export class InteractiveMode {
 	 * If multiple status messages are emitted back-to-back (without anything else being added to the chat),
 	 * we update the previous status line instead of appending new ones to avoid log spam.
 	 */
-	private showStatus(message: string): void {
+	private showStatus(message: string, options?: { dim?: boolean }): void {
 		if (this.isBackgrounded) {
 			return;
 		}
 		const children = this.chatContainer.children;
 		const last = children.length > 0 ? children[children.length - 1] : undefined;
 		const secondLast = children.length > 1 ? children[children.length - 2] : undefined;
+		const useDim = options?.dim ?? true;
+		const rendered = useDim ? theme.fg("dim", message) : message;
 
 		if (last && secondLast && last === this.lastStatusText && secondLast === this.lastStatusSpacer) {
-			this.lastStatusText.setText(theme.fg("dim", message));
+			this.lastStatusText.setText(rendered);
 			this.ui.requestRender();
 			return;
 		}
 
 		const spacer = new Spacer(1);
-		const text = new Text(theme.fg("dim", message), 1, 0);
+		const text = new Text(rendered, 1, 0);
 		this.chatContainer.addChild(spacer);
 		this.chatContainer.addChild(text);
 		this.lastStatusSpacer = spacer;
@@ -1822,10 +1830,24 @@ export class InteractiveMode {
 		try {
 			const image = await readImageFromClipboard();
 			if (image) {
+				let imageData = image;
+				if (this.settingsManager.getImageAutoResize()) {
+					try {
+						const resized = await resizeImage({
+							type: "image",
+							data: image.data,
+							mimeType: image.mimeType,
+						});
+						imageData = { data: resized.data, mimeType: resized.mimeType };
+					} catch {
+						imageData = image;
+					}
+				}
+
 				this.pendingImages.push({
 					type: "image",
-					data: image.data,
-					mimeType: image.mimeType,
+					data: imageData.data,
+					mimeType: imageData.mimeType,
 				});
 				// Insert styled placeholder at cursor like Claude does
 				const imageNum = this.pendingImages.length;
@@ -1980,7 +2002,8 @@ export class InteractiveMode {
 
 	private async cycleRoleModel(options?: { temporary?: boolean }): Promise<void> {
 		try {
-			const result = await this.session.cycleRoleModels(["slow", "default", "smol"], options);
+			const roleOrder = ["slow", "default", "smol"];
+			const result = await this.session.cycleRoleModels(roleOrder, options);
 			if (!result) {
 				this.showStatus("Only one role model available");
 				return;
@@ -1989,10 +2012,24 @@ export class InteractiveMode {
 			this.statusLine.invalidate();
 			this.updateEditorBorderColor();
 			const roleLabel = result.role === "default" ? "default" : result.role;
+			const roleLabelStyled = theme.bold(theme.fg("accent", roleLabel));
 			const thinkingStr =
 				result.model.reasoning && result.thinkingLevel !== "off" ? ` (thinking: ${result.thinkingLevel})` : "";
 			const tempLabel = options?.temporary ? " (temporary)" : "";
-			this.showStatus(`Switched to ${roleLabel}: ${result.model.name || result.model.id}${thinkingStr}${tempLabel}`);
+			const cycleSeparator = theme.fg("dim", " > ");
+			const cycleLabel = roleOrder
+				.map((role) => {
+					if (role === result.role) {
+						return theme.bold(theme.fg("accent", role));
+					}
+					return theme.fg("muted", role);
+				})
+				.join(cycleSeparator);
+			const orderLabel = ` (cycle: ${cycleLabel})`;
+			this.showStatus(
+				`Switched to ${roleLabelStyled}: ${result.model.name || result.model.id}${thinkingStr}${tempLabel}${orderLabel}`,
+				{ dim: false },
+			);
 		} catch (error) {
 			this.showError(error instanceof Error ? error.message : String(error));
 		}
@@ -2576,9 +2613,7 @@ export class InteractiveMode {
 	private async showOAuthSelector(mode: "login" | "logout"): Promise<void> {
 		if (mode === "logout") {
 			const providers = this.session.modelRegistry.authStorage.list();
-			const loggedInProviders = providers.filter(
-				(p) => this.session.modelRegistry.authStorage.get(p)?.type === "oauth",
-			);
+			const loggedInProviders = providers.filter((p) => this.session.modelRegistry.authStorage.hasOAuth(p));
 			if (loggedInProviders.length === 0) {
 				this.showStatus("No OAuth providers logged in. Use /login first.");
 				return;
@@ -2599,6 +2634,7 @@ export class InteractiveMode {
 							await this.session.modelRegistry.authStorage.login(providerId as OAuthProvider, {
 								onAuth: (info: { url: string; instructions?: string }) => {
 									this.chatContainer.addChild(new Spacer(1));
+									this.chatContainer.addChild(new Text(theme.fg("dim", info.url), 1, 0));
 									// Use OSC 8 hyperlink escape sequence for clickable link
 									const hyperlink = `\x1b]8;;${info.url}\x07Click here to login\x1b]8;;\x07`;
 									this.chatContainer.addChild(new Text(theme.fg("accent", hyperlink), 1, 0));

package/src/prompts/tools/ask.md

@@ -8,11 +8,6 @@ Use this tool to:
 - Request user preferences (styling, naming conventions, architecture patterns)
 - Offer meaningful choices about task direction
 
-Do NOT use for:
-- Questions resolvable by reading files or docs
-- Permission for normal dev tasks (just proceed)
-- Decisions you should make from codebase context
-
 Tips:
 - Place recommended option first with " (Recommended)" suffix
 - 2-5 concise, distinct options
@@ -22,3 +17,14 @@ Tips:
 question: "Which authentication method should this API use?"
 options: [{"label": "JWT (Recommended)"}, {"label": "OAuth2"}, {"label": "Session cookies"}]
 </example>
+
+## Critical: Resolve before asking
+
+**Exhaust all other options before asking.** Questions interrupt user flow.
+
+1. **Unknown file location?** → Search with grep/find first. Only ask if search fails.
+2. **Ambiguous syntax/format?** → Infer from context and codebase conventions. Make a reasonable choice.
+3. **Missing details?** → Check docs, related files, commit history. Fill gaps yourself.
+4. **Implementation approach?** → Choose based on codebase patterns. Ask only for genuinely novel architectural decisions.
+
+If you can make a reasonable inference from the user's request, **do it**. Users communicate intent, not specifications—your job is to translate intent into correct implementation.

package/src/prompts/tools/bash.md

@@ -13,6 +13,7 @@ Do NOT use Bash for:
 
 ## Command structure
 
+- Use `workdir` parameter to run commands in a specific directory instead of `cd dir && ...`
 - Paths with spaces must use double quotes: `cd "/path/with spaces"`
 - For sequential dependent operations, chain with `&&`: `mkdir foo && cd foo && touch bar`
 - For parallel independent operations, make multiple tool calls in one message

package/src/prompts/tools/calculator.md

@@ -0,0 +1,8 @@
+Basic calculations.
+
+Input:
+  - calculations: array of { expression: string, prefix: string, suffix: string }
+
+Notes:
+  - Supports +, -, *, /, %, ** and parentheses.
+  - Supports decimal, hex (0x), binary (0b), and octal (0o) literals.