opencode-sesh 0.9.0 → 0.10.0

package/AGENTS.md

@@ -83,8 +83,8 @@ the schema below. Keystrokes never touch the database:
   epoch, not a boolean).
 - Session and directory pins live in `${XDG_DATA_HOME:-$HOME/.local/share}/sesh/pins.json`
   (`SESH_PINS_FILE` overrides it for tests), shared by fzf and the TUI. Writes
-  use a sibling lock directory and atomic rename. Option-S toggles a selected
-  session; Option-D toggles its directory. Pinned directories sort before groups
+  use a sibling lock directory and atomic rename. Ctrl-S toggles a selected
+  session; Ctrl-D toggles its directory. Pinned directories sort before groups
   containing pinned sessions, with pinned sessions first inside each group.
 
 **Output contract** (TSV, 6 fields):
@@ -105,7 +105,8 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
 ## Conventions
 
 - Default scope is **all** sessions, every directory. `--cwd`/Ctrl-G narrows.
-  Archived sessions and fork children are hidden unless `--archived`.
+  Archived sessions and child sessions (fork children, spawned subagents) are
+  hidden unless `--archived`; metadata and cache pruning still see them.
 - **Text parts only** in search/preview; reasoning and tool payloads are
   excluded (asserted in tests).
 - Validate session ids (`^ses_[A-Za-z0-9]+$`) before SQL interpolation — never
@@ -141,8 +142,9 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
 - **Sidebar:** `api.slots.register` on `sidebar_content` (append mode — native
   sidebar content stays). Pinned directories sort first, then directory groups
   by recency; sessions within each group sort by last update regardless of pins.
-  Waiting, running, and current-idle sessions have distinct title colors and
-  text labels (in addition to row markers), polled every 15 s; Ctrl-P previews
+  Row markers alone signal session state: a running agent animates a loading
+  spinner marker, the open session shows its own ●, and every other idle row
+  stays neutral (polled every 15 s); Ctrl-P previews
   a row and ctrl+x deletes one (armed, then confirmed). The section lists every
   session without a row cap and flex-grows to fill the sidebar, with overflow
   scrolling inside; the picker remains the place for transcript search.

package/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.10.0] - 2026-09-25
+
+### Changed
+
+- The TUI session picker is taller (about three quarters of the screen) and
+  stays vertically centred; hovering a row moves the selection.
+- `ctrl+p` opens the transcript preview as a centred overlay on top of the
+  picker that follows the hovered session and closes with Esc.
+## [0.9.1] - 2026-09-25
+
+### Changed
+
+- Sidebar rows show state only in the marker column: a running agent animates
+  a loading spinner; idle rows and their titles go back to neutral.
+- Pin keybinds move from Option-S/Option-D to Ctrl-S/Ctrl-D in the terminal
+  picker, the sidebar, and the picker dialog.
+- The terminal picker hides child sessions (fork children, spawned subagents)
+  like the panel does; `--archived` still opts them back in.
 ## [0.9.0] - 2026-09-24
 
 ### Added
@@ -342,7 +360,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixture-database regression suite, TypeScript typechecking, and ShellCheck in
   CI.
 
-[Unreleased]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.9.0...HEAD
+[Unreleased]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.10.0...HEAD
+[0.10.0]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.9.1...v0.10.0
+[0.9.1]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.9.0...v0.9.1
 [0.9.0]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.7.3...v0.8.0
 [0.7.3]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.7.2...v0.7.3

package/README.md

@@ -1,5 +1,7 @@
 # sesh
 
