opencode-sesh 0.1.3 → 0.1.4

package/AGENTS.md

@@ -13,8 +13,8 @@ territory: read this first, then the specific file you need.
 2. **`tui/sesh-panel.tsx`** — a SolidJS/OpenTUI plugin for the opencode TUI: a
    recent-sessions section in the sidebar plus a `ctrl+o` / `/sesh` picker.
 3. **`opencode/tools/sesh-list.ts`** — the `sesh-list` custom tool, so the agent
-   can list sessions across every directory (the native `opencode session list`
-   is project-scoped).
+   can list sessions across every directory by querying the global `opencode
+   db` store (the native `opencode session list` is project-scoped).
 
 No iTerm2, no AppleScript, no panes, no window management — **never add any.**
 opencode has no persistent-sidebar API, so the "sidebar" is a `sidebar_content`
@@ -43,9 +43,10 @@ The **filename becomes the tool name** in opencode, so `sesh-list.ts` is the
 
 ## Data flow (fzf picker)
 
-`bin/sesh-list.sh` is the only place that knows the session store (opencode
-SQLite DB: `session` / `message` / `part` tables). Keystrokes never touch the
-database:
+`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
+the schema below. Keystrokes never touch the database:
 
 - `--refresh` (expensive): bulk-reads session metadata and per-session text
   parts, validates the persistent extraction cache
@@ -67,7 +68,7 @@ One worker (`sesh-refresh-worker.sh`, per picker, TERMed on exit) serializes
 scans; fzf's `start`/`every(3)`/`change` bindings render only. Selection requests
 a fresh poll (`request`/`wait`, ≤12 s) before dispatch. opencode has no
 live-agent API, so `liveState` is always `unknown` and rows render gray;
-dispatch is always `opencode --session <id>` (`--fork` with Ctrl-F/Enter).
+dispatch is always `opencode --session <id>` (`--fork` with Ctrl-F or --fork).
 Resume happens in place (`exec` after `cd` to the session's cwd).
 
 ## Conventions
@@ -82,12 +83,16 @@ Resume happens in place (`exec` after `cd` to the session's cwd).
   `sqlite3 -json` in `-R` mode; it pretty-prints — parse as JSON.
 - `jq -R` output stays JSON-quoted: use `-Rr` when a shell variable needs the
   raw string.
-- fzf: stock only, `>= 0.52` (`transform:`, `every():`). `{q}` in binds is
+- fzf: stock only, `>= 0.73` (`transform:`, `every():`). `{q}` in binds is
   shell-quoted by fzf — don't add quoting. Ctrl-G is bind-only (stays open);
   Ctrl-F is `--expect` (accepts with fork).
 - The installer prefers the local opencode version for `@opencode-ai/*` and
   merges (never clobbers) the config `package.json`; opencode runs `bun install`
   at startup.
+- Commit messages follow [Conventional Commits](https://www.conventionalcommits.org/)
+  (`feat`, `fix`, `docs`, `ci`, …). See
+  [CONTRIBUTING.md](CONTRIBUTING.md#commit-messages) for the types and the
+  version mapping.
 
 ## TUI panel (`tui/sesh-panel.tsx`)
 

package/CHANGELOG.md

@@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.4] - 2026-09-13
+
+### Fixed
+
+- The picker keeps the selected session across automatic refreshes and no
+  longer retargets Enter, Ctrl-F, or Ctrl-X when the selected session
+  disappears (`--track`/`--id-nth` plus a non-actionable placeholder row).
+- Ctrl-F now forks: fzf's `--print-query`/`--expect` output (query, key, row)
+  was parsed as key, query, row, so forking resumed the original session.
+- Require fzf >= 0.73 in the launcher, installer, README, and AGENTS — the
+  `every()` refresh event the picker relies on was added in 0.73.
+- Transcript extraction caches are written 0700/0600 regardless of the caller's
+  umask, and existing caches are tightened on refresh.
+
+### Changed
+
+- The `sesh-list` agent tool queries the global session store, so it lists
+  every project directory (roots, non-archived) instead of only the current
+  project; directory filtering now happens before the limit.
+
+### Added
+
+- Real-fzf PTY regressions for selection tracking and fork parsing
+  (`npm run test:picker`), an agent-tool contract/SQL suite, and fzf
+  version-gate and cache-permission regressions.
+
 ## [0.1.3] - 2026-09-12
 
 ### Added
@@ -48,7 +74,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.
 
-[Unreleased]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.1.3...HEAD
+[Unreleased]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.1.4...HEAD
+[0.1.4]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.1.2...v0.1.3
 [0.1.2]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/ozandogrultan/opencode-sesh/compare/v0.1.0...v0.1.1

package/README.md

@@ -82,7 +82,7 @@ ctrl+o            # inside opencode — picker
 ### Requirements
 
 - [opencode](https://opencode.ai), used at least once
-- `bash`, `jq`, and [`fzf`](https://github.com/junegunn/fzf) `>= 0.52`
+- `bash`, `jq`, and [`fzf`](https://github.com/junegunn/fzf) `>= 0.73`
 - `sqlite3` recommended — the picker queries the session DB directly in
   milliseconds and falls back to the slower `opencode db` CLI without it
 - [`glow`](https://github.com/charmbracelet/glow) optional — styles the
@@ -104,7 +104,7 @@ bash install.sh --uninstall   # from source
 | --- | --- |
 | Type | Search titles and transcript text across all directories |
 | Enter | Resume the selected session in this terminal |
-| Ctrl-F Enter | Resume as a fork (the original is untouched) |
+| Ctrl-F       | Resume as a fork (the original is untouched) |
 | Ctrl-G | Toggle current-directory scope / all sessions |
 | Space (empty query) | Toggle the transcript preview |
 | `?` (empty query) | Toggle shortcut help |

package/bin/sesh-list.sh

@@ -6,6 +6,7 @@
 # TSV: agentId, sessionId, liveState, display, cwd, trackingId.
 # Every row, including headers/notices, requires a unique nonempty trackingId.
 set -euo pipefail
+umask 077
 
 LIMIT=0
 LIMIT_SET=0
@@ -17,6 +18,7 @@ INCLUDE_ARCHIVED=0
 ARCHIVED_SET=0
 STATE_DIR=''
 QUERY=''
+SELECTED_ID=''
 SCOPE_CWD=''
 usage() { echo "usage: ${0##*/} [--refresh] [--wait-lock SECONDS] --state-dir DIR [--cwd] [--limit N] [--archived] [--toggle-scope] [--query TEXT]" >&2; }
 while [ "$#" -gt 0 ]; do
