diff --git a/lazy-lock.json b/lazy-lock.json
index 075ebc5..3760742 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -9,48 +9,48 @@
   "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f94f7ba948e32cd302caba1c2ca3f7c697fb4fcf" },
   "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "codecompanion.nvim": { "branch": "main", "commit": "d71d8b96c0b1ec8c047fb938552035864d530bb1" },
-  "conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" },
+  "codecompanion.nvim": { "branch": "main", "commit": "47627b5239143de03b4b7c78f9160099830ab703" },
+  "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
   "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
   "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" },
-  "copilot.lua": { "branch": "master", "commit": "891aee91eaca360b6d709ef3e8e684e764aa5513" },
-  "dashboard-nvim": { "branch": "master", "commit": "000448d837f6e7a47f8f342f29526c4d7e49e9ce" },
+  "copilot.lua": { "branch": "master", "commit": "a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0" },
+  "dashboard-nvim": { "branch": "master", "commit": "591b5b29e2f17b97496ec3179f6ecd08bb8502cc" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
-  "friendly-snippets": { "branch": "main", "commit": "31f2a2657b6261724313281fe0d8ba6f43f4a4fa" },
-  "gitsigns.nvim": { "branch": "main", "commit": "fcfa7a989cd6fed10abf02d9880dc76d7a38167d" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "gitsigns.nvim": { "branch": "main", "commit": "ee28ba3e70ecea811b8f6d7b51d81976e94b121c" },
   "goto-preview": { "branch": "main", "commit": "d1faf6ea992b5bcaaaf2c682e1aba3131a01143e" },
-  "image.nvim": { "branch": "master", "commit": "2e2d28b7734b5efdfc1219f4da8a46c761587bc2" },
+  "image.nvim": { "branch": "master", "commit": "4c51d6202628b3b51e368152c053c3fb5c5f76f2" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
   "lsp_lines.nvim": { "branch": "main", "commit": "a92c755f182b89ea91bd8a6a2227208026f27b4d" },
   "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
-  "lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" },
-  "mcphub.nvim": { "branch": "main", "commit": "d0e71f8cdc999d6d661818ea20b56eb9d7dcb15d" },
+  "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
+  "mcphub.nvim": { "branch": "main", "commit": "6f1ee64faacd549d48517a7978c335053d8f9cd2" },
   "mini.diff": { "branch": "main", "commit": "7e268d0241255abaa07b8aa0ddff028f7315fe21" },
-  "mini.nvim": { "branch": "main", "commit": "b418d585d99bd1c1a4b04dc8b2c585471665173a" },
+  "mini.nvim": { "branch": "main", "commit": "088d67751584e4168f35bca89bad70ada7ea4636" },
   "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
-  "none-ls.nvim": { "branch": "main", "commit": "1280b7965b6ed17787ffab1d4e3d9795ecdd0f51" },
-  "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
+  "none-ls.nvim": { "branch": "main", "commit": "78546696d365c4d958351881ff43a8d82ac1ed44" },
+  "nui.nvim": { "branch": "main", "commit": "8d5b0b568517935d3c84f257f272ef004d9f5a59" },
   "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-html-css": { "branch": "main", "commit": "1294109cba1dcc3ca1c0fc4f8e13e46e8951a4fd" },
-  "nvim-lint": { "branch": "master", "commit": "5b1bdf306bd3e565908145279e8bbfc594dac3b3" },
-  "nvim-lspconfig": { "branch": "master", "commit": "81920264a264144bd075f7f48f0c4356fc2c6236" },
+  "nvim-html-css": { "branch": "main", "commit": "23f53cbb8cf4ae7c302ba483ea8a28e5b03713a7" },
+  "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" },
+  "nvim-lspconfig": { "branch": "master", "commit": "94d0fec9135719e046903bbbbf8f39e3d3436d4e" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" },
-  "nvim-tree.lua": { "branch": "master", "commit": "6709463b2d18e77f7a946027917aa00d4aaed6f4" },
-  "nvim-treesitter": { "branch": "master", "commit": "7bbed4b548d9a81c14351bda93d16336edefd067" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "439789a9a8df9639ecd749bb3286b77117024a6f" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
+  "nvim-tree.lua": { "branch": "master", "commit": "be5b788f2dc1522c73fb7afad9092331c8aebe80" },
+  "nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "6daca3ad780f045550b820f262002f35175a6c04" },
+  "nvim-web-devicons": { "branch": "master", "commit": "50b5b06bff13a9b4eab946de7c7033649a6618a1" },
   "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
   "odis": { "branch": "master", "commit": "5176a07a729860d0c0cdefe96252fc7ff9e16d43" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "de39919a57e1a40a4c7dc5bae0de276f9c616ef3" },
-  "render-markdown.nvim": { "branch": "main", "commit": "8bb0d4725cc4909a603158d44ff28b6158ad9278" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "55ad4fb76ab68460f700599b7449385f0c4e858e" },
+  "render-markdown.nvim": { "branch": "main", "commit": "bffe41893d5c4ca9b166f983fa6595d101d81bc6" },
   "telescope-color-names.nvim": { "branch": "main", "commit": "95b372b9a8ba0fc7cf6a67be637ee37453f322da" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
diff --git a/lua/plugins/codecompanion.lua b/lua/plugins/codecompanion.lua
index 4ec510f..eb8f1dd 100644
--- a/lua/plugins/codecompanion.lua
+++ b/lua/plugins/codecompanion.lua
@@ -4,6 +4,7 @@ return {
 		"nvim-lua/plenary.nvim",
 		"nvim-treesitter/nvim-treesitter",
 		"j-hui/fidget.nvim",
+		"ravitemer/mcphub.nvim",
 	},
 	opts = {
 		adapters = {
@@ -17,7 +18,9 @@ return {
 						model = {
 							-- default = "claude-3.7-sonnet-thought",
 							-- default = "o3-mini",
-							default = "gemini-2.0-flash-001",
+							-- default = "gemini-2.0-flash-001",
+							default = "gpt-4.1",
+							-- default = "gpt-4o",
 							-- default = "o3-mini-2025-01-31",
 							-- choices = {
 							-- 	["o3-mini-2025-01-31"] = { opts = { can_reason = true } },
@@ -26,7 +29,7 @@ return {
 							-- 	"gpt-4o-2024-08-06",
 							-- 	"claude-3.7-sonnet-thought",
 							-- 	"claude-3.7-sonnet",
-							-- 	"claude-3.5-sonnet",
+							-- "claude-3.5-sonnet",
 							-- 	"gemini-2.0-flash-001",
 							-- },
 						},
@@ -94,8 +97,8 @@ return {
 		},
 		strategies = {
 			chat = {
-				-- adapter = "copilot",
-				adapter = "openrouter",
+				adapter = "copilot",
+				-- adapter = "openrouter",
 				roles = {
 					llm = function(adapter)
 						if adapter.model == nil then
@@ -132,19 +135,10 @@ return {
 						},
 					},
 				},
-				tools = {
-					["mcp"] = {
-						-- Prevent mcphub from loading before needed
-						callback = function()
-							return require("mcphub.extensions.codecompanion")
-						end,
-						description = "Call tools and resources from the MCP Servers",
-					},
-				},
 			},
 			inline = {
-				-- adapter = "copilot",
-				adapter = "openrouter",
+				adapter = "copilot",
+				-- adapter = "openrouter",
 			},
 		},
 		display = {
@@ -200,6 +194,16 @@ return {
 			log_level = "DEBUG",
 			-- log_level = "TRACE",
 		},
+		extensions = {
+			mcphub = {
+				callback = "mcphub.extensions.codecompanion",
+				opts = {
+					show_result_in_chat = true, -- Show the mcp tool result in the chat buffer
+					make_vars = true, -- make chat #variables from MCP server resources
+					make_slash_commands = true, -- make /slash_commands from MCP server prompts
+				},
+			},
+		},
 	},
 	init = function()
 		require("plugins.codecompanion.fidget-spinner"):init()
diff --git a/lua/plugins/none-ls.lua b/lua/plugins/none-ls.lua
index 6e9b24f..71214d8 100644
--- a/lua/plugins/none-ls.lua
+++ b/lua/plugins/none-ls.lua
@@ -1,10 +1,10 @@
 return {
-	'nvimtools/none-ls.nvim',
+	"nvimtools/none-ls.nvim",
 	config = function()
-		local null_ls = require('null-ls')
-		local helpers = require('null-ls.helpers')
+		local null_ls = require("null-ls")
+		local helpers = require("null-ls.helpers")
 		-- syncronous formatting
-		local augroup = vim.api.nvim_create_augroup('LspFormatting', {})
+		local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
 
 		-- null_ls.setup({
 		-- on_attach = function(client)
@@ -20,11 +20,11 @@ return {
 		-- })
 		-- you can reuse a shared lspconfig on_attach callback here
 
-		require('null-ls').setup({
+		require("null-ls").setup({
 			on_attach = function(client, bufnr)
-				if client.supports_method('textDocument/formatting') then
+				if client.supports_method("textDocument/formatting") then
 					vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
-					vim.api.nvim_create_autocmd('BufWritePre', {
+					vim.api.nvim_create_autocmd("BufWritePre", {
 						group = augroup,
 						buffer = bufnr,
 						callback = function()
@@ -35,7 +35,7 @@ return {
 								async = false,
 								bufnr = bufnr,
 								filter = function(client)
-									return client.name == 'null-ls'
+									return client.name == "null-ls"
 								end,
 							})
 						end,
@@ -60,8 +60,8 @@ return {
 				null_ls.builtins.formatting.markdownlint,
 				null_ls.builtins.formatting.prettier, -- handled by lsp server
 				null_ls.builtins.formatting.shfmt.with({
-					filetypes = { 'sh', 'bash' },
-					extra_args = { '-i', '0', '-ci', '-sr' },
+					filetypes = { "sh", "bash" },
+					extra_args = { "-i", "0", "-ci", "-sr" },
 				}),
 				-- null_ls.builtins.diagnostics.actionlint,
 			},