fpf-cli 1.6.39 → 1.6.41

package/README.md

@@ -102,5 +102,10 @@ Installed packages are marked with `*` in the result list.
 - Set `FPF_LOADING_INDICATOR=0` to disable the pre-search loading indicator.
 - `FPF_RELOAD_MIN_CHARS`: minimum query length before live reload (default `2`)
 - `FPF_RELOAD_DEBOUNCE`: reload debounce seconds (default `0.12`)
+- `FPF_DYNAMIC_RELOAD_BYPASS_QUERY_CACHE=1`: force uncached reload queries (legacy behavior); default `0` uses query cache during reloads
+- `FPF_ENABLE_QUERY_CACHE`: `auto` (default), `1`, or `0` (`auto` enables query cache for `apt`, `brew`, `pacman`, and `bun`)
+- `FPF_QUERY_CACHE_TTL`: default query-cache TTL seconds for heavy manager caches (default `300`)
+- `FPF_APT_QUERY_CACHE_TTL`, `FPF_BREW_QUERY_CACHE_TTL`, `FPF_PACMAN_QUERY_CACHE_TTL`: per-manager query-cache TTL overrides
+- `FPF_BUN_QUERY_CACHE_TTL`: Bun query-cache TTL (default `900`)
 - `FPF_DISABLE_INSTALLED_CACHE=1` disables installed-package marker cache
 - `FPF_INSTALLED_CACHE_TTL`: installed-package marker cache freshness window in seconds (default `300`, set `0` to always refresh)

package/fpf

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 SCRIPT_NAME="fpf"
-SCRIPT_VERSION="1.6.39"
+SCRIPT_VERSION="1.6.41"
 TMP_ROOT="${TMPDIR:-/tmp}/fpf"
 SESSION_TMP_ROOT=""
 HELP_FILE=""
@@ -25,6 +25,77 @@ query_cache_flags() {
     printf "%s" "query_limit=${FPF_QUERY_RESULT_LIMIT:-0};per_manager_limit=${FPF_QUERY_PER_MANAGER_LIMIT:-40};no_query_limit=${FPF_NO_QUERY_RESULT_LIMIT:-120};no_query_npm_limit=${FPF_NO_QUERY_NPM_LIMIT:-120}"
 }
 
+query_cache_default_enabled_for_manager() {
+    local manager="$1"
+
+    case "${manager}" in
+        apt|brew|pacman|bun)
+            return 0
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+query_cache_ttl_seconds_for_manager() {
+    local manager="$1"
+    local default_ttl="${FPF_QUERY_CACHE_TTL:-300}"
+    local manager_ttl="0"
+
+    if ! [[ "${default_ttl}" =~ ^[0-9]+$ ]]; then
+        default_ttl=300
+    fi
+
+    case "${manager}" in
+        bun)
+            manager_ttl="${FPF_BUN_QUERY_CACHE_TTL:-900}"
+            if ! [[ "${manager_ttl}" =~ ^[0-9]+$ ]]; then
+                manager_ttl=900
+            fi
+            ;;
+        apt)
+            manager_ttl="${FPF_APT_QUERY_CACHE_TTL:-${default_ttl}}"
+            if ! [[ "${manager_ttl}" =~ ^[0-9]+$ ]]; then
+                manager_ttl="${default_ttl}"
+            fi
+            ;;
+        brew)
+            manager_ttl="${FPF_BREW_QUERY_CACHE_TTL:-${default_ttl}}"
+            if ! [[ "${manager_ttl}" =~ ^[0-9]+$ ]]; then
+                manager_ttl="${default_ttl}"
+            fi
+            ;;
+        pacman)
+            manager_ttl="${FPF_PACMAN_QUERY_CACHE_TTL:-${default_ttl}}"
+            if ! [[ "${manager_ttl}" =~ ^[0-9]+$ ]]; then
+                manager_ttl="${default_ttl}"
+            fi
+            ;;
+        *)
+            manager_ttl=0
+            ;;
+    esac
+
+    printf "%s" "${manager_ttl}"
+}
+
+dynamic_reload_query_cache_bypass_value() {
+    local bypass_setting="${FPF_DYNAMIC_RELOAD_BYPASS_QUERY_CACHE:-0}"
+
+    bypass_setting="$(trim_whitespace "${bypass_setting}")"
+    bypass_setting="$(printf "%s" "${bypass_setting}" | tr '[:upper:]' '[:lower:]')"
+
+    case "${bypass_setting}" in
+        1|true|yes|on)
+            printf "1"
+            ;;
+        *)
+            printf "0"
+            ;;
+    esac
+}
+
 log() {
     printf "%s\n" "$*" >&2
 }
