opencode-sesh 2.0.4 → 2.1.1

package/AGENTS.md

@@ -159,7 +159,8 @@ when opencode exits, the picker reopens with the query preserved.
 ## TUI panel (`tui-plugins/sesh-panel/tui.tsx`)
 
 - **Sidebar & Home list:** `api.slots.register` on `sidebar_content` (`sidebar.content`
-  prepend mode — native sidebar content stays) and `home_bottom` (`home.footer`
+  append mode by default — native sidebar content stays above Sessions;
+  `sidebarPlacement: "prepend"` puts Sessions first) and `home_bottom` (`home.footer`
   prepend mode). In the sidebar, pinned directories sort first, then directory groups
   by recency; sessions within each group sort by last update regardless of pins.
   In the home list, pinned sessions sort first.

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).
 
+## [2.1.1] - 2026-10-22
+
+### Fixed
+
+- Harden pruning, picker concurrency, and TUI lifecycle
+
+## [2.1.0] - 2026-10-20
+
+### Added
+
+- **tui:** Configure sessions sidebar placement
+
 ## [2.0.4] - 2026-10-20
 
 ### Added
@@ -506,6 +518,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.1]: https://github.com/ozandogrultan/opencode-sesh/compare/v2.1.0...v2.1.1
+[2.1.0]: https://github.com/ozandogrultan/opencode-sesh/compare/v2.0.4...v2.1.0
 [2.0.4]: https://github.com/ozandogrultan/opencode-sesh/compare/v2.0.3...v2.0.4
 [2.0.3]: https://github.com/ozandogrultan/opencode-sesh/compare/v2.0.2...v2.0.3
 [2.0.2]: https://github.com/ozandogrultan/opencode-sesh/compare/v2.0.1...v2.0.2

package/README.md

@@ -1,9 +1,12 @@
+# sesh
+
+[![CI](https://github.com/ozandogrultan/opencode-sesh/actions/workflows/ci.yml/badge.svg)](https://github.com/ozandogrultan/opencode-sesh/actions/workflows/ci.yml)
+
 <h1 align="center">
   <img src="assets/logo.svg" alt="sesh" height="96">
 </h1>
 
 <p align="center">
-  <a href="https://github.com/ozandogrultan/opencode-sesh/actions/workflows/ci.yml"><img src="https://github.com/ozandogrultan/opencode-sesh/actions/workflows/ci.yml/badge.svg" alt="CI"></a>
   <a href="https://www.npmjs.com/package/opencode-sesh"><img src="https://img.shields.io/npm/v/opencode-sesh" alt="npm"></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License: MIT"></a>
   <a href="#contributing"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs welcome"></a>
@@ -226,6 +229,10 @@ workspace at its directory; outside cmux it shows a toast instead.
 
 ### TUI sidebar and home list
 
+`sidebarPlacement` (`"append"` or `"prepend"`, default: `"append"`) places the
+**Sessions** section below or above OpenCode's native sidebar sections. With
+`"append"`, native todos appear above Sessions when available.
+
 `showSidebar` (boolean, default: `true`) controls whether the **Sessions** section
 appears in the sidebar. Set it to `false` to hide the section while keeping the
 home list, session picker, and other commands available. OpenCode's native sidebar
@@ -238,7 +245,7 @@ the `opencode.json` entry unchanged:
   "plugins": [
     {
       "package": "opencode-sesh",
-      "options": { "showSidebar": false }
+      "options": { "showSidebar": true, "sidebarPlacement": "append" }
     }
   ]
 }
@@ -333,6 +340,13 @@ covers the current project) and offer to resume one.
 extracted text under `${XDG_CACHE_HOME:-~/.cache}/sesh` (or `SESH_CACHE_DIR`).
 Nothing is uploaded anywhere.
 
