From 049445b193d5a52f47b76f8aae242ffe0949a084 Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Sun, 3 Aug 2025 06:59:11 +0200
Subject: [PATCH] feat(copilotchat-nvim): update to v4 and add mcphub.nvim
 integration

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
---
 .../editing-support/copilotchat-nvim/README.md     |  2 --
 .../editing-support/copilotchat-nvim/init.lua      |  7 ++-----
 .../editing-support/mcphub-nvim/init.lua           | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/lua/astrocommunity/editing-support/copilotchat-nvim/README.md b/lua/astrocommunity/editing-support/copilotchat-nvim/README.md
index 9b38b27cc..64abc1dd8 100644
--- a/lua/astrocommunity/editing-support/copilotchat-nvim/README.md
+++ b/lua/astrocommunity/editing-support/copilotchat-nvim/README.md
@@ -3,5 +3,3 @@
 Chat with GitHub Copilot in Neovim
 
 **Repository:** <https://github.com/CopilotC-Nvim/CopilotChat.nvim>
-
-Note: This will need to have Copilot setup, this uses the same auth as `zbirenbaum/copilot.lua` with `:Copilot setup`
diff --git a/lua/astrocommunity/editing-support/copilotchat-nvim/init.lua b/lua/astrocommunity/editing-support/copilotchat-nvim/init.lua
index 48b6748bc..a6e221a46 100644
--- a/lua/astrocommunity/editing-support/copilotchat-nvim/init.lua
+++ b/lua/astrocommunity/editing-support/copilotchat-nvim/init.lua
@@ -1,7 +1,7 @@
 ---@type LazySpec
 return {
   "CopilotC-Nvim/CopilotChat.nvim",
-  version = "^3",
+  version = "^4",
   cmd = {
     "CopilotChat",
     "CopilotChatOpen",
@@ -11,19 +11,16 @@ return {
     "CopilotChatReset",
     "CopilotChatSave",
     "CopilotChatLoad",
-    "CopilotChatDebugInfo",
     "CopilotChatModels",
-    "CopilotChatAgents",
     "CopilotChatExplain",
     "CopilotChatReview",
     "CopilotChatFix",
     "CopilotChatOptimize",
     "CopilotChatDocs",
-    "CopilotChatFixTests",
+    "CopilotChatTests",
     "CopilotChatCommit",
   },
   dependencies = {
-    { "zbirenbaum/copilot.lua" },
     { "nvim-lua/plenary.nvim" },
     {
       "AstroNvim/astrocore",
diff --git a/lua/astrocommunity/editing-support/mcphub-nvim/init.lua b/lua/astrocommunity/editing-support/mcphub-nvim/init.lua
index 6eb0a2855..387f4f7ae 100644
--- a/lua/astrocommunity/editing-support/mcphub-nvim/init.lua
+++ b/lua/astrocommunity/editing-support/mcphub-nvim/init.lua
@@ -40,4 +40,18 @@ return {
       },
     },
   },
+  {
+    "CopilotC-Nvim/CopilotChat.nvim",
+    optional = true,
+    opts = {
+      extensions = {
+        copilotchat = {
+          enabled = true,
+          convert_tools_to_functions = true,
+          convert_resources_to_functions = true,
+          add_mcp_prefix = false,
+        },
+      },
+    },
+  },
 }