fpf-cli 1.6.40 → 1.6.42

package/README.md

@@ -102,6 +102,8 @@ 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_SEARCH_CATALOG_ASYNC_PREWARM`: async warmup for `apt`/`brew` catalog caches during interactive reload/search paths (default `1`, set `0` for synchronous legacy behavior)
 - `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

package/fpf

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 SCRIPT_NAME="fpf"
-SCRIPT_VERSION="1.6.40"
+SCRIPT_VERSION="1.6.42"
 TMP_ROOT="${TMPDIR:-/tmp}/fpf"
 SESSION_TMP_ROOT=""
 HELP_FILE=""
@@ -80,6 +80,22 @@ query_cache_ttl_seconds_for_manager() {
     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
 }
@@ -1021,6 +1037,110 @@ build_brew_catalog_entries() {
         awk -F'\t' '!seen[$1]++'
 }
 
+build_search_catalog_entries_for_manager() {
+    local manager="$1"
+
+    case "${manager}" in
+        apt)
+            build_apt_catalog_entries
+            ;;
+        brew)
+            build_brew_catalog_entries
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+search_catalog_async_prewarm_enabled() {
+    local setting="${FPF_SEARCH_CATALOG_ASYNC_PREWARM:-1}"
+
+    if [[ -z "${FPF_SEARCH_CATALOG_ASYNC_PREWARM+x}" && -n "${FPF_TEST_LOG:-}" ]]; then
+        return 1
+    fi
+
+    setting="$(trim_whitespace "${setting}")"
+    setting="$(printf "%s" "${setting}" | tr '[:upper:]' '[:lower:]')"
+
+    case "${setting}" in
+        0|false|no|off)
+            return 1
+            ;;
+    esac
+
+    case "${ACTION}" in
+        search)
+            return 0
+            ;;
+        feed-search)
+            case "${FPF_SKIP_INSTALLED_MARKERS:-0}" in
+                1|true|yes|on)
+                    return 0
+                    ;;
+            esac
+            ;;
+    esac
+
+    return 1
+}
+
+search_catalog_prewarm_lock_dir() {
+    local manager="$1"
+    printf "%s/state/search-catalog/%s.lock" "${CACHE_ROOT}" "${manager}"
+}
+
+run_search_catalog_prewarm_worker() {
+    local manager="$1"
+    local output_tmp
+    local cache_fingerprint_value
+    local cache_key
+
+    output_tmp="$(mktemp "${SESSION_TMP_ROOT}/search-catalog-prewarm.XXXXXX")"
+    build_search_catalog_entries_for_manager "${manager}" >"${output_tmp}" || true
+
+    if [[ -s "${output_tmp}" ]]; then
+        cache_fingerprint_value="$(cache_search_catalog_fingerprint "${manager}")"
+        cache_key="$(cache_search_catalog_key "${manager}" "${cache_fingerprint_value}")"
+        cache_store_key_from_file "${cache_key}" "${cache_fingerprint_value}" "${output_tmp}"
+    fi
+
+    rm -f "${output_tmp}"
+}
+
+start_search_catalog_prewarm_async() {
+    local manager="$1"
+    local lock_dir
+
+    search_catalog_async_prewarm_enabled || return 0
+    case "${manager}" in
+        apt|brew)
+            ;;
+        *)
+            return 0
+            ;;
+    esac
+
+    initialize_cache_root
+    lock_dir="$(search_catalog_prewarm_lock_dir "${manager}")"
+    mkdir -p "$(dirname "${lock_dir}")"
+
+    if ! mkdir "${lock_dir}" 2>/dev/null; then
+        return 0
+    fi
+
+    if [[ -n "${FPF_TEST_LOG:-}" ]]; then
+        run_search_catalog_prewarm_worker "${manager}" || true
+        rmdir "${lock_dir}" >/dev/null 2>&1 || true
+        return 0
+    fi
+
+    (
+        run_search_catalog_prewarm_worker "${manager}" || true
+        rmdir "${lock_dir}" >/dev/null 2>&1 || true
+    ) >/dev/null 2>&1 &
+}
+
 ensure_search_catalog_cache() {
     local manager="$1"
     local cache_fingerprint_value
@@ -1040,18 +1160,7 @@ ensure_search_catalog_cache() {
 
     output_tmp="$(mktemp "${SESSION_TMP_ROOT}/search-catalog.XXXXXX")"
 
-    case "${manager}" in
-        apt)
-            build_apt_catalog_entries >"${output_tmp}" || true
-            ;;
-        brew)
-            build_brew_catalog_entries >"${output_tmp}" || true
-            ;;
-        *)
-            rm -f "${output_tmp}"
-            return 1
-            ;;
-    esac
+    build_search_catalog_entries_for_manager "${manager}" >"${output_tmp}" || true
 
     if [[ -s "${output_tmp}" ]]; then
         cache_store_key_from_file "${cache_key}" "${cache_fingerprint_value}" "${output_tmp}"
@@ -2372,7 +2481,13 @@ manager_search_entries_uncached() {
 
     case "${manager}" in
         apt)
-            if ensure_search_catalog_cache "${manager}"; then
+            if search_entries_from_catalog_cache "${manager}" "${effective_query}"; then
+                :
+            elif search_catalog_async_prewarm_enabled; then
+                start_search_catalog_prewarm_async "${manager}"
+                apt-cache search -- "${effective_query}" 2>/dev/null |
+                    awk -F' - ' '{ name=$1; desc=$2; gsub(/^[[:space:]]+|[[:space:]]+$/, "", name); if (desc == "") desc="-"; print name "\t" desc }'
+            elif ensure_search_catalog_cache "${manager}"; then
                 search_entries_from_catalog_cache "${manager}" "${effective_query}" || true
             else
                 apt-cache search -- "${effective_query}" 2>/dev/null |
@@ -2434,7 +2549,16 @@ manager_search_entries_uncached() {
                 '
             ;;
         brew)
-            if ensure_search_catalog_cache "${manager}"; then
+            if search_entries_from_catalog_cache "${manager}" "${effective_query}"; then
+                exact_match_entry "${manager}" "${query}"
+            elif search_catalog_async_prewarm_enabled; then
+                start_search_catalog_prewarm_async "${manager}"
+                {
+                    brew search "${effective_query}" 2>/dev/null |
+                        awk 'NF >= 1 { print $1 "\t-" }'
+                    exact_match_entry "${manager}" "${query}"
+                }
+            elif ensure_search_catalog_cache "${manager}"; then
                 {
                     search_entries_from_catalog_cache "${manager}" "${effective_query}" || true
                     exact_match_entry "${manager}" "${query}"
@@ -3191,6 +3315,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
@@ -3200,14 +3325,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
 }
 
@@ -3218,6 +3345,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
@@ -3227,6 +3355,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
@@ -3237,9 +3367,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.40",
+  "version": "1.6.42",
   "description": "Cross-platform fuzzy package finder powered by fzf",
   "bin": {
     "fpf": "fpf"