opencode-sesh 2.1.6 → 2.1.8

package/AGENTS.md

@@ -182,7 +182,10 @@ when opencode exits, the picker reopens with the query preserved.
   scrolling inside; the picker remains the place for transcript search.
   Sessions waiting on the user (unanswered questions, stuck runs) pin a
   **Needs input** group above the directories, with the count in the heading —
-  same `NEEDS_INPUT_SQL` heuristic as `bin/sesh-waiting.sh`. The query runs in
+  same `NEEDS_INPUT_SQL` heuristic as `bin/sesh-waiting.sh`. Message payloads are
+  scanned only for in-flight root sessions (`time_suspended` set, `time_busy` newer
+  than `time_idle`); databases lacking those columns (checked via
+  `pragma_table_info`) fall back to the full scan. The query runs in
   a blob Worker (`createDbClient`; failure means "local store unavailable"),
   off the TUI thread but still costing worker CPU every poll, so the shared
   poll runs it only while the sidebar is subscribed
@@ -197,7 +200,16 @@ when opencode exits, the picker reopens with the query preserved.
 - **Picker search:** pages the global session list (`SESSION_PAGE_LIMIT`, capped
   at `SESSION_MAX` and reported when truncated) rather than a fixed-size
   window, then indexes transcript text for **every** session in batches
