@iowarp/clio-coder 0.4.6 → 0.4.7

package/src/interactive/interactive-input-runtime.ts

@@ -1,6 +1,13 @@
 import { getTerminationCoordinator } from "../core/termination.js";
-import type { ClioKeybinding } from "../domains/config/keybindings.js";
-import { isKeyRelease, type Keybinding } from "../engine/tui.js";
+import { CLIO_APP_KEYBINDING_IDS, type ClioKeybinding } from "../domains/config/keybindings.js";
+import {
+	decodePrintableKey,
+	isKeyRelease,
+	type Keybinding,
+	matchesKey,
+	type TUI,
+	TuiAltScreen,
+} from "../engine/tui.js";
 import {
 	type ApplicationClock,
 	type ApplicationController,
@@ -10,7 +17,9 @@ import {
 	type ApplicationSignalCoordinator,
 	createApplicationController,
 } from "./application-controller.js";
+import { focusedComponent, keyboardOwner } from "./keyboard-owner.js";
 import { createLeaderKeyController, type LeaderTarget } from "./leader-key.js";
+import { createLeaderMenu } from "./leader-menu.js";
 import { type OverlayState, routeOverlayKey } from "./overlay-lifecycle.js";
 import type { RenderInputAction } from "./render-trace.js";
 
@@ -26,6 +35,7 @@ export interface InteractiveInputKeyActionDeps {
 	openDecisions: () => void;
 	backgroundDispatch: () => void;
 	openModelSelector: () => void;
+	openLibrary: () => void;
 	openTree: () => void;
 	cycleScopedModelForward: () => void;
 	cycleScopedModelBackward: () => void;
@@ -38,9 +48,17 @@ export interface InteractiveInputKeyActionDeps {
 }
 
 export interface InteractiveInputRuntimeDeps {
+	tui?: TUI;
+	hasQueuedMessages?: () => boolean;
+	explainProtectedExit?: () => void;
+	explainSearchUnavailable?: () => void;
+	explainThinkingUnavailable?: () => void;
 	keybindings: {
 		matches(data: string, id: Keybinding): boolean;
 		leaderTargets(): ReadonlyArray<LeaderTarget>;
+		getKeys?(id: Keybinding): ReadonlyArray<string>;
+		getDescription?(id: Keybinding): string;
+		onReload?(listener: () => void): () => void;
 	};
 	dispatchAction: (id: ClioKeybinding, deps: InteractiveInputKeyActionDeps) => boolean;
 	actions: {
@@ -64,10 +82,12 @@ export interface InteractiveInputRuntimeDeps {
 		isInspectingMutation(): boolean;
 		toggleMutationInspection(): void;
 		scrollMutationInspection(delta: number): void;
+		togglePermissionTerms(): void;
 		cancelAskUser(): void;
 		toggleFooterDashboardState(): void;
 		toggleDispatchBoardOverlay(): void;
 		openModelOverlayState(): void;
+		openSkillsHubState(): void;
 		openTreeOverlayState(): void;
 		openTasksOverlayState(): void;
 		openDecisionsOverlayState(): void;
@@ -89,7 +109,13 @@ export interface InteractiveInputRuntimeDeps {
 	cancelActiveEditorBash: () => boolean;
 	isStreaming: () => boolean;
 	cancelActiveRun: () => void;
-	editor: { getText(): string; setText(text: string): void; handleInput?(data: string): void };
+	editor: {
+		getText(): string;
+		setText(text: string): void;
+		handleInput?(data: string): void;
+		applyEdit?(operation: import("./overlay-key-routing.js").DraftEditOperation | "undo"): void;
+		isShowingAutocomplete?(): boolean;
+	};
 	editorSubmit: {
 		openExternalEditorForInput(): void;
 		queueFollowUpFromEditor(): void;
@@ -138,6 +164,7 @@ export function createInteractiveInputRuntime(deps: InteractiveInputRuntimeDeps)
 		cycleThinking: () => {
 			const available = deps.actions.availableThinkingLevels();
 			if (!(available.length === 1 && available[0] === "off")) deps.actions.onCycleThinking();
+			else deps.explainThinkingUnavailable?.();
 			deps.refreshFooter();
 			deps.requestRender();
 		},
@@ -149,6 +176,7 @@ export function createInteractiveInputRuntime(deps: InteractiveInputRuntimeDeps)
 		backgroundDispatch: deps.actions.backgroundActiveDispatch,
 		toggleFilesPane: deps.actions.toggleFilesPane,
 		openModelSelector: deps.overlay.openModelOverlayState,
+		openLibrary: deps.overlay.openSkillsHubState,
 		openTree: deps.overlay.openTreeOverlayState,
 		cycleScopedModelForward: () => {
 			deps.actions.cycleScopedModelForward();
@@ -167,10 +195,98 @@ export function createInteractiveInputRuntime(deps: InteractiveInputRuntimeDeps)
 		interruptWithMessage: deps.editorSubmit.interruptFromEditor,
 		restoreQueuedFollowUps: deps.editorSubmit.restoreQueuedFollowUpsToEditor,
 	});
+	const focused = () => (deps.tui ? focusedComponent(deps.tui) : null);
+	const search = () => (deps.tui instanceof TuiAltScreen && deps.tui.isSearchFocused ? deps.tui : null);
+	const owner = () => keyboardOwner(focused());
+	const ownerAction = (): ClioKeybinding | undefined =>
+		(
+			({
+				"skills-hub": "clio-coder.library.toggle",
+				model: "clio-coder.model.select",
+				tree: "clio-coder.session.tree",
+				"dispatch-board": "clio-coder.dispatchBoard.toggle",
+			}) as Partial<Record<OverlayState, ClioKeybinding>>
+		)[deps.overlay.getState()];
+	const canToggleOwner = () => deps.overlay.getState() === "dispatch-board" || owner().keyboardScope === "browse";
+	const targets = (): ReadonlyArray<LeaderTarget> => {
+		const all = deps.keybindings.leaderTargets();
+		const filtered = search()
+			? all.filter(({ id }) => id === "tui.editor.undo" || id === "tui.altScreen.search")
+			: deps.overlay.getState() === "closed"
+				? all
+				: all.filter(
+						({ id }) =>
+							(id === ownerAction() && canToggleOwner()) ||
+							(id === "tui.editor.undo" &&
+								(owner().keyboardScope === "edit" || deps.overlay.getState() === "permission-confirm")),
+					);
+		return filtered.map((entry) => ({
+			...entry,
+			label: deps.keybindings.getDescription?.(entry.id) ?? entry.id,
+			...(entry.id === "clio-coder.thinking.cycle" &&
+			deps.actions.availableThinkingLevels().every((level) => level === "off")
+				? { disabledReason: "This model supports only off" }
+				: {}),
+		}));
+	};
+	const menu = deps.tui
+		? createLeaderMenu(
+				deps.tui,
+				() => (search() ? "Transcript search" : overlayScopeLabel(deps.overlay.getState())),
+				(id) => deps.keybindings.getKeys?.(id).join(" / ") ?? "",
+			)
+		: undefined;
+	const dispatchLeader = (id: Keybinding): boolean => {
+		if (id === "tui.editor.undo") {
+			if (search()) search()?.undoSearchQuery();
+			else if (deps.overlay.getState() === "closed" || deps.overlay.getState() === "permission-confirm")
+				deps.editor.applyEdit?.("undo");
+			else owner().undoInput?.();
+			deps.requestRender();
+			return true;
+		}
+		if (id.startsWith("tui.altScreen.")) {
+			const tui = deps.tui;
+			if (!(tui instanceof TuiAltScreen)) {
+				deps.explainSearchUnavailable?.();
+				return true;
+			}
+			switch (id) {
+				case "tui.altScreen.search":
+					tui.toggleSearch();
+					break;
+				case "tui.altScreen.pageUp":
+					tui.scrollBy(-Math.max(1, tui.terminal.rows - 3));
+					break;
+				case "tui.altScreen.pageDown":
+					tui.scrollBy(Math.max(1, tui.terminal.rows - 3));
+					break;
+				case "tui.altScreen.top":
+					tui.scrollToTop();
+					break;
+				case "tui.altScreen.bottom":
+					tui.scrollToBottom();
+					break;
+				case "tui.altScreen.previousPrompt":
+					tui.scrollToPrompt(-1);
+					break;
+				case "tui.altScreen.nextPrompt":
+					tui.scrollToPrompt(1);
+					break;
+			}
+			return true;
+		}
+		if (deps.overlay.getState() !== "closed") {
+			if (id === ownerAction() && canToggleOwner()) deps.overlay.closeOverlay();
+			return true;
+		}
+		return deps.dispatchAction(id as ClioKeybinding, keyActionDeps());
+	};
 	const leaderKeys = createLeaderKeyController({
 		matchesLeader: (input) => deps.keybindings.matches(input, "clio-coder.leader"),
-		leaderTargets: () => deps.keybindings.leaderTargets(),
-		dispatchAction: (id) => deps.dispatchAction(id, keyActionDeps()),
+		leaderTargets: targets,
+		dispatchAction: dispatchLeader,
+		...(menu ? { onMenuChange: menu } : {}),
 		isRelease: isKeyRelease,
 		onStateChange: (pending) => {
 			deps.onLeaderStateChange?.(pending);
@@ -179,7 +295,101 @@ export function createInteractiveInputRuntime(deps: InteractiveInputRuntimeDeps)
 		},
 	});
 
+	const removeReload = deps.keybindings.onReload?.(() => leaderKeys.reset());
 	controller = createApplicationController({
+		routeComposerKey: (data) => {
+			if (deps.keybindings.matches(data, "tui.altScreen.search") && !(deps.tui instanceof TuiAltScreen)) {
+				deps.explainSearchUnavailable?.();
+				return true;
+			}
+			return false;
+		},
+		isSearchFocused: () => search() !== null,
+		closeSearch: () => search()?.closeSearch(),
+		isAutocompleteVisible: () => deps.editor.isShowingAutocomplete?.() ?? false,
+		hasQueuedMessages: () => deps.hasQueuedMessages?.() ?? false,
+		explainProtectedExit: () => deps.explainProtectedExit?.(),
+		forwardFocusedInput: (data) => {
+			const active = search();
+			if (active) {
+				if (
+					deps.keybindings.matches(data, "tui.altScreen.search") ||
+					deps.keybindings.matches(data, "tui.altScreen.searchClose") ||
+					matchesKey(data, "escape")
+				)
+					active.closeSearch();
+				else if (deps.keybindings.matches(data, "tui.altScreen.searchNext")) active.navigateSearch(1);
+				else if (deps.keybindings.matches(data, "tui.altScreen.searchPrevious")) active.navigateSearch(-1);
+				else focused()?.handleInput?.(data);
+			} else focused()?.handleInput?.(data);
+			deps.requestRender();
+		},
+		cancelFocusedOwner: () => {
+			const state = deps.overlay.getState();
+			if (["permission-confirm", "cost", "context-view", "side-question", "dispatch-board", "auth"].includes(state))
+				deps.overlay.closeOverlay();
+			else if (focused()?.handleInput) {
+				focused()?.handleInput?.("\x1b");
+				deps.requestRender();
+			} else deps.overlay.closeOverlay();
+		},
+		matchesRepeatableInput: (data) => {
+			// Safety takes precedence over hostile user collisions.
+			if (CLIO_APP_KEYBINDING_IDS.some((id) => id !== "clio-coder.exit" && deps.keybindings.matches(data, id)))
+				return false;
+			if (deps.keybindings.matches(data, "clio-coder.exit"))
+				return matchesKey(data, "ctrl+d") && deps.editor.getText().length > 0 && deps.overlay.getState() === "closed";
+			if (
+				["clio-coder.exit", "clio-coder.leader", "tui.input.submit", "tui.select.confirm", "tui.select.cancel"].some((id) =>
+					deps.keybindings.matches(data, id as Keybinding),
+				) ||
+				matchesKey(data, "ctrl+c") ||
+				matchesKey(data, "escape")
+			)
+				return false;
+			const editable = deps.overlay.getState() === "closed" || search() !== null || owner().keyboardScope === "edit";
+			if (editable && (decodePrintableKey(data) !== undefined || deps.keybindings.matches(data, "tui.input.newLine")))
+				return true;
+			const navigation = ["up", "down", "left", "right", "home", "end", "pageUp", "pageDown"] as const;
+			if (navigation.some((key) => matchesKey(data, key))) return true;
+			if (
+				deps.overlay.getState() !== "closed" &&
+				["tui.select.up", "tui.select.down"].some((id) => deps.keybindings.matches(data, id as Keybinding))
+			)
+				return true;
+			if (
+				deps.overlay.getState() === "closed" &&
+				["pageUp", "pageDown", "top", "bottom", "previousPrompt", "nextPrompt"].some((name) =>
+					deps.keybindings.matches(data, `tui.altScreen.${name}` as Keybinding),
+				)
+			)
+				return true;
+			return (
+				(deps.overlay.getState() === "closed" ||
+					search() !== null ||
+					owner().keyboardScope === "edit" ||
+					deps.overlay.getState() === "permission-confirm") &&
+				[
+					"undo",
+					"yank",
+					"yankPop",
+					"cursorLeft",
+					"cursorRight",
+					"cursorWordLeft",
+					"cursorWordRight",
+					"cursorLineStart",
+					"cursorLineEnd",
+					"deleteCharBackward",
+					"deleteCharForward",
+					"deleteWordBackward",
+					"deleteWordForward",
+					"deleteToLineStart",
+					"deleteToLineEnd",
+					"historyPrevious",
+					"historyNext",
+				].some((name) => deps.keybindings.matches(data, `tui.editor.${name}` as Keybinding))
+			);
+		},
 		clock: deps.clock ?? { now: Date.now },
 		signals: deps.signals ?? {
 			takeInterruptOwnership: () => getTerminationCoordinator().releaseInterruptOwnership(),
@@ -206,8 +416,10 @@ export function createInteractiveInputRuntime(deps: InteractiveInputRuntimeDeps)
 					isInspectingMutation: () => deps.overlay.isInspectingMutation(),
 					toggleMutationInspection: () => deps.overlay.toggleMutationInspection(),
 					scrollMutationInspection: (delta) => deps.overlay.scrollMutationInspection(delta),
-					editDraft: (data) => {
-						deps.editor.handleInput?.(data);
+					togglePermissionTerms: () => deps.overlay.togglePermissionTerms(),
+					canToggleOwner,
+					editDraft: (operation) => {
+						deps.editor.applyEdit?.(operation);
 						deps.requestRender();
 					},
 					closeOverlay: () => deps.overlay.closeOverlay(),
@@ -259,6 +471,7 @@ export function createInteractiveInputRuntime(deps: InteractiveInputRuntimeDeps)
 		shutdownDisposers: [
 			() => deps.shutdown.stopTickers(),
 			() => leaderKeys.dispose(),
+			() => removeReload?.(),
 			() => deps.shutdown.disposeInteractiveTickers(),
 			() => deps.shutdown.disposeBeforeStatus(),
 			() => deps.shutdown.disposeProjectionPrimary(),
@@ -287,6 +500,7 @@ export function createInteractiveInputRuntime(deps: InteractiveInputRuntimeDeps)
 	});
 	deps.registerInputListener((data) => {
 		deps.onInputIngress?.(classifyInputAction(data, deps), data);
+
 		return controller.handleInput(data);
 	});
 	return controller;
@@ -309,3 +523,36 @@ function classifyInputAction(data: string, deps: InteractiveInputRuntimeDeps): R
 	if (deps.overlay.getState() !== "closed") return "overlay";
 	return "editor";
 }
+
+/** Operator-facing scope names; overlay state IDs stay inside routing. */
+function overlayScopeLabel(state: OverlayState): string {
+	const names: Record<OverlayState, string> = {
+		closed: "Composer",
+		"permission-confirm": "Permission",
+		"dispatch-board": "Workers",
+		auth: "Authentication",
+		cost: "Usage",
+		"context-view": "Context",
+		"context-reset": "Context reset",
+		tasks: "Tasks",
+		decisions: "Decisions",
+		memory: "Memory",
+		view: "View",
+		model: "Model",
+		"model-scope": "Model cycle set",
+		settings: "Settings",
+		resume: "Resume",
+		tree: "Session tree",
+		"message-picker": "Messages",
+		"cwd-fallback": "Working directory",
+		"ask-user": "Interview",
+		help: "Help",
+		extensions: "Extensions",
+		interop: "Interop",
+		"skills-hub": "Library",
+		"side-question": "Side question",
+		"handoff-review": "Handoff review",
+		"fleet-run-approval": "Run approval",
+	};
+	return names[state];
+}

package/src/interactive/interactive-presentation.ts

@@ -72,6 +72,8 @@ export interface InteractivePresentationFactories {
 }
 
 export interface InteractivePresentationDeps {
+	extensionCommands?: import("./slash-autocomplete.js").SlashAutocompleteOptions["extensionCommands"];
+	getExtensionStatus?: () => ReadonlyArray<string>;
 	bus: SafeEventBus;
 	providers: ProvidersContract;
 	dispatch: Pick<DispatchContract, "snapshot">;
@@ -89,7 +91,7 @@ export interface InteractivePresentationDeps {
 	/** Pending boot submissions remain visible until serial admission removes them. */
 	bootPending?: Component;
 	getSettings?: () => Readonly<ClioSettings>;
-	resources?: Pick<ResourcesContract, "skills">;
+	resources?: Pick<ResourcesContract, "skills" | "prompts">;
 	agents?: Pick<AgentsContract, "listSpecs">;
 	session?: Pick<SessionContract, "current">;
 	getSessionId?: () => string | null;
@@ -107,6 +109,12 @@ export interface InteractivePresentationDeps {
 	/** Whether that prompt has a mutation to inspect, and whether it is open (issue #254). */
 	getPermissionInspection?: () => import("./permission-hint.js").PermissionInspectionHint;
 	getCwd?: () => string;
+	/**
+	 * True when this process resumed an existing session at boot (`--continue`,
+	 * `--session <id>`). The header opens collapsed rather than showing
+	 * fresh-start onboarding above a conversation that already has history.
+	 */
+	startsResumed?: boolean;
 	resolveVisibleEventSequence?: (event: ChatLoopEvent) => number | null;
 	resolveStreamIngress?: (
 		event: ChatLoopEvent,
@@ -181,7 +189,7 @@ const DEFAULT_FACTORIES: InteractivePresentationFactories = {
 };
 
 /** Title-case a KeyId for compact chrome hints, preserving each caller's fallback. */
-function formatKeyLabel(keyId: string | undefined, fallback = "Alt+X"): string {
+function formatKeyLabel(keyId: string | undefined, fallback = "unbound"): string {
 	if (!keyId || keyId.length === 0) return fallback;
 	return keyId
 		.split("+")
@@ -220,19 +228,33 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 	const keybindings = deps.keybindings ?? factories.createKeybindings(settings);
 	const { getExtensionStats, getLiveWorkspaceSnapshot, getWorkspaceSnapshot, refreshLiveWorkspaceGit } =
 		deps.workspaceFacts;
+	/**
+	 * The submit binding as the operator has it, or null when it is unbound or
+	 * disabled. The header prints a key only when pressing it would actually
+	 * submit, so a rebound or removed binding silently drops the hint instead of
+	 * advertising a default that does nothing.
+	 */
+	const effectiveSubmitKeyLabel = (): string | null => {
+		if (keybindings.isDisabled("tui.input.submit")) return null;
+		const key = keybindings.getKeys("tui.input.submit")[0];
+		return key === undefined || key.length === 0 ? null : formatKeyLabel(key, "");
+	};
 
 	const banner = factories.createBanner({
 		providers: deps.providers,
-		observability: deps.observability,
-		getContextUsage: () => deps.chat.contextUsage(),
 		getWorkspaceSnapshot,
-		getExtensionStats,
-		// The repository probe runs off the render path now, so the frame that
-		// shows its result has to be asked for when the probe lands.
+		// The authoritative project-context reader. It is synchronous on a cache
+		// miss, so the banner refreshes it off the frame rather than calling it
+		// during render; the frame that shows the result is asked for below.
+		...(deps.getContextState ? { getContextState: deps.getContextState } : {}),
+		getSubmitKeyLabel: () => effectiveSubmitKeyLabel(),
 		onFactsRefreshed: requestRender,
-		...(deps.getTaskMemoryStatus ? { getTaskMemoryStatus: deps.getTaskMemoryStatus } : {}),
 		...(deps.getSettings ? { getSettings: deps.getSettings } : {}),
 	});
+	// A boot-time `--continue`/`--session` resume opens onto an existing
+	// conversation, so the launchpad's fresh-start onboarding would be a lie
+	// before the operator has typed anything.
+	if (deps.startsResumed === true) banner.collapseToSessionHeader();
 	const renderTrace = getActiveRenderTrace();
 	const chatPanel = factories.createChatPanel({
 		getOutputStyle: () => deps.getSettings?.().interface.outputDetail ?? "standard",
@@ -241,8 +263,7 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 	});
 	const followUpQueuePanel = factories.createFollowUpQueuePanel({
 		getDequeueKey: () => {
-			const first = keybindings.getKeys("clio-coder.message.dequeue")[0];
-			return typeof first === "string" && first.length > 0 ? first : undefined;
+			return keybindings.actionLabel("clio-coder.message.dequeue");
 		},
 	});
 	const statusController = factories.createStatusController({
@@ -397,6 +418,7 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 			: {}),
 		getWorkspaceSnapshot: getLiveWorkspaceSnapshot,
 		getExtensionStats,
+		...(deps.getExtensionStatus ? { getExtensionStatus: deps.getExtensionStatus } : {}),
 		getSessionInfo: () => {
 			const meta = deps.session?.current();
 			return {
@@ -407,7 +429,9 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 		},
 		getLastTurnSummary: () => lastTurnSummary,
 		getNotifications: () => notifications.list(),
-		dismissKeyLabel: formatKeyLabel(keybindings.getKeys("clio-coder.notifications.dismiss")[0]),
+		get dismissKeyLabel() {
+			return keybindings.actionLabel("clio-coder.notifications.dismiss");
+		},
 	};
 	footer = factories.buildFooter(footerDeps);
 	const unsubscribeObservability = deps.observability.subscribe((snapshot) => {
@@ -441,11 +465,13 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 		getTurnPreparation: () => deps.chat.turnPreparation().phase,
 		willEnterSteer: (text) => willEnterSteerActiveWork(deps, text),
 		getSubmitKeyLabel: () => formatKeyLabel(keybindings.getKeys("tui.input.submit")[0], "Enter"),
-		getNewlineKeyLabel: () => formatKeyLabel(keybindings.getKeys("tui.input.newLine")[0], "Shift+Enter"),
+		getNewlineKeyLabel: () => formatKeyLabel(keybindings.getKeys("tui.input.newLine")[0], "Ctrl+J"),
 	};
 	const editor = deps.editor ?? factories.createEditor(deps.tui, editorChrome);
 	editor.focused = true;
 	const autocomplete: AutocompleteProvider = factories.createAutocomplete({
+		promptTemplates: () => deps.resources?.prompts(getCwd()).items ?? [],
+		...(deps.extensionCommands ? { extensionCommands: deps.extensionCommands } : {}),
 		completionSources: {
 			agents: async () =>
 				(deps.agents?.listSpecs() ?? []).filter(isUserVisibleAgent).map((agent) => ({
@@ -599,6 +625,9 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 	const disposeBeforeStatus = (): void => {
 		if (beforeStatusDisposed) return;
 		beforeStatusDisposed = true;
+		// Before the subscriptions go: a project-context refresh already in flight
+		// must not land afterwards and ask a torn-down presentation for a frame.
+		banner.dispose();
 		footer.dispose();
 		unsubscribeObservability();
 		contextActivityStore.unsubscribe();

package/src/interactive/interactive-slash-runtime.ts

@@ -17,7 +17,7 @@ import {
 	type ThinkingLevel,
 	thinkingLevelChoiceLabel,
 } from "../domains/providers/index.js";
-import type { LibraryEntryKind, ResourcesContract } from "../domains/resources/index.js";
+import type { ResourcesContract } from "../domains/resources/index.js";
 import { installSkill } from "../domains/resources/skills/marketplace.js";
 import { foldDecisionBoard } from "../domains/session/decision-board.js";
 import type { SessionContract, SessionEntry } from "../domains/session/index.js";
@@ -33,7 +33,7 @@ import type { ChatLoop } from "./chat-loop.js";
 import { type ChatPanel, createChatPanel } from "./chat-panel.js";
 import { rehydrateChatPanelFromTurns } from "./chat-renderer.js";
 import { runCompactWithNotice } from "./command-fallbacks.js";
-import { appendNotice, appendOperatorCommand } from "./command-output.js";
+import { appendNotice, appendOperatorAside, appendOperatorCommand, appendReferenceCard } from "./command-output.js";
 import { runOperatorRecall } from "./context-recall-command.js";
 import { renderSessionHtml } from "./export-html/index.js";
 import { dateLocal } from "./format-time.js";
@@ -44,6 +44,7 @@ import {
 	type CouncilDispatchOutcome,
 	dispatchSlashCommand,
 	type InitCommandOptions,
+	type LibraryBrowseRequest,
 	parseSlashCommand,
 	type RunIo,
 	type SettingsAreaId,
@@ -61,6 +62,8 @@ export interface InteractiveSlashSubmitExpansion {
 	images: ImageContent[];
 	workingContextPaths: string[];
 	pendingSkillRequests: PendingSkillRequest[];
+	/** The typed line and a template note to paint instead of `text`; see `InteractiveSubmitExpansion`. */
+	display?: { text: string; note: string };
 }
 
 type SlashChat = Pick<ChatLoop, "clearSkillSurface" | "getSessionId" | "isStreaming" | "submit">;
@@ -72,6 +75,9 @@ type SlashAgents = Pick<AgentsContract, "getSpec" | "listSpecs">;
 type SlashShare = Pick<ShareContract, "writeArchive" | "planImport" | "importArchive">;
 
 export interface InteractiveSlashRuntimeDeps {
+	keyboardActions?: SlashCommandContext["keyboardActions"];
+	operatorExtensions?: SlashCommandContext["operatorExtensions"];
+	showExtensionOutput?: SlashCommandContext["showExtensionOutput"];
 	io: RunIo;
 	bus: SafeEventBus;
 	dispatch: DispatchContract;
@@ -82,6 +88,7 @@ export interface InteractiveSlashRuntimeDeps {
 	resources?: SlashResources;
 	extensions?: SlashExtensions;
 	reloadExtensions?: SlashCommandContext["reloadExtensions"];
+	reloadPlugins?: SlashCommandContext["reloadPlugins"];
 	interop?: SlashCommandContext["interop"];
 	agents?: SlashAgents;
 	share?: SlashShare;
@@ -119,7 +126,7 @@ export interface InteractiveSlashRuntimeDeps {
 	session?: Pick<SessionContract, "tree" | "current" | "appendEntry">;
 	expandSubmit: (text: string) => Promise<InteractiveSlashSubmitExpansion>;
 	openAskUser: AskUserHandler;
-	openSkillsHub: (tab?: LibraryEntryKind) => void;
+	openSkillsHub: (request?: LibraryBrowseRequest) => void;
 	openCost: () => void;
 	/** Run one `/btw` side question in its own overlay. */
 	openSideQuestion: (question: string) => void;
@@ -155,8 +162,6 @@ export interface InteractiveSlashRuntimeDeps {
 	openTree: () => void;
 	openMessagePicker: () => void;
 	openHelp: (query?: string) => void;
-	openAgents: () => void;
-	openPrompts: () => void;
 	openExtensions: () => void;
 	openInterop?: () => void;
 	openContextReset: () => void;
@@ -260,13 +265,22 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 			// is in the ledger yet, and a refused preflight must not leave a row
 			// that reads like a committed turn (issue #251).
 			let rowStatus: UserTurnStatus = "pending";
-			if (!willQueue) deps.chatPanel.appendUser(sub.text, () => rowStatus);
+			if (!willQueue) {
+				deps.chatPanel.appendUser(sub.display?.text ?? sub.text, () => rowStatus);
+				if (sub.display) {
+					appendOperatorAside(sub.display.note, {
+						appendReplayBlock: (renderBlock) => deps.chatPanel.appendReplayBlock(renderBlock),
+						requestRender: deps.requestRender,
+					});
+				}
+			}
 			deps.requestRender();
 			let acknowledgeAdmission = (): void => {};
 			const admitted = new Promise<void>((resolve) => {
 				acknowledgeAdmission = resolve;
 			});
 			const turn = deps.chat.submit(sub.text, {
+				...(sub.display ? { display: sub.display } : {}),
 				...(sub.images.length > 0 ? { images: sub.images } : {}),
 				...(sub.workingContextPaths.length > 0 ? { workingContextPaths: sub.workingContextPaths } : {}),
 				...(sub.pendingSkillRequests.length > 0 ? { pendingSkillRequests: sub.pendingSkillRequests } : {}),
@@ -310,6 +324,13 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 	const admitChat = async (text: string, signal?: AbortSignal): Promise<void> => {
 		try {
 			signal?.throwIfAborted();
+			// submitChat can be called directly, bypassing command dispatch. Keep
+			// the reserved clear command ahead of skill lookup and installation.
+			const command = parseSlashCommand(text);
+			if (command.kind === "skill-surface-clear") {
+				dispatchSlashCommand(command, context);
+				return;
+			}
 			const submitted = await deps.expandSubmit(text);
 			signal?.throwIfAborted();
 			const uninstalled = submitted.pendingSkillRequests.find((request) => !request.installed);
@@ -379,6 +400,12 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 				requestRender: deps.requestRender,
 			});
 		},
+		showReference: (card) => {
+			appendReferenceCard(card, {
+				appendReplayBlock: (renderBlock) => deps.chatPanel.appendReplayBlock(renderBlock),
+				requestRender: deps.requestRender,
+			});
+		},
 		dispatch: deps.dispatch,
 		...(deps.getDecisionBoard ? { getDecisionBoard: deps.getDecisionBoard } : {}),
 		bus: deps.bus,
@@ -393,6 +420,9 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 		openSkillsHub: deps.openSkillsHub,
 		clearSkillSurface: () => deps.chat.clearSkillSurface(),
 		listExtensions: () => deps.extensions?.list(cwd(), { all: true }) ?? [],
+		...(deps.keyboardActions ? { keyboardActions: deps.keyboardActions } : {}),
+		...(deps.operatorExtensions ? { operatorExtensions: deps.operatorExtensions } : {}),
+		...(deps.showExtensionOutput ? { showExtensionOutput: deps.showExtensionOutput } : {}),
 		listAgents: () => deps.agents?.listSpecs().filter((spec) => spec.audience !== "internal") ?? [],
 		listDelegationAgents: () => deps.getSettings?.().integrations.externalAgents.entries ?? [],
 		exportShareArchive: (outPath) => {
@@ -531,10 +561,9 @@ export function createInteractiveSlashRuntime(deps: InteractiveSlashRuntimeDeps)
 		openTree: deps.openTree,
 		openMessagePicker: deps.openMessagePicker,
 		openHelp: deps.openHelp,
-		openAgents: deps.openAgents,
-		openPrompts: deps.openPrompts,
 		openExtensions: deps.openExtensions,
 		...(deps.reloadExtensions ? { reloadExtensions: deps.reloadExtensions } : {}),
+		...(deps.reloadPlugins ? { reloadPlugins: deps.reloadPlugins } : {}),
 		...(deps.openInterop ? { openInterop: deps.openInterop } : {}),
 		...(deps.interop ? { interop: deps.interop } : {}),
 		setEditorText: (text) => {