Merge branch 'main' into tools

deathbeam · deathbeam · commit 873e772d958f · 2025-07-10T20:09:43.000+02:00
* main: chore(doc): auto generate docs Properly null check opts.glob when rigpgrep is not available (CopilotC-Nvim#1183) docs: add adborden as a contributor for code (CopilotC-Nvim#1171) fix: CopilotC-Nvim#1153 use filepath on accept (CopilotC-Nvim#1170) chore(doc): auto generate docs chore(main): release 3.12.1 (CopilotC-Nvim#1164) docs: add fredrikaverpil as a contributor for code (CopilotC-Nvim#1165) chore(doc): auto generate docs fix: move plenary import into function (CopilotC-Nvim#1162) chore(doc): auto generate docs chore(main): release 3.12.0 (CopilotC-Nvim#1131) docs: add azdanov as a contributor for doc, and code (CopilotC-Nvim#1130) chore(doc): auto generate docs docs: update mentions of default model to gpt-4.1 feat: switch to new default model gpt-4.1 chore(doc): auto generate docs chore(main): release 3.11.1 (CopilotC-Nvim#1116) chore(doc): auto generate docs [pre-commit.ci] pre-commit autoupdate
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -396,6 +396,27 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/77256586?v=4",
       "profile": "https://m4dd0c.netlify.app",
       "contributions": ["code"]
+    },
+    {
+      "login": "azdanov",
+      "name": "Anton Ždanov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6123841?v=4",
+      "profile": "https://www.azdanov.dev",
+      "contributions": ["doc", "code"]
+    },
+    {
+      "login": "fredrikaverpil",
+      "name": "Fredrik Averpil",
+      "avatar_url": "https://avatars.githubusercontent.com/u/994357?v=4",
+      "profile": "http://fredrikaverpil.github.io",
+      "contributions": ["code"]
+    },
+    {
+      "login": "adborden",
+      "name": "Aaron D Borden",
+      "avatar_url": "https://avatars.githubusercontent.com/u/509703?v=4",
+      "profile": "https://a14n.net",
+      "contributions": ["code"]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,6 +4,6 @@ repos:
     hooks:
       - id: prettier
   - repo: https://github.com/JohnnyMorganz/StyLua
-    rev: v2.0.2
+    rev: v2.1.0
     hooks:
       - id: stylua-github
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Changelog
 
+## [3.12.1](https://github.com/CopilotC-Nvim/CopilotChat.nvim/compare/v3.12.0...v3.12.1) (2025-06-16)
+
+
+### Bug Fixes
+
+* move plenary import into function ([#1162](https://github.com/CopilotC-Nvim/CopilotChat.nvim/issues/1162)) ([5229bc4](https://github.com/CopilotC-Nvim/CopilotChat.nvim/commit/5229bc48d655247449652d37ba525429ecfcce99))
+
+## [3.12.0](https://github.com/CopilotC-Nvim/CopilotChat.nvim/compare/v3.11.1...v3.12.0) (2025-05-09)
+
+
+### Features
+
+* switch to new default model gpt-4.1 ([5f105cf](https://github.com/CopilotC-Nvim/CopilotChat.nvim/commit/5f105cf2453585487d3c9ccfe7fd129d3344056c))
+
+## [3.11.1](https://github.com/CopilotC-Nvim/CopilotChat.nvim/compare/v3.11.0...v3.11.1) (2025-04-21)
+
+
+### Bug Fixes
+
+* **validation:** Ensure If the 	erminal buffer is excluded from #buffers and #buffer ([bc644cd](https://github.com/CopilotC-Nvim/CopilotChat.nvim/commit/bc644cd97d272e6b46272cbb11147a5891fa08ff))
+
 ## [3.11.0](https://github.com/CopilotC-Nvim/CopilotChat.nvim/compare/v3.10.1...v3.11.0) (2025-04-09)
 
 
diff --git a/README.md b/README.md
@@ -441,7 +441,7 @@ Below are all available configuration options with their default values:
 
   system_prompt = 'COPILOT_INSTRUCTIONS', -- System prompt to use (can be specified manually in prompt via /).
 
-  model = 'gpt-4o-2024-11-20', -- Default model to use, see ':CopilotChatModels' for available models (can be specified manually in prompt via $).
+  model = 'gpt-4.1', -- Default model to use, see ':CopilotChatModels' for available models (can be specified manually in prompt via $).
   group = nil, -- Default group of tools or array of groups to use (can be specified manually in prompt via @).
   sticky = nil, -- Default sticky prompt or array of sticky prompts to use at start of every new chat (can be specified manually in prompt via >).
 
@@ -746,8 +746,8 @@ require("CopilotChat").load("my_debugging_session")
 
 -- Use custom sticky and model
 require("CopilotChat").ask("How can I optimize this?", {
-  model = "gpt-4o",
-  sticky = {"#buffer", "#git:staged"}
+  model = "gpt-4.1",
+  context = {"buffer", "git:staged"}
 })
 ```
 
@@ -870,6 +870,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://ouuan.moe/about"><img src="https://avatars.githubusercontent.com/u/30581822?v=4?s=100" width="100px;" alt="Yufan You"/><br /><sub><b>Yufan You</b></sub></a><br /><a href="https://github.com/CopilotC-Nvim/CopilotChat.nvim/commits?author=ouuan" title="Documentation">📖</a> <a href="https://github.com/CopilotC-Nvim/CopilotChat.nvim/commits?author=ouuan" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://m4dd0c.netlify.app"><img src="https://avatars.githubusercontent.com/u/77256586?v=4?s=100" width="100px;" alt="Manish Kumar"/><br /><sub><b>Manish Kumar</b></sub></a><br /><a href="https://github.com/CopilotC-Nvim/CopilotChat.nvim/commits?author=m4dd0c" title="Code">💻</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.azdanov.dev"><img src="https://avatars.githubusercontent.com/u/6123841?v=4?s=100" width="100px;" alt="Anton Ždanov"/><br /><sub><b>Anton Ždanov</b></sub></a><br /><a href="https://github.com/CopilotC-Nvim/CopilotChat.nvim/commits?author=azdanov" title="Documentation">📖</a> <a href="https://github.com/CopilotC-Nvim/CopilotChat.nvim/commits?author=azdanov" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://fredrikaverpil.github.io"><img src="https://avatars.githubusercontent.com/u/994357?v=4?s=100" width="100px;" alt="Fredrik Averpil"/><br /><sub><b>Fredrik Averpil</b></sub></a><br /><a href="https://github.com/CopilotC-Nvim/CopilotChat.nvim/commits?author=fredrikaverpil" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://a14n.net"><img src="https://avatars.githubusercontent.com/u/509703?v=4?s=100" width="100px;" alt="Aaron D Borden"/><br /><sub><b>Aaron D Borden</b></sub></a><br /><a href="https://github.com/CopilotC-Nvim/CopilotChat.nvim/commits?author=adborden" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 
diff --git a/doc/CopilotChat.txt b/doc/CopilotChat.txt
@@ -1,4 +1,4 @@
-*CopilotChat.txt*          For NVIM v0.8.0          Last change: 2025 April 18
+*CopilotChat.txt*           For NVIM v0.8.0          Last change: 2025 July 09
 
 ==============================================================================
 Table of Contents                              *CopilotChat-table-of-contents*
@@ -512,7 +512,7 @@ Below are all available configuration options with their default values:
     
       system_prompt = 'COPILOT_INSTRUCTIONS', -- System prompt to use (can be specified manually in prompt via /).
     
-      model = 'gpt-4o-2024-11-20', -- Default model to use, see ':CopilotChatModels' for available models (can be specified manually in prompt via $).
+      model = 'gpt-4.1', -- Default model to use, see ':CopilotChatModels' for available models (can be specified manually in prompt via $).
       agent = 'copilot', -- Default agent to use, see ':CopilotChatAgents' for available agents (can be specified manually in prompt via @).
       context = nil, -- Default context or array of contexts to use (can be specified manually in prompt via #).
       sticky = nil, -- Default sticky prompt or array of sticky prompts to use at start of every new chat.
@@ -827,7 +827,7 @@ EXAMPLE USAGE                                      *CopilotChat-example-usage*
     
     -- Use custom context and model
     require("CopilotChat").ask("How can I optimize this?", {
-      model = "gpt-4o",
+      model = "gpt-4.1",
       context = {"buffer", "git:staged"}
     })
 <
@@ -882,7 +882,7 @@ See CONTRIBUTING.md </CONTRIBUTING.md> for detailed guidelines.
 Thanks goes to these wonderful people (emoji key
 <https://allcontributors.org/docs/en/emoji-key>):
 
-gptlang💻 📖Dung Duc Huynh (Kaka)💻 📖Ahmed Haracic💻Trí Thiện Nguyễn💻He Zhizhou💻Guruprakash Rajakkannu💻kristofka💻PostCyberPunk📖Katsuhiko Nishimra💻Erno Hopearuoho💻Shaun Garwood💻neutrinoA4💻 📖Jack Muratore💻Adriel Velazquez💻 📖Tomas Slusny💻 📖Nisal📖Tobias Gårdhus📖Petr Dlouhý📖Dylan Madisetti💻Aaron Weisberg💻 📖Jose Tlacuilo💻 📖Kevin Traver💻 📖dTry💻Arata Furukawa💻Ling💻Ivan Frolov💻Folke Lemaitre💻 📖GitMurf💻Dmitrii Lipin💻jinzhongjia📖guill💻Sjon-Paul Brown💻Renzo Mondragón💻 📖fjchen7💻Radosław Woźniak💻JakubPecenka💻thomastthai📖Tomáš Janoušek💻Toddneal Stallworth📖Sergey Alexandrov💻Léopold Mebazaa💻JunKi Jin💻abdennourzahaf📖Josiah💻Tony Fischer💻 📖Kohei Wada💻Sebastian Yaghoubi📖johncming💻Rokas Brazdžionis💻Sola📖 💻Mani Chandra💻Nischal Basuti📖Teo Ljungberg💻Joe Price💻Yufan You📖 💻This project follows the all-contributors
+gptlang💻 📖Dung Duc Huynh (Kaka)💻 📖Ahmed Haracic💻Trí Thiện Nguyễn💻He Zhizhou💻Guruprakash Rajakkannu💻kristofka💻PostCyberPunk📖Katsuhiko Nishimra💻Erno Hopearuoho💻Shaun Garwood💻neutrinoA4💻 📖Jack Muratore💻Adriel Velazquez💻 📖Tomas Slusny💻 📖Nisal📖Tobias Gårdhus📖Petr Dlouhý📖Dylan Madisetti💻Aaron Weisberg💻 📖Jose Tlacuilo💻 📖Kevin Traver💻 📖dTry💻Arata Furukawa💻Ling💻Ivan Frolov💻Folke Lemaitre💻 📖GitMurf💻Dmitrii Lipin💻jinzhongjia📖guill💻Sjon-Paul Brown💻Renzo Mondragón💻 📖fjchen7💻Radosław Woźniak💻JakubPecenka💻thomastthai📖Tomáš Janoušek💻Toddneal Stallworth📖Sergey Alexandrov💻Léopold Mebazaa💻JunKi Jin💻abdennourzahaf📖Josiah💻Tony Fischer💻 📖Kohei Wada💻Sebastian Yaghoubi📖johncming💻Rokas Brazdžionis💻Sola📖 💻Mani Chandra💻Nischal Basuti📖Teo Ljungberg💻Joe Price💻Yufan You📖 💻Manish Kumar💻Anton Ždanov📖 💻Fredrik Averpil💻Aaron D Borden💻This project follows the all-contributors
 <https://github.com/all-contributors/all-contributors> specification.
 Contributions of any kind are welcome!
 
diff --git a/lua/CopilotChat/config.lua b/lua/CopilotChat/config.lua
@@ -58,7 +58,7 @@ return {
 
   system_prompt = 'COPILOT_INSTRUCTIONS', -- System prompt to use (can be specified manually in prompt via /).
 
-  model = 'gpt-4o', -- Default model to use, see ':CopilotChatModels' for available models (can be specified manually in prompt via $).
+  model = 'gpt-4.1', -- Default model to use, see ':CopilotChatModels' for available models (can be specified manually in prompt via $).
   tools = nil, -- Default tool or array of tools (or groups) to share with LLM (can be specified manually in prompt via @).
   sticky = nil, -- Default sticky prompt or array of sticky prompts to use at start of every new chat (can be specified manually in prompt via >).
 
diff --git a/lua/CopilotChat/config/mappings.lua b/lua/CopilotChat/config/mappings.lua
@@ -63,7 +63,7 @@ local function get_diff(block)
     change = block.content,
     reference = reference or '',
     filetype = filetype or '',
-    filename = filename,
+    filename = utils.filepath(filename),
     start_line = start_line,
     end_line = end_line,
     bufnr = bufnr,
diff --git a/lua/CopilotChat/utils.lua b/lua/CopilotChat/utils.lua
@@ -1,7 +1,6 @@
 local async = require('plenary.async')
 local curl = require('plenary.curl')
 local scandir = require('plenary.scandir')
-local filetype = require('plenary.filetype')
 
 local M = {}
 M.timers = {}
@@ -214,6 +213,7 @@ end
 ---@param filename string The file name
 ---@return string|nil
 function M.filetype(filename)
+  local filetype = require('plenary.filetype')
   local ft = filetype.detect(filename, {
     fs_access = false,
   })
@@ -506,7 +506,7 @@ M.glob = async.wrap(function(path, opts, callback)
     vim.tbl_deep_extend('force', opts, {
       depth = opts.max_depth,
       add_dirs = false,
-      search_pattern = M.glob_to_pattern(opts.pattern),
+      search_pattern = opts.glob and M.glob_to_pattern(opts.glob) or nil,
       respect_gitignore = not opts.no_ignore,
       on_exit = function(files)
         callback(filter_files(files, opts.max_count))
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.11.0
+3.12.1