-  (`TRANSCRIPT_BATCH`) with bounded remote concurrency (`REMOTE_CONCURRENCY`).
+  (`TRANSCRIPT_BATCH`, also capped by `TRANSCRIPT_BATCH_BYTES` of message
+  payload; a single larger session forms its own batch) with bounded remote
+  concurrency (`REMOTE_CONCURRENCY`). Transcript text is cached in memory for
+  the plugin lifetime (never on disk, cleared on dispose); a worker signature
+  query (session timestamp, message count, latest message timestamp, payload
+  size; chunked by `SIGNATURE_CHUNK`) lets reopened pickers reuse unchanged
+  sessions, extract only new or changed ones, and prune vanished ones. Sessions
+  indexed through the remote path are not cached. If the signature query fails
+  (`octet_length` needs SQLite ≥ 3.43; macOS Bun uses the system SQLite),
+  extraction still runs locally, batched by count only, and caches nothing.
   Local extraction is one SQL statement per batch in the DB worker
   (`transcriptTextQuery`, JSON-guarded) that returns only `{sid, text}` rows,
   so tool payloads never reach the UI thread; if the worker rejects, sessions

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.1.8] - 2026-11-02
+
+### Changed
+
+- **tui:** Prefilter needs-input candidates by in-flight session state (#38)
+
+## [2.1.7] - 2026-11-02
+
+### Changed
+
+- **tui:** Reuse unchanged transcript text and bound index batches by bytes (#37)
+
+### Fixed
+
+- **tui:** Stop the DB worker and sidebar polls on plugin dispose (#36)
+
 ## [2.1.6] - 2026-11-02
 
 ### Changed
@@ -548,6 +564,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.1.8]: https://github.com/ozandogrultan/opencode-sesh/compare/v2.1.7...v2.1.8
+[2.1.7]: https://github.com/ozandogrultan/opencode-sesh/compare/v2.1.6...v2.1.7
 [2.1.6]: https://github.com/ozandogrultan/opencode-sesh/compare/v2.1.5...v2.1.6
 [2.1.5]: https://github.com/ozandogrultan/opencode-sesh/compare/v2.1.4...v2.1.5
 [2.1.4]: https://github.com/ozandogrultan/opencode-sesh/compare/v2.1.3...v2.1.4

package/bin/sesh-waiting.sh

@@ -15,6 +15,9 @@
 #     (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).
+# Only a turn in flight can be waiting (time_suspended is set while a turn
+# runs), so message payloads are scanned only for those candidate sessions;
+# databases without the in-flight columns scan every assistant message.
 #
 # Usage: sesh-waiting.sh [--json]
 #   default prints a human table; --json prints [{id,reason,title,directory,updated}]
@@ -57,8 +60,23 @@ NOW_MS=$(python3 -c 'import time; print(int(time.time() * 1000))' 2>/dev/null ||
 STUCK_BEFORE=$((NOW_MS - 600000))
 
 # NEEDS_INPUT_SQL (shared heuristic — keep in sync with tui-plugins/sesh-panel/tui.tsx).
+CANDIDATES=''
+PREFILTER=''
+HAS_COLUMNS=0
+if [ -n "$SQLITE_BIN" ]; then
+  HAS_COLUMNS=$("$SQLITE_BIN" -readonly "$DB_PATH" "SELECT count(*) = 3 FROM pragma_table_info('session_v2') WHERE name IN ('time_busy', 'time_idle', 'time_suspended');" 2>/dev/null || echo 0)
+fi
+if [ "$HAS_COLUMNS" = 1 ]; then
+  CANDIDATES="cand AS (
+  SELECT id FROM session_v2
+  WHERE time_suspended IS NOT NULL AND COALESCE(parent_id, '') = '' AND COALESCE(time_archived, 0) = 0
+    AND time_busy > COALESCE(time_idle, 0)
+), "
+  PREFILTER="AND m.session_id IN (SELECT id FROM cand)"
+fi
+
 read -r -d '' QUERY <<SQL || true
-WITH live AS (
+WITH ${CANDIDATES}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,
@@ -68,6 +86,7 @@ WITH live AS (
     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')
+    $PREFILTER
 )
 SELECT s.id AS id, s.directory AS directory, s.title AS title, s.time_updated AS updated,
   CASE WHEN EXISTS (

package/dist/tui.js

@@ -605,6 +605,8 @@ async function fetchEntries(api, active = () => true) {
 }
 const SESSION_ID_PATTERN = /^ses_[A-Za-z0-9]+$/;
 const TRANSCRIPT_BATCH = 64;
+const TRANSCRIPT_BATCH_BYTES = 8 * 1024 * 1024;
+const SIGNATURE_CHUNK = 500;
 const REMOTE_CONCURRENCY = 8;
 const nextTick = () => new Promise(resolve => setTimeout(resolve, 0));
 let resolvedDbPath;
@@ -663,9 +665,11 @@ function createDbWorker() {
 // Read-only queries against the local store, served by one lazily started
 // worker. Any failure (no worker, no bun:sqlite, query error, timeout) rejects;
 // a timeout or worker error discards the worker so the next call starts afresh.
+// `close` is final: later calls reject and never start a worker.
 function createDbClient(createWorker = createDbWorker, timeoutMs = DB_QUERY_TIMEOUT_MS) {
   let worker;
   let nextId = 0;
+  let closed = false;
   const pending = new Map();
   const reset = error => {
     const dead = worker;
@@ -702,6 +706,10 @@ function createDbClient(createWorker = createDbWorker, timeoutMs = DB_QUERY_TIME
     return created;
   };
   const run = (sql, params = []) => new Promise((resolve, reject) => {
+    if (closed) {
+      reject(new Error("local store closed"));
+      return;
+    }
     try {
       worker ??= start();
     } catch (error) {
@@ -729,10 +737,16 @@ function createDbClient(createWorker = createDbWorker, timeoutMs = DB_QUERY_TIME
   });
   return {
     run,
-    close: () => reset(new Error("local store closed"))
+    close: () => {
+      closed = true;
+      reset(new Error("local store closed"));
+    }
   };
 }
-const dbClient = createDbClient();
+
+// Each plugin setup installs its own client and closes only that one on
+// dispose: a reload reuses this module instance.
+let dbClient = createDbClient();
 function createSessionPoll(api, refreshPins) {
   // Listener -> whether it reads `snapshot.waiting`. The needs-input query
   // costs worker CPU on every poll, so it only runs while such a listener exists.
@@ -850,9 +864,19 @@ ORDER BY lifetime_cost DESC`;
 // 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.
+// Only a turn in flight can be waiting (time_suspended is set while a turn runs
+// and a question/permission prompt keeps it running), so message payloads are
+// scanned only for those candidate sessions. Databases without the in-flight
+// columns scan every assistant message.
 const STUCK_AFTER_MS = 600000;
-const LIVE_TOOLS_CTE = sessionFilter => `
-WITH live AS (
+const IN_FLIGHT_COLUMNS = ["time_busy", "time_idle", "time_suspended"];
+const CANDIDATES_CTE = `cand AS (
+  SELECT id FROM session_v2
+  WHERE time_suspended IS NOT NULL AND parent_id IS NULL AND COALESCE(time_archived, 0) = 0
+    AND time_busy > COALESCE(time_idle, 0)
+), `;
+const LIVE_TOOLS_CTE = (sessionFilter, prefilter = false) => `
+WITH ${prefilter ? CANDIDATES_CTE : ""}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,
@@ -861,7 +885,7 @@ WITH live AS (
   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')${sessionFilter}
+    AND json_extract(c.value, '$.state.status') IN ('pending', 'running')${sessionFilter}${prefilter ? "\n    AND m.session_id IN (SELECT id FROM cand)" : ""}
 )`;
 const QUESTION_OPEN = `live.name = 'question'
   AND NOT EXISTS (
@@ -870,7 +894,7 @@ const QUESTION_OPEN = `live.name = 'question'
 const NO_RECENT_ACTIVITY = (sessionIdExpr, stuckBefore) => `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 => `${LIVE_TOOLS_CTE("")}
+const NEEDS_INPUT_SQL = (stuckBefore, prefilter = false) => `${LIVE_TOOLS_CTE("", prefilter)}
 SELECT s.id AS id,
   CASE WHEN EXISTS (SELECT 1 FROM live WHERE live.session_id = s.id AND ${QUESTION_OPEN})
     THEN 'question' ELSE 'stuck' END AS reason
@@ -883,8 +907,23 @@ WHERE COALESCE(s.time_archived, 0) = 0
       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`;
+const inFlightSupport = new WeakMap();
+function hasInFlightColumns(run) {
+  let known = inFlightSupport.get(run);
+  if (!known) {
+    known = run("SELECT name FROM pragma_table_info('session_v2')").then(rows => {
+      const names = new Set(rows.map(row => row?.name));
+      return IN_FLIGHT_COLUMNS.every(name => names.has(name));
+    }, () => {
+      inFlightSupport.delete(run);
+      return false;
+    });
+    inFlightSupport.set(run, known);
+  }
+  return known;
+}
 async function queryWaitingIds(run) {
-  const rows = await run(NEEDS_INPUT_SQL(Date.now() - STUCK_AFTER_MS));
+  const rows = await run(NEEDS_INPUT_SQL(Date.now() - STUCK_AFTER_MS, await hasInFlightColumns(run)));
   const out = new Map();
   for (const row of rows) {
     if (typeof row?.id === "string" && SESSION_ID_PATTERN.test(row.id) && (row.reason === "question" || row.reason === "stuck")) {
@@ -948,11 +987,33 @@ function transcriptTextQuery(count) {
 SELECT sid, text FROM parts WHERE text IS NOT NULL AND text <> '' ORDER BY sid, seq, rid, part`;
 }
 
+// Transcript text per session for the plugin lifetime; memory only, so
+// conversation text is never written anywhere. `sig` identifies the extracted
+// state of the session (see transcriptSignatureQuery).
+const transcriptCache = new Map();
+const clearTranscriptCache = () => transcriptCache.clear();
+
+// Cheap change detector mirroring the fzf extraction cache: message count and
+// latest message timestamp, plus the payload size that bounds extraction
+// batches. octet_length() reads the stored size, never the payload; length()
+// would read every payload to count characters.
+function transcriptSignatureQuery(count) {
+  const placeholders = Array.from({
+    length: count
+  }, () => "?").join(",");
+  return `SELECT session_id AS sid, COUNT(*) AS n, MAX(time_updated) AS m, SUM(octet_length(data)) AS bytes
+FROM session_message
+WHERE session_id IN (${placeholders}) AND type IN ('user', 'assistant')
+GROUP BY session_id`;
+}
+
 // Index titles/directories immediately, then add transcript text progressively
 // in batches so the render thread can breathe. Covers every entry, not a fixed
 // newest window; `onProgress` lets the picker show coverage. Local extraction
-// runs through `run` (the worker client) and returns text only.
-async function buildSearchIndex(api, entries, onProgress, active = () => true, run = dbClient.run) {
+// runs through `run` (the worker client) and returns text only; sessions whose
+// signature is unchanged reuse their cached text, and extraction batches are
+// bounded by session count and payload bytes.
+async function buildSearchIndex(api, entries, onProgress, active = () => true, run = dbClient.run, cache = transcriptCache) {
   const index = new Map();
   for (const entry of entries) {
     index.set(entry.id, `${entry.title} ${entry.dir}`);
@@ -971,9 +1032,54 @@ async function buildSearchIndex(api, entries, onProgress, active = () => true, r
   report(false);
   if (!active()) return index;
   try {
-    for (let i = 0; i < ids.length; i += TRANSCRIPT_BATCH) {
+    // `entries` must be the full session list: sessions missing from it are pruned.
+    const idSet = new Set(ids);
+    for (const sid of cache.keys()) if (!idSet.has(sid)) cache.delete(sid);
+    // Undefined when the signature query fails (octet_length needs SQLite
+    // >= 3.43, and macOS Bun uses the system SQLite): extract everything
+    // locally, batched by count only, and cache nothing.
+    let signatures = new Map();
+    try {
+      for (let i = 0; i < ids.length; i += SIGNATURE_CHUNK) {
+        const chunk = ids.slice(i, i + SIGNATURE_CHUNK);
+        const rows = await run(transcriptSignatureQuery(chunk.length), chunk);
+        if (!active()) return index;
+        for (const row of rows) signatures.set(row.sid, {
+          sig: `${row.n}:${row.m}:${row.bytes}`,
+          bytes: row.bytes ?? 0
+        });
+      }
+    } catch {
+      if (!active()) return index;
+      signatures = undefined;
+    }
+    const sigs = signatures && new Map(entries.map(entry => [entry.id, `${entry.updated}:${signatures.get(entry.id)?.sig ?? "0:0:0"}`]));
+    const stale = [];
+    for (const id of ids) {
+      const hit = cache.get(id);
+      if (hit && sigs && hit.sig === sigs.get(id)) {
+        if (hit.text) index.set(id, `${index.get(id) ?? ""} ${hit.text}`.trim());
+        remaining.delete(id);
+        indexed += 1;
+      } else stale.push(id);
+    }
+    if (indexed > 0) report(false);
+    const batches = [];
+    let current = [];
+    let currentBytes = 0;
+    for (const id of stale) {
+      const bytes = signatures?.get(id)?.bytes ?? 0;
+      if (current.length > 0 && (current.length >= TRANSCRIPT_BATCH || currentBytes + bytes > TRANSCRIPT_BATCH_BYTES)) {
+        batches.push(current);
+        current = [];
+        currentBytes = 0;
+      }
+      current.push(id);
+      currentBytes += bytes;
+    }
+    if (current.length > 0) batches.push(current);
+    for (const batch of batches) {
       if (!active()) break;
-      const batch = ids.slice(i, i + TRANSCRIPT_BATCH);
       const rows = await run(transcriptTextQuery(batch.length), batch);
       if (!active()) break;
       const texts = new Map();
@@ -981,8 +1087,15 @@ async function buildSearchIndex(api, entries, onProgress, active = () => true, r
         const list = texts.get(row.sid);
         if (list) list.push(row.text);else texts.set(row.sid, [row.text]);
       }
-      for (const [sid, list] of texts) index.set(sid, [index.get(sid) ?? "", ...list].join(" ").trim());
-      for (const id of batch) remaining.delete(id);
+      for (const id of batch) {
+        const list = texts.get(id) ?? [];
+        if (sigs) cache.set(id, {
+          sig: sigs.get(id),
+          text: list.join(" ").trim()
+        });
+        if (list.length > 0) index.set(id, [index.get(id) ?? "", ...list].join(" ").trim());
+        remaining.delete(id);
+      }
       indexed += batch.length;
       report(false);
       await nextTick();
@@ -4306,7 +4419,11 @@ function createApi(ctx) {
   const [dialogOpen, setDialogOpen] = createSignal(false);
   let sourceTheme;
   let currentTheme;
+  const slotDisposers = [];
   return {
+    dispose() {
+      for (const dispose of slotDisposers.splice(0)) dispose();
+    },
     theme: {
       get current() {
         if (sourceTheme !== ctx.theme) {
@@ -4441,20 +4558,20 @@ function createApi(ctx) {
     slots: {
       register(cfg) {
         if (cfg.slots.sidebar_content && ctx.options?.showSidebar !== false) {
-          ctx.ui.slot({
+          slotDisposers.push(ctx.ui.slot({
             ...(ctx.options?.sidebarPlacement === "prepend" ? {
               prepend: "sidebar.content"
             } : {
               append: "sidebar.content"
             }),
             render: cfg.slots.sidebar_content
-          });
+          }));
         }
         if (cfg.slots.home_bottom) {
-          ctx.ui.slot({
+          slotDisposers.push(ctx.ui.slot({
             prepend: "home.footer",
             render: cfg.slots.home_bottom
-          });
+          }));
         }
       }
     },
@@ -4568,6 +4685,7 @@ function createApi(ctx) {
 export default Plugin.define({
   id: "sesh-panel",
   async setup(ctx) {
+    const client = dbClient = createDbClient();
     const api = createApi(ctx);
     let initialized = false;
     const disposeSlot = ctx.ui.slot({
@@ -4584,8 +4702,10 @@ export default Plugin.define({
     return () => {
       if (api.ui.dialog.open) api.ui.dialog.clear();
       disposeSlot();
+      api.dispose();
       removeRootMouse?.();
-      dbClient.close();
+      clearTranscriptCache();
+      client.close();
     };
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-sesh",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "description": "OpenCode session browser: search, preview, and resume every session across every project from the terminal or TUI.",
   "type": "module",
   "license": "MIT",

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

@@ -503,6 +503,8 @@ async function fetchEntries(api: TuiPluginApi, active = () => true): Promise<Ent
 
 const SESSION_ID_PATTERN = /^ses_[A-Za-z0-9]+$/
 const TRANSCRIPT_BATCH = 64
+const TRANSCRIPT_BATCH_BYTES = 8 * 1024 * 1024
+const SIGNATURE_CHUNK = 500
 const REMOTE_CONCURRENCY = 8
 
 type IndexProgress = { indexed: number; total: number; complete: boolean }
@@ -565,10 +567,12 @@ function createDbWorker(): any {
 // Read-only queries against the local store, served by one lazily started
 // worker. Any failure (no worker, no bun:sqlite, query error, timeout) rejects;
 // a timeout or worker error discards the worker so the next call starts afresh.
+// `close` is final: later calls reject and never start a worker.
 function createDbClient(createWorker: () => any = createDbWorker, timeoutMs = DB_QUERY_TIMEOUT_MS) {
   type Pending = { resolve: (rows: unknown[]) => void; reject: (error: Error) => void; timer: ReturnType<typeof setTimeout> }
   let worker: any
   let nextId = 0
+  let closed = false
   const pending = new Map<number, Pending>()
   const reset = (error: Error) => {
     const dead = worker
@@ -601,6 +605,10 @@ function createDbClient(createWorker: () => any = createDbWorker, timeoutMs = DB
   }
   const run: DbRun = (sql, params = []) =>
     new Promise((resolve, reject) => {
+      if (closed) {
+        reject(new Error("local store closed"))
+        return
+      }
       try {
         worker ??= start()
       } catch (error) {
@@ -617,10 +625,12 @@ function createDbClient(createWorker: () => any = createDbWorker, timeoutMs = DB
         reset(error as Error)
       }
     })
-  return { run, close: () => reset(new Error("local store closed")) }
+  return { run, close: () => { closed = true; reset(new Error("local store closed")) } }
 }
 
-const dbClient = createDbClient()
+// Each plugin setup installs its own client and closes only that one on
+// dispose: a reload reuses this module instance.
+let dbClient = createDbClient()
 
 type SessionSnapshot = { entries: Entry[]; waiting: Map<string, string>; failed: boolean }
 
@@ -723,9 +733,19 @@ ORDER BY lifetime_cost DESC`
 // 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.
+// Only a turn in flight can be waiting (time_suspended is set while a turn runs
+// and a question/permission prompt keeps it running), so message payloads are
+// scanned only for those candidate sessions. Databases without the in-flight
+// columns scan every assistant message.
 const STUCK_AFTER_MS = 600000
-const LIVE_TOOLS_CTE = (sessionFilter: string) => `
-WITH live AS (
+const IN_FLIGHT_COLUMNS = ["time_busy", "time_idle", "time_suspended"]
+const CANDIDATES_CTE = `cand AS (
+  SELECT id FROM session_v2
+  WHERE time_suspended IS NOT NULL AND parent_id IS NULL AND COALESCE(time_archived, 0) = 0
+    AND time_busy > COALESCE(time_idle, 0)
+), `
+const LIVE_TOOLS_CTE = (sessionFilter: string, prefilter = false) => `
+WITH ${prefilter ? CANDIDATES_CTE : ""}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,
@@ -734,7 +754,9 @@ WITH live AS (
   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')${sessionFilter}
+    AND json_extract(c.value, '$.state.status') IN ('pending', 'running')${sessionFilter}${
+      prefilter ? "\n    AND m.session_id IN (SELECT id FROM cand)" : ""
+    }
 )`
 const QUESTION_OPEN = `live.name = 'question'
   AND NOT EXISTS (
@@ -743,7 +765,7 @@ const QUESTION_OPEN = `live.name = 'question'
 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("")}
+const NEEDS_INPUT_SQL = (stuckBefore: number, prefilter = false) => `${LIVE_TOOLS_CTE("", prefilter)}
 SELECT s.id AS id,
   CASE WHEN EXISTS (SELECT 1 FROM live WHERE live.session_id = s.id AND ${QUESTION_OPEN})
     THEN 'question' ELSE 'stuck' END AS reason
@@ -757,8 +779,27 @@ WHERE COALESCE(s.time_archived, 0) = 0
       AND ${NO_RECENT_ACTIVITY("s.id", stuckBefore)}))
 ORDER BY s.time_updated DESC`
 
+const inFlightSupport = new WeakMap<DbRun, Promise<boolean>>()
+function hasInFlightColumns(run: DbRun): Promise<boolean> {
+  let known = inFlightSupport.get(run)
+  if (!known) {
+    known = run("SELECT name FROM pragma_table_info('session_v2')").then(
+      (rows) => {
+        const names = new Set((rows as { name?: unknown }[]).map((row) => row?.name))
+        return IN_FLIGHT_COLUMNS.every((name) => names.has(name))
+      },
+      () => {
+        inFlightSupport.delete(run)
+        return false
+      },
+    )
+    inFlightSupport.set(run, known)
+  }
+  return known
+}
+
 async function queryWaitingIds(run: DbRun): Promise<Map<string, string>> {
-  const rows = (await run(NEEDS_INPUT_SQL(Date.now() - STUCK_AFTER_MS))) as {
+  const rows = (await run(NEEDS_INPUT_SQL(Date.now() - STUCK_AFTER_MS, await hasInFlightColumns(run)))) as {
     id: unknown
     reason: unknown
   }[]
@@ -830,16 +871,37 @@ function transcriptTextQuery(count: number): string {
 SELECT sid, text FROM parts WHERE text IS NOT NULL AND text <> '' ORDER BY sid, seq, rid, part`
 }
 
+// Transcript text per session for the plugin lifetime; memory only, so
+// conversation text is never written anywhere. `sig` identifies the extracted
+// state of the session (see transcriptSignatureQuery).
+const transcriptCache = new Map<string, { sig: string; text: string }>()
+const clearTranscriptCache = () => transcriptCache.clear()
+
+// Cheap change detector mirroring the fzf extraction cache: message count and
+// latest message timestamp, plus the payload size that bounds extraction
+// batches. octet_length() reads the stored size, never the payload; length()
+// would read every payload to count characters.
+function transcriptSignatureQuery(count: number): string {
+  const placeholders = Array.from({ length: count }, () => "?").join(",")
+  return `SELECT session_id AS sid, COUNT(*) AS n, MAX(time_updated) AS m, SUM(octet_length(data)) AS bytes
+FROM session_message
+WHERE session_id IN (${placeholders}) AND type IN ('user', 'assistant')
+GROUP BY session_id`
+}
+
 // Index titles/directories immediately, then add transcript text progressively
 // in batches so the render thread can breathe. Covers every entry, not a fixed
 // newest window; `onProgress` lets the picker show coverage. Local extraction
-// runs through `run` (the worker client) and returns text only.
+// runs through `run` (the worker client) and returns text only; sessions whose
+// signature is unchanged reuse their cached text, and extraction batches are
+// bounded by session count and payload bytes.
 async function buildSearchIndex(
   api: TuiPluginApi,
   entries: Entry[],
   onProgress?: (progress: IndexProgress, index: Map<string, string>) => void,
   active = () => true,
   run: DbRun = dbClient.run,
+  cache = transcriptCache,
 ): Promise<Map<string, string>> {
   const index = new Map<string, string>()
   for (const entry of entries) {
@@ -854,9 +916,53 @@ async function buildSearchIndex(
 
   if (!active()) return index
   try {
-    for (let i = 0; i < ids.length; i += TRANSCRIPT_BATCH) {
+    // `entries` must be the full session list: sessions missing from it are pruned.
+    const idSet = new Set(ids)
+    for (const sid of cache.keys()) if (!idSet.has(sid)) cache.delete(sid)
+    // Undefined when the signature query fails (octet_length needs SQLite
+    // >= 3.43, and macOS Bun uses the system SQLite): extract everything
+    // locally, batched by count only, and cache nothing.
+    let signatures: Map<string, { sig: string; bytes: number }> | undefined = new Map()
+    try {
+      for (let i = 0; i < ids.length; i += SIGNATURE_CHUNK) {
+        const chunk = ids.slice(i, i + SIGNATURE_CHUNK)
+        const rows = (await run(transcriptSignatureQuery(chunk.length), chunk)) as { sid: string; n: number; m: number; bytes: number }[]
+        if (!active()) return index
+        for (const row of rows) signatures.set(row.sid, { sig: `${row.n}:${row.m}:${row.bytes}`, bytes: row.bytes ?? 0 })
+      }
+    } catch {
+      if (!active()) return index
+      signatures = undefined
+    }
+    const sigs = signatures && new Map(entries.map((entry) => [entry.id, `${entry.updated}:${signatures!.get(entry.id)?.sig ?? "0:0:0"}`]))
+    const stale: string[] = []
+    for (const id of ids) {
+      const hit = cache.get(id)
+      if (hit && sigs && hit.sig === sigs.get(id)) {
+        if (hit.text) index.set(id, `${index.get(id) ?? ""} ${hit.text}`.trim())
+        remaining.delete(id)
+        indexed += 1
+      } else stale.push(id)
+    }
+    if (indexed > 0) report(false)
+
+    const batches: string[][] = []
+    let current: string[] = []
+    let currentBytes = 0
+    for (const id of stale) {
+      const bytes = signatures?.get(id)?.bytes ?? 0
+      if (current.length > 0 && (current.length >= TRANSCRIPT_BATCH || currentBytes + bytes > TRANSCRIPT_BATCH_BYTES)) {
+        batches.push(current)
+        current = []
+        currentBytes = 0
+      }
+      current.push(id)
+      currentBytes += bytes
+    }
+    if (current.length > 0) batches.push(current)
+
+    for (const batch of batches) {
       if (!active()) break
-      const batch = ids.slice(i, i + TRANSCRIPT_BATCH)
       const rows = (await run(transcriptTextQuery(batch.length), batch)) as { sid: string; text: string }[]
       if (!active()) break
       const texts = new Map<string, string[]>()
@@ -865,8 +971,12 @@ async function buildSearchIndex(
         if (list) list.push(row.text)
         else texts.set(row.sid, [row.text])
       }
-      for (const [sid, list] of texts) index.set(sid, [index.get(sid) ?? "", ...list].join(" ").trim())
-      for (const id of batch) remaining.delete(id)
+      for (const id of batch) {
+        const list = texts.get(id) ?? []
+        if (sigs) cache.set(id, { sig: sigs.get(id)!, text: list.join(" ").trim() })
+        if (list.length > 0) index.set(id, [index.get(id) ?? "", ...list].join(" ").trim())
+        remaining.delete(id)
+      }
       indexed += batch.length
       report(false)
       await nextTick()
@@ -3352,7 +3462,11 @@ function createApi(ctx: Plugin.Context) {
   const [dialogOpen, setDialogOpen] = createSignal(false)
   let sourceTheme: Plugin.Context["theme"] | undefined
   let currentTheme: ReturnType<typeof adaptTheme>
+  const slotDisposers: Array<() => void> = []
   return {
+    dispose() {
+      for (const dispose of slotDisposers.splice(0)) dispose()
+    },
     theme: {
       get current() {
         if (sourceTheme !== ctx.theme) {
@@ -3476,18 +3590,18 @@ function createApi(ctx: Plugin.Context) {
     slots: {
       register(cfg: { order?: number; slots: Record<string, () => any> }) {
         if (cfg.slots.sidebar_content && ctx.options?.showSidebar !== false) {
-          ctx.ui.slot({
+          slotDisposers.push(ctx.ui.slot({
             ...(ctx.options?.sidebarPlacement === "prepend"
               ? { prepend: "sidebar.content" as const }
               : { append: "sidebar.content" as const }),
             render: cfg.slots.sidebar_content as any,
-          })
+          }))
         }
         if (cfg.slots.home_bottom) {
-          ctx.ui.slot({
+          slotDisposers.push(ctx.ui.slot({
             prepend: "home.footer",
             render: cfg.slots.home_bottom as any,
-          })
+          }))
         }
       },
     },
@@ -3581,6 +3695,7 @@ function createApi(ctx: Plugin.Context) {
 export default Plugin.define({
   id: "sesh-panel",
   async setup(ctx) {
+    const client = dbClient = createDbClient()
     const api = createApi(ctx)
     let initialized = false
     const disposeSlot = ctx.ui.slot({
@@ -3597,8 +3712,10 @@ export default Plugin.define({
     return () => {
       if (api.ui.dialog.open) api.ui.dialog.clear()
       disposeSlot()
+      api.dispose()
       removeRootMouse?.()
-      dbClient.close()
+      clearTranscriptCache()
+      client.close()
     }
   },
 })