opencode-sesh 1.0.2 → 1.0.4

package/AGENTS.md

@@ -59,16 +59,18 @@ 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` / `message` / `part` tables); the `sesh-list` agent tool queries
-the same store through `opencode db`. Keep its SQL column names in sync with
+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:
 
 - `--refresh` (expensive): bulk-reads session metadata and per-session text
   parts, validates the persistent extraction cache
-  (`$SESH_CACHE_DIR/extractions/<ses_*.json>`, schema 2) against `time_updated`,
-  part count and the latest part timestamp, re-extracts only changed sessions,
+  (`$SESH_CACHE_DIR/extractions/<ses_*.json>`, schema 3) against `time_updated`,
+  message count and the latest message timestamp, re-extracts only changed sessions,
   prunes vanished ones, and atomically publishes `STATE_DIR/snapshot.jsonl`.
-  Extraction moves transcripts through files, never argv (no ARG_MAX limit); if
+  Extraction reads user `data.text` and assistant `data.content` text entries,
+  ordered by message `seq`, through files, never argv (no ARG_MAX limit); if
   any session fails, the published status is `stale` and that session stays
   uncached so the next refresh retries, otherwise `status = fresh`. Scope
   (`--cwd`/toggle) and `--limit` apply at assembly, so metadata always covers
@@ -85,7 +87,10 @@ the schema below. Keystrokes never touch the database:
 - 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. Ctrl-S toggles a selected
-  session; Ctrl-D toggles its directory. Pinned directories sort before groups
+  session; Ctrl-D toggles its directory (terminal picker and option+o picker).
+  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.
 
 **Output contract** (TSV, 6 fields):
@@ -138,7 +143,7 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
 
 ## TUI panel (`tui-plugins/sesh-panel/tui.tsx`)
 
-- **Sidebar:** `api.slots.register` on `sidebar_content` (append mode — native
+- **Sidebar:** `api.slots.register` on `sidebar_content` (prepend 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.
   Row markers alone signal session state: a running agent animates a loading
@@ -168,8 +173,9 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
   `/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`
+- **Durable install:** V2 reloads plugins on watched configuration changes;
+  unwatched dependencies may need a restart. If a panel update does not appear,
+  fully quit/reopen opencode. `install.sh --sync-panel`
   (run by the `postinstall`) refreshes an already-installed panel and is a
   no-op when absent, and `sesh --check` reports when the installed copy differs
   from the bundled one.
@@ -231,7 +237,7 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
   history in a temp dir (included in `bun run test`).
 - `bun run test:picker` — PTY suite driving the real fzf picker (needs fzf
   `>= 0.73` and Python 3).
-- `bun run typecheck` — `tsc` over `tui/` and `opencode/`.
+- `bun run typecheck` — `tsc` over `tui-plugins/` and `plugins/`.
 - `bun run lint:sh` — `bash -n` on every script.
 - `HOME=/tmp/fakehome bash install.sh` — installer smoke test.
 - Keep `tui-plugins/sesh-panel/tui.tsx` and any installed copy byte-identical when testing

package/CHANGELOG.md

@@ -5,6 +5,18 @@ 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).
 
+## [1.0.4] - 2026-10-08
+
+### Fixed
+
+- Restore V2 session store, dialog and fork compatibility
+
+## [1.0.3] - 2026-10-08
+
+### Fixed
+
+- **tui:** Rebind sidebar pins to option keys to stop shadowing composer
+
 ## [1.0.2] - 2026-10-08
 
 ### Fixed
@@ -430,6 +442,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.
 
+[1.0.4]: https://github.com/ozandogrultan/opencode-sesh/compare/v1.0.3...v1.0.4
+[1.0.3]: https://github.com/ozandogrultan/opencode-sesh/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/ozandogrultan/opencode-sesh/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/ozandogrultan/opencode-sesh/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.14.1...v1.0.0

package/README.md

@@ -24,7 +24,7 @@ Sessions (8)                              ▾ hide
   ├○ Retry the OAuth token refr…            2h
   ├○ Login rate limiting notes              3d
   ├○ Draft the release notes                7d
-  ├○ Auth middleware cleanup               11d
+  ├○ Auth middleware cleanup                11d
   └○ Rotate the signing keys                12d
 ▾ ~/Projects/mobile                          (3)
   ├○ Author avatar upload retry             1d
@@ -72,7 +72,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
-`${XDG_CONFIG_HOME:-~/.config}/opencode`, registers the panel in `tui.json`, and
+`${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
 file it would overwrite is backed up first.
@@ -80,8 +80,8 @@ file it would overwrite is backed up first.
 The npm package ships the same scripts and installer; the runtime tools below
 are still required.
 
-Fully quit opencode and reopen it to load the panel — opencode imports plugins
-once at startup, so reloading a window reuses the running process. Upgrades
+V2 reloads plugins when watched configuration files change. If a panel update
+does not appear, fully quit opencode and reopen it. Upgrades
 refresh an already-installed panel automatically (the npm `postinstall` syncs
 it), and `sesh --check` reports when the installed panel is out of date.
 
@@ -201,7 +201,7 @@ workspace at its directory; outside cmux it shows a toast instead.
 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,
-Option-P to preview, Ctrl-S/Ctrl-D to pin, Option-D to delete, Esc to leave). Pinned
+Option-P to preview, Option-S/Option-R to pin, Option-D 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.
@@ -247,10 +247,10 @@ workspace, and a global "resume from anywhere" hotkey — all caller-side.
 
 ## How it works
 
