@oh-my-pi/pi-coding-agent 12.1.1 → 12.2.1

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

@@ -3,9 +3,8 @@ import { Container, matchesKey, Spacer, TruncatedText } from "@oh-my-pi/pi-tui";
 import { theme } from "../../modes/theme/theme";
 import type { AuthStorage } from "../../session/auth-storage";
 import { DynamicBorder } from "./dynamic-border";
-
 /**
- * Component that renders an OAuth provider selector
+ * Component that renders an OAuth provider selector.
  */
 export class OAuthSelectorComponent extends Container {
 	#listContainer: Container;
@@ -16,62 +15,139 @@ export class OAuthSelectorComponent extends Container {
 	#onSelectCallback: (providerId: string) => void;
 	#onCancelCallback: () => void;
 	#statusMessage: string | undefined;
-
+	#validateAuthCallback?: (providerId: string) => Promise<boolean>;
+	#requestRenderCallback?: () => void;
+	#authState: Map<string, "checking" | "valid" | "invalid"> = new Map();
+	#spinnerFrame: number = 0;
+	#spinnerInterval?: NodeJS.Timeout;
+	#validationGeneration: number = 0;
 	constructor(
 		mode: "login" | "logout",
 		authStorage: AuthStorage,
 		onSelect: (providerId: string) => void,
 		onCancel: () => void,
+		options?: {
+			validateAuth?: (providerId: string) => Promise<boolean>;
+			requestRender?: () => void;
+		},
 	) {
 		super();
-
 		this.#mode = mode;
 		this.#authStorage = authStorage;
 		this.#onSelectCallback = onSelect;
 		this.#onCancelCallback = onCancel;
-
+		this.#validateAuthCallback = options?.validateAuth;
+		this.#requestRenderCallback = options?.requestRender;
 		// Load all OAuth providers
 		this.#loadProviders();
-
-		// Add top border
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
-
 		// Add title
 		const title = mode === "login" ? "Select provider to login:" : "Select provider to logout:";
 		this.addChild(new TruncatedText(theme.bold(title)));
 		this.addChild(new Spacer(1));
-
 		// Create list container
 		this.#listContainer = new Container();
 		this.addChild(this.#listContainer);
-
 		this.addChild(new Spacer(1));
-
 		// Add bottom border
 		this.addChild(new DynamicBorder());
-
 		// Initial render
 		this.#updateList();
+		this.#startValidation();
 	}
 
+	stopValidation(): void {
+		this.#validationGeneration += 1;
+		this.#stopSpinner();
+	}
 	#loadProviders(): void {
 		this.#allProviders = getOAuthProviders();
 	}
 
+	#startValidation(): void {
+		if (!this.#validateAuthCallback) return;
+		const generation = this.#validationGeneration + 1;
+		this.#validationGeneration = generation;
+
+		let pending = 0;
+		for (const provider of this.#allProviders) {
+			if (!this.#authStorage.hasAuth(provider.id)) {
+				this.#authState.delete(provider.id);
+				continue;
+			}
+			this.#authState.set(provider.id, "checking");
+			pending += 1;
+			void this.#validateProvider(provider.id, generation);
+		}
+
+		if (pending > 0) {
+			this.#startSpinner();
+			this.#updateList();
+			this.#requestRenderCallback?.();
+		}
+	}
+
+	async #validateProvider(providerId: string, generation: number): Promise<void> {
+		if (!this.#validateAuthCallback) return;
+		let isValid = false;
+		try {
+			isValid = await this.#validateAuthCallback(providerId);
+		} catch {
+			isValid = false;
+		}
+
+		if (generation !== this.#validationGeneration) return;
+		this.#authState.set(providerId, isValid ? "valid" : "invalid");
+		if (![...this.#authState.values()].includes("checking")) {
+			this.#stopSpinner();
+		}
+		this.#updateList();
+		this.#requestRenderCallback?.();
+	}
+
+	#startSpinner(): void {
+		if (this.#spinnerInterval) return;
+		this.#spinnerInterval = setInterval(() => {
+			const frameCount = theme.spinnerFrames.length;
+			if (frameCount > 0) {
+				this.#spinnerFrame = (this.#spinnerFrame + 1) % frameCount;
+			}
+			this.#updateList();
+			this.#requestRenderCallback?.();
+		}, 80);
+	}
+
+	#stopSpinner(): void {
+		if (this.#spinnerInterval) {
+			clearInterval(this.#spinnerInterval);
+			this.#spinnerInterval = undefined;
+		}
+	}
+
+	#getStatusIndicator(providerId: string): string {
+		const state = this.#authState.get(providerId);
+		if (state === "checking") {
+			const frameCount = theme.spinnerFrames.length;
+			const spinner = frameCount > 0 ? theme.spinnerFrames[this.#spinnerFrame % frameCount] : theme.status.pending;
+			return theme.fg("warning", ` ${spinner} checking`);
+		}
+		if (state === "invalid") {
+			return theme.fg("error", ` ${theme.status.error} invalid`);
+		}
+		if (state === "valid") {
+			return theme.fg("success", ` ${theme.status.success} logged in`);
+		}
+		return this.#authStorage.hasAuth(providerId) ? theme.fg("success", ` ${theme.status.success} logged in`) : "";
+	}
 	#updateList(): void {
 		this.#listContainer.clear();
-
 		for (let i = 0; i < this.#allProviders.length; i++) {
 			const provider = this.#allProviders[i];
 			if (!provider) continue;
-
 			const isSelected = i === this.#selectedIndex;
 			const isAvailable = provider.available;
-
-			// Check if user is logged in for this provider
-			const isLoggedIn = this.#authStorage.hasOAuth(provider.id);
-			const statusIndicator = isLoggedIn ? theme.fg("success", ` ${theme.status.success} logged in`) : "";
+			const statusIndicator = this.#getStatusIndicator(provider.id);
 
 			let line = "";
 			if (isSelected) {
@@ -82,7 +158,6 @@ export class OAuthSelectorComponent extends Container {
 				const text = isAvailable ? `  ${provider.name}` : theme.fg("dim", `  ${provider.name}`);
 				line = text + statusIndicator;
 			}
-
 			this.#listContainer.addChild(new TruncatedText(line, 0, 0));
 		}
 
@@ -92,13 +167,11 @@ export class OAuthSelectorComponent extends Container {
 				this.#mode === "login" ? "No OAuth providers available" : "No OAuth providers logged in. Use /login first.";
 			this.#listContainer.addChild(new TruncatedText(theme.fg("muted", `  ${message}`), 0, 0));
 		}
-
 		if (this.#statusMessage) {
 			this.#listContainer.addChild(new Spacer(1));
 			this.#listContainer.addChild(new TruncatedText(theme.fg("warning", `  ${this.#statusMessage}`), 0, 0));
 		}
 	}
-
 	handleInput(keyData: string): void {
 		// Up arrow
 		if (matchesKey(keyData, "up")) {
@@ -121,6 +194,7 @@ export class OAuthSelectorComponent extends Container {
 			const selectedProvider = this.#allProviders[this.#selectedIndex];
 			if (selectedProvider?.available) {
 				this.#statusMessage = undefined;
+				this.stopValidation();
 				this.#onSelectCallback(selectedProvider.id);
 			} else if (selectedProvider) {
 				this.#statusMessage = "Provider unavailable in this environment.";
@@ -129,6 +203,7 @@ export class OAuthSelectorComponent extends Container {
 		}
 		// Escape or Ctrl+C
 		else if (matchesKey(keyData, "escape") || matchesKey(keyData, "esc") || matchesKey(keyData, "ctrl+c")) {
+			this.stopValidation();
 			this.#onCancelCallback();
 		}
 	}

package/src/modes/components/status-line/segments.ts

@@ -1,4 +1,5 @@
 import * as os from "node:os";
+import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import { theme } from "../../../modes/theme/theme";
 import { shortenPath } from "../../../tools/render-utils";
 import type { RenderedSegment, SegmentContext, StatusLineSegment, StatusLineSegmentId } from "./types";
@@ -91,7 +92,7 @@ const pathSegment: StatusLineSegment = {
 	render(ctx) {
 		const opts = ctx.options.path ?? {};
 
-		let pwd = process.cwd();
+		let pwd = getProjectDir();
 
 		if (opts.abbreviate !== false) {
 			pwd = shortenPath(pwd);

package/src/modes/components/status-line.ts

@@ -2,6 +2,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import type { AssistantMessage } from "@oh-my-pi/pi-ai";
 import { type Component, padding, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
+import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import { $ } from "bun";
 import { settings } from "../../config/settings";
 import type { StatusLinePreset, StatusLineSegmentId, StatusLineSeparatorStyle } from "../../config/settings-schema";
@@ -41,7 +42,7 @@ function sanitizeStatusText(text: string): string {
 
 /** Find the git root directory by walking up from cwd */
 function findGitHeadPath(): string | null {
-	let dir = process.cwd();
+	let dir = getProjectDir();
 	while (true) {
 		const gitHeadPath = path.join(dir, ".git", "HEAD");
 		if (fs.existsSync(gitHeadPath)) {

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

@@ -13,6 +13,7 @@ import {
 	type TUI,
 } from "@oh-my-pi/pi-tui";
 import { logger, sanitizeText } from "@oh-my-pi/pi-utils";
+import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import type { Theme } from "../../modes/theme/theme";
 import { theme } from "../../modes/theme/theme";
 import {
@@ -129,7 +130,7 @@ export class ToolExecutionComponent extends Container {
 		options: ToolExecutionOptions = {},
 		tool: AgentTool | undefined,
 		ui: TUI,
-		cwd: string = process.cwd(),
+		cwd: string = getProjectDir(),
 	) {
 		super();
 		this.#toolName = toolName;

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

@@ -1,10 +1,17 @@
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
-import type { UsageLimit, UsageReport } from "@oh-my-pi/pi-ai";
+import {
+	getEnvApiKey,
+	getProviderDetails,
+	type ProviderDetails,
+	type UsageLimit,
+	type UsageReport,
+} from "@oh-my-pi/pi-ai";
 import { copyToClipboard } from "@oh-my-pi/pi-natives";
 import { Loader, Markdown, padding, Spacer, Text, visibleWidth } from "@oh-my-pi/pi-tui";
 import { Snowflake } from "@oh-my-pi/pi-utils";
+import { setProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import { $ } from "bun";
 import { reset as resetCapabilities } from "../../capability";
 import { loadCustomShare } from "../../export/custom-share";
@@ -16,6 +23,7 @@ import { DynamicBorder } from "../../modes/components/dynamic-border";
 import { PythonExecutionComponent } from "../../modes/components/python-execution";
 import { getMarkdownTheme, getSymbolTheme, theme } from "../../modes/theme/theme";
 import type { InteractiveModeContext } from "../../modes/types";
+import type { AuthStorage } from "../../session/auth-storage";
 import { createCompactionSummaryMessage } from "../../session/messages";
 import { outputMeta } from "../../tools/output-meta";
 import { resolveToCwd } from "../../tools/path-utils";
@@ -206,6 +214,25 @@ export class CommandController {
 		let info = `${theme.bold("Session Info")}\n\n`;
 		info += `${theme.fg("dim", "File:")} ${stats.sessionFile ?? "In-memory"}\n`;
 		info += `${theme.fg("dim", "ID:")} ${stats.sessionId}\n\n`;
+		info += `\n${theme.bold("Provider")}\n`;
+		const model = this.ctx.session.model;
+		if (!model) {
+			info += `${theme.fg("dim", "No model selected")}\n`;
+		} else {
+			const authMode = resolveProviderAuthMode(this.ctx.session.modelRegistry.authStorage, model.provider);
+			const openaiWebsocketSetting = this.ctx.settings.get("providers.openaiWebsockets") ?? "auto";
+			const preferOpenAICodexWebsockets =
+				openaiWebsocketSetting === "on" ? true : openaiWebsocketSetting === "off" ? false : undefined;
+			const providerDetails = getProviderDetails({
+				model,
+				sessionId: stats.sessionId,
+				authMode,
+				preferWebsockets: preferOpenAICodexWebsockets,
+				providerSessionState: this.ctx.session.providerSessionState,
+			});
+			info += renderProviderSection(providerDetails, theme);
+		}
+		info += `\n`;
 		info += `${theme.bold("Messages")}\n`;
 		info += `${theme.fg("dim", "User:")} ${stats.userMessages}\n`;
 		info += `${theme.fg("dim", "Assistant:")} ${stats.assistantMessages}\n`;
@@ -388,6 +415,12 @@ export class CommandController {
 		}
 		this.ctx.statusContainer.clear();
 
+		if (this.ctx.session.isCompacting) {
+			this.ctx.session.abortCompaction();
+			while (this.ctx.session.isCompacting) {
+				await Bun.sleep(10);
+			}
+		}
 		await this.ctx.session.newSession();
 
 		this.ctx.statusLine.invalidate();
@@ -460,7 +493,7 @@ export class CommandController {
 		try {
 			await this.ctx.sessionManager.flush();
 			await this.ctx.sessionManager.moveTo(resolvedPath);
-			process.chdir(resolvedPath);
+			setProjectDir(resolvedPath);
 			resetCapabilities();
 			await this.ctx.refreshSlashCommandState(resolvedPath);
 
@@ -733,6 +766,31 @@ function formatDurationShort(ms: number): string {
 	return `${totalSeconds}s`;
 }
 
+function resolveProviderAuthMode(authStorage: AuthStorage, provider: string): string {
+	if (authStorage.hasOAuth(provider)) {
+		return "oauth";
+	}
+	if (authStorage.has(provider)) {
+		return "api key";
+	}
+	if (getEnvApiKey(provider)) {
+		return "env api key";
+	}
+	if (authStorage.hasAuth(provider)) {
+		return "runtime/fallback";
+	}
+	return "unknown";
+}
+
+export function renderProviderSection(details: ProviderDetails, uiTheme: Pick<typeof theme, "fg">): string {
+	const lines: string[] = [];
+	lines.push(`${uiTheme.fg("dim", "Name:")} ${details.provider}`);
+	for (const field of details.fields) {
+		lines.push(`${uiTheme.fg("dim", `${field.label}:`)} ${field.value}`);
+	}
+	return `${lines.join("\n")}\n`;
+}
+
 function resolveFraction(limit: UsageLimit): number | undefined {
 	const amount = limit.amount;
 	if (amount.usedFraction !== undefined) return amount.usedFraction;

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

@@ -4,7 +4,7 @@
  * Handles /mcp subcommands for managing MCP servers.
  */
 import { Spacer, Text } from "@oh-my-pi/pi-tui";
-import { getMCPConfigPath } from "@oh-my-pi/pi-utils/dirs";
+import { getMCPConfigPath, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import type { SourceMeta } from "../../capability/types";
 import { analyzeAuthError, discoverOAuthEndpoints, MCPManager } from "../../mcp";
 import { connectToServer, disconnectServer, listTools } from "../../mcp/client";
@@ -528,7 +528,7 @@ export class MCPCommandController {
 		if (this.ctx.mcpManager) {
 			resolvedConfig = await this.ctx.mcpManager.prepareConfig(config);
 		} else {
-			const tempManager = new MCPManager(process.cwd());
+			const tempManager = new MCPManager(getProjectDir());
 			tempManager.setAuthStorage(this.ctx.session.modelRegistry.authStorage);
 			resolvedConfig = await tempManager.prepareConfig(config);
 		}
@@ -540,7 +540,7 @@ export class MCPCommandController {
 	async #findConfiguredServer(
 		name: string,
 	): Promise<{ filePath: string; scope: "user" | "project"; config: MCPServerConfig } | null> {
-		const cwd = process.cwd();
+		const cwd = getProjectDir();
 		const userPath = getMCPConfigPath("user", cwd);
 		const projectPath = getMCPConfigPath("project", cwd);
 
@@ -665,7 +665,7 @@ export class MCPCommandController {
 	async #handleWizardComplete(name: string, config: MCPServerConfig, scope: "user" | "project"): Promise<void> {
 		try {
 			// Determine file path
-			const cwd = process.cwd();
+			const cwd = getProjectDir();
 			const filePath = getMCPConfigPath(scope, cwd);
 
 			// Add server to config
@@ -747,7 +747,7 @@ export class MCPCommandController {
 	 */
 	async #handleList(): Promise<void> {
 		try {
-			const cwd = process.cwd();
+			const cwd = getProjectDir();
 
 			// Load from both user and project configs
 			const userPath = getMCPConfigPath("user", cwd);
@@ -913,7 +913,7 @@ export class MCPCommandController {
 		}
 
 		try {
-			const cwd = process.cwd();
+			const cwd = getProjectDir();
 			const userPath = getMCPConfigPath("user", cwd);
 			const projectPath = getMCPConfigPath("project", cwd);
 			const filePath = scope === "user" ? userPath : projectPath;
@@ -957,7 +957,7 @@ export class MCPCommandController {
 
 		let connection: MCPServerConnection | undefined;
 		try {
-			const cwd = process.cwd();
+			const cwd = getProjectDir();
 			const userPath = getMCPConfigPath("user", cwd);
 			const projectPath = getMCPConfigPath("project", cwd);
 
@@ -989,7 +989,7 @@ export class MCPCommandController {
 			if (this.ctx.mcpManager) {
 				resolvedConfig = await this.ctx.mcpManager.prepareConfig(config);
 			} else {
-				const tempManager = new MCPManager(process.cwd());
+				const tempManager = new MCPManager(getProjectDir());
 				tempManager.setAuthStorage(this.ctx.session.modelRegistry.authStorage);
 				resolvedConfig = await tempManager.prepareConfig(config);
 			}

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

@@ -1,8 +1,8 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { OAuthProvider } from "@oh-my-pi/pi-ai";
+import { getOAuthProviders, type OAuthProvider } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
-import { getAgentDbPath } from "@oh-my-pi/pi-utils/dirs";
+import { getAgentDbPath, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import { MODEL_ROLES } from "../../config/model-registry";
 import { settings } from "../../config/settings";
 import { DebugSelectorComponent } from "../../debug";
@@ -32,6 +32,16 @@ import { setPreferredImageProvider, setPreferredSearchProvider } from "../../too
 export class SelectorController {
 	constructor(private ctx: InteractiveModeContext) {}
 
+	async #refreshOAuthProviderAuthState(): Promise<void> {
+		const oauthProviders = getOAuthProviders();
+		await Promise.all(
+			oauthProviders.map(provider =>
+				this.ctx.session.modelRegistry
+					.getApiKeyForProvider(provider.id, this.ctx.session.sessionId)
+					.catch(() => undefined),
+			),
+		);
+	}
 	/**
 	 * Shows a selector component in place of the editor.
 	 * @param create Factory that receives a `done` callback and returns the component and focus target
@@ -57,7 +67,7 @@ export class SelectorController {
 						availableThinkingLevels: this.ctx.session.getAvailableThinkingLevels(),
 						thinkingLevel: this.ctx.session.thinkingLevel,
 						availableThemes,
-						cwd: process.cwd(),
+						cwd: getProjectDir(),
 					},
 					{
 						onChange: (id, value) => this.handleSettingChange(id, value),
@@ -136,7 +146,7 @@ export class SelectorController {
 	 * Replaces /status with a unified view of all providers and extensions.
 	 */
 	async showExtensionsDashboard(): Promise<void> {
-		const dashboard = await ExtensionDashboard.create(process.cwd(), this.ctx.settings, this.ctx.ui.terminal.rows);
+		const dashboard = await ExtensionDashboard.create(getProjectDir(), this.ctx.settings, this.ctx.ui.terminal.rows);
 		this.showSelector(done => {
 			dashboard.onClose = () => {
 				done();
@@ -536,8 +546,11 @@ export class SelectorController {
 
 	async showOAuthSelector(mode: "login" | "logout"): Promise<void> {
 		if (mode === "logout") {
-			const providers = this.ctx.session.modelRegistry.authStorage.list();
-			const loggedInProviders = providers.filter(p => this.ctx.session.modelRegistry.authStorage.hasOAuth(p));
+			await this.#refreshOAuthProviderAuthState();
+			const oauthProviders = getOAuthProviders();
+			const loggedInProviders = oauthProviders.filter(provider =>
+				this.ctx.session.modelRegistry.authStorage.hasAuth(provider.id),
+			);
 			if (loggedInProviders.length === 0) {
 				this.ctx.showStatus("No OAuth providers logged in. Use /login first.");
 				return;
@@ -545,15 +558,15 @@ export class SelectorController {
 		}
 
 		this.showSelector(done => {
-			const selector = new OAuthSelectorComponent(
+			let selector: OAuthSelectorComponent;
+			selector = new OAuthSelectorComponent(
 				mode,
 				this.ctx.session.modelRegistry.authStorage,
 				async (providerId: string) => {
+					selector.stopValidation();
 					done();
-
 					if (mode === "login") {
 						this.ctx.showStatus(`Logging in to ${providerId}…`);
-
 						try {
 							await this.ctx.session.modelRegistry.authStorage.login(providerId as OAuthProvider, {
 								onAuth: (info: { url: string; instructions?: string }) => {
@@ -567,7 +580,6 @@ export class SelectorController {
 										this.ctx.chatContainer.addChild(new Text(theme.fg("warning", info.instructions), 1, 0));
 									}
 									this.ctx.ui.requestRender();
-
 									this.ctx.openInBrowser(info.url);
 								},
 								onPrompt: async (prompt: { message: string; placeholder?: string }) => {
@@ -577,7 +589,6 @@ export class SelectorController {
 										this.ctx.chatContainer.addChild(new Text(theme.fg("dim", prompt.placeholder), 1, 0));
 									}
 									this.ctx.ui.requestRender();
-
 									return new Promise<string>(resolve => {
 										const codeInput = new Input();
 										codeInput.onSubmit = () => {
@@ -638,9 +649,22 @@ export class SelectorController {
 					}
 				},
 				() => {
+					selector.stopValidation();
 					done();
 					this.ctx.ui.requestRender();
 				},
+				{
+					validateAuth: async (providerId: string) => {
+						const apiKey = await this.ctx.session.modelRegistry.getApiKeyForProvider(
+							providerId,
+							this.ctx.session.sessionId,
+						);
+						return !!apiKey;
+					},
+					requestRender: () => {
+						this.ctx.ui.requestRender();
+					},
+				},
 			);
 			return { component: selector, focus: selector };
 		});

package/src/modes/interactive-mode.ts

@@ -16,7 +16,7 @@ import {
 	TUI,
 } from "@oh-my-pi/pi-tui";
 import { $env, isEnoent, logger, postmortem } from "@oh-my-pi/pi-utils";
-import { APP_NAME } from "@oh-my-pi/pi-utils/dirs";
+import { APP_NAME, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import chalk from "chalk";
 import { KeybindingsManager } from "../config/keybindings";
 import { renderPromptTemplate } from "../config/prompt-templates";
@@ -249,7 +249,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#cleanupUnsubscribe = postmortem.register("session-manager-flush", () => this.sessionManager.flush());
 		debugStartup("InteractiveMode.init:cleanupRegistered");
 
-		await this.refreshSlashCommandState(process.cwd());
+		await this.refreshSlashCommandState(getProjectDir());
 		debugStartup("InteractiveMode.init:slashCommands");
 
 		// Get current model info for welcome screen