skydive-cli 0.6.0-beta.16 → 0.6.0-beta.18

package/dist/js/{boot-BqjMpVtf.mjs → boot-BcyHfvnh.mjs}

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
-import { a as errorMessage, i as sendErrorMessage, n as errorDetail, o as isRecord, t as createRestClient } from "./rest-ToPnfmTk.mjs";
-import { C as DEFAULT_APP_URL, E as getConfigPath, K as saveTheme, L as recordDefaultAgent, M as getSavedTheme, S as DEFAULT_API_URL, U as resolveWebUrl, _ as parseConnectCard, c as actionableCardVerb, d as parseOauthConnectParams, f as prioritizeActionableCards, g as computeSettledLabel, h as composeQuestionAnswer, i as resolveAgent, j as getReviewStateDir, l as cardActionErrorMessage, m as resolveConnectUrl, p as reconcileMaskedInput, s as MASK_CHAR, u as parseExternalOauthConnectParams, v as specKeyFor } from "./print-CdbXPgQk.mjs";
-import { A as installAgentAlias, C as themeVersion, D as machineOsFromPlatform, F as detectShell, L as getActiveWorkspaceId, M as takenAliasNames, O as aliasActivationHint, S as themeModeFromColorFgBg, T as themesForMode, V as setActiveWorkspace, _ as monoTheme, a as WORDMARK, b as themeForMode, d as profilingEnabled, f as record, g as findTheme, h as applyTheme, i as MARK_CELLS, j as slugifyAliasName, k as dedupeAliasName, m as DEFAULT_THEME_ID, n as buildCrashReport, p as writeArtifact, r as writeCrashReport, s as splashFitsWidth, t as installCrashHandler, v as noColorRequested, x as themeMode, y as theme, z as listWorkspaces } from "./install-iZWrGKZJ.mjs";
+import { a as errorMessage, i as sendErrorMessage, n as errorDetail, o as isRecord, t as createRestClient } from "./rest-DZCq0tZw.mjs";
+import { C as DEFAULT_APP_URL, E as getConfigPath, K as saveTheme, L as recordDefaultAgent, M as getSavedTheme, S as DEFAULT_API_URL, U as resolveWebUrl, _ as parseConnectCard, c as actionableCardVerb, d as parseOauthConnectParams, f as prioritizeActionableCards, g as computeSettledLabel, h as composeQuestionAnswer, i as resolveAgent, j as getReviewStateDir, l as cardActionErrorMessage, m as resolveConnectUrl, p as reconcileMaskedInput, s as MASK_CHAR, u as parseExternalOauthConnectParams, v as specKeyFor } from "./print-CCXpClJw.mjs";
+import { A as installAgentAlias, C as themeVersion, D as machineOsFromPlatform, F as detectShell, L as getActiveWorkspaceId, M as takenAliasNames, O as aliasActivationHint, S as themeModeFromColorFgBg, T as themesForMode, V as setActiveWorkspace, _ as monoTheme, a as WORDMARK, b as themeForMode, d as profilingEnabled, f as record, g as findTheme, h as applyTheme, i as MARK_CELLS, j as slugifyAliasName, k as dedupeAliasName, m as DEFAULT_THEME_ID, n as buildCrashReport, p as writeArtifact, r as writeCrashReport, s as splashFitsWidth, t as installCrashHandler, v as noColorRequested, x as themeMode, y as theme, z as listWorkspaces } from "./install-Dvl9vzTP.mjs";
 import { t as HttpError } from "./http-error-BF2NZZE3.mjs";
 import { i as billingBlockedOutcomeFromSendResponse } from "./billing-blocked-D3l5kJlX.mjs";
-import { t as PortalClient } from "./client-CcN2hZil.mjs";
+import { t as PortalClient } from "./client-DG0vUvWI.mjs";
 import { t as defaultTlsCertSource } from "./tls-cert-Rua2oV7n.mjs";
 import "./api-BFQ4PQDA.mjs";
-import "./daemon-BioFi0dP.mjs";
+import "./daemon-rHe1xapN.mjs";
 import { t as SandboxStream } from "./client-l6orYfqq.mjs";
-import { t as PortalDaemonClient } from "./daemon-client-Bbjns6Wk.mjs";
+import { t as PortalDaemonClient } from "./daemon-client-D-k67MEB.mjs";
 import { t as runRawPtyPassthrough } from "./raw-pty-dndn1Kxc.mjs";
 import * as os$1 from "node:os";
 import { homedir, platform, release, tmpdir } from "node:os";