-`bin/sesh-list.sh` is the only `bin/` script that reads the opencode session
-store (SQLite: `session` / `message` / `part`). Each refresh extracts session
+The `bin/` readers use the V2 opencode session
+store (SQLite: `session_v2` / `session_message`). Each refresh extracts session
 metadata and text-only parts into a persistent per-session cache keyed on
-`time_updated`, part count and the latest part timestamp, then atomically
+`time_updated`, message count and the latest message timestamp, then atomically
 publishes a `snapshot.jsonl`. Every keystroke re-renders that snapshot with `jq`
 alone, so typing never starts competing database scans. Reasoning and tool
 payloads are never indexed or previewed, and session ids are validated before
@@ -261,7 +261,8 @@ 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 through `opencode db`.
+`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
 
@@ -292,7 +293,7 @@ checks before opening a PR:
 bun install
 bun run test         # fixture-database regression suite
 bun run test:picker  # PTY picker suite (needs fzf >= 0.73)
-bun run typecheck    # tsc over tui/ and opencode/
+bun run typecheck    # tsc over tui-plugins/ and plugins/
 bun run lint:sh      # bash -n on every script
 ```
 

package/bin/sesh-costs.sh

@@ -59,9 +59,9 @@ SELECT s.directory AS directory,
   ROUND(SUM(COALESCE(json_extract(m.data, '\$.cost'), 0)), 4) AS lifetime_cost,
   COUNT(DISTINCT s.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 message m
-JOIN session s ON s.id = m.session_id
-WHERE json_extract(m.data, '\$.role') = 'assistant'
+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;"

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, COALESCE(parent_id, '') AS parent 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_v2 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
   }
@@ -287,7 +287,7 @@ refresh() {
     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
   }
