feat: Jujutsu (jj) support for files and grep, auto-detecting vcs_search function (#2610)

* fix: exclude .jj directory from file search defaults

Jujutsu (jj) stores internal data in a .jj directory. Exclude it from
the default fd_opts, rg_opts, and find_opts so .jj contents don't
appear in file picker results.

* feat: add jj_files provider for Jujutsu workspaces

Add a FzfLua jj_files command that lists tracked files using
`jj file list`, mirroring git_files but for Jujutsu repos. This
works in secondary jj workspaces that lack a .git directory.

- path.jj_root(): detects jj workspace root with fast .jj walk-up
- path.is_jj_repo(): boolean wrapper
- providers/jj.lua: jj_files provider following the git_files pattern
- defaults.lua: jj.files config with jj file list command

* feat: add vcs_files provider with jj -> git -> files fallback

Adds FzfLua vcs_files as a drop-in replacement for git_files that
auto-detects the VCS: uses jj_files in jj workspaces, git_files in
git repos, and falls back to the regular files picker otherwise.

* fix: make vcs_files self-contained to avoid E565 window error

vcs_files was delegating to git.files()/jj.files() which each call
normalize_opts and core.fzf_exec independently. This caused E565
errors when the function was invoked from a context where opening
windows isn't immediately allowed.

Instead, detect the VCS type, normalize opts with the right defaults
key, set the VCS root as cwd, and call core.fzf_exec directly.

* refactor: consolidate jj_root cmd construction into single expression

* refactor: simplify vcs_files back to delegation pattern

The E565 error was caused by hardtime.nvim + function-reference keymaps,
not by the delegation pattern. Revert to the simpler form that delegates
to jj.files()/git.files()/files() directly, avoiding duplicated logic.

* test: add unit tests for jj_root and is_jj_repo

* test: add vcs_files delegation unit tests

* fix: resolve CI lint failures and add jj documentation

- Add @param/@return annotations to is_jj_repo and jj_root to fix
  redundant-parameter lint warnings
- Add diagnostic disable for duplicate-set-field in vcs_files tests
  (intentional monkey-patching)
- Update find_opts to use -prune for .jj directories instead of -path filter
- Add opts = opts or {} in vcs_files to prevent nil indexing
- Add user-visible message in jj_root when .jj walk-up fails
- Add jj_files and vcs_files to README.md and doc/fzf-lua.txt
- Update example configs with current find_opts/rg_opts/fd_opts defaults

* fix: use discovered workspace root for jj -R flag, add docs TOC and prereqs

- Use walk-up discovered root_dir instead of opts.cwd for jj -R flag
- Add *fzf-lua-jj* TOC entry and section tag in vimdoc
- Add jj to optional dependencies in README
- Derive jj defaults from git.files via tbl_deep_extend
- Add nil-opts regression test for vcs_files()

* fix: detect GNU getopt on Apple Silicon Macs

Add /opt/homebrew/opt/gnu-getopt/bin/getopt path check for Homebrew on
Apple Silicon, before the existing /usr/local/bin/getopt Intel path.

* fix: remove explicit -print from find_opts, normalize jj_root cwd, add jj optional dep

- Remove -print from default find_opts so the hidden toggle filter and
  nullglob -print0 are correctly positioned in the predicate chain
- Append -print0 after predicates (instead of prepending) in render_crlf
- Insert hidden filter before -print0 in find commands so it is evaluated
- Normalize opts.cwd in jj_root with tilde expansion and relative path
  resolution, matching how git_cwd handles paths
- List jj as an optional dependency in the help docs

* docs: sync help file defaults with code and clarify vcs_files fallback

- Update find_opts, rg_opts, fd_opts in customization example to match
  the actual runtime defaults (remove -print and --hidden flags)
- Clarify that only jj_files is a no-op without jj; vcs_files falls
  back to git_files or the generic files picker

* fix: alignment issues

* fix: revert find_opts to `! -path` pattern and drop unrelated headless_fd.sh change

Address ibhagwan's review feedback:
- Revert find_opts from -prune to `! -path` pattern to avoid .git entries
  leaking into output and macOS -print0 incompatibilities
- Revert -print0 placement in config.lua (prepend, not append)
- Revert hidden toggle refactor in providers/files.lua (unnecessary with
  ! -path pattern)
- Revert unrelated getopt path change in scripts/headless_fd.sh

* feat: add VCS-specific header to vcs_files popup and test coverage

vcs_files now sets cwd_header_txt to indicate which VCS backend (jj/git)
is being used. Both git.files and jj.files already have "cwd" in their
_headers config, ensuring a header displays in the popup.

Tests added for: vcs_files header text per VCS type, git_files quiet
failure when not in a git repo, and _headers configuration for both
git.files and jj.files.

* fix: capitalize JJ in default-title profile ("JJ Files" not "Jj Files")

* Restore `--hidden`

* feat: simplify jj_root to use jj root command directly

* fix: handle missing jj command gracefully in utils.io_systemlist

* fix: handle missing commands gracefully in utils.io_systemlist and io_system

* docs: incorrect default --hidden

ci: fix lint

---------

Co-authored-by: bhagwan <bhagwan@disroot.org>

Author: zenibako

README.md

@@ -74,6 +74,7 @@ Using [lazy.nvim](https://github.com/folke/lazy.nvim)
   using fzf's native previewer
 - [delta](https://github.com/dandavison/delta) - syntax highlighted git pager
   for git status previews
+- [jj](https://github.com/jj-vcs/jj) - for Jujutsu commands (`jj_files`, `vcs_files`)
 - [nvim-dap](https://github.com/mfussenegger/nvim-dap) - for Debug Adapter
   Protocol (DAP) support
 - [nvim-treesitter-context](https://github.com/nvim-treesitter/nvim-treesitter-context) - for
@@ -211,6 +212,7 @@ Fzf-Lua conveniently comes with a VS-Code like picker by default
 | `treesitter`     | current buffer treesitter symbols |
 | `tabs`           | open tabs                         |
 | `args`           | argument list                     |
+| `vcs_files`      | `jj`/`git` files or `find`/`fd`   |
 
 </details>
 <details>
@@ -273,6 +275,16 @@ Fzf-Lua conveniently comes with a VS-Code like picker by default
 | `git_tags`      | git tags                 |
 | `git_stash`     | git stash                |
 
+</details>
+<details>
+<summary>Jujutsu</summary>
+
+### Jujutsu
+
+| Command    | List                   |
+| ---------- | ---------------------- |
+| `jj_files` | `jj file list` tracked files |
+
 </details>
 <details>
 <summary>LSP / Diagnostics</summary>
@@ -823,9 +835,9 @@ previewers = {
     -- otherwise auto-detect prioritizes `fd`:`rg`:`find`
     -- default options are controlled by 'fd|rg|find|_opts'
     -- cmd            = "rg --files",
-    find_opts         = [[-type f \! -path '*/.git/*']],
-    rg_opts           = [[--color=never --hidden --files -g "!.git"]],
-    fd_opts           = [[--color=never --hidden --type f --type l --exclude .git]],
+    find_opts         = [[-type f \! -path '*/.git/*' \! -path '*/.jj/*']],
+    rg_opts           = [[--color=never --files -g "!.git" -g "!.jj"]],
+    fd_opts           = [[--color=never --type f --type l --exclude .git --exclude .jj]],
     dir_opts          = [[/s/b/a:-d]],
     -- by default, cwd appears in the header only if {opts} contain a cwd
     -- parameter to a different folder than the current working directory

doc/fzf-lua.txt

@@ -17,6 +17,7 @@ Buffers and Files ................................ |fzf-lua-buffers-and-files|
 Search ...................................................... |fzf-lua-search|
 Tags .......................................................... |fzf-lua-tags|
 Git ............................................................ |fzf-lua-git|
+Jujutsu ......................................................... |fzf-lua-jj|
 LSP/Diagnostics .................................... |fzf-lua-lsp/diagnostics|
 Misc .......................................................... |fzf-lua-misc|
 Neovim API .............................................. |fzf-lua-neovim-api|
@@ -129,6 +130,11 @@ OPTIONAL DEPENDENCIES                          *fzf-lua-optional-dependencies*
   <https://github.com/MeanderingProgrammer/render-markdown.nvim> or
   markview.nvim <https://github.com/OXY2DEV/markview.nvim> - for rendering
   markdown files in the previewer
+- jj <https://github.com/jj-vcs/jj> - for Jujutsu repository support;
+  `jj_files` is a no-op when the `jj` executable is not found on PATH,
+  while `vcs_files` falls back to `git_files` or the generic `files`
+  picker (install via `cargo install jj-cli` or see
+  https://jj-vcs.github.io/jj/latest/install-and-setup)
 Below are a few optional dependencies for viewing media files (which you need
 to configure in `previewer.builtin.extensions`):
 
@@ -259,6 +265,7 @@ BUFFERS AND FILES                                  *fzf-lua-buffers-and-files*
 | `treesitter`     | current buffer treesitter symbols |
 | `tabs`           | open tabs                         |
 | `args`           | argument list                     |
+| `vcs_files`      | `jj`/`git` files or `find`/`fd`   |
 
 
 
@@ -317,6 +324,14 @@ GIT                                                              *fzf-lua-git*
 
 
 
+JUJUTSU                                                           *fzf-lua-jj*
+
+| Command    | List                         |
+| ---------- | ---------------------------- |
+| `jj_files` | `jj file list` tracked files |
+
+
+                                                                              
 LSP/DIAGNOSTICS                                      *fzf-lua-lsp/diagnostics*
 
 | Command                      | List                             |
@@ -798,9 +813,9 @@ CUSTOMIZATION                                          *fzf-lua-customization*
         -- otherwise auto-detect prioritizes `fd`:`rg`:`find`
         -- default options are controlled by 'fd|rg|find|_opts'
         -- cmd            = "rg --files",
-        find_opts         = [[-type f \! -path '*/.git/*']],
-        rg_opts           = [[--color=never --hidden --files -g "!.git"]],
-        fd_opts           = [[--color=never --hidden --type f --type l --exclude .git]],
+        find_opts         = [[-type f \! -path '*/.git/*' \! -path '*/.jj/*']],
+        rg_opts           = [[--color=never --hidden --files -g "!.git" -g "!.jj"]],
+        fd_opts           = [[--color=never --hidden --type f --type l --exclude .git --exclude .jj]],
         dir_opts          = [[/s/b/a:-d]],
         -- by default, cwd appears in the header only if {opts} contain a cwd
         -- parameter to a different folder than the current working directory
@@ -1678,4 +1693,4 @@ I missed your name feel free to contact me and I'll add it below:
   previewer code while using nvim-bqf
   <https://github.com/kevinhwang91/nvim-bqf>
 
-vim:tw=78:ts=8:ft=help:norl:
+vim:tw=78:ts=8:ft=help:norl:

lua/fzf-lua/defaults.lua

@@ -522,9 +522,9 @@ M.defaults.files  = {
   _fzf_nth_devicons      = true,
   git_status_cmd         = {
     "git", "-c", "color.status=false", "--no-optional-locks", "status", "--porcelain=v1" },
-  find_opts              = [[-type f \! -path '*/.git/*']],
-  rg_opts                = [[--color=never --files -g "!.git"]],
-  fd_opts                = [[--color=never --type f --type l --exclude .git]],
+  find_opts              = [[-type f \! -path '*/.git/*' \! -path '*/.jj/*']],
+  rg_opts                = [[--color=never --files -g "!.git" -g "!.jj"]],
+  fd_opts                = [[--color=never --type f --type l --exclude .git --exclude .jj]],
   dir_opts               = [[/s/b/a:-d]],
   hidden                 = true,
   toggle_ignore_flag     = "--no-ignore",
@@ -894,6 +894,14 @@ M.defaults.git                   = {
   },
 }
 
+M.defaults.jj                    = {
+  ---Jujutsu tracked files.
+  files = vim.tbl_deep_extend("force", M.defaults.git.files, {
+    cmd               = "jj file list --ignore-working-copy",
+    git_icons         = false,
+  }),
+}
+
 ---Grep using `rg`, `grep` or other grep commands.
 ---@class fzf-lua.config.Grep: fzf-lua.config.Base
 ---Shell command used to execute grep, default: auto detect `rg|grep`.

lua/fzf-lua/init.lua

@@ -263,6 +263,8 @@ local lazyloaded_modules = {
   git_branches = { "fzf-lua.providers.git", "branches" },
   git_worktrees = { "fzf-lua.providers.git", "worktrees" },
   git_tags = { "fzf-lua.providers.git", "tags" },
+  jj_files = { "fzf-lua.providers.jj", "files" },
+  vcs_files = { "fzf-lua.providers.files", "vcs_files" },
   oldfiles = { "fzf-lua.providers.oldfiles", "oldfiles" },
   history = { "fzf-lua.providers.oldfiles", "history" },
   undotree = { "fzf-lua.providers.undotree", "undotree" },

lua/fzf-lua/path.lua

@@ -617,6 +617,28 @@ function M.git_root(opts, noerr)
   return output[1]
 end
 
+---@param opts? table
+---@param noerr? boolean
+---@return boolean
+function M.is_jj_repo(opts, noerr)
+  return not not M.jj_root(opts, noerr)
+end
+
+---@param opts? table
+---@param noerr? boolean
+---@return string?
+function M.jj_root(opts, noerr)
+  local cmd = (opts and opts.cwd)
+      and { "jj", "-R", opts.cwd, "root", "--ignore-working-copy" }
+      or { "jj", "root", "--ignore-working-copy" }
+  local output, err = utils.io_systemlist(cmd)
+  if err ~= 0 then
+    if not noerr then utils.info(table.concat(output, "\n")) end
+    return nil
+  end
+  return output[1]
+end
+
 ---@param str string
 ---@param opts fzf-lua.config.Resolved
 ---@return fzf-lua.path.Entry|fzf-lua.keymap.Entry

lua/fzf-lua/profiles/default-title.lua

@@ -28,6 +28,7 @@ return {
     worktrees = title("Git Worktrees"),
     stash     = title("Git Stash"),
   },
+  jj                   = { files = title("JJ Files") },
   args                 = title("Args"),
   oldfiles             = title("Oldfiles"),
   history              = title("History"),

lua/fzf-lua/providers/files.lua

@@ -172,4 +172,21 @@ M.zoxide = function(opts)
   return core.fzf_exec(opts.cmd, opts)
 end
 
+---VCS-aware file picker: uses jj_files in jj repos, git_files in git repos,
+---falls back to the regular files picker otherwise.
+---@param opts table|{}?
+---@return thread?, string?, table?
+M.vcs_files = function(opts)
+  opts = opts or {}
+  if path.is_jj_repo(opts, true) then
+    opts.winopts = vim.tbl_deep_extend("keep", opts.winopts or {}, { title = " VCS Files (jj) " })
+    return require("fzf-lua.providers.jj").files(opts)
+  elseif path.is_git_repo(opts, true) then
+    opts.winopts = vim.tbl_deep_extend("keep", opts.winopts or {}, { title = " VCS Files (git) " })
+    return require("fzf-lua.providers.git").files(opts)
+  else
+    return M.files(opts)
+  end
+end
+
 return M

lua/fzf-lua/providers/jj.lua

@@ -0,0 +1,29 @@
+local core = require "fzf-lua.core"
+local path = require "fzf-lua.path"
+local utils = require "fzf-lua.utils"
+local config = require "fzf-lua.config"
+
+local M = {}
+
+local function set_jj_cwd_args(opts)
+  -- verify cwd is a jj repo, override user supplied
+  -- cwd if cwd isn't a jj repo, error was already
+  -- printed to `:messages` by 'path.jj_root'
+  local jj_root = path.jj_root(opts)
+  if not opts.cwd or not jj_root then
+    opts.cwd = jj_root
+  end
+  return opts
+end
+
+---@param opts table|{}?
+---@return thread?, string?, table?
+M.files = function(opts)
+  opts = config.normalize_opts(opts, "jj.files")
+  if not opts then return end
+  opts = set_jj_cwd_args(opts)
+  if not opts.cwd then return end
+  return core.fzf_exec(opts.cmd, opts)
+end
+
+return M

lua/fzf-lua/utils.lua

@@ -1279,7 +1279,13 @@ end
 ---@return integer exit_code (0: success)
 function M.io_systemlist(cmd)
   if vim.system ~= nil then -- nvim 0.10+
-    local proc = vim.system(cmd):wait()
+    local ok, proc_or_err = pcall(vim.system, cmd)
+    if not ok then
+      -- Command doesn't exist or other error occurred
+      -- Return the error message in the output so callers can display it
+      return { tostring(proc_or_err) }, -1
+    end
+    local proc = proc_or_err:wait()
     local output = (type(proc.stderr) == "string" and proc.stderr or "")
         .. (type(proc.stdout) == "string" and proc.stdout or "")
     return vim.split(output, "\n", { trimempty = true }), proc.code
@@ -1293,10 +1299,15 @@ end
 ---@return integer exit_code (0: success)
 function M.io_system(cmd)
   if vim.system ~= nil then -- nvim 0.10+
-    local proc = vim.system(cmd):wait()
-    local output = (type(proc.stderr) == "string" and proc.stderr or "")
-        .. (type(proc.stdout) == "string" and proc.stdout or "")
-    return output, proc.code
+    local ok, proc_or_err = pcall(function() return vim.system(cmd):wait() end)
+    if not ok then
+      -- Command doesn't exist or other error occurred
+      -- Return the error message so callers can display it
+      return tostring(proc_or_err), -1
+    end
+    local output = (type(proc_or_err.stderr) == "string" and proc_or_err.stderr or "")
+        .. (type(proc_or_err.stdout) == "string" and proc_or_err.stdout or "")
+    return output, proc_or_err.code
   else
     return vim.fn.system(cmd), vim.v.shell_error
   end