Merge branch 'main' into feat/go-extra

docs/manual/release-notes/rl-0.9.md

@@ -274,4 +274,8 @@ https://github.com/gorbit99/codewindow.nvim
 - [img-clip.nvim]'s configuration now has it's own DAG entry, separate from
   image-nvim.
 
+[alv-around](https://github.com/alv-around):
+
+- Fix `vim.assistant.codecompanion-nvim` lazy loading with [blink-cmp]
+
 <!-- vim: set textwidth=80: -->

modules/plugins/assistant/codecompanion/config.nix

@@ -18,6 +18,18 @@ in {
           package = "codecompanion-nvim";
           setupModule = "codecompanion";
           inherit (cfg) setupOpts;
+
+          # Register commands with lz.n so Neovim recognizes them immediately
+          cmd = [
+            "CodeCompanion"
+            "CodeCompanionChat"
+            "CodeCompanionActions"
+            "CodeCompanionCmd"
+          ];
+
+          # Ensure the plugin loads when entering Insert/Cmdline mode
+          # so the module is ready when blink.cmp requests it
+          event = ["InsertEnter" "CmdlineEnter"];
         };
       };
 
@@ -33,9 +45,20 @@ in {
         ];
       };
 
-      autocomplete.nvim-cmp = {
+      autocomplete = {
-        sources = {codecompanion-nvim = "[codecompanion]";};
+        nvim-cmp = {
-        sourcePlugins = ["codecompanion-nvim"];
+          sources = {codecompanion-nvim = "[codecompanion]";};
+          sourcePlugins = ["codecompanion-nvim"];
+        };
+        blink-cmp = {
+          setupOpts.sources = {
+            default = ["codecompanion"];
+            providers.codecompanion = {
+              name = "CodeCompanion";
+              module = "codecompanion.providers.completion.blink";
+            };
+          };
+        };
       };
     };
   };