@oh-my-pi/pi-coding-agent 13.7.1 → 13.7.4

package/CHANGELOG.md

@@ -2,6 +2,47 @@
 
 ## [Unreleased]
 
+## [13.7.4] - 2026-03-04
+### Added
+- Added `fetch.useKagiSummarizer` setting to toggle Kagi Universal Summarizer usage in the fetch tool.
+
+### Fixed
+
+- Fixed incorrect message history reference in session title generation that could cause missing or stale titles on first message
+- Added startup check requiring Bun 1.3.7+ for JSONL session parsing (`Bun.JSONL.parseChunk`) and clear upgrade guidance so `/resume` and `--resume` do not silently report missing sessions on older Bun runtimes
+
+## [13.7.3] - 2026-03-04
+
+### Added
+
+- Added Kagi Universal Summarizer integration for URL summarization, now prioritized before Jina and other methods
+- Added Kagi Universal Summarizer support for YouTube video summaries when credentials are available
+- Exported `searchWithKagi` and `summarizeUrlWithKagi` functions from new `web/kagi` module for direct API access
+- Added `KagiApiError` exception class for Kagi API-specific error handling
+
+### Changed
+
+- Updated hashline prompt documentation with clearer operation syntax and improved examples showing full edit structure with path and edits array
+- Refactored `hlineref` Handlebars helper to return JSON-quoted strings for safer embedding in JSON blocks within prompts
+- Improved `hashlineParseText` to correctly preserve blank lines and trailing empty strings in array input while stripping trailing newlines from string input
+- Optimized duplicate line detection in range replacements to use trimmed comparison, reducing false positives from whitespace differences
+- Refactored Kagi search provider to use shared Kagi API utilities from `web/kagi` module
+- Changed HTML-to-text rendering priority order to try Kagi first, then Jina, Trafilatura, and Lynx
+
+### Fixed
+
+- Fixed `isEscapedTabAutocorrectEnabled` environment variable parsing to use switch statement for clearer logic and consistent default behavior
+
+## [13.7.2] - 2026-03-04
+### Added
+
+- Added support for direct OAuth provider login via `/login <provider>` command (e.g., `/login kagi`)
+- Added optional `providerId` parameter to `showOAuthSelector()` to enable direct provider selection without UI selector
+
+### Changed
+
+- Simplified web search result formatting to omit empty sections and metadata when not present
+
 ## [13.7.0] - 2026-03-03
 
 ### Fixed

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "13.7.1",
+	"version": "13.7.4",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -41,12 +41,12 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "13.7.1",
-		"@oh-my-pi/pi-agent-core": "13.7.1",
-		"@oh-my-pi/pi-ai": "13.7.1",
-		"@oh-my-pi/pi-natives": "13.7.1",
-		"@oh-my-pi/pi-tui": "13.7.1",
-		"@oh-my-pi/pi-utils": "13.7.1",
+		"@oh-my-pi/omp-stats": "13.7.4",
+		"@oh-my-pi/pi-agent-core": "13.7.4",
+		"@oh-my-pi/pi-ai": "13.7.4",
+		"@oh-my-pi/pi-natives": "13.7.4",
+		"@oh-my-pi/pi-tui": "13.7.4",
+		"@oh-my-pi/pi-utils": "13.7.4",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/cli.ts

@@ -1,11 +1,39 @@
 #!/usr/bin/env bun
-import { APP_NAME, VERSION } from "@oh-my-pi/pi-utils";
+import { APP_NAME, MIN_BUN_VERSION, VERSION } from "@oh-my-pi/pi-utils";
 /**
  * CLI entry point — registers all commands explicitly and delegates to the
  * lightweight CLI runner from pi-utils.
  */
 import { type CommandEntry, run } from "@oh-my-pi/pi-utils/cli";
 
