@iowarp/clio-coder 0.4.6 → 0.4.7

package/src/interactive/interactive-application.ts

@@ -1,4 +1,4 @@
-import type { PermissionRequestedPayload } from "../core/bus-events.js";
+import { BusChannels, type PermissionRequestedPayload } from "../core/bus-events.js";
 import type { ClioSettings } from "../core/config.js";
 import { nextOutputStyle } from "../core/defaults.js";
 import type { SafeEventBus } from "../core/event-bus.js";
@@ -11,6 +11,7 @@ import type { ClioKeybinding } from "../domains/config/keybindings.js";
 import type { ContextState } from "../domains/context/index.js";
 import type { DispatchContract } from "../domains/dispatch/contract.js";
 import type { ExtensionsContract } from "../domains/extensions/index.js";
+import { OperatorExtensionRuntime } from "../domains/extensions/operator-runtime.js";
 import type { InteropContract } from "../domains/interop/index.js";
 import type { TaskMemoryOperatorStatus } from "../domains/memory/index.js";
 import { openDetachedBatchViews } from "../domains/middleware/index.js";
@@ -68,7 +69,6 @@ import type { createYaziBridge, YaziBridge } from "./yazi-bridge.js";
 
 export {
 	IDLE_LEADER_STATE,
-	LEADER_TIMEOUT_MS,
 	type LeaderKeyController,
 	type LeaderKeyControllerDeps,
 	type LeaderKeyRouteDeps,
@@ -125,8 +125,9 @@ export interface InteractiveDeps {
 	initialNotices?: ReadonlyArray<string>;
 	resources?: ResourcesContract;
 	extensions?: ExtensionsContract;
-	/** `/resources extensions reload` seam; the composition root supplies the coordinator. */
+	/** `/extensions reload` seam; the composition root supplies the coordinator. */
 	reloadExtensions?: SlashCommandContext["reloadExtensions"];
+	reloadPlugins?: SlashCommandContext["reloadPlugins"];
 	interop?: InteropContract;
 	share?: ShareContract;
 	/**
@@ -202,6 +203,12 @@ export interface InteractiveDeps {
 	registerAskUserHandler?: (handler: AskUserHandler) => () => void;
 	/** Live CLIO-CODER.md and memory state for the footer Context quadrant. */
 	getContextState?: (cwd?: string) => ContextState;
+	/**
+	 * True when this process resumed an existing session at boot (`--continue`,
+	 * `--session <id>`). The welcome header opens collapsed so a conversation
+	 * with history is not topped by fresh-start onboarding.
+	 */
+	startsResumed?: boolean;
 	/**
 	 * Persist a thinking level set by `/thinking <level>` or `/model <pattern>:<level>`.
 	 * Scope "session" leaves settings.yaml alone; omitted means the historical
@@ -273,9 +280,17 @@ export interface InteractiveSubmitExpansion {
 	images: ImageContent[];
 	workingContextPaths: string[];
 	pendingSkillRequests: PendingSkillRequest[];
+	/**
+	 * What the transcript paints as the operator's turn when `text` is a prompt
+	 * template's body: the line they typed, and a note naming the template. The
+	 * model still receives `text`; a `/wtfp:new-paper` body is several hundred
+	 * lines the operator never wrote, and painting it as their message buried
+	 * the command under it.
+	 */
+	display?: { text: string; note: string };
 }
 
-async function expandInteractiveSubmitAsync(
+export async function expandInteractiveSubmitAsync(
 	text: string,
 	resources: ResourcesContract | undefined,
 	cwd = process.cwd(),
@@ -291,11 +306,18 @@ async function expandInteractiveSubmitAsync(
 		includeImages: true,
 		missing: "leave",
 	});
+	const display = promptExpansion?.expanded
+		? {
+				text: parsed.text.trim(),
+				note: `expanded prompt template ${promptExpansion.template.name} (${promptExpansion.text.split("\n").length} lines)`,
+			}
+		: undefined;
 	return {
 		text: fileExpansion.text,
 		images: fileExpansion.images,
 		workingContextPaths: fileExpansion.referencedPaths,
 		pendingSkillRequests: parsed.pendingSkillRequests,
+		...(display ? { display } : {}),
 	};
 }
 
@@ -323,6 +345,7 @@ export interface KeyBindingDeps {
 	openDecisions: () => void;
 	backgroundDispatch: () => void;
 	openModelSelector: () => void;
+	openLibrary: () => void;
 	openTree: () => void;
 	cycleScopedModelForward: () => void;
 	cycleScopedModelBackward: () => void;
@@ -356,7 +379,7 @@ export function resolveCtrlCAction(deps: CtrlCActionDeps): CtrlCAction {
 	return "arm-shutdown";
 }
 
-function dispatchInteractiveAction(id: ClioKeybinding, deps: KeyBindingDeps): boolean {
+export function dispatchInteractiveAction(id: ClioKeybinding, deps: KeyBindingDeps): boolean {
 	switch (id) {
 		case "clio-coder.output.cycle":
 			deps.cycleOutputStyle();
@@ -403,6 +426,9 @@ function dispatchInteractiveAction(id: ClioKeybinding, deps: KeyBindingDeps): bo
 		case "clio-coder.model.select":
 			deps.openModelSelector();
 			return true;
+		case "clio-coder.library.toggle":
+			deps.openLibrary();
+			return true;
 		case "clio-coder.model.cycleBackward":
 			deps.cycleScopedModelBackward();
 			return true;
@@ -430,6 +456,7 @@ export function routeInteractiveKey(data: string, deps: KeyBindingDeps): boolean
 		"clio-coder.decisions.open",
 		"clio-coder.dispatch.background",
 		"clio-coder.model.select",
+		"clio-coder.library.toggle",
 		// Match cycleBackward before cycleForward so a user rebind where one key
 		// is a prefix of the other resolves to the more specific binding first.
 		// The defaults (alt+k / alt+j) do not prefix-match each other.
@@ -536,9 +563,49 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 	 * rail reads it through the optional chain before then as "no prompt".
 	 */
 	let overlayLifecycle: OverlayLifecycleController;
+	let refreshOperatorUi = (): void => {};
+	let scheduleOperatorMaintenance = (): void => {};
+	let operatorTimer: ReturnType<typeof setTimeout> | undefined;
+	let operatorPanelValid: (() => boolean) | undefined;
+	const operatorExtensions = deps.extensions
+		? new OperatorExtensionRuntime({
+				context: () => ({
+					workspace: process.cwd(),
+					sessionId: deps.session?.current()?.id ?? deps.getSessionId?.() ?? null,
+					mode: "interactive",
+				}),
+				isIdle: () =>
+					!deps.chat.isStreaming() &&
+					deps.chat.turnPreparation().phase === "idle" &&
+					(overlayLifecycle?.getState() ?? "closed") === "closed" &&
+					!editorSubmit?.hasActiveEditorBash(),
+				list: (cwd) => deps.extensions?.list(cwd, { all: true }) ?? [],
+				...(deps.reloadExtensions ? { commitHooks: deps.reloadExtensions } : {}),
+				onChange: () => refreshOperatorUi(),
+				...(deps.toolRegistry
+					? {
+							frozenTools: deps.toolRegistry
+								.listAll()
+								.flatMap((tool) => (tool.sourceInfo?.extension ? [tool.sourceInfo.extension] : [])),
+						}
+					: {}),
+				onDiagnostic: (message) => notify("warning", message, "operator-extensions:observation"),
+				onReload: (result) => {
+					if (result.status !== "deferred")
+						notify(result.status === "rejected" ? "error" : "info", result.message, "operator-extensions:reload");
+				},
+			})
+		: undefined;
 	const presentation = createInteractivePresentation({
 		bus: deps.bus,
 		getLeaderArmed: () => leaderArmed,
+		extensionCommands: () => operatorExtensions?.commands() ?? [],
+		getExtensionStatus: () =>
+			overlayLifecycle?.getState() === "permission-confirm"
+				? []
+				: (operatorExtensions?.entries() ?? []).flatMap((entry) =>
+						entry.status ? [`${entry.id}: ${entry.status.text}`] : [],
+					),
 		getShutdownArmed: () => shutdownArmed,
 		isAwaitingApproval: () => overlayLifecycle?.getState() === "permission-confirm",
 		getPermissionInspection: () => {
@@ -577,6 +644,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		...(deps.getTaskMemoryStatus ? { getTaskMemoryStatus: deps.getTaskMemoryStatus } : {}),
 		...(deps.getTaskMemorySeedOffer ? { getTaskMemorySeedOffer: deps.getTaskMemorySeedOffer } : {}),
 		...(deps.getContextState ? { getContextState: deps.getContextState } : {}),
+		...(deps.startsResumed === true ? { startsResumed: true } : {}),
 	});
 	const {
 		keybindings,
@@ -621,6 +689,15 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 			: null;
 	const detachYaziBridge = yaziBridge ? deps.attachYaziBridge?.(yaziBridge) : undefined;
 	refreshPresentationFooter = () => footer.refresh();
+	refreshOperatorUi = () => {
+		scheduleOperatorMaintenance();
+		if (operatorPanelValid && !operatorPanelValid() && overlayLifecycle?.getState() === "extensions") {
+			operatorPanelValid = undefined;
+			overlayLifecycle.closeOverlay();
+		}
+		footer.refresh();
+		tui.requestRender();
+	};
 	const agentProgress = createAgentProgress(terminal);
 	// Desktop notifications are a protocol write on the terminal owner, issued
 	// outside any render transaction, so the sequence carries frameId null and
@@ -659,7 +736,10 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		setLastTurnSummary: (summary) => presentation.setLastTurnSummary(summary),
 		startTerminalProgress: () => agentProgress.start(),
 		stopTerminalProgress: () => agentProgress.stop(),
-		onTurnEnded: () => desktopNotifications.turnEnded(),
+		onTurnEnded: () => {
+			desktopNotifications.turnEnded();
+			operatorExtensions?.observe({ event: "turn_end", reason: "completed" });
+		},
 		refreshLiveWorkspaceGit,
 		refreshFooter: () => footer.refresh(),
 		requestRender: () => tui.requestRender(),
@@ -668,6 +748,9 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		appendTranscriptNotice: (level, text) => appendNotice(level, text, busNoticeSink),
 		refreshSettingsOverlay: () => overlayLifecycle.refreshSettingsOverlay(),
 		onConfigHotReload: (settings) => {
+			keybindings.reload(settings.interface.keybindings ?? {});
+			footer.refresh();
+			tui.requestRender();
 			const mode = settings.interface.smoothStreaming;
 			const autoAllowed = processAutoPacingAllowed(shell.hasObservedBackpressure());
 			chatRenderer.setSmoothStreamingMode(mode);
@@ -683,6 +766,30 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 	const toolRegistry = deps.toolRegistry;
 	const interopSurface = interop ? interopOverlaySurface(interop, (level, text) => notify(level, text)) : null;
 	const slashRuntime = createInteractiveSlashRuntime({
+		keyboardActions: {
+			background: () => backgroundActiveDispatch(),
+			editor: (text) => editorSubmit.openExternalEditorForInput(text),
+			interrupt: (text) => editorSubmit.interruptFromEditor(text),
+			dismiss: (all) => applicationController.dismissNotifications(all),
+			outputLabel: () => keybindings.actionLabel("clio-coder.output.cycle"),
+		},
+		...(operatorExtensions ? { operatorExtensions } : {}),
+		showExtensionOutput: (invocation, output) => {
+			const generation = operatorExtensions?.activeGeneration;
+			const id = invocation.split(":")[1];
+			const valid = () =>
+				operatorExtensions
+					?.entries()
+					.some((entry) => entry.id === id && entry.state === "ready" && entry.generation === generation) ?? false;
+			if (!valid()) return;
+			if (
+				output.panel &&
+				!deps.chat.isStreaming() &&
+				overlayLifecycle.openExtensionPanelState(id ?? invocation, output.panel, valid)
+			)
+				operatorPanelValid = valid;
+			else slashRuntime.context.showReference?.({ command: invocation, source: "operator extension", text: output.text });
+		},
 		io,
 		bus: deps.bus,
 		dispatch: deps.dispatch,
@@ -699,6 +806,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		...(deps.resources ? { resources: deps.resources } : {}),
 		...(deps.extensions ? { extensions: deps.extensions } : {}),
 		...(deps.reloadExtensions ? { reloadExtensions: deps.reloadExtensions } : {}),
+		...(deps.reloadPlugins ? { reloadPlugins: deps.reloadPlugins } : {}),
 		...(interopSurface ? { interop: interopSurface } : {}),
 		...(deps.agents ? { agents: deps.agents } : {}),
 		...(deps.share ? { share: deps.share } : {}),
@@ -721,7 +829,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		readStructuredEntries,
 		expandSubmit: (text) => expandInteractiveSubmitAsync(text, deps.resources),
 		openAskUser: (questions, options) => openAskUserOverlayState(questions, options),
-		openSkillsHub: (tab) => openSkillsHubState(tab),
+		openSkillsHub: (request) => openSkillsHubState(request),
 		openCost: () => openCostOverlayState(),
 		openSideQuestion: (question) => openSideQuestionOverlayState(question),
 		startHandoff: (goal) => startHandoffState(goal),
@@ -758,8 +866,6 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		openTree: () => openTreeOverlayState(),
 		openMessagePicker: () => openMessagePickerOverlayState(),
 		openHelp: (query) => openHelpOverlayState(query),
-		openAgents: () => openAgentsOverlayState(),
-		openPrompts: () => openPromptsOverlayState(),
 		openExtensions: () => openExtensionsOverlayState(),
 		openInterop: () => openInteropOverlayState(),
 		openContextReset: () => openContextResetOverlayState(),
@@ -816,6 +922,21 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 			interactiveSubscriptions.workers.reset();
 		});
 	};
+	/**
+	 * The same reset, plus the header collapse that adopting an existing
+	 * conversation implies. `/resume`, `/tree`, `/fork` and `/handoff` all rebuild
+	 * the transcript from a session that already has turns, so the launchpad's
+	 * fresh-start onboarding must not survive above it. `/new` deliberately calls
+	 * the bare reset above and re-expands the launchpad instead.
+	 *
+	 * Collapsing here rather than at each overlay call site keeps one seam for
+	 * all four paths; `collapseToSessionHeader` is idempotent, so a resume that is
+	 * immediately submitted to cannot produce a second transition.
+	 */
+	const adoptExistingConversation = (): void => {
+		presentation.collapseWelcomeDashboard();
+		resetTranscript();
+	};
 	overlayLifecycle = createOverlayLifecycle({
 		app: deps,
 		tui,
@@ -828,7 +949,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		dispatchBoard,
 		setFleetRunPhase: (runId, phase) => dispatchBoardStore.setFleetPhase(runId, phase),
 		chatPanel,
-		resetTranscript,
+		resetTranscript: adoptExistingConversation,
 		io,
 		readStructuredEntries,
 		announceTaskMemorySeedOffer,
@@ -869,9 +990,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		openTreeOverlayState,
 		openMessagePickerOverlayState,
 		openHelpOverlayState,
-		openAgentsOverlayState,
 		openSkillsHubState,
-		openPromptsOverlayState,
 		openExtensionsOverlayState,
 		openInteropOverlayState,
 		toggleDispatchBoardOverlay,
@@ -888,13 +1007,14 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 	const { cancelSelectedDispatch, steerSelectedDispatch } = dispatchSteering;
 
 	const cancelActiveRun = (): void => {
+		operatorExtensions?.cancel();
 		// Esc must not eat typed work: queued steers and follow-ups return to the
 		// editor before the abort, the same restore the reference implementation
 		// performs. cancel() then finds both queues already empty.
 		const restored = deps.chat.clearQueuedFollowUps();
 		if (restored.length > 0) {
-			const current = editor.getText();
-			editor.setText([restored.join("\n\n"), current].filter((part) => part.trim().length > 0).join("\n\n"));
+			const current = editor.getExpandedText();
+			editor.setLiteralText([restored.join("\n\n"), current].filter((part) => part.trim().length > 0).join("\n\n"));
 		}
 		chatRenderer.flush();
 		deps.chat.cancel();
@@ -919,19 +1039,19 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		tui.requestRender();
 	};
 	/**
-	 * Alt+J and Alt+K with nothing to step to. The help center documents both
+	 * Explicit model-cycle bindings with nothing to step to. The help center documents both
 	 * keys, so a keypress that changes no pixel reads as a broken binding rather
-	 * than as an empty set; the set itself is chosen in `/scoped-models`.
+	 * than as an empty set; the set itself is chosen in `/settings chat model-picker`.
 	 */
 	const announceEmptyScopedSet = (): void => {
 		notify(
 			"info",
-			"scoped models: nothing to cycle to; run /scoped-models to choose the set Alt+J and Alt+K step through",
+			"scoped models: nothing to cycle to; run /settings chat model-picker to choose the configured cycle set",
 			"scoped-models:empty",
 		);
 	};
 	/**
-	 * Alt+S / Ctrl+Alt+B. The dispatch tool owns the conversion and answers with
+	 * Ctrl+G s / /background. The dispatch tool owns the conversion and answers with
 	 * the line to show, so the refusal a review-gated or compete call returns is
 	 * rendered verbatim rather than restated here.
 	 */
@@ -1044,10 +1164,43 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 	});
 
 	applicationController = createInteractiveInputRuntime({
+		tui,
+		hasQueuedMessages: () => {
+			const queue = deps.chat.queuedMessages();
+			return queue.steer.length + queue.followUp.length > 0;
+		},
+		explainProtectedExit: () =>
+			notify(
+				"info",
+				`Work or queued messages remain. Cancel with Ctrl+C, recover with ${keybindings.actionLabel("clio-coder.message.dequeue")}, or use /quit.`,
+				"keyboard:exit",
+			),
+		explainThinkingUnavailable: () => notify("info", "This model supports only thinking off", "keyboard:thinking"),
+		explainSearchUnavailable: () =>
+			notify("info", "Clio transcript search requires fullscreen; use your terminal's Find", "keyboard:search"),
 		keybindings,
 		dispatchAction: dispatchInteractiveAction,
 		actions: {
-			canExit: () => editor.getText().length === 0,
+			canExit: () => {
+				if (editor.getText().length > 0) return false;
+				const queue = deps.chat.queuedMessages();
+				if (
+					deps.chat.isStreaming() ||
+					deps.chat.turnPreparation().phase !== "idle" ||
+					deps.dispatch.snapshot().running.length > 0 ||
+					editorSubmit.hasActiveEditorBash() ||
+					operatorExtensions?.busy ||
+					queue.steer.length + queue.followUp.length > 0
+				) {
+					notify(
+						"info",
+						`Work or queued messages remain. Cancel with Ctrl+C, recover with ${keybindings.actionLabel("clio-coder.message.dequeue")}, or use /quit.`,
+						"keyboard:exit",
+					);
+					return false;
+				}
+				return true;
+			},
 			cycleOutputStyle: () => {
 				const settings = deps.getSettings?.();
 				if (!settings || !deps.commitSetting) return;
@@ -1110,7 +1263,8 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		steerSelectedDispatch,
 		cancelSelectedDispatch,
 		cancelActiveEditorBash: () => editorSubmit.cancelActiveEditorBash(),
-		isStreaming: () => deps.chat.isStreaming() || deps.chat.turnPreparation().phase === "compacting",
+		isStreaming: () =>
+			deps.chat.isStreaming() || deps.chat.turnPreparation().phase !== "idle" || (operatorExtensions?.busy ?? false),
 		cancelActiveRun,
 		editor,
 		editorSubmit,
@@ -1127,6 +1281,9 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 			stopAgentProgress: agentProgress.stop,
 			disposeChat: () => deps.chat.dispose(),
 			disposeSubscriptions: () => {
+				clearTimeout(operatorTimer);
+				for (const unsubscribe of operatorSubscriptions) unsubscribe();
+				void operatorExtensions?.dispose();
 				detachYaziBridge?.();
 				yaziBridge?.dispose();
 				detachWatchPane?.();
@@ -1155,6 +1312,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 			if (leftBehind !== null) process.stderr.write(`${leftBehind}\n`);
 			try {
 				if (dumpInputWedgeOnTerminate) process.off("SIGTERM", dumpInputWedgeOnTerminate);
+				await operatorExtensions?.dispose();
 				await deps.onShutdown();
 			} finally {
 				if (lease) await lease.close();
@@ -1163,7 +1321,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		},
 		registerInputListener: (listener) => {
 			if (lease) lease.registerApplicationInput(listener);
-			else tui.addInputListener(listener);
+			else tui.setApplicationInputPolicy(listener);
 		},
 		...(lease
 			? {
@@ -1180,6 +1338,36 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 			: {}),
 	});
 
+	const operatorSubscriptions = operatorExtensions
+		? [
+				BusChannels.SessionStart,
+				BusChannels.SessionEnd,
+				BusChannels.SessionParked,
+				BusChannels.SessionResumed,
+				BusChannels.SessionTurnSwitched,
+			].map((channel) => deps.bus.on(channel, () => operatorExtensions.invalidateContext()))
+		: [];
+	scheduleOperatorMaintenance = () => {
+		clearTimeout(operatorTimer);
+		const delay = operatorExtensions?.maintenanceDelayMs;
+		if (delay === undefined || delay === null) return;
+		operatorTimer = setTimeout(() => {
+			operatorExtensions?.maintenance();
+			scheduleOperatorMaintenance();
+		}, delay);
+		operatorTimer.unref();
+	};
+	queueMicrotask(() => {
+		void operatorExtensions?.reload("startup");
+	});
+	getTerminationCoordinator().onDrain(
+		async () => {
+			clearTimeout(operatorTimer);
+			for (const unsubscribe of operatorSubscriptions) unsubscribe();
+			await operatorExtensions?.dispose();
+		},
+		{ timeoutMs: 6500 },
+	);
 	if (lease) {
 		const adopted = lease.adopt({
 			root: presentation.root,