fpf-cli 1.6.46 → 1.6.48

package/fpf

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 SCRIPT_NAME="fpf"
-SCRIPT_VERSION="1.6.46"
+SCRIPT_VERSION="1.6.48"
 TMP_ROOT="${TMPDIR:-/tmp}/fpf"
 SESSION_TMP_ROOT=""
 HELP_FILE=""
@@ -659,7 +659,24 @@ brew_catalog_state_token() {
     printf "state=unknown"
 }
 
-cache_search_catalog_fingerprint() {
+brew_catalog_state_cache_ttl_seconds() {
+    local ttl="${FPF_BREW_CATALOG_STATE_TTL:-300}"
+
+    if ! [[ "${ttl}" =~ ^[0-9]+$ ]]; then
+        ttl=300
+    fi
+
+    printf "%s" "${ttl}"
+}
+
+brew_catalog_state_cache_scope_hash() {
+    local scope_token
+
+    scope_token="fixtures=${FPF_TEST_FIXTURES:-0};fixture_dir=${FPF_TEST_FIXTURE_DIR:-}"
+    cache_cksum "${scope_token}"
+}
+
+cache_search_catalog_fingerprint_uncached() {
     local manager="$1"
     local command_path=""
     local state_token="state=unknown"
@@ -681,6 +698,42 @@ cache_search_catalog_fingerprint() {
     printf "%s|cmd=%s|%s" "$(cache_fingerprint "${manager}" "" "search-catalog")" "${command_path}" "${state_token}"
 }
 
+cache_search_catalog_fingerprint() {
+    local manager="$1"
+    local state_cache_key=""
+    local state_cache_file=""
+    local state_cache_ttl=0
+    local state_cache_tmp=""
+    local state_cache_scope_hash=""
+
+    if [[ "${manager}" != "brew" ]]; then
+        cache_search_catalog_fingerprint_uncached "${manager}"
+        return
+    fi
+
+    initialize_cache_root
+
+    state_cache_scope_hash="$(brew_catalog_state_cache_scope_hash)"
+    state_cache_key="state/search-catalog-fingerprint/${manager}.${state_cache_scope_hash}.txt"
+    state_cache_file="$(cache_path_for_key "${state_cache_key}")"
+    state_cache_ttl="$(brew_catalog_state_cache_ttl_seconds)"
+
+    if [[ "${state_cache_ttl}" -gt 0 && -s "${state_cache_file}" ]] && cache_is_fresh_with_ttl "${state_cache_key}" "${state_cache_ttl}"; then
+        cat "${state_cache_file}"
+        return
+    fi
+
+    state_cache_tmp="$(mktemp "${SESSION_TMP_ROOT}/search-catalog-fingerprint.XXXXXX")"
+    cache_search_catalog_fingerprint_uncached "${manager}" >"${state_cache_tmp}" || true
+
+    if [[ -s "${state_cache_tmp}" ]]; then
+        cache_store_key_from_file "${state_cache_key}" "${manager}" "${state_cache_tmp}"
+        cat "${state_cache_tmp}"
+    fi
+
+    rm -f "${state_cache_tmp}"
+}
+
 cache_search_catalog_key() {
     local manager="$1"
     local fingerprint="$2"
@@ -3290,6 +3343,7 @@ collect_installed_display_rows() {
 build_dynamic_reload_command() {
     local manager_override="$1"
     local fallback_file="$2"
+    local manager_list_csv="${3:-}"
     local script_path="${BASH_SOURCE[0]}"
     local bypass_query_cache="1"
 
@@ -3299,13 +3353,14 @@ build_dynamic_reload_command() {
         script_path="$(pwd)/${script_path}"
     fi
 
-    printf 'FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=%s FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_FALLBACK_FILE=%q %q --dynamic-reload -- "{q}"' "${bypass_query_cache}" "${manager_override}" "${fallback_file}" "${script_path}"
+    printf 'FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=%s FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_MANAGER_LIST=%q FPF_IPC_FALLBACK_FILE=%q %q --dynamic-reload -- "{q}"' "${bypass_query_cache}" "${manager_override}" "${manager_list_csv}" "${fallback_file}" "${script_path}"
 }
 
 build_dynamic_reload_command_for_query() {
     local manager_override="$1"
     local fallback_file="$2"
-    local query_value="$3"
+    local manager_list_csv="$3"
+    local query_value="$4"
     local script_path="${BASH_SOURCE[0]}"
     local bypass_query_cache="1"
 
@@ -3315,31 +3370,33 @@ build_dynamic_reload_command_for_query() {
         script_path="$(pwd)/${script_path}"
     fi
 
-    printf 'FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=%s FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_FALLBACK_FILE=%q %q --dynamic-reload -- %q' "${bypass_query_cache}" "${manager_override}" "${fallback_file}" "${script_path}" "${query_value}"
+    printf 'FPF_SKIP_INSTALLED_MARKERS=1 FPF_BYPASS_QUERY_CACHE=%s FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_MANAGER_LIST=%q FPF_IPC_FALLBACK_FILE=%q %q --dynamic-reload -- %q' "${bypass_query_cache}" "${manager_override}" "${manager_list_csv}" "${fallback_file}" "${script_path}" "${query_value}"
 }
 
 build_dynamic_reload_ipc_command() {
     local manager_override="$1"
     local fallback_file="$2"
+    local manager_list_csv="${3:-}"
     local script_path="${BASH_SOURCE[0]}"
 
     if [[ "${script_path}" != /* ]]; then
         script_path="$(pwd)/${script_path}"
     fi
 
-    printf 'FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_FALLBACK_FILE=%q %q --ipc-reload -- "{q}"' "${manager_override}" "${fallback_file}" "${script_path}"
+    printf 'FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_MANAGER_LIST=%q FPF_IPC_FALLBACK_FILE=%q %q --ipc-reload -- "{q}"' "${manager_override}" "${manager_list_csv}" "${fallback_file}" "${script_path}"
 }
 
 build_dynamic_query_notify_ipc_command() {
     local manager_override="$1"
     local fallback_file="$2"
+    local manager_list_csv="${3:-}"
     local script_path="${BASH_SOURCE[0]}"
 
     if [[ "${script_path}" != /* ]]; then
         script_path="$(pwd)/${script_path}"
     fi
 
-    printf 'FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_FALLBACK_FILE=%q %q --ipc-query-notify -- "{q}"' "${manager_override}" "${fallback_file}" "${script_path}"
+    printf 'FPF_IPC_MANAGER_OVERRIDE=%q FPF_IPC_MANAGER_LIST=%q FPF_IPC_FALLBACK_FILE=%q %q --ipc-query-notify -- "{q}"' "${manager_override}" "${manager_list_csv}" "${fallback_file}" "${script_path}"
 }
 
 fzf_supports_listen() {
@@ -3444,11 +3501,15 @@ send_fzf_prompt_action() {
 run_dynamic_reload_action() {
     local query="$1"
     local manager_override="${FPF_IPC_MANAGER_OVERRIDE:-}"
+    local manager_list_csv="${FPF_IPC_MANAGER_LIST:-}"
     local fallback_file="${FPF_IPC_FALLBACK_FILE:-}"
     local min_chars="${FPF_RELOAD_MIN_CHARS:-2}"
     local reload_debounce="${FPF_RELOAD_DEBOUNCE:-0.12}"
     local output_file=""
     local detected_manager=""
+    local manager_seen=""
+    local manager_entry=""
+    local -a manager_list_entries=()
     local -a managers=()
 
     if [[ -z "${fallback_file}" || ! -r "${fallback_file}" ]]; then
@@ -3477,6 +3538,25 @@ run_dynamic_reload_action() {
             return 0
         fi
         managers+=("${manager_override}")
+    elif [[ -n "${manager_list_csv}" ]]; then
+        IFS=',' read -r -a manager_list_entries <<<"${manager_list_csv}"
+        for manager_entry in "${manager_list_entries[@]-}"; do
+            manager_entry="$(trim_whitespace "${manager_entry}")"
+            [[ -n "${manager_entry}" ]] || continue
+
+            detected_manager="$(normalize_manager "${manager_entry}")"
+            if ! manager_supported "${detected_manager}" || ! manager_command_ready "${detected_manager}"; then
+                continue
+            fi
+
+            case " ${manager_seen} " in
+                *" ${detected_manager} "*)
+                    continue
+                    ;;
+            esac
+            manager_seen+=" ${detected_manager}"
+            managers+=("${detected_manager}")
+        done
     else
         while IFS= read -r detected_manager; do
             [[ -n "${detected_manager}" ]] || continue
@@ -3506,6 +3586,7 @@ run_dynamic_reload_action() {
 run_ipc_reload_action() {
     local query="$1"
     local manager_override="${FPF_IPC_MANAGER_OVERRIDE:-}"
+    local manager_list_csv="${FPF_IPC_MANAGER_LIST:-}"
     local fallback_file="${FPF_IPC_FALLBACK_FILE:-}"
     local reload_command
     local action_payload
@@ -3519,7 +3600,7 @@ run_ipc_reload_action() {
         manager_supported "${manager_override}" || return 1
     fi
 
-    reload_command="$(build_dynamic_reload_command_for_query "${manager_override}" "${fallback_file}" "${query}")"
+    reload_command="$(build_dynamic_reload_command_for_query "${manager_override}" "${fallback_file}" "${manager_list_csv}" "${query}")"
     action_payload="change-prompt(Search> )+reload(${reload_command})"
     send_fzf_listen_action "${action_payload}"
 }
@@ -3909,8 +3990,11 @@ main() {
     local reload_cmd=""
     local reload_ipc_cmd=""
     local reload_fallback_file="${display_file}"
+    local reload_manager_list=""
     if [[ "${ACTION}" == "search" ]]; then
         if dynamic_reload_enabled "${#managers[@]}"; then
+            reload_manager_list="$(IFS=,; printf "%s" "${managers[*]-}")"
+
             if [[ -n "${query}" ]]; then
                 reload_fallback_file="$(mktemp "${SESSION_TMP_ROOT}/reload-fallback.XXXXXX")"
                 loading_progress_begin "${managers[@]-}"
@@ -3924,9 +4008,9 @@ main() {
                 fi
             fi
 
-            reload_cmd="$(build_dynamic_reload_command "${MANAGER_OVERRIDE}" "${reload_fallback_file}")"
+            reload_cmd="$(build_dynamic_reload_command "${MANAGER_OVERRIDE}" "${reload_fallback_file}" "${reload_manager_list}")"
             if dynamic_reload_use_ipc; then
-                reload_ipc_cmd="$(build_dynamic_query_notify_ipc_command "${MANAGER_OVERRIDE}" "${reload_fallback_file}")"
+                reload_ipc_cmd="$(build_dynamic_query_notify_ipc_command "${MANAGER_OVERRIDE}" "${reload_fallback_file}" "${reload_manager_list}")"
             fi
         fi
     fi

package/package.json

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