opencode-sesh 1.1.0 → 2.0.1

package/AGENTS.md

@@ -11,10 +11,10 @@ territory: read this first, then the specific file you need.
    any terminal. Lists **all** sessions across **all** project directories,
    full-text searchable, with transcript preview and resume/fork/delete.
 2. **`tui-plugins/sesh-panel/tui.tsx`** — a SolidJS/OpenTUI plugin for the opencode TUI: a
-   recent-sessions section in the sidebar plus an `alt+o` / `/sesh` picker.
+   sessions section in the sidebar plus an `option+o` / `/sesh` picker.
 3. **`plugins/sesh-list.ts`** — the `sesh_list` custom tool, so the agent
-   can list sessions across every directory by querying the global `opencode
-   db` store (the native `opencode session list` is project-scoped).
+   can list sessions across every directory by querying the global opencode
+   SQLite store (the native `opencode session list` is project-scoped).
 
 No iTerm2, no AppleScript, no panes, no window management — **never add any.**
 The one exception is the TUI's right-click action, which shells out to
@@ -39,11 +39,10 @@ HOME=/tmp/fakehome bash install.sh   # installer smoke test (never touches ~/.co
 - `bin/` — flat; no subdirs. Scripts resolve siblings from their own location.
   Never hardcode install paths. `sesh-waiting.sh` owns the needs-input query
   (shared heuristic with the TUI sidebar copy, marked `NEEDS_INPUT_SQL` in
-  both); `sesh-prune.sh` archives stale sessions; `sesh-costs.sh` sums
+  both); `sesh-prune.sh` deletes stale sessions; `sesh-costs.sh` sums
   assistant-message cost per directory. Reads go through `sqlite3 -readonly`
-  (required; `opencode db` no longer exists); the direct `UPDATE` in
-  `sesh-prune.sh` (archive) is the only sanctioned database write — the API has
-  no archive endpoint — and hard deletes stay on `opencode session delete`.
+  (required; `opencode db` no longer exists). Sesh never writes the database
+  directly; deletes go through `opencode session delete`.
 - `contrib/` — caller-side integrations (currently cmux). Nothing here may add
   window management to sesh itself.
 - `tui-plugins/sesh-panel/tui.tsx` — SolidJS panel, `/** @jsxImportSource @opentui/solid */`.
@@ -58,7 +57,7 @@ The tool name in opencode is `sesh_list`. Do not rename it without updating the
 ## Data flow (fzf picker)
 
 `bin/sesh-list.sh` owns the fzf picker's session store access (opencode SQLite
-DB: `session_v2` / `session_message` tables); the `sesh-list` agent tool queries
+DB: `session_v2` / `session_message` tables); the `sesh_list` agent tool queries
 the same store read-only through `bun:sqlite`. V2 discovers the tool from the
 global config directory's `plugins/`. Keep its SQL column names in sync with
 the schema below. Keystrokes never touch the database:
@@ -76,7 +75,8 @@ the schema below. Keystrokes never touch the database:
   the whole DB and pruning is always safe.
 - render (cheap, pure `jq`): reads the snapshot only. Filters on `searchText`
   (title + `fulltextLower`, both lowercased at extraction), groups by `cwd`,
