@sayknow-cli/coding-agent 0.5.2 → 0.5.8

package/src/lsp/client.ts

@@ -89,12 +89,10 @@ function deleteClientLock(key: string, clientPromise: Promise<LspClient>): void
 	}
 }
 
-function evictDeadCachedClient(key: string, client: LspClient): void {
+function evictDeadCachedClient(client: LspClient): void {
 	if (client.proc.exitCode === null && !client.proc.killed && !client.owner?.disposed && !killedClients.has(client))
 		return;
-	deleteCachedClient(key, client);
-	client.resolveProjectLoaded();
-	rejectPendingRequests(client, new Error("LSP server exited"));
+	terminalizeTransport(client, new Error("LSP server exited"));
 }
 
 function terminalizeTransport(client: LspClient, cause: unknown): Error {
@@ -275,7 +273,9 @@ async function writeMessage(
 	if (terminalError) throw terminalError;
 
 	try {
-		client.proc.stdin.write(`Content-Length: ${Buffer.byteLength(content, "utf-8")}\r\n\r\n${content}`);
+		await Promise.resolve(
+			client.proc.stdin.write(`Content-Length: ${Buffer.byteLength(content, "utf-8")}\r\n\r\n${content}`),
+		);
 		await client.proc.stdin.flush();
 	} catch (error) {
 		if (isKnownSinkPeerClosedError(error)) {
@@ -302,7 +302,7 @@ function queueWriteMessage(
  * Start background message reader for a client.
  * Routes responses to pending requests and handles notifications.
  */
-async function startMessageReader(client: LspClient): Promise<void> {
+export async function startMessageReader(client: LspClient): Promise<void> {
 	if (client.isReading) return;
 	client.isReading = true;
 
@@ -311,7 +311,10 @@ async function startMessageReader(client: LspClient): Promise<void> {
 	try {
 		while (true) {
 			const { done, value } = await reader.read();
-			if (done) break;
+			if (done) {
+				terminalizeTransport(client, new Error("LSP stdout closed"));
+				break;
+			}
 
 			// Atomically update buffer before processing
 			const currentBuffer: Buffer = Buffer.concat([client.messageBuffer, value]);
@@ -368,11 +371,7 @@ async function startMessageReader(client: LspClient): Promise<void> {
 			client.messageBuffer = workingBuffer;
 		}
 	} catch (err) {
-		// Connection closed or error - reject all pending requests
-		for (const pending of Array.from(client.pendingRequests.values())) {
-			pending.reject(new Error(`LSP connection closed: ${err}`));
-		}
-		client.pendingRequests.clear();
+		terminalizeTransport(client, err);
 	} finally {
 		reader.releaseLock();
 		client.isReading = false;
@@ -488,7 +487,7 @@ export async function getOrCreateClient(config: ServerConfig, cwd: string, initT
 	// Check if client already exists
 	const existingClient = clients.get(key);
 	if (existingClient) {
-		evictDeadCachedClient(key, existingClient);
+		evictDeadCachedClient(existingClient);
 		if (clients.has(key)) {
 			existingClient.lastActivity = Date.now();
 			return existingClient;
@@ -558,13 +557,10 @@ export async function getOrCreateClient(config: ServerConfig, cwd: string, initT
 		};
 		clients.set(key, client);
 
-		// Register crash recovery - remove client on process exit
+		// Register crash recovery and durably terminalize retained references on exit.
 		proc.exited.then(async () => {
-			deleteCachedClient(key, client);
 			deleteClientLock(key, clientPromise);
-			client.resolveProjectLoaded();
-
-			// Reject any pending requests — the server is gone, they will never complete.
+			let error = new Error(`LSP server exited unexpectedly (code ${proc.exitCode})`);
 			if (client.pendingRequests.size > 0) {
 				// Strip informational log lines (e.g. marksman's [INF]/[DBG] prefix)
 				// — they are startup noise, not actionable errors.
@@ -588,16 +584,13 @@ export async function getOrCreateClient(config: ServerConfig, cwd: string, initT
 				);
 				const diagnosticSuffix = crashNotice ? `\n${crashNotice}` : "";
 				const code = proc.exitCode;
-				const err = new Error(
+				error = new Error(
 					stderr
 						? `LSP server exited (code ${code}): ${stderr}${diagnosticSuffix}`
 						: `LSP server exited unexpectedly (code ${code})${diagnosticSuffix}`,
 				);
-				for (const pending of client.pendingRequests.values()) {
-					pending.reject(err);
-				}
-				client.pendingRequests.clear();
 			}
+			terminalizeTransport(client, error);
 		});
 
 		// Start background message reader
@@ -980,12 +973,7 @@ export async function sendNotification(client: LspClient, method: string, params
 	};
 
 	client.lastActivity = Date.now();
-	try {
-		await queueWriteMessage(client, notification);
-	} catch (error) {
-		if (transportClosedErrors.get(client) === error) return;
-		throw error;
-	}
+	await queueWriteMessage(client, notification);
 }
 
 /**

package/src/modes/action-registry.ts

@@ -39,6 +39,7 @@ export const APP_ACTION_METADATA: readonly ActionMetadata[] = [
 	action("app.model.select", "Select model", "Model", ["composer"]),
 	action("app.model.selectTemporary", "Select temporary model", "Model", ["composer"]),
 	action("app.tools.expand", "Toggle tool expansion", "Tools", ["composer"]),
+	action("app.todo.toggle", "Toggle todo expansion", "Tasks", ["composer"]),
 	action("app.tool.backgroundFold", "Fold foreground tool", "Tools", ["composer"]),
 	action("app.editor.external", "Open external editor", "Editor", ["composer"]),
 	action("app.message.followUp", "Send follow-up", "Messages", ["composer"]),
@@ -47,6 +48,7 @@ export const APP_ACTION_METADATA: readonly ActionMetadata[] = [
 	action("app.clipboard.pasteImage", "Paste image", "Clipboard", ["composer"]),
 	action("app.clipboard.copyLine", "Copy line", "Clipboard", ["composer"]),
 	action("app.clipboard.copyPrompt", "Copy prompt", "Clipboard", ["composer"]),
+	action("app.oauth.copyUrl", "Copy OAuth authorization URL", "OAuth", ["composer"]),
 	action("app.session.new", "New session", "Session", ["composer"]),
 	action("app.session.tree", "Session tree", "Session", ["composer"]),
 	action("app.session.fork", "Branch from message", "Session", ["composer"]),

package/src/modes/components/welcome.ts

@@ -25,6 +25,7 @@ export interface WelcomeComponentOptions {
 	collapseChangelog?: boolean;
 	buildLabel?: string;
 	keyDisplayContext?: KeyDisplayContext;
+	skipLogoAnimation?: boolean;
 }
 
 const WELCOME_STATIC_RIGHT_ROWS_EXCLUDING_DYNAMIC_SECTIONS = 15;
@@ -75,6 +76,10 @@ export class WelcomeComponent implements Component {
 	 */
 	playIntro(requestRender: () => void): void {
 		this.#stopAnimation();
+		if (this.options.skipLogoAnimation) {
+			requestRender();
+			return;
+		}
 		this.#animStart = performance.now();
 		requestRender();
 		this.#animTimer = setInterval(() => {

package/src/modes/controllers/goal-mode-controller.ts

@@ -264,12 +264,15 @@ export class GoalModeController {
 			if (this.#enabled || this.#paused) this.ctx.modeGate.enter("goal");
 			if (restored?.goal) {
 				this.#previousTools = this.ctx.session.getActiveToolNames();
-				await this.ctx.session.setActiveToolsByName([...new Set([...this.#previousTools, "goal"])]);
+				if (!this.ctx.session.hasExplicitlyDisabledTools()) {
+					await this.ctx.session.setActiveToolsByName([...new Set([...this.#previousTools, "goal"])]);
+				}
 			}
 			this.#updateStatus();
 			return true;
 		}
 		if (recoveryHydration) return false;
+		if (this.ctx.session.hasExplicitlyDisabledTools()) return false;
 		const pendingGoal = goalEnabled
 			? await consumePendingGoalModeRequest(this.ctx.sessionManager.getCwd(), this.ctx.sessionManager.getSessionId())
 			: null;
@@ -321,7 +324,9 @@ export class GoalModeController {
 					objective: options.objective ?? "",
 					provenance: options.provenance,
 				});
-		await this.ctx.session.setActiveToolsByName([...new Set([...this.#previousTools, "goal"])]);
+		if (!this.ctx.session.hasExplicitlyDisabledTools()) {
+			await this.ctx.session.setActiveToolsByName([...new Set([...this.#previousTools, "goal"])]);
+		}
 		this.ctx.session.setGoalModeState(state);
 		this.#enabled = true;
 		this.#resetContinuationSuppression();

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

@@ -91,6 +91,7 @@ export class InputController {
 			"app.model.select": () => this.ctx.showModelSelector(),
 			"app.model.selectTemporary": () => this.ctx.showModelSelector({ temporaryOnly: true }),
 			"app.tools.expand": () => this.toggleToolOutputExpansion(),
+			"app.todo.toggle": () => this.ctx.toggleTodoExpansion(),
 			"app.tool.backgroundFold": () => {
 				this.handleForegroundToolBackgroundFold();
 			},
@@ -103,6 +104,7 @@ export class InputController {
 			},
 			"app.clipboard.copyLine": () => this.handleCopyCurrentLine(),
 			"app.clipboard.copyPrompt": () => this.handleCopyPrompt(),
+			"app.oauth.copyUrl": () => this.ctx.copyOAuthAuthorizationUrl(),
 			"app.session.new": async () => {
 				await this.ctx.handleClearCommand();
 			},
@@ -153,6 +155,8 @@ export class InputController {
 				return this.ctx.session.getRoleModelCycleCandidateCount() > 1;
 			case "app.tools.expand":
 				return this.ctx.chatContainer.children.some(isExpandable);
+			case "app.todo.toggle":
+				return this.ctx.todoPhases.some(phase => phase.tasks.length > 0);
 			case "app.tool.backgroundFold":
 				return Boolean(this.ctx.session.hasForegroundBashBackgroundRequestHandler?.());
 			case "app.editor.external":
@@ -178,6 +182,8 @@ export class InputController {
 				);
 			case "app.clipboard.copyPrompt":
 				return this.ctx.editor.getText().length > 0;
+			case "app.oauth.copyUrl":
+				return this.ctx.hasOAuthAuthorizationUrl();
 			case "app.session.tree":
 			case "app.session.fork":
 				return this.ctx.session.messages.length > 0;
@@ -258,14 +264,20 @@ export class InputController {
 	 *  so abort cleanup going idle cannot turn the second Esc into an idle action. */
 	#steerConsumePending = false;
 	#commandPaletteActions = new Map<AppKeybinding, CommandPaletteAction>();
+	readonly #availabilityGatedPaletteActions = new Set<AppKeybinding>();
 	#paletteCommandInFlight = false;
 
-	#registerCommandPaletteAction(action: AppKeybinding, handler: () => void | Promise<void>): void {
+	#registerCommandPaletteAction(
+		action: AppKeybinding,
+		handler: () => void | Promise<void>,
+		availabilityGated = false,
+	): void {
 		this.#commandPaletteActions.set(action, {
 			id: action,
 			label: KEYBINDINGS[action].description,
 			handler,
 		});
+		if (availabilityGated) this.#availabilityGatedPaletteActions.add(action);
 	}
 
 	#globalInterruptUnsubscribe: (() => void) | undefined;
@@ -623,14 +635,12 @@ export class InputController {
 		this.ctx.editor.setActionKeys("app.tools.expand", this.ctx.keybindings.getKeys("app.tools.expand"));
 		this.ctx.editor.onExpandTools = () => this.#executeAction("app.tools.expand");
 		this.#registerCommandPaletteAction("app.tools.expand", expandTools);
-		const dequeue = () => this.handleDequeue();
 		this.ctx.editor.setActionKeys("app.message.dequeue", this.ctx.keybindings.getKeys("app.message.dequeue"));
 		this.ctx.editor.onDequeue = () => this.#executeAction("app.message.dequeue");
-		this.#registerCommandPaletteAction("app.message.dequeue", dequeue);
-		const queue = () => this.handleQueueSubmit();
+		this.#registerCommandPaletteAction("app.message.dequeue", () => this.#executeAction("app.message.dequeue"), true);
 		this.ctx.editor.setActionKeys("app.message.queue", this.ctx.keybindings.getKeys("app.message.queue"));
 		this.ctx.editor.onQueue = () => this.#executeAction("app.message.queue");
-		this.#registerCommandPaletteAction("app.message.queue", queue);
+		this.#registerCommandPaletteAction("app.message.queue", () => this.#executeAction("app.message.queue"), true);
 
 		this.ctx.editor.onViewportPageScroll = direction => this.ctx.ui.scrollViewportPages(direction);
 		this.ctx.editor.onViewportFollowLive = () => {
@@ -699,6 +709,11 @@ export class InputController {
 				return true;
 			});
 		}
+		this.#registerCommandPaletteAction(
+			"app.message.followUp",
+			() => this.#executeAction("app.message.followUp"),
+			true,
+		);
 		for (const key of this.ctx.keybindings.getKeys("app.message.followUp")) {
 			this.ctx.editor.setCustomKeyHandler(key, () => {
 				if (!this.actionRegistry.isAvailable("app.message.followUp")) return false;
@@ -706,6 +721,46 @@ export class InputController {
 				return true;
 			});
 		}
+		this.#registerCommandPaletteAction(
+			"app.transcript.prevTurn",
+			() => this.#executeAction("app.transcript.prevTurn"),
+			true,
+		);
+		for (const key of this.ctx.keybindings.getKeys("app.transcript.prevTurn")) {
+			this.ctx.editor.setCustomKeyHandler(key, () => {
+				if (!this.actionRegistry.isAvailable("app.transcript.prevTurn")) return false;
+				this.#executeAction("app.transcript.prevTurn");
+				return true;
+			});
+		}
+		this.#registerCommandPaletteAction(
+			"app.transcript.nextTurn",
+			() => this.#executeAction("app.transcript.nextTurn"),
+			true,
+		);
+		for (const key of this.ctx.keybindings.getKeys("app.transcript.nextTurn")) {
+			this.ctx.editor.setCustomKeyHandler(key, () => {
+				if (!this.actionRegistry.isAvailable("app.transcript.nextTurn")) return false;
+				this.#executeAction("app.transcript.nextTurn");
+				return true;
+			});
+		}
+		this.#registerCommandPaletteAction("app.message.sendNow", () => this.#executeAction("app.message.sendNow"), true);
+		for (const key of this.ctx.keybindings.getKeys("app.message.sendNow")) {
+			this.ctx.editor.setCustomKeyHandler(key, () => {
+				if (!this.actionRegistry.isAvailable("app.message.sendNow")) return false;
+				this.#executeAction("app.message.sendNow");
+				return true;
+			});
+		}
+		this.#registerCommandPaletteAction("app.todo.toggle", () => this.#executeAction("app.todo.toggle"), true);
+		for (const key of this.ctx.keybindings.getKeys("app.todo.toggle")) {
+			this.ctx.editor.setCustomKeyHandler(key, () => {
+				if (!this.actionRegistry.isAvailable("app.todo.toggle")) return false;
+				this.#executeAction("app.todo.toggle");
+				return true;
+			});
+		}
 		for (const key of this.ctx.keybindings.getKeys("app.stt.toggle")) {
 			this.ctx.editor.setCustomKeyHandler(key, () => {
 				this.#executeAction("app.stt.toggle");
@@ -717,6 +772,14 @@ export class InputController {
 				this.#executeAction("app.clipboard.copyLine");
 			});
 		}
+		this.#registerCommandPaletteAction("app.oauth.copyUrl", () => this.#executeAction("app.oauth.copyUrl"), true);
+		for (const key of this.ctx.keybindings.getKeys("app.oauth.copyUrl")) {
+			this.ctx.editor.setCustomKeyHandler(key, () => {
+				if (!this.actionRegistry.isAvailable("app.oauth.copyUrl")) return false;
+				this.#executeAction("app.oauth.copyUrl");
+				return true;
+			});
+		}
 		for (const key of this.ctx.keybindings.getKeys("app.session.observe")) {
 			this.ctx.editor.setCustomKeyHandler(key, () => {
 				this.#executeAction("app.session.observe");
@@ -1900,7 +1963,9 @@ export class InputController {
 			return;
 		}
 
-		const actions = [...this.#commandPaletteActions.values()];
+		const actions = [...this.#commandPaletteActions.entries()]
+			.filter(([id]) => !this.#availabilityGatedPaletteActions.has(id) || this.actionRegistry.isAvailable(id))
+			.map(([, action]) => action);
 		const slashCommands = [...(this.ctx.getSlashCommands?.() ?? this.#slashCommands)];
 		if (!this.ctx.showCommandPalette) {
 			let overlayHandle: ReturnType<typeof this.ctx.ui.showOverlay> | undefined;

package/src/modes/controllers/plan-mode-controller.ts

@@ -103,6 +103,11 @@ export class PlanModeController {
 				this.ctx.sessionManager.appendModeChange("none");
 			return;
 		}
+		if (this.ctx.session.hasExplicitlyDisabledTools()) {
+			if (sessionContext.mode === "plan" || sessionContext.mode === "plan_paused")
+				this.ctx.sessionManager.appendModeChange("none");
+			return;
+		}
 		if (sessionContext.mode === "plan") {
 			await this.enter({ planFilePath: sessionContext.modeData?.planFilePath as string | undefined });
 		} else if (sessionContext.mode === "plan_paused") {
@@ -115,6 +120,8 @@ export class PlanModeController {
 
 	async enter(options?: { planFilePath?: string; workflow?: "parallel" | "iterative" }): Promise<void> {
 		if (this.#enabled) return;
+		if (this.ctx.session.hasExplicitlyDisabledTools())
+			return this.ctx.showWarning("Plan mode requires the resolve tool.");
 		if (!this.ctx.modeGate.enter("plan")) return this.ctx.showWarning("Exit goal mode first.");
 		this.#paused = false;
 		const planFilePath = options?.planFilePath ?? "local://PLAN.md";
@@ -143,7 +150,7 @@ export class PlanModeController {
 	async exit(options?: { silent?: boolean; paused?: boolean }): Promise<void> {
 		if (!this.#enabled) return;
 		await this.ctx.session.abort({ timeoutMs: ABORT_TIMEOUT_MS });
-		if (this.#previousTools?.length) await this.ctx.session.setActiveToolsByName(this.#previousTools);
+		if (this.#previousTools !== undefined) await this.ctx.session.setActiveToolsByName(this.#previousTools);
 		if (this.#providerSessionScope && !this.ctx.session.isStreaming) {
 			if (this.ctx.session.restoreTemporaryProviderSessionScope(this.#providerSessionScope))
 				this.#providerSessionScope = undefined;

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

@@ -540,6 +540,7 @@ export class MCPCommandController {
 
 		const resolvedClientId = clientId.trim() || parsedAuthUrl.searchParams.get("client_id") || undefined;
 		const resolvedClientSecret = clientSecret.trim() || undefined;
+		let authorizationUrlLease: number | undefined;
 
 		try {
 			// Create OAuth flow
@@ -556,6 +557,7 @@ export class MCPCommandController {
 				},
 				{
 					onAuth: (info: { url: string; instructions?: string }) => {
+						authorizationUrlLease = this.ctx.setOAuthAuthorizationUrl(info.url);
 						// Show auth URL prominently in chat
 						this.ctx.chatContainer.addChild(new Spacer(1));
 						this.ctx.chatContainer.addChild(
@@ -565,6 +567,16 @@ export class MCPCommandController {
 						this.ctx.chatContainer.addChild(
 							new Text(theme.fg("muted", "Preparing browser authorization..."), 1, 0),
 						);
+						this.ctx.chatContainer.addChild(
+							new Text(
+								theme.fg(
+									"muted",
+									`Press ${this.ctx.keybindings.getDisplayString("app.oauth.copyUrl")} to copy the authorization URL.`,
+								),
+								1,
+								0,
+							),
+						);
 						this.ctx.chatContainer.addChild(new Spacer(1));
 						this.ctx.chatContainer.addChild(
 							new Text(
@@ -661,6 +673,8 @@ export class MCPCommandController {
 			} else {
 				throw new Error(`OAuth authentication failed: ${errorMsg}`);
 			}
+		} finally {
+			if (authorizationUrlLease !== undefined) this.ctx.clearOAuthAuthorizationUrl(authorizationUrlLease);
 		}
 	}
 

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

@@ -40,6 +40,7 @@ import {
 	theme,
 } from "../../modes/theme/theme";
 import type { InteractiveModeContext, OAuthSelectorOptions } from "../../modes/types";
+import { acquireResumeProgressLease } from "../../modes/utils/ui-helpers";
 import { getNotificationConfig, isTelegramConfigured, maskToken } from "../../sdk/bus/config";
 import {
 	clearTelegramActivationMarker,
@@ -2052,26 +2053,40 @@ export class SelectorController {
 		return true;
 	}
 
-	async handleResumeSession(sessionPath: string): Promise<void> {
-		const previousSessionId = this.ctx.sessionManager.getSessionId();
-		this.#clearTransientSessionUi();
-		const migrationPolicy =
-			this.ctx.settings?.get("session.directoryMigration") === "disabled" ? "disabled" : "copy-retain";
-		const writableSessionPath = await this.ctx.sessionManager.prepareManagedCandidateForWrite(
-			sessionPath,
-			migrationPolicy,
-		);
-
-		// Switch session via AgentSession (emits hook and tool session events)
-		if (!(await this.ctx.session.switchSession(writableSessionPath))) return;
-		const switchingToDifferentSession = previousSessionId !== this.ctx.sessionManager.getSessionId();
-		if (switchingToDifferentSession) this.ctx.resetIrcSidebarSession();
-		this.#refreshSessionTerminalTitle();
-		this.ctx.updateEditorBorderColor();
+	async handleResumeSession(
+		sessionPath: string,
+		options?: { requireIdle?: boolean },
+		onSwitched?: () => void,
+	): Promise<boolean> {
+		const progress = acquireResumeProgressLease(this.ctx);
+		await progress.committed;
+		try {
+			const previousSessionId = this.ctx.sessionManager.getSessionId();
+			const migrationPolicy =
+				this.ctx.settings?.get("session.directoryMigration") === "disabled" ? "disabled" : "copy-retain";
+			const writableSessionPath = await this.ctx.sessionManager.prepareManagedCandidateForWrite(
+				sessionPath,
+				migrationPolicy,
+			);
 
-		this.ctx.rebuildInitialMessages(switchingToDifferentSession ? "replace-identity" : "reconcile-same-transcript");
-		await this.ctx.reloadTodos();
-		this.ctx.showStatus("Resumed session");
+			// Switch session via AgentSession (emits hook and tool session events)
+			if (!(await this.ctx.session.switchSession(writableSessionPath, options))) return false;
+			onSwitched?.();
+			this.#clearTransientSessionUi();
+			const switchingToDifferentSession = previousSessionId !== this.ctx.sessionManager.getSessionId();
+			if (switchingToDifferentSession) this.ctx.resetIrcSidebarSession();
+			this.#refreshSessionTerminalTitle();
+			this.ctx.updateEditorBorderColor();
+
+			this.ctx.rebuildInitialMessages(
+				switchingToDifferentSession ? "replace-identity" : "reconcile-same-transcript",
+			);
+			await this.ctx.reloadTodos();
+			this.ctx.showStatus("Resumed session");
+			return true;
+		} finally {
+			progress.clear();
+		}
 	}
 
 	async handleSessionDeleteCommand(): Promise<void> {
@@ -2158,6 +2173,7 @@ export class SelectorController {
 		}
 
 		this.ctx.showStatus(`Logging in to ${providerId}… (Esc to cancel)`);
+		let authorizationUrlLease: number | undefined;
 		const manualInput = this.ctx.oauthManualInput;
 		const useManualInput = CALLBACK_SERVER_PROVIDERS.has(providerId as OAuthProvider);
 		const abort = new AbortController();
@@ -2172,6 +2188,7 @@ export class SelectorController {
 			await this.ctx.session.modelRegistry.authStorage.login(providerId as OAuthProvider, {
 				signal: abort.signal,
 				onAuth: (info: { url: string; instructions?: string }) => {
+					authorizationUrlLease = this.ctx.setOAuthAuthorizationUrl(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`;
@@ -2184,6 +2201,16 @@ export class SelectorController {
 						this.ctx.chatContainer.addChild(new Spacer(1));
 						this.ctx.chatContainer.addChild(new Text(theme.fg("dim", MANUAL_LOGIN_TIP), 1, 0));
 					}
+					this.ctx.chatContainer.addChild(
+						new Text(
+							theme.fg(
+								"dim",
+								`Press ${this.ctx.keybindings.getDisplayString("app.oauth.copyUrl")} to copy the authorization URL.`,
+							),
+							1,
+							0,
+						),
+					);
 					this.ctx.ui.requestRender();
 					this.ctx.openInBrowser(info.url);
 				},
@@ -2235,6 +2262,7 @@ export class SelectorController {
 			if (useManualInput) {
 				manualInput.clear(`Manual OAuth input cleared for ${providerId}`);
 			}
+			if (authorizationUrlLease !== undefined) this.ctx.clearOAuthAuthorizationUrl(authorizationUrlLease);
 		}
 	}
 

package/src/modes/interactive-mode.ts

@@ -312,6 +312,25 @@ export function selectShutdownDraft(editorText: string, hasActiveBtw: boolean):
 	return hasActiveBtw ? "" : editorText;
 }
 
+export class OAuthAuthorizationUrlState {
+	#active: { url: string; lease: number } | undefined;
+	#nextLease = 0;
+
+	set(url: string): number {
+		const lease = ++this.#nextLease;
+		this.#active = { url, lease };
+		return lease;
+	}
+
+	clear(lease: number): void {
+		if (this.#active?.lease === lease) this.#active = undefined;
+	}
+
+	get current(): string | undefined {
+		return this.#active?.url;
+	}
+}
+
 export class InteractiveMode implements InteractiveModeContext {
 	session: AgentSession;
 	sessionManager: SessionManager;
@@ -384,6 +403,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	fileSlashCommands: Set<string> = new Set();
 	skillCommands: Map<string, Skill> = new Map();
 	oauthManualInput: OAuthManualInputManager = new OAuthManualInputManager();
+	#oauthAuthorizationUrl = new OAuthAuthorizationUrlState();
 	promptSuggestion: PromptSuggestionController;
 
 	#baseSlashCommands: SlashCommand[] = [];
@@ -697,6 +717,7 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		const startupQuiet = settings.get("startup.quiet");
 		const welcomeLogoMode = resolveWelcomeLogoMode(settings.get("startup.welcomeBannerMode"));
+		const skipLogoAnimation = settings.get("startup.skipLogoAnimation");
 		this.#welcomeComponent = undefined;
 
 		for (const warning of this.session.configWarnings) {
@@ -722,6 +743,7 @@ export class InteractiveMode implements InteractiveModeContext {
 					rightGutterWidth: COMPOSER_RIGHT_GUTTER_WIDTH,
 					collapseChangelog: settings.get("collapseChangelog"),
 					keyDisplayContext: this.#keyDisplayContext,
+					skipLogoAnimation,
 				},
 			);
 
@@ -2042,6 +2064,33 @@ export class InteractiveMode implements InteractiveModeContext {
 	openInBrowser(urlOrPath: string): void {
 		this.#commandController.openInBrowser(urlOrPath);
 	}
+	setOAuthAuthorizationUrl(url: string): number {
+		return this.#oauthAuthorizationUrl.set(url);
+	}
+
+	clearOAuthAuthorizationUrl(lease: number): void {
+		this.#oauthAuthorizationUrl.clear(lease);
+	}
+
+	hasOAuthAuthorizationUrl(): boolean {
+		return this.#oauthAuthorizationUrl.current !== undefined;
+	}
+
+	async copyOAuthAuthorizationUrl(): Promise<void> {
+		const url = this.#oauthAuthorizationUrl.current;
+		if (!url) {
+			this.showWarning("No OAuth authorization URL is available to copy.");
+			return;
+		}
+		try {
+			await copyToClipboard(url);
+			this.showStatus("OAuth authorization URL copied to clipboard");
+		} catch (error) {
+			this.showError(
+				`Failed to copy OAuth authorization URL: ${error instanceof Error ? error.message : String(error)}`,
+			);
+		}
+	}
 
 	// Selector handling
 	showCommandPalette(
@@ -2104,10 +2153,11 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#selectorController.showSessionSelector();
 	}
 
-	handleResumeSession(sessionPath: string): Promise<void> {
-		this.#btwController.dispose();
-		this.resetObserverRegistry();
-		return this.#selectorController.handleResumeSession(sessionPath);
+	handleResumeSession(sessionPath: string, options?: { requireIdle?: boolean }): Promise<boolean> {
+		return this.#selectorController.handleResumeSession(sessionPath, options, () => {
+			this.#btwController.dispose();
+			this.resetObserverRegistry();
+		});
 	}
 
 	handleSessionDeleteCommand(): Promise<void> {

package/src/modes/types.ts

@@ -298,6 +298,10 @@ export interface InteractiveModeContext {
 	): Promise<CompactionOutcome>;
 
 	openInBrowser(urlOrPath: string): void;
+	setOAuthAuthorizationUrl(url: string): number;
+	hasOAuthAuthorizationUrl(): boolean;
+	clearOAuthAuthorizationUrl(lease: number): void;
+	copyOAuthAuthorizationUrl(): Promise<void>;
 	/** Resolved source of truth for slash autocomplete and command palette entries. */
 	getSlashCommands?(): readonly SlashCommand[];
 	refreshSlashCommandState(cwd?: string): Promise<void>;
@@ -322,7 +326,7 @@ export interface InteractiveModeContext {
 	showTreeSelector(): void;
 	showSessionSelector(): void;
 	showSessionsDashboard(): void;
-	handleResumeSession(sessionPath: string): Promise<void>;
+	handleResumeSession(sessionPath: string, options?: { requireIdle?: boolean }): Promise<boolean>;
 	handleSessionDeleteCommand(): Promise<void>;
 	showOAuthSelector(mode: "login" | "logout", providerId?: string, options?: OAuthSelectorOptions): Promise<void>;
 	showHookConfirm(title: string, message: string): Promise<boolean>;

package/src/prompts/system/system-prompt.md

@@ -42,6 +42,14 @@ Optimize for correctness first, maintainability second, and brevity third. Prefe
 - Do not defer actionable work. Underpromise and overdeliver: report only what is done or in progress, never announce remaining work instead of doing it.
 </communication>
 
+{{#if reasoningLanguageEnglish}}
+<reasoning-language>
+- Reason through development and technical problem-solving in English.
+- Keep user-facing answers in the language the user requested or used.
+- This changes reasoning language only; it does not relax correctness, safety, or communication requirements.
+</reasoning-language>
+{{/if}}
+
 <completion-contract>
 - Never present partial work as complete.
 - Never suppress tests or warnings to make code pass.