Merge branch 'main' into dev

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "15.7.0"
+  ".": "15.7.1"
 }

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [15.7.1](https://github.com/LazyVim/LazyVim/compare/v15.7.0...v15.7.1) (2025-10-02)
+
+
+### Bug Fixes
+
+* **sidekick:** better keymaps ([188b288](https://github.com/LazyVim/LazyVim/commit/188b2886147acb4d9e2a5c8ae7b73770fd66a92c))
+
 ## [15.7.0](https://github.com/LazyVim/LazyVim/compare/v15.6.0...v15.7.0) (2025-10-01)
 
 

lua/lazyvim/config/init.lua

@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "15.7.0" -- x-release-please-version
+M.version = "15.7.1" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

lua/lazyvim/config/keymaps.lua

@@ -113,10 +113,12 @@ end, { desc = "Format" })
 
 -- diagnostic
 local diagnostic_goto = function(next, severity)
-  local go = next and vim.diagnostic.goto_next or vim.diagnostic.goto_prev
-  severity = severity and vim.diagnostic.severity[severity] or nil
   return function()
-    go({ severity = severity })
+    vim.diagnostic.jump({
+      count = (next and 1 or -1) * vim.v.count1,
+      severity = severity and vim.diagnostic.severity[severity] or nil,
+      float = true,
+    })
   end
 end
 map("n", "<leader>cd", vim.diagnostic.open_float, { desc = "Line Diagnostics" })

lua/lazyvim/plugins/extras/ai/sidekick.lua

@@ -64,20 +64,27 @@ return {
       {
         "<leader>as",
         function() require("sidekick.cli").select() end,
-        mode = { "n" },
-        desc = "Sidekick Select CLI",
+        -- Or to select only installed tools:
+        -- require("sidekick.cli").select({ filter = { installed = true } })
+        desc = "Select CLI",
       },
       {
-        "<leader>as",
-        function() require("sidekick.cli").send() end,
-        mode = { "v" },
-        desc = "Sidekick Send Visual Selection",
+        "<leader>at",
+        function() require("sidekick.cli").send({ msg = "{this}" }) end,
+        mode = { "x", "n" },
+        desc = "Send This",
+      },
+      {
+        "<leader>av",
+        function() require("sidekick.cli").send({ msg = "{selection}" }) end,
+        mode = { "x" },
+        desc = "Send Visual Selection",
       },
       {
         "<leader>ap",
         function() require("sidekick.cli").prompt() end,
+        mode = { "n", "x" },
         desc = "Sidekick Select Prompt",
-        mode = { "n", "v" },
       },
       {
         "<c-.>",
@@ -85,6 +92,12 @@ return {
         mode = { "n", "x", "i", "t" },
         desc = "Sidekick Switch Focus",
       },
+      -- Example of a keybinding to open Claude directly
+      {
+        "<leader>ac",
+        function() require("sidekick.cli").toggle({ name = "claude", focus = true }) end,
+        desc = "Sidekick Claude Toggle",
+      },
     },
   },
 }