-  sorts groups/items by recency, renders the TSV. Notice rows (headers, a
+  sorts groups/items by pins and recency, with current-project and title-match
+  priority while searching, and renders the TSV. Notice rows (headers, a
   vanished selection, an empty store, a query matching nothing) carry an empty
   `sessionId` and a unique `trackingId`. `--header` prints the one-line
   scope/count/status that the picker uses as fzf's header, and a non-actionable
@@ -90,7 +90,9 @@ the schema below. Keystrokes never touch the database:
   The sidebar and home lists use Option-S / Option-R instead: opencode binds
   `ctrl+d` itself (composer delete-char, session delete), so ctrl pins would
   shadow the composer. Pinned directories sort before groups
-  containing pinned sessions, with pinned sessions first inside each group.
+  containing pinned sessions. The terminal picker puts pinned sessions first
+  inside each group; the TUI picker and sidebar keep sessions recency-ordered
+  within each directory. The home list puts pinned sessions first.
 
 **Output contract** (TSV, 6 fields):
 `agentId  sessionId  liveState  display  cwd  trackingId`. `display` is the only
@@ -106,7 +108,8 @@ live-agent API, so `liveState` is always `unknown` and rows render gray unless
 they are archived (opt-in, tagged `· archived`);
 dispatch is always `opencode --session <id>`; Ctrl-F or `--fork` first creates the
 fork with `opencode api session.fork` (the CLI has no fork flag) and resumes the new id.
-Resume happens in place (`exec` after `cd` to the session's cwd).
+Resume runs opencode in a subshell at the session's cwd in the same terminal;
+when opencode exits, the picker reopens with the query preserved.
 
 ## Conventions
 
@@ -130,7 +133,7 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
 - Destructive actions confirm. `sesh-delete.sh` prompts on a TTY and refuses
   without `--yes` when stdin is not one; the TUI arms on the first Option-D and
   commits on the second (or `y`).
-- The installer prefers the local opencode version for `@opencode-ai/*` and
+- The installer prefers the local opencode version for `@opencode/*` and
   merges (never clobbers) the config `package.json`; opencode runs `bun install`
   at startup.
 - Commit messages follow [Conventional Commits](https://www.conventionalcommits.org/)

package/CHANGELOG.md

@@ -5,6 +5,22 @@ All notable changes to this project are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.1] - 2026-10-10
+
+### Fixed
+
+- **packaging:** Add root export for opencode plugin and broaden opentui peer range
+
+## [2.0.0] - 2026-10-10
+
+### Breaking changes
+
+- Finish V2 session compatibility and prune semantics _(breaking)_
+
+### Fixed
+
+- **tui:** Align sidebar search with Sessions heading
+
 ## [1.1.0] - 2026-10-09
 
 ### Fixed
@@ -472,6 +488,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.
 
+[2.0.1]: https://github.com/ozandogrultan/opencode-sesh/compare/v2.0.0...v2.0.1
+[2.0.0]: https://github.com/ozandogrultan/opencode-sesh/compare/v1.1.0...v2.0.0
 [1.1.0]: https://github.com/ozandogrultan/opencode-sesh/compare/v1.0.8...v1.1.0
 [1.0.8]: https://github.com/ozandogrultan/opencode-sesh/compare/v1.0.7...v1.0.8
 [1.0.7]: https://github.com/ozandogrultan/opencode-sesh/compare/v1.0.6...v1.0.7

package/README.md

@@ -12,14 +12,13 @@ The TUI plugin and agent tool require OpenCode V2 and are not compatible with V1
 `/sessions`) are scoped to the current project. `sesh` shows all of them —
 grouped by directory, full-text searchable, and previewable from anywhere.
 
-[![CI](https://github.com/ozandogrultan/opencode-sesh/actions/workflows/ci.yml/badge.svg)](https://github.com/ozandogrultan/opencode-sesh/actions/workflows/ci.yml)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![PRs welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](#contributing)
 [![GitHub stars](https://img.shields.io/github/stars/ozandogrultan/opencode-sesh?style=social)](https://github.com/ozandogrultan/opencode-sesh/stargazers)
 
 ```text
 Sessions (8)                              ▾ hide
-  search…
+search…
 ▾ …/Projects/portal                          (5)
   ├○ Retry the OAuth token refr…            2h
   ├○ Login rate limiting notes              3d
@@ -35,26 +34,49 @@ Sessions (8)                              ▾ hide
 ## Why sesh
 
 - **Every session, everywhere.** Sessions are grouped by project directory and
-  sorted by pins, then recency — across *all* your projects, not just the current one.
+  shown across *all* your projects, not just the current one. Archived and
+  subagent child sessions are hidden by default.
 - **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.
+  either picker; the TUI sidebar and home list use Option-S and Option-R.
+  Pins are shared and persist across restarts. Pinned directories rise first;
+  pinned sessions sort first in the terminal picker and home list. The TUI picker
+  and sidebar keep sessions within each directory recency-ordered.
 - **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.
-- **Transcript preview.** Space shows the most recent messages first, rendered as
-  Markdown (with `glow` if you have it).
-- **Resume in place.** Enter `exec`s `opencode --session <id>` in the session's
-  own directory. Ctrl-F forks instead. Your terminal becomes the session — no
-  tabs, no panes, no window management.
-- **Native TUI, too.** A recent-sessions section in the opencode sidebar plus an
+- **Transcript preview.** Ctrl-P in the terminal picker or Option-P in the TUI
+  shows the most recent messages first, rendered as Markdown (with `glow` in
+  the terminal if you have it).
+- **Resume in place.** Enter runs `opencode --session <id>` in the session's
+  own directory. Ctrl-F forks instead. The session opens in the same terminal,
+  and exiting opencode returns to the picker — no tabs, panes, or window management.
+- **Native TUI, too.** A sessions section in the opencode sidebar plus an
   `option+o` picker, both themed by your opencode theme.
 - **Fast.** The database is scanned once per refresh and cached; keystrokes only
   re-render the last snapshot, so typing never triggers a query storm.
 
 ## Install
 
-With npm:
+### OpenCode plugin
+
+Add the package to `plugins` in your OpenCode V2 `opencode.json` or
+`opencode.jsonc`:
+
+```json
+{
+  "$schema": "https://opencode.ai/config.json",
+  "plugins": ["opencode-sesh"]
+}
+```
+
+OpenCode installs the package and loads its server tool and TUI panel. Merge
+this entry with your existing plugins. Remove the copied
+`./tui-plugins/sesh-panel` registration and `plugins/sesh-list.ts` tool before
+switching to avoid loading them twice.
+
+### Terminal picker
+
+Install the CLI with npm:
 
 ```bash
 npm install -g opencode-sesh
@@ -71,7 +93,7 @@ bash install.sh
 
 `sesh install` (or `bash install.sh`) links `sesh` into `$XDG_BIN_HOME`
 (default `~/.local/bin`), copies
-the `sesh-list` tool and the TUI panel into
+the `sesh_list` tool and the TUI panel into
 `${XDG_CONFIG_HOME:-~/.config}/opencode`, registers the panel in `opencode.json`, and
 declares the plugin dependencies (opencode installs them on next start). The
 panel registers the `/sesh` slash command. It never edits your shell rc, and any
@@ -137,23 +159,26 @@ Flags: `--cwd` (current directory only), `--limit N` (default: all),
 `--json` (with `--print`, emit JSON), `--query TEXT`, `--check`,
 `--needs-input` (list sessions waiting on you instead of opening the picker).
 
-`sesh prune [--older-than 30d] [--dry-run] [--yes] [--delete]` archives stale
-sessions (not updated within the threshold) so the list stays triageable.
-Pinned sessions, sessions waiting on you, subagent child sessions and already-archived
-sessions are never touched; archiving is reversible, while `--delete`
-hard-deletes through `opencode session delete`. Without `--dry-run`, a TTY run
+`sesh prune [--older-than 30d] [--dry-run] [--yes]` deletes stale
+sessions (not updated within the threshold) through `opencode session delete`, including their children.
+Pinned sessions and directories, sessions waiting on you, subagent child sessions and already-archived
+sessions are never selected. Without `--dry-run`, a TTY run
 confirms first and a non-TTY run needs `--yes`.
 
 `sesh costs [--days N] [--json]` sums assistant-message cost per project, with a
 recent window beside the lifetime total, so a day's work reads as a
-per-project record.
+per-project record. Legacy V1 history is included when available; sessions
+already present in V2 are counted only once.
+
+Session browsing uses the V2 store. Sessions remaining only in the legacy V1
+tables are not listed or resumable through sesh.
 
 When searching, title matches outrank transcript-only matches and the current
 project rises, so the list answers "where was that thing I worked on" before it
 answers "what is newest". Pins still win outright.
 
-Because `--print` just emits the id and directory, `sesh` doubles as a scriptable
-session lookup:
+`--print` still opens the interactive picker, but emits the selected id and
+directory instead of resuming. `--query` supplies the initial search text:
 
 ```bash
 read -r id cwd < <(sesh --print --query "auth")
@@ -163,7 +188,7 @@ sesh --print --json --query "auth" | jq -r .cwd
 Deleting is irreversible, so the picker asks before dispatching it, and a
 non-interactive `sesh-delete.sh` refuses unless given `--yes`.
 
-### TUI panel
+### TUI picker
 
 | Key | Action |
 | --- | --- |
@@ -175,13 +200,16 @@ non-interactive `sesh-delete.sh` refuses unless given `--yes`.
 | `↑`/`↓`, `PgUp`/`PgDn`, `Home`/`End` | Move the selection |
 | Option-P | Toggle the transcript preview |
 | Enter | Open the selected session |
-| Option-D | Delete the selected session (asks to confirm) |
+| Option-D | Arm deletion; press Option-D again, `y`, or Enter to confirm |
 | Ctrl-F | Fork the selected session |
 | Ctrl-G | Toggle scope: the selected session's project, or every project |
 | Option-W / Option-S | Show only sessions needing input / pinned sessions |
 | Ctrl-S / Ctrl-D | Pin or unpin the selected session / directory |
 | Esc | Close the preview first, then the picker |
 
+While deletion is armed, `n` or Esc cancels; it also cancels after five seconds.
+Option-O opens the picker globally; the other keys above apply inside it.
+
 The picker groups sessions under collapsible directory headings (click ▾/▸).
 Mouse-wheel scrolling moves through the tree without changing the selection
 under a stationary pointer. Option-P opens a full-size transcript preview over
@@ -193,10 +221,14 @@ action, or Esc to dismiss the menu.
 Right-click a session in the home list or picker to open it in a new cmux
 workspace at its directory; outside cmux it shows a toast instead.
 
-Click the sidebar's `search…` box to filter recent sessions in place; click
+### TUI sidebar and home list
+
+Click the sidebar's `search…` box to filter 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,
-Option-P to preview, Option-S/Option-R to pin, Option-D to delete, Esc to leave). Pinned
+Option-P to preview, Option-S to pin a session, Option-R to pin its directory,
+Option-D to arm deletion, Esc to leave). Press Option-D again or `y` to confirm
+an armed deletion; `n` or Esc cancels. 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.
@@ -209,6 +241,12 @@ 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.
 
+The home list also supports search and the Option-P, Option-S, Option-R, and
+Option-D actions on the hovered session. These Option pin shortcuts do not
+replace the picker's Ctrl-S/Ctrl-D bindings; Option-S in the picker filters pins.
+
+### Transcript search and needs-input triage
+
 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
@@ -225,12 +263,12 @@ All variables are optional.
 
 | Variable | Default | Effect |
 | --- | --- | --- |
-| `SESH_DB` | `opencode debug paths` | opencode SQLite database |
+| `SESH_DB` | `${XDG_DATA_HOME:-~/.local/share}/opencode/opencode.db`, falling back to `opencode debug paths` | opencode SQLite database |
 | `SESH_SQLITE` | `sqlite3` | query tool |
 | `SESH_JQ` / `SESH_FZF` | `PATH` | explicit executable overrides |
 | `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_CACHE_DIR` | `${XDG_CACHE_HOME:-~/.cache}/sesh` | persistent search-index cache |
 | `SESH_PINS_FILE` | `${XDG_DATA_HOME:-~/.local/share}/sesh/pins.json` | shared persistent session/directory pins |
 
 ## Integrations
@@ -256,7 +294,7 @@ Flat scripts back the terminal UI — the picker (`sesh.sh`), the refresh engine
 scans), preview renderer (`sesh-preview.sh`), deleter (`sesh-delete.sh`) and
 shortcut help (`sesh-shortcuts.sh`). The TUI panel (`tui-plugins/sesh-panel/tui.tsx`) is a
 SolidJS OpenTUI plugin that talks to the opencode SDK over the same store; the
-`sesh-list` agent tool reads it read-only through `bun:sqlite`. V2 discovers
+`sesh_list` agent tool reads it read-only through `bun:sqlite`. V2 discovers
 the installed tool automatically in the global config directory's `plugins/`.
 
 ## FAQ
@@ -264,12 +302,13 @@ the installed tool automatically in the global config directory's `plugins/`.
 **Does it replace opencode's native session list?** No. `<leader>l` and the
 native `/sessions` command are untouched; `sesh` is additive.
 
-**Is there an agent-facing list?** Yes — the `sesh-list` tool lets the model list
+**Is there an agent-facing list?** Yes — the `sesh_list` tool lets the model list
 every session across all directories (the native `opencode session list` only
 covers the current project) and offer to resume one.
 
 **Where is my data?** It reads the opencode database read-only and caches
-extracted text under `~/.cache/sesh`. Nothing is uploaded anywhere.
+extracted text under `${XDG_CACHE_HOME:-~/.cache}/sesh` (or `SESH_CACHE_DIR`).
+Nothing is uploaded anywhere.
 
 **Does it work on Windows?** It targets macOS and Linux. WSL should work; native
 Windows is untested.

package/bin/sesh-costs.sh

@@ -32,7 +32,7 @@ resolve_db() {
   local default="${XDG_DATA_HOME:-$HOME/.local/share}/opencode/opencode.db" from_cli=''
   if [ -f "$default" ]; then printf '%s\n' "$default"; return 0; fi
   if command -v "$OPENCODE_BIN" >/dev/null 2>&1; then
-    from_cli=$("$OPENCODE_BIN" debug paths 2>/dev/null | awk '$1 == "db" { print $2; exit }' || true)
+    from_cli=$("$OPENCODE_BIN" debug paths 2>/dev/null | awk '$1 == "db" { sub(/^db[ \t]+/, ""); print; exit }' || true)
   fi
   if [ -n "$from_cli" ] && [ -f "$from_cli" ]; then printf '%s\n' "$from_cli"; return 0; fi
   return 1
@@ -51,19 +51,33 @@ DB_PATH=$(resolve_db) || { echo 'sesh: session database unavailable' >&2; exit 1
 NOW_MS=$(python3 -c 'import time; print(int(time.time() * 1000))' 2>/dev/null || echo "$(( $(date +%s) * 1000 ))")
 CUTOFF=$((NOW_MS - days * 86400000))
 
+[ -n "$SQLITE_BIN" ] || { echo 'sesh: sqlite3 is required' >&2; exit 1; }
+LEGACY_QUERY=''
+if [ "$("$SQLITE_BIN" -readonly "$DB_PATH" "SELECT count(*) FROM sqlite_master WHERE type = 'table' AND name IN ('session', 'message');")" = 2 ]; then
+  LEGACY_QUERY="UNION ALL
+SELECT s.directory, s.id AS session_id, m.time_created, m.data
+FROM message m JOIN session s ON s.id = m.session_id
+WHERE json_extract(m.data, '\$.role') = 'assistant'
+  AND NOT EXISTS (SELECT 1 FROM session_v2 v WHERE v.id = s.id)"
+fi
+
 # One pass over assistant messages; the window filter is a cheap CASE so the
 # lifetime total and the window total come back together.
 ROWS_QUERY="
-SELECT s.directory AS directory,
+WITH costs AS (
+SELECT s.directory, s.id AS session_id, m.time_created, m.data
+FROM session_message m JOIN session_v2 s ON s.id = m.session_id
+WHERE m.type = 'assistant'
+$LEGACY_QUERY
+)
+SELECT m.directory AS directory,
   ROUND(SUM(CASE WHEN m.time_created >= $CUTOFF THEN COALESCE(json_extract(m.data, '\$.cost'), 0) ELSE 0 END), 4) AS window_cost,
   ROUND(SUM(COALESCE(json_extract(m.data, '\$.cost'), 0)), 4) AS lifetime_cost,
-  COUNT(DISTINCT s.id) AS sessions,
+  COUNT(DISTINCT m.session_id) AS sessions,
   SUM(CASE WHEN m.time_created >= $CUTOFF THEN COALESCE(json_extract(m.data, '\$.tokens.input'), 0) + COALESCE(json_extract(m.data, '\$.tokens.output'), 0) ELSE 0 END) AS window_tokens
-FROM session_message m
-JOIN session_v2 s ON s.id = m.session_id
-WHERE m.type = 'assistant'
-  AND json_extract(m.data, '\$.cost') IS NOT NULL
-GROUP BY s.directory
+FROM costs m
+WHERE json_extract(m.data, '\$.cost') IS NOT NULL
+GROUP BY m.directory
 ORDER BY lifetime_cost DESC;"
 
 [ -n "$SQLITE_BIN" ] || { echo 'sesh: sqlite3 is required' >&2; exit 1; }

package/bin/sesh-list.sh

@@ -79,7 +79,7 @@ resolve_db() {
   local default="${XDG_DATA_HOME:-$HOME/.local/share}/opencode/opencode.db" from_cli=''
   if [ -f "$default" ]; then printf '%s\n' "$default"; return 0; fi
   if command -v "$OPENCODE_BIN" >/dev/null 2>&1; then
-    from_cli=$("$OPENCODE_BIN" debug paths 2>/dev/null | awk '$1 == "db" { print $2; exit }' || true)
+    from_cli=$("$OPENCODE_BIN" debug paths 2>/dev/null | awk '$1 == "db" { sub(/^db[ \t]+/, ""); print; exit }' || true)
   fi
   if [ -n "$from_cli" ] && [ -f "$from_cli" ]; then printf '%s\n' "$from_cli"; return 0; fi
   return 1
@@ -279,7 +279,7 @@ refresh() {
   db_json "SELECT session_id, COUNT(*) AS n, MAX(time_updated) AS m FROM session_message GROUP BY session_id;" > "$parts" 2>/dev/null || printf '[]\n' > "$parts"
   "$JQ_BIN" -e 'type == "array"' "$parts" >/dev/null 2>&1 || printf '[]\n' > "$parts"
 
-  # Same bulk cache validation as the Claude list: every cache arrives as its
+  # Same bulk cache validation as the full list: every cache arrives as its
   # own file argument (ARG_MAX), records match on session id plus the two
   # change signals, and only vanished sessions are pruned — metadata always
   # covers the whole database, so pruning is safe under any scope or limit.
@@ -378,8 +378,8 @@ refresh() {
     | ($hist | map({key: .sessionId, value: .}) | from_entries) as $histById
     | [$meta[]
        | select((.id | type) == "string" and (.id | test("^ses_[A-Za-z0-9]+$")))
-       # Child sessions (fork children, spawned subagents) surface only with
-       # --archived; metadata still sees them, so cache pruning stays safe.
+       # Child sessions (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

package/bin/sesh-preview.sh

@@ -17,7 +17,7 @@ JQ_BIN=${SESH_JQ:-jq}
 OPENCODE_BIN=${SESH_OPENCODE:-opencode}
 DB_PATH=${SESH_DB:-"${XDG_DATA_HOME:-$HOME/.local/share}/opencode/opencode.db"}
 if [ -z "${SESH_DB:-}" ] && [ ! -f "$DB_PATH" ] && command -v "$OPENCODE_BIN" >/dev/null 2>&1; then
-  DB_PATH=$("$OPENCODE_BIN" debug paths 2>/dev/null | awk '$1 == "db" { print $2; exit }' || true)
+  DB_PATH=$("$OPENCODE_BIN" debug paths 2>/dev/null | awk '$1 == "db" { sub(/^db[ \t]+/, ""); print; exit }' || true)
 fi
 [ -f "$DB_PATH" ] || { echo "(opencode database is unavailable)"; exit 0; }
 

package/bin/sesh-prune.sh

@@ -1,15 +1,9 @@
 #!/usr/bin/env bash
-# Archive (or, with --delete, hard-delete) stale sessions: not updated within
+# Delete stale sessions: not updated within
 # the threshold, never pinned, never waiting on the user, never already
 # archived, never a child (subagent) session.
 #
-# Archive is the default because it is reversible; hard deletes go through
-# `opencode session delete` so its own safeguards apply. The archive itself
-# is a single atomic UPDATE through sqlite3 — the opencode server API has no
-# archive endpoint, so a direct write is the only route (deletes stay on the
-# CLI).
-#
-# Usage: sesh-prune.sh [--older-than 30d] [--dry-run] [--yes] [--delete]
+# Usage: sesh-prune.sh [--older-than 30d] [--dry-run] [--yes]
 #   --older-than Nd|Nh|Nw (bare N means days; default 30d)
 #   --dry-run lists candidates and changes nothing
 #   without --dry-run, a TTY run confirms first; a non-TTY run needs --yes
@@ -21,15 +15,13 @@ OPENCODE_BIN=${SESH_OPENCODE:-opencode}
 older_than=30d
 dry_run=0
 assume_yes=0
-hard_delete=0
 while [ "$#" -gt 0 ]; do
   case "$1" in
     --older-than) older_than=${2:-}; shift ;;
     --older-than=*) older_than=${1#--older-than=} ;;
     --dry-run) dry_run=1 ;;
     --yes|-y) assume_yes=1 ;;
-    --delete) hard_delete=1 ;;
-    --help) echo "usage: ${0##*/} [--older-than 30d] [--dry-run] [--yes] [--delete]"; exit 0 ;;
+    --help) echo "usage: ${0##*/} [--older-than 30d] [--dry-run] [--yes]"; exit 0 ;;
     *) echo "unknown option: $1" >&2; exit 2 ;;
   esac
   shift
@@ -56,7 +48,7 @@ resolve_db() {
   local default="${XDG_DATA_HOME:-$HOME/.local/share}/opencode/opencode.db" from_cli=''
   if [ -f "$default" ]; then printf '%s\n' "$default"; return 0; fi
   if command -v "$OPENCODE_BIN" >/dev/null 2>&1; then
-    from_cli=$("$OPENCODE_BIN" debug paths 2>/dev/null | awk '$1 == "db" { print $2; exit }' || true)
+    from_cli=$("$OPENCODE_BIN" debug paths 2>/dev/null | awk '$1 == "db" { sub(/^db[ \t]+/, ""); print; exit }' || true)
   fi
   if [ -n "$from_cli" ] && [ -f "$from_cli" ]; then printf '%s\n' "$from_cli"; return 0; fi
   return 1
@@ -74,7 +66,6 @@ DB_PATH=$(resolve_db) || { echo 'sesh: session database unavailable' >&2; exit 1
 
 [ -n "$SQLITE_BIN" ] || { echo 'sesh: sqlite3 is required' >&2; exit 1; }
 query() { "$SQLITE_BIN" -json -readonly "$DB_PATH" "$1"; }
-write_db() { "$SQLITE_BIN" "$DB_PATH" "$1"; }
 
 JQ_BIN=${SESH_JQ:-$(command -v jq || true)}
 [ -n "$JQ_BIN" ] || { echo 'sesh: jq is required' >&2; exit 1; }
@@ -98,8 +89,7 @@ ELIGIBLE=$(printf '%s' "$CANDIDATES" | "$JQ_BIN" -c --slurpfile _pins <(printf '
     ]
 ')
 COUNT=$(printf '%s' "$ELIGIBLE" | "$JQ_BIN" -r 'length')
-VERB=Archive
-[ "$hard_delete" = 0 ] || VERB=Delete
+VERB=Delete
 
 if [ "$COUNT" = 0 ]; then
   echo "Nothing to prune older than $older_than."
@@ -137,29 +127,17 @@ if [ "$assume_yes" = 0 ]; then
   fi
 fi
 
-if [ "$hard_delete" = 0 ]; then
-  IDS=$(printf '%s' "$ELIGIBLE" | "$JQ_BIN" -r '.[].id')
-  IN_LIST=''
-  for id in $IDS; do
-    [[ "$id" =~ ^ses_[A-Za-z0-9]+$ ]] || { echo "Refusing: unexpected session id shape." >&2; exit 1; }
-    IN_LIST="$IN_LIST'$id',"
-  done
-  IN_LIST=${IN_LIST%,}
-  write_db "UPDATE session_v2 SET time_archived = $NOW_MS WHERE id IN ($IN_LIST);"
-  echo "Archived $COUNT session(s) older than $older_than."
-else
-  command -v "$OPENCODE_BIN" >/dev/null 2>&1 || { echo 'sesh: opencode executable is unavailable for deletes.' >&2; exit 1; }
-  failed=0
-  done_count=0
-  for id in $(printf '%s' "$ELIGIBLE" | "$JQ_BIN" -r '.[].id'); do
-    [[ "$id" =~ ^ses_[A-Za-z0-9]+$ ]] || { echo "Refusing: unexpected session id shape." >&2; exit 1; }
-    if "$OPENCODE_BIN" session delete "$id" >/dev/null 2>&1; then
-      done_count=$((done_count + 1))
-    else
-      echo "Could not delete $id." >&2
-      failed=$((failed + 1))
-    fi
-  done
-  echo "Deleted $done_count session(s) older than $older_than."
-  [ "$failed" = 0 ] || exit 1
-fi
+command -v "$OPENCODE_BIN" >/dev/null 2>&1 || { echo 'sesh: opencode executable is unavailable for deletes.' >&2; exit 1; }
+failed=0
+done_count=0
+for id in $(printf '%s' "$ELIGIBLE" | "$JQ_BIN" -r '.[].id'); do
+  [[ "$id" =~ ^ses_[A-Za-z0-9]+$ ]] || { echo "Refusing: unexpected session id shape." >&2; exit 1; }
+  if "$OPENCODE_BIN" session delete "$id" >/dev/null 2>&1; then
+    done_count=$((done_count + 1))
+  else
+    echo "Could not delete $id." >&2
+    failed=$((failed + 1))
+  fi
+done
+echo "Deleted $done_count session(s) older than $older_than."
+[ "$failed" = 0 ] || exit 1

package/bin/sesh-shortcuts.sh

@@ -15,6 +15,11 @@ sesh shortcuts
   Escape            Exit the picker
 
 Flags: --cwd (current directory only), --limit N (default: all),
-       --archived (include archived), --print (print id instead of resuming),
-       --json (with --print, emit JSON)
+       --archived (include archived and child sessions),
+       --print (print selected id<TAB>cwd instead of resuming),
+       --json (with --print, emit JSON), --fork (resume as a fork),
+       --query TEXT (initial search), --check (check dependencies),
+       --needs-input [--json] (list sessions waiting on you)
+
+--print still opens the picker; select a session with Enter or Ctrl-F.
 HELP

package/bin/sesh-waiting.sh

@@ -5,12 +5,16 @@
 # owned by a running TUI server, whose in-memory permission/question state
 # is invisible cross-project.
 #
-# A session waits when it is not archived, is not a fork child, and either
+# A session waits when it is not archived, is not a child (subagent) session,
+# and either
 #   - has a `question` tool part still pending or running with no later user
 #     message in the same session (awaiting an answer; a dismissed question
 #     that errored is not waiting), or
-#   - has a `tool` part still marked `running` older than STUCK_AFTER_MS
-#     (awaiting approval, or orphaned by a dead server).
+#   - has a `tool` part still marked `running` older than STUCK_AFTER_MS with
+#     no message activity in the session or its direct children since then
+#     (a long-running subagent/shell tool with recent activity is not stuck;
+#     V2 resumes interrupted runs server-side, so `running` with no activity
+#     means orphaned or awaiting approval).
 #
 # Usage: sesh-waiting.sh [--json]
 #   default prints a human table; --json prints [{id,reason,title,directory,updated}]
@@ -34,7 +38,7 @@ resolve_db() {
   local default="${XDG_DATA_HOME:-$HOME/.local/share}/opencode/opencode.db" from_cli=''
   if [ -f "$default" ]; then printf '%s\n' "$default"; return 0; fi
   if command -v "$OPENCODE_BIN" >/dev/null 2>&1; then
-    from_cli=$("$OPENCODE_BIN" debug paths 2>/dev/null | awk '$1 == "db" { print $2; exit }' || true)
+    from_cli=$("$OPENCODE_BIN" debug paths 2>/dev/null | awk '$1 == "db" { sub(/^db[ \t]+/, ""); print; exit }' || true)
   fi
   if [ -n "$from_cli" ] && [ -f "$from_cli" ]; then printf '%s\n' "$from_cli"; return 0; fi
   return 1
@@ -83,9 +87,12 @@ WHERE COALESCE(s.time_archived, 0) = 0
       AND NOT EXISTS (
         SELECT 1 FROM session_message u
         WHERE u.session_id = live.session_id AND u.type = 'user' AND u.seq > live.seq)
-  ) OR EXISTS (
+  ) OR (EXISTS (
     SELECT 1 FROM live
-    WHERE live.session_id = s.id AND live.status = 'running' AND live.created < $STUCK_BEFORE))
+    WHERE live.session_id = s.id AND live.status = 'running' AND live.created < $STUCK_BEFORE)
+    AND NOT EXISTS (
+      SELECT 1 FROM session_message r JOIN session_v2 f ON f.id = r.session_id
+      WHERE (f.id = s.id OR f.parent_id = s.id) AND r.time_updated >= $STUCK_BEFORE)))
 ORDER BY s.time_updated DESC;
 SQL
 

package/bin/sesh.sh

@@ -203,11 +203,15 @@ fi
 command -v "$OPENCODE_BIN" >/dev/null 2>&1 || { echo 'sesh: opencode executable unavailable' >&2; exit 1; }
 # Resume in place: this terminal becomes the session. No tabs, no panes.
 if [ "$fork" = 1 ]; then
-  forked=$(cd "$cwd" && "$OPENCODE_BIN" api session.fork --param "sessionID=$session_id" -d '{}' 2>/dev/null | "$SESH_JQ" -r '.data.id // empty' 2>/dev/null || true)
+  fork_err="$state_dir/fork-err"
+  forked=$(cd "$cwd" && "$OPENCODE_BIN" api session.fork --param "sessionID=$session_id" -d '{}' 2>"$fork_err" | "$SESH_JQ" -r '.data.id // empty' 2>/dev/null || true)
   if [[ "$forked" =~ ^ses_[A-Za-z0-9]+$ ]]; then
     session_id=$forked
+    rm -f "$fork_err"
   else
     echo 'sesh: could not fork the session; returning to the picker.' >&2
+    [ -s "$fork_err" ] && sed 's/^/sesh: /' "$fork_err" >&2
+    rm -f "$fork_err"
     continue
   fi
 fi

package/contrib/cmux/README.md

@@ -20,7 +20,8 @@ Paste only the actions you want; the `ui.newWorkspace` block is optional.
 
 ## Resume a session in its own cmux workspace
 
-The picker resumes in place (it `cd`s and `exec`s opencode). To instead open a
+The picker runs opencode in the selected session's directory and returns to the
+picker when opencode exits. To instead open a
 session in a **new cmux workspace** at its directory, shell out to cmux after
 resolving the session with sesh's scriptable lookup:
 
@@ -57,9 +58,10 @@ sesh is a normal CLI, so any system-wide launcher works — a cmux `shortcut`, a
 cmd + shift - s : cmux new-workspace --command "sesh"
 ```
 
-Because `--print --json` resolves a session non-interactively, the same hook can
-resume a specific session without any UI:
+`--print --json` still opens the interactive picker; `--query` initializes its
+search and `--limit` caps the list rather than automatically accepting a result.
+To resume a known session without the picker, use its id and directory directly:
 
 ```bash
-cmd + alt - r : cmux new-workspace --command "opencode --session $(sesh --print --json --limit 1 | jq -r .sessionId)"
+cmd + alt - r : cmux new-workspace --cwd /path/to/project --command "opencode --session ses_EXAMPLE"
 ```

package/install.sh

@@ -24,7 +24,7 @@ SYNC_PANEL=0
 
 # Fallback plugin version for when the opencode CLI is unavailable; the
 # installer prefers the local opencode version so the panel matches its SDK.
-PLUGIN_VERSION_FALLBACK="2.0.18"
+PLUGIN_VERSION_FALLBACK="2.0.25"
 # Peer line the panel was developed and typechecked against. A checkout's
 # package.json overrides these, so dependency bumps cannot drift the installed
 # config out of sync (solid-js moves with OpenTUI via @opentui/keymap's peer).
@@ -42,7 +42,7 @@ usage() {
 Usage: bash install.sh [--bin-dir DIR] [--no-tool] [--no-tui] [--uninstall]
 
   --bin-dir DIR  Directory for the sesh launcher (default: ~/.local/bin).
-  --no-tool      Skip installing the sesh-list custom tool.
+  --no-tool      Skip installing the sesh_list custom tool.
   --no-tui       Skip installing the in-TUI sessions panel plugin.
   --uninstall    Remove everything this script installed.
   --sync-panel   Refresh an already-installed TUI panel only (used by postinstall).
@@ -314,7 +314,7 @@ fi
 "$LAUNCHER" --check || fail "post-install check failed."
 note "done"
 note "  picker:  run 'sesh' in any terminal, or '/sesh' inside opencode"
-note "  sidebar: alt+o opens the full picker"
+note "  TUI:     Option-O opens the full picker"
 note_restart
 case ":$PATH:" in
   *":$BIN_DIR:"*) ;;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-sesh",
-  "version": "1.1.0",
+  "version": "2.0.1",
   "description": "Browse, search, preview and resume opencode sessions from the terminal and the TUI.",
   "type": "module",
   "license": "MIT",
@@ -22,6 +22,7 @@
     "cli"
   ],
   "exports": {
+    ".": "./plugins/sesh-list.ts",
     "./tui": "./tui-plugins/sesh-panel/tui.tsx",
     "./tool": "./plugins/sesh-list.ts"
   },
@@ -74,7 +75,7 @@
     "@opentui/core": "^0.5.11",
     "@opentui/keymap": "^0.5.11",
     "@opentui/solid": "^0.5.11",
-    "@types/node": "26.5.1",
+    "@types/node": "26.6.4",
     "husky": "^9.1.7",
     "solid-js": "1.9.15",
     "typescript": "7.0.2"

package/plugins/sesh-list.ts

@@ -1,9 +1,19 @@
 import { Plugin } from "@opencode/plugin"
+import { spawnSync } from "node:child_process"
+import { existsSync } from "node:fs"
 import { homedir } from "node:os"
 import { join } from "node:path"
 
 function dbPath(): string {
-  return process.env.SESH_DB ?? join(process.env.XDG_DATA_HOME ?? join(homedir(), ".local", "share"), "opencode", "opencode.db")
+  if (process.env.SESH_DB) return process.env.SESH_DB
+  const xdgPath = join(process.env.XDG_DATA_HOME ?? join(homedir(), ".local", "share"), "opencode", "opencode.db")
+  if (existsSync(xdgPath)) return xdgPath
+  try {
+    const result = spawnSync(process.env.SESH_OPENCODE ?? "opencode", ["debug", "paths"], { encoding: "utf8" })
+    const match = result.stdout?.match(/^db\s+(.+)$/m)
+    if (match) return match[1].trimEnd()
+  } catch {}
+  return xdgPath
 }
 
 const input = {

package/tui-plugins/sesh-panel/tui.tsx

@@ -7,8 +7,9 @@ type TuiPluginApi = ReturnType<typeof createApi>
 type TuiPlugin = (api: TuiPluginApi) => Promise<void>
 import { createEffect, createMemo, createRoot, createSignal, For, getOwner, on, onCleanup, onMount, runWithOwner, Show } from "solid-js"
 import { mkdir, readFile, rename, rmdir, unlink, writeFile } from "node:fs/promises"
+import { existsSync } from "node:fs"
 import { dirname, join } from "node:path"
-import { spawn } from "node:child_process"
+import { spawn, spawnSync } from "node:child_process"
 import { getTreeSitterClient, RGBA, SyntaxStyle, TextAttributes } from "@opentui/core"
 import { Portal } from "@opentui/solid"
 
@@ -16,8 +17,8 @@ type ThemeColors = TuiPluginApi["theme"]["current"]
 
 let markdownStyleCache: { theme: ThemeColors; style: SyntaxStyle } | undefined
 
-function buildMarkdownStyle(theme: ThemeColors): SyntaxStyle {
-  return SyntaxStyle.fromTheme([
+function buildMarkdownStyle(theme: ThemeColors, owner?: unknown): SyntaxStyle {
+  return (SyntaxStyle as any).fromTheme([
     { scope: ["default"], style: { foreground: theme.text } },
     { scope: ["comment", "comment.documentation"], style: { foreground: theme.syntaxComment, italic: true } },
     { scope: ["string", "symbol", "character"], style: { foreground: theme.syntaxString } },
@@ -80,17 +81,17 @@ function buildMarkdownStyle(theme: ThemeColors): SyntaxStyle {
     },
     { scope: ["markup.link.label", "label"], style: { foreground: theme.markdownLinkText, underline: true } },
     { scope: ["conceal"], style: { foreground: theme.textMuted } },
-  ])
+  ], owner)
 }
 
-function getMarkdownStyle(theme: ThemeColors): SyntaxStyle | undefined {
+function getMarkdownStyle(theme: ThemeColors, owner?: unknown): SyntaxStyle | undefined {
   if (markdownStyleCache?.theme === theme) return markdownStyleCache?.style
   try {
-    markdownStyleCache = { theme, style: buildMarkdownStyle(theme) }
+    markdownStyleCache = { theme, style: buildMarkdownStyle(theme, owner) }
     return markdownStyleCache?.style
   } catch {
     try {
-      return SyntaxStyle.create()
+      return (SyntaxStyle as any).create(owner)
     } catch {
       return undefined
     }
@@ -502,26 +503,63 @@ type IndexProgress = { indexed: number; total: number; complete: boolean }
 
 const nextTick = () => new Promise<void>((resolve) => setTimeout(resolve, 0))
 
+function resolveDbPath(): string {
+  if (process.env.SESH_DB) return process.env.SESH_DB
+  const home = process.env.HOME ?? ""
+  const dataHome = process.env.XDG_DATA_HOME ?? `${home}/.local/share`
+  const xdgPath = `${dataHome}/opencode/opencode.db`
+  if (existsSync(xdgPath)) return xdgPath
+  try {
+    const result = spawnSync(process.env.SESH_OPENCODE ?? "opencode", ["debug", "paths"], { encoding: "utf8" })
+    const match = result.stdout?.match(/^db\s+(.+)$/m)
+    if (match) return match[1].trimEnd()
+  } catch {}
+  return xdgPath
+}
+
 async function openTranscriptDb(): Promise<any | undefined> {
   try {
-    const home = process.env.HOME ?? ""
-    const dataHome = process.env.XDG_DATA_HOME ?? `${home}/.local/share`
     // @ts-ignore - bun:sqlite ships with the Bun runtime (verified); no type package installed
     const sqlite: any = await import("bun:sqlite")
     if (typeof sqlite?.Database !== "function") return undefined
-    return new sqlite.Database(process.env.SESH_DB ?? `${dataHome}/opencode/opencode.db`, { readonly: true })
+    return new sqlite.Database(resolveDbPath(), { readonly: true })
   } catch {
     return undefined
   }
 }
 
+function costRowsQuery(cutoff: number, includeLegacy: boolean): string {
+  const legacy = includeLegacy ? `UNION ALL
+SELECT s.directory, s.id AS session_id, m.time_created, m.data
+FROM message m JOIN session s ON s.id = m.session_id
+WHERE json_extract(m.data, '$.role') = 'assistant'
+  AND NOT EXISTS (SELECT 1 FROM session_v2 v WHERE v.id = s.id)` : ""
+  return `WITH costs AS (
+SELECT s.directory, s.id AS session_id, m.time_created, m.data
+FROM session_message m JOIN session_v2 s ON s.id = m.session_id
+WHERE m.type = 'assistant'
+${legacy}
+)
+SELECT m.directory AS directory,
+  ROUND(SUM(CASE WHEN m.time_created >= ${cutoff} THEN COALESCE(json_extract(m.data, '$.cost'), 0) ELSE 0 END), 4) AS window_cost,
+  ROUND(SUM(COALESCE(json_extract(m.data, '$.cost'), 0)), 4) AS lifetime_cost,
+  COUNT(DISTINCT m.session_id) AS sessions
+FROM costs m
+WHERE json_extract(m.data, '$.cost') IS NOT NULL
+GROUP BY m.directory
+ORDER BY lifetime_cost DESC`
+}
+
 // NEEDS_INPUT_SQL: sessions waiting on the user (shared heuristic — keep in
 // sync with bin/sesh-waiting.sh). A session waits when it is not archived,
-// is not a fork child, and either has an unanswered `question` tool part or
-// a `tool` part still marked running older than STUCK_AFTER_MS (awaiting
-// approval, or orphaned by a dead server). Server-independent on purpose:
-// the TUI sync layer only sees permission/question state for sessions owned
-// by the current server, which is invisible cross-project.
+// is not a child (subagent) session, and either has an unanswered `question`
+// tool part or a `tool` part still marked running older than STUCK_AFTER_MS
+// with no message activity in the session or its direct children since then (a
+// long-running subagent/shell tool with recent activity is not stuck; V2
+// resumes interrupted runs server-side, so `running` with no activity means
+// orphaned or awaiting approval). Server-independent on purpose: the TUI
+// sync layer only sees permission/question state for sessions owned by the
+// current server, which is invisible cross-project.
 const STUCK_AFTER_MS = 600000
 const LIVE_TOOLS_CTE = (sessionFilter: string) => `
 WITH live AS (
@@ -539,6 +577,9 @@ const QUESTION_OPEN = `live.name = 'question'
   AND NOT EXISTS (
     SELECT 1 FROM session_message u
     WHERE u.session_id = live.session_id AND u.type = 'user' AND u.seq > live.seq)`
+const NO_RECENT_ACTIVITY = (sessionIdExpr: string, stuckBefore: number) => `NOT EXISTS (
+      SELECT 1 FROM session_message r JOIN session_v2 f ON f.id = r.session_id
+      WHERE (f.id = ${sessionIdExpr} OR f.parent_id = ${sessionIdExpr}) AND r.time_updated >= ${stuckBefore})`
 const NEEDS_INPUT_SQL = (stuckBefore: number) => `${LIVE_TOOLS_CTE("")}
 SELECT s.id AS id,
   CASE WHEN EXISTS (SELECT 1 FROM live WHERE live.session_id = s.id AND ${QUESTION_OPEN})
@@ -547,9 +588,10 @@ FROM session_v2 s
 WHERE COALESCE(s.time_archived, 0) = 0
   AND s.parent_id IS NULL
   AND (EXISTS (SELECT 1 FROM live WHERE live.session_id = s.id AND ${QUESTION_OPEN})
-    OR EXISTS (
+    OR (EXISTS (
       SELECT 1 FROM live
-      WHERE live.session_id = s.id AND live.status = 'running' AND live.created < ${stuckBefore}))
+      WHERE live.session_id = s.id AND live.status = 'running' AND live.created < ${stuckBefore})
+      AND ${NO_RECENT_ACTIVITY("s.id", stuckBefore)}))
 ORDER BY s.time_updated DESC`
 
 async function queryWaitingIds(db: any): Promise<Map<string, string>> {
@@ -679,7 +721,7 @@ async function buildSearchIndexRemote(
   onEach: () => void,
 ): Promise<void> {
   const home = process.env.HOME ?? ""
-  const cacheDir = process.env.SESH_CACHE_DIR ?? `${home}/.cache/sesh`
+  const cacheDir = process.env.SESH_CACHE_DIR ?? `${process.env.XDG_CACHE_HOME ?? `${home}/.cache`}/sesh`
   let cursor = 0
   // Bounded concurrency: a fixed worker pool instead of one request per session.
   const worker = async () => {
@@ -865,10 +907,10 @@ function createTranscriptPreview(api: TuiPluginApi) {
             scrollbarOptions={{ visible: false }}
             maxHeight={Math.max(6, Math.floor(api.renderer.height / 2))}
           >
-            {getMarkdownStyle(api.theme.current) ? (
+            {getMarkdownStyle(api.theme.current, (api.renderer as any)?.nativeSession) ? (
               <markdown
                 content={previewText()}
-                syntaxStyle={getMarkdownStyle(api.theme.current)!}
+                syntaxStyle={getMarkdownStyle(api.theme.current, (api.renderer as any)?.nativeSession)!}
                 treeSitterClient={getTreeSitterClient()}
               />
             ) : (
@@ -1558,7 +1600,6 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         <box
           flexDirection="row"
           gap={1}
-          paddingLeft={1}
           paddingRight={1}
           backgroundColor={searching() ? theme().backgroundElement : RGBA.fromInts(0, 0, 0, 0)}
           onMouseDown={(event: { stopPropagation: () => void }) => {
@@ -1576,7 +1617,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
             wrapMode="none"
             style={{ fg: query() ? theme().text : theme().textMuted }}
           >
-            {query() || "search…"}
+            {query() || (searching() ? "" : "search…")}
             {searching() ? "▏" : ""}
           </text>
           <Show when={query()}>
@@ -2001,7 +2042,7 @@ function HomeSessions(props: { api: TuiPluginApi } & PinProps) {
                   wrapMode="none"
                   style={{ fg: query() ? theme().text : theme().textMuted }}
                 >
-                  {query() || "search…"}
+                  {query() || (searching() ? "" : "search…")}
                   {searching() ? "▏" : ""}
                 </text>
               </box>
@@ -2574,6 +2615,7 @@ const tui: TuiPlugin = async (api) => {
                 focusedBackgroundColor={api.theme.current.backgroundPanel}
                 focusedTextColor={api.theme.current.text}
                 cursorColor={api.theme.current.primary}
+                cursorStyle={{ style: "line", blinking: false }}
                 onInput={(value) => {
                   if (pendingDelete()) return
                   setQuery(value)
@@ -2812,10 +2854,10 @@ const tui: TuiPlugin = async (api) => {
                 <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: Accessor<string>) =>
-                      getMarkdownStyle(api.theme.current) ? (
+                      getMarkdownStyle(api.theme.current, (api.renderer as any)?.nativeSession) ? (
                         <markdown
                           content={text()}
-                          syntaxStyle={getMarkdownStyle(api.theme.current)!}
+                          syntaxStyle={getMarkdownStyle(api.theme.current, (api.renderer as any)?.nativeSession)!}
                           treeSitterClient={getTreeSitterClient()}
                         />
                       ) : (
@@ -2851,17 +2893,8 @@ const tui: TuiPlugin = async (api) => {
       else {
         try {
           const cutoff = Date.now() - 86400000
-          const raw = (db.query(`
-SELECT s.directory AS directory,
-  ROUND(SUM(CASE WHEN m.time_created >= ${cutoff} THEN COALESCE(json_extract(m.data, '$.cost'), 0) ELSE 0 END), 4) AS window_cost,
-  ROUND(SUM(COALESCE(json_extract(m.data, '$.cost'), 0)), 4) AS lifetime_cost,
-  COUNT(DISTINCT s.id) AS sessions
-FROM session_message m
-JOIN session_v2 s ON s.id = m.session_id
-WHERE m.type = 'assistant'
-  AND json_extract(m.data, '$.cost') IS NOT NULL
-GROUP BY s.directory
-ORDER BY lifetime_cost DESC`).all() ?? []) as {
+          const legacyTables = db.query("SELECT count(*) AS count FROM sqlite_master WHERE type = 'table' AND name IN ('session', 'message')").get()
+          const raw = (db.query(costRowsQuery(cutoff, legacyTables?.count === 2)).all() ?? []) as {
             directory: unknown
             window_cost: unknown
             lifetime_cost: unknown
@@ -3261,6 +3294,9 @@ function createApi(ctx: Plugin.Context) {
       get currentFocusedEditor() {
         return ctx.renderer.currentFocusedEditor
       },
+      get nativeSession() {
+        return (ctx.renderer as any)?.nativeSession
+      },
       on(event: string, handler: (...args: any[]) => void) {
         ctx.renderer.on(event, handler)
       },