+function parseSemver(version: string): [number, number, number] {
+	function toint(value: string): number {
+		const int = Number.parseInt(value, 10);
+		if (Number.isNaN(int) || !Number.isFinite(int)) return 0;
+		return int;
+	}
+	const [majorRaw, minorRaw, patchRaw] = version.split(".").map(toint);
+	return [majorRaw, minorRaw, patchRaw];
+}
+
+function isAtLeastBunVersion(minimum: string): boolean {
+	const ver = parseSemver(Bun.version);
+	const min = parseSemver(minimum);
+	for (let i = 0; i < 3; i++) {
+		if (ver[i] !== min[i]) {
+			return ver[i] > min[i];
+		}
+	}
+	return true;
+}
+
+if (typeof Bun.JSONL?.parseChunk !== "function" || !isAtLeastBunVersion(MIN_BUN_VERSION)) {
+	process.stderr.write(
+		`error: Bun runtime must be >= ${MIN_BUN_VERSION} (found v${Bun.version}). Please update Bun: bun upgrade\n`,
+	);
+	process.exit(1);
+}
+
 // Detect known Bun errata that cause TUI crashes (e.g. Bun.stringWidth mishandling OSC sequences).
 if (Bun.stringWidth("\x1b[0m\x1b]8;;\x07") !== 0) {
 	process.stderr.write(`error: Bun runtime errata detected (v${Bun.version}). Please update Bun: bun upgrade\n`);

package/src/config/prompt-templates.ts

@@ -249,10 +249,6 @@ export function sectionSeparator(name: string): string {
 
 handlebars.registerHelper("SECTION_SEPERATOR", (name: unknown): string => sectionSeparator(String(name)));
 
-/**
- * {{hlineref lineNum "content"}} — compute a real hashline ref for prompt examples.
- * Returns `"lineNum#hash"` using the actual hash algorithm.
- */
 function formatHashlineRef(lineNum: unknown, content: unknown): { num: number; text: string; ref: string } {
 	const num = typeof lineNum === "number" ? lineNum : Number.parseInt(String(lineNum), 10);
 	const raw = typeof content === "string" ? content : String(content ?? "");
@@ -261,16 +257,11 @@ function formatHashlineRef(lineNum: unknown, content: unknown): { num: number; t
 	return { num, text, ref };
 }
 
-handlebars.registerHelper("hlineref", (lineNum: unknown, content: unknown): string => {
-	const { ref } = formatHashlineRef(lineNum, content);
-	return ref;
-});
-
 /**
- * {{hlinejsonref lineNum "content"}} — same as hlineref but returns a JSON-quoted string.
- * Useful for embedding hashline refs inside JSON blocks in prompts.
+ * {{hlineref lineNum "content"}} — compute a real hashline ref for prompt examples.
+ * Returns `"lineNum#hash"` using the actual hash algorithm.
  */
-handlebars.registerHelper("hlinejsonref", (lineNum: unknown, content: unknown): string => {
+handlebars.registerHelper("hlineref", (lineNum: unknown, content: unknown): string => {
 	const { ref } = formatHashlineRef(lineNum, content);
 	return JSON.stringify(ref);
 });

package/src/config/settings-schema.ts

@@ -490,6 +490,15 @@ export const SETTINGS_SCHEMA = {
 		default: true,
 		ui: { tab: "tools", label: "Enable Fetch", description: "Enable the fetch tool for URL fetching" },
 	},
+	"fetch.useKagiSummarizer": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "tools",
+			label: "Use Kagi in Fetch",
+			description: "Use Kagi Universal Summarizer when rendering HTML in fetch",
+		},
+	},
 	"web_search.enabled": {
 		type: "boolean",
 		default: true,

package/src/debug/log-formatting.ts

@@ -1,4 +1,4 @@
-import { sanitizeText } from "@oh-my-pi/pi-natives";
+import { sanitizeText, wrapTextWithAnsi } from "@oh-my-pi/pi-natives";
 import { replaceTabs, truncateToWidth } from "../tools/render-utils";
 
 export function formatDebugLogLine(line: string, maxWidth: number): string {
@@ -17,9 +17,7 @@ export function formatDebugLogExpandedLines(line: string, maxWidth: number): str
 		return [""];
 	}
 
-	return normalized
-		.split("\n")
-		.flatMap(segment => Bun.wrapAnsi(segment, width, { hard: true, trim: false, wordWrap: true }).split("\n"));
+	return normalized.split("\n").flatMap(segment => wrapTextWithAnsi(segment, width));
 }
 
 export function parseDebugLogTimestampMs(line: string): number | undefined {

package/src/debug/log-viewer.ts

@@ -499,7 +499,7 @@ export class DebugLogViewerComponent implements Component {
 		}
 
 		if (matchesKey(keyData, "ctrl+c")) {
-			void this.#copySelected();
+			this.#copySelected();
 			return;
 		}
 
@@ -878,7 +878,7 @@ export class DebugLogViewerComponent implements Component {
 		return `${theme.boxSharp.vertical}${truncated}${padding(remaining)}${theme.boxSharp.vertical}`;
 	}
 
-	async #copySelected(): Promise<void> {
+	#copySelected() {
 		const selectedPayload = buildLogCopyPayload(this.#model.getSelectedRawLines());
 		const selected = selectedPayload.length === 0 ? [] : selectedPayload.split("\n");
 
@@ -890,7 +890,7 @@ export class DebugLogViewerComponent implements Component {
 		}
 
 		try {
-			await copyToClipboard(selectedPayload);
+			copyToClipboard(selectedPayload);
 			const message = `Copied ${selected.length} log ${selected.length === 1 ? "entry" : "entries"}`;
 			this.#statusMessage = message;
 			this.#onStatus?.(message);

package/src/exa/factory.ts

@@ -30,7 +30,7 @@ export function createExaTool(
 		parameters,
 		async execute(_toolCallId, params, _onUpdate, _ctx, _signal) {
 			try {
-				const apiKey = await findApiKey();
+				const apiKey = findApiKey();
 				// Exa MCP endpoint is publicly accessible; API key is optional
 				const args = transformParams ? transformParams(params as Record<string, unknown>) : params;
 				const response = await callExaTool(mcpToolName, args, apiKey);

package/src/exa/mcp-client.ts

@@ -238,7 +238,7 @@ export class MCPWrappedTool implements CustomTool<TSchema, ExaRenderDetails> {
 		_signal?: AbortSignal,
 	): Promise<CustomToolResult<ExaRenderDetails>> {
 		try {
-			const apiKey = await findApiKey();
+			const apiKey = findApiKey();
 			// Websets tools require an API key; basic Exa MCP tools work without one
 			if (!apiKey && this.config.isWebsetsTool) {
 				return {

package/src/exa/websets.ts

@@ -23,7 +23,7 @@ function createWebsetTool(
 		parameters,
 		async execute(_toolCallId, params, _onUpdate, _ctx, _signal) {
 			try {
-				const apiKey = await findApiKey();
+				const apiKey = findApiKey();
 				if (!apiKey) {
 					return {
 						content: [{ type: "text" as const, text: "Error: EXA_API_KEY not found" }],

package/src/ipy/gateway-coordinator.ts

@@ -230,7 +230,7 @@ async function startGatewayProcess(
 	const settings = await Settings.init();
 	const { shell, env } = settings.getShellConfig();
 	const filteredEnv = filterEnv(env);
-	const runtime = await resolvePythonRuntime(cwd, filteredEnv);
+	const runtime = resolvePythonRuntime(cwd, filteredEnv);
 	const snapshotPath = await getOrCreateSnapshot(shell, env).catch((err: unknown) => {
 		logger.warn("Failed to resolve shell snapshot for shared Python gateway", {
 			error: err instanceof Error ? err.message : String(err),

package/src/modes/components/assistant-message.ts

@@ -89,7 +89,7 @@ export class AssistantMessageComponent extends Container {
 			try {
 				for (const content of message.content) {
 					if (content.type === "text" && content.text.trim() && hasPendingMermaid(content.text)) {
-						await prerenderMermaid(content.text);
+						prerenderMermaid(content.text);
 					}
 				}
 			} catch (error) {

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

@@ -30,7 +30,7 @@ import {
 	stripInternalArgs,
 } from "../../tools/json-tree";
 import { PYTHON_DEFAULT_PREVIEW_LINES } from "../../tools/python";
-import { formatExpandHint, truncateToWidth } from "../../tools/render-utils";
+import { formatExpandHint, replaceTabs, truncateToWidth } from "../../tools/render-utils";
 import { toolRenderers } from "../../tools/renderers";
 import { renderStatusLine } from "../../tui";
 import { convertToPng } from "../../utils/image-convert";
@@ -431,14 +431,14 @@ export class ToolExecutionComponent extends Container {
 					// Fall back to showing raw output on error
 					const output = this.#getTextOutput();
 					if (output) {
-						this.#contentBox.addChild(new Text(theme.fg("toolOutput", output), 0, 0));
+						this.#contentBox.addChild(new Text(theme.fg("toolOutput", replaceTabs(output)), 0, 0));
 					}
 				}
 			} else if (this.#result) {
 				// Has result but no custom renderResult
 				const output = this.#getTextOutput();
 				if (output) {
-					this.#contentBox.addChild(new Text(theme.fg("toolOutput", output), 0, 0));
+					this.#contentBox.addChild(new Text(theme.fg("toolOutput", replaceTabs(output)), 0, 0));
 				}
 			}
 		} else if (this.#toolName in toolRenderers) {
@@ -488,7 +488,7 @@ export class ToolExecutionComponent extends Container {
 					// Fall back to showing raw output on error
 					const output = this.#getTextOutput();
 					if (output) {
-						this.#contentBox.addChild(new Text(theme.fg("toolOutput", output), 0, 0));
+						this.#contentBox.addChild(new Text(theme.fg("toolOutput", replaceTabs(output)), 0, 0));
 					}
 				}
 			}
@@ -679,7 +679,7 @@ export class ToolExecutionComponent extends Container {
 		const displayLines = outputLines.slice(0, maxOutputLines);
 
 		for (const line of displayLines) {
-			lines.push(theme.fg("toolOutput", truncateToWidth(line, 80)));
+			lines.push(theme.fg("toolOutput", truncateToWidth(replaceTabs(line), 80)));
 		}
 
 		if (outputLines.length > maxOutputLines) {

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

@@ -57,14 +57,14 @@ export class CommandController {
 		}
 	}
 
-	async handleDumpCommand(): Promise<void> {
+	handleDumpCommand() {
 		try {
 			const formatted = this.ctx.session.formatSessionAsText();
 			if (!formatted) {
 				this.ctx.showError("No messages to dump yet.");
 				return;
 			}
-			await copyToClipboard(formatted);
+			copyToClipboard(formatted);
 			this.ctx.showStatus("Session copied to clipboard");
 		} catch (error: unknown) {
 			this.ctx.showError(`Failed to copy session: ${error instanceof Error ? error.message : "Unknown error"}`);
@@ -214,7 +214,7 @@ export class CommandController {
 		}
 	}
 
-	async handleCopyCommand(): Promise<void> {
+	handleCopyCommand() {
 		const text = this.ctx.session.getLastAssistantText();
 		if (!text) {
 			this.ctx.showError("No agent messages to copy yet.");
@@ -222,7 +222,7 @@ export class CommandController {
 		}
 
 		try {
-			await copyToClipboard(text);
+			copyToClipboard(text);
 			this.ctx.showStatus("Copied last agent message to clipboard");
 		} catch (error) {
 			this.ctx.showError(error instanceof Error ? error.message : String(error));

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

@@ -300,7 +300,7 @@ export class InputController {
 			this.ctx.flushPendingBashComponents();
 
 			// Generate session title on first message
-			const hasUserMessages = this.ctx.agent.state.messages.some((m: AgentMessage) => m.role === "user");
+			const hasUserMessages = this.ctx.session.messages.some((m: AgentMessage) => m.role === "user");
 			if (!hasUserMessages && !this.ctx.sessionManager.getSessionName() && !$env.PI_NO_TITLE) {
 				const registry = this.ctx.session.modelRegistry;
 				const smolModel = this.ctx.settings.getModelRole("smol");
@@ -393,7 +393,7 @@ export class InputController {
 		if (allQueued.length === 0) {
 			this.ctx.updatePendingMessagesDisplay();
 			if (options?.abort) {
-				this.ctx.agent.abort();
+				this.ctx.session.abort();
 			}
 			return 0;
 		}
@@ -403,7 +403,7 @@ export class InputController {
 		this.ctx.editor.setText(combinedText);
 		this.ctx.updatePendingMessagesDisplay();
 		if (options?.abort) {
-			this.ctx.agent.abort();
+			this.ctx.session.abort();
 		}
 		return allQueued.length;
 	}
@@ -510,15 +510,14 @@ export class InputController {
 			this.ctx.showStatus("Nothing to copy");
 			return;
 		}
-		copyToClipboard(text)
-			.then(() => {
-				const sanitized = sanitizeText(text);
-				const preview = sanitized.length > 30 ? `${sanitized.slice(0, 30)}...` : sanitized;
-				this.ctx.showStatus(`Copied: ${preview}`);
-			})
-			.catch(() => {
-				this.ctx.showWarning("Failed to copy to clipboard");
-			});
+		try {
+			copyToClipboard(text);
+			const sanitized = sanitizeText(text);
+			const preview = sanitized.length > 30 ? `${sanitized.slice(0, 30)}...` : sanitized;
+			this.ctx.showStatus(`Copied: ${preview}`);
+		} catch {
+			this.ctx.showWarning("Failed to copy to clipboard");
+		}
 	}
 
 	cycleThinkingLevel(): void {

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

@@ -617,7 +617,99 @@ export class SelectorController {
 		this.ctx.showStatus("Resumed session");
 	}
 
-	async showOAuthSelector(mode: "login" | "logout"): Promise<void> {
+	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);
+		try {
+			await this.ctx.session.modelRegistry.authStorage.login(providerId as OAuthProvider, {
+				onAuth: (info: { url: string; instructions?: string }) => {
+					this.ctx.chatContainer.addChild(new Spacer(1));
+					this.ctx.chatContainer.addChild(new Text(theme.fg("dim", info.url), 1, 0));
+					const hyperlink = `\x1b]8;;${info.url}\x07Click here to login\x1b]8;;\x07`;
+					this.ctx.chatContainer.addChild(new Text(theme.fg("accent", hyperlink), 1, 0));
+					if (info.instructions) {
+						this.ctx.chatContainer.addChild(new Spacer(1));
+						this.ctx.chatContainer.addChild(new Text(theme.fg("warning", info.instructions), 1, 0));
+					}
+					if (useManualInput) {
+						this.ctx.chatContainer.addChild(new Spacer(1));
+						this.ctx.chatContainer.addChild(new Text(theme.fg("dim", MANUAL_LOGIN_TIP), 1, 0));
+					}
+					this.ctx.ui.requestRender();
+					this.ctx.openInBrowser(info.url);
+				},
+				onPrompt: async (prompt: { message: string; placeholder?: string }) => {
+					this.ctx.chatContainer.addChild(new Spacer(1));
+					this.ctx.chatContainer.addChild(new Text(theme.fg("warning", prompt.message), 1, 0));
+					if (prompt.placeholder) {
+						this.ctx.chatContainer.addChild(new Text(theme.fg("dim", prompt.placeholder), 1, 0));
+					}
+					this.ctx.ui.requestRender();
+					const { promise, resolve } = Promise.withResolvers<string>();
+					const codeInput = new Input();
+					codeInput.onSubmit = () => {
+						const code = codeInput.getValue();
+						this.ctx.editorContainer.clear();
+						this.ctx.editorContainer.addChild(this.ctx.editor);
+						this.ctx.ui.setFocus(this.ctx.editor);
+						resolve(code);
+					};
+					this.ctx.editorContainer.clear();
+					this.ctx.editorContainer.addChild(codeInput);
+					this.ctx.ui.setFocus(codeInput);
+					this.ctx.ui.requestRender();
+					return promise;
+				},
+				onProgress: (message: string) => {
+					this.ctx.chatContainer.addChild(new Text(theme.fg("dim", message), 1, 0));
+					this.ctx.ui.requestRender();
+				},
+				onManualCodeInput: useManualInput ? () => manualInput.waitForInput(providerId) : undefined,
+			});
+			await this.ctx.session.modelRegistry.refresh();
+			this.ctx.chatContainer.addChild(new Spacer(1));
+			this.ctx.chatContainer.addChild(
+				new Text(theme.fg("success", `${theme.status.success} Successfully logged in to ${providerId}`), 1, 0),
+			);
+			this.ctx.chatContainer.addChild(new Text(theme.fg("dim", `Credentials saved to ${getAgentDbPath()}`), 1, 0));
+			this.ctx.ui.requestRender();
+		} catch (error: unknown) {
+			this.ctx.showError(`Login failed: ${error instanceof Error ? error.message : String(error)}`);
+		} finally {
+			if (useManualInput) {
+				manualInput.clear(`Manual OAuth input cleared for ${providerId}`);
+			}
+		}
+	}
+
+	async #handleOAuthLogout(providerId: string): Promise<void> {
+		try {
+			await this.ctx.session.modelRegistry.authStorage.logout(providerId);
+			await this.ctx.session.modelRegistry.refresh();
+			this.ctx.chatContainer.addChild(new Spacer(1));
+			this.ctx.chatContainer.addChild(
+				new Text(theme.fg("success", `${theme.status.success} Successfully logged out of ${providerId}`), 1, 0),
+			);
+			this.ctx.chatContainer.addChild(
+				new Text(theme.fg("dim", `Credentials removed from ${getAgentDbPath()}`), 1, 0),
+			);
+			this.ctx.ui.requestRender();
+		} catch (error: unknown) {
+			this.ctx.showError(`Logout failed: ${error instanceof Error ? error.message : String(error)}`);
+		}
+	}
+
+	async showOAuthSelector(mode: "login" | "logout", providerId?: string): Promise<void> {
+		if (providerId) {
+			if (mode === "login") {
+				await this.#handleOAuthLogin(providerId);
+			} else {
+				await this.#handleOAuthLogout(providerId);
+			}
+			return;
+		}
+
 		if (mode === "logout") {
 			await this.#refreshOAuthProviderAuthState();
 			const oauthProviders = getOAuthProviders();
@@ -635,101 +727,13 @@ export class SelectorController {
 			selector = new OAuthSelectorComponent(
 				mode,
 				this.ctx.session.modelRegistry.authStorage,
-				async (providerId: string) => {
+				async (selectedProviderId: string) => {
 					selector.stopValidation();
 					done();
 					if (mode === "login") {
-						this.ctx.showStatus(`Logging in to ${providerId}…`);
-						const manualInput = this.ctx.oauthManualInput;
-						const useManualInput = CALLBACK_SERVER_PROVIDERS.has(providerId as OAuthProvider);
-						try {
-							await this.ctx.session.modelRegistry.authStorage.login(providerId as OAuthProvider, {
-								onAuth: (info: { url: string; instructions?: string }) => {
-									this.ctx.chatContainer.addChild(new Spacer(1));
-									this.ctx.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.ctx.chatContainer.addChild(new Text(theme.fg("accent", hyperlink), 1, 0));
-									if (info.instructions) {
-										this.ctx.chatContainer.addChild(new Spacer(1));
-										this.ctx.chatContainer.addChild(new Text(theme.fg("warning", info.instructions), 1, 0));
-									}
-									if (useManualInput) {
-										this.ctx.chatContainer.addChild(new Spacer(1));
-										this.ctx.chatContainer.addChild(new Text(theme.fg("dim", MANUAL_LOGIN_TIP), 1, 0));
-									}
-									this.ctx.ui.requestRender();
-									this.ctx.openInBrowser(info.url);
-								},
-								onPrompt: async (prompt: { message: string; placeholder?: string }) => {
-									this.ctx.chatContainer.addChild(new Spacer(1));
-									this.ctx.chatContainer.addChild(new Text(theme.fg("warning", prompt.message), 1, 0));
-									if (prompt.placeholder) {
-										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 = () => {
-											const code = codeInput.getValue();
-											this.ctx.editorContainer.clear();
-											this.ctx.editorContainer.addChild(this.ctx.editor);
-											this.ctx.ui.setFocus(this.ctx.editor);
-											resolve(code);
-										};
-										this.ctx.editorContainer.clear();
-										this.ctx.editorContainer.addChild(codeInput);
-										this.ctx.ui.setFocus(codeInput);
-										this.ctx.ui.requestRender();
-									});
-								},
-								onProgress: (message: string) => {
-									this.ctx.chatContainer.addChild(new Text(theme.fg("dim", message), 1, 0));
-									this.ctx.ui.requestRender();
-								},
-								onManualCodeInput: useManualInput ? () => manualInput.waitForInput(providerId) : undefined,
-							});
-							// Refresh models to pick up new baseUrl (e.g., github-copilot)
-							await this.ctx.session.modelRegistry.refresh();
-							this.ctx.chatContainer.addChild(new Spacer(1));
-							this.ctx.chatContainer.addChild(
-								new Text(
-									theme.fg("success", `${theme.status.success} Successfully logged in to ${providerId}`),
-									1,
-									0,
-								),
-							);
-							this.ctx.chatContainer.addChild(
-								new Text(theme.fg("dim", `Credentials saved to ${getAgentDbPath()}`), 1, 0),
-							);
-							this.ctx.ui.requestRender();
-						} catch (error: unknown) {
-							this.ctx.showError(`Login failed: ${error instanceof Error ? error.message : String(error)}`);
-						} finally {
-							if (useManualInput) {
-								manualInput.clear(`Manual OAuth input cleared for ${providerId}`);
-							}
-						}
+						await this.#handleOAuthLogin(selectedProviderId);
 					} else {
-						try {
-							await this.ctx.session.modelRegistry.authStorage.logout(providerId);
-							// Refresh models to reset baseUrl
-							await this.ctx.session.modelRegistry.refresh();
-							this.ctx.chatContainer.addChild(new Spacer(1));
-							this.ctx.chatContainer.addChild(
-								new Text(
-									theme.fg("success", `${theme.status.success} Successfully logged out of ${providerId}`),
-									1,
-									0,
-								),
-							);
-							this.ctx.chatContainer.addChild(
-								new Text(theme.fg("dim", `Credentials removed from ${getAgentDbPath()}`), 1, 0),
-							);
-							this.ctx.ui.requestRender();
-						} catch (error: unknown) {
-							this.ctx.showError(`Logout failed: ${error instanceof Error ? error.message : String(error)}`);
-						}
+						await this.#handleOAuthLogout(selectedProviderId);
 					}
 				},
 				() => {
@@ -738,9 +742,9 @@ export class SelectorController {
 					this.ctx.ui.requestRender();
 				},
 				{
-					validateAuth: async (providerId: string) => {
+					validateAuth: async (selectedProviderId: string) => {
 						const apiKey = await this.ctx.session.modelRegistry.getApiKeyForProvider(
-							providerId,
+							selectedProviderId,
 							this.ctx.session.sessionId,
 						);
 						return !!apiKey;

package/src/modes/interactive-mode.ts

@@ -949,7 +949,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		return this.#commandController.handleExportCommand(text);
 	}
 
-	handleDumpCommand(): Promise<void> {
+	handleDumpCommand() {
 		return this.#commandController.handleDumpCommand();
 	}
 
@@ -961,7 +961,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		return this.#commandController.handleShareCommand();
 	}
 
-	handleCopyCommand(): Promise<void> {
+	handleCopyCommand() {
 		return this.#commandController.handleCopyCommand();
 	}
 
@@ -1149,8 +1149,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		return this.#selectorController.handleResumeSession(sessionPath);
 	}
 
-	showOAuthSelector(mode: "login" | "logout"): Promise<void> {
-		return this.#selectorController.showOAuthSelector(mode);
+	showOAuthSelector(mode: "login" | "logout", providerId?: string): Promise<void> {
+		return this.#selectorController.showOAuthSelector(mode, providerId);
 	}
 
 	showHookConfirm(title: string, message: string): Promise<boolean> {

package/src/modes/types.ts

@@ -147,13 +147,13 @@ export interface InteractiveModeContext {
 	// Command handling
 	handleExportCommand(text: string): Promise<void>;
 	handleShareCommand(): Promise<void>;
-	handleCopyCommand(): Promise<void>;
+	handleCopyCommand(): void;
 	handleSessionCommand(): Promise<void>;
 	handleJobsCommand(): Promise<void>;
 	handleUsageCommand(reports?: UsageReport[] | null): Promise<void>;
 	handleChangelogCommand(showFull?: boolean): Promise<void>;
 	handleHotkeysCommand(): void;
-	handleDumpCommand(): Promise<void>;
+	handleDumpCommand(): void;
 	handleDebugTranscriptCommand(): Promise<void>;
 	handleClearCommand(): Promise<void>;
 	handleForkCommand(): Promise<void>;
@@ -180,7 +180,7 @@ export interface InteractiveModeContext {
 	showTreeSelector(): void;
 	showSessionSelector(): void;
 	handleResumeSession(sessionPath: string): Promise<void>;
-	showOAuthSelector(mode: "login" | "logout"): Promise<void>;
+	showOAuthSelector(mode: "login" | "logout", providerId?: string): Promise<void>;
 	showHookConfirm(title: string, message: string): Promise<boolean>;
 	showDebugSelector(): void;