@iowarp/clio-coder 0.3.1 → 0.3.2

package/src/interactive/overlays/help-reference.ts

@@ -41,17 +41,8 @@ export function openHelpOverlay(
 				// Overlay key actions are deliberately not duplicated here: each
 				// overlay's footer hint is the live source of its keys, and a static
 				// copy would rot exactly like the old SLASH_HOTKEYS table did.
-				detail: () => {
-					const lines = [`# Command: /${ref.name}`, `**Usage:** \`${ref.usage}\``, `**Description:** ${ref.description}`];
-					if (ref.aliases.length > 0) {
-						lines.push(`**Aliases:** ${ref.aliases.map((a) => `/${a}`).join(", ")}`);
-					}
-					return lines;
-				},
+				detail: () => [`# Command: /${ref.name}`, `**Usage:** \`${ref.usage}\``, `**Description:** ${ref.description}`],
 			};
-			if (ref.aliases.length > 0) {
-				item.meta = ref.aliases.join(", ");
-			}
 			return item;
 		});
 
@@ -109,6 +100,20 @@ export function openHelpOverlay(
 				"**Tasks versus runs**: `/tasks` shows the agent's plan steps. Fleet runs are concrete delegated worker executions and remain in this board as recent terminal history.",
 			],
 		},
+		{
+			id: "topic-steering-modes",
+			label: `${"steering modes".padEnd(30)}Interrupt, next slot, or end of turn: when a message lands mid-run`,
+			group: "Topics",
+			detail: () => [
+				"# Steering modes",
+				"While Clio is running, the key that submits a message chooses when it lands. The default is next slot.",
+				"**Next slot** (Enter): the message is delivered between tool batches, mid-run. The agent keeps going and reads it before its next model call.",
+				"**End of turn** (Alt+Enter by default): the message waits until the whole run settles and Clio would hand control back, then starts the next round.",
+				"**Interrupt** (Alt+I by default, or Ctrl+G then i): cancels the in-flight work the way Esc does, including a running bash child, then delivers the message as a fresh prompt. Anything already queued returns to the editor.",
+				"**Interrupt is refused** while an attached dispatch is running (the abort would kill the worker's run with no receipt; steer it with `@<agent>` or cancel it with Esc) and while a permission ask is parked (it is already waiting on you). In both cases the message is queued for the next slot and a notice says why.",
+				"**Alt+Up** restores queued messages to the editor. Workers accept next-slot steering only, through `@<agent>`.",
+			],
+		},
 		{
 			id: "topic-autonomy",
 			label: `${"autonomy & safety net".padEnd(30)}How the autonomy level and the always-on guardrails interact`,

package/src/interactive/overlays/model-selector.ts

@@ -22,6 +22,7 @@ import {
 } from "../../domains/providers/index.js";
 import {
 	type Component,
+	fuzzyFilter,
 	getKeybindings,
 	matchesKey,
 	type OverlayHandle,
@@ -45,6 +46,13 @@ const MODEL_OVERLAY_MAX_WIDTH = 120;
 const MODEL_OVERLAY_TERMINAL_PADDING = 8;
 const VISIBLE_ROWS = 10;
 const MODEL_MIN_WIDTH = 14;
+/**
+ * Every other column pair is separated by an explicit space. The model cell
+ * instead relies on its own padding, so a label that fills the column exactly
+ * butts straight against the ctx figure. The gutter is reserved inside the
+ * model cell, which keeps the header and the rows on the same column stops.
+ */
+const MODEL_COL_GUTTER = 1;
 const CONTEXT_COL_WIDTH = 7;
 const CAPS_COL_WIDTH = 5;
 const TARGET_COL_WIDTH_NARROW = 8;
@@ -549,6 +557,11 @@ function modelColumns(width: number): ModelColumns {
 	};
 }
 
+/** The model cell, always leaving `MODEL_COL_GUTTER` blank columns before ctx. */
+function fitModelCell(text: string, columnWidth: number): string {
+	return fitCell(truncateMiddle(text, Math.max(1, columnWidth - MODEL_COL_GUTTER)), columnWidth);
+}
+
 function fitCell(text: string, width: number, align: "left" | "right" = "left"): string {
 	const clipped = truncateToWidth(text, width, "", true);
 	const pad = " ".repeat(Math.max(0, width - visibleWidth(clipped)));
@@ -577,7 +590,7 @@ function formatModelHeader(width: number): string {
 	const columns = modelColumns(width);
 	let line =
 		`${" ".repeat(SELECTED_PREFIX_WIDTH)}` +
-		`${fitCell("model", columns.modelWidth)}` +
+		`${fitModelCell("model", columns.modelWidth)}` +
 		`${fitCell("ctx", CONTEXT_COL_WIDTH, "right")} ` +
 		`${fitCell("caps", CAPS_COL_WIDTH)}`;
 	if (columns.showTarget) line += ` ${fitCell("target", columns.targetWidth)}`;
@@ -597,7 +610,7 @@ function formatModelRow(row: ModelRow, width: number, selected: boolean): string
 	const health = theme.fg(healthToken(row), row.healthGlyph);
 	const prefix = `${pointer} ${health} ${activeMark(row)} `;
 	const modelLabel = row.model.length > 0 ? row.model : "(no model ids)";
-	const modelCell = fitCell(truncateMiddle(modelLabel, columns.modelWidth), columns.modelWidth);
+	const modelCell = fitModelCell(modelLabel, columns.modelWidth);
 	const model = selected ? theme.style("accent", modelCell, { bold: true }) : theme.fg("muted", modelCell);
 	let line =
 		prefix +
@@ -667,14 +680,18 @@ function formatModelDetail(row: ModelRow, width: number): string[] {
 	];
 }
 
-function matchesQuery(row: ModelRow, query: string): boolean {
-	const tokens = query
-		.toLowerCase()
-		.split(/\s+/)
-		.map((token) => token.trim())
-		.filter(Boolean);
-	if (tokens.length === 0) return true;
-	const haystack = [
+/**
+ * Keep the target-qualified ref ahead of the bare model id. This mirrors
+ * pi-coding-agent's provider-first model-selector search text, so an exact
+ * target/model query ranks ahead of a proxy target carrying that ref as its
+ * model id. Clio's runtime and availability facts remain searchable after the
+ * ranking prefix.
+ */
+function modelSelectorSearchText(row: ModelRow): string {
+	const qualifiedModel = row.model.length > 0 ? `${row.target}/${row.model}` : row.target;
+	return [
+		row.target,
+		qualifiedModel,
 		row.target,
 		row.model,
 		row.runtimeName,
@@ -690,10 +707,11 @@ function matchesQuery(row: ModelRow, query: string): boolean {
 		row.maxTokens,
 		row.authText,
 		row.healthText,
-	]
-		.join(" ")
-		.toLowerCase();
-	return tokens.every((token) => haystack.includes(token));
+	].join(" ");
+}
+
+function filterModelRows(rows: ReadonlyArray<ModelRow>, query: string): ModelRow[] {
+	return fuzzyFilter([...rows], query, modelSelectorSearchText);
 }
 
 function visibleSlice<T>(
@@ -728,7 +746,7 @@ function renderModelOverlayLines(input: {
 	const width = Math.max(1, input.width);
 	const query = input.query.trim();
 	const searching = query.length > 0;
-	const allMatches = input.rows.filter((row) => matchesQuery(row, input.query));
+	const allMatches = filterModelRows(input.rows, input.query);
 	const focusedMatches = allMatches.filter((row) => row.visibleByDefault !== false);
 	const filtered = searching || input.showAll ? allMatches : focusedMatches;
 	const selectableFiltered = filtered.filter((row) => row.selectable).length;
@@ -849,7 +867,7 @@ export class ModelOverlayView implements Component {
 	}
 
 	private filteredRows(): ModelRow[] {
-		const matches = this.rows.filter((row) => matchesQuery(row, this.query));
+		const matches = filterModelRows(this.rows, this.query);
 		if (this.query.trim().length > 0 || this.showAll) return matches;
 		return matches.filter((row) => row.visibleByDefault !== false);
 	}

package/src/interactive/overlays/session-selector.ts

@@ -1,6 +1,7 @@
 import { basename } from "node:path";
 import type { SessionContract, SessionMeta } from "../../domains/session/contract.js";
 import {
+	getKeybindings,
 	Input,
 	matchesKey,
 	type OverlayHandle,
@@ -178,6 +179,14 @@ export function createSessionOverlayBox(
 		closeOverlay();
 	}
 
+	function moveSelectionByPage(direction: -1 | 1): void {
+		const selected = list.getSelectedItem();
+		const currentIndex = selected ? filtered.findIndex((session) => session.id === selected.value) : 0;
+		const targetIndex = currentIndex + direction * VISIBLE_ROWS;
+		list.setSelectedIndex(targetIndex);
+		box.invalidate();
+	}
+
 	function closeOverlay(): void {
 		clearPendingEscape();
 		onClose();
@@ -200,6 +209,15 @@ export function createSessionOverlayBox(
 	}
 
 	function dispatchResolvedInput(data: string): void {
+		const keybindings = getKeybindings();
+		if (keybindings.matches(data, "tui.select.pageUp")) {
+			moveSelectionByPage(-1);
+			return;
+		}
+		if (keybindings.matches(data, "tui.select.pageDown")) {
+			moveSelectionByPage(1);
+			return;
+		}
 		if (matchesKey(data, "up") || matchesKey(data, "down")) {
 			list.handleInput(data);
 			return;

package/src/interactive/overlays/settings.ts

@@ -118,7 +118,12 @@ class SettingsSelectList extends SelectList {
  * overlay only offers a global save that a restart picks up.
  */
 type SettingScope = "live" | "restart";
-const RESTART_REQUIRED_IDS = new Set<string>(["budget.concurrency", "runtimePlugins"]);
+const RESTART_REQUIRED_IDS = new Set<string>([
+	"budget.concurrency",
+	"runtimePlugins",
+	"terminal.tuiMode",
+	"terminal.fullscreenScrollbar",
+]);
 
 export const SETTINGS_SECTIONS = [
 	{ id: "safety", label: "Autonomy & Safety", group: "CORE" },
@@ -140,12 +145,12 @@ const SETTINGS_SECTION_DESCRIPTIONS = {
 	orchestrator: "Interactive chat routing and the optional proactive-memory model plane.",
 	fleet: "Defaults, profiles, and agent bindings applied to dispatched workers, and where they run.",
 	targets: "Configured inference targets: which one chat and the fleet use, and whether each answers.",
-	models: "The /models picker, favorites, and Alt+J / Alt+K cycling.",
+	models: "The /model picker, favorites, and Alt+J / Alt+K cycling.",
 	budget: "Cost ceiling, per-turn output budget, and worker concurrency.",
 	compaction: "When and how the context window is summarized under pressure.",
 	retry: "Automatic recovery from transient provider and network errors.",
 	terminal: "Terminal integration and the Clio color palette.",
-	advanced: "Identity, runtime plugins, delegation timeouts, and links to other surfaces.",
+	advanced: "Commit provenance, runtime plugins, delegation timeouts, and links to other surfaces.",
 } as const satisfies Record<SettingsSectionId, string>;
 
 export const SETTINGS_LABELS_BY_ID = {
@@ -157,6 +162,7 @@ export const SETTINGS_LABELS_BY_ID = {
 	"workers.onPermission": "Fleet approvals routing",
 	"delegation.defaults.toolGovernance": "Delegation governance",
 	"skills.trustProjectCompatRoots": "Trust project skill roots",
+	"attribution.gitCommits": "Clio commit provenance",
 	safetyNet: "Safety net",
 	"orchestrator.thinkingLevel": "Thinking level",
 	"orchestrator.target": "Target",
@@ -190,6 +196,9 @@ export const SETTINGS_LABELS_BY_ID = {
 	"retry.maxDelayMs": "Max delay (ms)",
 	"terminal.showTerminalProgress": "Terminal progress badges",
 	"terminal.outputVerbosity": "Output detail",
+	"terminal.tuiMode": "TUI mode",
+	"terminal.fullscreenScrollbar": "Fullscreen scrollbar",
+	"terminal.smoothStreaming": "Smooth streaming",
 	theme: "Theme",
 	runtimePlugins: "Runtime plugins",
 	"compaction.model": "Compaction model",
@@ -254,9 +263,17 @@ export const SETTINGS_SECTION_ROWS = {
 	budget: ["budget.sessionCeilingUsd", "defaults.maxTokens", "budget.concurrency"],
 	compaction: ["compaction.auto", "compaction.threshold", "compaction.excludeLastTurns"],
 	retry: ["retry.enabled", "retry.maxRetries", "retry.baseDelayMs", "retry.maxDelayMs"],
-	terminal: ["terminal.showTerminalProgress", "terminal.outputVerbosity", "theme"],
+	terminal: [
+		"terminal.showTerminalProgress",
+		"terminal.outputVerbosity",
+		"terminal.tuiMode",
+		"terminal.fullscreenScrollbar",
+		"terminal.smoothStreaming",
+		"theme",
+	],
 	advanced: [
 		"runtimePlugins",
+		"attribution.gitCommits",
 		"compaction.model",
 		"compaction.systemPrompt",
 		"delegation.defaults.connectTimeoutMs",
@@ -274,6 +291,8 @@ const SETTINGS_DESCRIPTIONS_BY_ID = {
 		"How a worker resolves an approval ask: deny the call, fail the run, or escalate to this session.",
 	"delegation.defaults.toolGovernance": "Tool policy for delegated external agents.",
 	"skills.trustProjectCompatRoots": "Whether third-party project skill roots are loaded.",
+	"attribution.gitCommits":
+		"Add evidence-backed assistance, testing, review, and contributor trailers to commits created through Clio.",
 	safetyNet: "Always-on rails; tuned in .clio-coder/safety.yaml.",
 	"orchestrator.thinkingLevel": "Reasoning budget for the chat loop.",
 	"orchestrator.target": "Active chat target id.",
@@ -293,8 +312,8 @@ const SETTINGS_DESCRIPTIONS_BY_ID = {
 	"workers.agentBindings": "Pins native Clio agents, including shadow agents, to worker profiles. Enter adds one.",
 	"workers.maxRetries": "Automatic retries for a retryable worker outcome.",
 	scope: "Alt+J and Alt+K model cycle set.",
-	"modelSelector.recentLimit": "How many recently used models /models remembers.",
-	"modelSelector.favorites": "Exact target/model refs pinned in /models.",
+	"modelSelector.recentLimit": "How many recently used models /model remembers.",
+	"modelSelector.favorites": "Exact target/model refs pinned in /model.",
 	"budget.sessionCeilingUsd": "Per-session cost cap.",
 	"defaults.maxTokens": "Output tokens requested per turn, applied to every target.",
 	"budget.concurrency": "Parallel workers allowed during dispatch.",
@@ -307,6 +326,9 @@ const SETTINGS_DESCRIPTIONS_BY_ID = {
 	"retry.maxDelayMs": "Maximum retry delay in milliseconds.",
 	"terminal.showTerminalProgress": "Emit OSC 9;4 progress badges during agent turns.",
 	"terminal.outputVerbosity": "How much reasoning, tool input, and live tool output appears in the transcript.",
+	"terminal.tuiMode": "Use regular terminal scrollback or a fullscreen transcript with a sticky composer and footer.",
+	"terminal.fullscreenScrollbar": "When the draggable transcript scrollbar is visible in fullscreen mode.",
+	"terminal.smoothStreaming": "Presentation-only pacing for streamed assistant text and thinking.",
 	theme: "Color palette. Clio ships a single tuned palette.",
 	runtimePlugins: "npm packages exporting clioRuntimes: RuntimeDescriptor[].",
 	"compaction.model": "Dedicated summarization model; blank uses the orchestrator.",
@@ -330,6 +352,8 @@ const SETTINGS_HELP_BY_ID: Partial<Record<EditableSettingId, string>> = {
 	"budget.concurrency": "auto sizes to your machine. A fixed number caps how many workers run at once.",
 	"skills.trustProjectCompatRoots":
 		"Project roots like .claude/skills and .codex/skills are untrusted by default; enabling exposes them to the model.",
+	"attribution.gitCommits":
+		"Role trailers are added only when Clio has trusted evidence for that role. Disabling leaves subsequent commit messages entirely unchanged.",
 	"workers.onPermission":
 		"deny turns the ask into a tool denial and the run continues; fail stops the run as permission_required; escalate forwards the ask to you and falls back per workers.escalation on timeout.",
 	"workers.agentBindings":
@@ -366,7 +390,7 @@ const SETTINGS_VALUE_HELP_BY_ID: Partial<Record<EditableSettingId, Record<string
 	},
 	"compaction.auto": {
 		true: "compact automatically before a turn crosses the threshold",
-		false: "context is only compacted when you run /compact",
+		false: "context is only compacted when you run /context compact",
 	},
 	"retry.enabled": {
 		true: "retry transient provider errors automatically",
@@ -376,6 +400,10 @@ const SETTINGS_VALUE_HELP_BY_ID: Partial<Record<EditableSettingId, Record<string
 		true: "load skills from .claude/.codex/.github/etc. project roots",
 		false: "ignore third-party project skill roots",
 	},
+	"attribution.gitCommits": {
+		enabled: "add only the Clio role trailers justified by trusted evidence",
+		disabled: "leave every subsequent commit message byte-for-byte unchanged",
+	},
 	"terminal.showTerminalProgress": {
 		true: "emit OSC 9;4 taskbar/tab progress badges during turns",
 		false: "no terminal progress badges",
@@ -385,6 +413,20 @@ const SETTINGS_VALUE_HELP_BY_ID: Partial<Record<EditableSettingId, Record<string
 		default: "balanced transcript; unfold the latest tool, worker, or reasoning block on demand",
 		verbose: "transparent transcript; reasoning, arguments, and live tool output stay visible",
 	},
+	"terminal.tuiMode": {
+		regular: "preserve terminal scrollback and render the composer below the transcript",
+		fullscreen: "use the alternate screen with an independently scrollable transcript and sticky composer/footer",
+	},
+	"terminal.fullscreenScrollbar": {
+		hidden: "never draw the fullscreen transcript scrollbar",
+		auto: "show the scrollbar while scrolling or dragging",
+		always: "reserve the rightmost column for the scrollbar",
+	},
+	"terminal.smoothStreaming": {
+		off: "preserve the current immediate 16ms-coalesced streaming behavior",
+		auto: "pace only on a capable local TTY without accessibility or backpressure risk",
+		on: "request grapheme-safe pacing; stdout backpressure still pauses presentation",
+	},
 };
 
 export type SettingSubmenuBuilder = NonNullable<SettingItem["submenu"]>;
@@ -1063,6 +1105,7 @@ function defaultValueFor(id: EditableSettingId): string | undefined {
 	if (isRoutingPath(id)) return undefined;
 	const raw = getAtPath(DEFAULT_SETTINGS, id);
 	if (raw === null || raw === undefined || typeof raw === "object") return undefined;
+	if (id === "attribution.gitCommits") return raw === true ? "enabled" : "disabled";
 	return String(raw);
 }
 
@@ -1319,7 +1362,7 @@ export function buildSettingItems(
 			values: ["6", "12", "20", "50"],
 		}),
 		settingItem("modelSelector.favorites", favorites.length > 0 ? `${favorites.length} pinned` : "(none)", {
-			affordance: "manage in /models",
+			affordance: "manage in /model",
 			readOnly: true,
 		}),
 		settingItem("budget.sessionCeilingUsd", String(settings.budget.sessionCeilingUsd), {
@@ -1359,6 +1402,15 @@ export function buildSettingItems(
 		settingItem("terminal.outputVerbosity", terminal.outputVerbosity, {
 			values: ["minimal", "default", "verbose"],
 		}),
+		settingItem("terminal.tuiMode", terminal.tuiMode, {
+			values: ["regular", "fullscreen"],
+		}),
+		settingItem("terminal.fullscreenScrollbar", terminal.fullscreenScrollbar, {
+			values: ["hidden", "auto", "always"],
+		}),
+		settingItem("terminal.smoothStreaming", terminal.smoothStreaming, {
+			values: ["off", "auto", "on"],
+		}),
 		settingItem("theme", settings.theme, {
 			affordance: "single clio-coder palette",
 			readOnly: true,
@@ -1367,6 +1419,9 @@ export function buildSettingItems(
 			submenu: editTextSubmenu("Edit runtime plugins comma-separated list", "Restart Clio to load changes."),
 			affordance: "free text",
 		}),
+		settingItem("attribution.gitCommits", settings.attribution.gitCommits ? "enabled" : "disabled", {
+			values: ["enabled", "disabled"],
+		}),
 		settingItem("compaction.model", compaction.model ?? "(orchestrator target)", {
 			submenu: editTextSubmenu("Edit compaction model; blank uses the orchestrator"),
 			affordance: "free text",
@@ -1734,6 +1789,9 @@ export function applySettingChange(settings: ClioSettings, id: string, value: st
 		case "skills.trustProjectCompatRoots":
 			if (value === "true" || value === "false") settings.skills.trustProjectCompatRoots = value === "true";
 			return;
+		case "attribution.gitCommits":
+			if (value === "enabled" || value === "disabled") settings.attribution.gitCommits = value === "enabled";
+			return;
 		case "orchestrator.thinkingLevel":
 			settings.orchestrator.thinkingLevel = thinkingLevelFromChoiceLabel(value) ?? settings.orchestrator.thinkingLevel;
 			return;
@@ -1832,6 +1890,17 @@ export function applySettingChange(settings: ClioSettings, id: string, value: st
 		case "terminal.outputVerbosity":
 			if (value === "minimal" || value === "default" || value === "verbose") settings.terminal.outputVerbosity = value;
 			return;
+		case "terminal.tuiMode":
+			if (value === "regular" || value === "fullscreen") settings.terminal.tuiMode = value;
+			return;
+		case "terminal.fullscreenScrollbar":
+			if (value === "hidden" || value === "auto" || value === "always") {
+				settings.terminal.fullscreenScrollbar = value;
+			}
+			return;
+		case "terminal.smoothStreaming":
+			if (value === "off" || value === "auto" || value === "on") settings.terminal.smoothStreaming = value;
+			return;
 		case "runtimePlugins":
 			settings.runtimePlugins = value
 				.split(",")
@@ -2446,7 +2515,11 @@ export class SettingsCenter implements Component {
 	private submenuComponent: Component | null = null;
 	/** Committed catalog filter; empty means unfiltered. */
 	private filterQuery = "";
-	/** Draft while the filter editor owns input; null when it is closed. */
+	/**
+	 * Draft while the filter editor owns input; null when it is closed. The
+	 * draft narrows the catalog live per keystroke, matching /model and /resume;
+	 * Enter commits it and Esc restores the committed query.
+	 */
 	private filterDraft: string | null = null;
 	/** Local cycle preview for the selected row; committed on Enter. */
 	private pendingValue: string | null = null;
@@ -2606,13 +2679,25 @@ export class SettingsCenter implements Component {
 		}
 		if (data === "\x7f" || data === "\b") {
 			this.filterDraft = draft.slice(0, -1);
+			this.normalizeSelection();
+			this.options.requestRender?.();
 			return;
 		}
-		if (isPrintableInput(data)) this.filterDraft = draft + data;
+		if (isPrintableInput(data)) {
+			this.filterDraft = draft + data;
+			this.normalizeSelection();
+			this.options.requestRender?.();
+		}
+	}
+
+	/** The query the catalog is narrowed by right now: the live draft while the
+	 * filter editor is open, the committed query otherwise. */
+	private effectiveFilterQuery(): string {
+		return (this.filterDraft ?? this.filterQuery).trim();
 	}
 
 	private matchesFilter(item: SettingsCenterItem): boolean {
-		const query = this.filterQuery.trim().toLowerCase();
+		const query = this.effectiveFilterQuery().toLowerCase();
 		if (query.length === 0) return true;
 		return (
 			item.label.toLowerCase().includes(query) ||
@@ -2628,7 +2713,7 @@ export class SettingsCenter implements Component {
 	 */
 	private sections(): SettingsCenterSection[] {
 		const all = buildSettingsSections(this.items);
-		if (this.filterQuery.trim().length === 0) return all;
+		if (this.effectiveFilterQuery().length === 0) return all;
 		return all
 			.map((section) => ({ ...section, items: this.filterSectionItems(section.items) }))
 			.filter((section) => section.items.some((item) => this.isSelectableRow(item)));
@@ -2692,10 +2777,13 @@ export class SettingsCenter implements Component {
 
 	private normalizeSelection(): void {
 		const sections = this.sections();
-		// A filter that hides everything leaves nowhere to drill into, so the stack
-		// sits at its top level and one Esc closes Settings from the empty state.
+		// A committed filter that hides everything leaves nowhere to drill into, so
+		// the stack sits at its top level and one Esc closes Settings from the
+		// empty state. A live draft narrows per keystroke and may pass through the
+		// empty state on its way to a match, so it must not disturb the level:
+		// Esc's first press cancels the draft and lands back where editing began.
 		if (sections.length === 0) {
-			this.level = "sections";
+			if (this.filterDraft === null) this.level = "sections";
 			return;
 		}
 		if (!sections.some((section) => section.id === this.selectedSectionId)) {
@@ -2909,7 +2997,7 @@ export class SettingsCenter implements Component {
 		const theme = clioTheme();
 		return fixedLines(
 			[
-				theme.fg("muted", truncateToWidth(`No settings match “${this.filterQuery}”`, width, ELLIPSIS, true)),
+				theme.fg("muted", truncateToWidth(`No settings match “${this.effectiveFilterQuery()}”`, width, ELLIPSIS, true)),
 				theme.fg("dim", truncateToWidth("/ edit filter · empty Enter clears", width, ELLIPSIS, true)),
 			],
 			width,
@@ -3014,7 +3102,7 @@ export class SettingsCenter implements Component {
 	 */
 	private sectionCatalogRows(): Array<{ line: string; sectionId: SettingsSectionId | null }> {
 		const theme = clioTheme();
-		const filtering = this.filterQuery.trim().length > 0;
+		const filtering = this.effectiveFilterQuery().length > 0;
 		const rows: Array<{ line: string; sectionId: SettingsSectionId | null }> = [];
 		let previousGroup: string | null = null;
 		for (const section of this.sections()) {

package/src/interactive/overlays/skills-hub.ts

@@ -13,7 +13,7 @@ import { type ListOverlayItem, openListOverlay } from "./list-overlay.js";
 /**
  * The Skills Hub: one multipane surface for every skill Clio can reach.
  * Installed skills group by scope, marketplace rows come from the same local
- * marketplace lookup the installer and `/skill:<name>` resolve through, Enter
+ * marketplace lookup the installer and `/skill <name>` resolve through, Enter
  * inserts the invocation into the editor, and `i` installs in place. The hub
  * lists nothing the resolver cannot resolve; when the lookup is empty the hub
  * says so and names the remedy instead of drawing an inventory.
@@ -82,7 +82,7 @@ export function buildInstalledItems(list: ResourceList<Skill>): ListOverlayItem[
 			detail: () => {
 				const lines = [
 					`# ${skill.name}`,
-					`**Invoke:** \`/skill:${skill.name} [task]\``,
+					`**Invoke:** \`/skill ${skill.name} [task]\``,
 					`**Source:** \`${skill.filePath}\``,
 					`**Scope:** ${skill.scope}/${skill.source}${skill.trusted ? "" : " (untrusted)"}`,
 				];
@@ -119,7 +119,7 @@ export function buildMarketplaceItems(
 			group: GROUP_MARKETPLACE,
 			detail: () => [
 				`# ${skill.name}`,
-				`**Invoke:** \`/skill:${skill.name} [task]\` (prompts to install first)`,
+				`**Invoke:** \`/skill ${skill.name} [task]\` (prompts to install first)`,
 				"**Install now:** press `i`",
 				`**Source:** \`${skill.sourceUrl}\``,
 				`**Origin:** ${skill.origin}${skill.category ? ` (${skill.category})` : ""}${skill.audit ? ` · audit ${skill.audit}` : ""}`,
@@ -201,7 +201,7 @@ export function openSkillsHub(tui: TUI, deps: SkillsHubDeps): OverlayHandle {
 		onSelect: (item) => {
 			if (item.group === GROUP_DIAGNOSTICS) return;
 			const name = item.id.startsWith("marketplace:") ? item.id.slice("marketplace:".length) : item.id;
-			deps.setEditorText(`/skill:${name} `);
+			deps.setEditorText(`/skill ${name} `);
 			deps.onClose();
 		},
 		actions: {

package/src/interactive/overlays/tree-selector.ts

@@ -38,6 +38,10 @@ interface TreeRow {
 	depth: number;
 	node: TreeSnapshotNode;
 	sessionId: string;
+	/** This row is the session's active append point: where the next message lands. */
+	isActiveTip: boolean;
+	/** Enter on this row will move the append point; false for structural rows. */
+	switchable: boolean;
 }
 
 type Submode = "browse" | "edit-label";
@@ -108,12 +112,29 @@ function isLeaf(node: TreeSnapshotNode): boolean {
 	return node.children.length === 0;
 }
 
+/**
+ * `switchTurn` validates against message-tree nodes only (tree.json), so a
+ * structural row that /tree draws on top of it (a compaction marker or a
+ * fork's returned-from-branch summary) throws "turn not found" if Enter is
+ * pressed on it. Before issue #94 the row rendered exactly like a switchable
+ * one and gave no sign it would fail.
+ */
+function isSwitchable(node: TreeSnapshotNode): boolean {
+	return node.kind !== "compaction" && node.kind !== "branch";
+}
+
 function flattenTreeSnapshot(snapshot: TreeSnapshot): TreeRow[] {
 	const rows: TreeRow[] = [];
 	const walk = (id: string, depth: number): void => {
 		const node = snapshot.nodesById[id];
 		if (!node) return;
-		rows.push({ depth, node, sessionId: snapshot.sessionId });
+		rows.push({
+			depth,
+			node,
+			sessionId: snapshot.sessionId,
+			isActiveTip: snapshot.leafId !== null && node.id === snapshot.leafId,
+			switchable: isSwitchable(node),
+		});
 		// Indentation marks a fork, not a step. Every message is a child of the
 		// one before it, so indenting per child made depth equal message count:
 		// a seventeen-message session rendered as a seventeen-level staircase
@@ -137,24 +158,34 @@ const ROW_PREVIEW_BUDGET = 55;
 export function formatTreeRow(row: TreeRow, opts: { showTimestamps: boolean; width: number }): string {
 	const theme = clioTheme();
 	const indent = "  ".repeat(row.depth);
-	const glyph = isLeaf(row.node) ? GLYPH.running : "○";
+	// The active tip is where the next message lands; it gets its own glyph so
+	// a branched session shows exactly one live tip instead of every childless
+	// node reading the same as every other (issue #94). Other leaves still get
+	// a leaf glyph, just not the one that claims to be current.
+	const glyph = row.isActiveTip ? GLYPH.active : isLeaf(row.node) ? GLYPH.running : "○";
 	const turnId = shortTurnId(row.node.id);
 	const rawPreview = row.node.preview && row.node.preview.length > 0 ? row.node.preview : fallbackPreview(row.node);
 	const labelText = row.node.label ? ` · label:"${row.node.label}"` : "";
+	// Enter cannot switch to a structural row (switchTurn only knows message
+	// turns), so it says so instead of looking like every switchable row.
+	const inertText = row.switchable ? "" : " (fixed)";
 	// A plain copy of the prefix and label drives the width math; the rendered
 	// versions below carry color, so every measurement uses visibleWidth.
 	const plainPrefix = `${indent}${glyph} ${row.node.kind.padEnd(12)} ${turnId}  `;
 	const previewBudget = Math.min(
 		ROW_PREVIEW_BUDGET,
-		Math.max(1, opts.width - visibleWidth(plainPrefix) - visibleWidth(labelText)),
+		Math.max(1, opts.width - visibleWidth(plainPrefix) - visibleWidth(labelText) - visibleWidth(inertText)),
 	);
 	const preview = clampPreview(rawPreview, previewBudget);
 	// The node glyph and kind are structural scaffolding and render dim; the turn
 	// id and preview are content and render muted; the optional label reads as a
-	// dim key with a muted value.
-	const styledPrefix = `${theme.fg("dim", `${indent}${glyph} ${row.node.kind.padEnd(12)}`)} ${theme.fg("muted", turnId)}  `;
+	// dim key with a muted value. The active tip's glyph renders in accent so it
+	// stands out against every other row.
+	const glyphStyled = row.isActiveTip ? theme.fg("accent", glyph) : theme.fg("dim", glyph);
+	const styledPrefix = `${indent}${glyphStyled}${theme.fg("dim", ` ${row.node.kind.padEnd(12)}`)} ${theme.fg("muted", turnId)}  `;
 	const styledLabel = labelText ? `${theme.fg("dim", " · label:")}${theme.fg("muted", `"${row.node.label}"`)}` : "";
-	const main = `${styledPrefix}${theme.fg("muted", preview)}${styledLabel}`;
+	const styledInert = inertText ? theme.fg("dim", inertText) : "";
+	const main = `${styledPrefix}${theme.fg("muted", preview)}${styledLabel}${styledInert}`;
 	if (!opts.showTimestamps) return truncateToWidth(main, opts.width, "", true);
 	const ts = `${dateLocal(row.node.at)} ${clockLocal(row.node.at)}`;
 	if (opts.width < ts.length + 12) return truncateToWidth(main, opts.width, "", true);
@@ -298,6 +329,10 @@ export class TreeOverlayView implements Component {
 		if (matchesKey(data, "enter") || data === "\n") {
 			const row = this.currentRow();
 			if (!row) return;
+			if (!row.switchable) {
+				this.setStatus(`[tree] ${row.node.kind} rows mark a moment in the timeline; they are not a place to switch to`);
+				return;
+			}
 			this.deps.onSwitchTurn(row.node.id);
 			this.deps.onClose();
 			return;