-  db_json "SELECT session_id, COUNT(*) AS n, MAX(time_updated) AS m FROM part GROUP BY session_id;" > "$parts" 2>/dev/null || printf '[]\n' > "$parts"
+  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
@@ -302,7 +302,7 @@ refresh() {
     | ($parts[0] | map({key:.session_id, value:.}) | from_entries) as $stats
     | [$sessions[0][] | . + {partCount: ($stats[.id].n // 0), partMax: ($stats[.id].m // 0)}] as $meta
     | ($meta | map({key:.id, value:.}) | from_entries) as $byId
-    | [$caches[0][]? | select(.cacheSchema == 2 and (.sessionId | type) == "string")
+    | [$caches[0][]? | select(.cacheSchema == 3 and (.sessionId | type) == "string")
        | select($byId[.sessionId] as $m | $m != null and .cacheUpdated == $m.time_updated and .cacheParts == $m.partCount and .cacheMax == $m.partMax)] as $cached
     | ($cached | map({key: .sessionId, value:true}) | from_entries) as $cachedIds
     | {cached: $cached,
@@ -337,7 +337,8 @@ refresh() {
     for ((i = j; i < j + 200 && i < ${#stale_ids[@]}; i++)); do
       chunk="${chunk:+$chunk,}'${stale_ids[$i]}'"
     done
-    if ! db_json "SELECT session_id, data FROM part WHERE session_id IN ($chunk) AND json_extract(data, '\$.type') = 'text' ORDER BY session_id, time_created;" 2>/dev/null \
+    if ! db_json "SELECT session_id, json_object('type', 'text', 'text', json_extract(data, '\$.text')) AS data, seq, -1 AS ordinal FROM session_message WHERE session_id IN ($chunk) AND type = 'user' AND json_type(data, '\$.text') = 'text'
+      UNION ALL SELECT m.session_id, c.value AS data, m.seq, CAST(c.key AS INTEGER) AS ordinal FROM session_message m, json_each(m.data, '\$.content') c WHERE m.session_id IN ($chunk) AND m.type = 'assistant' AND json_extract(c.value, '\$.type') = 'text' ORDER BY session_id, seq, ordinal;" 2>/dev/null \
       | "$JQ_BIN" -c '.[]?' >> "$parts_raw"; then
       extract_failed=1
       break
@@ -363,7 +364,7 @@ refresh() {
          else $s.title end) as $title
       | {sessionId: $s.id,
          cachePath: ($extractions + "/" + $s.id + ".json"),
-         record: {cacheSchema: 2, cacheSession: $s.id,
+          record: {cacheSchema: 3, cacheSession: $s.id,
                   cacheUpdated: ($s.time_updated // 0), cacheParts: ($s.partCount // 0), cacheMax: ($s.partMax // 0),
                   sessionId: $s.id, transcriptPath: "", source: "opencode",
                   cwd: ($s.directory // ""),

package/bin/sesh-preview.sh

@@ -26,7 +26,8 @@ fi
 
 SQLITE_BIN=${SESH_SQLITE:-}
 if [ -z "$SQLITE_BIN" ] && command -v sqlite3 >/dev/null 2>&1; then SQLITE_BIN=sqlite3; fi
-SQL="SELECT m.data AS msg, p.data AS part FROM part p JOIN message m ON m.id = p.message_id WHERE p.session_id = '$session_id' AND json_extract(p.data, '\$.type') = 'text' ORDER BY p.time_created DESC LIMIT 200;"
+SQL="SELECT json_object('role', type) AS msg, json_object('type', 'text', 'text', json_extract(data, '\$.text')) AS part, seq, -1 AS ordinal FROM session_message WHERE session_id = '$session_id' AND type = 'user' AND json_type(data, '\$.text') = 'text'
+UNION ALL SELECT json_object('role', m.type) AS msg, c.value AS part, m.seq, CAST(c.key AS INTEGER) AS ordinal FROM session_message m, json_each(m.data, '\$.content') c WHERE m.session_id = '$session_id' AND m.type = 'assistant' AND json_extract(c.value, '\$.type') = 'text' ORDER BY seq DESC, ordinal DESC LIMIT 200;"
 if [ -n "$SQLITE_BIN" ]; then
   rows=$("$SQLITE_BIN" -json -readonly "$DB_PATH" "$SQL" 2>/dev/null) || rows=''
 else

package/bin/sesh-prune.sh

@@ -84,7 +84,7 @@ fi
 JQ_BIN=${SESH_JQ:-$(command -v jq || true)}
 [ -n "$JQ_BIN" ] || { echo 'sesh: jq is required' >&2; exit 1; }
 
-CANDIDATES=$(query "SELECT id, directory, title, time_updated AS updated FROM session WHERE time_updated < $CUTOFF AND COALESCE(time_archived, 0) = 0 AND parent_id IS NULL ORDER BY time_updated ASC;")
+CANDIDATES=$(query "SELECT id, directory, title, time_updated AS updated FROM session_v2 WHERE time_updated < $CUTOFF AND COALESCE(time_archived, 0) = 0 AND parent_id IS NULL ORDER BY time_updated ASC;")
 # sqlite3 -json prints nothing (not []) when no rows match.
 [ -n "$CANDIDATES" ] || CANDIDATES='[]'
 PINS=$("$SCRIPT_DIR/sesh-pins.sh" read 2>/dev/null || printf '{"sessions":[],"directories":[]}')
@@ -152,7 +152,7 @@ if [ "$hard_delete" = 0 ]; then
     esac
   done
   IN_LIST=${IN_LIST%,}
-  write_db "UPDATE session SET time_archived = $NOW_MS WHERE id IN ($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; }

package/bin/sesh-retitle.sh

@@ -72,13 +72,11 @@ JQ_BIN=${SESH_JQ:-$(command -v jq || true)}
 # first `max_words` words kept.
 CANDIDATES=$(query "
 SELECT s.id AS id, s.directory AS directory, s.title AS old_title,
-  (SELECT p.data FROM part p
-     JOIN message m ON m.id = p.message_id
-     WHERE p.session_id = s.id
-       AND json_extract(p.data, '\$.type') = 'text'
-       AND json_extract(m.data, '\$.role') = 'user'
-     ORDER BY p.time_created ASC LIMIT 1) AS first_part
-FROM session s
+  (SELECT m.data FROM session_message m
+     WHERE m.session_id = s.id AND m.type = 'user'
+       AND json_type(m.data, '\$.text') = 'text'
+     ORDER BY m.seq ASC LIMIT 1) AS first_part
+FROM session_v2 s
 WHERE s.title LIKE 'New session - %'
    OR TRIM(COALESCE(s.title, '')) = ''
 ORDER BY s.time_updated DESC;")
@@ -136,6 +134,6 @@ printf '%s' "$PLAN" | "$JQ_BIN" -r '.[] | [.id, .new_title] | @tsv' | while IFS=
     ses_[A-Za-z0-9]*) ;;
     *) echo "Refusing: unexpected session id shape." >&2; exit 1 ;;
   esac
-  write_db "UPDATE session SET title = '$(sql_escape "$new")' WHERE id = '$id' AND (title LIKE 'New session - %' OR TRIM(COALESCE(title, '')) = '');"
+  write_db "UPDATE session_v2 SET title = '$(sql_escape "$new")' WHERE id = '$id' AND (title LIKE 'New session - %' OR TRIM(COALESCE(title, '')) = '');"
 done
 echo "Retitled $COUNT session(s)."

package/bin/sesh-waiting.sh

@@ -54,39 +54,37 @@ STUCK_BEFORE=$((NOW_MS - 600000))
 
 # NEEDS_INPUT_SQL (shared heuristic — keep in sync with tui-plugins/sesh-panel/tui.tsx).
 read -r -d '' QUERY <<SQL || true
+WITH live AS (
+  SELECT m.session_id AS session_id, m.seq AS seq,
+    json_extract(c.value, '\$.name') AS name,
+    json_extract(c.value, '\$.state.status') AS status,
+    COALESCE(json_extract(c.value, '\$.time.created'), m.time_created) AS created
+  FROM session_message m, json_each(m.data, '\$.content') c
+  WHERE m.type = 'assistant'
+    AND (m.data LIKE '%"status":"running"%' OR m.data LIKE '%"status":"pending"%')
+    AND json_extract(c.value, '\$.type') = 'tool'
+    AND json_extract(c.value, '\$.state.status') IN ('pending', 'running')
+)
 SELECT s.id AS id, s.directory AS directory, s.title AS title, s.time_updated AS updated,
   CASE WHEN EXISTS (
-    SELECT 1 FROM part p
-    WHERE p.session_id = s.id
-      AND json_extract(p.data, '\$.type') = 'tool'
-      AND json_extract(p.data, '\$.tool') = 'question'
-      AND COALESCE(json_extract(p.data, '\$.state.status'), 'pending') != 'completed'
+    SELECT 1 FROM live
+    WHERE live.session_id = s.id AND live.name = 'question'
       AND NOT EXISTS (
-        SELECT 1 FROM message m
-        WHERE m.session_id = s.id
-          AND json_extract(m.data, '\$.role') = 'user'
-          AND m.time_created > p.time_created)
+        SELECT 1 FROM session_message u
+        WHERE u.session_id = live.session_id AND u.type = 'user' AND u.seq > live.seq)
   ) THEN 'question' ELSE 'stuck' END AS reason
-FROM session s
+FROM session_v2 s
 WHERE COALESCE(s.time_archived, 0) = 0
   AND s.parent_id IS NULL
   AND (EXISTS (
-    SELECT 1 FROM part p
-    WHERE p.session_id = s.id
-      AND json_extract(p.data, '\$.type') = 'tool'
-      AND json_extract(p.data, '\$.tool') = 'question'
-      AND COALESCE(json_extract(p.data, '\$.state.status'), 'pending') != 'completed'
+    SELECT 1 FROM live
+    WHERE live.session_id = s.id AND live.name = 'question'
       AND NOT EXISTS (
-        SELECT 1 FROM message m
-        WHERE m.session_id = s.id
-          AND json_extract(m.data, '\$.role') = 'user'
-          AND m.time_created > p.time_created)
+        SELECT 1 FROM session_message u
+        WHERE u.session_id = live.session_id AND u.type = 'user' AND u.seq > live.seq)
   ) OR EXISTS (
-    SELECT 1 FROM part p2
-    WHERE p2.session_id = s.id
-      AND json_extract(p2.data, '\$.type') = 'tool'
-      AND json_extract(p2.data, '\$.state.status') = 'running'
-      AND p2.time_created < $STUCK_BEFORE))
+    SELECT 1 FROM live
+    WHERE live.session_id = s.id AND live.status = 'running' AND live.created < $STUCK_BEFORE))
 ORDER BY s.time_updated DESC;
 SQL
 

package/install.sh

@@ -210,11 +210,8 @@ install_tui_panel() {
   fi
 }
 
-# opencode imports plugins once at startup and has no hot reload, so a running
-# instance keeps the old panel until it is fully quit (reloading a window reuses
-# the same process). Say so explicitly and name the processes still holding it.
 note_restart() {
-  note "restart opencode to load the updated panel: quit it completely"
+  note "V2 reloads watched plugins automatically; if the panel stays unchanged, restart opencode: quit it completely"
   note "  (all windows and background processes), then reopen."
   if command -v pgrep >/dev/null 2>&1; then
     local pids
@@ -238,7 +235,7 @@ if [ "$UNINSTALL" = 1 ]; then
   if [ -d "$PANEL_DIR" ]; then
     rm -rf "$PANEL_DIR" && note "removed $PANEL_DIR"
   fi
-  remove_if_marker "$CONFIG_DIR/plugins/sesh-panel.tsx" "@jsxImportSource @opentui/solid" && note "removed $CONFIG_DIR/plugins/sesh-panel.tsx"
+  remove_if_marker "$CONFIG_DIR/plugins/sesh-panel.tsx" 'id: "sesh-panel"' && note "removed $CONFIG_DIR/plugins/sesh-panel.tsx"
   remove_opencode_entry && note "unregistered the panel from $OPENCODE_JSON"
   remove_tui_entry && note "unregistered the panel from $TUI_JSON"
   note "uninstalled (extraction cache and plugin dependencies left intact)"
@@ -309,6 +306,7 @@ remove_if_marker "$COMMAND_DST" "rich interactive picker" && note "removed obsol
 [ "$INSTALL_TOOL" = 1 ] && install_file "$SOURCE_DIR/plugins/sesh-list.ts" "$TOOL_DST"
 # Clean up obsolete V1 tool if present
 remove_if_marker "$CONFIG_DIR/tools/sesh-list.ts" "list opencode sessions for the agent" && note "removed obsolete V1 tool"
+remove_if_marker "$CONFIG_DIR/plugins/sesh-panel.tsx" 'id: "sesh-panel"' && note "removed obsolete V1 panel"
 
 if [ "$INSTALL_TUI" = 1 ]; then
   install_tui_panel

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-sesh",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Browse, search, preview and resume opencode sessions from the terminal and the TUI.",
   "type": "module",
   "license": "MIT",
@@ -66,8 +66,9 @@
   "devDependencies": {
     "@commitlint/cli": "^21.2.2",
     "@commitlint/config-conventional": "^21.2.2",
-    "@opencode/client": "2.0.18",
-    "@opencode/plugin": "2.0.18",
+    "@opencode/client": "2.0.25",
+    "@opencode/plugin": "2.0.25",
+    "@opencode/theme": "2.0.25",
     "@opentui/core": "^0.5.11",
     "@opentui/keymap": "^0.5.11",
     "@opentui/solid": "^0.5.11",

package/plugins/sesh-list.ts

@@ -26,7 +26,7 @@ const input = {
 export default Plugin.define({
   id: "sesh-list",
   async setup(ctx) {
-    ctx.tool.transform((editor) => {
+    await ctx.tool.transform((editor) => {
       editor.add({
         name: "sesh_list",
         description: "List opencode sessions across all project directories, newest first",

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

@@ -3,7 +3,7 @@ import { Plugin } from "@opencode/plugin/tui"
 import type { Project, SessionInfo as Session } from "@opencode/client"
 import type { Accessor } from "solid-js"
 
-type TuiPluginApi = any
+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"
@@ -237,6 +237,8 @@ function searchBindings(append: (input: string) => void, exit: () => void) {
 
 const rootMouseHandlers = new Set<() => void>()
 let rootMouseInstalled = false
+let removeRootMouse: (() => void) | undefined
+const ROOT_MOUSE = Symbol.for("opencode-sesh.root-mouse")
 
 function ensureRootMouse(renderer: TuiPluginApi["renderer"]) {
   if (rootMouseInstalled || !renderer?.root) return
@@ -244,12 +246,26 @@ function ensureRootMouse(renderer: TuiPluginApi["renderer"]) {
   const root = renderer.root as unknown as {
     onMouseDown?: (event: unknown) => void
     _mouseListeners?: { down?: (event: unknown) => void }
+    [ROOT_MOUSE]?: Set<() => void>
   }
-  const previous = root._mouseListeners?.down
-  root.onMouseDown = (event) => {
-    previous?.(event)
+  if (!root[ROOT_MOUSE]) {
+    const handlers = new Set<() => void>()
+    root[ROOT_MOUSE] = handlers
+    const previous = root._mouseListeners?.down
+    root.onMouseDown = (event) => {
+      previous?.(event)
+      for (const handler of [...handlers]) handler()
+    }
+  }
+  const dispatch = () => {
     for (const handler of [...rootMouseHandlers]) handler()
   }
+  root[ROOT_MOUSE].add(dispatch)
+  removeRootMouse = () => {
+    root[ROOT_MOUSE]?.delete(dispatch)
+    rootMouseHandlers.clear()
+    rootMouseInstalled = false
+  }
 }
 
 type Entry = { id: string; title: string; dir: string; group: string; updated: number }
@@ -422,17 +438,14 @@ const SESSION_MAX = 5000
 
 async function fetchEntries(api: TuiPluginApi): Promise<EntryResult> {
   const home = process.env.HOME ?? ""
-  const projectResult = await api.client.project.list({})
+  const projectResult = await api.client.project.list()
   const projects = ((projectResult?.data ?? projectResult) as Project[]) ?? []
   const projectName = new Map<string, string>(
     projects.map((p) => [p.id, p.name?.trim() || shortDir(p.canonical, home)]),
   )
   const sessions: Session[] = []
-  let cursor: number | undefined
+  let cursor: string | undefined
   let truncated = false
-  // Page through the global list instead of one fixed window, so sessions in
-  // older directories stay searchable. `cursor` is the previous page's oldest
-  // `time.updated`; a repeated or missing cursor stops the walk.
   for (;;) {
     const result = await api.client.experimental.session.list({
       limit: SESSION_PAGE_LIMIT,
@@ -443,13 +456,13 @@ async function fetchEntries(api: TuiPluginApi): Promise<EntryResult> {
     const page = ((result?.data ?? result) as Session[]) ?? []
     if (!Array.isArray(page) || page.length === 0) break
     sessions.push(...page)
-    if (page.length < SESSION_PAGE_LIMIT) break
+    if (!result.cursor?.next) break
     if (sessions.length >= SESSION_MAX) {
       truncated = true
       break
     }
-    const next = page[page.length - 1]?.time?.updated
-    if (typeof next !== "number" || next === cursor) {
+    const next = result.cursor.next
+    if (next === cursor) {
       truncated = true
       break
     }
@@ -773,7 +786,7 @@ function Highlighted(props: {
 
 async function fetchTranscriptText(api: TuiPluginApi, sessionID: string): Promise<string> {
   try {
-    const result = await api.client.session.messages({ sessionID })
+    const result = await api.client.session.messages({ sessionID, preview: true })
     const messages = result.data ?? []
     const blocks = messages
       .map((message: any) => {
@@ -815,6 +828,7 @@ function createTranscriptPreview(api: TuiPluginApi) {
       close()
       return
     }
+    if (previewID()) close()
     setPreviewID(entry.id)
     setPreviewText("Loading…")
     void fetchTranscriptText(api, entry.id).then((text) => {
@@ -857,6 +871,7 @@ function createTranscriptPreview(api: TuiPluginApi) {
     api.ui.dialog.setSize("large")
     disposePreviewKeys?.()
     disposePreviewKeys = api.keymap.registerLayer({
+      mode: "modal",
       bindings: [
         {
           key: "escape",
@@ -1089,6 +1104,14 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
   })
   createEffect(() => {
     if (props.api.ui.dialog.open) menu.close()
+    // A modal dialog owns input while open: yield the sidebar's keyboard
+    // captures too, so its layers cannot double-fire with the dialog's own.
+    if (props.api.ui.dialog.open) {
+      cancelDelete()
+      setNavActive(false)
+      setSearching(false)
+      setHovered(undefined)
+    }
   })
 
   const moveCursor = (delta: number) => {
@@ -1357,8 +1380,8 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
             if (!confirmArmed()) requestDelete(entry)
           },
         },
-        { 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: "alt+s", desc: "Pin session", preventDefault: true, cmd: () => props.onTogglePin("sessions", entry.id) },
+        { key: "alt+r", desc: "Pin directory", preventDefault: true, cmd: () => props.onTogglePin("directories", entry.dir) },
         {
           key: "/",
           desc: "Search sessions",
@@ -1409,7 +1432,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         },
       },
       {
-        key: "ctrl+s",
+        key: "alt+s",
         desc: "Pin session",
         preventDefault: true,
         cmd: () => {
@@ -1418,7 +1441,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         },
       },
       {
-        key: "ctrl+d",
+        key: "alt+r",
         desc: "Pin directory",
         preventDefault: true,
         cmd: () => {
@@ -1639,7 +1662,7 @@ function SidebarSessions(props: { api: TuiPluginApi } & PinProps) {
         </Show>
         <Show when={navActive()}>
           <box paddingTop={1}>
-            <text style={{ fg: theme().textMuted }}>↑↓ move · enter open · option+p preview · ctrl+s/d pin · option+d delete · esc done</text>
+            <text style={{ fg: theme().textMuted }}>↑↓ move · enter open · option+p preview · option+s/r pin · option+d delete · esc done</text>
           </box>
         </Show>
       </Show>
@@ -1807,6 +1830,16 @@ function HomeSessions(props: { api: TuiPluginApi } & PinProps) {
     if (searching()) setSearching(false)
   }
 
+  // A modal dialog owns input while open: yield this list's keyboard captures
+  // too, so its layers cannot double-fire with the dialog's own.
+  createEffect(() => {
+    if (props.api.ui.dialog.open) {
+      cancelDelete()
+      setSearching(false)
+      setHovered(undefined)
+    }
+  })
+
   onMount(() => {
     ensureRootMouse(props.api.renderer)
     rootMouseHandlers.add(onRootMouseDown)
@@ -1854,8 +1887,8 @@ function HomeSessions(props: { api: TuiPluginApi } & PinProps) {
             if (!confirmArmed()) requestDelete(entry)
           },
         },
-        { 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: "alt+s", desc: "Pin session", preventDefault: true, cmd: () => props.onTogglePin("sessions", entry.id) },
+        { key: "alt+r", desc: "Pin directory", preventDefault: true, cmd: () => props.onTogglePin("directories", entry.dir) },
       ],
     })
   })
@@ -2026,10 +2059,10 @@ const tui: TuiPlugin = async (api) => {
     },
   })
 
-  const openPicker = async () => {
+  const openPicker = async (command = false) => {
     refreshPins()
-    if (api.mode.current() !== BASE_MODE) return
-    if (api.renderer.currentFocusedEditor === null) return
+    if (!command && api.mode.current() !== BASE_MODE) return
+    if (!command && api.renderer.currentFocusedEditor === null) return
 
     let entriesResult: EntryResult
     try {
@@ -2339,6 +2372,7 @@ const tui: TuiPlugin = async (api) => {
       confirmTimer = setTimeout(cancelDelete, 5000)
       disposeConfirm?.()
       disposeConfirm = api.keymap.registerLayer({
+        mode: "modal",
         priority: 20,
         bindings: [
           {
@@ -2397,9 +2431,7 @@ const tui: TuiPlugin = async (api) => {
     }
 
     const disposeNav = api.keymap.registerLayer({
-      // Outrank the built-in dialog layer so Escape reaches this picker before
-      // the dialog host closes the whole thing.
-      mode: "global",
+      mode: "modal",
       priority: 1,
       bindings: [
         { key: "up", desc: "Previous session", preventDefault: true, cmd: () => moveCursor(-1) },
@@ -2472,6 +2504,7 @@ const tui: TuiPlugin = async (api) => {
     })
 
     const cleanup = () => {
+      if (!alive) return
       alive = false
       if (confirmTimer) clearTimeout(confirmTimer)
       pickerState = { query: query(), scope: scope(), waitingOnly: waitingOnly(), pinnedOnly: pinnedOnly() }
@@ -2775,9 +2808,9 @@ const tui: TuiPlugin = async (api) => {
 
   // Read-only digest dialog: spend per project, last day beside lifetime.
   // Same message-level sums as `sesh costs`; the dialog just renders them.
-  const openCosts = async () => {
-    if (api.mode.current() !== BASE_MODE) return
-    if (api.renderer.currentFocusedEditor === null) return
+  const openCosts = async (command = false) => {
+    if (!command && api.mode.current() !== BASE_MODE) return
+    if (!command && api.renderer.currentFocusedEditor === null) return
     type CostRow = { directory: string; window: number; lifetime: number; sessions: number }
     let rows: CostRow[] = []
     let failed = false
@@ -2835,6 +2868,7 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
     const money = (n: number) => (n === 0 ? "—" : `$${n.toFixed(2)}`)
     const home = process.env.HOME ?? ""
     const disposeKeys = api.keymap.registerLayer({
+      mode: "modal",
       bindings: [
         { key: "escape", desc: "Close", preventDefault: true, cmd: () => api.ui.dialog.clear() },
       ],
@@ -2888,9 +2922,9 @@ 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
+  const openNeeds = async (command = false) => {
+    if (!command && api.mode.current() !== BASE_MODE) return
+    if (!command && api.renderer.currentFocusedEditor === null) return
     let items: { entry: Entry; reason: string; since?: number }[] = []
     try {
       const { entries } = await fetchEntries(api)
@@ -2935,6 +2969,7 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
       api.route.navigate("session", { sessionID: target.entry.id })
     }
     const disposeNav = api.keymap.registerLayer({
+      mode: "modal",
       bindings: [
         { key: "up", desc: "Previous session", preventDefault: true, cmd: () => moveCursor(-1) },
         { key: "down", desc: "Next session", preventDefault: true, cmd: () => moveCursor(1) },
@@ -3036,7 +3071,7 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
       category: "Sessions",
       slash: { name: "sesh" },
       onSelect: () => {
-        void openPicker()
+        void openPicker(true)
       },
     },
     {
@@ -3046,7 +3081,7 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
       category: "Sessions",
       slash: { name: "sesh-costs" },
       onSelect: () => {
-        void openCosts()
+        void openCosts(true)
       },
     },
     {
@@ -3056,7 +3091,7 @@ ORDER BY lifetime_cost DESC`).all() ?? []) as {
       category: "Sessions",
       slash: { name: "sesh-needs" },
       onSelect: () => {
-        void openNeeds()
+        void openNeeds(true)
       },
     },
   ])
@@ -3102,7 +3137,7 @@ function adaptTheme(theme: Plugin.Context["theme"]) {
   }
 }
 
-function createApi(ctx: Plugin.Context): TuiPluginApi {
+function createApi(ctx: Plugin.Context) {
   const [dialogOpen, setDialogOpen] = createSignal(false)
   let sourceTheme: Plugin.Context["theme"] | undefined
   let currentTheme: ReturnType<typeof adaptTheme>
@@ -3117,9 +3152,9 @@ function createApi(ctx: Plugin.Context): TuiPluginApi {
       },
     },
     ui: {
-      toast(opts: { message: string; variant?: "info" | "warning" | "error" | "success" }) {
+      toast(opts: { title?: string; message: string; variant?: "info" | "warning" | "error" | "success" }) {
         ctx.ui.toast.show({
-          title: "Session",
+          title: opts.title ?? "Sessions",
           message: opts.message,
           variant: opts.variant ?? "info",
         })
@@ -3129,12 +3164,18 @@ function createApi(ctx: Plugin.Context): TuiPluginApi {
           ctx.ui.dialog.clear()
           setDialogOpen(false)
         },
-        replace(render: () => any) {
+        replace(render: () => any, onClose?: () => void) {
+          let closed = false
+          ctx.ui.dialog.show(render, () => {
+            if (closed) return
+            closed = true
+            setDialogOpen(false)
+            onClose?.()
+          })
           setDialogOpen(true)
-          ctx.ui.dialog.show(render, () => setDialogOpen(false))
         },
-        setSize(size: string) {
-          ctx.ui.dialog.set({ size: size as any })
+        setSize(size: Parameters<Plugin.Context["ui"]["dialog"]["set"]>[0]["size"]) {
+          ctx.ui.dialog.set({ size })
         },
         // V2's Dialog has no reactive open/isOpen accessor; track it locally
         // from the replace/clear calls above and the host's onClose callback.
@@ -3206,8 +3247,7 @@ function createApi(ctx: Plugin.Context): TuiPluginApi {
           ctx.keymap.layer(() => ({
             mode: layer.mode ?? "base",
             priority: layer.priority ?? 20,
-            commands: (layer.bindings ?? []).map((b, i) => ({
-              id: `sesh-cmd-${Math.random().toString(36).slice(2)}-${i}`,
+            commands: (layer.bindings ?? []).map((b) => ({
               title: b.desc,
               bind: b.key,
               run: () => {
@@ -3216,7 +3256,7 @@ function createApi(ctx: Plugin.Context): TuiPluginApi {
             })),
           }))
           return dispose
-        }))
+        }))!
       },
     },
     slots: {
@@ -3273,20 +3313,28 @@ function createApi(ctx: Plugin.Context): TuiPluginApi {
           await ctx.client.session.remove({ sessionID: req.sessionID })
           return { data: undefined }
         },
-        async fork(req: { path: { id: string } }) {
-          const res: any = await ctx.client.session.fork({ sessionID: req.path.id })
-          return { data: res?.data ?? res }
+        async fork(req: { sessionID: string; directory?: string }) {
+          const res = await ctx.client.session.fork({ sessionID: req.sessionID })
+          return { data: res }
         },
-        async messages(req: { path?: { id?: string }; sessionID?: string }) {
-          const sessionID = req.sessionID ?? req.path?.id ?? ""
-          const res = await ctx.client.message.list({ sessionID, order: "asc", limit: 100 })
-          const messages = (res.data ?? []).map((m: any) => {
+        async messages(req: { sessionID: string; preview?: boolean }) {
+          let cursor: string | undefined
+          const all = []
+          do {
+            const res = await ctx.client.message.list({ sessionID: req.sessionID, order: req.preview ? "desc" : "asc", limit: 100, cursor })
+            all.push(...res.data)
+            const next = res.cursor.next
+            if (req.preview || !next || next === cursor) break
+            cursor = next
+          } while (true)
+          if (req.preview) all.reverse()
+          const messages = all.map((m) => {
             let text = ""
             if (m.type === "user") text = m.text ?? ""
             else if (m.type === "assistant") {
               text = (m.content ?? [])
-                .filter((c: any) => c.type === "text")
-                .map((c: any) => c.text)
+                .filter((c) => c.type === "text")
+                .map((c) => c.text)
                 .join("\n")
             }
             return {
@@ -3300,30 +3348,17 @@ function createApi(ctx: Plugin.Context): TuiPluginApi {
       },
       experimental: {
         session: {
-          async list(input: any) {
-            // V1 paged the global list with a numeric `time.updated` cursor and a
-            // descending order. V2 returns an opaque cursor per location, so
-            // fetch once and page in memory to keep the caller's loop intact.
-            const limit = Number(input?.limit) > 0 ? Number(input.limit) : 200
-            const cursor = typeof input?.cursor === "number" ? input.cursor : undefined
-            const res: any = await ctx.client.session.list({ limit: 5000, order: "desc" })
-            const all: any[] = Array.isArray(res) ? res : (res?.data ?? [])
-            const normalized = all
-              .map((s: any) => ({
+          async list(input: { limit: number; cursor?: string; roots?: boolean; directory?: string }) {
+            const res = await ctx.client.session.list({ parentID: null, order: "desc", limit: input.limit, cursor: input.cursor })
+            return { cursor: res.cursor, data: res.data.map((s) => ({
                 ...s,
-                directory: s.directory ?? s.location?.directory ?? "",
-              }))
-              .sort((a: any, b: any) => (b.time?.updated ?? 0) - (a.time?.updated ?? 0))
-            const page =
-              cursor === undefined
-                ? normalized.slice(0, limit)
-                : normalized.filter((s: any) => (s.time?.updated ?? 0) < cursor).slice(0, limit)
-            return { data: page }
+                directory: s.location?.directory ?? "",
+              })) }
           },
         },
       },
     },
-  } as any
+  }
 }
 
 export default Plugin.define({
@@ -3331,7 +3366,7 @@ export default Plugin.define({
   async setup(ctx) {
     const api = createApi(ctx)
     let initialized = false
-    return ctx.ui.slot({
+    const disposeSlot = ctx.ui.slot({
       append: "app",
       render: () => {
         if (!initialized) {
@@ -3342,5 +3377,10 @@ export default Plugin.define({
         return <box />
       },
     })
+    return () => {
+      if (api.ui.dialog.open) api.ui.dialog.clear()
+      disposeSlot()
+      removeRootMouse?.()
+    }
   },
 })