dsh-code 1.0.3 → 1.0.5

package/lib/index.mjs

@@ -4,11 +4,11 @@ import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import { readFileSync, realpathSync } from "node:fs";
 import os, { homedir } from "node:os";
-import { mkdir, open, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
+import { appendFile, mkdir, open, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, isAbsolute, join, resolve } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import { installModelSelection } from "@deepseek-ai/dsh-agent";
-import { MessageId, ReasoningEffortId, assertNever, boundContextSummary, createUserMessage, normalizeApiKey } from "@deepseek-ai/dsh-llm";
+import { MessageId, ReasoningEffortId, boundContextSummary, createUserMessage, normalizeApiKey } from "@deepseek-ai/dsh-llm";
 import { SessionId } from "@deepseek-ai/dsh-session";
 import { PassThrough, Stream } from "node:stream";
 import process$1, { cwd, env } from "node:process";
@@ -22,6 +22,7 @@ import { AuthorizationDeclinedError } from "@deepseek-ai/dsh-authorization";
 import { fileURLToPath } from "node:url";
 import { UserQuestionError } from "@deepseek-ai/dsh-user-questions";
 import { isUserInvocable } from "@deepseek-ai/dsh-skill";
+import { assertNever } from "@deepseek-ai/dsh-util-values";
 //#region node_modules/.pnpm/react@18.3.1/node_modules/react/cjs/react.production.min.js
 /**
 * @license React
@@ -24648,10 +24649,12 @@ function displayTail(text, columns, rows) {
 		used += width;
 		lastCluster = cluster;
 	}
-	if (current !== "" || wrapped.length > 0 && text.endsWith("\n")) flush();
+	const trailingBlank = current === "" && wrapped.length > 0 && text.endsWith("\n");
+	if (current !== "") flush();
 	const truncated = wrapped.length > rowLimit;
+	const kept = truncated ? wrapped.slice(-rowLimit) : wrapped;
 	return {
-		text: (truncated ? wrapped.slice(-rowLimit) : wrapped).join("\n"),
+		text: (trailingBlank && kept.length < rowLimit ? [...kept, ""] : kept).join("\n"),
 		truncated
 	};
 }
@@ -24702,8 +24705,11 @@ function ThemePanel({ current, select, close }) {
 		if (key.downArrow) return setCursor((value) => (value + 1) % THEME_ROWS.length);
 		if (key.return) return select(THEME_ROWS[cursor].id);
 	});
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("/theme · esc close", viewport.contentColumns));
+	if (viewport.maxHeight === 0 || viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("/theme · esc close", viewport.contentColumns));
+	const rowBudget = Math.max(1, viewport.bodyRows);
+	const first = clampScroll(cursor, THEME_ROWS.length, rowBudget);
+	const visibleThemes = THEME_ROWS.slice(first, first + rowBudget);
+	const hiddenThemes = THEME_ROWS.length - visibleThemes.length;
 	return (0, import_react.createElement)(Box, {
 		width: viewport.outerColumns,
 		borderStyle: "round",
@@ -24713,8 +24719,8 @@ function ThemePanel({ current, select, close }) {
 	}, (0, import_react.createElement)(Text, {
 		color: inkColor(getPalette().brandBright),
 		wrap: "truncate-end"
-	}, truncateColumns("/theme — color palette", viewport.contentColumns)), ...THEME_ROWS.map((theme, index) => {
-		const selected = index === cursor;
+	}, truncateColumns("/theme — color palette", viewport.contentColumns)), ...visibleThemes.map((theme, index) => {
+		const selected = first + index === cursor;
 		const active = theme.id === current;
 		return (0, import_react.createElement)(Text, {
 			key: theme.id,
@@ -24724,7 +24730,7 @@ function ThemePanel({ current, select, close }) {
 	}), (0, import_react.createElement)(Text, {
 		dimColor: true,
 		wrap: "truncate-end"
-	}, truncateColumns("↑↓ choose · enter apply · esc/q close", viewport.contentColumns)));
+	}, truncateColumns(`↑↓ choose · enter apply · esc/q close${hiddenThemes > 0 ? ` · +${hiddenThemes} more` : ""}`, viewport.contentColumns)));
 }
 //#endregion
 //#region src/whale-glyph.ts
@@ -25201,6 +25207,29 @@ function indexList(map, id) {
 	return list;
 }
 /**
+* Finalize replay rows the ended turn left `running`, mirroring the reducer's
+* turn-end orphan sweep: an orphaned retry settles `done`, an orphaned command
+* settles `error` with an interruption note. Only the id-indexed rows are
+* visited, so the sweep stays O(retries+commands of the log), never a scan.
+*/
+function finalizeReplayOrphans(acc) {
+	for (const list of acc.retryIndex.values()) for (const index of list) {
+		const entry = acc.entries[index];
+		if (entry !== void 0 && entry.kind === "retry" && entry.state === "running") acc.entries[index] = {
+			...entry,
+			state: "done"
+		};
+	}
+	for (const list of acc.commandIndex.values()) for (const index of list) {
+		const entry = acc.entries[index];
+		if (entry !== void 0 && entry.kind === "command" && entry.state === "running") acc.entries[index] = {
+			...entry,
+			state: "error",
+			summary: "interrupted before the turn ended"
+		};
+	}
+}
+/**
 * Apply an id-keyed update to every row that registered the id, mirroring the
 * copy-on-write reducer's full-array map semantics (all matching rows update,
 * in order). Each registered index is O(1), so a duplicate id costs
@@ -25303,6 +25332,7 @@ function replayProjectEvent(acc, event) {
 					if (entry !== void 0 && entry.kind === "pending" && entry.target === target) retireReplayEntry(acc, entryIndex);
 				}
 			}
+			ids.splice(start, 0, ...inserted.map((message) => message.id));
 			for (const message of inserted) {
 				const images = imagesOf(message.content);
 				appendReplayEntry(acc, {
@@ -25313,7 +25343,6 @@ function replayProjectEvent(acc, event) {
 					...images.length === 0 ? {} : { images }
 				});
 				indexList(acc.pendingIndex, message.id).push(acc.entries.length - 1);
-				ids.push(message.id);
 				acc.ops += 1;
 			}
 			return true;
@@ -25507,6 +25536,7 @@ function replayProjectEvent(acc, event) {
 				for (const callId of turnToolSet) acc.toolStart.delete(callId);
 				acc.turnTools.delete(event.data.turn);
 			}
+			finalizeReplayOrphans(acc);
 			acc.busy = false;
 			acc.busySince = 0;
 			for (const entry of appended) appendReplayEntry(acc, entry);
@@ -25519,6 +25549,7 @@ function replayProjectEvent(acc, event) {
 			appendReplayEntry(acc, {
 				kind: "retry",
 				retryId: data.retryId,
+				mode: data.mode,
 				attempt: data.retry,
 				max: "maxRetries" in data ? data.maxRetries : data.retry,
 				code: data.failure.code,
@@ -25678,14 +25709,14 @@ function materializeReplayView(acc, copy) {
 		},
 		stats: acc.stats,
 		anchors: {
-			stepStart: acc.stepStart,
-			toolStart: acc.toolStart,
-			firstChunkAt: acc.firstChunkAt,
-			compactionTokens: acc.compactionTokens,
+			stepStart: new Map(acc.stepStart),
+			toolStart: new Map(acc.toolStart),
+			firstChunkAt: new Map(acc.firstChunkAt),
+			compactionTokens: new Map(acc.compactionTokens),
 			lastPruneTokens: acc.lastPruneTokens,
-			turnFiles: acc.turnFiles,
-			turnSteps: acc.turnSteps,
-			turnTools: acc.turnTools
+			turnFiles: new Map([...acc.turnFiles].map(([turn, files]) => [turn, new Set(files)])),
+			turnSteps: new Map(acc.turnSteps),
+			turnTools: new Map([...acc.turnTools].map(([turn, tools]) => [turn, new Set(tools)]))
 		}
 	};
 }
@@ -25759,19 +25790,19 @@ function wrapUnits(segments) {
 			});
 			word = "";
 		};
-		for (const char of segment.text) if (char === " ") {
+		for (const cluster of splitGraphemes$1(segment.text)) if (cluster === " ") {
 			flushWord();
 			units.push({
-				text: char,
+				text: cluster,
 				style: segment.style
 			});
-		} else if (visibleColumns(char) > 1) {
+		} else if (graphemeWidth(cluster) > 1) {
 			flushWord();
 			units.push({
-				text: char,
+				text: cluster,
 				style: segment.style
 			});
-		} else word += char;
+		} else word += cluster;
 		flushWord();
 	}
 	return units;
@@ -25797,8 +25828,8 @@ function wrapSegments(segments, width) {
 	const append = (unit) => {
 		const columns = visibleColumns(unit.text);
 		if (used === 0 && columns > limit) {
-			for (const char of unit.text) appendAtom({
-				text: char,
+			for (const cluster of splitGraphemes$1(unit.text)) appendAtom({
+				text: cluster,
 				style: unit.style
 			});
 			return;
@@ -25818,8 +25849,8 @@ function wrapSegments(segments, width) {
 			return;
 		}
 		flush();
-		if (columns > limit) for (const char of unit.text) appendAtom({
-			text: char,
+		if (columns > limit) for (const cluster of splitGraphemes$1(unit.text)) appendAtom({
+			text: cluster,
 			style: unit.style
 		});
 		else appendAtom(unit);
@@ -26038,13 +26069,13 @@ function hardWrapSegments(segments, width) {
 		current = [];
 		used = 0;
 	};
-	for (const segment of segments) for (const char of segment.text) {
-		const cells = visibleColumns(char);
+	for (const segment of segments) for (const cluster of splitGraphemes$1(segment.text)) {
+		const cells = graphemeWidth(cluster);
 		if (used > 0 && used + cells > width) flush();
 		const previous = current.at(-1);
-		if (previous?.style === segment.style) previous.text += char;
+		if (previous?.style === segment.style) previous.text += cluster;
 		else current.push({
-			text: char,
+			text: cluster,
 			style: segment.style
 		});
 		used += cells;
@@ -26713,6 +26744,556 @@ function effortAboveHigh(effort) {
 	return rank !== void 0 && rank > 3;
 }
 //#endregion
+//#region src/commands.ts
+/**
+* Watch the live command registry. Reads the current list immediately and
+* re-reads on every registry mutation or agent retarget; notification
+* failures are contained by the registry itself, so this watcher only ever
+* re-reads. Without a `commands` service the view stays empty and all lines
+* fall through to normal prompts.
+* @param ctx - context carrying the `commands` service (optional).
+* @returns the view the completion menu subscribes to.
+*/
+function watchCommands(ctx) {
+	const commands = ctx.get("commands");
+	let agent;
+	let descriptors = [];
+	let error;
+	let loadedFor;
+	const listeners = /* @__PURE__ */ new Set();
+	const refresh = () => {
+		if (commands === void 0 || agent === void 0) return;
+		try {
+			descriptors = commands.list(agent);
+			loadedFor = agent;
+			error = void 0;
+		} catch (cause) {
+			descriptors = loadedFor === agent ? [...descriptors] : [];
+			error = cause instanceof Error ? cause.message : String(cause);
+		}
+		for (const listener of listeners) listener();
+	};
+	if (commands !== void 0) ctx.on("commands/change", () => refresh());
+	return {
+		get descriptors() {
+			return descriptors;
+		},
+		get error() {
+			return error;
+		},
+		subscribe(listener) {
+			listeners.add(listener);
+			return () => {
+				listeners.delete(listener);
+			};
+		},
+		setAgent(next) {
+			agent = next;
+			refresh();
+		}
+	};
+}
+/**
+* Whether one command line is a syntactically valid slash command.
+* @param line - the complete candidate line.
+* @returns true when the line parses as `/name` or `/name input`.
+*/
+function isSlashLine(line) {
+	return /^\/[a-z][a-z0-9_-]*(?=$|[\t ])/u.test(line);
+}
+/**
+* The submission payload for one composer line. Trim is a blank check, not a
+* rewrite: an ordinary prompt keeps its exact leading indentation, inner
+* layout, and trailing spaces (pasted code must reach the model verbatim).
+* Only trailing line terminators are stripped — a draft's final newline is a
+* paste/Enter artifact (an open bracketed paste turns Enter into an inserted
+* newline), never deliberate content. A syntactic slash line still normalizes
+* fully so command routing stays stable (completion inserts a trailing space
+* after `/name`).
+* @param line - the complete draft text.
+* @returns the text to submit verbatim.
+*/
+function submissionPayload(line) {
+	const withoutTrailingNewlines = line.replace(/[\r\n]+$/u, "");
+	const trimmed = withoutTrailingNewlines.trim();
+	return isSlashLine(trimmed) ? trimmed : withoutTrailingNewlines;
+}
+//#endregion
+//#region src/provider-settings.ts
+/** Human text for a rejection value (mirrors the web page's `messageOf`). */
+function messageOf$1(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+/** Collapse every whitespace/control run to one space so a notice stays one line. */
+function singleLine$1(message) {
+	return message.replace(/[\u0000-\u001F\u007F]/g, " ").replace(/\s+/g, " ").trim();
+}
+/** Keep a misbehaving credential provider from reflecting the submitted secret. */
+function credentialWriteMessage(error, secret) {
+	const message = singleLine$1(messageOf$1(error));
+	return message.includes(secret) ? "credentials service rejected the API key" : message;
+}
+/** Obvious shell-assignment paste; mirrors the official Web Models editor. */
+const ENV_ASSIGNMENT = /^[A-Z][A-Z0-9_]*=[^=]/;
+/** Whether the whole draft is wrapped in one matching quote pair. */
+function hasWrappingQuotes(value) {
+	const first = value[0];
+	return (first === "\"" || first === "'" || first === "`") && value.length > 1 && value.endsWith(first);
+}
+/** Read the value at a path through plain objects; undefined when any segment misses. */
+function getPath$1(value, path) {
+	let current = value;
+	for (const segment of path) {
+		if (typeof current !== "object" || current === null) return void 0;
+		current = current[segment];
+	}
+	return current;
+}
+/** Whether a path resolves to a defined value (the empty path reads the root). */
+function hasPath(value, path) {
+	return path.length === 0 ? value !== void 0 : getPath$1(value, path) !== void 0;
+}
+/** The credential reference a resolved profile names (its `apiKeyEnv` field). */
+function profileRefOf(profile) {
+	if (typeof profile !== "object" || profile === null) return void 0;
+	const ref = profile.apiKeyEnv;
+	return typeof ref === "string" && ref.length > 0 ? ref : void 0;
+}
+/** Extract only fields the terminal can round-trip without touching provider-specific extras. */
+function configurationOf(profile) {
+	if (typeof profile !== "object" || profile === null) return { models: [] };
+	const record = profile;
+	const models = (Array.isArray(record.models) ? record.models : []).flatMap((value) => {
+		if (typeof value !== "object" || value === null) return [];
+		const entry = value;
+		if (typeof entry.id !== "string" || entry.id.trim() === "") return [];
+		const { id: _id, name: _name, contextWindow: _contextWindow, maxTokens: _maxTokens, ...extras } = entry;
+		return [{
+			id: entry.id,
+			...typeof entry.name === "string" && entry.name.trim() !== "" ? { name: entry.name } : {},
+			...typeof entry.contextWindow === "number" && Number.isFinite(entry.contextWindow) ? { contextWindow: entry.contextWindow } : {},
+			...typeof entry.maxTokens === "number" && Number.isFinite(entry.maxTokens) ? { maxTokens: entry.maxTokens } : {},
+			...Object.keys(extras).length > 0 ? { extras } : {}
+		}];
+	});
+	return {
+		...typeof record.baseURL === "string" && record.baseURL.trim() !== "" ? { baseURL: record.baseURL } : {},
+		...typeof record.api === "string" && record.api.trim() !== "" ? { api: record.api } : {},
+		models
+	};
+}
+/**
+* The conventional credential reference for a provider route: `<ROUTE>_API_KEY`
+* with the route uppercased and every non-alphanumeric run collapsed to one
+* underscore — the exact derivation the official Models page uses
+* (`deriveKeyRef` in `ui-settings-models`), so a key saved here is found there.
+* @param provider - provider route id (e.g. `pi-ai`, `minimax-cn`).
+* @returns the derived reference name (e.g. `PI_AI_API_KEY`).
+*/
+function deriveCredentialRef(provider) {
+	return `${provider.toUpperCase().replace(/[^A-Z0-9]+/g, "_")}_API_KEY`;
+}
+/**
+* The seven canonical reasoning levels a reasoningEfforts key may name -
+* pi-ai's THINKING_LEVELS. A pi-ai upgrade that adds or removes one fails
+* upstream's own drift gate; this mirror exists so the terminal editor can
+* validate drafts without importing the pi-ai package.
+*/
+const REASONING_EFFORT_LEVELS = [
+	"off",
+	"minimal",
+	"low",
+	"medium",
+	"high",
+	"xhigh",
+	"max"
+];
+/** Whether a raw extras value is a declared efforts dict (non-empty, non-false). */
+function isDeclaredReasoningEfforts(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length > 0;
+}
+/**
+* Parse the setup page's compact efforts draft into a storable declaration.
+* Grammar: empty = clear back to inherit; the single token "false" = disable
+* the picker; otherwise space-separated level:wire pairs where level is one
+* of REASONING_EFFORT_LEVELS and wire is any non-empty string or the literal
+* "null" (send no parameter).
+*/
+function parseReasoningEffortsDraft(draft) {
+	const text = draft.trim();
+	if (text === "") return {
+		ok: true,
+		value: void 0
+	};
+	if (text === "false") return {
+		ok: true,
+		value: false
+	};
+	const value = {};
+	for (const token of text.split(/\s+/u)) {
+		const split = token.indexOf(":");
+		if (split <= 0 || split === token.length - 1) return {
+			ok: false,
+			error: "each entry needs level:wire, got \"" + token + "\""
+		};
+		const level = token.slice(0, split);
+		const wire = token.slice(split + 1);
+		if (!REASONING_EFFORT_LEVELS.includes(level)) return {
+			ok: false,
+			error: "\"" + level + "\" is not a level; use one of " + REASONING_EFFORT_LEVELS.join("/")
+		};
+		if (level in value) return {
+			ok: false,
+			error: "level \"" + level + "\" appears twice"
+		};
+		value[level] = wire === "null" ? null : wire;
+	}
+	return {
+		ok: true,
+		value
+	};
+}
+/** Serialize a stored declaration back to the compact draft form (stored key order preserved). */
+function serializeReasoningEfforts(value) {
+	if (value === false) return "false";
+	if (!isDeclaredReasoningEfforts(value)) return "";
+	return Object.entries(value).map(([level, wire]) => level + ":" + (wire === null ? "null" : String(wire))).join(" ");
+}
+/** Events that invalidate the official Models provider/settings/credential join. */
+const PROVIDER_SETTINGS_EVENTS = [
+	"credentials/reference-updated",
+	"settings/document-updated",
+	"llm/adapters-updated"
+];
+/** Subscribe to the same provider-directory invalidations as the official Web Models page. */
+function subscribeProviderSettings(ctx, listener) {
+	const events = ctx;
+	const disposers = PROVIDER_SETTINGS_EVENTS.map((event) => events.on(event, () => listener()));
+	return () => {
+		for (const dispose of disposers) dispose();
+	};
+}
+/** A single-line, bounded error from the provider-management adapter. */
+var ProviderSettingsError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "ProviderSettingsError";
+	}
+};
+/**
+* Join the configurable-provider directory, the redacted settings
+* namespaces, and the referenced credentials into panel rows, web-parity:
+* - directory entries merge with `listProviders()` to mark each live or
+*   dormant, and routes registered without a directory declaration appear as
+*   read-only/unmanaged rows (no settings address);
+* - a whole-section entry is configured whenever its namespace resolves;
+*   a path-addressed one only when the profile resolves there;
+* - a row is removable when the user layer alone carries its profile;
+* - only refs named by resolved profiles are described, and a per-ref failure
+*   degrades to that row's bounded error instead of losing it.
+* Absent `settings`/`credentials` services are tolerated the same way.
+* @param ctx - context carrying the `llm` service (settings/credentials optional).
+* @returns the resolved directory; empty rows when `llm` is unavailable.
+*/
+async function loadProviderSettings(ctx) {
+	const llm = ctx.get("llm");
+	if (llm === void 0) return {
+		rows: [],
+		writable: false,
+		failures: []
+	};
+	const registered = llm.listProviders();
+	const failures = [];
+	const directoryEntries = [];
+	if (llm.listConfigurableProviders !== void 0) try {
+		directoryEntries.push(...llm.listConfigurableProviders());
+	} catch (error) {
+		failures.push(`configurable-provider directory failed: ${singleLine$1(messageOf$1(error))}`);
+	}
+	const settings = ctx.get("settings");
+	let descriptors = [];
+	let writable = false;
+	if (settings !== void 0) try {
+		descriptors = settings.describe({ redactSecrets: true });
+		writable = settings.writable === true;
+	} catch (error) {
+		failures.push(`settings describe failed: ${singleLine$1(messageOf$1(error))}`);
+	}
+	const namespaces = new Map(descriptors.map((descriptor) => [descriptor.ns, descriptor]));
+	const active = new Set(registered.map((provider) => provider.id));
+	const declared = new Set(directoryEntries.map((entry) => entry.provider));
+	const rows = [...directoryEntries.map((entry) => ({
+		provider: entry.provider,
+		displayName: entry.displayName,
+		active: active.has(entry.provider),
+		settingsNs: entry.settingsNs,
+		settingsPath: entry.settingsPath,
+		...entry.declared === void 0 ? {} : { declared: entry.declared }
+	})), ...registered.filter((provider) => !declared.has(provider.id)).map((provider) => ({
+		provider: provider.id,
+		displayName: provider.name,
+		active: true,
+		settingsNs: "",
+		settingsPath: []
+	}))].map((base) => {
+		const namespace = base.settingsNs.length === 0 ? void 0 : namespaces.get(base.settingsNs);
+		const profile = namespace === void 0 ? void 0 : base.settingsPath.length === 0 ? namespace.value : getPath$1(namespace.value, base.settingsPath);
+		const configured = namespace !== void 0 && (base.settingsPath.length === 0 || profile !== void 0);
+		const removable = namespace !== void 0 && base.settingsPath.length > 0 && hasPath(namespace.user, base.settingsPath) && !hasPath(namespace.base, base.settingsPath);
+		const credentialRef = profileRefOf(profile);
+		return {
+			provider: base.provider,
+			displayName: base.displayName,
+			active: base.active,
+			settingsNs: base.settingsNs,
+			settingsPath: base.settingsPath,
+			settingsRevision: namespace?.revision ?? 0,
+			configured,
+			removable,
+			configuration: configurationOf(profile),
+			...credentialRef === void 0 ? {} : { credentialRef },
+			suggestedRef: deriveCredentialRef(base.provider),
+			...base.declared === void 0 ? {} : { declared: base.declared }
+		};
+	});
+	const refs = [...new Set(rows.flatMap((row) => row.credentialRef === void 0 ? [] : [row.credentialRef]))];
+	const credentialViews = /* @__PURE__ */ new Map();
+	const credentials = ctx.get("credentials");
+	if (refs.length > 0) {
+		if (credentials === void 0) for (const ref of refs) credentialViews.set(ref, {
+			kind: "error",
+			message: "credentials service is unavailable"
+		});
+		else await Promise.all(refs.map(async (ref) => {
+			try {
+				const facts = await credentials.describe(ref);
+				credentialViews.set(ref, {
+					kind: "facts",
+					configured: facts.configured,
+					writable: facts.writable,
+					...facts.source === void 0 ? {} : { source: facts.source }
+				});
+			} catch (error) {
+				credentialViews.set(ref, {
+					kind: "error",
+					message: singleLine$1(messageOf$1(error))
+				});
+			}
+		}));
+	}
+	return {
+		rows: rows.map((row) => ({
+			...row,
+			credential: row.credentialRef === void 0 ? void 0 : credentialViews.get(row.credentialRef) ?? {
+				kind: "error",
+				message: "credential describe returned no view"
+			}
+		})),
+		writable,
+		failures
+	};
+}
+/**
+* Store a provider API key, web-parity: validate with `normalizeApiKey`
+* (single-line, actionable errors that never echo the key), materialize the
+* profile/`apiKeyEnv` through `settings.mutate` first when the resolved
+* profile names no reference (dormant route or ref-less profile), then store
+* under the trusted named ref or the derived conventional ref. An existing
+* whole-section DeepSeek whose resolved profile already names
+* `DEEPSEEK_API_KEY` needs no settings mutation. Env-supplied read-only keys
+* are refused before any service call.
+* @param ctx - context carrying `settings` (when materializing) and `credentials`.
+* @param target - the joined row to write through.
+* @param rawKey - the key exactly as typed; surrounding whitespace is trimmed.
+* @throws {@link ProviderSettingsError} with a single-line, key-free message.
+*/
+async function saveProviderCredential(ctx, target, rawKey) {
+	const trimmed = rawKey.trim();
+	if (ENV_ASSIGNMENT.test(trimmed) || hasWrappingQuotes(trimmed)) throw new ProviderSettingsError("paste only the API key, without an environment-variable name or wrapping quotes");
+	const checked = normalizeApiKey(rawKey);
+	if (!checked.ok) throw new ProviderSettingsError(checked.reason === "empty" ? "the API key is empty after trimming surrounding whitespace" : "the API key contains characters an HTTP header cannot carry; type a plain printable-ASCII key");
+	if (target.settingsNs.length === 0) throw new ProviderSettingsError(`provider "${target.provider}" has no managed settings namespace; configure it in settings.yaml`);
+	if (target.credential?.kind === "facts" && target.credential.writable === false) throw new ProviderSettingsError(`the key for provider "${target.provider}" is supplied read-only by the environment; unset it in the shell instead of overwriting it here`);
+	const credentials = ctx.get("credentials");
+	if (credentials === void 0) throw new ProviderSettingsError("credentials service is unavailable; cannot store the API key");
+	const ref = target.credentialRef ?? deriveCredentialRef(target.provider);
+	if (target.credentialRef === void 0) {
+		const settings = ctx.get("settings");
+		if (settings === void 0) throw new ProviderSettingsError("settings service is unavailable; cannot materialize the credential reference");
+		try {
+			await settings.mutate(target.settingsNs, [{
+				op: "set",
+				path: [...target.settingsPath, "apiKeyEnv"],
+				value: ref
+			}]);
+		} catch (error) {
+			throw new ProviderSettingsError(singleLine$1(messageOf$1(error)));
+		}
+	}
+	try {
+		await credentials.set(ref, checked.value);
+	} catch (error) {
+		throw new ProviderSettingsError(credentialWriteMessage(error, checked.value));
+	}
+}
+/** Save the endpoint and an explicit model allow-list without rebuilding the profile. */
+async function saveProviderConfiguration(ctx, target, configuration) {
+	if (target.settingsNs.length === 0) throw new ProviderSettingsError(`provider "${target.provider}" has no managed settings namespace; configure it in settings.yaml`);
+	const settings = ctx.get("settings");
+	if (settings === void 0 || settings.writable !== true) throw new ProviderSettingsError("settings are read-only; provider configuration cannot be changed here");
+	const baseURL = configuration.baseURL?.trim();
+	if (baseURL !== void 0 && baseURL !== "") try {
+		const parsed = new URL(baseURL);
+		if (parsed.protocol !== "http:" && parsed.protocol !== "https:") throw new Error("unsupported protocol");
+	} catch {
+		throw new ProviderSettingsError("base URL must be an absolute http or https URL");
+	}
+	const seen = /* @__PURE__ */ new Set();
+	const models = configuration.models.map((model) => {
+		const id = model.id.trim();
+		if (id === "" || seen.has(id)) throw new ProviderSettingsError("each selected model must have a unique non-empty id");
+		seen.add(id);
+		for (const [label, value] of [["context window", model.contextWindow], ["output window", model.maxTokens]]) if (value !== void 0 && (!Number.isSafeInteger(value) || value <= 0)) throw new ProviderSettingsError(`${label} must be a positive integer`);
+		return {
+			id,
+			...model.extras,
+			...model.name === void 0 || model.name.trim() === "" ? {} : { name: model.name.trim() },
+			...model.contextWindow === void 0 ? {} : { contextWindow: model.contextWindow },
+			...model.maxTokens === void 0 ? {} : { maxTokens: model.maxTokens }
+		};
+	});
+	const root = target.settingsPath;
+	const ops = [baseURL === void 0 || baseURL === "" ? {
+		op: "unset",
+		path: [...root, "baseURL"]
+	} : {
+		op: "set",
+		path: [...root, "baseURL"],
+		value: baseURL
+	}, {
+		op: "set",
+		path: [...root, "models"],
+		value: models
+	}];
+	try {
+		await settings.mutate(target.settingsNs, ops, target.settingsRevision);
+	} catch (error) {
+		throw new ProviderSettingsError(singleLine$1(messageOf$1(error)));
+	}
+}
+/**
+* Interrogate a provider endpoint for the models it really serves, through
+* the model-discovery capability the provider's settings namespace
+* registered — the same pipe the official Web Models page uses. The request
+* is a draft: a typed key forces direct endpoint interrogation (gateway
+* truth), while an empty key lets the harness resolve the route's stored
+* credential; with neither baseURL nor route the adapter answers from its
+* own knowledge.
+* @param ctx - context carrying the `llm` service (optional discovery).
+* @param target - provider row whose settings namespace serves the draft.
+* @param request - typed key and/or endpoint override for this one probe.
+* @param signal - caller cancellation (panel navigation aborts the probe).
+* @returns the advertised models in endpoint order, deduplicated.
+*/
+async function discoverProviderModels(ctx, target, request, signal) {
+	if (target.settingsNs.length === 0) throw new ProviderSettingsError(`provider "${target.provider}" has no managed settings namespace; its models cannot be discovered here`);
+	const llm = ctx.get("llm");
+	if (llm?.discoverModels === void 0) throw new ProviderSettingsError("model discovery is unavailable in this profile; enter models by hand");
+	const typedKey = request.apiKey?.trim();
+	const baseURL = request.baseURL?.trim();
+	const hasUrl = baseURL !== void 0 && baseURL !== "";
+	let oneShotKey = typedKey;
+	if (hasUrl && (oneShotKey === void 0 || oneShotKey === "")) {
+		const credentialsService = ctx.get("credentials");
+		const ref = target.credentialRef ?? target.suggestedRef;
+		if (credentialsService?.resolve !== void 0 && ref !== void 0) try {
+			oneShotKey = (await credentialsService.resolve(ref))?.value;
+		} catch {}
+	}
+	const draft = hasUrl ? {
+		...oneShotKey !== void 0 && oneShotKey !== "" ? { apiKey: oneShotKey } : {},
+		baseURL,
+		...target.configuration.api === void 0 ? {} : { api: target.configuration.api }
+	} : { provider: target.provider };
+	try {
+		const discovered = signal === void 0 ? await llm.discoverModels(target.settingsNs, draft) : await llm.discoverModels(target.settingsNs, draft, signal);
+		const seen = /* @__PURE__ */ new Set();
+		const rows = [];
+		for (const model of discovered) {
+			if (typeof model.id !== "string" || model.id.trim() === "" || seen.has(model.id)) continue;
+			seen.add(model.id);
+			rows.push({
+				id: model.id,
+				...model.name === void 0 ? {} : { name: model.name },
+				...model.contextWindow === void 0 ? {} : { contextWindow: model.contextWindow },
+				...model.maxTokens === void 0 ? {} : { maxTokens: model.maxTokens }
+			});
+		}
+		return rows;
+	} catch (error) {
+		if (signal?.aborted === true) throw error;
+		throw new ProviderSettingsError(singleLine$1(messageOf$1(error)));
+	}
+}
+/**
+* Remove the currently named credential without touching the provider
+* profile. Only the resolved profile's own reference is unset; a dormant or
+* ref-less row (nothing to remove), an already-absent key, and an
+* env-supplied read-only key are rejected safely before any service call.
+* @param ctx - context carrying the `credentials` service.
+* @param target - the joined row whose named credential to unset.
+* @throws {@link ProviderSettingsError} with a single-line, key-free message.
+*/
+async function unsetProviderCredential(ctx, target) {
+	const ref = target.credentialRef;
+	if (ref === void 0) throw new ProviderSettingsError(`provider "${target.provider}" names no credential reference to remove`);
+	const facts = target.credential;
+	if (facts?.kind === "facts" && facts.configured === false) throw new ProviderSettingsError(`provider "${target.provider}" has no configured credential to remove`);
+	if (facts?.kind === "facts" && facts.writable === false) throw new ProviderSettingsError(`the key for provider "${target.provider}" is supplied read-only by the environment; unset it in the shell instead`);
+	const credentials = ctx.get("credentials");
+	if (credentials === void 0) throw new ProviderSettingsError("credentials service is unavailable; cannot remove the API key");
+	try {
+		await credentials.unset(ref);
+	} catch (error) {
+		throw new ProviderSettingsError(singleLine$1(messageOf$1(error)));
+	}
+}
+/**
+* Remove a user-added provider profile, web-parity: only `removable` rows may
+* be removed; a page-managed credential — the derived ref, configured and
+* writable — is unset first (so a second-step failure leaves the row visible
+* and the operation retryable), then `settings.mutate` unsets
+* `target.settingsPath`. Both steps are idempotent. A hand-named credential
+* ref may be shared elsewhere and is left alone.
+* @param ctx - context carrying `credentials` and `settings`.
+* @param target - the joined row to remove.
+* @throws {@link ProviderSettingsError} with a single-line, key-free message.
+*/
+async function removeProviderSettings(ctx, target) {
+	if (!target.removable) throw new ProviderSettingsError(`provider "${target.provider}" is not removable from the user settings layer`);
+	if (target.settingsNs.length === 0) throw new ProviderSettingsError(`provider "${target.provider}" has no managed settings profile to remove`);
+	const managedRef = target.credentialRef === target.suggestedRef && target.credential?.kind === "facts" && target.credential.configured === true && target.credential.writable === true ? target.credentialRef : void 0;
+	if (managedRef !== void 0) {
+		const credentials = ctx.get("credentials");
+		if (credentials === void 0) throw new ProviderSettingsError("credentials service is unavailable; cannot remove the managed API key");
+		try {
+			await credentials.unset(managedRef);
+		} catch (error) {
+			throw new ProviderSettingsError(singleLine$1(messageOf$1(error)));
+		}
+	}
+	const settings = ctx.get("settings");
+	if (settings === void 0) throw new ProviderSettingsError("settings service is unavailable; cannot remove the provider profile");
+	try {
+		await settings.mutate(target.settingsNs, [{
+			op: "unset",
+			path: [...target.settingsPath]
+		}]);
+	} catch (error) {
+		throw new ProviderSettingsError(singleLine$1(messageOf$1(error)));
+	}
+}
+//#endregion
 //#region src/mentions.ts
 /** Menu cap on file rows; the service owns ranking and default rows. */
 const MAX_FILE_ROWS = 20;
