Merge pull request #21 from mhiro2/fix/source-keymaps-layout-safety-grep-marks-cleanup

fix: Harden source-mode popups, providers, and persistence safeguards

Author: mhiro2

README.md

@@ -247,7 +247,6 @@ Configure via `require("peekstack").setup({ ... })`.
     file = { enable = true },
     marks = {
       enable = false,
-      scope = "all", -- "buffer" | "global" | "all"
       include = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
       include_special = false,
     },

doc/peekstack.txt

@@ -113,7 +113,6 @@ With options:
       file = { enable = true },
       marks = {
         enable = false,
-        scope = "all", -- "buffer" | "global" | "all"
         include = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
         include_special = false,
       },

lua/peekstack/config.lua

@@ -16,9 +16,6 @@ local KNOWN_BUFFER_MODES = { "copy", "source" }
 ---@type string[]
 local KNOWN_RESTORE_POSITIONS = { "top", "original" }
 
----@type string[]
-local KNOWN_MARK_SCOPES = { "buffer", "global", "all" }
-
 ---@type string[]
 local KNOWN_PATH_BASES = { "repo", "cwd", "absolute" }
 
@@ -171,7 +168,6 @@ M.defaults = {
     file = { enable = true },
     marks = {
       enable = false,
-      scope = "all",
       include = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
       include_special = false,
     },
@@ -443,7 +439,6 @@ local LAYOUT_OFFSET_RULES = {
 
 ---@type PeekstackConfigFieldRule[]
 local MARKS_RULES = {
-  { key = "scope", validate = field_enum(KNOWN_MARK_SCOPES), require_truthy = true },
   { key = "include", validate = field_type("string") },
   { key = "include_special", validate = field_type("boolean") },
 }

lua/peekstack/core/events.lua

@@ -72,6 +72,7 @@ function M.setup()
   reset_reflow_timer()
   popup_cursor_buffers = {}
   local group = vim.api.nvim_create_augroup("PeekstackEvents", { clear = true })
+  local keymaps = require("peekstack.ui.keymaps")
 
   vim.api.nvim_create_autocmd("WinClosed", {
     group = group,
@@ -105,6 +106,7 @@ function M.setup()
         local bufnr = vim.api.nvim_win_get_buf(winid)
         ensure_popup_cursor_tracking(group, bufnr)
       end
+      keymaps.activate_source_popup(winid)
       if is_floating_window(winid) then
         stack.touch(winid)
         local layout = require("peekstack.core.layout")
@@ -116,9 +118,17 @@ function M.setup()
     end,
   })
 
+  vim.api.nvim_create_autocmd("WinLeave", {
+    group = group,
+    callback = function()
+      keymaps.deactivate_source_popup(vim.api.nvim_get_current_win())
+    end,
+  })
+
   local current_winid = vim.api.nvim_get_current_win()
   if vim.w[current_winid].peekstack_popup_id ~= nil then
     ensure_popup_cursor_tracking(group, vim.api.nvim_win_get_buf(current_winid))
+    keymaps.activate_source_popup(current_winid)
   end
 
   local cfg = config.get()
@@ -139,8 +149,9 @@ function M.setup()
     end,
   })
 
+  local cleanup = require("peekstack.core.cleanup")
+  cleanup.stop()
   if cfg.ui.popup.auto_close and cfg.ui.popup.auto_close.enabled then
-    local cleanup = require("peekstack.core.cleanup")
     cleanup.start()
   end
 end

lua/peekstack/core/layout.lua

@@ -145,7 +145,7 @@ function M.reflow(stack)
         height = lo.height,
         zindex = z,
       })
-      vim.api.nvim_win_set_config(popup.winid, win_opts)
+      pcall(vim.api.nvim_win_set_config, popup.winid, win_opts)
       if is_zoomed then
         set_popup_zoom_winhighlight(popup.winid, true)
       else

lua/peekstack/core/popup.lua

@@ -252,6 +252,9 @@ end
 
 ---@param popup PeekstackPopupModel
 function M.close(popup)
+  -- Remove source-mode keymaps before closing the window so they do not
+  -- leak into normal editing of the shared buffer.
+  require("peekstack.ui.keymaps").remove_popup(popup)
   diagnostics_ui.clear(popup.diagnostics)
   if popup.winid and vim.api.nvim_win_is_valid(popup.winid) then
     vim.api.nvim_win_close(popup.winid, true)

lua/peekstack/persist/store.lua

@@ -72,6 +72,7 @@ function M.read(scope, opts)
         vim.schedule(function()
           local ok, decoded = pcall(vim.json.decode, data)
           if not ok or type(decoded) ~= "table" then
+            notify.warn("Failed to decode session data: " .. path)
             on_done(empty_data())
             return
           end
@@ -104,6 +105,7 @@ function M.read_sync(scope)
 
   local ok, decoded = pcall(vim.json.decode, data)
   if not ok or type(decoded) ~= "table" then
+    notify.warn("Failed to decode session data: " .. path)
     return empty_data()
   end
   return decoded

lua/peekstack/providers/file.lua

@@ -16,6 +16,12 @@ function M.under_cursor(ctx, cb)
     local source_name = vim.api.nvim_buf_get_name(ctx.bufnr)
     local base = vim.fn.fnamemodify(source_name, ":p:h")
     target = vim.fn.fnamemodify(base .. "/" .. target, ":p")
+
+    local stat = vim.uv.fs_stat(target)
+    if not stat or stat.type ~= "file" then
+      cb({})
+      return
+    end
   end
   local uri = fs.fname_to_uri(target)
   local loc = location.normalize(

lua/peekstack/providers/grep.lua

@@ -53,7 +53,7 @@ function M.search(_, cb)
       return
     end
 
-    vim.system({ "rg", "--vimgrep", query }, { text = true }, function(result)
+    vim.system({ "rg", "--vimgrep", "--max-count=1000", "--", query }, { text = true }, function(result)
       vim.schedule(function()
         if result.code ~= 0 and result.code ~= 1 then
           notify.warn("rg failed: " .. (result.stderr or "unknown error"))

lua/peekstack/types.lua

@@ -277,7 +277,6 @@
 
 ---@class PeekstackConfigProviderMarks
 ---@field enable boolean
----@field scope "buffer"|"global"|"all"
 ---@field include string
 ---@field include_special boolean