@iowarp/clio-coder 0.4.0 → 0.4.2

package/src/interactive/interactive-application.ts

@@ -46,6 +46,7 @@ import type { createMuxBridge } from "./mux-bridge.js";
 import { createOverlayLifecycle, type OverlayLifecycleController, type OverlayState } from "./overlay-lifecycle.js";
 import { interopOverlaySurface } from "./overlays/interop.js";
 import { paneWatchDecision } from "./pane-policy.js";
+import { describePanesLeftBehind } from "./panes-runtime.js";
 import { writeInputWedgeDump } from "./render-trace.js";
 import { settleChatBeforeSessionSwitch } from "./session-switch-settlement.js";
 import { createSessionTranscript } from "./session-transcript.js";
@@ -53,9 +54,11 @@ import type {
 	ContextClearCommandOptions,
 	InitCommandOptions,
 	RunIo,
+	SettingsAreaId,
+	SlashCommandContext,
 	TaskMemorySeedCommandResult,
 } from "./slash-commands.js";
-import { processAutoPacingAllowed, resolveSmoothStreamingMode } from "./stream-pacing-policy.js";
+import { processAutoPacingAllowed } from "./stream-pacing-policy.js";
 import type { TerminalLease } from "./terminal-lease.js";
 import type { createWatchPaneController } from "./watch-pane.js";
 import { createWorkspaceFacts } from "./workspace-facts.js";
@@ -91,20 +94,6 @@ export {
 	type SlashCommandKind,
 } from "./slash-commands.js";
 