@@ -26741,19 +27322,36 @@ function createMentions(ctx, agent, cwd) {
 	const resolver = ctx.get("sessionReferenceResolver");
 	const fileReferences = ctx.get("fileReferences");
 	const sessionCapable = agent !== void 0 && resolver !== void 0;
+	const PRE_SESSION_INDEX_TTL_MS = 3e4;
 	let preSessionSearch;
+	let preSessionIndexedAt = 0;
 	const preSessionFiles = (query, signal) => {
-		preSessionSearch ??= new WorkspaceFileSearch(cwd, {
-			maxResults: DEFAULT_FILE_SEARCH_MAX_RESULTS,
-			maxEntries: DEFAULT_FILE_SEARCH_MAX_ENTRIES,
-			excludedDirectories: [...DEFAULT_FILE_SEARCH_EXCLUDED_DIRECTORIES]
-		});
+		if (preSessionSearch === void 0 || Date.now() - preSessionIndexedAt > PRE_SESSION_INDEX_TTL_MS) {
+			preSessionSearch?.invalidate();
+			preSessionSearch = new WorkspaceFileSearch(cwd, {
+				maxResults: DEFAULT_FILE_SEARCH_MAX_RESULTS,
+				maxEntries: DEFAULT_FILE_SEARCH_MAX_ENTRIES,
+				excludedDirectories: [...DEFAULT_FILE_SEARCH_EXCLUDED_DIRECTORIES]
+			});
+			preSessionIndexedAt = Date.now();
+		}
 		return preSessionSearch.list(query, signal ?? new AbortController().signal);
 	};
 	return {
 		async candidates(query, signal) {
 			const needle = query.trim();
-			const [files, sessions] = await Promise.all([agent !== void 0 && fileReferences !== void 0 ? fileReferences.list(agent, needle, signal ?? new AbortController().signal).catch(() => []) : agent === void 0 ? preSessionFiles(needle, signal).catch(() => []) : Promise.resolve([]), sessionCapable && needle !== "" && !isPathLikeMentionQuery(needle) && agent !== void 0 ? resolver.listCandidates(agent, needle, 10, signal).catch(() => []) : Promise.resolve([])]);
+			let fileFailure;
+			let sessionFailure;
+			const [files, sessions] = await Promise.all([agent !== void 0 && fileReferences !== void 0 ? fileReferences.list(agent, needle, signal ?? new AbortController().signal).catch((error) => {
+				fileFailure = error;
+				return [];
+			}) : agent === void 0 ? preSessionFiles(needle, signal).catch((error) => {
+				fileFailure = error;
+				return [];
+			}) : Promise.resolve([]), sessionCapable && needle !== "" && !isPathLikeMentionQuery(needle) && agent !== void 0 ? resolver.listCandidates(agent, needle, 10, signal).catch((error) => {
+				sessionFailure = error;
+				return [];
+			}) : Promise.resolve([])]);
 			const fileRows = files.slice(0, MAX_FILE_ROWS).map((candidate) => ({
 				label: candidate.path,
 				description: candidate.kind === "directory" ? "Folder" : "File",
@@ -26765,7 +27363,9 @@ function createMentions(ctx, agent, cwd) {
 				description: `Session · ${candidate.cwd ?? "(no cwd)"}`,
 				kind: "session"
 			}));
-			return [...fileRows, ...sessionRows];
+			const rows = [...fileRows, ...sessionRows];
+			if (rows.length === 0 && (fileFailure !== void 0 || sessionFailure !== void 0)) throw fileFailure instanceof Error ? fileFailure : sessionFailure instanceof Error ? sessionFailure : new Error(String(fileFailure ?? sessionFailure));
+			return rows;
 		},
 		parse(text) {
 			return parseSessionReferenceText(text);
@@ -27075,53 +27675,62 @@ const STATUS_ITEM_SEPARATOR = " · ";
 const STATUS_CYCLE_HINT = " (shift+tab to cycle)";
 /** Occupancy at which the usage readout flips from brand blue to amber. */
 const CONTEXT_WARN_PERCENT = 90;
-/** Free-tail floor in columns: wide enough for the bare percent readout, so
-* the warning stays visible even at 100%+ occupancy. */
-const CONTEXT_MIN_FREE = 5;
 /**
-* Narrowest bar width the drop ladder tries before giving up on the context
-* group: the bar shrinks inside its own budget first (a few columns still
-* show the bare percent readout) and only then drops as a whole.
+* Narrowest bar width the drop ladder keeps before dropping the whole
+* context group: the bar shrinks to this floor first (the absolute readout
+* survives), and only past it does the readout degrade and the group go.
 */
 const CONTEXT_MIN_WIDTH = 5;
 /**
-* Render context occupancy as ONE stepless bar: a solid DeepSeek-blue fill
-* run, a dim dotted free track, and the usage readout riding the track's
-* right edge (`12.3K/1.0M 25%`, shrinking to the bare percent as the track
-* narrows). No per-content-type segmentation. Column split is deterministic:
-* the free share is `Math.round(free/window*width)` clamped to at least
-* CONTEXT_MIN_FREE columns and at most the full width; the fill takes every
-* remaining column, so a given occupancy always renders the identical bar.
-* The readout flips to amber once occupancy reaches the warning threshold.
-* @param usedTokens - reported used tokens (drives the readout and percent).
+* Render context occupancy as ONE stepless proportional bar: a solid
+* DeepSeek-blue fill run tracking the occupancy and a dim dotted free
+* track for the rest. Nothing else lives inside the bar — the usage
+* readout rides outside it (see contextGroupSpans) — so the geometry
+* always reads as the true remaining share. A given occupancy always
+* renders the identical bar.
+* @param usedTokens - reported used tokens.
 * @param contextWindow - route capacity.
-* @param width - total bar interior columns.
+* @param width - total bar columns.
 * @returns tone-split spans for the footer to paint.
 */
 function contextBar(usedTokens, contextWindow, width) {
 	if (width <= 0 || contextWindow <= 0) return [];
-	const used = Math.max(0, usedTokens);
-	const percent = Math.round(used / contextWindow * 100);
-	const readoutTone = percent >= CONTEXT_WARN_PERCENT ? "warn" : "value";
-	const freeShare = Math.round(Math.max(0, contextWindow - used) / contextWindow * width);
-	const freeColumns = Math.min(width, Math.max(freeShare, CONTEXT_MIN_FREE));
-	const usedColumns = Math.max(0, width - freeColumns);
-	const total = `${formatTokens(used)}/${formatTokens(contextWindow)}`;
-	const percentText = `${percent}%`;
-	const readout = freeColumns >= visibleColumns(`${total} ${percentText}`) ? `${total} ${percentText}` : freeColumns >= visibleColumns(percentText) ? percentText : "";
+	const fill = Math.min(width, Math.max(0, Math.round(Math.max(0, usedTokens) / contextWindow * width)));
 	const spans = [];
-	if (usedColumns > 0) spans.push({
-		text: "█".repeat(usedColumns),
+	if (fill > 0) spans.push({
+		text: "█".repeat(fill),
 		tone: "ctxFill"
 	});
-	const pad = freeColumns - visibleColumns(readout);
-	if (pad > 0) spans.push({
-		text: "░".repeat(pad),
+	const free = width - fill;
+	if (free > 0) spans.push({
+		text: "░".repeat(free),
 		tone: "label"
 	});
-	if (readout !== "") spans.push({
-		text: readout,
-		tone: readoutTone
+	return spans;
+}
+/**
+* Compose the context group: the proportional bar plus the usage readout
+* OUTSIDE the bar, so the dotted track keeps its proportional meaning no
+* matter how wide the readout is. `full` reads `12.3K/1.0M 25%`; `percent`
+* drops the absolute pair; `none` is the bare bar. The readout turns amber
+* once occupancy reaches the warning threshold.
+*/
+function contextGroupSpans(usedTokens, contextWindow, barWidth, readout) {
+	const spans = [{
+		text: "context ",
+		tone: "label"
+	}];
+	spans.push(...contextBar(usedTokens, contextWindow, barWidth));
+	if (readout === "none" || barWidth <= 0 || contextWindow <= 0) return spans;
+	const used = Math.max(0, usedTokens);
+	const percent = Math.round(used / contextWindow * 100);
+	const text = readout === "full" ? `${formatTokens(used)}/${formatTokens(contextWindow)} ${percent}%` : `${percent}%`;
+	spans.push({
+		text: " ",
+		tone: "label"
+	}, {
+		text,
+		tone: percent >= CONTEXT_WARN_PERCENT ? "warn" : "value"
 	});
 	return spans;
 }
@@ -27413,10 +28022,7 @@ function buildCandidates(facts, stats, busy, enabled, contextWidth) {
 		id: "cache"
 	});
 	if (stats.contextWindow > 0 && stats.lastPromptTokens > 0 && enabled.has("context")) left.push({
-		group: { spans: [{
-			text: "context ",
-			tone: "label"
-		}, ...contextBar(stats.lastPromptTokens, stats.contextWindow, contextWidth)] },
+		group: { spans: contextGroupSpans(stats.lastPromptTokens, stats.contextWindow, contextWidth, "full") },
 		rank: RANK_CONTEXT,
 		id: "context"
 	});
@@ -27517,15 +28123,13 @@ function layoutStatusBar(facts, stats, columns, options = {}) {
 	let hint = badge >= 0 && !busy;
 	const leftKept = [...orderedLeft];
 	const rightKept = [...orderedRight];
+	let contextReadout = "full";
 	let contextWidth = maxContextWidth;
 	const rebuildContext = () => {
 		const index = leftKept.findIndex((entry) => entry.id === "context");
 		if (index < 0) return;
 		leftKept[index] = {
-			group: { spans: [{
-				text: "context ",
-				tone: "label"
-			}, ...contextBar(stats.lastPromptTokens, stats.contextWindow, contextWidth)] },
+			group: { spans: contextGroupSpans(stats.lastPromptTokens, stats.contextWindow, contextWidth, contextReadout) },
 			rank: RANK_CONTEXT,
 			id: "context"
 		};
@@ -27536,15 +28140,19 @@ function layoutStatusBar(facts, stats, columns, options = {}) {
 		return rightWidth > 0 ? leftWidth + LEFT_RIGHT_GAP + rightWidth : leftWidth;
 	};
 	while (width() > budget) {
-		if (leftKept.some((entry) => entry.id === "context") && contextWidth > CONTEXT_MIN_WIDTH) {
-			const overflow = width() - budget;
-			contextWidth = Math.max(CONTEXT_MIN_WIDTH, contextWidth - overflow);
-			rebuildContext();
-			continue;
-		}
-		const contextIndex = leftKept.findIndex((entry) => entry.id === "context");
-		if (contextIndex >= 0) {
-			leftKept.splice(contextIndex, 1);
+		if (leftKept.some((entry) => entry.id === "context")) {
+			if (contextWidth > CONTEXT_MIN_WIDTH) {
+				const overflow = width() - budget;
+				contextWidth = Math.max(CONTEXT_MIN_WIDTH, contextWidth - overflow);
+				rebuildContext();
+				continue;
+			}
+			if (contextReadout === "full") {
+				contextReadout = "percent";
+				rebuildContext();
+				continue;
+			}
+			leftKept.splice(leftKept.findIndex((entry) => entry.id === "context"), 1);
 			continue;
 		}
 		if (hint && rightKept.length > 0 && leftKept.length > 0) {
@@ -27672,14 +28280,14 @@ function styledLines(segments, columns) {
 	};
 	for (const segment of segments) {
 		const safe = displayText(segment.text).replaceAll("	", "  ").replaceAll("\r", "");
-		for (const char of safe) {
-			if (char === "\n") {
+		for (const cluster of splitGraphemes$1(safe)) {
+			if (cluster === "\n") {
 				flush();
 				continue;
 			}
-			const cells = visibleColumns(char);
+			const cells = graphemeWidth(cluster);
 			if (used > 0 && used + cells > width) flush();
-			appendSegment(current, char, segment.style);
+			appendSegment(current, cluster, segment.style);
 			used += cells;
 		}
 	}
@@ -27693,7 +28301,7 @@ function textLines(text, columns, style = "plain") {
 /** Prefix every wrapped physical row without exceeding the column budget. */
 function prefixedStyledLines(segments, columns, prefix, prefixStyle = "plain") {
 	const width = Math.max(1, Math.floor(columns));
-	const prefixWidth = Math.min(width, visibleColumns(prefix));
+	const prefixWidth = Math.min(width - 1, visibleColumns(prefix));
 	return styledLines(segments, Math.max(1, width - prefixWidth)).map((line) => ({ segments: [lineSegment(prefix, prefixStyle), ...line.segments] }));
 }
 /** Text convenience for a tool row whose continuation must keep its gutter. */
@@ -27725,14 +28333,14 @@ function hangingStyledLines(segments, columns, firstPrefix, firstStyle, contPref
 	};
 	for (const segment of segments) {
 		const safe = displayText(segment.text).replaceAll("	", "  ").replaceAll("\r", "");
-		for (const char of safe) {
-			if (char === "\n") {
+		for (const cluster of splitGraphemes$1(safe)) {
+			if (cluster === "\n") {
 				flush();
 				continue;
 			}
-			const cells = visibleColumns(char);
+			const cells = graphemeWidth(cluster);
 			if (used > 0 && used + cells > budget) flush();
-			appendSegment(current, char, segment.style);
+			appendSegment(current, cluster, segment.style);
 			used += cells;
 		}
 	}
@@ -27746,7 +28354,7 @@ function hangingTextLines(text, columns, firstPrefix, firstStyle = "plain", cont
 /** Markdown rows re-hardened so a single long word cannot escape the budget. */
 function markdownLines(text, columns) {
 	const width = Math.max(1, Math.floor(columns));
-	return renderMarkdown(displayText(text), Math.max(10, width)).flatMap((line) => styledLines(line.segments.map((segment) => lineSegment(segment.text, segment.style)), width));
+	return renderMarkdown(displayText(text), width).flatMap((line) => styledLines(line.segments.map((segment) => lineSegment(segment.text, segment.style)), width));
 }
 /**
 * Codex-style reasoning rows: the marker occupies the reply gutter and every
@@ -27796,7 +28404,7 @@ function transcriptEntryLines(entry, columns, showReasoning = true, reasoningTog
 		case "pending": return hangingStyledLines([lineSegment(promptDisplayText(entry), "plain")], width, "❯ ", "brand", "  ", "plain");
 		case "assistant": {
 			const reasoning = entry.reasoning === "" ? [] : showReasoning ? reasoningLines(entry.reasoning, width) : textLines(`✻ Thinking (${entry.reasoning.length} chars${reasoningToggleHint ? ", Ctrl/Alt+R to expand" : ""})`, width, "dim");
-			const body = markdownLines(entry.text, Math.max(10, width - 2)).map((line) => ({ segments: [{
+			const body = markdownLines(entry.text, Math.max(1, width - 2)).map((line) => ({ segments: [{
 				text: "  ",
 				style: "plain"
 			}, ...line.segments] }));
@@ -27831,7 +28439,7 @@ function transcriptEntryLines(entry, columns, showReasoning = true, reasoningTog
 		}
 		case "turn-marker": return textLines(`  ⏹ ${entry.text}`, width, "dim");
 		case "compaction": return textLines(entry.ok ? `  ⧉ compacted ~${formatTokens(entry.tokens)} tokens` : `  ⧉ compaction failed: ${entry.error}`, width, "dim");
-		case "retry": return textLines(`  ↻ retry ${entry.attempt}/${entry.max} · ${entry.code} · ${Math.round(entry.delayMs / 100) / 10}s`, width, entry.state === "running" ? "warn" : "dim");
+		case "retry": return textLines(entry.mode === "always" ? `  ↻ retry ${entry.attempt} · ${entry.code} · ${Math.round(entry.delayMs / 100) / 10}s` : `  ↻ retry ${entry.attempt}/${entry.max} · ${entry.code} · ${Math.round(entry.delayMs / 100) / 10}s`, width, entry.state === "running" ? "warn" : "dim");
 		case "files": return entry.paths.length === 0 ? textLines("  ⎄ no changed files", width, "dim") : [...textLines(`  ⎄ ${entry.paths.length} changed file${entry.paths.length === 1 ? "" : "s"}`, width, "dim"), ...entry.paths.flatMap((path) => hangingTextLines(path, width, "    ", "dim", "    "))];
 		case "error": return textLines(entry.text, width, "error");
 		default: return entry;
@@ -28390,6 +28998,14 @@ function stripTerminalFocusEvents(chunk, onFocus) {
 const PASTE_START_MARKER = "[200~";
 const PASTE_END_MARKER = "[201~";
 /**
+* How long an unterminated bracketed-paste block may hold buffered bytes
+* before the input splitter strips its start marker and releases them: a
+* terminal that loses the end marker must never take the whole keyboard
+* hostage (Esc/Ctrl+C included). Shared by the splitter and the composer's
+* lost-paste safety net so both use one window.
+*/
+const PASTE_BRACKET_TIMEOUT_MS = 1e3;
+/**
 * Remove bracketed paste markers from one input chunk. Panel drafts accept raw
 * `input` text, where an unhandled paste would otherwise persist the literal
 * "[200~"/"[201~" markers Ink leaves after stripping the ESC byte.
@@ -28398,7 +29014,21 @@ function stripPasteMarkers(text) {
 	return text.replaceAll(`\x1b${PASTE_START_MARKER}`, "").replaceAll(`\x1b${PASTE_END_MARKER}`, "").replaceAll(PASTE_START_MARKER, "").replaceAll(PASTE_END_MARKER, "");
 }
 /** Match one CSI-u sequence (code, optional ;modifiers, then :event or ;alternate). */
-const CSI_U_SOURCE = "\x1B\\[(\\d+)(?:;(\\d+))?(?:[:;](\\d+))?u";
+const CSI_U_SOURCE = "\x1B\\[(\\d+)(?:;(\\d+))?(?:(:|;)(\\d+))?u";
+/** Kitty private-use keycodes for the numeric keypad and keypad Enter. */
+const KITTY_KEYPAD_CODES = {
+	57399: "0",
+	57400: "1",
+	57401: "2",
+	57402: "3",
+	57403: "4",
+	57404: "5",
+	57405: "6",
+	57406: "7",
+	57407: "8",
+	57408: "9",
+	57414: "\r"
+};
 /** Legacy equivalent for one decoded CSI-u key, or undefined to pass through. */
 function legacyForKey(key) {
 	const bits = Math.max(0, key.modifiers - 1);
@@ -28413,6 +29043,11 @@ function legacyForKey(key) {
 	if (key.code === 27) return "\x1B";
 	if (key.code === 9) return shift ? "\x1B[Z" : "	";
 	if (key.code === 127) return alt || ctrl ? "\x1B" : "";
+	const keypad = KITTY_KEYPAD_CODES[key.code];
+	if (keypad !== void 0) {
+		if (alt) return "\x1B" + keypad;
+		return keypad;
+	}
 	if (key.code >= 1 && key.code <= 6) {
 		const mask = (shift ? 1 : 0) + (alt ? 2 : 0) + (ctrl ? 4 : 0);
 		const mods = mask === 0 ? "" : `;${mask + 1}`;
@@ -28432,11 +29067,11 @@ function legacyForKey(key) {
 		if (alt) return "\x1B" + String.fromCodePoint(key.code + 32);
 		return String.fromCodePoint(key.code);
 	}
-	if (key.code >= 32 && key.code <= 126 && key.alternate !== void 0) {
-		const base = key.alternate >= 97 && key.alternate <= 122 ? key.alternate : key.code;
+	if (key.code >= 32 && key.code <= 126) {
+		const base = key.alternate ?? key.code;
 		if (ctrl && base - 96 >= 1 && base - 96 <= 26) return String.fromCodePoint(base - 96);
-		if (alt) return "\x1B" + String.fromCodePoint(key.alternate);
-		return String.fromCodePoint(key.alternate);
+		if (alt) return "\x1B" + String.fromCodePoint(base);
+		return String.fromCodePoint(base);
 	}
 }
 /**
@@ -28448,11 +29083,11 @@ function legacyForKey(key) {
 function normalizeKeyboardChunk(chunk) {
 	if (!chunk.includes("\x1B[") || !chunk.includes("u")) return chunk;
 	const pattern = new RegExp(CSI_U_SOURCE, "g");
-	return chunk.replace(pattern, (whole, code, mods, third) => {
+	return chunk.replace(pattern, (whole, code, mods, separator, third) => {
 		return legacyForKey({
 			code: Number.parseInt(code, 10),
 			modifiers: mods === void 0 || mods === "" ? 1 : Math.max(1, Number.parseInt(mods, 10)),
-			alternate: third !== void 0 && third !== "" ? Number.parseInt(third, 10) : void 0
+			alternate: separator === ";" && third !== void 0 && third !== "" ? Number.parseInt(third, 10) : void 0
 		}) ?? whole;
 	});
 }
@@ -28565,8 +29200,10 @@ function searchLine(searching, query) {
 function ListFrame(props) {
 	const stdout = useStdout().stdout;
 	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns(singleLineText(`${props.title} · esc close`), viewport.contentColumns));
+	if (viewport.maxHeight === 0 || viewport.compact) {
+		const body = props.loading ? `${props.title} · loading…` : props.error !== void 0 ? `${props.title} · load failed` : props.rows.length === 0 ? `${props.title} · no matching entries` : `❯ ${singleLineText(props.rows[props.cursor]?.text ?? "")}`;
+		return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns(singleLineText(`${body} · esc close`), viewport.contentColumns));
+	}
 	const stateRows = props.loading ? [{
 		key: "loading",
 		text: "  loading…"
@@ -28641,7 +29278,7 @@ function ModePanel({ current, load, select, 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);
+		if (key.return && visible[cursor] !== void 0 && visible[cursor].broken === void 0) return select(visible[cursor].id);
 		const next = editQuery(query, input, key);
 		if (next !== void 0) {
 			setQuery(next);
@@ -29034,8 +29671,10 @@ function HistoryPanel({ entries, fill, close }) {
 	});
 	const stdout = useStdout().stdout;
 	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("/history · esc close", viewport.contentColumns));
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
+	if (viewport.maxHeight === 0 || viewport.compact) {
+		const picked = matches[cursor];
+		return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("/history · " + (picked === void 0 ? "no matching prompts" : singleLineText(picked)) + " · esc close", viewport.contentColumns));
+	}
 	const bodyRows = Math.max(1, viewport.bodyRows - 1);
 	const offset = revealRow(0, cursor, matches.length, bodyRows);
 	const visible = matches.slice(offset, offset + bodyRows);
@@ -29120,8 +29759,7 @@ function StatuslinePanel({ enabled, change, close }) {
 	});
 	const stdout = useStdout().stdout;
 	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("/statusline · esc close", viewport.contentColumns));
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
+	if (viewport.maxHeight === 0 || viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("/statusline · esc close", viewport.contentColumns));
 	const bodyRows = Math.max(1, viewport.bodyRows - 1);
 	const offset = revealRow(0, cursor, order.length, bodyRows);
 	const visible = order.slice(offset, offset + bodyRows);
@@ -29162,7 +29800,7 @@ function StatuslinePanel({ enabled, change, close }) {
 * instead of a bare failure notice. Enter applies one level; Esc returns to
 * the model list without applying.
 */
-function EffortPanel({ row, current, select, back }) {
+function EffortPanel({ row, current, select, back, onExit }) {
 	const advertised = row.reasoning?.efforts ?? [];
 	const empty = row.reasoning === void 0 || advertised.length === 0;
 	const hasDefaultRow = row.reasoning !== void 0 && row.reasoning.defaultEffort === void 0;
@@ -29186,6 +29824,7 @@ function EffortPanel({ row, current, select, back }) {
 	}, [rows.length, cursor]);
 	useInput((input, key) => {
 		if (key.escape || input === "q") return back();
+		if (key.ctrl && input === "c") return onExit();
 		if (empty) return;
 		if (input === "g") {
 			setCursor(0);
@@ -29375,7 +30014,8 @@ function SubagentPanel({ current, load, pick, inherit, close }) {
 		row: effortFor,
 		current: current === "" ? void 0 : current.split("@")[1],
 		select: (effortId) => pick(effortFor, effortId),
-		back: () => setEffortFor(void 0)
+		back: () => setEffortFor(void 0),
+		onExit: close
 	});
 	return (0, import_react.createElement)(ListFrame, {
 		title: `/subagent — model for delegated agents${current === "" ? "" : ` · override ${current}`}`,
@@ -29422,6 +30062,26 @@ function parseHistoryFile(raw, max = 100) {
 	return kept.slice(-max);
 }
 /**
+* The append unit for the persistent file: one JSON line, so a multi-line
+* draft still occupies exactly one physical line. Each submission appends
+* this unit at the end of the file, so concurrent terminals add entries
+* after each other. Node chunks one append at 512 KiB: a pasted entry
+* beyond that size could interleave mid-line with another writer's
+* chunks, and the damaged line then drops out at the next parse —
+* recall tolerates the loss by design.
+*/
+function historyLine(text) {
+	return serializeHistoryEntry(text) + "\n";
+}
+/**
+* Whether the file on disk differs from its canonical form (deduped and
+* capped). True means stale lines have accumulated and the next boot
+* should rewrite it once, atomically.
+*/
+function needsCompaction(raw, max = 100) {
+	return serializeHistoryList(parseHistoryFile(raw, max)) !== raw;
+}
+/**
 * Record one in-session submission: empty text is ignored and an adjacent
 * duplicate collapses (Codex `record_local_submission` semantics). The local
 * pool shares the persistent pool's cap so the recall space stays bounded.
@@ -29436,10 +30096,10 @@ function recordLocalEntry(local, text, max = 100) {
 	return [...local, text].slice(-max);
 }
 /**
-* Serialize a capped entry list to the history file format (one JSON line per
-* entry, trailing newline). The runner writes the in-memory list as the whole
-* file, so rapid same-process submissions cannot lose entries to a
-* read-modify-write race (the file is never read back before writing).
+* Serialize a capped entry list to the history file format (one JSON line
+* per entry, trailing newline). The boot-time compaction writes this
+* canonical form once when stale lines have accumulated; submissions
+* themselves only ever append a single line.
 * @param entries - the entries to persist, oldest first.
 * @returns the file content, '' for an empty list.
 */
@@ -29798,8 +30458,7 @@ function ProviderAuthorizationPanel(props) {
 		}
 		if (input !== "" && !key.ctrl && !key.meta) setDraft((current) => current + input);
 	});
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("provider login · esc cancel", viewport.contentColumns));
+	if (viewport.maxHeight === 0 || viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("provider login · esc cancel", viewport.contentColumns));
 	const rows = [];
 	if (phase === "methods") {
 		if (error !== void 0) rows.push({
@@ -29903,8 +30562,7 @@ function ProviderAuthorizationLogoutPanel({ row, confirm, done, back }) {
 			setError(reason instanceof Error ? reason.message : String(reason));
 		});
 	});
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("y logout · n/esc back", viewport.contentColumns));
+	if (viewport.maxHeight === 0 || viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("y logout · n/esc back", viewport.contentColumns));
 	return (0, import_react.createElement)(Box, {
 		flexDirection: "column",
 		width: viewport.outerColumns,
@@ -30075,12 +30733,6 @@ function readSettledRowCap() {
 	const parsed = Number.parseInt(raw, 10);
 	return Number.isFinite(parsed) && parsed >= 0 ? parsed : 3e3;
 }
-/**
-* Safety net for a bracketed paste whose end marker never arrives (terminal
-* defect or crash mid-paste): past this window the open-paste flag resets so
-* Enter submits again instead of inserting newlines forever.
-*/
-const PASTE_BRACKET_TIMEOUT_MS = 1e3;
 /** Release the held frame after Ink has replayed the source-backed Static rows. */
 const SYNCHRONIZED_UPDATE_END = "\x1B[?2026l";
 /** One source of truth for TUI-owned slash commands in completion and `/help`. */
@@ -30290,13 +30942,14 @@ function StreamTail({ text, dim, maxRows, prefix = "", continuationPrefix = pref
 	const columns = useStdout().stdout?.columns ?? 80;
 	const safeRows = Math.max(1, maxRows);
 	const prefixColumns = Math.max(visibleColumns(prefix), visibleColumns(continuationPrefix));
-	const contentColumns = Math.max(10, columns - 1 - prefixColumns);
+	const contentColumns = Math.max(1, columns - 1 - prefixColumns);
 	const initial = displayTail(text, contentColumns, safeRows);
 	const tail = initial.truncated && safeRows > 1 ? displayTail(text, contentColumns, safeRows - 1) : initial;
 	const rows = tail.text.split("\n");
 	return (0, import_react.createElement)(Box, { flexDirection: "column" }, tail.truncated && safeRows > 1 ? (0, import_react.createElement)(Text, { color: inkColor(getPalette().dim) }, continuationPrefix, "…") : void 0, ...rows.map((row, index) => (0, import_react.createElement)(Text, {
 		key: index,
-		dimColor: dim || void 0
+		dimColor: dim || void 0,
+		wrap: "truncate-end"
 	}, index === 0 ? prefix : continuationPrefix, row, index + 1 === rows.length ? children : void 0)));
 }
 /** Ink props for one markdown style class. */
@@ -30606,8 +31259,7 @@ function TodoListPanel({ todos, onClose }) {
 		else if (input === "g") setScroll(0);
 		else if (input === "G") setScroll(Math.max(0, rows.length - viewport.bodyRows));
 	});
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("todos · esc/q close", viewport.contentColumns));
+	if (viewport.maxHeight === 0 || viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("todos · esc/q close", viewport.contentColumns));
 	return (0, import_react.createElement)(Box, {
 		flexDirection: "column",
 		width: viewport.outerColumns,
@@ -30833,7 +31485,7 @@ const APPROVAL_OPTIONS = [
 * `rejected`): "tell it what to do differently" rejects and hands the
 * composer back with a hint notice, exactly Codex's decline-then-type flow.
 */
-function ApprovalBar({ snapshot, locked, notify }) {
+function ApprovalBar({ snapshot, locked, notify, interrupt, summarize }) {
 	const stdout = useStdout().stdout;
 	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
 	const [cursor, setCursor] = (0, import_react.useState)(0);
@@ -30855,6 +31507,10 @@ function ApprovalBar({ snapshot, locked, notify }) {
 	};
 	useInput((input, key) => {
 		if (snapshot.pending === void 0 || snapshot.answered) return;
+		if (key.ctrl && input === "c") {
+			interrupt();
+			return;
+		}
 		if (key.upArrow) {
 			setCursor((current) => (current + APPROVAL_OPTIONS.length - 1) % APPROVAL_OPTIONS.length);
 			return;
@@ -30889,9 +31545,8 @@ function ApprovalBar({ snapshot, locked, notify }) {
 		}
 	}, { isActive: active });
 	if (pending === void 0) return void 0;
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
 	const queuedSuffix = snapshot.queued > 0 ? ` · +${snapshot.queued} queued` : "";
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns(`approval${queuedSuffix} · enter/y allow · esc/n reject`, viewport.contentColumns));
+	if (viewport.maxHeight === 0 || viewport.compact || summarize === true) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns(`approval${queuedSuffix} · enter/y allow · esc/n reject`, viewport.contentColumns));
 	const reservedRows = 3 + APPROVAL_OPTIONS.length;
 	const bodyBudget = Math.max(1, viewport.bodyRows - reservedRows);
 	const visibleBody = body.slice(0, bodyBudget);
@@ -30926,13 +31581,40 @@ function ApprovalBar({ snapshot, locked, notify }) {
 		wrap: "truncate-end"
 	}, truncateColumns(snapshot.answered ? "submitted…" : "↑↓ choose · enter confirm · y/n/d quick · esc reject", viewport.contentColumns)));
 }
+function initialQuestionDraft(question) {
+	const hasOptions = (question?.options?.length ?? 0) > 0;
+	return {
+		selected: [],
+		custom: "",
+		cursor: 0,
+		mode: hasOptions ? "options" : "custom",
+		scroll: 0,
+		manualScroll: false,
+		followCustomTail: !hasOptions,
+		committed: false
+	};
+}
+function answerFromQuestionDraft(question, draft) {
+	if (!(question.multiSelect === true ? draft.committed || draft.selected.length > 0 || draft.custom.trim() !== "" : draft.committed)) return {
+		id: question.id,
+		selected: []
+	};
+	const options = question.options ?? [];
+	const selected = draft.selected.map((at) => options[at]?.label).filter((label) => label !== void 0);
+	const custom = draft.custom.trim();
+	return {
+		id: question.id,
+		selected,
+		...custom === "" ? {} : { custom }
+	};
+}
 /**
 * The ask_user_question bar: walks one request question by question,
-* renders the option menu (Claude-Code style: arrows move, space toggles a
-* multi-select, enter submits, `c` opens the custom-answer box, Esc
-* interrupts the question as aborted). Plan reviews arrive through the same
-* service with a `plan-review` intent — the approve option gets a ✓ mark,
-* the answer encoding stays identical.
+* retaining an independent draft for every question. Options use Space/1-9
+* to toggle a multi-select, Enter to confirm, and arrows/Ctrl+P/N to move
+* between questions. Plan reviews arrive through the same service with a
+* `plan-review` intent — the approve option gets a ✓ mark, the answer
+* encoding stays identical.
 */
 function QuestionBar({ store, snapshot, locked }) {
 	const stdout = useStdout().stdout;
@@ -30940,33 +31622,25 @@ function QuestionBar({ store, snapshot, locked }) {
 	const pending = snapshot.pending;
 	const request = pending?.request;
 	const [index, setIndex] = (0, import_react.useState)(0);
-	const [cursor, setCursor] = (0, import_react.useState)(0);
-	const [selected, setSelected] = (0, import_react.useState)([]);
-	const [mode, setMode] = (0, import_react.useState)("options");
-	const [custom, setCustom] = (0, import_react.useState)("");
-	const [answers, setAnswers] = (0, import_react.useState)([]);
+	const [drafts, setDrafts] = (0, import_react.useState)(() => request?.questions.map((question) => initialQuestionDraft(question)) ?? []);
 	const [submitted, setSubmitted] = (0, import_react.useState)(false);
-	const [scroll, setScroll] = (0, import_react.useState)(0);
-	const [manualScroll, setManualScroll] = (0, import_react.useState)(false);
-	const [followCustomTail, setFollowCustomTail] = (0, import_react.useState)(false);
+	const draftsRef = (0, import_react.useRef)([]);
+	const indexRef = (0, import_react.useRef)(0);
+	draftsRef.current = drafts;
+	indexRef.current = index;
 	(0, import_react.useEffect)(() => {
-		const first = request?.questions[0];
-		const initialMode = first?.options === void 0 || first.options.length === 0 ? "custom" : "options";
-		setIndex((current) => current === 0 ? current : 0);
-		setCursor((current) => current === 0 ? current : 0);
-		setSelected((current) => current.length === 0 ? current : []);
-		setMode((current) => current === initialMode ? current : initialMode);
-		setCustom((current) => current === "" ? current : "");
-		setAnswers((current) => current.length === 0 ? current : []);
-		setSubmitted((current) => current ? false : current);
-		setScroll((current) => current === 0 ? current : 0);
-		setManualScroll((current) => current ? false : current);
-		setFollowCustomTail((current) => current === (initialMode === "custom") ? current : initialMode === "custom");
+		const next = request?.questions.map((question) => initialQuestionDraft(question)) ?? [];
+		draftsRef.current = next;
+		indexRef.current = 0;
+		setDrafts(next);
+		setIndex(0);
+		setSubmitted(false);
 	}, [request]);
 	const question = pending?.request.questions[index];
 	const options = question?.options ?? [];
 	const isPlan = question?.intent?.kind === "plan-review";
 	const isMulti = question?.multiSelect === true;
+	const { cursor, selected, mode, custom, scroll, manualScroll, followCustomTail } = drafts[index] ?? initialQuestionDraft(question);
 	const active = !locked && pending !== void 0 && question !== void 0 && !submitted;
 	const rendered = (0, import_react.useMemo)(() => {
 		if (question === void 0) return {
@@ -30992,6 +31666,7 @@ function QuestionBar({ store, snapshot, locked }) {
 			const style = at === cursor ? "brand" : chosen || approve ? "success" : "plain";
 			lines.push(...styledLines([
 				lineSegment(mark, style),
+				lineSegment(at < 9 ? `${at + 1}. ` : "", "dim"),
 				lineSegment(option.label, style),
 				lineSegment(option.description === void 0 ? "" : ` — ${option.description}`, "dim")
 			], viewport.contentColumns));
@@ -31014,32 +31689,54 @@ function QuestionBar({ store, snapshot, locked }) {
 	]);
 	const focusedRow = rendered.optionRows[cursor] ?? 0;
 	const visibleScroll = clampScroll(mode === "options" && options.length > 0 && !manualScroll ? revealRow(scroll, focusedRow, rendered.lines.length, viewport.bodyRows) : (mode === "custom" || options.length === 0) && followCustomTail ? Math.max(0, rendered.lines.length - viewport.bodyRows) : scroll, rendered.lines.length, viewport.bodyRows);
+	const updateDrafts = (update) => {
+		const next = update(draftsRef.current);
+		draftsRef.current = next;
+		setDrafts(next);
+	};
+	const updateCurrentDraft = (update) => {
+		const currentIndex = indexRef.current;
+		updateDrafts((current) => current.map((draft, at) => at === currentIndex ? update(draft) : draft));
+	};
+	const moveQuestion = (direction) => {
+		const total = request?.questions.length ?? 0;
+		if (total <= 1) return;
+		const currentIndex = indexRef.current;
+		const nextIndex = Math.max(0, Math.min(total - 1, currentIndex + direction));
+		if (nextIndex === currentIndex) return;
+		indexRef.current = nextIndex;
+		setIndex(nextIndex);
+	};
 	const commit = (answer) => {
-		if (pending === void 0) return;
-		const next = [...answers, answer];
+		if (pending === void 0 || question === void 0) return;
+		const currentIndex = indexRef.current;
+		const optionLabels = new Set(answer.selected);
+		const selectedIndices = (question.options ?? []).map((option, at) => optionLabels.has(option.label) ? at : -1).filter((at) => at >= 0);
+		const nextDrafts = draftsRef.current.map((draft, at) => at === currentIndex ? {
+			...draft,
+			selected: selectedIndices,
+			custom: answer.custom ?? "",
+			committed: true
+		} : draft);
+		draftsRef.current = nextDrafts;
+		setDrafts(nextDrafts);
 		const total = pending.request.questions.length;
-		if (index + 1 >= total) {
+		if (currentIndex + 1 >= total) {
 			setSubmitted(true);
-			store.submit(pending, { answers: next });
+			store.submit(pending, { answers: pending.request.questions.map((item, at) => answerFromQuestionDraft(item, nextDrafts[at] ?? initialQuestionDraft(item))) });
 			return;
 		}
-		setAnswers(next);
-		const nextIndex = index + 1;
-		const nextQuestion = pending.request.questions[nextIndex];
+		const nextIndex = currentIndex + 1;
+		indexRef.current = nextIndex;
 		setIndex(nextIndex);
-		setCursor(0);
-		setSelected([]);
-		setMode(nextQuestion?.options === void 0 || nextQuestion.options.length === 0 ? "custom" : "options");
-		setCustom("");
-		setScroll(0);
-		setManualScroll(false);
-		setFollowCustomTail(nextQuestion?.options === void 0 || nextQuestion.options.length === 0);
 	};
 	const commitOption = () => {
 		if (pending === void 0 || question === void 0) return;
+		const currentIndex = indexRef.current;
+		const current = draftsRef.current[currentIndex] ?? initialQuestionDraft(question);
 		if (isMulti) {
-			const labels = selected.map((at) => options[at]?.label).filter((label) => label !== void 0);
-			const customText = custom.trim();
+			const labels = current.selected.map((at) => options[at]?.label).filter((label) => label !== void 0);
+			const customText = current.custom.trim();
 			commit({
 				id: question.id,
 				selected: labels,
@@ -31047,7 +31744,7 @@ function QuestionBar({ store, snapshot, locked }) {
 			});
 			return;
 		}
-		const option = options[cursor];
+		const option = options[current.cursor];
 		if (option === void 0) return;
 		commit({
 			id: question.id,
@@ -31057,19 +31754,30 @@ function QuestionBar({ store, snapshot, locked }) {
 	/**
 	* A question with choices has two local focus surfaces, just like Codex:
 	* the choice list and the optional custom-answer editor. Returning to the
-	* list keeps the user's current choice (and multi-select state), but drops
-	* the transient custom draft so a second Escape can cancel the question.
+	* list keeps the user's current choice and multi-select state, but drops the
+	* transient custom draft so a second Escape can cancel the question.
 	*/
 	const returnToOptions = () => {
 		if (options.length === 0) return;
-		setMode("options");
-		setCustom("");
-		setScroll(0);
-		setManualScroll(false);
-		setFollowCustomTail(false);
+		updateCurrentDraft((current) => ({
+			...current,
+			mode: "options",
+			custom: "",
+			scroll: 0,
+			manualScroll: false,
+			followCustomTail: false
+		}));
 	};
 	useStableInput((input, key) => {
 		if (pending === void 0 || question === void 0 || submitted) return;
+		if (viewport.maxHeight === 0) {
+			if (key.escape || key.ctrl && input === "c") store.cancel(pending);
+			return;
+		}
+		if (key.ctrl && input === "c") {
+			store.cancel(pending);
+			return;
+		}
 		if (key.escape) {
 			if (mode === "custom" && options.length > 0) {
 				returnToOptions();
@@ -31078,16 +31786,34 @@ function QuestionBar({ store, snapshot, locked }) {
 			store.cancel(pending);
 			return;
 		}
+		if (key.tab && key.shift) {
+			moveQuestion(-1);
+			return;
+		}
+		if (key.leftArrow || key.ctrl && input === "p") {
+			moveQuestion(-1);
+			return;
+		}
+		if (key.rightArrow || key.ctrl && input === "n") {
+			moveQuestion(1);
+			return;
+		}
 		if (key.pageUp) {
-			setManualScroll(true);
-			setFollowCustomTail(false);
-			setScroll(moveScroll(visibleScroll, -Math.max(1, viewport.bodyRows - 1), rendered.lines.length, viewport.bodyRows));
+			updateCurrentDraft((current) => ({
+				...current,
+				manualScroll: true,
+				followCustomTail: false,
+				scroll: moveScroll(visibleScroll, -Math.max(1, viewport.bodyRows - 1), rendered.lines.length, viewport.bodyRows)
+			}));
 			return;
 		}
 		if (key.pageDown) {
-			setManualScroll(true);
-			setFollowCustomTail(false);
-			setScroll(moveScroll(visibleScroll, Math.max(1, viewport.bodyRows - 1), rendered.lines.length, viewport.bodyRows));
+			updateCurrentDraft((current) => ({
+				...current,
+				manualScroll: true,
+				followCustomTail: false,
+				scroll: moveScroll(visibleScroll, Math.max(1, viewport.bodyRows - 1), rendered.lines.length, viewport.bodyRows)
+			}));
 			return;
 		}
 		if (mode === "custom" || options.length === 0) {
@@ -31096,13 +31822,19 @@ function QuestionBar({ store, snapshot, locked }) {
 				return;
 			}
 			if (key.upArrow) {
-				setFollowCustomTail(false);
-				setScroll(moveScroll(visibleScroll, -1, rendered.lines.length, viewport.bodyRows));
+				updateCurrentDraft((current) => ({
+					...current,
+					followCustomTail: false,
+					scroll: moveScroll(visibleScroll, -1, rendered.lines.length, viewport.bodyRows)
+				}));
 				return;
 			}
 			if (key.downArrow) {
-				setFollowCustomTail(false);
-				setScroll(moveScroll(visibleScroll, 1, rendered.lines.length, viewport.bodyRows));
+				updateCurrentDraft((current) => ({
+					...current,
+					followCustomTail: false,
+					scroll: moveScroll(visibleScroll, 1, rendered.lines.length, viewport.bodyRows)
+				}));
 				return;
 			}
 			if (key.return) {
@@ -31122,23 +31854,37 @@ function QuestionBar({ store, snapshot, locked }) {
 					returnToOptions();
 					return;
 				}
-				setCustom((current) => deleteLastGrapheme(current));
+				updateCurrentDraft((current) => ({
+					...current,
+					custom: deleteLastGrapheme(current.custom),
+					committed: false
+				}));
 				return;
 			}
 			if (input !== "" && !key.ctrl && !key.meta) {
 				const text = stripPasteMarkers(input);
-				if (text !== "") setCustom((current) => current + text);
+				if (text !== "") updateCurrentDraft((current) => ({
+					...current,
+					custom: current.custom + text,
+					committed: false
+				}));
 			}
 			return;
 		}
 		if (key.upArrow) {
-			setManualScroll(false);
-			setCursor((current) => (current + options.length - 1) % options.length);
+			updateCurrentDraft((current) => ({
+				...current,
+				cursor: (current.cursor + options.length - 1) % options.length,
+				manualScroll: false
+			}));
 			return;
 		}
 		if (key.downArrow) {
-			setManualScroll(false);
-			setCursor((current) => (current + 1) % options.length);
+			updateCurrentDraft((current) => ({
+				...current,
+				cursor: (current.cursor + 1) % options.length,
+				manualScroll: false
+			}));
 			return;
 		}
 		if (key.return) {
@@ -31146,17 +31892,43 @@ function QuestionBar({ store, snapshot, locked }) {
 			return;
 		}
 		if (key.tab || input === "c" || input === "C") {
-			setMode("custom");
-			setManualScroll(false);
-			setFollowCustomTail(true);
+			updateCurrentDraft((current) => ({
+				...current,
+				mode: "custom",
+				manualScroll: false,
+				followCustomTail: true
+			}));
+			return;
+		}
+		if (input === " " && isMulti) {
+			updateCurrentDraft((current) => ({
+				...current,
+				selected: current.selected.includes(current.cursor) ? current.selected.filter((at) => at !== current.cursor) : [...current.selected, current.cursor],
+				committed: false
+			}));
 			return;
 		}
-		if (input === " " && isMulti) setSelected((current) => current.includes(cursor) ? current.filter((at) => at !== cursor) : [...current, cursor]);
+		if (/^[1-9]$/.test(input)) {
+			const at = Number(input) - 1;
+			if (at >= options.length) return;
+			if (isMulti) updateCurrentDraft((current) => ({
+				...current,
+				selected: current.selected.includes(at) ? current.selected.filter((row) => row !== at) : [...current.selected, at],
+				committed: false
+			}));
+			else {
+				const option = options[at];
+				if (option !== void 0) commit({
+					id: question.id,
+					selected: [option.label]
+				});
+			}
+		}
 	}, active);
 	if (pending === void 0 || question === void 0) return void 0;
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns(isPlan ? "plan review · esc cancel" : "question · esc cancel", viewport.contentColumns));
-	const footer = submitted ? "submitted…" : mode === "custom" ? options.length === 0 ? "↑↓/pgup/pgdn scroll · type answer · enter submit · esc interrupt" : "↑↓/pgup/pgdn scroll · type answer · enter submit · tab/esc or empty backspace: options" : options.length === 0 ? "↑↓/pgup/pgdn scroll · type answer · enter submit · esc interrupt" : isMulti ? "↑↓ choose · pgup/pgdn scroll · space toggle · enter submit · c custom · esc interrupt" : "↑↓ choose · pgup/pgdn scroll · enter submit · c custom · esc interrupt";
+	if (viewport.maxHeight === 0 || viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns(isPlan ? "plan review · esc cancel" : "question · esc cancel", viewport.contentColumns));
+	const footerBase = submitted ? "submitted…" : mode === "custom" ? options.length === 0 ? "↑↓/pgup/pgdn scroll · type answer · enter submit · esc interrupt" : "↑↓/pgup/pgdn scroll · type answer · enter submit · tab/esc or empty backspace: options" : options.length === 0 ? "↑↓/pgup/pgdn scroll · type answer · enter submit · esc interrupt" : isMulti ? "↑↓ choose · pgup/pgdn scroll · space/1-9 toggle · enter submit · c custom · esc interrupt" : "↑↓ choose · pgup/pgdn scroll · 1-9 pick · enter submit · c custom · esc interrupt";
+	const footer = pending.request.questions.length > 1 && !submitted ? `${footerBase} · ←→/ctrl+p/n switch question` : footerBase;
 	return (0, import_react.createElement)(Box, {
 		flexDirection: "column",
 		width: viewport.outerColumns,
@@ -31207,10 +31979,14 @@ function ModelPanel({ directory, error, current, onSelect, onProviders, onRetry,
 			onRetry();
 			return;
 		}
-		if (input === "a" && onProviders !== void 0) {
+		if (key.tab && onProviders !== void 0) {
 			onProviders();
 			return;
 		}
+		if (key.ctrl && input === "c") {
+			onClose();
+			return;
+		}
 		if (rows.length === 0) return;
 		if (key.upArrow) {
 			setCursor(cursor > 0 ? cursor - 1 : rows.length - 1);
@@ -31238,8 +32014,11 @@ function ModelPanel({ directory, error, current, onSelect, onProviders, onRetry,
 		}
 		if (key.return && rows[cursor] !== void 0) onSelect(rows[cursor]);
 	});
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns(`/model${onProviders === void 0 ? "" : " · a providers"} · r retry · esc/q close`, viewport.contentColumns));
+	if (viewport.maxHeight === 0 || viewport.compact) {
+		const providers = onProviders === void 0 ? "" : " · tab providers";
+		const state = rows.length === 0 ? directory === void 0 && error === void 0 ? "loading…" : error !== void 0 ? "error" : "no models" : `❯ ${rows[cursor]?.modelName ?? rows[cursor]?.model ?? ""}`;
+		return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns(`/model · ${state}${providers} · r retry · esc/q close`, viewport.contentColumns));
+	}
 	const visibleStateRows = (directory === void 0 && error === void 0 ? [(0, import_react.createElement)(Text, {
 		key: "loading",
 		dimColor: true,
@@ -31282,7 +32061,7 @@ function ModelPanel({ directory, error, current, onSelect, onProviders, onRetry,
 	}), (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), (0, import_react.createElement)(Text, {
 		dimColor: true,
 		wrap: "truncate-end"
-	}, dim(truncateColumns(`↑↓ move · pgup/pgdn page · enter select${onProviders === void 0 ? "" : " · a providers"} · r retry · esc/q close`, viewport.contentColumns))));
+	}, dim(truncateColumns(`↑↓ move · pgup/pgdn page · enter select${onProviders === void 0 ? "" : " · tab providers"} · r retry · esc/q close`, viewport.contentColumns))));
 }
 /** Compact provider-state copy; only value-free credential facts cross this boundary. */
 function providerStateLabel(row) {
@@ -31296,10 +32075,13 @@ function providerStateLabel(row) {
 	return `${route} · ${row.configured ? "provider auth" : "not configured"}`;
 }
 /** The provider-management stage reached from /model with `a`. */
-function ProviderPanel({ directory, error, authorizations, authorizationError, onCredential, onConfigure, onUnset, onRemove, onLogin, onLogout, onRetry, onBack }) {
+function ProviderPanel({ directory, error, authorizations, authorizationError, onConfigure, onUnset, onRemove, onLogin, onLogout, onRetry, onBack, onExit }) {
 	const stdout = useStdout().stdout;
 	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
 	const rows = directory?.rows ?? [];
+	const sorted = [...rows].sort((left, right) => (left.configured ? 0 : 1) - (right.configured ? 0 : 1));
+	const configuredCount = sorted.filter((row) => row.configured).length;
+	const hasSeparator = configuredCount > 0 && configuredCount < sorted.length;
 	const [cursor, setCursor] = (0, import_react.useState)(0);
 	const [actionError, setActionError] = (0, import_react.useState)(void 0);
 	(0, import_react.useEffect)(() => {
@@ -31314,6 +32096,10 @@ function ProviderPanel({ directory, error, authorizations, authorizationError, o
 			onBack();
 			return;
 		}
+		if (key.ctrl && input === "c") {
+			onExit();
+			return;
+		}
 		if (input === "r") {
 			setActionError(void 0);
 			onRetry();
@@ -31340,13 +32126,8 @@ function ProviderPanel({ directory, error, authorizations, authorizationError, o
 			setCursor((current) => Math.min(rows.length - 1, current + Math.max(1, viewport.bodyRows - 1)));
 			return;
 		}
-		const target = rows[cursor];
+		const target = sorted[cursor];
 		if (target === void 0) return;
-		if (key.tab) {
-			if (target.settingsNs.length === 0) setActionError("this provider is not managed by Harness settings");
-			else onConfigure(target);
-			return;
-		}
 		if (input === "d") {
 			const facts = target.credential;
 			if (facts?.kind !== "facts" || !facts.configured) setActionError("this provider has no configured API key to remove");
@@ -31374,14 +32155,10 @@ function ProviderPanel({ directory, error, authorizations, authorizationError, o
 		}
 		if (key.return) {
 			if (target.settingsNs.length === 0) setActionError("this provider is not managed by Harness settings");
-			else if (target.credential?.kind === "error") setActionError("credential status is unavailable; retry before writing");
-			else if (target.credential?.kind === "facts" && !target.credential.writable) setActionError("this API key is supplied read-only by the environment");
-			else if (target.credentialRef === void 0 && directory?.writable !== true) setActionError("settings are read-only; this provider cannot be activated here");
-			else onCredential(target);
+			else onConfigure(target);
 		}
 	}, true);
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("/model providers · enter key · d remove key · esc back", viewport.contentColumns));
+	if (viewport.maxHeight === 0 || viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("/model providers · enter configure · d remove key · esc back", viewport.contentColumns));
 	const visibleStateRows = (directory === void 0 && error === void 0 ? [(0, import_react.createElement)(Text, {
 		key: "loading",
 		color: inkColor(getPalette().dim),
@@ -31418,8 +32195,32 @@ function ProviderPanel({ directory, error, authorizations, authorizationError, o
 		}, "  no configurable providers")] : []
 	]).slice(0, viewport.bodyRows);
 	const rowBudget = Math.max(0, viewport.bodyRows - visibleStateRows.length);
-	const first = selectionWindow(cursor, rows.length, rowBudget);
-	const visible = rowBudget === 0 ? [] : rows.slice(first, first + rowBudget);
+	const displayLength = sorted.length + (hasSeparator ? 1 : 0);
+	const first = selectionWindow(cursor + (hasSeparator && cursor >= configuredCount ? 1 : 0), displayLength, rowBudget);
+	const itemRows = [];
+	for (let display = first; display < first + rowBudget && display < displayLength; display += 1) {
+		if (hasSeparator && display === configuredCount) {
+			itemRows.push((0, import_react.createElement)(Text, {
+				key: "separator",
+				color: inkColor(getPalette().dim),
+				wrap: "truncate-end"
+			}, truncateColumns("  ── not configured ──", viewport.contentColumns)));
+			continue;
+		}
+		const index = hasSeparator && display > configuredCount ? display - 1 : display;
+		const row = sorted[index];
+		if (row === void 0) continue;
+		const identity = row.displayName === row.provider ? row.provider : row.displayName + " (" + row.provider + ")";
+		const authorization = authorizationForProvider(authorizations, row.provider);
+		const authLabel = !(row.credential?.kind === "facts" && row.credential.configured) || authorization?.record.configured === true || authorization?.inFlight === true ? " · " + providerAuthorizationStatus(authorization) : "";
+		const label = identity + " · " + providerStateLabel(row) + authLabel + (row.removable ? " · custom" : "");
+		const idleColor = row.configured ? inkColor(getPalette().brandMid) : inkColor(getPalette().dim);
+		itemRows.push((0, import_react.createElement)(Text, {
+			key: row.provider,
+			color: index === cursor ? inkColor(getPalette().brandBright) : idleColor,
+			wrap: "truncate-end"
+		}, truncateColumns((index === cursor ? "❯ " : "  ") + displayText(label), viewport.contentColumns)));
+	}
 	return (0, import_react.createElement)(Box, {
 		flexDirection: "column",
 		width: viewport.outerColumns,
@@ -31430,128 +32231,379 @@ function ProviderPanel({ directory, error, authorizations, authorizationError, o
 		color: inkColor(getPalette().brand),
 		bold: true,
 		wrap: "truncate-end"
-	}, truncateColumns(`/model — providers${rows.length === 0 ? "" : ` · ${cursor + 1}/${rows.length}`}`, viewport.contentColumns)), (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), ...visibleStateRows, ...visible.map((row) => {
-		const index = rows.indexOf(row);
-		const identity = row.displayName === row.provider ? row.provider : `${row.displayName} (${row.provider})`;
-		const authorization = authorizationForProvider(authorizations, row.provider);
-		const authLabel = !(row.credential?.kind === "facts" && row.credential.configured) || authorization?.record.configured === true || authorization?.inFlight === true ? ` · ${providerAuthorizationStatus(authorization)}` : "";
-		const label = `${identity} · ${providerStateLabel(row)}${authLabel}${row.removable ? " · custom" : ""}`;
-		return (0, import_react.createElement)(Text, {
-			key: row.provider,
-			color: index === cursor ? inkColor(getPalette().brandBright) : inkColor(getPalette().dim),
-			wrap: "truncate-end"
-		}, truncateColumns(`${index === cursor ? "❯ " : "  "}${displayText(label)}`, viewport.contentColumns));
-	}), (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), (0, import_react.createElement)(Text, {
+	}, truncateColumns(`/model — providers${rows.length === 0 ? "" : ` · ${cursor + 1}/${rows.length}`}`, viewport.contentColumns)), (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), ...visibleStateRows, ...itemRows, (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), (0, import_react.createElement)(Text, {
 		color: inkColor(getPalette().dim),
 		wrap: "truncate-end"
-	}, truncateColumns("↑↓ move · enter key · l login · o logout · tab configure · d remove key · x remove provider · r retry · esc back", viewport.contentColumns)));
+	}, truncateColumns("↑↓ move · enter configure · l login · o logout · d remove key · x remove provider · r retry · esc back", viewport.contentColumns)));
 }
-/** Provider configuration editor: only explicit models are written to settings. */
-function ProviderConfigurationPanel({ target, catalog, save, done, back }) {
+function ProviderSetupPanel({ target, save, saveCredential, discover, effortDonors, done, back, onExit }) {
 	const stdout = useStdout().stdout;
 	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
+	const [page, setPage] = (0, import_react.useState)("setup");
+	const [keyDraft, setKeyDraft] = (0, import_react.useState)("");
 	const [baseURL, setBaseURL] = (0, import_react.useState)(target.configuration.baseURL ?? "");
 	const [models, setModels] = (0, import_react.useState)(target.configuration.models);
 	const [cursor, setCursor] = (0, import_react.useState)(0);
-	const [focus, setFocus] = (0, import_react.useState)("url");
+	const [zone, setZone] = (0, import_react.useState)("key");
+	const [field, setField] = (0, import_react.useState)("none");
+	const [addDraft, setAddDraft] = (0, import_react.useState)("");
+	/** Micro-editor for the selected model's reasoningEfforts declaration. */
+	const [effEditing, setEffEditing] = (0, import_react.useState)(false);
+	const [effDraft, setEffDraft] = (0, import_react.useState)("");
+	const [donorCursor, setDonorCursor] = (0, import_react.useState)(0);
 	const [busy, setBusy] = (0, import_react.useState)(false);
 	const [error, setError] = (0, import_react.useState)(void 0);
-	const choices = (0, import_react.useMemo)(() => {
-		const known = catalog.filter((row) => row.provider === target.provider);
-		const ids = new Set(known.map((row) => row.model));
-		return [...known.map((row) => ({
-			id: row.model,
-			name: row.modelName
-		})), ...models.filter((model) => !ids.has(model.id)).map((model) => ({
-			id: model.id,
-			name: model.name ?? model.id
-		}))];
-	}, [
-		catalog,
-		models,
-		target.provider
-	]);
-	const selected = choices[cursor];
-	const selectedModel = selected === void 0 ? void 0 : models.find((model) => model.id === selected.id);
+	const credential = target.credential;
+	const keyStatus = saveCredential === void 0 ? "key storage unavailable" : credential?.kind === "error" ? "key status unavailable" : credential?.kind === "facts" && credential.configured ? "key saved" + (credential.source === void 0 ? "" : " · " + credential.source) : "no key set";
+	const keyEditable = saveCredential !== void 0 && (credential === void 0 || credential.kind === "facts" && credential.writable);
+	const onAddRow = cursor >= models.length;
+	const selected = onAddRow ? void 0 : models[cursor];
 	const updateSelected = (change) => {
 		if (selected === void 0) return;
-		setModels((current) => current.some((model) => model.id === selected.id) ? current.map((model) => model.id === selected.id ? {
+		setModels((current) => current.map((model, index) => index === cursor ? {
 			...model,
 			...change
-		} : model) : [...current, {
-			id: selected.id,
-			name: selected.name,
-			...change
-		}]);
+		} : model));
 	};
+	const commitAddDraft = () => {
+		const id = addDraft.trim();
+		if (id === "") return;
+		if (models.some((model) => model.id === id)) {
+			setError("model \"" + id + "\" is already in the list");
+			return;
+		}
+		setError(void 0);
+		setModels([...models, { id }]);
+		setCursor(models.length);
+		setAddDraft("");
+	};
+	/** Compact declaration summary for the row label: count, off, or inherit. */
+	const effortsSummary = (model) => {
+		const raw = model.extras?.reasoningEfforts;
+		if (raw === false) return "off";
+		if (isDeclaredReasoningEfforts(raw)) return String(Object.keys(raw).length);
+		return "~";
+	};
+	/** Write (or clear) the selected model's declaration through extras. */
+	const applyDeclaration = (value) => {
+		setModels((current) => current.map((model, index) => {
+			if (index !== cursor) return model;
+			const extras = { ...model.extras };
+			if (value === void 0) delete extras.reasoningEfforts;
+			else extras.reasoningEfforts = value;
+			return {
+				...model,
+				...Object.keys(extras).length === 0 ? {} : { extras }
+			};
+		}));
+	};
+	/** Donors excluding the row being edited (copying from itself is a no-op). */
+	const donorRows = selected === void 0 ? [] : effortDonors.filter((donor) => !(donor.provider === target.provider && donor.id === selected.id));
+	const donorIndex = Math.min(donorCursor, Math.max(0, donorRows.length - 1));
+	const donorRow = donorRows[donorIndex];
 	const submit = () => {
 		if (busy) return;
+		const key = keyDraft.trim();
+		if (key !== "" && !keyEditable) {
+			setError("this API key cannot be written here (read-only or status unavailable); clear the key field to save the endpoint and models alone");
+			return;
+		}
 		setBusy(true);
 		setError(void 0);
-		Promise.resolve().then(() => save(target, {
-			...baseURL.trim() === "" ? {} : { baseURL },
-			models
-		})).then(done, (reason) => {
+		const keySave = key !== "" ? saveCredential : void 0;
+		(async () => {
+			if (keySave !== void 0) await keySave(target, key);
+			await save(target, {
+				...baseURL.trim() === "" ? {} : { baseURL },
+				models
+			});
+			return keySave !== void 0;
+		})().then((keySaved) => done({ key: keySaved }), (reason) => {
 			setBusy(false);
 			setError(singleLineText(reason instanceof Error ? reason.message : String(reason)));
 		});
 	};
 	useStableInput((input, key) => {
 		if (busy) return;
+		if (key.ctrl && input === "c") {
+			onExit();
+			return;
+		}
+		if (effEditing) {
+			if (key.escape) {
+				setEffEditing(false);
+				setEffDraft("");
+				return;
+			}
+			if (key.return) {
+				const parsed = parseReasoningEffortsDraft(effDraft);
+				if (!parsed.ok) {
+					setError(parsed.error);
+					return;
+				}
+				setError(void 0);
+				applyDeclaration(parsed.value);
+				setEffEditing(false);
+				setEffDraft("");
+				return;
+			}
+			if (key.backspace || key.delete) {
+				setError(void 0);
+				setEffDraft((current) => deleteLastGrapheme(current));
+				return;
+			}
+			if (key.ctrl && input === "u") {
+				setError(void 0);
+				setEffDraft("");
+				return;
+			}
+			if (key.ctrl || key.meta || input.length === 0) return;
+			if (effDraft.length > 200) {
+				setError("efforts draft is too long");
+				return;
+			}
+			setError(void 0);
+			setEffDraft((current) => current + stripPasteMarkers(input));
+			return;
+		}
+		if (page === "donor") {
+			if (key.escape || input === "q") {
+				setPage("setup");
+				return;
+			}
+			if (donorRows.length === 0) return;
+			if (key.upArrow) {
+				setDonorCursor((current) => current > 0 ? current - 1 : donorRows.length - 1);
+				return;
+			}
+			if (key.downArrow) {
+				setDonorCursor((current) => current < donorRows.length - 1 ? current + 1 : 0);
+				return;
+			}
+			if (key.return && donorRow !== void 0) {
+				applyDeclaration(donorRow.efforts);
+				setError(void 0);
+				setPage("setup");
+			}
+			return;
+		}
 		if (key.escape || input === "q") {
 			back();
 			return;
 		}
 		if (key.tab) {
-			setFocus((current) => current === "url" ? "models" : current === "models" ? "context" : current === "context" ? "output" : "url");
+			setPage("discover");
 			return;
 		}
 		if (key.return) {
 			submit();
 			return;
 		}
-		if (focus === "url") {
+		if (zone === "key") {
+			if (key.downArrow) {
+				setZone("url");
+				return;
+			}
+			if (key.backspace || key.delete) {
+				setError(void 0);
+				setKeyDraft((current) => [...current].slice(0, -1).join(""));
+				return;
+			}
+			if (key.ctrl && input === "u") {
+				setError(void 0);
+				setKeyDraft("");
+				return;
+			}
+			if (key.ctrl || key.meta || input.length === 0) return;
+			const next = keyDraft + stripPasteMarkers(input);
+			if (next.length > 4096) {
+				setError("API key input is too long");
+				return;
+			}
+			setError(void 0);
+			setKeyDraft(next);
+			return;
+		}
+		if (zone === "url") {
+			if (key.upArrow) {
+				setZone("key");
+				return;
+			}
+			if (key.downArrow) {
+				setZone("models");
+				return;
+			}
 			if (key.backspace || key.delete) setBaseURL((current) => deleteLastGrapheme(current));
 			else if (!key.ctrl && !key.meta && input !== "") setBaseURL((current) => current + stripPasteMarkers(input));
 			return;
 		}
-		if (key.upArrow && choices.length > 0) {
-			setCursor((current) => Math.max(0, current - 1));
+		if (key.upArrow) {
+			setError(void 0);
+			if (cursor === 0) setZone("url");
+			else {
+				setCursor((current) => current - 1);
+				setField("none");
+			}
 			return;
 		}
-		if (key.downArrow && choices.length > 0) {
-			setCursor((current) => Math.min(choices.length - 1, current + 1));
+		if (key.downArrow) {
+			setError(void 0);
+			if (!onAddRow) {
+				setCursor((current) => current + 1);
+				setField("none");
+			}
 			return;
 		}
-		if (focus === "models" && input === " ") {
-			if (selectedModel === void 0) updateSelected({});
-			else setModels((current) => current.filter((model) => model.id !== selectedModel.id));
+		if (key.leftArrow || key.rightArrow) {
+			if (selected === void 0) return;
+			const cycle = key.rightArrow ? (current) => current === "none" ? "ctx" : current === "ctx" ? "out" : "none" : (current) => current === "none" ? "out" : current === "out" ? "ctx" : "none";
+			setField((current) => cycle(current));
 			return;
 		}
-		if ((focus === "context" || focus === "output") && selectedModel !== void 0) {
-			const field = focus === "context" ? "contextWindow" : "maxTokens";
-			const current = String(selectedModel[field] ?? "");
+		if (input === " ") {
+			if (selected === void 0) commitAddDraft();
+			else {
+				setError(void 0);
+				setField("none");
+				setModels((current) => current.filter((_model, index) => index !== cursor));
+				setCursor((current) => Math.min(current, Math.max(0, models.length - 1)));
+			}
+			return;
+		}
+		if (onAddRow) {
+			if (key.backspace || key.delete) {
+				setError(void 0);
+				setAddDraft((current) => deleteLastGrapheme(current));
+				return;
+			}
+			if (key.ctrl || key.meta || input.length === 0) return;
+			setError(void 0);
+			setAddDraft((current) => current + stripPasteMarkers(input));
+			return;
+		}
+		if (input === "e" && selected !== void 0) {
+			setError(void 0);
+			setEffDraft(serializeReasoningEfforts(selected.extras?.reasoningEfforts));
+			setEffEditing(true);
+			return;
+		}
+		if ((input === "c" || input === "C") && !key.ctrl && selected !== void 0) {
+			setError(void 0);
+			setDonorCursor(0);
+			setPage("donor");
+			return;
+		}
+		if (field !== "none" && selected !== void 0) {
+			const name = field === "ctx" ? "contextWindow" : "maxTokens";
+			const current = String(selected[name] ?? "");
 			if (key.backspace || key.delete) {
 				const next = current.slice(0, -1);
-				updateSelected({ [field]: next === "" ? void 0 : Number(next) });
+				updateSelected({ [name]: next === "" ? void 0 : Number(next) });
 			} else {
 				const digits = stripPasteMarkers(input);
-				if (/^[0-9]+$/u.test(digits)) {
-					const next = `${current}${digits}`;
-					updateSelected({ [field]: Number(next) });
-				}
+				if (/^[0-9]+$/u.test(digits)) updateSelected({ [name]: Number(current + digits) });
 			}
 		}
-	}, true);
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
+	}, page !== "discover");
+	if (viewport.maxHeight === 0 || viewport.bodyRows < 3) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("provider setup · terminal too small · esc back", viewport.contentColumns));
+	if (page === "donor") {
+		const stateRow = donorRows.length === 0 ? (0, import_react.createElement)(Text, {
+			key: "empty",
+			color: inkColor(getPalette().dim),
+			wrap: "truncate-end"
+		}, truncateColumns("  no model with declared efforts yet; declare one with e, or hand-write settings", viewport.contentColumns)) : (0, import_react.createElement)(Text, {
+			key: "hint",
+			color: inkColor(getPalette().dim),
+			wrap: "truncate-end"
+		}, truncateColumns("  copy verbatim into " + displayText(selected?.id ?? ""), viewport.contentColumns));
+		const donorBudget = Math.max(0, viewport.bodyRows - 2);
+		const donorFirst = selectionWindow(donorIndex, donorRows.length, donorBudget);
+		const donorVisible = donorRows.slice(donorFirst, donorFirst + donorBudget);
+		return (0, import_react.createElement)(Box, {
+			flexDirection: "column",
+			width: viewport.outerColumns,
+			paddingX: 1,
+			borderStyle: "round",
+			borderColor: inkColor(getPalette().brand)
+		}, (0, import_react.createElement)(Text, {
+			color: inkColor(getPalette().brand),
+			bold: true,
+			wrap: "truncate-end"
+		}, truncateColumns("/model — copy efforts", viewport.contentColumns)), (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), stateRow, ...donorVisible.map((donor, index) => {
+			const active = donorFirst + index === donorIndex;
+			const label = (active ? ">" : " ") + " " + donor.provider + "/" + displayText(donor.id) + " · " + serializeReasoningEfforts(donor.efforts);
+			return (0, import_react.createElement)(Text, {
+				key: donor.provider + "/" + donor.id,
+				color: active ? inkColor(getPalette().brandBright) : inkColor(getPalette().text),
+				wrap: "truncate-end"
+			}, truncateColumns(label, viewport.contentColumns));
+		}), (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), (0, import_react.createElement)(Text, {
+			color: inkColor(getPalette().dim),
+			wrap: "truncate-end"
+		}, truncateColumns("↑↓ move · enter copy · esc back", viewport.contentColumns)));
+	}
+	if (page === "discover") return (0, import_react.createElement)(ProviderDiscoveryPanel, {
+		target,
+		baseURL,
+		apiKey: keyDraft,
+		configured: models.map((model) => model.id),
+		discover,
+		onAdopt: (adopted) => {
+			const existing = new Set(models.map((model) => model.id));
+			const fresh = adopted.filter((model) => !existing.has(model.id));
+			if (fresh.length > 0) {
+				setModels([...models, ...fresh.map((model) => ({
+					id: model.id,
+					...model.name === void 0 ? {} : { name: model.name },
+					...model.contextWindow === void 0 ? {} : { contextWindow: model.contextWindow },
+					...model.maxTokens === void 0 ? {} : { maxTokens: model.maxTokens }
+				}))]);
+				setCursor(models.length);
+			}
+			setPage("setup");
+		},
+		back: () => setPage("setup"),
+		onExit
+	});
 	const stateRows = error === void 0 ? [] : [(0, import_react.createElement)(Text, {
 		key: "error",
 		color: inkColor(getPalette().error),
 		wrap: "truncate-end"
-	}, truncateColumns(`  ${error}`, viewport.contentColumns))];
-	const rowBudget = Math.max(0, viewport.bodyRows - stateRows.length - 1);
-	const first = selectionWindow(cursor, choices.length, rowBudget);
-	const visible = choices.slice(first, first + rowBudget);
+	}, truncateColumns("  " + error, viewport.contentColumns))];
+	const keyBullets = "•".repeat(Math.min([...keyDraft].length, Math.max(1, viewport.contentColumns - 14)));
+	const keyRow = (0, import_react.createElement)(Text, {
+		key: "key",
+		color: zone === "key" ? inkColor(getPalette().brandBright) : inkColor(getPalette().dim),
+		wrap: "truncate-end"
+	}, truncateColumns(("  " + (zone === "key" ? ">" : " ") + " key   " + keyBullets + (zone === "key" && !busy ? "▏" : "") + (keyDraft === "" ? " (" + keyStatus + ")" : busy ? " saving…" : "")).replace(/ +$/u, ""), viewport.contentColumns));
+	const urlRow = (0, import_react.createElement)(Text, {
+		key: "url",
+		color: zone === "url" ? inkColor(getPalette().brandBright) : inkColor(getPalette().dim),
+		wrap: "truncate-end"
+	}, truncateColumns("  " + (zone === "url" ? ">" : " ") + " url   " + (baseURL === "" ? "(official default)" : baseURL) + (zone === "url" ? "▏" : ""), viewport.contentColumns));
+	const rowBudget = Math.max(0, viewport.bodyRows - stateRows.length - 3);
+	const first = selectionWindow(cursor, models.length + 1, rowBudget);
+	const modelRows = [];
+	for (let index = first; index < first + Math.max(0, Math.min(models.length + 1 - first, rowBudget)); index += 1) {
+		if (index >= models.length) {
+			modelRows.push((0, import_react.createElement)(Text, {
+				key: "add",
+				color: cursor === index ? inkColor(getPalette().brandBright) : inkColor(getPalette().dim),
+				wrap: "truncate-end"
+			}, truncateColumns("  " + (cursor === index ? ">" : " ") + " + add by id" + (addDraft === "" ? "" : " " + addDraft + "▏"), viewport.contentColumns)));
+			continue;
+		}
+		const model = models[index];
+		const active = index === cursor;
+		const context = model.contextWindow === void 0 ? "-" : String(model.contextWindow);
+		const output = model.maxTokens === void 0 ? "-" : String(model.maxTokens);
+		const tail = active && effEditing ? "  eff:" + effDraft + "▏" : "  in:" + (active && field === "ctx" ? "[" + context + "]" : context) + " out:" + (active && field === "out" ? "[" + output + "]" : output) + " eff:" + effortsSummary(model);
+		modelRows.push((0, import_react.createElement)(Text, {
+			key: model.id,
+			color: active ? inkColor(getPalette().brandBright) : inkColor(getPalette().success),
+			wrap: "truncate-end"
+		}, truncateColumns("  " + (active ? ">" : " ") + " [x] " + displayText(model.id) + tail, viewport.contentColumns)));
+	}
 	return (0, import_react.createElement)(Box, {
 		flexDirection: "column",
 		width: viewport.outerColumns,
@@ -31562,104 +32614,110 @@ function ProviderConfigurationPanel({ target, catalog, save, done, back }) {
 		color: inkColor(getPalette().brand),
 		bold: true,
 		wrap: "truncate-end"
-	}, truncateColumns(`/model - ${target.displayName} configuration`, viewport.contentColumns)), (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), (0, import_react.createElement)(Text, {
-		color: focus === "url" ? inkColor(getPalette().brandBright) : inkColor(getPalette().dim),
-		wrap: "truncate-end"
-	}, truncateColumns(`  ${focus === "url" ? ">" : " "} endpoint: ${baseURL === "" ? "(adapter default)" : baseURL}`, viewport.contentColumns)), ...stateRows, ...visible.map((choice, index) => {
-		const absolute = first + index;
-		const model = models.find((item) => item.id === choice.id);
-		const selectedMark = model === void 0 ? "[ ]" : "[x]";
-		const context = model?.contextWindow === void 0 ? "-" : String(model.contextWindow);
-		const output = model?.maxTokens === void 0 ? "-" : String(model.maxTokens);
-		const active = absolute === cursor && focus !== "url";
-		return (0, import_react.createElement)(Text, {
-			key: choice.id,
-			color: active ? inkColor(getPalette().brandBright) : model === void 0 ? inkColor(getPalette().dim) : inkColor(getPalette().success),
-			wrap: "truncate-end"
-		}, truncateColumns(`${active ? ">" : " "} ${selectedMark} ${choice.name}  in:${context} out:${output}`, viewport.contentColumns));
-	}), (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), (0, import_react.createElement)(Text, {
+	}, truncateColumns("/model — configure " + target.displayName, viewport.contentColumns)), (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), keyRow, urlRow, ...stateRows, ...modelRows, (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), (0, import_react.createElement)(Text, {
 		color: inkColor(getPalette().dim),
 		wrap: "truncate-end"
-	}, truncateColumns("tab endpoint/models/input/output - space select - arrows model - digits set window - enter save - esc back", viewport.contentColumns)));
+	}, truncateColumns("↑↓ move · ←→ in/out · space remove · e efforts · c copy efforts · tab discover · enter save · esc back", viewport.contentColumns)));
 }
-/** Write-only masked API-key editor; the secret lives only in this mounted component. */
-function ProviderCredentialPanel({ target, save, done, back }) {
+/**
+* The discovery stage of the provider setup page: interrogates the endpoint
+* the drafts describe (typed key wins over the stored credential) and offers
+* the advertised models as a checkable list. Already-configured ids render
+* verified but untoggleable; Enter adopts every checked model back into the
+* setup page's list — selective adoption, never a bulk import.
+*/
+function ProviderDiscoveryPanel({ target, baseURL, apiKey, configured, discover, onAdopt, back, onExit }) {
 	const stdout = useStdout().stdout;
 	const viewport = panelViewport(stdout?.columns ?? 80, stdout?.rows ?? 30);
-	const [draft, setDraft] = (0, import_react.useState)("");
-	const [busy, setBusy] = (0, import_react.useState)(false);
+	const [epoch, setEpoch] = (0, import_react.useState)(0);
+	const [loading, setLoading] = (0, import_react.useState)(true);
 	const [error, setError] = (0, import_react.useState)(void 0);
-	const submit = () => {
-		if (busy) return;
-		setBusy(true);
+	const [rows, setRows] = (0, import_react.useState)([]);
+	const [checked, setChecked] = (0, import_react.useState)(/* @__PURE__ */ new Set());
+	const [cursor, setCursor] = (0, import_react.useState)(0);
+	(0, import_react.useEffect)(() => {
+		const controller = new AbortController();
+		setLoading(true);
 		setError(void 0);
-		Promise.resolve().then(() => save(target, draft)).then(() => {
-			setDraft("");
-			done();
+		discover(target, {
+			...baseURL.trim() === "" ? {} : { baseURL: baseURL.trim() },
+			...apiKey.trim() === "" ? {} : { apiKey: apiKey.trim() }
+		}, controller.signal).then((discovered) => {
+			if (controller.signal.aborted) return;
+			setRows(discovered);
+			const alreadyKnown = new Set(configured);
+			const firstNew = discovered.findIndex((model) => !alreadyKnown.has(model.id));
+			setCursor(firstNew < 0 ? 0 : firstNew);
+			setLoading(false);
 		}, (reason) => {
+			if (controller.signal.aborted) return;
 			setError(singleLineText(reason instanceof Error ? reason.message : String(reason)));
-			setBusy(false);
+			setLoading(false);
 		});
-	};
+		return () => {
+			controller.abort();
+		};
+	}, [epoch]);
+	const known = new Set(configured);
 	useStableInput((input, key) => {
-		if (busy) return;
-		if (key.escape) {
-			setDraft("");
+		if (key.escape || input === "q") {
 			back();
 			return;
 		}
-		if (key.return) {
-			submit();
+		if (key.ctrl && input === "c") {
+			onExit();
 			return;
 		}
-		if (key.backspace || key.delete) {
-			setError(void 0);
-			setDraft((current) => [...current].slice(0, -1).join(""));
+		if (input === "f") {
+			setChecked(/* @__PURE__ */ new Set());
+			setEpoch((current) => current + 1);
 			return;
 		}
-		if (key.ctrl && input === "u") {
-			setError(void 0);
-			setDraft("");
+		if (loading || error !== void 0) return;
+		if (rows.length === 0) return;
+		if (key.upArrow) {
+			setCursor((current) => current > 0 ? current - 1 : rows.length - 1);
 			return;
 		}
-		if (key.ctrl || key.meta || input.length === 0) return;
-		const next = draft + stripPasteMarkers(input);
-		if (next.length > 4096) {
-			setError("API key input is too long");
+		if (key.downArrow) {
+			setCursor((current) => current < rows.length - 1 ? current + 1 : 0);
 			return;
 		}
-		setError(void 0);
-		setDraft(next);
+		const row = rows[cursor];
+		if (row === void 0) return;
+		if (input === " ") {
+			if (known.has(row.id)) return;
+			setChecked((current) => {
+				const next = new Set(current);
+				if (next.has(row.id)) next.delete(row.id);
+				else next.add(row.id);
+				return next;
+			});
+			return;
+		}
+		if (key.return) onAdopt(rows.filter((model) => checked.has(model.id)));
 	}, true);
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
-	const keyBudget = Math.max(1, viewport.contentColumns - 4);
-	const bullets = "•".repeat(Math.min([...draft].length, keyBudget));
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns(`API key ${bullets}${busy ? " saving…" : " ▏"} · esc back`, viewport.contentColumns));
-	const identity = target.displayName === target.provider ? target.provider : `${target.displayName} (${target.provider})`;
-	const source = target.credential?.kind === "facts" && target.credential.configured ? `replaces ${singleLineText(target.credential.source ?? "stored key")}` : "new key";
-	const providerRow = (0, import_react.createElement)(Text, {
-		key: "provider",
-		wrap: "truncate-end"
-	}, truncateColumns(`  provider  ${displayText(identity)}`, viewport.contentColumns));
-	const referenceRow = (0, import_react.createElement)(Text, {
-		key: "reference",
+	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("model discovery · terminal too small · esc back", viewport.contentColumns));
+	const stateRows = loading ? [(0, import_react.createElement)(Text, {
+		key: "loading",
 		color: inkColor(getPalette().dim),
 		wrap: "truncate-end"
-	}, truncateColumns(`  reference ${displayText(target.credentialRef ?? target.suggestedRef)} · ${source}`, viewport.contentColumns));
-	const keyRow = (0, import_react.createElement)(Text, {
-		key: "key",
-		color: error === void 0 ? inkColor(getPalette().brandBright) : inkColor(getPalette().error),
-		wrap: "truncate-end"
-	}, truncateColumns(`  key       ${bullets}${busy ? " saving…" : " ▏"}`, viewport.contentColumns));
-	const errorRow = error === void 0 ? void 0 : (0, import_react.createElement)(Text, {
+	}, truncateColumns("  discovering models…", viewport.contentColumns))] : error !== void 0 ? [(0, import_react.createElement)(Text, {
 		key: "error",
 		color: inkColor(getPalette().error),
 		wrap: "truncate-end"
-	}, truncateColumns(`  ${error}`, viewport.contentColumns));
-	const detailRows = errorRow === void 0 ? [providerRow, referenceRow] : [providerRow, errorRow];
-	const primaryRow = viewport.bodyRows === 1 && errorRow !== void 0 ? errorRow : keyRow;
-	const detailBudget = Math.max(0, viewport.bodyRows - 1);
-	const bodyRows = [...detailBudget === 0 ? [] : detailRows.slice(-detailBudget), ...viewport.bodyRows === 0 ? [] : [primaryRow]];
+	}, truncateColumns("  " + error, viewport.contentColumns))] : rows.length === 0 ? [(0, import_react.createElement)(Text, {
+		key: "empty",
+		color: inkColor(getPalette().dim),
+		wrap: "truncate-end"
+	}, truncateColumns("  the endpoint advertised no models; add ids by hand on the setup page", viewport.contentColumns))] : [(0, import_react.createElement)(Text, {
+		key: "summary",
+		color: inkColor(getPalette().dim),
+		wrap: "truncate-end"
+	}, truncateColumns("  " + rows.length + " advertised · " + rows.filter((model) => !known.has(model.id)).length + " new · " + checked.size + " checked", viewport.contentColumns))];
+	const rowBudget = Math.max(0, viewport.bodyRows - stateRows.length - 1);
+	const first = selectionWindow(cursor, rows.length, rowBudget);
+	const visible = rows.slice(first, first + rowBudget);
 	return (0, import_react.createElement)(Box, {
 		flexDirection: "column",
 		width: viewport.outerColumns,
@@ -31670,10 +32728,20 @@ function ProviderCredentialPanel({ target, save, done, back }) {
 		color: inkColor(getPalette().brand),
 		bold: true,
 		wrap: "truncate-end"
-	}, truncateColumns("/model — add API key", viewport.contentColumns)), (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), ...bodyRows, (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), (0, import_react.createElement)(Text, {
+	}, truncateColumns("/model — discover " + target.displayName, viewport.contentColumns)), (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), ...stateRows, ...visible.map((model, index) => {
+		const active = first + index === cursor;
+		const added = known.has(model.id);
+		const mark = added ? "✓" : checked.has(model.id) ? "☑" : "☐";
+		const label = (active ? ">" : " ") + " " + mark + " " + displayText(model.id) + (model.name === void 0 || model.name === model.id ? "" : " · " + displayText(model.name));
+		return (0, import_react.createElement)(Text, {
+			key: model.id,
+			color: added ? inkColor(getPalette().dim) : active ? inkColor(getPalette().brandBright) : inkColor(getPalette().text),
+			wrap: "truncate-end"
+		}, truncateColumns(label, viewport.contentColumns));
+	}), (0, import_react.createElement)(PanelGap, { visible: viewport.gapRows > 0 }), (0, import_react.createElement)(Text, {
 		color: inkColor(getPalette().dim),
 		wrap: "truncate-end"
-	}, truncateColumns("type or paste key · enter save · ctrl+u clear · esc back", viewport.contentColumns)));
+	}, truncateColumns("↑↓ move · space check · enter adopt · f refetch · esc back", viewport.contentColumns)));
 }
 /** Bounded destructive-action confirmation for credential or provider removal. */
 function ProviderConfirmPanel({ target, kind, confirm, done, back }) {
@@ -31698,9 +32766,8 @@ function ProviderConfirmPanel({ target, kind, confirm, done, back }) {
 		}
 		if (input === "y") run();
 	}, true);
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
 	const action = kind === "credential" ? "remove API key" : "remove provider";
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns(`${action} ${target.displayName}? · y confirm · n/esc back`, viewport.contentColumns));
+	if (viewport.maxHeight === 0 || viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns(`${action} ${target.displayName}? · y confirm · n/esc back`, viewport.contentColumns));
 	const identity = target.displayName === target.provider ? target.provider : `${target.displayName} (${target.provider})`;
 	const identityRow = (0, import_react.createElement)(Text, {
 		key: "identity",
@@ -31835,8 +32902,7 @@ function HelpPanel({ descriptors, skills, commandError, skillError, onClose }) {
 		else if (input === "g") setScroll(0);
 		else if (input === "G") setScroll(Math.max(0, content.length - viewport.bodyRows));
 	});
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("/help · esc/q close", viewport.contentColumns));
+	if (viewport.maxHeight === 0 || viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("/help · esc/q close", viewport.contentColumns));
 	return (0, import_react.createElement)(Box, {
 		flexDirection: "column",
 		width: viewport.outerColumns,
@@ -31975,8 +33041,7 @@ function VerbosePanel({ entries, onClose }) {
 		}
 		if (input === "G") setScroll(Math.max(0, allLines.length - viewport.bodyRows));
 	});
-	if (viewport.maxHeight === 0) return (0, import_react.createElement)(Box, { display: "none" });
-	if (viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("history details · ctrl+o / esc / q close", viewport.contentColumns));
+	if (viewport.maxHeight === 0 || viewport.compact) return (0, import_react.createElement)(Text, { wrap: "truncate-end" }, truncateColumns("history details · ctrl+o / esc / q close", viewport.contentColumns));
 	const title = entries.length === 0 ? "history details · empty" : `history details · entry ${cursor + 1}/${entries.length} · lines ${allLines.length === 0 ? 0 : visibleScroll + 1}-${Math.min(allLines.length, visibleScroll + viewport.bodyRows)}/${allLines.length}`;
 	const visible = allLines.slice(visibleScroll, visibleScroll + viewport.bodyRows);
 	return (0, import_react.createElement)(Box, {
@@ -32052,6 +33117,31 @@ function completionCandidates(value, descriptors, skills) {
 	return all.filter((candidate) => candidate.label.slice(1).startsWith(prefix));
 }
 /**
+* Shared completion-menu geometry: the menu view and the App's dynamic-row
+* budget MUST derive the exact same physical height, or an open menu silently
+* overflows the terminal during streaming (the cursor creeps past the top and
+* the live region freezes). One helper, two consumers — never drift.
+*/
+function completionMenuMetrics(terminalRows) {
+	const showFooter = terminalRows >= 12;
+	const verticalPadding = terminalRows >= 14 ? 1 : 0;
+	return {
+		limit: Math.max(1, Math.min(6, terminalRows - (showFooter ? 11 : 10) - verticalPadding * 2)),
+		showFooter,
+		verticalPadding
+	};
+}
+/**
+* The menu's total physical row count at this terminal height: visible
+* candidates (or the single "searching…" row), the overflow marker, the
+* footer, and both padding rows.
+*/
+function completionMenuRowCount(terminalRows, rowCount) {
+	const { limit, showFooter, verticalPadding } = completionMenuMetrics(terminalRows);
+	const visible = rowCount === 0 ? 1 : Math.min(rowCount, limit);
+	return visible + ((rowCount === 0 ? 0 : rowCount - visible) > 0 ? 1 : 0) + (showFooter ? 1 : 0) + verticalPadding * 2;
+}
+/**
 * The completion menu, rendered inside the composer's subtree directly above
 * the composer band — attached the way Claude-Code anchors its dropdown. Opening
 * it grows the stack downward: the composer stays the last element on screen
@@ -32060,7 +33150,7 @@ function completionCandidates(value, descriptors, skills) {
 * editor's live completion state, so no cross-component effect ever resyncs
 * it (a state lift here previously deadlocked the menu after a resize).
 */
-function CompletionMenu({ active, mention, index, rows }) {
+function CompletionMenu({ active, mention, index, rows, error }) {
 	const stdout = useStdout().stdout;
 	const columns = stdout?.columns ?? 80;
 	const terminalRows = stdout?.rows ?? 30;
@@ -32068,9 +33158,7 @@ function CompletionMenu({ active, mention, index, rows }) {
 	const contentColumns = Math.max(1, columns - 4);
 	const nameWidth = mention ? Math.max(1, contentColumns - 2) : 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 verticalPadding = terminalRows >= 14 ? 1 : 0;
-	const limit = Math.max(1, Math.min(6, terminalRows - (showFooter ? 11 : 10) - verticalPadding * 2));
+	const { limit, showFooter, verticalPadding } = completionMenuMetrics(terminalRows);
 	const selected = rows.length === 0 ? 0 : index % rows.length;
 	const first = selectionWindow(selected, rows.length, limit);
 	const visible = rows.slice(first, first + limit);
@@ -32079,10 +33167,14 @@ function CompletionMenu({ active, mention, index, rows }) {
 		flexDirection: "column",
 		marginLeft: 2,
 		paddingY: verticalPadding
-	}, ...rows.length === 0 ? [(0, import_react.createElement)(Text, {
+	}, ...rows.length === 0 ? [error === void 0 ? (0, import_react.createElement)(Text, {
 		key: "loading",
 		dimColor: true
-	}, "searching…")] : visible.map((candidate, at) => {
+	}, "searching…") : (0, import_react.createElement)(Text, {
+		key: "error",
+		color: inkColor(getPalette().error),
+		wrap: "truncate-end"
+	}, truncateColumns(`workspace search unavailable: ${singleLineText(error)} · keep typing to retry`, contentColumns))] : visible.map((candidate, at) => {
 		const absolute = first + at;
 		return (0, import_react.createElement)(Text, {
 			key: candidate.label,
@@ -32104,8 +33196,9 @@ 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, openEffort, openHelp, openMode, openPermission, openResume, openPlugin, openJobs, openStatusline, openTheme, openHistory, openAgents, openSubagent, openTodos, openDelete, openDiff, reviewChanges, deleteConfirm, confirmDelete, cancelDelete, createSession, forkSession, cancelSessionSwitch, notify, applyEditorKeys, hasNotice, dismissNotice, toggleReasoning, openVerbose, clearView, refresh, loadMentions, inspectImages, prepareImages, cyclePermission, exportTranscript, renameTitle, copyLastResponse, recallSpace, recordLocal, recordHistory, queued, cancelQueued, historyFill, historyConsumed, waveTier, waveStyle, maxRows, onEditorRows }) {
+function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, interrupt, quit, openModel, openEffort, openHelp, openMode, openPermission, openResume, openPlugin, openJobs, openStatusline, openTheme, openHistory, openAgents, openSubagent, openTodos, openDelete, openDiff, reviewChanges, deleteConfirm, confirmDelete, cancelDelete, createSession, forkSession, cancelSessionSwitch, notify, applyEditorKeys, hasNotice, dismissNotice, toggleReasoning, openVerbose, clearView, refresh, loadMentions, inspectImages, prepareImages, cyclePermission, exportTranscript, renameTitle, copyLastResponse, recallSpace, recordLocal, recordHistory, queued, cancelQueued, historyFill, historyConsumed, waveTier, waveStyle, maxRows, onEditorRows, onMenuRows }) {
 	const columns = useStdout().stdout?.columns ?? 80;
+	const inputTerminalRows = useStdout().stdout?.rows ?? 30;
 	const editorColumns = Math.max(1, columns - 6);
 	const stdin = useStdin().stdin;
 	const focusReporting = isVsCodeTerminalEnv();
@@ -32210,6 +33303,8 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 	};
 	const mentionActive = mentionToken !== void 0;
 	const [mentionRows, setMentionRows] = (0, import_react.useState)([]);
+	/** Latest mention-discovery failure; shown in the menu instead of an empty list. */
+	const [mentionError, setMentionError] = (0, import_react.useState)(void 0);
 	const mentionRequestRef = (0, import_react.useRef)(0);
 	const sameImagePath = (left, right) => process.platform === "win32" ? left.toLowerCase() === right.toLowerCase() : left === right;
 	const uniqueImageMarker = (name, source, reserved = []) => {
@@ -32286,14 +33381,21 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 		mentionRequestRef.current = requestId;
 		if (!active || !mentionActive) {
 			setMentionRows([]);
+			setMentionError(void 0);
 			return;
 		}
+		setMentionError(void 0);
 		const controller = new AbortController();
 		const query = mentionToken.query;
 		const timer = setTimeout(() => {
 			loadMentions(query, controller.signal).then((rows) => {
 				if (!controller.signal.aborted && mentionRequestRef.current === requestId) setMentionRows(rows);
-			}, () => {});
+			}, (reason) => {
+				if (!controller.signal.aborted && mentionRequestRef.current === requestId) {
+					setMentionRows([]);
+					setMentionError(reason instanceof Error ? reason.message : String(reason));
+				}
+			});
 		}, 50);
 		return () => {
 			clearTimeout(timer);
@@ -32311,6 +33413,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 		description: row.description,
 		origin: "mention"
 	})) : candidates;
+	const menuHeightRows = menuActive ? completionMenuRowCount(inputTerminalRows, menuRows.length) : 0;
 	/** Accept the highlighted completion-menu candidate into the draft. */
 	const acceptMenuCandidate = () => {
 		if (mentionActive && mentionToken !== void 0) {
@@ -32545,8 +33648,10 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 			return;
 		}
 		if (key.delete && liveValue === "" && queued.length > 0) {
-			cancelQueued(queued[queued.length - 1].messageId);
-			return;
+			if (rawEditorTokens.current?.some((token) => token.kind === "delete-forward" || token.kind === "delete-word-forward") === true) {
+				cancelQueued(queued[queued.length - 1].messageId);
+				return;
+			}
 		}
 		if (key.return) {
 			if (pasteBracketRef.current) {
@@ -32559,7 +33664,8 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 					return;
 				}
 			}
-			const text = liveValue.trim();
+			const trimmed = liveValue.trim();
+			const text = submissionPayload(liveValue);
 			if (draftImagesRef.current.length > 0) {
 				const controller = new AbortController();
 				const epoch = prepareEpochRef.current + 1;
@@ -32581,7 +33687,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 					setCompletionIndex(0);
 					setDismissedMenuValue(void 0);
 					dismissNotice();
-					if (text !== "") {
+					if (trimmed !== "") {
 						recordLocal(text);
 						recordHistory(text);
 					}
@@ -32603,7 +33709,7 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 			resetCursorBlink();
 			setCompletionIndex(0);
 			setDismissedMenuValue(void 0);
-			if (text === "") return;
+			if (trimmed === "") return;
 			dismissNotice();
 			if (!text.startsWith("/")) {
 				recordLocal(text);
@@ -32898,6 +34004,10 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 	(0, import_react.useEffect)(() => {
 		onEditorRows(editorRowCount);
 	}, [editorRowCount, onEditorRows]);
+	(0, import_react.useEffect)(() => {
+		onMenuRows(menuHeightRows);
+		return () => onMenuRows(0);
+	}, [menuHeightRows, onMenuRows]);
 	const bandWidth = Math.max(1, columns - 1);
 	const bandBg = inkColor(getPalette().composerBand);
 	const bandFill = (consumed) => " ".repeat(Math.max(0, bandWidth - consumed));
@@ -32932,7 +34042,8 @@ function Input({ active, frozen, busy, descriptors, skills, dispatch, steer, int
 		active: menuActive,
 		mention: mentionActive,
 		index: completionIndex,
-		rows: menuRows
+		rows: menuRows,
+		error: mentionActive ? mentionError : void 0
 	});
 	const editorRows = [];
 	for (let index = editorWindowStart; index < Math.min(editorViewModel.rows.length, editorWindowStart + editorWindowRows); index += 1) {
@@ -33206,6 +34317,7 @@ function computeSettledRows(previous, entries, settled, showReasoning, resumed,
 /** The whole terminal app; state arrives via the store, output via Ink. */
 function App(props) {
 	const view = (0, import_react.useSyncExternalStore)(props.store.subscribe, props.store.getView);
+	useStableInput(() => {}, true);
 	const readDescriptors = (0, import_react.useCallback)(() => props.commands.descriptors, [props.commands]);
 	const readSkills = (0, import_react.useCallback)(() => props.skills.rows, [props.skills]);
 	const descriptors = (0, import_react.useSyncExternalStore)(props.commands.subscribe, readDescriptors);
@@ -33501,11 +34613,16 @@ function App(props) {
 	const handleEditorRows = (0, import_react.useCallback)((rows) => {
 		setComposerRows((current) => current === rows ? current : rows);
 	}, []);
+	const [menuRows, setMenuRows] = (0, import_react.useState)(0);
+	const handleMenuRows = (0, import_react.useCallback)((rows) => {
+		setMenuRows((current) => current === rows ? current : rows);
+	}, []);
 	const composerEditorCap = composerMaxRows(terminalRows);
-	const dynamicRows = Math.max(1, terminalRows - 13 - composerGutterRows - (composerRows - 1));
+	const MENU_RESERVE_ROWS = 5;
+	const dynamicRows = Math.max(1, terminalRows - 8 - MENU_RESERVE_ROWS - composerGutterRows - (composerRows - 1) - Math.max(0, menuRows - MENU_RESERVE_ROWS));
 	const streamingActive = view.streaming !== "" || view.streamingReasoning !== "";
 	const deepDivingVisible = busy && !streamingActive;
-	const allLiveLines = (0, import_react.useMemo)(() => view.entries.slice(settled).flatMap((entry) => transcriptEntryLines(entry, Math.max(10, terminalColumns - 2), showReasoning)), [
+	const allLiveLines = (0, import_react.useMemo)(() => view.entries.slice(settled).flatMap((entry) => transcriptEntryLines(entry, Math.max(1, terminalColumns - 2), showReasoning)), [
 		view.entries,
 		settled,
 		terminalColumns,
@@ -33581,6 +34698,37 @@ function App(props) {
 		setProviderAction(void 0);
 		setEffortFor(void 0);
 	};
+	const effortDonors = (0, import_react.useMemo)(() => {
+		const donors = [];
+		const seen = /* @__PURE__ */ new Set();
+		for (const row of providerDirectory?.rows ?? []) for (const model of row.configuration.models) {
+			const raw = model.extras?.reasoningEfforts;
+			if (!isDeclaredReasoningEfforts(raw)) continue;
+			const key = row.provider + "/" + model.id;
+			if (seen.has(key)) continue;
+			seen.add(key);
+			donors.push({
+				provider: row.provider,
+				id: model.id,
+				efforts: raw
+			});
+		}
+		for (const row of directory?.rows ?? []) {
+			const levels = row.reasoning?.efforts.map((effort) => effort.id) ?? [];
+			if (levels.filter((level) => level !== "off").length === 0) continue;
+			const key = row.provider + "/" + row.model;
+			if (seen.has(key)) continue;
+			seen.add(key);
+			const efforts = {};
+			for (const level of levels) efforts[level] = level === "off" ? null : level;
+			donors.push({
+				provider: row.provider,
+				id: row.model,
+				efforts
+			});
+		}
+		return donors;
+	}, [providerDirectory, directory]);
 	let modelSurface;
 	if (modelOpen && !approvalPending && !questionPending) {
 		if (providerAction?.kind === "login" && props.beginProviderAuthorization !== void 0 && props.cancelProviderAuthorization !== void 0 && props.openAuthorizationUrl !== void 0 && props.copyTextValue !== void 0) modelSurface = (0, import_react.createElement)(ProviderAuthorizationPanel, {
@@ -33613,30 +34761,23 @@ function App(props) {
 			},
 			back: () => setProviderAction(void 0)
 		});
-		else if (providerAction?.kind === "configure" && props.saveModelProviderConfiguration !== void 0) modelSurface = (0, import_react.createElement)(ProviderConfigurationPanel, {
+		else if (providerAction?.kind === "configure" && props.saveModelProviderConfiguration !== void 0) modelSurface = (0, import_react.createElement)(ProviderSetupPanel, {
 			target: providerAction.target,
-			catalog: directory?.rows ?? [],
+			effortDonors,
 			save: props.saveModelProviderConfiguration,
-			done: () => {
+			saveCredential: props.saveModelProviderCredential,
+			discover: props.discoverModelProvider ?? (async () => {
+				throw new Error("model discovery is unavailable in this profile; enter models by hand");
+			}),
+			done: (result) => {
 				const target = providerAction.target;
 				setProviderAction(void 0);
 				setProviderOpen(true);
 				reloadModelSurfaces();
-				notify(`provider configuration saved: ${target.displayName}`);
-			},
-			back: () => setProviderAction(void 0)
-		});
-		else if (providerAction?.kind === "credential" && props.saveModelProviderCredential !== void 0) modelSurface = (0, import_react.createElement)(ProviderCredentialPanel, {
-			target: providerAction.target,
-			save: props.saveModelProviderCredential,
-			done: () => {
-				const target = providerAction.target;
-				setProviderAction(void 0);
-				setProviderOpen(false);
-				reloadModelSurfaces();
-				notify(`API key saved for ${target.displayName}; select a model`);
+				notify(`provider configuration saved: ${target.displayName}` + (result.key ? " · API key updated" : ""));
 			},
-			back: () => setProviderAction(void 0)
+			back: () => setProviderAction(void 0),
+			onExit: closeModelSurface
 		});
 		else if (providerAction?.kind === "unset" && props.unsetModelProviderCredential !== void 0) modelSurface = (0, import_react.createElement)(ProviderConfirmPanel, {
 			target: providerAction.target,
@@ -33669,16 +34810,6 @@ function App(props) {
 			error: providerError,
 			authorizations: authorizationDirectory,
 			authorizationError,
-			onCredential: (target) => {
-				if (props.saveModelProviderCredential === void 0) {
-					notify("API key storage is unavailable in this profile", "warning");
-					return;
-				}
-				setProviderAction({
-					kind: "credential",
-					target
-				});
-			},
 			onConfigure: (target) => {
 				if (props.saveModelProviderConfiguration === void 0) {
 					notify("provider configuration is unavailable in this profile", "warning");
@@ -33736,14 +34867,16 @@ function App(props) {
 				});
 			},
 			onRetry: reloadModelSurfaces,
-			onBack: () => setProviderOpen(false)
+			onBack: () => setProviderOpen(false),
+			onExit: closeModelSurface
 		});
 		else if (effortFor !== void 0) modelSurface = (0, import_react.createElement)(EffortPanel, {
 			key: `${effortFor.provider}/${effortFor.model}`,
 			row: effortFor,
 			current: effortLabel,
 			select: (effortId) => applyModel(effortFor, effortId),
-			back: () => setEffortFor(void 0)
+			back: () => setEffortFor(void 0),
+			onExit: closeModelSurface
 		});
 		else modelSurface = (0, import_react.createElement)(ModelPanel, {
 			directory,
@@ -33757,7 +34890,7 @@ function App(props) {
 				const effortId = row.reasoning?.efforts.length === 1 ? row.reasoning.efforts[0].id : void 0;
 				applyModel(row, effortId);
 			},
-			...props.loadModelProviders === void 0 || props.saveModelProviderCredential === void 0 ? {} : { onProviders: () => setProviderOpen(true) },
+			...props.loadModelProviders === void 0 || props.saveModelProviderConfiguration === void 0 ? {} : { onProviders: () => setProviderOpen(true) },
 			onRetry: reloadModelSurfaces,
 			onClose: closeModelSurface
 		});
@@ -33797,7 +34930,9 @@ function App(props) {
 	}), (0, import_react.createElement)(ApprovalBar, {
 		snapshot: approvalSnapshot,
 		locked: questionPending,
-		notify
+		notify,
+		interrupt: props.interrupt,
+		summarize: questionPending
 	}), modelSurface, helpOpen && !approvalPending && !questionPending ? (0, import_react.createElement)(HelpPanel, {
 		descriptors,
 		skills,
@@ -34032,7 +35167,8 @@ function App(props) {
 		waveTier,
 		waveStyle,
 		maxRows: composerEditorCap,
-		onEditorRows: handleEditorRows
+		onEditorRows: handleEditorRows,
+		onMenuRows: handleMenuRows
 	}), (0, import_react.createElement)(StatusLine, {
 		facts: {
 			model: modelLabel,
@@ -34097,6 +35233,9 @@ function mountApprovalAnswerer(ctx, owns, preview) {
 		if (request.signal?.aborted === true) return Promise.resolve("cancelled");
 		let resolved = false;
 		let settle;
+		const settled = new Promise((resolve) => {
+			settle = resolve;
+		});
 		const signal = request.signal;
 		const onAbort = () => withdraw();
 		const detachAbort = () => {
@@ -34129,9 +35268,7 @@ function mountApprovalAnswerer(ctx, owns, preview) {
 		};
 		queue.push(slot);
 		publish();
-		return new Promise((resolve) => {
-			settle = resolve;
-		}).then((outcome) => {
+		return settled.then((outcome) => {
 			if (outcome !== "cancelled") {
 				removeSlot(slot);
 				publish();
@@ -34152,60 +35289,143 @@ function mountApprovalAnswerer(ctx, owns, preview) {
 	};
 }
 //#endregion
-//#region src/commands.ts
+//#region src/input-split.ts
 /**
-* Watch the live command registry. Reads the current list immediately and
-* re-reads on every registry mutation or agent retarget; notification
-* failures are contained by the registry itself, so this watcher only ever
-* re-reads. Without a `commands` service the view stays empty and all lines
-* fall through to normal prompts.
-* @param ctx - context carrying the `commands` service (optional).
-* @returns the view the completion menu subscribes to.
+* Terminal input arrives as byte chunks, and one chunk can carry several
+* keypresses: a fast space-then-enter, a bridged stdin that batches reads, a
+* middle-click paste. Ink parses each chunk as exactly one keypress —
+* `parseKeypress(' \r')` matches neither member, so both keys silently
+* vanish (a multi-select question answered with an empty set). The splitter
+* below cuts every chunk into the individual keypress units Ink's parser
+* expects, keeping escape sequences and bracketed-paste blocks intact, and
+* the stdin proxy feeds the split stream to the Ink mount.
+*
+* @module @deepseek-ai/dsh-tui/input-split
 */
-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;
-		try {
-			descriptors = commands.list(agent);
-			error = void 0;
-		} catch (cause) {
-			descriptors = [...descriptors];
-			error = cause instanceof Error ? cause.message : String(cause);
+/** Bracketed-paste wrapper bytes; the whole block travels as one unit. */
+const PASTE_START = "\x1B[200~";
+const PASTE_END = "\x1B[201~";
+/** Final byte of a CSI sequence (\x40-\x7e per ECMA-48). */
+const isCsiFinal = (char) => char >= "@" && char <= "~";
+/**
+* Build a stateful chunk splitter. A partial unit at the end of one chunk
+* (a cut CSI sequence, an open paste block) waits in the buffer for the
+* rest. A chunk-trailing lone ESC emits as the Escape key right away:
+* terminals send Escape as its own chunk, and holding it hostage for a
+* sequence that may never continue would break every Esc cancel.
+*/
+function createKeypressSplitter() {
+	let buffer = "";
+	const push = (chunk) => {
+		buffer += chunk;
+		const units = [];
+		while (buffer !== "") {
+			if (buffer.startsWith(PASTE_START)) {
+				const end = buffer.indexOf(PASTE_END, 6);
+				if (end < 0) break;
+				const stop = end + 6;
+				units.push(buffer.slice(0, stop));
+				buffer = buffer.slice(stop);
+				continue;
+			}
+			const head = buffer[0];
+			if (head !== "\x1B") {
+				const take = head >= "\ud800" && head <= "\udbff" && buffer[1] !== void 0 ? 2 : 1;
+				units.push(buffer.slice(0, take));
+				buffer = buffer.slice(take);
+				continue;
+			}
+			if (buffer[1] === "[") {
+				let end = -1;
+				for (let at = 2; at < buffer.length; at += 1) if (isCsiFinal(buffer[at])) {
+					end = at;
+					break;
+				}
+				if (end < 0) break;
+				units.push(buffer.slice(0, end + 1));
+				buffer = buffer.slice(end + 1);
+				continue;
+			}
+			if (buffer[1] === "O") {
+				if (buffer[2] === void 0) break;
+				units.push(buffer.slice(0, 3));
+				buffer = buffer.slice(3);
+				continue;
+			}
+			if (buffer[1] === void 0) {
+				units.push(buffer);
+				buffer = "";
+				continue;
+			}
+			units.push(buffer.slice(0, 2));
+			buffer = buffer.slice(2);
 		}
-		for (const listener of listeners) listener();
+		return units;
 	};
-	if (commands !== void 0) ctx.on("commands/change", () => refresh());
 	return {
-		get descriptors() {
-			return descriptors;
-		},
-		get error() {
-			return error;
-		},
-		subscribe(listener) {
-			listeners.add(listener);
-			return () => {
-				listeners.delete(listener);
-			};
+		push,
+		openPaste() {
+			return buffer.startsWith(PASTE_START);
 		},
-		setAgent(next) {
-			agent = next;
-			refresh();
+		releaseStalePaste() {
+			if (!buffer.startsWith(PASTE_START)) return [];
+			buffer = buffer.slice(6);
+			return push("");
 		}
 	};
 }
 /**
-* Whether one command line is a syntactically valid slash command.
-* @param line - the complete candidate line.
-* @returns true when the line parses as `/name` or `/name input`.
+* Wrap one real stdin in the splitting proxy: keypress units flow into a
+* PassThrough Ink reads, while raw-mode/ref calls forward to the source.
+* @param source - the process (or harness) input stream in raw mode.
+* @returns the proxy stream plus a dispose that detaches the tap.
 */
-function isSlashLine(line) {
-	return /^\/[a-z][a-z0-9_-]*(?=$|[\t ])/u.test(line);
+function createSplitStdin(source) {
+	const stream = new PassThrough({ objectMode: true });
+	const splitter = createKeypressSplitter();
+	let stalePasteTimer;
+	const disarmStalePasteTimer = () => {
+		if (stalePasteTimer === void 0) return;
+		clearTimeout(stalePasteTimer);
+		stalePasteTimer = void 0;
+	};
+	const armStalePasteTimer = () => {
+		if (stalePasteTimer !== void 0 || !splitter.openPaste()) return;
+		stalePasteTimer = setTimeout(() => {
+			stalePasteTimer = void 0;
+			for (const unit of splitter.releaseStalePaste()) stream.write(unit);
+			armStalePasteTimer();
+		}, PASTE_BRACKET_TIMEOUT_MS);
+		stalePasteTimer.unref?.();
+	};
+	const onChunk = (chunk) => {
+		for (const unit of splitter.push(String(chunk))) stream.write(unit);
+		if (splitter.openPaste()) armStalePasteTimer();
+		else disarmStalePasteTimer();
+	};
+	const proxy = Object.assign(stream, {
+		isTTY: source.isTTY === true,
+		setRawMode(value) {
+			source.setRawMode?.(value);
+			return stream;
+		},
+		ref() {
+			source.ref?.();
+		},
+		unref() {
+			source.unref?.();
+		}
+	});
+	source.setEncoding("utf8");
+	source.on("data", onChunk);
+	return {
+		stdin: proxy,
+		dispose() {
+			disarmStalePasteTimer();
+			source.removeListener("data", onChunk);
+			source.pause();
+		}
+	};
 }
 //#endregion
 //#region src/internals.ts
@@ -34222,14 +35442,23 @@ const internals = {
 		const keyboardEnhanced = shouldEnableKeyboardEnhancement();
 		const focusReporting = isVsCodeTerminalEnv();
 		process.stdout.write((keyboardEnhanced ? KEYBOARD_ENHANCE_ENABLE : "") + BRACKETED_PASTE_ENABLE + (focusReporting ? TERMINAL_FOCUS_REPORT_ENABLE : ""));
-		const instance = render(element, { exitOnCtrlC: false });
+		const tuiStdin = createSplitStdin(process.stdin);
+		const instance = render(element, {
+			exitOnCtrlC: false,
+			stdin: tuiStdin.stdin,
+			stdout: process.stdout
+		});
 		return {
 			rerender(element) {
 				instance.rerender(element);
 			},
 			unmount() {
-				instance.unmount();
-				process.stdout.write((keyboardEnhanced ? KEYBOARD_ENHANCE_DISABLE : "") + BRACKETED_PASTE_DISABLE + (focusReporting ? TERMINAL_FOCUS_REPORT_DISABLE : ""));
+				try {
+					instance.unmount();
+				} finally {
+					tuiStdin.dispose();
+					process.stdout.write((keyboardEnhanced ? KEYBOARD_ENHANCE_DISABLE : "") + BRACKETED_PASTE_DISABLE + (focusReporting ? TERMINAL_FOCUS_REPORT_DISABLE : ""));
+				}
 			}
 		};
 	},
@@ -34388,18 +35617,18 @@ const PI_AI_SETTINGS_NS = "llm-pi-ai";
 /** The effort level that means "send no reasoning parameter"; its wire value is always null. */
 const OFF_LEVEL = "off";
 /** Single-line a misbehaving error for the notice channel. */
-function singleLine$1(message) {
+function singleLine(message) {
 	return [...message].map((ch) => {
 		const code = ch.charCodeAt(0);
 		return code < 32 || code === 127 ? " " : ch;
 	}).join("").split(" ").filter((part) => part !== "").join(" ");
 }
 /** Human text for a rejection value. */
-function messageOf$1(error) {
+function messageOf(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 /** Read the value at a path through plain objects; undefined when any segment misses. */
-function getPath$1(value, path) {
+function getPath(value, path) {
 	let current = value;
 	for (const segment of path) {
 		if (typeof current !== "object" || current === null) return void 0;
@@ -34538,7 +35767,7 @@ async function syncModelCapabilities(ctx, notify) {
 		for (const entry of routed) {
 			const namespace = namespaces.get(entry.settingsNs);
 			if (namespace === void 0) continue;
-			const profile = entry.settingsPath.length === 0 ? namespace.value : getPath$1(namespace.value, entry.settingsPath);
+			const profile = entry.settingsPath.length === 0 ? namespace.value : getPath(namespace.value, entry.settingsPath);
 			const models = Array.isArray(profile?.models) ? profile.models : void 0;
 			if (models === void 0) continue;
 			profiles.set(entry.provider, {
@@ -34572,376 +35801,24 @@ async function syncModelCapabilities(ctx, notify) {
 				const more = plan.sources.length > 3 ? `, +${plan.sources.length - 3}` : "";
 				notify?.(`inherited reasoning levels for ${plan.inherited.length} model${plan.inherited.length === 1 ? "" : "s"} on ${plan.provider} (from ${shown}${more})`, "info");
 			} catch (error) {
-				notify?.(`capability inheritance failed on ${plan.provider}: ${singleLine$1(messageOf$1(error))}`, "warning");
+				notify?.(`capability inheritance failed on ${plan.provider}: ${singleLine(messageOf(error))}`, "warning");
 			}
 		}
 	} catch {}
 }
 //#endregion
-//#region src/provider-settings.ts
-/** Human text for a rejection value (mirrors the web page's `messageOf`). */
-function messageOf(error) {
-	return error instanceof Error ? error.message : String(error);
-}
-/** Collapse every whitespace/control run to one space so a notice stays one line. */
-function singleLine(message) {
-	return message.replace(/[\u0000-\u001F\u007F]/g, " ").replace(/\s+/g, " ").trim();
-}
-/** Keep a misbehaving credential provider from reflecting the submitted secret. */
-function credentialWriteMessage(error, secret) {
-	const message = singleLine(messageOf(error));
-	return message.includes(secret) ? "credentials service rejected the API key" : message;
-}
-/** Obvious shell-assignment paste; mirrors the official Web Models editor. */
-const ENV_ASSIGNMENT = /^[A-Z][A-Z0-9_]*=[^=]/;
-/** Whether the whole draft is wrapped in one matching quote pair. */
-function hasWrappingQuotes(value) {
-	const first = value[0];
-	return (first === "\"" || first === "'" || first === "`") && value.length > 1 && value.endsWith(first);
-}
-/** Read the value at a path through plain objects; undefined when any segment misses. */
-function getPath(value, path) {
-	let current = value;
-	for (const segment of path) {
-		if (typeof current !== "object" || current === null) return void 0;
-		current = current[segment];
-	}
-	return current;
-}
-/** Whether a path resolves to a defined value (the empty path reads the root). */
-function hasPath(value, path) {
-	return path.length === 0 ? value !== void 0 : getPath(value, path) !== void 0;
-}
-/** The credential reference a resolved profile names (its `apiKeyEnv` field). */
-function profileRefOf(profile) {
-	if (typeof profile !== "object" || profile === null) return void 0;
-	const ref = profile.apiKeyEnv;
-	return typeof ref === "string" && ref.length > 0 ? ref : void 0;
-}
-/** Extract only fields the terminal can round-trip without touching provider-specific extras. */
-function configurationOf(profile) {
-	if (typeof profile !== "object" || profile === null) return { models: [] };
-	const record = profile;
-	const models = (Array.isArray(record.models) ? record.models : []).flatMap((value) => {
-		if (typeof value !== "object" || value === null) return [];
-		const entry = value;
-		if (typeof entry.id !== "string" || entry.id.trim() === "") return [];
-		const { id: _id, name: _name, contextWindow: _contextWindow, maxTokens: _maxTokens, ...extras } = entry;
-		return [{
-			id: entry.id,
-			...typeof entry.name === "string" && entry.name.trim() !== "" ? { name: entry.name } : {},
-			...typeof entry.contextWindow === "number" && Number.isFinite(entry.contextWindow) ? { contextWindow: entry.contextWindow } : {},
-			...typeof entry.maxTokens === "number" && Number.isFinite(entry.maxTokens) ? { maxTokens: entry.maxTokens } : {},
-			...Object.keys(extras).length > 0 ? { extras } : {}
-		}];
-	});
-	return {
-		...typeof record.baseURL === "string" && record.baseURL.trim() !== "" ? { baseURL: record.baseURL } : {},
-		models
-	};
-}
-/**
-* The conventional credential reference for a provider route: `<ROUTE>_API_KEY`
-* with the route uppercased and every non-alphanumeric run collapsed to one
-* underscore — the exact derivation the official Models page uses
-* (`deriveKeyRef` in `ui-settings-models`), so a key saved here is found there.
-* @param provider - provider route id (e.g. `pi-ai`, `minimax-cn`).
-* @returns the derived reference name (e.g. `PI_AI_API_KEY`).
-*/
-function deriveCredentialRef(provider) {
-	return `${provider.toUpperCase().replace(/[^A-Z0-9]+/g, "_")}_API_KEY`;
-}
-/** Events that invalidate the official Models provider/settings/credential join. */
-const PROVIDER_SETTINGS_EVENTS = [
-	"credentials/reference-updated",
-	"settings/document-updated",
-	"llm/adapters-updated"
-];
-/** Subscribe to the same provider-directory invalidations as the official Web Models page. */
-function subscribeProviderSettings(ctx, listener) {
-	const events = ctx;
-	const disposers = PROVIDER_SETTINGS_EVENTS.map((event) => events.on(event, () => listener()));
-	return () => {
-		for (const dispose of disposers) dispose();
-	};
-}
-/** A single-line, bounded error from the provider-management adapter. */
-var ProviderSettingsError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "ProviderSettingsError";
-	}
-};
-/**
-* Join the configurable-provider directory, the redacted settings
-* namespaces, and the referenced credentials into panel rows, web-parity:
-* - directory entries merge with `listProviders()` to mark each live or
-*   dormant, and routes registered without a directory declaration appear as
-*   read-only/unmanaged rows (no settings address);
-* - a whole-section entry is configured whenever its namespace resolves;
-*   a path-addressed one only when the profile resolves there;
-* - a row is removable when the user layer alone carries its profile;
-* - only refs named by resolved profiles are described, and a per-ref failure
-*   degrades to that row's bounded error instead of losing it.
-* Absent `settings`/`credentials` services are tolerated the same way.
-* @param ctx - context carrying the `llm` service (settings/credentials optional).
-* @returns the resolved directory; empty rows when `llm` is unavailable.
-*/
-async function loadProviderSettings(ctx) {
-	const llm = ctx.get("llm");
-	if (llm === void 0) return {
-		rows: [],
-		writable: false,
-		failures: []
-	};
-	const registered = llm.listProviders();
-	const failures = [];
-	const directoryEntries = [];
-	if (llm.listConfigurableProviders !== void 0) try {
-		directoryEntries.push(...llm.listConfigurableProviders());
-	} catch (error) {
-		failures.push(`configurable-provider directory failed: ${singleLine(messageOf(error))}`);
-	}
-	const settings = ctx.get("settings");
-	let descriptors = [];
-	let writable = false;
-	if (settings !== void 0) try {
-		descriptors = settings.describe({ redactSecrets: true });
-		writable = settings.writable === true;
-	} catch (error) {
-		failures.push(`settings describe failed: ${singleLine(messageOf(error))}`);
-	}
-	const namespaces = new Map(descriptors.map((descriptor) => [descriptor.ns, descriptor]));
-	const active = new Set(registered.map((provider) => provider.id));
-	const declared = new Set(directoryEntries.map((entry) => entry.provider));
-	const rows = [...directoryEntries.map((entry) => ({
-		provider: entry.provider,
-		displayName: entry.displayName,
-		active: active.has(entry.provider),
-		settingsNs: entry.settingsNs,
-		settingsPath: entry.settingsPath,
-		...entry.declared === void 0 ? {} : { declared: entry.declared }
-	})), ...registered.filter((provider) => !declared.has(provider.id)).map((provider) => ({
-		provider: provider.id,
-		displayName: provider.name,
-		active: true,
-		settingsNs: "",
-		settingsPath: []
-	}))].map((base) => {
-		const namespace = base.settingsNs.length === 0 ? void 0 : namespaces.get(base.settingsNs);
-		const profile = namespace === void 0 ? void 0 : base.settingsPath.length === 0 ? namespace.value : getPath(namespace.value, base.settingsPath);
-		const configured = namespace !== void 0 && (base.settingsPath.length === 0 || profile !== void 0);
-		const removable = namespace !== void 0 && base.settingsPath.length > 0 && hasPath(namespace.user, base.settingsPath) && !hasPath(namespace.base, base.settingsPath);
-		const credentialRef = profileRefOf(profile);
-		return {
-			provider: base.provider,
-			displayName: base.displayName,
-			active: base.active,
-			settingsNs: base.settingsNs,
-			settingsPath: base.settingsPath,
-			settingsRevision: namespace?.revision ?? 0,
-			configured,
-			removable,
-			configuration: configurationOf(profile),
-			...credentialRef === void 0 ? {} : { credentialRef },
-			suggestedRef: deriveCredentialRef(base.provider),
-			...base.declared === void 0 ? {} : { declared: base.declared }
-		};
-	});
-	const refs = [...new Set(rows.flatMap((row) => row.credentialRef === void 0 ? [] : [row.credentialRef]))];
-	const credentialViews = /* @__PURE__ */ new Map();
-	const credentials = ctx.get("credentials");
-	if (refs.length > 0) {
-		if (credentials === void 0) for (const ref of refs) credentialViews.set(ref, {
-			kind: "error",
-			message: "credentials service is unavailable"
-		});
-		else await Promise.all(refs.map(async (ref) => {
-			try {
-				const facts = await credentials.describe(ref);
-				credentialViews.set(ref, {
-					kind: "facts",
-					configured: facts.configured,
-					writable: facts.writable,
-					...facts.source === void 0 ? {} : { source: facts.source }
-				});
-			} catch (error) {
-				credentialViews.set(ref, {
-					kind: "error",
-					message: singleLine(messageOf(error))
-				});
-			}
-		}));
-	}
-	return {
-		rows: rows.map((row) => ({
-			...row,
-			credential: row.credentialRef === void 0 ? void 0 : credentialViews.get(row.credentialRef) ?? {
-				kind: "error",
-				message: "credential describe returned no view"
-			}
-		})),
-		writable,
-		failures
-	};
-}
-/**
-* Store a provider API key, web-parity: validate with `normalizeApiKey`
-* (single-line, actionable errors that never echo the key), materialize the
-* profile/`apiKeyEnv` through `settings.mutate` first when the resolved
-* profile names no reference (dormant route or ref-less profile), then store
-* under the trusted named ref or the derived conventional ref. An existing
-* whole-section DeepSeek whose resolved profile already names
-* `DEEPSEEK_API_KEY` needs no settings mutation. Env-supplied read-only keys
-* are refused before any service call.
-* @param ctx - context carrying `settings` (when materializing) and `credentials`.
-* @param target - the joined row to write through.
-* @param rawKey - the key exactly as typed; surrounding whitespace is trimmed.
-* @throws {@link ProviderSettingsError} with a single-line, key-free message.
-*/
-async function saveProviderCredential(ctx, target, rawKey) {
-	const trimmed = rawKey.trim();
-	if (ENV_ASSIGNMENT.test(trimmed) || hasWrappingQuotes(trimmed)) throw new ProviderSettingsError("paste only the API key, without an environment-variable name or wrapping quotes");
-	const checked = normalizeApiKey(rawKey);
-	if (!checked.ok) throw new ProviderSettingsError(checked.reason === "empty" ? "the API key is empty after trimming surrounding whitespace" : "the API key contains characters an HTTP header cannot carry; type a plain printable-ASCII key");
-	if (target.settingsNs.length === 0) throw new ProviderSettingsError(`provider "${target.provider}" has no managed settings namespace; configure it in settings.yaml`);
-	if (target.credential?.kind === "facts" && target.credential.writable === false) throw new ProviderSettingsError(`the key for provider "${target.provider}" is supplied read-only by the environment; unset it in the shell instead of overwriting it here`);
-	const credentials = ctx.get("credentials");
-	if (credentials === void 0) throw new ProviderSettingsError("credentials service is unavailable; cannot store the API key");
-	const ref = target.credentialRef ?? deriveCredentialRef(target.provider);
-	if (target.credentialRef === void 0) {
-		const settings = ctx.get("settings");
-		if (settings === void 0) throw new ProviderSettingsError("settings service is unavailable; cannot materialize the credential reference");
-		try {
-			await settings.mutate(target.settingsNs, [{
-				op: "set",
-				path: [...target.settingsPath, "apiKeyEnv"],
-				value: ref
-			}]);
-		} catch (error) {
-			throw new ProviderSettingsError(singleLine(messageOf(error)));
-		}
-	}
-	try {
-		await credentials.set(ref, checked.value);
-	} catch (error) {
-		throw new ProviderSettingsError(credentialWriteMessage(error, checked.value));
-	}
-}
-/** Save the endpoint and an explicit model allow-list without rebuilding the profile. */
-async function saveProviderConfiguration(ctx, target, configuration) {
-	if (target.settingsNs.length === 0) throw new ProviderSettingsError(`provider "${target.provider}" has no managed settings namespace; configure it in settings.yaml`);
-	const settings = ctx.get("settings");
-	if (settings === void 0 || settings.writable !== true) throw new ProviderSettingsError("settings are read-only; provider configuration cannot be changed here");
-	const baseURL = configuration.baseURL?.trim();
-	if (baseURL !== void 0 && baseURL !== "") try {
-		const parsed = new URL(baseURL);
-		if (parsed.protocol !== "http:" && parsed.protocol !== "https:") throw new Error("unsupported protocol");
-	} catch {
-		throw new ProviderSettingsError("base URL must be an absolute http or https URL");
-	}
-	const seen = /* @__PURE__ */ new Set();
-	const models = configuration.models.map((model) => {
-		const id = model.id.trim();
-		if (id === "" || seen.has(id)) throw new ProviderSettingsError("each selected model must have a unique non-empty id");
-		seen.add(id);
-		for (const [label, value] of [["context window", model.contextWindow], ["output window", model.maxTokens]]) if (value !== void 0 && (!Number.isSafeInteger(value) || value <= 0)) throw new ProviderSettingsError(`${label} must be a positive integer`);
-		return {
-			id,
-			...model.extras,
-			...model.name === void 0 || model.name.trim() === "" ? {} : { name: model.name.trim() },
-			...model.contextWindow === void 0 ? {} : { contextWindow: model.contextWindow },
-			...model.maxTokens === void 0 ? {} : { maxTokens: model.maxTokens }
-		};
-	});
-	const root = target.settingsPath;
-	const ops = [baseURL === void 0 || baseURL === "" ? {
-		op: "unset",
-		path: [...root, "baseURL"]
-	} : {
-		op: "set",
-		path: [...root, "baseURL"],
-		value: baseURL
-	}, {
-		op: "set",
-		path: [...root, "models"],
-		value: models
-	}];
-	try {
-		await settings.mutate(target.settingsNs, ops, target.settingsRevision);
-	} catch (error) {
-		throw new ProviderSettingsError(singleLine(messageOf(error)));
-	}
-}
-/**
-* Remove the currently named credential without touching the provider
-* profile. Only the resolved profile's own reference is unset; a dormant or
-* ref-less row (nothing to remove), an already-absent key, and an
-* env-supplied read-only key are rejected safely before any service call.
-* @param ctx - context carrying the `credentials` service.
-* @param target - the joined row whose named credential to unset.
-* @throws {@link ProviderSettingsError} with a single-line, key-free message.
-*/
-async function unsetProviderCredential(ctx, target) {
-	const ref = target.credentialRef;
-	if (ref === void 0) throw new ProviderSettingsError(`provider "${target.provider}" names no credential reference to remove`);
-	const facts = target.credential;
-	if (facts?.kind === "facts" && facts.configured === false) throw new ProviderSettingsError(`provider "${target.provider}" has no configured credential to remove`);
-	if (facts?.kind === "facts" && facts.writable === false) throw new ProviderSettingsError(`the key for provider "${target.provider}" is supplied read-only by the environment; unset it in the shell instead`);
-	const credentials = ctx.get("credentials");
-	if (credentials === void 0) throw new ProviderSettingsError("credentials service is unavailable; cannot remove the API key");
-	try {
-		await credentials.unset(ref);
-	} catch (error) {
-		throw new ProviderSettingsError(singleLine(messageOf(error)));
-	}
-}
-/**
-* Remove a user-added provider profile, web-parity: only `removable` rows may
-* be removed; a page-managed credential — the derived ref, configured and
-* writable — is unset first (so a second-step failure leaves the row visible
-* and the operation retryable), then `settings.mutate` unsets
-* `target.settingsPath`. Both steps are idempotent. A hand-named credential
-* ref may be shared elsewhere and is left alone.
-* @param ctx - context carrying `credentials` and `settings`.
-* @param target - the joined row to remove.
-* @throws {@link ProviderSettingsError} with a single-line, key-free message.
-*/
-async function removeProviderSettings(ctx, target) {
-	if (!target.removable) throw new ProviderSettingsError(`provider "${target.provider}" is not removable from the user settings layer`);
-	if (target.settingsNs.length === 0) throw new ProviderSettingsError(`provider "${target.provider}" has no managed settings profile to remove`);
-	const managedRef = target.credentialRef === target.suggestedRef && target.credential?.kind === "facts" && target.credential.configured === true && target.credential.writable === true ? target.credentialRef : void 0;
-	if (managedRef !== void 0) {
-		const credentials = ctx.get("credentials");
-		if (credentials === void 0) throw new ProviderSettingsError("credentials service is unavailable; cannot remove the managed API key");
-		try {
-			await credentials.unset(managedRef);
-		} catch (error) {
-			throw new ProviderSettingsError(singleLine(messageOf(error)));
-		}
-	}
-	const settings = ctx.get("settings");
-	if (settings === void 0) throw new ProviderSettingsError("settings service is unavailable; cannot remove the provider profile");
-	try {
-		await settings.mutate(target.settingsNs, [{
-			op: "unset",
-			path: [...target.settingsPath]
-		}]);
-	} catch (error) {
-		throw new ProviderSettingsError(singleLine(messageOf(error)));
-	}
-}
-//#endregion
 //#region src/questions.ts
 const ABORT_ERROR = new UserQuestionError("ask_user_question was interrupted before the user answered", "ASK_ABORTED");
 /**
-* Mount the single `ctx.userQuestions` UI provider over a FIFO queue.
-* @param ctx - context carrying the `userQuestions` service (dsh-base).
-* @returns the store the renderer subscribes to; a context without the
-* service yields a permanently empty store.
+* Mount the `user-questions/request` answerer over a FIFO queue.
+* @param ctx - plugin context whose event bus carries the waterfall.
+* @param owns - agents this terminal answers for; every other request is
+* deferred back into the waterfall (`next()`), so sibling answerers stay
+* usable. Agent-less asks are claimed: this TUI is the only human surface
+* in the process.
+* @returns the store the renderer subscribes to.
 */
-function mountQuestionProvider(ctx) {
-	const service = ctx.get("userQuestions");
+function mountQuestionProvider(ctx, owns) {
 	let snapshot = { pending: void 0 };
 	let active;
 	const queue = [];
@@ -34956,7 +35833,8 @@ function mountQuestionProvider(ctx) {
 		active = next;
 		set({ pending: next });
 	};
-	if (service !== void 0) service.registerProvider({ ask(request) {
+	ctx.on("user-questions/request", (request, next) => {
+		if (request.agent !== void 0 && !owns(request.agent)) return next();
 		return new Promise((resolve, reject) => {
 			const onAbort = () => {
 				if (active === pending) {
@@ -34988,7 +35866,7 @@ function mountQuestionProvider(ctx) {
 				set({ pending });
 			} else queue.push(pending);
 		});
-	} });
+	});
 	return {
 		subscribe(listener) {
 			listeners.add(listener);
@@ -35271,30 +36149,33 @@ function toRows(skills) {
 * @param ctx - context carrying the `skills` service (optional).
 * @returns the view the completion menu subscribes to.
 */
-function watchSkills(ctx) {
+function watchSkills(ctx, fallbackCwd) {
 	const skills = ctx.get("skills");
 	let agent;
 	let rows = [];
 	let error;
+	let loadedFor;
 	const listeners = /* @__PURE__ */ new Set();
 	const reload = () => {
 		const target = agent;
 		if (skills === void 0 || target === void 0) return;
 		Promise.resolve().then(() => skills.list({
-			cwd: target.session.header.cwd,
+			cwd: target.session.header.cwd ?? fallbackCwd,
 			scope: target
 		})).then((summaries) => {
 			if (agent !== target) return;
 			const next = toRows(summaries);
-			const unchanged = next.length === rows.length && next.every((row, index) => row.name === rows[index]?.name);
+			const unchanged = next.length === rows.length && next.every((row, index) => row.name === rows[index]?.name && row.description === rows[index]?.description && row.modelInvocable === rows[index]?.modelInvocable);
 			rows = next;
+			loadedFor = target;
 			const recovered = error !== void 0;
 			error = void 0;
 			if (unchanged && !recovered) return;
 			for (const listener of listeners) listener();
 		}).catch((cause) => {
 			if (agent !== target) return;
-			rows = [...rows];
+			if (loadedFor !== target) rows = [];
+			else rows = [...rows];
 			error = cause instanceof Error ? cause.message : String(cause);
 			for (const listener of listeners) listener();
 		});
@@ -35761,7 +36642,12 @@ function selectForkSeed(events, atSeq) {
 }
 //#endregion
 //#region src/git-workflow.ts
-/** Read-only Git inspection used by /diff and /review. */
+/**
+* Read-only Git inspection used by /diff and /review. Every diff
+* invocation carries --no-ext-diff and --no-textconv, so configured
+* external diff drivers and text converters can never execute as a
+* side effect of reading a diff.
+*/
 /** Split Git's stable `diff --git` framing without interpreting patch content. */
 function parseGitDiffFiles(text) {
 	if (text === "") return [];
@@ -35784,6 +36670,7 @@ function parseGitDiffSpec(argument) {
 		args: [
 			"diff",
 			"--no-ext-diff",
+			"--no-textconv",
 			"--unified=3",
 			"HEAD",
 			"--"
@@ -35794,6 +36681,7 @@ function parseGitDiffSpec(argument) {
 		args: [
 			"diff",
 			"--no-ext-diff",
+			"--no-textconv",
 			"--unified=3",
 			"--cached",
 			"--"
@@ -35805,6 +36693,7 @@ function parseGitDiffSpec(argument) {
 		args: [
 			"diff",
 			"--no-ext-diff",
+			"--no-textconv",
 			"--unified=3",
 			value,
 			"--"
@@ -35828,8 +36717,25 @@ function executeGit(cwd, args, signal) {
 		});
 	});
 }
+/** Arguments for the unstaged-only fallback below. */
+const UNSTAGED_DIFF_ARGS = [
+	"diff",
+	"--no-ext-diff",
+	"--no-textconv",
+	"--unified=3",
+	"--"
+];
+/** Whether the repository has at least one commit (a HEAD revision). */
+function hasHeadRevision(cwd, signal) {
+	return executeGit(cwd, [
+		"rev-parse",
+		"--verify",
+		"--quiet",
+		"HEAD"
+	], signal).then(() => true).catch(() => false);
+}
 /**
-* Load one complete textual diff without invoking external diff drivers.
+* Load one complete textual diff without invoking external programs.
 * @param signal - aborted by the caller on session switches/quit, killing the
 * git subprocess instead of letting a stale repository's diff land later.
 */
@@ -35842,15 +36748,10 @@ async function loadGitDiff(cwd, argument, signal) {
 			files: parseGitDiffFiles(text)
 		};
 	} catch (error) {
-		if (argument.trim() !== "") throw error;
+		if (argument.trim() !== "" || signal?.aborted === true || await hasHeadRevision(cwd, signal)) throw error;
 		return {
-			title: "git diff - working tree",
-			files: parseGitDiffFiles(await executeGit(cwd, [
-				"diff",
-				"--no-ext-diff",
-				"--unified=3",
-				"--"
-			], signal))
+			title: "git diff - working tree (no commits yet)",
+			files: parseGitDiffFiles(await executeGit(cwd, UNSTAGED_DIFF_ARGS, signal))
 		};
 	}
 }
@@ -35925,16 +36826,24 @@ function agentPresetsFrom(ctx) {
 function isBlankSession(events) {
 	return !events.some((event) => event.type === "turn/start");
 }
+/** Upstream renamed the shipped `code` preset to `ptc` in 0.1.2-rc.1; sessions
+* and CLI choices recorded before the rename keep resolving through this map. */
+const LEGACY_PRESET_IDS = { code: "ptc" };
+function normalizePresetId(id) {
+	return id === void 0 ? void 0 : LEGACY_PRESET_IDS[id] ?? id;
+}
 /** 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;
+	const events = session.snapshotEvents();
+	for (let index = events.length - 1; index >= 0; index -= 1) {
+		const event = events[index];
+		if (event.type === "agent-preset/selected" && event.data?.agentPreset !== void 0) return normalizePresetId(event.data.agentPreset);
 	}
-	return session.header.agentPreset ?? "standard";
+	return normalizePresetId(session.header.agentPreset) ?? "standard";
 }
 /** Resolve a pre-session choice, or recompose an active blank Agent. */
 async function selectPreset(service, agent, presetId) {
+	presetId = normalizePresetId(presetId);
 	if (agent !== void 0) return switchPreset(service, agent, presetId);
 	const preset = await service.resolve(presetId);
 	if (preset.broken !== void 0) throw new Error(preset.broken);
@@ -35942,7 +36851,7 @@ async function selectPreset(service, agent, presetId) {
 }
 /** 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>");
+	if (!isBlankSession(agent.session.snapshotEvents())) 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;
@@ -35955,7 +36864,7 @@ function permissionPresetsFrom(ctx) {
 }
 /** Effective label for either an active session or the not-yet-created first one. */
 function effectivePermission(service, session, pending) {
-	return session === void 0 ? pending ?? service.defaultPreset : service.current(session.events);
+	return session === void 0 ? pending ?? service.defaultPreset : service.current(session);
 }
 /** Validate a preset and write it only when a durable session already exists. */
 function selectPermission(service, session, preset) {
@@ -36037,6 +36946,38 @@ function listPluginRows(ctx) {
 * @module @deepseek-ai/dsh-code/settings-file
 */
 /**
+* Run one file operation with a bounded retry: one initial try plus at
+* most `retries` more. Creating or replacing a file can fail transiently
+* with EPERM/EACCES while an antivirus scanner or search indexer holds
+* it — the standard graceful-fs remedy, not a workaround for a
+* persistent permission problem. A save that still fails leaves its
+* uniquely named temp file behind, so repeated crashed saves accumulate
+* distinct leftovers rather than corrupting a shared one.
+*/
+async function withTransientRetry(operation, retries = 5) {
+	for (let attempt = 0;; attempt += 1) try {
+		await operation();
+		return;
+	} catch (error) {
+		const code = error.code;
+		if (attempt >= retries || code !== "EPERM" && code !== "EACCES") throw error;
+		await new Promise((resolve) => setTimeout(resolve, 30 * (attempt + 1)));
+	}
+}
+/**
+* Write one file atomically: create the parent directory, write to a
+* uniquely named temp file, and rename it into place. A crash midway
+* can never leave a half-written document behind. Unique temp names
+* keep concurrent writers (two terminals, two chains in one process)
+* from sharing one temp path.
+*/
+async function writeFileAtomically(path, text) {
+	await mkdir(dirname(path), { recursive: true });
+	const temp = `${path}.${process.pid}.${randomUUID()}.tmp`;
+	await withTransientRetry(() => writeFile(temp, text, "utf8"));
+	await withTransientRetry(() => rename(temp, path));
+}
+/**
 * Create the shared settings-write chain. One instance per process keeps
 * every user-level JSON file mutually serialized.
 * @returns the persistence handle.
@@ -36045,12 +36986,7 @@ function createUserSettingsPersistence() {
 	let chain = Promise.resolve();
 	return {
 		save(path, text) {
-			const write = chain.then(async () => {
-				await mkdir(dirname(path), { recursive: true });
-				const temp = `${path}.tmp`;
-				await writeFile(temp, text, "utf8");
-				await rename(temp, path);
-			});
+			const write = chain.then(() => writeFileAtomically(path, text));
 			chain = write.catch(() => {});
 			return write;
 		},
@@ -36172,6 +37108,41 @@ async function runQuitSequence(steps, exit, onError) {
 	return started;
 }
 /**
+* Order-preserving gate for composer input while the startup prompt/images
+* are still preparing. Anything submitted before the startup delivery settles
+* queues and flushes afterwards in submit order, so the initial request can
+* never be overtaken by typing that raced a slow image preparation. The flush
+* also runs when the startup delivery fails: user input is never stranded.
+*/
+var StartupInputGate = class {
+	deliver;
+	queued = [];
+	pending = false;
+	constructor(deliver) {
+		this.deliver = deliver;
+	}
+	/** Submit one line: delivered now while idle, queued behind the startup delivery otherwise. */
+	submit(submission) {
+		if (this.pending) this.queued.push(submission);
+		else this.deliver(submission);
+	}
+	/**
+	* Run the startup delivery — the callback receives the direct-delivery sink
+	* for the startup prompt itself — then flush everything that queued behind
+	* it, in order, even when the callback rejects.
+	*/
+	async run(startup) {
+		this.pending = true;
+		try {
+			await startup((submission) => this.deliver(submission));
+		} finally {
+			this.pending = false;
+			const queued = this.queued.splice(0);
+			for (const submission of queued) this.deliver(submission);
+		}
+	}
+};
+/**
 * Resolve the invocation's target session against the persisted headers.
 * @param startup - the parsed startup flags.
 * @param persistence - the persistence service; required for resume/latest.
@@ -36254,7 +37225,7 @@ async function run(ctx, startup, io) {
 		const nextCwd = next.cwd ?? cwd;
 		const selectionState = pendingSelection === void 0 ? {} : { picked: pendingSelection };
 		let mode = next.resume ? next.mode : next.mode ?? pendingMode;
-		if (!next.resume) mode = (await presets.resolve(mode)).id;
+		if (!next.resume) mode = (await presets.resolve(normalizePresetId(mode ?? presets.defaultId))).id;
 		const setup = async (agentCtx) => {
 			const sessionPreset = next.resume ? resolvePreset(agentCtx.agent.session) : mode;
 			mode = (await presets.mount(agentCtx, sessionPreset)).id;
@@ -36299,7 +37270,7 @@ async function run(ctx, startup, io) {
 			handle,
 			agent: handle.agent,
 			session,
-			store: createTranscriptStore(session.events),
+			store: createTranscriptStore(session.snapshotEvents()),
 			mentions: createMentions(ctx, handle.agent, session.header.cwd ?? nextCwd),
 			mode: mode ?? "standard",
 			selection: selectionState,
@@ -36370,7 +37341,7 @@ async function run(ctx, startup, io) {
 	});
 	const commands = watchCommands(ctx);
 	if (agent !== void 0) commands.setAgent(agent);
-	const skills = watchSkills(ctx);
+	const skills = watchSkills(ctx, cwd);
 	if (agent !== void 0) skills.setAgent(agent);
 	const approval = mountApprovalAnswerer(ctx, (candidate) => agent !== void 0 && candidate.id === agent.id, (request) => approvalCommandPreview(store.getView().entries, request.callId, request.toolName));
 	let subagentOverride;
@@ -36378,10 +37349,12 @@ async function run(ctx, startup, io) {
 		const subject = payload.agent;
 		const header = subject.session.header;
 		if (header.parentSession === void 0 && header.origin !== "subagent") return next();
-		const picked = subagentOverride ?? resolveEffectiveSelection(active?.selection.picked ?? pendingSelection, subject.session.requestHeader()?.config, currentDefaults());
+		const activeAgent = active;
+		const belongsToActive = activeAgent !== void 0 && (header.parentSession ?? subject.session.id) === activeAgent.session.id;
+		const picked = subagentOverride ?? resolveEffectiveSelection(belongsToActive && activeAgent !== void 0 ? activeAgent.selection.picked ?? pendingSelection : void 0, subject.session.requestHeader()?.config, currentDefaults());
 		return next().then((resolved) => applyModelSelectionToConfig(resolved, picked));
 	});
-	const questions = mountQuestionProvider(ctx);
+	const questions = mountQuestionProvider(ctx, (candidate) => agent !== void 0 && candidate.id === agent.id);
 	const bridge = { notify: () => {} };
 	const capabilitySyncDebounceMs = 400;
 	const runCapabilitySync = () => {
@@ -36439,17 +37412,27 @@ async function run(ctx, startup, io) {
 	};
 	const historyPath = join(homedir(), ".dsh", "dsh-code", "history.jsonl");
 	let inputHistory = [];
+	let historyWriteChain = Promise.resolve();
 	try {
-		inputHistory = parseHistoryFile(readFileSync(historyPath, "utf8"));
+		const rawHistory = readFileSync(historyPath, "utf8");
+		inputHistory = parseHistoryFile(rawHistory);
+		if (needsCompaction(rawHistory)) historyWriteChain = historyWriteChain.then(() => writeFileAtomically(historyPath, serializeHistoryList(inputHistory))).catch(() => {});
 	} catch {
 		inputHistory = [];
 	}
-	/** Serialized history writes: each submission rewrites the latest in-memory snapshot. */
-	let historyWriteChain = Promise.resolve();
+	/**
+	* Serialized history writes: each submission appends one JSON line at the
+	* end of the file, so concurrent terminals add entries after each other
+	* instead of overwriting snapshots they read at their own boot. A
+	* multi-line draft still occupies one physical line (JSON escapes the
+	* newline), and a regular-length line reaches the disk as one positioned
+	* write; an oversized paste may interleave mid-line, which the next
+	* parse simply drops.
+	*/
 	const recordHistory = (text) => {
 		if (text === "") return;
 		inputHistory = [...inputHistory, text].slice(-100);
-		historyWriteChain = historyWriteChain.then(() => mkdir(dirname(historyPath), { recursive: true })).then(() => writeFile(historyPath, serializeHistoryList(inputHistory), "utf8")).catch((writeError) => {
+		historyWriteChain = historyWriteChain.then(() => mkdir(dirname(historyPath), { recursive: true })).then(() => appendFile(historyPath, historyLine(text), "utf8")).catch((writeError) => {
 			bridge.notify("history save failed: " + (writeError instanceof Error ? writeError.message : String(writeError)), "error");
 		});
 	};
@@ -36474,12 +37457,16 @@ async function run(ctx, startup, io) {
 		off();
 		for (const dispose of offCapabilitySync) dispose();
 		if (capabilitySyncTimer !== void 0) clearTimeout(capabilitySyncTimer);
-		mountRef.current?.unmount();
 		const currentSession = session;
 		const currentActive = active;
 		const report = (name, error) => {
 			internals.stderr.write(`dsh: quit ${name} failed: ${error instanceof Error ? error.message : String(error)}\n`);
 		};
+		try {
+			mountRef.current?.unmount();
+		} catch (error) {
+			report("unmount", error);
+		}
 		runQuitSequence([
 			...currentSession === void 0 || currentActive === void 0 ? [] : [{
 				name: "flush",
@@ -36543,6 +37530,11 @@ async function run(ctx, startup, io) {
 			bridge.notify(`command failed: ${error instanceof Error ? error.message : String(error)}`, "error");
 		});
 	};
+	/** Delivery serialization state: the chain's epoch pins it to one session. */
+	let deliveryChain = {
+		epoch: 0,
+		tail: Promise.resolve()
+	};
 	/** Deliver one trimmed line to the live session, expanding mentions first. */
 	const deliverLine = (line, mode, images = []) => {
 		const currentAgent = agent;
@@ -36558,6 +37550,13 @@ async function run(ctx, startup, io) {
 			bridge.notify(`invalid session reference: ${error instanceof Error ? error.message : String(error)}`, "error");
 			return;
 		}
+		if (deliveryChain.epoch !== epoch) deliveryChain = {
+			epoch,
+			tail: Promise.resolve()
+		};
+		const enqueueDelivery = (run) => {
+			deliveryChain.tail = deliveryChain.tail.then(run);
+		};
 		const atEpoch = epoch;
 		const deliver = (readable, context) => {
 			if (epoch !== atEpoch || agent !== currentAgent) return;
@@ -36578,19 +37577,19 @@ async function run(ctx, startup, io) {
 			}
 		};
 		if (parsed.references.length === 0) {
-			deliver(parsed.text);
+			enqueueDelivery(() => deliver(parsed.text));
 			return;
 		}
 		const controller = new AbortController();
 		pendingControllers.add(controller);
-		currentMentions.prepare(parsed, controller.signal).then((prepared) => {
+		enqueueDelivery(() => currentMentions.prepare(parsed, controller.signal).then((prepared) => {
 			pendingControllers.delete(controller);
 			deliver(prepared.text, prepared.additionalContext);
 		}, (error) => {
 			pendingControllers.delete(controller);
 			if (controller.signal.aborted || epoch !== atEpoch) return;
 			bridge.notify(`session reference failed: ${error instanceof Error ? error.message : String(error)}`, "error");
-		});
+		}));
 	};
 	const pendingInputs = [];
 	let creating = false;
@@ -36614,18 +37613,41 @@ async function run(ctx, startup, io) {
 					next.handle.dispose().catch(() => {});
 					return;
 				}
-				active = next;
-				agent = next.agent;
-				session = next.session;
-				store = next.store;
-				mentions = next.mentions;
-				subagents.reset();
-				pendingMode = void 0;
-				pendingPermission = void 0;
-				commands.setAgent(agent);
-				skills.setAgent(agent);
-				process.stdout.write("\x1B[r\x1B[0m\x1B[H\x1B[2J\x1B[3J\x1B[H");
-				renderCurrent();
+				const previous = {
+					active,
+					agent,
+					session,
+					store,
+					mentions
+				};
+				try {
+					active = next;
+					agent = next.agent;
+					session = next.session;
+					store = next.store;
+					mentions = next.mentions;
+					subagents.reset();
+					pendingMode = void 0;
+					pendingPermission = void 0;
+					commands.setAgent(agent);
+					skills.setAgent(agent);
+					process.stdout.write("\x1B[r\x1B[0m\x1B[H\x1B[2J\x1B[3J\x1B[H");
+					renderCurrent();
+				} catch (error) {
+					active = previous.active;
+					agent = previous.agent;
+					session = previous.session;
+					store = previous.store === void 0 ? createTranscriptStore() : previous.store;
+					mentions = previous.mentions === void 0 ? createMentions(ctx, void 0, cwd) : previous.mentions;
+					if (agent !== void 0) {
+						commands.setAgent(agent);
+						skills.setAgent(agent);
+					}
+					await next.handle.dispose().catch(() => {});
+					if (!quitting) renderCurrent();
+					bridge.notify(`session activation failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+					return;
+				}
 				abortPendingControllers();
 				epoch += 1;
 				const queued = pendingInputs.splice(0);
@@ -36639,9 +37661,9 @@ async function run(ctx, startup, io) {
 		});
 	};
 	/** Deliver one readable line to the agent, expanding session mentions first. */
-	const send = (text, mode, images = []) => {
-		const line = text.trim();
-		if (line === "" && images.length === 0) return;
+	const sendNow = (text, mode, images = []) => {
+		const line = submissionPayload(text);
+		if (line.trim() === "" && images.length === 0) return;
 		if (images.length === 0 && line.startsWith("/mode ")) {
 			switchModeAction(line.slice(6).trim()).then((selected) => bridge.notify(`mode → ${selected}`), (error) => bridge.notify(`mode switch failed: ${error instanceof Error ? error.message : String(error)}`, "error"));
 			return;
@@ -36666,6 +37688,14 @@ async function run(ctx, startup, io) {
 		}
 		deliverLine(line, mode, images);
 	};
+	const inputGate = new StartupInputGate(({ text, mode, images }) => sendNow(text, mode, images));
+	const send = (text, mode, images = []) => {
+		inputGate.submit({
+			text,
+			mode,
+			images
+		});
+	};
 	/** Dispatch one submitted line: slash commands to the registry, other text to the agent. */
 	const dispatch = (text, images = []) => {
 		send(text, "followup", images);
@@ -36920,14 +37950,14 @@ async function run(ctx, startup, io) {
 			session = next.session;
 			store = next.store;
 			mentions = next.mentions;
-			subagents.reset();
-			pendingMode = void 0;
-			pendingPermission = void 0;
 			commands.setAgent(agent);
 			skills.setAgent(agent);
 			try {
 				process.stdout.write("\x1B[r\x1B[0m\x1B[H\x1B[2J\x1B[3J\x1B[H");
 				renderCurrent();
+				subagents.reset();
+				pendingMode = void 0;
+				pendingPermission = void 0;
 			} catch (error) {
 				active = previous;
 				agent = previous?.agent;
@@ -36943,7 +37973,9 @@ async function run(ctx, startup, io) {
 			abortPendingControllers();
 			epoch += 1;
 			if (previous === void 0) {
-				bridge.notify(`${next.resumed ? "resumed" : "created"} ${next.session.id.slice(-12)} · mode ${next.mode}`);
+				setTimeout(() => {
+					bridge.notify(`${next.resumed ? "resumed" : "created"} ${next.session.id.slice(-12)} · mode ${next.mode}`);
+				}, 0);
 				return;
 			}
 			let cleanupWarning;
@@ -37019,10 +38051,6 @@ async function run(ctx, startup, io) {
 	};
 	const reviewChanges = (argument) => {
 		const currentAgent = agent;
-		if (currentAgent === void 0) {
-			bridge.notify("no session yet - submit a message to start", "warning");
-			return;
-		}
 		const atEpoch = epoch;
 		const reviewCwd = session?.header.cwd ?? cwd;
 		const controller = new AbortController();
@@ -37056,7 +38084,7 @@ async function run(ctx, startup, io) {
 			const text = argument.trim();
 			const atSeq = text === "" ? void 0 : Number(text);
 			if (text !== "" && (!Number.isSafeInteger(atSeq) || (atSeq ?? -1) < 0)) throw new Error("usage: /fork [event-seq]");
-			const seed = selectForkSeed(session.events, atSeq);
+			const seed = selectForkSeed(session.snapshotEvents(), atSeq);
 			const id = `session-${randomUUID()}`;
 			requestSwitch({
 				target: {
@@ -37112,7 +38140,7 @@ async function run(ctx, startup, io) {
 			branch: gitBranch(sessionCwd),
 			sessionId: session === void 0 ? "" : session.id.slice(-8),
 			resumed: active?.resumed ?? false,
-			mode: active?.mode ?? pendingMode ?? presets.defaultId,
+			mode: active?.mode ?? pendingMode ?? normalizePresetId(presets.defaultId),
 			permission,
 			dispatch,
 			steer,
@@ -37123,6 +38151,7 @@ async function run(ctx, startup, io) {
 			subscribeModelProviders: (listener) => subscribeProviderSettings(ctx, listener),
 			saveModelProviderCredential: (target, key) => saveProviderCredential(ctx, target, key),
 			saveModelProviderConfiguration: (target, configuration) => saveProviderConfiguration(ctx, target, configuration),
+			discoverModelProvider: (target, request, signal) => discoverProviderModels(ctx, target, request, signal),
 			unsetModelProviderCredential: (target) => unsetProviderCredential(ctx, target),
 			removeModelProvider: (target) => removeProviderSettings(ctx, target),
 			loadProviderAuthorizations: () => loadProviderAuthorizations(ctx),
@@ -37187,10 +38216,17 @@ async function run(ctx, startup, io) {
 	mountRef.current = io.mount(appElement());
 	if (startup.prompt !== void 0 || (startup.images?.length ?? 0) > 0) {
 		if ((startup.images?.length ?? 0) > 0) bridge.notify(`processing ${startup.images.length} startup image${startup.images.length === 1 ? "" : "s"}…`);
-		saveImagePaths(startup.images ?? [], ctx.get("attachments")).then((images) => {
+		inputGate.run(async (deliver) => {
+			const images = await saveImagePaths(startup.images ?? [], ctx.get("attachments"));
 			if (images.length > 0) bridge.notify(`${images.length} startup image${images.length === 1 ? "" : "s"} attached`);
-			send(startup.prompt ?? "", "followup", images);
-		}, (error) => bridge.notify(`initial prompt failed: ${error instanceof Error ? error.message : String(error)}`, "error"));
+			deliver({
+				text: startup.prompt ?? "",
+				mode: "followup",
+				images
+			});
+		}).catch((error) => {
+			bridge.notify(`initial prompt failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+		});
 	}
 	async function copyLastResponse() {
 		const text = latestAssistantText(store.getView());
@@ -37251,4 +38287,4 @@ function apply(ctx, config) {
 	});
 }
 //#endregion
-export { Config, apply, exportSessionIdSuffix, inject, name, resolveTarget, runQuitSequence };
+export { Config, StartupInputGate, apply, exportSessionIdSuffix, inject, name, resolveTarget, runQuitSequence };