dsh-code 0.4.0 → 0.5.0

package/lib/index.mjs

@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { readdir, writeFile } from "node:fs/promises";
-import { basename, join } from "node:path";
+import { basename, join, resolve } from "node:path";
 import { createElement, memo, useCallback, useEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
 import z from "@deepseek-ai/schemastery";
 import { installModelSelection } from "@deepseek-ai/dsh-agent";
@@ -879,14 +879,24 @@ const ORDERED = /^\s*(\d+)[.)]\s+(.*)$/u;
 /** Render markdown text into styled lines of at most `width` columns. */
 function renderMarkdown(text, width) {
 	const lines = [];
+	let separatorPending = false;
 	const push = (segments) => {
 		for (const wrapped of wrapSegments(segments, Math.max(10, width))) lines.push({ segments: merge(wrapped) });
 	};
+	const startBlock = () => {
+		if (separatorPending && lines.length > 0 && lines.at(-1)?.segments.length !== 0) lines.push({ segments: [] });
+		separatorPending = false;
+	};
 	const source = text.replaceAll("\r", "").split("\n");
 	let index = 0;
 	while (index < source.length) {
 		const line = source[index] ?? "";
 		index += 1;
+		if (line.trim() === "") {
+			separatorPending = lines.length > 0;
+			continue;
+		}
+		startBlock();
 		const fence = FENCE.exec(line);
 		if (fence !== null) {
 			const language = fence[1] ?? "";
@@ -898,7 +908,6 @@ function renderMarkdown(text, width) {
 			index += 1;
 			continue;
 		}
-		if (line.trim() === "") continue;
 		if (RULE.test(line.trim())) {
 			push([seg(`  ${"─".repeat(Math.max(1, Math.floor(width / 4)))}`, "dim")]);
 			continue;
@@ -971,6 +980,64 @@ function caretVisible(tick) {
 	return tick % 2 === 0;
 }
 //#endregion
+//#region src/render/inspector.ts
+/** Composer/status chrome plus one optional, fixed-height local notice row. */
+const INSPECTOR_CHROME_ROWS = 5;
+/** One transcript-to-composer gutter, collapsed on short terminals. */
+function layoutGutterRows(rows) {
+	return Math.max(1, Math.floor(rows)) >= 14 ? 1 : 0;
+}
+/**
+* Keep the inspector plus its persistent status/composer chrome below
+* `stdout.rows`: at equality Ink clears the terminal and rewrites all
+* accumulated `<Static>` output on every frame.
+*/
+function panelViewport(columns, rows) {
+	const safeColumns = Math.max(1, Math.floor(columns));
+	const safeRows = Math.max(1, Math.floor(rows));
+	const maxHeight = Math.max(0, Math.min(safeRows - 2 - INSPECTOR_CHROME_ROWS - layoutGutterRows(safeRows), Math.floor(safeRows / 2)));
+	const compact = maxHeight < 5 || safeColumns < 8;
+	const gapRows = !compact && maxHeight >= 7 ? 2 : 0;
+	return {
+		maxHeight,
+		bodyRows: compact ? 0 : maxHeight - 4 - gapRows,
+		gapRows,
+		contentColumns: compact ? Math.max(1, safeColumns - 1) : Math.max(1, safeColumns - 4),
+		compact
+	};
+}
+/** Backward-compatible name for the Ctrl+O-specific caller and tests. */
+function inspectorViewport(columns, rows) {
+	return panelViewport(columns, rows);
+}
+/** Clamp a first-visible row to the range representable by one viewport. */
+function clampScroll(offset, totalRows, visibleRows) {
+	const last = Math.max(0, Math.max(0, Math.floor(totalRows)) - Math.max(0, Math.floor(visibleRows)));
+	return Math.max(0, Math.min(Math.floor(offset), last));
+}
+/** Move a viewport by a signed row delta without escaping its content. */
+function moveScroll(offset, delta, totalRows, visibleRows) {
+	return clampScroll(offset + delta, totalRows, visibleRows);
+}
+/** Keep one focused row visible while preserving the current window when possible. */
+function revealRow(offset, row, totalRows, visibleRows) {
+	const size = Math.max(1, Math.floor(visibleRows));
+	const target = Math.max(0, Math.min(Math.floor(row), Math.max(0, totalRows - 1)));
+	if (target < offset) return clampScroll(target, totalRows, size);
+	if (target >= offset + size) return clampScroll(target - size + 1, totalRows, size);
+	return clampScroll(offset, totalRows, size);
+}
+/** Center a selected list row where possible, clamped at both ends. */
+function selectionWindow(cursor, totalRows, visibleRows) {
+	return clampScroll(cursor - Math.floor(Math.max(1, visibleRows) / 2), totalRows, visibleRows);
+}
+/** Follow appended history only while the inspector cursor was at the tail. */
+function followInspectorCursor(cursor, previousLength, nextLength) {
+	const nextLast = Math.max(0, nextLength - 1);
+	if (cursor >= Math.max(0, previousLength - 1)) return nextLast;
+	return Math.min(cursor, nextLast);
+}
+//#endregion
 //#region src/render/status.ts
 /**
 * Compact token count: 517 / 12.2K / 517K / 1.2M (one decimal under three
@@ -1029,6 +1096,7 @@ function buildStatusGroups(facts, stats) {
 		facts.plan ? "⧉ plan" : void 0
 	].filter((part) => part !== void 0 && part !== "");
 	if (identity.length > 0) groups.push(identity.join(" · "));
+	if (facts.mode !== void 0 && facts.mode !== "") groups.push(`mode ${facts.mode}`);
 	if (stats.turns > 0 || stats.steps > 0) {
 		groups.push(`T${stats.turns} · S${stats.steps}`);
 		const durations = [];
@@ -1076,12 +1144,37 @@ const CONTROL_ESCAPE = /[\u0000-\u0008\u000b-\u001f\u007f-\u009f]/gu;
 function displayText(text) {
 	return text.replace(CONTROL_ESCAPE, (char) => `\\x${char.charCodeAt(0).toString(16).padStart(2, "0")}`);
 }
+/** Collapse external text to one terminal-safe logical row. */
+function singleLineText(text) {
+	return displayText(text).replace(/\r?\n/gu, " ↵ ").replace(/\t/gu, "  ");
+}
 /** Terminal-cell width matching the TUI's existing CJK-aware wrapping rule. */
 function cellWidth(text) {
 	let columns = 0;
 	for (const char of text) columns += (char.codePointAt(0) ?? 0) > 11903 ? 2 : 1;
 	return columns;
 }
+/**
+* Truncate one display-safe row without ever exceeding its physical-column
+* budget. The ellipsis is included inside the budget, matching Codex's popup
+* truncation contract; the previous app-local helper appended it after the
+* row was already full and could force an extra terminal wrap.
+*/
+function truncateColumns(text, columns) {
+	const limit = Math.max(0, Math.floor(columns));
+	if (limit === 0) return "";
+	if (cellWidth(text) <= limit) return text;
+	const contentLimit = limit - 1;
+	let used = 0;
+	let result = "";
+	for (const char of text) {
+		const width = cellWidth(char);
+		if (used + width > contentLimit) break;
+		result += char;
+		used += width;
+	}
+	return `${result}…`;
+}
 /** Read one Unicode character immediately before `end`. */
 function previousCharacter(text, end) {
 	const last = text.charCodeAt(end - 1);
@@ -1145,58 +1238,6 @@ function displayTail(text, columns, rows) {
 	};
 }
 //#endregion
-//#region src/render/inspector.ts
-/** The three-row read-only composer frame plus its one-row status footer. */
-const INSPECTOR_CHROME_ROWS = 4;
-/**
-* Keep the inspector plus its persistent status/composer chrome below
-* `stdout.rows`: at equality Ink clears the terminal and rewrites all
-* accumulated `<Static>` output on every frame.
-*/
-function panelViewport(columns, rows) {
-	const safeColumns = Math.max(1, Math.floor(columns));
-	const safeRows = Math.max(1, Math.floor(rows));
-	const maxHeight = Math.max(0, Math.min(safeRows - 2 - INSPECTOR_CHROME_ROWS, Math.floor(safeRows / 2)));
-	const compact = maxHeight < 5 || safeColumns < 8;
-	return {
-		maxHeight,
-		bodyRows: compact ? 0 : maxHeight - 4,
-		contentColumns: compact ? Math.max(1, safeColumns - 1) : Math.max(1, safeColumns - 4),
-		compact
-	};
-}
-/** Backward-compatible name for the Ctrl+O-specific caller and tests. */
-function inspectorViewport(columns, rows) {
-	return panelViewport(columns, rows);
-}
-/** Clamp a first-visible row to the range representable by one viewport. */
-function clampScroll(offset, totalRows, visibleRows) {
-	const last = Math.max(0, Math.max(0, Math.floor(totalRows)) - Math.max(0, Math.floor(visibleRows)));
-	return Math.max(0, Math.min(Math.floor(offset), last));
-}
-/** Move a viewport by a signed row delta without escaping its content. */
-function moveScroll(offset, delta, totalRows, visibleRows) {
-	return clampScroll(offset + delta, totalRows, visibleRows);
-}
-/** Keep one focused row visible while preserving the current window when possible. */
-function revealRow(offset, row, totalRows, visibleRows) {
-	const size = Math.max(1, Math.floor(visibleRows));
-	const target = Math.max(0, Math.min(Math.floor(row), Math.max(0, totalRows - 1)));
-	if (target < offset) return clampScroll(target, totalRows, size);
-	if (target >= offset + size) return clampScroll(target - size + 1, totalRows, size);
-	return clampScroll(offset, totalRows, size);
-}
-/** Center a selected list row where possible, clamped at both ends. */
-function selectionWindow(cursor, totalRows, visibleRows) {
-	return clampScroll(cursor - Math.floor(Math.max(1, visibleRows) / 2), totalRows, visibleRows);
-}
-/** Follow appended history only while the inspector cursor was at the tail. */
-function followInspectorCursor(cursor, previousLength, nextLength) {
-	const nextLast = Math.max(0, nextLength - 1);
-	if (cursor >= Math.max(0, previousLength - 1)) return nextLast;
-	return Math.min(cursor, nextLast);
-}
-//#endregion
 //#region src/render/lines.ts
 /** Construct one segment without leaking mutable objects into cached rows. */
 function lineSegment(text, style = "plain") {
@@ -1315,6 +1356,291 @@ function transcriptEntryLines(entry, columns) {
 	}
 }
 //#endregion
+//#region src/kernel-panels.ts
+/** Bounded, composer-safe panels for preset, session, and plugin kernel views. */
+function color(rgb) {
+	return `rgb(${rgb[0]}, ${rgb[1]}, ${rgb[2]})`;
+}
+function ListFrame(props) {
+	const stdout = useStdout().stdout;
+	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
+	if (viewport.maxHeight === 0) return createElement(Box, { display: "none" });
+	if (viewport.compact) return createElement(Text, { wrap: "truncate-end" }, truncateColumns(`${props.title} · esc close`, viewport.contentColumns));
+	const stateRows = props.loading ? [{
+		key: "loading",
+		text: "  loading…"
+	}] : props.error !== void 0 ? [{
+		key: "error",
+		text: `  ${singleLineText(props.error)}`
+	}] : props.rows.length === 0 ? [{
+		key: "empty",
+		text: "  no matching entries"
+	}] : props.rows;
+	const bodyRows = Math.max(1, viewport.bodyRows - 1);
+	const offset = revealRow(0, props.cursor, stateRows.length, bodyRows);
+	const visible = stateRows.slice(offset, offset + bodyRows);
+	return createElement(Box, {
+		borderStyle: "round",
+		borderColor: color(TUI_RGB.dim),
+		flexDirection: "column",
+		paddingX: 1
+	}, createElement(Text, {
+		color: color(TUI_RGB.brandBright),
+		wrap: "truncate-end"
+	}, truncateColumns(props.title, viewport.contentColumns)), createElement(Text, {
+		dimColor: true,
+		wrap: "truncate-end"
+	}, truncateColumns(`search: ${props.query === "" ? "type to filter" : props.query}`, viewport.contentColumns)), ...visible.map((row, index) => {
+		const absolute = offset + index;
+		const selected = !props.loading && props.error === void 0 && props.rows.length > 0 && absolute === props.cursor;
+		return createElement(Text, {
+			key: row.key,
+			color: selected ? color(TUI_RGB.brandBright) : row.disabled ? color(TUI_RGB.dim) : void 0,
+			dimColor: row.disabled,
+			wrap: "truncate-end"
+		}, truncateColumns(`${selected ? "› " : "  "}${row.text}`, viewport.contentColumns));
+	}), createElement(Text, {
+		dimColor: true,
+		wrap: "truncate-end"
+	}, truncateColumns(props.footer, viewport.contentColumns)));
+}
+function editQuery(query, input, key) {
+	if (key.backspace || key.delete) return query.slice(0, -1);
+	if (input.length === 1 && input >= " " && input !== "") return query + input;
+}
+function ModePanel({ current, load, select, close }) {
+	const [rows, setRows] = useState([]);
+	const [query, setQuery] = useState("");
+	const [cursor, setCursor] = useState(0);
+	const [loading, setLoading] = useState(true);
+	const [error, setError] = useState();
+	const refresh = () => {
+		setLoading(true);
+		setError(void 0);
+		Promise.resolve().then(load).then((value) => {
+			setRows(value);
+			setLoading(false);
+		}, (reason) => {
+			setError(reason instanceof Error ? reason.message : String(reason));
+			setLoading(false);
+		});
+	};
+	useEffect(refresh, []);
+	const visible = useMemo(() => rows.filter((row) => `${row.id} ${row.name ?? ""} ${row.description ?? ""}`.toLowerCase().includes(query.toLowerCase())), [rows, query]);
+	useEffect(() => setCursor((value) => Math.min(value, Math.max(0, visible.length - 1))), [visible.length]);
+	useInput((input, key) => {
+		if (key.escape || input === "q") return close();
+		if (input === "r" && query === "") return refresh();
+		if (key.upArrow) return setCursor((value) => visible.length === 0 ? 0 : (value + visible.length - 1) % visible.length);
+		if (key.downArrow) return setCursor((value) => visible.length === 0 ? 0 : (value + 1) % visible.length);
+		if (key.return && visible[cursor]?.broken === void 0) return select(visible[cursor].id);
+		const next = editQuery(query, input, key);
+		if (next !== void 0) {
+			setQuery(next);
+			setCursor(0);
+		}
+	});
+	return createElement(ListFrame, {
+		title: `/mode · current ${current}`,
+		rows: visible.map((row) => ({
+			key: row.id,
+			disabled: row.broken !== void 0,
+			text: `${row.id === current ? "●" : "○"} ${row.name ?? row.id} · ${row.description ?? row.trust}${row.broken === void 0 ? "" : ` · broken: ${row.broken}`}`
+		})),
+		cursor,
+		loading,
+		error,
+		query,
+		footer: "↑↓ choose · enter switch · r refresh · esc close"
+	});
+}
+function PluginPanel({ load, close, initialQuery = "" }) {
+	const [epoch, setEpoch] = useState(0);
+	const [query, setQuery] = useState(initialQuery);
+	const [cursor, setCursor] = useState(0);
+	const [expanded, setExpanded] = useState(false);
+	const rows = useMemo(() => load().filter((row) => `${row.entryId} ${row.moduleName} ${row.phase ?? ""}`.toLowerCase().includes(query.toLowerCase())), [epoch, query]);
+	useEffect(() => setCursor((value) => Math.min(value, Math.max(0, rows.length - 1))), [rows.length]);
+	useInput((input, key) => {
+		if (key.escape || input === "q") return close();
+		if (input === "r" && query === "") return setEpoch((value) => value + 1);
+		if (key.upArrow) return setCursor((value) => rows.length === 0 ? 0 : (value + rows.length - 1) % rows.length);
+		if (key.downArrow) return setCursor((value) => rows.length === 0 ? 0 : (value + 1) % rows.length);
+		if (key.return) return setExpanded((value) => !value);
+		const next = editQuery(query, input, key);
+		if (next !== void 0) {
+			setQuery(next);
+			setCursor(0);
+		}
+	});
+	return createElement(ListFrame, {
+		title: "/plugin · loader inspector",
+		rows: rows.map((row, index) => ({
+			key: row.entryId,
+			disabled: !row.enabled,
+			text: `${row.enabled ? "●" : "○"} ${row.entryId} · ${row.phase ?? "not mounted"}${expanded && index === cursor ? ` · ${row.moduleName}` : ""}`
+		})),
+		cursor,
+		loading: false,
+		query,
+		footer: "↑↓ inspect · enter details · r refresh · esc close"
+	});
+}
+function ResumePanel({ currentCwd, load, readTranscript, select, close }) {
+	const [options, setOptions] = useState({
+		sessions: "roots",
+		cwd: "all",
+		sort: "newest",
+		currentCwd,
+		query: ""
+	});
+	const [focus, setFocus] = useState(0);
+	const [density, setDensity] = useState("comfortable");
+	const [rows, setRows] = useState([]);
+	const [cursor, setCursor] = useState(0);
+	const [loading, setLoading] = useState(true);
+	const [error, setError] = useState();
+	const [expanded, setExpanded] = useState();
+	const [transcript, setTranscript] = useState();
+	const transcriptLoad = useRef();
+	useEffect(() => () => transcriptLoad.current?.abort(), []);
+	useEffect(() => {
+		const controller = new AbortController();
+		setLoading(true);
+		setError(void 0);
+		Promise.resolve().then(() => load(options, controller.signal)).then((value) => {
+			if (!controller.signal.aborted) {
+				setRows(value);
+				setLoading(false);
+			}
+		}, (reason) => {
+			if (!controller.signal.aborted) {
+				setError(reason instanceof Error ? reason.message : String(reason));
+				setLoading(false);
+			}
+		});
+		return () => controller.abort();
+	}, [options]);
+	useEffect(() => setCursor((value) => Math.min(value, Math.max(0, rows.length - 1))), [rows.length]);
+	const cycle = () => {
+		if (focus === 3) {
+			setDensity((current) => current === "comfortable" ? "dense" : "comfortable");
+			return;
+		}
+		setOptions((value) => {
+			if (focus === 0) return {
+				...value,
+				sessions: value.sessions === "roots" ? "all" : "roots"
+			};
+			if (focus === 1) return {
+				...value,
+				cwd: value.cwd === "all" ? "current" : "all"
+			};
+			return {
+				...value,
+				sort: value.sort === "newest" ? "oldest" : "newest"
+			};
+		});
+	};
+	useInput((input, key) => {
+		if (key.escape || input === "q") return close();
+		if (key.tab) return setFocus((value) => (value + (key.shift ? 3 : 1)) % 4);
+		if (key.leftArrow) return cycle();
+		if (key.rightArrow) return cycle();
+		if (key.upArrow) return setCursor((value) => rows.length === 0 ? 0 : Math.max(0, value - 1));
+		if (key.downArrow) return setCursor((value) => rows.length === 0 ? 0 : Math.min(rows.length - 1, value + 1));
+		if (key.pageUp) return setCursor((value) => Math.max(0, value - 8));
+		if (key.pageDown) return setCursor((value) => Math.min(rows.length - 1, value + 8));
+		if (input === "g") return setCursor(0);
+		if (input === "G") return setCursor(Math.max(0, rows.length - 1));
+		if (input === "d") return setDensity((value) => value === "comfortable" ? "dense" : "comfortable");
+		if (input === "e" && rows[cursor] !== void 0) return setExpanded((value) => value === rows[cursor].id ? void 0 : rows[cursor].id);
+		if (input === "t" && rows[cursor] !== void 0) {
+			const row = rows[cursor];
+			transcriptLoad.current?.abort();
+			setTranscript({ id: row.id });
+			const controller = new AbortController();
+			transcriptLoad.current = controller;
+			Promise.resolve().then(() => readTranscript(row.id, controller.signal)).then((text) => {
+				if (!controller.signal.aborted) setTranscript({
+					id: row.id,
+					text
+				});
+			}, (reason) => {
+				if (!controller.signal.aborted) setTranscript({
+					id: row.id,
+					error: reason instanceof Error ? reason.message : String(reason)
+				});
+			});
+			return;
+		}
+		if (key.return && rows[cursor]?.resumable === true) return select(rows[cursor]);
+		const next = editQuery(options.query, input, key);
+		if (next !== void 0) {
+			setOptions((value) => ({
+				...value,
+				query: next
+			}));
+			setCursor(0);
+		}
+	}, { isActive: transcript === void 0 });
+	if (transcript !== void 0) return createElement(DocumentPanel, {
+		title: `transcript · ${transcript.id}`,
+		text: transcript.text,
+		error: transcript.error,
+		close: () => {
+			transcriptLoad.current?.abort();
+			setTranscript(void 0);
+		}
+	});
+	const toolbar = `[${focus === 0 ? ">" : ""}${options.sessions}] [${focus === 1 ? ">" : ""}${options.cwd} cwd] [${focus === 2 ? ">" : ""}${options.sort}] [${focus === 3 ? ">" : ""}${density}]`;
+	return createElement(ListFrame, {
+		title: `/resume · ${toolbar}`,
+		rows: rows.map((row) => ({
+			key: row.id,
+			disabled: !row.resumable,
+			text: `${row.subagent ? "↳" : "○"} ${row.title ?? row.id.slice(-12)}${density === "comfortable" ? ` · ${row.workspace} · ${row.preset}` : ""}${row.live ? " · live" : ""}${expanded === row.id ? ` · ${row.id} · ${row.cwd}${row.parent === void 0 ? "" : ` · parent ${row.parent}`}` : ""}`
+		})),
+		cursor,
+		loading,
+		error,
+		query: options.query,
+		footer: "type search · tab/←→ filters · ↑↓/pg navigate · e details · t transcript · enter resume"
+	});
+}
+function DocumentPanel({ title, text, error, close }) {
+	const stdout = useStdout().stdout;
+	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
+	const [scroll, setScroll] = useState(0);
+	const lines = useMemo(() => text === void 0 ? [] : textLines(text, viewport.contentColumns).map((line) => line.segments.map((segment) => segment.text).join("")), [text, viewport.contentColumns]);
+	useInput((input, key) => {
+		if (key.escape || input === "q" || input === "t") return close();
+		if (key.upArrow) return setScroll((value) => Math.max(0, value - 1));
+		if (key.downArrow) return setScroll((value) => Math.min(Math.max(0, lines.length - viewport.bodyRows), value + 1));
+		if (key.pageUp) return setScroll((value) => Math.max(0, value - Math.max(1, viewport.bodyRows - 1)));
+		if (key.pageDown) return setScroll((value) => Math.min(Math.max(0, lines.length - viewport.bodyRows), value + Math.max(1, viewport.bodyRows - 1)));
+		if (input === "g") return setScroll(0);
+		if (input === "G") return setScroll(Math.max(0, lines.length - viewport.bodyRows));
+	});
+	if (viewport.compact) return createElement(Text, { wrap: "truncate-end" }, truncateColumns("transcript · esc close", viewport.contentColumns));
+	const body = error !== void 0 ? [`error: ${singleLineText(error)}`] : text === void 0 ? ["loading transcript…"] : lines.slice(scroll, scroll + viewport.bodyRows);
+	return createElement(Box, {
+		borderStyle: "round",
+		borderColor: color(TUI_RGB.dim),
+		flexDirection: "column",
+		paddingX: 1
+	}, createElement(Text, {
+		color: color(TUI_RGB.brandBright),
+		wrap: "truncate-end"
+	}, truncateColumns(title, viewport.contentColumns)), ...body.map((line, index) => createElement(Text, {
+		key: `${scroll}-${index}`,
+		wrap: "truncate-end"
+	}, truncateColumns(line, viewport.contentColumns))), createElement(Text, {
+		dimColor: true,
+		wrap: "truncate-end"
+	}, truncateColumns(`lines ${lines.length === 0 ? 0 : scroll + 1}-${Math.min(lines.length, scroll + viewport.bodyRows)}/${lines.length} · ↑↓/pg/g/G · t/esc close`, viewport.contentColumns)));
+}
+//#endregion
 //#region src/app.ts
 /**
 * The Ink terminal app: whale-and-wordmark header in DeepSeek blue, the live
@@ -1339,21 +1665,10 @@ const RESIZE_REFLOW_CLEAR = "\x1B[r\x1B[0m\x1B[H\x1B[2J\x1B[3J\x1B[H";
 function inkColor(triple) {
 	return `rgb(${triple[0]}, ${triple[1]}, ${triple[2]})`;
 }
-/** Truncate text to a visible-column budget, appending … when cut. */
-function truncateColumns(text, max) {
-	let columns = 0;
-	let out = "";
-	for (const char of text) {
-		const width = (char.codePointAt(0) ?? 0) > 11903 ? 2 : 1;
-		if (columns + width > max) return `${out}…`;
-		out += char;
-		columns += width;
-	}
-	return out;
-}
 /** Pad text with spaces to a visible-column target (menu name column). */
 function padColumns(text, width) {
-	return text + " ".repeat(Math.max(0, width - visibleColumns(text)));
+	const clipped = truncateColumns(singleLineText(text), width);
+	return clipped + " ".repeat(Math.max(0, width - visibleColumns(clipped)));
 }
 /** Interval-driven frame counter for one self-contained animated leaf. */
 function useFrames(intervalMs) {
@@ -1521,11 +1836,15 @@ function StyledRows({ lines }) {
 		...lineStyleProps(segment.style)
 	}, segment.text)))));
 }
