opencode-sesh 0.2.0 → 0.2.1

package/AGENTS.md

@@ -72,6 +72,11 @@ the schema below. Keystrokes never touch the database:
   selection leaves a one-shot `STATE_DIR/action-notice` the next render shows
   and consumes. Snapshot records carry `archived` as 0/1 (the DB column is an
   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
+  containing pinned sessions, with pinned sessions first inside each group.
 
 **Output contract** (TSV, 6 fields):
 `agentId  sessionId  liveState  display  cwd  trackingId`. `display` is the only
@@ -125,10 +130,11 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
 ## TUI panel (`tui/sesh-panel.tsx`)
 
 - **Sidebar:** `api.slots.register` on `sidebar_content` (append mode — native
-  sidebar content stays). Renders the newest `SIDEBAR_LIMIT` unarchived sessions
-  with the current one highlighted, polled every 15 s; space previews a row and
-  ctrl+x deletes one (armed, then confirmed). Anything bulkier belongs to the
-  picker.
+  sidebar content stays). Renders pinned sessions before the newest unarchived
+  sessions, with the current one highlighted, 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.
 - **Picker:** a custom dialog (not `DialogSelect`) grouped by
   project/directory, recency-ordered, resume via
   `api.route.navigate("session", …)`. `ctrl+o` and the command palette open it;
@@ -168,12 +174,15 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
   opt-in: clicking the *Sessions* heading (or its search box) activates a
   priority-20 layer, because a global `↑`/`↓` would hijack the main prompt.
   Cursor state is derived from `itemRows()`, so hover and cursor resolve to the
-  same row, and the section is capped at `SIDEBAR_LIMIT` (`… N more · ctrl+o for
-  all` is the escape hatch) — it must stay a glanceable recent list.
+  same row. The section lists every session with no row cap
+  (`tests/tui.mjs` asserts the cap stays out); overflow scrolls inside the
+  stretched section.
 - **Delete in the TUI is two-step.** The first `ctrl+x` arms `pendingDelete`,
-  the second (or `y`, or Enter in the picker footer) commits, and `n`/Esc/moving
-  cancels. The `y`/`n` layer is registered *only while armed*, so it can never
-  shadow the search box's typing.
+  the second (or `y`, or Enter in the picker footer) commits the armed row
+  wherever the pointer or cursor is, and `n`/Esc (or a five-second timeout)
+  cancels. Moving the pointer must never disarm: edge-hover flicker ate the
+  confirm before `confirmArmed` landed. The `y`/`n` layer is registered *only
+  while armed*, so it can never shadow the search box's typing.
 - **Picker `ctrl+g` is project scope**, not close (parity with the fzf picker's
   `Ctrl-G`); Esc is the only close key. `ctrl+f` forks through
   `api.client.session.fork` and navigates to the returned session.

package/CHANGELOG.md

@@ -7,6 +7,53 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.1] - 2026-09-24
+
+### Changed
+
+- The TUI sidebar's Sessions section now lists every session and fills the
+  available sidebar height: the fixed 15-row cap is gone, with overflow
+  scrolling inside the section.
+
+### Added
+
+- Pin sessions with Option-S or directories with Option-D in both pickers. Pins live
+  in a shared XDG data file, appear with a star, and sort ahead of recent
+  sessions in the terminal picker, TUI picker, sidebar and home list.
+
+### Fixed
+
+- The sidebar delete confirm no longer disarms when the pointer leaves the
+  armed row: the second Ctrl+X (or `y`) commits the visibly armed row wherever
+  the pointer is, so deleting works while hovering the sidebar edges.
+
+- Session previews now use Ctrl-P rather than Space in the terminal picker,
+  sidebar and home list, so typing cannot accidentally open a preview.
+- Hovering a sidebar session while keyboard navigation is active now moves the
+  selection to that row, so Option-S/Option-D pin the row under the pointer rather
+  than the previously selected (often currently open) session.
+- The TUI sidebar's Sessions section now has a working show/hide control,
+  separate from clicking the heading to activate keyboard navigation.
+- Transcript previews pass OpenTUI's tree-sitter client to the markdown
+  renderer, restoring themed Markdown and fenced-code highlighting.
+- Preview Markdown now uses the active theme's semantic accents for headings,
+  emphasis, code and list markers when the default Markdown colors read like
+  body text.
+
+### Changed
+
+- Pin shortcuts are labeled Option-S/Option-D (the macOS key) in both pickers
+  and the docs. The terminal picker still binds fzf's `alt-s`/`alt-d`, which is
+  fzf's name for Option and unchanged.
+- The TUI picker now shows transcript search matches as indexing progresses,
+  identifies transcript-only hits, and distinguishes an in-progress search from
+  a completed search with no results.
+- Session previews identify the selected session and show loading feedback
+  while it changes, instead of displaying another session's transcript.
+- The TUI picker uses `Ctrl-P` for transcript preview; Space always enters a
+  space in the search field, including at the start of a query.
+- Sidebar and home searches direct users to the full picker for transcript
+  search when no titles or directories match.
 ## [0.2.0] - 2026-09-21
 
 ### Added
@@ -178,7 +225,8 @@ 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.2.0...HEAD
+[Unreleased]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.2.1...HEAD
+[0.2.1]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.1.7...v0.2.0
 [0.1.7]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.1.6...v0.1.7
 [0.1.6]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.1.5...v0.1.6

package/README.md

@@ -27,7 +27,10 @@ grouped by directory, full-text searchable, and previewable from anywhere.
 ## Why sesh
 
 - **Every session, everywhere.** Sessions are grouped by project directory and
-  sorted by recency — across *all* your projects, not just the current one.
+  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
+  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
   the conversation itself. Reasoning and tool output are excluded, so the index
   stays clean.
@@ -112,7 +115,8 @@ 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 |
-| Space (empty query) | Toggle the transcript preview |
+| Option-S / Option-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) |
 | Escape | Exit |
@@ -144,18 +148,22 @@ non-interactive `sesh-delete.sh` refuses unless given `--yes`.
 | `ctrl+o` | Open the full picker (also in the command palette) |
 | Type | Search titles, directories and transcript text |
 | `↑`/`↓`, `PgUp`/`PgDn`, `Home`/`End` | Move the selection |
-| Space | Toggle the transcript preview |
+| Ctrl-P | Toggle the transcript preview |
 | Enter | Open the selected session |
 | Ctrl-X | Delete the selected session (asks to confirm) |
 | Ctrl-F | Fork the selected session |
 | Ctrl-G | Toggle scope: the selected session's project, or every project |