+**What if a lock stays busy after a crash?** Stop all sesh pickers before
+manually removing the lock directory named in the error; for pin locks, also
+fully quit OpenCode. Locks are never automatically reclaimed. Restart OpenCode
+after upgrading so older plugin instances cannot reclaim locks. Interrupted
+extraction temporary files may remain in the cache; remove them only after all
+pickers have stopped.
+
 **Does it work on Windows?** It targets macOS and Linux. WSL should work; native
 Windows is untested.
 

package/bin/sesh-costs.sh

@@ -11,7 +11,6 @@
 #   --json     machine-readable rows
 set -euo pipefail
 
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 OPENCODE_BIN=${SESH_OPENCODE:-opencode}
 days=1
 emit_json=0

package/bin/sesh-delete.sh

@@ -33,18 +33,10 @@ release_lock() {
   rmdir "$lock" 2>/dev/null || true
   lock_owned=0
 }
-# Mirrors the acquirer in sesh-list.sh, including its stale-owner
-# recovery. Recovery is conservative -- an unreadable or non-numeric owner,
-# or one still alive, always loses the race.
+# Only the owner removes a lock; stale reclamation can race a new owner.
 acquire_lock() {
   if mkdir "$lock" 2>/dev/null; then printf '%s\n' "$$" > "$lock/pid"; return 0; fi
-  local owner=''; [ -f "$lock/pid" ] && owner=$(cat "$lock/pid" 2>/dev/null || true)
-  case "$owner" in ''|*[!0-9]*) return 1;; esac
-  kill -0 "$owner" 2>/dev/null && return 1
-  rm -f "$lock/pid" 2>/dev/null || return 1
-  rmdir "$lock" 2>/dev/null || return 1
-  mkdir "$lock" 2>/dev/null || return 1
-  printf '%s\n' "$$" > "$lock/pid"
+  return 1
 }
 
 # fzf passes an empty second field for headers and notices. They are never
@@ -77,9 +69,9 @@ fi
 # Serialize this action with the sole snapshot publisher. A short collision
 # is safer than deleting against a moving snapshot.
 if ! acquire_lock; then
-  echo "Session list is refreshing; try deletion again in a moment."
+  printf 'sesh: refresh lock is busy: %s; if it persists, stop all sesh pickers before removing this lock directory\n' "$lock" >&2
   pause
-  exit 0
+  exit 75
 fi
 lock_owned=1
 trap 'release_lock' EXIT

package/bin/sesh-list.sh

@@ -23,6 +23,10 @@ SELECTED_ID=''
 SCOPE_CWD=''
 usage() { echo "usage: ${0##*/} [--refresh] [--header] [--wait-lock SECONDS] --state-dir DIR [--cwd] [--limit N] [--archived] [--toggle-scope] [--query TEXT]" >&2; }
 while [ "$#" -gt 0 ]; do
+  case "$1" in
+    --wait-lock|--state-dir|--limit|--query|--selected-id)
+      [ "$#" -ge 2 ] || { echo "$1 requires an argument" >&2; exit 2; } ;;
+  esac
   case "$1" in
     --refresh) REFRESH=1 ;;
     --header) HEADER=1 ;;
@@ -57,6 +61,12 @@ EXTRACTIONS="$CACHE_DIR/extractions"
 # so metadata always covers the whole database and cache pruning is safe.
 SCOPE_CWD_SETTING=''
 if [ -f "$SETTINGS" ]; then