+/** Codex-style panel rhythm that still participates in the row budget. */
+function PanelGap({ visible }) {
+	return visible ? createElement(Text, null, " ") : void 0;
+}
 /** One settled markdown document rendered as styled lines at the terminal width. */
 function MarkdownBody({ text }) {
 	const columns = useStdout().stdout?.columns ?? 80;
 	const lines = useMemo(() => renderMarkdown(displayText(text), Math.max(20, columns - 2)), [text, columns]);
-	return createElement(Box, { flexDirection: "column" }, ...lines.map((line, index) => createElement(Text, { key: index }, ...line.segments.map((segment, at) => createElement(Text, {
+	return createElement(Box, { flexDirection: "column" }, ...lines.map((line, index) => createElement(Text, { key: index }, line.segments.length === 0 ? " " : line.segments.map((segment, at) => createElement(Text, {
 		key: at,
 		...segmentProps(segment.style)
 	}, segment.text)))));
@@ -1691,9 +2010,21 @@ function StatusLine({ facts, stats, busy }) {
 		wrap: "truncate-end"
 	}, busy ? "● " : "○ ", groups.join(" | ")));
 }
+/**
+* One fixed-height local feedback row. Errors remain visible while a slash
+* subpage is open, but arbitrary exception text can never add physical rows
+* above the composer.
+*/
+function NoticeLine({ text, tone, columns }) {
+	const color = tone === "error" ? TUI_RGB.error : tone === "warning" ? TUI_RGB.warn : TUI_RGB.brandBright;
+	const mark = tone === "error" ? "⨯" : tone === "warning" ? "!" : "•";
+	return createElement(Box, { paddingLeft: 2 }, createElement(Text, {
+		color: inkColor(color),
+		wrap: "truncate-end"
+	}, truncateColumns(`${mark} ${singleLineText(text)}`, Math.max(1, columns - 2))));
+}
 /** The y/n approval bar rendered while an approval ask is pending. */
-function ApprovalBar({ approval, locked }) {
-	const snapshot = useSyncExternalStore(approval.subscribe, approval.getSnapshot);
+function ApprovalBar({ snapshot, locked }) {
 	const stdout = useStdout().stdout;
 	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
 	const [scroll, setScroll] = useState(0);
@@ -1745,7 +2076,7 @@ function ApprovalBar({ approval, locked }) {
 		color: inkColor(TUI_RGB.warn),
 		bold: true,
 		wrap: "truncate-end"
-	}, truncateColumns(`⏸ waiting for approval · lines ${content.length === 0 ? 0 : visibleScroll + 1}-${Math.min(content.length, visibleScroll + viewport.bodyRows)}/${content.length}`, viewport.contentColumns)), createElement(StyledRows, { lines: content.slice(visibleScroll, visibleScroll + viewport.bodyRows) }), createElement(Text, {
+	}, truncateColumns(`⏸ waiting for approval · lines ${content.length === 0 ? 0 : visibleScroll + 1}-${Math.min(content.length, visibleScroll + viewport.bodyRows)}/${content.length}`, viewport.contentColumns)), createElement(PanelGap, { visible: viewport.gapRows > 0 }), createElement(StyledRows, { lines: content.slice(visibleScroll, visibleScroll + viewport.bodyRows) }), createElement(PanelGap, { visible: viewport.gapRows > 0 }), createElement(Text, {
 		dimColor: true,
 		wrap: "truncate-end"
 	}, dim(truncateColumns(answered ? "submitted…" : "↑↓/pgup/pgdn scroll · y allow once · n reject", viewport.contentColumns))));
@@ -1758,8 +2089,7 @@ function ApprovalBar({ approval, locked }) {
 * service with a `plan-review` intent — the approve option gets a ✓ mark,
 * the answer encoding stays identical.
 */
-function QuestionBar({ store, locked }) {
-	const snapshot = useSyncExternalStore(store.subscribe, store.getSnapshot);
+function QuestionBar({ store, snapshot, locked }) {
 	const stdout = useStdout().stdout;
 	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
 	const pending = snapshot.pending;
@@ -1960,13 +2290,13 @@ function QuestionBar({ store, locked }) {
 		color: inkColor(isPlan ? TUI_RGB.brand : TUI_RGB.brandDeep),
 		bold: true,
 		wrap: "truncate-end"
-	}, truncateColumns(`${isPlan ? "📋 plan review" : "❓ question"} ${index + 1}/${pending.request.questions.length} · lines ${rendered.lines.length === 0 ? 0 : visibleScroll + 1}-${Math.min(rendered.lines.length, visibleScroll + viewport.bodyRows)}/${rendered.lines.length}`, viewport.contentColumns)), createElement(StyledRows, { lines: rendered.lines.slice(visibleScroll, visibleScroll + viewport.bodyRows) }), createElement(Text, {
+	}, truncateColumns(`${isPlan ? "📋 plan review" : "❓ question"} ${index + 1}/${pending.request.questions.length} · lines ${rendered.lines.length === 0 ? 0 : visibleScroll + 1}-${Math.min(rendered.lines.length, visibleScroll + viewport.bodyRows)}/${rendered.lines.length}`, viewport.contentColumns)), createElement(PanelGap, { visible: viewport.gapRows > 0 }), createElement(StyledRows, { lines: rendered.lines.slice(visibleScroll, visibleScroll + viewport.bodyRows) }), createElement(PanelGap, { visible: viewport.gapRows > 0 }), createElement(Text, {
 		dimColor: true,
 		wrap: "truncate-end"
 	}, dim(truncateColumns(footer, viewport.contentColumns))));
 }
 /** The /model panel: a scrolling list over the advisory model directory. */
-function ModelPanel({ directory, error, onSelect, onClose }) {
+function ModelPanel({ directory, error, onSelect, onRetry, onClose }) {
 	const [cursor, setCursor] = useState(0);
 	const stdout = useStdout().stdout;
 	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
@@ -1983,6 +2313,10 @@ function ModelPanel({ directory, error, onSelect, onClose }) {
 			onClose();
 			return;
 		}
+		if (input === "r") {
+			onRetry();
+			return;
+		}
 		if (rows.length === 0) return;
 		if (key.upArrow) {
 			setCursor(cursor > 0 ? cursor - 1 : rows.length - 1);
@@ -2011,9 +2345,27 @@ function ModelPanel({ directory, error, onSelect, onClose }) {
 		if (key.return && rows[cursor] !== void 0) onSelect(rows[cursor]);
 	});
 	if (viewport.maxHeight === 0) return createElement(Box, { display: "none" });
-	if (viewport.compact) return createElement(Text, { wrap: "truncate-end" }, truncateColumns("/model · esc/q close", viewport.contentColumns));
-	const first = selectionWindow(cursor, rows.length, viewport.bodyRows);
-	const visible = rows.slice(first, first + viewport.bodyRows);
+	if (viewport.compact) return createElement(Text, { wrap: "truncate-end" }, truncateColumns("/model · r retry · esc/q close", viewport.contentColumns));
+	const stateRows = directory === void 0 && error === void 0 ? [createElement(Text, {
+		key: "loading",
+		dimColor: true,
+		wrap: "truncate-end"
+	}, "  loading models…")] : error !== void 0 ? [createElement(Text, {
+		key: "error",
+		color: inkColor(TUI_RGB.error),
+		wrap: "truncate-end"
+	}, truncateColumns(`  ${singleLineText(error)}`, viewport.contentColumns))] : [...directory?.failures.length === 0 ? [] : [createElement(Text, {
+		key: "failures",
+		color: inkColor(TUI_RGB.warn),
+		wrap: "truncate-end"
+	}, truncateColumns(`  unavailable providers: ${directory?.failures.join(", ")}`, viewport.contentColumns))], ...rows.length === 0 ? [createElement(Text, {
+		key: "empty",
+		dimColor: true,
+		wrap: "truncate-end"
+	}, "  no models available")] : []];
+	const rowBudget = Math.max(0, viewport.bodyRows - stateRows.length);
+	const first = selectionWindow(cursor, rows.length, rowBudget);
+	const visible = rowBudget === 0 ? [] : rows.slice(first, first + rowBudget);
 	return createElement(Box, {
 		flexDirection: "column",
 		paddingX: 1,
@@ -2023,13 +2375,7 @@ function ModelPanel({ directory, error, onSelect, onClose }) {
 		color: inkColor(TUI_RGB.brand),
 		bold: true,
 		wrap: "truncate-end"
-	}, truncateColumns(`/model — select model${rows.length === 0 ? "" : ` · ${cursor + 1}/${rows.length}`}`, viewport.contentColumns)), directory === void 0 && error === void 0 ? createElement(Text, {
-		dimColor: true,
-		wrap: "truncate-end"
-	}, "  loading models…") : void 0, error !== void 0 ? createElement(Text, {
-		color: inkColor(TUI_RGB.error),
-		wrap: "truncate-end"
-	}, truncateColumns(`  ${displayText(error)}`, viewport.contentColumns)) : void 0, ...visible.map((row) => {
+	}, truncateColumns(`/model — select model${rows.length === 0 ? "" : ` · ${cursor + 1}/${rows.length}`}`, viewport.contentColumns)), createElement(PanelGap, { visible: viewport.gapRows > 0 }), ...stateRows, ...visible.map((row) => {
 		const index = rows.indexOf(row);
 		const label = displayText(`${row.providerName} · ${row.modelName}`);
 		return createElement(Text, {
@@ -2037,22 +2383,22 @@ function ModelPanel({ directory, error, onSelect, onClose }) {
 			color: index === cursor ? inkColor(TUI_RGB.brandBright) : inkColor(TUI_RGB.dim),
 			wrap: "truncate-end"
 		}, truncateColumns(`${index === cursor ? "❯ " : "  "}${label}`, viewport.contentColumns));
-	}), createElement(Text, {
+	}), createElement(PanelGap, { visible: viewport.gapRows > 0 }), createElement(Text, {
 		dimColor: true,
 		wrap: "truncate-end"
-	}, dim(truncateColumns("↑↓ move · pgup/pgdn page · g/G ends · enter select · esc/q close", viewport.contentColumns))));
+	}, dim(truncateColumns("↑↓ move · pgup/pgdn page · g/G ends · enter select · r retry · esc/q close", viewport.contentColumns))));
 }
 /**
 * The /help overlay: one scrolling card with the keyboard map, the TUI-local
 * commands, the live registry commands, and the user-invocable skills — the
 * real command surface, replacing the one-line notice.
 */
-function HelpPanel({ descriptors, skills, onClose }) {
+function HelpPanel({ descriptors, skills, commandError, skillError, onClose }) {
 	const stdout = useStdout().stdout;
 	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
 	const [scroll, setScroll] = useState(0);
-	const nameWidth = 18;
-	const descBudget = Math.max(1, viewport.contentColumns - nameWidth - 2);
+	const nameWidth = Math.min(18, Math.max(1, viewport.contentColumns - 2));
+	const descBudget = Math.max(0, viewport.contentColumns - nameWidth - 2);
 	const row = (label, description) => createElement(Text, {
 		dimColor: true,
 		wrap: "truncate-end"
@@ -2088,13 +2434,23 @@ function HelpPanel({ descriptors, skills, onClose }) {
 			dimColor: true,
 			wrap: "truncate-end"
 		}, "  ctrl+k cut to end of line · ctrl+u clear line · ctrl+a / ctrl+e line ends"),
+		createElement(Text, { key: "commands-gap" }, " "),
 		createElement(Text, {
 			key: "commands-title",
 			bold: true,
 			wrap: "truncate-end"
 		}, " commands"),
+		...commandError === void 0 ? [] : [createElement(Text, {
+			key: "commands-error",
+			color: inkColor(TUI_RGB.error),
+			wrap: "truncate-end"
+		}, truncateColumns(`  command catalog unavailable: ${singleLineText(commandError)}`, viewport.contentColumns))],
 		createElement(Box, { key: "local-help" }, row("/help", "show this overlay")),
 		createElement(Box, { key: "local-model" }, row("/model", "switch the model")),
+		createElement(Box, { key: "local-mode" }, row("/mode", "inspect or select the agent preset (/mode [preset])")),
+		createElement(Box, { key: "local-new" }, row("/new", "create and switch to a fresh session (/new [preset])")),
+		createElement(Box, { key: "local-resume" }, row("/resume", "browse or switch root sessions (/resume [id|prefix])")),
+		createElement(Box, { key: "local-plugin" }, row("/plugin", "inspect the live plugin composition")),
 		createElement(Box, { key: "local-clear" }, row("/clear", "clear the screen")),
 		createElement(Box, { key: "local-export" }, row("/export", "export the transcript to markdown (/export [path])")),
 		createElement(Box, { key: "local-title" }, row("/title", "rename this session (/title <text>)")),
@@ -2104,11 +2460,16 @@ function HelpPanel({ descriptors, skills, onClose }) {
 			dimColor: true,
 			wrap: "truncate-end"
 		}, `  ${padColumns(`/${descriptor.name}`, nameWidth)}${dim(truncateColumns(displayText(descriptor.description), descBudget))}`)),
-		...skills.length === 0 ? [] : [createElement(Text, {
+		...skills.length === 0 && skillError === void 0 ? [] : [createElement(Text, { key: "skills-gap" }, " "), createElement(Text, {
 			key: "skills-title",
 			bold: true,
 			wrap: "truncate-end"
 		}, " skills")],
+		...skillError === void 0 ? [] : [createElement(Text, {
+			key: "skills-error",
+			color: inkColor(TUI_RGB.error),
+			wrap: "truncate-end"
+		}, truncateColumns(`  skill catalog unavailable: ${singleLineText(skillError)}`, viewport.contentColumns))],
 		...skills.map((skill) => createElement(Text, {
 			key: `skill-${skill.name}`,
 			dimColor: true,
@@ -2145,7 +2506,7 @@ function HelpPanel({ descriptors, skills, onClose }) {
 		color: inkColor(TUI_RGB.brand),
 		bold: true,
 		wrap: "truncate-end"
-	}, truncateColumns(`/help — keys and commands · rows ${content.length === 0 ? 0 : visibleScroll + 1}-${Math.min(content.length, visibleScroll + viewport.bodyRows)}/${content.length}`, viewport.contentColumns)), ...content.slice(visibleScroll, visibleScroll + viewport.bodyRows), createElement(Text, {
+	}, truncateColumns(`/help — keys and commands · rows ${content.length === 0 ? 0 : visibleScroll + 1}-${Math.min(content.length, visibleScroll + viewport.bodyRows)}/${content.length}`, viewport.contentColumns)), createElement(PanelGap, { visible: viewport.gapRows > 0 }), ...content.slice(visibleScroll, visibleScroll + viewport.bodyRows), createElement(PanelGap, { visible: viewport.gapRows > 0 }), createElement(Text, {
 		dimColor: true,
 		wrap: "truncate-end"
 	}, dim(truncateColumns("↑↓ scroll · pgup/pgdn page · g/G ends · esc/q close", viewport.contentColumns))));
@@ -2269,7 +2630,7 @@ function VerbosePanel({ entries, onClose }) {
 		color: inkColor(TUI_RGB.brand),
 		bold: true,
 		wrap: "truncate-end"
-	}, truncateColumns(title, viewport.contentColumns)), createElement(Box, { flexDirection: "column" }, entry === void 0 ? createElement(Text, { dimColor: true }, "  no durable entries yet") : createElement(StyledRows, { lines: visible })), createElement(Text, {
+	}, truncateColumns(title, viewport.contentColumns)), createElement(PanelGap, { visible: viewport.gapRows > 0 }), createElement(Box, { flexDirection: "column" }, entry === void 0 ? createElement(Text, { dimColor: true }, "  no durable entries yet") : createElement(StyledRows, { lines: visible })), createElement(PanelGap, { visible: viewport.gapRows > 0 }), createElement(Text, {
 		dimColor: true,
 		wrap: "truncate-end"
 	}, dim(truncateColumns("←→ entry · ↑↓ scroll · pgup/pgdn page · g/G ends · ctrl+o/esc/q close", viewport.contentColumns))));
@@ -2307,6 +2668,26 @@ function completionCandidates(value, descriptors, skills) {
 			description: "switch the model",
 			origin: "command"
 		},
+		{
+			label: "/mode",
+			description: "select the agent preset",
+			origin: "command"
+		},
+		{
+			label: "/new",
+			description: "start a fresh session",
+			origin: "command"
+		},
+		{
+			label: "/resume",
+			description: "browse or switch sessions",
+			origin: "command"
+		},
+		{
+			label: "/plugin",
+			description: "inspect the plugin composition",
+			origin: "command"
+		},
 		{
 			label: "/clear",
 			description: "clear the screen",
@@ -2362,16 +2743,19 @@ function CompletionMenu({ active, mention, index, rows }) {
 	const columns = stdout?.columns ?? 80;
 	const terminalRows = stdout?.rows ?? 30;
 	if (!active) return void 0;
-	const nameWidth = Math.min(18, Math.max(0, ...rows.map((row) => visibleColumns(row.label))) + 2);
-	const descBudget = Math.max(24, columns - nameWidth - 8);
+	const contentColumns = Math.max(1, columns - 4);
+	const nameWidth = Math.min(18, Math.max(1, contentColumns - 2), Math.max(0, ...rows.map((row) => visibleColumns(row.label))) + 2);
+	const descBudget = Math.max(0, contentColumns - nameWidth - 2);
 	const showFooter = terminalRows >= 12;
-	const limit = Math.max(1, Math.min(6, terminalRows - (showFooter ? 11 : 10)));
+	const verticalPadding = terminalRows >= 14 ? 1 : 0;
+	const limit = Math.max(1, Math.min(6, terminalRows - (showFooter ? 11 : 10) - verticalPadding * 2));
 	const selected = rows.length === 0 ? 0 : index % rows.length;
 	const first = selectionWindow(selected, rows.length, limit);
 	const visible = rows.slice(first, first + limit);
 	return createElement(Box, {
 		flexDirection: "column",
-		marginLeft: 2
+		marginLeft: 2,
+		paddingY: verticalPadding
 	}, ...rows.length === 0 ? [createElement(Text, {
 		key: "loading",
 		dimColor: true
@@ -2393,7 +2777,7 @@ function CompletionMenu({ active, mention, index, rows }) {
 * While a modal (approval / question / model panel) owns the keys, the
 * box passes every key through untouched.
 */
-function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, interrupt, quit, openModel, openHelp, notify, toggleReasoning, openVerbose, clearView, refresh, loadMentions, cyclePermission, exportTranscript, renameTitle }) {
+function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, interrupt, quit, openModel, openHelp, openMode, openResume, openPlugin, createSession, cancelSessionSwitch, notify, hasNotice, dismissNotice, toggleReasoning, openVerbose, clearView, refresh, loadMentions, cyclePermission, exportTranscript, renameTitle }) {
 	const columns = useStdout().stdout?.columns ?? 80;
 	const [value, setValue] = useState("");
 	const [cursor, setCursor] = useState(0);
@@ -2401,6 +2785,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 	const historyIndex = useRef(null);
 	const draft = useRef("");
 	const [completionIndex, setCompletionIndex] = useState(0);
+	const [dismissedMenuValue, setDismissedMenuValue] = useState(void 0);
 	const candidates = completionCandidates(value, descriptors, skills);
 	const slashActive = candidates.length > 0 && value.startsWith("/") && !value.includes(" ") && !value.includes("\n");
 	const beforeCursor = value.slice(0, cursor);
@@ -2449,7 +2834,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 		mentionActive,
 		mentionToken?.query
 	]);
-	const menuActive = (slashActive || mentionActive || pathActive) && !busy;
+	const menuActive = (slashActive || mentionActive || pathActive) && dismissedMenuValue !== value;
 	const menuRows = mentionActive ? mentionRows.map((row) => ({
 		label: row.label.startsWith("@") ? row.label : `@${row.label}${row.kind === "directory" ? "/" : ""}`,
 		description: row.description,
@@ -2462,8 +2847,12 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 	useInput((input, key) => {
 		if (!active) return;
 		if (key.tab && key.shift) {
-			const next = cyclePermission();
-			if (next !== "") notify(`permission → ${next}`);
+			try {
+				const next = cyclePermission();
+				if (next !== "") notify(`permission → ${next}`);
+			} catch (error) {
+				notify(`permission change failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+			}
 			return;
 		}
 		if (key.ctrl && input === "r") {
@@ -2480,15 +2869,24 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 				setValue("");
 				setCursor(0);
 				setCompletionIndex(0);
+				setDismissedMenuValue(void 0);
 			} else quit();
 			return;
 		}
 		if (key.ctrl && input === "d") {
-			if (busy) notify("cancel the running turn before exiting (Esc or Ctrl+C)");
+			if (busy) notify("cancel the running turn before exiting (Esc or Ctrl+C)", "warning");
 			else quit();
 			return;
 		}
 		if (key.escape) {
+			if (menuActive) {
+				setDismissedMenuValue(value);
+				return;
+			}
+			if (hasNotice) {
+				dismissNotice();
+				return;
+			}
 			if (busy) interrupt();
 			return;
 		}
@@ -2496,13 +2894,16 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 			if (key.meta || key.ctrl && input === "j") {
 				setValue(value.slice(0, cursor) + "\n" + value.slice(cursor));
 				setCursor(cursor + 1);
+				setDismissedMenuValue(void 0);
 				return;
 			}
 			const text = value.trim();
 			setValue("");
 			setCursor(0);
 			setCompletionIndex(0);
+			setDismissedMenuValue(void 0);
 			if (text === "") return;
+			dismissNotice();
 			history.current = [...history.current, text];
 			historyIndex.current = null;
 			if (text === "/quit") {
@@ -2516,6 +2917,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 			if (text === "/clear") {
 				refresh();
 				clearView();
+				dismissNotice();
 				return;
 			}
 			if (text === "/export" || text.startsWith("/export ")) {
@@ -2523,13 +2925,36 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 				return;
 			}
 			if (text === "/title" || text.startsWith("/title ")) {
-				notify(renameTitle(text.slice(7)));
+				const outcome = renameTitle(text.slice(7));
+				notify(outcome, outcome.startsWith("rename failed:") ? "error" : outcome.startsWith("usage:") || outcome.includes("unavailable") ? "warning" : "info");
 				return;
 			}
 			if (text === "/model" || text.startsWith("/model ")) {
 				openModel();
 				return;
 			}
+			if (text === "/mode" || text.startsWith("/mode ")) {
+				if (text.slice(5).trim() === "") openMode();
+				else dispatch(text);
+				return;
+			}
+			if (text === "/resume cancel") {
+				notify(cancelSessionSwitch() ? "pending session switch cancelled" : "no pending session switch", "info");
+				return;
+			}
+			if (text === "/resume" || text.startsWith("/resume ")) {
+				if (text.slice(7).trim() === "") openResume();
+				else dispatch(text);
+				return;
+			}
+			if (text === "/new" || text.startsWith("/new ")) {
+				createSession(text.slice(4).trim() || void 0);
+				return;
+			}
+			if (text === "/plugin" || text.startsWith("/plugin ")) {
+				openPlugin(text.slice(7).trim());
+				return;
+			}
 			if (busy && !text.startsWith("/")) {
 				steer(text);
 				return;
@@ -2553,6 +2978,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 			historyIndex.current = next;
 			setValue(entries[next] ?? "");
 			setCursor((entries[next] ?? "").length);
+			setDismissedMenuValue(void 0);
 			return;
 		}
 		if (key.downArrow) {
@@ -2563,11 +2989,13 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 				historyIndex.current = null;
 				setValue(draft.current);
 				setCursor(draft.current.length);
+				setDismissedMenuValue(void 0);
 				return;
 			}
 			historyIndex.current = next;
 			setValue(entries[next] ?? "");
 			setCursor((entries[next] ?? "").length);
+			setDismissedMenuValue(void 0);
 			return;
 		}
 		if (key.tab && menuActive) {
@@ -2593,6 +3021,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 				}
 			}
 			setCompletionIndex(0);
+			setDismissedMenuValue(void 0);
 			return;
 		}
 		if (key.backspace || key.delete) {
@@ -2600,6 +3029,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 				setValue(value.slice(0, cursor - 1) + value.slice(cursor));
 				setCursor(cursor - 1);
 				setCompletionIndex(0);
+				setDismissedMenuValue(void 0);
 			}
 			return;
 		}
@@ -2614,10 +3044,12 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 		if (key.ctrl && input === "u") {
 			setValue("");
 			setCursor(0);
+			setDismissedMenuValue(void 0);
 			return;
 		}
 		if (key.ctrl && input === "k") {
 			setValue(value.slice(0, cursor));
+			setDismissedMenuValue(void 0);
 			return;
 		}
 		if (key.ctrl && input === "l") {
@@ -2636,6 +3068,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 			setValue(value.slice(0, cursor) + input + value.slice(cursor));
 			setCursor(cursor + input.length);
 			setCompletionIndex(0);
+			setDismissedMenuValue(void 0);
 		}
 	});
 	if (frozen) {
@@ -2667,18 +3100,23 @@ function App(props) {
 	const [modelOpen, setModelOpen] = useState(false);
 	const [directory, setDirectory] = useState(void 0);
 	const [modelError, setModelError] = useState(void 0);
-	const [notices, setNotices] = useState([]);
-	const notify = (text) => {
-		setNotices((current) => [...current, text]);
-	};
+	const [modelLoadEpoch, setModelLoadEpoch] = useState(0);
+	const [notice, setNotice] = useState(void 0);
+	const notify = useCallback((text, tone = "info") => {
+		setNotice({
+			text,
+			tone
+		});
+	}, []);
 	useEffect(() => {
 		props.onBridgeReady({ notify });
 	}, []);
 	useEffect(() => {
-		if (!modelOpen || directory !== void 0) return;
+		if (!modelOpen) return;
 		let cancelled = false;
+		setDirectory(void 0);
 		setModelError(void 0);
-		props.loadModels().then((loaded) => {
+		Promise.resolve().then(() => props.loadModels()).then((loaded) => {
 			if (!cancelled) setDirectory(loaded);
 		}, (error) => {
 			if (!cancelled) setModelError(error instanceof Error ? error.message : String(error));
@@ -2686,21 +3124,32 @@ function App(props) {
 		return () => {
 			cancelled = true;
 		};
-	}, [modelOpen]);
+	}, [
+		modelOpen,
+		modelLoadEpoch,
+		props.loadModels
+	]);
 	const busy = view.busy;
 	const [showReasoning, setShowReasoning] = useState(false);
 	const [verboseOpen, setVerboseOpen] = useState(false);
 	const [helpOpen, setHelpOpen] = useState(false);
+	const [modeOpen, setModeOpen] = useState(false);
+	const [resumeOpen, setResumeOpen] = useState(false);
+	const [pluginOpen, setPluginOpen] = useState(false);
+	const [pluginQuery, setPluginQuery] = useState("");
 	const [refreshEpoch, setRefreshEpoch] = useState(0);
 	const approvalSnapshot = useSyncExternalStore(props.approval.subscribe, props.approval.getSnapshot);
 	const questionSnapshot = useSyncExternalStore(props.questions.subscribe, props.questions.getSnapshot);
 	const approvalPending = approvalSnapshot.pending !== void 0;
 	const questionPending = questionSnapshot.pending !== void 0;
-	const inputActive = !modelOpen && !helpOpen && !verboseOpen && !approvalPending && !questionPending;
+	const inputActive = !modelOpen && !helpOpen && !modeOpen && !resumeOpen && !pluginOpen && !verboseOpen && !approvalPending && !questionPending;
 	useEffect(() => {
 		if (!approvalPending && !questionPending) return;
 		setModelOpen(false);
 		setHelpOpen(false);
+		setModeOpen(false);
+		setResumeOpen(false);
+		setPluginOpen(false);
 		setVerboseOpen(false);
 	}, [approvalPending, questionPending]);
 	const settled = useMemo(() => settledEntryCount(view.entries), [view.entries]);
@@ -2715,14 +3164,19 @@ function App(props) {
 				showReasoning,
 				verbose: false
 			});
-			if (entry.kind === "user" && index > 0) rows.push(createElement(Box, {
-				key: `gap-${index}`,
+			const roomyPrompt = entry.kind === "user" && !entry.notice;
+			if (roomyPrompt) rows.push(createElement(Box, {
+				key: `prompt-before-${index}`,
 				paddingX: 1
 			}, createElement(Text, null, " ")));
 			rows.push(createElement(Box, {
 				key: index,
 				paddingX: 1
 			}, row));
+			if (roomyPrompt) rows.push(createElement(Box, {
+				key: `prompt-after-${index}`,
+				paddingX: 1
+			}, createElement(Text, null, " ")));
 		});
 		return rows;
 	}, [
@@ -2762,7 +3216,8 @@ function App(props) {
 	}, [appStdout]);
 	const terminalRows = terminalSize.rows;
 	const terminalColumns = terminalSize.columns;
-	const dynamicRows = Math.max(1, terminalRows - 12);
+	const composerGutterRows = layoutGutterRows(terminalRows);
+	const dynamicRows = Math.max(1, terminalRows - 12 - composerGutterRows);
 	const streamingActive = view.streaming !== "" || view.streamingReasoning !== "";
 	const deepDivingVisible = busy && !streamingActive;
 	const allLiveLines = useMemo(() => view.entries.slice(settled).flatMap((entry) => transcriptEntryLines(entry, Math.max(1, terminalColumns - 2))), [
@@ -2775,8 +3230,8 @@ function App(props) {
 	const streamRows = Math.max(1, dynamicRows - visibleLiveLines.length);
 	const reasoningRows = view.streamingReasoning === "" ? 0 : view.streaming === "" ? streamRows : streamRows <= 1 ? 0 : showReasoning ? Math.max(1, Math.floor(streamRows / 3)) : 1;
 	const answerRows = view.streaming === "" ? 0 : Math.max(1, streamRows - reasoningRows);
-	const transcriptVisible = !modelOpen && !helpOpen && !verboseOpen && !approvalPending && !questionPending;
-	const modalVisible = modelOpen || helpOpen || verboseOpen && !approvalPending && !questionPending || approvalPending || questionPending;
+	const transcriptVisible = !modelOpen && !helpOpen && !modeOpen && !resumeOpen && !pluginOpen && !verboseOpen && !approvalPending && !questionPending;
+	const modalVisible = modelOpen || helpOpen || modeOpen || resumeOpen || pluginOpen || verboseOpen && !approvalPending && !questionPending || approvalPending || questionPending;
 	const closeInspector = useCallback(() => {
 		setVerboseOpen(false);
 	}, []);
@@ -2801,17 +3256,25 @@ function App(props) {
 		maxRows: answerRows
 	}, busy ? createElement(Caret) : void 0) : void 0, deepDivingVisible ? createElement(DeepDivingLine, { since: view.busySince }) : void 0) : void 0, transcriptVisible ? createElement(TodoPanel, { todos: view.todos }) : void 0, createElement(QuestionBar, {
 		store: props.questions,
+		snapshot: questionSnapshot,
 		locked: false
 	}), createElement(ApprovalBar, {
-		approval: props.approval,
+		snapshot: approvalSnapshot,
 		locked: questionPending
 	}), modelOpen && !approvalPending && !questionPending ? createElement(ModelPanel, {
 		directory,
 		error: modelError,
 		onSelect: (row) => {
-			setModelLabel(props.selectModel(row));
-			notify(`model → next step uses ${row.provider}/${row.model}`);
-			setModelOpen(false);
+			try {
+				setModelLabel(props.selectModel(row));
+				notify(`model → next step uses ${row.provider}/${row.model}`);
+				setModelOpen(false);
+			} catch (error) {
+				notify(`model switch failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+			}
+		},
+		onRetry: () => {
+			setModelLoadEpoch((epoch) => epoch + 1);
 		},
 		onClose: () => {
 			setModelOpen(false);
@@ -2819,17 +3282,45 @@ function App(props) {
 	}) : void 0, helpOpen && !approvalPending && !questionPending ? createElement(HelpPanel, {
 		descriptors,
 		skills,
+		commandError: props.commands.error,
+		skillError: props.skills.error,
 		onClose: () => {
 			setHelpOpen(false);
 		}
 	}) : void 0, verboseOpen && !approvalPending && !questionPending ? createElement(MemoVerbosePanel, {
 		entries: view.entries,
 		onClose: closeInspector
-	}) : void 0, transcriptVisible ? createElement(Box, { flexDirection: "column" }, ...notices.slice(-1).map((notice, index) => createElement(Text, {
-		key: index,
-		dimColor: true,
-		wrap: "truncate-end"
-	}, displayText(notice)))) : void 0, createElement(Box, { flexDirection: "column" }, createElement(Input, {
+	}) : void 0, modeOpen && !approvalPending && !questionPending ? createElement(ModePanel, {
+		current: props.mode,
+		load: props.loadPresets,
+		select: (id) => {
+			props.switchMode(id).then((label) => {
+				notify(`mode → ${label}`);
+				setModeOpen(false);
+			}, (reason) => notify(`mode switch failed: ${reason instanceof Error ? reason.message : String(reason)}`, "error"));
+		},
+		close: () => setModeOpen(false)
+	}) : void 0, resumeOpen && !approvalPending && !questionPending ? createElement(ResumePanel, {
+		currentCwd: props.workspaceRoot,
+		load: props.loadSessions,
+		readTranscript: props.loadSessionTranscript,
+		select: (row) => {
+			props.switchSession(row);
+			setResumeOpen(false);
+		},
+		close: () => setResumeOpen(false)
+	}) : void 0, pluginOpen && !approvalPending && !questionPending ? createElement(PluginPanel, {
+		load: props.loadPlugins,
+		initialQuery: pluginQuery,
+		close: () => setPluginOpen(false)
+	}) : void 0, notice === void 0 ? void 0 : createElement(NoticeLine, {
+		text: notice.text,
+		tone: notice.tone,
+		columns: terminalColumns
+	}), createElement(Box, {
+		flexDirection: "column",
+		marginTop: composerGutterRows
+	}, createElement(Input, {
 		active: inputActive,
 		frozen: modalVisible,
 		busy,
@@ -2840,12 +3331,26 @@ function App(props) {
 		interrupt: props.interrupt,
 		quit: props.quit,
 		openModel: () => {
+			setDirectory(void 0);
+			setModelError(void 0);
 			setModelOpen(true);
 		},
 		openHelp: () => {
 			setHelpOpen(true);
 		},
+		openMode: () => setModeOpen(true),
+		openResume: () => setResumeOpen(true),
+		openPlugin: (query = "") => {
+			setPluginQuery(query);
+			setPluginOpen(true);
+		},
+		createSession: props.createSession,
+		cancelSessionSwitch: props.cancelSessionSwitch,
 		notify,
+		hasNotice: notice !== void 0,
+		dismissNotice: () => {
+			setNotice(void 0);
+		},
 		openVerbose: () => {
 			setVerboseOpen(true);
 		},
@@ -2863,6 +3368,7 @@ function App(props) {
 	}), createElement(StatusLine, {
 		facts: {
 			model: modelLabel,
+			mode: props.mode,
 			cwd: props.cwd,
 			branch: props.branch,
 			sessionId: props.sessionId,
@@ -2975,10 +3481,17 @@ function watchCommands(ctx) {
 	const commands = ctx.get("commands");
 	let agent;
 	let descriptors = [];
+	let error;
 	const listeners = /* @__PURE__ */ new Set();
 	const refresh = () => {
 		if (commands === void 0 || agent === void 0) return;
-		descriptors = commands.list(agent);
+		try {
+			descriptors = commands.list(agent);
+			error = void 0;
+		} catch (cause) {
+			descriptors = [...descriptors];
+			error = cause instanceof Error ? cause.message : String(cause);
+		}
 		for (const listener of listeners) listener();
 	};
 	if (commands !== void 0) ctx.on("commands/change", () => refresh());
@@ -2986,6 +3499,9 @@ function watchCommands(ctx) {
 		get descriptors() {
 			return descriptors;
 		},
+		get error() {
+			return error;
+		},
 		subscribe(listener) {
 			listeners.add(listener);
 			return () => {
@@ -3019,9 +3535,14 @@ function isSlashLine(line) {
 const internals = {
 	mount: (element) => {
 		const instance = render(element);
-		return { unmount() {
-			instance.unmount();
-		} };
+		return {
+			rerender(element) {
+				instance.rerender(element);
+			},
+			unmount() {
+				instance.unmount();
+			}
+		};
 	},
 	stderr: process.stderr
 };
@@ -3345,24 +3866,36 @@ function watchSkills(ctx) {
 	const skills = ctx.get("skills");
 	let agent;
 	let rows = [];
+	let error;
 	const listeners = /* @__PURE__ */ new Set();
 	const reload = () => {
-		if (skills === void 0 || agent === void 0) return;
-		skills.list({
-			cwd: agent.session.header.cwd,
-			scope: agent
-		}).then((summaries) => {
+		const currentAgent = agent;
+		if (skills === void 0 || currentAgent === void 0) return;
+		Promise.resolve().then(() => skills.list({
+			cwd: currentAgent.session.header.cwd,
+			scope: currentAgent
+		})).then((summaries) => {
 			const next = toRows(summaries);
-			if (next.length === rows.length && next.every((row, index) => row.name === rows[index]?.name)) return;
+			const unchanged = next.length === rows.length && next.every((row, index) => row.name === rows[index]?.name);
 			rows = next;
+			const recovered = error !== void 0;
+			error = void 0;
+			if (unchanged && !recovered) return;
 			for (const listener of listeners) listener();
-		}, () => {});
+		}).catch((cause) => {
+			rows = [...rows];
+			error = cause instanceof Error ? cause.message : String(cause);
+			for (const listener of listeners) listener();
+		});
 	};
 	if (skills !== void 0) ctx.on("skills/change", reload);
 	return {
 		get rows() {
 			return rows;
 		},
+		get error() {
+			return error;
+		},
 		subscribe(listener) {
 			listeners.add(listener);
 			return () => {
@@ -3443,15 +3976,152 @@ function buildExportMarkdown(view, sessionId) {
 	return out.join("\n");
 }
 //#endregion
+//#region src/session-switch.ts
+var SessionSwitchQueue = class {
+	execute;
+	failed;
+	pending;
+	pumping = false;
+	constructor(execute, failed) {
+		this.execute = execute;
+		this.failed = failed;
+	}
+	/** Queue a request; a later request replaces any request still waiting. */
+	request(activity, value) {
+		this.pending = {
+			activity,
+			value
+		};
+		const outcome = activity.status === "running" || this.pumping ? "queued" : "started";
+		if (!this.pumping) this.pump();
+		return outcome;
+	}
+	/** Cancel only work that has not begun activation. */
+	cancel() {
+		if (this.pending === void 0) return false;
+		this.pending = void 0;
+		return true;
+	}
+	async pump() {
+		this.pumping = true;
+		try {
+			while (this.pending !== void 0) {
+				const observed = this.pending;
+				await observed.activity.whenIdle();
+				if (this.pending !== observed) continue;
+				this.pending = void 0;
+				try {
+					await this.execute(observed.value);
+				} catch (error) {
+					this.failed(error);
+				}
+			}
+		} finally {
+			this.pumping = false;
+			if (this.pending !== void 0) this.pump();
+		}
+	}
+};
+//#endregion
+//#region src/presets.ts
+/** Read an optional Cordis service without requiring its package at build time. */
+function agentPresetsFrom(ctx) {
+	return ctx.get("agentPresets");
+}
+/** A preset may change only before the first durable turn begins. */
+function isBlankSession(events) {
+	return !events.some((event) => event.type === "turn/start");
+}
+/** Latest logged selection wins; legacy sessions deliberately fall back to standard. */
+function resolvePreset(session) {
+	for (let index = session.events.length - 1; index >= 0; index -= 1) {
+		const event = session.events[index];
+		if (event.type === "agent-preset/selected" && event.data?.agentPreset !== void 0) return event.data.agentPreset;
+	}
+	return session.header.agentPreset ?? "standard";
+}
+/** Recompose atomically from the caller's perspective, logging only success. */
+async function switchPreset(service, agent, presetId) {
+	if (!isBlankSession(agent.session.events)) throw new Error("mode is locked after the first turn; use /new <mode>");
+	const preset = await service.recompose(agent.ctx, presetId);
+	agent.session.append("agent-preset/selected", { agentPreset: preset.id });
+	return preset;
+}
+//#endregion
+//#region src/plugin-inventory.ts
+const PHASES = {
+	0: "pending",
+	1: "loading",
+	2: "active",
+	3: "failed",
+	4: null,
+	5: "unloading"
+};
+/** Snapshot the live Loader; group-only rows are composition containers, not plugins. */
+function listPluginRows(ctx) {
+	const loader = ctx.get("loader");
+	if (loader === void 0) return [];
+	const rows = [];
+	for (const entry of loader.entries()) {
+		if (entry.options.group === true) continue;
+		rows.push({
+			entryId: entry.id,
+			moduleName: entry.options.name,
+			enabled: !entry.disabled,
+			phase: entry.fiber === void 0 ? null : PHASES[entry.fiber.state] ?? null
+		});
+	}
+	return rows;
+}
+//#endregion
+//#region src/session-directory.ts
+/** Lightweight session-directory projection for the /resume picker. */
+function samePath(left, right) {
+	if (left === void 0) return false;
+	return resolve(left).toLowerCase() === resolve(right).toLowerCase();
+}
+/** Filter/sort header-only records. No session log is loaded here. */
+function projectSessionRows(records, options) {
+	const needle = options.query.trim().toLowerCase();
+	return records.filter((record) => options.sessions === "all" || record.header.parentSession === void 0 && record.header.origin !== "subagent").filter((record) => options.cwd === "all" || samePath(record.header.cwd, options.currentCwd)).map((record) => {
+		const cwd = record.header.cwd ?? "";
+		const subagent = record.header.origin === "subagent" || record.header.parentSession !== void 0;
+		return {
+			id: record.header.id,
+			createdAt: record.header.createdAt,
+			cwd,
+			workspace: cwd === "" ? "(no workspace)" : basename(cwd),
+			parent: record.header.parentSession,
+			subagent,
+			resumable: !subagent,
+			live: record.live,
+			persisted: record.persisted,
+			preset: record.header.agentPreset ?? "standard"
+		};
+	}).filter((row) => needle === "" || `${row.id} ${row.cwd} ${row.workspace} ${row.preset}`.toLowerCase().includes(needle)).sort((left, right) => options.sort === "newest" ? right.createdAt - left.createdAt : left.createdAt - right.createdAt);
+}
+/** Merge page-local title observations without disturbing directory order. */
+function mergeSessionTitles(rows, observations) {
+	const titles = /* @__PURE__ */ new Map();
+	for (const observation of observations) {
+		if (observation.status !== "fulfilled") continue;
+		const title = observation.value?.title?.title ?? observation.value?.title?.text;
+		if (title !== void 0 && title.trim() !== "") titles.set(observation.sessionId, title);
+	}
+	return rows.map((row) => titles.has(row.id) ? {
+		...row,
+		title: titles.get(row.id)
+	} : row);
+}
+//#endregion
 //#region src/index.ts
 /**
 * @deepseek-ai/dsh-code — the interactive terminal driver. The bundle patch
 * rides over dsh-base without Host, HTTP, or browser plugins; this runner
-* creates (or resumes) one Agent through the core registry, mounts the Ink
-* app (DeepSeek blue, whale wordmark), folds submitted prompts into the same
-* durable session, answers approval asks with a y/n bar, dispatches slash
-* commands through the shared registry, and on quit flushes and requests
-* process exit.
+* creates or resumes preset-composed Agents through the core registry, keeps
+* one Ink owner while the active session changes, folds submitted prompts
+* into the selected durable session, answers approval asks with a y/n bar,
+* dispatches slash commands, and on quit flushes and requests process exit.
 *
 * @module @deepseek-ai/dsh-code
 */
@@ -3465,7 +4135,8 @@ const inject = [
 ];
 const Config = z.object({ startup: z.object({
 	kind: z.string().required(),
-	sessionId: z.string()
+	sessionId: z.string(),
+	mode: z.string()
 }) });
 /** Report an unexpected direct-driver failure and request a failing exit. */
 function fail(io, error) {
@@ -3495,11 +4166,13 @@ function gitBranch(cwd) {
 async function resolveTarget(startup, persistence, cwd) {
 	if (startup.kind === "fresh") return {
 		sessionId: `session-${randomUUID()}`,
-		resume: false
+		resume: false,
+		mode: startup.mode
 	};
 	if (startup.kind === "named") return {
 		sessionId: startup.sessionId,
-		resume: false
+		resume: false,
+		mode: startup.mode
 	};
 	if (persistence === void 0) throw new Error("cannot resolve the requested session: session persistence is not configured");
 	const headers = await persistence.list();
@@ -3550,63 +4223,76 @@ async function run(ctx, startup, io) {
 	const defaultModel = ctx.get("agentDefaultModel");
 	const sessions = ctx.get("sessions");
 	const persistence = ctx.get("sessionPersistence");
+	const sessionQuery = ctx.get("sessionQuery");
 	if (agents === void 0 || defaultModel === void 0 || sessions === void 0) return;
 	const cwd = process.cwd();
 	const target = await resolveTarget(startup, persistence, cwd);
 	const defaults = defaultModel.currentSelection();
-	let picked;
-	let session;
-	let agent;
-	if (target.resume) {
-		agent = (await agents.resume({
-			resumeSessionId: SessionId(target.sessionId),
+	const presets = agentPresetsFrom(ctx);
+	if (presets === void 0) throw new Error("agent preset service is unavailable; check the dsh-code bundle patch");
+	/** Prepare a complete next session before disturbing the currently visible one. */
+	const prepare = async (next) => {
+		const nextCwd = next.cwd ?? cwd;
+		const selectionState = {};
+		let mode = next.mode;
+		if (!next.resume) mode = (await presets.resolve(mode)).id;
+		const setup = async (agentCtx) => {
+			const sessionPreset = next.resume ? resolvePreset(agentCtx.agent.session) : mode;
+			mode = (await presets.mount(agentCtx, sessionPreset)).id;
+			installModelSelection(agentCtx, {
+				get current() {
+					if (selectionState.picked !== void 0) return selectionState.picked;
+					const logged = agentCtx.agent?.session.requestHeader()?.config;
+					if (logged !== void 0) return {
+						provider: logged.provider,
+						model: logged.model,
+						...logged.reasoningEffort === void 0 ? {} : { reasoningEffort: logged.reasoningEffort }
+					};
+					return defaults;
+				},
+				set current(value) {
+					selectionState.picked = value;
+				},
+				assembled: void 0
+			});
+		};
+		const handle = next.resume ? await agents.resume({
+			resumeSessionId: SessionId(next.sessionId),
 			agentOptions: {
 				provider: defaults.provider,
 				model: defaults.model
 			},
-			setup: (agentCtx) => {
-				installModelSelection(agentCtx, {
-					get current() {
-						if (picked !== void 0) return picked;
-						const logged = agentCtx.agent?.session.requestHeader()?.config;
-						if (logged !== void 0) return {
-							provider: logged.provider,
-							model: logged.model,
-							...logged.reasoningEffort === void 0 ? {} : { reasoningEffort: logged.reasoningEffort }
-						};
-						return defaults;
-					},
-					set current(next) {
-						picked = next;
-					},
-					assembled: void 0
-				});
-			}
-		})).agent;
-		session = agent.session;
-	} else {
-		agent = (await agents.create({
-			sessionId: SessionId(target.sessionId),
-			meta: { cwd },
+			setup
+		}) : await agents.create({
+			sessionId: SessionId(next.sessionId),
+			meta: {
+				cwd: nextCwd,
+				agentPreset: mode
+			},
 			agentOptions: {
 				provider: defaults.provider,
 				model: defaults.model
 			},
-			setup: (agentCtx) => {
-				installModelSelection(agentCtx, {
-					get current() {
-						return picked ?? defaults;
-					},
-					set current(next) {
-						picked = next;
-					},
-					assembled: void 0
-				});
-			}
-		})).agent;
-		session = agent.session;
-	}
-	const store = createTranscriptStore(session.events);
+			setup
+		});
+		const session = handle.agent.session;
+		const sessionCwd = session.header.cwd ?? nextCwd;
+		return {
+			handle,
+			agent: handle.agent,
+			session,
+			store: createTranscriptStore(session.events),
+			mentions: createMentions(ctx, handle.agent, sessionCwd),
+			mode: mode ?? "standard",
+			selection: selectionState,
+			resumed: next.resume
+		};
+	};
+	let active = await prepare(target);
+	let agent = active.agent;
+	let session = active.session;
+	let store = active.store;
+	let mentions = active.mentions;
 	const off = ctx.on("session/event", (subject, event) => {
 		if (subject.id === session.id) store.apply(event);
 	});
@@ -3616,39 +4302,53 @@ async function run(ctx, startup, io) {
 	skills.setAgent(agent);
 	const approval = mountApprovalAnswerer(ctx, (candidate) => candidate.id === agent.id, (request) => approvalCommandPreview(store.getView().entries, request.callId, request.toolName));
 	const questions = mountQuestionProvider(ctx);
-	const mentions = createMentions(ctx, agent, session.header.cwd ?? cwd);
 	const bridge = { notify: () => {} };
 	const mountRef = {};
 	let quitting = false;
 	const quit = () => {
 		if (quitting) return;
 		quitting = true;
+		switchQueue.cancel();
 		off();
 		mountRef.current?.unmount();
 		sessions.flush(session).catch((flushError) => {
 			internals.stderr.write(`dsh: session flush failed: ${flushError instanceof Error ? flushError.message : String(flushError)}\n`);
+		}).then(() => active.handle.dispose()).catch((disposeError) => {
+			internals.stderr.write(`dsh: agent disposal failed: ${disposeError instanceof Error ? disposeError.message : String(disposeError)}\n`);
 		}).then(() => {
 			io.exit(0);
 		});
 	};
 	/** Run one slash line through the command registry (closed namespace). */
 	const runSlash = (line) => {
+		if (line.startsWith("/mode ")) {
+			switchModeAction(line.slice(6).trim());
+			return;
+		}
+		if (line.startsWith("/resume ")) {
+			requestResume(line.slice(8).trim());
+			return;
+		}
 		const registry = ctx.get("commands");
 		if (registry === void 0) {
-			bridge.notify("no command registry is mounted in this composition");
+			bridge.notify("no command registry is mounted in this composition", "error");
 			return;
 		}
 		const controller = new AbortController();
-		registry.execute(agent, line, controller.signal).then((execution) => {
-			if (execution === void 0) agent.followup(createUserMessage({
-				content: [{
-					type: "text",
-					text: line
-				}],
-				source: { kind: "user" }
-			}));
+		Promise.resolve().then(() => registry.execute(agent, line, controller.signal)).then((execution) => {
+			if (execution === void 0) try {
+				agent.followup(createUserMessage({
+					content: [{
+						type: "text",
+						text: line
+					}],
+					source: { kind: "user" }
+				}));
+			} catch (error) {
+				bridge.notify(`command fallback failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+			}
 		}, (error) => {
-			bridge.notify(`command failed: ${error instanceof Error ? error.message : String(error)}`);
+			bridge.notify(`command failed: ${error instanceof Error ? error.message : String(error)}`, "error");
 		});
 	};
 	/** Deliver one readable line to the agent, expanding session mentions first. */
@@ -3663,22 +4363,26 @@ async function run(ctx, startup, io) {
 		try {
 			parsed = mentions.parse(line);
 		} catch (error) {
-			bridge.notify(`invalid session reference: ${error instanceof Error ? error.message : String(error)}`);
+			bridge.notify(`invalid session reference: ${error instanceof Error ? error.message : String(error)}`, "error");
 			return;
 		}
 		const deliver = (readable, context) => {
-			if (context !== void 0) agent.inject(context);
-			const message = createUserMessage({
-				content: [{
-					type: "text",
-					text: readable
-				}],
-				source: { kind: "user" }
-			});
-			if (mode === "steer") {
-				agent.steer(message);
-				bridge.notify("steering queued — the next step sees it");
-			} else agent.followup(message);
+			try {
+				if (context !== void 0) agent.inject(context);
+				const message = createUserMessage({
+					content: [{
+						type: "text",
+						text: readable
+					}],
+					source: { kind: "user" }
+				});
+				if (mode === "steer") {
+					agent.steer(message);
+					bridge.notify("steering queued — the next step sees it");
+				} else agent.followup(message);
+			} catch (error) {
+				bridge.notify(`${mode === "steer" ? "steering" : "message"} failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+			}
 		};
 		if (parsed.references.length === 0) {
 			deliver(parsed.text);
@@ -3689,7 +4393,7 @@ async function run(ctx, startup, io) {
 			deliver(prepared.text, prepared.additionalContext);
 		}, (error) => {
 			if (controller.signal.aborted) return;
-			bridge.notify(`session reference failed: ${error instanceof Error ? error.message : String(error)}`);
+			bridge.notify(`session reference failed: ${error instanceof Error ? error.message : String(error)}`, "error");
 		});
 	};
 	/** Dispatch one submitted line: slash commands to the registry, other text to the agent. */
@@ -3707,9 +4411,14 @@ async function run(ctx, startup, io) {
 	/** Interrupt the running turn (Esc); true when a turn was actually cancelled. */
 	const interrupt = () => {
 		if (agent.status !== "running") return false;
-		agent.cancel({ kind: "user" });
-		bridge.notify("turn cancelled — Ctrl+C or /quit to exit");
-		return true;
+		try {
+			agent.cancel({ kind: "user" });
+			bridge.notify("turn cancelled — Ctrl+C or /quit to exit");
+			return true;
+		} catch (error) {
+			bridge.notify(`cancel failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+			return false;
+		}
 	};
 	/**
 	* Cycle to the next permission preset (Shift+Tab, the Claude-Code
@@ -3719,18 +4428,23 @@ async function run(ctx, startup, io) {
 	const cyclePermission = () => {
 		const service = ctx.get("permissionPresets");
 		if (service === void 0 || service.names.length === 0) {
-			bridge.notify("permission presets are not mounted in this composition");
+			bridge.notify("permission presets are not mounted in this composition", "warning");
 			return "";
 		}
 		const at = service.names.indexOf(service.current(session.events));
 		const next = service.names[(at + 1) % service.names.length] ?? "";
 		if (next === "") return "";
-		service.set(session, next);
-		return next;
+		try {
+			service.set(session, next);
+			return next;
+		} catch (error) {
+			bridge.notify(`permission change failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+			return "";
+		}
 	};
 	/** Apply one /model selection: takes effect from the next assembled step. */
 	const selectModel = (row) => {
-		picked = {
+		active.selection.picked = {
 			provider: row.provider,
 			model: row.model
 		};
@@ -3743,14 +4457,15 @@ async function run(ctx, startup, io) {
 	*/
 	const exportTranscript = async (argument) => {
 		const wanted = argument.trim();
+		const sessionCwd = session.header.cwd ?? cwd;
 		const defaultName = `dsh-session-${session.id.slice(-8)}.md`;
-		const target = wanted === "" ? join(cwd, defaultName) : /^[a-zA-Z]:[\\/]/u.test(wanted) || wanted.startsWith("/") ? wanted : join(cwd, wanted);
+		const target = wanted === "" ? join(sessionCwd, defaultName) : /^[a-zA-Z]:[\\/]/u.test(wanted) || wanted.startsWith("/") ? wanted : join(sessionCwd, wanted);
 		const markdown = buildExportMarkdown(store.getView(), session.id);
 		try {
 			await writeFile(target, `${markdown}\n`, "utf8");
 			bridge.notify(`exported to ${target}`);
 		} catch (error) {
-			bridge.notify(`export failed: ${error instanceof Error ? error.message : String(error)}`);
+			bridge.notify(`export failed: ${error instanceof Error ? error.message : String(error)}`, "error");
 		}
 	};
 	/**
@@ -3770,32 +4485,171 @@ async function run(ctx, startup, io) {
 			return `rename failed: ${error instanceof Error ? error.message : String(error)}`;
 		}
 	};
-	const initialModel = store.getView().model !== "" ? store.getView().model : `${defaults.provider}/${defaults.model}`;
-	mountRef.current = io.mount(createElement(App, {
-		store,
-		approval,
-		questions,
-		commands,
-		skills,
-		model: initialModel,
-		cwd: basename(cwd),
-		branch: gitBranch(cwd),
-		sessionId: session.id.slice(-8),
-		resumed: target.resume,
-		dispatch,
-		steer,
-		interrupt,
-		quit,
-		loadModels: () => loadModelDirectory(ctx),
-		loadMentions: mentions.candidates,
-		cyclePermission,
-		selectModel,
-		exportTranscript,
-		renameTitle,
-		onBridgeReady: (instance) => {
-			bridge.notify = instance.notify;
+	const loadSessions = async (options, signal) => {
+		if (sessionQuery === void 0) throw new Error("session query is unavailable in this profile");
+		const projected = projectSessionRows(await sessionQuery.listSessions(signal), options);
+		const page = projected.slice(0, 32);
+		if (page.length === 0) return projected;
+		return mergeSessionTitles(projected, await sessionQuery.readTitleSnapshots(page.map((row) => row.id), signal));
+	};
+	const loadSessionTranscript = async (id, signal) => {
+		if (sessionQuery === void 0) throw new Error("session query is unavailable in this profile");
+		const snapshot = await sessionQuery.readSession(id, signal);
+		return buildExportMarkdown(createTranscriptStore(snapshot.events).getView(), snapshot.session.id);
+	};
+	const switchModeAction = async (id) => {
+		if (id === "") throw new Error("usage: /mode <preset>");
+		const preset = await switchPreset(presets, agent, id);
+		active.mode = preset.id;
+		commands.setAgent(agent);
+		skills.setAgent(agent);
+		renderCurrent();
+		return preset.id;
+	};
+	const activate = async (nextTarget) => {
+		const previous = active;
+		const next = await prepare(nextTarget);
+		active = next;
+		agent = next.agent;
+		session = next.session;
+		store = next.store;
+		mentions = next.mentions;
+		commands.setAgent(agent);
+		skills.setAgent(agent);
+		try {
+			process.stdout.write("\x1B[r\x1B[0m\x1B[H\x1B[2J\x1B[3J\x1B[H");
+			renderCurrent();
+		} catch (error) {
+			active = previous;
+			agent = previous.agent;
+			session = previous.session;
+			store = previous.store;
+			mentions = previous.mentions;
+			commands.setAgent(agent);
+			skills.setAgent(agent);
+			await next.handle.dispose();
+			renderCurrent();
+			throw error;
 		}
-	}));
+		let cleanupWarning;
+		try {
+			await sessions.flush(previous.session);
+		} catch (error) {
+			cleanupWarning = `previous session flush failed: ${error instanceof Error ? error.message : String(error)}`;
+		}
+		try {
+			await previous.handle.dispose();
+		} catch (error) {
+			cleanupWarning = `${cleanupWarning === void 0 ? "" : `${cleanupWarning}; `}previous agent release failed: ${error instanceof Error ? error.message : String(error)}`;
+		}
+		bridge.notify(cleanupWarning === void 0 ? `${next.resumed ? "resumed" : "created"} ${next.session.id.slice(-12)} · mode ${next.mode}` : `switched to ${next.session.id.slice(-12)}, but ${cleanupWarning}`, cleanupWarning === void 0 ? "info" : "warning");
+	};
+	const switchQueue = new SessionSwitchQueue(async (request) => {
+		if (!quitting) await activate(request.target);
+	}, (error) => bridge.notify(`session switch failed: ${error instanceof Error ? error.message : String(error)}`, "error"));
+	const requestSwitch = (request) => {
+		if (request.target.sessionId === session.id) {
+			bridge.notify("that session is already active", "warning");
+			return;
+		}
+		if (switchQueue.request(agent, request) === "queued") bridge.notify(`will switch to ${request.label} when the current turn finishes · /resume cancel to abort`);
+	};
+	const resolveResumeId = async (wanted) => {
+		if (wanted === "") throw new Error("usage: /resume <id|prefix>");
+		if (sessionQuery === void 0) throw new Error("session query is unavailable in this profile");
+		const records = await sessionQuery.listSessions();
+		const exact = records.filter((record) => record.header.id === wanted);
+		const matches = exact.length > 0 ? exact : records.filter((record) => record.header.id.startsWith(wanted));
+		if (matches.length === 0) throw new Error(`no session matches "${wanted}"`);
+		if (matches.length > 1) throw new Error(`session prefix "${wanted}" is ambiguous (${matches.length} matches)`);
+		if (matches[0].header.parentSession !== void 0 || matches[0].header.origin === "subagent") throw new Error("subagent conversations are read-only in /resume; resume a root session");
+		if (agents.get(SessionId(matches[0].header.id)) !== void 0 && matches[0].header.id !== session.id) throw new Error("that session is already live in another owner");
+		return matches[0].header.id;
+	};
+	const requestResume = (wanted) => {
+		resolveResumeId(wanted).then((id) => {
+			requestSwitch({
+				target: {
+					sessionId: id,
+					resume: true
+				},
+				label: id.slice(-12)
+			});
+		}, (error) => bridge.notify(`resume failed: ${error instanceof Error ? error.message : String(error)}`, "error"));
+	};
+	const createSession = (mode) => {
+		const nextCwd = session.header.cwd ?? cwd;
+		const id = `session-${randomUUID()}`;
+		requestSwitch({
+			target: {
+				sessionId: id,
+				resume: false,
+				mode,
+				cwd: nextCwd
+			},
+			label: id.slice(-12)
+		});
+	};
+	const switchSession = (row) => {
+		if (!row.resumable) {
+			bridge.notify("subagent conversations are read-only", "warning");
+			return;
+		}
+		requestSwitch({
+			target: {
+				sessionId: row.id,
+				resume: true
+			},
+			label: row.title ?? row.id.slice(-12)
+		});
+	};
+	const cancelSessionSwitch = () => {
+		return switchQueue.cancel();
+	};
+	const appElement = () => {
+		const sessionCwd = session.header.cwd ?? cwd;
+		const model = store.getView().model !== "" ? store.getView().model : `${defaults.provider}/${defaults.model}`;
+		return createElement(App, {
+			key: session.id,
+			store,
+			approval,
+			questions,
+			commands,
+			skills,
+			model,
+			cwd: basename(sessionCwd),
+			workspaceRoot: sessionCwd,
+			branch: gitBranch(sessionCwd),
+			sessionId: session.id.slice(-8),
+			resumed: active.resumed,
+			mode: active.mode,
+			dispatch,
+			steer,
+			interrupt,
+			quit,
+			loadModels: () => loadModelDirectory(ctx),
+			loadMentions: mentions.candidates,
+			cyclePermission,
+			selectModel,
+			exportTranscript,
+			renameTitle,
+			loadPresets: () => presets.list(),
+			switchMode: switchModeAction,
+			createSession,
+			loadSessions,
+			loadSessionTranscript,
+			switchSession,
+			cancelSessionSwitch,
+			loadPlugins: () => listPluginRows(ctx),
+			onBridgeReady: (instance) => {
+				bridge.notify = instance.notify;
+			}
+		});
+	};
+	const renderCurrent = () => {
+		mountRef.current?.rerender(appElement());
+	};
+	mountRef.current = io.mount(appElement());
 }
 /**
 * Mount the interactive terminal driver.
@@ -3808,8 +4662,12 @@ function apply(ctx, config) {
 		sessionId: config.startup.sessionId
 	} : config.startup.kind === "latest" ? { kind: "latest" } : config.startup.kind === "named" && config.startup.sessionId !== void 0 ? {
 		kind: "named",
-		sessionId: config.startup.sessionId
-	} : { kind: "fresh" };
+		sessionId: config.startup.sessionId,
+		...config.startup.mode === void 0 ? {} : { mode: config.startup.mode }
+	} : {
+		kind: "fresh",
+		...config.startup.mode === void 0 ? {} : { mode: config.startup.mode }
+	};
 	const exit = ctx.get("appExit");
 	if (exit === void 0) throw new Error("tui-runner: the launcher must provide ctx.appExit before the tree mounts");
 	const io = {