@sayknow-cli/coding-agent 0.2.7 → 0.3.1

package/src/lsp/config.ts

@@ -88,6 +88,7 @@ function normalizeServerConfig(name: string, config: RawServerConfig): ServerCon
 		: isRecord(config.initializationOptions)
 			? config.initializationOptions
 			: undefined;
+	const supersedes = normalizeStringArray(config.supersedes);
 
 	return {
 		...config,
@@ -96,6 +97,7 @@ function normalizeServerConfig(name: string, config: RawServerConfig): ServerCon
 		fileTypes,
 		rootMarkers,
 		...(initOptions ? { initOptions } : {}),
+		...(supersedes ? { supersedes } : {}),
 	};
 }
 
@@ -144,6 +146,18 @@ function mergeServers(
 	return merged;
 }
 
+function applyServerPrecedence(servers: Record<string, ServerConfig>): Record<string, ServerConfig> {
+	const suppressed = new Set<string>();
+	for (const config of Object.values(servers)) {
+		for (const serverName of config.supersedes ?? []) {
+			suppressed.add(serverName);
+		}
+	}
+	if (suppressed.size === 0) return servers;
+
+	return Object.fromEntries(Object.entries(servers).filter(([name]) => !suppressed.has(name)));
+}
+
 function applyRuntimeDefaults(servers: Record<string, ServerConfig>): Record<string, ServerConfig> {
 	const updated: Record<string, ServerConfig> = { ...servers };
 
@@ -422,9 +436,8 @@ export function loadConfig(cwd: string): LspConfig {
 			detected[name] = { ...config, resolvedCommand: resolved };
 		}
 
-		return { servers: detected, idleTimeoutMs };
+		return { servers: applyServerPrecedence(detected), idleTimeoutMs };
 	}
-
 	// Merge overrides with defaults and filter to available servers
 	const mergedWithRuntime = applyRuntimeDefaults(mergedServers);
 	const available: Record<string, ServerConfig> = {};
@@ -437,7 +450,7 @@ export function loadConfig(cwd: string): LspConfig {
 		available[name] = { ...config, resolvedCommand: resolved };
 	}
 
-	return { servers: available, idleTimeoutMs };
+	return { servers: applyServerPrecedence(available), idleTimeoutMs };
 }
 
 // =============================================================================

package/src/lsp/defaults.json

@@ -342,6 +342,13 @@
 		"fileTypes": [".php"],
 		"rootMarkers": ["composer.json", ".phpactor.json", ".phpactor.yml"]
 	},