+| Option-S / Option-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,
-Space to preview, Ctrl-X to delete, Esc to leave). The sidebar shows the 15 most
-recent sessions — the full picker is one keystroke away.
+Ctrl-P to preview, Option-S/Option-D to pin, Ctrl-X to delete, Esc to leave). Pinned
+sessions appear ahead of the rest; the section lists every session and scrolls
+to fill the sidebar, so click **▾ hide** to collapse it when you need the room.
+Hovering a row while keyboard navigation is active selects it for the next
+shortcut. The full picker is one keystroke away.
 
 The full picker pages through your whole global session list (no fixed window)
 and indexes transcript text for every session in the background, showing
@@ -174,6 +182,7 @@ All variables are optional.
 | `SESH_GLOW` | first `glow` on `PATH` | optional Markdown preview renderer |
 | `SESH_OPENCODE` | `opencode` | opencode executable (resume / delete) |
 | `SESH_CACHE_DIR` | `~/.cache/sesh` | persistent search-index cache |
+| `SESH_PINS_FILE` | `${XDG_DATA_HOME:-~/.local/share}/sesh/pins.json` | shared persistent session/directory pins |
 
 ## How it works
 

package/bin/sesh-list.sh

@@ -157,7 +157,7 @@ render() {
   {
     [ -n "$notice" ] && printf '\t\tunknown\t%s%s%s\t\tnotice:action\n' "$YELLOW" "$notice" "$RESET"
     [ -n "$state" ] && [ "$state" != fresh ] && printf '\t\tunknown\t%s%s%s\t\tnotice:live-state\n' "$YELLOW" "$state" "$RESET"
-    "$JQ_BIN" -sr --arg green "$GREEN" --arg cyan "$CYAN" --arg gray "$GRAY" --arg magenta "$MAGENTA" --arg red "$RED" --arg bold "$BOLD" --arg yellow "$YELLOW" --arg reset "$RESET" --arg query "$QUERY" --arg home "$HOME" --arg selected "$SELECTED_ID" '
+    "$JQ_BIN" -sr --argjson pins "$("${BASH_SOURCE[0]%/*}/sesh-pins.sh" read)" --arg green "$GREEN" --arg cyan "$CYAN" --arg gray "$GRAY" --arg magenta "$MAGENTA" --arg red "$RED" --arg bold "$BOLD" --arg yellow "$YELLOW" --arg reset "$RESET" --arg query "$QUERY" --arg home "$HOME" --arg selected "$SELECTED_ID" '
       def ago($epoch):
         ((now - ($epoch | tonumber)) | floor) as $s
         | if $s < 60 then "now" elif $s < 3600 then "\($s / 60 | floor)m" elif $s < 86400 then "\($s / 3600 | floor)h" else "\($s / 86400 | floor)d" end;
@@ -180,17 +180,20 @@ render() {
          then notice_row(if $q == "" then "No sessions in this store" else "No sessions match \"" + $query + "\"" end; "notice:no-match")
          else empty end),
         ($matched
-      | group_by(.cwd)
-      | map({cwd: .[0].cwd, updated: (map(.updatedEpoch) | max), items: (sort_by(.updatedEpoch) | reverse)})
-      | sort_by(.updated) | reverse
-      | .[] as $g
-      | (["", "", "unknown", ($magenta + ($g.cwd | homepath | gsub("[\u0000-\u001f\u007f-\u009f]";" ")) + $reset), $g.cwd, ("hdr:" + $g.cwd)] | @tsv),
+       | group_by(.cwd)
+       | map({cwd: .[0].cwd, updated: (map(.updatedEpoch) | max),
+              pinDirectory: (.[0].cwd as $dir | $pins.directories | index($dir) != null),
+              pinSession: (any(.[]; .sessionId as $id | $pins.sessions | index($id) != null)),
+              items: (sort_by([(.sessionId as $id | $pins.sessions | index($id) != null), .updatedEpoch]) | reverse)})
+       | sort_by([.pinDirectory, .pinSession, .updated]) | reverse
+       | .[] as $g
+       | (["", "", "unknown", ($magenta + (if $g.pinDirectory then "★ " else "" end) + ($g.cwd | homepath | gsub("[\u0000-\u001f\u007f-\u009f]";" ")) + $reset), $g.cwd, ("hdr:" + $g.cwd)] | @tsv),
         ($g.items | to_entries[] | .key as $i | .value as $s
          # Archived rows are opt-in and need to look like it; nothing else about
          # a row is knowable here (live agent state is not exposed by opencode).
          | (if $s.archived == 1 then $yellow else $gray end) as $c
          | ($gray + (if $i == (($g.items|length)-1) then "└" else "├" end) + $reset) as $branch
-         | [$s.agentId, $s.sessionId, $s.liveState, ($branch + " " + $c + ($s.title | gsub("[\u0000-\u001f\u007f-\u009f]";" ")) + (if $s.archived == 1 then " · archived" else "" end) + $reset + "  " + $gray + ago($s.updatedEpoch) + $reset), $s.cwd, $s.sessionId] | @tsv)))
+          | [$s.agentId, $s.sessionId, $s.liveState, ($branch + " " + $c + (if ($s.sessionId as $id | $pins.sessions | index($id)) != null then "★ " else "" end) + ($s.title | gsub("[\u0000-\u001f\u007f-\u009f]";" ")) + (if $s.archived == 1 then " · archived" else "" end) + $reset + "  " + $gray + ago($s.updatedEpoch) + $reset), $s.cwd, $s.sessionId] | @tsv)))
     ' "$SNAPSHOT"
   } || printf '\t\tunknown\t%sSnapshot rendering failed; retry refresh%s\t\tnotice:render-error\n' "$YELLOW" "$RESET"
 }
@@ -372,7 +375,7 @@ refresh() {
     done < "$records"
   fi
 
-  if ! "$JQ_BIN" -c --slurpfile hist "$historical" --arg scope "$SCOPE_CWD" --argjson limit "$LIMIT" --argjson archived "$INCLUDE_ARCHIVED" '
+  if ! "$JQ_BIN" -c --slurpfile hist "$historical" --argjson pins "$("${BASH_SOURCE[0]%/*}/sesh-pins.sh" read)" --arg scope "$SCOPE_CWD" --argjson limit "$LIMIT" --argjson archived "$INCLUDE_ARCHIVED" '
     .meta as $meta
     | ($hist | map({key: .sessionId, value: .}) | from_entries) as $histById
     | [$meta[]
@@ -387,7 +390,7 @@ refresh() {
           updatedEpoch: ($h.updatedEpoch // (($m.time_updated / 1000 | floor))),
           title: (if ($h.title // "") != "" then $h.title else ($m.title // "(untitled)") end)}
        | .searchText = ((.title | ascii_downcase) + " " + ($histById[.sessionId].fulltextLower // ""))]
-    | sort_by(.updatedEpoch) | reverse
+     | sort_by([(.cwd as $dir | $pins.directories | index($dir) != null), (.sessionId as $id | $pins.sessions | index($id) != null), .updatedEpoch]) | reverse
     | (if $limit == 0 then . else .[:$limit] end)[]
   ' "$cache_state" > "$out"; then
     set_status 'stale: snapshot construction failed; showing last good snapshot'

package/bin/sesh-pins.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+# Persistent pins shared by the fzf picker and the opencode TUI plugin.
+set -euo pipefail
+umask 077
+
+PINS_FILE=${SESH_PINS_FILE:-"${XDG_DATA_HOME:-$HOME/.local/share}/sesh/pins.json"}
+JQ_BIN=${SESH_JQ:-jq}
+empty='{"sessions":[],"directories":[]}'
+action=${1:-}
+value=${2:-}
+
+read_pins() {
+  if [ -f "$PINS_FILE" ]; then
+    local pins=''
+    pins=$("$JQ_BIN" -c 'select(type == "object") | {sessions: ((.sessions // []) | map(select(type == "string"))), directories: ((.directories // []) | map(select(type == "string")))}' "$PINS_FILE" 2>/dev/null) || pins=''
+    printf '%s\n' "${pins:-$empty}"
+  else
+    printf '%s\n' "$empty"
+  fi
+}
+
+case "$action" in
+  read) read_pins; exit 0 ;;
+  toggle-session)
+    [[ "$value" =~ ^ses_[A-Za-z0-9]+$ ]] || exit 2
+    field=sessions ;;
+  toggle-directory)
+    [[ "$value" == /* && "$value" != *$'\n'* ]] || exit 2
+    field=directories ;;
+  *) echo 'usage: sesh-pins.sh read|toggle-session ID|toggle-directory PATH' >&2; exit 2 ;;
+esac
+
+mkdir -p "$(dirname "$PINS_FILE")"
+lock="$PINS_FILE.lock"
+for ((attempt = 0; attempt < 50; attempt++)); do
+  if mkdir "$lock" 2>/dev/null; then printf '%s\n' "$$" > "$lock/pid"; break; fi
+  owner=''
+  [ ! -f "$lock/pid" ] || owner=$(cat "$lock/pid" 2>/dev/null || true)
+  if [[ "$owner" =~ ^[0-9]+$ ]] && ! kill -0 "$owner" 2>/dev/null; then
+    rm -f "$lock/pid" 2>/dev/null || true
+    rmdir "$lock" 2>/dev/null || true
+  fi
+  [ "$attempt" -lt 49 ] || { echo 'sesh: pins are busy; try again' >&2; exit 1; }
+  sleep 0.1
+done
+tmp=''
+cleanup() { [ -z "$tmp" ] || rm -f "$tmp"; rm -f "$lock/pid"; rmdir "$lock" 2>/dev/null || true; }
+trap cleanup EXIT
+tmp=$(mktemp "${PINS_FILE}.XXXXXX")
+read_pins | "$JQ_BIN" -c --arg field "$field" --arg value "$value" '
+  .[$field] |= (if index($value) then map(select(. != $value)) else . + [$value] end)
+' > "$tmp"
+mv -f "$tmp" "$PINS_FILE"
+tmp=''
+read_pins

package/bin/sesh-shortcuts.sh

@@ -7,7 +7,9 @@ sesh shortcuts
   Enter             Resume the selected session here
   Ctrl-F            Resume the selected session as a fork
   Ctrl-G            Toggle current-directory scope / all sessions
-  Space             Toggle transcript preview
+  Ctrl-P            Toggle transcript preview
+  Option-S          Pin / unpin selected session
+  Option-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

@@ -90,6 +90,7 @@ q_list=$(shell_quote "$SCRIPT_DIR/sesh-list.sh")
 q_worker=$(shell_quote "$SCRIPT_DIR/sesh-refresh-worker.sh")
 q_preview=$(shell_quote "$SCRIPT_DIR/sesh-preview.sh")
 q_delete=$(shell_quote "$SCRIPT_DIR/sesh-delete.sh")
+q_pins=$(shell_quote "$SCRIPT_DIR/sesh-pins.sh")
 q_shortcuts=$(shell_quote "$SCRIPT_DIR/sesh-shortcuts.sh")
 q_state=$(shell_quote "$state_dir")
 export SESH_LIST="$SCRIPT_DIR/sesh-list.sh"
@@ -119,6 +120,8 @@ preview_cmd="if [ -f $q_state/help ]; then $q_shortcuts; else $q_preview $q_stat
 help_bind="?:transform:[ -z {q} ] && ( [ -f $q_state/help ] && rm -f $q_state/help && echo hide-preview || ( : > $q_state/help && echo show-preview+refresh-preview ) ) || echo 'put(?)'"
 toggle_cmd="$q_list --toggle-scope --state-dir $q_state >/dev/null"
 delete_cmd="$q_delete $q_state {2}"
+pin_session_cmd="$q_pins toggle-session {2}"
+pin_directory_cmd="$q_pins toggle-directory {5}"
 
 query="$picker_query"
 while :; do
@@ -128,10 +131,12 @@ while :; do
   selection=$(FZF_DEFAULT_COMMAND='printf ""' FZF_DEFAULT_OPTS='' FZF_DEFAULT_OPTS_FILE='' "$SESH_FZF" --print-query --expect=ctrl-f --query="$query" --ansi --delimiter=$'\t' --with-nth=4 --track --id-nth=6 --disabled --layout=reverse --info=hidden --prompt='❯ ' \
     --preview="$preview_cmd" --preview-window='right,50%,wrap,hidden' \
     --header-first --header="$header_line" \
-    --bind='space:transform:[ -z {q} ] && echo toggle-preview || echo "put( )"' \
+    --bind='ctrl-p:toggle-preview' \
     --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="change:reload:$cache_cmd" \
     --bind="start,every(3):transform-header($header_cmd)+reload-sync:$cache_cmd")
 status=$?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-sesh",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "description": "Browse, search, preview and resume opencode sessions from the terminal and the TUI.",
   "license": "MIT",

package/tui/sesh-panel.tsx

@@ -2,8 +2,9 @@
 import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui"
 import type { Project, Session } from "@opencode-ai/sdk/v2"
 import { createEffect, createMemo, createSignal, For, onCleanup, onMount, Show } from "solid-js"
-import { readFile } from "node:fs/promises"
-import { RGBA, SyntaxStyle, TextAttributes } from "@opentui/core"
+import { mkdir, readFile, rename, rmdir, unlink, writeFile } from "node:fs/promises"
+import { dirname, join } from "node:path"
+import { getTreeSitterClient, RGBA, SyntaxStyle, TextAttributes } from "@opentui/core"
 
 type ThemeColors = TuiPluginApi["theme"]["current"]
 
@@ -49,21 +50,24 @@ function buildMarkdownStyle(theme: ThemeColors): SyntaxStyle {
       ],
       style: { foreground: theme.error },
     },
-    { scope: ["markup.heading"], style: { foreground: theme.markdownHeading, bold: true } },
+    // Some opencode themes give Markdown roles the same foreground as body
+    // text. Use their semantic accents here so transcript structure remains
+    // legible without recoloring the surrounding TUI or ordinary prose.
+    { scope: ["markup.heading"], style: { foreground: theme.accent, bold: true } },
     {
       scope: ["markup.heading.1"],
-      style: { foreground: theme.markdownHeading, bold: true, underline: true },
+      style: { foreground: theme.primary, bold: true, underline: true },
     },
     {
       scope: ["markup.heading.2", "markup.heading.3", "markup.heading.4", "markup.heading.5", "markup.heading.6"],
-      style: { foreground: theme.markdownHeading, bold: true },
+      style: { foreground: theme.accent, bold: true },
     },
-    { scope: ["markup.bold", "markup.strong"], style: { foreground: theme.markdownStrong, bold: true } },
-    { scope: ["markup.italic"], style: { foreground: theme.markdownEmph, italic: true } },
-    { scope: ["markup.list"], style: { foreground: theme.markdownListItem } },
+    { scope: ["markup.bold", "markup.strong"], style: { foreground: theme.accent, bold: true } },
+    { scope: ["markup.italic"], style: { foreground: theme.syntaxString, italic: true } },
+    { scope: ["markup.list"], style: { foreground: theme.syntaxKeyword } },
     { scope: ["markup.quote"], style: { foreground: theme.markdownBlockQuote, italic: true } },
-    { scope: ["markup.raw", "markup.raw.block"], style: { foreground: theme.markdownCode } },
-    { scope: ["markup.raw.inline"], style: { foreground: theme.markdownCode, background: theme.background } },
+    { scope: ["markup.raw", "markup.raw.block"], style: { foreground: theme.syntaxString } },
+    { scope: ["markup.raw.inline"], style: { foreground: theme.syntaxString, background: theme.background } },
     {
       scope: ["markup.link", "markup.link.url", "string.special", "string.special.url"],
       style: { foreground: theme.markdownLink, underline: true },
@@ -87,6 +91,77 @@ function getMarkdownStyle(theme: ThemeColors): SyntaxStyle | undefined {
   }
 }
 
+type Pins = { sessions: string[]; directories: string[] }
+const emptyPins = (): Pins => ({ sessions: [], directories: [] })
+const pinsPath = () =>
+  process.env.SESH_PINS_FILE ?? join(process.env.XDG_DATA_HOME ?? join(process.env.HOME ?? "", ".local/share"), "sesh/pins.json")
+
+async function readPins(): Promise<Pins> {
+  try {
+    const data = JSON.parse(await readFile(pinsPath(), "utf8")) as Partial<Pins>
+    return {
+      sessions: Array.isArray(data.sessions) ? data.sessions.filter((id): id is string => typeof id === "string") : [],
+      directories: Array.isArray(data.directories) ? data.directories.filter((dir): dir is string => typeof dir === "string") : [],
+    }
+  } catch {
+    return emptyPins()
+  }
+}
+
+async function togglePin(kind: keyof Pins, value: string): Promise<Pins> {
+  const file = pinsPath()
+  await mkdir(dirname(file), { recursive: true })
+  const lock = `${file}.lock`
+  let locked = false
+  for (let attempt = 0; attempt < 50; attempt++) {
+    try {
+      await mkdir(lock)
+      locked = true
+      break
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error
+      try {
+        const owner = Number((await readFile(join(lock, "pid"), "utf8")).trim())
+        if (Number.isSafeInteger(owner) && owner > 0) {
+          try {
+            process.kill(owner, 0)
+          } catch (check) {
+            if ((check as NodeJS.ErrnoException).code === "ESRCH") {
+              await unlink(join(lock, "pid")).catch(() => {})
+              await rmdir(lock).catch(() => {})
+            }
+          }
+        }
+      } catch {}
+      await new Promise((resolve) => setTimeout(resolve, 100))
+    }
+  }
+  if (!locked) throw new Error("pins are busy")
+  const tmp = `${file}.${process.pid}.${Math.random().toString(36).slice(2)}`
+  try {
+    await writeFile(join(lock, "pid"), `${process.pid}\n`)
+    const next = await readPins()
+    next[kind] = next[kind].includes(value) ? next[kind].filter((item) => item !== value) : [...next[kind], value]
+    await writeFile(tmp, JSON.stringify(next) + "\n", { mode: 0o600 })
+    await rename(tmp, file)
+    return next
+  } finally {
+    await unlink(tmp).catch(() => {})
+    await unlink(join(lock, "pid")).catch(() => {})
+    await rmdir(lock)
+  }
+}
+
+function pinnedFirst(entries: Entry[], pins: Pins): Entry[] {
+  const sessions = new Set(pins.sessions)
+  const directories = new Set(pins.directories)
+  return [...entries].sort((a, b) => {
+    const aRank = sessions.has(a.id) ? 2 : directories.has(a.dir) ? 1 : 0
+    const bRank = sessions.has(b.id) ? 2 : directories.has(b.dir) ? 1 : 0
+    return bRank - aRank || b.updated - a.updated
+  })
+}
+
 // Sessions panel: an opencode-native session switcher in two parts.
 //
 // 1. Sidebar (always visible): a compact recent-sessions section appended to
@@ -137,10 +212,9 @@ const SIDEBAR_TITLE_WIDTH = 27
 const SIDEBAR_GROUP_WIDTH = 30
 const HOME_TITLE_WIDTH = 30
 
-// The sidebar is a glanceable recent list, not a second picker: cap it so the
-// section cannot grow into a scrolling wall (the docs promise "most recent"),
-// and point at the picker for everything else.
-const SIDEBAR_LIMIT = 15
+// The sidebar lists every session (newest first, pins ahead) and fills
+// whatever vertical space it gets: overflow scrolls inside the stretched
+// scrollbox. The picker (ctrl+o) remains the place for transcript search.
 
 // Uppercase is included deliberately: a search box that silently drops shifted
 // letters cannot be used for acronyms or paths like README.
@@ -269,7 +343,7 @@ function addTranscript(index: Map<string, string>, sid: string, data: string): v
 async function buildSearchIndex(
   api: TuiPluginApi,
   entries: Entry[],
-  onProgress?: (progress: IndexProgress) => void,
+  onProgress?: (progress: IndexProgress, index: Map<string, string>) => void,
 ): Promise<Map<string, string>> {
   const index = new Map<string, string>()
   for (const entry of entries) {
@@ -279,7 +353,7 @@ async function buildSearchIndex(
   const remaining = new Set(ids)
   const total = ids.length
   let indexed = 0
-  const report = (complete: boolean) => onProgress?.({ indexed, total, complete })
+  const report = (complete: boolean) => onProgress?.({ indexed, total, complete }, index)
   report(false)
 
   const db = await openTranscriptDb()
@@ -309,7 +383,7 @@ async function buildSearchIndex(
   if (remaining.size > 0) {
     await buildSearchIndexRemote(api, [...remaining], index, () => {
       indexed += 1
-      report(false)
+      if (indexed % TRANSCRIPT_BATCH === 0) report(false)
     })
   }
   report(true)
@@ -446,7 +520,9 @@ function createTranscriptPreview(api: TuiPluginApi) {
     }
     setPreviewID(entry.id)
     setPreviewText("Loading…")
-    void fetchTranscriptText(api, entry.id).then(setPreviewText)
+    void fetchTranscriptText(api, entry.id).then((text) => {
+      if (previewID() === entry.id) setPreviewText(text)
+    })
     api.ui.dialog.replace(
       () => (
         <box flexDirection="column" paddingLeft={4} paddingRight={4} paddingBottom={1} gap={1}>
@@ -464,7 +540,11 @@ function createTranscriptPreview(api: TuiPluginApi) {
             maxHeight={Math.max(6, Math.floor(api.renderer.height / 2))}
           >
             {getMarkdownStyle(api.theme.current) ? (
-              <markdown content={previewText()} syntaxStyle={getMarkdownStyle(api.theme.current)!} />
+              <markdown
+                content={previewText()}
+                syntaxStyle={getMarkdownStyle(api.theme.current)!}
+                treeSitterClient={getTreeSitterClient()}
+              />
             ) : (
               <text wrapMode="word">{previewText()}</text>
             )}
@@ -500,10 +580,13 @@ type TreeRow =
   | { kind: "group"; dir: string; label: string; count: number }
   | { kind: "item"; entry: Entry; last: boolean }
 
-function SidebarSessions(props: { api: TuiPluginApi }) {
+type PinProps = { pins: () => Pins; onTogglePin: (kind: keyof Pins, value: string) => void; refreshPins: () => void }
+
+function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
   const theme = () => props.api.theme.current
   const home = process.env.HOME ?? ""
   const [entries, setEntries] = createSignal<Entry[]>([])
+  const [sectionCollapsed, setSectionCollapsed] = createSignal(false)
   const [collapsed, setCollapsed] = createSignal<Record<string, boolean>>({})
   const [hovered, setHovered] = createSignal<string>()
   const preview = createTranscriptPreview(props.api)
@@ -525,6 +608,7 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
   onMount(() => {
     let alive = true
     const load = async () => {
+      props.refreshPins()
       try {
         const { entries: all } = await fetchEntries(props.api)
         if (alive) {
@@ -547,13 +631,14 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
 
   const filteredEntries = createMemo(() => {
     const q = query().trim().toLowerCase()
-    if (!q) return entries()
-    return entries().filter(
+    const ordered = pinnedFirst(entries(), props.pins())
+    if (!q) return ordered
+    return ordered.filter(
       (entry) => entry.title.toLowerCase().includes(q) || entry.dir.toLowerCase().includes(q),
     )
   })
 
-  const shownEntries = createMemo(() => filteredEntries().slice(0, SIDEBAR_LIMIT))
+  const shownEntries = createMemo(() => filteredEntries())
   const remaining = createMemo(() => Math.max(0, filteredEntries().length - shownEntries().length))
 
   const tree = createMemo<TreeRow[]>(() => {
@@ -565,7 +650,12 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
     }
     const ordered = [...groups.entries()]
       .map(([dir, list]) => ({ dir, list, updated: Math.max(...list.map((entry) => entry.updated)) }))
-      .sort((a, b) => b.updated - a.updated)
+      .sort((a, b) => {
+        const pins = props.pins()
+        const rank = (group: { dir: string; list: Entry[] }) =>
+          pins.directories.includes(group.dir) ? 2 : group.list.some((entry) => pins.sessions.includes(entry.id)) ? 1 : 0
+        return rank(b) - rank(a) || b.updated - a.updated
+      })
     const rows: TreeRow[] = []
     for (const group of ordered) {
       rows.push({ kind: "group", dir: group.dir, label: prettyDir(group.dir, home), count: group.list.length })
@@ -581,6 +671,16 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
     setCollapsed((prev) => ({ ...prev, [dir]: !prev[dir] }))
   }
 
+  const toggleSection = () => {
+    if (!sectionCollapsed()) {
+      cancelDelete()
+      setNavActive(false)
+      setSearching(false)
+      setHovered(undefined)
+    }
+    setSectionCollapsed((value) => !value)
+  }
+
   // Flat order of the rows a cursor can land on, so keyboard navigation and
   // mouse hover resolve to the same row.
   const itemRows = createMemo(() => tree().flatMap((row) => (row.kind === "item" ? [row.entry] : [])))
@@ -591,9 +691,14 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
     if (count === 0) return
     setCursor((value) => Math.max(0, Math.min(count - 1, value + delta)))
   }
+  let previousRows: Entry[] = []
   createEffect(() => {
-    const count = itemRows().length
-    if (cursor() >= count) setCursor(Math.max(0, count - 1))
+    const rows = itemRows()
+    const selected = previousRows[cursor()]?.id
+    const position = rows.findIndex((entry) => entry.id === selected)
+    if (position >= 0 && position !== cursor()) setCursor(position)
+    else if (cursor() >= rows.length) setCursor(Math.max(0, rows.length - 1))
+    previousRows = rows
   })
 
   const sessionStatus = (id: string): "running" | "waiting" | "idle" => {
@@ -621,8 +726,9 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
   }
 
   // Deleting is irreversible, so ctrl+x arms the row and a second ctrl+x (or y)
-  // commits it. Anything else — another row, five seconds, a keypress elsewhere
-  // — lets it go. The old behaviour deleted whatever was hovered outright.
+  // commits it. The arm survives pointer movement — edge-hover flicker must
+  // not eat the confirm — and is cleared by the five-second timeout, n, Esc,
+  // collapsing the section, or the delete itself.
   const requestDelete = (entry: Entry) => {
     if (deleting()) return
     if (pendingDelete() === entry.id) {
@@ -634,6 +740,18 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
     confirmTimer = setTimeout(() => setPendingDelete(undefined), 5000)
   }
 
+  // The confirm always targets the visibly armed row ("ctrl+x again"),
+  // wherever the pointer or cursor currently is. Returns true when an arm
+  // was pending (and is now committed or discarded as stale).
+  const confirmArmed = (): boolean => {
+    const id = pendingDelete()
+    if (!id) return false
+    const entry = entries().find((e) => e.id === id)
+    if (!entry) cancelDelete()
+    else void deleteEntry(entry)
+    return true
+  }
+
   const deleteEntry = async (entry: Entry) => {
     cancelDelete()
     if (deleting()) return
@@ -710,7 +828,7 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
       priority: 20,
       bindings: [
         {
-          key: "space",
+          key: "ctrl+p",
           desc: "Preview session transcript",
           preventDefault: true,
           cmd: () => openSidebarPreview(entry),
@@ -719,8 +837,12 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
           key: "ctrl+x",
           desc: "Delete session",
           preventDefault: true,
-          cmd: () => requestDelete(entry),
+          cmd: () => {
+            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: "/",
           desc: "Search sessions",
@@ -731,13 +853,6 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
     })
   })
 
-  // Mouse hover must not commit a keyboard-initiated confirm (and vice versa):
-  // leaving the armed row abandons the pending delete.
-  createEffect(() => {
-    const pending = pendingDelete()
-    if (pending && !navActive() && pending !== hovered()) cancelDelete()
-  })
-
   // Keyboard navigation is opt-in (click the "Sessions" heading or the search
   // box) so the sidebar never steals the arrow keys from the main prompt.
   createEffect(() => {
@@ -757,7 +872,7 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
         cmd: () => setCursor(Math.max(0, itemRows().length - 1)),
       },
       {
-        key: "space",
+        key: "ctrl+p",
         desc: "Preview session transcript",
         preventDefault: true,
         cmd: () => {
@@ -770,10 +885,29 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
         desc: "Delete session",
         preventDefault: true,
         cmd: () => {
+          if (confirmArmed()) return
           const entry = itemRows()[cursor()]
           if (entry) requestDelete(entry)
         },
       },
+      {
+        key: "option+s",
+        desc: "Pin session",
+        preventDefault: true,
+        cmd: () => {
+          const entry = itemRows()[cursor()]
+          if (entry) props.onTogglePin("sessions", entry.id)
+        },
+      },
+      {
+        key: "option+d",
+        desc: "Pin directory",
+        preventDefault: true,
+        cmd: () => {
+          const entry = itemRows()[cursor()]
+          if (entry) props.onTogglePin("directories", entry.dir)
+        },
+      },
       {
         key: "enter",
         desc: "Open session",
@@ -799,8 +933,7 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
               desc: "Confirm delete",
               preventDefault: true,
               cmd: () => {
-                const entry = itemRows()[cursor()]
-                if (entry && pendingDelete() === entry.id) void deleteEntry(entry)
+                confirmArmed()
               },
             },
             { key: "n", desc: "Cancel delete", preventDefault: true, cmd: cancelDelete },
@@ -818,16 +951,22 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
   })
 
   return (
-    <box flexDirection="column" paddingRight={1}>
-      <box flexDirection="row" gap={1} onMouseDown={() => setNavActive((value) => !value)}>
-        <text>
+    <box flexDirection="column" paddingRight={1} flexGrow={1} flexShrink={1}>
+      <box flexDirection="row" justifyContent="space-between" gap={1}>
+        <text flexShrink={1} onMouseDown={() => {
+          if (!sectionCollapsed()) setNavActive((value) => !value)
+        }}>
           <b>Sessions</b>
           <span style={{ fg: theme().textMuted }}>
             {query().trim() ? ` (${filteredEntries().length}/${entries().length})` : ` (${entries().length})`}
           </span>
-          <span style={{ fg: navActive() ? theme().accent : theme().textMuted }}>{navActive() ? "  ▸ nav" : "  ▸"}</span>
+          <span style={{ fg: theme().accent }}>{navActive() ? " · nav" : ""}</span>
+        </text>
+        <text flexShrink={0} style={{ fg: theme().textMuted }} onMouseDown={toggleSection}>
+          {sectionCollapsed() ? "▸ show" : "▾ hide"}
         </text>
       </box>
+      <Show when={!sectionCollapsed()}>
       <Show
         when={entries().length > 0}
         fallback={
@@ -864,6 +1003,8 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
           </Show>
         </box>
         <scrollbox
+          flexGrow={1}
+          flexShrink={1}
           verticalScrollbarOptions={{ visible: false }}
           horizontalScrollbarOptions={{ visible: false }}
         >
@@ -873,7 +1014,7 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
               <box flexDirection="row" paddingTop={1} onMouseDown={() => toggleGroup(row.dir)}>
                 <text flexGrow={1} flexShrink={1} wrapMode="none">
                   <span style={{ fg: theme().textMuted }}>{collapsed()[row.dir] ? "▸ " : "▾ "}</span>
-                  <b>{truncate(row.label, SIDEBAR_GROUP_WIDTH)}</b>
+                  <b>{props.pins().directories.includes(row.dir) ? "★ " : ""}{truncate(row.label, SIDEBAR_GROUP_WIDTH - (props.pins().directories.includes(row.dir) ? 2 : 0))}</b>
                 </text>
                 <text flexShrink={0} style={{ fg: theme().textMuted }}>
                   {" "}({row.count})
@@ -890,7 +1031,16 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
                     ? theme().backgroundElement
                     : RGBA.fromInts(0, 0, 0, 0)
                 }
-                onMouseOver={() => setHovered(row.entry.id)}
+                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
+                  // cannot silently pin a different (often current) session.
+                  if (navActive()) {
+                    const index = itemRows().findIndex((entry) => entry.id === row.entry.id)
+                    if (index >= 0) setCursor(index)
+                  }
+                }}
                 onMouseOut={() => setHovered(undefined)}
                 onMouseDown={() => props.api.route.navigate("session", { sessionID: row.entry.id })}
               >
@@ -909,7 +1059,7 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
                   </span>
                 </text>
                 <Highlighted
-                  text={truncate(row.entry.title, SIDEBAR_TITLE_WIDTH)}
+                  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 : theme().text}
                   matchColor={theme().warning}
@@ -925,19 +1075,23 @@ function SidebarSessions(props: { api: TuiPluginApi }) {
         <Show when={remaining() > 0}>
           <text style={{ fg: theme().textMuted }}>{`… ${remaining()} more · ctrl+o for all`}</text>
         </Show>
+        <Show when={query().trim() && filteredEntries().length === 0}>
+          <text style={{ fg: theme().textMuted }}>No title or directory matches · ctrl+o to search transcripts</text>
+        </Show>
         <Show when={navActive()}>
           <box paddingTop={1}>
-            <text style={{ fg: theme().textMuted }}>↑↓ move · enter open · space preview · ctrl+x delete · esc done</text>
+            <text style={{ fg: theme().textMuted }}>↑↓ move · enter open · ctrl+p preview · option+s/d pin · ctrl+x delete · esc done</text>
           </box>
         </Show>
       </Show>
+      </Show>
     </box>
   )
 }
 
 const HOME_SESSION_LIMIT = 6
 
-function HomeSessions(props: { api: TuiPluginApi }) {
+function HomeSessions(props: { api: TuiPluginApi } & PinProps) {
   const theme = () => props.api.theme.current
   const home = process.env.HOME ?? ""
   const [entries, setEntries] = createSignal<Entry[]>([])
@@ -992,11 +1146,13 @@ function HomeSessions(props: { api: TuiPluginApi }) {
       priority: 20,
       bindings: [
         {
-          key: "space",
+          key: "ctrl+p",
           desc: "Preview session transcript",
           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) },
       ],
     })
   })
@@ -1007,6 +1163,7 @@ function HomeSessions(props: { api: TuiPluginApi }) {
   onMount(() => {
     let alive = true
     const load = async () => {
+      props.refreshPins()
       try {
         const { entries: all } = await fetchEntries(props.api)
         if (alive) {
@@ -1032,7 +1189,7 @@ function HomeSessions(props: { api: TuiPluginApi }) {
           (entry) => entry.title.toLowerCase().includes(q) || entry.dir.toLowerCase().includes(q),
         )
       : entries()
-    return list.slice(0, HOME_SESSION_LIMIT)
+    return pinnedFirst(list, props.pins()).slice(0, HOME_SESSION_LIMIT)
   })
 
   return (
@@ -1097,19 +1254,19 @@ function HomeSessions(props: { api: TuiPluginApi }) {
                 ○
               </text>
               <Highlighted
-                text={truncate(entry.title, HOME_TITLE_WIDTH)}
+                text={`${props.pins().sessions.includes(entry.id) ? "★ " : ""}${truncate(entry.title, HOME_TITLE_WIDTH - (props.pins().sessions.includes(entry.id) ? 2 : 0))}`}
                 query={query()}
                 color={theme().text}
                 matchColor={theme().warning}
               />
               <text flexShrink={0} style={{ fg: theme().textMuted }}>
-                {prettyDir(entry.dir, home)} · {ago(entry.updated)}
+                {props.pins().directories.includes(entry.dir) ? "★ " : ""}{prettyDir(entry.dir, home)} · {ago(entry.updated)}
               </text>
             </box>
           )}
         </For>
         <Show when={visible().length === 0}>
-          <text style={{ fg: theme().textMuted }}>No matching sessions</text>
+          <text style={{ fg: theme().textMuted }}>No title or directory matches · ctrl+o to search transcripts</text>
         </Show>
       </Show>
     </box>
@@ -1117,19 +1274,40 @@ function HomeSessions(props: { api: TuiPluginApi }) {
 }
 
 const tui: TuiPlugin = async (api) => {
+  const [pins, setPins] = createSignal<Pins>(emptyPins())
+  let pinVersion = 0
+  const refreshPins = () => {
+    const version = pinVersion
+    void readPins().then((latest) => {
+      if (version === pinVersion) setPins(latest)
+    })
+  }
+  refreshPins()
+  const onTogglePin = (kind: keyof Pins, value: string) => {
+    if (!value) return
+    pinVersion += 1
+    void togglePin(kind, value).then(
+      (updated) => {
+        setPins(updated)
+        api.ui.toast({ message: `${updated[kind].includes(value) ? "Pinned" : "Unpinned"} ${kind === "sessions" ? "session" : "directory"}`, variant: "info" })
+      },
+      () => api.ui.toast({ message: "Could not update pins", variant: "error" }),
+    )
+  }
   api.slots.register({
     order: 100,
     slots: {
       sidebar_content() {
-        return <SidebarSessions api={api} />
+        return <SidebarSessions api={api} pins={pins} onTogglePin={onTogglePin} refreshPins={refreshPins} />
       },
       home_bottom() {
-        return <HomeSessions api={api} />
+        return <HomeSessions api={api} pins={pins} onTogglePin={onTogglePin} refreshPins={refreshPins} />
       },
     },
   })
 
   const openPicker = async () => {
+    refreshPins()
     if (api.mode.current() !== BASE_MODE) return
     if (api.renderer.currentFocusedEditor === null) return
 
@@ -1159,16 +1337,20 @@ const tui: TuiPlugin = async (api) => {
       total: 0,
       complete: false,
     })
-    void buildSearchIndex(api, entries, setIndexProgress).then(setSearchIndex)
-    let pickerInput: { value: string; isDestroyed?: boolean } | undefined
-
+    void buildSearchIndex(api, entries, (progress, index) => {
+      setIndexProgress(progress)
+      // Publish a fresh snapshot: the indexing workers mutate their own map,
+      // while Solid needs a new reference to update search results mid-scan.
+      setSearchIndex(new Map(index))
+    })
     type DialogRow = { kind: "group"; label: string; count: number } | { kind: "item"; entry: Entry }
 
+    const orderedEntries = createMemo(() => pinnedFirst(allEntries(), pins()))
     const matchedGroups = createMemo(() => {
       const q = query().trim().toLowerCase()
       const index = searchIndex()
       const group = scope()
-      const matched = allEntries().filter((entry) => {
+      const matched = orderedEntries().filter((entry) => {
         if (group && entry.group !== group) return false
         if (!q) return true
         const haystack = index.get(entry.id) ?? `${entry.title} ${entry.dir}`.toLowerCase()
@@ -1180,7 +1362,14 @@ const tui: TuiPlugin = async (api) => {
         list.push(entry)
         byGroup.set(entry.group, list)
       }
-      return [...byGroup.entries()].map(([name, list]) => ({ name, list }))
+      const groups = [...byGroup.entries()].map(([name, list]) => ({ name, list }))
+      const currentPins = pins()
+      const rank = (group: (typeof groups)[number]) =>
+        group.list.some((entry) => currentPins.directories.includes(entry.dir)) ? 2
+          : group.list.some((entry) => currentPins.sessions.includes(entry.id)) ? 1 : 0
+      return groups.sort((a, b) =>
+        rank(b) - rank(a) || Math.max(...b.list.map((entry) => entry.updated)) - Math.max(...a.list.map((entry) => entry.updated)),
+      )
     })
 
     const selectableEntries = createMemo(() => matchedGroups().flatMap((g) => g.list))
@@ -1202,9 +1391,14 @@ const tui: TuiPlugin = async (api) => {
       return bits.join(" · ")
     })
 
+    let previousSelection: Entry[] = []
     createEffect(() => {
-      const count = selectableEntries().length
-      if (cursor() >= count) setCursor(Math.max(0, count - 1))
+      const rows = selectableEntries()
+      const selected = previousSelection[cursor()]?.id
+      const position = rows.findIndex((entry) => entry.id === selected)
+      if (position >= 0 && position !== cursor()) setCursor(position)
+      else if (cursor() >= rows.length) setCursor(Math.max(0, rows.length - 1))
+      previousSelection = rows
     })
 
     const pickerRows = createMemo<DialogRow[]>(() => {
@@ -1273,8 +1467,8 @@ const tui: TuiPlugin = async (api) => {
         setPreviewText(cached)
         return
       }
-      // Keep the previous transcript visible while the next one loads so the
-      // preview does not blink away on every cursor move.
+      // Never show another session's transcript beneath the new selection.
+      setPreviewText("Loading…")
       previewTimer = setTimeout(() => void loadPreview(id), 120)
     })
 
@@ -1375,6 +1569,15 @@ const tui: TuiPlugin = async (api) => {
           cmd: () => setCursor(selectableEntries().length - 1),
         },
         { 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: () => {
+          const entry = selectableEntries()[cursor()]
+          if (entry) onTogglePin("sessions", entry.id)
+        } },
+        { key: "option+d", desc: "Pin directory", preventDefault: true, cmd: () => {
+          const entry = selectableEntries()[cursor()]
+          if (entry) onTogglePin("directories", entry.dir)
+        } },
         {
           key: "ctrl+x",
           desc: "Delete session",
@@ -1425,16 +1628,6 @@ const tui: TuiPlugin = async (api) => {
       if (previewTimer) clearTimeout(previewTimer)
     }
 
-    const onSearchInput = (value: string) => {
-      if (query() === "" && value.trim() === "" && value.length > 0) {
-        if (pickerInput && !pickerInput.isDestroyed) pickerInput.value = ""
-        setQuery("")
-        togglePreview()
-        return
-      }
-      setQuery(value)
-    }
-
     api.ui.dialog.replace(
       () => (
         <box flexDirection="column" flexGrow={1} paddingBottom={1} gap={1}>
@@ -1449,7 +1642,6 @@ const tui: TuiPlugin = async (api) => {
             </box>
             <box paddingTop={1}>
               <input
-                ref={(r) => (pickerInput = r)}
                 focused
                 placeholder="Search title, directory, transcript…"
                 value={query()}
@@ -1457,7 +1649,7 @@ const tui: TuiPlugin = async (api) => {
                 focusedBackgroundColor={api.theme.current.backgroundPanel}
                 focusedTextColor={api.theme.current.text}
                 cursorColor={api.theme.current.primary}
-                onInput={onSearchInput}
+                onInput={setQuery}
                 onSubmit={() => choose()}
                 onKeyDown={(event) => {
                   if (event.name === "escape") {
@@ -1486,7 +1678,7 @@ const tui: TuiPlugin = async (api) => {
                   row.kind === "group" ? (
                     <box paddingTop={1} paddingLeft={4}>
                       <text style={{ fg: api.theme.current.accent }} attributes={TextAttributes.BOLD}>
-                        {row.label} <span style={{ fg: api.theme.current.textMuted }}>({row.count})</span>
+                        {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>
                     </box>
                   ) : (
@@ -1516,7 +1708,7 @@ const tui: TuiPlugin = async (api) => {
                         </text>
                       </Show>
                       <Highlighted
-                        text={truncate(row.entry.title, 61)}
+                        text={`${pins().sessions.includes(row.entry.id) ? "★ " : ""}${truncate(row.entry.title, pins().sessions.includes(row.entry.id) ? 59 : 61)}`}
                         query={query()}
                         bold={row.entry.id === selectableEntries()[cursor()]?.id}
                         color={
@@ -1543,7 +1735,12 @@ const tui: TuiPlugin = async (api) => {
                       >
                         {pendingDelete()?.id === row.entry.id
                           ? "press y to delete"
-                          : `${prettyDir(row.entry.dir, process.env.HOME ?? "")} · ${ago(row.entry.updated)}`}
+                          : `${prettyDir(row.entry.dir, process.env.HOME ?? "")} · ${ago(row.entry.updated)}${
+                              query().trim() &&
+                              !`${row.entry.title} ${row.entry.dir}`.toLowerCase().includes(query().trim().toLowerCase())
+                                ? " · transcript match"
+                                : ""
+                            }`}
                       </text>
                     </box>
                   )
@@ -1552,7 +1749,11 @@ const tui: TuiPlugin = async (api) => {
               <Show when={selectableEntries().length === 0}>
                 <box paddingLeft={4} paddingRight={4}>
                   <text style={{ fg: api.theme.current.textMuted }}>
-                    {scope() ? `No sessions in ${scope()}` : "No sessions match this search"}
+                    {!indexProgress().complete
+                      ? "No matches yet · still searching transcripts…"
+                      : scope()
+                        ? `No matches in ${scope()} · ctrl+g for all projects`
+                        : "No sessions match · try another search"}
                   </text>
                 </box>
               </Show>
@@ -1560,20 +1761,23 @@ const tui: TuiPlugin = async (api) => {
           <Show when={showPreview()}>
             <box flexShrink={0} flexDirection="column" paddingLeft={4} paddingRight={4} height={12}>
               <text style={{ fg: api.theme.current.textMuted }} attributes={TextAttributes.BOLD}>
-                Preview
+                {previewID() ? `Preview · ${truncate(selectableEntries()[cursor()]!.title, 48)}` : "Preview"}
               </text>
               <scrollbox flexGrow={1} scrollbarOptions={{ visible: false }}>
-                <Show
-                  when={previewText()}
-                  fallback={<text style={{ fg: api.theme.current.textMuted }}>Loading…</text>}
-                >
-                  {(text) =>
-                    getMarkdownStyle(api.theme.current) ? (
-                      <markdown content={text()} syntaxStyle={getMarkdownStyle(api.theme.current)!} />
-                    ) : (
-                      <text wrapMode="word">{text()}</text>
-                    )
-                  }
+                <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>}>
+                    {(text) =>
+                      getMarkdownStyle(api.theme.current) ? (
+                        <markdown
+                          content={text()}
+                          syntaxStyle={getMarkdownStyle(api.theme.current)!}
+                          treeSitterClient={getTreeSitterClient()}
+                        />
+                      ) : (
+                        <text wrapMode="word">{text()}</text>
+                      )
+                    }
+                  </Show>
                 </Show>
               </scrollbox>
             </box>
@@ -1586,7 +1790,7 @@ const tui: TuiPlugin = async (api) => {
             >
               {pendingDelete()
                 ? `Delete "${truncate(pendingDelete()!.title, 40)}"? y confirm · n cancel`
-                : "↑↓ navigate · enter open · ctrl+x delete · ctrl+f fork · ctrl+g project · space preview · esc close"}
+                : "↑↓ navigate · enter open · option+s/d pin · ctrl+x delete · ctrl+f fork · ctrl+g project · ctrl+p preview · esc close"}
             </text>
           </box>
         </box>