opencode-sesh 0.8.0 → 0.9.1

package/AGENTS.md

@@ -83,8 +83,8 @@ the schema below. Keystrokes never touch the database:
   epoch, not a boolean).
 - Session and directory pins live in `${XDG_DATA_HOME:-$HOME/.local/share}/sesh/pins.json`
   (`SESH_PINS_FILE` overrides it for tests), shared by fzf and the TUI. Writes
-  use a sibling lock directory and atomic rename. Option-S toggles a selected
-  session; Option-D toggles its directory. Pinned directories sort before groups
+  use a sibling lock directory and atomic rename. Ctrl-S toggles a selected
+  session; Ctrl-D toggles its directory. Pinned directories sort before groups
   containing pinned sessions, with pinned sessions first inside each group.
 
 **Output contract** (TSV, 6 fields):
@@ -105,7 +105,8 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
 ## Conventions
 
 - Default scope is **all** sessions, every directory. `--cwd`/Ctrl-G narrows.
-  Archived sessions and fork children are hidden unless `--archived`.
+  Archived sessions and child sessions (fork children, spawned subagents) are
+  hidden unless `--archived`; metadata and cache pruning still see them.
 - **Text parts only** in search/preview; reasoning and tool payloads are
   excluded (asserted in tests).
 - Validate session ids (`^ses_[A-Za-z0-9]+$`) before SQL interpolation — never
@@ -141,8 +142,9 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
 - **Sidebar:** `api.slots.register` on `sidebar_content` (append mode — native
   sidebar content stays). Pinned directories sort first, then directory groups
   by recency; sessions within each group sort by last update regardless of pins.
-  Waiting, running, and current-idle sessions have distinct title colors and
-  text labels (in addition to row markers), polled every 15 s; Ctrl-P previews
+  Row markers alone signal session state: a running agent animates a loading
+  spinner marker, the open session shows its own ●, and every other idle row
+  stays neutral (polled every 15 s); Ctrl-P previews
   a row and ctrl+x deletes one (armed, then confirmed). The section lists every
   session without a row cap and flex-grows to fill the sidebar, with overflow
   scrolling inside; the picker remains the place for transcript search.
@@ -160,7 +162,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,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.1] - 2026-09-25
+
+### Changed
+
+- Sidebar rows show state only in the marker column: a running agent animates
+  a loading spinner; idle rows and their titles go back to neutral.
+- Pin keybinds move from Option-S/Option-D to Ctrl-S/Ctrl-D in the terminal
+  picker, the sidebar, and the picker dialog.
+- The terminal picker hides child sessions (fork children, spawned subagents)
+  like the panel does; `--archived` still opts them back in.
+## [0.9.0] - 2026-09-24
+
+### Added
+
+- 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
@@ -333,7 +352,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.8.0...HEAD
+[Unreleased]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.9.1...HEAD
+[0.9.1]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.9.0...v0.9.1
+[0.9.0]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.7.3...v0.8.0
 [0.7.3]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.7.2...v0.7.3
 [0.7.2]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.7.1...v0.7.2

package/README.md

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

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

package/bin/sesh-shortcuts.sh

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

package/bin/sesh.sh

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

package/package.json

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

package/tui/sesh-panel.tsx

@@ -248,19 +248,20 @@ function ensureRootMouse(renderer: TuiPluginApi["renderer"]) {
 
 type Entry = { id: string; title: string; dir: string; group: string; updated: number }
 type EntryResult = { entries: Entry[]; truncated: boolean }
-type SidebarActivity = "waiting" | "running" | "active" | "idle"
+type SidebarMarker = "current" | "running" | "idle"
+
+// Loading-spinner frames for the marker of a session whose agent is working.
+const SIDEBAR_SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
 
 function newestFirst(entries: Entry[]): Entry[] {
   return [...entries].sort((a, b) => b.updated - a.updated || a.id.localeCompare(b.id))
 }
 
-// A question needs an answer even if the agent is busy. A stale running-tool
-// record, on the other hand, must not hide a currently busy agent.
-function sidebarActivity(current: boolean, live?: string, pending = false, reason?: string): SidebarActivity {
-  if (pending || reason === "question") return "waiting"
+// A working agent is the only state the marker displays: everything that
+// finished goes back to the neutral row, with the open session marked inside.
+function sidebarMarker(current: boolean, live?: string): SidebarMarker {
   if (live === "busy" || live === "retry") return "running"
-  if (reason === "stuck") return "waiting"
-  return current ? "active" : "idle"
+  return current ? "current" : "idle"
 }
 
 const SESSION_PAGE_LIMIT = 200
@@ -402,6 +403,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 }
@@ -484,9 +522,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 })
@@ -508,6 +551,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
 
@@ -736,8 +809,6 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
     const ids = waiting()
     return newestFirst(shownEntries().filter((entry) => ids.has(entry.id)))
   })
