opencode-sesh 0.1.7 → 0.2.1

package/bin/sesh-pins.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+# Persistent pins shared by the fzf picker and the opencode TUI plugin.
+set -euo pipefail
+umask 077
+
+PINS_FILE=${SESH_PINS_FILE:-"${XDG_DATA_HOME:-$HOME/.local/share}/sesh/pins.json"}
+JQ_BIN=${SESH_JQ:-jq}
+empty='{"sessions":[],"directories":[]}'
+action=${1:-}
+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}"
+  else
+    printf '%s\n' "$empty"
+  fi
+}
+
+case "$action" in
+  read) read_pins; exit 0 ;;
+  toggle-session)
+    [[ "$value" =~ ^ses_[A-Za-z0-9]+$ ]] || exit 2
+    field=sessions ;;
+  toggle-directory)
+    [[ "$value" == /* && "$value" != *$'\n'* ]] || exit 2
+    field=directories ;;
+  *) echo 'usage: sesh-pins.sh read|toggle-session ID|toggle-directory PATH' >&2; exit 2 ;;
+esac
+
+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; }
+  sleep 0.1
+done
+tmp=''
+cleanup() { [ -z "$tmp" ] || rm -f "$tmp"; rm -f "$lock/pid"; rmdir "$lock" 2>/dev/null || true; }
+trap cleanup EXIT
+tmp=$(mktemp "${PINS_FILE}.XXXXXX")
+read_pins | "$JQ_BIN" -c --arg field "$field" --arg value "$value" '
+  .[$field] |= (if index($value) then map(select(. != $value)) else . + [$value] end)
+' > "$tmp"
+mv -f "$tmp" "$PINS_FILE"
+tmp=''
+read_pins

package/bin/sesh-shortcuts.sh

@@ -7,11 +7,14 @@ sesh shortcuts
   Enter             Resume the selected session here
   Ctrl-F            Resume the selected session as a fork
   Ctrl-G            Toggle current-directory scope / all sessions
-  Space             Toggle transcript preview
+  Ctrl-P            Toggle transcript preview
+  Option-S          Pin / unpin selected session
+  Option-D          Pin / unpin selected directory
   ?                 Toggle this help
-  Ctrl-X            Delete the selected session
+  Ctrl-X            Delete the selected session (asks to confirm)
   Escape            Exit the picker
 
 Flags: --cwd (current directory only), --limit N (default: all),
-       --archived (include archived), --print (print id instead of resuming)
+       --archived (include archived), --print (print id instead of resuming),
+       --json (with --print, emit JSON)
 HELP

package/bin/sesh.sh

@@ -59,6 +59,7 @@ picker_limit=0
 picker_archived=0
 picker_print=0
 picker_fork=0
+picker_json=0
 picker_query=''
 while [ "$#" -gt 0 ]; do
   case "$1" in
@@ -67,12 +68,14 @@ while [ "$#" -gt 0 ]; do
     --archived) picker_archived=1 ;;
     --print) picker_print=1 ;;
     --fork) picker_fork=1 ;;
+    --json) picker_json=1 ;;
     --query) picker_query=${2:-}; shift ;;
     *) echo "unknown option: $1" >&2; exit 2 ;;
   esac
   shift
 done
 case "$picker_limit" in ''|*[!0-9]*) echo "--limit must be a non-negative integer" >&2; exit 2;; esac
+[ "$picker_json" = 0 ] || [ "$picker_print" = 1 ] || { echo '--json requires --print' >&2; exit 2; }
 
 shell_quote() {
   # Quotes fixed command arguments embedded in fzf's shell action strings.
@@ -87,6 +90,7 @@ q_list=$(shell_quote "$SCRIPT_DIR/sesh-list.sh")
 q_worker=$(shell_quote "$SCRIPT_DIR/sesh-refresh-worker.sh")
 q_preview=$(shell_quote "$SCRIPT_DIR/sesh-preview.sh")
 q_delete=$(shell_quote "$SCRIPT_DIR/sesh-delete.sh")
+q_pins=$(shell_quote "$SCRIPT_DIR/sesh-pins.sh")
 q_shortcuts=$(shell_quote "$SCRIPT_DIR/sesh-shortcuts.sh")
 q_state=$(shell_quote "$state_dir")
 export SESH_LIST="$SCRIPT_DIR/sesh-list.sh"
@@ -106,23 +110,35 @@ trap cleanup EXIT
 trap 'exit 130' HUP INT TERM
 
 cache_cmd="$q_worker render --state-dir $q_state --query {q} --selected-id {6}"
+# fzf's --header is the only place a persistent scope/status line can live
+# without becoming a selectable row, so it is refreshed by transform-header on
+# start, on the 3s poll and after either action that can change it. Order
+# matters: a transform-* action placed AFTER reload/reload-sync in the chain
+# leaves the list empty, so the header is always transformed first.
+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"
 delete_cmd="$q_delete $q_state {2}"
+pin_session_cmd="$q_pins toggle-session {2}"
+pin_directory_cmd="$q_pins toggle-directory {5}"
 
 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 --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" \
-  --bind="ctrl-x:execute($delete_cmd)+reload($cache_cmd)" \
-  --bind="ctrl-g:execute($toggle_cmd)+reload($cache_cmd)" \
-  --bind="change:reload:$cache_cmd" \
-  --bind="start,every(3):reload-sync:$cache_cmd")
+  header_line=$("$SCRIPT_DIR/sesh-list.sh" --header --state-dir "$state_dir" 2>/dev/null || true)
+  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 --track --id-nth=6 --disabled --layout=reverse --info=hidden --prompt='❯ ' \
+    --preview="$preview_cmd" --preview-window='right,50%,wrap,hidden' \
+    --header-first --header="$header_line" \
+    --bind='ctrl-p:toggle-preview' \
+    --bind="$help_bind" \
+    --bind="ctrl-x:execute($delete_cmd)+transform-header($header_cmd)+reload($cache_cmd)" \
+    --bind="ctrl-g:execute($toggle_cmd)+transform-header($header_cmd)+reload($cache_cmd)" \
+    --bind="alt-s:execute-silent($pin_session_cmd)+reload($cache_cmd)" \
+    --bind="alt-d:execute-silent($pin_directory_cmd)+reload($cache_cmd)" \
+    --bind="change:reload:$cache_cmd" \
+    --bind="start,every(3):transform-header($header_cmd)+reload-sync:$cache_cmd")
 status=$?
 set -e
 case "$status" in 0) ;; 1|130) exit 0;; *) echo "sesh: picker failed ($status)" >&2; exit "$status";; esac
@@ -132,13 +148,30 @@ selection=${selection#*$'\n'}
 key=${selection%%$'\n'*}
 selection=${selection#*$'\n'}
 session_id=$(printf '%s\n' "$selection" | cut -f2)
-[ -n "$session_id" ] || continue
+tracking_id=$(printf '%s\n' "$selection" | cut -f6)
+if [ -z "$session_id" ]; then
+  # Enter/Ctrl-F on a directory header or a notice row. Leave a one-shot
+  # message for the reopened picker so the keypress visibly did something,
+  # and keep the query so the user has not lost their place.
+  case "$tracking_id" in
+    hdr:*) printf '%s' 'That row is a directory header, not a session.' > "$state_dir/action-notice" ;;
+    notice:*) printf '%s' 'That row is a notice, not a session; pick a session row.' > "$state_dir/action-notice" ;;
+  esac
+  continue
+fi
 # Dispatch queues a new worker scan and waits for that exact serialized poll.
 # It cannot accept a previously fresh status while the worker owns its lock.
-poll_target=$("$SCRIPT_DIR/sesh-refresh-worker.sh" request --state-dir "$state_dir")
-if ! "$SCRIPT_DIR/sesh-refresh-worker.sh" wait --state-dir "$state_dir" --target "$poll_target" --timeout 12; then
-  echo 'Live state unavailable; retry selection after refresh' >&2
-  continue
+# A --print lookup reads the published snapshot, so it skips the wait entirely
+# and stays usable from scripts without paying a rescan.
+if [ "$picker_print" = 0 ]; then
+  printf 'sesh: refreshing session state…' >&2
+  poll_target=$("$SCRIPT_DIR/sesh-refresh-worker.sh" request --state-dir "$state_dir")
+  if ! "$SCRIPT_DIR/sesh-refresh-worker.sh" wait --state-dir "$state_dir" --target "$poll_target" --timeout 12; then
+    printf '\r\033[K' >&2
+    echo 'sesh: session state unavailable; selection cancelled, retry after refresh' >&2
+    continue
+  fi
+  printf '\r\033[K' >&2
 fi
 record=$("$SESH_JQ" -c --arg sid "$session_id" 'select(.sessionId==$sid)' "$state_dir/snapshot.jsonl")
 [ -n "$record" ] || continue
@@ -146,7 +179,10 @@ cwd=$(printf '%s' "$record" | "$SESH_JQ" -r '.cwd')
 fork=0
 if [ "$picker_fork" = 1 ] || [ "$key" = ctrl-f ]; then fork=1; fi
 if [ "$picker_print" = 1 ]; then
-  if [ "$fork" = 1 ]; then printf '%s\t%s\tfork\n' "$session_id" "$cwd"; else printf '%s\t%s\n' "$session_id" "$cwd"; fi
+  if [ "$picker_json" = 1 ]; then
+    "$SESH_JQ" -cn --arg sessionId "$session_id" --arg cwd "$cwd" --argjson fork "$fork" \
+      '{sessionId: $sessionId, cwd: $cwd, fork: ($fork == 1)}'
+  elif [ "$fork" = 1 ]; then printf '%s\t%s\tfork\n' "$session_id" "$cwd"; else printf '%s\t%s\n' "$session_id" "$cwd"; fi
   exit 0
 fi
 if [ ! -d "$cwd" ]; then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-sesh",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "type": "module",
   "description": "Browse, search, preview and resume opencode sessions from the terminal and the TUI.",
   "license": "MIT",
@@ -36,17 +36,19 @@
   "publishConfig": {
     "access": "public"
   },
+  "packageManager": "bun@1.4.2",
   "engines": {
     "node": ">=20"
   },
   "scripts": {
     "prepare": "husky",
     "postinstall": "bash install.sh --sync-panel || true",
-    "test": "bash tests/sesh.sh",
+    "test": "bash tests/sesh.sh && bash tests/changelog.sh",
+    "test:changelog": "bash tests/changelog.sh",
     "test:picker": "python3 tests/picker.py",
     "typecheck": "tsc -p tsconfig.json",
-    "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"
+    "lint:sh": "for script in bin/*.sh bin/sesh install.sh tests/*.sh scripts/*.sh; do bash -n \"$script\" || exit; done",
+    "prepublishOnly": "bun run test && bun run typecheck"
   },
   "devDependencies": {
     "@commitlint/cli": "^21.2.2",