+[![CI](https://github.com/ozandogrultan/opencode-sesh/actions/workflows/ci.yml/badge.svg)](https://github.com/ozandogrultan/opencode-sesh/actions/workflows/ci.yml)
+
 **A session browser for [opencode](https://opencode.ai).** Search every session
 across every project, preview the transcript, and resume in place — from your
 terminal or from inside the TUI.
@@ -28,7 +30,7 @@ grouped by directory, full-text searchable, and previewable from anywhere.
 
 - **Every session, everywhere.** Sessions are grouped by project directory and
   sorted by pins, then recency — across *all* your projects, not just the current one.
-- **Pin what matters.** Option-S pins a session and Option-D pins its directory in
+- **Pin what matters.** Ctrl-S pins a session and Ctrl-D pins its directory in
   either picker. Pins are shared across the terminal and opencode TUI and
   persist across restarts; pinned directories and sessions sort first.
 - **Full-text search.** Type to match against session titles *and* the text of
@@ -115,7 +117,7 @@ bash install.sh --uninstall   # from source
 | Enter | Resume the selected session in this terminal |
 | Ctrl-F       | Resume as a fork (the original is untouched) |
 | Ctrl-G | Toggle current-directory scope / all sessions |
-| Option-S / Option-D | Pin or unpin the selected session / directory |
+| Ctrl-S / Ctrl-D | Pin or unpin the selected session / directory |
 | Ctrl-P | Toggle the transcript preview |
 | `?` (empty query) | Toggle shortcut help |
 | Ctrl-X | Delete the selected session (asks to confirm) |
@@ -176,21 +178,21 @@ non-interactive `sesh-delete.sh` refuses unless given `--yes`.
 | Ctrl-F | Fork the selected session |
 | Ctrl-G | Toggle scope: the selected session's project, or every project |
 | Option-W / Option-P | Show only sessions needing input / pinned sessions |
-| Option-S / Option-D | Pin or unpin the selected session / directory |
+| Ctrl-S / Ctrl-D | Pin or unpin the selected session / directory |
 | Esc | Close |
 
 Click the sidebar's `search…` box to filter recent sessions in place; click
 elsewhere or press Esc to leave search. Click the **Sessions** heading to drive
 the list from the keyboard instead of the mouse (`↑`/`↓` to move, Enter to open,
-Ctrl-P to preview, Option-S/Option-D to pin, Ctrl-X to delete, Esc to leave). Pinned
+Ctrl-P to preview, Ctrl-S/Ctrl-D to pin, Ctrl-X to delete, Esc to leave). Pinned
 directories rise first, while sessions within each directory are ordered by
 last update, newest first. The section lists every session and scrolls to fill
 the sidebar, so click **▾ hide** to collapse it when you need the room.
 Sessions waiting on you (unanswered agent questions, runs stuck mid-tool) pin
 themselves to a **Needs input** group above the directories, with the count in
-the heading; `sesh --needs-input` lists the same set in the terminal. Row titles
-and labels mark waiting (warning), running (success), and the current idle
-session (accent); other sessions stay neutral.
+the heading; `sesh --needs-input` lists the same set in the terminal. Row
+markers are the only status signal: a loading spinner marks the session whose
+agent is working; the open session shows ● and every other row stays neutral.
 Hovering a row while keyboard navigation is active selects it for the next
 shortcut. Clicking (or Enter on) a session opens it here. The full picker is one
 keystroke away.

package/bin/sesh-list.sh

@@ -276,7 +276,7 @@ refresh() {
   historical="$scratch/historical.jsonl"; needs_extract="$scratch/needs-extract.json"
   out="$scratch/snapshot.jsonl"
 
-  db_json "SELECT id, directory, title, time_created, time_updated, COALESCE(time_archived, 0) AS archived FROM session ORDER BY time_updated DESC;" > "$sessions" 2>/dev/null || {
+  db_json "SELECT id, directory, title, time_created, time_updated, COALESCE(time_archived, 0) AS archived, COALESCE(parent_id, '') AS parent FROM session ORDER BY time_updated DESC;" > "$sessions" 2>/dev/null || {
     if [ -f "$SNAPSHOT" ]; then set_status 'stale: opencode database query failed; showing last good snapshot'; else set_status 'unavailable: opencode database query failed'; fi
     return 0
   }
@@ -388,7 +388,9 @@ refresh() {
     | ($hist | map({key: .sessionId, value: .}) | from_entries) as $histById
     | [$meta[]
        | select((.id | type) == "string" and (.id | test("^ses_[A-Za-z0-9]+$")))
-       | select($archived == 1 or .archived == 0)
+       # Child sessions (fork children, spawned subagents) surface only with
+       # --archived; metadata still sees them, so cache pruning stays safe.
+       | select($archived == 1 or (.archived == 0 and .parent == ""))
        | select($scope == "" or .directory == $scope)
        | . as $m | ($histById[$m.id] // {}) as $h
        | {sessionId: $m.id, malformedRecords: 0, agentId: "", agentState: "",

package/bin/sesh-shortcuts.sh

@@ -8,8 +8,8 @@ sesh shortcuts
   Ctrl-F            Resume the selected session as a fork
   Ctrl-G            Toggle current-directory scope / all sessions
   Ctrl-P            Toggle transcript preview
-  Option-S          Pin / unpin selected session
-  Option-D          Pin / unpin selected directory
+  Ctrl-S            Pin / unpin selected session
+  Ctrl-D            Pin / unpin selected directory
   ?                 Toggle this help
   Ctrl-X            Delete the selected session (asks to confirm)
   Escape            Exit the picker

package/bin/sesh.sh

@@ -146,8 +146,8 @@ while :; do
     --bind="$help_bind" \
     --bind="ctrl-x:execute($delete_cmd)+transform-header($header_cmd)+reload($cache_cmd)" \
     --bind="ctrl-g:execute($toggle_cmd)+transform-header($header_cmd)+reload($cache_cmd)" \
-    --bind="alt-s:execute-silent($pin_session_cmd)+reload($cache_cmd)" \
-    --bind="alt-d:execute-silent($pin_directory_cmd)+reload($cache_cmd)" \
+    --bind="ctrl-s:execute-silent($pin_session_cmd)+reload($cache_cmd)" \
+    --bind="ctrl-d:execute-silent($pin_directory_cmd)+reload($cache_cmd)" \
     --bind="change:reload:$cache_cmd" \
     --bind="start,every(3):transform-header($header_cmd)+reload-sync:$cache_cmd")
 status=$?

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "opencode-sesh",
-  "version": "0.9.0",
-  "type": "module",
+  "version": "0.10.0",
   "description": "Browse, search, preview and resume opencode sessions from the terminal and the TUI.",
+  "type": "module",
   "license": "MIT",
   "author": "Ozan Dogrultan",
   "repository": {
@@ -44,12 +44,13 @@
   },
   "scripts": {
     "prepare": "husky",
-    "postinstall": "bash install.sh --sync-panel || true",
     "test": "bash tests/sesh.sh && bash tests/changelog.sh",
+    "test:unit": "bash tests/sesh.sh",
     "test:changelog": "bash tests/changelog.sh",
     "test:picker": "python3 tests/picker.py",
-    "typecheck": "tsc -p tsconfig.json",
+    "typecheck": "tsc --noEmit",
     "lint:sh": "for script in bin/*.sh bin/sesh install.sh tests/*.sh scripts/*.sh; do bash -n \"$script\" || exit; done",
+    "postinstall": "bash install.sh --sync-panel || true",
     "prepublishOnly": "bun run test && bun run typecheck"
   },
   "devDependencies": {

package/tui/sesh-panel.tsx

@@ -248,19 +248,20 @@ function ensureRootMouse(renderer: TuiPluginApi["renderer"]) {
 
 type Entry = { id: string; title: string; dir: string; group: string; updated: number }
 type EntryResult = { entries: Entry[]; truncated: boolean }
-type SidebarActivity = "waiting" | "running" | "active" | "idle"
+type SidebarMarker = "current" | "running" | "idle"
+
+// Loading-spinner frames for the marker of a session whose agent is working.
+const SIDEBAR_SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
 
 function newestFirst(entries: Entry[]): Entry[] {
   return [...entries].sort((a, b) => b.updated - a.updated || a.id.localeCompare(b.id))
 }
 
-// A question needs an answer even if the agent is busy. A stale running-tool
-// record, on the other hand, must not hide a currently busy agent.
-function sidebarActivity(current: boolean, live?: string, pending = false, reason?: string): SidebarActivity {
-  if (pending || reason === "question") return "waiting"
+// A working agent is the only state the marker displays: everything that
+// finished goes back to the neutral row, with the open session marked inside.
+function sidebarMarker(current: boolean, live?: string): SidebarMarker {
   if (live === "busy" || live === "retry") return "running"
-  if (reason === "stuck") return "waiting"
-  return current ? "active" : "idle"
+  return current ? "current" : "idle"
 }
 
 const SESSION_PAGE_LIMIT = 200
@@ -808,8 +809,6 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
     const ids = waiting()
     return newestFirst(shownEntries().filter((entry) => ids.has(entry.id)))
   })
-  const waitingReason = (id: string) =>
-    waiting().get(id) === "question" ? "awaiting answer" : waiting().get(id) === "stuck" ? "run stuck" : "needs input"
 
   const tree = createMemo<TreeRow[]>(() => {
     const rows: TreeRow[] = []
@@ -884,26 +883,34 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
     previousRows = rows
   })
 
-  const sessionStatus = (id: string): SidebarActivity => {
+  // Marker only: a spinner for a working agent, the open-session dot, and the
+  // neutral row for idle sessions. Titles stay plain and no status text is
+  // rendered.
+  const markerOf = (id: string): SidebarMarker => {
+    let live: string | undefined
     try {
-      const permissions = props.api.state.session.permission(id)
-      const questions = props.api.state.session.question(id)
-      return sidebarActivity(
-        id === currentID(),
-        props.api.state.session.status(id)?.type,
-        (permissions?.length ?? 0) > 0 || (questions?.length ?? 0) > 0,
-        waiting().get(id),
-      )
+      live = props.api.state.session.status(id)?.type
     } catch {}
-    return sidebarActivity(id === currentID(), undefined, false, waiting().get(id))
+    return sidebarMarker(id === currentID(), live)
   }
 
-  const statusColor = (status: SidebarActivity) => {
-    if (status === "running") return theme().success
-    if (status === "waiting") return theme().warning
-    if (status === "active") return theme().accent
-    return theme().textMuted
-  }
+  // The spinner animates only while a listed session is actually running, so
+  // an idle list costs no timer and only running rows re-render per frame.
+  const [spinFrame, setSpinFrame] = createSignal(0)
+  let spinTimer: ReturnType<typeof setInterval> | undefined
+  createEffect(() => {
+    const spinning = itemRows().some((entry) => markerOf(entry.id) === "running")
+    if (spinning && !spinTimer) {
+      spinTimer = setInterval(() => setSpinFrame((value) => (value + 1) % SIDEBAR_SPINNER.length), 120)
+    } else if (!spinning && spinTimer) {
+      clearInterval(spinTimer)
+      spinTimer = undefined
+      setSpinFrame(0)
+    }
+  })
+  onCleanup(() => {
+    if (spinTimer) clearInterval(spinTimer)
+  })
 
   const cancelDelete = () => {
     if (confirmTimer) clearTimeout(confirmTimer)
@@ -1027,8 +1034,8 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
             if (!confirmArmed()) requestDelete(entry)
           },
         },
-        { key: "option+s", desc: "Pin session", preventDefault: true, cmd: () => props.onTogglePin("sessions", entry.id) },
-        { key: "option+d", desc: "Pin directory", preventDefault: true, cmd: () => props.onTogglePin("directories", entry.dir) },
+        { key: "ctrl+s", desc: "Pin session", preventDefault: true, cmd: () => props.onTogglePin("sessions", entry.id) },
+        { key: "ctrl+d", desc: "Pin directory", preventDefault: true, cmd: () => props.onTogglePin("directories", entry.dir) },
         {
           key: "/",
           desc: "Search sessions",
@@ -1077,7 +1084,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         },
       },
       {
-        key: "option+s",
+        key: "ctrl+s",
         desc: "Pin session",
         preventDefault: true,
         cmd: () => {
@@ -1086,7 +1093,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         },
       },
       {
-        key: "option+d",
+        key: "ctrl+d",
         desc: "Pin directory",
         preventDefault: true,
         cmd: () => {
@@ -1210,7 +1217,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
                 </text>
               </box>
             )
-            const activity = createMemo(() => sessionStatus(row.entry.id))
+            const marker = createMemo(() => markerOf(row.entry.id))
             return (
               <box
                 flexDirection="row"
@@ -1225,7 +1232,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
                 onMouseOver={() => {
                   setHovered(row.entry.id)
                   // The keyboard layer wins over the hover layer while nav is
-                  // active. Keep its cursor on the hovered row so Option-S/Option-D
+                  // active. Keep its cursor on the hovered row so Ctrl-S/Ctrl-D
                   // cannot silently pin a different (often current) session.
                   if (navActive()) {
                     const index = itemRows().findIndex((entry) => entry.id === row.entry.id)
@@ -1241,30 +1248,24 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
                     style={{
                       fg: isPendingDelete(row.entry.id)
                         ? theme().error
-                        : row.entry.id === currentID()
+                        : marker() === "current"
                           ? theme().accent
-                          : statusColor(activity()),
+                          : marker() === "running"
+                            ? theme().success
+                            : theme().textMuted,
                     }}
                   >
-                    {row.entry.id === currentID() ? "●" : activity() === "waiting" ? "!" : activity() === "running" ? "▶" : isActive(row.entry.id) ? "▸" : "○"}
+                    {marker() === "current" ? "●" : marker() === "running" ? SIDEBAR_SPINNER[spinFrame()] : isActive(row.entry.id) ? "▸" : "○"}
                   </span>
                 </text>
                 <Highlighted
                   text={`${props.pins().sessions.includes(row.entry.id) ? "★ " : ""}${truncate(row.entry.title, SIDEBAR_TITLE_WIDTH - (props.pins().sessions.includes(row.entry.id) ? 2 : 0))}`}
                   query={query()}
-                  color={isPendingDelete(row.entry.id) ? theme().error : activity() === "idle" ? theme().text : statusColor(activity())}
+                  color={isPendingDelete(row.entry.id) ? theme().error : theme().text}
                   matchColor={theme().warning}
                 />
                 <text flexShrink={0} style={{ fg: isPendingDelete(row.entry.id) ? theme().error : theme().textMuted }}>
-                  {isPendingDelete(row.entry.id) ? (
-                    "ctrl+x again"
-                  ) : activity() !== "idle" ? (
-                    <span>
-                      {ago(row.entry.updated)} · <span style={{ fg: statusColor(activity()) }}>{activity() === "waiting" ? waitingReason(row.entry.id) : activity()}</span>
-                    </span>
-                  ) : (
-                    ago(row.entry.updated)
-                  )}
+                  {isPendingDelete(row.entry.id) ? "ctrl+x again" : ago(row.entry.updated)}
                 </text>
               </box>
             )
@@ -1279,7 +1280,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         </Show>
         <Show when={navActive()}>
           <box paddingTop={1}>
-            <text style={{ fg: theme().textMuted }}>↑↓ move · enter open · ctrl+p preview · option+s/d pin · ctrl+x delete · esc done</text>
+            <text style={{ fg: theme().textMuted }}>↑↓ move · enter open · ctrl+p preview · ctrl+s/d pin · ctrl+x delete · esc done</text>
           </box>
         </Show>
       </Show>
@@ -1350,8 +1351,8 @@ function HomeSessions(props: { api: TuiPluginApi } & PinProps) {
           preventDefault: true,
           cmd: () => preview.open(entry),
         },
-        { key: "option+s", desc: "Pin session", preventDefault: true, cmd: () => props.onTogglePin("sessions", entry.id) },
-        { key: "option+d", desc: "Pin directory", preventDefault: true, cmd: () => props.onTogglePin("directories", entry.dir) },
+        { key: "ctrl+s", desc: "Pin session", preventDefault: true, cmd: () => props.onTogglePin("sessions", entry.id) },
+        { key: "ctrl+d", desc: "Pin directory", preventDefault: true, cmd: () => props.onTogglePin("directories", entry.dir) },
       ],
     })
   })
@@ -1645,13 +1646,23 @@ const tui: TuiPlugin = async (api) => {
     })
 
     const termHeight = api.renderer.height
-    const listHeight = Math.max(6, Math.floor(termHeight / 2) - 12)
+    // The dialog host anchors content a quarter of the way down the screen and
+    // lets it size to content, so a taller picker drifts downward. Pin the
+    // content height and offset it up by the same amount to keep it centred.
+    const dialogWidth = Math.min(116, api.renderer.width - 2)
+    const CHROME_ROWS = 12
+    const listHeight = () => Math.max(6, Math.floor(termHeight * 0.75) - CHROME_ROWS)
+    const dialogHeight = () => listHeight() + CHROME_ROWS
+    const dialogOffset = () => Math.min(0, Math.floor(termHeight / 4 - dialogHeight() / 2 - 1))
+    const previewWidth = () => Math.max(40, Math.min(94, dialogWidth - 6))
+    const previewHeight = () => Math.max(8, Math.floor(termHeight / 2))
 
     const visiblePickerRows = createMemo<DialogRow[]>(() => {
       const flat = pickerRows()
       // A transcript hit adds a second line to a row; bound by screen height,
       // not just the number of session IDs.
-      const windowSize = query().trim() ? Math.max(2, Math.floor(listHeight / 3)) : listHeight
+      const height = listHeight()
+      const windowSize = query().trim() ? Math.max(2, Math.floor(height / 3)) : height
       const currentID = selectableEntries()[cursor()]?.id
       let pos = currentID
         ? flat.findIndex((row) => row.kind === "item" && row.entry.id === currentID)
@@ -1726,6 +1737,22 @@ const tui: TuiPlugin = async (api) => {
       setPendingDelete(undefined)
     }
 
+    // Escape first closes the transcript overlay, then the picker. One Escape
+    // can reach both the focused search input and the key layer (sometimes in
+    // separate ticks), so ignore the duplicate that trails right behind.
+    let escapeHandledAt = 0
+    const handleEscape = () => {
+      const now = Date.now()
+      if (escapeHandledAt > now) return
+      if (showPreview()) {
+        setShowPreview(false)
+        escapeHandledAt = now + 150
+        return
+      }
+      cancelDelete()
+      close()
+    }
+
     const deleteEntry = async (entry: Entry) => {
       cancelDelete()
       try {
@@ -1792,6 +1819,9 @@ const tui: TuiPlugin = async (api) => {
     }
 
     const disposeNav = api.keymap.registerLayer({
+      // Outrank the built-in dialog layer so Escape reaches this picker before
+      // the dialog host closes the whole thing.
+      priority: 1,
       bindings: [
         { key: "up", desc: "Previous session", preventDefault: true, cmd: () => moveCursor(-1) },
         { key: "down", desc: "Next session", preventDefault: true, cmd: () => moveCursor(1) },
@@ -1806,11 +1836,11 @@ const tui: TuiPlugin = async (api) => {
         },
         { key: "enter", desc: "Open session", preventDefault: true, cmd: () => choose() },
         { key: "ctrl+p", desc: "Toggle transcript preview", preventDefault: true, cmd: togglePreview },
-        { key: "option+s", desc: "Pin session", preventDefault: true, cmd: () => {
+        { key: "ctrl+s", desc: "Pin session", preventDefault: true, cmd: () => {
           const entry = selectableEntries()[cursor()]
           if (entry) onTogglePin("sessions", entry.id)
         } },
-        { key: "option+d", desc: "Pin directory", preventDefault: true, cmd: () => {
+        { key: "ctrl+d", desc: "Pin directory", preventDefault: true, cmd: () => {
           const entry = selectableEntries()[cursor()]
           if (entry) onTogglePin("directories", entry.dir)
         } },
@@ -1851,10 +1881,7 @@ const tui: TuiPlugin = async (api) => {
           key: "escape",
           desc: "Close",
           preventDefault: true,
-          cmd: () => {
-            cancelDelete()
-            close()
-          },
+          cmd: handleEscape,
         },
       ],
     })
@@ -1870,7 +1897,14 @@ const tui: TuiPlugin = async (api) => {
 
     api.ui.dialog.replace(
       () => (
-        <box flexDirection="column" flexGrow={1} paddingBottom={1} gap={1}>
+        <box
+          flexDirection="column"
+          height={dialogHeight()}
+          marginTop={dialogOffset()}
+          paddingBottom={1}
+          gap={1}
+          backgroundColor={api.theme.current.backgroundPanel}
+        >
           <box paddingLeft={4} paddingRight={4}>
             <box flexDirection="row" justifyContent="space-between">
               <text attributes={TextAttributes.BOLD}>
@@ -1894,7 +1928,7 @@ const tui: TuiPlugin = async (api) => {
                 onKeyDown={(event) => {
                   if (event.name === "escape") {
                     event.preventDefault()
-                    close()
+                    handleEscape()
                   }
                 }}
               />
@@ -1922,6 +1956,8 @@ const tui: TuiPlugin = async (api) => {
           </box>
           <box
             flexDirection="column"
+            flexGrow={1}
+            overflow="hidden"
             onMouseScroll={(event: { scroll?: { direction: string } }) => {
               const direction = event.scroll?.direction
               if (direction === "down") moveCursor(3)
@@ -1931,7 +1967,7 @@ const tui: TuiPlugin = async (api) => {
             <For each={visiblePickerRows()}>
                 {(row) => {
                   if (row.kind === "group") return (
-                    <box paddingTop={1} paddingLeft={4}>
+                    <box paddingLeft={4}>
                       <text style={{ fg: api.theme.current.accent }} attributes={TextAttributes.BOLD}>
                         {matchedGroups().find((group) => group.name === row.label)?.list.some((entry) => pins().directories.includes(entry.dir)) ? "★ " : ""}{row.label} <span style={{ fg: api.theme.current.textMuted }}>({row.count})</span>
                       </text>
@@ -1948,6 +1984,12 @@ const tui: TuiPlugin = async (api) => {
                           ? api.theme.current.primary
                           : RGBA.fromInts(0, 0, 0, 0)
                       }
+                      onMouseOver={() => {
+                        // Hovering moves the cursor so the highlight, Ctrl-S/Ctrl-D
+                        // and Enter all resolve to the row under the pointer.
+                        const index = selectableEntries().findIndex((entry) => entry.id === row.entry.id)
+                        if (index >= 0) setCursor(index)
+                      }}
                       onMouseDown={() => choose(row.entry)}
                     >
                       <box flexDirection="row" gap={1}>
@@ -2025,7 +2067,7 @@ const tui: TuiPlugin = async (api) => {
                       : waitingOnly() && waitingCoverage() === "unavailable"
                         ? "Needs-input data unavailable · turn off the filter"
                       : pinnedOnly() && pins().sessions.length === 0
-                        ? "No pinned sessions yet · option+s pins a session"
+                        ? "No pinned sessions yet · ctrl+s pins a session"
                       : !indexProgress().complete && query().trim()
                         ? "No matches yet · still searching transcripts…"
                       : scope()
@@ -2037,11 +2079,46 @@ const tui: TuiPlugin = async (api) => {
                 </box>
               </Show>
             </box>
+          <box paddingLeft={4} paddingRight={4} flexShrink={0} flexDirection="column">
+            <text
+              style={{
+                fg: pendingDelete() ? api.theme.current.warning : api.theme.current.textMuted,
+              }}
+            >
+              {pendingDelete()
+                ? `Delete "${truncate(pendingDelete()!.title, 40)}"? y confirm · n cancel`
+                : "↑↓ move · enter open · ctrl+g project · option+w needs · option+p pinned · ctrl+p preview"}
+            </text>
+            <Show when={!pendingDelete()}>
+              <text style={{ fg: api.theme.current.textMuted }}>ctrl+s/d pin · ctrl+x delete · ctrl+f fork · esc close</text>
+            </Show>
+          </box>
           <Show when={showPreview()}>
-            <box flexShrink={0} flexDirection="column" paddingLeft={4} paddingRight={4} height={12}>
-              <text style={{ fg: api.theme.current.textMuted }} attributes={TextAttributes.BOLD}>
-                {previewID() ? `Preview · ${truncate(selectableEntries()[cursor()]!.title, 48)}` : "Preview"}
-              </text>
+            <box
+              position="absolute"
+              left={Math.floor((dialogWidth - previewWidth()) / 2)}
+              top={Math.max(0, Math.floor((dialogHeight() - previewHeight()) / 2))}
+              width={previewWidth()}
+              height={previewHeight()}
+              flexDirection="column"
+              backgroundColor={api.theme.current.backgroundElement}
+              paddingLeft={2}
+              paddingRight={2}
+              paddingTop={1}
+              paddingBottom={1}
+              gap={1}
+            >
+              <box flexDirection="row" justifyContent="space-between">
+                <text attributes={TextAttributes.BOLD}>
+                  {previewID() ? truncate(selectableEntries()[cursor()]!.title, previewWidth() - 8) : "Preview"}
+                </text>
+                <text style={{ fg: api.theme.current.textMuted }}>esc close</text>
+              </box>
+              <Show when={previewID()}>
+                <text style={{ fg: api.theme.current.textMuted }}>
+                  {prettyDir(selectableEntries()[cursor()]!.dir, process.env.HOME ?? "")}
+                </text>
+              </Show>
               <scrollbox flexGrow={1} scrollbarOptions={{ visible: false }}>
                 <Show when={previewID()} fallback={<text style={{ fg: api.theme.current.textMuted }}>Select a session to preview</text>}>
                   <Show when={previewText()} fallback={<text style={{ fg: api.theme.current.textMuted }}>Loading…</text>}>
@@ -2061,20 +2138,6 @@ const tui: TuiPlugin = async (api) => {
               </scrollbox>
             </box>
           </Show>
-          <box paddingLeft={4} paddingRight={4} flexShrink={0} flexDirection="column">
-            <text
-              style={{
-                fg: pendingDelete() ? api.theme.current.warning : api.theme.current.textMuted,
-              }}
-            >
-              {pendingDelete()
-                ? `Delete "${truncate(pendingDelete()!.title, 40)}"? y confirm · n cancel`
-                : "↑↓ move · enter open · ctrl+g project · option+w needs · option+p pinned · ctrl+p preview"}
-            </text>
-            <Show when={!pendingDelete()}>
-              <text style={{ fg: api.theme.current.textMuted }}>option+s/d pin · ctrl+x delete · ctrl+f fork · esc close</text>
-            </Show>
-          </box>
         </box>
       ),
       () => {