diff --git a/CHANGELOG.md b/CHANGELOG.md
index a70265bb..62b6fa50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,13 +4,59 @@ This file is the canonical source for unreleased changes and published release n
 
 ## Format
 
-- Add in-progress work under `## [Unreleased]
+- Add in-progress work under `## [Unreleased]`.
+
+## [Unreleased]
 
 ### Added
 
 - The desktop start page creates a session in the folder you pick, or in a memory sandbox, sends your first prompt and opens the session. A memory session's project is named "In Memory".
 - The desktop start page's composer has a model picker and a Reasoning picker. The model picker lists providers down a rail with their models beside it and searches across all of them. With no model picked, settings decide; a default whose provider has no credentials shows muted and cannot be picked. Reasoning offers only the levels the model supports and marks the settings level as Default. The picks are remembered across restarts.
 
+### @codeworksh/harness
+
+#### Added
+
+- Prompts queued while the agent works can be read and changed before it takes them in. `Control.pending` lists them, steers and follow-ups, in the order they were sent. `Control.cancel` withdraws one, recorded as a `session.prompt.cancelled` event; it returns `false` when the prompt was already taken in, and a cancelled message id may be sent again. `Control.update` moves one to the other lane or rewrites its text, keeping its place, recorded as a `session.prompt.updated` event; moving it to the steer lane also wakes the session, so a prompt left queued by a stop runs now.
+- A run cut off by a crash or a shutdown resumes when the server starts again (`Control.resumeUnfinished`). A crash counts as a restart and a shutdown does not; a committed turn starts the count over. After 5 restarts (`Control.RESTART_LIMIT`) the session is parked instead of resumed: `Session.Info.parked` is `true`, and its next prompt runs it again. A resumed run answers the reply it was cut off in before a queued follow-up goes in; steers join it at once. A run the user stopped is not resumed, and what was queued behind it stays queued.
+
+#### Fixed
+
+- A turn started for a prompt that was cancelled just before it joined the conversation no longer asks the model anything.
+- A prompt changed, cancelled or sent again while it was being taken in no longer fails the run; the run takes in the prompt as it now stands.
+
+#### Internal
+
+- Migrations add `session_input.cancelled_seq`, and `session.execution` and `session.restarts`.
+- Tests use `gpt-6-luna` in place of the deprecated `gpt-5.5`.
+
+### @codeworksh/cli
+
+#### Added
+
+- Added the `session.queue` RPC (`{ sessionId }`): the prompts sent while the agent works and not yet taken in, steers and follow-ups, in the order they were sent.
+- Added the `session.cancel` RPC (`{ sessionId, messageId }`), which withdraws a queued prompt. `cancelled` is `false` when the prompt was already taken in.
+- Added the `session.update` RPC (`{ sessionId, messageId, delivery?, text? }`), which moves a queued prompt to the other lane or rewrites its text, keeping its place. `delivery: "steer"` also wakes the session. `updated` is `false` when the prompt was already taken in.
+- `codework serve` resumes the sessions a crash or a shutdown cut off when it starts. Session info carries `parked: true` for a session that restarted too often to resume on its own; its next prompt runs it again.
+
+#### Fixed
+
+- Ctrl+C on `codework run` without `--server` stops the run as a user stop, so `codework serve` does not resume it later.
+
+#### Internal
+
+- Tests use `gpt-6-luna` in place of the deprecated `gpt-5.5`.
+
+### @codeworksh/aikit
+
+#### Fixed
+
+- `modelgen` leaves out providers with no models instead of writing them as empty entries.
+
+#### Internal
+
+- `gpt-5.5` is out of the live OpenAI test models; tests use `gpt-6-luna`.
+
 ## [@codeworksh/cli@0.4.0] - 2026-10-20
 
 ### Added
diff --git a/apps/contract/src/contract.ts b/apps/contract/src/contract.ts
index 8cf728ed..85cf9fd7 100644
--- a/apps/contract/src/contract.ts
+++ b/apps/contract/src/contract.ts
@@ -46,27 +46,26 @@ export const Workspace = Schema.Struct({
 	bit: Schema.Number,
 	pos: Schema.Number,
 	name: Schema.String,
-	/** A name from the app's icon set, e.g. "code". */
-	icon: Schema.String,
 	layout: Layout,
 	/** Master column share of the width, 0–1. */
 	mfact: Schema.Number,
 	/** Created to show something the user opened (a session); removed once it shows nothing. */
 	auto: Schema.Boolean,
+	/** What its tab last read, as its focused widget set it; absent until a widget has. */
+	tab: Schema.optionalKey(Schema.String),
 });
 export type Workspace = typeof Workspace.Type;
 
 export const WorkspaceCreate = Schema.Struct({
 	name: Schema.String,
-	icon: Schema.String,
 	auto: Schema.optionalKey(Schema.Boolean),
 });
 export const WorkspaceUpdate = Schema.Struct({
 	id: Schema.String,
 	name: Schema.optional(Schema.String),
-	icon: Schema.optional(Schema.String),
 	layout: Schema.optional(Layout),
 	mfact: Schema.optional(Schema.Number),
+	tab: Schema.optional(Schema.String),
 });
 export const WorkspaceOrder = Schema.Struct({ ids: Schema.Array(Schema.String) });
 export const WorkspaceId = Schema.Struct({ id: Schema.String });
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index 5b5ca17d..db80c2a7 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -124,11 +124,16 @@ function createMainWindow(): BrowserWindow {
 		}),
 		// Windows and Linux take the window's icon; macOS ignores it for the Dock's.
 		icon: ICON,
+		// Hidden until the page's first paint, the splash in the saved theme, so it never opens blank.
+		show: false,
 		webPreferences: {
 			preload: path.join(app.getAppPath(), "out/preload.cjs"),
 			sandbox: true,
 		},
 	});
+	window.once("ready-to-show", () => window.show());
+	// Linux can miss ready-to-show; the load finishing reveals the window there.
+	if (process.platform === "linux") window.webContents.once("did-finish-load", () => window.show());
 	void window.loadURL(APP_URL);
 	return window;
 }
diff --git a/apps/server/src/db.ts b/apps/server/src/db.ts
index 0c8721d9..3f2ac840 100644
--- a/apps/server/src/db.ts
+++ b/apps/server/src/db.ts
@@ -109,6 +109,16 @@ const migrations = {
 		})}`;
 		yield* sql`DELETE FROM kv WHERE package = 'codework' AND key LIKE 'servers.local.%'`;
 	}),
+	// Workspace tabs all show the window icon now.
+	"202610230001_drop_workspace_icon": Effect.gen(function* () {
+		const sql = yield* SqlClient.SqlClient;
+		yield* sql`ALTER TABLE workspaces DROP COLUMN icon`;
+	}),
+	// What the workspace's tab last read, so a workspace not yet opened since a restart names what it shows.
+	"202610240001_workspace_tab": Effect.gen(function* () {
+		const sql = yield* SqlClient.SqlClient;
+		yield* sql`ALTER TABLE workspaces ADD COLUMN tab TEXT`;
+	}),
 };
 
 const setup = Effect.gen(function* () {
diff --git a/apps/server/src/workspaces.ts b/apps/server/src/workspaces.ts
index 0ab83c31..2f59d4a8 100644
--- a/apps/server/src/workspaces.ts
+++ b/apps/server/src/workspaces.ts
@@ -18,11 +18,17 @@ const fail = (message: string) => new Contract.WorkspaceError({ message });
 export const handlers = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 
-	// SQLite has no booleans; `auto` is stored as 0 or 1.
-	const list = sql<Omit<Workspace, "auto"> & { auto: number }>`
-		SELECT id, bit, pos, name, icon, layout, mfact, auto FROM workspaces ORDER BY pos
+	// SQLite has no booleans; `auto` is stored as 0 or 1. A tab never set is NULL.
+	const list = sql<Omit<Workspace, "auto" | "tab"> & { auto: number; tab: string | null }>`
+		SELECT id, bit, pos, name, layout, mfact, auto, tab FROM workspaces ORDER BY pos
 	`.pipe(
-		Effect.map((rows) => rows.map((row): Workspace => ({ ...row, auto: row.auto === 1 }))),
+		Effect.map((rows) =>
+			rows.map(({ auto, tab, ...row }): Workspace => ({
+				...row,
+				auto: auto === 1,
+				...(tab === null ? {} : { tab }),
+			})),
+		),
 		Effect.orDie,
 	);
 
@@ -49,7 +55,6 @@ export const handlers = Effect.gen(function* () {
 
 		"workspaces.create": Effect.fn("workspaces.create")(function* ({
 			name,
-			icon,
 			auto = false,
 		}: typeof WorkspaceCreate.Type) {
 			return yield* sql
@@ -64,7 +69,6 @@ export const handlers = Effect.gen(function* () {
 							bit,
 							pos: current.length,
 							name,
-							icon,
 							layout: "tile",
 							mfact: 0.6,
 							auto,
diff --git a/apps/server/test/__artifacts__/desk.json b/apps/server/test/__artifacts__/desk.json
index 460db1fc..9400b63f 100644
--- a/apps/server/test/__artifacts__/desk.json
+++ b/apps/server/test/__artifacts__/desk.json
@@ -9,7 +9,6 @@
 		"bit": 3,
 		"pos": 3,
 		"name": "Scratch",
-		"icon": "box",
 		"layout": "tile",
 		"mfact": 0.6,
 		"auto": false
@@ -147,7 +146,8 @@
 			{
 				"name": "Kept",
 				"auto": true,
-				"pos": 3
+				"pos": 3,
+				"tab": "Kept / A session"
 			}
 		],
 		"desk": {
diff --git a/apps/server/test/desk.test.ts b/apps/server/test/desk.test.ts
index 3afce05b..46daf066 100644
--- a/apps/server/test/desk.test.ts
+++ b/apps/server/test/desk.test.ts
@@ -60,7 +60,7 @@ it("desk round-trips and follows workspace deletion", async () => {
 		const rpc = yield* RpcClient.make(Contract.Api);
 		const empty = yield* rpc["desk.get"]();
 
-		const workspace = yield* rpc["workspaces.create"]({ name: "Scratch", icon: "box" });
+		const workspace = yield* rpc["workspaces.create"]({ name: "Scratch" });
 		const bit = 1 << workspace.bit;
 		const saved: Contract.Desk = {
 			instances: [
@@ -93,8 +93,10 @@ it("desk round-trips and follows workspace deletion", async () => {
 		}).pipe(Effect.flip);
 
 		// Two auto workspaces: one keeps a frame, the other is left empty without being closed.
-		const kept = yield* rpc["workspaces.create"]({ name: "Kept", icon: "box", auto: true });
-		yield* rpc["workspaces.create"]({ name: "Stray", icon: "box", auto: true });
+		const kept = yield* rpc["workspaces.create"]({ name: "Kept", auto: true });
+		// What its tab last read, as its frame set it.
+		yield* rpc["workspaces.update"]({ id: kept.id, tab: "Kept / A session" });
+		yield* rpc["workspaces.create"]({ name: "Stray", auto: true });
 		yield* rpc["desk.save"]({
 			instances: [{ id: "notes-2", kind: "notes", tags: 1 << kept.bit, props: {}, pinned: false }],
 			tileOrder: ["notes-2"],
@@ -121,9 +123,16 @@ it("desk round-trips and follows workspace deletion", async () => {
 		const rpc = yield* RpcClient.make(Contract.Api);
 		const workspaces = yield* rpc["workspaces.list"]();
 		const desk = yield* rpc["desk.get"]();
-		return { workspaces: workspaces.map(({ name, auto, pos }) => ({ name, auto, pos })), desk };
+		return { workspaces: workspaces.map(({ name, auto, pos, tab }) => ({ name, auto, pos, tab })), desk };
 	}).pipe(Effect.scoped, Effect.provide(protocol()), Effect.runPromise);
 	expect(afterRestart.workspaces.map((workspace) => workspace.name)).toEqual(["Main", "Code", "Notes", "Kept"]);
+	// A workspace's last tab survives the restart, so it names what it shows before its frame loads.
+	expect(afterRestart.workspaces.map((workspace) => workspace.tab)).toEqual([
+		undefined,
+		undefined,
+		undefined,
+		"Kept / A session",
+	]);
 
 	await expect(`${JSON.stringify({ ...steps, afterRestart }, null, "\t")}\n`).toMatchFileSnapshot(
 		"./__artifacts__/desk.json",
diff --git a/apps/web/index.html b/apps/web/index.html
index bc1ddb9a..e293351c 100644
--- a/apps/web/index.html
+++ b/apps/web/index.html
@@ -10,9 +10,63 @@
 				document.documentElement.dataset.theme = localStorage.getItem("codework-theme") ?? "tokyo-night";
 			} catch {}
 		</script>
+		<!-- Linked here rather than imported by style.css, so the splash paints in the theme before the app's JS runs. -->
+		<link rel="stylesheet" href="/src/themes.css" />
+		<style>
+			html,
+			body,
+			#root {
+				height: 100%;
+				margin: 0;
+			}
+
+			/* The app's desktop tint (--cw-desktop in style.css), so the swap to the app does not shift colour. */
+			body {
+				background: color-mix(in oklab, var(--t-bg) 96%, var(--t-text));
+				color: var(--t-text);
+				font:
+					13px/1.4 system-ui,
+					-apple-system,
+					"Segoe UI",
+					sans-serif;
+			}
+
+			#boot-shell {
+				display: flex;
+				height: 100%;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				gap: 16px;
+				-webkit-app-region: drag;
+				user-select: none;
+			}
+
+			#boot-shell img {
+				width: 64px;
+				height: 64px;
+				border-radius: 14px;
+			}
+
+			#boot-shell button {
+				padding: 6px 14px;
+				border: 1px solid currentColor;
+				border-radius: 6px;
+				background: transparent;
+				color: inherit;
+				font: inherit;
+				cursor: pointer;
+				-webkit-app-region: no-drag;
+			}
+		</style>
 	</head>
 	<body>
-		<div id="root"></div>
+		<!-- The splash: shown until the app mounts and replaces it. -->
+		<div id="root">
+			<div id="boot-shell">
+				<img src="/src/assets/codework.png" alt="CodeWork" />
+			</div>
+		</div>
 		<script type="module" src="/src/bootstrap.ts"></script>
 	</body>
 </html>
diff --git a/apps/web/src/bootstrap.ts b/apps/web/src/bootstrap.ts
index 984bfe27..d1d67a73 100644
--- a/apps/web/src/bootstrap.ts
+++ b/apps/web/src/bootstrap.ts
@@ -1,4 +1,16 @@
 // Separate entry so this module runs before the (heavier) React tree mounts.
-void import("./main").catch((error: unknown) => {
-	console.error(error);
-});
+void import("./main")
+	.then(({ startup }) => startup)
+	.catch((error: unknown) => {
+		console.error(error);
+		// The app never mounted, so the splash is still up: it turns into the failure and a way out.
+		const shell = document.getElementById("boot-shell");
+		if (shell === null) return;
+		const message = document.createElement("p");
+		message.textContent = "CodeWork could not load.";
+		const reload = document.createElement("button");
+		reload.type = "button";
+		reload.textContent = "Reload";
+		reload.addEventListener("click", () => window.location.reload());
+		shell.replaceChildren(message, reload);
+	});
diff --git a/apps/web/src/components/banner.tsx b/apps/web/src/components/banner.tsx
index 839f60dc..693eb4bb 100644
--- a/apps/web/src/components/banner.tsx
+++ b/apps/web/src/components/banner.tsx
@@ -56,7 +56,7 @@ export function ComposerNotice({
 	return (
 		<div
 			role="alert"
-			className={`mx-5.5 -mb-4 flex items-center gap-2.5 rounded-t-[16px] border border-b-0 ${surface} px-3 pt-2.5 pb-6 text-[12px] leading-snug`}
+			className={`mx-5.5 -mb-4 flex items-center gap-2.5 rounded-t-2xl border border-b-0 ${surface} px-3 pt-2.5 pb-6 text-xs leading-snug`}
 		>
 			<Icon className={`size-4 shrink-0 ${text}`} strokeWidth={2} aria-hidden />
 			<div className="min-w-0 flex-1">
diff --git a/apps/web/src/components/composer.tsx b/apps/web/src/components/composer.tsx
index 57bddc1d..5d86972d 100644
--- a/apps/web/src/components/composer.tsx
+++ b/apps/web/src/components/composer.tsx
@@ -1,5 +1,7 @@
-import type { ReactNode } from "react";
+import { CornerDownLeft, X, type LucideIcon } from "lucide-react";
+import type { ComponentProps, ReactNode, Ref } from "react";
 
+import { cn } from "@/lib/utils";
 import { isMac } from "@codeworksh/widget/view";
 
 /** How a send was asked for: `alternate` is Mod+Enter, which a caller may give its own meaning. */
@@ -22,6 +24,10 @@ export function Composer({
 	controls,
 	actions,
 	tray,
+	header,
+	inputRef,
+	onEscape,
+	className,
 }: {
 	readonly value: string;
 	readonly onChange: (value: string) => void;
@@ -34,25 +40,42 @@ export function Composer({
 	readonly controls?: ReactNode;
 	readonly actions: ReactNode;
 	readonly tray?: ReactNode;
+	readonly header?: ReactNode;
+	readonly inputRef?: Ref<HTMLTextAreaElement>;
+	readonly onEscape?: () => void;
+	readonly className?: string;
 }) {
 	return (
 		<div className="w-full">
 			<form
 				// Raised like a frame (the theme's top-down gradient, top highlight and shadows), with a deeper
 				// drop so it still floats when it sits inside one.
-				className="relative z-10 flex flex-col rounded-[22px] border border-edge bg-linear-to-b from-frame-top to-frame to-60% shadow-[inset_0_1px_0_var(--cw-highlight),0_1px_2px_var(--cw-shadow-near),0_14px_36px_-12px_var(--cw-shadow-far)] transition-colors focus-within:border-edge-focus"
+				className={cn(
+					"relative z-10 flex flex-col rounded-[22px] border border-edge bg-linear-to-b from-frame-top to-frame to-60% shadow-[inset_0_1px_0_var(--cw-highlight),0_1px_2px_var(--cw-shadow-near),0_14px_36px_-12px_var(--cw-shadow-far)] transition-colors focus-within:border-edge-focus",
+					className,
+				)}
 				onSubmit={(event) => {
 					event.preventDefault();
 					onSubmit({ alternate: false });
 				}}
 			>
-				<div className={compact ? "px-3.5 pt-2.5 pb-0.5" : "px-4 pt-4 pb-2"}>
+				{header}
+				<div
+					className={compact ? "px-3.5 pt-2.5 pb-0.5" : header !== undefined ? "px-4 pt-2 pb-2" : "px-4 pt-4 pb-2"}
+				>
 					<textarea
+						ref={inputRef}
 						autoFocus={autoFocus}
 						rows={1}
 						value={value}
 						onChange={(event) => onChange(event.target.value)}
 						onKeyDown={(event) => {
+							if (event.key === "Escape" && !event.defaultPrevented && onEscape !== undefined) {
+								event.preventDefault();
+								event.stopPropagation();
+								onEscape();
+								return;
+							}
 							// An IME composition owns its own Enter.
 							if (event.key !== "Enter" || event.shiftKey || event.nativeEvent.isComposing) return;
 							event.preventDefault();
@@ -61,7 +84,7 @@ export function Composer({
 						placeholder={placeholder}
 						aria-label="Prompt"
 						// Grows with its text, from four lines (one when compact) up to about nine, then scrolls.
-						className={`block max-h-52 w-full resize-none bg-transparent text-[14px] leading-relaxed text-ink outline-none [field-sizing:content] placeholder:text-ink-muted/60 ${compact ? "min-h-6" : "min-h-19.5"}`}
+						className={`block max-h-52 w-full resize-none bg-transparent text-[14px] leading-relaxed text-ink outline-none [field-sizing:content] placeholder:text-ink-muted ${compact ? "min-h-6" : "min-h-19.5"}`}
 					/>
 				</div>
 				<div className={`flex items-center gap-2 ${compact ? "px-2.5 pb-2.5" : "px-4 pb-4"}`}>
@@ -82,6 +105,69 @@ export function Composer({
 	);
 }
 
+/** Shared expanded surface for starting a session and replying to one. */
+export function PromptComposer(props: ComponentProps<typeof Composer>) {
+	return (
+		<Composer
+			{...props}
+			className={cn(
+				"rounded-xl bg-frame-top [&_textarea]:rounded-lg [&_textarea]:bg-ink/4 [&_textarea]:px-3 [&_textarea]:py-2",
+				props.className,
+			)}
+		/>
+	);
+}
+
+export function ComposerHeader({
+	title,
+	icon: Icon,
+	onClose,
+}: {
+	readonly title: string;
+	readonly icon: LucideIcon;
+	readonly onClose?: () => void;
+}) {
+	return (
+		<div className="flex h-10 items-center gap-2 px-4 text-[12px] text-ink-muted">
+			<Icon className="size-3.5 text-brand" aria-hidden />
+			<span className="flex-1 font-medium text-ink">{title}</span>
+			{onClose !== undefined && (
+				<button
+					type="button"
+					onClick={onClose}
+					aria-label="Minimize reply"
+					className="flex items-center gap-2 rounded-md p-1 text-ink-muted outline-none hover:bg-ink/5 hover:text-ink focus-visible:ring-2 focus-visible:ring-ring press"
+				>
+					<kbd className="text-[10px]">esc</kbd>
+					<X className="size-3.5" aria-hidden />
+				</button>
+			)}
+		</div>
+	);
+}
+
+export function ComposerSubmit({
+	label,
+	disabled,
+	title,
+}: {
+	readonly label: string;
+	readonly disabled?: boolean;
+	readonly title?: string;
+}) {
+	return (
+		<button
+			type="submit"
+			disabled={disabled}
+			className="flex h-8 shrink-0 items-center gap-2 rounded-md bg-brand px-3 text-[12px] font-medium text-brand-ink outline-none hover:brightness-110 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-frame press disabled:pointer-events-none disabled:opacity-50"
+			title={title ?? `${label} (Enter)`}
+		>
+			{label}
+			<CornerDownLeft className="size-3.5 opacity-70" aria-hidden />
+		</button>
+	);
+}
+
 /** The round primary action at the composer's corner. */
 export function ComposerButton({
 	label,
diff --git a/apps/web/src/components/model.tsx b/apps/web/src/components/model.tsx
index d72a0ab0..6848eb8e 100644
--- a/apps/web/src/components/model.tsx
+++ b/apps/web/src/components/model.tsx
@@ -129,7 +129,7 @@ export function useModelsNotice(hostDir: string | undefined): Notice | undefined
 
 // The composer row's pickers: muted text that brightens on hover, like the prompt's own controls.
 const trigger =
-	"flex h-7 min-w-0 shrink-0 items-center gap-1.5 rounded-[8px] px-2.5 outline-none press hover:bg-ink/5 hover:text-ink focus-visible:bg-ink/5 data-[state=open]:bg-ink/5 data-[state=open]:text-ink";
+	"flex h-7 min-w-0 shrink-0 items-center gap-1.5 rounded-lg px-2.5 outline-none press hover:bg-ink/5 hover:text-ink focus-visible:bg-ink/5 data-[state=open]:bg-ink/5 data-[state=open]:text-ink";
 
 /** A model's name and its provider's, when the list has it. */
 const lookup = <P extends ModelProvider>(providers: ReadonlyArray<P>, ref: ModelRef) => {
@@ -246,14 +246,14 @@ export function ModelPicker({
 					event.preventDefault();
 					search.current?.focus();
 				}}
-				className="w-90 overflow-hidden rounded-[10px] border-ink/10 bg-popover/85 p-0 shadow-[0_16px_40px_-18px_rgb(0_0_0/0.55)] backdrop-blur-xl"
+				className="w-90 overflow-hidden rounded-lg border-ink/10 bg-popover/85 p-0 shadow-[0_16px_40px_-18px_rgb(0_0_0/0.55)] backdrop-blur-xl"
 			>
 				<div className="flex max-h-62 min-h-0 flex-row">
 					<div
 						role="toolbar"
 						aria-label="Providers"
 						aria-orientation="vertical"
-						className="w-11 shrink-0 overflow-y-auto bg-ink/[0.015] p-1 [scrollbar-width:none]"
+						className="w-11 shrink-0 overflow-y-auto bg-ink/1.5 p-1 scrollbar-none"
 					>
 						<div className="flex flex-col gap-1">
 							{providers.map((provider) => {
@@ -287,7 +287,7 @@ export function ModelPicker({
 						shouldFilter={false}
 						// Opens on the current model, as the highlighted row.
 						{...(current === undefined ? {} : { defaultValue: `${current.provider}/${current.id}` })}
-						className="flex min-w-0 flex-1 flex-col border-l border-edge/70 bg-ink/[0.025]"
+						className="flex min-w-0 flex-1 flex-col border-l border-edge/70 bg-ink/2.5"
 					>
 						<div className="px-3 pt-2.5">
 							<div className="relative border-b border-edge/70 pb-1.5 transition-colors focus-within:border-brand">
@@ -305,7 +305,7 @@ export function ModelPicker({
 								/>
 							</div>
 						</div>
-						<CommandPrimitive.List className="min-h-0 flex-1 overflow-x-hidden overflow-y-auto py-1.5 pr-1.5 pl-2 [scrollbar-width:thin]">
+						<CommandPrimitive.List className="min-h-0 flex-1 overflow-x-hidden overflow-y-auto py-1.5 pr-1.5 pl-2 scrollbar-thin">
 							<CommandPrimitive.Empty className="py-6 text-center text-xs text-ink-muted">
 								{empty}
 							</CommandPrimitive.Empty>
@@ -323,7 +323,7 @@ export function ModelPicker({
 											onChange({ provider: provider.id, id: model.id });
 											setOpen(false);
 										}}
-										className="flex min-h-8 cursor-pointer items-center gap-2 rounded-md px-2 py-1 outline-none select-none data-[disabled=true]:cursor-not-allowed data-[selected=true]:bg-ink/[0.08]"
+										className="flex min-h-8 cursor-pointer items-center gap-2 rounded-md px-2 py-1 outline-none select-none data-[disabled=true]:cursor-not-allowed data-[selected=true]:bg-ink/8"
 									>
 										<div className="min-w-0 flex-1">
 											<div className="flex min-w-0 items-center gap-2">
@@ -431,7 +431,7 @@ export function ThinkingPicker({
 					side="bottom"
 					sideOffset={4}
 					collisionPadding={5}
-					className="min-w-36 rounded-[10px] border-ink/10 bg-popover/85 p-1 shadow-[0_16px_40px_-18px_rgb(0_0_0/0.55)] backdrop-blur-xl"
+					className="min-w-36 rounded-lg border-ink/10 bg-popover/85 p-1 shadow-[0_16px_40px_-18px_rgb(0_0_0/0.55)] backdrop-blur-xl"
 				>
 					<DropdownMenuLabel className="px-2 pt-1 pb-0.5 text-xs font-normal text-ink-muted">
 						Reasoning
@@ -442,7 +442,7 @@ export function ThinkingPicker({
 							onSelect={() => onChange(level)}
 							aria-current={level === shown}
 							{...(level === shown ? { ref: picked } : {})}
-							className="gap-1.5 rounded-md py-1 text-[13px] aria-current:bg-ink/[0.08]"
+							className="gap-1.5 rounded-md py-1 text-sm aria-current:bg-ink/8"
 						>
 							{levelLabels[level]}
 						</DropdownMenuItem>
diff --git a/apps/web/src/components/monogram.tsx b/apps/web/src/components/monogram.tsx
index 1b748845..02ee4531 100644
--- a/apps/web/src/components/monogram.tsx
+++ b/apps/web/src/components/monogram.tsx
@@ -36,7 +36,7 @@ export function Monogram({ id, name, large = false }: { id: string; name: string
 		<span
 			aria-hidden
 			style={{ color: inkOf(id) } as CSSProperties}
-			className={`grid shrink-0 place-items-center bg-[color-mix(in_oklab,currentColor_14%,transparent)] font-mono font-bold ${large ? "size-6 rounded-[6px] text-[10px]" : "size-4 rounded-[4px] text-[8px]"}`}
+			className={`grid shrink-0 place-items-center bg-[color-mix(in_oklab,currentColor_14%,transparent)] font-mono font-bold ${large ? "size-6 rounded-md text-3xs" : "size-4 rounded-sm text-4xs"}`}
 		>
 			{monogram(name)}
 		</span>
diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsx
index af37dc19..1d5abfaa 100644
--- a/apps/web/src/components/ui/sidebar.tsx
+++ b/apps/web/src/components/ui/sidebar.tsx
@@ -360,11 +360,11 @@ function SidebarRail({ className, ...props }: React.ComponentProps<"button">) {
 				dragged.current = false;
 			}}
 			className={cn(
-				"absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-[left,right] ease-out group-data-[side=left]:-right-4 group-data-[side=right]:left-0 after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] hover:after:bg-sidebar-border sm:flex",
+				"absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-[left,right] ease-out group-data-[side=left]:-right-4 group-data-[side=right]:left-0 sm:flex",
 				resizable
 					? "cursor-col-resize"
 					: "in-data-[side=left]:cursor-w-resize in-data-[side=right]:cursor-e-resize [[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",
-				"group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full hover:group-data-[collapsible=offcanvas]:bg-sidebar",
+				"group-data-[collapsible=offcanvas]:translate-x-0",
 				"[[data-side=left][data-collapsible=offcanvas]_&]:-right-2",
 				"[[data-side=right][data-collapsible=offcanvas]_&]:-left-2",
 				className,
diff --git a/apps/web/src/landing/empty.tsx b/apps/web/src/landing/empty.tsx
index 8b2581f6..dc62698d 100644
--- a/apps/web/src/landing/empty.tsx
+++ b/apps/web/src/landing/empty.tsx
@@ -3,7 +3,7 @@ import type { ReactNode } from "react";
 /** The sidebar's message when it has nothing to list: a few quiet lines, centered, and what to do next. */
 export function Empty({ children }: { children: ReactNode }) {
 	return (
-		<div className="flex flex-col items-center gap-2 px-2 py-6 text-center text-[12px] text-ink-muted/70">
+		<div className="flex w-full min-w-0 flex-col items-center gap-2 px-2 py-6 text-center text-xs text-ink-muted/70">
 			{children}
 		</div>
 	);
@@ -26,7 +26,7 @@ export function EmptyAction({
 			type="button"
 			disabled={disabled}
 			onClick={onClick}
-			className="inline-flex items-center gap-1.5 rounded-md border border-edge px-2.5 py-1 text-[11px] font-medium text-ink-muted transition-colors outline-none hover:bg-ink/5 hover:text-ink focus-visible:bg-ink/5 disabled:pointer-events-none disabled:opacity-60"
+			className="inline-flex items-center gap-1.5 rounded-md border border-edge px-2.5 py-1 text-2xs font-medium text-ink-muted transition-colors outline-none hover:bg-ink/5 hover:text-ink focus-visible:bg-ink/5 disabled:pointer-events-none disabled:opacity-60"
 		>
 			{icon}
 			{children}
diff --git a/apps/web/src/landing/landing.tsx b/apps/web/src/landing/landing.tsx
index 22705f88..7c013fbd 100644
--- a/apps/web/src/landing/landing.tsx
+++ b/apps/web/src/landing/landing.tsx
@@ -1,6 +1,6 @@
 import { RegistryContext, useAtomRefresh, useAtomValue } from "@effect/atom-react";
 import { Option, Schema } from "effect";
-import { ArrowUp, ChevronDown, Folder, FolderPlus } from "lucide-react";
+import { ChevronDown, Folder, FolderPlus, SquarePen } from "lucide-react";
 import { useContext, useMemo, useState } from "react";
 
 import {
@@ -11,13 +11,12 @@ import {
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { ComposerNotice } from "@/components/banner";
-import { Composer, ComposerButton } from "@/components/composer";
+import { PromptComposer, ComposerHeader, ComposerSubmit } from "@/components/composer";
 import { makeHost } from "../kernel/host";
 import { sessionAddress } from "../widgets/session/address";
 import { Json, type Place as Where, topics } from "../widgets/session/schema";
 import { useOpenElsewhere } from "../wm/open";
 import { ModelPicker, ThinkingPicker, useChoice, useModelsNotice } from "@/components/model";
-import { TitleBar } from "../shell/titlebar";
 import { placeAtom, placeLabel, usePickFolder } from "./place";
 import { projectsAtom } from "../widgets/session/projects";
 import { Wordmark } from "./wordmark";
@@ -79,13 +78,13 @@ export function Landing() {
 
 	return (
 		<div className="flex h-full min-w-0 flex-col select-none">
-			<TitleBar active={undefined} />
 			<main className="relative flex min-h-0 flex-1 flex-col items-center overflow-auto px-4">
 				<div className="flex-[0.8]" />
 				<Wordmark className="pointer-events-none w-[min(88%,44rem)] shrink-0 text-brand opacity-15" />
 				<div className="mt-10 w-full max-w-2xl shrink-0">
 					{notice !== undefined && <ComposerNotice {...notice} />}
-					<Composer
+					<PromptComposer
+						header={<ComposerHeader title="New Session" icon={SquarePen} />}
 						autoFocus
 						value={query}
 						onChange={setQuery}
@@ -106,11 +105,7 @@ export function Landing() {
 								/>
 							</>
 						}
-						actions={
-							<ComposerButton label="Send" disabled={!canSend}>
-								<ArrowUp className="size-4" strokeWidth={2} aria-hidden />
-							</ComposerButton>
-						}
+						actions={<ComposerSubmit label="Start Session" disabled={!canSend} />}
 						tray={
 							<>
 								<DropdownMenu>
diff --git a/apps/web/src/landing/offline.tsx b/apps/web/src/landing/offline.tsx
index 18fb059b..6b5edf4b 100644
--- a/apps/web/src/landing/offline.tsx
+++ b/apps/web/src/landing/offline.tsx
@@ -23,9 +23,9 @@ export function ServerOffline() {
 		<button
 			type="button"
 			onClick={() => void navigate({ to: "/settings/servers" })}
-			className="text-[11px] text-ink-muted/70 underline-offset-2 outline-none hover:text-ink hover:underline focus-visible:underline"
+			className="text-2xs text-ink-muted/70 underline-offset-2 outline-none hover:text-ink hover:underline focus-visible:underline"
 		>
-			Server Settings
+			Provider Settings
 		</button>
 	);
 
diff --git a/apps/web/src/landing/sidebar.tsx b/apps/web/src/landing/sidebar.tsx
index c617291f..4979a5e7 100644
--- a/apps/web/src/landing/sidebar.tsx
+++ b/apps/web/src/landing/sidebar.tsx
@@ -1,15 +1,14 @@
-import { useAtomValue } from "@effect/atom-react";
+import { useAtom, useAtomValue } from "@effect/atom-react";
 import { useNavigate, useParams } from "@tanstack/react-router";
 import { Option } from "effect";
 import { AsyncResult } from "effect/reactivity";
-import { Plus, Search } from "lucide-react";
+import { Plus, Search, SquarePen } from "lucide-react";
 import { type MouseEvent, useState } from "react";
 
 import { Sidebar, SidebarContent, SidebarHeader, SidebarInput, SidebarRail } from "@/components/ui/sidebar";
 import { isMac, openMode } from "@codeworksh/widget/view";
 import { sessionAddress } from "../widgets/session/address";
 import { projectsAtom } from "../widgets/session/projects";
-import { insetTitleBar } from "../shell/titlebar";
 import { focusedAtom } from "../wm/chrome";
 import { deskAtom } from "../wm/instances";
 import { useOpenElsewhere } from "../wm/open";
@@ -27,7 +26,7 @@ export function SessionsSidebar() {
 	const result = useAtomValue(projectsAtom);
 	const [query, setQuery] = useState("");
 	const openElsewhere = useOpenElsewhere();
-	const place = useAtomValue(placeAtom);
+	const [place, setPlace] = useAtom(placeAtom);
 	const pickFolder = usePickFolder();
 	const navigate = useNavigate();
 	// The session in front on the workspace on screen reads as current.
@@ -38,6 +37,14 @@ export function SessionsSidebar() {
 	const current = instances.find((instance) => instance.id === focusedId)?.address;
 	// Picking lands on the start page, where the folder is used.
 	const addProject = pickFolder === undefined ? undefined : () => void pickFolder().then(() => navigate({ to: "/" }));
+	// A new session starts on the start page, in the current session's project when one is in front.
+	const startNew = () => {
+		const project = AsyncResult.isSuccess(result)
+			? result.value.find((candidate) => candidate.sessions.some(({ id }) => sessionAddress(id) === current))
+			: undefined;
+		if (project !== undefined) setPlace({ kind: "folder", path: project.path });
+		void navigate({ to: "/" });
+	};
 	// Primary and middle clicks open; a right click is left to the context menu. Shift, like a
 	// browser's new window, asks for a workspace of its own.
 	const open = (session: { id: string; project: { name: string } }, event: MouseEvent) => {
@@ -55,11 +62,9 @@ export function SessionsSidebar() {
 		: [];
 
 	return (
-		<Sidebar collapsible="offcanvas" className="select-none">
+		<Sidebar collapsible="offcanvas" className="shell-sidebar select-none">
 			<SidebarHeader className="gap-0 p-0">
-				{/* The window's drag region, clear of the macOS traffic lights. */}
-				<div className={`h-12 shrink-0 [-webkit-app-region:drag] ${insetTitleBar ? "pl-20" : ""}`} />
-				<div className="px-2 pb-2">
+				<div className="px-2 pt-2 pb-2">
 					{/* The icon centers on the input alone, not on the padding below it. */}
 					<div className="relative">
 						<Search className="pointer-events-none absolute top-1/2 left-2.5 size-3.5 -translate-y-1/2 text-ink-muted" />
@@ -69,22 +74,30 @@ export function SessionsSidebar() {
 							aria-label="Search sessions"
 							value={query}
 							onChange={(event) => setQuery(event.target.value)}
-							className="h-8 rounded-[8px] border-transparent bg-transparent pl-8 text-[13px] shadow-none focus-visible:bg-ink/5"
+							className="h-8 rounded-lg border-transparent bg-transparent pl-8 text-sm shadow-none focus-visible:bg-ink/5"
 						/>
 					</div>
+					<button
+						type="button"
+						onClick={startNew}
+						className="mt-1 flex h-8 w-full items-center gap-2 rounded-lg px-2.5 text-left text-sm text-ink transition-colors outline-none hover:bg-ink/5 focus-visible:bg-ink/5"
+					>
+						<SquarePen className="size-3.5 text-ink-muted" aria-hidden />
+						New
+					</button>
 				</div>
 			</SidebarHeader>
-			<SidebarContent className="px-2 pb-2">
+			<SidebarContent className="px-2 pt-2 pb-2">
 				{AsyncResult.isFailure(result) ? (
 					// The CodeWork server is the usual reason, and the sidebar can say which state it is in and fix it.
 					Option.exists(AsyncResult.error(result), (error) => error._tag === "Server.CodeworkUnavailable") ? (
 						<ServerOffline />
 					) : (
-						<p className="px-2.5 py-2 text-[12px] text-ink-muted">Could not load sessions.</p>
+						<p className="px-2.5 py-2 text-xs text-ink-muted">Could not load sessions.</p>
 					)
 				) : AsyncResult.isSuccess(result) && sessions.length === 0 ? (
 					needle !== "" ? (
-						<p className="px-2.5 py-2 text-[12px] text-ink-muted">No sessions match “{query}”.</p>
+						<p className="px-2.5 py-2 text-xs text-ink-muted">No sessions match “{query}”.</p>
 					) : (
 						<Empty>
 							{place.kind === "none" && result.value.length === 0 ? (
@@ -112,19 +125,16 @@ export function SessionsSidebar() {
 									type="button"
 									title={`${session.project.path}\n${isMac ? "⌘" : "Ctrl"}-click opens it in a new frame\n⇧-click opens it in a new workspace`}
 									aria-current={sessionAddress(session.id) === current ? "true" : undefined}
-									className="block w-full rounded-[8px] px-2.5 py-2 text-left transition-colors outline-none hover:bg-ink/5 focus-visible:bg-ink/5 aria-[current=true]:bg-ink/8"
+									className="block w-full rounded-lg px-2.5 py-2 text-left transition-colors outline-none hover:bg-ink/5 focus-visible:bg-ink/5 aria-current:bg-ink/8"
 									onClick={(event) => open(session, event)}
 									onAuxClick={(event) => open(session, event)}
 								>
-									<div className="flex h-5 min-w-0 items-center gap-1.5 text-[12px] text-ink-muted">
+									<div className="flex h-5 min-w-0 items-center gap-1.5 text-xs text-ink-muted">
 										<Monogram id={session.project.id} name={session.project.name} />
 										<span className="min-w-0 flex-1 truncate">{session.project.name}</span>
 										<span className="shrink-0 tabular-nums">{ago(session.updated)}</span>
 									</div>
-									<div className="mt-1 truncate text-[13px] text-ink">{session.title}</div>
-									{session.model !== undefined && (
-										<div className="mt-0.5 truncate text-[11px] text-ink-muted/60">{session.model.id}</div>
-									)}
+									<div className="mt-1 truncate text-sm text-ink">{session.title}</div>
 								</button>
 							</li>
 						))}
diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx
index 939b6351..2e76e549 100644
--- a/apps/web/src/main.tsx
+++ b/apps/web/src/main.tsx
@@ -12,10 +12,14 @@ import "./style.css";
 const history = isElectron ? createHashHistory() : createBrowserHistory();
 const router = getRouter(history);
 
-ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
-	<React.StrictMode>
-		<RegistryProvider>
-			<RouterProvider router={router} />
-		</RegistryProvider>
-	</React.StrictMode>,
-);
+// The splash in index.html stays up until the first route's split chunks have loaded, so the app
+// mounts whole instead of flashing an empty shell.
+export const startup = router.load().then(() => {
+	ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
+		<React.StrictMode>
+			<RegistryProvider>
+				<RouterProvider router={router} />
+			</RegistryProvider>
+		</React.StrictMode>,
+	);
+});
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
index a9498e39..63d482f7 100644
--- a/apps/web/src/routes/__root.tsx
+++ b/apps/web/src/routes/__root.tsx
@@ -4,7 +4,10 @@ import type { CSSProperties } from "react";
 
 import { SidebarProvider } from "@/components/ui/sidebar";
 import { SessionsSidebar } from "../landing/sidebar";
+import { SettingsSidebar } from "../settings/layout";
 import { serversAtom } from "../settings/servers/local";
+import { Navigation } from "../shell/navigation";
+import { NavigationControls } from "../shell/titlebar";
 import { Palette } from "../shell/palette";
 
 // The sessions sidebar wraps every page but settings, which has its own; its open state carries over.
@@ -15,13 +18,17 @@ function Root() {
 	useAtomMount(serversAtom);
 	return (
 		<SidebarProvider
-			className="h-full min-h-0"
-			style={{ "--sidebar-width": "17rem" } as CSSProperties}
+			className="app-shell h-full min-h-0 flex-col bg-desktop"
+			style={{ "--sidebar-width": "15rem" } as CSSProperties}
 			widthStorageKey="codework.sidebar.width"
 		>
-			{!inSettings && <SessionsSidebar />}
-			<div className="flex min-w-0 flex-1 flex-col">
-				<Outlet />
+			<NavigationControls />
+			<div className="mb-2 mr-2 ml-[52px] flex min-h-0 flex-1 overflow-hidden rounded-xl bg-frame">
+				<Navigation />
+				{inSettings ? <SettingsSidebar /> : <SessionsSidebar />}
+				<div className="flex min-w-0 flex-1 flex-col overflow-hidden">
+					<Outlet />
+				</div>
 			</div>
 			<Palette />
 		</SidebarProvider>
diff --git a/apps/web/src/settings/blocks.tsx b/apps/web/src/settings/blocks.tsx
index 5fb5fdcb..5b4b575e 100644
--- a/apps/web/src/settings/blocks.tsx
+++ b/apps/web/src/settings/blocks.tsx
@@ -7,16 +7,21 @@ import { Input } from "@/components/ui/input";
 export function Page({
 	title,
 	description,
+	actions,
 	children,
 }: {
 	title: string;
 	description?: ReactNode;
+	actions?: ReactNode;
 	children: ReactNode;
 }) {
 	return (
-		<div className="mx-auto flex max-w-3xl flex-col gap-10 px-4 py-8 text-[14px] md:px-10 md:py-14">
+		<div className="mx-auto flex w-full max-w-248 flex-col gap-8 px-5 py-8 text-sm sm:px-8 sm:py-10">
 			<header className="flex flex-col gap-2">
-				<h1 className="text-[28px]/tight font-semibold tracking-tight">{title}</h1>
+				<div className="flex items-center gap-4">
+					<h1 className="min-w-0 flex-1 text-2xl/tight font-semibold tracking-tight">{title}</h1>
+					{actions}
+				</div>
 				{description !== undefined && <p className="text-ink-muted">{description}</p>}
 			</header>
 			{children}
@@ -27,7 +32,7 @@ export function Page({
 export function Section({ title, children }: { title: string; children: ReactNode }) {
 	return (
 		<section className="flex flex-col gap-3">
-			<h2 className="text-[15px] font-semibold">{title}</h2>
+			<h2 className="text-sm font-semibold">{title}</h2>
 			{children}
 		</section>
 	);
@@ -35,9 +40,7 @@ export function Section({ title, children }: { title: string; children: ReactNod
 
 /** A card of rows with a divider between each. */
 export function Group({ children }: { children: ReactNode }) {
-	return (
-		<div className="flex flex-col divide-y divide-edge rounded-xl border border-edge bg-ink/[0.02]">{children}</div>
-	);
+	return <div className="flex flex-col divide-y divide-edge/60 rounded-lg border border-edge/60">{children}</div>;
 }
 
 /** A labelled setting: title and a one-line description on the left, its control on the right. */
@@ -51,10 +54,10 @@ export function Row({
 	children?: ReactNode;
 }) {
 	return (
-		<div className="flex items-center gap-4 px-5 py-4">
+		<div className="flex flex-col items-start gap-3 px-4 py-4 sm:flex-row sm:items-center sm:gap-4">
 			<div className="flex min-w-0 flex-1 flex-col gap-1">
 				<span className="font-medium">{title}</span>
-				{description !== undefined && <span className="text-[13px] text-ink-muted">{description}</span>}
+				{description !== undefined && <span className="text-sm text-ink-muted">{description}</span>}
 			</div>
 			{children}
 		</div>
diff --git a/apps/web/src/settings/layout.tsx b/apps/web/src/settings/layout.tsx
index 285894d6..b732e00e 100644
--- a/apps/web/src/settings/layout.tsx
+++ b/apps/web/src/settings/layout.tsx
@@ -1,7 +1,6 @@
-import { useAtomValue } from "@effect/atom-react";
 import { Link, Outlet, useMatchRoute, useNavigate } from "@tanstack/react-router";
-import { Search, X } from "lucide-react";
-import { type CSSProperties, useState } from "react";
+import { Search } from "lucide-react";
+import { useEffect, useRef, useState } from "react";
 
 import {
 	Sidebar,
@@ -13,103 +12,111 @@ import {
 	SidebarMenu,
 	SidebarMenuButton,
 	SidebarMenuItem,
-	SidebarProvider,
+	SidebarRail,
 } from "@/components/ui/sidebar";
-import { chromeButton, insetTitleBar } from "../shell/titlebar";
-import { lastWorkspaceAtom, useWorkspaces, workspaceRoute } from "../wm/workspaces";
 import { search } from "./sections";
 
-/**
- * Settings fills the window: a flat section list on the window chrome beside one pane for the
- * open section, under its own bar with the way out (also Esc).
- */
-export function SettingsLayout() {
+/** Settings replaces the sessions list within the same app shell and sidebar controls. */
+export function SettingsSidebar() {
 	const matchRoute = useMatchRoute();
 	const navigate = useNavigate();
 	const [query, setQuery] = useState("");
 	const matches = search(query);
 	const groups = [...new Set(matches.map((section) => section.group))];
-	// Closing returns to the workspace that was on screen, like Esc does.
-	const lastId = useAtomValue(lastWorkspaceAtom);
-	const back = useWorkspaces().find((workspace) => workspace.id === lastId);
-
 	return (
-		// Wider than shadcn's 16rem default, so section names never crowd the icons;
-		// below md the sidebar folds to an icon rail so the section keeps the room.
-		<SidebarProvider
-			className="h-full min-h-0 flex-col gap-0 p-2 pt-0"
-			style={{ "--sidebar-width": "20rem" } as CSSProperties}
-		>
-			<header
-				className={`flex h-12 shrink-0 items-center justify-end select-none [-webkit-app-region:drag] ${insetTitleBar ? "pl-18" : ""}`}
-			>
-				<button
-					type="button"
-					aria-label="Close settings"
-					title="Close settings (Esc)"
-					className={chromeButton}
-					onClick={() => void navigate(back === undefined ? { to: "/" } : workspaceRoute(back))}
-				>
-					<X className="size-4" strokeWidth={1.75} aria-hidden />
-				</button>
-			</header>
-			<div className="flex min-h-0 flex-1 gap-2">
-				<Sidebar collapsible="none" className="bg-transparent max-md:w-14">
-					<SidebarHeader className="gap-3 px-2 pt-3 max-md:hidden">
-						<h1 className="px-2 text-lg font-semibold">Settings</h1>
-						<div className="relative">
-							<Search className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-ink-muted" />
-							<SidebarInput
-								type="search"
-								placeholder="Search"
-								aria-label="Search settings"
-								value={query}
-								className="h-9 rounded-full border-transparent bg-ink/6 pl-9"
-								onChange={(event) => setQuery(event.target.value)}
-								onKeyDown={(event) => {
-									const first = matches[0];
-									if (event.key === "Enter" && first !== undefined) void navigate({ to: first.to });
-									if (event.key === "Escape" && query !== "") {
-										// Clears the query instead of leaving settings.
-										event.preventDefault();
-										setQuery("");
-									}
-								}}
-							/>
-						</div>
-					</SidebarHeader>
-					<SidebarContent>
-						{groups.map((group) => (
-							<SidebarGroup key={group}>
-								<SidebarGroupLabel className="text-ink-muted max-md:sr-only">{group}</SidebarGroupLabel>
-								<SidebarMenu>
-									{matches
-										.filter((section) => section.group === group)
-										.map(({ to, label, icon: Icon }) => (
+		<Sidebar collapsible="offcanvas" className="shell-sidebar select-none">
+			<SidebarHeader className="gap-1 px-2 pt-2 pb-2">
+				<h1 className="flex h-8 items-center px-2.5 text-sm font-semibold text-ink">Settings</h1>
+				<div className="relative">
+					<Search
+						className="pointer-events-none absolute top-1/2 left-2.5 size-3.5 -translate-y-1/2 text-ink-muted"
+						aria-hidden
+					/>
+					<SidebarInput
+						type="search"
+						placeholder="Search"
+						aria-label="Search settings"
+						value={query}
+						className="h-8 rounded-lg border-transparent bg-transparent pl-8 text-sm shadow-none focus-visible:bg-ink/5"
+						onChange={(event) => setQuery(event.target.value)}
+						onKeyDown={(event) => {
+							const first = matches[0];
+							if (event.key === "Enter" && first !== undefined) void navigate({ to: first.to });
+							if (event.key === "Escape" && query !== "") {
+								event.preventDefault();
+								setQuery("");
+							}
+						}}
+					/>
+				</div>
+			</SidebarHeader>
+			<SidebarContent className="px-2 pb-2">
+				<nav aria-label="Settings navigation">
+					{groups.map((group) => (
+						<SidebarGroup key={group} className="px-0">
+							<SidebarGroupLabel className="px-2.5 text-2xs text-ink-muted">{group}</SidebarGroupLabel>
+							<SidebarMenu>
+								{matches
+									.filter((section) => section.group === group)
+									.map(({ to, label, icon: Icon }) => {
+										const current = matchRoute({ to }) !== false;
+										return (
 											<SidebarMenuItem key={to}>
 												<SidebarMenuButton
 													asChild
-													size="lg"
-													isActive={matchRoute({ to }) !== false}
-													className="h-9 text-[14px] max-md:justify-center"
+													isActive={current}
+													className="h-8 rounded-lg px-2.5 text-sm text-ink-muted data-[active=true]:bg-ink/8 data-[active=true]:text-ink"
 												>
-													<Link to={to} title={label}>
-														<Icon strokeWidth={1.75} />
-														<span className="max-md:sr-only">{label}</span>
+													<Link to={to} aria-current={current ? "page" : undefined}>
+														<Icon className="size-4" strokeWidth={1.5} aria-hidden />
+														<span>{label}</span>
 													</Link>
 												</SidebarMenuButton>
 											</SidebarMenuItem>
-										))}
-								</SidebarMenu>
-							</SidebarGroup>
-						))}
-						{matches.length === 0 && <p className="px-4 py-2 text-ink-muted">No settings match “{query}”.</p>}
-					</SidebarContent>
-				</Sidebar>
-				<main className="panel min-w-0 flex-1 overflow-auto">
-					<Outlet />
-				</main>
+										);
+									})}
+							</SidebarMenu>
+						</SidebarGroup>
+					))}
+					{matches.length === 0 && (
+						<p className="px-2.5 py-2 text-xs text-ink-muted">No settings match “{query}”.</p>
+					)}
+				</nav>
+			</SidebarContent>
+			<SidebarRail />
+		</Sidebar>
+	);
+}
+
+export function SettingsLayout() {
+	const viewport = useRef<HTMLElement>(null);
+	const content = useRef<HTMLDivElement>(null);
+	useEffect(() => {
+		const element = viewport.current;
+		const body = content.current;
+		if (element === null || body === null) return;
+		const update = () => {
+			element.style.setProperty("--scroll-top", element.scrollTop > 1 ? "transparent" : "black");
+			element.style.setProperty(
+				"--scroll-bottom",
+				element.scrollTop + element.clientHeight < element.scrollHeight - 1 ? "transparent" : "black",
+			);
+		};
+		const observer = new ResizeObserver(update);
+		observer.observe(element);
+		observer.observe(body);
+		element.addEventListener("scroll", update, { passive: true });
+		update();
+		return () => {
+			observer.disconnect();
+			element.removeEventListener("scroll", update);
+		};
+	}, []);
+	return (
+		<main ref={viewport} className="settings-scroll h-full min-h-0 min-w-0 overflow-auto">
+			<div ref={content}>
+				<Outlet />
 			</div>
-		</SidebarProvider>
+		</main>
 	);
 }
diff --git a/apps/web/src/settings/sections.ts b/apps/web/src/settings/sections.ts
index a5b11186..c945bdac 100644
--- a/apps/web/src/settings/sections.ts
+++ b/apps/web/src/settings/sections.ts
@@ -16,7 +16,7 @@ export const sections: readonly SettingsSection[] = [
 		label: "Workspaces",
 		icon: Layers,
 		group: "App",
-		keywords: ["tabs", "shortcuts", "reorder", "rename", "icon", "delete"],
+		keywords: ["tabs", "shortcuts", "reorder", "rename", "delete"],
 	},
 	{
 		to: "/settings/themes",
@@ -27,10 +27,10 @@ export const sections: readonly SettingsSection[] = [
 	},
 	{
 		to: "/settings/servers",
-		label: "Servers",
+		label: "Providers",
 		icon: Server,
 		group: "App",
-		keywords: ["local", "remote", "cli", "service", "install", "codework", "version", "rpc"],
+		keywords: ["servers", "provider", "local", "remote", "cli", "service", "install", "codework", "version", "rpc"],
 	},
 ];
 
diff --git a/apps/web/src/settings/servers/add.tsx b/apps/web/src/settings/servers/add.tsx
index 384fd746..e154d69b 100644
--- a/apps/web/src/settings/servers/add.tsx
+++ b/apps/web/src/settings/servers/add.tsx
@@ -66,9 +66,9 @@ export function AddServer({
 
 	return (
 		<Dialog open onOpenChange={(next) => !next && onClose()}>
-			<DialogContent className="gap-5 text-[14px] sm:max-w-2xl">
+			<DialogContent className="gap-5 text-sm sm:max-w-2xl">
 				<DialogHeader>
-					<DialogTitle>Add server</DialogTitle>
+					<DialogTitle>Add Provider</DialogTitle>
 					<DialogDescription>Run another codework server on this machine, with its own home.</DialogDescription>
 				</DialogHeader>
 
@@ -77,10 +77,10 @@ export function AddServer({
 						<li
 							key={label}
 							aria-current={index === step ? "step" : undefined}
-							className={`flex items-center gap-2 rounded-md px-3 py-1.5 text-[13px] ${index === step ? "bg-ink/6 text-ink" : "text-ink-muted"}`}
+							className={`flex items-center gap-2 rounded-md px-3 py-1.5 text-sm ${index === step ? "bg-muted text-ink" : "text-ink-muted"}`}
 						>
 							<span
-								className={`grid size-5 place-items-center rounded-full text-[11px] ${index < step ? "bg-info text-white" : "bg-ink/8"}`}
+								className={`grid size-5 place-items-center rounded-full text-2xs ${index < step ? "bg-info text-white" : "bg-ink/8"}`}
 							>
 								{index < step ? <Check className="size-3" /> : index + 1}
 							</span>
@@ -106,7 +106,7 @@ export function AddServer({
 
 				{step === 1 && (
 					<div className="flex flex-col divide-y divide-edge rounded-xl border border-edge">
-						<Row title="Name" description="Shown in the server list.">
+						<Row title="Name" description="Shown in the provider list.">
 							<Input
 								aria-label="Name"
 								value={name}
@@ -126,7 +126,7 @@ export function AddServer({
 								aria-label="Executable"
 								value={executable}
 								placeholder={detected ?? "codework"}
-								className={`${quietField} font-mono text-[12px] md:text-[12px]`}
+								className={`${quietField} font-mono text-xs md:text-xs`}
 								onChange={(event) => setExecutable(event.target.value)}
 							/>
 						</Row>
@@ -143,7 +143,7 @@ export function AddServer({
 								value={home}
 								autoFocus
 								placeholder="~/.codework-2"
-								className={`${quietField} font-mono text-[12px] md:text-[12px]`}
+								className={`${quietField} font-mono text-xs md:text-xs`}
 								onChange={(event) => setHome(event.target.value)}
 							/>
 						</Row>
@@ -159,14 +159,14 @@ export function AddServer({
 							<Input
 								aria-label="Launch Args"
 								value={args}
-								className={`${quietField} font-mono text-[12px] md:text-[12px]`}
+								className={`${quietField} font-mono text-xs md:text-xs`}
 								onChange={(event) => setArgs(event.target.value)}
 							/>
 						</Row>
 					</div>
 				)}
 
-				{error !== null && <p className="text-[13px] text-destructive">{error}</p>}
+				{error !== null && <p className="text-sm text-destructive">{error}</p>}
 
 				<DialogFooter>
 					{step === 0 ? (
@@ -184,7 +184,7 @@ export function AddServer({
 						</Button>
 					) : (
 						<Button disabled={!canContinue || adding} onClick={submit}>
-							{adding ? "Adding…" : "Add server"}
+							{adding ? "Adding…" : "Add Provider"}
 						</Button>
 					)}
 				</DialogFooter>
@@ -217,7 +217,7 @@ function KindTile({
 			{icon}
 			<span className="flex min-w-0 flex-1 flex-col">
 				<span className="font-medium">{title}</span>
-				<span className="text-[12px] text-ink-muted">{detail}</span>
+				<span className="text-xs text-ink-muted">{detail}</span>
 			</span>
 			{badge}
 			{selected && <Check className="size-4 text-info" />}
@@ -231,7 +231,7 @@ function Row({ title, description, children }: { title: ReactNode; description:
 		<div className="grid items-center gap-x-6 gap-y-2 px-5 py-4 sm:grid-cols-[1fr_16rem]">
 			<span className="flex flex-col gap-1">
 				<span className="font-medium">{title}</span>
-				<span className="text-[13px] text-ink-muted">{description}</span>
+				<span className="text-sm text-ink-muted">{description}</span>
 			</span>
 			{children}
 		</div>
diff --git a/apps/web/src/settings/servers/local.tsx b/apps/web/src/settings/servers/local.tsx
index e5b4ec2a..205cb4eb 100644
--- a/apps/web/src/settings/servers/local.tsx
+++ b/apps/web/src/settings/servers/local.tsx
@@ -42,13 +42,13 @@ const TONES: Record<Tone, string> = {
 
 /** A small coloured pill: a server's state, or a fixed fact such as "Default". */
 export const Badge = ({ tone, children }: { tone: Tone; children: ReactNode }) => (
-	<span className={`shrink-0 rounded-full px-2 py-0.5 text-[11px] font-medium ${TONES[tone]}`}>{children}</span>
+	<span className={`shrink-0 rounded-full px-2 py-0.5 text-2xs font-medium ${TONES[tone]}`}>{children}</span>
 );
 
 export const Mark = () => <img src={brand} alt="" className="size-5 shrink-0" />;
 
 const Version = ({ version }: { version: string }) => (
-	<span className="font-mono text-[13px] text-ink-muted">v{version}</span>
+	<span className="font-mono text-sm text-ink-muted">v{version}</span>
 );
 
 /**
@@ -132,7 +132,7 @@ function stateOf({ cli, server }: ServerStatus): { tone: Tone; text: string } {
 const StatusLine = ({ status }: { status: ServerStatus }) => {
 	const { tone, text } = stateOf(status);
 	return (
-		<span className="flex items-center gap-1.5 text-[12px] text-ink-muted">
+		<span className="flex items-center gap-1.5 text-xs text-ink-muted">
 			<span className={`size-1.5 shrink-0 rounded-full ${DOTS[tone]}`} aria-hidden />
 			<span className="truncate">{text}</span>
 		</span>
@@ -164,7 +164,7 @@ export function LocalDetail({ status }: { status: ServerStatus }) {
 			{/* As tall as its buttons, so a server that can be removed does not sit lower than one that cannot. */}
 			<header className="flex h-8 items-center gap-3 px-2">
 				<Mark />
-				<span className="truncate text-[15px] font-medium">{status.name}</span>
+				<span className="truncate text-base font-medium">{status.name}</span>
 				<Badge tone="muted">Local</Badge>
 				{status.isDefault && <Badge tone="info">Default</Badge>}
 				<span className="flex-1" />
@@ -185,7 +185,7 @@ export function LocalDetail({ status }: { status: ServerStatus }) {
 							void configure({ name: next }).then((failure) => setNameError(failure ?? null));
 						}}
 					/>
-					{nameError !== null && <span className="text-[13px] text-destructive">{nameError}</span>}
+					{nameError !== null && <span className="text-sm text-destructive">{nameError}</span>}
 				</Field>
 			</Card>
 
@@ -193,7 +193,7 @@ export function LocalDetail({ status }: { status: ServerStatus }) {
 				<div className="flex flex-wrap items-start gap-x-4 gap-y-3 px-5 py-4">
 					<div className="flex min-w-60 flex-1 flex-col gap-1">
 						<span className="font-medium">Server</span>
-						<span className="text-[13px] text-ink-muted">
+						<span className="text-sm text-ink-muted">
 							<ServerLine status={status} />
 						</span>
 					</div>
@@ -214,12 +214,12 @@ export function LocalDetail({ status }: { status: ServerStatus }) {
 					)}
 				</div>
 				{(actionError ?? error) !== null && (
-					<p className="px-5 pb-4 text-[13px] text-destructive">{actionError ?? error}</p>
+					<p className="px-5 pb-4 text-sm text-destructive">{actionError ?? error}</p>
 				)}
 			</Card>
 
 			<section className="flex flex-col gap-3">
-				<h3 className="px-2 text-[14px] text-ink-muted">Runtime</h3>
+				<h3 className="px-2 text-sm text-ink-muted">Runtime</h3>
 				<Card>
 					<SettingField
 						title="Executable"
@@ -234,9 +234,7 @@ export function LocalDetail({ status }: { status: ServerStatus }) {
 						onSave={(next) => configure({ executable: next || null })}
 					>
 						{cli === null && <CopyCommand command={INSTALL} />}
-						{cli !== null && "failure" in cli && (
-							<span className="text-[13px] text-destructive">{cli.failure}</span>
-						)}
+						{cli !== null && "failure" in cli && <span className="text-sm text-destructive">{cli.failure}</span>}
 					</SettingField>
 					<SettingField
 						title={
@@ -268,7 +266,7 @@ export function LocalDetail({ status }: { status: ServerStatus }) {
 			</section>
 
 			<section className="flex flex-col gap-3">
-				<h3 className="px-2 text-[14px] text-ink-muted">Environment</h3>
+				<h3 className="px-2 text-sm text-ink-muted">Environment</h3>
 				<Card>
 					<Field
 						title="Variables"
@@ -362,7 +360,7 @@ function Field({ title, description, children }: { title: ReactNode; description
 	return (
 		<div className="flex flex-col gap-1 px-5 py-4">
 			<span className="font-medium">{title}</span>
-			<span className="text-[13px] text-ink-muted">{description}</span>
+			<span className="text-sm text-ink-muted">{description}</span>
 			<div className="mt-2 flex flex-col gap-1">{children}</div>
 		</div>
 	);
@@ -410,7 +408,7 @@ function SettingField({
 					label={label}
 					value={value}
 					placeholder={placeholder}
-					className={`${field} font-mono text-[12px] md:text-[12px]`}
+					className={`${field} font-mono text-xs md:text-xs`}
 					onCommit={save}
 				/>
 				{resettable && value !== "" && (
@@ -426,7 +424,7 @@ function SettingField({
 					</Button>
 				)}
 			</span>
-			{error !== undefined && <span className="text-[13px] text-destructive">{error}</span>}
+			{error !== undefined && <span className="text-sm text-destructive">{error}</span>}
 			{children}
 		</Field>
 	);
@@ -460,7 +458,7 @@ export function CopyCommand({ command }: { command: string }) {
 	const [copied, setCopied] = useState(false);
 	return (
 		<span className="flex items-center gap-1 rounded-lg border border-edge bg-ink/3 py-1 pr-1 pl-3">
-			<code className="flex-1 font-mono text-[12px]">{command}</code>
+			<code className="flex-1 font-mono text-xs">{command}</code>
 			<Button
 				size="icon-xs"
 				variant="ghost"
diff --git a/apps/web/src/settings/servers/servers.tsx b/apps/web/src/settings/servers/servers.tsx
index 0d8e349e..bbf753ba 100644
--- a/apps/web/src/settings/servers/servers.tsx
+++ b/apps/web/src/settings/servers/servers.tsx
@@ -4,6 +4,7 @@ import { AsyncResult } from "effect/reactivity";
 import { useEffect, useState } from "react";
 
 import { Skeleton } from "@/components/ui/skeleton";
+import { Page } from "../blocks";
 import { AddServer } from "./add";
 import { LocalDetail, LocalItem, serversAtom } from "./local";
 
@@ -27,71 +28,73 @@ export function ServersSettings() {
 	)[0];
 
 	return (
-		// The pane is narrower than the window by the settings sidebar, so the layout follows the pane. The
-		// page fills it and does not scroll: side by side only the detail does, stacked the panel does.
-		<div className="@container mx-auto flex h-full max-w-5xl flex-col gap-6 px-4 py-8 text-[14px] md:px-10 md:py-14">
-			<header className="flex items-center gap-4">
-				<h1 className="flex-1 text-[28px]/tight font-semibold tracking-tight">Servers</h1>
+		<Page
+			title="Providers"
+			actions={
 				<button
 					type="button"
 					title="Check again"
 					disabled={result.waiting}
-					className="flex items-center gap-1.5 rounded-md px-2 py-1 text-ink-muted transition-colors hover:bg-ink/6 hover:text-ink disabled:pointer-events-none"
+					className="flex items-center gap-1.5 rounded-md px-2 py-1 text-ink-muted transition-colors hover:bg-muted hover:text-ink disabled:pointer-events-none"
 					onClick={() => refresh()}
 				>
 					<RefreshCw className={`size-3.5 ${result.waiting ? "animate-spin" : ""}`} aria-hidden />
 					{result.waiting ? "Checking…" : <Checked at={servers} />}
 				</button>
-			</header>
-			<div className="grid min-h-0 flex-1 content-start overflow-y-auto rounded-xl border border-edge @3xl:grid-cols-[18rem_minmax(0,1fr)] @3xl:content-stretch @3xl:overflow-hidden">
-				<nav
-					aria-label="Servers"
-					className="flex flex-col border-edge @max-3xl:border-b @3xl:overflow-y-auto @3xl:border-r"
-				>
-					{servers?.map((server) => (
+			}
+		>
+			<div className="@container">
+				{/* Side by side, the split keeps a fixed height and each side scrolls on its own; stacked, the page scrolls. */}
+				<div className="grid items-start rounded-lg border border-edge/60 @3xl:h-[min(44rem,calc(100dvh-12.5rem))] @3xl:min-h-128 @3xl:grid-cols-[16rem_minmax(0,1fr)] @3xl:items-stretch @3xl:overflow-hidden">
+					<nav
+						aria-label="Providers"
+						className="flex flex-col border-edge/60 @max-3xl:border-b @3xl:min-h-0 @3xl:overflow-y-auto @3xl:border-r"
+					>
+						{servers?.map((server) => (
+							<button
+								key={server.id}
+								type="button"
+								aria-current={server.id === selected?.id ? "true" : undefined}
+								className={`border-b border-edge pr-5 text-left transition-colors ${server.id === selected?.id ? "bg-ink/4" : "hover:bg-ink/3"}`}
+								onClick={() => setSelectedId(server.id)}
+							>
+								<LocalItem status={server} />
+							</button>
+						))}
 						<button
-							key={server.id}
 							type="button"
-							aria-current={server.id === selected?.id ? "true" : undefined}
-							className={`border-b border-edge pr-5 text-left transition-colors ${server.id === selected?.id ? "bg-ink/4" : "hover:bg-ink/3"}`}
-							onClick={() => setSelectedId(server.id)}
+							className="flex items-center gap-3 px-5 py-4 text-left text-ink-muted transition-colors hover:bg-ink/3 hover:text-ink"
+							onClick={() => setAdding(true)}
 						>
-							<LocalItem status={server} />
+							<Plus className="size-4" aria-hidden />
+							Add Provider
 						</button>
-					))}
-					<button
-						type="button"
-						className="flex items-center gap-3 px-5 py-4 text-left text-ink-muted transition-colors hover:bg-ink/3 hover:text-ink"
-						onClick={() => setAdding(true)}
-					>
-						<Plus className="size-4" aria-hidden />
-						Add server
-					</button>
-				</nav>
-				{/* Mounted only while open, so each opening starts fresh and is named after the servers there are. */}
-				{adding && (
-					<AddServer
-						onClose={() => setAdding(false)}
-						defaultName={`CodeWork ${(servers?.length ?? 0) + 1}`}
-						detected={detected}
-						onAdded={setSelectedId}
-					/>
-				)}
-				<div className="min-w-0 @3xl:overflow-y-auto">
-					{selected !== undefined ? (
-						<LocalDetail key={selected.id} status={selected} />
-					) : AsyncResult.isFailure(result) ? (
-						<p className="p-6 text-ink-muted">The app server did not answer.</p>
-					) : (
-						<div className="flex flex-col gap-3 p-6">
-							<Skeleton className="h-5 w-1/3" />
-							<Skeleton className="h-24 w-full" />
-							<Skeleton className="h-40 w-full" />
-						</div>
+					</nav>
+					{/* Mounted only while open, so each opening starts fresh and is named after the servers there are. */}
+					{adding && (
+						<AddServer
+							onClose={() => setAdding(false)}
+							defaultName={`CodeWork ${(servers?.length ?? 0) + 1}`}
+							detected={detected}
+							onAdded={setSelectedId}
+						/>
 					)}
+					<div className="min-w-0 @3xl:min-h-0 @3xl:overflow-y-auto">
+						{selected !== undefined ? (
+							<LocalDetail key={selected.id} status={selected} />
+						) : AsyncResult.isFailure(result) ? (
+							<p className="p-6 text-ink-muted">The app server did not answer.</p>
+						) : (
+							<div className="flex flex-col gap-3 p-6">
+								<Skeleton className="h-5 w-1/3" />
+								<Skeleton className="h-24 w-full" />
+								<Skeleton className="h-40 w-full" />
+							</div>
+						)}
+					</div>
 				</div>
 			</div>
-		</div>
+		</Page>
 	);
 }
 
diff --git a/apps/web/src/settings/servers/variables.tsx b/apps/web/src/settings/servers/variables.tsx
index 5ae703d6..a0f63fe3 100644
--- a/apps/web/src/settings/servers/variables.tsx
+++ b/apps/web/src/settings/servers/variables.tsx
@@ -73,7 +73,7 @@ export function Variables({
 						placeholder="VARIABLE_NAME"
 						value={row.name}
 						autoFocus={row.name === "" && !row.kept}
-						className={`${quietField} w-2/5 font-mono text-[12px] md:text-[12px]`}
+						className={`${quietField} w-2/5 font-mono text-xs md:text-xs`}
 						onChange={(event) => update(row.id, { name: event.target.value })}
 						onBlur={() => save(rows)}
 					/>
@@ -83,7 +83,7 @@ export function Variables({
 						type={row.sensitive ? "password" : "text"}
 						placeholder={row.kept ? "Saved; type to replace" : "value"}
 						value={row.value}
-						className={`${quietField} flex-1 font-mono text-[12px] md:text-[12px]`}
+						className={`${quietField} flex-1 font-mono text-xs md:text-xs`}
 						onChange={(event) => update(row.id, { value: event.target.value })}
 						onBlur={() => save(rows)}
 					/>
@@ -123,11 +123,11 @@ export function Variables({
 				</span>
 			))}
 			{rows.some((row) => row.sensitive) && (
-				<span className="text-[13px] text-ink-muted">
+				<span className="text-sm text-ink-muted">
 					Sensitive values stay with the app server and are never shown here again.
 				</span>
 			)}
-			{error !== undefined && <span className="text-[13px] text-destructive">{error}</span>}
+			{error !== undefined && <span className="text-sm text-destructive">{error}</span>}
 		</div>
 	);
 }
diff --git a/apps/web/src/settings/themes.tsx b/apps/web/src/settings/themes.tsx
index e40280ac..d2f3c91f 100644
--- a/apps/web/src/settings/themes.tsx
+++ b/apps/web/src/settings/themes.tsx
@@ -35,7 +35,7 @@ export function ThemesSettings() {
 								{/* The theme's own tokens apply under its data-theme. */}
 								<span
 									data-theme={theme.id}
-									className={`flex aspect-[16/10] flex-col gap-1.5 border bg-(--t-bg) p-2.5 transition-colors ${
+									className={`flex aspect-16/10 flex-col gap-1.5 border bg-(--t-bg) p-2.5 transition-colors ${
 										selected
 											? "border-brand ring-1 ring-brand"
 											: "border-edge group-hover:border-edge-focus group-focus-visible:border-edge-focus"
@@ -48,7 +48,7 @@ export function ThemesSettings() {
 									</span>
 									<span className="h-2.5 w-1/3 bg-(--t-brand)" />
 								</span>
-								<span className="flex items-center gap-1.5 text-[13px]">
+								<span className="flex items-center gap-1.5 text-sm">
 									{theme.name}
 									{selected && <Check className="size-3.5 text-brand" strokeWidth={2} aria-hidden />}
 								</span>
diff --git a/apps/web/src/settings/workspaces.tsx b/apps/web/src/settings/workspaces.tsx
index 2e080add..1203ad70 100644
--- a/apps/web/src/settings/workspaces.tsx
+++ b/apps/web/src/settings/workspaces.tsx
@@ -14,10 +14,8 @@ import {
 	AlertDialogTrigger,
 } from "@/components/ui/alert-dialog";
 import { Button } from "@/components/ui/button";
-import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import { messageOf } from "@/lib/utils";
 import { isMac } from "@codeworksh/widget/view";
-import { iconOf, icons } from "../shell/icons";
 import { shortcutLabel } from "../shell/switcher";
 import { deskAtom, deskKey, only } from "../wm/instances";
 import {
@@ -36,7 +34,7 @@ import { Group, Keys, SavingInput, Page, Row, Section } from "./blocks";
 const sameOrder = (ids: readonly string[], workspaces: readonly Workspace[]) =>
 	ids.length === workspaces.length && ids.every((id, index) => workspaces[index]?.id === id);
 
-/** List, create, rename, re-icon, reorder (drag the grip), and delete workspaces. */
+/** List, create, rename, reorder (drag the grip), and delete workspaces. */
 export function WorkspacesSettings() {
 	const workspaces = useWorkspaces();
 	const create = useCreateWorkspace();
@@ -59,7 +57,7 @@ export function WorkspacesSettings() {
 
 	const addWorkspace = () =>
 		run(async () => {
-			const workspace = await create({ name: `Workspace ${workspaces.length + 1}`, icon: "app-window" });
+			const workspace = await create({ name: `Workspace ${workspaces.length + 1}` });
 			setCreated(workspace.id);
 		});
 
@@ -112,7 +110,6 @@ export function WorkspacesSettings() {
 							>
 								<GripVertical className="size-4" />
 							</span>
-							<IconPicker workspace={workspace} onError={setError} />
 							<NameField workspace={workspace} autoFocus={workspace.id === created} onError={setError} />
 							<Keys>{shortcutLabel(index + 1)}</Keys>
 							<DeleteButton workspace={workspace} onError={setError} />
@@ -135,15 +132,15 @@ export function WorkspacesSettings() {
 			</Section>
 			<Section title="Shortcuts">
 				<Group>
-					<Row title="Switch workspace" description="Jump to a workspace by its place in the list">
+					<Row title="Switch Workspace" description="Jump to a workspace by its place in the list">
 						<Keys>
 							{shortcutLabel(1)}–{MAX_WORKSPACES}
 						</Keys>
 					</Row>
-					<Row title="Open settings">
+					<Row title="Open Settings">
 						<Keys>{isMac ? "⌘," : "Ctrl+,"}</Keys>
 					</Row>
-					<Row title="Close settings" description="Back to the workspace you came from">
+					<Row title="Close Settings" description="Back to the workspace you came from">
 						<Keys>Esc</Keys>
 					</Row>
 				</Group>
@@ -178,42 +175,6 @@ function NameField({ workspace, autoFocus, onError }: RowProps & { readonly auto
 	);
 }
 
-function IconPicker({ workspace, onError }: RowProps) {
-	const save = useAtomSet(updateWorkspace, { mode: "promise" });
-	const [open, setOpen] = useState(false);
-	const Icon = iconOf(workspace.icon);
-	return (
-		<Popover open={open} onOpenChange={setOpen}>
-			<PopoverTrigger asChild>
-				<Button variant="ghost" size="icon" className="size-8" aria-label={`Icon for ${workspace.name}`}>
-					<Icon strokeWidth={1.75} />
-				</Button>
-			</PopoverTrigger>
-			<PopoverContent align="start" className="grid w-auto grid-cols-6 gap-1 p-2">
-				{Object.entries(icons).map(([name, Choice]) => (
-					<Button
-						key={name}
-						variant={name === workspace.icon ? "secondary" : "ghost"}
-						size="icon"
-						className="size-8"
-						aria-label={name}
-						aria-pressed={name === workspace.icon}
-						onClick={() => {
-							setOpen(false);
-							if (name === workspace.icon) return;
-							save({ payload: { id: workspace.id, icon: name }, reactivityKeys: workspacesKey }).catch(
-								(cause: unknown) => onError(messageOf(cause)),
-							);
-						}}
-					>
-						<Choice strokeWidth={1.75} />
-					</Button>
-				))}
-			</PopoverContent>
-		</Popover>
-	);
-}
-
 /** Deletes after a confirm that says which widgets close with it. */
 function DeleteButton({ workspace, onError }: RowProps) {
 	const remove = useAtomSet(deleteWorkspace, { mode: "promise" });
diff --git a/apps/web/src/shell/icons.ts b/apps/web/src/shell/icons.ts
deleted file mode 100644
index 0a846875..00000000
--- a/apps/web/src/shell/icons.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import {
-	AppWindow,
-	BookOpen,
-	Bot,
-	Briefcase,
-	Code2,
-	Database,
-	FlaskConical,
-	Globe,
-	LayoutDashboard,
-	Megaphone,
-	MessagesSquare,
-	Music,
-	NotebookPen,
-	Palette,
-	Rocket,
-	Server,
-	Terminal,
-	Wrench,
-	type LucideIcon,
-} from "lucide-react";
-
-/** Icons a workspace can pick, saved by name so the database stores no components. */
-export const icons: Readonly<Record<string, LucideIcon>> = {
-	"layout-dashboard": LayoutDashboard,
-	code: Code2,
-	"notebook-pen": NotebookPen,
-	terminal: Terminal,
-	globe: Globe,
-	bot: Bot,
-	"messages-square": MessagesSquare,
-	"book-open": BookOpen,
-	briefcase: Briefcase,
-	database: Database,
-	server: Server,
-	"flask-conical": FlaskConical,
-	palette: Palette,
-	megaphone: Megaphone,
-	music: Music,
-	rocket: Rocket,
-	wrench: Wrench,
-	"app-window": AppWindow,
-};
-
-export const iconOf = (name: string): LucideIcon => icons[name] ?? AppWindow;
diff --git a/apps/web/src/shell/navigation.tsx b/apps/web/src/shell/navigation.tsx
new file mode 100644
index 00000000..b6c0ac19
--- /dev/null
+++ b/apps/web/src/shell/navigation.tsx
@@ -0,0 +1,50 @@
+import { Link, useLocation } from "@tanstack/react-router";
+import { House, Settings } from "lucide-react";
+
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+
+/** App destinations stay available independently of the collapsible sessions sidebar. */
+export function Navigation() {
+	const pathname = useLocation({ select: (location) => location.pathname });
+	return (
+		<nav
+			aria-label="Main navigation"
+			className="fixed top-12 bottom-0 left-0 z-20 flex w-[52px] flex-col items-center gap-2 bg-desktop pt-2 pb-3 select-none"
+		>
+			<Tooltip>
+				<TooltipTrigger asChild>
+					<Link
+						to="/"
+						aria-label="Home"
+						aria-current={pathname === "/" ? "page" : undefined}
+						className={destination}
+					>
+						<House className="size-[18px]" strokeWidth={1.75} aria-hidden />
+					</Link>
+				</TooltipTrigger>
+				<TooltipContent side="right" sideOffset={8}>
+					Home
+				</TooltipContent>
+			</Tooltip>
+			<div className="flex-1" />
+			<Tooltip>
+				<TooltipTrigger asChild>
+					<Link
+						to="/settings/workspaces"
+						aria-label="Settings"
+						aria-current={pathname.startsWith("/settings") ? "page" : undefined}
+						className={destination}
+					>
+						<Settings className="size-[18px]" strokeWidth={1.75} aria-hidden />
+					</Link>
+				</TooltipTrigger>
+				<TooltipContent side="right" sideOffset={8}>
+					Settings
+				</TooltipContent>
+			</Tooltip>
+		</nav>
+	);
+}
+
+const destination =
+	"grid size-8 place-items-center rounded-lg text-ink-muted outline-none hover:bg-ink/5 hover:text-ink focus-visible:ring-2 focus-visible:ring-ring aria-[current=page]:bg-ink/8 aria-[current=page]:text-ink press [-webkit-app-region:no-drag]";
diff --git a/apps/web/src/shell/shell.tsx b/apps/web/src/shell/shell.tsx
index 22d64073..6b11dcc9 100644
--- a/apps/web/src/shell/shell.tsx
+++ b/apps/web/src/shell/shell.tsx
@@ -7,7 +7,6 @@ import { Desktop } from "../wm/desktop";
 import { deskQueryAtom } from "../wm/instances";
 import { lastWorkspaceAtom, useWorkspaces, workspaceRoute, workspacesAtom } from "../wm/workspaces";
 import { settingsShortcut, workspaceShortcut } from "./switcher";
-import { TitleBar } from "./titlebar";
 
 /**
  * Lives in the pathless `_shell` layout so switching workspaces (a URL change) never remounts
@@ -65,8 +64,6 @@ export function Shell() {
 
 	return (
 		<div className="flex h-full min-w-0 flex-col">
-			{/* Settings takes the whole window, with its own bar. */}
-			{!inSettings && <TitleBar active={shown} />}
 			<div className="relative min-h-0 flex-1">
 				{ready &&
 					shown !== undefined && (
diff --git a/apps/web/src/shell/swatch.tsx b/apps/web/src/shell/swatch.tsx
index 13a23b28..9abcbaba 100644
--- a/apps/web/src/shell/swatch.tsx
+++ b/apps/web/src/shell/swatch.tsx
@@ -6,7 +6,7 @@ export function Swatch({ theme }: { theme: ThemeId }) {
 		<span
 			data-theme={theme}
 			aria-hidden
-			className="flex h-5 shrink-0 items-center gap-1 border border-(--t-border-strong) bg-(--t-bg) px-1.5 text-[11px] text-(--t-text)"
+			className="flex h-5 shrink-0 items-center gap-1 border border-(--t-border-strong) bg-(--t-bg) px-1.5 text-2xs text-(--t-text)"
 		>
 			<span className="size-1.5 rounded-full bg-(--t-brand)" />
 			Aa
diff --git a/apps/web/src/shell/switcher.tsx b/apps/web/src/shell/switcher.tsx
index bd99dbdf..316b8284 100644
--- a/apps/web/src/shell/switcher.tsx
+++ b/apps/web/src/shell/switcher.tsx
@@ -1,13 +1,20 @@
-import { useAtomValue } from "@effect/atom-react";
-import { Link } from "@tanstack/react-router";
-import { Fragment, useRef } from "react";
+import { useAtomSet, useAtomValue } from "@effect/atom-react";
+import { Link, useNavigate } from "@tanstack/react-router";
+import { AppWindow, X } from "lucide-react";
+import { Fragment, useEffect, useRef } from "react";
 
-import { isMac, type Tab } from "@codeworksh/widget/view";
+import { isMac } from "@codeworksh/widget/view";
 import { registry } from "../widgets";
 import { chromeAtom, chromeOf, focusedAtom, tabOwnerAtom } from "../wm/chrome";
-import { deskAtom } from "../wm/instances";
-import { type Workspace, workspaceRoute, workspaceTag } from "../wm/workspaces";
-import { iconOf } from "./icons";
+import { deskAtom, deskKey } from "../wm/instances";
+import {
+	deleteWorkspace,
+	updateWorkspace,
+	type Workspace,
+	workspaceRoute,
+	workspacesKey,
+	workspaceTag,
+} from "../wm/workspaces";
 
 interface SwitcherProps {
 	readonly workspaces: readonly Workspace[];
@@ -16,79 +23,124 @@ interface SwitcherProps {
 }
 
 /**
- * Workspace tabs, like a browser's: a title and subtitle that the workspace's focused frame decides
- * (its `setTab`), and they shrink together when the bar runs out of room. The active workspace is the URL, so a tab is a link.
+ * Workspace tabs, like a browser's: a title that the workspace's focused frame decides (its
+ * `setTab`), shortened at its end when the bar runs out of room. The active workspace is the URL, so a tab is a link.
+ * A frame's title is saved with its workspace, so after a restart a workspace not opened yet still names what it shows.
  */
 export function Switcher({ workspaces, active }: SwitcherProps) {
 	const { instances, order } = useAtomValue(deskAtom);
 	const chrome = useAtomValue(chromeAtom);
 	const focusedOn = useAtomValue(focusedAtom);
 	const owners = useAtomValue(tabOwnerAtom);
+	const navigate = useNavigate();
+	const remove = useAtomSet(deleteWorkspace, { mode: "promise" });
+	// No confirm, like a browser tab; closing the one on screen moves to a neighbour first.
+	const close = async (workspace: Workspace, index: number) => {
+		if (workspace.id === active?.id) {
+			const next = workspaces[index + 1] ?? workspaces[index - 1];
+			await navigate(next === undefined ? { to: "/" } : workspaceRoute(next));
+		}
+		// The server drops the workspace's widgets, so the desk reloads with the list.
+		await remove({ payload: { id: workspace.id }, reactivityKeys: [...workspacesKey, ...deskKey] }).catch(
+			() => undefined,
+		);
+	};
 	// What each tab showed last, kept while a frame that will set the tab is still loading.
-	const shown = useRef(new Map<string, Tab>());
+	const shown = useRef(new Map<string, string>());
 	const showing = (workspace: Workspace) => {
-		const tab = tabOf(workspace);
-		shown.current.set(workspace.id, tab);
-		return tab;
+		const { text } = tabOf(workspace);
+		shown.current.set(workspace.id, text);
+		return text;
 	};
-	const tabOf = (workspace: Workspace): Tab => {
+	/** The tab's text, and whether a frame set it just now (and so it is worth saving). */
+	const tabOf = (workspace: Workspace): { readonly text: string; readonly live: boolean } => {
 		const tag = workspaceTag(workspace);
 		const onWorkspace = (instance: (typeof instances)[number] | undefined) =>
 			instance !== undefined && (instance.tags & tag) !== 0;
 		// The frame that claimed the tab keeps it while it is still on this workspace.
 		const owner = instances.find((instance) => instance.id === owners.get(workspace.id));
 		const claimed = owner !== undefined && onWorkspace(owner) ? chrome.get(owner.id)?.tab : undefined;
-		if (claimed !== undefined) return claimed;
+		if (claimed !== undefined) return { text: claimed, live: true };
 		// Its own last focus once it has been on screen, else its main frame (first in tile order), so
 		// focusing a frame shared with another workspace never relabels a tab not yet visited.
 		const remembered = instances.find((instance) => instance.id === focusedOn.get(workspace.id));
 		const focused = onWorkspace(remembered)
 			? remembered
 			: order.tileOrder.map((id) => instances.find((instance) => instance.id === id)).find(onWorkspace);
-		if (focused === undefined) return { title: workspace.name };
+		if (focused === undefined) return { text: workspace.name, live: false };
 		const frame = chrome.get(focused.id);
-		// The focused frame decides what the tab says; without a say, the workspace's name over its title.
-		if (frame?.tab !== undefined) return frame.tab;
+		// The focused frame decides what the tab says; without a say, the workspace's name and its title.
+		if (frame?.tab !== undefined) return { text: frame.tab, live: true };
+		// Before its frame has said anything since a restart, what it said last time.
+		if (workspace.tab !== undefined) return { text: workspace.tab, live: false };
 		const kept = shown.current.get(workspace.id);
-		if (registry.get(focused.kind)?.ownsTab === true && kept !== undefined) return kept;
+		if (registry.get(focused.kind)?.ownsTab === true && kept !== undefined) return { text: kept, live: false };
 		const title = chromeOf(focused, frame).title;
 		// A frame named like its workspace adds nothing to the tab.
-		return title.toLowerCase() === workspace.name.toLowerCase()
-			? { title: workspace.name }
-			: { title: workspace.name, subtitle: title };
+		const text =
+			title.toLowerCase() === workspace.name.toLowerCase() ? workspace.name : `${workspace.name} / ${title}`;
+		return { text, live: false };
 	};
 
+	// Saves a tab a frame set once it differs from the stored one; the last value sent is remembered,
+	// so the list refetch it triggers does not send it again.
+	const save = useAtomSet(updateWorkspace);
+	const sent = useRef(new Map<string, string>());
+	const changed = workspaces.flatMap((workspace) => {
+		const { text, live } = tabOf(workspace);
+		return live && text !== workspace.tab ? [[workspace.id, text] as const] : [];
+	});
+	useEffect(() => {
+		for (const [id, tab] of changed) {
+			if (sent.current.get(id) === tab) continue;
+			sent.current.set(id, tab);
+			save({ payload: { id, tab }, reactivityKeys: workspacesKey });
+		}
+	});
+
 	return (
-		<nav className="flex min-w-0 items-center rounded-[14px] bg-ink/5 p-1 [-webkit-app-region:no-drag]">
+		<nav
+			aria-label="Workspaces"
+			className="ml-3 flex min-w-0 items-center rounded-xl bg-ink/5 p-1 [-webkit-app-region:no-drag]"
+		>
 			{workspaces.map((workspace, index) => {
-				const Icon = iconOf(workspace.icon);
 				const current = workspace.id === active?.id;
 				const tab = showing(workspace);
-				// A hairline between two resting tabs; the raised active tab needs none beside it.
+				// Keep separator space reserved when selection hides its hairline.
 				const divider = index > 0 && !current && workspaces[index - 1]?.id !== active?.id;
 				return (
 					<Fragment key={workspace.id}>
-						{divider && <span aria-hidden className="mx-0.5 h-5 w-px shrink-0 bg-ink/12" />}
-						<Link
-							{...workspaceRoute(workspace)}
-							aria-current={current ? "page" : undefined}
-							title={`${tab.title}${tab.subtitle === undefined ? "" : `\n${tab.subtitle}`}\n${shortcutLabel(index + 1)}`}
-							className={`flex h-9 w-56 min-w-12 shrink items-center gap-2 rounded-[10px] pr-3 pl-1.5 transition-colors animate-in duration-150 ease-out fade-in-0 zoom-in-95 [corner-shape:superellipse(1.25)] ${
-								current
-									? "border border-edge bg-linear-to-b from-frame-top to-frame text-ink shadow-frame"
-									: "border border-transparent text-ink-muted hover:bg-ink/5 hover:text-ink"
-							}`}
-						>
-							<span className="grid size-6 shrink-0 place-items-center rounded-[7px] border border-edge bg-frame-top text-ink shadow-xs">
-								<Icon className="size-3.5" strokeWidth={1.75} aria-hidden />
-							</span>
-							<span className="flex min-w-0 flex-col leading-tight">
-								<span className="truncate text-[12px] font-medium">{tab.title}</span>
-								{tab.subtitle !== undefined && (
-									<span className="truncate text-[11px] text-ink-muted">{tab.subtitle}</span>
-								)}
-							</span>
-						</Link>
+						{index > 0 && (
+							<span aria-hidden className={`mx-0.5 h-4 w-px shrink-0 bg-ink/12 ${divider ? "" : "invisible"}`} />
+						)}
+						<div className="group relative flex h-8 w-56 min-w-16 shrink basis-56">
+							<Link
+								{...workspaceRoute(workspace)}
+								aria-current={current ? "page" : undefined}
+								title={`${tab}\n${shortcutLabel(index + 1)}`}
+								className={`flex size-full min-w-0 items-center gap-2 rounded-lg pr-3 pl-1.5 group-hover:pr-8 outline-none focus-visible:ring-2 focus-visible:ring-ring ${
+									current
+										? "border border-edge bg-linear-to-b from-frame-top to-frame text-ink shadow-frame"
+										: "border border-transparent text-ink-muted hover:bg-ink/5 hover:text-ink"
+								}`}
+							>
+								<span
+									className={`grid size-6 shrink-0 place-items-center rounded-md border ${current ? "border-edge bg-frame-top text-ink shadow-xs" : "border-transparent text-ink-muted"}`}
+								>
+									<AppWindow className="size-3.5" strokeWidth={1.75} aria-hidden />
+								</span>
+								<span className="truncate text-xs font-medium">{tab}</span>
+							</Link>
+							<button
+								type="button"
+								aria-label={`Close ${workspace.name}`}
+								title={`Close ${workspace.name}`}
+								onClick={() => void close(workspace, index)}
+								className="absolute top-1/2 right-1.5 grid size-5 -translate-y-1/2 place-items-center rounded-md text-ink-muted opacity-0 group-hover:opacity-100 hover:bg-ink/8 hover:text-ink focus-visible:opacity-100"
+							>
+								<X className="size-3" strokeWidth={2} aria-hidden />
+							</button>
+						</div>
 					</Fragment>
 				);
 			})}
diff --git a/apps/web/src/shell/titlebar.tsx b/apps/web/src/shell/titlebar.tsx
index 21862f34..1f017f4f 100644
--- a/apps/web/src/shell/titlebar.tsx
+++ b/apps/web/src/shell/titlebar.tsx
@@ -1,9 +1,10 @@
-import { Link, useCanGoBack, useNavigate, useRouter } from "@tanstack/react-router";
-import { ChevronLeft, House, Plus, Settings } from "lucide-react";
+import { useAtomValue } from "@effect/atom-react";
+import { useCanGoBack, useLocation, useNavigate, useParams, useRouter } from "@tanstack/react-router";
+import { ArrowLeft, ArrowRight, Plus, X } from "lucide-react";
 
 import { SidebarTrigger, useSidebar } from "@/components/ui/sidebar";
 import { isMac } from "@codeworksh/widget/view";
-import { MAX_WORKSPACES, useCreateWorkspace, useWorkspaces, type Workspace, workspaceRoute } from "../wm/workspaces";
+import { lastWorkspaceAtom, MAX_WORKSPACES, useCreateWorkspace, useWorkspaces, workspaceRoute } from "../wm/workspaces";
 import { Switcher } from "./switcher";
 
 // The window has no native title bar on macOS; a title bar is its drag region and leaves room for the
@@ -12,65 +13,80 @@ export const insetTitleBar = window.desktopBridge?.platform === "darwin";
 
 /** A square title-bar button; it opts out of the window's drag region so it can be clicked. */
 export const chromeButton =
-	"grid size-7 shrink-0 place-items-center rounded-[10px] text-ink-muted press [-webkit-app-region:no-drag] hover:bg-ink/5 hover:text-ink disabled:opacity-40 disabled:hover:bg-transparent";
+	"grid size-7 shrink-0 place-items-center rounded-lg text-ink-muted press [-webkit-app-region:no-drag] hover:bg-ink/5 hover:text-ink disabled:opacity-40 disabled:hover:bg-transparent";
 
-/**
- * The title bar over the start page and workspaces: the window's drag region with the sidebar
- * toggle, navigation, the workspace switcher and settings. With the sidebar hidden, or overlaid as
- * a sheet in a narrow window, it sits in the window's corner, so it moves clear of the macOS
- * traffic lights.
- */
-export function TitleBar({
-	active,
-}: {
-	/** The workspace on screen; none on the start page. */
-	readonly active: Workspace | undefined;
-}) {
+/** Window-level navigation remains available on Home, workspaces, and settings. */
+export function NavigationControls() {
 	const { open, isMobile } = useSidebar();
-	const inCorner = !open || isMobile;
+	const inSettings = useLocation({ select: (location) => location.pathname.startsWith("/settings") });
+	const withSidebar = open && !isMobile;
+	const { workspaceId } = useParams({ strict: false });
 	const workspaces = useWorkspaces();
+	const active = workspaces.find((workspace) => workspace.id === workspaceId);
+	const router = useRouter();
+	const canGoBack = useCanGoBack();
+	const index = useLocation({ select: (location) => location.state.__TSR_index });
+	const canGoForward = index < router.history.length - 1;
 	return (
-		<header
-			className={`flex h-12 shrink-0 items-center gap-1.5 px-2 select-none [-webkit-app-region:drag] ${inCorner && insetTitleBar ? "pl-20" : ""}`}
-		>
-			<SidebarTrigger
-				title={`Toggle sidebar (${isMac ? "⌘B" : "Ctrl+B"})`}
-				className="text-ink-muted [-webkit-app-region:no-drag] hover:text-ink"
-			/>
-			<BackButton />
-			<HomeButton />
-			<Switcher workspaces={workspaces} active={active} />
-			<NewWorkspaceButton />
-			<SettingsButton />
+		<header className="flex h-12 w-full shrink-0 items-center border-b border-edge/50 bg-desktop pr-2 select-none [-webkit-app-region:drag]">
+			<div
+				className={`flex shrink-0 items-center gap-1 px-2 ${insetTitleBar ? "min-w-44 pl-20" : "min-w-28"}`}
+				style={{ width: withSidebar ? "calc(52px + var(--sidebar-width))" : undefined }}
+			>
+				<button
+					type="button"
+					aria-label="Back"
+					title="Back"
+					disabled={!canGoBack}
+					onClick={() => router.history.back()}
+					className={chromeButton}
+				>
+					<ArrowLeft className="size-4" strokeWidth={1.5} aria-hidden />
+				</button>
+				<button
+					type="button"
+					aria-label="Forward"
+					title="Forward"
+					disabled={!canGoForward}
+					onClick={() => router.history.forward()}
+					className={chromeButton}
+				>
+					<ArrowRight className="size-4" strokeWidth={1.5} aria-hidden />
+				</button>
+				<SidebarTrigger
+					title={`Toggle sidebar (${isMac ? "⌘B" : "Ctrl+B"})`}
+					className="text-ink-muted [-webkit-app-region:no-drag] hover:text-ink"
+				/>
+			</div>
+			{inSettings ? (
+				<CloseSettings />
+			) : (
+				<>
+					<Switcher workspaces={workspaces} active={active} />
+					<NewWorkspaceButton />
+				</>
+			)}
 		</header>
 	);
 }
 
-function BackButton() {
-	const router = useRouter();
-	const canGoBack = useCanGoBack();
+function CloseSettings() {
+	const navigate = useNavigate();
+	const lastId = useAtomValue(lastWorkspaceAtom);
+	const back = useWorkspaces().find((workspace) => workspace.id === lastId);
 	return (
 		<button
 			type="button"
-			aria-label="Back"
-			title="Back"
-			disabled={!canGoBack}
-			onClick={() => router.history.back()}
-			className={chromeButton}
+			aria-label="Close settings"
+			title="Close settings (Esc)"
+			className={`${chromeButton} ml-auto`}
+			onClick={() => void navigate(back === undefined ? { to: "/" } : workspaceRoute(back))}
 		>
-			<ChevronLeft className="size-4" strokeWidth={1.75} aria-hidden />
+			<X className="size-4" strokeWidth={1.5} aria-hidden />
 		</button>
 	);
 }
 
-function HomeButton() {
-	return (
-		<Link to="/" aria-label="Home" title="Home: the start page" className={chromeButton}>
-			<House className="size-4" strokeWidth={1.75} aria-hidden />
-		</Link>
-	);
-}
-
 /** Adds a workspace and goes to it; pushed to the bar's right edge. */
 function NewWorkspaceButton() {
 	const workspaces = useWorkspaces();
@@ -78,7 +94,7 @@ function NewWorkspaceButton() {
 	const create = useCreateWorkspace();
 	const full = workspaces.length >= MAX_WORKSPACES;
 	const add = async () => {
-		const workspace = await create({ name: `Workspace ${workspaces.length + 1}`, icon: "app-window" });
+		const workspace = await create({ name: `Workspace ${workspaces.length + 1}` });
 		void navigate(workspaceRoute(workspace));
 	};
 	return (
@@ -88,17 +104,9 @@ function NewWorkspaceButton() {
 			title={full ? `All ${MAX_WORKSPACES} workspaces are in use` : "New workspace"}
 			disabled={full}
 			onClick={() => void add()}
-			className={`${chromeButton} ml-auto`}
+			className={chromeButton}
 		>
 			<Plus className="size-4" strokeWidth={1.75} aria-hidden />
 		</button>
 	);
 }
-
-function SettingsButton() {
-	return (
-		<Link to="/settings/workspaces" aria-label="Settings" title="Settings" className={chromeButton}>
-			<Settings className="size-4" strokeWidth={1.75} aria-hidden />
-		</Link>
-	);
-}
diff --git a/apps/web/src/style.css b/apps/web/src/style.css
index fcc845d5..fea6cfcb 100644
--- a/apps/web/src/style.css
+++ b/apps/web/src/style.css
@@ -1,24 +1,24 @@
 @import "tailwindcss";
 /* shadcn/ui's enter and exit animations (animate-in, fade-in-0, zoom-in-95, ...). */
 @import "tw-animate-css";
-@import "./themes.css";
 
 /* `--cw-*` are the theme contract widgets style against. They map onto the site palette's `--t-*`
    tokens, so switching data-theme restyles everything; light-dark() follows the theme's color-scheme. */
 :root {
-	--cw-desktop: var(--t-bg);
+	/* A quiet shell tint keeps even White and near-black palettes spatially legible. */
+	--cw-desktop: color-mix(in oklab, var(--t-bg) 96%, var(--t-text));
 	--cw-frame: var(--t-surface);
 	/* A touch lighter than the frame (whiter in light palettes), for the panel's top-down gradient. */
 	--cw-frame-top: light-dark(
-		color-mix(in oklab, var(--t-surface) 55%, white),
-		color-mix(in oklab, var(--t-surface) 93%, var(--t-text))
+		color-mix(in oklab, var(--t-surface) 88%, white),
+		color-mix(in oklab, var(--t-surface) 97%, var(--t-text))
 	);
-	--cw-edge: var(--t-border-subtle);
-	--cw-edge-focus: var(--t-border-strong);
-	--cw-ink: var(--t-text);
-	--cw-ink-secondary: var(--t-text-secondary);
-	--cw-ink-muted: var(--t-text-muted);
-	--cw-brand: var(--t-brand);
+	--cw-edge: color-mix(in oklab, var(--t-surface) 88%, var(--t-text));
+	--cw-edge-focus: color-mix(in oklab, var(--t-surface) 76%, var(--t-text));
+	--cw-ink: color-mix(in oklab, var(--t-text) 96%, var(--t-surface));
+	--cw-ink-secondary: color-mix(in oklab, var(--t-text) 85%, var(--t-surface));
+	--cw-ink-muted: color-mix(in oklab, var(--t-text) 75%, var(--t-surface));
+	--cw-brand: light-dark(color-mix(in oklab, var(--t-brand) 85%, var(--t-text)), var(--t-brand));
 	--cw-brand-ink: var(--t-brand-ink);
 	--cw-scrollbar: color-mix(in oklab, var(--t-text) 16%, transparent);
 	--cw-danger: light-dark(#dc2626, #f87171);
@@ -26,8 +26,9 @@
 	--cw-success: light-dark(#16a34a, #4ade80);
 	--cw-info: light-dark(#2563eb, #60a5fa);
 	--cw-highlight: light-dark(rgb(255 255 255 / 0.9), color-mix(in oklab, var(--t-text) 9%, transparent));
-	--cw-shadow-near: light-dark(rgb(0 0 0 / 0.06), rgb(0 0 0 / 0.35));
-	--cw-shadow-far: light-dark(rgb(0 0 0 / 0.08), rgb(0 0 0 / 0.5));
+	--cw-drop-shadow: color-mix(in oklab, var(--t-text) 20%, transparent);
+	--cw-shadow-near: light-dark(rgb(0 0 0 / 0.06), rgb(0 0 0 / 0.22));
+	--cw-shadow-far: light-dark(rgb(0 0 0 / 0.08), rgb(0 0 0 / 0.3));
 	--cw-dialog-shadow: 0 24px 64px -24px light-dark(rgb(0 0 0 / 0.35), rgb(0 0 0 / 0.9));
 	--cw-menu-shadow: 0 16px 40px -18px light-dark(rgb(0 0 0 / 0.55), rgb(0 0 0 / 0.8));
 }
@@ -39,6 +40,13 @@
 	/* Tailwind's built-in curves are too weak for UI motion. */
 	--ease-out: cubic-bezier(0.23, 1, 0.32, 1);
 	--ease-in-out: cubic-bezier(0.77, 0, 0.175, 1);
+	/* Sizes below Tailwind's xs, for dense chrome: badges, kbd hints, metadata. */
+	--text-2xs: 0.6875rem;
+	--text-2xs--line-height: calc(1 / 0.6875);
+	--text-3xs: 0.625rem;
+	--text-3xs--line-height: calc(0.875 / 0.625);
+	--text-4xs: 0.5rem;
+	--text-4xs--line-height: 1;
 }
 
 @theme inline {
@@ -167,3 +175,53 @@
 		background: var(--cw-scrollbar);
 	}
 }
+
+/* The navigation rail stays put when the shadcn sessions sidebar folds away. */
+.app-shell [data-slot="sidebar"] > .shell-sidebar {
+	left: 52px;
+	top: 48px;
+	height: calc(100svh - 56px);
+	border: 0;
+	border-right: 1px solid color-mix(in oklab, var(--cw-edge) 60%, transparent);
+	border-radius: 12px 0 0 12px;
+	background: var(--cw-frame);
+}
+.app-shell [data-collapsible="offcanvas"] > .shell-sidebar {
+	left: calc(52px - var(--sidebar-width));
+	visibility: hidden;
+}
+.app-shell .shell-sidebar [data-slot="sidebar-inner"] {
+	background: transparent;
+}
+
+/* Sidebar and title-bar tabs follow the same width without trailing one another. */
+.app-shell > div > [data-slot="sidebar"] > [data-slot="sidebar-gap"],
+.app-shell .shell-sidebar {
+	transition: none;
+}
+
+/* The transcript continues beneath the floating reply card rather than ending at a hard seam. */
+.session-transcript {
+	mask-image: linear-gradient(
+		to bottom,
+		var(--transcript-top, black),
+		black 16px,
+		black calc(100% - var(--composer-height, 60px) - 40px),
+		transparent calc(100% - var(--composer-height, 60px) + 32px)
+	);
+}
+
+.session-transcript-scrolled {
+	--transcript-top: transparent;
+}
+
+/* Only soften edges that have more settings content beyond them. */
+.settings-scroll {
+	mask-image: linear-gradient(
+		to bottom,
+		var(--scroll-top, black),
+		black 16px,
+		black calc(100% - 24px),
+		var(--scroll-bottom, black)
+	);
+}
diff --git a/apps/web/src/widgets/session/backend.ts b/apps/web/src/widgets/session/backend.ts
index 4c7539b6..2d88d4f3 100644
--- a/apps/web/src/widgets/session/backend.ts
+++ b/apps/web/src/widgets/session/backend.ts
@@ -1,8 +1,17 @@
 import { Bus, Codework, defineBackend, handle, Kv } from "@codeworksh/widget/backend";
-import { type EventEnvelope, HistoryEntry, type Part, type SessionInfo } from "@codeworksh/widget/codework";
+import {
+	type EventEnvelope,
+	HistoryEntry,
+	type Part,
+	QueuedPrompt,
+	type SessionInfo,
+} from "@codeworksh/widget/codework";
 import { Deferred, Effect, Fiber, Option, Schedule, Schema, Stream } from "effect";
 
 import {
+	Cancel,
+	type Cancelled,
+	Change,
 	Configure,
 	Create,
 	type Created,
@@ -32,12 +41,18 @@ const toInfo = (info: SessionInfo): Info => ({
 
 const sameInfo = Schema.toEquivalence(Info);
 const sameMessage = Schema.toEquivalence(HistoryEntry);
+const sameQueue = Schema.toEquivalence(Schema.Array(QueuedPrompt));
 
 /**
  * What changed from `before` to the fresh info and messages, in conversation order. A first seed
  * publishes nothing: no view holds a snapshot yet, and the one it loads already has everything.
  */
-const changes = (before: Snapshot | undefined, info: Info, messages: ReadonlyArray<HistoryEntry>): Update[] => {
+const changes = (
+	before: Snapshot | undefined,
+	info: Info,
+	messages: ReadonlyArray<HistoryEntry>,
+	queued: ReadonlyArray<QueuedPrompt>,
+): Update[] => {
 	if (before === undefined) return [];
 	const previous = new Map(before.messages.map((message) => [message.id, message]));
 	const current = new Set(messages.map((message) => message.id));
@@ -50,6 +65,8 @@ const changes = (before: Snapshot | undefined, info: Info, messages: ReadonlyArr
 				return old === undefined || !sameMessage(old, message);
 			})
 			.map((message) => ({ _tag: "Message" as const, message })),
+		// After the messages, so a prompt that was promoted is in the conversation before it leaves the queue.
+		...(sameQueue(before.queued, queued) ? [] : [{ _tag: "Queue" as const, queued }]),
 	];
 };
 
@@ -95,6 +112,7 @@ const describe = (error: { readonly _tag: string }) => {
 };
 
 const encodeReply = Schema.encodeEffect(Json.Reply);
+const encodeCancelled = Schema.encodeEffect(Json.Cancelled);
 const encodeCreated = Schema.encodeEffect(Json.Created);
 const encodeWindow = Schema.encodeEffect(Json.Window);
 const encodeUpdate = Schema.encodeEffect(Json.Update);
@@ -160,16 +178,21 @@ export const session = defineBackend({
 
 		/** Refetches the conversation, publishes what changed, then stores the snapshot. */
 		const refresh = Effect.fn("Session.refresh")(function* (id: string, cursor: number | undefined) {
-			const { info, history } = yield* Effect.all({
+			// In this order: a prompt promoted between the queue and history reads is then in both, never in neither.
+			const { info, queue, history } = yield* Effect.all({
 				info: codework("session.info", { sessionId: id }),
+				queue: codework("session.queue", { sessionId: id }),
 				history: codework("session.history", { sessionId: id }),
 			});
 			const before = yield* load(id);
 			const next = toInfo(info);
 			const messages = withStreamed(history.entries);
+			// One that is in both has been promoted: the conversation wins.
+			const listed = new Set(messages.map((message) => message.id));
+			const queued = queue.entries.filter((prompt) => !listed.has(prompt.id));
 			let seq = before?.seq ?? 0;
 			// Published before the snapshot is stored, so a view never holds a snapshot newer than its cursor.
-			for (const update of changes(before, next, messages)) {
+			for (const update of changes(before, next, messages, queued)) {
 				const payload = yield* encodeUpdate(update).pipe(Effect.orDie);
 				seq = (yield* bus.publish({ topic: topics.session(id), payload })).seq ?? seq;
 			}
@@ -178,6 +201,7 @@ export const session = defineBackend({
 			const snapshot: Snapshot = {
 				info: next,
 				messages,
+				queued,
 				seq,
 				...(resume === undefined ? {} : { cursor: resume }),
 			};
@@ -376,6 +400,7 @@ export const session = defineBackend({
 						_tag: "Window",
 						info: snapshot.info,
 						messages: snapshot.messages.slice(start, end),
+						queued: snapshot.queued,
 						seq: snapshot.seq,
 						more: start > 0,
 					};
@@ -434,6 +459,31 @@ export const session = defineBackend({
 			),
 		);
 
+		// A cancel that lost to promotion answers `Sent`: the prompt is in the conversation, and the
+		// refresh that follows the log moving shows it there.
+		yield* handle(topics.cancel, Cancel, ({ sessionId, messageId }) =>
+			codework("session.cancel", { sessionId, messageId }).pipe(
+				Effect.map(({ cancelled }): Cancelled => (cancelled ? { _tag: "Cancelled" } : { _tag: "Sent" })),
+				Effect.catch((error) => Effect.succeed<Cancelled>({ _tag: "Failed", message: describe(error) })),
+				Effect.flatMap((reply) => encodeCancelled(reply).pipe(Effect.orDie)),
+			),
+		);
+
+		yield* handle(topics.change, Change, ({ sessionId, messageId, delivery, text }) =>
+			codework("session.update", {
+				sessionId,
+				messageId,
+				...(delivery === undefined ? {} : { delivery }),
+				...(text === undefined ? {} : { text }),
+			}).pipe(
+				Effect.map(({ updated }): Reply =>
+					updated ? { _tag: "Done" } : { _tag: "Failed", message: "That message was already sent." },
+				),
+				Effect.catch((error) => Effect.succeed<Reply>({ _tag: "Failed", message: describe(error) })),
+				Effect.flatMap((reply) => encodeReply(reply).pipe(Effect.orDie)),
+			),
+		);
+
 		yield* handle(topics.interrupt, Interrupt, ({ sessionId }) =>
 			codework("session.interrupt", { sessionId }).pipe(
 				Effect.as<Reply>({ _tag: "Done" }),
diff --git a/apps/web/src/widgets/session/composer.tsx b/apps/web/src/widgets/session/composer.tsx
index 91d4243e..88afdd27 100644
--- a/apps/web/src/widgets/session/composer.tsx
+++ b/apps/web/src/widgets/session/composer.tsx
@@ -1,9 +1,9 @@
 import { useBus, useKv } from "@codeworksh/widget/view";
 import { Option, Schema } from "effect";
-import { ArrowUp, Square } from "lucide-react";
-import { useEffect, useState } from "react";
+import { Reply, Square } from "lucide-react";
+import { useEffect, useRef, useState } from "react";
 
-import { Composer, ComposerButton, type Submit } from "@/components/composer";
+import { PromptComposer, ComposerHeader, ComposerSubmit, ComposerButton, type Submit } from "@/components/composer";
 import { ModelPicker, type ModelRef, ThinkingPicker } from "@/components/model";
 import type { Delivery, ThinkingLevel } from "@codeworksh/widget/codework";
 import { type Info, Json, topics } from "./schema";
@@ -34,6 +34,7 @@ export function SessionComposer({
 	running,
 	info,
 	onError,
+	restored,
 }: {
 	readonly sessionId: string;
 	readonly instanceId: string;
@@ -41,7 +42,67 @@ export function SessionComposer({
 	readonly info: Info;
 	/** A send or configure the backend refused, or undefined as a new one starts; the view shows it. */
 	readonly onError: (message: string | undefined) => void;
+	/** A queued prompt taken back: its text goes above the draft, once per `key`. */
+	readonly restored?: { readonly text: string; readonly key: number } | undefined;
 }) {
+	const root = useRef<HTMLDivElement>(null);
+	const input = useRef<HTMLTextAreaElement>(null);
+	const [expanded, setExpanded] = useState(false);
+	const expand = () => setExpanded(true);
+	const collapse = () => {
+		input.current?.blur();
+		setExpanded(false);
+	};
+	useEffect(() => {
+		if (expanded) input.current?.focus();
+	}, [expanded]);
+	useEffect(() => {
+		const onKeyDown = (event: KeyboardEvent) => {
+			if (
+				event.key === "Escape" &&
+				expanded &&
+				!event.defaultPrevented &&
+				root.current?.closest("article[data-focused='true']") &&
+				!Array.from(document.querySelectorAll("[role='dialog'], [role='menu']")).some(
+					(element) => element.getClientRects().length > 0,
+				)
+			) {
+				event.preventDefault();
+				input.current?.blur();
+				setExpanded(false);
+				return;
+			}
+			if (
+				event.defaultPrevented ||
+				event.repeat ||
+				event.isComposing ||
+				event.metaKey ||
+				event.ctrlKey ||
+				event.altKey ||
+				event.shiftKey ||
+				event.key.toLowerCase() !== "r"
+			)
+				return;
+			const target = event.target;
+			if (
+				target instanceof HTMLElement &&
+				(target.isContentEditable || target.closest("input, textarea, select, [role='dialog'], [role='menu']"))
+			)
+				return;
+			if (
+				root.current?.closest("article[data-focused='true']") === null ||
+				!root.current?.getClientRects().length ||
+				window.getSelection()?.toString()
+			)
+				return;
+			event.preventDefault();
+			setExpanded(true);
+		};
+		window.addEventListener("keydown", onKeyDown);
+		return () => {
+			window.removeEventListener("keydown", onKeyDown);
+		};
+	}, [expanded]);
 	const bus = useBus();
 	const kv = useKv();
 	const [text, setText] = useState("");
@@ -67,6 +128,12 @@ export function SessionComposer({
 		};
 	}, [kv, instanceId]);
 
+	useEffect(() => {
+		if (restored === undefined) return;
+		setText((current) => (current.trim() === "" ? restored.text : `${restored.text}\n\n${current}`));
+		setExpanded(true);
+	}, [restored]);
+
 	// Saved only once loaded, so the empty initial text never overwrites a stored draft.
 	useEffect(() => {
 		if (!loaded) return;
@@ -114,34 +181,68 @@ export function SessionComposer({
 
 	const empty = text.trim() === "";
 	return (
-		<Composer
-			value={text}
-			onChange={setText}
-			onSubmit={(submit) => void send(submit)}
-			placeholder={running ? "Steer the agent, or queue a follow-up" : "Ask for changes or send a follow-up"}
-			controls={
-				<>
-					<ModelPicker hostDir={info.hostDir} value={model} onChange={(next) => configure({ model: next })} />
-					<ThinkingPicker
-						hostDir={info.hostDir}
-						model={model}
-						value={thinkingLevel}
-						onChange={(level) => configure({ thinkingLevel: level })}
-					/>
-				</>
-			}
-			actions={
-				<>
-					{running && (
-						<ComposerButton label="Stop" onClick={() => void ask(topics.interrupt, { sessionId })}>
-							<Square className="size-3" fill="currentColor" strokeWidth={0} aria-hidden />
-						</ComposerButton>
-					)}
-					<ComposerButton label={running ? "Steer" : "Send"} disabled={empty || pending}>
-						<ArrowUp className="size-4" strokeWidth={2} aria-hidden />
-					</ComposerButton>
-				</>
-			}
-		/>
+		<div
+			ref={root}
+			onKeyDown={(event) => {
+				if (expanded && event.key === "Escape" && !event.defaultPrevented) {
+					event.preventDefault();
+					event.stopPropagation();
+					collapse();
+				}
+			}}
+		>
+			{!expanded ? (
+				<button
+					type="button"
+					onClick={expand}
+					aria-label="Write a reply"
+					className="flex h-12 w-full items-center gap-2 rounded-xl border border-edge bg-frame-top/95 px-4 text-left text-[13px] text-ink-muted shadow-frame outline-none hover:border-edge-focus focus-visible:ring-2 focus-visible:ring-ring"
+				>
+					<Reply className="size-4 shrink-0" strokeWidth={1.5} aria-hidden />
+					<span className="min-w-0 flex-1 truncate">{text || "Write a reply…"}</span>
+					<kbd className="rounded border border-edge px-1 text-[10px]">R</kbd>
+				</button>
+			) : (
+				<PromptComposer
+					inputRef={input}
+					onEscape={collapse}
+					header={<ComposerHeader title="Reply" icon={Reply} onClose={collapse} />}
+
+					value={text}
+					onChange={setText}
+					onSubmit={(submit) => void send(submit)}
+					placeholder={running ? "Steer the agent, or queue a follow-up" : "Ask for changes or send a follow-up"}
+					controls={
+						<>
+							<ModelPicker
+								hostDir={info.hostDir}
+								value={model}
+								onChange={(next) => configure({ model: next })}
+							/>
+							<ThinkingPicker
+								hostDir={info.hostDir}
+								model={model}
+								value={thinkingLevel}
+								onChange={(level) => configure({ thinkingLevel: level })}
+							/>
+						</>
+					}
+					actions={
+						<>
+							{running && (
+								<ComposerButton label="Stop" onClick={() => void ask(topics.interrupt, { sessionId })}>
+									<Square className="size-3" fill="currentColor" strokeWidth={0} aria-hidden />
+								</ComposerButton>
+							)}
+							<ComposerSubmit
+								label={running ? "Steer" : "Reply"}
+								disabled={empty || pending}
+								title={running ? "Steer now; Mod+Enter queues a follow-up" : "Reply (Enter)"}
+							/>
+						</>
+					}
+				/>
+			)}
+		</div>
 	);
 }
diff --git a/apps/web/src/widgets/session/markdown.tsx b/apps/web/src/widgets/session/markdown.tsx
index 990d0af5..9efdab17 100644
--- a/apps/web/src/widgets/session/markdown.tsx
+++ b/apps/web/src/widgets/session/markdown.tsx
@@ -67,7 +67,7 @@ function CodeBlock(props: ComponentProps<"pre"> & ExtraProps) {
 	if (block === undefined) return <pre className={preClass}>{props.children}</pre>;
 	return (
 		<div className="my-2 overflow-hidden rounded-lg border border-edge bg-desktop/60">
-			<div className="flex h-7 items-center justify-between border-b border-edge pr-1 pl-3 text-[11px] text-ink-muted select-none">
+			<div className="flex h-7 items-center justify-between border-b border-edge pr-1 pl-3 text-2xs text-ink-muted select-none">
 				<span>{block.language ?? "text"}</span>
 				<CopyButton text={block.code} />
 			</div>
@@ -78,8 +78,8 @@ function CodeBlock(props: ComponentProps<"pre"> & ExtraProps) {
 	);
 }
 
-const preClass = "overflow-x-auto px-3 py-2 font-mono text-[12px] leading-relaxed";
-const Table = styled("table", "border-collapse text-[13px]");
+const preClass = "overflow-x-auto px-3 py-2 font-mono text-xs leading-relaxed";
+const Table = styled("table", "border-collapse text-sm");
 
 // GitHub-flavoured markdown at reading size.
 const components: Components = {
@@ -88,13 +88,13 @@ const components: Components = {
 	ol: styled("ol", "my-2 list-decimal pl-5"),
 	li: styled("li", "my-0.5"),
 	h1: styled("h1", "mt-4 mb-2 text-[17px] font-semibold"),
-	h2: styled("h2", "mt-4 mb-2 text-[15px] font-semibold"),
+	h2: styled("h2", "mt-4 mb-2 text-base font-semibold"),
 	h3: styled("h3", "mt-3 mb-1.5 font-semibold"),
 	strong: styled("strong", "font-semibold text-ink"),
 	blockquote: styled("blockquote", "my-2 border-l-2 border-edge pl-3 text-ink-muted"),
 	pre: CodeBlock,
 	// Inline code reads as a small chip; inside a fence the block renders the text itself.
-	code: styled("code", "rounded-md border border-edge bg-ink/5 px-1.5 py-px font-mono text-[12px] text-ink"),
+	code: styled("code", "rounded-md border border-edge bg-ink/5 px-1.5 py-px font-mono text-xs text-ink"),
 	th: styled("th", "border border-edge px-2 py-1 text-left font-semibold"),
 	td: styled("td", "border border-edge px-2 py-1"),
 	a: (props) => {
diff --git a/apps/web/src/widgets/session/message.tsx b/apps/web/src/widgets/session/message.tsx
new file mode 100644
index 00000000..a68badcc
--- /dev/null
+++ b/apps/web/src/widgets/session/message.tsx
@@ -0,0 +1,41 @@
+import type { ReactNode } from "react";
+
+import { ago } from "../time";
+
+/** Both speakers share one reading edge; a quiet tint distinguishes the user's messages. */
+export function Message({
+	role,
+	at,
+	children,
+}: {
+	readonly role: "user" | "assistant";
+	readonly at: number | undefined;
+	readonly children: ReactNode;
+}) {
+	const user = role === "user";
+	return (
+		<article aria-label={user ? "Your message" : "Assistant message"} className="flex min-w-0 items-start gap-2.5">
+			<div
+				aria-hidden
+				className={`grid size-7 shrink-0 place-items-center rounded-md text-xs font-medium select-none ${user ? "bg-brand/15 text-brand" : "bg-ink/8 text-ink-secondary"}`}
+			>
+				{user ? "U" : "A"}
+			</div>
+			<div className={`min-w-0 flex-1 rounded-lg px-3.5 py-3 ${user ? "bg-brand/8" : "bg-ink/3"}`}>
+				<header className="mb-2 flex min-h-4 items-center gap-2 text-xs leading-4">
+					{user && <span className="font-medium text-ink">You</span>}
+					{at !== undefined && (
+						<time
+							dateTime={new Date(at).toISOString()}
+							title={new Date(at).toLocaleString()}
+							className="text-ink-muted"
+						>
+							{ago(at)}
+						</time>
+					)}
+				</header>
+				<div className="flex min-w-0 flex-col gap-3 wrap-anywhere text-ink">{children}</div>
+			</div>
+		</article>
+	);
+}
diff --git a/apps/web/src/widgets/session/projects.ts b/apps/web/src/widgets/session/projects.ts
index b59814ae..a9f6af5c 100644
--- a/apps/web/src/widgets/session/projects.ts
+++ b/apps/web/src/widgets/session/projects.ts
@@ -12,7 +12,7 @@ export function useListedSession(id: string) {
 	if (!AsyncResult.isSuccess(result)) return undefined;
 	for (const project of result.value) {
 		const session = project.sessions.find((candidate) => candidate.id === id);
-		if (session !== undefined) return { title: session.title, project: project.name };
+		if (session !== undefined) return { title: session.title, project: { id: project.id, name: project.name } };
 	}
 	return undefined;
 }
diff --git a/apps/web/src/widgets/session/queue.tsx b/apps/web/src/widgets/session/queue.tsx
new file mode 100644
index 00000000..b17d1ea6
--- /dev/null
+++ b/apps/web/src/widgets/session/queue.tsx
@@ -0,0 +1,207 @@
+import type { Delivery, QueuedPrompt } from "@codeworksh/widget/codework";
+import { useBus } from "@codeworksh/widget/view";
+import { Option, Schema } from "effect";
+import { CornerDownRight, ListEnd, type LucideIcon, Pencil, SendHorizontal, Trash2, Undo2 } from "lucide-react";
+import { useRef, useState } from "react";
+
+import { Json, topics } from "./schema";
+
+const decodeReply = Schema.decodeUnknownOption(Json.Reply);
+const decodeCancelled = Schema.decodeUnknownOption(Json.Cancelled);
+const unreachable = "The CodeWork server is not reachable.";
+
+/**
+ * Prompts sent while the agent works and not yet taken in, tucked behind the composer's top edge
+ * like a notice: steers join at the agent's next step, follow-ups after its turn. Each leaves once
+ * it is in the conversation, or once removed. Past four, a count heads the list and it scrolls,
+ * cut mid-row and faded at its edges so more reads as more.
+ *
+ * A row moves to the other lane (or, while idle, sends now), is rewritten in place, goes back to the
+ * composer, or is removed. Every action is a request on the session backend; the row changes when
+ * the queue next updates.
+ */
+export function Queue({
+	sessionId,
+	queued,
+	running,
+	onError,
+	onRestore,
+}: {
+	readonly sessionId: string;
+	readonly queued: readonly QueuedPrompt[];
+	readonly running: boolean;
+	readonly onError: (message: string | undefined) => void;
+	/** Puts a withdrawn prompt's text back in the composer. */
+	readonly onRestore: (text: string) => void;
+}) {
+	const bus = useBus();
+	// Rows with a request out; their actions wait for its answer.
+	const [busy, setBusy] = useState<ReadonlySet<string>>(() => new Set());
+	const [editing, setEditing] = useState<{ readonly id: string; readonly text: string }>();
+	// The row being edited, read by the blur that follows Enter or Escape unmounting the input, so
+	// an edit is saved once and an escaped one not at all.
+	const open = useRef<string>(undefined);
+	const edit = (id: string, text: string) => {
+		open.current = id;
+		setEditing({ id, text });
+	};
+	const close = () => {
+		open.current = undefined;
+		setEditing(undefined);
+	};
+
+	const act = async (id: string, request: () => Promise<void>) => {
+		onError(undefined);
+		setBusy((current) => new Set(current).add(id));
+		try {
+			await request();
+		} catch {
+			onError(unreachable);
+		} finally {
+			setBusy((current) => {
+				const next = new Set(current);
+				next.delete(id);
+				return next;
+			});
+		}
+	};
+
+	const change = (prompt: QueuedPrompt, patch: { readonly delivery?: Delivery; readonly text?: string }) =>
+		act(prompt.id, async () => {
+			const answer = await bus.request({
+				topic: topics.change,
+				payload: { sessionId, messageId: prompt.id, ...patch },
+			});
+			const reply = decodeReply(answer.payload);
+			if (Option.isSome(reply) && reply.value._tag === "Failed") onError(reply.value.message);
+		});
+
+	// Undo restores only what it took back: a prompt the agent already took in stays in the conversation.
+	const cancel = (prompt: QueuedPrompt, restore: boolean) =>
+		act(prompt.id, async () => {
+			const answer = await bus.request({ topic: topics.cancel, payload: { sessionId, messageId: prompt.id } });
+			const reply = Option.getOrUndefined(decodeCancelled(answer.payload));
+			if (reply?._tag === "Failed") onError(reply.message);
+			else if (reply?._tag === "Cancelled" && restore) onRestore(prompt.text);
+			else if (reply?._tag === "Sent" && restore) onError("That message was already sent.");
+		});
+
+	const save = (prompt: QueuedPrompt, text: string) => {
+		if (open.current !== prompt.id) return;
+		close();
+		const trimmed = text.trim();
+		if (trimmed === "" || trimmed === prompt.text) return;
+		void change(prompt, { text: trimmed });
+	};
+
+	const many = queued.length > 4;
+	return (
+		<div className="mx-5.5 -mb-4 rounded-t-2xl border border-b-0 border-edge bg-frame px-3 pt-2 pb-6 text-xs leading-snug">
+			{queued.length > 3 && <p className="pb-1 font-medium text-ink-muted tabular-nums">{queued.length} queued</p>}
+			<ol
+				aria-label="Queued messages"
+				className={`flex flex-col gap-0.5 ${many ? "max-h-[97px] overflow-y-auto mask-[linear-gradient(to_bottom,transparent,black_6px,black_calc(100%-10px),transparent)]" : ""}`}
+			>
+				{queued.map((prompt) => {
+					const steer = prompt.delivery === "steer";
+					const Icon = steer ? CornerDownRight : ListEnd;
+					const pending = busy.has(prompt.id);
+					const draft = editing?.id === prompt.id ? editing.text : undefined;
+					// While idle both lanes wait for a wake, so the lane action is "send now".
+					const lane: { readonly label: string; readonly icon: LucideIcon; readonly delivery: Delivery } = !running
+						? { label: "Send now", icon: SendHorizontal, delivery: "steer" }
+						: steer
+							? { label: "Queue as follow-up", icon: ListEnd, delivery: "followUp" }
+							: { label: "Steer now", icon: CornerDownRight, delivery: "steer" };
+					return (
+						<li
+							key={prompt.id}
+							className={`group flex min-w-0 items-center gap-2 ${pending ? "opacity-50" : ""}`}
+						>
+							<Icon className="size-3.5 shrink-0 text-ink-muted" strokeWidth={1.75} aria-hidden />
+							<span className="shrink-0 font-medium text-ink-muted">{steer ? "Steer" : "Follow-up"}</span>
+							{draft !== undefined ? (
+								<input
+									aria-label="Edit queued message"
+									autoFocus
+									value={draft}
+									onChange={(event) => setEditing({ id: prompt.id, text: event.target.value })}
+									onKeyDown={(event) => {
+										if (event.key === "Enter" && !event.nativeEvent.isComposing) {
+											event.preventDefault();
+											save(prompt, draft);
+										} else if (event.key === "Escape") {
+											event.preventDefault();
+											event.stopPropagation();
+											close();
+										}
+									}}
+									onBlur={() => save(prompt, draft)}
+									className="h-5 min-w-0 flex-1 rounded-md border border-edge bg-frame-top px-1.5 text-ink outline-none focus-visible:border-edge-focus"
+								/>
+							) : (
+								<span title={prompt.text} className="min-w-0 flex-1 truncate text-ink">
+									{prompt.text}
+								</span>
+							)}
+							<div className="flex shrink-0 items-center opacity-0 transition-opacity group-focus-within:opacity-100 group-hover:opacity-100">
+								<Action
+									label={lane.label}
+									icon={lane.icon}
+									disabled={pending}
+									onClick={() => void change(prompt, { delivery: lane.delivery })}
+								/>
+								<Action
+									label="Edit"
+									icon={Pencil}
+									disabled={pending}
+									onClick={() => edit(prompt.id, prompt.text)}
+								/>
+								<Action
+									label="Back to composer"
+									icon={Undo2}
+									disabled={pending}
+									onClick={() => void cancel(prompt, true)}
+								/>
+								<Action
+									label="Remove"
+									icon={Trash2}
+									danger
+									disabled={pending}
+									onClick={() => void cancel(prompt, false)}
+								/>
+							</div>
+						</li>
+					);
+				})}
+			</ol>
+		</div>
+	);
+}
+
+function Action({
+	label,
+	icon: Icon,
+	danger = false,
+	disabled,
+	onClick,
+}: {
+	readonly label: string;
+	readonly icon: LucideIcon;
+	readonly danger?: boolean;
+	readonly disabled: boolean;
+	readonly onClick: () => void;
+}) {
+	return (
+		<button
+			type="button"
+			aria-label={label}
+			title={label}
+			disabled={disabled}
+			onClick={onClick}
+			className={`grid size-5 place-items-center rounded-md text-ink-muted transition-colors outline-none hover:bg-ink/8 focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none ${danger ? "hover:text-destructive" : "hover:text-ink"}`}
+		>
+			<Icon className="size-3" strokeWidth={1.75} aria-hidden />
+		</button>
+	);
+}
diff --git a/apps/web/src/widgets/session/schema.ts b/apps/web/src/widgets/session/schema.ts
index bca8365b..70246f04 100644
--- a/apps/web/src/widgets/session/schema.ts
+++ b/apps/web/src/widgets/session/schema.ts
@@ -1,4 +1,4 @@
-import { Delivery, HistoryEntry, ThinkingLevel } from "@codeworksh/widget/codework";
+import { Delivery, HistoryEntry, QueuedPrompt, ThinkingLevel } from "@codeworksh/widget/codework";
 import { Schema } from "effect";
 
 /*
@@ -15,6 +15,10 @@ export const topics = {
 	/** Requests: choose a session's model or thinking level; they apply from its next exchange. */
 	configure: "codework/session.configure",
 	interrupt: "codework/session.interrupt",
+	/** Requests: withdraw a queued prompt before the agent takes it in; answered with `Cancelled`. */
+	cancel: "codework/session.cancel",
+	/** Requests: move a queued prompt to the other lane, or rewrite it, in place. */
+	change: "codework/session.change",
 	/** Requests: a window of a followed session's conversation, newest first back from `before`. */
 	page: "codework/session.page",
 	/** Updates to one session's conversation. */
@@ -63,6 +67,24 @@ export type Created = typeof Created.Type;
 
 export const Interrupt = Schema.Struct({ sessionId: Schema.String });
 
+export const Cancel = Schema.Struct({ sessionId: Schema.String, messageId: Schema.String });
+
+/** The answer to a cancel: withdrawn, already in the conversation, or why neither is known. */
+export const Cancelled = Schema.Union([
+	Schema.TaggedStruct("Cancelled", {}),
+	Schema.TaggedStruct("Sent", {}),
+	Schema.TaggedStruct("Failed", { message: Schema.String }),
+]);
+export type Cancelled = typeof Cancelled.Type;
+
+/** A queued prompt moved to `delivery`, or given new `text`; an absent key is left as it is. */
+export const Change = Schema.Struct({
+	sessionId: Schema.String,
+	messageId: Schema.String,
+	delivery: Schema.optionalKey(Delivery),
+	text: Schema.optionalKey(Schema.String),
+});
+
 /** A model or thinking level chosen for a session; an absent key is left as it is. */
 export const Configure = Schema.Struct({
 	sessionId: Schema.String,
@@ -104,6 +126,8 @@ export type Info = typeof Info.Type;
 export const Snapshot = Schema.Struct({
 	info: Info,
 	messages: Schema.Array(HistoryEntry),
+	/** Prompts sent but not yet in the conversation, oldest first. */
+	queued: Schema.Array(QueuedPrompt),
 	/** The CodeWork log position the backend resumes `session.log` from. */
 	cursor: Schema.optionalKey(Schema.Int),
 	/** The app event log seq of the last update published; a view subscribes after it. */
@@ -116,6 +140,7 @@ export const Window = Schema.Union([
 	Schema.TaggedStruct("Window", {
 		info: Info,
 		messages: Schema.Array(HistoryEntry),
+		queued: Schema.Array(QueuedPrompt),
 		/** The snapshot's seq: a view subscribes for updates after it. */
 		seq: Schema.Int,
 		/** Whether older messages remain. */
@@ -130,6 +155,8 @@ export const Update = Schema.Union([
 	Schema.TaggedStruct("Info", { info: Info }),
 	/** A message added or changed, replacing any with the same id. */
 	Schema.TaggedStruct("Message", { message: HistoryEntry }),
+	/** The prompts still waiting to join the conversation, replacing the last list. */
+	Schema.TaggedStruct("Queue", { queued: Schema.Array(QueuedPrompt) }),
 	/** A message no longer on the session's active branch. */
 	Schema.TaggedStruct("Removed", { id: Schema.String }),
 	/** Whether the agent is working on the session; sent live only, never stored. */
@@ -149,6 +176,9 @@ export const Json = {
 	Create: Schema.toCodecJson(Create),
 	Created: Schema.toCodecJson(Created),
 	Interrupt: Schema.toCodecJson(Interrupt),
+	Cancel: Schema.toCodecJson(Cancel),
+	Cancelled: Schema.toCodecJson(Cancelled),
+	Change: Schema.toCodecJson(Change),
 	Configure: Schema.toCodecJson(Configure),
 	Window: Schema.toCodecJson(Window),
 	Reply: Schema.toCodecJson(Reply),
diff --git a/apps/web/src/widgets/session/view.tsx b/apps/web/src/widgets/session/view.tsx
index 88341fdd..a339f2fb 100644
--- a/apps/web/src/widgets/session/view.tsx
+++ b/apps/web/src/widgets/session/view.tsx
@@ -1,16 +1,18 @@
 import { LegendList, type MaintainScrollAtEndOptions } from "@legendapp/list/react";
-import type { HistoryEntry, Part, ToolCall } from "@codeworksh/widget/codework";
+import type { HistoryEntry, Part, QueuedPrompt, ToolCall } from "@codeworksh/widget/codework";
 import { useBus, useEvents, useFrame, type WidgetProps } from "@codeworksh/widget/view";
 import { Option, Schema } from "effect";
-import { Brain, ChevronDown, ChevronRight, CircleAlert, MessageSquareText, Terminal, Wrench } from "lucide-react";
+import { Brain, ChevronDown, ChevronRight, CircleAlert, Terminal, Wrench } from "lucide-react";
 import { memo, type ReactNode, useCallback, useEffect, useMemo, useRef, useState } from "react";
 
 import { ComposerNotice, type Notice } from "@/components/banner";
+import { Monogram } from "@/components/monogram";
 import { useModelsNotice } from "@/components/model";
-import { ago } from "../time";
 import { sessionId } from "./address";
 import { SessionComposer } from "./composer";
 import { Markdown } from "./markdown";
+import { Message } from "./message";
+import { Queue } from "./queue";
 import { useListedSession } from "./projects";
 import { type Info, Json, topics, type Update } from "./schema";
 
@@ -21,6 +23,9 @@ const decodeUpdate = Schema.decodeUnknownOption(Json.Update);
 /** Messages per page: the newest on open, then older ones as the reader scrolls up. */
 const PAGE = 60;
 
+// Shared reading width for the transcript and floating composer.
+const contentWidth = "mx-auto w-full max-w-[62rem]";
+
 export function Session({ address, instanceId }: WidgetProps<unknown>) {
 	const id = sessionId(address);
 	if (id === undefined) return <p className="p-3 text-ink-muted">Not a session: {address}</p>;
@@ -37,6 +42,8 @@ type State =
 			readonly messages: readonly HistoryEntry[];
 			/** Whether older messages remain to be paged in. */
 			readonly more: boolean;
+			/** Prompts sent but not yet in the conversation, oldest first. */
+			readonly queued: readonly QueuedPrompt[];
 			/** The first page's seq: updates are read from after it. */
 			readonly after: number;
 			/** Whether the agent works, once the backend has said; until then a draft reply implies it. */
@@ -71,6 +78,8 @@ const apply = (state: State, update: Update): State => {
 	switch (update._tag) {
 		case "Info":
 			return { ...state, info: update.info };
+		case "Queue":
+			return { ...state, queued: update.queued };
 		case "Removed":
 			return { ...state, messages: state.messages.filter((message) => message.id !== update.id) };
 		case "Running": {
@@ -89,6 +98,8 @@ const apply = (state: State, update: Update): State => {
 			return {
 				...state,
 				messages: index === -1 ? [...state.messages, update.message] : state.messages.with(index, update.message),
+				// Promoted: it is in the conversation now, whatever the next queue update says.
+				queued: state.queued.filter((prompt) => prompt.id !== update.message.id),
 			};
 		}
 	}
@@ -130,8 +141,8 @@ function useConversation(id: string) {
 			const window = await page(undefined);
 			if (window === undefined) return fail(`Could not load session ${id}.`);
 			if (window._tag === "Failed") return fail(window.message);
-			const { info, messages, more, seq } = window;
-			if (active) setState({ status: "ready", info, messages, more, after: seq, running: undefined });
+			const { info, messages, more, queued, seq } = window;
+			if (active) setState({ status: "ready", info, messages, more, queued, after: seq, running: undefined });
 		})().catch(() => fail("The CodeWork server is not reachable."));
 		return () => {
 			active = false;
@@ -173,21 +184,26 @@ function Conversation({ id, instanceId }: { readonly id: string; readonly instan
 	// Named from the sessions list at once, so the frame never shows its default title while loading.
 	const listed = useListedSession(id);
 	const title = state.status === "ready" ? state.info.title : listed?.title;
-	const project = state.status === "ready" ? state.info.project?.name : listed?.project;
+	const project = state.status === "ready" ? state.info.project : listed?.project;
+	const projectId = project?.id;
+	const projectName = project?.name;
 
 	useEffect(() => {
 		if (title === undefined) return;
 		// The project leads, so sessions from different projects tell apart at a glance.
-		setTitle(title, project);
-		setIcon(MessageSquareText);
-		// While focused, the workspace's tab reads as this session: its project over its title.
-		setTab({ title: project ?? "Session", subtitle: title });
-	}, [title, project, setTitle, setIcon, setTab]);
+		setTitle(title, projectName);
+		// The project's badge, as in the sessions sidebar.
+		if (projectId !== undefined && projectName !== undefined) setIcon(<Monogram id={projectId} name={projectName} />);
+		// While focused, the workspace's tab reads as this session: its project, then its title.
+		setTab(projectName === undefined ? title : `${projectName} / ${title}`);
+	}, [title, projectId, projectName, setTitle, setIcon, setTab]);
 
 	// Models that can't be listed first: a state that clears itself, so it can't be dismissed. Then a
 	// refused send, else why the last run failed; dismissing hides that one notice only.
 	const models = useModelsNotice(state.status === "ready" ? state.info.hostDir : undefined);
 	const [sendError, setSendError] = useState<string>();
+	// A queued prompt taken back to edit; the composer puts its text above the draft.
+	const [restored, setRestored] = useState<{ readonly text: string; readonly key: number }>();
 	const [dismissed, setDismissed] = useState<Notice>();
 	const notice: Notice | undefined =
 		sendError !== undefined
@@ -198,14 +214,29 @@ function Conversation({ id, instanceId }: { readonly id: string; readonly instan
 	const shown =
 		notice !== undefined && (dismissed?.title !== notice.title || dismissed.description !== notice.description);
 
+	const surface = useRef<HTMLDivElement>(null);
+	const composer = useRef<HTMLDivElement>(null);
+	useEffect(() => {
+		const element = composer.current;
+		if (element === null) return;
+		const observer = new ResizeObserver(() => {
+			surface.current?.style.setProperty("--composer-height", `${element.getBoundingClientRect().height}px`);
+		});
+		observer.observe(element);
+		return () => observer.disconnect();
+	}, [state.status]);
+
 	if (state.status === "loading") return null;
 	if (state.status === "failed") return <p className="p-3 text-ink-muted">{state.message}</p>;
 	const last = state.messages.at(-1);
 	const running = state.running ?? (last?.role === "assistant" && last.state === "draft");
 	return (
-		<div className="flex h-full flex-col">
+		<div ref={surface} className="relative flex h-full flex-col">
 			<Transcript state={state} running={running} loadOlder={loadOlder} />
-			<div className="mx-auto w-full max-w-3xl shrink-0 px-3 pb-3">
+			<div
+				ref={composer}
+				className={`${contentWidth} pointer-events-none absolute inset-x-0 bottom-0 z-10 px-3 pb-3 *:pointer-events-auto`}
+			>
 				{models !== undefined ? (
 					<ComposerNotice {...models} />
 				) : (
@@ -219,23 +250,34 @@ function Conversation({ id, instanceId }: { readonly id: string; readonly instan
 						/>
 					)
 				)}
+				{/* Idle too: prompts left waiting by a stop or a failure run with the next message, so they stay in view. */}
+				{state.queued.length > 0 && (
+					<Queue
+						sessionId={id}
+						queued={state.queued}
+						running={running}
+						onError={setSendError}
+						onRestore={(text) => setRestored((current) => ({ text, key: (current?.key ?? 0) + 1 }))}
+					/>
+				)}
 				<SessionComposer
 					sessionId={id}
 					instanceId={instanceId}
 					running={running}
 					info={state.info}
 					onError={setSendError}
+					restored={restored}
 				/>
 			</div>
 		</div>
 	);
 }
 
-// New turns and growing replies keep the list at its end while the reader is there; the composer
-// below the list never moves what is already on screen.
+// New turns, growing replies and a taller composer (queued prompts above it) keep the list at its
+// end while the reader is there; a reader scrolled up stays where they are.
 const follow = {
 	animated: false,
-	on: { dataChange: true, footerLayout: false, itemLayout: true, layout: true },
+	on: { dataChange: true, footerLayout: true, itemLayout: true, layout: true },
 } as const satisfies MaintainScrollAtEndOptions;
 
 // Prepending an older page, or a row growing above the viewport, keeps what the reader sees in place.
@@ -256,6 +298,7 @@ function Transcript({
 	readonly running: boolean;
 	readonly loadOlder: () => void;
 }) {
+	const [scrolled, setScrolled] = useState(false);
 	const turns = useMemo(() => turnsOf(state.messages), [state.messages]);
 	const renderItem = useCallback(
 		({ item, index }: { readonly item: Turn; readonly index: number }) => (
@@ -282,7 +325,9 @@ function Transcript({
 			maintainScrollAtEnd={follow}
 			maintainVisibleContentPosition={anchor}
 			onStartReached={state.more ? loadOlder : undefined}
-			className="min-h-0 flex-1 overflow-x-hidden overscroll-y-contain [overflow-anchor:none]"
+			ListFooterComponent={<div className="h-[calc(var(--composer-height,60px)+24px)]" />}
+			onScroll={(event) => setScrolled(event.nativeEvent.contentOffset.y > 1)}
+			className={`session-transcript min-h-0 flex-1 overflow-x-hidden overscroll-y-contain [overflow-anchor:none] ${scrolled ? "session-transcript-scrolled" : ""}`}
 		/>
 	);
 }
@@ -339,23 +384,26 @@ const TurnView = memo(function TurnView({ turn, active }: { readonly turn: Turn;
 	const thinking = active && (last?.state !== "draft" || answer.length === 0);
 
 	return (
-		<section className="mx-auto flex max-w-3xl flex-col gap-3 px-4 py-3 text-[14px] leading-relaxed">
+		<section className={`${contentWidth} flex flex-col gap-5 px-4 py-3 text-sm leading-relaxed`}>
 			{turn.user !== undefined && <UserMessage entry={turn.user} />}
-			{work.length > 0 && (
-				<WorkLog
-					parts={work}
-					started={turn.user?.createdAt}
-					ended={active ? undefined : endOf(turn.replies)}
-					at={last?.updatedAt}
-				/>
-			)}
-			{thinking && <ThinkingRow />}
-			{answer.length > 0 && (
-				<div className="text-ink/90">
-					<Markdown text={answer.join("\n\n")} streaming={last?.state === "draft"} />
-				</div>
+			{(work.length > 0 || thinking || answer.length > 0 || interrupted) && (
+				<Message role="assistant" at={turn.replies[0]?.createdAt}>
+					{work.length > 0 && (
+						<WorkLog
+							parts={work}
+							started={turn.user?.createdAt}
+							ended={active ? undefined : endOf(turn.replies)}
+						/>
+					)}
+					{thinking && <ThinkingRow />}
+					{answer.length > 0 && (
+						<div>
+							<Markdown text={answer.join("\n\n")} streaming={last?.state === "draft"} />
+						</div>
+					)}
+					{interrupted && <p className="text-xs text-ink-muted">Interrupted</p>}
+				</Message>
 			)}
-			{interrupted && <p className="text-[12px] text-ink-muted">Interrupted</p>}
 		</section>
 	);
 }, sameTurn);
@@ -376,14 +424,10 @@ function UserMessage({ entry }: { readonly entry: HistoryEntry }) {
 	const text = entry.parts.flatMap((part) => (part.type === "text" ? [part.text] : [])).join("\n\n");
 	const images = entry.parts.filter((part) => part.type === "image").length;
 	return (
-		<div className="flex justify-end">
-			<div className="max-w-[80%] rounded-2xl bg-ink/6 px-3.5 py-2.5 whitespace-pre-wrap text-ink">
-				{text}
-				{images > 0 && (
-					<p className="mt-1 text-[12px] text-ink-muted">{images === 1 ? "1 image" : `${images} images`}</p>
-				)}
-			</div>
-		</div>
+		<Message role="user" at={entry.createdAt}>
+			{text !== "" && <p className="whitespace-pre-wrap">{text}</p>}
+			{images > 0 && <p className="text-xs text-ink-muted">{images === 1 ? "1 image" : `${images} images`}</p>}
+		</Message>
 	);
 }
 
@@ -410,13 +454,11 @@ function WorkLog({
 	parts,
 	started,
 	ended,
-	at,
 }: {
 	readonly parts: readonly Part[];
 	readonly started: number | undefined;
 	/** Absent while the turn is still running. */
 	readonly ended: number | undefined;
-	readonly at: number | undefined;
 }) {
 	const [open, setOpen] = useState(false);
 	const label =
@@ -427,12 +469,12 @@ function WorkLog({
 				: "Worked";
 	return (
 		<div>
-			<div className="flex items-center gap-2 border-b border-edge pb-1.5">
+			<div className="flex items-center gap-2 border-b border-edge/50 pb-2 text-xs text-ink-muted">
 				<button
 					type="button"
 					aria-expanded={open}
 					onClick={() => setOpen(!open)}
-					className="-mx-1 flex items-center gap-1 rounded-md px-1 text-ink transition-colors hover:bg-ink/5"
+					className="-mx-1 flex items-center gap-1 rounded-md px-1 text-ink-muted transition-colors outline-none hover:bg-ink/5 focus-visible:ring-2 focus-visible:ring-ring"
 				>
 					{label}
 					{open ? (
@@ -441,7 +483,6 @@ function WorkLog({
 						<ChevronRight className="size-3.5 text-ink-muted" aria-hidden />
 					)}
 				</button>
-				{at !== undefined && <span className="ml-auto text-[12px] text-ink-muted tabular-nums">{ago(at)}</span>}
 			</div>
 			{open && (
 				<div className="flex flex-col pt-1.5">
@@ -466,7 +507,7 @@ function WorkRow({ part }: { readonly part: Part }) {
 			);
 		case "text":
 			return (
-				<div className="py-1 text-ink/80">
+				<div className="py-1 text-ink-muted">
 					<Markdown text={part.text} />
 				</div>
 			);
@@ -487,7 +528,7 @@ function ToolRow({ call }: { readonly call: ToolCall }) {
 	);
 	return (
 		<Row icon={icon} label={summarize(call)}>
-			<div className="flex flex-col gap-2 font-mono text-[12px]">
+			<div className="flex flex-col gap-2 font-mono text-xs">
 				<pre className="overflow-x-auto whitespace-pre-wrap text-ink-muted">
 					{JSON.stringify(call.arguments, null, 2)}
 				</pre>
diff --git a/apps/web/src/wm/chrome.ts b/apps/web/src/wm/chrome.ts
index 0e1053be..a85d09d4 100644
--- a/apps/web/src/wm/chrome.ts
+++ b/apps/web/src/wm/chrome.ts
@@ -1,7 +1,6 @@
-import type { LucideIcon } from "lucide-react";
 import { Atom } from "effect/reactivity";
 
-import type { Tab } from "@codeworksh/widget/view";
+import type { FrameIcon } from "@codeworksh/widget/view";
 import { registry } from "../widgets";
 import type { Instance } from "./instances";
 
@@ -10,9 +9,9 @@ export interface Chrome {
 	readonly title?: string;
 	/** Shown before the title, quieter. */
 	readonly lead?: string | undefined;
-	readonly icon?: LucideIcon;
+	readonly icon?: FrameIcon;
 	/** What the workspace tab shows while this frame is its focused one. */
-	readonly tab?: Tab;
+	readonly tab?: string;
 }
 
 /**
diff --git a/apps/web/src/wm/desktop.tsx b/apps/web/src/wm/desktop.tsx
index f45810e7..b003ffe1 100644
--- a/apps/web/src/wm/desktop.tsx
+++ b/apps/web/src/wm/desktop.tsx
@@ -227,8 +227,12 @@ export function Desktop({ workspace }: DesktopProps) {
 			setChrome((current) => {
 				const previous = current.get(instanceId) ?? {};
 				const next = { ...previous, ...patch };
-				const sameTab = next.tab?.title === previous.tab?.title && next.tab?.subtitle === previous.tab?.subtitle;
-				if (next.title === previous.title && next.lead === previous.lead && next.icon === previous.icon && sameTab)
+				if (
+					next.title === previous.title &&
+					next.lead === previous.lead &&
+					next.icon === previous.icon &&
+					next.tab === previous.tab
+				)
 					return current;
 				return new Map(current).set(instanceId, next);
 			}),
@@ -288,12 +292,14 @@ export function Desktop({ workspace }: DesktopProps) {
 		leave(instanceId, retag(tag), workspaceRoute(destination), retag((byId.get(instanceId)?.tags ?? 0) | tag));
 	};
 
-	// A new workspace is auto, so it goes once the frame leaves it; it is named like the frame's tab would be.
+	// A new workspace is auto, so it goes once the frame leaves it; it is named for what the frame belongs
+	// to (a session's project), else for the frame.
 	const moveNew = async (instanceId: string) => {
 		const instance = byId.get(instanceId);
 		if (instance === undefined) return;
-		const name = chrome.get(instanceId)?.tab?.title ?? chromeOf(instance, chrome.get(instanceId)).title;
-		const created = await createWorkspace({ name, icon: "app-window", auto: true }).catch(() => undefined);
+		const { lead, title } = chromeOf(instance, chrome.get(instanceId));
+		const name = lead ?? title;
+		const created = await createWorkspace({ name, auto: true }).catch(() => undefined);
 		if (created !== undefined) move(instanceId, created);
 	};
 
@@ -421,6 +427,7 @@ export function Desktop({ workspace }: DesktopProps) {
 							focused={widget.id === focusedId}
 							pinned={instance.pinned}
 							maximized={layout === "monocle"}
+							integrated={arrangement.placements.length === 1}
 							canDrag={layout === "tile" && !instance.pinned}
 							offset={drag?.widgetId === widget.id ? drag : null}
 							animate={!resizing && !resized}
@@ -476,7 +483,7 @@ export function Desktop({ workspace }: DesktopProps) {
 				))}
 				{drag?.target && (
 					<div
-						className="pointer-events-none absolute z-20 h-0.5 -translate-y-px rounded-full bg-ink/40"
+						className="pointer-events-none absolute z-20 h-4 -translate-y-1/2 bg-[radial-gradient(ellipse_at_center,var(--cw-drop-shadow),transparent_70%)]"
 						style={{
 							left: drag.target.indicator.x + 12,
 							top: drag.target.indicator.y,
diff --git a/apps/web/src/wm/divider.tsx b/apps/web/src/wm/divider.tsx
index e1ac30c1..f67a1741 100644
--- a/apps/web/src/wm/divider.tsx
+++ b/apps/web/src/wm/divider.tsx
@@ -37,7 +37,7 @@ export function Divider({ left, height, mfact, range, onResizeStart, onResize, o
 			aria-valuemax={Math.round(range.max * 100)}
 			aria-valuenow={Math.round(mfact * 100)}
 			tabIndex={0}
-			className="group/divider absolute top-0 z-20 flex w-2 -translate-x-1/2 cursor-col-resize justify-center outline-none"
+			className="absolute top-0 z-20 w-2 -translate-x-1/2 cursor-col-resize rounded-sm outline-none focus-visible:ring-1 focus-visible:ring-ring"
 			style={{ left, height }}
 			onKeyDown={(event) => {
 				if (event.key !== "ArrowLeft" && event.key !== "ArrowRight") return;
@@ -45,8 +45,6 @@ export function Divider({ left, height, mfact, range, onResizeStart, onResize, o
 				const step = event.key === "ArrowLeft" ? -0.05 : 0.05;
 				onChange(Math.min(range.max, Math.max(range.min, mfact + step)));
 			}}
-		>
-			<div className="my-4 w-0.5 rounded-full bg-ink/0 transition-colors group-hover/divider:bg-ink/25 group-focus-visible/divider:bg-ink/25 group-active/divider:bg-ink/40" />
-		</div>
+		/>
 	);
 }
diff --git a/apps/web/src/wm/frame.tsx b/apps/web/src/wm/frame.tsx
index 3931e234..8dba529a 100644
--- a/apps/web/src/wm/frame.tsx
+++ b/apps/web/src/wm/frame.tsx
@@ -1,5 +1,5 @@
 import { AppWindow, GripVertical, Maximize2, Minimize2, Pin, PinOff, Plus, X, type LucideIcon } from "lucide-react";
-import type { ReactNode } from "react";
+import { isValidElement, type ReactNode } from "react";
 import type { Rect } from "webwm";
 import { useDragHandle } from "webwm/react";
 import type { DragMovement } from "webwm/dom";
@@ -13,6 +13,7 @@ import {
 	DropdownMenuShortcut,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import type { FrameIcon } from "@codeworksh/widget/view";
 import { shortcutLabel } from "../shell/switcher";
 import { Title } from "./title";
 
@@ -28,7 +29,7 @@ interface FrameProps {
 	readonly title: string;
 	/** Before the title, quieter: what the title belongs to. */
 	readonly lead?: string | undefined;
-	readonly icon?: LucideIcon | undefined;
+	readonly icon?: FrameIcon | undefined;
 	readonly children?: ReactNode;
 	readonly rect: Rect;
 	/** Shown as its header only, at `FRAME_HEADER_HEIGHT`; focusing it opens it again. */
@@ -38,6 +39,8 @@ interface FrameProps {
 	readonly focused: boolean;
 	readonly pinned: boolean;
 	readonly maximized: boolean;
+	/** A lone frame shares the app surface instead of drawing a separate card. */
+	readonly integrated: boolean;
 	readonly canDrag: boolean;
 	readonly offset: { readonly deltaX: number; readonly deltaY: number } | null;
 	/** Ease into new slots; off while the column divider is dragged so frames track the pointer. */
@@ -61,7 +64,7 @@ interface FrameProps {
 export const FRAME_HEADER_HEIGHT = 46;
 
 export function Frame(props: FrameProps) {
-	const { title, lead, icon: Icon, rect, collapsed, focused, pinned, maximized, canDrag, offset, animate } = props;
+	const { title, lead, icon, rect, collapsed, focused, pinned, maximized, canDrag, offset, animate } = props;
 	const handleRef = useDragHandle<HTMLDivElement>({
 		canDrag: () => props.canDrag,
 		onDragStart: props.onDragStart,
@@ -82,7 +85,9 @@ export function Frame(props: FrameProps) {
 			style={{ width: rect.w, height: rect.h, transform: `translate(${x}px, ${y}px)` }}
 			onPointerDown={props.onFocus}
 		>
-			<div className="panel flex h-full flex-col overflow-hidden group-data-[focused=true]:border-edge-focus">
+			<div
+				className={`flex h-full flex-col overflow-hidden ${props.integrated ? "bg-transparent" : "rounded-xl border border-edge bg-frame group-data-[focused=true]:border-edge-focus"} ${offset ? "shadow-[0_12px_32px_-12px_var(--cw-shadow-far)]" : ""}`}
+			>
 				<header className="flex items-center gap-1 py-1.5 pr-2 pl-1.5 select-none">
 					<div
 						ref={handleRef}
@@ -92,7 +97,7 @@ export function Frame(props: FrameProps) {
 							className={`size-3.5 shrink-0 text-ink-muted/50 ${canDrag ? "" : "invisible"}`}
 							aria-hidden
 						/>
-						{Icon && <Icon className="mr-0.5 size-4 shrink-0 text-ink-muted" strokeWidth={1.75} aria-hidden />}
+						{icon !== undefined && <IconOf icon={icon} className="mr-0.5 size-4 shrink-0 text-ink-muted" />}
 						{lead !== undefined && <Lead text={lead} />}
 						<Title text={title} className="font-semibold text-ink-muted group-data-[focused=true]:text-ink" />
 					</div>
@@ -170,7 +175,7 @@ function Move({
 }
 
 const actionClass =
-	"grid size-6 place-items-center rounded-md text-ink-muted/60 press hover:bg-ink/8 hover:text-ink aria-pressed:text-ink";
+	"grid size-6 place-items-center rounded-md text-ink-muted/80 outline-none press hover:bg-ink/8 hover:text-ink focus-visible:ring-2 focus-visible:ring-ring aria-pressed:text-ink";
 
 interface ActionProps {
 	readonly icon: LucideIcon;
@@ -193,3 +198,8 @@ function Action({ icon: Icon, label, active, onClick }: ActionProps) {
 		</button>
 	);
 }
+
+/** A frame icon as drawn: an element as given, a Lucide icon at `className`. */
+export function IconOf({ icon: Icon, className }: { readonly icon: FrameIcon; readonly className?: string }) {
+	return isValidElement(Icon) ? Icon : <Icon className={className} strokeWidth={1.75} aria-hidden />;
+}
diff --git a/apps/web/src/wm/open.ts b/apps/web/src/wm/open.ts
index 6c8a7c72..3a04f7c6 100644
--- a/apps/web/src/wm/open.ts
+++ b/apps/web/src/wm/open.ts
@@ -54,7 +54,7 @@ export function useOpenElsewhere() {
 		}
 
 		if (workspaces.length < MAX_WORKSPACES) {
-			const created = await create({ name, icon: "messages-square", auto: true }).catch(() => undefined);
+			const created = await create({ name, auto: true }).catch(() => undefined);
 			if (created !== undefined) return go(created);
 		}
 		if (last !== undefined) return go(last);
diff --git a/apps/web/src/wm/overflow.tsx b/apps/web/src/wm/overflow.tsx
index ba439729..8c716535 100644
--- a/apps/web/src/wm/overflow.tsx
+++ b/apps/web/src/wm/overflow.tsx
@@ -1,4 +1,5 @@
-import { ChevronUp, type LucideIcon } from "lucide-react";
+import type { FrameIcon } from "@codeworksh/widget/view";
+import { ChevronUp } from "lucide-react";
 import type { Rect } from "webwm";
 
 import {
@@ -7,12 +8,13 @@ import {
 	DropdownMenuItem,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { IconOf } from "./frame";
 
 export interface Hidden {
 	readonly id: string;
 	readonly title: string;
 	readonly lead?: string | undefined;
-	readonly icon?: LucideIcon | undefined;
+	readonly icon?: FrameIcon | undefined;
 }
 
 /**
@@ -39,9 +41,9 @@ export function Overflow({
 					<span className="font-semibold">+{hidden.length} more</span>
 				</DropdownMenuTrigger>
 				<DropdownMenuContent side="top" align="start" className="max-h-80 w-64 overflow-y-auto">
-					{hidden.map(({ id, title, lead, icon: Icon }) => (
+					{hidden.map(({ id, title, lead, icon }) => (
 						<DropdownMenuItem key={id} onSelect={() => onPick(id)}>
-							{Icon && <Icon strokeWidth={1.75} />}
+							{icon !== undefined && <IconOf icon={icon} />}
 							<span className="truncate">
 								{lead !== undefined && <span className="text-ink-muted/70">{lead} / </span>}
 								{title}
diff --git a/apps/web/src/wm/workspaces.ts b/apps/web/src/wm/workspaces.ts
index 7342bdae..69926ba8 100644
--- a/apps/web/src/wm/workspaces.ts
+++ b/apps/web/src/wm/workspaces.ts
@@ -51,7 +51,7 @@ export const openInWorkspaceRoute = (workspace: Workspace, address: string, mode
 export function useCreateWorkspace() {
 	const registry = useContext(RegistryContext);
 	const create = useAtomSet(createWorkspace, { mode: "promise" });
-	return async (payload: { readonly name: string; readonly icon: string; readonly auto?: boolean }) => {
+	return async (payload: { readonly name: string; readonly auto?: boolean }) => {
 		const workspace = await create({ payload, reactivityKeys: workspacesKey });
 		await runQuery(registry, workspacesAtom);
 		return workspace;
diff --git a/apps/widget/src/codework.ts b/apps/widget/src/codework.ts
index 59c7790b..4265e94c 100644
--- a/apps/widget/src/codework.ts
+++ b/apps/widget/src/codework.ts
@@ -100,6 +100,17 @@ export type LogSynced = typeof LogSynced.Type;
 export const Delivery = Schema.Literals(["steer", "followUp"]);
 export type Delivery = typeof Delivery.Type;
 
+/** A prompt admitted but not yet in the conversation, until the agent takes it in. */
+export const QueuedPrompt = Schema.Struct({
+	/** The id of the user message it becomes. */
+	id: Schema.String,
+	delivery: Delivery,
+	text: Schema.String,
+	/** Epoch milliseconds. */
+	createdAt: Schema.Finite,
+});
+export type QueuedPrompt = typeof QueuedPrompt.Type;
+
 /** The server's "no such session" (the harness `SessionNotFoundError`), by its wire tag. */
 export class SessionNotFoundError extends Schema.TaggedError<SessionNotFoundError>()("SessionNotFoundError", {
 	sessionId: Schema.String,
@@ -247,6 +258,12 @@ export const Api = RpcGroup.make(
 		success: Schema.Struct({ entries: Schema.Array(HistoryEntry) }),
 		error: SessionNotFoundError,
 	}),
+	/** Prompts admitted but not yet promoted, in admission order; reread whenever the log moves. */
+	Rpc.make("session.queue", {
+		payload: { sessionId: Schema.String },
+		success: Schema.Struct({ entries: Schema.Array(QueuedPrompt) }),
+		error: SessionNotFoundError,
+	}),
 	/** Durable events after `after` (exclusive), then `log.synced`; with `follow`, each new one as it commits. */
 	Rpc.make("session.log", {
 		payload: {
@@ -269,6 +286,23 @@ export const Api = RpcGroup.make(
 		success: Schema.Void,
 		error: Schema.Union([SessionNotFoundError, PromptConflictError]),
 	}),
+	/** Withdraws a queued prompt; `cancelled` is false when it was already promoted or is unknown. */
+	Rpc.make("session.cancel", {
+		payload: { sessionId: Schema.String, messageId: Schema.String },
+		success: Schema.Struct({ cancelled: Schema.Boolean }),
+		error: SessionNotFoundError,
+	}),
+	/** Moves a queued prompt to the other lane or rewrites it in place; `delivery: "steer"` also wakes the session. */
+	Rpc.make("session.update", {
+		payload: {
+			sessionId: Schema.String,
+			messageId: Schema.String,
+			delivery: Schema.optionalKey(Delivery),
+			text: Schema.optionalKey(Schema.String),
+		},
+		success: Schema.Struct({ updated: Schema.Boolean }),
+		error: SessionNotFoundError,
+	}),
 	Rpc.make("session.interrupt", {
 		payload: { sessionId: Schema.String },
 		success: Schema.Struct({ interrupted: Schema.Boolean }),
diff --git a/apps/widget/src/view.ts b/apps/widget/src/view.ts
index 53ebca9d..42b2cc0f 100644
--- a/apps/widget/src/view.ts
+++ b/apps/widget/src/view.ts
@@ -10,6 +10,7 @@ export {
 } from "./view/widget";
 export {
 	type Frame,
+	type FrameIcon,
 	FrameContext,
 	type OpenMode,
 	openMode,
@@ -17,7 +18,6 @@ export {
 	type Placement,
 	type Shell,
 	ShellContext,
-	type Tab,
 	useFrame,
 	useShell,
 } from "./view/shell";
diff --git a/apps/widget/src/view/shell.tsx b/apps/widget/src/view/shell.tsx
index 4567fc84..da4d9729 100644
--- a/apps/widget/src/view/shell.tsx
+++ b/apps/widget/src/view/shell.tsx
@@ -1,5 +1,5 @@
 import type { LucideIcon } from "lucide-react";
-import { createContext, useContext } from "react";
+import { createContext, type ReactElement, useContext } from "react";
 
 import { isMac } from "./platform";
 import type { Params } from "./widget";
@@ -35,11 +35,8 @@ export interface Shell {
 	close(instanceId?: string): void;
 }
 
-/** What a workspace's tab shows: a title, and a quieter line beneath it. */
-export interface Tab {
-	readonly title: string;
-	readonly subtitle?: string;
-}
+/** A frame's icon: a Lucide icon, or an element drawn at icon size (a project's badge). */
+export type FrameIcon = LucideIcon | ReactElement;
 
 export interface Frame {
 	readonly instanceId: string;
@@ -49,12 +46,13 @@ export interface Frame {
 	 */
 	readonly setTitle: (title: string, lead?: string) => void;
 	/** Replaces the default icon. */
-	readonly setIcon: (icon: LucideIcon) => void;
+	readonly setIcon: (icon: FrameIcon) => void;
 	/**
-	 * What the workspace's tab shows while this frame is the workspace's focused one. Without it the
-	 * tab shows the workspace's name over this frame's title.
+	 * What the workspace's tab reads while this frame is the workspace's focused one, as
+	 * "Project / Title" say; the tab shortens it to fit. Without it the tab reads the workspace's name
+	 * and this frame's title.
 	 */
-	readonly setTab: (tab: Tab) => void;
+	readonly setTab: (title: string) => void;
 }
 
 /**
diff --git a/package.json b/package.json
index 92bdf349..15f168bc 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,9 @@
 		"@acme/codework-sandbox-vercel": "workspace:*",
 		"@acme/codework-tool-proc": "workspace:*",
 		"@effect/tsgo": "catalog:",
+		"@shadcn/lint": "0.1.5",
 		"@types/node": "catalog:",
+		"eslint-plugin-better-tailwindcss": "4.10.0",
 		"typescript": "catalog:",
 		"vite-plus": "catalog:"
 	},
diff --git a/packages/aikit/src/llm/thinking.ts b/packages/aikit/src/llm/thinking.ts
index f9b7d66c..10537307 100644
--- a/packages/aikit/src/llm/thinking.ts
+++ b/packages/aikit/src/llm/thinking.ts
@@ -81,8 +81,8 @@ export function resolvePlan(model: Model.Info, context: Message.Context, options
 
 	/*
 	 * Preserve an explicit small answer allowance when it fits, and apply the
-	 * 1024-token reserve when context pressure reduces it. Pi's Anthropic wrapper
-	 * applies this reserve unconditionally; aikit deliberately permits small answers.
+	 * 1024-token reserve only when context pressure reduces it, rather than always:
+	 * aikit deliberately permits small answers.
 	 */
 	const budget =
 		maxTokens < adjusted.maxTokens
diff --git a/packages/aikit/src/utils/estimate.ts b/packages/aikit/src/utils/estimate.ts
index 5e940355..dc66453e 100644
--- a/packages/aikit/src/utils/estimate.ts
+++ b/packages/aikit/src/utils/estimate.ts
@@ -120,8 +120,8 @@ function estimateMessages(messages: ReadonlyArray<Message.Message>): ContextUsag
 	const usage = lastAssistantUsage(messages);
 	if (usage) {
 		const usageTokens = calculateContextTokens(usage.usage);
-		// Unlike Pi's separate tool-result messages, our results are attached to
-		// the assistant turn after its usage was reported. Only its output is counted.
+		// Tool results are attached to the assistant turn after its usage was
+		// reported, not sent as separate messages. Only its output is counted.
 		const latest = messages[usage.index]!;
 		let resultChars = 0;
 		for (const part of latest.parts) {
diff --git a/packages/aikit/test/e2e/__artifacts__/thinking.levels.openai.json b/packages/aikit/test/e2e/__artifacts__/thinking.levels.openai.json
index 022c3385..fdf81a53 100644
--- a/packages/aikit/test/e2e/__artifacts__/thinking.levels.openai.json
+++ b/packages/aikit/test/e2e/__artifacts__/thinking.levels.openai.json
@@ -61,37 +61,6 @@
 			"providerThinkingLevel": "max"
 		}
 	},
-	"gpt-5.5": {
-		"off": {
-			"thinkingLevel": "off",
-			"providerThinkingLevel": "none",
-			"thinking": false
-		},
-		"minimal": {
-			"thinkingLevel": "minimal",
-			"providerThinkingLevel": "low"
-		},
-		"low": {
-			"thinkingLevel": "low",
-			"providerThinkingLevel": "low"
-		},
-		"medium": {
-			"thinkingLevel": "medium",
-			"providerThinkingLevel": "medium"
-		},
-		"high": {
-			"thinkingLevel": "high",
-			"providerThinkingLevel": "high"
-		},
-		"xhigh": {
-			"thinkingLevel": "xhigh",
-			"providerThinkingLevel": "xhigh"
-		},
-		"max": {
-			"thinkingLevel": "max",
-			"providerThinkingLevel": "xhigh"
-		}
-	},
 	"gpt-5.4": {
 		"off": {
 			"thinkingLevel": "off",
diff --git a/packages/aikit/test/e2e/thinking.levels.e2e.test.ts b/packages/aikit/test/e2e/thinking.levels.e2e.test.ts
index ce4d7a5f..1feef2ec 100644
--- a/packages/aikit/test/e2e/thinking.levels.e2e.test.ts
+++ b/packages/aikit/test/e2e/thinking.levels.e2e.test.ts
@@ -37,7 +37,6 @@ const WITH_XHIGH: Model.ThinkingLevel[] = ["off", "low", "medium", "high", "xhig
 const OPENAI_LEVELS: Record<(typeof OPENAI_E2E_MODELS)[number], Model.ThinkingLevel[]> = {
 	"gpt-6-luna": WITH_MAX,
 	"gpt-5.6-luna": WITH_MAX,
-	"gpt-5.5": WITH_XHIGH,
 	"gpt-5.4": WITH_XHIGH,
 	"gpt-5.4-mini": WITH_XHIGH,
 	"gpt-5.4-nano": WITH_XHIGH,
diff --git a/packages/aikit/test/modelgen.test.ts b/packages/aikit/test/modelgen.test.ts
index 89125e22..3e9efd25 100644
--- a/packages/aikit/test/modelgen.test.ts
+++ b/packages/aikit/test/modelgen.test.ts
@@ -154,8 +154,8 @@ describe("generateModels", () => {
 				protocol: "anthropic",
 			});
 			expect(catalog.anthropic?.["claude-without-tools"]).toBeUndefined();
-			// Codex builds on the OpenAI entries, which this snapshot has none of.
-			expect(catalog["openai-codex"]).toEqual({});
+			// Codex builds on the OpenAI entries, which this snapshot has none of, so it is left out.
+			expect(catalog["openai-codex"]).toBeUndefined();
 			for (const provider of ["google", "google-vertex"]) {
 				for (const id of googleIds) {
 					const generated = catalog[provider]?.[id];
diff --git a/packages/aikit/test/pricing.test.ts b/packages/aikit/test/pricing.test.ts
index 9376f660..c063d684 100644
--- a/packages/aikit/test/pricing.test.ts
+++ b/packages/aikit/test/pricing.test.ts
@@ -34,7 +34,7 @@ describe("Pricing.serviceTierCostMultiplier", () => {
 	it("uses custom pricing metadata without recognizing the model name", () => {
 		const model = makeModel({ cost: { ...openai.cost, serviceTierMultipliers: { priority: 3 } } });
 		expect(Pricing.serviceTierCostMultiplier(model, "priority")).toBe(3);
-		expect(Pricing.serviceTierCostMultiplier(makeModel({ id: "gpt-5.5" }), "priority")).toBe(1);
+		expect(Pricing.serviceTierCostMultiplier(makeModel({ id: "gpt-6-luna" }), "priority")).toBe(1);
 	});
 });
 
diff --git a/packages/aikit/test/provider/openai.codex.request.test.ts b/packages/aikit/test/provider/openai.codex.request.test.ts
index 97f030a7..284c2eee 100644
--- a/packages/aikit/test/provider/openai.codex.request.test.ts
+++ b/packages/aikit/test/provider/openai.codex.request.test.ts
@@ -149,7 +149,7 @@ describe("request", () => {
 			apiKey: OPENAI_CODEX_TEST_API_KEY,
 			fetch,
 			compat: { supportsOpenAIGrammarTools: true, supportsToolSearch: true },
-		})("gpt-5.5").doStream({
+		})("gpt-6-luna").doStream({
 			prompt: openAICodexDeferredToolsPrompt,
 			tools: openAICodexDeferredTools,
 		});
diff --git a/packages/aikit/test/thinking.wire.test.ts b/packages/aikit/test/thinking.wire.test.ts
index 72f58c23..a20e2f16 100644
--- a/packages/aikit/test/thinking.wire.test.ts
+++ b/packages/aikit/test/thinking.wire.test.ts
@@ -112,7 +112,14 @@ type Wire = Record<string, unknown>;
 const path = (value: unknown, ...keys: string[]): unknown =>
 	keys.reduce<unknown>((at, key) => (typeof at === "object" && at !== null ? (at as Wire)[key] : undefined), value);
 
-const openai = makeModel({ id: "gpt-5.5", protocol: "openai", npm: "@ai-sdk/openai", reasoning: true });
+// GPT-6 takes no minimal effort; its catalog entry says so, and minimal clamps up to low.
+const openai = makeModel({
+	id: "gpt-6-luna",
+	protocol: "openai",
+	npm: "@ai-sdk/openai",
+	reasoning: true,
+	thinkingLevelMap: { off: "none", minimal: null },
+});
 const adaptiveClaude = makeModel({
 	id: "claude-opus-4-8",
 	npm: "@ai-sdk/anthropic",
diff --git a/packages/aikit/test/transform.test.ts b/packages/aikit/test/transform.test.ts
index bdfaeb55..ce140704 100644
--- a/packages/aikit/test/transform.test.ts
+++ b/packages/aikit/test/transform.test.ts
@@ -644,7 +644,7 @@ describe("convertMessages", () => {
 
 	it("omits item ids when replaying a prior Codex model id", () => {
 		const target = makeCodexModel({ id: "gpt-5.6-luna" });
-		const assistant = makeAssistantMessage(makeCodexModel({ id: "gpt-5.5" }), {
+		const assistant = makeAssistantMessage(makeCodexModel({ id: "gpt-6-luna" }), {
 			stopReason: "toolUse",
 			parts: [makeCompletedToolCall("call_1|fc_1", "search")],
 		});
diff --git a/packages/aikit/test/utils/llm.ts b/packages/aikit/test/utils/llm.ts
index eb1a66bf..6cd67320 100644
--- a/packages/aikit/test/utils/llm.ts
+++ b/packages/aikit/test/utils/llm.ts
@@ -65,17 +65,10 @@ export function anthropicOptions(extras: AnthropicOptions = {}): AnthropicOption
 }
 
 /** Every OpenAI suite runs once per model, latest to oldest. */
-export const OPENAI_E2E_MODELS = [
-	"gpt-6-luna",
-	"gpt-5.6-luna",
-	"gpt-5.5",
-	"gpt-5.4",
-	"gpt-5.4-mini",
-	"gpt-5.4-nano",
-] as const;
+export const OPENAI_E2E_MODELS = ["gpt-6-luna", "gpt-5.6-luna", "gpt-5.4", "gpt-5.4-mini", "gpt-5.4-nano"] as const;
 
 /**
- * Every Codex suite runs once per model. The Codex backend rejects gpt-5.5, gpt-5.4, gpt-5.4-mini
+ * Every Codex suite runs once per model. The Codex backend rejects gpt-5.4, gpt-5.4-mini
  * and gpt-5.4-nano for ChatGPT accounts ("not supported when using Codex with a ChatGPT account").
  */
 export const OPENAI_CODEX_E2E_MODELS = ["gpt-6-luna", "gpt-5.6-luna"] as const;
diff --git a/packages/aikit/test/utils/openai-codex.ts b/packages/aikit/test/utils/openai-codex.ts
index 39a0cf8a..1988e1f8 100644
--- a/packages/aikit/test/utils/openai-codex.ts
+++ b/packages/aikit/test/utils/openai-codex.ts
@@ -1,4 +1,4 @@
-import type { LanguageModelV3Prompt, LanguageModelV3StreamPart } from "@ai-sdk/provider";
+import type { LanguageModelV3FunctionTool, LanguageModelV3Prompt, LanguageModelV3StreamPart } from "@ai-sdk/provider";
 import { zstdDecompressSync } from "node:zlib";
 import { buildCatalog } from "../../src/cli/modelgen.ts";
 import type * as Model from "../../src/model/model.ts";
@@ -132,15 +132,15 @@ export const openAICodexDeferredToolsPrompt: LanguageModelV3Prompt = [
 	{ role: "user", content: [{ type: "text", text: "Continue" }] },
 ];
 
-export const openAICodexDeferredTools = [
+export const openAICodexDeferredTools: LanguageModelV3FunctionTool[] = [
 	{
-		type: "function" as const,
+		type: "function",
 		name: "base_tool",
 		description: "Base tool",
 		inputSchema: { type: "object", properties: {} },
 	},
 	{
-		type: "function" as const,
+		type: "function",
 		name: "late_tool",
 		description: "Late tool",
 		inputSchema: { type: "object", properties: { value: { type: "string" } } },
diff --git a/packages/codework/src/cli/cmd/handlers/run.ts b/packages/codework/src/cli/cmd/handlers/run.ts
index 4bedd908..8632bdbd 100644
--- a/packages/codework/src/cli/cmd/handlers/run.ts
+++ b/packages/codework/src/cli/cmd/handlers/run.ts
@@ -197,10 +197,13 @@ export default Runtime.handler(
 					columns,
 				}),
 			);
-			// The local command joins execution to retain typed error details.
-			const execution = yield* handle
-				.prompt({ text: prompt, delivery: "followUp" })
-				.pipe(Effect.andThen(handle.resume()), Effect.exit);
+			// The local command joins execution to retain typed error details. Ctrl+C is the user stopping
+			// the run, as on the remote path: named so, the next server start does not resume it.
+			const execution = yield* handle.prompt({ text: prompt, delivery: "followUp" }).pipe(
+				Effect.andThen(handle.resume()),
+				Effect.onInterrupt(() => handle.interrupt().pipe(Effect.timeout("5 seconds"), Effect.ignore)),
+				Effect.exit,
+			);
 			yield* handle.wait();
 			if (Exit.isFailure(execution)) return yield* Effect.failCause(execution.cause);
 			const path = yield* handle.path();
diff --git a/packages/codework/src/server/contract.ts b/packages/codework/src/server/contract.ts
index 107358e0..2ebdc28a 100644
--- a/packages/codework/src/server/contract.ts
+++ b/packages/codework/src/server/contract.ts
@@ -50,6 +50,8 @@ export const SessionInfo = Schema.Struct({
 	model: optional(Schema.Struct({ provider: Schema.String, id: Schema.String })),
 	/** The thinking level chosen for this session; absent when settings decide. */
 	thinkingLevel: optional(Schema.Enum(Model.ThinkingLevelEnum)),
+	/** Its unfinished run was cut off by restarts too often to resume on its own; the next prompt runs it. */
+	parked: optional(Schema.Boolean),
 });
 export type SessionInfo = typeof SessionInfo.Type;
 
@@ -70,6 +72,17 @@ export const HistoryEntry = Schema.Struct({
 });
 export type HistoryEntry = typeof HistoryEntry.Type;
 
+/** A prompt admitted but not yet in the conversation: a steer waiting for the next model request, or a follow-up for the next turn. */
+export const QueuedPrompt = Schema.Struct({
+	/** The id of the user message it becomes once promoted. */
+	id: Schema.String,
+	delivery: PromptSchema.Delivery,
+	text: Schema.String,
+	/** Epoch milliseconds. */
+	createdAt: Schema.Finite,
+});
+export type QueuedPrompt = typeof QueuedPrompt.Type;
+
 /** Ends `session.log`'s replay; `seq` is absent when the session has no durable events yet. */
 export const LogSynced = Schema.Struct({
 	type: Schema.Literal("log.synced"),
@@ -271,6 +284,15 @@ export const Api = RpcGroup.make(
 		success: Schema.Struct({ entries: Schema.Array(HistoryEntry) }),
 		error: SessionStore.SessionNotFoundError,
 	}),
+	/**
+	 * Prompts admitted but not yet promoted, in admission order. Admission and promotion are
+	 * durable events, so a client following `session.log` rereads this whenever the log moves.
+	 */
+	Rpc.make("session.queue", {
+		payload: { sessionId: Session.SessionSchema.ID },
+		success: Schema.Struct({ entries: Schema.Array(QueuedPrompt) }),
+		error: SessionStore.SessionNotFoundError,
+	}),
 	/**
 	 * A session's durable events after `after` (exclusive; omitted reads from the start), then a
 	 * `log.synced` marker at the head read when the call began. With `follow`, each event then
@@ -330,6 +352,30 @@ export const Api = RpcGroup.make(
 		success: Schema.Void,
 		error: Schema.Union([SessionStore.SessionNotFoundError, Control.PromptConflictError]),
 	}),
+	/**
+	 * Withdraws a queued prompt before it joins the conversation. `cancelled` is false when it had
+	 * already been promoted (it then stays in the conversation) or no pending prompt has that id.
+	 */
+	Rpc.make("session.cancel", {
+		payload: { sessionId: Session.SessionSchema.ID, messageId: Session.SessionMessageSchema.ID },
+		success: Schema.Struct({ cancelled: Schema.Boolean }),
+		error: SessionStore.SessionNotFoundError,
+	}),
+	/**
+	 * Moves a queued prompt to the other lane or rewrites it, keeping its place in the queue.
+	 * `delivery: "steer"` also wakes the session, so a prompt left waiting after a stop runs now.
+	 * `updated` is false when it had already been promoted or cancelled, or no pending prompt has that id.
+	 */
+	Rpc.make("session.update", {
+		payload: {
+			sessionId: Session.SessionSchema.ID,
+			messageId: Session.SessionMessageSchema.ID,
+			delivery: optional(PromptSchema.Delivery),
+			text: optional(Schema.String),
+		},
+		success: Schema.Struct({ updated: Schema.Boolean }),
+		error: SessionStore.SessionNotFoundError,
+	}),
 	Rpc.make("session.interrupt", {
 		payload: { sessionId: Session.SessionSchema.ID },
 		success: Schema.Struct({ interrupted: Schema.Boolean }),
diff --git a/packages/codework/src/server/handlers.ts b/packages/codework/src/server/handlers.ts
index b8b8fd65..ea114490 100644
--- a/packages/codework/src/server/handlers.ts
+++ b/packages/codework/src/server/handlers.ts
@@ -51,6 +51,7 @@ const toSessionInfo = (info: Session.Info): SessionInfo => ({
 	updatedAt: info.updatedAt,
 	...(info.model === undefined ? {} : { model: info.model }),
 	...(info.thinkingLevel === undefined ? {} : { thinkingLevel: info.thinkingLevel }),
+	...(info.parked ? { parked: true } : {}),
 });
 
 // Wire configs name only the keys they set, so `undefined` never reaches the
@@ -195,6 +196,20 @@ export const layer = Contract.Api.toLayer(
 				);
 				return { entries };
 			}),
+			"session.queue": Effect.fnUntraced(function* ({ sessionId }) {
+				if (Option.isNone(yield* sessions.get(sessionId))) {
+					return yield* new SessionStore.SessionNotFoundError({ sessionId });
+				}
+				const pending = yield* control.pending(sessionId);
+				return {
+					entries: pending.map((input) => ({
+						id: input.id,
+						delivery: input.delivery,
+						text: PromptSchema.Prompt.text(input.prompt),
+						createdAt: DateTime.toEpochMillis(input.timeCreated),
+					})),
+				};
+			}),
 			"session.log": ({ sessionId, after, follow }) =>
 				Stream.unwrap(
 					Effect.gen(function* () {
@@ -238,6 +253,22 @@ export const layer = Contract.Api.toLayer(
 				// uses `session.wait` when it needs cleanup to have finished.
 				return { interrupted: yield* control.interrupt(sessionId, { reason: "user" }) };
 			}),
+			"session.cancel": Effect.fnUntraced(function* ({ sessionId, messageId }) {
+				if (Option.isNone(yield* sessions.get(sessionId))) {
+					return yield* new SessionStore.SessionNotFoundError({ sessionId });
+				}
+				return { cancelled: yield* control.cancel(sessionId, messageId) };
+			}),
+			"session.update": Effect.fnUntraced(function* ({ sessionId, messageId, delivery, text }) {
+				if (Option.isNone(yield* sessions.get(sessionId))) {
+					return yield* new SessionStore.SessionNotFoundError({ sessionId });
+				}
+				const updated = yield* control.update(sessionId, messageId, {
+					...(delivery === undefined ? {} : { delivery }),
+					...(text === undefined ? {} : { prompt: PromptSchema.Prompt.fromText(text) }),
+				});
+				return { updated };
+			}),
 			"session.message": Effect.fnUntraced(function* ({ sessionId, messageId }) {
 				const found = yield* sessions.entry(messageId);
 				// Scoped to the session the caller named: an entry id is global, and a
diff --git a/packages/codework/src/server/server.ts b/packages/codework/src/server/server.ts
index 34da205a..e07540a8 100644
--- a/packages/codework/src/server/server.ts
+++ b/packages/codework/src/server/server.ts
@@ -51,6 +51,17 @@ const managedShutdown = Layer.unwrap(
 	}),
 );
 
+/**
+ * Resumes the runs the last server left unfinished, whether it crashed or shut down: the session
+ * table records them as they start, so this needs nothing from the previous process.
+ */
+const resumeUnfinished = Layer.effectDiscard(
+	Effect.gen(function* () {
+		const control = yield* Control.Service;
+		yield* Effect.forkScoped(control.resumeUnfinished);
+	}),
+);
+
 /**
  * Advertises the listener once it has an address: logs the endpoint and files
  * the registration later invocations discover it through.
@@ -78,6 +89,7 @@ export const layer = (options: { host: string; port: number; harness: Harness.Op
 	);
 	const app = HttpRouter.serve(rpc, { disableListenLog: true }).pipe(
 		Layer.provideMerge(managedShutdown),
+		Layer.provideMerge(resumeUnfinished),
 		Layer.provide(OAuth.layer(options.harness.home === undefined ? {} : { home: options.harness.home })),
 	);
 	return app.pipe(
diff --git a/packages/codework/test/server.test.ts b/packages/codework/test/server.test.ts
index 9b93fdf4..2caf9fad 100644
--- a/packages/codework/test/server.test.ts
+++ b/packages/codework/test/server.test.ts
@@ -787,7 +787,7 @@ describe("WebSocket client", () => {
 	it("subscribes before a fast prompt and renders through completion, including continuation", () =>
 		Effect.gen(function* () {
 			const rpc = yield* connectedClient;
-			const session = yield* rpc["session.create"]({ runtime: { model: { provider: "openai", id: "gpt-5.5" } } });
+			const session = yield* rpc["session.create"]({ runtime: { model: { provider: "openai", id: "gpt-6-luna" } } });
 			const text: string[] = [];
 			const render = (event: EventSchema.Payload) =>
 				Effect.sync(() => {
@@ -801,7 +801,7 @@ describe("WebSocket client", () => {
 	it("session.message finds a prompt that ran, scoped to its own session", () =>
 		Effect.gen(function* () {
 			const rpc = yield* connectedClient;
-			const session = yield* rpc["session.create"]({ runtime: { model: { provider: "openai", id: "gpt-5.5" } } });
+			const session = yield* rpc["session.create"]({ runtime: { model: { provider: "openai", id: "gpt-6-luna" } } });
 			const messageId = Session.SessionMessageSchema.ID.create();
 
 			yield* rpc["session.prompt"]({ sessionId: session.id, text: "hello", id: messageId });
@@ -824,7 +824,7 @@ describe("WebSocket client", () => {
 			yield* Effect.gen(function* () {
 				const rpc = yield* connectedClient;
 				const session = yield* rpc["session.create"]({
-					runtime: { model: { provider: "openai", id: "gpt-5.5" } },
+					runtime: { model: { provider: "openai", id: "gpt-6-luna" } },
 				});
 				// Watch admissions over the wire. The connected frame is the readiness
 				// barrier: past it, nothing published can be missed.
@@ -907,7 +907,7 @@ describe("WebSocket client", () => {
 						"--provider",
 						"openai",
 						"--model",
-						"gpt-5.5",
+						"gpt-6-luna",
 						"hello",
 					],
 					{ timeout: 10000 },
@@ -928,7 +928,9 @@ describe("WebSocket client", () => {
 			let completed = false;
 			const program = Effect.gen(function* () {
 				const rpc = yield* connectedClient;
-				const session = yield* rpc["session.create"]({ runtime: { model: { provider: "openai", id: "gpt-5.5" } } });
+				const session = yield* rpc["session.create"]({
+					runtime: { model: { provider: "openai", id: "gpt-6-luna" } },
+				});
 				const running = yield* Client.run(rpc, { sessionId: session.id, text: "hello" }, () => Effect.void).pipe(
 					Effect.forkChild,
 				);
@@ -959,7 +961,9 @@ describe("WebSocket client", () => {
 			const entered = yield* Deferred.make<void>();
 			const program = Effect.gen(function* () {
 				const rpc = yield* connectedClient;
-				const session = yield* rpc["session.create"]({ runtime: { model: { provider: "openai", id: "gpt-5.5" } } });
+				const session = yield* rpc["session.create"]({
+					runtime: { model: { provider: "openai", id: "gpt-6-luna" } },
+				});
 				const running = yield* Client.run(rpc, { sessionId: session.id, text: "hello" }, () => Effect.void).pipe(
 					Effect.flip,
 					Effect.forkChild,
@@ -990,7 +994,9 @@ describe("WebSocket client", () => {
 			let cleaned = false;
 			const program = Effect.gen(function* () {
 				const rpc = yield* connectedClient;
-				const session = yield* rpc["session.create"]({ runtime: { model: { provider: "openai", id: "gpt-5.5" } } });
+				const session = yield* rpc["session.create"]({
+					runtime: { model: { provider: "openai", id: "gpt-6-luna" } },
+				});
 				yield* rpc["session.prompt"]({ sessionId: session.id, text: "hello" });
 				yield* Deferred.await(entered);
 				expect(
diff --git a/packages/harness/src/control.ts b/packages/harness/src/control.ts
index b6ebea6e..b2b70beb 100644
--- a/packages/harness/src/control.ts
+++ b/packages/harness/src/control.ts
@@ -43,6 +43,12 @@ export interface PromptInput {
 	readonly delivery?: Delivery;
 }
 
+/**
+ * Times a run may be cut off by a dying process before the session is parked instead of resumed.
+ * A committed turn starts the count over.
+ */
+export const RESTART_LIMIT = 5;
+
 export interface Interface {
 	/**
 	 * Records a prompt in the session's durable inbox, then wakes its drain.
@@ -74,6 +80,26 @@ export interface Interface {
 	) => Effect.Effect<boolean>;
 	/** Sessions this process is currently draining. */
 	readonly active: Effect.Effect<ReadonlySet<SessionSchema.ID>>;
+	/**
+	 * Resumes the runs the last process left unfinished, as the server starts. One a crash cut off
+	 * counts a restart, one a shutdown closed does not; at {@link RESTART_LIMIT} the session is parked
+	 * and waits for its next prompt. Resolves once every resumed run has settled.
+	 */
+	readonly resumeUnfinished: Effect.Effect<void>;
+	/** Prompts admitted but not yet in the conversation, steers and follow-ups, in admission order. */
+	readonly pending: (sessionId: SessionSchema.ID) => Effect.Effect<ReadonlyArray<Admitted>>;
+	/**
+	 * Moves a pending prompt to the other lane or rewrites it, keeping its place; false when it was
+	 * already promoted, cancelled, or is unknown. Asking for the steer lane also wakes the session, so
+	 * a prompt left waiting by a stop or a failure runs now.
+	 */
+	readonly update: (
+		sessionId: SessionSchema.ID,
+		id: SessionMessageSchema.ID,
+		patch: SessionInput.UpdatePatch,
+	) => Effect.Effect<boolean>;
+	/** Withdraws a pending prompt; false when it was already promoted, cancelled, or is unknown. */
+	readonly cancel: (sessionId: SessionSchema.ID, id: SessionMessageSchema.ID) => Effect.Effect<boolean>;
 }
 
 export class Service extends Context.Service<Service, Interface>()("@codeworksh/harness/control/Service") {}
@@ -86,6 +112,10 @@ export const layer = Layer.effect(
 		const execution = yield* RunnerExecution.Service;
 		const isLifecycleConflict = Schema.is(SessionInput.LifecycleConflict);
 
+		// Marked before the wake, so a prompt accepted here survives a crash before its run starts.
+		const wake = (sessionId: SessionSchema.ID) =>
+			sessions.markRunning(sessionId).pipe(Effect.andThen(execution.wake(sessionId)));
+
 		/**
 		 * Uninterruptible end to end: a client that disconnects mid-call must not
 		 * leave a prompt half-admitted. Everything durable happens inside `admit`,
@@ -122,14 +152,14 @@ export const layer = Layer.effect(
 		});
 
 		const prompt = Effect.fn("Control.prompt")((input: PromptInput) =>
-			Effect.uninterruptible(admit(input).pipe(Effect.tap((admitted) => execution.wake(admitted.sessionId)))),
+			Effect.uninterruptible(admit(input).pipe(Effect.tap((admitted) => wake(admitted.sessionId)))),
 		);
 
 		const run = Effect.fn("Control.run")((input: PromptInput) =>
 			Effect.uninterruptibleMask((restore) =>
 				Effect.gen(function* () {
 					const admitted = yield* admit(input);
-					yield* execution.wake(admitted.sessionId);
+					yield* wake(admitted.sessionId);
 					yield* restore(execution.awaitIdle(admitted.sessionId));
 					return admitted;
 				}),
@@ -145,6 +175,7 @@ export const layer = Layer.effect(
 		const resume = Effect.fn("Control.resume")(function* (sessionId: SessionSchema.ID) {
 			const session = yield* sessions.get(sessionId);
 			if (Option.isNone(session)) return yield* new Session.SessionNotFoundError({ sessionId });
+			yield* sessions.markRunning(sessionId);
 			yield* execution.resume(sessionId);
 		});
 
@@ -155,7 +186,55 @@ export const layer = Layer.effect(
 			) => Effect.uninterruptible(execution.interrupt(sessionId, options?.reason ?? "user", options)),
 		);
 
-		return Service.of({ prompt, run, wait, resume, interrupt, active: execution.active });
+		// Uninterruptible like `prompt`: a change to the steer lane that commits must also wake.
+		const update = Effect.fn("Control.update")(
+			(sessionId: SessionSchema.ID, id: SessionMessageSchema.ID, patch: SessionInput.UpdatePatch) =>
+				Effect.uninterruptible(
+					Effect.gen(function* () {
+						const updated = yield* inputs.update(sessionId, id, patch);
+						if (Option.isNone(updated)) return false;
+						if (patch.delivery === "steer") yield* wake(sessionId);
+						return true;
+					}),
+				),
+		);
+
+		const resumeUnfinished = Effect.gen(function* () {
+			const running = yield* execution.active;
+			const unfinished = (yield* sessions.unfinished).filter((row) => !running.has(row.id));
+			yield* Effect.forEach(
+				unfinished,
+				Effect.fnUntraced(function* (row) {
+					if ((yield* execution.active).has(row.id)) return;
+					// Claimed again here, not from the list: a stop since then cleared it, and must stand.
+					// Counted before resuming, so a crash inside the resumed run is counted too.
+					const restarts = yield* sessions.claimRestart(row.id);
+					if (Option.isNone(restarts) || restarts.value >= RESTART_LIMIT) return;
+					yield* execution.recover(row.id).pipe(
+						Effect.tapCause((cause) =>
+							Effect.logWarning("Resuming an unfinished session failed", cause).pipe(
+								Effect.annotateLogs({ sessionId: row.id }),
+							),
+						),
+						Effect.ignore,
+					);
+				}),
+				{ concurrency: "unbounded", discard: true },
+			);
+		}).pipe(Effect.withSpan("Control.resumeUnfinished"));
+
+		return Service.of({
+			prompt,
+			run,
+			wait,
+			resume,
+			interrupt,
+			active: execution.active,
+			resumeUnfinished,
+			pending: inputs.pending,
+			cancel: inputs.cancel,
+			update,
+		});
 	}),
 );
 
diff --git a/packages/harness/src/db/migrations.ts b/packages/harness/src/db/migrations.ts
index 8851dd2a..dd73f3ac 100644
--- a/packages/harness/src/db/migrations.ts
+++ b/packages/harness/src/db/migrations.ts
@@ -269,4 +269,24 @@ export const migrations = {
 		// merges into it. NULL: nothing chosen, the session follows its settings.
 		yield* sql`ALTER TABLE session ADD COLUMN config TEXT`;
 	}),
+
+	"202610230001_session_input_cancel": Effect.gen(function* () {
+		const sql = yield* SqlClient.SqlClient;
+
+		// The sequence of the `session.prompt.cancelled` event that withdrew a pending input.
+		// The row is kept, not deleted: a promotion already in flight then finds it cancelled and
+		// loses, rather than reading a missing row as a replay and appending the prompt anyway.
+		yield* sql`ALTER TABLE session_input ADD COLUMN cancelled_seq INTEGER`;
+	}),
+
+	"202610240001_session_execution": Effect.gen(function* () {
+		const sql = yield* SqlClient.SqlClient;
+
+		// The run a session has unfinished (`SessionSchema.Execution`), written as it starts and
+		// ends, so a server starting finds what the last process left without its cooperation.
+		yield* sql`ALTER TABLE session ADD COLUMN execution TEXT`;
+		// Times that run was cut off by a process dying. A committed turn is progress and resets it;
+		// at the limit the session is parked rather than resumed again.
+		yield* sql`ALTER TABLE session ADD COLUMN restarts INTEGER NOT NULL DEFAULT 0`;
+	}),
 };
diff --git a/packages/harness/src/db/schema.sql.ts b/packages/harness/src/db/schema.sql.ts
index 77e0ff5d..2632403a 100644
--- a/packages/harness/src/db/schema.sql.ts
+++ b/packages/harness/src/db/schema.sql.ts
@@ -145,6 +145,9 @@ export class SessionRow extends Model.Class<SessionRow>("SessionRow")({
 	tokensOutput: Model.GeneratedByDb(Schema.Int),
 	tokensCacheRead: Model.GeneratedByDb(Schema.Int),
 	tokensCacheWrite: Model.GeneratedByDb(Schema.Int),
+	// The run left unfinished, and how often a dying process cut it off; see `SessionSchema.Execution`.
+	execution: Model.FieldOption(SessionSchema.Execution),
+	restarts: Model.GeneratedByDb(Schema.Int),
 	...Timestamps,
 }) {}
 
@@ -158,6 +161,7 @@ export class SessionInputRow extends Model.Class<SessionInputRow>("SessionInputR
 	delivery: Schema.Literals(inputDeliveries),
 	admittedSeq: Schema.Int,
 	promotedSeq: Model.FieldOption(Schema.Int),
+	cancelledSeq: Model.FieldOption(Schema.Int),
 	createdAt: Model.DateTimeInsertFromNumber,
 }) {}
 
diff --git a/packages/harness/src/effect/session.ts b/packages/harness/src/effect/session.ts
index 15c2f8c9..90696c56 100644
--- a/packages/harness/src/effect/session.ts
+++ b/packages/harness/src/effect/session.ts
@@ -104,6 +104,11 @@ export interface Info {
 	readonly model?: { readonly provider: string; readonly id: string };
 	/** The thinking level chosen for this session over settings; absent when settings decide. */
 	readonly thinkingLevel?: Model.ThinkingLevel;
+	/**
+	 * Its unfinished run was cut off {@link Control.RESTART_LIMIT} times, so the server no longer
+	 * resumes it; the next prompt runs it again.
+	 */
+	readonly parked: boolean;
 }
 
 export interface Handle {
@@ -182,6 +187,8 @@ const makeHandle = Effect.fn("Session.makeHandle")(function* (id: SessionSchema.
 		const config = Option.getOrUndefined(row.config);
 		const model = config?.model;
 		const thinkingLevel = config?.thinkingLevel;
+		const parked =
+			Option.isSome(row.execution) && row.restarts >= Control.RESTART_LIMIT && !(yield* control.active).has(id);
 		return {
 			id,
 			title: row.title,
@@ -193,6 +200,7 @@ const makeHandle = Effect.fn("Session.makeHandle")(function* (id: SessionSchema.
 			updatedAt: DateTime.toEpochMillis(row.updatedAt),
 			...(model === undefined ? {} : { model }),
 			...(thinkingLevel === undefined ? {} : { thinkingLevel }),
+			parked,
 		};
 	}).pipe(Effect.withSpan("Session.info"));
 
diff --git a/packages/harness/src/event/list.ts b/packages/harness/src/event/list.ts
index e3521e67..aa96755d 100644
--- a/packages/harness/src/event/list.ts
+++ b/packages/harness/src/event/list.ts
@@ -38,6 +38,30 @@ export const Prompted = EventSchema.define({
 });
 export type Prompted = typeof Prompted.Type;
 
+/** A pending prompt withdrawn before promotion; it never enters the conversation. */
+export const PromptCancelled = EventSchema.define({
+	type: "session.prompt.cancelled",
+	...durableOptions,
+	schema: { ...baseOptions, messageId: SessionMessageSchema.ID },
+});
+export type PromptCancelled = typeof PromptCancelled.Type;
+
+/**
+ * A pending prompt moved to the other lane or rewritten before promotion; it keeps its place. Only
+ * what changed is carried, so two updates of different fields both stand.
+ */
+export const PromptUpdated = EventSchema.define({
+	type: "session.prompt.updated",
+	...durableOptions,
+	schema: {
+		...baseOptions,
+		messageId: SessionMessageSchema.ID,
+		prompt: PromptSchema.Prompt.pipe(optional),
+		delivery: PromptSchema.Delivery.pipe(optional),
+	},
+});
+export type PromptUpdated = typeof PromptUpdated.Type;
+
 export const ConfigChanged = EventSchema.define({
 	type: "session.config.changed",
 	...durableOptions,
@@ -292,6 +316,8 @@ export const Definitions = EventSchema.inventory(
 	ExecutionInterrupted,
 	PromptAdmitted,
 	Prompted,
+	PromptCancelled,
+	PromptUpdated,
 	ConfigChanged,
 	SessionForked,
 	TurnStarted,
@@ -324,6 +350,8 @@ export const PublicDefinitions = Definitions;
 export const DurableDefinitions = EventSchema.inventory(
 	PromptAdmitted,
 	Prompted,
+	PromptCancelled,
+	PromptUpdated,
 	ConfigChanged,
 	SessionForked,
 	TurnEnded,
diff --git a/packages/harness/src/plugin/builtin/tool/edit.ts b/packages/harness/src/plugin/builtin/tool/edit.ts
index d52e5561..9e4dcfea 100644
--- a/packages/harness/src/plugin/builtin/tool/edit.ts
+++ b/packages/harness/src/plugin/builtin/tool/edit.ts
@@ -99,7 +99,7 @@ export const editDef = Tool.define({
 
 const fail = (message: string) => Effect.fail(new EditFailed({ message }));
 
-/** Filesystem failures name the backend's error code, as Pi's do. */
+/** Filesystem failures name the backend's error code. */
 const accessFailure = (path: string) => (error: SandboxFileSystem.FileSystemError) => {
 	const code = (error.cause as { code?: unknown } | undefined)?.code;
 	return fail(`Could not edit file: ${path}. Error code: ${typeof code === "string" ? code : "unknown"}.`);
diff --git a/packages/harness/src/runner/execute.ts b/packages/harness/src/runner/execute.ts
index bf8ae6b6..b3e7856b 100644
--- a/packages/harness/src/runner/execute.ts
+++ b/packages/harness/src/runner/execute.ts
@@ -45,11 +45,19 @@ export const layer = Layer.effect(
 				Effect.ignore,
 			);
 
+		// Sessions being recovered: their run neither marks the session nor runs once it is unmarked.
+		const recovering = new Set<SessionId>();
+		// The log position at each user stop: prompts admitted after it are new work, not parked by it.
+		const stoppedAt = new Map<SessionId, number>();
+
 		const coordinator = yield* RunCoordinator.make<SessionId, Runner.RunError, SessionSchema.InterruptReason>({
+			// The run is recorded unfinished before it starts, so a process dying anywhere in it
+			// leaves the session for the next server start to resume. A recovered one already is.
 			started: (sessionId) =>
 				reportLifecycle(
 					sessionId,
-					DateTime.now.pipe(
+					(recovering.has(sessionId) ? Effect.void : store.markRunning(sessionId)).pipe(
+						Effect.andThen(DateTime.now),
 						Effect.andThen((timestamp) => events.publish(EventList.ExecutionStarted, { sessionId, timestamp })),
 					),
 				),
@@ -58,6 +66,16 @@ export const layer = Layer.effect(
 				reportLifecycle(
 					sessionId,
 					Effect.gen(function* () {
+						// A shutdown leaves the run to resume on the next start; a user stop or any other end
+						// finishes it.
+						const interrupted = Exit.isFailure(exit) && Cause.hasInterruptsOnly(exit.cause);
+						const stop = stoppedAt.get(sessionId);
+						stoppedAt.delete(sessionId);
+						yield* store.endExecution(
+							sessionId,
+							!interrupted ? "finished" : reason === "user" ? "stopped" : "closed",
+							stop,
+						);
 						const timestamp = yield* DateTime.now;
 						if (Exit.isSuccess(exit))
 							return yield* events.publish(EventList.ExecutionSucceeded, { sessionId, timestamp });
@@ -78,6 +96,8 @@ export const layer = Layer.effect(
 			drain: Effect.fnUntraced(function* (sessionId: SessionId, force) {
 				const session = yield* store.get(sessionId);
 				if (Option.isNone(session)) return yield* new Session.SessionNotFoundError({ sessionId });
+				const recovered = recovering.delete(sessionId);
+				if (recovered && Option.isNone(session.value.execution)) return;
 				const space = yield* store.space(sessionId);
 				// Unreachable while the FK holds; typed so a UI can offer relink
 				// as the repair instead of surfacing a defect.
@@ -115,7 +135,7 @@ export const layer = Layer.effect(
 					);
 
 					return yield* runner
-						.run({ sessionId, force })
+						.run({ sessionId, force, recovered })
 						.pipe(Effect.provideContext(Context.merge(locationContext, mountContext)));
 				});
 
@@ -130,10 +150,34 @@ export const layer = Layer.effect(
 			}),
 		});
 
+		const interrupt: RunnerExecution.Interface["interrupt"] = (sessionId, reason, options) =>
+			Effect.gen(function* () {
+				// The first stop of a run sets its position; a repeat while it settles keeps that one.
+				const recorded = reason === "user" && !stoppedAt.has(sessionId);
+				if (recorded) stoppedAt.set(sessionId, yield* events.latestSequence(sessionId));
+				const accepted = yield* coordinator.interrupt(sessionId, reason, options);
+				// Nothing was running, so no settlement will read the position this call set.
+				if (recorded && !accepted) stoppedAt.delete(sessionId);
+				return accepted;
+			});
+
+		const recover = (sessionId: SessionId) =>
+			Effect.suspend(() => {
+				recovering.add(sessionId);
+				return coordinator.run(sessionId);
+			}).pipe(
+				Effect.ensuring(
+					Effect.sync(() => {
+						recovering.delete(sessionId);
+					}),
+				),
+			);
+
 		return RunnerExecution.Service.of({
 			active: coordinator.active,
-			interrupt: coordinator.interrupt,
+			interrupt,
 			resume: coordinator.run,
+			recover,
 			wake: coordinator.wake,
 			awaitIdle: coordinator.awaitIdle,
 		});
diff --git a/packages/harness/src/runner/execution.ts b/packages/harness/src/runner/execution.ts
index 45d14917..27664611 100644
--- a/packages/harness/src/runner/execution.ts
+++ b/packages/harness/src/runner/execution.ts
@@ -12,6 +12,12 @@ export interface Interface {
 	readonly active: Effect.Effect<ReadonlySet<SessionSchema.ID>>;
 	/** Starts execution while idle or joins the active execution. */
 	readonly resume: (sessionId: SessionSchema.ID) => Effect.Effect<void, Runner.RunError>;
+	/**
+	 * Resumes a run the last process left unfinished. Like `resume`, except that it marks nothing,
+	 * and runs nothing when the session is no longer marked as it begins: a stop that landed since
+	 * recovery chose the session stands.
+	 */
+	readonly recover: (sessionId: SessionSchema.ID) => Effect.Effect<void, Runner.RunError>;
 	/** Registers newly recorded work. Repeated wakeups may coalesce. */
 	readonly wake: (sessionId: SessionSchema.ID) => Effect.Effect<void>;
 	/**
@@ -35,6 +41,7 @@ export const noopLayer = Layer.succeed(
 	Service.of({
 		active: Effect.succeed(new Set()),
 		resume: () => Effect.void,
+		recover: () => Effect.void,
 		wake: () => Effect.void,
 		interrupt: () => Effect.succeed(false),
 		awaitIdle: () => Effect.void,
diff --git a/packages/harness/src/runner/loop.ts b/packages/harness/src/runner/loop.ts
index 9ada716b..4ec49536 100644
--- a/packages/harness/src/runner/loop.ts
+++ b/packages/harness/src/runner/loop.ts
@@ -267,12 +267,16 @@ export const layer = (options: Options = {}) =>
 			const runTurnAttempt = Effect.fn("Loop.runTurnAttempt", { level: "Info" })(function* (
 				promotion: Promotion,
 				snapshot: State.Snapshot,
+				continuing: boolean,
 			) {
 				const sessionId = snapshot.sessionId;
 				if (promotion !== undefined) {
 					const cutoff = yield* events.latestSequence(sessionId);
-					if (promotion === "followUp") yield* inputs.promoteFollowUp(sessionId);
-					yield* inputs.promoteSteers(sessionId, cutoff);
+					const followUp = promotion === "followUp" && (yield* inputs.promoteFollowUp(sessionId));
+					const steers = yield* inputs.promoteSteers(sessionId, cutoff);
+					// The pending input this turn was started for was cancelled before promotion: with no
+					// earlier work to continue there is nothing to answer, so no provider request.
+					if (!continuing && !followUp && steers === 0) return { needsContinuation: false } satisfies TurnResult;
 				}
 
 				const assembled = yield* context.assemble(sessionId);
@@ -413,16 +417,19 @@ export const layer = (options: Options = {}) =>
 				);
 			});
 
+			/** `continuing`: earlier work (tool results, a forced resume) needs a reply even when nothing is promoted. */
 			const runTurn = Effect.fn("Loop.runTurn", { level: "Info" })(function* (
 				promotion: Promotion,
 				snapshot: State.Snapshot,
+				continuing: boolean,
 			) {
-				return yield* runTurnAttempt(promotion, snapshot);
+				return yield* runTurnAttempt(promotion, snapshot, continuing);
 			});
 
 			const run = Effect.fn("Loop.run", { level: "Info" })(function* (input: {
 				readonly sessionId: SessionSchema.ID;
 				readonly force: boolean;
+				readonly recovered?: boolean;
 			}) {
 				yield* healDanglingDraft(input.sessionId);
 
@@ -435,18 +442,38 @@ export const layer = (options: Options = {}) =>
 					"gen_ai.conversation.id": input.sessionId,
 				});
 
-				let promotion: Promotion = hasSteer ? "steer" : hasFollowUp ? "followUp" : undefined;
+				// A recovered run first answers the reply it was cut off in, from the same committed messages,
+				// before a queued follow-up goes in; steers join it either way.
+				const cutOff =
+					input.recovered === true &&
+					!hasSteer &&
+					hasFollowUp &&
+					(yield* context.assemble(input.sessionId).pipe(
+						Effect.map((assembled) => {
+							const leaf =
+								assembled.lastAssistant?.entryId === assembled.leafEntryId
+									? assembled.lastAssistant.message
+									: undefined;
+							return (
+								assembled.messages.length > 0 && leaf?.stopReason !== "stop" && leaf?.stopReason !== "length"
+							);
+						}),
+					));
+				let promotion: Promotion = hasSteer ? "steer" : hasFollowUp && !cutOff ? "followUp" : undefined;
 				const drain = Effect.gen(function* () {
 					let shouldRun = true;
+					let continuing = input.force;
 					while (shouldRun) {
 						const snapshot = yield* state.snapshot(input.sessionId);
 						let needsContinuation = true;
 						while (needsContinuation) {
-							const result = yield* runTurn(promotion, snapshot);
+							const result = yield* runTurn(promotion, snapshot, continuing);
 							promotion = "steer";
+							continuing = result.needsContinuation;
 							needsContinuation =
 								result.needsContinuation || (yield* inputs.hasPending(input.sessionId, "steer"));
 						}
+						continuing = false;
 						shouldRun = yield* inputs.hasPending(input.sessionId, "followUp");
 						promotion = shouldRun ? "followUp" : undefined;
 					}
diff --git a/packages/harness/src/runner/run.ts b/packages/harness/src/runner/run.ts
index 5f99aad3..666faa9e 100644
--- a/packages/harness/src/runner/run.ts
+++ b/packages/harness/src/runner/run.ts
@@ -188,6 +188,8 @@ export interface Interface {
 	readonly run: (input: {
 		readonly sessionId: SessionId;
 		readonly force: boolean;
+		/** Resuming a run a previous process left unfinished: its cut-off reply is answered first. */
+		readonly recovered?: boolean;
 	}) => Effect.Effect<void, RunError, SandboxIO.Provides | Location.Service>;
 }
 
diff --git a/packages/harness/src/session/input/input.ts b/packages/harness/src/session/input/input.ts
index 4c0872e4..ceccdddf 100644
--- a/packages/harness/src/session/input/input.ts
+++ b/packages/harness/src/session/input/input.ts
@@ -7,6 +7,7 @@ import { EventList } from "../../event/list.ts";
 import { SessionMessageSchema } from "../message/schema.ts";
 import { Delivery, Prompt } from "../prompt/schema.ts";
 import { SessionSchema } from "../schema.ts";
+import { DateTimeUtcFromMillis } from "../../schema.ts";
 import { Admitted } from "./schema.ts";
 
 /**
@@ -32,6 +33,7 @@ const fromRow = (row: SessionInputRow): Admitted =>
 		delivery: row.delivery,
 		timeCreated: row.createdAt,
 		...(Option.isNone(row.promotedSeq) ? {} : { promotedSeq: row.promotedSeq.value }),
+		...(Option.isNone(row.cancelledSeq) ? {} : { cancelledSeq: row.cancelledSeq.value }),
 	});
 
 /**
@@ -75,6 +77,25 @@ export interface ProjectAdmittedInput extends AdmitInput {
 	readonly timeCreated: DateTime.Utc;
 }
 
+export interface ProjectCancelledInput {
+	readonly id: SessionMessageSchema.ID;
+	readonly sessionId: SessionSchema.ID;
+	readonly cancelledSeq: number;
+}
+
+export interface ProjectUpdatedInput {
+	readonly id: SessionMessageSchema.ID;
+	readonly sessionId: SessionSchema.ID;
+	readonly prompt?: Prompt | undefined;
+	readonly delivery?: Delivery | undefined;
+}
+
+/** What `update` changes; an absent field stays as it is. */
+export interface UpdatePatch {
+	readonly prompt?: Prompt;
+	readonly delivery?: Delivery;
+}
+
 export interface ProjectPromptedInput extends AdmitInput {
 	readonly promotedSeq: number;
 	readonly timeCreated: DateTime.Utc;
@@ -88,6 +109,27 @@ export interface Interface {
 	readonly projectAdmitted: (input: ProjectAdmittedInput) => Effect.Effect<void>;
 	/** Projector for `Prompted`. Runs inside the event commit. */
 	readonly projectPrompted: (input: ProjectPromptedInput) => Effect.Effect<void>;
+	/** Projector for `PromptCancelled`. Runs inside the event commit. */
+	readonly projectCancelled: (input: ProjectCancelledInput) => Effect.Effect<void>;
+	/** Projector for `PromptUpdated`. Runs inside the event commit. */
+	readonly projectUpdated: (input: ProjectUpdatedInput) => Effect.Effect<void>;
+	/**
+	 * Moves a pending input to the other lane, or rewrites it, keeping its place in admission
+	 * order. The stored input after the change, or none when it was promoted, cancelled, or unknown.
+	 */
+	readonly update: (
+		sessionId: SessionSchema.ID,
+		id: SessionMessageSchema.ID,
+		patch: UpdatePatch,
+	) => Effect.Effect<Option.Option<Admitted>>;
+	/**
+	 * Withdraws a pending input of the session. False when there is none by that id, or it was
+	 * promoted or cancelled first: a cancel that loses to promotion leaves the prompt in the
+	 * conversation.
+	 */
+	readonly cancel: (sessionId: SessionSchema.ID, id: SessionMessageSchema.ID) => Effect.Effect<boolean>;
+	/** Inputs not promoted yet, both lanes, in admission order. */
+	readonly pending: (sessionId: SessionSchema.ID) => Effect.Effect<ReadonlyArray<Admitted>>;
 	/** Whether the lane holds an input that has not been promoted yet. */
 	readonly hasPending: (sessionId: SessionSchema.ID, delivery: Delivery) => Effect.Effect<boolean>;
 	/**
@@ -131,6 +173,42 @@ export const make = Effect.gen(function* () {
     `,
 	});
 
+	const updateRow = SqlSchema.findAll({
+		Request: Schema.Struct({
+			id: Schema.String,
+			sessionId: Schema.String,
+			prompt: Schema.NullOr(Schema.fromJsonString(Prompt)),
+			delivery: Schema.NullOr(Delivery),
+		}),
+		Result: Schema.Struct({ id: Schema.String }),
+		// A null field is one the update left alone.
+		execute: ({ id, sessionId, prompt, delivery }) => sql`
+      UPDATE session_input SET prompt = COALESCE(${prompt}, prompt), delivery = COALESCE(${delivery}, delivery)
+      WHERE id = ${id} AND session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL
+      RETURNING id
+    `,
+	});
+
+	// A cancelled id may be admitted again: its kept row becomes pending once more, as a fresh admission.
+	const reviveRow = SqlSchema.findAll({
+		Request: Schema.Struct({
+			id: Schema.String,
+			sessionId: Schema.String,
+			prompt: Schema.fromJsonString(Prompt),
+			delivery: Delivery,
+			admittedSeq: Schema.Int,
+			createdAt: DateTimeUtcFromMillis,
+		}),
+		Result: Schema.Struct({ id: Schema.String }),
+		execute: ({ id, sessionId, prompt, delivery, admittedSeq, createdAt }) => sql`
+      UPDATE session_input
+      SET prompt = ${prompt}, delivery = ${delivery}, admitted_seq = ${admittedSeq}, created_at = ${createdAt},
+        cancelled_seq = NULL
+      WHERE id = ${id} AND session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NOT NULL
+      RETURNING id
+    `,
+	});
+
 	// `promoted_seq IS NULL` is the guard: it makes promotion a compare-and-set,
 	// so a second promotion updates nothing instead of silently re-delivering.
 	const promoteRow = SqlSchema.findAll({
@@ -142,11 +220,22 @@ export const make = Effect.gen(function* () {
 		Result: SessionInputRow,
 		execute: ({ id, sessionId, promotedSeq }) => sql`
       UPDATE session_input SET promoted_seq = ${promotedSeq}
-      WHERE id = ${id} AND session_id = ${sessionId} AND promoted_seq IS NULL
+      WHERE id = ${id} AND session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL
       RETURNING *
     `,
 	});
 
+	// The same compare-and-set as promotion: whichever of the two commits first wins the row.
+	const cancelRow = SqlSchema.findAll({
+		Request: Schema.Struct({ id: Schema.String, sessionId: Schema.String, cancelledSeq: Schema.Int }),
+		Result: Schema.Struct({ id: Schema.String }),
+		execute: ({ id, sessionId, cancelledSeq }) => sql`
+      UPDATE session_input SET cancelled_seq = ${cancelledSeq}
+      WHERE id = ${id} AND session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL
+      RETURNING id
+    `,
+	});
+
 	// An input id becomes the entry id once the Loop materializes it, so an
 	// existing entry means this input has already graduated out of the queue.
 	const selectEntry = SqlSchema.findAll({
@@ -160,11 +249,21 @@ export const make = Effect.gen(function* () {
 		Result: Schema.Struct({ id: Schema.String }),
 		execute: ({ sessionId, delivery }) => sql`
       SELECT id FROM session_input
-      WHERE session_id = ${sessionId} AND promoted_seq IS NULL AND delivery = ${delivery}
+      WHERE session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL AND delivery = ${delivery}
       LIMIT 1
     `,
 	});
 
+	const selectPending = SqlSchema.findAll({
+		Request: Schema.String,
+		Result: SessionInputRow,
+		execute: (sessionId) => sql`
+      SELECT * FROM session_input
+      WHERE session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL
+      ORDER BY admitted_seq
+    `,
+	});
+
 	const selectPendingSteers = SqlSchema.findAll({
 		Request: Schema.Struct({ sessionId: Schema.String, cutoff: Schema.Int }),
 		Result: SessionInputRow,
@@ -172,6 +271,7 @@ export const make = Effect.gen(function* () {
       SELECT * FROM session_input
       WHERE session_id = ${sessionId}
         AND promoted_seq IS NULL
+        AND cancelled_seq IS NULL
         AND delivery = 'steer'
         AND admitted_seq <= ${cutoff}
       ORDER BY admitted_seq
@@ -183,7 +283,7 @@ export const make = Effect.gen(function* () {
 		Result: SessionInputRow,
 		execute: (sessionId) => sql`
       SELECT * FROM session_input
-      WHERE session_id = ${sessionId} AND promoted_seq IS NULL AND delivery = 'followUp'
+      WHERE session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL AND delivery = 'followUp'
       ORDER BY admitted_seq
       LIMIT 1
     `,
@@ -197,7 +297,8 @@ export const make = Effect.gen(function* () {
 		// Read before publishing, never inside it: the commit transaction must open
 		// with a write, and a stored row makes re-admission a no-op anyway.
 		const existing = yield* find(input.id);
-		if (Option.isSome(existing)) return existing.value;
+		// A cancelled one is admitted afresh, as if it had never been sent.
+		if (Option.isSome(existing) && existing.value.cancelledSeq === undefined) return existing.value;
 		const timestamp = yield* DateTime.now;
 		return yield* events
 			.publish(EventList.PromptAdmitted, {
@@ -223,14 +324,14 @@ export const make = Effect.gen(function* () {
 							),
 				),
 				// Two admissions of one id race: the loser's projector conflicts, its
-				// event rolls back, and it adopts the winner's row.
+				// event rolls back, and it adopts the winner's row. A row still cancelled
+				// means no admission won, so the failure stands.
 				Effect.catchDefect((defect) =>
 					find(input.id).pipe(
-						Effect.flatMap(
-							Option.match({
-								onNone: () => Effect.die(defect),
-								onSome: (stored: Admitted) => Effect.succeed(stored),
-							}),
+						Effect.flatMap((stored) =>
+							Option.isSome(stored) && stored.value.cancelledSeq === undefined
+								? Effect.succeed(stored.value)
+								: Effect.die(defect),
 						),
 					),
 				),
@@ -249,9 +350,19 @@ export const make = Effect.gen(function* () {
 			delivery: input.delivery,
 			admittedSeq: input.admittedSeq,
 			promotedSeq: Option.none(),
+			cancelledSeq: Option.none(),
 			createdAt: VariantSchema.Override(input.timeCreated),
 		});
-		if (stored.length === 0) return yield* Effect.die(new LifecycleConflict({ id: input.id }));
+		if (stored.length > 0) return;
+		const revived = yield* reviveRow({
+			id: input.id,
+			sessionId: input.sessionId,
+			prompt: input.prompt,
+			delivery: input.delivery,
+			admittedSeq: input.admittedSeq,
+			createdAt: input.timeCreated,
+		});
+		if (revived.length === 0) return yield* Effect.die(new LifecycleConflict({ id: input.id }));
 	}, Effect.orDie);
 
 	const projectPrompted = Effect.fn("SessionInput.projectPrompted")(function* (input: ProjectPromptedInput) {
@@ -271,7 +382,11 @@ export const make = Effect.gen(function* () {
 		// is already promoted at a different sequence, which is a conflict.
 		const stored = yield* find(input.id);
 		if (Option.isSome(stored)) {
-			if (!matchesProjection(stored.value, input) || stored.value.promotedSeq !== input.promotedSeq)
+			if (
+				!matchesProjection(stored.value, input) ||
+				stored.value.promotedSeq !== input.promotedSeq ||
+				stored.value.cancelledSeq !== undefined
+			)
 				return yield* Effect.die(new LifecycleConflict({ id: input.id }));
 			return;
 		}
@@ -285,10 +400,92 @@ export const make = Effect.gen(function* () {
 			delivery: input.delivery,
 			admittedSeq: input.promotedSeq,
 			promotedSeq: Option.some(input.promotedSeq),
+			cancelledSeq: Option.none(),
 			createdAt: VariantSchema.Override(input.timeCreated),
 		});
 	}, Effect.orDie);
 
+	const projectCancelled = Effect.fn("SessionInput.projectCancelled")(function* (input: ProjectCancelledInput) {
+		const updated = yield* cancelRow(input);
+		if (updated.length > 0) return;
+		// Nothing moved: this exact cancel being replayed, or the row was promoted or cancelled first.
+		const stored = yield* find(input.id);
+		if (Option.isSome(stored) && stored.value.cancelledSeq === input.cancelledSeq) return;
+		return yield* Effect.die(new LifecycleConflict({ id: input.id }));
+	}, Effect.orDie);
+
+	const projectUpdated = Effect.fn("SessionInput.projectUpdated")(function* (input: ProjectUpdatedInput) {
+		const updated = yield* updateRow({
+			id: input.id,
+			sessionId: input.sessionId,
+			prompt: input.prompt ?? null,
+			delivery: input.delivery ?? null,
+		});
+		if (updated.length > 0) return;
+		// Promoted or cancelled first: the update lost, and its event rolls back.
+		return yield* Effect.die(new LifecycleConflict({ id: input.id }));
+	}, Effect.orDie);
+
+	const update = Effect.fn("SessionInput.update")(function* (
+		sessionId: SessionSchema.ID,
+		id: SessionMessageSchema.ID,
+		patch: UpdatePatch,
+	) {
+		// Read before publishing, as `admit` does: the commit must open with a write.
+		const stored = yield* find(id);
+		if (
+			Option.isNone(stored) ||
+			stored.value.sessionId !== sessionId ||
+			stored.value.promotedSeq !== undefined ||
+			stored.value.cancelledSeq !== undefined
+		)
+			return Option.none<Admitted>();
+		const prompt =
+			patch.prompt === undefined || Prompt.equivalence(patch.prompt, stored.value.prompt) ? undefined : patch.prompt;
+		const delivery =
+			patch.delivery === undefined || patch.delivery === stored.value.delivery ? undefined : patch.delivery;
+		if (prompt === undefined && delivery === undefined) return stored;
+		const timestamp = yield* DateTime.now;
+		return yield* events
+			.publish(EventList.PromptUpdated, {
+				sessionId,
+				messageId: id,
+				timestamp,
+				...(prompt === undefined ? {} : { prompt }),
+				...(delivery === undefined ? {} : { delivery }),
+			})
+			.pipe(
+				// Read back: another update may have changed the field this one left alone.
+				Effect.andThen(find(id)),
+				// Promoted or cancelled between the read and the commit.
+				Effect.catchDefect((defect) =>
+					isLifecycleConflict(defect) ? Effect.succeed(Option.none<Admitted>()) : Effect.die(defect),
+				),
+			);
+	});
+
+	const cancel = Effect.fn("SessionInput.cancel")(function* (
+		sessionId: SessionSchema.ID,
+		id: SessionMessageSchema.ID,
+	) {
+		// Read before publishing, as `admit` does: the commit must open with a write.
+		const stored = yield* find(id);
+		if (
+			Option.isNone(stored) ||
+			stored.value.sessionId !== sessionId ||
+			stored.value.promotedSeq !== undefined ||
+			stored.value.cancelledSeq !== undefined
+		)
+			return false;
+		const timestamp = yield* DateTime.now;
+		return yield* events.publish(EventList.PromptCancelled, { sessionId, messageId: id, timestamp }).pipe(
+			Effect.as(true),
+			// Promoted (or cancelled) between the read and the commit: the projector conflicted and
+			// the event rolled back.
+			Effect.catchDefect((defect) => (isLifecycleConflict(defect) ? Effect.succeed(false) : Effect.die(defect))),
+		);
+	});
+
 	// Publishing `Prompted` is what promotes: the projector stamps promoted_seq
 	// with that event's own sequence, so delivery order lives in the same space
 	// as the rest of the session's history.
@@ -317,7 +514,14 @@ export const make = Effect.gen(function* () {
 						isLifecycleConflict(defect)
 							? find(id).pipe(
 									Effect.flatMap((stored) =>
-										Option.isSome(stored) && stored.value.promotedSeq !== undefined
+										// Promoted by someone else, cancelled, re-admitted or updated since it was
+										// selected; one still pending is read afresh by the next promotion.
+										Option.isSome(stored) &&
+										(stored.value.promotedSeq !== undefined ||
+											stored.value.cancelledSeq !== undefined ||
+											stored.value.admittedSeq !== row.admittedSeq ||
+											stored.value.delivery !== row.delivery ||
+											!Prompt.equivalence(stored.value.prompt, row.prompt))
 											? Effect.succeed(false)
 											: Effect.die(defect),
 									),
@@ -330,6 +534,10 @@ export const make = Effect.gen(function* () {
 		return promoted;
 	});
 
+	const pending = Effect.fn("SessionInput.pending")(function* (sessionId: SessionSchema.ID) {
+		return (yield* selectPending(sessionId)).map(fromRow);
+	}, Effect.orDie);
+
 	const hasPending = Effect.fn("SessionInput.hasPending")(function* (sessionId: SessionSchema.ID, delivery: Delivery) {
 		const rows = yield* selectPendingOne({ sessionId, delivery });
 		return rows.length > 0;
@@ -354,6 +562,11 @@ export const make = Effect.gen(function* () {
 		admit,
 		projectAdmitted,
 		projectPrompted,
+		projectCancelled,
+		projectUpdated,
+		update,
+		cancel,
+		pending,
 		hasPending,
 		promoteSteers,
 		promoteFollowUp,
diff --git a/packages/harness/src/session/input/schema.ts b/packages/harness/src/session/input/schema.ts
index 30dc3eee..3111b81c 100644
--- a/packages/harness/src/session/input/schema.ts
+++ b/packages/harness/src/session/input/schema.ts
@@ -12,5 +12,6 @@ export const Admitted = Schema.Struct({
 	delivery: Delivery,
 	timeCreated: DateTimeUtcFromMillis,
 	promotedSeq: NonNegativeInt.pipe(optional),
+	cancelledSeq: NonNegativeInt.pipe(optional),
 }).annotate({ identifier: "SessionInput.Admitted" });
 export interface Admitted extends Schema.Schema.Type<typeof Admitted> {}
diff --git a/packages/harness/src/session/projector.ts b/packages/harness/src/session/projector.ts
index dd9d1e7f..4c0e44b1 100644
--- a/packages/harness/src/session/projector.ts
+++ b/packages/harness/src/session/projector.ts
@@ -74,6 +74,27 @@ export const layer = Layer.effectDiscard(
 			}),
 		);
 
+		yield* events.project(EventList.PromptCancelled, (event) =>
+			Effect.gen(function* () {
+				if (event.durable === undefined)
+					return yield* Effect.die("PromptCancelled is missing its aggregate sequence");
+				yield* input.projectCancelled({
+					cancelledSeq: event.durable.seq,
+					id: event.data.messageId,
+					sessionId: event.data.sessionId,
+				});
+			}),
+		);
+
+		yield* events.project(EventList.PromptUpdated, (event) =>
+			input.projectUpdated({
+				id: event.data.messageId,
+				sessionId: event.data.sessionId,
+				...(event.data.prompt === undefined ? {} : { prompt: event.data.prompt }),
+				...(event.data.delivery === undefined ? {} : { delivery: event.data.delivery }),
+			}),
+		);
+
 		// Publishing `Prompted` is what promotes an input, so this registration is
 		// what makes `promoteSteers` / `promoteFollowUp` take effect at all.
 		yield* events.project(EventList.Prompted, (event) =>
@@ -188,11 +209,13 @@ export const layer = Layer.effectDiscard(
 		);
 
 		yield* events.project(EventList.TurnEnded, (event) =>
-			sessions.setEntryState({
-				id: event.data.messageId,
-				sessionId: event.data.sessionId,
-				state: "committed",
-			}),
+			sessions
+				.setEntryState({
+					id: event.data.messageId,
+					sessionId: event.data.sessionId,
+					state: "committed",
+				})
+				.pipe(Effect.andThen(sessions.resetRestarts(event.data.sessionId))),
 		);
 	}),
 );
diff --git a/packages/harness/src/session/schema.ts b/packages/harness/src/session/schema.ts
index d91ccdcc..5dec780f 100644
--- a/packages/harness/src/session/schema.ts
+++ b/packages/harness/src/session/schema.ts
@@ -48,6 +48,14 @@ export type Config = typeof Config.Type;
 export const InterruptReason = Schema.Literals(["user", "shutdown"]);
 export type InterruptReason = typeof InterruptReason.Type;
 
+/**
+ * A run left unfinished: `running` while one is in flight, and still after the process died during
+ * it; `closed` once a shutdown stopped it. Either resumes when the server starts again; a run that
+ * ended any other way leaves none.
+ */
+export const Execution = Schema.Literals(["running", "closed"]);
+export type Execution = typeof Execution.Type;
+
 // Shared persistence-boundary codecs. Append validates before writing; fork
 // decodes again because legacy/imported rows may predate that validation.
 export const JsonObject = Schema.fromJsonString(Schema.Record(Schema.String, Schema.Unknown));
diff --git a/packages/harness/src/session/session.ts b/packages/harness/src/session/session.ts
index 63bb6353..191ba26b 100644
--- a/packages/harness/src/session/session.ts
+++ b/packages/harness/src/session/session.ts
@@ -255,6 +255,29 @@ export interface Interface {
 	 * value. The projection of `session.config.changed`, so it runs inside that event's commit.
 	 */
 	readonly configure: (sessionId: SessionSchema.ID, config: SessionSchema.Config) => Effect.Effect<void>;
+	/** Records that the session has a run to do: one starting, or one a prompt just woke. */
+	readonly markRunning: (sessionId: SessionSchema.ID) => Effect.Effect<void>;
+	/**
+	 * Records how a run ended. `closed` (a shutdown) leaves it to resume. `stopped` (the user) and
+	 * `finished` clear it and the restart count, except that a finished run with prompts still
+	 * pending stays marked: they are accepted work a successor, or the next server start, runs.
+	 */
+	readonly endExecution: (
+		sessionId: SessionSchema.ID,
+		end: "finished" | "stopped" | "closed",
+		/** For a stop: the log position it was asked at. A prompt admitted after it keeps the mark. */
+		stoppedAt?: number,
+	) => Effect.Effect<void>;
+	/**
+	 * Claims a session's unfinished run for recovery: marks it running again, counting a restart when
+	 * a dying process left it running (a shutdown's closed run is not counted). The new count, or none
+	 * when nothing is unfinished any more, say because the user stopped it since.
+	 */
+	readonly claimRestart: (sessionId: SessionSchema.ID) => Effect.Effect<Option.Option<number>>;
+	/** A committed turn is progress: the restart count starts over. Runs inside `TurnEnded`'s commit. */
+	readonly resetRestarts: (sessionId: SessionSchema.ID) => Effect.Effect<void>;
+	/** Sessions with a run left unfinished, oldest first. */
+	readonly unfinished: Effect.Effect<ReadonlyArray<SessionRow>>;
 	readonly get: (sessionId: SessionSchema.ID) => Effect.Effect<Option.Option<SessionRow>>;
 	/** The space a session attaches to — its env and absolute location. None when the session is unknown. */
 	readonly space: (sessionId: SessionSchema.ID) => Effect.Effect<Option.Option<SpaceSchema.Info>>;
@@ -517,6 +540,7 @@ export const layer = Layer.effect(
 					directory: input.directory,
 					hostDir: Option.fromUndefinedOr(input.hostDir),
 					config: Option.none(),
+					execution: Option.none(),
 					title: input.title,
 					tag: Option.fromUndefinedOr(input.tag),
 					metadata: Option.fromUndefinedOr(input.metadata as Record<string, string> | undefined),
@@ -1049,6 +1073,8 @@ export const layer = Layer.effect(
 							hostDir: source.value.hostDir,
 							// And runs the same model, until the fork chooses another.
 							config: source.value.config,
+							// Nothing runs in a fork yet, whatever the source was doing.
+							execution: Option.none(),
 							title: input.title ?? source.value.title,
 							tag: input.tag === undefined ? source.value.tag : Option.some(input.tag),
 							metadata: source.value.metadata,
@@ -1204,6 +1230,53 @@ export const layer = Layer.effect(
 			`;
 		}, Effect.orDie);
 
+		const markRunning = Effect.fn("Session.markRunning")(function* (sessionId: SessionSchema.ID) {
+			yield* sql`UPDATE session SET execution = 'running' WHERE id = ${sessionId}`;
+		}, Effect.orDie);
+
+		const endExecution = Effect.fn("Session.endExecution")(function* (
+			sessionId: SessionSchema.ID,
+			end: "finished" | "stopped" | "closed",
+			stoppedAt?: number,
+		) {
+			if (end === "closed") {
+				yield* sql`UPDATE session SET execution = 'closed' WHERE id = ${sessionId}`;
+				return;
+			}
+			// Pending prompts that keep the mark: any for a finished run; for a stop, only those sent
+			// after it, since what was queued before it stays parked by the user's choice.
+			const after = end === "stopped" ? (stoppedAt ?? Number.MAX_SAFE_INTEGER) : -1;
+			yield* sql`
+				UPDATE session SET execution = NULL, restarts = 0
+				WHERE id = ${sessionId} AND NOT EXISTS (
+					SELECT 1 FROM session_input
+					WHERE session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL
+						AND admitted_seq > ${after}
+				)
+			`;
+		}, Effect.orDie);
+
+		const claimRestart = Effect.fn("Session.claimRestart")(function* (sessionId: SessionSchema.ID) {
+			const rows = yield* sql<{ restarts: number }>`
+				UPDATE session
+				SET restarts = restarts + (CASE WHEN execution = 'running' THEN 1 ELSE 0 END), execution = 'running'
+				WHERE id = ${sessionId} AND execution IS NOT NULL
+				RETURNING restarts
+			`;
+			return Option.fromUndefinedOr(rows[0]?.restarts);
+		}, Effect.orDie);
+
+		const resetRestarts = Effect.fn("Session.resetRestarts")(function* (sessionId: SessionSchema.ID) {
+			yield* sql`UPDATE session SET restarts = 0 WHERE id = ${sessionId} AND restarts > 0`;
+		}, Effect.orDie);
+
+		const findUnfinished = SqlSchema.findAll({
+			Request: Schema.Void,
+			Result: SessionRow,
+			execute: () => sql`SELECT * FROM session WHERE execution IS NOT NULL ORDER BY updated_at`,
+		});
+		const unfinished = findUnfinished(undefined).pipe(Effect.orDie, Effect.withSpan("Session.unfinished"));
+
 		const relink = Effect.fn("Session.relink")(function* (input: RelinkInput) {
 			const reject = (reason: RelinkReason) =>
 				new RelinkError({ sessionId: input.sessionId, spaceId: input.spaceId, reason });
@@ -1289,6 +1362,11 @@ export const layer = Layer.effect(
 			link,
 			retitle,
 			configure,
+			markRunning,
+			endExecution,
+			claimRestart,
+			resetRestarts,
+			unfinished,
 			get,
 			space,
 			project,
diff --git a/packages/harness/test/control.prompt.test.ts b/packages/harness/test/control.prompt.test.ts
index 6595d86c..ab8592c6 100644
--- a/packages/harness/test/control.prompt.test.ts
+++ b/packages/harness/test/control.prompt.test.ts
@@ -1,10 +1,12 @@
-import { Effect, Layer, Option } from "effect";
+import { Cause, Effect, Exit, Layer, Option, Schema } from "effect";
 import { SqlClient } from "effect/sql";
+import * as TestClock from "effect/testing/TestClock";
 import { describe, expect } from "vite-plus/test";
 import { Control } from "../src/control.ts";
 import { ContextCodec } from "../src/context/codec.ts";
 import { Database } from "../src/db/db.ts";
 import { Event } from "../src/event/event.ts";
+import { EventList } from "../src/event/list.ts";
 import { RunnerExecution } from "../src/runner/execution.ts";
 import { SessionInput } from "../src/session/input/input.ts";
 import { SessionLive } from "../src/session/live.ts";
@@ -161,3 +163,475 @@ describe("Control.prompt", () => {
 			expect((yield* sessions.path(sessionId)).map((h) => h.entry.id)).toEqual([first.id]);
 		}));
 });
+
+describe("Control.cancel", () => {
+	it("lists pending prompts of both lanes in admission order, without promoted or cancelled ones", () =>
+		Effect.gen(function* () {
+			const { control, sessionId } = yield* setup;
+			const inputs = yield* SessionInput.make;
+			const first = yield* control.prompt({ sessionId, prompt: prompt("First steer") });
+			const later = yield* control.prompt({ sessionId, prompt: prompt("Later"), delivery: "followUp" });
+			const second = yield* control.prompt({ sessionId, prompt: prompt("Second steer") });
+			const dropped = yield* control.prompt({ sessionId, prompt: prompt("Dropped") });
+
+			expect((yield* control.pending(sessionId)).map((input) => [input.id, input.delivery])).toEqual([
+				[first.id, "steer"],
+				[later.id, "followUp"],
+				[second.id, "steer"],
+				[dropped.id, "steer"],
+			]);
+
+			yield* control.cancel(sessionId, dropped.id);
+			yield* inputs.promoteSteers(sessionId, Number.MAX_SAFE_INTEGER);
+			expect((yield* control.pending(sessionId)).map((input) => input.id)).toEqual([later.id]);
+		}));
+
+	it("cancels a pending prompt once and refuses a second cancel", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const inputs = yield* SessionInput.make;
+			const admitted = yield* control.prompt({ sessionId, id: messageId, prompt: prompt(text) });
+
+			expect(yield* control.cancel(sessionId, admitted.id)).toBe(true);
+			expect(yield* control.cancel(sessionId, admitted.id)).toBe(false);
+
+			expect(yield* eventCount("session.prompt.cancelled.1")).toBe(1);
+			expect(yield* control.pending(sessionId)).toEqual([]);
+			expect(yield* inputs.hasPending(sessionId, "steer")).toBe(false);
+			expect(some(yield* inputs.find(admitted.id)).cancelledSeq).toBeDefined();
+			// Nothing is left to promote, and nothing reaches the conversation.
+			expect(yield* inputs.promoteSteers(sessionId, Number.MAX_SAFE_INTEGER)).toBe(0);
+			expect(yield* sessions.path(sessionId)).toEqual([]);
+		}));
+
+	it("refuses to cancel another session's prompt, or an unknown id", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const { spaceId, location } = yield* seedSpace();
+			const other = yield* sessions.create({ spaceId, directory: location, title: "Other", tag: "test" });
+			const admitted = yield* control.prompt({ sessionId, prompt: prompt(text) });
+
+			expect(yield* control.cancel(other.id, admitted.id)).toBe(false);
+			expect(yield* control.cancel(sessionId, SessionMessageSchema.ID.make("msg_unknown"))).toBe(false);
+
+			expect(yield* eventCount("session.prompt.cancelled.1")).toBe(0);
+			expect((yield* control.pending(sessionId)).map((input) => input.id)).toEqual([admitted.id]);
+		}));
+
+	it("refuses to cancel a promoted prompt, which stays in the conversation", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const inputs = yield* SessionInput.make;
+			const admitted = yield* control.prompt({ sessionId, prompt: prompt(text) });
+			yield* inputs.promoteSteers(sessionId, Number.MAX_SAFE_INTEGER);
+
+			expect(yield* control.cancel(sessionId, admitted.id)).toBe(false);
+
+			expect(yield* eventCount("session.prompt.cancelled.1")).toBe(0);
+			expect((yield* sessions.path(sessionId)).map((h) => h.entry.id)).toEqual([admitted.id]);
+		}));
+
+	it("admits a cancelled id again, as a fresh pending prompt", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const inputs = yield* SessionInput.make;
+			const first = yield* control.prompt({ sessionId, id: messageId, prompt: prompt(text) });
+			yield* control.cancel(sessionId, messageId);
+
+			const retried = yield* control.prompt({
+				sessionId,
+				id: messageId,
+				prompt: prompt("Fix it another way"),
+				delivery: "followUp",
+			});
+
+			expect(retried.cancelledSeq).toBeUndefined();
+			expect(retried.admittedSeq).toBeGreaterThan(first.admittedSeq);
+			expect(yield* control.pending(sessionId)).toMatchObject([{ id: messageId, delivery: "followUp" }]);
+			expect(
+				yield* control.prompt({
+					sessionId,
+					id: messageId,
+					prompt: prompt("Fix it another way"),
+					delivery: "followUp",
+				}),
+			).toEqual(retried);
+
+			expect(yield* inputs.promoteFollowUp(sessionId)).toBe(true);
+			const path = yield* sessions.path(sessionId);
+			expect(path.map((h) => h.entry.id)).toEqual([messageId]);
+			expect((yield* ContextCodec.decodeMessage(path[0]!)).parts[0]).toMatchObject({ text: "Fix it another way" });
+		}));
+
+	// The promotion the runner had already read for a row that is then cancelled: it must lose,
+	// not read the cancelled row as a replay onto an empty projection and append it anyway.
+	it("rolls back a promotion that commits after the cancel", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const events = yield* Event.Service;
+			const admitted = yield* control.prompt({ sessionId, prompt: prompt(text) });
+			yield* control.cancel(sessionId, admitted.id);
+
+			const late = yield* events
+				.publish(EventList.Prompted, {
+					sessionId,
+					timestamp: admitted.timeCreated,
+					messageId: admitted.id,
+					prompt: admitted.prompt,
+					delivery: admitted.delivery,
+				})
+				.pipe(Effect.exit);
+
+			expect(Exit.isFailure(late)).toBe(true);
+			expect(yield* eventCount("session.prompt.promoted.1")).toBe(0);
+			expect(yield* sessions.path(sessionId)).toEqual([]);
+		}));
+
+	it("lets exactly one of a cancel and a promotion win the same prompt", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const inputs = yield* SessionInput.make;
+			const admitted = yield* control.prompt({ sessionId, prompt: prompt(text) });
+
+			const [cancelled, promoted] = yield* Effect.all(
+				[control.cancel(sessionId, admitted.id), inputs.promoteSteers(sessionId, Number.MAX_SAFE_INTEGER)],
+				{ concurrency: "unbounded" },
+			);
+
+			expect(cancelled !== (promoted === 1)).toBe(true);
+			expect((yield* sessions.path(sessionId)).map((h) => h.entry.id)).toEqual(cancelled ? [] : [admitted.id]);
+			expect(yield* eventCount("session.prompt.cancelled.1")).toBe(cancelled ? 1 : 0);
+			expect(yield* eventCount("session.prompt.promoted.1")).toBe(cancelled ? 0 : 1);
+		}));
+
+	it("does not turn an unrelated projector defect into a lost cancel", () =>
+		Effect.gen(function* () {
+			const { control, sessionId } = yield* setup;
+			const events = yield* Event.Service;
+			const admitted = yield* control.prompt({ sessionId, prompt: prompt(text) });
+			const defect = new Error("projector failed");
+			yield* events.project(EventList.PromptCancelled, () => Effect.die(defect));
+
+			const exit = yield* control.cancel(sessionId, admitted.id).pipe(Effect.exit);
+
+			expect(Exit.isFailure(exit) && Cause.squash(exit.cause)).toBe(defect);
+			expect(yield* eventCount("session.prompt.cancelled.1")).toBe(0);
+			expect((yield* control.pending(sessionId)).map((input) => input.id)).toEqual([admitted.id]);
+		}));
+});
+
+// Records wakes, so a test can tell which updates ask the runner to look again.
+const wakes: string[] = [];
+const watched = Control.layer.pipe(
+	Layer.provide(
+		Layer.succeed(
+			RunnerExecution.Service,
+			RunnerExecution.Service.of({
+				active: Effect.succeed(new Set()),
+				resume: () => Effect.void,
+				recover: () => Effect.void,
+				wake: (sessionId) => Effect.sync(() => wakes.push(sessionId)),
+				interrupt: () => Effect.succeed(false),
+				awaitIdle: () => Effect.void,
+			}),
+		),
+	),
+	Layer.provideMerge(SessionLive.layer),
+	Layer.provideMerge(Event.layer),
+	Layer.provideMerge(Database.layer(":memory:")),
+);
+const { effect: itWatched } = testEffect(watched);
+
+describe("Control.update", () => {
+	itWatched("moves a pending prompt between lanes in place, waking only for the steer lane", () =>
+		Effect.gen(function* () {
+			const { control, sessionId } = yield* setup;
+			const later = yield* control.prompt({ sessionId, prompt: prompt("Later"), delivery: "followUp" });
+			const steer = yield* control.prompt({ sessionId, prompt: prompt("Now") });
+			wakes.length = 0;
+
+			expect(yield* control.update(sessionId, later.id, { delivery: "steer" })).toBe(true);
+			expect((yield* control.pending(sessionId)).map((input) => [input.id, input.delivery])).toEqual([
+				[later.id, "steer"],
+				[steer.id, "steer"],
+			]);
+			expect(wakes).toEqual([sessionId]);
+
+			wakes.length = 0;
+			expect(yield* control.update(sessionId, steer.id, { delivery: "followUp" })).toBe(true);
+			expect((yield* control.pending(sessionId)).map((input) => [input.id, input.delivery])).toEqual([
+				[later.id, "steer"],
+				[steer.id, "followUp"],
+			]);
+			expect(wakes).toEqual([]);
+			expect(yield* eventCount("session.prompt.updated.1")).toBe(2);
+		}),
+	);
+
+	// "Send now" on a steer left waiting by a stop: nothing to change, but the session must wake.
+	itWatched("wakes for a steer already in the steer lane without recording a change", () =>
+		Effect.gen(function* () {
+			const { control, sessionId } = yield* setup;
+			const steer = yield* control.prompt({ sessionId, prompt: prompt("Parked") });
+			wakes.length = 0;
+
+			expect(yield* control.update(sessionId, steer.id, { delivery: "steer" })).toBe(true);
+
+			expect(wakes).toEqual([sessionId]);
+			expect(yield* eventCount("session.prompt.updated.1")).toBe(0);
+		}),
+	);
+
+	it("rewrites a pending prompt in place, and the promotion carries the new text", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const inputs = yield* SessionInput.make;
+			const first = yield* control.prompt({ sessionId, prompt: prompt("Fix the tests") });
+			const second = yield* control.prompt({ sessionId, prompt: prompt("Then lint") });
+
+			expect(yield* control.update(sessionId, first.id, { prompt: prompt("Fix the flaky test only") })).toBe(true);
+			expect((yield* control.pending(sessionId)).map((input) => input.id)).toEqual([first.id, second.id]);
+
+			yield* inputs.promoteSteers(sessionId, Number.MAX_SAFE_INTEGER);
+			const path = yield* sessions.path(sessionId);
+			expect(path.map((h) => h.entry.id)).toEqual([first.id, second.id]);
+			expect((yield* ContextCodec.decodeMessage(path[0]!)).parts[0]).toMatchObject({
+				text: "Fix the flaky test only",
+			});
+		}));
+
+	it("refuses to update a promoted, cancelled, unknown or another session's prompt", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const inputs = yield* SessionInput.make;
+			const { spaceId, location } = yield* seedSpace();
+			const other = yield* sessions.create({ spaceId, directory: location, title: "Other", tag: "test" });
+			const promoted = yield* control.prompt({ sessionId, prompt: prompt("Promoted") });
+			yield* inputs.promoteSteers(sessionId, Number.MAX_SAFE_INTEGER);
+			const cancelled = yield* control.prompt({ sessionId, prompt: prompt("Cancelled") });
+			yield* control.cancel(sessionId, cancelled.id);
+			const pending = yield* control.prompt({ sessionId, prompt: prompt("Pending"), delivery: "followUp" });
+
+			const refused = { delivery: "steer" as const, prompt: prompt("Changed") };
+			expect(yield* control.update(sessionId, promoted.id, refused)).toBe(false);
+			expect(yield* control.update(sessionId, cancelled.id, refused)).toBe(false);
+			expect(yield* control.update(sessionId, SessionMessageSchema.ID.make("msg_unknown"), refused)).toBe(false);
+			expect(yield* control.update(other.id, pending.id, refused)).toBe(false);
+
+			expect(yield* eventCount("session.prompt.updated.1")).toBe(0);
+			expect(yield* control.pending(sessionId)).toMatchObject([{ id: pending.id, delivery: "followUp" }]);
+		}));
+
+	it("settles an update racing a promotion in one of its valid orders", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const inputs = yield* SessionInput.make;
+			const admitted = yield* control.prompt({ sessionId, prompt: prompt("Original") });
+
+			const [updated, promoted] = yield* Effect.all(
+				[
+					control.update(sessionId, admitted.id, { prompt: prompt("Rewritten") }),
+					inputs.promoteSteers(sessionId, Number.MAX_SAFE_INTEGER),
+				],
+				{ concurrency: "unbounded" },
+			);
+
+			// Three orders are valid: the rewrite commits first and is promoted; the promotion commits
+			// first and the rewrite is refused; or the promotion selected the prompt before the rewrite
+			// committed, then steps back and leaves the rewritten prompt pending.
+			const path = yield* sessions.path(sessionId);
+			if (promoted === 0) {
+				expect(updated).toBe(true);
+				expect(path).toEqual([]);
+				expect(PromptSchema.Prompt.text((yield* control.pending(sessionId))[0]!.prompt)).toBe("Rewritten");
+			} else {
+				expect((yield* ContextCodec.decodeMessage(path[0]!)).parts[0]).toMatchObject({
+					text: updated ? "Rewritten" : "Original",
+				});
+			}
+			expect(yield* eventCount("session.prompt.updated.1")).toBe(updated ? 1 : 0);
+		}));
+});
+
+describe("Control queue order", () => {
+	it("keeps the others in order when a middle prompt is cancelled", () =>
+		Effect.gen(function* () {
+			const { control, sessionId } = yield* setup;
+			const first = yield* control.prompt({ sessionId, prompt: prompt("First") });
+			const middle = yield* control.prompt({ sessionId, prompt: prompt("Middle"), delivery: "followUp" });
+			const last = yield* control.prompt({ sessionId, prompt: prompt("Last") });
+
+			yield* control.cancel(sessionId, middle.id);
+
+			expect((yield* control.pending(sessionId)).map((input) => input.id)).toEqual([first.id, last.id]);
+		}));
+
+	it("does not turn an unrelated projector defect into a lost update", () =>
+		Effect.gen(function* () {
+			const { control, sessionId } = yield* setup;
+			const events = yield* Event.Service;
+			const admitted = yield* control.prompt({ sessionId, prompt: prompt(text), delivery: "followUp" });
+			const defect = new Error("projector failed");
+			yield* events.project(EventList.PromptUpdated, () => Effect.die(defect));
+
+			const exit = yield* control.update(sessionId, admitted.id, { delivery: "steer" }).pipe(Effect.exit);
+
+			expect(Exit.isFailure(exit) && Cause.squash(exit.cause)).toBe(defect);
+			expect(yield* eventCount("session.prompt.updated.1")).toBe(0);
+			expect(yield* control.pending(sessionId)).toMatchObject([{ id: admitted.id, delivery: "followUp" }]);
+		}));
+});
+
+describe("Control queue races", () => {
+	// The promotion selected the prompts, then one changed before its own promotion committed. That
+	// promotion must step back, not fail the drain, and the next one carries the new content.
+	it("steps a promotion back when its prompt was updated after selection", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const inputs = yield* SessionInput.make;
+			const events = yield* Event.Service;
+			const first = yield* control.prompt({ sessionId, prompt: prompt("First") });
+			const second = yield* control.prompt({ sessionId, prompt: prompt("Second") });
+			let rewritten = false;
+			yield* events.listen((event) =>
+				!rewritten && Schema.is(EventList.Prompted)(event) && event.data.messageId === first.id
+					? Effect.gen(function* () {
+							rewritten = true;
+							yield* control.update(sessionId, second.id, { prompt: prompt("Second, rewritten") });
+						})
+					: Effect.void,
+			);
+
+			expect(yield* inputs.promoteSteers(sessionId, Number.MAX_SAFE_INTEGER)).toBe(1);
+			expect(rewritten).toBe(true);
+			expect(yield* control.pending(sessionId)).toMatchObject([{ id: second.id }]);
+
+			expect(yield* inputs.promoteSteers(sessionId, Number.MAX_SAFE_INTEGER)).toBe(1);
+			const path = yield* sessions.path(sessionId);
+			expect(path.map((h) => h.entry.id)).toEqual([first.id, second.id]);
+			expect((yield* ContextCodec.decodeMessage(path[1]!)).parts[0]).toMatchObject({ text: "Second, rewritten" });
+		}));
+
+	// The prompt was cancelled and sent again, unchanged, after the promotion selected it: the stale
+	// promotion steps back and the next one promotes the new admission.
+	it("steps a promotion back when its prompt was cancelled and re-admitted after selection", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const inputs = yield* SessionInput.make;
+			const events = yield* Event.Service;
+			const first = yield* control.prompt({ sessionId, prompt: prompt("First") });
+			const second = { sessionId, id: SessionMessageSchema.ID.make("msg_second"), prompt: prompt("Second") };
+			const before = yield* control.prompt(second);
+			let resent = false;
+			yield* events.listen((event) =>
+				!resent && Schema.is(EventList.Prompted)(event) && event.data.messageId === first.id
+					? Effect.gen(function* () {
+							resent = true;
+							yield* control.cancel(sessionId, second.id);
+							// Sent again later, as a person would: the new admission's time differs.
+							yield* TestClock.adjust("1 second");
+							yield* control.prompt(second);
+						}).pipe(Effect.orDie)
+					: Effect.void,
+			);
+
+			expect(yield* inputs.promoteSteers(sessionId, Number.MAX_SAFE_INTEGER)).toBe(1);
+			expect(resent).toBe(true);
+			const [pending] = yield* control.pending(sessionId);
+			expect(pending?.id).toBe(second.id);
+			expect(pending!.admittedSeq).toBeGreaterThan(before.admittedSeq);
+
+			expect(yield* inputs.promoteSteers(sessionId, Number.MAX_SAFE_INTEGER)).toBe(1);
+			expect((yield* sessions.path(sessionId)).map((h) => h.entry.id)).toEqual([first.id, second.id]);
+		}));
+
+	// Two updates of different fields, the second computed before the first committed: each event
+	// carries only its own field, so the first one's change survives.
+	it("applies only the field an update changes", () =>
+		Effect.gen(function* () {
+			const { control, sessionId } = yield* setup;
+			const events = yield* Event.Service;
+			const admitted = yield* control.prompt({ sessionId, prompt: prompt("Original") });
+			yield* control.update(sessionId, admitted.id, { prompt: prompt("Rewritten") });
+
+			yield* events.publish(EventList.PromptUpdated, {
+				sessionId,
+				messageId: admitted.id,
+				timestamp: admitted.timeCreated,
+				delivery: "followUp",
+			});
+
+			const [pending] = yield* control.pending(sessionId);
+			expect(pending?.delivery).toBe("followUp");
+			expect(PromptSchema.Prompt.text(pending!.prompt)).toBe("Rewritten");
+		}));
+
+	it("does not report a re-admission as accepted when its projector fails", () =>
+		Effect.gen(function* () {
+			const { control, sessionId } = yield* setup;
+			const events = yield* Event.Service;
+			const input = { sessionId, id: messageId, prompt: prompt(text) };
+			yield* control.prompt(input);
+			yield* control.cancel(sessionId, messageId);
+			yield* events.project(EventList.PromptAdmitted, () => Effect.die(new Error("projector failed")));
+
+			const exit = yield* control.prompt(input).pipe(Effect.exit);
+
+			expect(Exit.isFailure(exit)).toBe(true);
+			expect(yield* control.pending(sessionId)).toEqual([]);
+		}));
+});
+
+describe("Control unfinished runs", () => {
+	const executionOf = (sessionId: string) =>
+		Effect.gen(function* () {
+			const sql = yield* SqlClient.SqlClient;
+			const [row] = yield* sql<{ execution: string | null }>`SELECT execution FROM session WHERE id = ${sessionId}`;
+			return row?.execution;
+		});
+
+	// Marked before the wake: a crash between accepting the prompt and its run starting must not lose it.
+	it("marks a session running as soon as a prompt is accepted", () =>
+		Effect.gen(function* () {
+			const { control, sessionId } = yield* setup;
+			expect(yield* executionOf(sessionId)).toBeNull();
+
+			yield* control.prompt({ sessionId, prompt: prompt(text) });
+
+			expect(yield* executionOf(sessionId)).toBe("running");
+		}));
+
+	it("keeps a finished run marked while accepted prompts are still pending", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const admitted = yield* control.prompt({ sessionId, prompt: prompt(text) });
+
+			yield* sessions.endExecution(sessionId, "finished");
+			expect(yield* executionOf(sessionId)).toBe("running");
+
+			// Cancelling leaves the mark alone; the run that next ends with nothing pending clears it.
+			yield* control.cancel(sessionId, admitted.id);
+			expect(yield* executionOf(sessionId)).toBe("running");
+			yield* sessions.endExecution(sessionId, "finished");
+			expect(yield* executionOf(sessionId)).toBeNull();
+		}));
+
+	it("keeps a closed run, and clears a stopped one unless a prompt came after the stop", () =>
+		Effect.gen(function* () {
+			const { sessions, control, sessionId } = yield* setup;
+			const events = yield* Event.Service;
+			yield* control.prompt({ sessionId, prompt: prompt("Parked by the stop") });
+
+			yield* sessions.endExecution(sessionId, "closed");
+			expect(yield* executionOf(sessionId)).toBe("closed");
+
+			// Sent while the stop was being cleaned up: its wake survives, so the mark must too.
+			const stop = yield* events.latestSequence(sessionId);
+			yield* control.prompt({ sessionId, prompt: prompt("Sent after the stop") });
+			yield* sessions.endExecution(sessionId, "stopped", stop);
+			expect(yield* executionOf(sessionId)).toBe("running");
+
+			yield* sessions.endExecution(sessionId, "stopped", yield* events.latestSequence(sessionId));
+			expect(yield* executionOf(sessionId)).toBeNull();
+		}));
+});
diff --git a/packages/harness/test/fixtures/conformance.spec.ts b/packages/harness/test/fixtures/conformance.spec.ts
index 0c13d1ce..2676c583 100644
--- a/packages/harness/test/fixtures/conformance.spec.ts
+++ b/packages/harness/test/fixtures/conformance.spec.ts
@@ -28,7 +28,7 @@ export interface ConformanceOptions {
 	readonly combinesOutput: boolean;
 	/** Interrupting the fiber stops the command (Daytona's exec API cannot). */
 	readonly cancels: boolean;
-	/** Commands see the harness process environment (the host, like Pi's `getShellEnv`). */
+	/** Commands see the harness process environment (the host's). */
 	readonly inheritsHostEnv: boolean;
 	/** `uname -s` reports Linux. */
 	readonly linux: boolean;
diff --git a/packages/harness/test/fixtures/runner.cycle.spec.ts b/packages/harness/test/fixtures/runner.cycle.spec.ts
index b7482c5b..174ec4dc 100644
--- a/packages/harness/test/fixtures/runner.cycle.spec.ts
+++ b/packages/harness/test/fixtures/runner.cycle.spec.ts
@@ -116,7 +116,7 @@ export const runnerCycleSpec = (resourceId: () => Promise<string>) =>
 							JSON.stringify({
 								model: {
 									provider: "openai",
-									id: "gpt-5.5",
+									id: "gpt-6-luna",
 									thinkingLevel: "high",
 									providerOptions: {
 										openai: {
@@ -288,7 +288,7 @@ export const runnerCycleSpec = (resourceId: () => Promise<string>) =>
 							expect(recovered.stopReason).toBe("stop");
 							expect(requests).toHaveLength(7);
 							for (const request of requests)
-								expect(request).toMatchObject({ provider: "openai", model: "gpt-5.5" });
+								expect(request).toMatchObject({ provider: "openai", model: "gpt-6-luna" });
 							for (const request of requests.slice(0, 6)) {
 								expect(request.effort).toBe("low");
 								expect(request.headers).toMatchObject({ "x-settings-revision": "low" });
diff --git a/packages/harness/test/fixtures/search.ts b/packages/harness/test/fixtures/search.ts
index 11cee286..d3ef445a 100644
--- a/packages/harness/test/fixtures/search.ts
+++ b/packages/harness/test/fixtures/search.ts
@@ -10,8 +10,8 @@ import { pendingCall } from "../tools.fixture.ts";
 
 /**
  * One tree and one set of grep / find / ls calls, run on every sandbox the search
- * tools support. The cases follow Pi's own tool tests and regressions (#3302 path
- * globs, #3303 nested .gitignore), plus the limits and truncation Pi documents.
+ * tools support. The cases cover path globs, nested .gitignore files, and the
+ * tools' limits and truncation.
  */
 
 export const files: Record<string, string> = {
diff --git a/packages/harness/test/runner.loop.test.ts b/packages/harness/test/runner.loop.test.ts
index 3c43be11..09ae6c5c 100644
--- a/packages/harness/test/runner.loop.test.ts
+++ b/packages/harness/test/runner.loop.test.ts
@@ -10,6 +10,7 @@ import { SqlClient, SqlSchema } from "effect/sql";
 import { describe, expect } from "vite-plus/test";
 import { Context } from "../src/context/context.ts";
 import { Control } from "../src/control.ts";
+import { Session as SessionApi } from "../src/effect/session.ts";
 import { Database } from "../src/db/db.ts";
 import { SessionInputRow } from "../src/db/schema.sql.ts";
 import { Event } from "../src/event/event.ts";
@@ -24,6 +25,7 @@ import { SandboxController } from "../src/sandbox/control.ts";
 import { SandboxDriverRegistry } from "../src/sandbox/registry.ts";
 import { SessionInput } from "../src/session/input/input.ts";
 import { SessionMessageSchema } from "../src/session/message/schema.ts";
+import { PromptSchema } from "../src/session/prompt/schema.ts";
 import { SessionProjector } from "../src/session/projector.ts";
 import { SessionSchema } from "../src/session/schema.ts";
 import { Session } from "../src/session/session.ts";
@@ -42,6 +44,8 @@ const runtime = (
 		readonly state?: State.Options;
 		readonly plugins?: ReadonlyArray<Plugin>;
 		readonly settings?: Info;
+		/** Runs as each turn's snapshot loads settings: after the loop checks for pending input, before it promotes. */
+		readonly beforeSettings?: { run: Effect.Effect<void> };
 	} = {},
 ) => {
 	const database = Database.layer(":memory:");
@@ -59,7 +63,12 @@ const runtime = (
 		),
 		Layer.provideMerge(SessionRuntime.layer),
 		Layer.provideMerge(
-			Layer.succeed(Settings.Service, { load: () => Effect.succeed(options.settings ?? Settings.defaults) }),
+			Layer.succeed(Settings.Service, {
+				load: () =>
+					Effect.suspend(() => options.beforeSettings?.run ?? Effect.void).pipe(
+						Effect.as(options.settings ?? Settings.defaults),
+					),
+			}),
 		),
 		Layer.provideMerge(sandbox),
 		Layer.provideMerge(Context.layer),
@@ -358,7 +367,7 @@ describe("runner loop — crash healing", () => {
 				sessionId,
 				context: { messages: [] },
 				provider: "openai",
-				model: "gpt-5.5",
+				model: "gpt-6-luna",
 			};
 			const draft = assistant(input, 99, { parts: [] });
 			yield* events.publish(EventList.LLMStarted, {
@@ -795,3 +804,524 @@ describe("runner loop — retry", () => {
 		}
 	});
 });
+
+/**
+ * A provider that follows a script, one step per request: "fail" fails it the way a provider does,
+ * "hang" streams until the run is interrupted; past the script every request answers. `during`
+ * runs at the start of the next request, while the run is still working.
+ */
+const scriptedProvider = () => {
+	const contexts: Message.Context[] = [];
+	/** What each provider request does, in order; past the end every request answers. */
+	const script: Array<"answer" | "fail" | "hang"> = [];
+	/** Runs at the start of the next request, while the run is still working. */
+	const during = { run: Effect.void as Effect.Effect<void> };
+	const answer = immediateOpen(contexts);
+	const open: LLM.Open = (input, signal) => {
+		const step = script.shift();
+		const hook = during.run;
+		during.run = Effect.void;
+		if (step === undefined || step === "answer") return Effect.andThen(hook, answer(input, signal));
+		return Effect.andThen(
+			hook,
+			Effect.sync(() => {
+				contexts.push(input.context);
+				const events = createAssistantMessageEventStream();
+				if (step === "fail") {
+					const failed = Object.assign(
+						assistant(input, 0, { stopReason: "error", errorMessage: "provider failed" }),
+						{
+							failure: {
+								_tag: "Authentication",
+								reason: "missing",
+								message: "provider failed",
+								retryable: false,
+							} as const,
+						},
+					);
+					events.push({ type: "start", partial: failed });
+					events.push({ type: "error", reason: "error", error: failed });
+					return events;
+				}
+				// Streams until the run is interrupted.
+				const partial = assistant(input, 0, { parts: [{ type: "text", text: "partial" }] });
+				events.push({ type: "start", partial });
+				events.push({ type: "text.delta", partIndex: 0, delta: "partial", partial });
+				const abort = () =>
+					events.push({
+						type: "error",
+						reason: "aborted",
+						error: assistant(input, 0, { stopReason: "aborted", errorMessage: "Request was aborted" }),
+					});
+				if (signal.aborted) abort();
+				else signal.addEventListener("abort", abort, { once: true });
+				return events;
+			}),
+		);
+	};
+	const reset = Effect.sync(() => {
+		contexts.length = 0;
+		script.length = 0;
+		during.run = Effect.void;
+	});
+	return { contexts, script, during, open, reset };
+};
+
+const texts = (context: Message.Context) =>
+	context.messages.flatMap((message) =>
+		message.role === "user" ? message.parts.flatMap((part) => (part.type === "text" ? [part.text] : [])) : [],
+	);
+
+/** A user prompt as a client sends one: admitted, then the session woken. */
+const send = (sessionId: SessionSchema.ID, id: string, delivery: "steer" | "followUp" = "steer") =>
+	Effect.gen(function* () {
+		const control = yield* Control.Service;
+		yield* control.prompt({
+			sessionId,
+			id: SessionMessageSchema.ID.make(id),
+			prompt: PromptSchema.Prompt.fromText(id),
+			delivery,
+		});
+	});
+
+const settle = (sessionId: SessionSchema.ID) =>
+	Effect.gen(function* () {
+		const execution = yield* RunnerExecution.Service;
+		yield* execution.awaitIdle(sessionId);
+	});
+
+/** The busy periods' outcomes, in order. */
+const outcomes = Effect.gen(function* () {
+	const events = yield* Event.Service;
+	const seen: string[] = [];
+	yield* events.listen((event) =>
+		Effect.sync(() => {
+			if (event.type === EventList.ExecutionSucceeded.type) seen.push("succeeded");
+			if (event.type === EventList.ExecutionFailed.type) seen.push("failed");
+			if (event.type === EventList.ExecutionInterrupted.type) seen.push("interrupted");
+		}),
+	);
+	return seen;
+});
+
+describe("runner loop — queued input", () => {
+	const provider = scriptedProvider();
+	const { contexts, script, during } = provider;
+	const beforeSettings = { run: Effect.void as Effect.Effect<void> };
+	const { effect: it } = testEffect(runtime({ open: provider.open, beforeSettings }));
+
+	const reset = provider.reset.pipe(
+		Effect.andThen(
+			Effect.sync(() => {
+				beforeSettings.run = Effect.void;
+			}),
+		),
+	);
+
+	/** Cancels `id` the first time a turn loads settings: inside the window between the pending check and promotion. */
+	const cancelBeforePromotion = Effect.fnUntraced(function* (sessionId: SessionSchema.ID, id: string) {
+		const services = yield* Effect.context<SqlClient.SqlClient | Event.Service>();
+		beforeSettings.run = Effect.gen(function* () {
+			beforeSettings.run = Effect.void;
+			const inputs = yield* SessionInput.make;
+			yield* inputs.cancel(sessionId, SessionMessageSchema.ID.make(id));
+		}).pipe(Effect.provideContext(services));
+	});
+
+	it(
+		"asks the model nothing when the only pending prompt is cancelled before promotion",
+		Effect.gen(function* () {
+			yield* reset;
+			const sessions = yield* Session.Service;
+			const inputs = yield* SessionInput.make;
+			const seen = yield* outcomes;
+			const sessionId = yield* seedSession();
+			yield* admit({ id: "msg_withdrawn", sessionId, delivery: "steer" });
+			yield* cancelBeforePromotion(sessionId, "msg_withdrawn");
+
+			// A wake, as a prompt sends: a forced resume would answer regardless.
+			const execution = yield* RunnerExecution.Service;
+			yield* execution.wake(sessionId);
+			yield* settle(sessionId);
+
+			expect(seen).toEqual(["succeeded"]);
+			expect(
+				Option.getOrThrow(yield* inputs.find(SessionMessageSchema.ID.make("msg_withdrawn"))).cancelledSeq,
+			).toBeDefined();
+			expect(contexts).toEqual([]);
+			expect(yield* sessions.path(sessionId)).toEqual([]);
+		}),
+	);
+
+	it(
+		"still runs a queued follow-up when the steer that started the run is cancelled before promotion",
+		Effect.gen(function* () {
+			yield* reset;
+			const seen = yield* outcomes;
+			const sessionId = yield* seedSession();
+			yield* send(sessionId, "A");
+			yield* settle(sessionId);
+
+			yield* admit({ id: "B", sessionId, delivery: "followUp" });
+			yield* admit({ id: "S", sessionId, delivery: "steer" });
+			yield* cancelBeforePromotion(sessionId, "S");
+			const execution = yield* RunnerExecution.Service;
+			yield* execution.wake(sessionId);
+			yield* settle(sessionId);
+
+			expect(seen).toEqual(["succeeded", "succeeded"]);
+			expect(contexts.map(texts)).toEqual([["A"], ["A", "B"]]);
+		}),
+	);
+
+	// A prompt's wake survives the failure, so what was sent while the run failed goes out after it.
+	it(
+		"runs prompts sent while a run fails right after it, steers first",
+		Effect.gen(function* () {
+			yield* reset;
+			const seen = yield* outcomes;
+			const sessionId = yield* seedSession();
+			const services = yield* Effect.context<Control.Service>();
+			script.push("fail");
+			during.run = Effect.all([send(sessionId, "F1", "followUp"), send(sessionId, "S1")]).pipe(
+				Effect.asVoid,
+				Effect.orDie,
+				Effect.provideContext(services),
+			);
+
+			yield* send(sessionId, "A");
+			yield* settle(sessionId);
+
+			expect(seen).toEqual(["failed", "succeeded"]);
+			expect(contexts.map(texts)).toEqual([["A"], ["A", "S1"], ["A", "S1", "F1"]]);
+		}),
+	);
+
+	// A stop claims the wakes of what was sent during the run: it stays queued, and the next prompt
+	// places it, steers with that prompt and follow-ups after.
+	it(
+		"keeps prompts sent before a stop queued until the next prompt places them",
+		Effect.gen(function* () {
+			yield* reset;
+			const events = yield* Event.Service;
+			const execution = yield* RunnerExecution.Service;
+			const seen = yield* outcomes;
+			const sessionId = yield* seedSession();
+			script.push("hang");
+			const streaming = yield* Deferred.make<void>();
+			yield* events.listen((event) =>
+				event.type === "session.llm.text.delta"
+					? Deferred.succeed(streaming, undefined).pipe(Effect.asVoid)
+					: Effect.void,
+			);
+
+			yield* send(sessionId, "A");
+			yield* Deferred.await(streaming);
+			yield* send(sessionId, "S1");
+			yield* send(sessionId, "F1", "followUp");
+			yield* execution.interrupt(sessionId, "user", { awaitSettlement: true });
+			yield* settle(sessionId);
+
+			expect(seen).toEqual(["interrupted"]);
+			expect((yield* delivered(sessionId)).map((row) => [row.id, row.promotedSeq !== null])).toEqual([
+				["A", true],
+				["S1", false],
+				["F1", false],
+			]);
+
+			yield* send(sessionId, "N");
+			yield* settle(sessionId);
+
+			expect(seen).toEqual(["interrupted", "succeeded"]);
+			expect(contexts.map(texts).slice(1)).toEqual([
+				["A", "S1", "N"],
+				["A", "S1", "N", "F1"],
+			]);
+		}),
+	);
+});
+
+describe("runner loop — resume after restart", () => {
+	const provider = scriptedProvider();
+	const { contexts, script } = provider;
+	const { effect: it } = testEffect(runtime({ open: provider.open }));
+
+	const stateOf = (sessionId: SessionSchema.ID) =>
+		Effect.gen(function* () {
+			const sql = yield* SqlClient.SqlClient;
+			const [row] = yield* sql<{ execution: string | null; restarts: number }>`
+				SELECT execution, restarts FROM session WHERE id = ${sessionId}
+			`;
+			return row;
+		});
+
+	/** The session's state each time a run starts, as it starts. */
+	const atEachStart = (sessionId: SessionSchema.ID) =>
+		Effect.gen(function* () {
+			const events = yield* Event.Service;
+			const sql = yield* SqlClient.SqlClient;
+			const seen: Array<{ execution: string | null; restarts: number } | undefined> = [];
+			yield* events.listen((event) =>
+				Schema.is(EventList.ExecutionStarted)(event) && event.data.sessionId === sessionId
+					? stateOf(sessionId).pipe(
+							Effect.map((state) => {
+								seen.push(state);
+							}),
+							Effect.orDie,
+							Effect.provideService(SqlClient.SqlClient, sql),
+						)
+					: Effect.void,
+			);
+			return seen;
+		});
+
+	/** Resolves once a request that streams until stopped is streaming. */
+	const hanging = Effect.gen(function* () {
+		const events = yield* Event.Service;
+		const streaming = yield* Deferred.make<void>();
+		yield* events.listen((event) =>
+			Schema.is(EventList.LLMTextDelta)(event) && event.data.delta === "partial"
+				? Deferred.succeed(streaming, undefined).pipe(Effect.asVoid)
+				: Effect.void,
+		);
+		return Deferred.await(streaming);
+	});
+
+	/**
+	 * What a process that died mid-reply leaves: the prompt in the conversation, the reply it was
+	 * streaming still a draft, and the run still marked running.
+	 */
+	const crashedMidReply = Effect.fnUntraced(function* (sessionId: SessionSchema.ID, id: string) {
+		const events = yield* Event.Service;
+		const sessions = yield* Session.Service;
+		const inputs = yield* SessionInput.make;
+		yield* admit({ id, sessionId, delivery: "steer" });
+		yield* inputs.promoteSteers(sessionId, Number.MAX_SAFE_INTEGER);
+		const input: LLM.Input = {
+			resolvedModel: yield* LLM.resolve({ provider: "openai", model: "gpt-4o-mini" }),
+			sessionId,
+			context: { messages: [] },
+			provider: "openai",
+			model: "gpt-6-luna",
+		};
+		const draft = assistant(input, 99, { parts: [{ type: "text", text: "half a reply" }] });
+		yield* events.publish(EventList.LLMStarted, {
+			timestamp: DateTime.makeUnsafe(1),
+			sessionId,
+			messageId: SessionMessageSchema.ID.from(draft.messageId),
+			message: draft,
+		});
+		yield* sessions.markRunning(sessionId);
+	});
+
+	it(
+		"does not resume a run the user stopped",
+		Effect.gen(function* () {
+			yield* provider.reset;
+			const control = yield* Control.Service;
+			const execution = yield* RunnerExecution.Service;
+			const seen = yield* outcomes;
+			const sessionId = yield* seedSession();
+			const streaming = yield* hanging;
+			script.push("hang");
+			yield* send(sessionId, "A");
+			yield* streaming;
+			yield* send(sessionId, "S1");
+			yield* execution.interrupt(sessionId, "user", { awaitSettlement: true });
+			yield* settle(sessionId);
+
+			// The stop is the user's: what was queued behind it stays queued, unmarked.
+			expect(yield* stateOf(sessionId)).toEqual({ execution: null, restarts: 0 });
+			yield* control.resumeUnfinished;
+
+			expect(seen).toEqual(["interrupted"]);
+			expect(contexts.map(texts)).toEqual([["A"]]);
+			expect((yield* delivered(sessionId)).map((row) => [row.id, row.promotedSeq !== null])).toEqual([
+				["A", true],
+				["S1", false],
+			]);
+		}),
+	);
+
+	// A shutdown is no crash: the run resumes uncounted, and what was queued behind it runs too.
+	it(
+		"resumes a run a shutdown closed without counting a restart, and runs its queue",
+		Effect.gen(function* () {
+			yield* provider.reset;
+			const control = yield* Control.Service;
+			const execution = yield* RunnerExecution.Service;
+			const seen = yield* outcomes;
+			const sessionId = yield* seedSession();
+			const streaming = yield* hanging;
+			script.push("hang");
+			yield* send(sessionId, "A");
+			yield* streaming;
+			yield* send(sessionId, "S1");
+			yield* send(sessionId, "F1", "followUp");
+			yield* execution.interrupt(sessionId, "shutdown", { awaitSettlement: true });
+			yield* settle(sessionId);
+
+			expect(yield* stateOf(sessionId)).toEqual({ execution: "closed", restarts: 0 });
+			const atStart = yield* atEachStart(sessionId);
+			yield* control.resumeUnfinished;
+
+			expect(atStart).toEqual([{ execution: "running", restarts: 0 }]);
+			expect(seen).toEqual(["interrupted", "succeeded"]);
+			expect(contexts.map(texts).slice(1)).toEqual([
+				["A", "S1"],
+				["A", "S1", "F1"],
+			]);
+			expect(yield* stateOf(sessionId)).toEqual({ execution: null, restarts: 0 });
+		}),
+	);
+
+	// Pi resends the cut-off request as it was; a follow-up queued behind it waits for the answer.
+	it(
+		"answers the reply a shutdown cut off before a queued follow-up goes in",
+		Effect.gen(function* () {
+			yield* provider.reset;
+			const control = yield* Control.Service;
+			const execution = yield* RunnerExecution.Service;
+			const sessionId = yield* seedSession();
+			const streaming = yield* hanging;
+			script.push("hang");
+			yield* send(sessionId, "A");
+			yield* streaming;
+			yield* send(sessionId, "B", "followUp");
+			yield* execution.interrupt(sessionId, "shutdown", { awaitSettlement: true });
+			yield* settle(sessionId);
+
+			yield* control.resumeUnfinished;
+
+			expect(contexts.map(texts).slice(1)).toEqual([["A"], ["A", "B"]]);
+		}),
+	);
+
+	it(
+		"resumes a run a crash cut off, counting one restart, and answers the prompt again",
+		Effect.gen(function* () {
+			yield* provider.reset;
+			const control = yield* Control.Service;
+			const sessions = yield* Session.Service;
+			const sessionId = yield* seedSession();
+			yield* crashedMidReply(sessionId, "A");
+			const atStart = yield* atEachStart(sessionId);
+
+			yield* control.resumeUnfinished;
+
+			expect(atStart).toEqual([{ execution: "running", restarts: 1 }]);
+			expect(contexts.map(texts)).toEqual([["A"]]);
+			const path = yield* sessions.path(sessionId);
+			expect(path.map((entry) => [entry.entry.type, entry.entry.state])).toEqual([
+				["user", "committed"],
+				["assistant", "aborted"],
+				["assistant", "committed"],
+			]);
+			expect(yield* stateOf(sessionId)).toEqual({ execution: null, restarts: 0 });
+		}),
+	);
+
+	// Recovery chose the session, then the user ran and stopped it: the stop cleared the mark, and the
+	// recovered run must find nothing to resume rather than force another turn.
+	it(
+		"runs nothing when a session recovery chose was stopped before its run began",
+		Effect.gen(function* () {
+			yield* provider.reset;
+			const sessions = yield* Session.Service;
+			const execution = yield* RunnerExecution.Service;
+			const sessionId = yield* seedSession();
+			yield* crashedMidReply(sessionId, "A");
+			yield* sessions.endExecution(sessionId, "stopped");
+
+			yield* execution.recover(sessionId);
+
+			expect(contexts).toEqual([]);
+			expect(yield* stateOf(sessionId)).toEqual({ execution: null, restarts: 0 });
+		}),
+	);
+
+	it(
+		"parks a session at the restart limit, and its next prompt runs it again",
+		Effect.gen(function* () {
+			yield* provider.reset;
+			const control = yield* Control.Service;
+			const sql = yield* SqlClient.SqlClient;
+			const sessionId = yield* seedSession();
+			yield* crashedMidReply(sessionId, "A");
+			yield* sql`UPDATE session SET restarts = ${Control.RESTART_LIMIT - 1} WHERE id = ${sessionId}`;
+
+			yield* control.resumeUnfinished;
+
+			expect(contexts).toEqual([]);
+			expect(yield* stateOf(sessionId)).toEqual({ execution: "running", restarts: Control.RESTART_LIMIT });
+			expect((yield* (yield* SessionApi.get(sessionId).pipe(Effect.map(Option.getOrThrow))).info).parked).toBe(true);
+
+			yield* send(sessionId, "B");
+			yield* settle(sessionId);
+
+			expect(contexts.map(texts)).toEqual([["A", "B"]]);
+			expect(yield* stateOf(sessionId)).toEqual({ execution: null, restarts: 0 });
+			expect((yield* (yield* SessionApi.get(sessionId).pipe(Effect.map(Option.getOrThrow))).info).parked).toBe(
+				false,
+			);
+		}),
+	);
+
+	// A run that makes progress has not crash-looped, so its count starts over mid-run.
+	it(
+		"starts the restart count over once a turn commits, while the run goes on",
+		Effect.gen(function* () {
+			yield* provider.reset;
+			const sql = yield* SqlClient.SqlClient;
+			const execution = yield* RunnerExecution.Service;
+			const sessionId = yield* seedSession();
+			yield* sql`UPDATE session SET restarts = 3 WHERE id = ${sessionId}`;
+			const streaming = yield* hanging;
+			const services = yield* Effect.context<Control.Service>();
+			script.push("answer", "hang");
+			provider.during.run = send(sessionId, "S").pipe(Effect.orDie, Effect.provideContext(services));
+
+			yield* send(sessionId, "A");
+			yield* streaming;
+
+			expect(yield* stateOf(sessionId)).toEqual({ execution: "running", restarts: 0 });
+			yield* execution.interrupt(sessionId, "user", { awaitSettlement: true });
+		}),
+	);
+});
+
+describe("runner loop — cancel and unfinished replies", () => {
+	const provider = scriptedProvider();
+	const { effect: it } = testEffect(runtime({ open: provider.open }));
+
+	// A shutdown cut off the reply to A while B waited. Cancelling B must not drop A's unfinished
+	// reply: the session stays marked for the next start.
+	it(
+		"keeps a session marked when cancelling the last queued prompt leaves a reply cut off",
+		Effect.gen(function* () {
+			yield* provider.reset;
+			const control = yield* Control.Service;
+			const execution = yield* RunnerExecution.Service;
+			const events = yield* Event.Service;
+			const sql = yield* SqlClient.SqlClient;
+			const sessionId = yield* seedSession();
+			const streaming = yield* Deferred.make<void>();
+			yield* events.listen((event) =>
+				Schema.is(EventList.LLMTextDelta)(event) && event.data.delta === "partial"
+					? Deferred.succeed(streaming, undefined).pipe(Effect.asVoid)
+					: Effect.void,
+			);
+			provider.script.push("hang");
+			yield* send(sessionId, "A");
+			yield* Deferred.await(streaming);
+			yield* send(sessionId, "B", "followUp");
+			yield* execution.interrupt(sessionId, "shutdown", { awaitSettlement: true });
+			yield* settle(sessionId);
+
+			yield* control.cancel(sessionId, SessionMessageSchema.ID.make("B"));
+
+			const [row] = yield* sql<{ execution: string | null }>`SELECT execution FROM session WHERE id = ${sessionId}`;
+			expect(row?.execution).toBe("closed");
+		}),
+	);
+});
diff --git a/packages/harness/test/settings.llm.test.ts b/packages/harness/test/settings.llm.test.ts
index 1e174999..119a9a37 100644
--- a/packages/harness/test/settings.llm.test.ts
+++ b/packages/harness/test/settings.llm.test.ts
@@ -76,7 +76,7 @@ describe("settings at the LLM boundary", () => {
 					},
 				);
 			};
-			const model = await llm("openai-codex", "gpt-5.5");
+			const model = await llm("openai-codex", "gpt-6-luna");
 			expect(model).toBeDefined();
 			if (!model) return;
 
diff --git a/packages/harness/test/tools.edit.test.ts b/packages/harness/test/tools.edit.test.ts
index ca8c9f01..bd766def 100644
--- a/packages/harness/test/tools.edit.test.ts
+++ b/packages/harness/test/tools.edit.test.ts
@@ -25,7 +25,7 @@ const sp = " ";
 const gap = Array.from({ length: 600 }, (_, i) => `line ${String(i + 1).padStart(3, "0")}`).join("\n") + "\n";
 
 /**
- * Pi's edit cases, each on its own file: the file before the turn (`null` for
+ * Edit cases, each on its own file: the file before the turn (`null` for
  * none) and the raw arguments of one `edit` call, exactly as a model sent them.
  */
 const cases: ReadonlyArray<{ readonly name: string; readonly before: string | null; readonly args: unknown }> = [
@@ -287,7 +287,7 @@ describe("edit plugin through the local harness", () => {
 					throw new Error(`${name} was not settled`);
 				const after = await fs.readFile(join(work, `${name}.txt`), "utf8").catch(() => null);
 				const details = call.result.details as { patch?: string } | undefined;
-				// Pi's own check: the patch turns the file as it was into the file as it is.
+				// The patch turns the file as it was into the file as it is.
 				if (call.status === "completed" && before !== null)
 					expect(applyPatch(before.replace(/^/, "").replace(/\r\n/g, "\n"), details?.patch ?? "")).toBe(
 						after?.replace(/^/, "").replace(/\r\n/g, "\n"),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fd287038..35980607 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,153 +7,153 @@ importers:
     configDependencies: {}
     packageManagerDependencies:
       pnpm:
-        specifier: 12.6.0
-        version: 12.6.0
+        specifier: 12.14.0
+        version: 12.14.0
 
 packages:
 
-  '@pnpm/exe.android-arm64@12.6.0':
-    resolution: {integrity: sha512-kviIHft9h02q+7N2In7tSL9T/HRUSGwYmU74YPtsWU5ee7vgqPyC0JT6RRX6miW+NxX1CvHgQxg69qq1qTLJYQ==}
+  '@pnpm/exe.android-arm64@12.14.0':
+    resolution: {integrity: sha512-+iSh7x21C3A2hqc+Z0ZmbKTcn6YNlzrXM142PsnQH/dLj0DYxFzoBvc6XAnL/yfQ5nnH2ebBiRj/zVxr61fZbQ==}
     cpu: [arm64]
     os: [android]
 
-  '@pnpm/exe.android-x64@12.6.0':
-    resolution: {integrity: sha512-CT8aJKLq2mtZFE71pr4E5Z2xHL8uGnRGr+NclDqsXlVF4SVcQ2QAs14mWi0C8gjT4hbmi+Q0lJRRIkMAWfjjng==}
+  '@pnpm/exe.android-x64@12.14.0':
+    resolution: {integrity: sha512-qT+0LqEr2wBVaxcG2T8cX/R8SSRz2Rvpp8nRR4fh8tnGUZRch87gFmsHUAoSQh7w6j1h0qTjrA384j4xi8frvw==}
     cpu: [x64]
     os: [android]
 
-  '@pnpm/exe.darwin-arm64@12.6.0':
-    resolution: {integrity: sha512-rafpVkjzugKBMxSvGQd5wK1x5eOTkD/+lcJIFHeQhvd+BJ8kDisOOvwhQDrpGd4vd2Fx+hhW0P2Ptt638OlhFg==}
+  '@pnpm/exe.darwin-arm64@12.14.0':
+    resolution: {integrity: sha512-tnrdUB8ecJoehuKKqi1YHCBVl61xtJ9XVGcx5EviC6fWO4DeGI8GtXrjvJxDBM3nuVjJeWistgsUp/N142x4sw==}
     cpu: [arm64]
     os: [darwin]
 
-  '@pnpm/exe.darwin-x64@12.6.0':
-    resolution: {integrity: sha512-72Jpuv1m24gI8zUNcaylYpBWEhBzz1VPhnDIU2GYM2eRP+KsOqVLwV78i+JrihI39zY2NNXmaN4eAKX1inpaDQ==}
+  '@pnpm/exe.darwin-x64@12.14.0':
+    resolution: {integrity: sha512-vlBfGkruqQRsEHTW43cPwpYd7QlbIJ//cvpAdb3bVXkI8SgTPoXhCnc05m+ZNiPrrEkBsX/t7KHw9aXpkzPm3Q==}
     cpu: [x64]
     os: [darwin]
 
-  '@pnpm/exe.freebsd-x64@12.6.0':
-    resolution: {integrity: sha512-LON4QgNy1w/XF4uySZIyC/5hEB0oGdelXsY9tSKqstER+2j2X2oHz67skD11RRd/HWFRtMr64shQZ4I9ZoZ0zg==}
+  '@pnpm/exe.freebsd-x64@12.14.0':
+    resolution: {integrity: sha512-Qg5rxBrGYl6Tfso+EyygPf84fY1Fzy55E/0or+iuYKtnf0vc0MlHJfVIlT7pBukMRntQHRik7hUi0Z4s7AlJsw==}
     cpu: [x64]
     os: [freebsd]
 
-  '@pnpm/exe.linux-arm64-musl@12.6.0':
-    resolution: {integrity: sha512-BdDpX+DeaMUc5x6WNcE6FkmFy36NwrBbBvwsZU737Zt3u1fTY+iKFPchjEQNCM4rT6q6xvF2oN3ZwExGsJCkxQ==}
+  '@pnpm/exe.linux-arm64-musl@12.14.0':
+    resolution: {integrity: sha512-DRIe4yQkXBGA/PhVJdzlbnllxBdAtnMMvTVLLcGpsK5FvJz9kxD2Hyxtn68ovmNkVX06f6p45cQwfm3wx2jn1A==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@pnpm/exe.linux-arm64@12.6.0':
-    resolution: {integrity: sha512-8h2sNoIhHDpHDYqZZCh9PXr6krqW10btb0GHVGuw710muDHlFAHMtUG2ogmaHge6zJG1xgY4Y7mwX5g/LWvrYg==}
+  '@pnpm/exe.linux-arm64@12.14.0':
+    resolution: {integrity: sha512-7joGShZ44Nk3WpNU+60JoOPjCXlgxhJAq11S2UiVtwCUDgTer1yTPPfxGW8pxaD6046actYLIYDbZNlubHWs0A==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@pnpm/exe.linux-ppc64@12.6.0':
-    resolution: {integrity: sha512-ld6xgcEhFCFrsVsJhbmdmR714PnsEspO/Ij8w0/D7OSiz2hYGu3fZd5tKRxOI5m6H6Gl0/RRFAPncTHbsgXVjQ==}
+  '@pnpm/exe.linux-ppc64@12.14.0':
+    resolution: {integrity: sha512-gSoryn7ySdXd//gjgf3MvvA8ZerJayaSbuMZMtAWq4vb2/wlVEgpl0Kvqt54y58TRj533Qjq2txKgnxd4JyoAQ==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@pnpm/exe.linux-riscv64@12.6.0':
-    resolution: {integrity: sha512-HIbImydoC3J8NFt+8MXfhTCf5rO6NjCMyinSAHac0VmV8uCHw+kbQkyAzxV84rzz9ZOzmBOnj0b1N461UIYGsw==}
+  '@pnpm/exe.linux-riscv64@12.14.0':
+    resolution: {integrity: sha512-EMjew1H9WqQ7pL+tYqCPwiuB+0PeCiJRV7fyWeuFw0wwYUajFBjcaPO3IGAVu9sdmJDU+e+HYv/Zey6aKae0Vw==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@pnpm/exe.linux-s390x@12.6.0':
-    resolution: {integrity: sha512-DjSqT7+BZ/lWcDHwNMuzsRVfyxUimh+D54Xw4tSWbdVVQhtWtNMUyI93LVnwCmsoEpar2gC3SFeAgywx37svKQ==}
+  '@pnpm/exe.linux-s390x@12.14.0':
+    resolution: {integrity: sha512-shYOj/SFoXD35fHe0pWr2JofwSXulC0BnEIXLj2QokDi0EF//AfKsui35yKIkTEl+s2VJybc3PO4iJNhKIj5Qw==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@pnpm/exe.linux-x64-musl@12.6.0':
-    resolution: {integrity: sha512-31lKeGPmRE6xfV6I3VjaEGVFRei14pl/zgoFDK4w+UkbJqOuNl2Ht3O1GuqNIg3Gl14qTEb4kZRAYFHXifDx9A==}
+  '@pnpm/exe.linux-x64-musl@12.14.0':
+    resolution: {integrity: sha512-btZiZ2Ot0llKK1ndSfA5i3IRX7/S0VrmzseNH/BJ4c+Cady+S81H6vvU1zByggHMyqQhC8OgxO5PiIY7D9bH0Q==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@pnpm/exe.linux-x64@12.6.0':
-    resolution: {integrity: sha512-qFWBneHJAJ73W4whtbaFOL1M/7DBC6ILHXuxc7ZPtEhfPuT1zeZiGrmKHoMAfJA+mcm6xhOFljqVTUS+00Jabw==}
+  '@pnpm/exe.linux-x64@12.14.0':
+    resolution: {integrity: sha512-F6K8e/jWxiuEYJaQtRRUG9ynBSTEHa+t7Lf86MKuOO5UA7WVVMbi+oB8nY6iKW++ncWS2yG6T9faXZGxqNsfoQ==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@pnpm/exe.win32-arm64@12.6.0':
-    resolution: {integrity: sha512-OhfefXEEykZlslSUhR8PPRe6MVPV3Oink/dVfIecE5velpc7j80cZYsHlaDrtRDcm3TPwQHkaRW1SJ1efX9oFg==}
+  '@pnpm/exe.win32-arm64@12.14.0':
+    resolution: {integrity: sha512-DOjlkVB6TtTKeAAe0hNZXn5S7YqESmo1Z6SGbR4BZNQ4isRg31XVHjX2RFTbY8gnZq68IwzyLmPqlEjMmYxofg==}
     cpu: [arm64]
     os: [win32]
 
-  '@pnpm/exe.win32-x64@12.6.0':
-    resolution: {integrity: sha512-L2tuyrD2+Imgxs3VK/ST/2L3xD6vDP0ktJQxM0TaGw7TbAQEMq+RMc8iK6Ew7Id579uzjJe8jSfJID2ZGsOHCA==}
+  '@pnpm/exe.win32-x64@12.14.0':
+    resolution: {integrity: sha512-/LSX6mew/sLf08XqcjemuklNKf1K/Ftpgj4//hK/HKzI2dKbmxDB27a/2OaQ5a0O3/3OFzlssXDziZsi+yVBwQ==}
     cpu: [x64]
     os: [win32]
 
-  pnpm@12.6.0:
-    resolution: {integrity: sha512-PvaPlRyxEawgS0paFvCy3fDaVqluBBPoHYVdnwtV75JnFHCQKOHNAMQFwsX7e56OxNxGd3yAXQNzwvL/AP0g7A==}
+  pnpm@12.14.0:
+    resolution: {integrity: sha512-wYum2HmT09Fky16JSPMrLAbuhUSH4GzY2GeBNC+z5btGNDZwNHEehoArqpw3vqkGzhkprQjXCITJfYAd8TOJpg==}
     engines: {node: '>=18.*'}
     hasBin: true
 
 snapshots:
 
-  '@pnpm/exe.android-arm64@12.6.0':
+  '@pnpm/exe.android-arm64@12.14.0':
     optional: true
 
-  '@pnpm/exe.android-x64@12.6.0':
+  '@pnpm/exe.android-x64@12.14.0':
     optional: true
 
-  '@pnpm/exe.darwin-arm64@12.6.0':
+  '@pnpm/exe.darwin-arm64@12.14.0':
     optional: true
 
-  '@pnpm/exe.darwin-x64@12.6.0':
+  '@pnpm/exe.darwin-x64@12.14.0':
     optional: true
 
-  '@pnpm/exe.freebsd-x64@12.6.0':
+  '@pnpm/exe.freebsd-x64@12.14.0':
     optional: true
 
-  '@pnpm/exe.linux-arm64-musl@12.6.0':
+  '@pnpm/exe.linux-arm64-musl@12.14.0':
     optional: true
 
-  '@pnpm/exe.linux-arm64@12.6.0':
+  '@pnpm/exe.linux-arm64@12.14.0':
     optional: true
 
-  '@pnpm/exe.linux-ppc64@12.6.0':
+  '@pnpm/exe.linux-ppc64@12.14.0':
     optional: true
 
-  '@pnpm/exe.linux-riscv64@12.6.0':
+  '@pnpm/exe.linux-riscv64@12.14.0':
     optional: true
 
-  '@pnpm/exe.linux-s390x@12.6.0':
+  '@pnpm/exe.linux-s390x@12.14.0':
     optional: true
 
-  '@pnpm/exe.linux-x64-musl@12.6.0':
+  '@pnpm/exe.linux-x64-musl@12.14.0':
     optional: true
 
-  '@pnpm/exe.linux-x64@12.6.0':
+  '@pnpm/exe.linux-x64@12.14.0':
     optional: true
 
-  '@pnpm/exe.win32-arm64@12.6.0':
+  '@pnpm/exe.win32-arm64@12.14.0':
     optional: true
 
-  '@pnpm/exe.win32-x64@12.6.0':
+  '@pnpm/exe.win32-x64@12.14.0':
     optional: true
 
-  pnpm@12.6.0:
+  pnpm@12.14.0:
     optionalDependencies:
-      '@pnpm/exe.android-arm64': 12.6.0
-      '@pnpm/exe.android-x64': 12.6.0
-      '@pnpm/exe.darwin-arm64': 12.6.0
-      '@pnpm/exe.darwin-x64': 12.6.0
-      '@pnpm/exe.freebsd-x64': 12.6.0
-      '@pnpm/exe.linux-arm64': 12.6.0
-      '@pnpm/exe.linux-arm64-musl': 12.6.0
-      '@pnpm/exe.linux-ppc64': 12.6.0
-      '@pnpm/exe.linux-riscv64': 12.6.0
-      '@pnpm/exe.linux-s390x': 12.6.0
-      '@pnpm/exe.linux-x64': 12.6.0
-      '@pnpm/exe.linux-x64-musl': 12.6.0
-      '@pnpm/exe.win32-arm64': 12.6.0
-      '@pnpm/exe.win32-x64': 12.6.0
+      '@pnpm/exe.android-arm64': 12.14.0
+      '@pnpm/exe.android-x64': 12.14.0
+      '@pnpm/exe.darwin-arm64': 12.14.0
+      '@pnpm/exe.darwin-x64': 12.14.0
+      '@pnpm/exe.freebsd-x64': 12.14.0
+      '@pnpm/exe.linux-arm64': 12.14.0
+      '@pnpm/exe.linux-arm64-musl': 12.14.0
+      '@pnpm/exe.linux-ppc64': 12.14.0
+      '@pnpm/exe.linux-riscv64': 12.14.0
+      '@pnpm/exe.linux-s390x': 12.14.0
+      '@pnpm/exe.linux-x64': 12.14.0
+      '@pnpm/exe.linux-x64-musl': 12.14.0
+      '@pnpm/exe.win32-arm64': 12.14.0
+      '@pnpm/exe.win32-x64': 12.14.0
 
 ---
 lockfileVersion: '9.0'
@@ -202,9 +202,15 @@ importers:
       '@effect/tsgo':
         specifier: 'catalog:'
         version: 0.45.0
+      '@shadcn/lint':
+        specifier: 0.1.5
+        version: 0.1.5
       '@types/node':
         specifier: 'catalog:'
         version: 26.6.5
+      eslint-plugin-better-tailwindcss:
+        specifier: 4.10.0
+        version: 4.10.0(oxlint@1.81.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.1(@opentelemetry/api@1.9.1)(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.15)(typescript@7.0.2)(yaml@2.9.1)))(tailwindcss@4.3.3)(typescript@7.0.2)
       typescript:
         specifier: 'catalog:'
         version: 7.0.2
@@ -1414,6 +1420,9 @@ packages:
     peerDependencies:
       effect: ^4.0.0
 
+  '@dual-bundle/import-meta-resolve@4.2.1':
+    resolution: {integrity: sha512-id+7YRUgoUX6CgV0DtuhirQWodeeA7Lf4i2x71JS/vtA5pRb/hIGWlw+G6MeXvsM+MXrz0VAydTGElX1rAfgPg==}
+
   '@effect/atom-react@4.0.5':
     resolution: {integrity: sha512-tqTSiy0rWBitej7kPfvTSw29q4ipof52+txDg6bIBJx0ksHVzVXaFTsssDa+AZBeImafK0xmjm9m1XzPfE6k2A==}
     peerDependencies:
@@ -1746,6 +1755,14 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@eslint/core@0.17.0':
+    resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/css-tree@4.1.2':
+    resolution: {integrity: sha512-rVcxLmwSkEL3aWS3vAgsTRrQHoYE1b0XcgDtKHDJ92XOkyUpcbS/g0tUJKhvCtlEhYzgKBWsgDd+Z/aPhd166w==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   '@floating-ui/core@1.8.0':
     resolution: {integrity: sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ==}
 
@@ -2491,6 +2508,128 @@ packages:
   '@oslojs/encoding@1.1.0':
     resolution: {integrity: sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==}
 
+  '@oxc-parser/binding-android-arm-eabi@0.148.0':
+    resolution: {integrity: sha512-pHASv9g5pASxb7akHERZNSkrEqPhFaUix98o7d9hbTpolnnFWl7UiRrcMhCsV1+iVO4/cJwKsbKRJTFNs2tdBQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [android]
+
+  '@oxc-parser/binding-android-arm64@0.148.0':
+    resolution: {integrity: sha512-sg/6Ez0KdAygsu0POELux9wN1Po2CP93WY8eNl4DBKIGprsd4QSHBXOb471Pu9i2OCD5sLkISSb2agZEhVn2Zw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
+  '@oxc-parser/binding-darwin-arm64@0.148.0':
+    resolution: {integrity: sha512-yiSJmzGUvCUaJT8X3j40gVcX+ckuHQMuiOtF8DvzTs5+JtB/7XuHFPp4M+vv5u+HlBtDUd4Ks5pyHpWz8mfnkg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@oxc-parser/binding-darwin-x64@0.148.0':
+    resolution: {integrity: sha512-6ZeklaamrMy4H2JmhvcJg6iip59tYILtuLaILxyAHT3l5FDxnI5ihVievAft5ZmAbqtlWHErOi1OpJK8gy1wcA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@oxc-parser/binding-freebsd-x64@0.148.0':
+    resolution: {integrity: sha512-vFsPx+a/qFECPnz/H8nC6x6MDvnWscLTCo/5muojEF54ERUq1kdgbvnWo95YnkhjF9sTIcG/uDxQBh1gffaufQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.148.0':
+    resolution: {integrity: sha512-eOr3M+6iGbbxNL4PSS0VtsyQ2eOUxSBh00BqO22SbolDimPSYsBuLr/LCrZBkiqW2BoabhR6V4R8jrRAay7hjg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxc-parser/binding-linux-arm-musleabihf@0.148.0':
+    resolution: {integrity: sha512-58ZKDw0mQRbCNfrd2IDyV4o8T7enzGERJn41BH2tjrZVGyiKiFzcfDicuB7Zcpb/1xIOrObovr8Dja6lZi8dLw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxc-parser/binding-linux-arm64-gnu@0.148.0':
+    resolution: {integrity: sha512-Fnu95O4eZ5i++GPvIzBEZ8y4ddTLR+D9paYa8JRaRk6ZK7nHQiWP5xtrhcPQsXqgat1d7sU/d5rbbI0p1FTHSQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@oxc-parser/binding-linux-arm64-musl@0.148.0':
+    resolution: {integrity: sha512-3CQy/BMdx7N7H3qrcPxUL+a2CwUZodUcf6oq8iJuNZ9C6Ol1aq3mcWzsgySJ7CHFLvpX21ZDPp1r1X0QLbu/AQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@oxc-parser/binding-linux-ppc64-gnu@0.148.0':
+    resolution: {integrity: sha512-9LkaYvfiF8hMOw900csAvkf1oxE8XlmMeGowu5BcastSSwV8mKvKRMNU7HsV+ycyj1dQD8pX5qgOw8ja6SJacg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@oxc-parser/binding-linux-riscv64-gnu@0.148.0':
+    resolution: {integrity: sha512-2GBiM9h26dR4WJfhoMvnFMnFLf7m/kYs4UMqjvrOfQG4BV1nuTJDH22Zc2MQr3INZF7nSKYQ6xlhD3hQ7A6gug==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@oxc-parser/binding-linux-riscv64-musl@0.148.0':
+    resolution: {integrity: sha512-uPqZexvKJmEgq4mAu36qe2xTfXZE7oyik1R7KtZ5tl8qKlq1U1fIqTFRUEBZqRGvforoTrGIpatRzcoPKO66RA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [musl]
+
+  '@oxc-parser/binding-linux-s390x-gnu@0.148.0':
+    resolution: {integrity: sha512-9oUHvnTbp7ZraFsTC8PN6XhdhPSSxZumYvixWl7Smi353gEULvK6yV0sXNVrdFMHQeaDKFCi8TgDhNK7/A+Y+Q==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@oxc-parser/binding-linux-x64-gnu@0.148.0':
+    resolution: {integrity: sha512-2qhDSJwKzbSZzF7lDqqk8sr/yXsmwr3PeUa4/nazIF+zFAYz1gVPEfC34GQtGxzJUUmklaYAL63368LEfrMeyw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@oxc-parser/binding-linux-x64-musl@0.148.0':
+    resolution: {integrity: sha512-qQoPDZUFV0bh9xA09XydmkjMBpgc1ukJuhMvzQ9QeVmFaHTS9W5TE5CoLmSl3QQyUP9OuHO3x/WPZTIIZPWR3Q==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@oxc-parser/binding-openharmony-arm64@0.148.0':
+    resolution: {integrity: sha512-1UGbaQWEXUCLqAmaR5kwRDjx/R4S5LQKZkM9CHmaHkuKhriOF32aRLfS0jCRNE2yGQJLMEA1z9UucbBVqjXnDw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@oxc-parser/binding-win32-arm64-msvc@0.148.0':
+    resolution: {integrity: sha512-pWKdzRDNG2+NK4h/V6U/CYERcfYD6u28h5IB/VJVsrZaD3muvE58tUj22lieL5vLZ+XFi1GPv9YXckZbJZ9BLA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@oxc-parser/binding-win32-ia32-msvc@0.148.0':
+    resolution: {integrity: sha512-i3p4x+mvwtjcE1J5HM6V7ggsbXiznExN/4MkNyOy3dfXrVV3bnkSfmZxvo6/84qCVX4ShkpNE1SKt9biIF31GQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@oxc-parser/binding-win32-x64-msvc@0.148.0':
+    resolution: {integrity: sha512-Ye6vB7VQulghWYkYkECOBYFRVEizz4XyRTUAv+t8BuyurhKU7uD0P9eowL+mKG5Mf8MSYx+DI3Cm8SKZvYG7bQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
   '@oxc-project/runtime@0.148.0':
     resolution: {integrity: sha512-0ExYgJZv8+nFuoV0T/xzX5ZyXFXwkHJFJg9LWTwhqgRLpe+IzBLirvyYKSdS8mPofTBKAjDYIA2o84xh5BHXew==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -2823,6 +2962,10 @@ packages:
       react: ^18.3.1 || ^19.0.0
       react-dom: ^18.3.1 || ^19.0.0
 
+  '@pkgr/core@0.3.6':
+    resolution: {integrity: sha512-SEeaJLb3qBNF/OaXnaR1NmmBbFYk1zC0ZH/52fATcRPLFg/p791YrcyFFy44Bo9sLaGuSuLp5Q6axbb/O+v/RA==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+
   '@platformatic/vfs@0.4.1':
     resolution: {integrity: sha512-y8WuXiV77ovmAnFhdXLQPJyg/2yde1yJLzOmsnjJTs9ZFGJel81exqgID52NozjyGwaxizTN1nZWIW3Rxw1Tlw==}
     engines: {node: '>= 22'}
@@ -3809,6 +3952,18 @@ packages:
   '@rolldown/pluginutils@1.0.1':
     resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==}
 
+  '@shadcn/lint@0.1.5':
+    resolution: {integrity: sha512-EkKJfJqSrx8lHgsxw9m304//l2cc/bHLH1vjZz1KwPBEv5uU+TQY1UHuzs03+/FiydNtAb5NX9sW4VrV/udNfQ==}
+    engines: {node: '>=20.19'}
+    peerDependencies:
+      '@typescript-eslint/parser': '>=8.40.0'
+      eslint: '>=9.30.0'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+
   '@shikijs/core@4.4.3':
     resolution: {integrity: sha512-QCR4q2ZO/ILJEuwiBMel4wdcTDb1JGwfjKTxPDF6x8ixOaluPrVqIn06C99AcRPhmYlBR56d/Fb+GN58GzExpg==}
     engines: {node: '>=20'}
@@ -4157,6 +4312,9 @@ packages:
   '@types/http-cache-semantics@4.2.0':
     resolution: {integrity: sha512-L3LgimLHXtGkWikKnsPg0/VFx9OGZaC+eN1u4r+OB1XRqH3meBIAVC2zr1WdMH+RHmnRkqliQAOHNJ/E0j/e0Q==}
 
+  '@types/json-schema@7.0.15':
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+
   '@types/keyv@3.1.4':
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
 
@@ -4333,6 +4491,11 @@ packages:
   '@ungap/structured-clone@1.4.0':
     resolution: {integrity: sha512-1mEZtMKPM09vDmQt5y7YvmN2+DFTP7Tg0EWXdic8/C6VRnpb33e4ghisCIE3WZjsE2N8mf+QV1Zqh7ZFYLWInQ==}
 
+  '@valibot/to-json-schema@1.8.0':
+    resolution: {integrity: sha512-a0M+uwCuQZEPAo65NYkFSJ14O5c213KoSZmPdoCfuFvUhfULi4T2Z6Tpjv6lTVMW9RoLm74RpRAjNEa43KcN+g==}
+    peerDependencies:
+      valibot: ^1.5.0
+
   '@vercel/cli-config@0.3.1':
     resolution: {integrity: sha512-sISbygqlFXYb8qfPu/+2Cf/A8IjrlAuZePdag3EDQr2PRA455s7UZtl9Ro674CWsB/saBRmz3jEkw0YsQs8OoQ==}
 
@@ -5215,6 +5378,11 @@ packages:
       react: ^18 || ^19 || ^19.0.0-rc
       react-dom: ^18 || ^19 || ^19.0.0-rc
 
+  cn@0.3.2:
+    resolution: {integrity: sha512-RKzY5Edavc8B2Ka6tjJecKFC4nm0p7lADY72xzICmiJSf4TkaxWXt0fHsib2P2G4FkFyXfSDi9oDtIBuCZvY2g==}
+    engines: {node: '>=20'}
+    hasBin: true
+
   cn@0.4.0:
     resolution: {integrity: sha512-qOAeUhPwPzBxx6jaeQdo646XIKliKHc2j1ZF7Ngb1o0pJZKH5gq8FkA0aVdUdPFUDXNXyUCXpCtoJISo6dhizg==}
     engines: {node: '>=20'}
@@ -5587,6 +5755,19 @@ packages:
     resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
     engines: {node: '>=12'}
 
+  eslint-plugin-better-tailwindcss@4.10.0:
+    resolution: {integrity: sha512-EvcfEScF7N39LXuqX8fDnDsgylhbBZe5bbNb+6oN8ht06ou3MvwfPQ5hVgm2LWIPLOB5LBwNDCY6gBQGW4KHGA==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=23.0.0}
+    peerDependencies:
+      eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0
+      oxlint: ^1.35.0
+      tailwindcss: ^3.3.0 || ^4.1.17
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+      oxlint:
+        optional: true
+
   estree-util-attach-comments@3.0.0:
     resolution: {integrity: sha512-cKUwm/HUcTDsYh/9FgnuFqpfquUbwIqwKM26BVCGDPVgvaCl/nDCCjUfiLlx6lsEZ3Z4RFxNbOQ60pkaEwFxGw==}
 
@@ -6635,6 +6816,9 @@ packages:
   mdn-data@2.27.1:
     resolution: {integrity: sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==}
 
+  mdn-data@2.37.2:
+    resolution: {integrity: sha512-rz9YOBGItdSbe7HcSArUbhiAv4SB/4DKRYg96CSFS2CcIYMbUvBtZlzA1NCbk2AdgbmYwMqwNblLpR441lLeiQ==}
+
   merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
 
@@ -7049,6 +7233,10 @@ packages:
     resolution: {integrity: sha512-wrAwOeXp1RRMFfQY8Sy7VaGVmPocaLwSFOYCGKSyo8qmJ+/yaafCl5BCA1IQZWqFSRBrKDYFeR9d/VyQzfH/jg==}
     engines: {node: '>= 6.0'}
 
+  oxc-parser@0.148.0:
+    resolution: {integrity: sha512-syxUKHeUll89RIABQADcI7sikYrwyssvA6gj4phSSIPezKVM8yMaLAiLLSc7fmzVvrwybfFGFbW5zme9sX87rg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+
   oxfmt@0.66.0:
     resolution: {integrity: sha512-FfvqR8RFtV6JJpRrpkfqyVCQ7HDvZ/VriWFx7veftCgL1B5ZO9qNr+1rvPieycMQnNfVG0PWyJQiy7p0hq1I5w==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -7813,6 +8001,10 @@ packages:
     resolution: {integrity: sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==}
     engines: {node: '>=12'}
 
+  strip-bom@3.0.0:
+    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
+    engines: {node: '>=4'}
+
   strip-final-newline@2.0.0:
     resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
     engines: {node: '>=6'}
@@ -7847,6 +8039,19 @@ packages:
     engines: {node: '>=16'}
     hasBin: true
 
+  synckit@0.12.3:
+    resolution: {integrity: sha512-U+/AXT6LWsxnj2vz9HeUuPWBNgdWxjyIEjEPdbJARC9txmgPzo2VEdqnFo4hHaNyMPtycyVJrSaQYeQv/PoyyA==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+
+  tailwind-csstree@0.3.3:
+    resolution: {integrity: sha512-je9J5UYRsTJqAjYrIBMMlge8T/rreRd44pJxgG5Zx/zeo4kAC/liUKqzztRZrGlYRJLvIf2Cb1DVJMTXSzEShA==}
+    engines: {node: '>=18.18'}
+    peerDependencies:
+      '@eslint/css': '>=1.0.0'
+    peerDependenciesMeta:
+      '@eslint/css':
+        optional: true
+
   tailwind-merge@3.7.0:
     resolution: {integrity: sha512-XPPUyAc+cvspz3lHTcR/QgPfW2A0lv/xQNIjX3HGhLR+Nq2lHaLq5MtTesHn8GUr3W3DguT2KT5x3NVgRtYwmA==}
 
@@ -7945,6 +8150,14 @@ packages:
   truncate-utf8-bytes@1.0.2:
     resolution: {integrity: sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==}
 
+  tsconfig-paths-webpack-plugin@4.2.0:
+    resolution: {integrity: sha512-zbem3rfRS8BgeNK50Zz5SIQgXzLafiHjOwUAvk/38/o1jHn/V5QAgVUcz884or7WYcPaH3N2CIfUc2u0ul7UcA==}
+    engines: {node: '>=10.13.0'}
+
+  tsconfig-paths@4.2.0:
+    resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
+    engines: {node: '>=6'}
+
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
@@ -8236,6 +8449,14 @@ packages:
       typescript:
         optional: true
 
+  valibot@1.5.0:
+    resolution: {integrity: sha512-nil6AkP2TChWL43Z5uJ6GTxX01CUA+g8LWUM+N/rB9NBbkUMaUsi9PUNzlUPgoKASgmx9f7eGOYpJ04/fSa6FQ==}
+    peerDependencies:
+      typescript: '>=5'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
   validate-npm-package-name@8.0.0:
     resolution: {integrity: sha512-SCv6OOV6Xj2/3cXy3dGmADluJTNcL3o7hZAglNPTe+WYuEuvxgJzxPrSDLZhF+CwyQOubqgecjMmTJGMVLWjYQ==}
     engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0}
@@ -9543,6 +9764,8 @@ snapshots:
       '@distilled.cloud/core': 1.0.0-rc.13(effect@4.0.5)
       effect: 4.0.5
 
+  '@dual-bundle/import-meta-resolve@4.2.1': {}
+
   '@effect/atom-react@4.0.5(effect@4.0.5)(react@19.3.1)(scheduler@0.27.0)':
     dependencies:
       effect: 4.0.5
@@ -9854,6 +10077,15 @@ snapshots:
   '@esbuild/win32-x64@0.28.2':
     optional: true
 
+  '@eslint/core@0.17.0':
+    dependencies:
+      '@types/json-schema': 7.0.15
+
+  '@eslint/css-tree@4.1.2':
+    dependencies:
+      mdn-data: 2.37.2
+      source-map-js: 1.2.2
+
   '@floating-ui/core@1.8.0':
     dependencies:
       '@floating-ui/utils': 0.2.12
@@ -10695,6 +10927,63 @@ snapshots:
 
   '@oslojs/encoding@1.1.0': {}
 
+  '@oxc-parser/binding-android-arm-eabi@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-android-arm64@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-darwin-arm64@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-darwin-x64@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-freebsd-x64@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-arm-musleabihf@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-arm64-gnu@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-arm64-musl@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-ppc64-gnu@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-riscv64-gnu@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-riscv64-musl@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-s390x-gnu@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-x64-gnu@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-x64-musl@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-openharmony-arm64@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-win32-arm64-msvc@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-win32-ia32-msvc@0.148.0':
+    optional: true
+
+  '@oxc-parser/binding-win32-x64-msvc@0.148.0':
+    optional: true
+
   '@oxc-project/runtime@0.148.0': {}
 
   '@oxc-project/types@0.146.0': {}
@@ -10878,6 +11167,8 @@ snapshots:
       - '@shikijs/themes'
       - shiki
 
+  '@pkgr/core@0.3.6': {}
+
   '@platformatic/vfs@0.4.1': {}
 
   '@polka/url@1.0.0-next.29': {}
@@ -11831,6 +12122,13 @@ snapshots:
 
   '@rolldown/pluginutils@1.0.1': {}
 
+  '@shadcn/lint@0.1.5':
+    dependencies:
+      '@eslint/core': 0.17.0
+      cn: 0.3.2
+    optionalDependencies:
+      oxc-parser: 0.148.0
+
   '@shikijs/core@4.4.3':
     dependencies:
       '@shikijs/primitive': 4.4.3
@@ -12235,6 +12533,8 @@ snapshots:
 
   '@types/http-cache-semantics@4.2.0': {}
 
+  '@types/json-schema@7.0.15': {}
+
   '@types/keyv@3.1.4':
     dependencies:
       '@types/node': 26.6.5
@@ -12353,6 +12653,10 @@ snapshots:
 
   '@ungap/structured-clone@1.4.0': {}
 
+  '@valibot/to-json-schema@1.8.0(valibot@1.5.0(typescript@7.0.2))':
+    dependencies:
+      valibot: 1.5.0(typescript@7.0.2)
+
   '@vercel/cli-config@0.3.1':
     dependencies:
       xdg-app-paths: 5.1.0
@@ -13321,6 +13625,8 @@ snapshots:
       - '@types/react'
       - '@types/react-dom'
 
+  cn@0.3.2: {}
+
   cn@0.4.0: {}
 
   collapse-white-space@2.1.0: {}
@@ -13715,6 +14021,23 @@ snapshots:
 
   escape-string-regexp@5.0.0: {}
 
+  eslint-plugin-better-tailwindcss@4.10.0(oxlint@1.81.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.1(@opentelemetry/api@1.9.1)(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.15)(typescript@7.0.2)(yaml@2.9.1)))(tailwindcss@4.3.3)(typescript@7.0.2):
+    dependencies:
+      '@eslint/css-tree': 4.1.2
+      '@valibot/to-json-schema': 1.8.0(valibot@1.5.0(typescript@7.0.2))
+      enhanced-resolve: 5.26.0
+      jiti: 2.7.0
+      synckit: 0.12.3
+      tailwind-csstree: 0.3.3
+      tailwindcss: 4.3.3
+      tsconfig-paths-webpack-plugin: 4.2.0
+      valibot: 1.5.0(typescript@7.0.2)
+    optionalDependencies:
+      oxlint: 1.81.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.1(@opentelemetry/api@1.9.1)(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.15)(typescript@7.0.2)(yaml@2.9.1))
+    transitivePeerDependencies:
+      - '@eslint/css'
+      - typescript
+
   estree-util-attach-comments@3.0.0:
     dependencies:
       '@types/estree': 1.0.9
@@ -14961,6 +15284,8 @@ snapshots:
 
   mdn-data@2.27.1: {}
 
+  mdn-data@2.37.2: {}
+
   merge-stream@2.0.0: {}
 
   merge2@1.4.1: {}
@@ -15525,6 +15850,31 @@ snapshots:
 
   os-paths@4.4.0: {}
 
+  oxc-parser@0.148.0:
+    dependencies:
+      '@oxc-project/types': 0.148.0
+    optionalDependencies:
+      '@oxc-parser/binding-android-arm-eabi': 0.148.0
+      '@oxc-parser/binding-android-arm64': 0.148.0
+      '@oxc-parser/binding-darwin-arm64': 0.148.0
+      '@oxc-parser/binding-darwin-x64': 0.148.0
+      '@oxc-parser/binding-freebsd-x64': 0.148.0
+      '@oxc-parser/binding-linux-arm-gnueabihf': 0.148.0
+      '@oxc-parser/binding-linux-arm-musleabihf': 0.148.0
+      '@oxc-parser/binding-linux-arm64-gnu': 0.148.0
+      '@oxc-parser/binding-linux-arm64-musl': 0.148.0
+      '@oxc-parser/binding-linux-ppc64-gnu': 0.148.0
+      '@oxc-parser/binding-linux-riscv64-gnu': 0.148.0
+      '@oxc-parser/binding-linux-riscv64-musl': 0.148.0
+      '@oxc-parser/binding-linux-s390x-gnu': 0.148.0
+      '@oxc-parser/binding-linux-x64-gnu': 0.148.0
+      '@oxc-parser/binding-linux-x64-musl': 0.148.0
+      '@oxc-parser/binding-openharmony-arm64': 0.148.0
+      '@oxc-parser/binding-win32-arm64-msvc': 0.148.0
+      '@oxc-parser/binding-win32-ia32-msvc': 0.148.0
+      '@oxc-parser/binding-win32-x64-msvc': 0.148.0
+    optional: true
+
   oxfmt@0.66.0(vite-plus@0.3.1(@opentelemetry/api@1.9.1)(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.15)(typescript@7.0.2)(yaml@2.9.1)):
     dependencies:
       tinypool: 2.1.0
@@ -16541,6 +16891,8 @@ snapshots:
     dependencies:
       ansi-regex: 6.4.0
 
+  strip-bom@3.0.0: {}
+
   strip-final-newline@2.0.0: {}
 
   strip-json-comments@2.0.1:
@@ -16582,6 +16934,13 @@ snapshots:
       picocolors: 1.1.1
       sax: 1.6.1
 
+  synckit@0.12.3:
+    dependencies:
+      '@dual-bundle/import-meta-resolve': 4.2.1
+      '@pkgr/core': 0.3.6
+
+  tailwind-csstree@0.3.3: {}
+
   tailwind-merge@3.7.0: {}
 
   tailwindcss@4.3.3: {}
@@ -16689,6 +17048,19 @@ snapshots:
     dependencies:
       utf8-byte-length: 1.0.5
 
+  tsconfig-paths-webpack-plugin@4.2.0:
+    dependencies:
+      chalk: 4.1.2
+      enhanced-resolve: 5.26.0
+      tapable: 2.3.3
+      tsconfig-paths: 4.2.0
+
+  tsconfig-paths@4.2.0:
+    dependencies:
+      json5: 2.2.3
+      minimist: 1.2.8
+      strip-bom: 3.0.0
+
   tslib@2.8.1: {}
 
   tsx@4.23.15:
@@ -16928,6 +17300,10 @@ snapshots:
     optionalDependencies:
       typescript: 7.0.2
 
+  valibot@1.5.0(typescript@7.0.2):
+    optionalDependencies:
+      typescript: 7.0.2
+
   validate-npm-package-name@8.0.0: {}
 
   verkit@0.4.1: {}
diff --git a/skills-lock.json b/skills-lock.json
index bef8f13b..2c829ec0 100644
--- a/skills-lock.json
+++ b/skills-lock.json
@@ -1,89 +1,89 @@
 {
-  "version": 1,
-  "skills": {
-    "agent-browser": {
-      "source": "vercel-labs/agent-browser",
-      "sourceType": "github",
-      "skillPath": "skills/agent-browser/SKILL.md",
-      "computedHash": "80161e6836b3b40f4e83730a290deb40ac14d877d38c97ad5f6d71be37ce74c3"
-    },
-    "animate": {
-      "source": "emilkowalski/skills",
-      "sourceType": "github",
-      "skillPath": "skills/animate/SKILL.md",
-      "computedHash": "7598d33e7f60dd5c24531eaaa897621cc3bdb48e8050324211627973bc59c4ce"
-    },
-    "animation-performance": {
-      "source": "emilkowalski/skills",
-      "sourceType": "github",
-      "skillPath": "skills/animation-performance/SKILL.md",
-      "computedHash": "b68ba704106e27b1f83df0cb817e09ec947abb76825d86eabdee2954b6c1bb84"
-    },
-    "animation-vocabulary": {
-      "source": "emilkowalski/skills",
-      "sourceType": "github",
-      "skillPath": "skills/animation-vocabulary/SKILL.md",
-      "computedHash": "0058036865ecbb864fd0c4132efcc62425355d6e99c7e6ef6a936742d62a5dea"
-    },
-    "apple-design": {
-      "source": "emilkowalski/skills",
-      "sourceType": "github",
-      "skillPath": "skills/apple-design/SKILL.md",
-      "computedHash": "0190417d092a0df447b000154e39733ea6d97efad6d3bec8a6ce3845aeb88914"
-    },
-    "ask-sonner": {
-      "source": "emilkowalski/skills",
-      "sourceType": "github",
-      "skillPath": "skills/ask-sonner/SKILL.md",
-      "computedHash": "8bd257b845985f4b35b603b510a126604176521094af79c4b7347ffeb8a8f7ab"
-    },
-    "break-ui": {
-      "source": "emilkowalski/skills",
-      "sourceType": "github",
-      "skillPath": "skills/break-ui/SKILL.md",
-      "computedHash": "60ada67662925f4df5e3c6ff41cac3ab241b66f8898100a5ffcd7ba7196cb868"
-    },
-    "emil-design-eng": {
-      "source": "emilkowalski/skills",
-      "sourceType": "github",
-      "skillPath": "skills/emil-design-eng/SKILL.md",
-      "computedHash": "51f2537e04d15911b41d78e2de24c36a0e26d41beae15e82a954fe5496a5eda9"
-    },
-    "find-animation-opportunities": {
-      "source": "emilkowalski/skills",
-      "sourceType": "github",
-      "skillPath": "skills/find-animation-opportunities/SKILL.md",
-      "computedHash": "465d087c41768e4f14ed640dd049036009f613feb55baaa5831b68b33178f9d2"
-    },
-    "improve-animations": {
-      "source": "emilkowalski/skills",
-      "sourceType": "github",
-      "skillPath": "skills/improve-animations/SKILL.md",
-      "computedHash": "524ea241e41d58bbdd8e288700fe24f5725e2a2f3ae7186ad7cebf9055058356"
-    },
-    "pick-ui-library": {
-      "source": "emilkowalski/skills",
-      "sourceType": "github",
-      "skillPath": "skills/pick-ui-library/SKILL.md",
-      "computedHash": "5d2a77bf0ecafbda85aa95fb49999b6d77945d9066ec83d970b62e5b388cd686"
-    },
-    "review-animations": {
-      "source": "emilkowalski/skills",
-      "sourceType": "github",
-      "skillPath": "skills/review-animations/SKILL.md",
-      "computedHash": "b4e5f0f4fe3e2743c85bf7354108f48a0b9d502cb20ef5c4a9c195da91f93736"
-    },
-    "trees": {
-      "source": "pierrecomputer/pierre",
-      "sourceType": "github",
-      "skillPath": "skills/trees/SKILL.md",
-      "computedHash": "7132a04dc1cb869f53db7fc01f34805d7c78a1089608d9df9b4839647e34b13a"
-    },
-    "vgpu": {
-      "source": "vercel-labs/vgpu",
-      "sourceType": "github",
-      "skillPath": "skills/vgpu/SKILL.md",
-      "computedHash": "c44a1f92f39d27229bfa9d1f518e09e24948607311a5abfb4132838f89483dc5"
-    }
-  }
+	"version": 1,
+	"skills": {
+		"agent-browser": {
+			"source": "vercel-labs/agent-browser",
+			"sourceType": "github",
+			"skillPath": "skills/agent-browser/SKILL.md",
+			"computedHash": "80161e6836b3b40f4e83730a290deb40ac14d877d38c97ad5f6d71be37ce74c3"
+		},
+		"animate": {
+			"source": "emilkowalski/skills",
+			"sourceType": "github",
+			"skillPath": "skills/animate/SKILL.md",
+			"computedHash": "7598d33e7f60dd5c24531eaaa897621cc3bdb48e8050324211627973bc59c4ce"
+		},
+		"animation-performance": {
+			"source": "emilkowalski/skills",
+			"sourceType": "github",
+			"skillPath": "skills/animation-performance/SKILL.md",
+			"computedHash": "b68ba704106e27b1f83df0cb817e09ec947abb76825d86eabdee2954b6c1bb84"
+		},
+		"animation-vocabulary": {
+			"source": "emilkowalski/skills",
+			"sourceType": "github",
+			"skillPath": "skills/animation-vocabulary/SKILL.md",
+			"computedHash": "0058036865ecbb864fd0c4132efcc62425355d6e99c7e6ef6a936742d62a5dea"
+		},
+		"apple-design": {
+			"source": "emilkowalski/skills",
+			"sourceType": "github",
+			"skillPath": "skills/apple-design/SKILL.md",
+			"computedHash": "0190417d092a0df447b000154e39733ea6d97efad6d3bec8a6ce3845aeb88914"
+		},
+		"ask-sonner": {
+			"source": "emilkowalski/skills",
+			"sourceType": "github",
+			"skillPath": "skills/ask-sonner/SKILL.md",
+			"computedHash": "8bd257b845985f4b35b603b510a126604176521094af79c4b7347ffeb8a8f7ab"
+		},
+		"break-ui": {
+			"source": "emilkowalski/skills",
+			"sourceType": "github",
+			"skillPath": "skills/break-ui/SKILL.md",
+			"computedHash": "60ada67662925f4df5e3c6ff41cac3ab241b66f8898100a5ffcd7ba7196cb868"
+		},
+		"emil-design-eng": {
+			"source": "emilkowalski/skills",
+			"sourceType": "github",
+			"skillPath": "skills/emil-design-eng/SKILL.md",
+			"computedHash": "51f2537e04d15911b41d78e2de24c36a0e26d41beae15e82a954fe5496a5eda9"
+		},
+		"find-animation-opportunities": {
+			"source": "emilkowalski/skills",
+			"sourceType": "github",
+			"skillPath": "skills/find-animation-opportunities/SKILL.md",
+			"computedHash": "465d087c41768e4f14ed640dd049036009f613feb55baaa5831b68b33178f9d2"
+		},
+		"improve-animations": {
+			"source": "emilkowalski/skills",
+			"sourceType": "github",
+			"skillPath": "skills/improve-animations/SKILL.md",
+			"computedHash": "524ea241e41d58bbdd8e288700fe24f5725e2a2f3ae7186ad7cebf9055058356"
+		},
+		"pick-ui-library": {
+			"source": "emilkowalski/skills",
+			"sourceType": "github",
+			"skillPath": "skills/pick-ui-library/SKILL.md",
+			"computedHash": "5d2a77bf0ecafbda85aa95fb49999b6d77945d9066ec83d970b62e5b388cd686"
+		},
+		"review-animations": {
+			"source": "emilkowalski/skills",
+			"sourceType": "github",
+			"skillPath": "skills/review-animations/SKILL.md",
+			"computedHash": "b4e5f0f4fe3e2743c85bf7354108f48a0b9d502cb20ef5c4a9c195da91f93736"
+		},
+		"trees": {
+			"source": "pierrecomputer/pierre",
+			"sourceType": "github",
+			"skillPath": "skills/trees/SKILL.md",
+			"computedHash": "7132a04dc1cb869f53db7fc01f34805d7c78a1089608d9df9b4839647e34b13a"
+		},
+		"vgpu": {
+			"source": "vercel-labs/vgpu",
+			"sourceType": "github",
+			"skillPath": "skills/vgpu/SKILL.md",
+			"computedHash": "c44a1f92f39d27229bfa9d1f518e09e24948607311a5abfb4132838f89483dc5"
+		}
+	}
 }
diff --git a/vite.config.ts b/vite.config.ts
index e1a07b5c..369f3135 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,6 +1,7 @@
 import { recommended } from "@effect/tsgo/oxlint-presets";
 import { fileURLToPath } from "node:url";
 import { defineConfig } from "vite-plus";
+import type { DummyRuleMap } from "vite-plus/lint";
 import { configDefaults } from "vite-plus/test/config";
 
 const ignoredPaths = [
@@ -71,6 +72,38 @@ const effectRules = {
 	"effecttsgo/lazy-effect": "off",
 } as const;
 
+// Tailwind rules for the web app, from @shadcn/lint and eslint-plugin-better-tailwindcss. shadcn's
+// components/ui stays as the generator wrote it. The checked rules are clean and gate `vp check`;
+// `vp run lint:tailwind` adds the rest until each is clean enough to join them.
+const tailwindChecked: DummyRuleMap = {
+	"shadcn/no-unknown-classes": "error",
+	"shadcn/no-raw-colors": "error",
+};
+
+const tailwindOptional: DummyRuleMap = {
+	"shadcn/require-static-classes": "error",
+	"shadcn/no-arbitrary-values": [
+		"error",
+		{
+			allow: [
+				"layout",
+				"transition",
+				// One-off effects with no place on a scale: frame and menu shadows, the drop target's glow,
+				// the queue strip's fade, a monogram's tint, and inline code sized to its text.
+				"shadow-[0_12px_32px_-12px_var(--cw-shadow-far)]",
+				"shadow-[0_16px_40px_-18px_rgb(0_0_0/0.55)]",
+				"bg-[radial-gradient(ellipse_at_center,var(--cw-drop-shadow),transparent_70%)]",
+				"mask-[linear-gradient(to_bottom,transparent,black_6px,black_calc(100%-10px),transparent)]",
+				"bg-[color-mix(in_oklab,currentColor_14%,transparent)]",
+				"text-[0.9em]",
+			],
+		},
+	],
+	"shadcn/no-restyle": ["error", { allow: ["layout"] }],
+	// One class at a time, as the editor's Tailwind hints are.
+	"better-tailwindcss/enforce-canonical-classes": ["error", { collapse: false, logical: false }],
+};
+
 export default defineConfig({
 	resolve: {
 		alias: aliases,
@@ -82,6 +115,7 @@ export default defineConfig({
 			release: { command: "node scripts/release.mjs", cache: false },
 			// CI's check gate. Type-aware lint, like each package's typecheck, resolves aikit through
 			// its generated declarations, so they are built first.
+			"lint:tailwind": { command: "CODEWORK_LINT_TAILWIND=1 vp lint apps/web/src", cache: false },
 			verify: {
 				command: [
 					"vp check packages scripts .github infra",
@@ -104,12 +138,24 @@ export default defineConfig({
 		// is plain TypeScript and would drown in false positives. Overrides cannot
 		// `extends`, so the preset's plugins/rules are spread in directly. These need Oxlint's
 		// type-aware mode, which the patched oxlint-tsgolint binary provides (`prepare`).
+		jsPlugins: ["@shadcn/lint", { name: "better-tailwindcss", specifier: "eslint-plugin-better-tailwindcss" }],
+		settings: {
+			"better-tailwindcss": { entryPoint: "src/style.css", cwd: "apps/web" },
+		},
 		overrides: [
 			{
 				files: effectPackages,
 				...(recommended.plugins && { plugins: recommended.plugins }),
 				rules: effectRules,
 			},
+			{
+				files: ["apps/web/src/**/*.tsx"],
+				excludeFiles: ["apps/web/src/components/ui/**"],
+				rules: {
+					...tailwindChecked,
+					...(process.env.CODEWORK_LINT_TAILWIND === "1" ? tailwindOptional : {}),
+				},
+			},
 		],
 		ignorePatterns: ignoredPaths,
 		options: {