+  "$JQ_BIN" -e '
+    type == "object" and (.scope | type) == "string"
+    and (.limit | type) == "number" and .limit >= 0 and .limit == (.limit | floor)
+    and ((.archived // 0) == 0 or .archived == 1)
+    and ((.cwd // "") | type) == "string"
+  ' "$SETTINGS" >/dev/null 2>&1 || { echo 'sesh: invalid settings' >&2; exit 2; }
   [ "$LIMIT_SET" = 1 ] || LIMIT=$("$JQ_BIN" -r '.limit' "$SETTINGS")
   [ "$SCOPE_SET" = 1 ] || SCOPE_CWD=$("$JQ_BIN" -r '.scope' "$SETTINGS")
   [ "$ARCHIVED_SET" = 1 ] || INCLUDE_ARCHIVED=$("$JQ_BIN" -r '.archived // 0' "$SETTINGS" 2>/dev/null || printf '0')
@@ -198,19 +208,16 @@ render() {
 release_lock() { rm -f "$LOCK/pid" 2>/dev/null || true; rmdir "$LOCK" 2>/dev/null || true; }
 acquire_lock() {
   if mkdir "$LOCK" 2>/dev/null; then printf '%s\n' "$$" > "$LOCK/pid"; return 0; fi
-  local owner=''; [ -f "$LOCK/pid" ] && owner=$(cat "$LOCK/pid" 2>/dev/null || true)
-  case "$owner" in ''|*[!0-9]*) return 1;; esac
-  kill -0 "$owner" 2>/dev/null && return 1
-  rm -f "$LOCK/pid" 2>/dev/null || return 1
-  rmdir "$LOCK" 2>/dev/null || return 1
-  mkdir "$LOCK" 2>/dev/null || return 1
-  printf '%s\n' "$$" > "$LOCK/pid"
+  # Only the owner removes a lock; stale reclamation can race a new owner.
+  return 1
 }
 
+lock_error() { printf 'sesh: refresh lock is busy: %s; if it persists, stop all sesh pickers before removing this lock directory\n' "$LOCK" >&2; }
+
 acquire_lock_wait() {
   local remaining=$WAIT_LOCK
   while ! acquire_lock; do
-    [ "$remaining" -gt 0 ] || return 75
+    [ "$remaining" -gt 0 ] || { lock_error; return 75; }
     sleep 1
     remaining=$((remaining - 1))
   done
@@ -231,35 +238,39 @@ refresh() {
   private_dir "$EXTRACTIONS"
   # Migrate warm caches too, including temporary files left by older versions.
   # Do not follow symlinks or chmod unrelated files outside our extraction store.
-  find "$EXTRACTIONS" -maxdepth 1 -type f -user "$(id -u)" \( -name 'ses_*.json' -o -name 'ses_*.json.tmp' \) -exec chmod 600 {} +
+  # SIGKILL orphans stay: the cache is shared, but refresh locks are picker-local,
+  # so removing unowned temp files could interrupt another picker's writer.
+  find "$EXTRACTIONS" -maxdepth 1 -type f -user "$(id -u)" \( -name 'ses_*.json' -o -name 'ses_*.json.tmp' -o -name 'ses_*.json.??????' \) -exec chmod 600 {} +
   if [ "${SESH_LOCK_HELD:-}" != "$STATE_DIR" ]; then
-    if [ "$WAIT_LOCK" -gt 0 ]; then acquire_lock_wait || return $?; else acquire_lock || return 0; fi
+    if [ "$WAIT_LOCK" -gt 0 ]; then acquire_lock_wait || return $?; else acquire_lock || { lock_error; return 75; }; fi
   fi
+  refresh_scratch=''
+  refresh_cache_tmp=''
+  if [ "${SESH_LOCK_HELD:-}" = "$STATE_DIR" ]; then
+    trap '[ -z "$refresh_cache_tmp" ] || rm -f "$refresh_cache_tmp"; [ -z "$refresh_scratch" ] || rm -rf "$refresh_scratch"' EXIT
+  else
+    trap '[ -z "$refresh_cache_tmp" ] || rm -f "$refresh_cache_tmp"; [ -z "$refresh_scratch" ] || rm -rf "$refresh_scratch"; release_lock' EXIT
+  fi
+  trap 'exit 130' HUP INT TERM
   # Persist the effective scope (after any toggle) so renders and workers agree.
   if [ "$SCOPE_SET" = 1 ] || [ ! -f "$SETTINGS" ]; then
     atomic_text "$SETTINGS" "$("$JQ_BIN" -cn --arg scope "$SCOPE_CWD" --argjson limit "$LIMIT" --arg cwd "$SCOPE_CWD_SETTING" --argjson archived "$INCLUDE_ARCHIVED" '{scope:$scope,limit:$limit,cwd:$cwd,archived:$archived}')"
   fi
   DB_PATH=$(resolve_db) || {
     if [ -f "$SNAPSHOT" ]; then set_status 'stale: opencode database is unavailable; showing last good snapshot'; else set_status 'unavailable: opencode database is unavailable'; fi
-    return 0
+    return 1
   }
   [ -f "$DB_PATH" ] || {
     if [ -f "$SNAPSHOT" ]; then set_status 'stale: opencode database is unavailable; showing last good snapshot'; else set_status 'unavailable: opencode database is unavailable'; fi
-    return 0
+    return 1
   }
   if [ -z "$SQLITE_BIN" ]; then
     if [ -f "$SNAPSHOT" ]; then set_status 'stale: sqlite3 is not available; showing last good snapshot'; else set_status 'unavailable: sqlite3 is not available'; fi
-    return 0
+    return 1
   fi
   local scratch sessions parts cache_records cache_state historical needs_extract out
   scratch=$(mktemp -d "$STATE_DIR/.refresh.XXXXXX")
   refresh_scratch=$scratch
-  if [ "${SESH_LOCK_HELD:-}" = "$STATE_DIR" ]; then
-    trap 'rm -rf "$refresh_scratch"' EXIT
-  else
-    trap 'rm -rf "$refresh_scratch"; release_lock' EXIT
-  fi
-  trap 'exit 130' HUP INT TERM
   sessions="$scratch/sessions.json"; parts="$scratch/parts.json"
   cache_records="$scratch/caches.json"; cache_state="$scratch/cache-state.json"
   historical="$scratch/historical.jsonl"; needs_extract="$scratch/needs-extract.json"
@@ -267,14 +278,14 @@ refresh() {
 
   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
+    return 1
   }
   # sqlite3 emits no bytes for zero rows. Publish an empty snapshot so removal
   # of the final session also produces the non-actionable selection notice.
   [ -s "$sessions" ] || printf '[]\n' > "$sessions"
   "$JQ_BIN" -e 'type == "array"' "$sessions" >/dev/null 2>&1 || {
     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
+    return 1
   }
   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"
@@ -296,7 +307,7 @@ refresh() {
     | ($cached | map({key: .sessionId, value:true}) | from_entries) as $cachedIds
     | {cached: $cached,
        stale: [$meta[] | select($cachedIds[.id] != true) | {id, directory, title, time_created, time_updated, archived, partCount, partMax}],
-       prune: [$caches[0][]? | select(.sessionId? as $s | $byId[$s] == null) | .cachePath],
+       prune: [$caches[0][]? | select(if (.sessionId | type) != "string" then true else $byId[.sessionId] == null end) | .cachePath],
        meta: $meta}
   ' "$cache_records" > "$cache_state" || {
     set_status 'stale: snapshot construction failed; showing last good snapshot'
@@ -366,9 +377,10 @@ refresh() {
   if [ "$extract_failed" = 0 ]; then
     while IFS= read -r sid && IFS= read -r cache_path && IFS= read -r record; do
       [ -n "$sid" ] || continue
-      cache_tmp=$(mktemp "$EXTRACTIONS/$sid.json.XXXXXX")
-      printf '%s\n' "$record" > "$cache_tmp"
-      mv "$cache_tmp" "$cache_path"
+      refresh_cache_tmp=$(mktemp "$EXTRACTIONS/$sid.json.XXXXXX")
+      printf '%s\n' "$record" > "$refresh_cache_tmp"
+      mv "$refresh_cache_tmp" "$cache_path"
+      refresh_cache_tmp=''
       printf '%s\n' "$record" >> "$historical"
     done < "$records"
   fi

package/bin/sesh-pins.sh

@@ -12,8 +12,16 @@ value=${2:-}
 read_pins() {
   if [ -f "$PINS_FILE" ]; then
     local pins=''
-    pins=$("$JQ_BIN" -c 'select(type == "object") | {sessions: ((.sessions // []) | map(select(type == "string"))), directories: ((.directories // []) | map(select(type == "string")))}' "$PINS_FILE" 2>/dev/null) || pins=''
-    printf '%s\n' "${pins:-$empty}"
+    pins=$("$JQ_BIN" -ces '
+      if length != 1 then error("invalid pins") else .[0] end
+      | select(type == "object")
+      | {sessions: .sessions, directories: .directories}
+      | select(all(.[]; type == "array" and all(.[]; type == "string")))
+    ' "$PINS_FILE" 2>/dev/null) || { echo 'sesh: cannot read pins; leaving them unchanged' >&2; return 1; }
+    printf '%s\n' "$pins"
+  elif [ -e "$PINS_FILE" ] || [ -L "$PINS_FILE" ]; then
+    echo 'sesh: cannot read pins; leaving them unchanged' >&2
+    return 1
   else
     printf '%s\n' "$empty"
   fi
@@ -34,13 +42,8 @@ mkdir -p "$(dirname "$PINS_FILE")"
 lock="$PINS_FILE.lock"
 for ((attempt = 0; attempt < 50; attempt++)); do
   if mkdir "$lock" 2>/dev/null; then printf '%s\n' "$$" > "$lock/pid"; break; fi
-  owner=''
-  [ ! -f "$lock/pid" ] || owner=$(cat "$lock/pid" 2>/dev/null || true)
-  if [[ "$owner" =~ ^[0-9]+$ ]] && ! kill -0 "$owner" 2>/dev/null; then
-    rm -f "$lock/pid" 2>/dev/null || true
-    rmdir "$lock" 2>/dev/null || true
-  fi
-  [ "$attempt" -lt 49 ] || { echo 'sesh: pins are busy; try again' >&2; exit 1; }
+  # Only the owner removes a lock; stale reclamation can race a new owner.
+  [ "$attempt" -lt 49 ] || { printf 'sesh: pins lock is busy: %s; if it persists, stop all sesh pickers and OpenCode instances before removing this lock directory\n' "$lock" >&2; exit 1; }
   sleep 0.1
 done
 tmp=''

package/bin/sesh-prune.sh

@@ -70,11 +70,14 @@ query() { "$SQLITE_BIN" -json -readonly "$DB_PATH" "$1"; }
 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_v2 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 COALESCE(parent_id, '') = '' 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":[]}')
-WAITING_IDS=$(bash "$SCRIPT_DIR/sesh-waiting.sh" --json 2>/dev/null | "$JQ_BIN" -r '.[].id' || true)
+PINS=$("$SCRIPT_DIR/sesh-pins.sh" read) || { echo 'sesh: refusing prune: pins protection unavailable' >&2; exit 1; }
+WAITING_IDS=$(bash "$SCRIPT_DIR/sesh-waiting.sh" --json | "$JQ_BIN" -er '
+  if type == "array" and all(.[]; (.id | type) == "string")
+  then map(.id) | join("\n") else error("invalid waiting sessions") end
+') || { echo 'sesh: refusing prune: waiting-session protection unavailable' >&2; exit 1; }
 [ -n "$WAITING_IDS" ] || WAITING_IDS='__none__'
 
 ELIGIBLE=$(printf '%s' "$CANDIDATES" | "$JQ_BIN" -c --slurpfile _pins <(printf '%s' "$PINS") --arg waiting "$WAITING_IDS" '
@@ -130,7 +133,7 @@ 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
+while IFS= read -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))
@@ -138,6 +141,6 @@ for id in $(printf '%s' "$ELIGIBLE" | "$JQ_BIN" -r '.[].id'); do
     echo "Could not delete $id." >&2
     failed=$((failed + 1))
   fi
-done
+done < <(printf '%s' "$ELIGIBLE" | "$JQ_BIN" -r '.[].id')
 echo "Deleted $done_count session(s) older than $older_than."
 [ "$failed" = 0 ] || exit 1

package/bin/sesh-refresh-worker.sh

@@ -73,7 +73,10 @@ case "$MODE" in
       complete=$(cat "$STATE_DIR/worker-complete" 2>/dev/null || printf 0)
       case "$complete" in ''|*[!0-9]*) complete=0;; esac
       if [ "$complete" -ge "$TARGET" ]; then
-        [ "$(cat "$STATE_DIR/status" 2>/dev/null || true)" = fresh ] || exit 1
+        case "$(cat "$STATE_DIR/status" 2>/dev/null || true)" in
+          fresh|'stale: transcript extraction incomplete; refresh to retry') ;;
+          *) exit 1 ;;
+        esac
         exit 0
       fi
       worker=$(cat "$STATE_DIR/worker.pid" 2>/dev/null || true)

package/bin/sesh-waiting.sh

@@ -21,7 +21,6 @@
 # Keep NEEDS_INPUT_SQL in sync with the TUI sidebar copy in tui-plugins/sesh-panel/tui.tsx.
 set -euo pipefail
 
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 OPENCODE_BIN=${SESH_OPENCODE:-opencode}
 JSON=0
 while [ "$#" -gt 0 ]; do
@@ -80,7 +79,7 @@ SELECT s.id AS id, s.directory AS directory, s.title AS title, s.time_updated AS
   ) THEN 'question' ELSE 'stuck' END AS reason
 FROM session_v2 s
 WHERE COALESCE(s.time_archived, 0) = 0
-  AND s.parent_id IS NULL
+  AND COALESCE(s.parent_id, '') = ''
   AND (EXISTS (
     SELECT 1 FROM live
     WHERE live.session_id = s.id AND live.name = 'question'

package/bin/sesh.sh

@@ -75,12 +75,12 @@ picker_query=''
 while [ "$#" -gt 0 ]; do
   case "$1" in
     --cwd) scope_value=$PWD ;;
-    --limit) picker_limit=${2:-}; shift ;;
+    --limit) [ "$#" -ge 2 ] || { echo '--limit requires an argument' >&2; exit 2; }; picker_limit=$2; shift ;;
     --archived) picker_archived=1 ;;
     --print) picker_print=1 ;;
     --fork) picker_fork=1 ;;
     --json) picker_json=1 ;;
-    --query) picker_query=${2:-}; shift ;;
+    --query) [ "$#" -ge 2 ] || { echo '--query requires an argument' >&2; exit 2; }; picker_query=$2; shift ;;
     *) echo "unknown option: $1" >&2; exit 2 ;;
   esac
   shift
@@ -129,7 +129,7 @@ cache_cmd="$q_worker render --state-dir $q_state --query {q} --selected-id {6}"
 header_cmd="$q_list --header --state-dir $q_state"
 preview_cmd="if [ -f $q_state/help ]; then $q_shortcuts; else $q_preview $q_state {2}; fi"
 help_bind="?:transform:[ -z {q} ] && ( [ -f $q_state/help ] && rm -f $q_state/help && echo hide-preview || ( : > $q_state/help && echo show-preview+refresh-preview ) ) || echo 'put(?)'"
-toggle_cmd="$q_list --toggle-scope --state-dir $q_state >/dev/null"
+toggle_cmd="$q_list --toggle-scope --wait-lock 12 --state-dir $q_state >/dev/null"
 delete_cmd="$q_delete $q_state {2}"
 pin_session_cmd="$q_pins toggle-session {2}"
 pin_directory_cmd="$q_pins toggle-directory {5}"