@@ -2493,8 +2564,10 @@ manager_search_entries_uncached() {
 manager_search_entries() {
     local manager="$1"
     local query="$2"
-    local query_cache_enabled="${FPF_ENABLE_QUERY_CACHE:-0}"
-    local bun_cache_ttl="${FPF_BUN_QUERY_CACHE_TTL:-900}"
+    local query_cache_enabled="0"
+    local query_cache_setting="${FPF_ENABLE_QUERY_CACHE:-auto}"
+    local query_cache_ttl="0"
+    local bun_cache_ttl="900"
     local bypass_query_cache="${FPF_BYPASS_QUERY_CACHE:-0}"
     local flags
     local key
@@ -2507,19 +2580,28 @@ manager_search_entries() {
     initialize_cache_root
 
     flags="$(query_cache_flags)"
+    query_cache_setting="$(trim_whitespace "${query_cache_setting}")"
+    query_cache_setting="$(printf "%s" "${query_cache_setting}" | tr '[:upper:]' '[:lower:]')"
+    query_cache_ttl="$(query_cache_ttl_seconds_for_manager "${manager}")"
 
-    if ! [[ "${bun_cache_ttl}" =~ ^[0-9]+$ ]]; then
-        bun_cache_ttl=900
+    if [[ "${manager}" == "bun" ]]; then
+        bun_cache_ttl="${query_cache_ttl}"
     fi
 
     case "${bypass_query_cache}" in
         1|true|yes|on)
-            query_cache_enabled="0"
             ;;
         *)
-            if [[ "${manager}" == "bun" ]]; then
-                query_cache_enabled="1"
-            fi
+            case "${query_cache_setting}" in
+                1|true|yes|on)
+                    query_cache_enabled="1"
+                    ;;
+                auto|"")
+                    if query_cache_default_enabled_for_manager "${manager}"; then
+                        query_cache_enabled="1"
+                    fi
+                    ;;
+            esac
             ;;
     esac
 