-  const waitingReason = (id: string) =>
-    waiting().get(id) === "question" ? "awaiting answer" : waiting().get(id) === "stuck" ? "run stuck" : "needs input"
 
   const tree = createMemo<TreeRow[]>(() => {
     const rows: TreeRow[] = []
@@ -812,26 +883,34 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
     previousRows = rows
   })
 
-  const sessionStatus = (id: string): SidebarActivity => {
+  // Marker only: a spinner for a working agent, the open-session dot, and the
+  // neutral row for idle sessions. Titles stay plain and no status text is
+  // rendered.
+  const markerOf = (id: string): SidebarMarker => {
+    let live: string | undefined
     try {
-      const permissions = props.api.state.session.permission(id)
-      const questions = props.api.state.session.question(id)
-      return sidebarActivity(
-        id === currentID(),
-        props.api.state.session.status(id)?.type,
-        (permissions?.length ?? 0) > 0 || (questions?.length ?? 0) > 0,
-        waiting().get(id),
-      )
+      live = props.api.state.session.status(id)?.type
     } catch {}
-    return sidebarActivity(id === currentID(), undefined, false, waiting().get(id))
+    return sidebarMarker(id === currentID(), live)
   }
 
-  const statusColor = (status: SidebarActivity) => {
-    if (status === "running") return theme().success
-    if (status === "waiting") return theme().warning
-    if (status === "active") return theme().accent
-    return theme().textMuted
-  }
+  // The spinner animates only while a listed session is actually running, so
+  // an idle list costs no timer and only running rows re-render per frame.
+  const [spinFrame, setSpinFrame] = createSignal(0)
+  let spinTimer: ReturnType<typeof setInterval> | undefined
+  createEffect(() => {
+    const spinning = itemRows().some((entry) => markerOf(entry.id) === "running")
+    if (spinning && !spinTimer) {
+      spinTimer = setInterval(() => setSpinFrame((value) => (value + 1) % SIDEBAR_SPINNER.length), 120)
+    } else if (!spinning && spinTimer) {
+      clearInterval(spinTimer)
+      spinTimer = undefined
+      setSpinFrame(0)
+    }
+  })
+  onCleanup(() => {
+    if (spinTimer) clearInterval(spinTimer)
+  })
 
   const cancelDelete = () => {
     if (confirmTimer) clearTimeout(confirmTimer)
@@ -955,8 +1034,8 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
             if (!confirmArmed()) requestDelete(entry)
           },
         },
-        { key: "option+s", desc: "Pin session", preventDefault: true, cmd: () => props.onTogglePin("sessions", entry.id) },
-        { key: "option+d", desc: "Pin directory", preventDefault: true, cmd: () => props.onTogglePin("directories", entry.dir) },
+        { key: "ctrl+s", desc: "Pin session", preventDefault: true, cmd: () => props.onTogglePin("sessions", entry.id) },
+        { key: "ctrl+d", desc: "Pin directory", preventDefault: true, cmd: () => props.onTogglePin("directories", entry.dir) },
         {
           key: "/",
           desc: "Search sessions",
@@ -1005,7 +1084,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         },
       },
       {
-        key: "option+s",
+        key: "ctrl+s",
         desc: "Pin session",
         preventDefault: true,
         cmd: () => {
@@ -1014,7 +1093,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         },
       },
       {
-        key: "option+d",
+        key: "ctrl+d",
         desc: "Pin directory",
         preventDefault: true,
         cmd: () => {
@@ -1138,7 +1217,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
                 </text>
               </box>
             )
-            const activity = createMemo(() => sessionStatus(row.entry.id))
+            const marker = createMemo(() => markerOf(row.entry.id))
             return (
               <box
                 flexDirection="row"
@@ -1153,7 +1232,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
                 onMouseOver={() => {
                   setHovered(row.entry.id)
                   // The keyboard layer wins over the hover layer while nav is
-                  // active. Keep its cursor on the hovered row so Option-S/Option-D
+                  // active. Keep its cursor on the hovered row so Ctrl-S/Ctrl-D
                   // cannot silently pin a different (often current) session.
                   if (navActive()) {
                     const index = itemRows().findIndex((entry) => entry.id === row.entry.id)
@@ -1169,30 +1248,24 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
                     style={{
                       fg: isPendingDelete(row.entry.id)
                         ? theme().error
-                        : row.entry.id === currentID()
+                        : marker() === "current"
                           ? theme().accent
-                          : statusColor(activity()),
+                          : marker() === "running"
+                            ? theme().success
+                            : theme().textMuted,
                     }}
                   >
-                    {row.entry.id === currentID() ? "●" : activity() === "waiting" ? "!" : activity() === "running" ? "▶" : isActive(row.entry.id) ? "▸" : "○"}
+                    {marker() === "current" ? "●" : marker() === "running" ? SIDEBAR_SPINNER[spinFrame()] : isActive(row.entry.id) ? "▸" : "○"}
                   </span>
                 </text>
                 <Highlighted
                   text={`${props.pins().sessions.includes(row.entry.id) ? "★ " : ""}${truncate(row.entry.title, SIDEBAR_TITLE_WIDTH - (props.pins().sessions.includes(row.entry.id) ? 2 : 0))}`}
                   query={query()}
-                  color={isPendingDelete(row.entry.id) ? theme().error : activity() === "idle" ? theme().text : statusColor(activity())}
+                  color={isPendingDelete(row.entry.id) ? theme().error : theme().text}
                   matchColor={theme().warning}
                 />
                 <text flexShrink={0} style={{ fg: isPendingDelete(row.entry.id) ? theme().error : theme().textMuted }}>
-                  {isPendingDelete(row.entry.id) ? (
-                    "ctrl+x again"
-                  ) : activity() !== "idle" ? (
-                    <span>
-                      {ago(row.entry.updated)} · <span style={{ fg: statusColor(activity()) }}>{activity() === "waiting" ? waitingReason(row.entry.id) : activity()}</span>
-                    </span>
-                  ) : (
-                    ago(row.entry.updated)
-                  )}
+                  {isPendingDelete(row.entry.id) ? "ctrl+x again" : ago(row.entry.updated)}
                 </text>
               </box>
             )
@@ -1207,7 +1280,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         </Show>
         <Show when={navActive()}>
           <box paddingTop={1}>
-            <text style={{ fg: theme().textMuted }}>↑↓ move · enter open · ctrl+p preview · option+s/d pin · ctrl+x delete · esc done</text>
+            <text style={{ fg: theme().textMuted }}>↑↓ move · enter open · ctrl+p preview · ctrl+s/d pin · ctrl+x delete · esc done</text>
           </box>
         </Show>
       </Show>
@@ -1278,8 +1351,8 @@ function HomeSessions(props: { api: TuiPluginApi } & PinProps) {
           preventDefault: true,
           cmd: () => preview.open(entry),
         },
-        { key: "option+s", desc: "Pin session", preventDefault: true, cmd: () => props.onTogglePin("sessions", entry.id) },
-        { key: "option+d", desc: "Pin directory", preventDefault: true, cmd: () => props.onTogglePin("directories", entry.dir) },
+        { key: "ctrl+s", desc: "Pin session", preventDefault: true, cmd: () => props.onTogglePin("sessions", entry.id) },
+        { key: "ctrl+d", desc: "Pin directory", preventDefault: true, cmd: () => props.onTogglePin("directories", entry.dir) },
       ],
     })
   })