@@ -29,6 +31,7 @@ while [ "$#" -gt 0 ]; do
     --archived) INCLUDE_ARCHIVED=1; ARCHIVED_SET=1 ;;
     --toggle-scope) TOGGLE_SCOPE=1 ;;
     --query) QUERY=${2:-}; shift ;;
+    --selected-id) SELECTED_ID=${2:-}; shift ;;
     --help) usage; exit 0 ;;
     *) echo "unknown option: $1" >&2; usage; exit 2 ;;
   esac
@@ -111,18 +114,24 @@ set_status() { atomic_text "$STATUS" "$1"; }
 render() {
   local state=''
   [ -f "$STATUS" ] && state=$(cat "$STATUS" 2>/dev/null || true)
-  if [ ! -s "$SNAPSHOT" ]; then
+  if [ ! -f "$SNAPSHOT" ]; then
     [ -n "$state" ] && [ "$state" != fresh ] && printf '\t\tunknown\t%s%s%s\t\tnotice:live-state\n' "$YELLOW" "$state" "$RESET"
     return 0
   fi
   {
     [ -n "$state" ] && [ "$state" != fresh ] && printf '\t\tunknown\t%s%s%s\t\tnotice:live-state\n' "$YELLOW" "$state" "$RESET"
-    "$JQ_BIN" -sr --arg green "$GREEN" --arg cyan "$CYAN" --arg gray "$GRAY" --arg magenta "$MAGENTA" --arg red "$RED" --arg bold "$BOLD" --arg reset "$RESET" --arg query "$QUERY" --arg home "$HOME" '
+    "$JQ_BIN" -sr --arg green "$GREEN" --arg cyan "$CYAN" --arg gray "$GRAY" --arg magenta "$MAGENTA" --arg red "$RED" --arg bold "$BOLD" --arg yellow "$YELLOW" --arg reset "$RESET" --arg query "$QUERY" --arg home "$HOME" --arg selected "$SELECTED_ID" '
       def ago($epoch):
         ((now - ($epoch | tonumber)) | floor) as $s
         | if $s < 60 then "now" elif $s < 3600 then "\($s / 60 | floor)m" elif $s < 86400 then "\($s / 3600 | floor)h" else "\($s / 86400 | floor)d" end;
       def homepath:
         . as $p | if $p == "" then "?" elif $p == $home then "~" elif ($home != "" and startswith($home + "/")) then "~" + .[($home|length):] else . end;
+      # Preserve a vanished selection as a non-actionable row with its original
+      # tracking key. Otherwise fzf falls back to a different session. Keep it
+      # until the user moves away; empty field 2 makes Enter/Ctrl-F/Ctrl-X no-ops.
+      (if ($selected | test("^ses_[A-Za-z0-9]+$")) and (any(.sessionId == $selected) | not)
+       then (["", "", "unknown", ($yellow + "Selected session is no longer available; choose another session" + $reset), "", $selected] | @tsv)
+       else empty end),
       (($query | ascii_downcase) as $q
       | map(select($q == "" or (.searchText | contains($q))))
       | group_by(.cwd)
@@ -159,8 +168,22 @@ acquire_lock_wait() {
   done
 }
 
+private_dir() {
+  # These are dedicated sesh directories, never the shared XDG parent. Refuse
+  # symlinks/foreign ownership rather than changing permissions on their target.
+  [ ! -L "$1" ] || { echo "sesh: private directory is a symlink: $1" >&2; return 1; }
+  mkdir -p "$1"
+  [ -O "$1" ] || { echo "sesh: private directory is not owned by this user: $1" >&2; return 1; }
+  chmod 700 "$1"
+}
+
 refresh() {
-  mkdir -p "$STATE_DIR"
+  private_dir "$STATE_DIR"
+  private_dir "$CACHE_DIR"
+  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 {} +
   if [ "${SESH_LOCK_HELD:-}" != "$STATE_DIR" ]; then
     if [ "$WAIT_LOCK" -gt 0 ]; then acquire_lock_wait || return $?; else acquire_lock || return 0; fi
   fi
@@ -180,7 +203,6 @@ refresh() {
     if [ -f "$SNAPSHOT" ]; then set_status 'stale: neither sqlite3 nor opencode is available; showing last good snapshot'; else set_status 'unavailable: neither sqlite3 nor opencode is available'; fi
     return 0
   fi
-  mkdir -p "$EXTRACTIONS"
   local scratch sessions parts cache_records cache_state historical needs_extract out
   scratch=$(mktemp -d "$STATE_DIR/.refresh.XXXXXX")
   refresh_scratch=$scratch
@@ -199,6 +221,9 @@ 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
   }
+  # 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
@@ -261,8 +286,9 @@ refresh() {
        updatedEpoch: (($updated / 1000 | floor) | if . > 0 then . else ($created / 1000 | floor) end),
        fulltextLower: $fulltext}') || record=''
     if [ -n "$record" ]; then
-      printf '%s\n' "$record" > "$cache.tmp"
-      mv "$cache.tmp" "$cache"
+      cache_tmp=$(mktemp "$EXTRACTIONS/$sid.json.XXXXXX")
+      printf '%s\n' "$record" > "$cache_tmp"
+      mv "$cache_tmp" "$cache"
       printf '%s\n' "$record" >> "$historical"
     fi
   done < "$needs_extract"

package/bin/sesh-refresh-worker.sh

@@ -2,6 +2,7 @@
 # A short-lived worker owned by one picker.  It serializes expensive refreshes;
 # fzf only ever asks the list script to render the last published snapshot.
 set -euo pipefail
+umask 077
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # The list script can be overridden for reuse; default is the opencode list.
@@ -14,6 +15,7 @@ SCOPE=''
 LIMIT=60
 TARGET=''
 TIMEOUT=12
+SELECTED_ID=''
 
 usage() { echo "usage: ${0##*/} init|worker|render|request|wait --state-dir DIR [options]" >&2; exit 2; }
 while [ "$#" -gt 0 ]; do
@@ -22,6 +24,7 @@ while [ "$#" -gt 0 ]; do
     --scope) [ "$#" -ge 2 ] || usage; SCOPE=$2; shift ;;
     --limit) [ "$#" -ge 2 ] || usage; LIMIT=$2; shift ;;
     --query) [ "$#" -ge 2 ] || usage; QUERY=$2; shift ;;
+    --selected-id) [ "$#" -ge 2 ] || usage; SELECTED_ID=$2; shift ;;
     --target) [ "$#" -ge 2 ] || usage; TARGET=$2; shift ;;
     --timeout) [ "$#" -ge 2 ] || usage; TIMEOUT=$2; shift ;;
     *) usage ;;
