feat!: add all items to quickfix list if none are selected (#216 )

chore: Update rust to 1.94 (#214 )
fix: Vendor libgit2 + improve checkhealth (#213 )
2026-01-24 12:56:38 -08:00 · 2026-01-08 23:25:45 -08:00 · 2026-01-08 23:03:23 -08:00 · 2026-01-08 21:37:28 -08:00 · 2026-01-08 20:54:42 -08:00 · 2026-01-08 19:38:00 -08:00
41 changed files with 2660 additions and 860 deletions
@@ -32,4 +32,4 @@ jobs:
      - uses: stefanzweifel/git-auto-commit-action@v6
        with:
          commit_author: ${{ steps.last-commit.outputs.author }}
-          commit_message: chore: Update docs for - ${{ steps.last-commit.outputs.message }}
+          commit_message: "chore: Update docs for - ${{ steps.last-commit.outputs.message }}"
@@ -2,7 +2,8 @@ name: Prebuild

 on:
  push:
-    branches: [main, feat/prebuild]
+    branches: [main]
+  pull_request:

 jobs:
  build:
@@ -61,9 +62,6 @@ jobs:

      - name: Install Rust
        run: |
-          # https://github.com/rust-cross/cargo-zigbuild/issues/327
-          rustup toolchain install nightly-2025-02-19
-          rustup default nightly-2025-02-19
          rustup target add ${{ matrix.target }}

      - name: Build for Linux
@@ -96,6 +94,7 @@ jobs:
    name: Release
    needs: build
    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
    permissions:
      contents: write
    steps:
@@ -132,4 +131,45 @@ jobs:
          prerelease: true
          generate_release_notes: false
          body: |
-           Nightly release from commit: ${{ github.sha }}
+            Nightly release from commit: ${{ github.sha }}
+
+  comment-on-pr:
+    name: Comment on PR
+    needs: build
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Get short SHA
+        id: vars
+        run: echo "short_sha=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
+
+      - name: Find existing comment
+        uses: peter-evans/find-comment@v3
+        id: find-comment
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: "github-actions[bot]"
+          body-includes: "<!-- fff-nvim-build-comment -->"
+
+      - name: Create or update PR comment
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: ${{ steps.find-comment.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          edit-mode: replace
+          body: |
+            <!-- fff-nvim-build-comment -->
+            ## 🔨 Build Artifacts for your PR
+
+            You can test the prebuilt binaries if you use lazy.nvim right now.
+
+            ```lua
+            {
+              "dmtrKovalenko/fff.nvim",
+              tag = "${{ steps.vars.outputs.short_sha }}",
+            }
+            ```
+            ---
+            *Built from ${{ github.sha }}*
@@ -340,6 +340,27 @@ dependencies = [
 "powerfmt",
 ]

+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -391,6 +412,7 @@ dependencies = [
 "chrono",
 "criterion",
 "ctrlc",
+ "dirs",
 "git2",
 "glidesort",
 "heed",
@@ -401,7 +423,6 @@ dependencies = [
 "notify",
 "notify-debouncer-full",
 "once_cell",
- "openssl",
 "pathdiff",
 "rand",
 "rayon",
@@ -423,21 +444,6 @@ dependencies = [
 "windows-sys 0.60.2",
 ]

-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -837,6 +843,16 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "libredox"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+dependencies = [
+ "bitflags 2.9.1",
+ "libc",
+]
+
 [[package]]
 name = "libssh2-sys"
 version = "0.3.1"
@@ -1094,32 +1110,6 @@ version = "11.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"

-[[package]]
-name = "openssl"
-version = "0.10.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
-dependencies = [
- "bitflags 2.9.1",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "openssl-probe"
 version = "0.1.6"
@@ -1148,6 +1138,12 @@ dependencies = [
 "vcpkg",
 ]

+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -1388,6 +1384,17 @@ dependencies = [
 "bitflags 2.9.1",
 ]

+[[package]]
+name = "redox_users"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom 0.2.16",
+ "libredox",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "regex"
 version = "1.11.1"
@@ -2008,6 +2015,15 @@ dependencies = [
 "windows-link",
 ]

+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
@@ -2026,6 +2042,21 @@ dependencies = [
 "windows-targets 0.53.3",
 ]

+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -2059,6 +2090,12 @@ dependencies = [
 "windows_x86_64_msvc 0.53.0",
 ]

+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -2071,6 +2108,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"

+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -2083,6 +2126,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"

+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -2107,6 +2156,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"

+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
@@ -2119,6 +2174,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"

+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -2131,6 +2192,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"

+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -2143,6 +2210,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"

+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -31,7 +31,11 @@ ahash = "0.8"
 blake3 = "1.8.2"
 chrono = { version = "0.4", features = ["serde"] }
 ctrlc = "3.4.2"
-git2 = "0.20.2"
+dirs = "5.0"
+git2 = { version = "0.20.2", features = [
+  "vendored-openssl",
+  "vendored-libgit2",
+] }
 glidesort = "0.1"
 heed = "0.22.0"
 ignore = "0.4.22"
@@ -42,7 +46,6 @@ neo_frizbee = { version = "0.7.1" }
 notify = "8.1.0"
 notify-debouncer-full = "0.6"
 once_cell = "1.20.2"
-openssl = { version = "0.10", features = ["vendored"] }
 pathdiff = "0.2.1"
 rayon = "1.8.0"
 serde = { version = "1.0", features = ["derive"] }
@@ -80,7 +80,7 @@ FFF.nvim requires:
 ```lua
 vim.pack.add({ 'https://github.com/dmtrKovalenko/fff.nvim' })

-nvim.create_autocmd('PackChanged', {
+vim.api.nvim_create_autocmd('PackChanged', {
  callback = function(event)
    if event.data.updated then
      require('fff.download').download_or_build_binary()
@@ -123,6 +123,7 @@ require('fff').setup({
      prompt_position = 'bottom', -- or 'top'
      preview_position = 'right', -- or 'left', 'right', 'top', 'bottom'
      preview_size = 0.5,
+      show_scrollbar = true, -- Show scrollbar for pagination
    },
    preview = {
      enabled = true,
@@ -132,7 +133,6 @@ require('fff').setup({
      imagemagick_info_format_str = '%m: %wx%h, %[colorspace], %q-bit',
      line_numbers = false,
      wrap_lines = false,
-      show_file_info = true,
      filetypes = {
        svg = { wrap_lines = true },
        markdown = { wrap_lines = true },
@@ -153,6 +153,9 @@ require('fff').setup({
      toggle_debug = '<F2>',
      -- goes to the previous query in history
      cycle_previous_query = '<C-Up>',
+      -- multi-select keymaps for quickfix
+      toggle_select = '<Tab>',
+      send_to_quickfix = '<C-q>',
    },
    hl = {
      border = 'FloatBorder',
@@ -165,6 +168,11 @@ require('fff').setup({
      frecency = 'Number',
      debug = 'Comment',
      combo_header = 'Number',
+      scrollbar = 'Comment', -- Highlight for scrollbar thumb (track uses border)
+      directory_path = 'Comment', -- Highlight for directory path in file list
+      -- Multi-select highlights
+      selected = 'FFFSelected',
+      selected_active = 'FFFSelectedActive',
      -- Git text highlights for file names
      git_staged = 'FFFGitStaged',
      git_modified = 'FFFGitModified',
@@ -187,7 +195,7 @@ require('fff').setup({
      git_sign_untracked_selected = 'FFFGitSignUntrackedSelected',
      git_sign_ignored_selected = 'FFFGitSignIgnoredSelected',
    },
-    -- Store file open frecency 
+    -- Store file open frecency
    frecency = {
      enabled = true,
      db_path = vim.fn.stdpath('cache') .. '/fff_nvim',
@@ -197,11 +205,16 @@ require('fff').setup({
      enabled = true,
      db_path = vim.fn.stdpath('data') .. '/fff_queries',
      min_combo_count = 3, -- file will get a boost if it was selected 3 in a row times per specific query
-      combo_boost_score_multiplier = 100, -- Score multiplier for combo matches 
+      combo_boost_score_multiplier = 100, -- Score multiplier for combo matches
+    },
+    -- Git integration
+    git = {
+      status_text_color = false, -- Apply git status colors to filename text (default: false, only sign column)
    },
    debug = {
      enabled = false, -- Set to true to show scores in the UI
      show_scores = false,
+      show_file_info = false, -- Show file info panel in preview
    },
    logging = {
      enabled = true,
@@ -236,7 +249,6 @@ FFF.nvim provides several commands for interacting with the file picker:
 - `:FFFDebug [on|off|toggle]` - Toggle debug scores display
 - `:FFFOpenLog` - Open the FFF log file in a new tab

-
 #### Multiline Paste Support

 The input field automatically handles multiline clipboard content by joining all lines into a single search query. This is particularly useful when copying file paths from terminal output.
@@ -249,6 +261,67 @@ Toggle scoring information display:
 - Use `:FFFDebug` command
 - Enable by default with `debug.show_scores = true`

+#### Multi-Select and Quickfix Integration
+
+Select multiple files and send them to Neovim's quickfix list (keymaps are configurable):
+
+- `<Tab>` - Toggle selection for the current file (shows thick border `▊` in signcolumn)
+- `<C-q>` - Send selected files to quickfix list and close picker
+
+#### Git Status Highlighting
+
+FFF integrates with git to show file status through sign column indicators (enabled by default) and optional filename text coloring.
+
+**Sign Column Indicators** (enabled by default) - Border characters shown in the sign column:
+```lua
+hl = {
+  git_sign_staged = 'FFFGitSignStaged',
+  git_sign_modified = 'FFFGitSignModified',
+  git_sign_deleted = 'FFFGitSignDeleted',
+  git_sign_renamed = 'FFFGitSignRenamed',
+  git_sign_untracked = 'FFFGitSignUntracked',
+  git_sign_ignored = 'FFFGitSignIgnored',
+}
+```
+
+**Text Highlights** (opt-in) - Apply colors to filenames based on git status:
+
+To enable git status text coloring, set `git.status_text_color = true`:
+```lua
+require('fff').setup({
+  git = {
+    status_text_color = true, -- Enable git status colors on filename text
+  },
+  hl = {
+    git_staged = 'FFFGitStaged',       -- Files staged for commit
+    git_modified = 'FFFGitModified',   -- Modified unstaged files
+    git_deleted = 'FFFGitDeleted',     -- Deleted files
+    git_renamed = 'FFFGitRenamed',     -- Renamed files
+    git_untracked = 'FFFGitUntracked', -- New untracked files
+    git_ignored = 'FFFGitIgnored',     -- Git-ignored files
+  }
+})
+```
+
+The plugin provides sensible default highlight groups that link to common git highlight groups (e.g., GitSignsAdd, GitSignsChange). You can override these with your own custom highlight groups to match your colorscheme.
+
+**Example - Custom Bright Colors for Text:**
+```lua
+vim.api.nvim_set_hl(0, 'CustomGitModified', { fg = '#FFA500' })
+vim.api.nvim_set_hl(0, 'CustomGitUntracked', { fg = '#00FF00' })
+
+require('fff').setup({
+  git = {
+    status_text_color = true,
+  },
+  hl = {
+    git_modified = 'CustomGitModified',
+    git_untracked = 'CustomGitUntracked',
+  }
+})
+```
+
+
 ### Troubleshooting

 #### Health Check
@@ -1,9 +1,9 @@
 use criterion::{BenchmarkId, Criterion, black_box, criterion_group, criterion_main};
 use fff_nvim::FILE_PICKER;
-use fff_nvim::file_picker::FilePicker;
+use fff_nvim::file_picker::{FilePicker, FuzzySearchOptions};
+use fff_nvim::types::PaginationArgs;
 use std::path::PathBuf;
 use std::time::Duration;
-use tracing_subscriber;

 /// Initialize tracing to output to console
 fn init_tracing() {
@@ -231,10 +231,19 @@ fn bench_search_queries(c: &mut Criterion) {
                let results = FilePicker::fuzzy_search(
                    black_box(&files),
                    black_box(query),
-                    black_box(100),
-                    black_box(4),
-                    black_box(None),
-                    black_box(false),
+                    FuzzySearchOptions {
+                        max_threads: 4,
+                        current_file: None,
+
+                        project_path: None,
+                        last_same_query_match: None,
+                        combo_boost_score_multiplier: 100,
+                        min_combo_count: 3,
+                        pagination: PaginationArgs {
+                            offset: 0,
+                            limit: 100,
+                        },
+                    },
                );
                results.total_matched
            });
@@ -269,10 +278,19 @@ fn bench_search_thread_scaling(c: &mut Criterion) {
                    let results = FilePicker::fuzzy_search(
                        black_box(&files),
                        black_box(query),
-                        black_box(100),
-                        black_box(threads),
-                        black_box(None),
-                        black_box(false),
+                        FuzzySearchOptions {
+                            max_threads: threads,
+                            current_file: None,
+
+                            project_path: None,
+                            last_same_query_match: None,
+                            combo_boost_score_multiplier: 100,
+                            min_combo_count: 3,
+                            pagination: PaginationArgs {
+                                offset: 0,
+                                limit: 100,
+                            },
+                        },
                    );
                    results.total_matched
                });
@@ -305,10 +323,19 @@ fn bench_search_result_limits(c: &mut Criterion) {
                let results = FilePicker::fuzzy_search(
                    black_box(&files),
                    black_box(query),
-                    black_box(limit),
-                    black_box(4),
-                    black_box(None),
-                    black_box(false),
+                    FuzzySearchOptions {
+                        max_threads: 4,
+                        current_file: None,
+
+                        project_path: None,
+                        last_same_query_match: None,
+                        combo_boost_score_multiplier: 100,
+                        min_combo_count: 3,
+                        pagination: PaginationArgs {
+                            offset: 0,
+                            limit: limit,
+                        },
+                    },
                );
                results.total_matched
            });
@@ -353,10 +380,19 @@ fn bench_search_scalability(c: &mut Criterion) {
                let results = FilePicker::fuzzy_search(
                    black_box(subset),
                    black_box(query),
-                    black_box(100),
-                    black_box(4),
-                    black_box(None),
-                    black_box(false),
+                    FuzzySearchOptions {
+                        max_threads: 4,
+                        current_file: None,
+
+                        project_path: None,
+                        last_same_query_match: None,
+                        combo_boost_score_multiplier: 100,
+                        min_combo_count: 3,
+                        pagination: PaginationArgs {
+                            offset: 0,
+                            limit: 100,
+                        },
+                    },
                );
                results.total_matched
            });
@@ -387,10 +423,19 @@ fn bench_search_ordering(c: &mut Criterion) {
            let results = FilePicker::fuzzy_search(
                black_box(&files),
                black_box(query),
-                black_box(100),
-                black_box(4),
-                black_box(None),
-                black_box(false),
+                FuzzySearchOptions {
+                    max_threads: 4,
+                    current_file: None,
+
+                    project_path: None,
+                    last_same_query_match: None,
+                    combo_boost_score_multiplier: 100,
+                    min_combo_count: 3,
+                    pagination: PaginationArgs {
+                        offset: 0,
+                        limit: 100,
+                    },
+                },
            );
            results.total_matched
        });
@@ -402,10 +447,19 @@ fn bench_search_ordering(c: &mut Criterion) {
            let results = FilePicker::fuzzy_search(
                black_box(&files),
                black_box(query),
-                black_box(100),
-                black_box(4),
-                black_box(None),
-                black_box(true),
+                FuzzySearchOptions {
+                    max_threads: 4,
+                    current_file: None,
+
+                    project_path: None,
+                    last_same_query_match: None,
+                    combo_boost_score_multiplier: 100,
+                    min_combo_count: 3,
+                    pagination: PaginationArgs {
+                        offset: 0,
+                        limit: 100,
+                    },
+                },
            );
            results.total_matched
        });
@@ -417,10 +471,19 @@ fn bench_search_ordering(c: &mut Criterion) {
            let results = FilePicker::fuzzy_search(
                black_box(&files),
                black_box("mod"),
-                black_box(500),
-                black_box(4),
-                black_box(None),
-                black_box(false),
+                FuzzySearchOptions {
+                    max_threads: 4,
+                    current_file: None,
+
+                    project_path: None,
+                    last_same_query_match: None,
+                    combo_boost_score_multiplier: 100,
+                    min_combo_count: 3,
+                    pagination: PaginationArgs {
+                        offset: 0,
+                        limit: 500,
+                    },
+                },
            );
            results.total_matched
        });
@@ -431,10 +494,19 @@ fn bench_search_ordering(c: &mut Criterion) {
            let results = FilePicker::fuzzy_search(
                black_box(&files),
                black_box("mod"),
-                black_box(500),
-                black_box(4),
-                black_box(None),
-                black_box(true),
+                FuzzySearchOptions {
+                    max_threads: 4,
+                    current_file: None,
+
+                    project_path: None,
+                    last_same_query_match: None,
+                    combo_boost_score_multiplier: 100,
+                    min_combo_count: 3,
+                    pagination: PaginationArgs {
+                        offset: 0,
+                        limit: 500,
+                    },
+                },
            );
            results.total_matched
        });
@@ -446,10 +518,19 @@ fn bench_search_ordering(c: &mut Criterion) {
            let results = FilePicker::fuzzy_search(
                black_box(&files),
                black_box("controller"),
-                black_box(10),
-                black_box(4),
-                black_box(None),
-                black_box(false),
+                FuzzySearchOptions {
+                    max_threads: 4,
+                    current_file: None,
+
+                    project_path: None,
+                    last_same_query_match: None,
+                    combo_boost_score_multiplier: 100,
+                    min_combo_count: 3,
+                    pagination: PaginationArgs {
+                        offset: 0,
+                        limit: 10,
+                    },
+                },
            );
            results.total_matched
        });
@@ -460,10 +541,110 @@ fn bench_search_ordering(c: &mut Criterion) {
            let results = FilePicker::fuzzy_search(
                black_box(&files),
                black_box("controller"),
-                black_box(10),
-                black_box(4),
-                black_box(None),
-                black_box(true),
+                FuzzySearchOptions {
+                    max_threads: 4,
+                    current_file: None,
+
+                    project_path: None,
+                    last_same_query_match: None,
+                    combo_boost_score_multiplier: 100,
+                    min_combo_count: 3,
+                    pagination: PaginationArgs {
+                        offset: 0,
+                        limit: 10,
+                    },
+                },
+            );
+            results.total_matched
+        });
+    });
+
+    group.finish();
+}
+
+/// Benchmark pagination: first page vs deep page
+fn bench_pagination_performance(c: &mut Criterion) {
+    let files = match setup_once() {
+        Ok(files) => files,
+        Err(e) => {
+            eprintln!("⚠ Skipping pagination benchmarks: {}", e);
+            return;
+        }
+    };
+
+    let mut group = c.benchmark_group("pagination");
+    group.sample_size(100);
+
+    let query = "mod";
+    let page_size = 40;
+
+    // Benchmark first page (uses partial sort optimization)
+    group.bench_function("page_0_size_40", |b| {
+        b.iter(|| {
+            let results = FilePicker::fuzzy_search(
+                black_box(&files),
+                black_box(query),
+                FuzzySearchOptions {
+                    max_threads: 4,
+                    current_file: None,
+
+                    project_path: None,
+                    last_same_query_match: None,
+                    combo_boost_score_multiplier: 100,
+                    min_combo_count: 3,
+                    pagination: PaginationArgs {
+                        offset: 0,
+                        limit: page_size,
+                    },
+                },
+            );
+            results.total_matched
+        });
+    });
+
+    // Benchmark 10th page (requires full sort, no optimization)
+    group.bench_function("page_10_size_40", |b| {
+        b.iter(|| {
+            let results = FilePicker::fuzzy_search(
+                black_box(&files),
+                black_box(query),
+                FuzzySearchOptions {
+                    max_threads: 4,
+                    current_file: None,
+
+                    project_path: None,
+                    last_same_query_match: None,
+                    combo_boost_score_multiplier: 100,
+                    min_combo_count: 3,
+                    pagination: PaginationArgs {
+                        offset: 10,
+                        limit: page_size,
+                    },
+                },
+            );
+            results.total_matched
+        });
+    });
+
+    // Benchmark 50th page (even deeper pagination)
+    group.bench_function("page_50_size_40", |b| {
+        b.iter(|| {
+            let results = FilePicker::fuzzy_search(
+                black_box(&files),
+                black_box(query),
+                FuzzySearchOptions {
+                    max_threads: 4,
+                    current_file: None,
+
+                    project_path: None,
+                    last_same_query_match: None,
+                    combo_boost_score_multiplier: 100,
+                    min_combo_count: 3,
+                    pagination: PaginationArgs {
+                        offset: 50,
+                        limit: page_size,
+                    },
+                },
            );
            results.total_matched
        });
@@ -480,6 +661,7 @@ criterion_group!(
    bench_search_result_limits,
    bench_search_scalability,
    bench_search_ordering,
+    bench_pagination_performance,
 );

 criterion_main!(benches);
@@ -1,5 +1,5 @@
 use criterion::{BenchmarkId, Criterion, black_box, criterion_group, criterion_main};
-use fff_nvim::query_tracker::{QueryMatchEntry, QueryTracker};
+use fff_nvim::query_tracker::QueryTracker;
 use rand::distributions::Alphanumeric;
 use rand::prelude::*;
 use std::path::PathBuf;
@@ -13,7 +13,16 @@ fn generate_random_string(len: usize) -> String {
        .collect()
 }

-fn generate_test_data(num_entries: usize) -> Vec<QueryMatchEntry> {
+// Test data structure for benchmarks
+struct TestQueryEntry {
+    query: String,
+    project_path: PathBuf,
+    file_path: PathBuf,
+    open_count: u32,
+    last_opened: u64,
+}
+
+fn generate_test_data(num_entries: usize) -> Vec<TestQueryEntry> {
    let mut rng = thread_rng();
    let mut entries = Vec::with_capacity(num_entries);
    let now = SystemTime::now()
@@ -72,7 +81,7 @@ fn generate_test_data(num_entries: usize) -> Vec<QueryMatchEntry> {
        );
        let file_path = PathBuf::from(format!("{}/src/{}", project_path, file_name));

-        let entry = QueryMatchEntry {
+        let entry = TestQueryEntry {
            query: query.into(),
            project_path: PathBuf::from(project_path),
            file_path,
@@ -86,7 +95,7 @@ fn generate_test_data(num_entries: usize) -> Vec<QueryMatchEntry> {
    entries
 }

-fn setup_tracker_with_data(entries: &[QueryMatchEntry]) -> (QueryTracker, PathBuf) {
+fn setup_tracker_with_data(entries: &[TestQueryEntry]) -> (QueryTracker, PathBuf) {
    use std::time::{SystemTime, UNIX_EPOCH};
    let timestamp = SystemTime::now()
        .duration_since(UNIX_EPOCH)
@@ -144,88 +153,6 @@ fn bench_track_query_completion(c: &mut Criterion) {
    group.finish();
 }

-fn bench_get_query_boost(c: &mut Criterion) {
-    let mut group = c.benchmark_group("get_query_boost");
-
-    for size in &[100, 1000, 10000] {
-        let entries = generate_test_data(*size);
-        let (tracker, temp_dir) = setup_tracker_with_data(&entries);
-
-        group.bench_with_input(BenchmarkId::new("entries", size), size, |b, _| {
-            let mut rng = thread_rng();
-            b.iter(|| {
-                let entry = entries.choose(&mut rng).unwrap();
-                let boost = black_box(
-                    tracker
-                        .get_query_boost(
-                            black_box(&entry.query),
-                            black_box(&entry.project_path),
-                            black_box(&entry.file_path),
-                        )
-                        .unwrap(),
-                );
-                black_box(boost);
-            });
-        });
-
-        drop(tracker);
-        cleanup_tracker_dir(temp_dir);
-    }
-
-    group.finish();
-}
-
-fn bench_get_query_history(c: &mut Criterion) {
-    let mut group = c.benchmark_group("get_query_history");
-
-    for size in &[100, 1000, 10000] {
-        let entries = generate_test_data(*size);
-        let (tracker, temp_dir) = setup_tracker_with_data(&entries);
-
-        group.bench_with_input(BenchmarkId::new("entries", size), size, |b, _| {
-            let mut rng = thread_rng();
-            b.iter(|| {
-                let project = &entries.choose(&mut rng).unwrap().project_path;
-                let history = black_box(
-                    tracker
-                        .get_query_history(black_box(project), black_box(50))
-                        .unwrap(),
-                );
-                black_box(history);
-            });
-        });
-
-        drop(tracker);
-        cleanup_tracker_dir(temp_dir);
-    }
-
-    group.finish();
-}
-
-fn bench_cleanup_old_entries(c: &mut Criterion) {
-    let mut group = c.benchmark_group("cleanup_old_entries");
-
-    for size in &[100, 1000, 10000] {
-        group.bench_with_input(BenchmarkId::new("entries", size), size, |b, &size| {
-            b.iter_batched(
-                || {
-                    let entries = generate_test_data(size);
-                    setup_tracker_with_data(&entries)
-                },
-                |(mut tracker, temp_dir)| {
-                    let cleaned = black_box(tracker.cleanup_old_entries().unwrap());
-                    black_box(cleaned);
-                    drop(tracker);
-                    cleanup_tracker_dir(temp_dir);
-                },
-                criterion::BatchSize::LargeInput,
-            );
-        });
-    }
-
-    group.finish();
-}
-
 fn bench_realistic_workload(c: &mut Criterion) {
    let mut group = c.benchmark_group("realistic_workload");

@@ -241,17 +168,17 @@ fn bench_realistic_workload(c: &mut Criterion) {
                // Simulate realistic usage: 70% lookups, 25% tracking, 5% history
                match rng.gen_range(0..100) {
                    0..70 => {
-                        // Query boost lookup (most common operation)
-                        let boost = black_box(
+                        // Query entry lookup (most common operation)
+                        let entry_result = black_box(
                            tracker
-                                .get_query_boost(
+                                .get_last_query_entry(
                                    black_box(&entry.query),
                                    black_box(&entry.project_path),
-                                    black_box(&entry.file_path),
+                                    3,
                                )
                                .unwrap(),
                        );
-                        black_box(boost);
+                        black_box(entry_result);
                    }
                    70..95 => {
                        // Track completion (when user opens file)
@@ -266,10 +193,10 @@ fn bench_realistic_workload(c: &mut Criterion) {
                        );
                    }
                    95..100 => {
-                        // Get history (least common)
+                        // Get historical query (least common)
                        let history = black_box(
                            tracker
-                                .get_query_history(black_box(&entry.project_path), black_box(20))
+                                .get_historical_query(black_box(&entry.project_path), black_box(5))
                                .unwrap(),
                        );
                        black_box(history);
@@ -289,9 +216,9 @@ fn bench_realistic_workload(c: &mut Criterion) {
 criterion_group!(
    benches,
    bench_track_query_completion,
-    bench_get_query_boost,
-    bench_get_query_history,
-    bench_cleanup_old_entries,
+    // Commented out - methods removed/changed in refactor:
+    // bench_get_query_boost,
+    // bench_cleanup_old_entries,
    bench_realistic_workload
 );
 criterion_main!(benches);
@@ -1,4 +1,4 @@
-*fff.nvim.txt*        For Neovim >= 0.10.0        Last change: 2025 October 17
+*fff.nvim.txt*        For Neovim >= 0.10.0        Last change: 2026 January 09

 ==============================================================================
 Table of Contents                                 *fff.nvim-table-of-contents*
@@ -86,10 +86,10 @@ VIM.PACK
 >lua
    vim.pack.add({ 'https://github.com/dmtrKovalenko/fff.nvim' })
    
-    nvim.create_autocmd('PackChanged', {
+    vim.api.nvim_create_autocmd('PackChanged', {
      callback = function(event)
-        if event.data.updated then 
-          require('fff.download').download_or_build_binary() 
+        if event.data.updated then
+          require('fff.download').download_or_build_binary()
        end
      end,
    })
@@ -128,11 +128,10 @@ all available options:
        layout = {
          height = 0.8,
          width = 0.8,
-          row = nil, -- ratio (0.0 = top edge, 1.0 = bottom edge) nil is centered
-          col = nil, -- ratio (0.0 = left edge, 1.0 = right edge) nil is centered
          prompt_position = 'bottom', -- or 'top'
          preview_position = 'right', -- or 'left', 'right', 'top', 'bottom'
          preview_size = 0.5,
+          show_scrollbar = true, -- Show scrollbar for pagination
        },
        preview = {
          enabled = true,
@@ -142,7 +141,6 @@ all available options:
          imagemagick_info_format_str = '%m: %wx%h, %[colorspace], %q-bit',
          line_numbers = false,
          wrap_lines = false,
-          show_file_info = true,
          filetypes = {
            svg = { wrap_lines = true },
            markdown = { wrap_lines = true },
@@ -155,11 +153,17 @@ all available options:
          select_split = '<C-s>',
          select_vsplit = '<C-v>',
          select_tab = '<C-t>',
+          -- you can assign multiple keys to any action
          move_up = { '<Up>', '<C-p>' },
          move_down = { '<Down>', '<C-n>' },
          preview_scroll_up = '<C-u>',
          preview_scroll_down = '<C-d>',
          toggle_debug = '<F2>',
+          -- goes to the previous query in history
+          cycle_previous_query = '<C-Up>',
+          -- multi-select keymaps for quickfix
+          toggle_select = '<Tab>',
+          send_to_quickfix = '<C-q>',
        },
        hl = {
          border = 'FloatBorder',
@@ -171,14 +175,54 @@ all available options:
          active_file = 'Visual',
          frecency = 'Number',
          debug = 'Comment',
+          combo_header = 'Number',
+          scrollbar = 'Comment', -- Highlight for scrollbar thumb (track uses border)
+          directory_path = 'Comment', -- Highlight for directory path in file list
+          -- Multi-select highlights
+          selected = 'FFFSelected',
+          selected_active = 'FFFSelectedActive',
+          -- Git text highlights for file names
+          git_staged = 'FFFGitStaged',
+          git_modified = 'FFFGitModified',
+          git_deleted = 'FFFGitDeleted',
+          git_renamed = 'FFFGitRenamed',
+          git_untracked = 'FFFGitUntracked',
+          git_ignored = 'FFFGitIgnored',
+          -- Git sign/border highlights
+          git_sign_staged = 'FFFGitSignStaged',
+          git_sign_modified = 'FFFGitSignModified',
+          git_sign_deleted = 'FFFGitSignDeleted',
+          git_sign_renamed = 'FFFGitSignRenamed',
+          git_sign_untracked = 'FFFGitSignUntracked',
+          git_sign_ignored = 'FFFGitSignIgnored',
+          -- Git sign selected highlights
+          git_sign_staged_selected = 'FFFGitSignStagedSelected',
+          git_sign_modified_selected = 'FFFGitSignModifiedSelected',
+          git_sign_deleted_selected = 'FFFGitSignDeletedSelected',
+          git_sign_renamed_selected = 'FFFGitSignRenamedSelected',
+          git_sign_untracked_selected = 'FFFGitSignUntrackedSelected',
+          git_sign_ignored_selected = 'FFFGitSignIgnoredSelected',
        },
+        -- Store file open frecency
        frecency = {
          enabled = true,
          db_path = vim.fn.stdpath('cache') .. '/fff_nvim',
        },
+        -- Store successfully opened queries with respective matches
+        history = {
+          enabled = true,
+          db_path = vim.fn.stdpath('data') .. '/fff_queries',
+          min_combo_count = 3, -- file will get a boost if it was selected 3 in a row times per specific query
+          combo_boost_score_multiplier = 100, -- Score multiplier for combo matches
+        },
+        -- Git integration
+        git = {
+          status_text_color = false, -- Apply git status colors to filename text (default: false, only sign column)
+        },
        debug = {
          enabled = false, -- Set to true to show scores in the UI
          show_scores = false,
+          show_file_info = false, -- Show file info panel in preview
        },
        logging = {
          enabled = true,
@@ -217,19 +261,6 @@ FFF.nvim provides several commands for interacting with the file picker:
 - `:FFFOpenLog` - Open the FFF log file in a new tab


-MULTIPLE KEY BINDINGS
-
-You can assign multiple key combinations to the same action:
-
->lua
-    keymaps = {
-      move_up = { '<Up>', '<C-p>', '<C-k>' },  -- Three ways to move up
-      close = { '<Esc>', '<C-c>' },            -- Two ways to close
-      select = '<CR>',                         -- Single binding still works
-    }
-<
-
-
 MULTILINE PASTE SUPPORT

 The input field automatically handles multiline clipboard content by joining
@@ -246,6 +277,76 @@ Toggle scoring information display:
 - Enable by default with `debug.show_scores = true`


+MULTI-SELECT AND QUICKFIX INTEGRATION
+
+Select multiple files and send them to Neovim’s quickfix list (keymaps are
+configurable):
+
+- `<Tab>` - Toggle selection for the current file (shows thick border `▊` in signcolumn)
+- `<C-q>` - Send selected files to quickfix list and close picker
+
+
+GIT STATUS HIGHLIGHTING
+
+FFF integrates with git to show file status through sign column indicators
+(enabled by default) and optional filename text coloring.
+
+**Sign Column Indicators** (enabled by default) - Border characters shown in
+the sign column:
+
+>lua
+    hl = {
+      git_sign_staged = 'FFFGitSignStaged',
+      git_sign_modified = 'FFFGitSignModified',
+      git_sign_deleted = 'FFFGitSignDeleted',
+      git_sign_renamed = 'FFFGitSignRenamed',
+      git_sign_untracked = 'FFFGitSignUntracked',
+      git_sign_ignored = 'FFFGitSignIgnored',
+    }
+<
+
+**Text Highlights** (opt-in) - Apply colors to filenames based on git status:
+
+To enable git status text coloring, set `git.status_text_color = true`:
+
+>lua
+    require('fff').setup({
+      git = {
+        status_text_color = true, -- Enable git status colors on filename text
+      },
+      hl = {
+        git_staged = 'FFFGitStaged',       -- Files staged for commit
+        git_modified = 'FFFGitModified',   -- Modified unstaged files
+        git_deleted = 'FFFGitDeleted',     -- Deleted files
+        git_renamed = 'FFFGitRenamed',     -- Renamed files
+        git_untracked = 'FFFGitUntracked', -- New untracked files
+        git_ignored = 'FFFGitIgnored',     -- Git-ignored files
+      }
+    })
+<
+
+The plugin provides sensible default highlight groups that link to common git
+highlight groups (e.g., GitSignsAdd, GitSignsChange). You can override these
+with your own custom highlight groups to match your colorscheme.
+
+**Example - Custom Bright Colors for Text:**
+
+>lua
+    vim.api.nvim_set_hl(0, 'CustomGitModified', { fg = '#FFA500' })
+    vim.api.nvim_set_hl(0, 'CustomGitUntracked', { fg = '#00FF00' })
+    
+    require('fff').setup({
+      git = {
+        status_text_color = true,
+      },
+      hl = {
+        git_modified = 'CustomGitModified',
+        git_untracked = 'CustomGitUntracked',
+      }
+    })
+<
+
+
 TROUBLESHOOTING ~


@@ -17,7 +17,13 @@ vim.opt.rtp:prepend(lazypath)

 require('lazy').setup({
  {
-    dir = '/Users/neogoose/dev/fff.nvim',
+    dir = '~/dev/fff.nvim',
+    'https://github.com/dmtrKovalenko/fff.nvim',
+    build = function()
+      -- this will download prebuild binary or try to use existing rustup toolchain to build from source
+      -- (if you are using lazy you can use gb for rebuilding a plugin if needed)
+      require('fff.download').download_or_build_binary()
+    end,
    dependencies = {
      'nvim-tree/nvim-web-devicons', -- Optional: for file icons
      -- {
@@ -2,11 +2,11 @@
  "nodes": {
    "crane": {
      "locked": {
-        "lastModified": 1765739568,
-        "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=",
+        "lastModified": 1767744144,
+        "narHash": "sha256-9/9ntI0D+HbN4G0TrK3KmHbTvwgswz7p8IEJsWyef8Q=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075",
+        "rev": "2fb033290bf6b23f226d4c8b32f7f7a16b043d7e",
        "type": "github"
      },
      "original": {
@@ -35,11 +35,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1765644376,
-        "narHash": "sha256-yqHBL2wYGwjGL2GUF2w3tofWl8qO9tZEuI4wSqbCrtE=",
+        "lastModified": 1767364772,
+        "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "23735a82a828372c4ef92c660864e82fbe2f5fbe",
+        "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
        "type": "github"
      },
      "original": {
@@ -64,11 +64,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765680428,
-        "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=",
+        "lastModified": 1767926800,
+        "narHash": "sha256-x0n73J6ufD/EhDlVdcoAmF0OQHZ+b0a2cKDc8RZyt+o=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f",
+        "rev": "499e9eed88ff9494b6604205b42847e847dfeb91",
        "type": "github"
      },
      "original": {
@@ -10,6 +10,8 @@ local overlay_state = {
  last_row = nil,
  last_col = nil,
  last_border_hl = nil,
+  -- Track if combo was rendered in last call
+  was_rendered = false,
 }

 local LEFT_OVERLAY_CONTENT = '├────'
@@ -91,6 +93,7 @@ local function position_overlay_window(state_key, buf, width, row, col)
    row = row,
    col = col,
    style = 'minimal',
+    border = 'none',
    focusable = false,
    zindex = 250,
  }
@@ -106,6 +109,12 @@ end

 local function update_overlays(list_win, combo_header_line, border_hl)
  local list_config = vim.api.nvim_win_get_config(list_win)
+  -- combo_header_line is a 1-based buffer line index (includes any padding offset)
+  -- list_config.row is where the window starts (0-based, at the top border)
+  -- Content starts at list_config.row + 1 (after the top border)
+  -- Buffer line 1 -> screen row (list_config.row + 1)
+  -- Buffer line N -> screen row (list_config.row + N)
+  -- Since combo_header_line is 1-based, the formula naturally works out
  local combo_header_row = list_config.row + combo_header_line

  -- Skip update if position and highlight haven't changed
@@ -121,20 +130,16 @@ local function update_overlays(list_win, combo_header_line, border_hl)
    return
  end

-  -- Cache current values
  overlay_state.last_row = combo_header_row
  overlay_state.last_col = list_config.col
  overlay_state.last_border_hl = border_hl

-  -- Update both overlays in a batch to minimize API calls
  local left_buf = get_or_create_overlay_buf('left_buf')
  local right_buf = get_or_create_overlay_buf('right_buf')

-  -- Update content for both buffers
  update_overlay_content(left_buf, LEFT_OVERLAY_CONTENT, border_hl)
  update_overlay_content(right_buf, RIGHT_OVERLAY_CONTENT, border_hl)

-  -- Position both windows
  position_overlay_window('left_win', left_buf, LEFT_OVERLAY_WIDTH, combo_header_row, list_config.col)
  position_overlay_window(
    'right_win',
@@ -156,10 +161,10 @@ local function clear_overlays_internal()
    overlay_state.right_win = nil
  end

-  -- Clear cache
  overlay_state.last_row = nil
  overlay_state.last_col = nil
  overlay_state.last_border_hl = nil
+  -- Note: we intentionally don't clear was_rendered here to track the transition
 end

 function M.detect_and_prepare(items, file_picker, win_width, combo_boost_score_multiplier, disable_combo_display)
@@ -171,6 +176,8 @@ function M.detect_and_prepare(items, file_picker, win_width, combo_boost_score_m
  return true, header_line, text_len, combo_item_index
 end

+--- Render combo highlights and overlays
+--- @return boolean was_hidden True if combo was just hidden (was rendered before, not now)
 function M.render_highlights_and_overlays(
  combo_item_index,
  text_len,
@@ -178,26 +185,54 @@ function M.render_highlights_and_overlays(
  list_win,
  ns_id,
  border_hl,
-  item_to_lines
+  item_to_lines,
+  prompt_position,
+  total_items
 )
+  local was_rendered_before = overlay_state.was_rendered
+  local is_rendering_now = false
+
  if not combo_item_index then
    clear_overlays_internal()
-    return
+  else
+    local combo_item_lines = item_to_lines[combo_item_index]
+    if not combo_item_lines then
+      clear_overlays_internal()
+    else
+      local combo_header_line_idx = combo_item_lines.first
+      apply_header_highlights(list_buf, ns_id, combo_header_line_idx, text_len, border_hl)
+      if prompt_position == 'bottom' and total_items and total_items > 1 then
+        combo_header_line_idx = combo_header_line_idx - 1
+      end
+
+      -- when rendering items in the reverse order for some reason this makes the
+      -- indexing shifted by one in the internal list config, so just adjust for that
+      update_overlays(list_win, combo_header_line_idx, border_hl)
+      is_rendering_now = true
+    end
  end

-  local combo_item_lines = item_to_lines[combo_item_index]
-  if not combo_item_lines then
-    clear_overlays_internal()
-    return
-  end
+  overlay_state.was_rendered = is_rendering_now

-  local combo_header_line_idx = combo_item_lines.first
-  apply_header_highlights(list_buf, ns_id, combo_header_line_idx, text_len, border_hl)
-  update_overlays(list_win, combo_header_line_idx, border_hl)
+  -- Return true if combo was just hidden (transition from visible to hidden)
+  return was_rendered_before and not is_rendering_now
+end
+
+--- Get the combo header text for a given item
+--- @param combo_count number The combo multiplier count
+--- @param win_width number Window width for formatting
+--- @param disable_combo_display boolean Whether to show combo count
+--- @return string header_text The formatted header line
+--- @return number text_len Length of the header text (without padding)
+function M.get_combo_header_text(combo_count, win_width, disable_combo_display)
+  return create_header_text(combo_count, win_width, disable_combo_display)
 end

 function M.get_overlay_widths() return LEFT_OVERLAY_WIDTH, RIGHT_OVERLAY_WIDTH end

-function M.cleanup() clear_overlays_internal() end
+function M.cleanup()
+  clear_overlays_internal()
+  overlay_state.was_rendered = false
+end

 return M
@@ -113,6 +113,7 @@ local function init()
      prompt_position = 'bottom', -- or 'top'
      preview_position = 'right', -- or 'left', 'right', 'top', 'bottom'
      preview_size = 0.5,
+      show_scrollbar = true, -- Show scrollbar for pagination
    },
    preview = {
      enabled = true,
@@ -122,7 +123,6 @@ local function init()
      imagemagick_info_format_str = '%m: %wx%h, %[colorspace], %q-bit',
      line_numbers = false,
      wrap_lines = false,
-      show_file_info = true,
      filetypes = {
        svg = { wrap_lines = true },
        markdown = { wrap_lines = true },
@@ -141,6 +141,10 @@ local function init()
      preview_scroll_down = '<C-d>',
      toggle_debug = '<F2>',
      cycle_previous_query = '<C-Up>',
+      toggle_select = '<Tab>',
+      send_to_quickfix = '<C-q>',
+      focus_list = '<leader>l',
+      focus_preview = '<leader>p',
    },
    hl = {
      border = 'FloatBorder',
@@ -153,6 +157,11 @@ local function init()
      frecency = 'Number',
      debug = 'Comment',
      combo_header = 'Number',
+      scrollbar = 'Comment',
+      directory_path = 'Comment', -- Highlight for directory path in file list
+      -- Multi-select highlights
+      selected = 'FFFSelected',
+      selected_active = 'FFFSelectedActive',
      -- Git text highlights for file names
      git_staged = 'FFFGitStaged',
      git_modified = 'FFFGitModified',
@@ -185,9 +194,13 @@ local function init()
      min_combo_count = 3, -- Minimum selections before combo boost applies (3 = boost starts on 3rd selection)
      combo_boost_score_multiplier = 100, -- Score multiplier for combo matches (files repeatedly opened with same query)
    },
+    git = {
+      status_text_color = false, -- Apply git status colors to filename text (default: false, only sign column)
+    },
    debug = {
      enabled = false, -- Set to true to show scores in the UI
      show_scores = false,
+      show_file_info = false, -- Show file info panel in preview
    },
    logging = {
      enabled = true,
@@ -28,11 +28,7 @@ local function setup_global_autocmds(config)

          vim.uv.fs_realpath(file_path, function(rp_err, real_path)
            if rp_err or not real_path then return end
-            local ok, track_err = pcall(fuzzy.track_access, real_path)
-
-            if not ok then
-              vim.notify('FFF: Failed to track file access: ' .. tostring(track_err), vim.log.levels.ERROR)
-            end
+            pcall(fuzzy.track_access, real_path)
          end)
        end)
      end,
@@ -47,9 +43,14 @@ local function setup_global_autocmds(config)
      local new_cwd = vim.v.event.cwd
      if state.initialized and new_cwd and new_cwd ~= config.base_path then
        vim.schedule(function()
-          local picker = require('fff.main')
-          local ok, err = pcall(picker.change_indexing_directory, new_cwd)
+          -- Delay require to avoid circular dependency: core -> main -> picker_ui -> file_picker -> core
+          local ok, picker = pcall(require, 'fff.main')
          if not ok then
+            vim.notify('FFF: Failed to load main module: ' .. tostring(picker), vim.log.levels.ERROR)
+            return
+          end
+          local change_ok, err = pcall(picker.change_indexing_directory, new_cwd)
+          if not change_ok then
            vim.notify('FFF: Failed to change indexing directory: ' .. tostring(err), vim.log.levels.ERROR)
          end
        end)
@@ -1,6 +1,6 @@
 local M = {}
 local system = require('fff.utils.system')
-local uv = vim and vim.uv or require('luv')
+local fs_utils = require('fff.utils.fs')

 local GITHUB_REPO = 'dmtrKovalenko/fff.nvim'

@@ -14,7 +14,7 @@ local function get_current_version(plugin_dir, callback)
  end)
 end

-local function get_binary_dir(plugin_dir) return plugin_dir .. '/../target' end
+local function get_binary_dir(plugin_dir) return plugin_dir .. '/../target/release' end

 local function get_binary_path(plugin_dir)
  local binary_dir = get_binary_dir(plugin_dir)
@@ -24,7 +24,7 @@ end

 local function binary_exists(plugin_dir)
  local binary_path = get_binary_path(plugin_dir)
-  local stat = uv.fs_stat(binary_path)
+  local stat = vim.uv.fs_stat(binary_path)
  return stat and stat.type == 'file'
 end

@@ -32,9 +32,9 @@ local function download_file(url, output_path, opts, callback)
  opts = opts or {}

  local dir = vim.fn.fnamemodify(output_path, ':h')
-  uv.fs_mkdir(dir, 493, function(err) -- 493 = 0755 octal
-    if err and not err:match('EEXIST') then
-      callback(false, 'Failed to create directory: ' .. err)
+  fs_utils.mkdir_recursive(dir, function(mkdir_ok, mkdir_err)
+    if not mkdir_ok then
+      callback(false, mkdir_err)
      return
    end

@@ -89,7 +89,7 @@ local function download_from_github(version, binary_path, opts, callback)
    local ok, err_msg = pcall(function() package.loadlib(binary_path, 'luaopen_fff_nvim') end)

    if not ok then
-      uv.fs_unlink(binary_path)
+      vim.uv.fs_unlink(binary_path)
      callback(false, 'Downloaded binary is not valid: ' .. (err_msg or 'unknown error'))
      return
    end
@@ -21,13 +21,11 @@ function M.setup()
    if ok then
      M.provider = provider
      M.provider_name = provider_name
-      vim.notify('FFF Icons: Loaded provider ' .. provider_name, vim.log.levels.INFO)
      return true
    end
  end

  M.setup_failed = true
-  vim.notify('FFF Icons: No icon provider found', vim.log.levels.WARN)
  return false
 end

@@ -225,4 +225,41 @@ function M.display_image(file_path, bufnr, max_width, max_height)
  return false
 end

+--- Check image preview availability status
+--- @return table status { available: boolean, snacks_available: boolean, snacks_image_available: boolean, terminal_supported: boolean, error: string|nil }
+function M.get_preview_status()
+  local status = {
+    available = false,
+    snacks_available = false,
+    snacks_image_available = false,
+    terminal_supported = false,
+    error = nil,
+  }
+
+  local ok, snacks = pcall(require, 'snacks')
+  if not ok then
+    status.error = 'snacks.nvim not installed'
+    return status
+  end
+
+  status.snacks_available = true
+
+  if not snacks.image then
+    status.error = 'snacks.image module not available'
+    return status
+  end
+
+  status.snacks_image_available = true
+
+  if not snacks.image.supports_terminal or not snacks.image.supports_terminal() then
+    status.error = 'terminal does not support image display'
+    return status
+  end
+
+  status.terminal_supported = true
+  status.available = true
+
+  return status
+end
+
 return M
@@ -32,43 +32,60 @@ function M.scan_files()
 end

 --- Search files with fuzzy matching using blink.cmp's advanced algorithm
+--- Results are always returned in descending order (best scores first)
 --- @param query string Search query
 --- @param max_results number|nil Maximum number of results (optional)
 --- @param max_threads number|nil Maximum number of threads (optional)
 --- @param current_file string|nil Path to current file to deprioritize (optional)
--- @param reverse_order boolean Reverse order of results
 --- @param min_combo_count_override number|nil Optional override for min_combo_count (nil uses config)
 --- @return table List of matching files
-function M.search_files(query, current_file, max_results, max_threads, reverse_order, min_combo_count_override)
+function M.search_files(query, current_file, max_results, max_threads, min_combo_count_override)
+  -- Delegate to paginated version with offset=0 and limit=max_results
+  return M.search_files_paginated(query, current_file, max_threads, min_combo_count_override, 0, max_results)
+end
+
+--- Search files with pagination support
+--- Results are always returned in descending order (best scores first)
+--- @param query string Search query
+--- @param current_file string|nil Path to current file to deprioritize (optional)
+--- @param max_threads number|nil Maximum number of threads to use
+--- @param min_combo_count_override number|nil Optional override for min_combo_count (nil uses config)
+--- @param page_index number Page index (0-based: 0, 1, 2, ...)
+--- @param page_size number Items per page
+--- @return table List of matching files
+function M.search_files_paginated(query, current_file, max_threads, min_combo_count_override, page_index, page_size)
  local config = require('fff.conf').get()
  if not M.state.initialized then return {} end

-  max_results = max_results or config.max_results or 40
  max_threads = max_threads or config.max_threads or 4
-  local combo_boost_score_multiplier = config.history and config.history.combo_boost_score_multiplier or 100
+  page_index = page_index or 0
+  page_size = page_size or 0

-  -- Use override if provided, otherwise use config value
  local min_combo_count = min_combo_count_override
  if min_combo_count == nil then min_combo_count = config.history and config.history.min_combo_count or 3 end

+  local combo_boost_score_multiplier = config.history and config.history.combo_boost_score_multiplier or 100
+
+  -- Convert page_index to offset (Rust expects offset in items, not page number)
+  local offset = page_index * page_size
+
  local ok, search_result = pcall(
    fuzzy.fuzzy_search_files,
    query,
-    max_results,
    max_threads,
    current_file,
-    reverse_order,
    combo_boost_score_multiplier,
-    min_combo_count
+    min_combo_count,
+    offset,
+    page_size
  )
+
  if not ok then
    vim.notify('Failed to search files: ' .. tostring(search_result), vim.log.levels.ERROR)
    return {}
  end

-  -- Store search metadata for UI display
  M.state.last_search_result = search_result
-
  return search_result.items
 end

@@ -0,0 +1,248 @@
+--- File Renderer
+--- Simple renderer for file items with 2 functions: render_line and apply_highlights
+local M = {}
+
+--- Render Context passed to renderer functions
+--- @class RenderContext
+--- @field config table User configuration from conf.get()
+--- @field items table[] Array of file items being rendered
+--- @field cursor number Current cursor position (1-based index into items)
+--- @field win_height number Window height in lines
+--- @field win_width number Window width in columns
+--- @field max_path_width number Maximum width for file paths
+--- @field debug_enabled boolean Whether debug mode is enabled (shows frecency scores)
+--- @field prompt_position string Prompt position: 'top' or 'bottom'
+--- @field has_combo boolean Whether combo boost is active
+--- @field combo_header_line string Formatted combo header line (if has_combo)
+--- @field combo_header_text_len number Length of combo header text (if has_combo)
+--- @field combo_item_index number Index of item with combo (usually 1)
+--- @field display_start number Start index for displayed items
+--- @field display_end number End index for displayed items
+--- @field iter_start number Iteration start (may differ from display_start for bottom prompt)
+--- @field iter_end number Iteration end (may differ from display_end for bottom prompt)
+--- @field iter_step number Iteration step (1 for top prompt, -1 for bottom prompt)
+--- @field format_file_display fun(item: table, max_width: number): string, string Helper function to format filename and dir path
+--- @field selected_files table<string, boolean> Map of selected file paths
+--- @field query string Current search query
+--- @field renderer table|nil Custom renderer (if provided via opts)
+
+--- File Item structure from Rust
+--- @class FileItem
+--- @field path string Absolute file path
+--- @field relative_path string Relative file path from base directory
+--- @field name string File name
+--- @field extension string File extension
+--- @field size number File size in bytes
+--- @field modified number Last modified timestamp
+--- @field total_frecency_score number Total frecency score
+--- @field access_frecency_score number Access-based frecency score
+--- @field modification_frecency_score number Modification-based frecency score
+--- @field git_status number|nil Git status enum (if file is in git repo)
+
+--- Renderer Interface:
+--- @field render_line fun(item: FileItem, ctx: RenderContext, item_idx: number): string[] Returns array of line strings
+--- @field apply_highlights fun(item: FileItem, ctx: RenderContext, item_idx: number, buf: number, ns_id: number, line_idx: number, line_content: string): nil Applies highlights to the rendered line
+
+--- Render a file item line
+--- @param item FileItem File item from Rust
+--- @param ctx RenderContext Render context with all state
+--- @param item_idx number Item index (1-based)
+--- @return string[] Array of line strings (1 or 2 lines if combo)
+function M.render_line(item, ctx, item_idx)
+  local icons = require('fff.file_picker.icons')
+  local lines = {}
+
+  -- Check if this should have combo header (first item with combo boost)
+  local has_combo = item_idx == 1 and ctx.has_combo and ctx.combo_header_line
+
+  if has_combo then table.insert(lines, ctx.combo_header_line) end
+
+  -- Get icon
+  local icon, icon_hl_group = icons.get_icon(item.name, item.extension, false)
+
+  -- Build frecency indicator (debug mode only)
+  local frecency = ''
+  if ctx.debug_enabled then
+    local total = item.total_frecency_score or 0
+    local access = item.access_frecency_score or 0
+    local mod = item.modification_frecency_score or 0
+
+    if total > 0 then
+      local indicator = ''
+      if mod >= 6 then
+        indicator = '🔥'
+      elseif access >= 4 then
+        indicator = '⭐'
+      elseif total >= 3 then
+        indicator = '✨'
+      elseif total >= 1 then
+        indicator = '•'
+      end
+      frecency = string.format(' %s%d', indicator, total)
+    end
+  end
+
+  -- Format filename and path
+  local icon_width = icon and (vim.fn.strdisplaywidth(icon) + 1) or 0
+  local available_width = math.max(ctx.max_path_width - icon_width - #frecency, 40)
+  local filename, dir_path = ctx.format_file_display(item, available_width)
+
+  -- Build line
+  local line = icon and string.format('%s %s %s%s', icon, filename, dir_path, frecency)
+    or string.format('%s %s%s', filename, dir_path, frecency)
+
+  local padding = math.max(0, ctx.win_width - vim.fn.strdisplaywidth(line) + 5)
+  table.insert(lines, line .. string.rep(' ', padding))
+
+  return lines
+end
+
+--- Apply highlights to a rendered line
+--- @param item FileItem File item from Rust
+--- @param ctx RenderContext Render context with all state
+--- @param item_idx number Item index (1-based)
+--- @param buf number Buffer handle
+--- @param ns_id number Namespace ID
+--- @param line_idx number 1-based line index in buffer
+--- @param line_content string The actual line content
+function M.apply_highlights(item, ctx, item_idx, buf, ns_id, line_idx, line_content)
+  local icons = require('fff.file_picker.icons')
+  local git_utils = require('fff.git_utils')
+  local file_picker = require('fff.file_picker')
+
+  local is_cursor = (ctx.cursor == item_idx)
+  local score = file_picker.get_file_score(item_idx)
+  local is_current_file = score and score.current_file_penalty and score.current_file_penalty < 0
+
+  -- Get icon and paths
+  local icon, icon_hl_group = icons.get_icon(item.name, item.extension, false)
+  local icon_width = icon and (vim.fn.strdisplaywidth(icon) + 1) or 0
+  local available_width = math.max(ctx.max_path_width - icon_width, 40)
+  local filename, dir_path = ctx.format_file_display(item, available_width)
+
+  -- 1. Cursor highlight
+  if is_cursor then
+    vim.api.nvim_buf_set_extmark(buf, ns_id, line_idx - 1, 0, {
+      end_col = 0,
+      end_row = line_idx,
+      hl_group = ctx.config.hl.active_file,
+      hl_eol = true,
+      priority = 100,
+    })
+  end
+
+  -- 2. Icon
+  if icon and icon_hl_group and vim.fn.strdisplaywidth(icon) > 0 then
+    local icon_hl = is_current_file and 'Comment' or icon_hl_group
+    vim.api.nvim_buf_add_highlight(buf, ns_id, icon_hl, line_idx - 1, 0, vim.fn.strdisplaywidth(icon))
+  end
+
+  -- 3. Git text color (filename)
+  if ctx.config.git and ctx.config.git.status_text_color and icon and #filename > 0 then
+    local git_text_hl = item.git_status and git_utils.get_text_highlight(item.git_status) or nil
+    if git_text_hl and git_text_hl ~= '' and not is_current_file then
+      local filename_start = #icon + 1
+      vim.api.nvim_buf_add_highlight(buf, ns_id, git_text_hl, line_idx - 1, filename_start, filename_start + #filename)
+    end
+  end
+
+  -- 4. Frecency indicator
+  if ctx.debug_enabled then
+    local start_pos, end_pos = line_content:find('[⭐🔥✨•]%d+')
+    if start_pos then
+      vim.api.nvim_buf_add_highlight(buf, ns_id, ctx.config.hl.frecency, line_idx - 1, start_pos - 1, end_pos)
+    end
+  end
+
+  -- 5. Directory path (dimmed)
+  if #filename > 0 and #dir_path > 0 then
+    local prefix_len = #filename + 1 -- filename bytes + space
+    if icon then
+      prefix_len = prefix_len + #icon + 1 -- if icon add icon bytes + space
+    end
+    vim.api.nvim_buf_add_highlight(
+      buf,
+      ns_id,
+      ctx.config.hl.directory_path or 'Comment',
+      line_idx - 1,
+      prefix_len,
+      prefix_len + #dir_path
+    )
+  end
+
+  -- 6. Current file
+  if is_current_file then
+    if not is_cursor then vim.api.nvim_buf_add_highlight(buf, ns_id, 'Comment', line_idx - 1, 0, -1) end
+    local virt_text_hl = is_cursor and ctx.config.hl.active_file or 'Comment'
+    vim.api.nvim_buf_set_extmark(buf, ns_id, line_idx - 1, 0, {
+      virt_text = { { ' (current)', virt_text_hl } },
+      virt_text_pos = 'right_align',
+    })
+  end
+
+  -- 7. Git sign
+  if item.git_status and git_utils.should_show_border(item.git_status) then
+    local border_char = git_utils.get_border_char(item.git_status)
+    local border_hl
+
+    if is_cursor then
+      local base_hl = git_utils.get_border_highlight(item.git_status)
+      if base_hl and base_hl ~= '' then
+        local border_fg = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID(base_hl)), 'fg')
+        local cursor_bg = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID(ctx.config.hl.active_file)), 'bg')
+        local temp_hl_name = 'FFFGitBorderSelected_' .. item_idx
+        if border_fg ~= '' and cursor_bg ~= '' then
+          vim.api.nvim_set_hl(0, temp_hl_name, { fg = border_fg, bg = cursor_bg })
+          border_hl = temp_hl_name
+        else
+          border_hl = git_utils.get_border_highlight_selected(item.git_status)
+        end
+      else
+        border_hl = ctx.config.hl.active_file
+      end
+    else
+      border_hl = git_utils.get_border_highlight(item.git_status)
+    end
+
+    if border_hl and border_hl ~= '' then
+      vim.api.nvim_buf_set_extmark(buf, ns_id, line_idx - 1, 0, {
+        sign_text = border_char,
+        sign_hl_group = border_hl,
+        priority = 1000,
+      })
+    end
+  elseif is_cursor then
+    vim.api.nvim_buf_set_extmark(buf, ns_id, line_idx - 1, 0, {
+      sign_text = ' ',
+      sign_hl_group = ctx.config.hl.active_file,
+      priority = 1000,
+    })
+  end
+
+  -- 8. Selection
+  if ctx.selected_files and ctx.selected_files[item.path] then
+    local selection_hl = is_cursor and ctx.config.hl.selected_active or ctx.config.hl.selected
+    vim.api.nvim_buf_set_extmark(buf, ns_id, line_idx - 1, 0, {
+      sign_text = '▊',
+      sign_hl_group = selection_hl,
+      priority = 1001,
+    })
+  end
+
+  -- 9. Query match
+  if ctx.query and ctx.query ~= '' then
+    local match_start, match_end = string.find(line_content, ctx.query, 1)
+    if match_start and match_end then
+      vim.api.nvim_buf_add_highlight(
+        buf,
+        ns_id,
+        ctx.config.hl.matched or 'IncSearch',
+        line_idx - 1,
+        match_start - 1,
+        match_end
+      )
+    end
+  end
+end
+
+return M
@@ -72,9 +72,9 @@ end
 --- Get highlight group for git status text
 --- @param git_status string Git status
 --- @return string Highlight group name
-function M.get_highlight(git_status)
+function M.get_text_highlight(git_status)
  ensure_cache()
-  return highlights_cache[git_status] or ''
+  return highlights_cache and highlights_cache[git_status] or ''
 end

 --- Get border highlight group for git status
@@ -82,7 +82,7 @@ end
 --- @return string Highlight group name
 function M.get_border_highlight(git_status)
  ensure_cache()
-  return border_highlights_cache[git_status] or ''
+  return border_highlights_cache and border_highlights_cache[git_status] or ''
 end

 --- Get selected border highlight group for git status
@@ -90,7 +90,7 @@ end
 --- @return string Highlight group name
 function M.get_border_highlight_selected(git_status)
  ensure_cache()
-  return border_highlights_selected_cache[git_status] or ''
+  return border_highlights_selected_cache and border_highlights_selected_cache[git_status] or ''
 end

 function M.get_border_char(git_status) return M.border_chars[git_status] or '' end
@@ -140,12 +140,12 @@ function M.setup_highlights()
    { 'FFFGitSignIgnored', 'FFFGitSignIgnoredSelected', '#4B5563', 8 },
  }

+  local visual_bg_gui = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID('Visual')), 'bg', 'gui')
+  local visual_bg_cterm = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID('Visual')), 'bg', 'cterm')
+
  for _, hl in ipairs(git_highlights) do
    local _, selected_hl, gui_fg, cterm_fg = hl[1], hl[2], hl[3], hl[4]

-    local visual_bg_gui = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID('Visual')), 'bg', 'gui')
-    local visual_bg_cterm = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID('Visual')), 'bg', 'cterm')
-
    local gui_bg = visual_bg_gui ~= '' and visual_bg_gui or 'NONE'
    local cterm_bg = visual_bg_cterm ~= '' and visual_bg_cterm or 'NONE'

@@ -160,6 +160,37 @@ function M.setup_highlights()
      )
    )
  end
+
+  -- Selection highlight - use Directory/Number colors (better than green 'Added')
+  vim.cmd('highlight default link FFFSelected Directory')
+
+  local dir_fg_gui = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID('Directory')), 'fg', 'gui')
+  local dir_fg_cterm = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID('Directory')), 'fg', 'cterm')
+
+  if dir_fg_gui == '' or dir_fg_gui == '-1' then
+    -- Directory not defined, try Number
+    dir_fg_gui = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID('Number')), 'fg', 'gui')
+    dir_fg_cterm = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID('Number')), 'fg', 'cterm')
+  end
+
+  -- Fallback to blue if neither Directory nor Number have colors
+  local is_dark_bg = vim.o.background == 'dark'
+  local gui_fg = dir_fg_gui ~= '' and dir_fg_gui or (is_dark_bg and '#60A5FA' or '#0369A1')
+  local cterm_fg = dir_fg_cterm ~= '' and dir_fg_cterm or (is_dark_bg and '12' or '4')
+
+  local gui_bg = visual_bg_gui ~= '' and visual_bg_gui or 'NONE'
+  local cterm_bg = visual_bg_cterm ~= '' and visual_bg_cterm or 'NONE'
+
+  -- Create combined highlight: Directory/Number foreground + Visual background
+  vim.cmd(
+    string.format(
+      'highlight default FFFSelectedActive guifg=%s guibg=%s ctermfg=%s ctermbg=%s',
+      gui_fg,
+      gui_bg,
+      cterm_fg,
+      cterm_bg
+    )
+  )
 end

 return M
@@ -0,0 +1,360 @@
+local utils = require('fff.utils')
+
+local M = {}
+
+local function fetch_rust_checkhealth(rust_module, test_path)
+  if not rust_module.health_check then
+    return nil, 'health_check function not available in rust module (binary may be outdated)'
+  end
+
+  local ok, result = pcall(rust_module.health_check, test_path)
+  if not ok then return nil, 'Failed to call health_check: ' .. tostring(result) end
+
+  return result, nil
+end
+
+--- Check snacks.nvim image preview availability
+--- @return table image_preview_info
+local function check_image_preview()
+  local ok, image = pcall(require, 'fff.file_picker.image')
+  if not ok then
+    return {
+      available = false,
+      snacks_available = false,
+      snacks_image_available = false,
+      terminal_supported = false,
+      error = 'failed to load image module',
+    }
+  end
+
+  return image.get_preview_status()
+end
+
+--- Check icon provider availability
+--- @return table icon_provider_info
+local function check_icon_provider()
+  local ok, icons = pcall(require, 'fff.file_picker.icons')
+  if not ok then return {
+    available = false,
+    name = nil,
+    supports_directories = false,
+  } end
+
+  return icons.get_provider_info()
+end
+
+--- Run the health check and return structured results
+--- @param opts? { test_path?: string } Options for health check
+--- @return table health_result
+function M.run(opts)
+  opts = opts or {}
+
+  local health = {
+    ok = true,
+    binary = {
+      available = false,
+      path = nil,
+      error = nil,
+    },
+    rust = {
+      version = nil,
+      git = {
+        available = false,
+        repository_found = false,
+        workdir = nil,
+        libgit2_version = nil,
+        error = nil,
+      },
+      file_picker = {
+        initialized = false,
+        base_path = nil,
+        is_scanning = false,
+        indexed_files = 0,
+        error = nil,
+      },
+      frecency = {
+        initialized = false,
+        db_path = nil,
+        disk_size = nil,
+        entries = nil,
+        error = nil,
+      },
+      query_tracker = {
+        initialized = false,
+        db_path = nil,
+        disk_size = nil,
+        query_file_entries = nil,
+        query_history_entries = nil,
+        error = nil,
+      },
+    },
+    image_preview = {
+      available = false,
+      snacks_available = false,
+      snacks_image_available = false,
+      terminal_supported = false,
+      error = nil,
+    },
+    icon_provider = {
+      available = false,
+      name = nil,
+      supports_directories = false,
+    },
+    messages = {},
+  }
+
+  -- Check binary availability
+  local download = require('fff.download')
+  health.binary.path = download.get_binary_path()
+
+  local binary_ok, rust_module = pcall(require, 'fff.rust')
+  if not binary_ok then
+    health.ok = false
+    health.binary.available = false
+    health.binary.error = tostring(rust_module)
+    table.insert(health.messages, {
+      level = 'error',
+      msg = 'Binary not available: ' .. tostring(rust_module),
+    })
+    return health
+  end
+
+  health.binary.available = true
+  table.insert(health.messages, {
+    level = 'ok',
+    msg = 'Binary loaded successfully from: ' .. health.binary.path,
+  })
+
+  local rust_health, rust_err = fetch_rust_checkhealth(rust_module, opts.test_path)
+  if rust_health then
+    health.rust.version = rust_health.version
+    table.insert(health.messages, {
+      level = 'ok',
+      msg = 'fff.nvim version: ' .. (rust_health.version or 'unknown'),
+    })
+
+    if rust_health.git then
+      health.rust.git.available = rust_health.git.available
+      health.rust.git.repository_found = rust_health.git.repository_found
+      health.rust.git.workdir = rust_health.git.workdir
+      health.rust.git.libgit2_version = rust_health.git.libgit2_version
+      health.rust.git.error = rust_health.git.error
+
+      if rust_health.git.available then
+        table.insert(health.messages, {
+          level = 'ok',
+          msg = 'libgit2 available (version: ' .. (rust_health.git.libgit2_version or 'unknown') .. ')',
+        })
+
+        if rust_health.git.repository_found then
+          table.insert(health.messages, {
+            level = 'ok',
+            msg = 'Git repository found: ' .. (rust_health.git.workdir or 'unknown'),
+          })
+        else
+          table.insert(health.messages, {
+            level = 'info',
+            msg = 'No git repository found in current directory'
+              .. (rust_health.git.error and (': ' .. rust_health.git.error) or ''),
+          })
+        end
+      else
+        table.insert(health.messages, {
+          level = 'warn',
+          msg = 'libgit2 not available',
+        })
+      end
+    end
+
+    if rust_health.file_picker then
+      health.rust.file_picker.initialized = rust_health.file_picker.initialized
+      health.rust.file_picker.base_path = rust_health.file_picker.base_path
+      health.rust.file_picker.is_scanning = rust_health.file_picker.is_scanning
+      health.rust.file_picker.indexed_files = rust_health.file_picker.indexed_files
+      health.rust.file_picker.error = rust_health.file_picker.error
+
+      if rust_health.file_picker.initialized then
+        local status = rust_health.file_picker.is_scanning and 'scanning' or 'ready'
+        table.insert(health.messages, {
+          level = 'ok',
+          msg = string.format(
+            'File picker initialized (%s, %d files indexed, base: %s)',
+            status,
+            rust_health.file_picker.indexed_files or 0,
+            rust_health.file_picker.base_path or 'unknown'
+          ),
+        })
+      else
+        table.insert(health.messages, {
+          level = 'info',
+          msg = 'File picker not initialized (will initialize on first use)',
+        })
+      end
+    end
+
+    -- Frecency database status
+    if rust_health.frecency then
+      health.rust.frecency.initialized = rust_health.frecency.initialized
+      health.rust.frecency.error = rust_health.frecency.error
+
+      if rust_health.frecency.initialized then
+        local db_info = rust_health.frecency.db_healthcheck
+        if db_info then
+          health.rust.frecency.db_path = db_info.path
+          health.rust.frecency.disk_size = db_info.disk_size
+          health.rust.frecency.entries = db_info.absolute_frecency_entries
+
+          table.insert(health.messages, {
+            level = 'ok',
+            msg = string.format(
+              'Frecency database initialized (%d entries, %s, path: %s)',
+              db_info.absolute_frecency_entries or 0,
+              utils.format_file_size(db_info.disk_size or 0),
+              db_info.path or 'unknown'
+            ),
+          })
+        elseif rust_health.frecency.db_healthcheck_error then
+          table.insert(health.messages, {
+            level = 'warn',
+            msg = 'Frecency database initialized but health check failed: '
+              .. rust_health.frecency.db_healthcheck_error,
+          })
+        else
+          table.insert(health.messages, {
+            level = 'ok',
+            msg = 'Frecency database initialized',
+          })
+        end
+      else
+        table.insert(health.messages, {
+          level = 'info',
+          msg = 'Frecency database not initialized (will initialize on first use)',
+        })
+      end
+    end
+
+    if rust_health.query_tracker then
+      health.rust.query_tracker.initialized = rust_health.query_tracker.initialized
+      health.rust.query_tracker.error = rust_health.query_tracker.error
+
+      if rust_health.query_tracker.initialized then
+        local db_info = rust_health.query_tracker.db_healthcheck
+        if db_info then
+          health.rust.query_tracker.db_path = db_info.path
+          health.rust.query_tracker.disk_size = db_info.disk_size
+          health.rust.query_tracker.query_file_entries = db_info.query_file_entries
+          health.rust.query_tracker.query_history_entries = db_info.query_history_entries
+
+          table.insert(health.messages, {
+            level = 'ok',
+            msg = string.format(
+              'Query tracker initialized (%d query-file mappings, %d history entries, %s, path: %s)',
+              db_info.query_file_entries or 0,
+              db_info.query_history_entries or 0,
+              utils.format_file_size(db_info.disk_size or 0),
+              db_info.path or 'unknown'
+            ),
+          })
+        elseif rust_health.query_tracker.db_healthcheck_error then
+          table.insert(health.messages, {
+            level = 'warn',
+            msg = 'Query tracker initialized but health check failed: '
+              .. rust_health.query_tracker.db_healthcheck_error,
+          })
+        else
+          table.insert(health.messages, {
+            level = 'ok',
+            msg = 'Query tracker initialized',
+          })
+        end
+      else
+        table.insert(health.messages, {
+          level = 'info',
+          msg = 'Query tracker not initialized (will initialize on first use)',
+        })
+      end
+    end
+  else
+    health.ok = false
+    table.insert(health.messages, {
+      level = 'error',
+      msg = rust_err or 'Unknown error getting rust health data',
+    })
+    return health
+  end
+
+  local image_info = check_image_preview()
+  health.image_preview.snacks_available = image_info.snacks_available
+  health.image_preview.snacks_image_available = image_info.snacks_image_available
+  health.image_preview.terminal_supported = image_info.terminal_supported
+  health.image_preview.error = image_info.error
+  health.image_preview.available = image_info.available
+
+  if image_info.available then
+    table.insert(health.messages, {
+      level = 'ok',
+      msg = 'Image preview available via snacks.nvim',
+    })
+  elseif image_info.snacks_available and image_info.snacks_image_available then
+    table.insert(health.messages, {
+      level = 'info',
+      msg = 'Image preview not available: ' .. (image_info.error or 'terminal does not support images'),
+    })
+  elseif image_info.snacks_available then
+    table.insert(health.messages, {
+      level = 'info',
+      msg = 'Image preview not available: snacks.image module not found',
+    })
+  else
+    table.insert(health.messages, {
+      level = 'info',
+      msg = 'Image preview not available: snacks.nvim not installed',
+    })
+  end
+
+  local icon_info = check_icon_provider()
+  health.icon_provider.available = icon_info.available
+  health.icon_provider.name = icon_info.name
+  health.icon_provider.supports_directories = icon_info.supports_directories
+
+  if icon_info.available then
+    table.insert(health.messages, {
+      level = 'ok',
+      msg = 'Filetype icons available via ' .. icon_info.name,
+    })
+  else
+    table.insert(health.messages, {
+      level = 'info',
+      msg = 'Filetype icons not available (install nvim-web-devicons or mini.icons)',
+    })
+  end
+
+  return health
+end
+
+function M.check()
+  vim.health.start('fff.nvim')
+
+  local result = M.run()
+
+  for _, msg in ipairs(result.messages) do
+    if msg.level == 'ok' then
+      vim.health.ok(msg.msg)
+    elseif msg.level == 'warn' then
+      vim.health.warn(msg.msg)
+    elseif msg.level == 'error' then
+      vim.health.error(msg.msg)
+    elseif msg.level == 'info' then
+      vim.health.info(msg.msg)
+    end
+  end
+
+  if not result.binary.available then
+    vim.health.info('To install the binary, run:')
+    vim.health.info('  :lua require("fff.download").download_or_build_binary()')
+    vim.health.info('Or build from source with:')
+    vim.health.info('  cargo build --release')
+  end
+end
+
+return M
@@ -10,10 +10,11 @@ M.state = { initialized = false }
 function M.setup(config) vim.g.fff = config end

 --- Find files in current directory
-function M.find_files()
+--- @param opts? table Optional configuration {renderer = custom_renderer}
+function M.find_files(opts)
  local picker_ok, picker_ui = pcall(require, 'fff.picker_ui')
  if picker_ok then
-    picker_ui.open()
+    picker_ui.open(opts)
  else
    vim.notify('Failed to load picker UI: ' .. picker_ui, vim.log.levels.ERROR)
  end
@@ -120,50 +121,6 @@ function M.get_preview(file_path)
  return table.concat(lines, '\n')
 end

-function M.health_check()
-  local health = {
-    ok = true,
-    messages = {},
-  }
-
-  if not require('fff.core').is_file_picker_initialized() then
-    health.ok = false
-    table.insert(health.messages, 'File picker not initialized')
-  else
-    table.insert(health.messages, '✓ File picker initialized')
-  end
-
-  local optional_deps = {
-    { cmd = 'git', desc = 'Git integration' },
-    { cmd = 'chafa', desc = 'Terminal graphics for image preview' },
-    { cmd = 'img2txt', desc = 'ASCII art for image preview' },
-    { cmd = 'viu', desc = 'Terminal images for image preview' },
-  }
-
-  for _, dep in ipairs(optional_deps) do
-    if vim.fn.executable(dep.cmd) == 0 then
-      table.insert(health.messages, string.format('Optional: %s not found (%s)', dep.cmd, dep.desc))
-    else
-      table.insert(health.messages, string.format('✓ %s found', dep.cmd))
-    end
-  end
-
-  if health.ok then
-    vim.notify('FFF health check passed ✓', vim.log.levels.INFO)
-  else
-    vim.notify('FFF health check failed ✗', vim.log.levels.ERROR)
-  end
-
-  for _, message in ipairs(health.messages) do
-    local level = message:match('^✓') and vim.log.levels.INFO
-      or message:match('^Optional:') and vim.log.levels.WARN
-      or vim.log.levels.ERROR
-    vim.notify(message, level)
-  end
-
-  return health
-end
-
 --- Find files in a specific directory
 --- @param directory string Directory path to search in
 function M.find_files_in_dir(directory)
@@ -0,0 +1,29 @@
+use crate::error::Result;
+use mlua::{Lua, Table};
+
+pub trait DbHealthChecker {
+    fn get_env(&self) -> &heed::Env;
+    fn count_entries(&self) -> Result<Vec<(&'static str, u64)>>;
+
+    fn get_lua_helthcheckh(&self, lua: &Lua) -> std::result::Result<Table, mlua::Error> {
+        let env = self.get_env();
+        let table = lua.create_table()?;
+
+        let size = env.real_disk_size().map_err(|e| {
+            mlua::Error::RuntimeError(format!("Failed to read db disk size: {}", e))
+        })?;
+        let path = env.path().to_string_lossy().to_string();
+        let entry_count = self
+            .count_entries()
+            .map_err(|e| mlua::Error::RuntimeError(format!("Failed to count db entries: {}", e)))?;
+
+        table.set("path", path)?;
+        table.set("disk_size", size)?;
+
+        for (name, count) in entry_count {
+            table.set(name, count)?;
+        }
+
+        Ok(table)
+    }
+}
@@ -5,7 +5,7 @@ use crate::git::GitStatusCache;
 use crate::location::parse_location;
 use crate::query_tracker::QueryMatchEntry;
 use crate::score::match_and_score_files;
-use crate::types::{FileItem, ScoringContext, SearchResult};
+use crate::types::{FileItem, PaginationArgs, ScoringContext, SearchResult};
 use git2::{Repository, Status, StatusOptions};
 use rayon::prelude::*;
 use std::fmt::Debug;
@@ -21,14 +21,13 @@ use crate::{FILE_PICKER, FRECENCY};

 #[derive(Debug, Clone, Copy)]
 pub struct FuzzySearchOptions<'a> {
-    pub max_results: usize,
    pub max_threads: usize,
    pub current_file: Option<&'a str>,
-    pub reverse_order: bool,
    pub project_path: Option<&'a Path>,
    pub last_same_query_match: Option<&'a QueryMatchEntry>,
    pub combo_boost_score_multiplier: i32,
    pub min_combo_count: u32,
+    pub pagination: PaginationArgs,
 }

 #[derive(Debug, Clone)]
@@ -184,7 +183,7 @@ impl FilePicker {
        let max_threads = options.max_threads.max(1);
        debug!(
            ?query,
-            max_results = ?options.max_results,
+            pagination = ?options.pagination,
            ?max_threads,
            current_file = ?options.current_file,
            "Fuzzy search",
@@ -195,27 +194,30 @@ impl FilePicker {

        // small queries with a large number of results can match absolutely everything
        let max_typos = (query.len() as u16 / 4).clamp(2, 6);
+
        let context = ScoringContext {
            query,
            project_path: options.project_path,
            max_typos,
            max_threads,
            current_file: options.current_file,
-            max_results: options.max_results,
-            reverse_order: options.reverse_order,
            last_same_query_match: options.last_same_query_match,
            combo_boost_score_multiplier: options.combo_boost_score_multiplier,
            min_combo_count: options.min_combo_count,
+            pagination: options.pagination,
        };

        let time = std::time::Instant::now();

+        // Match, score, and paginate files (all done in sort_and_truncate)
        let (items, scores, total_matched) = match_and_score_files(files, &context);

        debug!(
            ?query,
            completed_in = ?time.elapsed(),
-            top_position = ?items.first(),
+            total_matched,
+            returned_count = items.len(),
+            pagination = ?options.pagination,
            "Fuzzy search completed",
        );

@@ -1,3 +1,4 @@
+use crate::db_healthcheck::DbHealthChecker;
 use crate::{error::Error, git::is_modified_status};
 use heed::{Database, Env, EnvOpenOptions};
 use heed::{
@@ -26,6 +27,19 @@ const MODIFICATION_THRESHOLDS: [(i64, u64); 5] = [
    (1, 60 * 60 * 24 * 7), // 1 week
 ];

+impl DbHealthChecker for FrecencyTracker {
+    fn get_env(&self) -> &heed::Env {
+        &self.env
+    }
+
+    fn count_entries(&self) -> Result<Vec<(&'static str, u64)>, Error> {
+        let rtxn = self.env.read_txn().map_err(Error::DbStartReadTxn)?;
+        let count = self.db.len(&rtxn).map_err(Error::DbRead)?;
+
+        Ok(vec![("absolute_frecency_entries", count)])
+    }
+}
+
 impl FrecencyTracker {
    pub fn new(db_path: &str, use_unsafe_no_lock: bool) -> Result<Self, Error> {
        fs::create_dir_all(db_path).map_err(Error::CreateDir)?;
@@ -9,7 +9,13 @@ end

 -- search for the lib in the /target/release directory with and without the lib prefix
 -- since MSVC doesn't include the prefix
-local base_path = debug.getinfo(1).source:match('@?(.*/)')
+local info = debug.getinfo(1, 'S')
+local base_path = info and info.source and info.source:match('@?(.*/)') or ''
+
+-- Fallback: if base_path is nil, try to determine from current file path
+if not base_path or base_path == '' then
+  base_path = vim.fn.fnamemodify(vim.fn.resolve(vim.fn.expand('<sfile>:p')), ':h') .. '/'
+end

 local paths = {
  download.get_binary_cpath_component(),
@@ -23,11 +29,30 @@ if cargo_target_dir then
  table.insert(paths, cargo_target_dir .. '/release/?' .. get_lib_extension())
 end

-package.cpath = package.cpath .. ';' .. table.concat(paths, ';')
+-- Instead of using require (which can find the wrong lib due to cpath pollution),
+-- load the library directly from the first valid path we find
+local function try_load_library()
+  for _, path_pattern in ipairs(paths) do
+    local actual_path = path_pattern:gsub('%?', 'fff_nvim')
+    local stat = vim.uv.fs_stat(actual_path)
+    if stat and stat.type == 'file' then
+      local loader, err = package.loadlib(actual_path, 'luaopen_fff_nvim')
+      if err then return nil, string.format('Error loading library from %s: %s', actual_path, err) end
+      if loader then return loader() end
+    end
+  end
+  return nil, 'No valid library found in any search path'
+end

-local ok, backend = pcall(require, 'fff_nvim')
-if not ok then
-  error('Failed to load fff rust backend. Make sure that it has been downloaded or built with `cargo build --release`')
+local backend, load_err = try_load_library()
+if not backend or load_err then
+  local err_msg = string.format(
+    'Failed to load fff rust backend.\nError: %s\nSearched paths:\n%s\nMake sure binary exists or make it exists using \n `:lua require("fff.download").download_or_build_binary()`\nor\n`cargo build --release`\n(and rerun neovim after)',
+    tostring(load_err),
+    vim.inspect(paths)
+  )
+
+  error(err_msg)
 end

 return backend
@@ -1,7 +1,9 @@
+use crate::db_healthcheck::DbHealthChecker;
 use crate::error::Error;
 use crate::file_picker::{FilePicker, FuzzySearchOptions};
 use crate::frecency::FrecencyTracker;
 use crate::query_tracker::QueryTracker;
+use crate::types::PaginationArgs;
 use mlua::prelude::*;
 use once_cell::sync::Lazy;
 use std::path::{Path, PathBuf};
@@ -9,6 +11,7 @@ use std::sync::RwLock;
 use std::time::Duration;

 mod background_watcher;
+mod db_healthcheck;
 mod error;
 pub mod file_picker;
 mod frecency;
@@ -133,19 +136,28 @@ pub fn scan_files(_: &Lua, _: ()) -> LuaResult<()> {
    Ok(())
 }

+#[allow(clippy::type_complexity)]
 pub fn fuzzy_search_files(
    lua: &Lua,
    (
        query,
-        max_results,
        max_threads,
        current_file,
-        order_reverse,
        combo_boost_score_multiplier,
        min_combo_count,
-    ): (String, usize, usize, Option<String>, bool, i32, Option<u32>),
+        page_index,
+        page_size,
+    ): (
+        String,
+        usize,
+        Option<String>,
+        i32,
+        Option<u32>,
+        Option<usize>,
+        Option<usize>,
+    ),
 ) -> LuaResult<LuaValue> {
-    let Some(ref mut picker) = *FILE_PICKER.write().map_err(|_| Error::AcquireItemLock)? else {
+    let Some(ref picker) = *FILE_PICKER.read().map_err(|_| Error::AcquireItemLock)? else {
        return Err(Error::FilePickerMissing)?;
    };

@@ -173,21 +185,25 @@ pub fn fuzzy_search_files(
        ?base_path,
        ?query,
        ?min_combo_count,
-        "Last same query entry"
+        ?page_index,
+        ?page_size,
+        "Fuzzy search parameters"
    );

    let results = FilePicker::fuzzy_search(
        picker.get_files(),
        &query,
        FuzzySearchOptions {
-            max_results,
            max_threads,
            current_file: current_file.as_deref(),
-            reverse_order: order_reverse,
            project_path: Some(picker.base_path()),
            last_same_query_match: last_same_query_entry.as_ref(),
            combo_boost_score_multiplier,
            min_combo_count,
+            pagination: PaginationArgs {
+                offset: page_index.unwrap_or(0),
+                limit: page_size.unwrap_or(0),
+            },
        },
    );

@@ -367,6 +383,111 @@ pub fn init_tracing(
        .map_err(|e| LuaError::RuntimeError(format!("Failed to initialize tracing: {}", e)))
 }

+/// Returns health check information including version, git2 status, and repository detection
+pub fn health_check(lua: &Lua, test_path: Option<String>) -> LuaResult<LuaValue> {
+    let table = lua.create_table()?;
+    table.set("version", env!("CARGO_PKG_VERSION"))?;
+
+    let test_path = test_path
+        .map(PathBuf::from)
+        .unwrap_or_else(|| std::env::current_dir().unwrap_or_default());
+
+    let git_info = lua.create_table()?;
+    let git_version = git2::Version::get();
+    let (major, minor, rev) = git_version.libgit2_version();
+    let libgit2_version_str = format!("{}.{}.{}", major, minor, rev);
+
+    match git2::Repository::discover(&test_path) {
+        Ok(repo) => {
+            git_info.set("available", true)?;
+            git_info.set("repository_found", true)?;
+            if let Some(workdir) = repo.workdir() {
+                git_info.set("workdir", workdir.to_string_lossy().to_string())?;
+            }
+            // Get git2 version info
+            git_info.set("libgit2_version", libgit2_version_str.clone())?;
+        }
+        Err(e) => {
+            git_info.set("available", true)?;
+            git_info.set("repository_found", false)?;
+            git_info.set("error", e.message().to_string())?;
+            git_info.set("libgit2_version", libgit2_version_str)?;
+        }
+    }
+    table.set("git", git_info)?;
+
+    // Check file picker status
+    let picker_info = lua.create_table()?;
+    match FILE_PICKER.read() {
+        Ok(guard) => {
+            if let Some(ref picker) = *guard {
+                picker_info.set("initialized", true)?;
+                picker_info.set(
+                    "base_path",
+                    picker.base_path().to_string_lossy().to_string(),
+                )?;
+                picker_info.set("is_scanning", picker.is_scan_active())?;
+                let progress = picker.get_scan_progress();
+                picker_info.set("indexed_files", progress.scanned_files_count)?;
+            } else {
+                picker_info.set("initialized", false)?;
+            }
+        }
+        Err(_) => {
+            picker_info.set("initialized", false)?;
+            picker_info.set("error", "Failed to acquire file picker lock")?;
+        }
+    }
+    table.set("file_picker", picker_info)?;
+
+    let frecency_info = lua.create_table()?;
+    match FRECENCY.read() {
+        Ok(guard) => {
+            frecency_info.set("initialized", guard.is_some())?;
+
+            if let Some(ref frecency) = *guard {
+                match frecency.get_lua_helthcheckh(lua) {
+                    Ok(healthcheck_table) => {
+                        frecency_info.set("db_healthcheck", healthcheck_table)?;
+                    }
+                    Err(e) => {
+                        frecency_info.set("db_healthcheck_error", e.to_string())?;
+                    }
+                }
+            }
+        }
+        Err(_) => {
+            frecency_info.set("initialized", false)?;
+            frecency_info.set("error", "Failed to acquire frecency lock")?;
+        }
+    }
+    table.set("frecency", frecency_info)?;
+
+    let query_tracker_info = lua.create_table()?;
+    match QUERY_TRACKER.read() {
+        Ok(guard) => {
+            query_tracker_info.set("initialized", guard.is_some())?;
+            if let Some(ref query_history) = *guard {
+                match query_history.get_lua_helthcheckh(lua) {
+                    Ok(healthcheck_table) => {
+                        query_tracker_info.set("db_healthcheck", healthcheck_table)?;
+                    }
+                    Err(e) => {
+                        query_tracker_info.set("db_healthcheck_error", e.to_string())?;
+                    }
+                }
+            }
+        }
+        Err(_) => {
+            query_tracker_info.set("initialized", false)?;
+            query_tracker_info.set("error", "Failed to acquire query tracker lock")?;
+        }
+    }
+    table.set("query_tracker", query_tracker_info)?;
+
+    Ok(LuaValue::Table(table))
+}
+
 fn create_exports(lua: &Lua) -> LuaResult<LuaTable> {
    let exports = lua.create_table()?;
    exports.set("init_db", lua.create_function(init_db)?)?;
@@ -413,6 +534,7 @@ fn create_exports(lua: &Lua) -> LuaResult<LuaTable> {
        "get_historical_query",
        lua.create_function(get_historical_query)?,
    )?;
+    exports.set("health_check", lua.create_function(health_check)?)?;

    Ok(exports)
 }
@@ -420,5 +542,9 @@ fn create_exports(lua: &Lua) -> LuaResult<LuaTable> {
 // https://github.com/mlua-rs/mlua/issues/318
 #[mlua::lua_module(skip_memory_check)]
 fn fff_nvim(lua: &Lua) -> LuaResult<LuaTable> {
+    // Install panic hook IMMEDIATELY on module load
+    // This ensures any panics are logged even if init_tracing is never called
+    crate::log::install_panic_hook();
+
    create_exports(lua)
 }
@@ -7,6 +7,78 @@ use tracing_subscriber::{EnvFilter, fmt, prelude::*};
 static TRACING_INITIALIZED: std::sync::OnceLock<tracing_appender::non_blocking::WorkerGuard> =
    std::sync::OnceLock::new();

+static PANIC_HOOK_INSTALLED: std::sync::OnceLock<()> = std::sync::OnceLock::new();
+
+/// Install panic hook that writes to both stderr and a fallback file
+/// This is called separately from init_tracing to ensure panics are always logged
+pub fn install_panic_hook() {
+    PANIC_HOOK_INSTALLED.get_or_init(|| {
+        let default_panic = std::panic::take_hook();
+
+        std::panic::set_hook(Box::new(move |panic_info| {
+            let payload = panic_info.payload();
+            let message = if let Some(s) = payload.downcast_ref::<&str>() {
+                s.to_string()
+            } else if let Some(s) = payload.downcast_ref::<String>() {
+                s.clone()
+            } else {
+                "Unknown panic payload".to_string()
+            };
+
+            let location = if let Some(location) = panic_info.location() {
+                format!(
+                    "{}:{}:{}",
+                    location.file(),
+                    location.line(),
+                    location.column()
+                )
+            } else {
+                "unknown location".to_string()
+            };
+
+            // Always log to tracing (if initialized)
+            tracing::error!(
+                panic.message = %message,
+                panic.location = %location,
+                "PANIC occurred in FFF.nvim"
+            );
+
+            // Always print to stderr
+            eprintln!("=== FFF.nvim PANIC ===");
+            eprintln!("Message: {}", message);
+            eprintln!("Location: {}", location);
+            eprintln!("======================");
+
+            // Try to write to fallback panic log file
+            if let Some(cache_dir) = dirs::cache_dir() {
+                let panic_log = cache_dir.join("fff_nvim_panic.log");
+                let timestamp = std::time::SystemTime::now()
+                    .duration_since(std::time::UNIX_EPOCH)
+                    .map(|d| d.as_secs())
+                    .unwrap_or(0);
+
+                let panic_entry = format!(
+                    "\n[{}] PANIC at {}\nMessage: {}\n",
+                    timestamp, location, message
+                );
+
+                let _ = std::fs::OpenOptions::new()
+                    .create(true)
+                    .append(true)
+                    .open(&panic_log)
+                    .and_then(|mut f| {
+                        use std::io::Write;
+                        f.write_all(panic_entry.as_bytes())
+                    });
+
+                eprintln!("Panic logged to: {}", panic_log.display());
+            }
+
+            default_panic(panic_info);
+        }));
+    });
+}
+
 /// Initialize tracing with single log file
 ///
 /// # Arguments
@@ -16,6 +88,9 @@ static TRACING_INITIALIZED: std::sync::OnceLock<tracing_appender::non_blocking::
 /// # Returns
 /// * `Result<String, Error>` - Full path to the log file on success
 pub fn init_tracing(log_file_path: &str, log_level: Option<&str>) -> Result<String, Error> {
+    // Install panic hook first (does nothing if already installed)
+    install_panic_hook();
+
    let log_path = Path::new(log_file_path);
    if let Some(parent) = log_path.parent() {
        std::fs::create_dir_all(parent)?;
@@ -70,36 +145,6 @@ pub fn init_tracing(log_file_path: &str, log_level: Option<&str>) -> Result<Stri
            );
        }

-        std::panic::set_hook(Box::new(|panic_info| {
-            let payload = panic_info.payload();
-            let message = if let Some(s) = payload.downcast_ref::<&str>() {
-                s.to_string()
-            } else if let Some(s) = payload.downcast_ref::<String>() {
-                s.clone()
-            } else {
-                "Unknown panic payload".to_string()
-            };
-
-            let location = if let Some(location) = panic_info.location() {
-                format!(
-                    "{}:{}:{}",
-                    location.file(),
-                    location.line(),
-                    location.column()
-                )
-            } else {
-                "unknown location".to_string()
-            };
-
-            tracing::error!(
-                panic.message = %message,
-                panic.location = %location,
-                "PANIC occurred in FFF.nvim"
-            );
-
-            eprintln!("FFF.nvim PANIC: {} at {}", message, location);
-        }));
-
        guard
    });

@@ -1,3 +1,4 @@
+use crate::db_healthcheck::DbHealthChecker;
 use crate::error::Error;
 use heed::types::Bytes;
 use heed::{Database, Env, EnvOpenOptions};
@@ -34,6 +35,24 @@ pub struct QueryTracker {
    query_history_db: Database<Bytes, SerdeBincode<VecDeque<HistoryEntry>>>,
 }

+impl DbHealthChecker for QueryTracker {
+    fn get_env(&self) -> &Env {
+        &self.env
+    }
+
+    fn count_entries(&self) -> Result<Vec<(&'static str, u64)>, Error> {
+        let rtxn = self.env.read_txn().map_err(Error::DbStartReadTxn)?;
+
+        let count_queries = self.query_file_db.len(&rtxn).map_err(Error::DbRead)?;
+        let count_histories = self.query_history_db.len(&rtxn).map_err(Error::DbRead)?;
+
+        Ok(vec![
+            ("query_file_entries", count_queries),
+            ("query_history_entries", count_histories),
+        ])
+    }
+}
+
 impl QueryTracker {
    pub fn new(db_path: &str, use_unsafe_no_lock: bool) -> Result<Self, Error> {
        fs::create_dir_all(db_path).map_err(Error::CreateDir)?;
@@ -195,7 +195,7 @@ pub fn match_and_score_files<'a>(
        })
        .collect();

-    sort_and_truncate(results, context)
+    sort_and_paginate(results, context)
 }

 /// Check if a filename is a special entry point file that deserves bonus scoring
@@ -254,7 +254,7 @@ fn score_all_by_frecency<'a>(
        })
        .collect();

-    sort_and_truncate(results, context)
+    sort_and_paginate(results, context)
 }

 #[inline]
@@ -277,75 +277,77 @@ fn calculate_current_file_penalty(
    penalty
 }

-/// Dynamically sorts and returns the top results either in ascending or descending order
-/// Uses partial sorting for large result sets to improve performance
-fn sort_and_truncate<'a>(
+/// Sorts elements by total score (descending) and returns the requested page.
+/// Always returns results in descending order (best scores first).
+/// The UI layer handles rendering order based on prompt position.
+#[tracing::instrument(skip_all, level = tracing::Level::DEBUG)]
+fn sort_and_paginate<'a>(
    mut results: Vec<(&'a FileItem, Score)>,
    context: &ScoringContext,
 ) -> (Vec<&'a FileItem>, Vec<Score>, usize) {
    let total_matched = results.len();

-    // For large result sets, use partial sort to avoid sorting everything
-    let threshold = context.max_results * 2;
+    if total_matched == 0 {
+        return (vec![], vec![], 0);
+    }

-    if context.reverse_order {
-        // Ascending order: want highest N items displayed as [low -> high]
-        if results.len() > threshold {
-            // Partition at position (len - max_results) with ascending comparator
-            // This puts the highest max_results items after this position
-            let partition_index = results.len() - context.max_results;
-            results.select_nth_unstable_by(partition_index, |a, b| {
-                a.1.total
-                    .cmp(&b.1.total)
-                    .then_with(|| a.0.modified.cmp(&b.0.modified))
-            });
-            // Remove everything before partition_index, keeping highest max_results items
-            results.drain(0..partition_index);
-        }
-
-        // Sort remaining results in ascending order using glidesort
-        sort_with_buffer(&mut results, |a, b| {
-            a.1.total
-                .cmp(&b.1.total)
-                .then_with(|| a.0.modified.cmp(&b.0.modified))
-        });
-
-        // If still more than max_results (for small datasets), drain the front
-        if results.len() > context.max_results {
-            results.drain(0..(results.len() - context.max_results));
-        }
+    let offset = context.pagination.offset;
+    let limit = if context.pagination.limit > 0 {
+        context.pagination.limit
    } else {
-        // Descending order: want highest N items displayed as [high -> low]
-        if results.len() > threshold {
-            // Partition at position (max_results - 1) with descending comparator
-            // This puts the highest max_results items at the front
-            results.select_nth_unstable_by(context.max_results - 1, |a, b| {
-                b.1.total
-                    .cmp(&a.1.total)
-                    .then_with(|| b.0.modified.cmp(&a.0.modified))
-            });
-            // Keep only the first max_results items
-            results.truncate(context.max_results);
-        }
+        total_matched
+    };

-        // Sort remaining results in descending order using glidesort
-        sort_with_buffer(&mut results, |a, b| {
+    // Check if offset is out of bounds
+    if offset >= total_matched {
+        tracing::warn!(
+            offset = offset,
+            total_matched = total_matched,
+            "Pagination: offset >= total_matched, returning empty"
+        );
+
+        return (vec![], vec![], total_matched);
+    }
+
+    let items_needed = offset.saturating_add(limit).min(total_matched);
+    // Use partial sort if we need less than half the results and dataset is large
+    let use_partial_sort = items_needed < total_matched / 2 && total_matched > 100;
+    // Always sort in descending order (best scores first)
+    if use_partial_sort {
+        // Partition at position (items_needed - 1) with descending comparator
+        // This puts the highest N needed items at the front
+        results.select_nth_unstable_by(items_needed - 1, |a, b| {
            b.1.total
                .cmp(&a.1.total)
                .then_with(|| b.0.modified.cmp(&a.0.modified))
        });
-
-        // Ensure we only return max_results items (for small datasets)
-        results.truncate(context.max_results);
+        results.truncate(items_needed);
    }

-    let (items, scores) = results.into_iter().unzip();
+    // select nth does not sort the results, we have to sort accordingly anyway
+    sort_with_buffer(&mut results, |a, b| {
+        b.1.total
+            .cmp(&a.1.total)
+            .then_with(|| b.0.modified.cmp(&a.0.modified))
+    });
+
+    // in the best scenario truncation happened in the select_nth step
+    if results.len() > limit {
+        let page_end = std::cmp::min(offset + limit, results.len());
+        let page_size = page_end - offset;
+
+        results.drain(0..offset);
+        results.truncate(page_size);
+    }
+
+    let (items, scores): (Vec<&FileItem>, Vec<Score>) = results.into_iter().unzip();
    (items, scores, total_matched)
 }

 #[cfg(test)]
 mod tests {
    use super::*;
+    use crate::types::PaginationArgs;
    use std::path::PathBuf;

    fn create_test_file(path: &str, score: i32, modified: u64) -> (FileItem, Score) {
@@ -401,23 +403,26 @@ mod tests {

        let context = ScoringContext {
            query: "test",
-            max_results: 3,
            max_threads: 1,
            max_typos: 2,
            current_file: None,
-            reverse_order: false,
            last_same_query_match: None,
            project_path: None,
            combo_boost_score_multiplier: 100,
            min_combo_count: 3,
+
+            pagination: PaginationArgs {
+                offset: 0,
+                limit: 0,
+            },
        };

-        // Test with partial sort (threshold = 3 * 2 = 6, our len is 10 > 6)
-        let (items, scores, total) = sort_and_truncate(results.clone(), &context);
+        // Test with full sort - returns all results sorted descending
+        let (items, scores, total) = sort_and_paginate(results.clone(), &context);

-        // Should return top 3: 300, 250, 200
+        // Should return all 10 items sorted by score descending
        assert_eq!(total, 10);
-        assert_eq!(scores.len(), 3);
+        assert_eq!(scores.len(), 10);
        assert_eq!(scores[0].total, 300, "First should be highest score");
        assert_eq!(scores[1].total, 250, "Second should be second highest");
        assert_eq!(scores[2].total, 200, "Third should be third highest");
@@ -446,26 +451,34 @@ mod tests {

        let context = ScoringContext {
            query: "test",
-            max_results: 3,
            max_threads: 1,
            max_typos: 2,
            current_file: None,
-            reverse_order: false,
            last_same_query_match: None,
            project_path: None,
            combo_boost_score_multiplier: 100,
            min_combo_count: 3,
+
+            pagination: PaginationArgs {
+                offset: 0,
+                limit: 0,
+            },
        };

-        let (items, scores, _) = sort_and_truncate(results, &context);
+        let (items, scores, _) = sort_and_paginate(results, &context);

-        // Should return: 200(9000), 200(1000), 100(8000)
+        // Should return all 5 items sorted: 200(9000), 200(1000), 100(8000), 100(5000), 100(3000)
+        assert_eq!(scores.len(), 5);
        assert_eq!(scores[0].total, 200);
        assert_eq!(items[0].modified, 9000, "First 200 should be newest");
        assert_eq!(scores[1].total, 200);
        assert_eq!(items[1].modified, 1000, "Second 200 should be older");
        assert_eq!(scores[2].total, 100);
-        assert_eq!(items[2].modified, 8000, "Third should be newest of 100s");
+        assert_eq!(items[2].modified, 8000, "First 100 should be newest");
+        assert_eq!(scores[3].total, 100);
+        assert_eq!(items[3].modified, 5000);
+        assert_eq!(scores[4].total, 100);
+        assert_eq!(items[4].modified, 3000, "Last 100 should be oldest");
    }

    #[test]
@@ -484,66 +497,29 @@ mod tests {

        let context = ScoringContext {
            query: "test",
-            max_results: 2,
            max_threads: 1,
            max_typos: 2,
            current_file: None,
-            reverse_order: false,
            last_same_query_match: None,
            project_path: None,
            combo_boost_score_multiplier: 100,
            min_combo_count: 3,
+
+            pagination: PaginationArgs {
+                offset: 0,
+                limit: 0,
+            },
        };

-        // threshold = 2 * 2 = 4, len = 3 < 4, so regular sort
-        let (items, scores, _) = sort_and_truncate(results, &context);
+        // Returns all results sorted descending
+        let (items, scores, _) = sort_and_paginate(results, &context);

-        assert_eq!(scores.len(), 2);
+        assert_eq!(scores.len(), 3);
        assert_eq!(scores[0].total, 200);
        assert_eq!(scores[1].total, 100);
+        assert_eq!(scores[2].total, 50);
        assert_eq!(items[0].relative_path, "file2.rs");
        assert_eq!(items[1].relative_path, "file1.rs");
-    }
-
-    #[test]
-    fn test_reverse_order_partial_sort() {
-        let test_data = vec![
-            create_test_file("file1.rs", 100, 1000),
-            create_test_file("file2.rs", 200, 2000),
-            create_test_file("file3.rs", 50, 3000),
-            create_test_file("file4.rs", 300, 4000),
-            create_test_file("file5.rs", 150, 5000),
-            create_test_file("file6.rs", 250, 6000),
-        ];
-
-        let results: Vec<(&FileItem, Score)> = test_data
-            .iter()
-            .map(|(file, score)| (file, score.clone()))
-            .collect();
-
-        let context = ScoringContext {
-            query: "test",
-            max_results: 3,
-            max_threads: 1,
-            max_typos: 2,
-            current_file: None,
-            reverse_order: true,
-            last_same_query_match: None,
-            project_path: None,
-            combo_boost_score_multiplier: 100,
-            min_combo_count: 3,
-        };
-
-        let (items, scores, _) = sort_and_truncate(results, &context);
-
-        // Reverse order should return highest 3 in ascending order: 200, 250, 300
-        // This is for bottom-prompt UI where best results appear at bottom near the prompt
-        assert_eq!(scores.len(), 3);
-        assert_eq!(scores[0].total, 200, "First should be third highest");
-        assert_eq!(scores[1].total, 250, "Second should be second highest");
-        assert_eq!(scores[2].total, 300, "Third should be highest");
-        assert_eq!(items[0].relative_path, "file2.rs");
-        assert_eq!(items[1].relative_path, "file6.rs");
-        assert_eq!(items[2].relative_path, "file4.rs");
+        assert_eq!(items[2].relative_path, "file3.rs");
    }
 }
@@ -147,7 +147,6 @@ mod tests {
        // Simple test to verify highest scores come first
        let mut data = vec![100, 300, 200];
        sort_with_buffer(&mut data, |a, b| b.cmp(a));
-        println!("After sort: {:?}", data);
        assert_eq!(data[0], 300, "Highest should be first");
        assert_eq!(data[1], 200, "Middle should be second");
        assert_eq!(data[2], 100, "Lowest should be last");
@@ -32,18 +32,23 @@ pub struct Score {
    pub match_type: &'static str,
 }

+#[derive(Debug, Clone, Copy)]
+pub struct PaginationArgs {
+    pub offset: usize,
+    pub limit: usize,
+}
+
 #[derive(Debug, Clone)]
 pub struct ScoringContext<'a> {
    pub query: &'a str,
    pub project_path: Option<&'a Path>,
    pub current_file: Option<&'a str>,
-    pub max_results: usize,
    pub max_typos: u16,
    pub max_threads: usize,
-    pub reverse_order: bool,
    pub last_same_query_match: Option<&'a QueryMatchEntry>,
    pub combo_boost_score_multiplier: i32,
    pub min_combo_count: u32,
+    pub pagination: PaginationArgs,
 }

 #[derive(Debug, Clone, Default)]
@@ -0,0 +1,115 @@
+--- Scrollbar module for pagination indicator
+local M = {}
+
+-- Internal state
+local scrollbar_state = {
+  win = nil,
+  buf = nil,
+  ever_shown = false,
+}
+
+local ns_id = vim.api.nvim_create_namespace('fff_scrollbar')
+
+--- Render the scrollbar to show current page position
+--- Creates the window lazily if needed
+--- @param layout table Layout info with list_col, list_row, list_width, list_height, show_scrollbar
+--- @param config table Config with hl (highlight groups)
+--- @param list_win number List window handle
+--- @param pagination table Pagination state with page_index, page_size, total_matched
+--- @param prompt_position string|nil Prompt position ('top' or 'bottom', defaults to 'bottom')
+function M.render(layout, config, list_win, pagination, prompt_position)
+  if layout.show_scrollbar == false then return end
+
+  -- this is the most often path, we don't want to show scrollbar if use doesn't scrolling
+  if not scrollbar_state.ever_shown and pagination.page_index == 0 then return end
+
+  prompt_position = prompt_position or 'bottom'
+
+  local total_pages = pagination.page_size > 0 and math.ceil(pagination.total_matched / pagination.page_size) or 1
+  local has_multiple_pages = total_pages > 1
+  local scrollbar_exists = scrollbar_state.win and vim.api.nvim_win_is_valid(scrollbar_state.win)
+
+  -- If only one page, hide existing scrollbar and return
+  if not has_multiple_pages then
+    if scrollbar_exists then pcall(vim.api.nvim_win_hide, scrollbar_state.win) end
+    return
+  end
+
+  -- rendering in a separate buffer to overflow the border
+  if not scrollbar_exists then
+    scrollbar_state.buf = vim.api.nvim_create_buf(false, true)
+    vim.api.nvim_buf_set_option(scrollbar_state.buf, 'bufhidden', 'wipe')
+
+    scrollbar_state.win = vim.api.nvim_open_win(scrollbar_state.buf, false, {
+      relative = 'editor',
+      width = 1,
+      height = layout.list_height,
+      col = layout.list_col + layout.list_width + 1,
+      row = layout.list_row + 1,
+      border = 'none',
+      style = 'minimal',
+      focusable = false,
+    })
+
+    local scrollbar_hl = string.format('Normal:%s', config.hl.border)
+    vim.api.nvim_win_set_option(scrollbar_state.win, 'winhighlight', scrollbar_hl)
+
+    scrollbar_state.ever_shown = true
+  end
+
+  if not scrollbar_state.buf or not vim.api.nvim_buf_is_valid(scrollbar_state.buf) then return end
+  pcall(vim.api.nvim_win_set_config, scrollbar_state.win, { hide = false })
+
+  local win_height = vim.api.nvim_win_get_height(list_win)
+
+  local thumb_size = math.max(1, math.floor(win_height / total_pages))
+  local scrollbar_range = win_height - thumb_size
+
+  -- inverse the scrollbar when the position is at the bottom
+  local thumb_start
+  if prompt_position == 'bottom' then
+    thumb_start =
+      math.floor(((total_pages - 1 - pagination.page_index) / math.max(1, total_pages - 1)) * scrollbar_range)
+  else
+    thumb_start = math.floor((pagination.page_index / math.max(1, total_pages - 1)) * scrollbar_range)
+  end
+
+  local lines = {}
+  for i = 1, win_height do
+    if i >= thumb_start + 1 and i < thumb_start + thumb_size + 1 then
+      table.insert(lines, '▊') -- Thick block for thumb
+    else
+      table.insert(lines, '│') -- Thin line for track
+    end
+  end
+
+  pcall(vim.api.nvim_buf_set_option, scrollbar_state.buf, 'modifiable', true)
+  pcall(vim.api.nvim_buf_set_lines, scrollbar_state.buf, 0, -1, false, lines)
+  pcall(vim.api.nvim_buf_set_option, scrollbar_state.buf, 'modifiable', false)
+
+  pcall(vim.api.nvim_buf_clear_namespace, scrollbar_state.buf, ns_id, 0, -1)
+  if thumb_size > 0 then
+    pcall(vim.api.nvim_buf_set_extmark, scrollbar_state.buf, ns_id, thumb_start, 0, {
+      end_row = thumb_start + thumb_size,
+      end_col = 0,
+      hl_group = config.hl.scrollbar,
+      hl_eol = true,
+    })
+  end
+end
+
+function M.cleanup()
+  if scrollbar_state.win and vim.api.nvim_win_is_valid(scrollbar_state.win) then
+    pcall(vim.api.nvim_win_close, scrollbar_state.win, true)
+  end
+
+  if scrollbar_state.buf and vim.api.nvim_buf_is_valid(scrollbar_state.buf) then
+    pcall(vim.api.nvim_buf_delete, scrollbar_state.buf, { force = true })
+  end
+
+  scrollbar_state.win = nil
+  scrollbar_state.buf = nil
+  scrollbar_state.ever_shown = false
+end
+
+return M
@@ -0,0 +1,33 @@
+local M = {}
+
+function M.mkdir_recursive(path, callback)
+  vim.uv.fs_stat(path, function(err, stat)
+    if not err and stat then
+      callback(true, nil)
+      return
+    end
+
+    local parent = vim.fn.fnamemodify(path, ':h')
+    if parent == path or parent == '' or parent == '.' then
+      callback(false, 'Cannot create root directory')
+      return
+    end
+
+    M.mkdir_recursive(parent, function(parent_ok, parent_err)
+      if not parent_ok then
+        callback(false, parent_err)
+        return
+      end
+
+      vim.uv.fs_mkdir(path, 493, function(mkdir_err) -- 493 = 0755 octal
+        if mkdir_err and not mkdir_err:match('EEXIST') then
+          callback(false, 'Failed to create directory: ' .. mkdir_err)
+          return
+        end
+        callback(true, nil)
+      end)
+    end)
+  end)
+end
+
+return M
@@ -63,7 +63,7 @@ vim.api.nvim_create_user_command('FFFClearCache', function(opts) require('fff').
  desc = 'Clear FFF caches (all|frecency|files)',
 })

-vim.api.nvim_create_user_command('FFFHealth', function() require('fff').health_check() end, {
+vim.api.nvim_create_user_command('FFFHealth', function() vim.cmd('checkhealth fff') end, {
  desc = 'Check FFF health',
 })

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2025-09-01"
+channel = "nightly-2026-01-08"
 components = [
  "clippy-preview",
  "rustfmt-preview",
@@ -91,14 +91,16 @@ fn main() {
                &files,
                query,
                fff_nvim::file_picker::FuzzySearchOptions {
-                    max_results: 100,
                    max_threads: 4,
                    current_file: None,
-                    reverse_order: false,
                    project_path: None,
                    last_same_query_match: None,
                    combo_boost_score_multiplier: 100,
                    min_combo_count: 3,
+                    pagination: fff_nvim::types::PaginationArgs {
+                        offset: 0,
+                        limit: 100,
+                    },
                },
            );
            match_count += results.total_matched;
@@ -87,14 +87,16 @@ fn test_search_memory_pattern(
                    picker.get_files(),
                    &query,
                    fff_nvim::file_picker::FuzzySearchOptions {
-                        max_results: 50 + (i % 50),
                        max_threads: 1 + (i % 4),
                        current_file: None,
-                        reverse_order: false,
                        project_path: None,
                        last_same_query_match: None,
                        combo_boost_score_multiplier: 100,
                        min_combo_count: 3,
+                        pagination: fff_nvim::types::PaginationArgs {
+                            offset: 0,
+                            limit: 50 + (i % 50),
+                        },
                    },
                );
                (search_result.items.len(), search_result.total_matched)
@@ -125,14 +125,16 @@ fn main() {
                &files,
                query,
                fff_nvim::file_picker::FuzzySearchOptions {
-                    max_results: 100,
                    max_threads: 4,
                    current_file: None,
-                    reverse_order: false,
                    project_path: None,
                    last_same_query_match: None,
                    combo_boost_score_multiplier: 100,
                    min_combo_count: 3,
+                    pagination: fff_nvim::types::PaginationArgs {
+                        offset: 0,
+                        limit: 100,
+                    },
                },
            );

@@ -203,14 +203,16 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                    picker.get_files(),
                    query,
                    fff_nvim::file_picker::FuzzySearchOptions {
-                        max_results,
                        max_threads,
                        current_file: None,
-                        reverse_order: false,
                        project_path: None,
                        last_same_query_match: None,
                        combo_boost_score_multiplier: 100,
                        min_combo_count: 3,
+                        pagination: fff_nvim::types::PaginationArgs {
+                            offset: 0,
+                            limit: max_results,
+                        },
                    },
                );
                let duration = search_start.elapsed();
@@ -160,14 +160,16 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                files,
                "rs",
                fff_nvim::file_picker::FuzzySearchOptions {
-                    max_results: 5,
                    max_threads: 2,
                    current_file: None,
-                    reverse_order: false,
                    project_path: None,
                    last_same_query_match: None,
                    combo_boost_score_multiplier: 100,
                    min_combo_count: 3,
+                    pagination: fff_nvim::types::PaginationArgs {
+                        offset: 0,
+                        limit: 5,
+                    },
                },
            );
Author	SHA1	Message	Date
Marc Jakobi	6b01f95ca6	feat!: add all items to quickfix list if none are selected (#216 )	2026-01-24 12:56:38 -08:00
Dmitriy Kovalenko	5ab271ea9d	chore: Update rust to 1.94 (#214 )	2026-01-08 23:25:45 -08:00
Dmitriy Kovalenko	448cf3d025	fix: Vendor libgit2 + improve checkhealth (#213 ) Make sure that libgit2 is vendored so it is statically linked with a binary and we do not have a dynamic linking	2026-01-08 23:03:23 -08:00
Dmitriy Kovalenko	3cc7da787f	feat: Better keymaps for normal mode (try <leader>l & <leader>p) (#212 ) This implements significantly better keyboard shortctus for the normal mode allowing users to close the picker with the same keymap and even jump into the other fff's windows	2026-01-08 21:37:28 -08:00
Dmitriy Kovalenko	8b1f3f4e95	fix: Fully support winborder setting (#211 ) closes https://github.com/dmtrKovalenko/fff.nvim/issues/195	2026-01-08 20:54:42 -08:00
Dmitriy Kovalenko	ca4c32d364	fix: show_file_info option will work not and moved under debug (#210 ) * fix: show_file_info option will work not and moved under debug closes https://github.com/dmtrKovalenko/fff.nvim/issues/207 * chore: Update docs for - fix: show_file_info option will work not and moved under debug	2026-01-08 19:38:00 -08:00
Dmitriy Kovalenko	f6af8353c3	fix: Download lua script (#206 )	2025-12-18 21:22:50 -08:00
Dmitriy Kovalenko	b384bf7dad	fix: Not downloadable binary (#205 ) closes https://github.com/dmtrKovalenko/fff.nvim/issues/196 This issue was related to the fact that I chagned vim.mkdir to vim.uv.fs_mkdir but it is not recursive so when you installed a fresh version it never created the dir for it.	2025-12-18 18:08:34 -08:00
Dmitriy Kovalenko	2951756ae3	fix: Restore scroll position after last match result showing (#204 ) * fix: Scroll position after last match result showing * chore: Update docs for - fix: Scroll position after last match result showing * fix: Scroll position after last match result showing	2025-12-18 17:17:01 -08:00
Mohamed Ibraheem	c17056bcb6	fix: directory_path highlight is not working if there are no icons (#203 )	2025-12-18 17:10:01 -08:00
Dmitriy Kovalenko	abfa5d0ef7	feat: Add config param for git based filename highlighting (#202 ) * feat: Add config param for git based filename highlighting * chore: Update docs for - feat: Add config param for git based filename highlighting	2025-12-16 17:34:27 -08:00
Dmitriy Kovalenko	d997344fd7	fix: Invert pagination scrollbar when the prompt is in the bottom (#201 )	2025-12-16 13:16:45 -08:00
Dmitriy Kovalenko	e3ba972db6	fix: Pagination layout when combo box renderer used (#200 )	2025-12-16 13:13:24 -08:00
Dmitriy Kovalenko	a4f87bd4f2	fix: Do not rely on the global cpath (#199 ) As appeared package.cpath is global and other plugins can pollute it so we can not rely on this. Specifcially codesnap.nvim is breaking fff	2025-12-15 16:56:48 -08:00
Dmitriy Kovalenko	7fd361a369	feat: Pagination (#194 ) closes https://github.com/dmtrKovalenko/fff.nvim/issues/83	2025-12-15 16:37:37 -08:00
Dmitriy Kovalenko	c477f12487	chore: Remove not-required notifications (#198 )	2025-12-15 14:08:01 -08:00
Frank Ebel	8fe26ad4bd	docs: fix installation guide for `vim.pack` (#197 )	2025-12-15 10:13:43 -08:00
Dmitriy Kovalenko	003c05cf6d	feat: Multi-select and sending to quickfix (#193 )	2025-12-14 17:53:05 -08:00