-export function shouldAnnouncePermissionRequest(
-	seenRequestIds: Set<string>,
-	requestId: string,
-	maxSize = 2048,
-): boolean {
-	if (seenRequestIds.has(requestId)) return false;
-	seenRequestIds.add(requestId);
-	if (seenRequestIds.size > maxSize) {
-		const oldest = seenRequestIds.values().next().value;
-		if (oldest !== undefined) seenRequestIds.delete(oldest);
-	}
-	return true;
-}
-
 export function isLiveWorkerEscalationRequest(payload: PermissionRequestedPayload): boolean {
 	if (typeof payload.requestId !== "string") return false;
 	if (payload.escalation !== true) return false;
@@ -134,6 +123,8 @@ export interface InteractiveDeps {
 	initialNotices?: ReadonlyArray<string>;
 	resources?: ResourcesContract;
 	extensions?: ExtensionsContract;
+	/** `/resources extensions reload` seam; the composition root supplies the coordinator. */
+	reloadExtensions?: SlashCommandContext["reloadExtensions"];
 	interop?: InteropContract;
 	share?: ShareContract;
 	/**
@@ -243,7 +234,7 @@ export interface InteractiveDeps {
 	onForkSession?: (parentTurnId: string) => void;
 	/**
 	 * Run `/context compact` for the current session. Resolves the compaction model
-	 * (settings.compaction.model with fallback to the orchestrator target),
+	 * (settings.context.compaction.model with fallback to the chat target),
 	 * reads session entries, streams a summary via the session compaction
 	 * engine, and persists a compactionSummary entry.
 	 */
@@ -282,7 +273,7 @@ export interface InteractiveSubmitExpansion {
 	pendingSkillRequests: PendingSkillRequest[];
 }
 
-export async function expandInteractiveSubmitAsync(
+async function expandInteractiveSubmitAsync(
 	text: string,
 	resources: ResourcesContract | undefined,
 	cwd = process.cwd(),
@@ -314,7 +305,7 @@ function availableInteractiveThinkingLevels(deps: InteractiveDeps): ReadonlyArra
 export interface KeyBindingDeps {
 	/**
 	 * Keybinding lookup injected by startInteractive. Defaults come from
-	 * CLIO_KEYBINDINGS; user overrides from settings.keybindings. Tests may
+	 * CLIO_KEYBINDINGS; user overrides from settings.interface.keybindings. Tests may
 	 * substitute a narrower matcher via createKeybindingManagerForTesting.
 	 */
 	matches: (data: string, id: ClioKeybinding) => boolean;
@@ -324,6 +315,8 @@ export interface KeyBindingDeps {
 	requestShutdown: () => void;
 	toggleStatus: () => void;
 	toggleDispatchBoard: () => void;
+	/** `/files` as a key: open the files pane when closed, close it when open. */
+	toggleFilesPane: () => void;
 	openTasks: () => void;
 	openDecisions: () => void;
 	backgroundDispatch: () => void;
@@ -365,73 +358,76 @@ export function resolveCtrlCAction(deps: CtrlCActionDeps): CtrlCAction {
 	return "arm-shutdown";
 }
 
-export function dispatchInteractiveAction(id: ClioKeybinding, deps: KeyBindingDeps): boolean {
+function dispatchInteractiveAction(id: ClioKeybinding, deps: KeyBindingDeps): boolean {
 	switch (id) {
-		case "clio.notifications.dismiss":
+		case "clio-coder.notifications.dismiss":
 			deps.dismissNotifications();
 			return true;
-		case "clio.tool.expand":
+		case "clio-coder.tool.expand":
 			deps.toggleToolExpansion();
 			return true;
-		case "clio.tool.expandAll":
+		case "clio-coder.tool.expandAll":
 			deps.toggleAllToolExpansion();
 			return true;
-		case "clio.tool.liveOutput":
+		case "clio-coder.tool.liveOutput":
 			deps.toggleLiveToolOutput();
 			return true;
-		case "clio.editor.external":
+		case "clio-coder.editor.external":
 			deps.openExternalEditor();
 			return true;
-		case "clio.message.followUp":
+		case "clio-coder.message.followUp":
 			deps.queueFollowUp();
 			return true;
-		case "clio.message.interrupt":
+		case "clio-coder.message.interrupt":
 			deps.interruptWithMessage();
 			return true;
-		case "clio.message.dequeue":
+		case "clio-coder.message.dequeue":
 			deps.restoreQueuedFollowUps();
 			return true;
-		case "clio.thinking.expand":
+		case "clio-coder.thinking.expand":
 			deps.toggleThinkingExpansion();
 			return true;
-		case "clio.thinking.expandAll":
+		case "clio-coder.thinking.expandAll":
 			deps.toggleAllThinkingExpansion();
 			return true;
-		case "clio.status.toggle":
+		case "clio-coder.status.toggle":
 			deps.toggleStatus();
 			return true;
-		case "clio.thinking.cycle":
+		case "clio-coder.thinking.cycle":
 			deps.cycleThinking();
 			return true;
-		case "clio.session.tree":
+		case "clio-coder.session.tree":
 			deps.openTree();
 			return true;
-		case "clio.dispatchBoard.toggle":
+		case "clio-coder.dispatchBoard.toggle":
 			deps.toggleDispatchBoard();
 			return true;
-		case "clio.tasks.open":
+		case "clio-coder.files.toggle":
+			deps.toggleFilesPane();
+			return true;
+		case "clio-coder.tasks.open":
 			deps.openTasks();
 			return true;
-		case "clio.decisions.open":
+		case "clio-coder.decisions.open":
 			deps.openDecisions();
 			return true;
-		case "clio.dispatch.background":
+		case "clio-coder.dispatch.background":
 			deps.backgroundDispatch();
 			return true;
-		case "clio.model.select":
+		case "clio-coder.model.select":
 			deps.openModelSelector();
 			return true;
-		case "clio.model.cycleBackward":
+		case "clio-coder.model.cycleBackward":
 			deps.cycleScopedModelBackward();
 			return true;
-		case "clio.model.cycleForward":
+		case "clio-coder.model.cycleForward":
 			deps.cycleScopedModelForward();
 			return true;
-		case "clio.exit":
+		case "clio-coder.exit":
 			if (deps.canExit && !deps.canExit()) return false;
 			deps.requestShutdown();
 			return true;
-		case "clio.leader":
+		case "clio-coder.leader":
 			return false;
 	}
 }
@@ -439,20 +435,21 @@ export function dispatchInteractiveAction(id: ClioKeybinding, deps: KeyBindingDe
 /** Pure key router: returns true when the input was consumed. */
 export function routeInteractiveKey(data: string, deps: KeyBindingDeps): boolean {
 	const order: ClioKeybinding[] = [
-		"clio.status.toggle",
-		"clio.thinking.cycle",
-		"clio.session.tree",
-		"clio.dispatchBoard.toggle",
-		"clio.tasks.open",
-		"clio.decisions.open",
-		"clio.dispatch.background",
-		"clio.model.select",
+		"clio-coder.status.toggle",
+		"clio-coder.thinking.cycle",
+		"clio-coder.session.tree",
+		"clio-coder.dispatchBoard.toggle",
+		"clio-coder.files.toggle",
+		"clio-coder.tasks.open",
+		"clio-coder.decisions.open",
+		"clio-coder.dispatch.background",
+		"clio-coder.model.select",
 		// 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.
-		"clio.model.cycleBackward",
-		"clio.model.cycleForward",
-		"clio.exit",
+		"clio-coder.model.cycleBackward",
+		"clio-coder.model.cycleForward",
+		"clio-coder.exit",
 	];
 	for (const id of order) {
 		if (deps.matches(data, id)) return dispatchInteractiveAction(id, deps);
@@ -461,13 +458,13 @@ export function routeInteractiveKey(data: string, deps: KeyBindingDeps): boolean
 }
 
 export async function createInteractiveApplication(deps: InteractiveDeps): Promise<number> {
-	const initialSmoothStreaming = resolveSmoothStreamingMode(deps.getSettings?.().terminal.smoothStreaming ?? "off");
+	const initialSmoothStreaming = deps.getSettings?.().interface.smoothStreaming ?? "off";
 	const initialAutoPacingAllowed = processAutoPacingAllowed(false);
 	const lease = deps.terminalLease;
 	const shell =
 		lease?.shell ??
 		createProcessInteractiveShell({
-			tuiMode: deps.getSettings?.().terminal.tuiMode ?? "regular",
+			tuiMode: deps.getSettings?.().interface.mode ?? "regular",
 			streamPacingActive:
 				initialSmoothStreaming === "on" || (initialSmoothStreaming === "auto" && initialAutoPacingAllowed),
 			...(deps.onFirstFrameCommit ? { onFirstFrameCommit: deps.onFirstFrameCommit } : {}),
@@ -619,10 +616,10 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 					getDraft: () => editor.getText(),
 					setDraft: (text) => editor.setText(text),
 					requestRender: () => tui.requestRender(),
-					notice: (level, text) => notify(level, text, `yazi:${level}`),
+					notice: (level, text) => notify(level, text, `files:${level}`),
 					getCwd: () => process.cwd(),
 					getSettings: () =>
-						deps.getSettings?.().panes.yazi ?? {
+						deps.getSettings?.().interface.panes.files ?? {
 							mode: "companion",
 							profile: "managed",
 							followCwd: true,
@@ -643,7 +640,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 	// `CLIO_CODER_INTERACTIVE=1` forced the interactive surface on.
 	const desktopNotifications = createInteractiveDesktopNotifications({
 		write: (data) => terminal.write(data),
-		enabled: () => deps.getSettings?.().terminal.notify ?? false,
+		enabled: () => deps.getSettings?.().interface.desktopNotifications ?? false,
 		interactiveTty: () => process.stdout.isTTY === true,
 		getOpenBatches: () => openDetachedBatchViews(deps.dispatch),
 	});
@@ -685,7 +682,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		appendTranscriptNotice: (level, text) => appendNotice(level, text, busNoticeSink),
 		refreshSettingsOverlay: () => overlayLifecycle.refreshSettingsOverlay(),
 		onConfigHotReload: (settings) => {
-			const mode = resolveSmoothStreamingMode(settings.terminal.smoothStreaming);
+			const mode = settings.interface.smoothStreaming;
 			const autoAllowed = processAutoPacingAllowed(shell.hasObservedBackpressure());
 			chatRenderer.setSmoothStreamingMode(mode);
 			shell.setStreamPacingActive(mode === "on" || (mode === "auto" && autoAllowed));
@@ -715,6 +712,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		settleVisibleFrame: (reason) => chatRenderer.flushAndCommit(reason),
 		...(deps.resources ? { resources: deps.resources } : {}),
 		...(deps.extensions ? { extensions: deps.extensions } : {}),
+		...(deps.reloadExtensions ? { reloadExtensions: deps.reloadExtensions } : {}),
 		...(interopSurface ? { interop: interopSurface } : {}),
 		...(deps.agents ? { agents: deps.agents } : {}),
 		...(deps.share ? { share: deps.share } : {}),
@@ -742,6 +740,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		openSideQuestion: (question) => openSideQuestionOverlayState(question),
 		startHandoff: (goal) => startHandoffState(goal),
 		startFleetRun: (name, vars) => startFleetRunState(name, vars),
+		openFleetRuns: () => toggleDispatchBoardOverlay(),
 		...(toolRegistry ? { runCouncilDispatch: (args) => dispatchCouncilThroughRegistry(toolRegistry, args) } : {}),
 		openContextView: () => openContextViewOverlayState(),
 		openTasks: () => openTasksOverlayState(),
@@ -752,7 +751,22 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		...(deps.panes ? { panes: deps.panes } : {}),
 		openModel: () => openModelOverlayState(),
 		openModelScope: (ref) => openModelScopeState(ref),
-		openSettings: (section, rowId) => openSettingsOverlayState(section, rowId),
+		openSettings: (area, group) => {
+			if (!area) return openSettingsOverlayState();
+			// Compatibility adapter until the seven-area Settings shell replaces
+			// the legacy section ids. Slash grammar never exposes these old names.
+			if (area === "chat" && group === "model-picker") return openSettingsOverlayState("models", "scope");
+			const section = {
+				chat: "orchestrator",
+				fleet: "fleet",
+				targets: "targets",
+				context: "compaction",
+				safety: "safety",
+				interface: "terminal",
+				integrations: "advanced",
+			} satisfies Record<SettingsAreaId, Parameters<typeof openSettingsOverlayState>[0]>;
+			openSettingsOverlayState(section[area]);
+		},
 		openResume: () => openResumeOverlayState(),
 		startNewSession: () => startNewSession(),
 		openTree: () => openTreeOverlayState(),
@@ -870,6 +884,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		openPromptsOverlayState,
 		openExtensionsOverlayState,
 		openInteropOverlayState,
+		toggleDispatchBoardOverlay,
 	} = overlayLifecycle;
 
 	const dispatchSteering = createDispatchSteering({
@@ -947,7 +962,7 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 			? deps.createMuxBridge({
 					bus: deps.bus,
 					mux,
-					notificationsPolicy: () => deps.getSettings?.().panes.notifications ?? "failures",
+					notificationsPolicy: () => deps.getSettings?.().interface.panes.notifications ?? "failures",
 					log: (level, message) => {
 						if (level === "warning") notify("warning", message, "mux:bridge");
 					},
@@ -959,9 +974,25 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 	// tool drive the same controller through the shared operations object.
 	const watchPane =
 		mux && mux.mode !== "none" && deps.createWatchPane
-			? deps.createWatchPane({ mux, getCwd: () => process.cwd() })
+			? deps.createWatchPane({
+					mux,
+					getCwd: () => process.cwd(),
+					getWorkersRatio: () => deps.getSettings?.().interface.panes.workers.ratio ?? 0.34,
+				})
 			: null;
 	const detachWatchPane = watchPane ? deps.attachWatchPane?.(watchPane) : undefined;
+	// Boot composition per `interface.panes.layout`: `workers` opens the workers
+	// dock parked on "no selection"; `cockpit` adds the files dock. Fire and
+	// forget, and only against a live pane host: a boot must never fall through
+	// to the in-terminal chooser or block the first paint on socket traffic.
+	{
+		const bootSettings = deps.getSettings?.();
+		const layout = bootSettings?.interface.panes.layout ?? "off";
+		if (layout !== "off" && mux?.available()) {
+			void watchPane?.ensureOpen();
+			if (layout === "cockpit" && bootSettings?.interface.panes.files.enabled) void yaziBridge?.open();
+		}
+	}
 	const selectedWatchableRun = (): { runId: string; agentId: string } | null => {
 		if (!watchPane) return null;
 		const row = dispatchBoard.selectedRow();
@@ -1036,6 +1067,25 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 				if (deps.onCycleScopedModelBackward?.() === false) announceEmptyScopedSet();
 			},
 			backgroundActiveDispatch,
+			toggleFilesPane: () => {
+				const panes = deps.panes;
+				if (!panes) {
+					notify(
+						"info",
+						"the files pane is inactive: this session started without panes. Restart with `clio-coder --with-panes`, or set interface.panes.enabled=auto",
+						"files:info",
+					);
+					return;
+				}
+				void panes.files("toggle").then((result) => {
+					if (result.status === "opened") {
+						if (result.paneId !== null)
+							notify("success", `files pane ${result.existing ? "focused" : "opened"}`, "files:open");
+					} else if (result.status === "closed") notify("info", "files pane closed", "files:close");
+					else if (result.status === "missing-binary") notify("warning", result.detail, "files:missing");
+					else notify("warning", result.reason, "files:refused");
+				});
+			},
 		},
 		overlay: overlayLifecycle,
 		refreshFooter: () => footer.refresh(),
@@ -1117,6 +1167,11 @@ export async function createInteractiveApplication(deps: InteractiveDeps): Promi
 		},
 		cancelParkedCalls: (reason) => deps.toolRegistry?.cancelParkedCalls(reason),
 		onShutdown: async () => {
+			// The terminal is already stopped here and the domains have not, so this
+			// is the one moment a plain line about the pane host can both be read
+			// and still see the registry that shutdown is about to forget.
+			const leftBehind = mux && mux.mode !== "none" && mux.available() ? describePanesLeftBehind(mux) : null;
+			if (leftBehind !== null) process.stderr.write(`${leftBehind}\n`);
 			try {
 				if (dumpInputWedgeOnTerminate) process.off("SIGTERM", dumpInputWedgeOnTerminate);
 				await deps.onShutdown();

package/src/interactive/interactive-event-projection.ts

@@ -218,7 +218,7 @@ export function createInteractiveEventProjection(deps: InteractiveEventProjectio
 
 	remainingUnsubscribers.push(
 		deps.chat.onEvent((event) => {
-			const showProgress = deps.getSettings?.().terminal.showTerminalProgress ?? false;
+			const showProgress = deps.getSettings?.().interface.terminalProgress ?? false;
 			if (event.type === "agent_start" && showProgress) deps.startTerminalProgress();
 			else if (event.type === "agent_end") {
 				deps.stopTerminalProgress();

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

@@ -21,6 +21,7 @@ export interface InteractiveInputKeyActionDeps {
 	requestShutdown: () => void;
 	toggleStatus: () => void;
 	toggleDispatchBoard: () => void;
+	toggleFilesPane: () => void;
 	openTasks: () => void;
 	openDecisions: () => void;
 	backgroundDispatch: () => void;
@@ -54,6 +55,8 @@ export interface InteractiveInputRuntimeDeps {
 		cycleScopedModelBackward(): void;
 		/** Convert the newest attached dispatch into a detached batch and notice the outcome. */
 		backgroundActiveDispatch(): void;
+		/** Toggle the files pane; the application decides what "inactive" says. */
+		toggleFilesPane(): void;
 	};
 	overlay: {
 		getState(): OverlayState;
@@ -154,6 +157,7 @@ export function createInteractiveInputRuntime(deps: InteractiveInputRuntimeDeps)
 		openTasks: deps.overlay.openTasksOverlayState,
 		openDecisions: deps.overlay.openDecisionsOverlayState,
 		backgroundDispatch: deps.actions.backgroundActiveDispatch,
+		toggleFilesPane: deps.actions.toggleFilesPane,
 		openModelSelector: deps.overlay.openModelOverlayState,
 		openTree: deps.overlay.openTreeOverlayState,
 		cycleScopedModelForward: () => {
@@ -185,7 +189,7 @@ export function createInteractiveInputRuntime(deps: InteractiveInputRuntimeDeps)
 		restoreQueuedFollowUps: deps.editorSubmit.restoreQueuedFollowUpsToEditor,
 	});
 	const leaderKeys = createLeaderKeyController({
-		matchesLeader: (input) => deps.keybindings.matches(input, "clio.leader"),
+		matchesLeader: (input) => deps.keybindings.matches(input, "clio-coder.leader"),
 		leaderTargets: () => deps.keybindings.leaderTargets(),
 		dispatchAction: (id) => deps.dispatchAction(id, keyActionDeps()),
 		isRelease: isKeyRelease,
@@ -302,7 +306,7 @@ export function createInteractiveInputRuntime(deps: InteractiveInputRuntimeDeps)
 			deps.reportShutdownFailure ??
 			((step, error) => {
 				process.stderr.write(
-					`[clio:interactive] ${step} failed: ${error instanceof Error ? error.message : String(error)}\n`,
+					`[clio-coder:interactive] ${step} failed: ${error instanceof Error ? error.message : String(error)}\n`,
 				);
 			}),
 	});

package/src/interactive/interactive-presentation.ts

@@ -1,5 +1,6 @@
 import { performance } from "node:perf_hooks";
 import type { ClioSettings } from "../core/config.js";
+import { DEFAULT_SETTINGS } from "../core/defaults.js";
 import type { SafeEventBus } from "../core/event-bus.js";
 import type { ContextState } from "../domains/context/index.js";
 import type { DispatchContract } from "../domains/dispatch/contract.js";
@@ -36,7 +37,7 @@ import { createSlashCommandAutocompleteProvider } from "./slash-autocomplete.js"
 import { parseSlashCommand, type RunIo } from "./slash-commands.js";
 import { createStatusController, type StatusController, type TurnSummary } from "./status/index.js";
 import type { SmoothStreamingMode } from "./stream-pacer.js";
-import { processAutoPacingAllowed, resolveSmoothStreamingMode } from "./stream-pacing-policy.js";
+import { processAutoPacingAllowed } from "./stream-pacing-policy.js";
 import { formatTargetLabel } from "./theme/index.js";
 import { createWelcomeDashboard, type WelcomeDashboardComponent } from "./welcome-dashboard.js";
 import { readWorkerReceiptFacts } from "./worker-receipts.js";
@@ -209,7 +210,7 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 	const getCwd = deps.getCwd ?? (() => process.cwd());
 	const now = deps.now ?? performance.now.bind(performance);
 	const requestRender = (): void => deps.tui.requestRender();
-	const settings = deps.getSettings?.() ?? ({ keybindings: {} } as ClioSettings);
+	const settings = deps.getSettings?.() ?? structuredClone(DEFAULT_SETTINGS);
 	const keybindings = deps.keybindings ?? factories.createKeybindings(settings);
 	const { getExtensionStats, getLiveWorkspaceSnapshot, getWorkspaceSnapshot, refreshLiveWorkspaceGit } =
 		deps.workspaceFacts;
@@ -229,15 +230,15 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 	const renderTrace = getActiveRenderTrace();
 	const chatPanel = factories.createChatPanel({
 		getToolExpandKey: () => {
-			const first = keybindings.getKeys("clio.tool.expand")[0];
+			const first = keybindings.getKeys("clio-coder.tool.expand")[0];
 			return typeof first === "string" && first.length > 0 ? first : undefined;
 		},
-		getOutputVerbosity: () => deps.getSettings?.().terminal.outputVerbosity ?? "default",
+		getOutputVerbosity: () => deps.getSettings?.().interface.outputDetail ?? "default",
 		...(renderTrace ? { onRenderMetrics: (metrics) => renderTrace.recordPanelRender(metrics) } : {}),
 	});
 	const followUpQueuePanel = factories.createFollowUpQueuePanel({
 		getDequeueKey: () => {
-			const first = keybindings.getKeys("clio.message.dequeue")[0];
+			const first = keybindings.getKeys("clio-coder.message.dequeue")[0];
 			return typeof first === "string" && first.length > 0 ? first : undefined;
 		},
 	});
@@ -320,8 +321,8 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 			outputTokens,
 			durationMs,
 			ttftMs: Math.max(0, liveThroughput.firstDeltaAt - liveThroughput.startedAt),
-			providerId: settings?.orchestrator?.target ?? "",
-			modelId: settings?.orchestrator?.model ?? "",
+			providerId: settings?.chat?.target ?? "",
+			modelId: settings?.chat?.model ?? "",
 			recordedAt: Date.now(),
 		};
 	};
@@ -337,7 +338,11 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 	};
 	const dismissContextBootstrapNotices = (): void => {
 		for (const notice of notifications.list()) {
-			if (/^clio: (No CLIO\.md detected|malformed CLIO\.md ignored|Imported agent context changed)/.test(notice.text)) {
+			if (
+				/^(?:clio-coder|clio): (No CLIO(?:-CODER)?\.md detected|malformed CLIO(?:-CODER)?\.md ignored|Imported agent context changed)/.test(
+					notice.text,
+				)
+			) {
 				notifications.dismiss(notice.id);
 			}
 		}
@@ -390,7 +395,7 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 		},
 		getLastTurnSummary: () => lastTurnSummary,
 		getNotifications: () => notifications.list(),
-		dismissKeyLabel: formatKeyLabel(keybindings.getKeys("clio.notifications.dismiss")[0]),
+		dismissKeyLabel: formatKeyLabel(keybindings.getKeys("clio-coder.notifications.dismiss")[0]),
 	};
 	footer = factories.buildFooter(footerDeps);
 	const unsubscribeObservability = deps.observability.subscribe((snapshot) => {
@@ -403,18 +408,18 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 		getModelLabel: () => {
 			const current = deps.getSettings?.();
 			// The rail is the narrowest of the three, so it drops the spaces.
-			return formatTargetLabel(current?.orchestrator?.target, current?.orchestrator?.model, { separator: "·" });
+			return formatTargetLabel(current?.chat?.target, current?.chat?.model, { separator: "·" });
 		},
 		getThinkingLabel: () => {
 			const current = deps.getSettings?.();
 			return (
 				resolveModelRuntimeCapabilitiesForProviders(
 					deps.providers,
-					current?.orchestrator?.target,
-					current?.orchestrator?.model,
-					current?.orchestrator?.thinkingLevel ?? "off",
+					current?.chat?.target,
+					current?.chat?.model,
+					current?.chat?.thinkingLevel ?? "off",
 				)?.thinking.display ??
-				current?.orchestrator?.thinkingLevel ??
+				current?.chat?.thinkingLevel ??
 				"off"
 			);
 		},
@@ -447,7 +452,7 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 			? {
 					streamIngress: deps.resolveStreamIngress,
 					getSmoothStreamingMode: () => {
-						const mode = resolveSmoothStreamingMode(deps.getSettings?.().terminal.smoothStreaming ?? "off");
+						const mode = deps.getSettings?.().interface.smoothStreaming ?? "off";
 						const autoAllowed = processAutoPacingAllowed(deps.hasObservedBackpressure?.() ?? false);
 						deps.onSmoothStreamingMode?.(mode, mode === "on" || (mode === "auto" && autoAllowed));
 						return mode;
@@ -487,8 +492,8 @@ export function createInteractivePresentation(deps: InteractivePresentationDeps)
 			footer: footer.view,
 		},
 		{
-			mode: settings.terminal?.tuiMode ?? "regular",
-			fullscreenScrollbar: settings.terminal?.fullscreenScrollbar ?? "auto",
+			mode: settings.interface?.mode ?? "regular",
+			fullscreenScrollbar: settings.interface?.fullscreenScrollbar ?? "auto",
 		},
 	);
 	deps.mount?.(root, editor);

package/src/interactive/interactive-shell.ts

@@ -70,7 +70,7 @@ const KEEP_ALIVE_INTERVAL_MS = 1 << 30;
  * before the keep-alive anchor. Keeping that seam explicit prevents an
  * extraction from silently changing initialization order.
  */
-export function createInteractiveShell<TTerminal extends Terminal, TTui extends InteractiveShellTui>(
+function createInteractiveShell<TTerminal extends Terminal, TTui extends InteractiveShellTui>(
 	deps: InteractiveShellDeps<TTerminal, TTui>,
 ): InteractiveShell<TTerminal, TTui> {
 	const terminal = deps.createTerminal();
@@ -175,7 +175,7 @@ export function getActiveRenderTrace(): RenderTrace | null {
  * model state. After the finite pre-render bound, exactly one caller-supplied
  * final frame is still issued; a post-render drain wait is likewise bounded.
  */
-export async function settleLatestInteractiveFrame(
+async function settleLatestInteractiveFrame(
 	gate: Pick<StdoutBackpressureGate, "whenWritable"> | null,
 	timeoutMs: number,
 	renderFrame: () => Promise<number>,