@gajae-code/coding-agent 0.15.2 → 0.15.3

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

@@ -5,7 +5,7 @@
  */
 import * as path from "node:path";
 import { resolveMCPOAuthResourceOrigin, resolveMCPOAuthTokenEndpoint } from "@gajae-code/ai/core";
-import { Spacer, Text } from "@gajae-code/tui";
+import { matchesKey, type OverlayHandle, Spacer, Text } from "@gajae-code/tui";
 import { getMCPConfigPath, getProjectDir } from "@gajae-code/utils";
 import type { SourceMeta } from "../../capability/types";
 import { analyzeAuthError, discoverOAuthEndpoints, MCPManager } from "../../runtime-mcp";
@@ -18,7 +18,7 @@ import {
 	setServerDisabled,
 	updateMCPServer,
 } from "../../runtime-mcp/config-writer";
-import { canonicalMCPResourceUri, MCPOAuthFlow } from "../../runtime-mcp/oauth-flow";
+import { canonicalMCPResourceUri, type MCPOAuthConfig, MCPOAuthFlow } from "../../runtime-mcp/oauth-flow";
 import {
 	clearSmitheryApiKey,
 	createSmitheryCliAuthSession,
@@ -38,10 +38,13 @@ import type { MCPAuthConfig, MCPServerConfig } from "../../runtime-mcp/types";
 import type { OAuthCredential } from "../../session/auth-storage";
 import { shortenPath } from "../../tools/render-utils";
 import { openPath } from "../../utils/open";
+import { CommandPalette, type CommandPaletteEntry } from "../components/command-palette";
 import { MCPAddWizard } from "../components/runtime-mcp-add-wizard";
 import { parseCommandArgs } from "../shared";
+import { buildOAuthLoginAnchor, createOAuthUrlCopyLease } from "../shared/oauth-url-copy";
 import { theme } from "../theme/theme";
 import type { InteractiveModeContext } from "../types";
+import { matchesAppInterrupt } from "../utils/keybinding-matchers";
 import { groupBySource, parseRemoveArgs, readScopeFlag, showCommandMessage } from "./command-controller-shared";
 
 function withTimeout<T>(promise: Promise<T>, timeoutMs: number, message: string): Promise<T> {
@@ -70,6 +73,18 @@ interface OAuthFlowResult {
 type MCPAddScope = "user" | "project";
 type MCPAddTransport = "http" | "sse";
 
+type MCPAuthFlow = Pick<MCPOAuthFlow, "resolvedClientId" | "registeredClientSecret"> & {
+	login(): Promise<{ access: string; refresh: string; expires: number }>;
+};
+
+type MCPAuthCallbacks = {
+	onAuth(info: { url: string; instructions?: string }): void;
+	onProgress(message: string): void;
+	signal?: AbortSignal;
+};
+
+type MCPAuthFlowFactory = (config: MCPOAuthConfig, callbacks: MCPAuthCallbacks) => MCPAuthFlow;
+
 type MCPAddParsed = {
 	initialName?: string;
 	scope: MCPAddScope;
@@ -379,6 +394,46 @@ export class MCPCommandController {
 		return { keyword, scope, limit, semantic };
 	}
 
+	#openWizardOAuthCommandPalette(wizard: MCPAddWizard, keyData: string): boolean {
+		if (this.ctx.hasOAuthUrlForCopy?.() !== true) return false;
+		if (!this.ctx.keybindings.getKeys("app.commandPalette.open").some(key => matchesKey(keyData, key))) return false;
+
+		let overlayHandle: OverlayHandle | undefined;
+		const close = (): void => {
+			overlayHandle?.hide();
+			this.ctx.ui.setFocus(wizard);
+			this.ctx.ui.requestRender(true);
+		};
+		const copyEntry: CommandPaletteEntry = {
+			id: "action:app.clipboard.copyOAuthUrl",
+			label: "Copy OAuth URL",
+			description: "Copy the pending OAuth authorization URL",
+			keybinding: this.ctx.keybindings.getDisplayString("app.clipboard.copyOAuthUrl") || undefined,
+			handler: async () => {
+				await this.ctx.copyOAuthUrl();
+			},
+		};
+		const palette = new CommandPalette(
+			[copyEntry],
+			entry => {
+				close();
+				void Promise.resolve(entry.handler?.()).catch(error => {
+					this.ctx.showError(error instanceof Error ? error.message : String(error));
+				});
+			},
+			close,
+		);
+		overlayHandle = this.ctx.ui.showOverlay(palette, {
+			anchor: "bottom-center",
+			width: "100%",
+			maxHeight: "100%",
+			margin: 0,
+		});
+		this.ctx.ui.setFocus(palette);
+		this.ctx.ui.requestRender();
+		return true;
+	}
+
 	/**
 	 * Handle /mcp add - Launch interactive wizard or quick-add from args
 	 */
@@ -424,7 +479,7 @@ export class MCPCommandController {
 
 						try {
 							const oauthClientSecret = finalConfig.oauth?.clientSecret ?? "";
-							const oauthResult = await this.#handleOAuthFlow(
+							const oauthResult = await this.handleOAuthFlow(
 								finalConfig.url,
 								oauth.authorizationUrl,
 								oauth.tokenUrl,
@@ -475,7 +530,8 @@ export class MCPCommandController {
 		};
 
 		// Create wizard with OAuth handler and connection test
-		const wizard = new MCPAddWizard(
+		let wizard: MCPAddWizard;
+		wizard = new MCPAddWizard(
 			async (name: string, config: MCPServerConfig, scope: "user" | "project") => {
 				done();
 				await this.#handleWizardComplete(name, config, scope);
@@ -491,8 +547,23 @@ export class MCPCommandController {
 				clientId: string,
 				clientSecret: string,
 				scopes: string,
+				signal: AbortSignal,
 			) => {
-				return await this.#handleOAuthFlow(endpointUrl, authUrl, tokenUrl, clientId, clientSecret, scopes);
+				return await this.handleOAuthFlow(
+					endpointUrl,
+					authUrl,
+					tokenUrl,
+					clientId,
+					clientSecret,
+					scopes,
+					undefined,
+					undefined,
+					undefined,
+					undefined,
+					undefined,
+					undefined,
+					signal,
+				);
 			},
 			async (config: MCPServerConfig) => {
 				return await this.#handleTestConnection(config);
@@ -500,7 +571,15 @@ export class MCPCommandController {
 			() => {
 				this.ctx.ui.requestRender();
 			},
+			keyData => this.#openWizardOAuthCommandPalette(wizard, keyData),
 			parsed.initialName,
+			credentialId => this.#removeManagedOAuthCredential(credentialId),
+			(credentialId, error) =>
+				this.ctx.showError(
+					`Cancelled OAuth cleanup failed for ${credentialId}; the credential may remain stored. ${
+						error instanceof Error ? error.message : String(error)
+					}`,
+				),
 		);
 
 		// Replace editor with wizard
@@ -517,7 +596,8 @@ export class MCPCommandController {
 	/**
 	 * Handle OAuth authentication flow for MCP server
 	 */
-	async #handleOAuthFlow(
+	/** Internal OAuth entry point; injectable flow construction keeps controller lifecycle coverage deterministic. */
+	async handleOAuthFlow(
 		endpointUrl: string,
 		authUrl: string,
 		tokenUrl: string,
@@ -528,6 +608,9 @@ export class MCPCommandController {
 		callbackPath?: string,
 		redirectUri?: string,
 		oauthMeta?: { issuer?: string; issuerResponseIssSupported?: boolean },
+		createFlow: MCPAuthFlowFactory = (config, callbacks) => new MCPOAuthFlow(config, callbacks),
+		openBrowser: (url: string) => void = openPath,
+		signal?: AbortSignal,
 	): Promise<OAuthFlowResult> {
 		const authStorage = this.ctx.session.modelRegistry.authStorage;
 		let parsedAuthUrl: URL;
@@ -546,10 +629,31 @@ export class MCPCommandController {
 
 		const resolvedClientId = clientId.trim() || parsedAuthUrl.searchParams.get("client_id") || undefined;
 		const resolvedClientSecret = clientSecret.trim() || undefined;
+		const copyOAuthUrlKey = this.ctx.keybindings?.getDisplayString?.("app.clipboard.copyOAuthUrl") ?? "";
+		const copyOAuthUrlHint = copyOAuthUrlKey
+			? `Use ${copyOAuthUrlKey} or command palette → Copy OAuth URL to copy this exact URL:`
+			: "Use command palette → Copy OAuth URL to copy this exact URL:";
+		const oauthUrlCopyLease = createOAuthUrlCopyLease(this.ctx);
+		const timeoutController = new AbortController();
+		const userController = new AbortController();
+		const flowSignal = AbortSignal.any([
+			userController.signal,
+			timeoutController.signal,
+			...(signal ? [signal] : []),
+		]);
+		let flowFinished = false;
+		const cancellationUnsubscribe =
+			signal === undefined && typeof this.ctx.ui.addInputListener === "function"
+				? this.ctx.ui.addInputListener(data => {
+						if (data !== "\x03" && !matchesAppInterrupt(data)) return;
+						userController.abort(new Error("OAuth flow cancelled"));
+						return { consume: true };
+					})
+				: undefined;
 
 		try {
 			// Create OAuth flow
-			const flow = new MCPOAuthFlow(
+			const flow = createFlow(
 				{
 					authorizationUrl: authUrl,
 					tokenUrl: tokenEndpoint,
@@ -569,6 +673,10 @@ export class MCPCommandController {
 				},
 				{
 					onAuth: (info: { url: string; instructions?: string }) => {
+						if (flowFinished || flowSignal.aborted) return;
+						queueMicrotask(() => {
+							if (!flowFinished && !flowSignal.aborted) oauthUrlCopyLease.replace(info.url);
+						});
 						// Show auth URL prominently in chat
 						this.ctx.chatContainer.addChild(new Spacer(1));
 						this.ctx.chatContainer.addChild(
@@ -593,7 +701,7 @@ export class MCPCommandController {
 						this.ctx.ui.requestRender();
 						// Try to open browser automatically
 						try {
-							openPath(info.url);
+							openBrowser(info.url);
 
 							// Show confirmation that browser should open
 							this.ctx.chatContainer.addChild(new Spacer(1));
@@ -604,10 +712,10 @@ export class MCPCommandController {
 							this.ctx.chatContainer.addChild(
 								new Text(theme.fg("muted", "Alternative if browser did not open:"), 1, 0),
 							);
+							this.ctx.chatContainer.addChild(new Text(theme.fg("success", copyOAuthUrlHint), 1, 0));
 							this.ctx.chatContainer.addChild(
-								new Text(theme.fg("success", "Copy this exact URL in your browser:"), 1, 0),
+								new Text(theme.fg("accent", buildOAuthLoginAnchor(info.url)), 1, 0),
 							);
-							this.ctx.chatContainer.addChild(new Text(theme.fg("accent", info.url), 1, 0));
 							this.ctx.ui.requestRender();
 						} catch (_error) {
 							// Show error if browser doesn't open
@@ -615,10 +723,10 @@ export class MCPCommandController {
 							this.ctx.chatContainer.addChild(
 								new Text(theme.fg("warning", "→ Could not open browser automatically"), 1, 0),
 							);
+							this.ctx.chatContainer.addChild(new Text(theme.fg("success", copyOAuthUrlHint), 1, 0));
 							this.ctx.chatContainer.addChild(
-								new Text(theme.fg("success", "Copy this exact URL in your browser:"), 1, 0),
+								new Text(theme.fg("accent", buildOAuthLoginAnchor(info.url)), 1, 0),
 							);
-							this.ctx.chatContainer.addChild(new Text(theme.fg("accent", info.url), 1, 0));
 							this.ctx.ui.requestRender();
 						}
 					},
@@ -627,11 +735,26 @@ export class MCPCommandController {
 						this.ctx.chatContainer.addChild(new Text(theme.fg("muted", message), 1, 0));
 						this.ctx.ui.requestRender();
 					},
+					signal: flowSignal,
 				},
 			);
 
 			// Execute OAuth flow with 5 minute timeout
-			const credentials = await withTimeout(flow.login(), 5 * 60 * 1000, "OAuth flow timed out after 5 minutes");
+			const { promise: timeoutPromise, reject: rejectTimeout } = Promise.withResolvers<never>();
+			const timeoutId = setTimeout(
+				() => {
+					timeoutController.abort(new Error("OAuth flow timed out after 5 minutes"));
+					rejectTimeout(new Error("OAuth flow timed out after 5 minutes"));
+				},
+				5 * 60 * 1000,
+			);
+			let credentials: { access: string; refresh: string; expires: number };
+			try {
+				credentials = await Promise.race([flow.login(), timeoutPromise]);
+			} finally {
+				flowFinished = true;
+				clearTimeout(timeoutId);
+			}
 
 			this.ctx.chatContainer.addChild(new Spacer(1));
 			this.ctx.chatContainer.addChild(new Text(theme.fg("success", "✓ Authorization completed in browser."), 1, 0));
@@ -641,6 +764,7 @@ export class MCPCommandController {
 			const credentialId = `mcp_oauth_${Date.now()}_${Math.random().toString(36).slice(2, 11)}`;
 
 			// Store credentials in auth storage
+			flowSignal.throwIfAborted();
 			const oauthCredential: OAuthCredential = {
 				type: "oauth",
 				...credentials,
@@ -652,6 +776,10 @@ export class MCPCommandController {
 
 			// Store under a synthetic provider name
 			await authStorage.set(credentialId, oauthCredential);
+			if (flowSignal.aborted) {
+				await authStorage.remove(credentialId);
+				flowSignal.throwIfAborted();
+			}
 
 			return {
 				credentialId,
@@ -674,6 +802,9 @@ export class MCPCommandController {
 			} else {
 				throw new Error(`OAuth authentication failed: ${errorMsg}`);
 			}
+		} finally {
+			oauthUrlCopyLease.release();
+			cancellationUnsubscribe?.();
 		}
 	}
 
@@ -1363,7 +1494,7 @@ export class MCPCommandController {
 
 			this.#showMessage(["", theme.fg("muted", `Reauthorizing "${name}"...`), ""].join("\n"));
 
-			const oauthResult = await this.#handleOAuthFlow(
+			const oauthResult = await this.handleOAuthFlow(
 				found.config.url,
 				oauth.authorizationUrl,
 				oauth.tokenUrl,
@@ -1705,6 +1836,14 @@ export class MCPCommandController {
 
 	async #handleSmitheryBrowserLogin(): Promise<boolean> {
 		const session = await createSmitheryCliAuthSession();
+		const oauthUrlCopyLease = createOAuthUrlCopyLease(this.ctx);
+		const abortController = new AbortController();
+		const interruptUnsubscribe = this.ctx.ui.addInputListener?.(data => {
+			if (data !== "\x03" && !matchesAppInterrupt(data)) return;
+			abortController.abort(new Error("Smithery authorization cancelled."));
+			return { consume: true };
+		});
+		oauthUrlCopyLease.replace(session.authUrl);
 		const fallbackLoginUrl = getSmitheryLoginUrl();
 		this.#showMessage(
 			[
@@ -1712,7 +1851,7 @@ export class MCPCommandController {
 				theme.bold("Smithery Login"),
 				theme.fg("muted", "Browser authorization started. Complete auth in your browser."),
 				theme.fg("dim", "Authorize URL:"),
-				theme.fg("accent", session.authUrl),
+				theme.fg("accent", buildOAuthLoginAnchor(session.authUrl)),
 				theme.fg("dim", `Fallback: ${fallbackLoginUrl}`),
 				"",
 			].join("\n"),
@@ -1723,11 +1862,16 @@ export class MCPCommandController {
 			// URL is already shown above.
 		}
 
-		const apiKey = await this.#waitForSmitheryCliApiKey(session.sessionId, new AbortController().signal);
-		await this.#validateSmitheryApiKey(apiKey);
-		await saveSmitheryApiKey(apiKey);
-		this.ctx.showStatus("Smithery API key saved.");
-		return true;
+		try {
+			const apiKey = await this.#waitForSmitheryCliApiKey(session.sessionId, abortController.signal);
+			await this.#validateSmitheryApiKey(apiKey);
+			await saveSmitheryApiKey(apiKey);
+			this.ctx.showStatus("Smithery API key saved.");
+			return true;
+		} finally {
+			oauthUrlCopyLease.release();
+			interruptUnsubscribe?.();
+		}
 	}
 
 	async #promptSmitheryLogin(reason: string): Promise<boolean> {

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

@@ -213,6 +213,7 @@ import { TreeSelectorComponent } from "../components/tree-selector";
 import { UserMessageSelectorComponent } from "../components/user-message-selector";
 import type { JobsObserver } from "../jobs-observer";
 import type { SessionObserverRegistry } from "../session-observer-registry";
+import { buildOAuthLoginAnchor, createOAuthUrlCopyLease } from "../shared/oauth-url-copy";
 import type { TasksAggregator } from "../tasks-aggregator";
 import type { TranscriptItemRegistry } from "../transcript-item-registry";
 import { acquireResumeProgressLease, type ResumeProgressLease } from "../utils/ui-helpers";
@@ -3475,6 +3476,11 @@ export class SelectorController {
 		this.ctx.showStatus(`Logging in to ${providerId}…`);
 		const manualInput = this.ctx.oauthManualInput;
 		const useManualInput = CALLBACK_SERVER_PROVIDERS.has(providerId as OAuthProvider);
+		const copyOAuthUrlKey = this.ctx.keybindings?.getDisplayString?.("app.clipboard.copyOAuthUrl") ?? "";
+		const copyOAuthUrlHint = copyOAuthUrlKey
+			? `${copyOAuthUrlKey} or command palette → Copy OAuth URL copies the URL exactly.`
+			: "Command palette → Copy OAuth URL copies the URL exactly.";
+		const oauthUrlCopyLease = createOAuthUrlCopyLease(this.ctx);
 		if (providerId === "opencodex") {
 			this.ctx.showStatus("Checking the local OpenCodex proxy…");
 		}
@@ -3483,10 +3489,12 @@ export class SelectorController {
 				providerId as OAuthProvider,
 				{
 					onAuth: (info: { url: string; instructions?: string }) => {
+						oauthUrlCopyLease.replace(info.url);
 						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("dim", buildOAuthLoginAnchor(info.url)), 1, 0));
+						const hyperlink = buildOAuthLoginAnchor(info.url, "Click here to login");
 						this.ctx.chatContainer.addChild(new Text(theme.fg("accent", hyperlink), 1, 0));
+						this.ctx.chatContainer.addChild(new Text(theme.fg("muted", copyOAuthUrlHint), 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));
@@ -3551,6 +3559,7 @@ export class SelectorController {
 		} catch (error: unknown) {
 			this.ctx.showError(`Login failed: ${error instanceof Error ? error.message : String(error)}`);
 		} finally {
+			oauthUrlCopyLease.release();
 			if (useManualInput) {
 				manualInput.clear(`Manual OAuth input cleared for ${providerId}`);
 			}

package/src/modes/interactive-mode.ts

@@ -431,6 +431,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	hookEditor: HookEditorComponent | undefined = undefined;
 	lastStatusSpacer: Spacer | undefined = undefined;
 	lastStatusText: Text | undefined = undefined;
+	#oauthUrlForCopyLeases: Array<{ token: symbol; url: string }> = [];
 	fileSlashCommands: Set<string> = new Set();
 	skillCommands: Map<string, Skill> = new Map();
 	oauthManualInput: OAuthManualInputManager = new OAuthManualInputManager();
@@ -442,6 +443,37 @@ export class InteractiveMode implements InteractiveModeContext {
 	#cleanupUnsubscribe?: () => void;
 	#itermPetTransport?: ItermPetTransport;
 
+	waitForAgentEnd(): { promise: Promise<void>; dispose: () => void } {
+		const deferred = Promise.withResolvers<void>();
+		let disposed = false;
+		let agentStarted = false;
+		let unsubscribe: (() => void) | undefined;
+		const dispose = () => {
+			if (disposed) return;
+			disposed = true;
+			unsubscribe?.();
+			unsubscribe = undefined;
+		};
+		const listener = (event: AgentSessionEvent) => {
+			if (disposed) return;
+			if (event.type === "agent_start") {
+				agentStarted = true;
+				return;
+			}
+			if (event.type !== "agent_end" || !agentStarted) return;
+			dispose();
+			deferred.resolve();
+		};
+
+		const subscribedUnsubscribe = this.session.subscribe(listener);
+		unsubscribe = subscribedUnsubscribe;
+		if (disposed) {
+			subscribedUnsubscribe();
+		}
+
+		return { promise: deferred.promise, dispose };
+	}
+
 	/**
 	 * Pet-unavailable warning text. The iTerm transport reason is parenthesized
 	 * only when a transport actually reported one; non-iTerm terminals and a
@@ -808,6 +840,7 @@ export class InteractiveMode implements InteractiveModeContext {
 					rightGutterWidth: COMPOSER_RIGHT_GUTTER_WIDTH,
 					collapseChangelog: settings.get("collapseChangelog"),
 					keyDisplayContext: this.#keyDisplayContext,
+					reducedMotion: settings.get("startup.skipLogoAnimation") === true,
 				},
 			);
 
@@ -1147,9 +1180,16 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 
 	async getUserInput(): Promise<SubmittedUserInput> {
+		if (this.#stopped || this.#isShuttingDown) {
+			throw Object.assign(new Error("Interactive mode stopped"), { code: "cancelled" });
+		}
 		if (this.session.getGoalModeState()?.mode === "exiting") {
 			await this.#goalModeController.beforeGetUserInput();
 		}
+		const deferredSubmission = this.#inputController.takeDeferredSubmission();
+		if (deferredSubmission) {
+			return deferredSubmission;
+		}
 		const { promise, resolve, reject } = Promise.withResolvers<SubmittedUserInput>();
 		let unsubscribeStop = () => {};
 		unsubscribeStop = this.onStop(() => {
@@ -1584,6 +1624,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	stop(): void {
 		const wasInitialized = this.isInitialized;
 		this.#stopped = true;
+		this.#inputController.discardDeferredSubmission();
 		for (const listener of this.#stopListeners) {
 			try {
 				listener();
@@ -1647,6 +1688,16 @@ export class InteractiveMode implements InteractiveModeContext {
 		// `/btw` owns the shared composer while its panel is open. Never persist a
 		// side-chat draft or pending side-chat images into the main-session draft.
 		const hadActiveBtw = this.#btwController.hasOpenPanel();
+		const deferredSubmission = this.#inputController.takeDeferredSubmissionForShutdown();
+		if (
+			deferredSubmission &&
+			!hadActiveBtw &&
+			this.editor.getText().length === 0 &&
+			this.pendingImages.length === 0
+		) {
+			this.editor.setText(deferredSubmission.text);
+			this.pendingImages = deferredSubmission.images ? [...deferredSubmission.images] : [];
+		}
 		const draftText = selectShutdownDraft(this.editor.getText(), hadActiveBtw);
 		if (hadActiveBtw) this.pendingImages = [];
 		this.#btwController.dispose();
@@ -1788,6 +1839,42 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#uiHelpers.showWarning(message);
 	}
 
+	beginOAuthUrlForCopy(url: string): () => void {
+		const token = Symbol("oauth-url-copy");
+		this.#oauthUrlForCopyLeases.push({ token, url });
+		return () => {
+			const index = this.#oauthUrlForCopyLeases.findIndex(lease => lease.token === token);
+			if (index === -1) return;
+			this.#oauthUrlForCopyLeases.splice(index, 1);
+		};
+	}
+
+	hasOAuthUrlForCopy(): boolean {
+		return this.#oauthUrlForCopyLeases.length > 0;
+	}
+
+	async copyOAuthUrl(): Promise<void> {
+		const pending = this.#oauthUrlForCopyLeases.at(-1);
+		if (pending === undefined) {
+			this.showStatus("No OAuth URL is available to copy.");
+			return;
+		}
+		try {
+			const outcome = await copyToClipboard(pending.url);
+			if (outcome.status === "verified") {
+				this.showStatus("OAuth URL copied to clipboard.");
+			} else if (outcome.reason.includes("failed") || outcome.reason.includes("rejected")) {
+				this.showWarning(
+					`OAuth URL delivery was not confirmed (${outcome.transport}). Use the visible link or copy it manually.`,
+				);
+			} else {
+				this.showStatus(`OAuth URL delivery attempted via ${outcome.transport}; verify it arrived before pasting.`);
+			}
+		} catch {
+			this.showWarning("Failed to copy OAuth URL to clipboard.");
+		}
+	}
+
 	#handleLspStartupEvent(event: LspStartupEvent): void {
 		this.#updateWelcomeLspServers();
 
@@ -1864,7 +1951,7 @@ export class InteractiveMode implements InteractiveModeContext {
 				workingMessage => renderWorkingMessage(workingMessage, this.#getWorkingMessageAccent()),
 				message,
 				getSymbolTheme().spinnerFrames,
-				{ timeDependentColor: true },
+				{ timeDependentColor: true, renderScope: "layout" },
 			);
 			this.statusContainer.addChild(this.loadingAnimation);
 		}

package/src/modes/shared/oauth-url-copy.ts

@@ -0,0 +1,33 @@
+import { isHyperlinkEnabled } from "../../tui/hyperlink";
+
+export interface OAuthUrlCopyLeaseHost {
+	beginOAuthUrlForCopy(url: string): () => void;
+}
+
+export interface OAuthUrlCopyLease {
+	replace(url: string): void;
+	release(): void;
+}
+
+export function buildOAuthLoginAnchor(url: string, label: string = url, hyperlinks = isHyperlinkEnabled()): string {
+	return hyperlinks ? `\x1b]8;;${url}\x07${label}\x1b]8;;\x07` : label;
+}
+
+export function createOAuthUrlCopyLease(host: OAuthUrlCopyLeaseHost): OAuthUrlCopyLease {
+	let releaseCurrent: (() => void) | undefined;
+	let released = false;
+
+	return {
+		replace(url: string): void {
+			if (released) return;
+			releaseCurrent?.();
+			releaseCurrent = host.beginOAuthUrlForCopy(url);
+		},
+		release(): void {
+			if (released) return;
+			released = true;
+			releaseCurrent?.();
+			releaseCurrent = undefined;
+		},
+	};
+}

package/src/modes/types.ts

@@ -270,6 +270,9 @@ export interface InteractiveModeContext {
 	showStatus(message: string, options?: { dim?: boolean }): void;
 	showError(message: string): void;
 	showWarning(message: string): void;
+	beginOAuthUrlForCopy(url: string): () => void;
+	hasOAuthUrlForCopy(): boolean;
+	copyOAuthUrl(): Promise<void>;
 	notifyConfigChanged?: () => Promise<void> | void;
 	showNewVersionNotification(newVersion: string): void;
 	clearEditor(): void;

package/src/modes/ui-language.ts

@@ -1,4 +1,4 @@
-export const UI_LANGUAGES = ["en", "ko"] as const;
+export const UI_LANGUAGES = ["en", "ko", "ja"] as const;
 
 export type UiLanguage = (typeof UI_LANGUAGES)[number];
 
@@ -23,6 +23,7 @@ const ENGLISH_STRINGS = {
 	"settings.language.description": "Language for human-facing interactive UI text",
 	"settings.language.english": "English",
 	"settings.language.korean": "Korean (한국어)",
+	"settings.language.japanese": "Japanese (日本語)",
 	"language.current": "Current UI language:",
 	"language.changed": "UI language changed to",
 	"language.unknown": "Unknown language",
@@ -51,24 +52,59 @@ const KOREAN_STRINGS: Record<UiStringKey, string> = {
 	"settings.language.description": "사람이 읽는 대화형 UI 텍스트의 언어",
 	"settings.language.english": "English",
 	"settings.language.korean": "한국어",
+	"settings.language.japanese": "日本語",
 	"language.current": "현재 UI 언어:",
 	"language.changed": "UI 언어를 다음으로 변경했습니다:",
 	"language.unknown": "알 수 없는 언어",
 };
 
+const JAPANESE_STRINGS: Record<UiStringKey, string> = {
+	"settings.title": "設定",
+	"settings.navigationHint": "(Tab キーで切り替え)",
+	"settings.selectHint": "  Enter: 選択 · Esc: 戻る",
+	"settings.preview": "プレビュー:",
+	"settings.tab.appearance": "外観",
+	"settings.tab.model": "モデル",
+	"settings.tab.interaction": "操作",
+	"settings.tab.context": "コンテキスト",
+	"settings.tab.memory": "メモリ",
+	"settings.tab.editing": "編集",
+	"settings.tab.tools": "ツール",
+	"settings.tab.tasks": "タスク",
+	"settings.tab.providers": "プロバイダー",
+	"settings.tab.notifications": "通知",
+	"settings.tab.plugins": "プラグイン",
+	"settings.tab.gjcBundles": "GJC バンドル",
+	"settings.language.label": "言語",
+	"settings.language.description": "対話型 UI テキストに使う言語",
+	"settings.language.english": "English",
+	"settings.language.korean": "한국어",
+	"settings.language.japanese": "日本語",
+	"language.current": "現在の UI 言語:",
+	"language.changed": "UI 言語を次に変更しました:",
+	"language.unknown": "不明な言語",
+};
+
+const STRINGS: Record<UiLanguage, Record<UiStringKey, string>> = {
+	en: ENGLISH_STRINGS,
+	ko: KOREAN_STRINGS,
+	ja: JAPANESE_STRINGS,
+};
+
 /** User selection is authoritative; invalid or unavailable values deterministically fall back to English. */
 export function resolveUiLanguage(value: unknown): UiLanguage {
-	return value === "ko" ? "ko" : "en";
+	return value === "ko" || value === "ja" ? value : "en";
 }
 
 export function uiString(language: unknown, key: UiStringKey): string {
-	return resolveUiLanguage(language) === "ko" ? KOREAN_STRINGS[key] : ENGLISH_STRINGS[key];
+	return STRINGS[resolveUiLanguage(language)][key];
 }
 
 /** Endonym shown by `/language` and the language submenu. */
 export const UI_LANGUAGE_LABELS: Record<UiLanguage, string> = {
 	en: "English",
 	ko: "한국어",
+	ja: "日本語",
 };
 
 /** Spellings accepted by `/language`; the canonical codes stay authoritative. */
@@ -81,6 +117,11 @@ const UI_LANGUAGE_ALIASES: Readonly<Record<string, UiLanguage>> = {
 	kor: "ko",
 	korean: "ko",
 	한국어: "ko",
+	ja: "ja",
+	jp: "ja",
+	jpn: "ja",
+	japanese: "ja",
+	日本語: "ja",
 };
 
 export function parseUiLanguage(value: string): UiLanguage | undefined {