opencode-sesh 0.7.3 → 0.9.0

package/AGENTS.md

@@ -139,8 +139,10 @@ 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 pinned sessions before the newest unarchived
-  sessions, with the current one highlighted, polled every 15 s; Ctrl-P previews
+  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
   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.
@@ -158,7 +160,13 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
   at `SESSION_MAX` and reported when truncated) instead of a fixed 500-row
   window, then indexes transcript text for **every** session in batches
   (`TRANSCRIPT_BATCH`) with bounded remote concurrency (`REMOTE_CONCURRENCY`).
-  The header shows indexing progress/coverage. `tests/tui.mjs` locks this.
+  The header shows indexing progress/coverage. Visible transcript hits get
+  short excerpts from the text-only index (never tool or reasoning payloads).
+  Project, needs-input (Option-W), and pinned-session (Option-P) filters compose
+  with the query; the picker remembers query/scope/filters until plugin restart.
+  `/sesh-needs` uses the shared needs-input set plus the oldest unresolved
+  question or running-tool timestamp, lists longest-waiting first, and `n`
+  opens the next waiting session. `tests/tui.mjs` locks the data layer.
 - **Durable install:** opencode imports plugins once at startup and never hot
   reloads, so panel changes need a full quit/reopen. `install.sh --sync-panel`
   (run by the `postinstall`) refreshes an already-installed panel and is a

package/CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.0] - 2026-09-24
+
+### Added
+
+- The TUI picker shows a highlighted excerpt for matching transcript text,
+  offers composable project, needs-input and pinned-session filters, and keeps
+  the query and filters when reopened during the same opencode run.
+- `/sesh-needs` shows how long each session has waited, puts the longest-waiting
+  first, and can open the next waiting session with `n`.
+## [0.8.0] - 2026-09-24
+
+### Changed
+
+- Sidebar and picker sessions within each directory now sort by last update,
+  newest first, even when a session is pinned. Sidebar titles and labels make
+  waiting, running, and currently open idle sessions distinguishable at a glance.
 ## [0.7.3] - 2026-09-24
 
 ### Removed
@@ -326,7 +342,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.7.3...HEAD
+[Unreleased]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.9.0...HEAD
+[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
 [0.7.2]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.7.1...v0.7.2
 [0.7.1]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.7.0...v0.7.1

package/README.md

@@ -175,6 +175,7 @@ non-interactive `sesh-delete.sh` refuses unless given `--yes`.
 | 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-W / Option-P | Show only sessions needing input / pinned sessions |
 | Option-S / Option-D | Pin or unpin the selected session / directory |
 | Esc | Close |
 
@@ -182,11 +183,14 @@ 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
-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.
+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.
+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.
 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.
@@ -194,7 +198,12 @@ 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
 indexing progress under the search box. It only stops at a safety cap of 5,000
-sessions, and says so when it does.
+sessions, and says so when it does. Transcript matches show a short excerpt
+under the result; the Project, Needs input, and Pinned filters combine with
+search. The picker remembers your query and filters until you restart opencode.
+The Needs input dialog (`/sesh-needs`) shows why and how long each session has
+been waiting, oldest first. Press `n` there to open the next waiting session,
+or reopen it after answering one to continue through the list.
 
 ## Configuration
 

package/package.json

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

package/tui/sesh-panel.tsx

@@ -248,6 +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"
+
+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"
+  if (live === "busy" || live === "retry") return "running"
+  if (reason === "stuck") return "waiting"
+  return current ? "active" : "idle"
+}
 
 const SESSION_PAGE_LIMIT = 200
 const SESSION_MAX = 5000
@@ -388,6 +402,43 @@ async function queryWaitingIds(db: any): Promise<Map<string, string>> {
   return out
 }
 
