Merge branch 'CopilotC-Nvim:main' into main

Author: 80avin

.all-contributorsrc

@@ -375,6 +375,20 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/810650?v=4",
       "profile": "https://teoljungberg.com",
       "contributions": ["code"]
+    },
+    {
+      "login": "JPricey",
+      "name": "Joe Price",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4826348?v=4",
+      "profile": "https://github.com/JPricey",
+      "contributions": ["code"]
+    },
+    {
+      "login": "ouuan",
+      "name": "Yufan You",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30581822?v=4",
+      "profile": "https://ouuan.moe/about",
+      "contributions": ["doc", "code"]
     }
   ],
   "contributorsPerLine": 7,

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [3.11.0](https://github.com/CopilotC-Nvim/CopilotChat.nvim/compare/v3.10.1...v3.11.0) (2025-04-09)
+
+
+### Features
+
+* add option to disable contexts in prompts ([14c78d2](https://github.com/CopilotC-Nvim/CopilotChat.nvim/commit/14c78d24e1db88384dc878e870665c3a7ad61a3a))
+* change default selection to visual only ([a63031f](https://github.com/CopilotC-Nvim/CopilotChat.nvim/commit/a63031fc706d4e34e118c46339ae2b5681fab21e)), closes [#1103](https://github.com/CopilotC-Nvim/CopilotChat.nvim/issues/1103)
+
+
+### Bug Fixes
+
+* set default model to gpt-4o again ([381d5cd](https://github.com/CopilotC-Nvim/CopilotChat.nvim/commit/381d5cddd25abec595c3c611e96cae2ba61d7ea5)), closes [#1105](https://github.com/CopilotC-Nvim/CopilotChat.nvim/issues/1105)
+
+## [3.10.1](https://github.com/CopilotC-Nvim/CopilotChat.nvim/compare/v3.10.0...v3.10.1) (2025-04-04)
+
+
+### Bug Fixes
+
+* **client:** update response_text after parsing response ([#1093](https://github.com/CopilotC-Nvim/CopilotChat.nvim/issues/1093)) ([34d1b4f](https://github.com/CopilotC-Nvim/CopilotChat.nvim/commit/34d1b4fc816401c9bad88b33f71ef943a7dd2396)), closes [#1064](https://github.com/CopilotC-Nvim/CopilotChat.nvim/issues/1064)
+* **diff:** normalize filename ([#1095](https://github.com/CopilotC-Nvim/CopilotChat.nvim/issues/1095)) ([81754ea](https://github.com/CopilotC-Nvim/CopilotChat.nvim/commit/81754ea35253c48459db5712ae60531ea2c5ef75))
+* handle invalid context window size in GitHub models ([#1094](https://github.com/CopilotC-Nvim/CopilotChat.nvim/issues/1094)) ([00bf27e](https://github.com/CopilotC-Nvim/CopilotChat.nvim/commit/00bf27ed201b9509105afaac4d5bdcc46ce89f35))
+
 ## [1.9.0](https://github.com/CopilotC-Nvim/CopilotChat.nvim/compare/v1.8.0...v1.9.0) (2024-02-24)
 
 

README.md

@@ -20,7 +20,7 @@ CopilotChat.nvim is a Neovim plugin that brings GitHub Copilot Chat capabilities
 
 - 🤖 GitHub Copilot Chat integration with official model and agent support (GPT-4o, Claude 3.7 Sonnet, Gemini 2.0 Flash, and more)
 - 💻 Rich workspace context powered by smart embeddings system
-- 🔒 Explicit context sharing - only sends what you specifically request, either as context or selection
+- 🔒 Explicit context sharing - only sends what you specifically request, either as context or selection (by default visual selection)
 - 🔌 Modular provider architecture supporting both official and custom LLM backends (Ollama, LM Studio, Mistral.ai and more)
 - 📝 Interactive chat UI with completion, diffs and quickfix integration
 - 🎯 Powerful prompt system with composable templates and sticky prompts
@@ -387,7 +387,7 @@ You can set a default selection in the configuration:
 
 ```lua
 {
-  -- Default uses visual selection or falls back to buffer
+  -- Uses visual selection or falls back to buffer
   selection = function(source)
     return select.visual(source) or select.buffer(source)
   end
@@ -466,13 +466,11 @@ Below are all available configuration options with their default values:
 
   -- default selection
   -- see select.lua for implementation
-  selection = function(source)
-    return select.visual(source) or select.buffer(source)
-  end,
+  selection = select.visual,
 
   -- default window options
   window = {
-    layout = 'vertical', -- 'vertical', 'horizontal', 'float', 'replace'
+    layout = 'vertical', -- 'vertical', 'horizontal', 'float', 'replace', or a function that returns the layout
     width = 0.5, -- fractional width of parent, or absolute width in columns when > 1
     height = 0.5, -- fractional height of parent, or absolute height in rows when > 1
     -- Options below only apply to floating windows
@@ -883,6 +881,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ThisIsMani"><img src="https://avatars.githubusercontent.com/u/84711804?v=4?s=100" width="100px;" alt="Mani Chandra"/><br /><sub><b>Mani Chandra</b></sub></a><br /><a href="https://github.com/CopilotC-Nvim/CopilotChat.nvim/commits?author=ThisIsMani" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://nischalbasuti.github.io/"><img src="https://avatars.githubusercontent.com/u/14853910?v=4?s=100" width="100px;" alt="Nischal Basuti"/><br /><sub><b>Nischal Basuti</b></sub></a><br /><a href="https://github.com/CopilotC-Nvim/CopilotChat.nvim/commits?author=nischalbasuti" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://teoljungberg.com"><img src="https://avatars.githubusercontent.com/u/810650?v=4?s=100" width="100px;" alt="Teo Ljungberg"/><br /><sub><b>Teo Ljungberg</b></sub></a><br /><a href="https://github.com/CopilotC-Nvim/CopilotChat.nvim/commits?author=teoljungberg" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JPricey"><img src="https://avatars.githubusercontent.com/u/4826348?v=4?s=100" width="100px;" alt="Joe Price"/><br /><sub><b>Joe Price</b></sub></a><br /><a href="https://github.com/CopilotC-Nvim/CopilotChat.nvim/commits?author=JPricey" title="Code">💻</a></td>
+      <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>
     </tr>
   </tbody>
 </table>

doc/CopilotChat.txt

@@ -1,4 +1,4 @@
-*CopilotChat.txt*          For NVIM v0.8.0          Last change: 2025 March 26
+*CopilotChat.txt*          For NVIM v0.8.0          Last change: 2025 April 09
 
 ==============================================================================
 Table of Contents                              *CopilotChat-table-of-contents*
@@ -38,7 +38,7 @@ capabilities directly into your editor. It provides:
 
 - 🤖 GitHub Copilot Chat integration with official model and agent support (GPT-4o, Claude 3.7 Sonnet, Gemini 2.0 Flash, and more)
 - 💻 Rich workspace context powered by smart embeddings system
-- 🔒 Explicit context sharing - only sends what you specifically request, either as context or selection
+- 🔒 Explicit context sharing - only sends what you specifically request, either as context or selection (by default visual selection)
 - 🔌 Modular provider architecture supporting both official and custom LLM backends (Ollama, LM Studio, Mistral.ai and more)
 - 📝 Interactive chat UI with completion, diffs and quickfix integration
 - 🎯 Powerful prompt system with composable templates and sticky prompts
@@ -437,7 +437,7 @@ You can set a default selection in the configuration:
 
 >lua
     {
-      -- Default uses visual selection or falls back to buffer
+      -- Uses visual selection or falls back to buffer
       selection = function(source)
         return select.visual(source) or select.buffer(source)
       end
@@ -525,13 +525,11 @@ Below are all available configuration options with their default values:
 
       -- default selection
       -- see select.lua for implementation
-      selection = function(source)
-        return select.visual(source) or select.buffer(source)
-      end,
+      selection = select.visual,
 
       -- default window options
       window = {
-        layout = 'vertical', -- 'vertical', 'horizontal', 'float', 'replace'
+        layout = 'vertical', -- 'vertical', 'horizontal', 'float', 'replace', or a function that returns the layout
         width = 0.5, -- fractional width of parent, or absolute width in columns when > 1
         height = 0.5, -- fractional height of parent, or absolute height in rows when > 1
         -- Options below only apply to floating windows
@@ -884,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💻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📖 💻This project follows the all-contributors
 <https://github.com/all-contributors/all-contributors> specification.
 Contributions of any kind are welcome!
 

lua/CopilotChat/client.lua

@@ -709,9 +709,6 @@ function Client:ask(prompt, opts)
   end
 
   local response_text = response_buffer:tostring()
-  log.trace('Response text:\n', response_text)
-  log.debug('Response message:\n', vim.inspect(last_message))
-
   if errored then
     error(response_text)
     return
@@ -727,6 +724,7 @@ function Client:ask(prompt, opts)
     else
       parse_line(response.body)
     end
+    response_text = response_buffer:tostring()
   end
 
   if utils.empty(response_text) then

lua/CopilotChat/config.lua

@@ -1,7 +1,9 @@
 local select = require('CopilotChat.select')
 
+---@alias CopilotChat.config.Layout 'vertical'|'horizontal'|'float'|'replace'
+
 ---@class CopilotChat.config.window
----@field layout 'vertical'|'horizontal'|'float'|'replace'?
+---@field layout? CopilotChat.config.Layout|fun():CopilotChat.config.Layout
 ---@field relative 'editor'|'win'|'cursor'|'mouse'?
 ---@field border 'none'|'single'|'double'|'rounded'|'solid'|'shadow'?
 ---@field width number?
@@ -23,6 +25,7 @@ local select = require('CopilotChat.select')
 ---@field stream nil|fun(chunk: string, source: CopilotChat.source):string
 ---@field callback nil|fun(response: string, source: CopilotChat.source):string
 ---@field remember_as_sticky boolean?
+---@field include_contexts_in_prompt boolean?
 ---@field selection false|nil|fun(source: CopilotChat.source):CopilotChat.select.selection?
 ---@field window CopilotChat.config.window?
 ---@field show_help boolean?
@@ -58,7 +61,7 @@ return {
 
   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-4o', -- Default model to use, see ':CopilotChatModels' for available models (can be specified manually in prompt via $).
   agent = 'none', -- 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.
@@ -69,14 +72,14 @@ return {
   callback = nil, -- Function called when full response is received (retuned string is stored to history)
   remember_as_sticky = true, -- Remember model/agent/context as sticky prompts when asking questions
 
+  include_contexts_in_prompt = true, -- Include contexts in prompt
+
   -- default selection
-  selection = function(source)
-    return select.visual(source) or select.buffer(source)
-  end,
+  selection = select.visual,
 
   -- default window options
   window = {
-    layout = 'vertical', -- 'vertical', 'horizontal', 'float', 'replace'
+    layout = 'vertical', -- 'vertical', 'horizontal', 'float', 'replace', or a function that returns the layout
     width = 0.5, -- fractional width of parent, or absolute width in columns when > 1
     height = 0.5, -- fractional height of parent, or absolute height in rows when > 1
     -- Options below only apply to floating windows

lua/CopilotChat/config/mappings.lua

@@ -64,7 +64,7 @@ local function get_diff(block)
     change = block.content,
     reference = reference or '',
     filetype = filetype or '',
-    filename = filename,
+    filename = utils.filename(filename),
     start_line = start_line,
     end_line = end_line,
     bufnr = bufnr,
@@ -240,7 +240,6 @@ return {
 
       local lines = vim.split(diff.change, '\n', { trimempty = false })
       vim.api.nvim_buf_set_lines(diff.bufnr, diff.start_line - 1, diff.end_line, false, lines)
-
       copilot.set_selection(diff.bufnr, diff.start_line, diff.start_line + #lines - 1)
     end,
   },

lua/CopilotChat/config/providers.lua

@@ -332,12 +332,20 @@ M.github_models = {
         return vim.tbl_contains(model.inferenceTasks, 'chat-completion')
       end)
       :map(function(model)
+        local context_window = model.modelLimits.textLimits.inputContextWindow
+        local max_output_tokens = model.modelLimits.textLimits.maxOutputTokens
+        local max_input_tokens = context_window - max_output_tokens
+        if max_input_tokens <= 0 then
+          max_output_tokens = 4096
+          max_input_tokens = context_window - max_output_tokens
+        end
+
         return {
           id = model.name,
           name = model.displayName,
           tokenizer = 'o200k_base',
-          max_input_tokens = model.modelLimits.textLimits.inputContextWindow,
-          max_output_tokens = model.modelLimits.textLimits.maxOutputTokens,
+          max_input_tokens = max_input_tokens,
+          max_output_tokens = max_output_tokens,
         }
       end)
       :totable()

lua/CopilotChat/init.lua

@@ -850,9 +850,11 @@ function M.ask(prompt, config)
 
   -- Resolve context name and description
   local contexts = {}
-  for name, context in pairs(M.config.contexts) do
-    if context.description then
-      contexts[name] = context.description
+  if config.include_contexts_in_prompt then
+    for name, context in pairs(M.config.contexts) do
+      if context.description then
+        contexts[name] = context.description
+      end
     end
   end
 

lua/CopilotChat/ui/chat.lua

@@ -55,6 +55,7 @@ end
 ---@class CopilotChat.ui.Chat : CopilotChat.ui.Overlay
 ---@field winnr number?
 ---@field config CopilotChat.config.shared
+---@field layout CopilotChat.config.Layout?
 ---@field sections table<CopilotChat.ui.Chat.Section>
 ---@field references table<CopilotChat.Provider.reference>
 ---@field token_count number?
@@ -71,6 +72,7 @@ local Chat = class(function(self, question_header, answer_header, separator, hel
   self.winnr = nil
   self.sections = {}
   self.config = {}
+  self.layout = nil
   self.references = {}
   self.token_count = nil
   self.token_max_count = nil
@@ -268,15 +270,21 @@ function Chat:open(config)
   self:validate()
 
   local window = config.window or {}
+
   local layout = window.layout
+  if type(layout) == 'function' then
+    layout = layout()
+  end
+
   local width = window.width > 1 and window.width or math.floor(vim.o.columns * window.width)
   local height = window.height > 1 and window.height or math.floor(vim.o.lines * window.height)
 
-  if self.config and self.config.window and self.config.window.layout ~= layout then
+  if self.layout ~= layout then
     self:close()
   end
 
   self.config = config
+  self.layout = layout
 
   if self:visible() then
     return
@@ -357,7 +365,7 @@ function Chat:close(bufnr)
     utils.return_to_normal_mode()
   end
 
-  if self.config.window and self.config.window.layout == 'replace' then
+  if self.layout == 'replace' then
     if bufnr then
       self:restore(self.winnr, bufnr)
     end