feat: add :GpSelectAgent to improve selection of agents (#272)

* add :GpAgentSelect command

* update nvim docs

* rename to :GpSelectAgent

* fix typo

* undo autoformat

Author: jordibeen

README.md

@@ -369,6 +369,10 @@ Displays currently used agents for chat and command instructions.
 
 Choose a new agent based on its name, listing options based on the current buffer (chat agents if current buffer is a chat and command agents otherwise). The agent setting is persisted on disk across Neovim instances.
 
+#### `:GpSelectAgent` <!-- {doc=:GpSelectAgent}  -->
+
+Opens a selection interface using `vim.ui.select` to choose from all available agents, allowing you to directly select the desired agent from a list. Works seamlessly with telescope if available.
+
 ## Image commands
 
 #### `:GpImage` <!-- {doc=:GpImage}  -->
@@ -530,6 +534,7 @@ vim.keymap.set("v", "<C-g>x", ":<C-u>'<,'>GpContext<cr>", keymapOptions("Visual
 
 vim.keymap.set({"n", "i", "v", "x"}, "<C-g>s", "<cmd>GpStop<cr>", keymapOptions("Stop"))
 vim.keymap.set({"n", "i", "v", "x"}, "<C-g>n", "<cmd>GpNextAgent<cr>", keymapOptions("Next Agent"))
+vim.keymap.set({"n", "i", "v", "x"}, "<C-g>j", "<cmd>GpSelectAgent<cr>", keymapOptions("Select Agent"))
 
 -- optional Whisper commands with prefix <C-g>w
 vim.keymap.set({"n", "i"}, "<C-g>ww", "<cmd>GpWhisper<cr>", keymapOptions("Whisper"))
@@ -582,6 +587,7 @@ require("which-key").add({
         { "<C-g>gv", ":<C-u>'<,'>GpVnew<cr>", desc = "Visual GpVnew" },
         { "<C-g>i", ":<C-u>'<,'>GpImplement<cr>", desc = "Implement selection" },
         { "<C-g>n", "<cmd>GpNextAgent<cr>", desc = "Next Agent" },
+        { "<C-g>j", "<cmd>GpSelectAgent<cr>", desc = "Select Agent" },
         { "<C-g>p", ":<C-u>'<,'>GpChatPaste<cr>", desc = "Visual Chat Paste" },
         { "<C-g>r", ":<C-u>'<,'>GpRewrite<cr>", desc = "Visual Rewrite" },
         { "<C-g>s", "<cmd>GpStop<cr>", desc = "GpStop" },
@@ -618,6 +624,7 @@ require("which-key").add({
         { "<C-g>gt", "<cmd>GpTabnew<cr>", desc = "GpTabnew" },
         { "<C-g>gv", "<cmd>GpVnew<cr>", desc = "GpVnew" },
         { "<C-g>n", "<cmd>GpNextAgent<cr>", desc = "Next Agent" },
+        { "<C-g>j", "<cmd>GpSelectAgent<cr>", desc = "Select Agent" },
         { "<C-g>r", "<cmd>GpRewrite<cr>", desc = "Inline Rewrite" },
         { "<C-g>s", "<cmd>GpStop<cr>", desc = "GpStop" },
         { "<C-g>t", "<cmd>GpChatToggle<cr>", desc = "Toggle Chat" },
@@ -653,6 +660,7 @@ require("which-key").add({
         { "<C-g>gt", "<cmd>GpTabnew<cr>", desc = "GpTabnew" },
         { "<C-g>gv", "<cmd>GpVnew<cr>", desc = "GpVnew" },
         { "<C-g>n", "<cmd>GpNextAgent<cr>", desc = "Next Agent" },
+        { "<C-g>j", "<cmd>GpSelectAgent<cr>", desc = "Select Agent" },
         { "<C-g>r", "<cmd>GpRewrite<cr>", desc = "Inline Rewrite" },
         { "<C-g>s", "<cmd>GpStop<cr>", desc = "GpStop" },
         { "<C-g>t", "<cmd>GpChatToggle<cr>", desc = "Toggle Chat" },

doc/gp.nvim.txt

@@ -483,6 +483,13 @@ buffer (chat agents if current buffer is a chat and command agents otherwise).
 The agent setting is persisted on disk across Neovim instances.
 
 
+:GpSelectAgent                                                *:GpSelectAgent*
+
+Opens a selection interface using `vim.ui.select` to choose from all available
+agents, allowing you to directly select the desired agent from a list. Works
+seamlessly with telescope if available.
+
+
 IMAGE COMMANDS                                        *gp.nvim-image-commands*
 
 
@@ -668,6 +675,7 @@ them at one place).
 
     vim.keymap.set({"n", "i", "v", "x"}, "<C-g>s", "<cmd>GpStop<cr>", keymapOptions("Stop"))
     vim.keymap.set({"n", "i", "v", "x"}, "<C-g>n", "<cmd>GpNextAgent<cr>", keymapOptions("Next Agent"))
+    vim.keymap.set({"n", "i", "v", "x"}, "<C-g>j", "<cmd>GpSelectAgent<cr>", keymapOptions("Select Agent"))
 
     -- optional Whisper commands with prefix <C-g>w
     vim.keymap.set({"n", "i"}, "<C-g>ww", "<cmd>GpWhisper<cr>", keymapOptions("Whisper"))
@@ -722,6 +730,7 @@ Or go more fancy by using which-key.nvim
             { "<C-g>gv", ":<C-u>'<,'>GpVnew<cr>", desc = "Visual GpVnew" },
             { "<C-g>i", ":<C-u>'<,'>GpImplement<cr>", desc = "Implement selection" },
             { "<C-g>n", "<cmd>GpNextAgent<cr>", desc = "Next Agent" },
+            { "<C-g>j", "<cmd>GpSelectAgent<cr>", desc = "Select Agent" },
             { "<C-g>p", ":<C-u>'<,'>GpChatPaste<cr>", desc = "Visual Chat Paste" },
             { "<C-g>r", ":<C-u>'<,'>GpRewrite<cr>", desc = "Visual Rewrite" },
             { "<C-g>s", "<cmd>GpStop<cr>", desc = "GpStop" },
@@ -758,6 +767,7 @@ Or go more fancy by using which-key.nvim
             { "<C-g>gt", "<cmd>GpTabnew<cr>", desc = "GpTabnew" },
             { "<C-g>gv", "<cmd>GpVnew<cr>", desc = "GpVnew" },
             { "<C-g>n", "<cmd>GpNextAgent<cr>", desc = "Next Agent" },
+            { "<C-g>j", "<cmd>GpSelectAgent<cr>", desc = "Select Agent" },
             { "<C-g>r", "<cmd>GpRewrite<cr>", desc = "Inline Rewrite" },
             { "<C-g>s", "<cmd>GpStop<cr>", desc = "GpStop" },
             { "<C-g>t", "<cmd>GpChatToggle<cr>", desc = "Toggle Chat" },
@@ -793,6 +803,7 @@ Or go more fancy by using which-key.nvim
             { "<C-g>gt", "<cmd>GpTabnew<cr>", desc = "GpTabnew" },
             { "<C-g>gv", "<cmd>GpVnew<cr>", desc = "GpVnew" },
             { "<C-g>n", "<cmd>GpNextAgent<cr>", desc = "Next Agent" },
+            { "<C-g>j", "<cmd>GpSelectAgent<cr>", desc = "Select Agent" },
             { "<C-g>r", "<cmd>GpRewrite<cr>", desc = "Inline Rewrite" },
             { "<C-g>s", "<cmd>GpStop<cr>", desc = "GpStop" },
             { "<C-g>t", "<cmd>GpChatToggle<cr>", desc = "Toggle Chat" },

lua/gp/init.lua

@@ -1546,6 +1546,58 @@ M.cmd.NextAgent = function()
 	set_agent(agent_list[1])
 end
 
+M.cmd.SelectAgent = function()
+	local buf = vim.api.nvim_get_current_buf()
+	local file_name = vim.api.nvim_buf_get_name(buf)
+	local is_chat = M.not_chat(buf, file_name) == nil
+	local current_agent, agent_list
+
+	if is_chat then
+		current_agent = M._state.chat_agent
+		agent_list = M._chat_agents
+	else
+		current_agent = M._state.command_agent
+		agent_list = M._command_agents
+	end
+
+	if #agent_list == 0 then
+		M.logger.warning("No agents available")
+		return
+	end
+
+	-- Create options with current agent highlighted
+	local options = {}
+	for _, agent_name in ipairs(agent_list) do
+		if agent_name == current_agent then
+			table.insert(options, agent_name .. " (current)")
+		else
+			table.insert(options, agent_name)
+		end
+	end
+
+	vim.ui.select(options, {
+		prompt = is_chat and "Select chat agent:" or "Select command agent:",
+		format_item = function(item)
+			return item
+		end,
+	}, function(choice)
+		if not choice then
+			return
+		end
+
+		-- Remove " (current)" suffix if present
+		local agent_name = choice:gsub(" %(current%)$", "")
+
+		if is_chat then
+			M.refresh_state({ chat_agent = agent_name })
+			M.logger.info("Chat agent: " .. M._state.chat_agent)
+		else
+			M.refresh_state({ command_agent = agent_name })
+			M.logger.info("Command agent: " .. M._state.command_agent)
+		end
+	end)
+end
+
 ---@param name string | nil
 ---@return table | nil # { cmd_prefix, name, model, system_prompt, provider}
 M.get_command_agent = function(name)