+	"csharp-ls": {
+		"command": "csharp-ls",
+		"args": [],
+		"fileTypes": [".cs", ".csx"],
+		"rootMarkers": ["*.sln", "*.slnx", "*.csproj", "global.json"],
+		"supersedes": ["omnisharp"]
+	},
 	"omnisharp": {
 		"command": "omnisharp",
 		"args": ["-z", "--hostPID", "$PID", "--encoding", "utf-8", "--languageserver"],

package/src/lsp/types.ts

@@ -358,6 +358,8 @@ export interface ServerConfig {
 	/** Per-server warmup timeout in milliseconds. Overrides the global WARMUP_TIMEOUT_MS for this server during startup. */
 	warmupTimeoutMs?: number;
 	capabilities?: ServerCapabilities;
+	/** Names of lower-precedence servers to drop when this server is available. */
+	supersedes?: string[];
 	/** If true, this is a linter/formatter server (e.g., Biome) - used only for diagnostics/actions, not type intelligence */
 	isLinter?: boolean;
 	/** Resolved absolute path to the command binary (set during config loading) */

package/src/main.ts

@@ -47,6 +47,7 @@ import {
 import type { AgentSession } from "./session/agent-session";
 import type { AuthStorage } from "./session/auth-storage";
 import { resolveResumableSession, type SessionInfo, SessionManager } from "./session/session-manager";
+import { runStartupCredentialAutoImportIfNeeded } from "./setup/credential-auto-import";
 import { formatModelOnboardingGuidance } from "./setup/model-onboarding-guidance";
 import { executeBuiltinSlashCommand } from "./slash-commands/builtin-registry";
 import { resolvePromptInput } from "./system-prompt";
@@ -856,6 +857,14 @@ export async function runRootCommand(
 		settingsInstance.get("theme.light"),
 	);
 
+	const credentialAutoImportNotice = isInteractive
+		? await logger.time("credentialAutoImport", runStartupCredentialAutoImportIfNeeded, {
+				authStorage,
+				modelRegistry,
+				agentDir: settingsInstance.getAgentDir(),
+			})
+		: undefined;
+
 	let scopedModels: ScopedModel[] = [];
 	const modelPatterns = parsedArgs.models ?? settingsInstance.get("enabledModels");
 	const modelMatchPreferences = {
@@ -895,6 +904,24 @@ export async function runRootCommand(
 		sessionManager = await SessionManager.open(selectedPath);
 	}
 
+	// Restore the resumed session's working directory so the HUD branch, the
+	// project path, and the agent's tools all match where the session was
+	// created. A `--worktree` session lives in a linked worktree whose path
+	// differs from where `--continue`/`--resume` is invoked, which would
+	// otherwise leave the HUD pinned to the main checkout's branch.
+	if (sessionManager && !parsedArgs.cwd) {
+		const sessionCwd = sessionManager.getCwd();
+		if (sessionCwd && normalizePathForComparison(sessionCwd) !== normalizePathForComparison(getProjectDir())) {
+			try {
+				if ((await fs.stat(sessionCwd)).isDirectory()) {
+					setProjectDir(sessionCwd);
+				}
+			} catch {
+				// Session cwd no longer exists (e.g. worktree removed); keep current dir.
+			}
+		}
+	}
+
 	const { options: sessionOptions } = await logger.time(
 		"buildSessionOptions",
 		buildSessionOptions,
@@ -976,6 +1003,9 @@ export async function runRootCommand(
 		if (modelRegistryError) {
 			notifs.push({ kind: "error", message: modelRegistryError.message });
 		}
+		if (credentialAutoImportNotice) {
+			notifs.push({ kind: "info", message: credentialAutoImportNotice });
+		}
 
 		if (isInteractive && !session.model && !modelFallbackMessage) {
 			notifs.push({

package/src/modes/acp/acp-event-mapper.ts

@@ -244,6 +244,7 @@ export function mapAgentSessionEventToAcpSessionUpdates(
 		case "retry_fallback_succeeded":
 		case "ttsr_triggered":
 		case "irc_message":
+		case "subagent_steer_message":
 		case "notice":
 		case "thinking_level_changed":
 		case "goal_updated":

package/src/modes/components/hook-editor.ts

@@ -17,6 +17,10 @@ export interface HookEditorOptions {
 	promptStyle?: boolean;
 }
 
+function isWindowsRawLfNewlineInput(keyData: string): boolean {
+	return process.platform === "win32" && keyData === "\n";
+}
+
 export class HookEditorComponent extends Container {
 	#editor: Editor;
 	#onSubmitCallback: (value: string) => void;
@@ -92,8 +96,9 @@ export class HookEditorComponent extends Container {
 			return;
 		}
 
-		// Submit on any plain Enter encoding, including terminals that report unmodified Enter as LF.
-		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return")) {
+		// Submit on plain Enter encodings. On Windows, raw LF is reserved for terminal
+		// newline mappings (Shift+Enter/Ctrl+J/Ctrl+Enter); plain Enter reports CR.
+		if (!isWindowsRawLfNewlineInput(keyData) && (matchesKey(keyData, "enter") || matchesKey(keyData, "return"))) {
 			this.#onSubmitCallback(this.#editor.getText());
 			return;
 		}

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

@@ -4,6 +4,7 @@ import { Container, matchesKey, Spacer, TruncatedText } from "@sayknow-cli/tui";
 import { theme } from "../../modes/theme/theme";
 import { matchesSelectCancel } from "../../modes/utils/keybinding-matchers";
 import type { AuthStorage } from "../../session/auth-storage";
+import type { ImportableCredential } from "../../setup/credential-import";
 import { DynamicBorder } from "./dynamic-border";
 
 const OAUTH_SELECTOR_MAX_VISIBLE = 10;
@@ -22,6 +23,7 @@ export class OAuthSelectorComponent extends Container {
 	#validateAuthCallback?: (providerId: string) => Promise<boolean>;
 	#requestRenderCallback?: () => void;
 	#authState: Map<string, "checking" | "valid" | "invalid"> = new Map();
+	#externalCredentialCandidates: ImportableCredential[] = [];
 	#spinnerFrame: number = 0;
 	#spinnerInterval?: NodeJS.Timeout;
 	#validationGeneration: number = 0;
@@ -33,6 +35,7 @@ export class OAuthSelectorComponent extends Container {
 		options?: {
 			validateAuth?: (providerId: string) => Promise<boolean>;
 			requestRender?: () => void;
+			externalCredentialCandidates?: ImportableCredential[];
 		},
 	) {
 		super();
@@ -42,6 +45,7 @@ export class OAuthSelectorComponent extends Container {
 		this.#onCancelCallback = onCancel;
 		this.#validateAuthCallback = options?.validateAuth;
 		this.#requestRenderCallback = options?.requestRender;
+		this.#externalCredentialCandidates = options?.externalCredentialCandidates ?? [];
 		// Load all OAuth providers
 		this.#loadProviders();
 		this.addChild(new DynamicBorder());
@@ -195,6 +199,21 @@ export class OAuthSelectorComponent extends Container {
 			this.#listContainer.addChild(new Spacer(1));
 			this.#listContainer.addChild(new TruncatedText(theme.fg("warning", `  ${this.#statusMessage}`), 0, 0));
 		}
+		if (this.#mode === "login" && this.#externalCredentialCandidates.length > 0) {
+			this.#listContainer.addChild(new Spacer(1));
+			for (const credential of this.#externalCredentialCandidates) {
+				this.#listContainer.addChild(
+					new TruncatedText(
+						theme.fg(
+							"success",
+							`  ${theme.status.success} Imported ${credential.provider} from ${credential.source}`,
+						),
+						0,
+						0,
+					),
+				);
+			}
+		}
 	}
 	handleInput(keyData: string): void {
 		// Up arrow

package/src/modes/components/settings-defs.ts

@@ -62,6 +62,7 @@ export interface SubmenuSettingDef extends BaseSettingDef {
 
 export interface TextInputSettingDef extends BaseSettingDef {
 	type: "text";
+	secret?: boolean;
 }
 
 export type SettingDef = BooleanSettingDef | EnumSettingDef | SubmenuSettingDef | TextInputSettingDef;
@@ -128,7 +129,7 @@ function pathToSettingDef(path: SettingPath): SettingDef | null {
 		if (options) {
 			return { ...base, type: "submenu", options };
 		}
-		return { ...base, type: "text" };
+		return { ...base, type: "text", secret: (ui as { secret?: boolean }).secret };
 	}
 
 	return null;

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

@@ -14,6 +14,7 @@ import {
 	Text,
 } from "@sayknow-cli/tui";
 import { type SettingPath, settings } from "../../config/settings";
+import { maskToken } from "../../notifications/config";
 import type {
 	SettingTab,
 	StatusLinePreset,
@@ -352,7 +353,9 @@ export class SettingsSelectorComponent extends Container {
 					id: def.path,
 					label,
 					description,
-					currentValue: (currentValue as string) ?? "",
+					currentValue: def.secret
+						? maskToken(currentValue as string | undefined)
+						: ((currentValue as string) ?? ""),
 					submenu: (cv, done) => this.#createTextInput(def, cv, done),
 				};
 		}
@@ -480,10 +483,12 @@ export class SettingsSelectorComponent extends Container {
 			this.#textInputActive = false;
 			done(value);
 		};
+		// For secret fields, pre-fill with the real stored value rather than the masked display value.
+		const prefillValue = def.secret ? ((settings.get(def.path) as string) ?? "") : currentValue;
 		return new TextInputSubmenu(
 			tSettingLabel(def),
 			tSettingDesc(def),
-			currentValue,
+			prefillValue,
 			value => {
 				// Empty string clears the setting; undefined-typed string settings
 				// store "" which the browser.ts expandPath ignores (no-op fallback).

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

@@ -83,6 +83,7 @@ export class EventController {
 			todo_reminder: e => this.#handleTodoReminder(e),
 			todo_auto_clear: e => this.#handleTodoAutoClear(e),
 			irc_message: e => this.#handleIrcMessage(e),
+			subagent_steer_message: e => this.#handleSubagentSteerMessage(e),
 			notice: e => this.#handleNotice(e),
 			thinking_level_changed: async () => {},
 			goal_updated: async () => {},
@@ -200,6 +201,7 @@ export class EventController {
 			this.ctx.statusContainer.clear();
 		}
 		this.#cancelIdleCompaction();
+		this.ctx.updateEditorBorderColor();
 		this.ctx.ensureLoadingAnimation();
 		this.ctx.ui.requestRender();
 	}
@@ -284,6 +286,25 @@ export class EventController {
 		this.ctx.ui.requestRender();
 	}
 
+	async #handleSubagentSteerMessage(
+		event: Extract<AgentSessionEvent, { type: "subagent_steer_message" }>,
+	): Promise<void> {
+		const details = event.message.details as
+			| { observationId?: string; from?: string; to?: string; body?: string; state?: string }
+			| undefined;
+		const obsId = details?.observationId;
+		const signature = obsId
+			? `steer:${obsId}`
+			: `${event.message.role}:${event.message.customType}:${event.message.timestamp}:${details?.from}:${details?.to}:${details?.state}:${details?.body}`;
+		if (this.#renderedCustomMessages.has(signature)) {
+			return;
+		}
+		this.#renderedCustomMessages.add(signature);
+		this.#resetReadGroup();
+		this.ctx.addMessageToChat(event.message);
+		this.ctx.ui.requestRender();
+	}
+
 	#scheduleIrcExpiry(signature: string, components: Component[]): void {
 		if (components.length === 0 || this.#ircExpiryTimers.has(signature)) return;
 		const timer = setTimeout(() => {
@@ -613,6 +634,7 @@ export class EventController {
 		this.#readToolCallArgs.clear();
 		this.#readToolCallAssistantComponents.clear();
 		this.#lastAssistantComponent = undefined;
+		this.ctx.updateEditorBorderColor();
 		this.ctx.ui.requestRender();
 		this.#scheduleIdleCompaction();
 		this.sendCompletionNotification();
@@ -622,6 +644,7 @@ export class EventController {
 		event: Extract<AgentSessionEvent, { type: "auto_compaction_start" }>,
 	): Promise<void> {
 		this.#cancelIdleCompaction();
+		this.ctx.updateEditorBorderColor();
 		this.ctx.autoCompactionEscapeHandler = this.ctx.editor.onEscape;
 		this.ctx.editor.onEscape = () => {
 			this.ctx.session.abortCompaction();
@@ -652,13 +675,20 @@ export class EventController {
 			this.ctx.autoCompactionLoader = undefined;
 			this.ctx.statusContainer.clear();
 		}
+		this.ctx.updateEditorBorderColor();
 		const isHandoffAction = event.action === "handoff";
+		const continuationDisabled = event.continuationSkipReason === "auto_continue_disabled_non_resumable_tail";
 		if (event.aborted) {
 			this.ctx.showStatus(isHandoffAction ? "Auto-handoff cancelled" : "Auto context-full maintenance cancelled");
 		} else if (event.result) {
 			this.ctx.rebuildChatFromMessages();
 			this.ctx.statusLine.invalidate();
 			this.ctx.updateEditorTopBorder();
+			if (continuationDisabled && !isHandoffAction) {
+				this.ctx.showStatus("Context overflow recovery skipped: auto_continue_disabled_non_resumable_tail");
+			} else if (event.willRetry && !isHandoffAction) {
+				this.ctx.showStatus("Context overflow maintenance completed");
+			}
 		} else if (event.errorMessage) {
 			this.ctx.showWarning(event.errorMessage);
 		} else if (isHandoffAction) {
@@ -671,6 +701,11 @@ export class EventController {
 		} else if (event.skipped) {
 			// Benign skip: no model selected, no candidate models available, or nothing
 			// to compact yet. Not a failure — suppress the warning.
+			if (continuationDisabled) {
+				this.ctx.showStatus("Context overflow recovery skipped: auto_continue_disabled_non_resumable_tail");
+			} else if (event.willRetry && !isHandoffAction) {
+				this.ctx.showStatus("Context overflow maintenance skipped");
+			}
 		} else {
 			this.ctx.showWarning("Auto context-full maintenance failed; continuing without maintenance");
 		}

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

@@ -29,10 +29,14 @@ import {
 	setTheme,
 	theme,
 } from "../../modes/theme/theme";
-import type { InteractiveModeContext } from "../../modes/types";
+import type { InteractiveModeContext, OAuthSelectorOptions } from "../../modes/types";
 import { type SessionInfo, SessionManager } from "../../session/session-manager";
 import { FileSessionStorage } from "../../session/session-storage";
-import { discoverExternalCredentials, formatDiscoverySummary, importCredentials } from "../../setup/credential-import";
+import {
+	CREDENTIAL_AUTO_IMPORT_ROTATION_WARNING,
+	runExternalCredentialAutoImport,
+} from "../../setup/credential-auto-import";
+import { filterAutoImportOAuthCredentials, formatDiscoverySummary } from "../../setup/credential-import";
 import {
 	MODEL_ONBOARDING_API_PROVIDER_COMMAND,
 	MODEL_ONBOARDING_PROVIDER_PRESET_COMMAND,
@@ -160,10 +164,22 @@ export class SelectorController {
 
 	async #handleCredentialImport(): Promise<void> {
 		this.ctx.showStatus("Scanning for existing Claude Code / Codex CLI credentials…");
-		const result = await discoverExternalCredentials();
-		const summaryLines = formatDiscoverySummary(result);
+		const preview = await runExternalCredentialAutoImport({
+			authStorage: {
+				importCredentialIfAbsent: async () => ({
+					inserted: false,
+					reason: "skipped-existing",
+					provider: "",
+					entries: [],
+				}),
+			},
+			trigger: "bare-login",
+		});
+		const result = preview.discovery ?? { importable: [], skipped: [], environment: [] };
+		const candidates = filterAutoImportOAuthCredentials(result.importable);
+		const summaryLines = formatDiscoverySummary({ ...result, importable: candidates });
 
-		if (result.importable.length === 0) {
+		if (candidates.length === 0) {
 			this.ctx.chatContainer.addChild(new Spacer(1));
 			for (const line of summaryLines) {
 				this.ctx.chatContainer.addChild(new Text(theme.fg("dim", line), 1, 0));
@@ -172,7 +188,7 @@ export class SelectorController {
 				new Text(
 					theme.fg(
 						"warning",
-						"No importable Claude/Codex credentials found. Use /login or add a custom provider.",
+						"No importable Claude/Codex OAuth credentials found. Use /login or add a custom provider.",
 					),
 					1,
 					0,
@@ -183,7 +199,7 @@ export class SelectorController {
 		}
 
 		const confirmed = await this.ctx.showHookConfirm(
-			`Import ${result.importable.length} credential(s)?`,
+			`Import ${candidates.length} credential(s)?`,
 			summaryLines.join("\n"),
 		);
 		if (!confirmed) {
@@ -191,9 +207,10 @@ export class SelectorController {
 			return;
 		}
 
-		const summary = await importCredentials(result.importable, (provider, credential) =>
-			this.ctx.session.modelRegistry.authStorage.upsertCredential(provider, credential),
-		);
+		const summary = await runExternalCredentialAutoImport({
+			authStorage: this.ctx.session.modelRegistry.authStorage,
+			trigger: "bare-login",
+		});
 		await this.ctx.session.modelRegistry.refresh();
 
 		this.ctx.chatContainer.addChild(new Spacer(1));
@@ -206,13 +223,15 @@ export class SelectorController {
 				),
 			);
 		}
-		for (const failure of summary.failed) {
+		for (const skip of summary.skipped) {
 			this.ctx.chatContainer.addChild(
-				new Text(
-					theme.fg("error", `${theme.status.error} Failed ${failure.credential.provider}: ${failure.error}`),
-					1,
-					0,
-				),
+				new Text(theme.fg("dim", `${theme.status.info} Skipped ${skip.credential.provider}: ${skip.reason}`), 1, 0),
+			);
+		}
+		for (const failure of summary.failures) {
+			const provider = failure.credential?.provider ?? failure.origin ?? "credential discovery";
+			this.ctx.chatContainer.addChild(
+				new Text(theme.fg("error", `${theme.status.error} Failed ${provider}: ${failure.failureClass}`), 1, 0),
 			);
 		}
 		if (summary.imported.length > 0) {
@@ -1280,7 +1299,11 @@ export class SelectorController {
 		}
 	}
 
-	async showOAuthSelector(mode: "login" | "logout", providerId?: string): Promise<void> {
+	async showOAuthSelector(
+		mode: "login" | "logout",
+		providerId?: string,
+		options?: OAuthSelectorOptions,
+	): Promise<void> {
 		if (providerId) {
 			const oauthProvider = getOAuthProviders().find(provider => provider.id === providerId);
 			if (!oauthProvider && !this.ctx.session.modelRegistry.getModelProfiles().has(providerId)) {
@@ -1307,6 +1330,45 @@ export class SelectorController {
 			}
 		}
 
+		let externalCredentialCandidates: ReturnType<typeof filterAutoImportOAuthCredentials> = [];
+		if (
+			mode === "login" &&
+			providerId === undefined &&
+			options?.allowExternalCredentialDiscovery === true &&
+			options.trigger === "bare-login"
+		) {
+			const preview = await runExternalCredentialAutoImport({
+				authStorage: {
+					importCredentialIfAbsent: async () => ({
+						inserted: false,
+						reason: "skipped-existing",
+						provider: "",
+						entries: [],
+					}),
+				},
+				trigger: "bare-login",
+				discover: options.externalCredentialDiscover,
+			});
+			const result = preview.discovery ?? { importable: [], skipped: [], environment: [] };
+			const candidates = filterAutoImportOAuthCredentials(result.importable);
+			if (candidates.length > 0) {
+				const confirmed = await this.ctx.showHookConfirm(
+					`Import ${candidates.length} external credential(s)?`,
+					`${formatDiscoverySummary({ ...result, importable: candidates }).join("\n")}\n\n${CREDENTIAL_AUTO_IMPORT_ROTATION_WARNING}`,
+				);
+				if (confirmed) {
+					const summary = await runExternalCredentialAutoImport({
+						authStorage: this.ctx.session.modelRegistry.authStorage,
+						trigger: "bare-login",
+						discover: options.externalCredentialDiscover,
+					});
+					externalCredentialCandidates = summary.imported;
+					if (externalCredentialCandidates.length > 0) {
+						await this.ctx.session.modelRegistry.refresh("offline");
+					}
+				}
+			}
+		}
 		this.showSelector(done => {
 			let selector: OAuthSelectorComponent;
 			selector = new OAuthSelectorComponent(
@@ -1337,6 +1399,7 @@ export class SelectorController {
 					requestRender: () => {
 						this.ctx.ui.requestRender();
 					},
+					externalCredentialCandidates,
 				},
 			);
 			return { component: selector, focus: selector };

package/src/modes/interactive-mode.ts

@@ -29,7 +29,7 @@ import {
 import { APP_NAME, adjustHsv, getProjectDir, hsvToRgb, isEnoent, logger, postmortem, prompt } from "@sayknow-cli/utils";
 import chalk from "chalk";
 import { AsyncJobManager } from "../async";
-import { KeybindingsManager } from "../config/keybindings";
+import { type AppKeybinding, KeybindingsManager } from "../config/keybindings";
 import { isSettingsInitialized, type Settings, settings } from "../config/settings";
 import { DEFAULT_SKC_DEFINITION_NAMES } from "../defaults/skc-defaults";
 import type {
@@ -118,6 +118,24 @@ import type { CompactionQueuedMessage, InteractiveModeContext, SubmittedUserInpu
 import { UiHelpers } from "./utils/ui-helpers";
 
 const INTERACTIVE_ABORT_CLEANUP_TIMEOUT_MS = 5_000;
+const DEFAULT_COMPOSER_PLACEHOLDER = "Type your message...";
+const FRIENDLY_KEY_PARTS: Record<string, string> = {
+	alt: "Alt",
+	cmd: "Command",
+	command: "Command",
+	ctrl: "Control",
+	enter: "Enter",
+	meta: process.platform === "darwin" ? "Command" : "Meta",
+	option: "Option",
+	shift: "Shift",
+};
+
+function formatShortcutForPlaceholder(key: string): string {
+	return key
+		.split("+")
+		.map(part => FRIENDLY_KEY_PARTS[part.toLowerCase()] ?? part)
+		.join("+");
+}
 
 const HINT_SHIMMER_PALETTE: ShimmerPalette = {
 	low: "dim",
@@ -142,7 +160,7 @@ function configureDefaultComposerChrome(editor: CustomEditor): void {
 	editor.setClosedBorderBox(true);
 	editor.setPromptGutter(undefined);
 	editor.setInputPrefix(getDefaultInputPrefix());
-	editor.setPlaceholder("Type your message...");
+	editor.setPlaceholder(DEFAULT_COMPOSER_PLACEHOLDER);
 	editor.setPaddingX(1);
 	editor.setTopBorder(undefined);
 }
@@ -904,6 +922,31 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.editor.setMaxHeight(this.#computeEditorMaxHeight());
 	}
 
+	#isPromptDeliveryBusy(): boolean {
+		return this.session.isStreaming || this.session.isCompacting;
+	}
+
+	#getFirstKeyForAction(action: AppKeybinding): string | undefined {
+		return this.keybindings.getKeys(action)[0];
+	}
+
+	#getMessageQueueShortcut(): string | undefined {
+		const preferredAction: AppKeybinding =
+			process.platform === "darwin" ? "app.message.followUp" : "app.message.queue";
+		const fallbackAction: AppKeybinding =
+			process.platform === "darwin" ? "app.message.queue" : "app.message.followUp";
+		return this.#getFirstKeyForAction(preferredAction) ?? this.#getFirstKeyForAction(fallbackAction);
+	}
+
+	#getComposerPlaceholder(): string {
+		if (!this.#isPromptDeliveryBusy()) return DEFAULT_COMPOSER_PLACEHOLDER;
+		const enterAction = this.settings.get("busyPromptMode") === "steer" ? "Steering" : "Message Queueing";
+		const parts = [`Enter: ${enterAction}`];
+		const queueKey = this.#getMessageQueueShortcut();
+		if (queueKey) parts.push(`${formatShortcutForPlaceholder(queueKey)}: Message Queueing`);
+		return `${DEFAULT_COMPOSER_PLACEHOLDER} ${parts.join(" · ")}`;
+	}
+
 	updateEditorChrome(): void {
 		if (this.isBashMode) {
 			this.editor.borderColor = this.isBashNoContext
@@ -927,6 +970,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		if (!this.isBashMode) {
 			this.editor.setInputPrefix(getDefaultInputPrefix());
 		}
+		this.editor.setPlaceholder(this.#getComposerPlaceholder());
 		this.#setComposerTopBorder();
 		this.ui.requestRender();
 	}
@@ -2503,8 +2547,12 @@ export class InteractiveMode implements InteractiveModeContext {
 		return this.#selectorController.handleSessionDeleteCommand();
 	}
 
-	showOAuthSelector(mode: "login" | "logout", providerId?: string): Promise<void> {
-		return this.#selectorController.showOAuthSelector(mode, providerId);
+	showOAuthSelector(
+		mode: "login" | "logout",
+		providerId?: string,
+		options?: import("./types").OAuthSelectorOptions,
+	): Promise<void> {
+		return this.#selectorController.showOAuthSelector(mode, providerId, options);
 	}
 
 	showHookConfirm(title: string, message: string): Promise<boolean> {

package/src/modes/runtime-init.ts

@@ -78,6 +78,7 @@ export async function initializeExtensions(session: AgentSession, options: Initi
 			shutdown,
 			getContextUsage: () => session.getContextUsage(),
 			getSystemPrompt: () => session.systemPrompt,
+			getWorkflowGate: () => session.getWorkflowGateEmitter(),
 			compact: instructionsOrOptions => runExtensionCompact(session, instructionsOrOptions),
 		},
 		// ExtensionCommandContextActions — commands invokable via prompt("/command")

package/src/modes/shared/agent-wire/event-contract.ts

@@ -49,6 +49,7 @@ const AGENT_SESSION_EVENT_TYPE_REGISTRY: Record<AgentWireEventType, true> = {
 	todo_reminder: true,
 	todo_auto_clear: true,
 	irc_message: true,
+	subagent_steer_message: true,
 	notice: true,
 	thinking_level_changed: true,
 	goal_updated: true,

package/src/modes/shared/agent-wire/event-envelope.ts

@@ -50,6 +50,7 @@ export function agentSessionEventType(event: AgentSessionEvent): AgentWireEventT
 		case "todo_reminder":
 		case "todo_auto_clear":
 		case "irc_message":
+		case "subagent_steer_message":
 		case "notice":
 		case "thinking_level_changed":
 		case "goal_updated":

package/src/modes/shared/agent-wire/event-observation.ts

@@ -235,6 +235,22 @@ export function observeAgentSessionEvent(event: AgentSessionEvent): AgentWireOwn
 				semantic: false,
 				coalesceKey: null,
 			});
+		case "subagent_steer_message": {
+			const details = recordObject(event.message.details);
+			return obs(event, {
+				kind: "rpc_subagent_steer",
+				signal: null,
+				evidence: {
+					from: str(details?.from) ?? null,
+					to: str(details?.to) ?? null,
+					state: str(details?.state) ?? null,
+					observationId: str(details?.observationId) ?? null,
+				},
+				severity: "info",
+				semantic: false,
+				coalesceKey: null,
+			});
+		}
 		case "notice": {
 			const level = event.level;
 			return obs(event, {