@@ -137,7 +137,6 @@ const useStore = create((set, get) => ({
 	toast: null,
 	seedPrompt: null,
 	autoGrantMachine: false,
-	newConversationIntent: false,
 	forcedOnboarding: false,
 	earlyInput: "",
 	goTo: (screen) => set({
@@ -221,20 +220,20 @@ const useStore = create((set, get) => ({
 /**
 * Decide the screen the chat TUI boots into.
 *
-* With no selector we open the agent picker — unless the config stores a
-* `defaultAgent`, in which case a bare `skydive chat` opens a fresh
-* conversation with that agent directly. The default is maintained
-* automatically (every conversation the TUI opens records its agent, so a
-* bare launch returns to whoever you talked to last — the dominant launch
-* pattern), and `skydive config set defaultAgent` can seed or override it. A
-* stored selector that no longer resolves degrades silently to the agent
-* picker rather than an error screen: config goes stale (agent renamed,
-* archived, another one claiming the same name), and unlike a mistyped
-* `--agent` there is no command line to correct — and picking an agent
-* there heals the default on its own.
+* With no selector we open the welcome screen (screen 1 of the three-screen
+* flow) — unless the config stores a `defaultAgent`, in which case a bare
+* `skydive chat` opens that agent's conversation home directly (its centered
+* composer + conversation list). The default is maintained automatically
+* (every conversation the TUI opens records its agent, so a bare launch
+* returns to whoever you talked to last — the dominant launch pattern), and
+* `skydive config set defaultAgent` can seed or override it. A stored selector that no longer resolves degrades silently
+* to the welcome screen rather than an error screen: config goes stale (agent
+* renamed, archived, another one claiming the same name), and unlike a
+* mistyped `--agent` there is no command line to correct — and picking an
+* agent there heals the default on its own.
 *
 * With `--agent` (`skydive chat --agent grace`, no `-p`) we resolve it
-* against the org roster and open that agent's conversation list, skipping
+* against the org roster and open that agent's conversation home, skipping
 * the picker. Resolution reuses the same `resolveAgent` rules as the `-p`
 * path so a given selector behaves identically in both modes: an id, or a
 * unique case-insensitive slug/name; ambiguous or unknown selectors throw
@@ -251,8 +250,9 @@ const useStore = create((set, get) => ({
 * needs every candidate is disambiguating a fuzzy name/slug selector; an id
 * (or the `--resume` conversation's agentId) is exact and resolves with a
 * single `getAgent`, and `--new` with no selector only needs "exactly one
-* agent, or not", which a two-row page answers. A large org must never sit on
-* the `connecting…` splash while the roster streams in.
+* agent, or not", which a two-row page answers. A bare launch lands straight
+* on the welcome screen, which loads the roster itself. A large org must never
+* sit on the `connecting…` splash while the roster streams in.
 *
 * Kept out of the React component so it's unit-testable under Node (the
 * component itself can't render without Bun + OpenTUI).
@@ -262,7 +262,7 @@ const useStore = create((set, get) => ({
 * org roster. A name/slug selector is the only case that can be ambiguous and
 * therefore still needs the full candidate list to disambiguate. */
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-async function resolveInitialScreen({ rest, agentSelector, conversationId, newConversation, defaultAgentSelector, forceOnboarding }) {
+async function resolveInitialScreen({ rest, agentSelector, conversationId, newConversation, seedPrompt, defaultAgentSelector, forceOnboarding }) {
 	if (conversationId) {
 		const conversation = await rest.getConversation({ conversationId }).catch((err) => {
 			if (err instanceof HttpError && err.status === 404) throw new Error(`No conversation with id ${conversationId}. It may have been deleted, or belong to another workspace.`);
@@ -294,14 +294,8 @@ async function resolveInitialScreen({ rest, agentSelector, conversationId, newCo
 			parentConversationId: conversation.parentConversationId ?? null
 		};
 	}
-	if (forceOnboarding && !agentSelector) return { kind: "first-run" };
-	if (!agentSelector && !newConversation && !defaultAgentSelector) {
-		if ((await rest.listAgents({
-			scope: "org",
-			onPage: null
-		})).length === 0) return { kind: "first-run" };
-		return { kind: "agent-picker" };
-	}
+	if (forceOnboarding && !agentSelector) return { kind: "welcome" };
+	if (!agentSelector && !newConversation && seedPrompt === null && !defaultAgentSelector) return { kind: "welcome" };
 	if (!agentSelector && defaultAgentSelector) {
 		const agent = UUID_RE.test(defaultAgentSelector) ? await rest.getAgent({ agentId: defaultAgentSelector }).catch((err) => {
 			if (err instanceof HttpError && (err.status === 404 || err.status === 403)) return null;
@@ -310,31 +304,13 @@ async function resolveInitialScreen({ rest, agentSelector, conversationId, newCo
 			scope: "org",
 			onPage: null
 		}), defaultAgentSelector);
-		if (agent) return newChat(agent);
-		return { kind: "agent-picker" };
-	}
-	if (agentSelector && UUID_RE.test(agentSelector)) {
-		const agent = await rest.getAgent({ agentId: agentSelector }).catch((err) => {
-			if (err instanceof HttpError && (err.status === 404 || err.status === 403)) throw new Error(`No agent with id ${agentSelector}. It may not exist, or belong to another workspace.`);
-			throw err;
-		});
-		if (newConversation) return {
-			kind: "chat",
-			agent,
-			attachRunId: null,
-			parentConversationId: null,
-			conversation: {
-				kind: "new",
-				agentId: agent.id,
-				nonce: crypto.randomUUID()
-			}
-		};
-		return {
-			kind: "conversation-picker",
-			agent,
-			initialQuery: ""
-		};
+		if (agent) return openAgentHome(agent, seedPrompt);
+		return { kind: "welcome" };
 	}
+	if (agentSelector && UUID_RE.test(agentSelector)) return openAgentHome(await rest.getAgent({ agentId: agentSelector }).catch((err) => {
+		if (err instanceof HttpError && (err.status === 404 || err.status === 403)) throw new Error(`No agent with id ${agentSelector}. It may not exist, or belong to another workspace.`);
+		throw err;
+	}), seedPrompt);
 	if (!agentSelector && newConversation) {
 		const firstTwo = await rest.listAgents({
 			scope: "org",
@@ -342,14 +318,24 @@ async function resolveInitialScreen({ rest, agentSelector, conversationId, newCo
 			limit: 2
 		});
 		const only = firstTwo.length === 1 ? firstTwo[0] : null;
-		if (!only) return { kind: "agent-picker" };
-		return newChat(only);
+		if (!only) return { kind: "welcome" };
+		return openAgentHome(only, seedPrompt);
 	}
-	const agent = resolveAgent(await rest.listAgents({
+	return openAgentHome(resolveAgent(await rest.listAgents({
 		scope: "org",
 		onPage: null
-	}), agentSelector);
-	if (newConversation) return newChat(agent);
+	}), agentSelector), seedPrompt);
+}
+/**
+* Land on the agent's conversation home — the single new-conversation surface
+* (centered composer + conversation list). The one exception is a seeded
+* launch (`skydive import`): there is a message queued to auto-send, so boot
+* straight into a fresh chat (`kind: 'new'`) that fires it. Without a seed
+* there is nothing to send, so the composer on the home is where a new
+* conversation starts — the legacy full-width empty-chat landing is gone.
+*/
+function openAgentHome(agent, seedPrompt) {
+	if (seedPrompt !== null) return newChat(agent);
 	return {
 		kind: "conversation-picker",
 		agent,
@@ -1831,9 +1817,7 @@ function screenLabelParts(screen, chatTitle) {
 	switch (screen.kind) {
 		case "splash": return { title: "" };
 		case "error": return { title: "" };
-		case "agent-picker": return { title: "pick an agent" };
-		case "agent-create": return { title: "create an agent" };
-		case "first-run": return { title: "welcome" };
+		case "welcome": return { title: "welcome" };
 		case "workspace-picker": return { title: "switch workspace" };
 		case "conversation-picker": return {
 			title: "pick a conversation",
@@ -2103,26 +2087,185 @@ function SkydiveMark({ variant = "full" }) {
 }
 
 //#endregion
-//#region src/chat/tui/screens/agent-picker.tsx
-function AgentPickerScreen() {
+//#region src/chat/tui/use-terminal-ready.ts
+/**
+* The 80x24 size the CLI renderer boots on when it cannot read the terminal's
+* real size synchronously (emulators / multiplexers that report size via an
+* async `resize` after start). A terminal reporting its size synchronously
+* boots on its true size instead — which is almost never exactly 80x24. See
+* `@opentui/core`: the renderer seeds width from `process.stdout.columns || 80`
+* and height from `process.stdout.rows || 24`.
+*/
+const FALLBACK_WIDTH = 80;
+const FALLBACK_HEIGHT = 24;
+/**
+* Last-resort reveal delay for the ambiguous fallback boot (booted 80x24 with
+* no readable `process.stdout` size and no resize ever arriving — a non-tty
+* pipe, say). It is deliberately longer than the renderer's 100ms resize
+* debounce (`resizeDebounceDelay`), so a real async terminal's first resize
+* always wins this race and the brand's first *visible* paint is at the true
+* width. On the genuinely-80x24 path this timer never runs (we reveal from
+* `stdout.columns`), so its length costs a real terminal nothing.
+*/
+const REVEAL_FALLBACK_MS = 250;
+/** The terminal's real column/row count if the tty reports it synchronously,
+* else null. On an async-sizing emulator `process.stdout.columns` is populated
+* shortly after boot even while the renderer is still on its 80x24 fallback, so
+* this is the cheapest way to learn the true size without waiting on the
+* debounced resize. A non-tty (pipe/redirect) has no size and returns null. */
+function stdoutSize() {
+	const width = process.stdout.columns;
+	const height = process.stdout.rows;
+	return typeof width === "number" && typeof height === "number" ? {
+		width,
+		height
+	} : null;
+}
+/**
+* Terminal dimensions plus a `ready` flag that gates the first centered paint,
+* to kill the welcome screen's left→center brand flash (PR #20856).
+*
+* `useTerminalDimensions` seeds from `renderer.width`/`height`. A terminal that
+* reports its size synchronously already has the real size on frame one, so
+* `ready` starts true and nothing is gated — no flash is possible because the
+* width never changes.
+*
+* A terminal that sizes asynchronously (tmux, cmux, some emulators) boots on
+* the 80x24 fallback and the real size lands via `resize` — but the renderer
+* DEBOUNCES that resize by 100ms, so a naive "reveal on the next tick" reveals
+* the brand centered-within-80 first and only jumps it to the real width a
+* tenth of a second later: exactly the flash reviewers saw. So on a fallback
+* boot we hold a blank full-size frame and reveal only once we actually know
+* the final width, from one of three signals, in order:
+*
+*   1. `process.stdout.columns` — the OS-reported tty size, populated well
+*      before the debounced resize fires. If it reports a size other than
+*      80x24, that is the truth and the imminent resize will bring it, so we
+*      stay gated until the resize actually lands (the width the brand centers
+*      within must be the one on screen). If it reports exactly 80x24, the
+*      terminal really is 80 wide — the 80-col centering is already final, so
+*      reveal immediately with no flash.
+*   2. the `resize` event — the definitive real size for an async terminal;
+*      reveal the instant it arrives, already at the final width.
+*   3. a `REVEAL_FALLBACK_MS` timer — only for a non-tty with no size and no
+*      resize (a pipe), so it is never left blank forever. Longer than the
+*      100ms debounce so a real resize always beats it.
+*/
+function useTerminalReady() {
+	const { width, height } = useTerminalDimensions();
+	const renderer = useRenderer();
+	const bootedOnFallback = width === FALLBACK_WIDTH && height === FALLBACK_HEIGHT;
+	const [ready, setReady] = useState(() => {
+		if (!bootedOnFallback) return true;
+		const size = stdoutSize();
+		return size?.width === FALLBACK_WIDTH && size?.height === FALLBACK_HEIGHT;
+	});
+	useEffect(() => {
+		if (ready) return;
+		let done = false;
+		const settle = () => {
+			if (done) return;
+			done = true;
+			setReady(true);
+		};
+		renderer.on("resize", settle);
+		const size = stdoutSize();
+		if (size?.width === FALLBACK_WIDTH && size?.height === FALLBACK_HEIGHT) settle();
+		const t = setTimeout(settle, REVEAL_FALLBACK_MS);
+		return () => {
+			renderer.off("resize", settle);
+			clearTimeout(t);
+		};
+	}, [renderer, ready]);
+	return {
+		width,
+		height,
+		ready
+	};
+}
+
+//#endregion
+//#region src/chat/tui/agent-name.ts
+function parseAgentName(value) {
+	const name = value.trim();
+	if (!name) return {
+		ok: false,
+		message: "Enter a name."
+	};
+	if (name.length > 120) return {
+		ok: false,
+		message: "Use 120 characters or fewer."
+	};
+	return {
+		ok: true,
+		name
+	};
+}
+
+//#endregion
+//#region src/chat/tui/screens/welcome.tsx
+/**
+* Screen 1 of the three-screen chat flow: **Welcome to Skydive**.
+*
+* A single centered screen (opencode fixed-width column) that is the entry
+* point whenever no agent is pinned. It folds together what used to be three
+* separate screens — the agent picker, the create-agent form, and the
+* first-run onboarding — so the flow is exactly: welcome → agent page → chat.
+*
+* Modes, all rendered in the same centered column:
+* - `list`: the workspace's agents, fuzzy-filterable. Enter opens the
+*   highlighted agent's home (the agent page); tab flips mine/all scope;
+*   ctrl+n switches to `create`; ctrl+w opens the workspace picker.
+* - `create`: an inline name field (prefilled from the server's suggestion).
+*   Enter creates the agent, then offers a shell alias before opening it.
+* - `first-run`: reached automatically when the workspace has no agents at
+*   all — auto-creates the account's first agent (server-named, like web
+*   onboarding) and offers to have it learn from this machine's coding-agent
+*   setup before dropping the user into its chat.
+*
+* Everything is centered both axes so a wide terminal gets even margins
+* instead of content stranded top-left.
+*/
+const CONTENT_MAX_COLS = 76;
+/**
+* Where to land after creating an agent (create mode / first-run). The
+* conversation home (centered composer + list) is the single new-conversation
+* surface, so a freshly created agent opens straight into its home. The one
+* exception is a seeded launch (`skydive import`): there is a message queued
+* to auto-send, so boot into a fresh chat (`kind: 'new'`) that fires it. A
+* brand-new agent has no conversations yet, so its home is just the composer
+* over an empty list — which is exactly the "start talking" prompt we want.
+*/
+function openAgentAfterCreate(agent) {
+	if (useStore.getState().seedPrompt !== null) return {
+		kind: "chat",
+		agent,
+		attachRunId: null,
+		parentConversationId: null,
+		conversation: {
+			kind: "new",
+			agentId: agent.id,
+			nonce: crypto.randomUUID()
+		}
+	};
+	return {
+		kind: "conversation-picker",
+		agent,
+		initialQuery: ""
+	};
+}
+function WelcomeScreen() {
 	const rest = useStore((s) => s.rest);
 	const goTo = useStore((s) => s.goTo);
 	const fail = useStore((s) => s.fail);
+	const forcedOnboarding = useStore((s) => s.forcedOnboarding);
 	const [scope, setScope] = useState("mine");
 	const [cache, setCache] = useState({});
 	const [state, setState] = useState({ kind: "loading" });
-	useKeyboard((key) => {
-		if (key.name === "w" && key.ctrl) {
-			if (useStore.getState().authKind === "api-key") {
-				useStore.getState().showToast({ message: "API keys are pinned to one workspace. Run `skydive auth login --web` to switch workspaces." });
-				return;
-			}
-			goTo({ kind: "workspace-picker" });
-		} else if (key.name === "n" && key.ctrl) goTo({ kind: "agent-create" });
-		else if (key.name === "tab") setScope((s) => s === "mine" ? "org" : "mine");
-	});
+	const [mode, setMode] = useState(forcedOnboarding ? { kind: "first-run" } : { kind: "list" });
 	useEffect(() => {
 		if (!rest) return;
+		if (mode.kind !== "list") return;
 		const cached = cache[scope];
 		if (cached) {
 			setState({
@@ -2153,6 +2296,15 @@ function AgentPickerScreen() {
 					kind: "ready",
 					agents
 				});
+				if (agents.length === 0 && scope === "mine") {
+					const org = await rest.listAgents({
+						scope: "org",
+						onPage: null
+					});
+					if (cancelled) return;
+					if (org.length === 0) setMode({ kind: "first-run" });
+					else setScope("org");
+				}
 			} catch (err) {
 				if (cancelled) return;
 				if (err instanceof HttpError && err.status === 401) {
@@ -2172,56 +2324,124 @@ function AgentPickerScreen() {
 		rest,
 		fail,
 		scope,
-		cache
+		cache,
+		mode.kind
 	]);
-	const { width, height } = useTerminalDimensions();
-	if (state.kind === "loading") return /* @__PURE__ */ jsxs("box", {
+	if (mode.kind === "create") return /* @__PURE__ */ jsx(CreateAgentMode, { onCancel: () => setMode({ kind: "list" }) });
+	if (mode.kind === "first-run") return /* @__PURE__ */ jsx(FirstRunMode, {});
+	return /* @__PURE__ */ jsx(AgentListMode, {
+		state,
+		scope,
+		onToggleScope: () => setScope((s) => s === "mine" ? "org" : "mine"),
+		onCreate: () => setMode({ kind: "create" }),
+		onSwitchWorkspace: () => {
+			if (useStore.getState().authKind === "api-key") {
+				useStore.getState().showToast({ message: "API keys are pinned to one workspace. Run `skydive auth login --web` to switch workspaces." });
+				return;
+			}
+			goTo({ kind: "workspace-picker" });
+		},
+		onPick: goTo
+	});
+}
+/** The centered welcome frame every mode renders inside: the brand mark and a
+* "Welcome to Skydive" heading over the mode's own content, in a fixed-width
+* column centered on both axes.
+*
+* The first paint is GATED on the terminal's real size being known (`ready`).
+* The renderer boots on an 80x24 fallback when the emulator reports its size
+* asynchronously (tmux and friends), so an ungated screen centers the brand
+* within 80 cols first, then jumps to centered-within-the-real-width once the
+* size lands — the "weird flashing transition" from left to center reviewers
+* see. Crucially the renderer DEBOUNCES that resize by 100ms, so revealing on
+* the next tick would still flash; `useTerminalReady` instead reveals from the
+* OS-reported `process.stdout` size or the resize event itself, whichever
+* confirms the true width first. While `ready` is false we hold a blank but
+* full-size, same-background frame, so the brand's first *visible* paint is
+* already at its final centered position and never reflows. The home
+* (conversation-picker) and the empty-chat splash gate the same way, so the
+* flash is fixed on every brand-centered surface the launch flow can land on.
+* See `useTerminalReady`. */
+function WelcomeFrame({ contentWidth, children }) {
+	const { width, height, ready } = useTerminalReady();
+	if (!ready) return /* @__PURE__ */ jsx("box", { style: {
+		flexDirection: "column",
+		flexGrow: 1
+	} });
+	return /* @__PURE__ */ jsxs("box", {
 		style: {
 			flexDirection: "column",
-			flexGrow: 1
+			flexGrow: 1,
+			alignItems: "center"
 		},
-		children: [/* @__PURE__ */ jsx(BrandHeader, {
-			height,
-			width
-		}), /* @__PURE__ */ jsx("text", {
+		children: [
+			/* @__PURE__ */ jsx("box", { style: {
+				flexGrow: 1,
+				flexShrink: 1
+			} }),
+			/* @__PURE__ */ jsxs("box", {
+				style: {
+					flexDirection: "column",
+					width: contentWidth
+				},
+				children: [/* @__PURE__ */ jsxs("box", {
+					style: {
+						flexDirection: "column",
+						alignItems: "center"
+					},
+					children: [/* @__PURE__ */ jsx(BrandHeader, {
+						height,
+						width
+					}), height >= 24 ? /* @__PURE__ */ jsxs("box", {
+						style: {
+							flexDirection: "column",
+							alignItems: "center"
+						},
+						children: [/* @__PURE__ */ jsx("text", {
+							fg: theme.accent,
+							attributes: 1,
+							children: "Welcome to Skydive"
+						}), /* @__PURE__ */ jsx("box", { style: { height: 1 } })]
+					}) : null]
+				}), children]
+			}),
+			/* @__PURE__ */ jsx("box", { style: {
+				flexGrow: 1,
+				flexShrink: 1
+			} })
+		]
+	});
+}
+function AgentListMode({ state, scope, onToggleScope, onCreate, onSwitchWorkspace, onPick }) {
+	const { width } = useTerminalDimensions();
+	const contentWidth = Math.min(CONTENT_MAX_COLS, Math.max(1, width - 2));
+	if (state.kind === "loading") return /* @__PURE__ */ jsx(WelcomeFrame, {
+		contentWidth,
+		children: /* @__PURE__ */ jsx("text", {
 			fg: theme.muted,
 			children: "loading agents…"
-		})]
+		})
 	});
-	if (state.kind === "error") return /* @__PURE__ */ jsxs("box", {
-		style: {
-			flexDirection: "column",
-			flexGrow: 1
-		},
-		children: [/* @__PURE__ */ jsx(BrandHeader, {
-			height,
-			width
-		}), /* @__PURE__ */ jsxs("text", {
+	if (state.kind === "error") return /* @__PURE__ */ jsx(WelcomeFrame, {
+		contentWidth,
+		children: /* @__PURE__ */ jsxs("text", {
 			fg: theme.error,
 			children: ["error: ", state.message]
-		})]
-	});
-	if (state.agents.length === 0) return /* @__PURE__ */ jsxs("box", {
-		style: {
-			flexDirection: "column",
-			flexGrow: 1
-		},
-		children: [/* @__PURE__ */ jsx(BrandHeader, {
-			height,
-			width
-		}), /* @__PURE__ */ jsx("text", {
-			fg: theme.muted,
-			children: scope === "mine" ? "no agents of yours yet. press tab to see all agents, ctrl+w to switch workspace, or ctrl+n to create one." : "no agents in this workspace. press ctrl+w to switch workspace, or ctrl+n to create one."
-		})]
+		})
 	});
 	return /* @__PURE__ */ jsx(FilterableAgentList, {
 		agents: state.agents,
 		scope,
-		onPick: goTo
+		contentWidth,
+		onToggleScope,
+		onCreate,
+		onSwitchWorkspace,
+		onPick
 	});
 }
-function FilterableAgentList({ agents, scope, onPick }) {
+function FilterableAgentList({ agents, scope, contentWidth, onToggleScope, onCreate, onSwitchWorkspace, onPick }) {
 	const { width, height } = useTerminalDimensions();
+	const composerRef = useRef(null);
 	const [query, setQuery] = useState("");
 	const [highlight, setHighlight] = useState(0);
 	useEffect(() => {
@@ -2230,87 +2450,100 @@ function FilterableAgentList({ agents, scope, onPick }) {
 	const hits = fuzzyFilter(query, agents, agentKeys);
 	const filtered = hits.map((h) => h.item);
 	const clamped = Math.min(highlight, Math.max(0, filtered.length - 1));
-	const visibleRows = Math.max(3, height - 6 - brandHeaderRows(height, width));
+	const identityRows = height >= 24 ? 2 : 0;
+	const visibleRows = Math.max(3, height - 8 - brandHeaderRows(height, width) - identityRows);
 	const start = windowStart(clamped, filtered.length, visibleRows);
 	const windowed = hits.slice(start, start + visibleRows);
+	const openAgent = () => {
+		const agent = filtered[clamped];
+		if (!agent) return;
+		onPick(useStore.getState().seedPrompt !== null ? {
+			kind: "chat",
+			agent,
+			attachRunId: null,
+			parentConversationId: null,
+			conversation: {
+				kind: "new",
+				agentId: agent.id,
+				nonce: crypto.randomUUID()
+			}
+		} : {
+			kind: "conversation-picker",
+			agent,
+			initialQuery: ""
+		});
+	};
 	useKeyboard((key) => {
-		if (key.name === "up") setHighlight(Math.max(0, clamped - 1));
-		else if (key.name === "down") setHighlight(Math.min(Math.max(0, filtered.length - 1), clamped + 1));
-		else if (key.name === "pageup" || key.name === "pgup") setHighlight(Math.max(0, clamped - Math.max(1, visibleRows - 1)));
-		else if (key.name === "pagedown" || key.name === "pgdn") setHighlight(Math.min(Math.max(0, filtered.length - 1), clamped + Math.max(1, visibleRows - 1)));
-		else if (key.name === "return") {
-			const agent = filtered[clamped];
-			if (!agent) return;
-			const store = useStore.getState();
-			onPick(store.seedPrompt !== null || store.newConversationIntent ? {
-				kind: "chat",
-				agent,
-				attachRunId: null,
-				parentConversationId: null,
-				conversation: {
-					kind: "new",
-					agentId: agent.id,
-					nonce: crypto.randomUUID()
-				}
-			} : {
-				kind: "conversation-picker",
-				agent,
-				initialQuery: ""
-			});
+		if (key.name === "up") {
+			setHighlight(Math.max(0, clamped - 1));
+			key.preventDefault();
+		} else if (key.name === "down") {
+			setHighlight(Math.min(Math.max(0, filtered.length - 1), clamped + 1));
+			key.preventDefault();
+		} else if (key.name === "pageup" || key.name === "pgup") {
+			setHighlight(Math.max(0, clamped - Math.max(1, visibleRows - 1)));
+			key.preventDefault();
+		} else if (key.name === "pagedown" || key.name === "pgdn") {
+			setHighlight(Math.min(Math.max(0, filtered.length - 1), clamped + Math.max(1, visibleRows - 1)));
+			key.preventDefault();
+		} else if (key.name === "n" && key.ctrl) {
+			onCreate();
+			key.preventDefault();
+		} else if (key.name === "w" && key.ctrl) {
+			onSwitchWorkspace();
+			key.preventDefault();
+		} else if (key.name === "tab") {
+			onToggleScope();
+			key.preventDefault();
 		}
 	});
-	return /* @__PURE__ */ jsxs("box", {
-		style: {
-			flexDirection: "column",
-			flexGrow: 1
-		},
+	const empty = agents.length === 0;
+	return /* @__PURE__ */ jsxs(WelcomeFrame, {
+		contentWidth,
 		children: [
-			/* @__PURE__ */ jsx(BrandHeader, {
-				height,
-				width
-			}),
-			/* @__PURE__ */ jsxs("box", {
+			/* @__PURE__ */ jsx("box", {
 				style: {
-					flexDirection: "row",
-					height: 1
+					border: true,
+					borderColor: theme.faint,
+					paddingLeft: 1,
+					paddingRight: 1,
+					height: 3,
+					flexShrink: 0,
+					flexDirection: "column"
 				},
-				children: [/* @__PURE__ */ jsx("text", {
-					fg: theme.muted,
-					children: "search "
-				}), /* @__PURE__ */ jsx("input", {
+				children: /* @__PURE__ */ jsx("textarea", {
+					ref: composerRef,
 					textColor: theme.fg,
 					focusedTextColor: theme.fg,
 					cursorColor: theme.cursor,
 					placeholderColor: theme.dim,
-					placeholder: "type to filter…",
-					focused: true,
-					width: Math.max(10, width - 12),
-					onInput: (value) => {
-						setQuery(value);
+					placeholder: "Search agents…",
+					keyBindings: searchKeyBindings,
+					onContentChange: () => {
+						setQuery(composerRef.current?.plainText ?? "");
 						setHighlight(0);
+					},
+					onSubmit: openAgent,
+					focused: true,
+					style: {
+						height: 1,
+						wrapMode: "word"
 					}
-				})]
+				})
 			}),
-			/* @__PURE__ */ jsxs("text", {
+			/* @__PURE__ */ jsx("text", {
 				fg: theme.dim,
-				children: [
-					filtered.length,
-					"/",
-					agents.length,
-					" · ",
-					scope === "mine" ? "mine" : "all",
-					" ",
-					"· tab ",
-					scope === "mine" ? "all" : "mine",
-					" · ↑/↓ move · ↵ open · ctrl+w workspace · ctrl+n new"
-				]
+				children: truncate(`${scope === "mine" ? "mine" : "all agents"} · ↵ open · ctrl+n new agent · tab ${scope === "mine" ? "all" : "mine"} · ctrl+w workspace`, contentWidth)
 			}),
 			/* @__PURE__ */ jsx("box", {
 				style: {
 					flexDirection: "column",
-					flexGrow: 1
+					flexShrink: 0
 				},
-				children: windowed.length === 0 ? /* @__PURE__ */ jsxs("text", {
+				children: empty ? /* @__PURE__ */ jsx("text", {
+					fg: theme.muted,
+					children: truncate(scope === "mine" ? "no agents of yours yet — press ctrl+n to create one, or tab to see all agents." : "no agents in this workspace — press ctrl+n to create one, or ctrl+w to switch workspace.", contentWidth)
+				}) : windowed.length === 0 ? /* @__PURE__ */ jsxs("text", {
 					fg: theme.muted,
 					children: [
 						"no agents match “",
@@ -2339,45 +2572,12 @@ function FilterableAgentList({ agents, scope, onPick }) {
 		]
 	});
 }
-const agentKeys = [
-	{
-		get: (a) => a.name,
-		weight: 1
-	},
-	{
-		get: (a) => a.slug ?? "",
-		weight: .6
-	},
-	{
-		get: (a) => a.title ?? "",
-		weight: .4
-	}
-];
-
-//#endregion
-//#region src/chat/tui/agent-name.ts
-function parseAgentName(value) {
-	const name = value.trim();
-	if (!name) return {
-		ok: false,
-		message: "Enter a name."
-	};
-	if (name.length > 120) return {
-		ok: false,
-		message: "Use 120 characters or fewer."
-	};
-	return {
-		ok: true,
-		name
-	};
-}
-
-//#endregion
-//#region src/chat/tui/screens/agent-create.tsx
-function AgentCreateScreen() {
+function CreateAgentMode({ onCancel }) {
 	const rest = useStore((s) => s.rest);
 	const goTo = useStore((s) => s.goTo);
 	const fail = useStore((s) => s.fail);
+	const { width } = useTerminalDimensions();
+	const contentWidth = Math.min(CONTENT_MAX_COLS, Math.max(1, width - 2));
 	const [name, setName] = useState("");
 	const [state, setState] = useState({ kind: "idle" });
 	useEffect(() => {
@@ -2392,17 +2592,7 @@ function AgentCreateScreen() {
 		};
 	}, [rest]);
 	const openChat = (agent) => {
-		goTo({
-			kind: "chat",
-			agent,
-			attachRunId: null,
-			parentConversationId: null,
-			conversation: {
-				kind: "new",
-				agentId: agent.id,
-				nonce: crypto.randomUUID()
-			}
-		});
+		goTo(openAgentAfterCreate(agent));
 	};
 	const acceptAlias = (agent, alias) => {
 		try {
@@ -2441,7 +2631,7 @@ function AgentCreateScreen() {
 			openChat(state.agent);
 			return;
 		}
-		if (key.name === "escape" && state.kind !== "creating") goTo({ kind: "agent-picker" });
+		if (key.name === "escape" && state.kind !== "creating") onCancel();
 	});
 	const createAgent = async () => {
 		if (!rest || state.kind === "creating") return;
@@ -2468,51 +2658,25 @@ function AgentCreateScreen() {
 				fail("Session expired. Run `skydive auth login --web`, then retry.");
 				return;
 			}
-			if (err instanceof HttpError && err.status === 403) {
-				setState({
-					kind: "error",
-					message: "You don't have permission to create an agent here."
-				});
-				return;
-			}
-			if (err instanceof HttpError && err.status === 400) {
-				setState({
-					kind: "error",
-					message: "Skydive could not create this agent. Check your active workspace and try again."
-				});
-				return;
-			}
-			if (err instanceof HttpError && err.status === 409) {
-				setState({
-					kind: "error",
-					message: "That name is unavailable. Choose another name and try again."
-				});
-				return;
-			}
-			if (err instanceof HttpError && err.status === 429) {
-				setState({
-					kind: "error",
-					message: "Too many requests. Wait a moment and try again."
-				});
-				return;
-			}
 			setState({
 				kind: "error",
-				message: err instanceof HttpError ? "Skydive could not create the agent. Try again in a moment." : "Could not reach Skydive. Check your connection and try again."
+				message: createErrorMessage(err)
 			});
 		}
 	};
-	if (state.kind === "offer-alias") return /* @__PURE__ */ jsx(AliasOffer, {
-		agentName: state.agent.name,
-		alias: state.alias
+	if (state.kind === "offer-alias") return /* @__PURE__ */ jsx(WelcomeFrame, {
+		contentWidth,
+		children: /* @__PURE__ */ jsx(AliasOffer, {
+			agentName: state.agent.name,
+			alias: state.alias
+		})
 	});
-	if (state.kind === "aliased") return /* @__PURE__ */ jsx(AliasResult, { message: state.message });
-	return /* @__PURE__ */ jsxs("box", {
-		style: {
-			flexDirection: "column",
-			flexGrow: 1,
-			gap: 1
-		},
+	if (state.kind === "aliased") return /* @__PURE__ */ jsx(WelcomeFrame, {
+		contentWidth,
+		children: /* @__PURE__ */ jsx(AliasResult, { message: state.message })
+	});
+	return /* @__PURE__ */ jsxs(WelcomeFrame, {
+		contentWidth,
 		children: [
 			/* @__PURE__ */ jsx("text", {
 				fg: theme.fg,
@@ -2522,6 +2686,7 @@ function AgentCreateScreen() {
 				fg: theme.muted,
 				children: "Choose a name. You can change it later."
 			}),
+			/* @__PURE__ */ jsx("box", { style: { height: 1 } }),
 			/* @__PURE__ */ jsx("box", {
 				style: {
 					border: true,
@@ -2568,7 +2733,6 @@ function AliasOffer({ agentName, alias }) {
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
 			flexDirection: "column",
-			flexGrow: 1,
 			gap: 1
 		},
 		children: [
@@ -2600,7 +2764,6 @@ function AliasResult({ message }) {
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
 			flexDirection: "column",
-			flexGrow: 1,
 			gap: 1
 		},
 		children: [/* @__PURE__ */ jsx("text", {
@@ -2612,22 +2775,14 @@ function AliasResult({ message }) {
 		})]
 	});
 }
-
-//#endregion
-//#region src/chat/tui/screens/first-run.tsx
-/** Rows the mark lockup needs before it's worth painting (matches the
-* new-chat splash): the 6-row mark, a spacer, and a couple of content rows.
-* Below this the mark is dropped and only the message renders. */
-const MARK_MIN_ROWS$1 = 12;
-/** Columns the full mark + wordmark lockup spans; below this the pinwheel
-* mark renders alone instead of wrapping the wordmark. */
-const FULL_MARK_MIN_COLS$1 = 70;
-function FirstRunScreen() {
+function FirstRunMode() {
 	const rest = useStore((s) => s.rest);
 	const goTo = useStore((s) => s.goTo);
 	const fail = useStore((s) => s.fail);
 	const authKind = useStore((s) => s.authKind);
 	const forced = useStore((s) => s.forcedOnboarding);
+	const { width } = useTerminalDimensions();
+	const contentWidth = Math.min(CONTENT_MAX_COLS, Math.max(1, width - 2));
 	const [state, setState] = useState({ kind: "creating" });
 	const canShareMachine = authKind === "session";
 	useEffect(() => {
@@ -2658,17 +2813,7 @@ function FirstRunScreen() {
 		};
 	}, [rest, fail]);
 	const openNewChat = (agent) => {
-		goTo({
-			kind: "chat",
-			agent,
-			attachRunId: null,
-			parentConversationId: null,
-			conversation: {
-				kind: "new",
-				agentId: agent.id,
-				nonce: crypto.randomUUID()
-			}
-		});
+		goTo(openAgentAfterCreate(agent));
 	};
 	const openOnboardingChat = (agent, conversationId, title, attachRunId) => {
 		const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -2740,84 +2885,100 @@ function FirstRunScreen() {
 		if (key.name === "return" || key.name === "y") acceptImport(state.agent);
 		else if (key.name === "n" || key.name === "escape") declineImport(state.agent);
 	});
-	return /* @__PURE__ */ jsx(Centered, { children: renderBody({
-		state,
-		forced,
-		canShareMachine
-	}) });
+	return /* @__PURE__ */ jsx(WelcomeFrame, {
+		contentWidth,
+		children: /* @__PURE__ */ jsx(FirstRunBody, {
+			state,
+			forced,
+			canShareMachine
+		})
+	});
 }
-/** The Skydive mark centered above the screen's content, matching the
-* new-chat splash lockup and degrading by available space. */
-function Centered({ children }) {
-	const { width, height } = useTerminalDimensions();
+function FirstRunBody({ state, forced, canShareMachine }) {
+	if (state.kind === "error") return /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexDirection: "column",
+			alignItems: "center",
+			gap: 1
+		},
+		children: [/* @__PURE__ */ jsx("text", {
+			fg: theme.error,
+			children: state.message
+		}), /* @__PURE__ */ jsx("text", {
+			fg: theme.muted,
+			children: "press ctrl+c to quit, then run `skydive` again to retry."
+		})]
+	});
+	if (state.kind === "creating") return /* @__PURE__ */ jsx("box", {
+		style: {
+			flexDirection: "column",
+			alignItems: "center",
+			gap: 1
+		},
+		children: /* @__PURE__ */ jsx("text", {
+			fg: theme.muted,
+			children: forced ? "creating an agent…" : "setting up your first agent…"
+		})
+	});
+	if (state.kind === "starting") return /* @__PURE__ */ jsx("text", {
+		fg: theme.muted,
+		children: "opening your agent…"
+	});
+	const { agent } = state;
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
-			flexGrow: 1,
 			flexDirection: "column",
-			justifyContent: "center",
-			alignItems: "center"
+			alignItems: "center",
+			gap: 1
 		},
-		children: [height >= MARK_MIN_ROWS$1 ? /* @__PURE__ */ jsx("box", {
-			style: {
-				flexDirection: "column",
-				alignItems: "center",
-				marginBottom: 1
-			},
-			children: /* @__PURE__ */ jsx(SkydiveMark, { variant: width >= FULL_MARK_MIN_COLS$1 ? "full" : "mark" })
-		}) : null, /* @__PURE__ */ jsx("box", {
-			style: {
-				flexDirection: "column",
-				alignItems: "center",
-				gap: 1
-			},
-			children
+		children: [/* @__PURE__ */ jsx("text", {
+			fg: theme.fg,
+			children: forced ? `${agent.name} is ready.` : `Your first agent, ${agent.name}, is ready.`
+		}), canShareMachine ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs("text", {
+			fg: theme.muted,
+			children: [
+				"Want ",
+				agent.name,
+				" to learn how you already work? It can look at the coding agents set up on this machine to get up to speed fast. It will connect to your computer to read your setup, show you a plan first, and never copy credentials."
+			]
+		}), /* @__PURE__ */ jsx("text", {
+			fg: theme.dim,
+			children: "↵/y yes, learn from my setup · n skip"
+		})] }) : /* @__PURE__ */ jsx("text", {
+			fg: theme.dim,
+			children: "press any key to open the chat"
 		})]
 	});
 }
-function renderBody({ state, forced, canShareMachine }) {
-	if (state.kind === "error") return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("text", {
-		fg: theme.error,
-		children: state.message
-	}), /* @__PURE__ */ jsx("text", {
-		fg: theme.muted,
-		children: "press ctrl+c to quit, then run `skydive` again to retry."
-	})] });
-	if (state.kind === "creating") return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("text", {
-		fg: theme.fg,
-		children: "Welcome to Skydive."
-	}), /* @__PURE__ */ jsx("text", {
-		fg: theme.muted,
-		children: forced ? "creating an agent…" : "setting up your first agent…"
-	})] });
-	if (state.kind === "starting") return /* @__PURE__ */ jsx("text", {
-		fg: theme.muted,
-		children: "opening your agent…"
-	});
-	const { agent } = state;
-	return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("text", {
-		fg: theme.fg,
-		children: forced ? `${agent.name} is ready.` : `Your first agent, ${agent.name}, is ready.`
-	}), canShareMachine ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs("text", {
-		fg: theme.muted,
-		children: [
-			"Want ",
-			agent.name,
-			" to learn how you already work? It can look at the coding agents set up on this machine to get up to speed fast. It will connect to your computer to read your setup, show you a plan first, and never copy credentials."
-		]
-	}), /* @__PURE__ */ jsx("text", {
-		fg: theme.dim,
-		children: "↵/y yes, learn from my setup · n skip"
-	})] }) : /* @__PURE__ */ jsx("text", {
-		fg: theme.dim,
-		children: "press any key to open the chat"
-	})] });
-}
 function createErrorMessage(err) {
 	if (err instanceof HttpError && err.status === 403) return "You don't have permission to create an agent in this workspace.";
-	if (err instanceof HttpError && err.status === 429) return "Too many requests. Wait a moment, then run `skydive` again.";
+	if (err instanceof HttpError && err.status === 429) return "Too many requests. Wait a moment, then try again.";
+	if (err instanceof HttpError && err.status === 409) return "That name is unavailable. Choose another name and try again.";
+	if (err instanceof HttpError && err.status === 400) return "Skydive could not create this agent. Check your active workspace and try again.";
 	if (err instanceof HttpError) return "Skydive could not create your agent. Try again in a moment.";
 	return "Could not reach Skydive. Check your connection and try again.";
 }
+const searchKeyBindings = [{
+	name: "return",
+	action: "submit"
+}, {
+	name: "kpenter",
+	action: "submit"
+}];
+const agentKeys = [
+	{
+		get: (a) => a.name,
+		weight: 1
+	},
+	{
+		get: (a) => a.slug ?? "",
+		weight: .6
+	},
+	{
+		get: (a) => a.title ?? "",
+		weight: .4
+	}
+];
 
 //#endregion
 //#region src/chat/tui/screens/workspace-picker.tsx
@@ -2981,48 +3142,6 @@ function singleLine(text) {
 	return out;
 }
 /**
-* Fit a row's title, an optional mid-row `tag` and a trailing detail into
-* `width` columns, each rendered separated by one space. The title identifies
-* the row so it gets the space first; the tag comes next because it carries
-* information the detail does not; the detail takes what is left and is
-* dropped when nothing is.
-*/
-function fitRowText(title, detail, width, tag = "") {
-	if (width <= 0) return {
-		title: "",
-		detail: "",
-		tag: ""
-	};
-	const segment = (text) => text ? text.length + 1 : 0;
-	if (title.length + segment(tag) + segment(detail) <= width) return {
-		title,
-		detail,
-		tag
-	};
-	const room = width - title.length - 1;
-	if (room < 2) return {
-		title: truncate(title, width),
-		detail: "",
-		tag: ""
-	};
-	if (title.length + segment(tag) > width) return {
-		title,
-		detail: "",
-		tag: truncate(tag, room)
-	};
-	const detailRoom = room - segment(tag);
-	if (detailRoom < 2) return {
-		title,
-		detail: "",
-		tag
-	};
-	return {
-		title,
-		detail: truncate(detail, detailRoom),
-		tag
-	};
-}
-/**
 * Join hint segments with " · ", dropping trailing segments that do not fit
 * rather than wrapping onto a second line — which would cost the list a row.
 * The first segment is always kept (truncated if it has to be).
@@ -3130,6 +3249,7 @@ function forkedConversationRef({ agent, forked }) {
 //#region src/chat/tui/screens/conversation-picker.tsx
 const SEARCH_DEBOUNCE_MS = 250;
 const SEARCH_QUERY_MAX_LENGTH = 200;
+const SEARCH_PREFIX = "/";
 function ConversationPickerScreen({ agent, initialQuery }) {
 	const rest = useStore((s) => s.rest);
 	const goTo = useStore((s) => s.goTo);
@@ -3194,38 +3314,18 @@ function ConversationPickerScreen({ agent, initialQuery }) {
 		cacheKey,
 		cache
 	]);
-	const { width, height } = useTerminalDimensions();
-	if (state.kind === "loading") return /* @__PURE__ */ jsxs("box", {
-		style: {
-			flexDirection: "column",
-			flexGrow: 1
-		},
-		children: [/* @__PURE__ */ jsx(BrandHeader, {
-			height,
-			width
-		}), /* @__PURE__ */ jsx("text", {
-			fg: theme.muted,
-			children: "loading conversations…"
-		})]
-	});
-	if (state.kind === "error") return /* @__PURE__ */ jsxs("box", {
-		style: {
-			flexDirection: "column",
-			flexGrow: 1
-		},
-		children: [/* @__PURE__ */ jsx(BrandHeader, {
-			height,
-			width
-		}), /* @__PURE__ */ jsxs("text", {
-			fg: theme.error,
-			children: ["error: ", state.message]
-		})]
-	});
-	return /* @__PURE__ */ jsx(ConversationList, {
+	if (state.kind === "loading") return /* @__PURE__ */ jsx(HomeFrame, { children: /* @__PURE__ */ jsx("text", {
+		fg: theme.muted,
+		children: "loading conversations…"
+	}) });
+	if (state.kind === "error") return /* @__PURE__ */ jsx(HomeFrame, { children: /* @__PURE__ */ jsxs("text", {
+		fg: theme.error,
+		children: ["error: ", state.message]
+	}) });
+	return /* @__PURE__ */ jsx(ConversationHome, {
 		agent,
 		initialQuery,
 		conversations: state.conversations,
-		complete: state.complete,
 		showAutomated,
 		onToggleAutomated: () => setShowAutomated((shown) => !shown),
 		showArchived,
@@ -3233,12 +3333,84 @@ function ConversationPickerScreen({ agent, initialQuery }) {
 		onPick: goTo
 	});
 }
-function ConversationList({ agent, initialQuery, conversations, complete, showAutomated, onToggleAutomated, showArchived, onToggleArchived, onPick }) {
-	const { width, height } = useTerminalDimensions();
+/**
+* The gated, centered brand frame the home renders inside — shared by the
+* loading and error legs so every leg paints the brand in the SAME centered
+* position at the SAME (real) width. Without this the loading leg painted an
+* ungated, left-aligned brand and then jumped it to centered when the loaded
+* home mounted: the left→center flash James saw (PR #20856).
+*
+* It rides `useTerminalReady`: on an async-sizing terminal (tmux/cmux) the
+* renderer boots on the 80x24 fallback and the real width lands via a debounced
+* resize, so we hold a blank same-size frame until the true width is known and
+* only then paint the centered brand — first VISIBLE paint already at its final
+* position, no reflow. The loaded `ConversationHome` gates identically, so the
+* brand never moves across loading → loaded. See `useTerminalReady`.
+*/
+function HomeFrame({ children }) {
+	const { width, height, ready } = useTerminalReady();
+	const contentWidth = Math.min(76, Math.max(1, width - 2));
+	if (!ready) return /* @__PURE__ */ jsx("box", { style: {
+		flexDirection: "column",
+		flexGrow: 1
+	} });
+	return /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexDirection: "column",
+			flexGrow: 1,
+			alignItems: "center"
+		},
+		children: [
+			/* @__PURE__ */ jsx("box", { style: {
+				flexGrow: 1,
+				flexShrink: 1
+			} }),
+			/* @__PURE__ */ jsxs("box", {
+				style: {
+					flexDirection: "column",
+					width: contentWidth
+				},
+				children: [/* @__PURE__ */ jsx("box", {
+					style: {
+						flexDirection: "column",
+						alignItems: "center"
+					},
+					children: /* @__PURE__ */ jsx(BrandHeader, {
+						height,
+						width
+					})
+				}), children]
+			}),
+			/* @__PURE__ */ jsx("box", { style: {
+				flexGrow: 1,
+				flexShrink: 1
+			} })
+		]
+	});
+}
+/**
+* The agent's home screen: a composer to start a new conversation (mirroring
+* the web home's "Ask <agent> anything" field) over the list of existing
+* conversations. The composer is always focused; ↑/↓ move the list, enter on
+* a non-empty composer sends a new message, enter on an empty composer opens
+* the highlighted conversation. A leading '/' turns the composer into a live
+* list filter (server-side search) instead of a message.
+*/
+function ConversationHome({ agent, initialQuery, conversations, showAutomated, onToggleAutomated, showArchived, onToggleArchived, onPick }) {
+	const { width, height, ready } = useTerminalReady();
 	const rest = useStore((s) => s.rest);
-	const [query, setQuery] = useState(initialQuery);
+	const composerRef = useRef(null);
+	const [input, setInput] = useState(initialQuery ? `${SEARCH_PREFIX}${initialQuery}` : "");
+	const seededRef = useRef(false);
+	useEffect(() => {
+		if (seededRef.current) return;
+		seededRef.current = true;
+		if (initialQuery) composerRef.current?.setText(`${SEARCH_PREFIX}${initialQuery}`);
+	}, [initialQuery]);
 	const [highlight, setHighlight] = useState(0);
-	const debouncedQuery = useDebouncedValue(query.trim(), SEARCH_DEBOUNCE_MS);
+	const [composerLines, setComposerLines] = useState(1);
+	const isSearchInput = input.startsWith(SEARCH_PREFIX);
+	const debouncedQuery = useDebouncedValue((isSearchInput ? input.slice(1).slice(0, SEARCH_QUERY_MAX_LENGTH) : "").trim(), SEARCH_DEBOUNCE_MS);
 	const isSearching = debouncedQuery.length > 0;
 	const [search, setSearch] = useState(null);
 	useEffect(() => {
@@ -3307,19 +3479,15 @@ function ConversationList({ agent, initialQuery, conversations, complete, showAu
 	useEffect(() => {
 		setHighlight(0);
 	}, [showAutomated, showArchived]);
-	const hits = isSearching ? list.map((item) => ({
+	const rows = list.map((item) => ({
 		item,
-		highlights: [
-			substringIndexes(singleLine(item.title ?? ""), debouncedQuery),
-			null,
-			null
-		]
-	})) : fuzzyFilter(query, list, conversationKeys);
-	const rows = [{ kind: "new" }, ...hits.map((hit) => ({
+		highlights: [isSearching ? substringIndexes(singleLine(item.title ?? ""), debouncedQuery) : null]
+	})).map((hit) => ({
 		kind: "conv",
 		hit
-	}))];
-	const innerWidth = Math.max(1, width - 2);
+	}));
+	const contentWidth = Math.min(76, Math.max(1, width - 2));
+	const innerWidth = contentWidth;
 	const rowWidth = Math.max(1, innerWidth - 2);
 	const clamped = Math.min(highlight, Math.max(0, rows.length - 1));
 	const highlightRow = rows[clamped];
@@ -3327,7 +3495,9 @@ function ConversationList({ agent, initialQuery, conversations, complete, showAu
 	const highlightAgentRun = highlightRow?.kind === "conv" && isAgentRunConversation(highlightRow.hit.item);
 	const confirmConv = confirmId !== null ? list.find((c) => c.id === confirmId) : void 0;
 	const searchState = isSearching ? search?.state : void 0;
-	const countSegment = isSearching && (searchState?.kind === "loading" || search === null) ? "searching…" : isSearching && searchState?.kind === "error" ? `search failed: ${searchState.message}` : `${hits.length}/${list.length}${complete || isSearching ? "" : " (loading…)"}`;
+	const searchStatusSegment = !isSearching ? "" : searchState?.kind === "loading" || search === null ? "searching…" : searchState?.kind === "error" ? `search failed: ${searchState.message}` : list.length === 0 ? "no matches" : "";
+	const trimmedMessage = isSearchInput ? "" : input.trim();
+	const enterHint = isSearchInput ? "filtering" : trimmedMessage ? "↵ send" : "↵ open";
 	const status = confirmConv ? {
 		fg: theme.error,
 		text: truncate(`delete “${confirmConv.title ?? "(untitled)"}”? y/n`, innerWidth)
@@ -3337,39 +3507,61 @@ function ConversationList({ agent, initialQuery, conversations, complete, showAu
 	} : {
 		fg: theme.dim,
 		text: fitHintLine([
-			countSegment,
+			searchStatusSegment,
+			enterHint,
+			"/ search",
 			...highlightAgentRun ? [] : [`ctrl+a ${highlightArchived ? "unarchive" : "archive"}`],
 			"ctrl+d delete",
 			`tab ${showAutomated ? "hide" : "show"} agent runs`,
 			`shift+tab ${showArchived ? "hide" : "show"} archived`,
-			"esc back",
 			"↑/↓ move",
-			"↵ open"
-		], innerWidth)
+			"esc back"
+		].filter((segment) => segment !== ""), innerWidth)
 	};
-	const visibleRows = Math.max(3, height - 6 - brandHeaderRows(height, width));
+	const identityRows = height >= 24 ? 3 : 0;
+	const fixedRows = 6 + brandHeaderRows(height, width) + identityRows;
+	const composerRows = Math.max(1, Math.min(composerLines, height - fixedRows - 2 - MIN_LIST_ROWS));
+	const visibleRows = Math.max(MIN_LIST_ROWS, height - fixedRows - (composerRows + 2));
 	const start = windowStart(clamped, rows.length, visibleRows);
 	const windowed = rows.slice(start, start + visibleRows);
-	const open = (row) => {
-		if (row.kind === "new") onPick({
+	const openHighlighted = () => {
+		const row = rows[clamped];
+		if (row) onPick({
 			kind: "chat",
 			agent,
 			attachRunId: null,
 			parentConversationId: null,
-			conversation: {
-				kind: "new",
-				agentId: agent.id,
-				nonce: crypto.randomUUID()
-			}
+			conversation: row.hit.item
 		});
-		else onPick({
+	};
+	const sendNewConversation = (message) => {
+		useStore.setState({ seedPrompt: message });
+		onPick({
 			kind: "chat",
 			agent,
 			attachRunId: null,
 			parentConversationId: null,
-			conversation: row.hit.item
+			conversation: {
+				kind: "new",
+				agentId: agent.id,
+				nonce: crypto.randomUUID()
+			}
 		});
 	};
+	const handleComposerChange = () => {
+		const composer = composerRef.current;
+		if (!composer) return;
+		const raw = composer.plainText;
+		const capped = raw.startsWith(SEARCH_PREFIX) ? raw.slice(0, 1 + SEARCH_QUERY_MAX_LENGTH) : raw;
+		if (capped !== raw) composer.setText(capped);
+		setInput(capped);
+		setComposerLines(Math.max(1, composer.editorView.getTotalVirtualLineCount()));
+		setHighlight(0);
+	};
+	const submit = () => {
+		if (trimmedMessage) sendNewConversation(trimmedMessage);
+		else openHighlighted();
+	};
 	/**
 	* Optimistically drop a row, run `mutate`, and put the row back if it fails.
 	* Delete only — archive keeps the row and flips its mark instead.
@@ -3422,17 +3614,34 @@ function ConversationList({ agent, initialQuery, conversations, complete, showAu
 			else if (key.name === "n" || key.name === "escape") setConfirmId(null);
 			return;
 		}
-		if (key.name === "escape") onPick({ kind: "agent-picker" });
-		else if (key.name === "up") setHighlight(Math.max(0, clamped - 1));
-		else if (key.name === "down") setHighlight(Math.min(Math.max(0, rows.length - 1), clamped + 1));
-		else if (key.name === "pageup" || key.name === "pgup") setHighlight(Math.max(0, clamped - Math.max(1, visibleRows - 1)));
-		else if (key.name === "pagedown" || key.name === "pgdn") setHighlight(Math.min(Math.max(0, rows.length - 1), clamped + Math.max(1, visibleRows - 1)));
-		else if (key.name === "d" && key.ctrl) {
+		if (key.name === "escape") {
+			if (input) {
+				composerRef.current?.setText("");
+				setInput("");
+				setComposerLines(1);
+				setHighlight(0);
+			} else onPick({ kind: "welcome" });
+			return;
+		}
+		if (key.name === "up") {
+			setHighlight(Math.max(0, clamped - 1));
+			key.preventDefault();
+		} else if (key.name === "down") {
+			setHighlight(Math.min(Math.max(0, rows.length - 1), clamped + 1));
+			key.preventDefault();
+		} else if (key.name === "pageup" || key.name === "pgup") {
+			setHighlight(Math.max(0, clamped - Math.max(1, visibleRows - 1)));
+			key.preventDefault();
+		} else if (key.name === "pagedown" || key.name === "pgdn") {
+			setHighlight(Math.min(Math.max(0, rows.length - 1), clamped + Math.max(1, visibleRows - 1)));
+			key.preventDefault();
+		} else if (key.name === "d" && key.ctrl) {
 			const row = rows[clamped];
 			if (row?.kind === "conv") {
 				setError(null);
 				setConfirmId(row.hit.item.id);
 			}
+			key.preventDefault();
 		} else if (key.name === "a" && key.ctrl) {
 			const row = rows[clamped];
 			if (row?.kind === "conv") {
@@ -3443,94 +3652,169 @@ function ConversationList({ agent, initialQuery, conversations, complete, showAu
 				setError(null);
 				toggleArchived(row.hit.item);
 			}
-		} else if (key.name === "tab" && key.shift) onToggleArchived();
-		else if (key.name === "tab") onToggleAutomated();
-		else if (key.name === "return") {
-			const row = rows[clamped];
-			if (row) open(row);
+			key.preventDefault();
+		} else if (key.name === "tab" && key.shift) {
+			onToggleArchived();
+			key.preventDefault();
+		} else if (key.name === "tab") {
+			onToggleAutomated();
+			key.preventDefault();
 		}
 	});
+	if (!ready) return /* @__PURE__ */ jsx("box", { style: {
+		flexDirection: "column",
+		flexGrow: 1
+	} });
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
 			flexDirection: "column",
-			flexGrow: 1
+			flexGrow: 1,
+			alignItems: "center"
 		},
 		children: [
-			/* @__PURE__ */ jsx(BrandHeader, {
-				height,
-				width
-			}),
+			/* @__PURE__ */ jsx("box", { style: {
+				flexGrow: 1,
+				flexShrink: 1
+			} }),
 			/* @__PURE__ */ jsxs("box", {
-				style: {
-					flexDirection: "row",
-					height: 1
-				},
-				children: [/* @__PURE__ */ jsx("text", {
-					fg: theme.muted,
-					children: "search "
-				}), /* @__PURE__ */ jsx("input", {
-					textColor: theme.fg,
-					focusedTextColor: theme.fg,
-					cursorColor: theme.cursor,
-					placeholderColor: theme.dim,
-					placeholder: "type to filter…",
-					focused: confirmId === null,
-					width: Math.max(10, width - 12),
-					maxLength: SEARCH_QUERY_MAX_LENGTH,
-					value: query,
-					onInput: (value) => {
-						setQuery(value.slice(0, SEARCH_QUERY_MAX_LENGTH));
-						setHighlight(0);
-					}
-				})]
-			}),
-			/* @__PURE__ */ jsx("text", {
-				fg: status.fg,
-				children: status.text
-			}),
-			/* @__PURE__ */ jsx("box", {
 				style: {
 					flexDirection: "column",
-					flexGrow: 1
+					width: contentWidth
 				},
-				children: windowed.map((row, i) => {
-					const selected = start + i === clamped;
-					const fg = selected ? theme.accent : theme.fg;
-					const marker = selected ? "› " : "  ";
-					if (row.kind === "new") return /* @__PURE__ */ jsxs("text", {
-						fg,
-						children: [marker, truncate("+ new conversation", rowWidth)]
-					}, "new");
-					const archived = isArchived(row.hit.item);
-					const unread = row.hit.item.unread === true;
-					const { title, detail, tag } = fitRowText(singleLine(row.hit.item.title ?? "(untitled)"), `${archived ? "archived · " : ""}${previewLine(row.hit.item)}`, rowWidth, coAgentsTag(row.hit.item, agent.id));
-					const titleText = /* @__PURE__ */ jsx(FuzzyText, {
-						text: title,
-						indexes: row.hit.item.title ? row.hit.highlights[0] : null
-					});
-					return /* @__PURE__ */ jsxs("text", {
-						fg: archived && !selected ? theme.dim : fg,
-						children: [
-							!selected && unread ? /* @__PURE__ */ jsx("span", {
-								fg: theme.accent,
-								children: "● "
-							}) : marker,
-							unread ? /* @__PURE__ */ jsx("b", { children: titleText }) : titleText,
-							tag ? /* @__PURE__ */ jsxs("span", {
-								fg: theme.muted,
-								children: [" ", tag]
-							}) : null,
-							detail ? /* @__PURE__ */ jsxs("span", {
-								fg: theme.dim,
-								children: [" ", detail]
-							}) : null
-						]
-					}, row.hit.item.id);
-				})
-			})
+				children: [
+					/* @__PURE__ */ jsxs("box", {
+						style: {
+							flexDirection: "column",
+							alignItems: "center"
+						},
+						children: [/* @__PURE__ */ jsx(BrandHeader, {
+							height,
+							width
+						}), height >= 24 ? /* @__PURE__ */ jsxs("box", {
+							style: {
+								flexDirection: "column",
+								alignItems: "center"
+							},
+							children: [
+								/* @__PURE__ */ jsx("text", {
+									fg: theme.accent,
+									attributes: 1,
+									children: truncate(`Hey, I'm ${agent.name}`, innerWidth)
+								}),
+								identitySubtitle(agent) ? /* @__PURE__ */ jsx("text", {
+									fg: theme.muted,
+									children: truncate(identitySubtitle(agent), innerWidth)
+								}) : null,
+								/* @__PURE__ */ jsx("box", { style: { height: 1 } })
+							]
+						}) : null]
+					}),
+					/* @__PURE__ */ jsx("box", {
+						style: {
+							border: true,
+							borderColor: theme.faint,
+							paddingLeft: 1,
+							paddingRight: 1,
+							height: composerRows + 2,
+							flexShrink: 0,
+							flexDirection: "column"
+						},
+						children: /* @__PURE__ */ jsx("textarea", {
+							ref: composerRef,
+							textColor: theme.fg,
+							focusedTextColor: theme.fg,
+							cursorColor: theme.cursor,
+							placeholderColor: theme.dim,
+							placeholder: `Ask ${agent.name} anything…`,
+							keyBindings: composerKeyBindings$1,
+							onContentChange: handleComposerChange,
+							onSubmit: submit,
+							focused: confirmId === null,
+							style: {
+								height: composerRows,
+								wrapMode: "word"
+							}
+						})
+					}),
+					/* @__PURE__ */ jsx("text", {
+						fg: status.fg,
+						children: status.text
+					}),
+					/* @__PURE__ */ jsx("box", {
+						style: {
+							flexDirection: "column",
+							flexShrink: 0
+						},
+						children: rows.length === 0 ? /* @__PURE__ */ jsx("text", {
+							fg: theme.dim,
+							children: isSearching ? "no conversations match." : `no conversations yet — type a message above to start one with ${agent.name}.`
+						}) : windowed.map((row, i) => {
+							const selected = start + i === clamped;
+							const fg = selected ? theme.accent : theme.fg;
+							const marker = selected ? "› " : "  ";
+							const archived = isArchived(row.hit.item);
+							const { title, time } = layoutRow(`${archived ? "archived · " : ""}${singleLine(row.hit.item.title ?? "(untitled)")}`, relativeTime(row.hit.item.updatedAt), coAgentsTag(row.hit.item, agent.id), rowWidth);
+							const glyph = channelGlyph(row.hit.item.channel);
+							const tag = coAgentsTag(row.hit.item, agent.id);
+							const unread = row.hit.item.unread === true;
+							const titleText = /* @__PURE__ */ jsx(FuzzyText, {
+								text: title,
+								indexes: row.hit.item.title ? row.hit.highlights[0] : null
+							});
+							return /* @__PURE__ */ jsxs("text", {
+								fg: archived && !selected ? theme.dim : fg,
+								children: [
+									!selected && unread ? /* @__PURE__ */ jsx("span", {
+										fg: theme.accent,
+										children: "● "
+									}) : marker,
+									/* @__PURE__ */ jsxs("span", {
+										fg: selected ? theme.accent : theme.muted,
+										children: [glyph, " "]
+									}),
+									unread ? /* @__PURE__ */ jsx("b", { children: titleText }) : titleText,
+									tag ? /* @__PURE__ */ jsxs("span", {
+										fg: theme.muted,
+										children: [" ", tag]
+									}) : null,
+									/* @__PURE__ */ jsx("span", {
+										fg: theme.dim,
+										children: time
+									})
+								]
+							}, row.hit.item.id);
+						})
+					})
+				]
+			}),
+			/* @__PURE__ */ jsx("box", { style: {
+				flexGrow: 1,
+				flexShrink: 1
+			} })
 		]
 	});
 }
+const MIN_LIST_ROWS = 3;
+const composerKeyBindings$1 = [
+	{
+		name: "return",
+		action: "submit"
+	},
+	{
+		name: "kpenter",
+		action: "submit"
+	},
+	{
+		name: "return",
+		shift: true,
+		action: "newline"
+	},
+	{
+		name: "kpenter",
+		shift: true,
+		action: "newline"
+	}
+];
 /**
 * Tags a row with the thread's other agents (`+Grace, Ada`). The picker is
 * entered per agent, so that agent stays implicit and only its co-participants
@@ -3547,20 +3831,6 @@ function coAgentsTag(conv, viewerAgentId) {
 function conversationAgents(c) {
 	return c.agents && c.agents.length > 0 ? c.agents : [c.agent];
 }
-const conversationKeys = [
-	{
-		get: (c) => singleLine(c.title ?? ""),
-		weight: 1
-	},
-	{
-		get: (c) => c.preview ?? "",
-		weight: .6
-	},
-	{
-		get: (c) => conversationAgents(c).map((a) => a.name).join(" "),
-		weight: .4
-	}
-];
 /**
 * Character indexes of the first case-insensitive occurrence of `needle` in
 * `haystack`, for highlighting a literal title match under server search (the
@@ -3575,11 +3845,63 @@ function substringIndexes(haystack, needle) {
 	if (at < 0) return null;
 	return Array.from({ length: trimmed.length }, (_, i) => at + i);
 }
-function previewLine(c) {
-	const when = relativeTime(c.updatedAt);
-	const prefix = c.preview ? c.preview.replace(/\s+/g, " ").trim() : "";
-	const text = prefix ? `${when} · ${prefix}` : when;
-	return text.length > 60 ? `${text.slice(0, 59)}…` : text;
+/**
+* The subtitle under the “Hey, I'm <Agent>” greeting, mirroring the web home's
+* “<title> · <owner>'s agent” line. Either half may be missing (an older
+* server omits `title`/`creatorName`); we join whatever is present and return
+* an empty string when there's nothing to show, so the caller drops the row.
+*/
+function identitySubtitle(agent) {
+	const parts = [];
+	if (agent.title) parts.push(agent.title);
+	if (agent.creatorName) parts.push(`${agent.creatorName}'s agent`);
+	return parts.join(" · ");
+}
+/**
+* A single glyph marking a conversation's channel, echoing the web home's
+* leading channel icon. Web threads (the common case) get a globe; the other
+* human channels and agent-run channels get a recognizable mark, with a
+* neutral dot as the fallback so an unknown/again-renamed channel still lines
+* up. Kept to one display column so the row layout budget stays exact.
+*/
+function channelGlyph(channel) {
+	switch (channel) {
+		case "web":
+		case null: return "◉";
+		case "slack": return "▰";
+		case "email": return "✉";
+		case "imessage":
+		case "sms": return "○";
+		case "cron": return "⏲";
+		default: return "·";
+	}
+}
+/**
+* Lay a row out web-home style: the title on the left, the relative time
+* flush-right, and an optional co-agent tag between them. The glyph (2 cols
+* incl. its trailing space) and marker (2 cols) are accounted for by the
+* caller via `width` (already `rowWidth`), so here we reserve the time (plus a
+* gap), the tag (plus a gap) and the glyph slot, then truncate the title into
+* what's left. The returned `time` carries its own leading padding so it sits
+* flush against the right edge; when the row is too narrow to fit the title
+* AND the time, the time is dropped rather than wrapping the row.
+*/
+function layoutRow(title, time, tag, width) {
+	const GLYPH = 2;
+	const tagCost = tag ? tag.length + 1 : 0;
+	const timeCost = time.length + 1;
+	const titleBudget = width - GLYPH - tagCost - timeCost;
+	if (titleBudget < 8) return {
+		title: truncate(title, Math.max(1, width - GLYPH - tagCost)),
+		time: ""
+	};
+	const fitTitle = truncate(title, titleBudget);
+	const used = GLYPH + fitTitle.length + tagCost;
+	const pad = Math.max(1, width - used - time.length);
+	return {
+		title: fitTitle,
+		time: `${" ".repeat(pad)}${time}`
+	};
 }
 function relativeTime(iso) {
 	const diffMs = Date.now() - new Date(iso).getTime();
@@ -7393,7 +7715,6 @@ function SubagentCardView({ items, isActive, onHeightChange }) {
 		style: {
 			flexDirection: "column",
 			flexShrink: 0,
-			height: height > 0 ? void 0 : 0,
 			marginTop: height > 0 ? 1 : 0,
 			paddingLeft: height > 0 ? 1 : 0,
 			paddingRight: height > 0 ? 1 : 0,
@@ -13163,6 +13484,7 @@ function isActionableCard(m) {
 function ChatScreen({ agent, conversation, attachRunId, parentConversationId }) {
 	const renderer = useRenderer();
 	const { width, height } = useTerminalDimensions();
+	const { ready: terminalReady } = useTerminalReady();
 	const rest = useStore((s) => s.rest);
 	const history = usePromptHistory({ filePath: useStore((s) => s.promptHistoryPath) });
 	const appUrl = useStore((s) => s.appUrl);
@@ -14590,6 +14912,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 				agentSelector: null,
 				conversationId: target,
 				newConversation: false,
+				seedPrompt: null,
 				defaultAgentSelector: null,
 				forceOnboarding: false
 			});
@@ -14630,6 +14953,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 				agentSelector: null,
 				conversationId: target,
 				newConversation: false,
+				seedPrompt: null,
 				defaultAgentSelector: null,
 				forceOnboarding: false
 			}));
@@ -14777,15 +15101,9 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 						break;
 					}
 					goTo({
-						kind: "chat",
+						kind: "conversation-picker",
 						agent,
-						attachRunId: null,
-						parentConversationId: null,
-						conversation: {
-							kind: "new",
-							agentId: agent.id,
-							nonce: crypto.randomUUID()
-						}
+						initialQuery: ""
 					});
 					break;
 				case "fork":
@@ -15289,6 +15607,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 					agentSelector: null,
 					conversationId: parentConversationId,
 					newConversation: false,
+					seedPrompt: null,
 					defaultAgentSelector: null,
 					forceOnboarding: false
 				}).then((parentScreen) => goTo(parentScreen)).catch(() => {
@@ -15567,7 +15886,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 					children: [!historyLoaded ? /* @__PURE__ */ jsx("text", {
 						fg: theme.muted,
 						children: "loading history…"
-					}) : items.length === 0 ? /* @__PURE__ */ jsx(NewChatSplash, {
+					}) : items.length === 0 && !terminalReady ? /* @__PURE__ */ jsx("box", { style: { height: Math.max(1, scrollHeight - 1) } }) : items.length === 0 ? /* @__PURE__ */ jsx(NewChatSplash, {
 						agentName: agent.name,
 						agentTitle: agent.title ?? null,
 						width: reviewView && reviewPlacement === "side" ? Math.max(1, bodyWidth - reviewWidth - 1) : bodyWidth,
@@ -16216,7 +16535,8 @@ function App({ appUrl, sessionToken, authKind, workspaceId, shareMachine, prompt
 					rest,
 					agentSelector,
 					conversationId,
-					newConversation: newConversation || useStore.getState().seedPrompt !== null,
+					newConversation,
+					seedPrompt: useStore.getState().seedPrompt,
 					defaultAgentSelector,
 					forceOnboarding
 				});
@@ -16282,16 +16602,14 @@ function App({ appUrl, sessionToken, authKind, workspaceId, shareMachine, prompt
 					children: [
 						screen.kind === "splash" && /* @__PURE__ */ jsx(Splash, {}),
 						screen.kind === "error" && /* @__PURE__ */ jsx(ErrorScreen, { message: screen.message }),
-						screen.kind === "agent-picker" && rest && /* @__PURE__ */ jsx(AgentPickerScreen, {}),
-						screen.kind === "agent-create" && rest && /* @__PURE__ */ jsx(AgentCreateScreen, {}),
-						screen.kind === "first-run" && rest && /* @__PURE__ */ jsx(FirstRunScreen, {}),
+						screen.kind === "welcome" && rest && /* @__PURE__ */ jsx(WelcomeScreen, {}),
 						screen.kind === "workspace-picker" && /* @__PURE__ */ jsx(WorkspacePicker, {
 							appUrl,
 							sessionToken,
-							onCancel: () => goTo({ kind: "agent-picker" }),
+							onCancel: () => goTo({ kind: "welcome" }),
 							onSelect: (workspace) => {
 								setWorkspaceName(workspace.name);
-								goTo({ kind: "agent-picker" });
+								goTo({ kind: "welcome" });
 							}
 						}),
 						screen.kind === "conversation-picker" && rest && /* @__PURE__ */ jsx(ConversationPickerScreen, {
@@ -16842,7 +17160,6 @@ async function runChat({ appUrl, sessionToken, authKind = "session", workspaceId
 		authKind,
 		seedPrompt: seedPrompt ?? null,
 		autoGrantMachine: Boolean(seedPrompt && shareMachine),
-		newConversationIntent: newConversation,
 		forcedOnboarding: forceOnboarding
 	});
 	const store = useStore.getState();