@@ -1402,6 +1475,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
@@ -1454,9 +1532,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>({
@@ -1465,6 +1568,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.
@@ -1473,16 +1577,18 @@ 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) ?? []
@@ -1507,6 +1613,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
@@ -1542,7 +1650,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)
@@ -1697,11 +1807,11 @@ const tui: TuiPlugin = async (api) => {
         },
         { key: "enter", desc: "Open session", preventDefault: true, cmd: () => choose() },
         { key: "ctrl+p", desc: "Toggle transcript preview", preventDefault: true, cmd: togglePreview },
-        { key: "option+s", desc: "Pin session", preventDefault: true, cmd: () => {
+        { key: "ctrl+s", desc: "Pin session", preventDefault: true, cmd: () => {
           const entry = selectableEntries()[cursor()]
           if (entry) onTogglePin("sessions", entry.id)
         } },
-        { key: "option+d", desc: "Pin directory", preventDefault: true, cmd: () => {
+        { key: "ctrl+d", desc: "Pin directory", preventDefault: true, cmd: () => {
           const entry = selectableEntries()[cursor()]
           if (entry) onTogglePin("directories", entry.dir)
         } },
@@ -1736,6 +1846,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",
@@ -1749,6 +1861,8 @@ const tui: TuiPlugin = async (api) => {
     })
 
     const cleanup = () => {
+      alive = false
+      pickerState = { query: query(), scope: scope(), waitingOnly: waitingOnly(), pinnedOnly: pinnedOnly() }
       disposeNav()
       disposeConfirm?.()
       disposeConfirm = undefined
@@ -1791,6 +1905,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"
@@ -1801,17 +1930,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={
@@ -1821,6 +1951,7 @@ const tui: TuiPlugin = async (api) => {
                       }
                       onMouseDown={() => choose(row.entry)}
                     >
+                      <box flexDirection="row" gap={1}>
                       <Show when={row.entry.id === currentSessionID()}>
                         <text
                           flexShrink={0}
@@ -1869,17 +2000,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 · ctrl+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>
@@ -1909,7 +2062,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,
@@ -1917,8 +2070,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 }}>ctrl+s/d pin · ctrl+x delete · ctrl+f fork · esc close</text>
+            </Show>
           </box>
         </box>
       ),
@@ -2043,27 +2199,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
@@ -2072,12 +2233,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 })
@@ -2087,6 +2251,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",
@@ -2101,9 +2269,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
@@ -2118,7 +2286,7 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
                   }
                   onMouseDown={() => {
                     setCursor(index())
-                    choose()
+                    choose(item)
                   }}
                 >
                   <text
@@ -2154,14 +2322,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>
       ),