@@ -2558,7 +2640,7 @@ manager_search_entries() {
     fi
 
     if [[ "${query_cache_enabled}" == "1" && -s "${cache_file}" ]]; then
-        if [[ "${manager}" != "bun" ]] || cache_is_fresh_with_ttl "${key}" "${bun_cache_ttl}"; then
+        if [[ "${query_cache_ttl}" -eq 0 ]] || cache_is_fresh_with_ttl "${key}" "${query_cache_ttl}"; then
             cat "${cache_file}"
             return
         fi
@@ -3125,6 +3207,7 @@ build_dynamic_reload_command() {
     local script_path="${BASH_SOURCE[0]}"
     local min_chars="${FPF_RELOAD_MIN_CHARS:-2}"
     local reload_debounce="${FPF_RELOAD_DEBOUNCE:-0.12}"
+    local bypass_query_cache="1"
 
     if ! [[ "${min_chars}" =~ ^[0-9]+$ ]]; then
         min_chars=2
@@ -3134,14 +3217,16 @@ build_dynamic_reload_command() {
         reload_debounce=0.12
     fi
 
+    bypass_query_cache="$(dynamic_reload_query_cache_bypass_value)"
+
     if [[ "${script_path}" != /* ]]; then
         script_path="$(pwd)/${script_path}"
     fi
 
     if [[ -n "${manager_override}" ]]; then
-        printf 'q={q}; if [ ${#q} -lt %s ]; then cat %q; else sleep %s; FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=1 FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_FALLBACK_FILE=%q %q --feed-search --manager %q -- "$q" 2>/dev/null || cat %q; fi' "${min_chars}" "${fallback_file}" "${reload_debounce}" "${manager_override}" "${fallback_file}" "${script_path}" "${manager_override}" "${fallback_file}"
+        printf 'q={q}; if [ ${#q} -lt %s ]; then cat %q; else sleep %s; FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=%s FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_FALLBACK_FILE=%q %q --feed-search --manager %q -- "$q" 2>/dev/null || cat %q; fi' "${min_chars}" "${fallback_file}" "${reload_debounce}" "${bypass_query_cache}" "${manager_override}" "${fallback_file}" "${script_path}" "${manager_override}" "${fallback_file}"
     else
-        printf 'q={q}; if [ ${#q} -lt %s ]; then cat %q; else sleep %s; FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=1 FPF_IPC_MANAGER_OVERRIDE= FPF_IPC_FALLBACK_FILE=%q %q --feed-search -- "$q" 2>/dev/null || cat %q; fi' "${min_chars}" "${fallback_file}" "${reload_debounce}" "${fallback_file}" "${script_path}" "${fallback_file}"
+        printf 'q={q}; if [ ${#q} -lt %s ]; then cat %q; else sleep %s; FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=%s FPF_IPC_MANAGER_OVERRIDE= FPF_IPC_FALLBACK_FILE=%q %q --feed-search -- "$q" 2>/dev/null || cat %q; fi' "${min_chars}" "${fallback_file}" "${reload_debounce}" "${bypass_query_cache}" "${fallback_file}" "${script_path}" "${fallback_file}"
     fi
 }
 
@@ -3152,6 +3237,7 @@ build_dynamic_reload_command_for_query() {
     local script_path="${BASH_SOURCE[0]}"
     local min_chars="${FPF_RELOAD_MIN_CHARS:-2}"
     local reload_debounce="${FPF_RELOAD_DEBOUNCE:-0.12}"
+    local bypass_query_cache="1"
 
     if ! [[ "${min_chars}" =~ ^[0-9]+$ ]]; then
         min_chars=2
@@ -3161,6 +3247,8 @@ build_dynamic_reload_command_for_query() {
         reload_debounce=0.12
     fi
 
+    bypass_query_cache="$(dynamic_reload_query_cache_bypass_value)"
+
     if [[ "${script_path}" != /* ]]; then
         script_path="$(pwd)/${script_path}"
     fi
@@ -3171,9 +3259,9 @@ build_dynamic_reload_command_for_query() {
     fi
 
     if [[ -n "${manager_override}" ]]; then
-        printf 'sleep %s; FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=1 FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_FALLBACK_FILE=%q %q --feed-search --manager %q -- %q 2>/dev/null || cat %q' "${reload_debounce}" "${manager_override}" "${fallback_file}" "${script_path}" "${manager_override}" "${query_value}" "${fallback_file}"
+        printf 'sleep %s; FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=%s FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_FALLBACK_FILE=%q %q --feed-search --manager %q -- %q 2>/dev/null || cat %q' "${reload_debounce}" "${bypass_query_cache}" "${manager_override}" "${fallback_file}" "${script_path}" "${manager_override}" "${query_value}" "${fallback_file}"
     else
-        printf 'sleep %s; FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=1 FPF_IPC_MANAGER_OVERRIDE= FPF_IPC_FALLBACK_FILE=%q %q --feed-search -- %q 2>/dev/null || cat %q' "${reload_debounce}" "${fallback_file}" "${script_path}" "${query_value}" "${fallback_file}"
+        printf 'sleep %s; FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=%s FPF_IPC_MANAGER_OVERRIDE= FPF_IPC_FALLBACK_FILE=%q %q --feed-search -- %q 2>/dev/null || cat %q' "${reload_debounce}" "${bypass_query_cache}" "${fallback_file}" "${script_path}" "${query_value}" "${fallback_file}"
     fi
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fpf-cli",
-  "version": "1.6.39",
+  "version": "1.6.41",
   "description": "Cross-platform fuzzy package finder powered by fzf",
   "bin": {
     "fpf": "fpf"