@@ -49,7 +52,7 @@ case "$MODE" in
     atomic_text "$STATE_DIR/worker-complete" 0
     ;;
   render)
-    "$LIST" --state-dir "$STATE_DIR" --query "${QUERY:-}"
+    "$LIST" --state-dir "$STATE_DIR" --query "${QUERY:-}" --selected-id "$SELECTED_ID"
     # An empty, first snapshot should not look like a broken picker.
     if [ ! -f "$STATE_DIR/status" ] && [ -f "$STATE_DIR/worker.pid" ]; then
       printf '\t\tunknown\tLoading sessions…\t\tnotice:loading\n'

package/bin/sesh-shortcuts.sh

@@ -5,7 +5,7 @@ sesh shortcuts
 
   Type              Search session titles and transcript text
   Enter             Resume the selected session here
-  Ctrl-F Enter      Resume the selected session as a fork
+  Ctrl-F            Resume the selected session as a fork
   Ctrl-G            Toggle current-directory scope / all sessions
   Space             Toggle transcript preview
   ?                 Toggle this help

package/bin/sesh.sh

@@ -4,6 +4,7 @@
 # Refreshes publish one state-dir snapshot; fzf query changes render that
 # snapshot only, so typing never starts competing scans.
 set -euo pipefail
+umask 077
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
@@ -25,8 +26,8 @@ version=$("$SESH_FZF" --version 2>/dev/null || true)
 if [[ "$version" =~ ^([0-9]+)\.([0-9]+)(\.([0-9]+))? ]]; then
   fzf_major=$((10#${BASH_REMATCH[1]}))
   fzf_minor=$((10#${BASH_REMATCH[2]}))
-  if [ "$fzf_major" -eq 0 ] && [ "$fzf_minor" -lt 52 ]; then
-    echo "sesh: fzf >= 0.52.0 is required (found $version)" >&2
+  if [ "$fzf_major" -eq 0 ] && [ "$fzf_minor" -lt 73 ]; then
+    echo "sesh: fzf >= 0.73.0 is required (found $version)" >&2
     exit 1
   fi
 else
@@ -92,7 +93,7 @@ cleanup() {
 trap cleanup EXIT
 trap 'exit 130' HUP INT TERM
 
-cache_cmd="$q_worker render --state-dir $q_state --query {q}"
+cache_cmd="$q_worker render --state-dir $q_state --query {q} --selected-id {6}"
 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"
@@ -102,7 +103,7 @@ query="$picker_query"
 while :; do
 selection=''
 set +e
-selection=$(FZF_DEFAULT_COMMAND='printf ""' FZF_DEFAULT_OPTS='' FZF_DEFAULT_OPTS_FILE='' "$SESH_FZF" --print-query --expect=ctrl-f --query="$query" --ansi --delimiter=$'\t' --with-nth=4 --disabled --layout=reverse --info=hidden --prompt='❯ ' \
+selection=$(FZF_DEFAULT_COMMAND='printf ""' FZF_DEFAULT_OPTS='' FZF_DEFAULT_OPTS_FILE='' "$SESH_FZF" --print-query --expect=ctrl-f --query="$query" --ansi --delimiter=$'\t' --with-nth=4 --track --id-nth=6 --disabled --layout=reverse --info=hidden --prompt='❯ ' \
   --preview="$preview_cmd" --preview-window='right,50%,wrap,hidden' \
   --bind='space:transform:[ -z {q} ] && echo toggle-preview || echo "put( )"' \
   --bind="$help_bind" \
@@ -113,10 +114,11 @@ selection=$(FZF_DEFAULT_COMMAND='printf ""' FZF_DEFAULT_OPTS='' FZF_DEFAULT_OPTS
 status=$?
 set -e
 case "$status" in 0) ;; 1|130) exit 0;; *) echo "sesh: picker failed ($status)" >&2; exit "$status";; esac
-key=${selection%%$'\n'*}
-selection=${selection#*$'\n'}
+# --print-query precedes the --expect key (empty for Enter), then the row.
 query=${selection%%$'\n'*}
 selection=${selection#*$'\n'}
+key=${selection%%$'\n'*}
+selection=${selection#*$'\n'}
 session_id=$(printf '%s\n' "$selection" | cut -f2)
 [ -n "$session_id" ] || continue
 # Dispatch queues a new worker scan and waits for that exact serialized poll.

package/install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Install sesh for the current user.
 # Terminal- and OS-agnostic: macOS and Linux, any terminal. No administrator
-# privileges, downloads, or shell-rc edits. Runtime requires jq, fzf >= 0.52
+# privileges, downloads, or shell-rc edits. Runtime requires jq, fzf >= 0.73
 # and sqlite3 or the opencode CLI; the in-TUI panel additionally needs the
 # packages opencode installs for local plugins (handled below).
 set -euo pipefail
@@ -120,8 +120,8 @@ for tool in bash jq fzf; do
 done
 fzf_version=$(fzf --version 2>/dev/null || true)
 if [[ "$fzf_version" =~ ^([0-9]+)\.([0-9]+)(\.([0-9]+))? ]]; then
-  if [ "$((10#${BASH_REMATCH[1]}))" -eq 0 ] && [ "$((10#${BASH_REMATCH[2]}))" -lt 52 ]; then
-    fail "fzf >= 0.52.0 is required (found $fzf_version)."
+  if [ "$((10#${BASH_REMATCH[1]}))" -eq 0 ] && [ "$((10#${BASH_REMATCH[2]}))" -lt 73 ]; then
+    fail "fzf >= 0.73.0 is required (found $fzf_version)."
   fi
 else
   fail "cannot parse fzf version from: $fzf_version."

package/opencode/tools/sesh-list.ts

@@ -12,7 +12,10 @@ export default tool({
   args: {
     limit: tool.schema
       .number()
-      .describe("Maximum sessions to return")
+      .int()
+      .min(0)
+      .max(1000)
+      .describe("Maximum sessions to return (0–1000; 0 returns none)")
       .default(50),
     directory: tool.schema
       .string()
@@ -20,23 +23,29 @@ export default tool({
       .optional(),
   },
   async execute(args) {
+    // Validate here as well as in the schema for direct/programmatic callers.
+    if (!Number.isInteger(args.limit) || args.limit < 0 || args.limit > 1000) {
+      throw new Error("limit must be an integer between 0 and 1000")
+    }
     const bun = (globalThis as any).Bun
     if (!bun || typeof bun.$ !== "function") {
       throw new Error("This tool requires the Bun runtime (globalThis.Bun.$)")
     }
 
-    const out = await bun.$`opencode session list -n ${args.limit} --format json`.json()
-    const sessions = (Array.isArray(out) ? out : []).filter(
-      (s) => !args.directory || s.directory === args.directory,
-    )
-    return JSON.stringify(
-      sessions.map((s) => ({
-        id: s.id,
-        title: s.title,
-        directory: s.directory,
-        updated: s.updated,
-        created: s.created,
-      })),
-    )
+    // `session list` is project-scoped and hides only children of forks. The
+    // global store has no project instance, so query the SQLite session table
+    // directly (OpenCode 1.18.30). Match `Session.listGlobal`/the picker: roots
+    // only, non-archived. Bun quotes the SQL as one shell argument; SQL string
+    // literals need their own escaping as well.
+    const where = args.directory === undefined
+      ? ""
+      : ` AND directory = '${args.directory.replaceAll("'", "''")}'`
+    const query = `SELECT id, title, directory, time_updated AS updated, time_created AS created
+      FROM session WHERE parent_id IS NULL AND time_archived IS NULL${where}
+      ORDER BY time_updated DESC, id DESC LIMIT ${args.limit}`
+    const text = await bun.$`opencode db ${query} --format json`.text()
+    const sessions = JSON.parse(text.trim() || "[]")
+    if (!Array.isArray(sessions)) throw new Error("Unexpected opencode db result: expected an array")
+    return JSON.stringify(sessions)
   },
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-sesh",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "type": "module",
   "description": "Browse, search, preview and resume opencode sessions from the terminal and the TUI.",
   "license": "MIT",
@@ -40,17 +40,23 @@
     "node": ">=20"
   },
   "scripts": {
+    "prepare": "husky",
     "test": "bash tests/sesh.sh",
+    "test:picker": "python3 tests/picker.py",
     "typecheck": "tsc -p tsconfig.json",
-    "lint:sh": "bash -n bin/*.sh bin/sesh install.sh tests/sesh.sh"
+    "lint:sh": "for script in bin/*.sh bin/sesh install.sh tests/*.sh; do bash -n \"$script\" || exit; done",
+    "prepublishOnly": "npm test && npm run typecheck"
   },
   "devDependencies": {
+    "@commitlint/cli": "^21.2.2",
+    "@commitlint/config-conventional": "^21.2.2",
     "@opencode-ai/plugin": "1.18.30",
     "@opencode-ai/sdk": "1.18.30",
     "@opentui/core": "^0.5.11",
     "@opentui/keymap": "^0.5.11",
     "@opentui/solid": "^0.5.11",
     "@types/node": "26.5.1",
+    "husky": "^9.1.7",
     "solid-js": "1.9.12",
     "typescript": "7.0.2"
   }