+type WaitingDetail = { reason: "question" | "stuck"; since?: number }
+
+// The shared needs-input query decides *which* sessions are waiting. Read the
+// oldest still-unanswered question or stuck tool for each result so triage can
+// show how long it has waited, rather than its last (unrelated) update time.
+async function queryWaitingDetails(db: any): Promise<Map<string, WaitingDetail>> {
+  const reasons = await queryWaitingIds(db)
+  const details = new Map<string, WaitingDetail>(
+    [...reasons].map(([id, reason]) => [id, { reason: reason as WaitingDetail["reason"] }]),
+  )
+  const ids = [...details.keys()]
+  const cutoff = Date.now() - STUCK_AFTER_MS
+  for (let i = 0; i < ids.length; i += 200) {
+    const batch = ids.slice(i, i + 200)
+    const rows = (db.query(`
+ SELECT p.session_id AS id,
+   MIN(CASE WHEN json_extract(p.data, '$.tool') = 'question'
+      AND COALESCE(json_extract(p.data, '$.state.status'), 'pending') != 'completed'
+      AND NOT EXISTS (SELECT 1 FROM message m WHERE m.session_id = p.session_id
+        AND json_extract(m.data, '$.role') = 'user' AND m.time_created > p.time_created)
+     THEN p.time_created END) AS question_since,
+   MIN(CASE WHEN json_extract(p.data, '$.state.status') = 'running'
+      AND p.time_created < ${cutoff} THEN p.time_created END) AS stuck_since
+ FROM part p
+ WHERE p.session_id IN (${batch.map(() => "?").join(",")})
+   AND json_extract(p.data, '$.type') = 'tool'
+ GROUP BY p.session_id`).all(...batch) ?? []) as { id: string; question_since: number | null; stuck_since: number | null }[]
+    for (const row of rows) {
+      const detail = details.get(row.id)
+      if (!detail) continue
+      const since = detail.reason === "question" ? row.question_since : row.stuck_since
+      if (typeof since === "number") detail.since = since
+    }
+  }
+  return details
+}
+
 function addTranscript(index: Map<string, string>, sid: string, data: string): void {
   try {
     const part = JSON.parse(data) as { type?: unknown; text?: unknown }
@@ -470,9 +521,14 @@ async function buildSearchIndexRemote(
       const base = index.get(id) ?? ""
       try {
         const raw = await readFile(`${cacheDir}/extractions/${id}.json`, "utf8")
-        const record = JSON.parse(raw) as { fulltextLower?: unknown }
+        const record = JSON.parse(raw) as { fulltextLower?: unknown; title?: unknown }
         const fulltext = typeof record?.fulltextLower === "string" ? record.fulltextLower : ""
-        index.set(id, `${base} ${fulltext}`.trim())
+        // Extraction caches prefix the transcript with the cached title. The
+        // live entry already indexes its own title; strip that duplicate so a
+        // title-only match cannot appear as a transcript excerpt.
+        const title = typeof record?.title === "string" ? `${record.title.toLowerCase()} ` : ""
+        const transcript = title && fulltext.startsWith(title) ? fulltext.slice(title.length) : fulltext
+        index.set(id, `${base} ${transcript}`.trim())
       } catch {
         try {
           const result = await api.client.session.messages({ sessionID: id })
@@ -494,6 +550,36 @@ async function buildSearchIndexRemote(
   await Promise.all(Array.from({ length: Math.min(REMOTE_CONCURRENCY, ids.length) }, worker))
 }
 
+// The index is title + directory + text parts, all lowercased. Start looking
+// after the metadata so a title match never masquerades as a transcript hit.
+function transcriptMatchExcerpt(indexed: string | undefined, entry: Entry, query: string): string | undefined {
+  const needle = query.trim().toLowerCase()
+  if (!indexed || !needle) return undefined
+  const transcriptStart = `${entry.title.toLowerCase()} ${entry.dir.toLowerCase()}`.length + 1
+  const at = indexed.indexOf(needle, transcriptStart)
+  if (at < 0) return undefined
+  const start = Math.max(transcriptStart, at - 28)
+  const end = Math.min(indexed.length, Math.max(at + needle.length + 28, start + 90))
+  const excerpt = indexed.slice(start, end).replace(/\s+/g, " ").trim()
+  return `${start > transcriptStart ? "…" : ""}${excerpt}${end < indexed.length ? "…" : ""}`
+}
+
+type PickerFilters = { query: string; scope?: string; waitingOnly: boolean; pinnedOnly: boolean }
+
+function filterPickerEntries(
+  entries: Entry[], filters: PickerFilters, index: Map<string, string>, waitingIds: Set<string>, pinnedSessions: string[],
+): Entry[] {
+  const q = filters.query.trim().toLowerCase()
+  const pinned = new Set(pinnedSessions)
+  return entries.filter((entry) => {
+    if (filters.scope && entry.group !== filters.scope) return false
+    if (filters.waitingOnly && !waitingIds.has(entry.id)) return false
+    if (filters.pinnedOnly && !pinned.has(entry.id)) return false
+    if (!q) return true
+    return (index.get(entry.id) ?? `${entry.title} ${entry.dir}`.toLowerCase()).includes(q)
+  })
+}
+
 const TRANSCRIPT_PREVIEW_TURNS = 8
 const TRANSCRIPT_PREVIEW_CHARS = 2000
 
@@ -707,7 +793,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
 
   const filteredEntries = createMemo(() => {
     const q = query().trim().toLowerCase()
-    const ordered = pinnedFirst(entries(), props.pins())
+    const ordered = entries()
     if (!q) return ordered
     return ordered.filter(
       (entry) => entry.title.toLowerCase().includes(q) || entry.dir.toLowerCase().includes(q),
@@ -720,9 +806,10 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
   const NEEDS_INPUT_DIR = "__needs_input__"
   const waitingEntries = createMemo(() => {
     const ids = waiting()
-    return shownEntries().filter((entry) => ids.has(entry.id))
+    return newestFirst(shownEntries().filter((entry) => ids.has(entry.id)))
   })
-  const waitingReason = (id: string) => (waiting().get(id) === "question" ? "awaiting answer" : "run stuck")
+  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[] = []
@@ -751,10 +838,11 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         return rank(b) - rank(a) || b.updated - a.updated
       })
     for (const group of ordered) {
+      const sessions = newestFirst(group.list)
       rows.push({ kind: "group", dir: group.dir, label: prettyDir(group.dir, home), count: group.list.length })
       if (collapsed()[group.dir]) continue
-      for (let i = 0; i < group.list.length; i++) {
-        rows.push({ kind: "item", entry: group.list[i], last: i === group.list.length - 1 })
+      for (let i = 0; i < sessions.length; i++) {
+        rows.push({ kind: "item", entry: sessions[i], last: i === sessions.length - 1 })
       }
     }
     return rows
@@ -796,21 +884,24 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
     previousRows = rows
   })
 
-  const sessionStatus = (id: string): "running" | "waiting" | "idle" => {
+  const sessionStatus = (id: string): SidebarActivity => {
     try {
       const permissions = props.api.state.session.permission(id)
       const questions = props.api.state.session.question(id)
-      if ((permissions?.length ?? 0) > 0 || (questions?.length ?? 0) > 0) return "waiting"
-      const status = props.api.state.session.status(id)
-      if (status?.type === "busy" || status?.type === "retry") return "running"
+      return sidebarActivity(
+        id === currentID(),
+        props.api.state.session.status(id)?.type,
+        (permissions?.length ?? 0) > 0 || (questions?.length ?? 0) > 0,
+        waiting().get(id),
+      )
     } catch {}
-    return "idle"
+    return sidebarActivity(id === currentID(), undefined, false, waiting().get(id))
   }
 
-  const statusColor = (id: string) => {
-    const status = sessionStatus(id)
+  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
   }
 
@@ -1107,8 +1198,8 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
           horizontalScrollbarOptions={{ visible: false }}
         >
           <For each={tree()}>
-          {(row) =>
-            row.kind === "group" ? (
+          {(row) => {
+            if (row.kind === "group") return (
               <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>
@@ -1118,7 +1209,9 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
                   {" "}({row.count})
                 </text>
               </box>
-            ) : (
+            )
+            const activity = createMemo(() => sessionStatus(row.entry.id))
+            return (
               <box
                 flexDirection="row"
                 gap={1}
@@ -1150,24 +1243,24 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
                         ? theme().error
                         : row.entry.id === currentID()
                           ? theme().accent
-                          : statusColor(row.entry.id),
+                          : statusColor(activity()),
                     }}
                   >
-                    {row.entry.id === currentID() ? "●" : isActive(row.entry.id) ? "▸" : "○"}
+                    {row.entry.id === currentID() ? "●" : activity() === "waiting" ? "!" : activity() === "running" ? "▶" : 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 : theme().text}
+                  color={isPendingDelete(row.entry.id) ? theme().error : activity() === "idle" ? theme().text : statusColor(activity())}
                   matchColor={theme().warning}
                 />
                 <text flexShrink={0} style={{ fg: isPendingDelete(row.entry.id) ? theme().error : theme().textMuted }}>
                   {isPendingDelete(row.entry.id) ? (
                     "ctrl+x again"
-                  ) : waiting().has(row.entry.id) ? (
+                  ) : activity() !== "idle" ? (
                     <span>
-                      {ago(row.entry.updated)} · <span style={{ fg: theme().warning }}>{waitingReason(row.entry.id)}</span>
+                      {ago(row.entry.updated)} · <span style={{ fg: statusColor(activity()) }}>{activity() === "waiting" ? waitingReason(row.entry.id) : activity()}</span>
                     </span>
                   ) : (
                     ago(row.entry.updated)
@@ -1175,7 +1268,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
                 </text>
               </box>
             )
-          }
+          }}
         </For>
         </scrollbox>
         <Show when={remaining() > 0}>
@@ -1381,6 +1474,11 @@ function HomeSessions(props: { api: TuiPluginApi } & PinProps) {
 
 const tui: TuiPlugin = async (api) => {
   const [pins, setPins] = createSignal<Pins>(emptyPins())
+  // Keep exploratory context while the plugin remains loaded; a full OpenCode
+  // restart starts with a clean picker rather than an old cross-project filter.
+  let pickerState: PickerFilters = {
+    query: "", waitingOnly: false, pinnedOnly: false,
+  }
   let pinVersion = 0
   const refreshPins = () => {
     const version = pinVersion
@@ -1433,9 +1531,34 @@ const tui: TuiPlugin = async (api) => {
     const [allEntries, setAllEntries] = createSignal<Entry[]>(entries)
     const [previewText, setPreviewText] = createSignal("")
     const [showPreview, setShowPreview] = createSignal(false)
-    const [query, setQuery] = createSignal("")
+    const [query, setQuery] = createSignal(pickerState.query)
     const [cursor, setCursor] = createSignal(0)
-    const [scope, setScope] = createSignal<string>()
+    const [scope, setScope] = createSignal<string | undefined>(
+      entries.some((entry) => entry.group === pickerState.scope) ? pickerState.scope : undefined,
+    )
+    const [waitingOnly, setWaitingOnly] = createSignal(pickerState.waitingOnly)
+    const [pinnedOnly, setPinnedOnly] = createSignal(pickerState.pinnedOnly)
+    const [waitingIds, setWaitingIds] = createSignal<Set<string>>(new Set())
+    const [waitingCoverage, setWaitingCoverage] = createSignal<"loading" | "ready" | "unavailable">("loading")
+    let alive = true
+    void (async () => {
+      const db = await openTranscriptDb()
+      if (!db) {
+        if (alive) setWaitingCoverage("unavailable")
+        return
+      }
+      try {
+        const ids = await queryWaitingIds(db)
+        if (alive) {
+          setWaitingIds(new Set(ids.keys()))
+          setWaitingCoverage("ready")
+        }
+      } catch {
+        if (alive) setWaitingCoverage("unavailable")
+      } finally {
+        db.close()
+      }
+    })()
     const [pendingDelete, setPendingDelete] = createSignal<Entry>()
     const [searchIndex, setSearchIndex] = createSignal<Map<string, string>>(new Map())
     const [indexProgress, setIndexProgress] = createSignal<IndexProgress>({
@@ -1444,6 +1567,7 @@ const tui: TuiPlugin = async (api) => {
       complete: false,
     })
     void buildSearchIndex(api, entries, (progress, index) => {
+      if (!alive) return
       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.
@@ -1452,23 +1576,25 @@ const tui: TuiPlugin = async (api) => {
     type DialogRow = { kind: "group"; label: string; count: number } | { kind: "item"; entry: Entry }
 
     const orderedEntries = createMemo(() => pinnedFirst(allEntries(), pins()))
+    const currentProject = () => {
+      const route = api.route.current
+      const id = route.name === "session" ? route.params?.sessionID : undefined
+      return allEntries().find((entry) => entry.id === id)?.group ??
+        allEntries().find((entry) => entry.dir === api.state.path.directory)?.group
+    }
     const matchedGroups = createMemo(() => {
-      const q = query().trim().toLowerCase()
-      const index = searchIndex()
-      const group = scope()
-      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()
-        return haystack.includes(q)
-      })
+      const matched = filterPickerEntries(
+        orderedEntries(),
+        { query: query(), scope: scope(), waitingOnly: waitingOnly(), pinnedOnly: pinnedOnly() },
+        searchIndex(), waitingIds(), pins().sessions,
+      )
       const byGroup = new Map<string, Entry[]>()
       for (const entry of matched) {
         const list = byGroup.get(entry.group) ?? []
         list.push(entry)
         byGroup.set(entry.group, list)
       }
-      const groups = [...byGroup.entries()].map(([name, list]) => ({ name, list }))
+      const groups = [...byGroup.entries()].map(([name, list]) => ({ name, list: newestFirst(list) }))
       const currentPins = pins()
       const rank = (group: (typeof groups)[number]) =>
         group.list.some((entry) => currentPins.directories.includes(entry.dir)) ? 2
@@ -1486,6 +1612,8 @@ const tui: TuiPlugin = async (api) => {
       const progress = indexProgress()
       const bits: string[] = []
       if (scope()) bits.push(`scope ${scope()}`)
+      if (waitingOnly()) bits.push(waitingCoverage() === "loading" ? "checking needs input" : waitingCoverage() === "unavailable" ? "needs-input unavailable" : "needs input")
+      if (pinnedOnly()) bits.push("pinned sessions")
       if (progress.total > 0) {
         bits.push(
           progress.complete
@@ -1521,7 +1649,9 @@ const tui: TuiPlugin = async (api) => {
 
     const visiblePickerRows = createMemo<DialogRow[]>(() => {
       const flat = pickerRows()
-      const windowSize = listHeight
+      // 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 currentID = selectableEntries()[cursor()]?.id
       let pos = currentID
         ? flat.findIndex((row) => row.kind === "item" && row.entry.id === currentID)
@@ -1715,6 +1845,8 @@ const tui: TuiPlugin = async (api) => {
             else if (target) setScope(target.group)
           },
         },
+        { key: "option+w", desc: "Filter needs input", preventDefault: true, cmd: () => setWaitingOnly((value) => !value) },
+        { key: "option+p", desc: "Filter pinned sessions", preventDefault: true, cmd: () => setPinnedOnly((value) => !value) },
         {
           key: "escape",
           desc: "Close",
@@ -1728,6 +1860,8 @@ const tui: TuiPlugin = async (api) => {
     })
 
     const cleanup = () => {
+      alive = false
+      pickerState = { query: query(), scope: scope(), waitingOnly: waitingOnly(), pinnedOnly: pinnedOnly() }
       disposeNav()
       disposeConfirm?.()
       disposeConfirm = undefined
@@ -1770,6 +1904,21 @@ const tui: TuiPlugin = async (api) => {
                 <text style={{ fg: api.theme.current.textMuted }}>{coverageLabel()}</text>
               </box>
             </Show>
+            <box flexDirection="row" gap={2} paddingTop={1}>
+              <text style={{ fg: scope() ? api.theme.current.accent : api.theme.current.textMuted }} onMouseDown={() => {
+                const group = currentProject()
+                if (group) setScope(scope() === group ? undefined : group)
+                else api.ui.toast({ message: "No current project to filter", variant: "info" })
+              }}>
+                {scope() ? `Project: ${truncate(scope()!, 22)}` : "Project: all"}
+              </text>
+              <text style={{ fg: waitingOnly() ? api.theme.current.warning : api.theme.current.textMuted }} onMouseDown={() => setWaitingOnly((value) => !value)}>
+                {waitingOnly() ? "● Needs input" : "○ Needs input"}
+              </text>
+              <text style={{ fg: pinnedOnly() ? api.theme.current.accent : api.theme.current.textMuted }} onMouseDown={() => setPinnedOnly((value) => !value)}>
+                {pinnedOnly() ? "★ Pinned" : "☆ Pinned"}
+              </text>
+            </box>
           </box>
           <box
             flexDirection="column"
@@ -1780,17 +1929,18 @@ const tui: TuiPlugin = async (api) => {
             }}
           >
             <For each={visiblePickerRows()}>
-                {(row) =>
-                  row.kind === "group" ? (
+                {(row) => {
+                  if (row.kind === "group") return (
                     <box paddingTop={1} 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>
                     </box>
-                  ) : (
+                  )
+                  const excerpt = createMemo(() => transcriptMatchExcerpt(searchIndex().get(row.entry.id), row.entry, query()))
+                  return (
                     <box
-                      flexDirection="row"
-                      gap={1}
+                      flexDirection="column"
                       paddingLeft={4}
                       paddingRight={4}
                       backgroundColor={
@@ -1800,6 +1950,7 @@ const tui: TuiPlugin = async (api) => {
                       }
                       onMouseDown={() => choose(row.entry)}
                     >
+                      <box flexDirection="row" gap={1}>
                       <Show when={row.entry.id === currentSessionID()}>
                         <text
                           flexShrink={0}
@@ -1848,17 +1999,39 @@ const tui: TuiPlugin = async (api) => {
                                 : ""
                             }`}
                       </text>
+                      </box>
+                      <Show when={excerpt()}>
+                        {(match) => (
+                          <box flexDirection="row" gap={1} paddingLeft={2}>
+                            <text flexShrink={0} style={{ fg: api.theme.current.textMuted }}>↳</text>
+                            <Highlighted
+                              text={match()}
+                              query={query()}
+                              color={row.entry.id === selectableEntries()[cursor()]?.id ? api.theme.current.selectedListItemText : api.theme.current.textMuted}
+                              matchColor={api.theme.current.warning}
+                            />
+                          </box>
+                        )}
+                      </Show>
                     </box>
                   )
-                }
+                }}
               </For>
               <Show when={selectableEntries().length === 0}>
                 <box paddingLeft={4} paddingRight={4}>
                   <text style={{ fg: api.theme.current.textMuted }}>
-                    {!indexProgress().complete
-                      ? "No matches yet · still searching transcripts…"
+                    {waitingOnly() && waitingCoverage() === "loading"
+                        ? "Checking which sessions need input…"
+                      : 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"
+                      : !indexProgress().complete && query().trim()
+                        ? "No matches yet · still searching transcripts…"
                       : scope()
                         ? `No matches in ${scope()} · ctrl+g for all projects`
+                        : waitingOnly()
+                          ? "No sessions need input with these filters"
                         : "No sessions match · try another search"}
                   </text>
                 </box>
@@ -1888,7 +2061,7 @@ const tui: TuiPlugin = async (api) => {
               </scrollbox>
             </box>
           </Show>
-          <box paddingLeft={4} paddingRight={4} flexShrink={0}>
+          <box paddingLeft={4} paddingRight={4} flexShrink={0} flexDirection="column">
             <text
               style={{
                 fg: pendingDelete() ? api.theme.current.warning : api.theme.current.textMuted,
@@ -1896,8 +2069,11 @@ const tui: TuiPlugin = async (api) => {
             >
               {pendingDelete()
                 ? `Delete "${truncate(pendingDelete()!.title, 40)}"? y confirm · n cancel`
-                : "↑↓ navigate · enter open · option+s/d pin · ctrl+x delete · ctrl+f fork · ctrl+g project · ctrl+p preview · esc close"}
+                : "↑↓ 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>
       ),
@@ -2022,27 +2198,32 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
 
   // Triage dialog: the waiting set as an openable list. Enter opens the
   // highlighted session; the sidebar section stays the always-visible view.
+  let lastNeedsID: string | undefined
   const openNeeds = async () => {
     if (api.mode.current() !== BASE_MODE) return
     if (api.renderer.currentFocusedEditor === null) return
-    let items: { entry: Entry; reason: string }[] = []
+    let items: { entry: Entry; reason: string; since?: number }[] = []
     try {
       const { entries } = await fetchEntries(api)
       const db = await openTranscriptDb()
-      let waiting = new Map<string, string>()
-      if (db) {
-        try {
-          waiting = await queryWaitingIds(db)
-        } finally {
-          db.close()
-        }
+      if (!db) {
+        api.ui.toast({ message: "Needs-input data unavailable", variant: "error" })
+        return
+      }
+      let waiting: Map<string, WaitingDetail>
+      try {
+        waiting = await queryWaitingDetails(db)
+      } finally {
+        db.close()
       }
       items = entries
         .filter((entry) => waiting.has(entry.id))
         .map((entry) => ({
           entry,
-          reason: waiting.get(entry.id) === "question" ? "awaiting answer" : "run stuck",
+          reason: waiting.get(entry.id)?.reason === "question" ? "awaiting answer" : "run stuck",
+          since: waiting.get(entry.id)?.since,
         }))
+        .sort((a, b) => (a.since ?? a.entry.updated) - (b.since ?? b.entry.updated))
     } catch {
       api.ui.toast({ message: "Could not load sessions", variant: "error" })
       return
@@ -2051,12 +2232,15 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
       api.ui.toast({ message: "No sessions are waiting on you.", variant: "info" })
       return
     }
-    const [cursor, setCursor] = createSignal(0)
+    const route = api.route.current
+    const currentID = route.name === "session" ? route.params?.sessionID : undefined
+    const previous = items.findIndex((item) => item.entry.id === (currentID ?? lastNeedsID))
+    const [cursor, setCursor] = createSignal(previous < 0 ? 0 : (previous + 1) % items.length)
     const moveCursor = (delta: number) =>
       setCursor((value) => Math.max(0, Math.min(items.length - 1, value + delta)))
-    const choose = () => {
-      const target = items[cursor()]
+    const choose = (target = items[cursor()]) => {
       if (!target) return
+      lastNeedsID = target.entry.id
       disposeNav()
       api.ui.dialog.clear()
       api.route.navigate("session", { sessionID: target.entry.id })
@@ -2066,6 +2250,10 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
         { key: "up", desc: "Previous session", preventDefault: true, cmd: () => moveCursor(-1) },
         { key: "down", desc: "Next session", preventDefault: true, cmd: () => moveCursor(1) },
         { key: "enter", desc: "Open session", preventDefault: true, cmd: () => choose() },
+        { key: "n", desc: "Open next waiting session", preventDefault: true, cmd: () => {
+          const at = items.findIndex((item) => item.entry.id === currentID)
+          choose(items[at < 0 ? cursor() : (at + 1) % items.length])
+        } },
         {
           key: "escape",
           desc: "Close",
@@ -2080,9 +2268,9 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
         <box flexDirection="column" paddingLeft={4} paddingRight={4} paddingTop={1} gap={1}>
           <text attributes={TextAttributes.BOLD}>
             Needs input{" "}
-            <span style={{ fg: api.theme.current.textMuted }}>({items.length})</span>
+            <span style={{ fg: api.theme.current.textMuted }}>({items.length} · longest waiting first)</span>
           </text>
-          <box flexDirection="column">
+          <scrollbox flexGrow={1} height={Math.max(6, Math.floor(api.renderer.height / 2) - 10)} scrollbarOptions={{ visible: false }}>
             <For each={items}>
               {(item, index) => (
                 <box
@@ -2097,7 +2285,7 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
                   }
                   onMouseDown={() => {
                     setCursor(index())
-                    choose()
+                    choose(item)
                   }}
                 >
                   <text
@@ -2133,14 +2321,14 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
                           : api.theme.current.textMuted,
                     }}
                   >
-                    {prettyDir(item.entry.dir, home)} · {ago(item.entry.updated)}
+                    {prettyDir(item.entry.dir, home)} · {item.since === undefined ? "time unknown" : `waiting ${ago(item.since)}`}
                   </text>
                 </box>
               )}
             </For>
-          </box>
+          </scrollbox>
           <box flexShrink={0}>
-            <text style={{ fg: api.theme.current.textMuted }}>↑↓ navigate · enter open · esc close</text>
+            <text style={{ fg: api.theme.current.textMuted }}>↑↓ navigate · enter open · n open next waiting · esc close</text>
           </box>
         </box>
       ),