Merge branch 'main' into dev

.github/.release-please-manifest.json

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

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [15.7.0](https://github.com/LazyVim/LazyVim/compare/v15.6.0...v15.7.0) (2025-10-01)
+
+
+### Features
+
+* **sidekick:** updated keymaps for sidekick ([2942bd4](https://github.com/LazyVim/LazyVim/commit/2942bd4a0d738d693af51354e96aa7be5407d105))
+
+
+### Bug Fixes
+
+* **copilot-native:** schedule inline_completion.enable ([23b1da1](https://github.com/LazyVim/LazyVim/commit/23b1da170f6367fafe0be47b9c141770ed75a78e))
+* **sidekick:** better keymaps ([aabc03f](https://github.com/LazyVim/LazyVim/commit/aabc03f88d30b0424926d9d894adc5c91eb84ec2))
+* **stylua:** stylua is now also an LSP. Disable it since we use the CLI tool. ([2f76d57](https://github.com/LazyVim/LazyVim/commit/2f76d572a2b172e5e7e236d3e972443242c36b66))
+
 ## [15.6.0](https://github.com/LazyVim/LazyVim/compare/v15.5.0...v15.6.0) (2025-09-30)
 
 

doc/LazyVim.txt

@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim            Last change: 2025 September 30
+*LazyVim.txt*              For Neovim             Last change: 2025 October 02
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

lua/lazyvim/config/init.lua

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

lua/lazyvim/plugins/extras/ai/copilot-native.lua

@@ -45,7 +45,9 @@ return {
       },
       setup = {
         copilot = function()
-          vim.lsp.inline_completion.enable()
+          vim.schedule(function()
+            vim.lsp.inline_completion.enable()
+          end)
           -- Accept inline suggestions or next edits
           LazyVim.cmp.actions.ai_accept = function()
             return vim.lsp.inline_completion.get()

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

@@ -51,42 +51,40 @@ return {
         end
       end
     end,
+    -- stylua: ignore
     keys = {
       -- nes is also useful in normal mode
       { "<tab>", LazyVim.cmp.map({ "ai_nes" }, "<tab>"), mode = { "n" }, expr = true },
       { "<leader>a", "", desc = "+ai", mode = { "n", "v" } },
       {
         "<leader>aa",
-        function()
+        function() require("sidekick.cli").toggle() end,
-          require("sidekick.cli").toggle()
+        desc = "Sidekick Toggle CLI",
-        end,
-        mode = { "n" },
-        desc = "Sidekick Toggle",
       },
       {
-        "<leader>an",
+        "<leader>as",
-        function()
+        function() require("sidekick.cli").select() end,
-          require("sidekick.cli").select_tool()
-        end,
         mode = { "n" },
-        desc = "Sidekick New Tool",
+        desc = "Sidekick Select CLI",
       },
       {
-        "<c-.>",
+        "<leader>as",
-        function()
+        function() require("sidekick.cli").send() end,
-          require("sidekick.cli").focus()
+        mode = { "v" },
-        end,
+        desc = "Sidekick Send Visual Selection",
-        mode = { "n", "x", "i", "t" },
-        desc = "Sidekick Switch Focus",
       },
       {
         "<leader>ap",
-        function()
+        function() require("sidekick.cli").prompt() end,
-          require("sidekick.cli").select_prompt()
+        desc = "Sidekick Select Prompt",
-        end,
-        desc = "Sidekick Ask Prompt",
         mode = { "n", "v" },
       },
+      {
+        "<c-.>",
+        function() require("sidekick.cli").focus() end,
+        mode = { "n", "x", "i", "t" },
+        desc = "Sidekick Switch Focus",
+      },
     },
   },
 }