From 6a69a524ea6c76f8d94b33e41a3469e4780d85db Mon Sep 17 00:00:00 2001
From: Carlos Gutierrez <cargdev@gmail.com>
Date: Fri, 16 Jan 2026 12:01:42 -0500
Subject: [PATCH] Refactor: standardize 'agent' -> 'agents' for params and
 prompts

---
 lua/codetyper/adapters/nvim/ui/context_modal.lua          | 6 +++---
 lua/codetyper/adapters/nvim/ui/diff_review.lua            | 2 +-
 lua/codetyper/adapters/nvim/ui/logs.lua                   | 2 +-
 lua/codetyper/core/diff/conflict.lua                      | 2 +-
 lua/codetyper/core/diff/diff.lua                          | 4 ++--
 lua/codetyper/core/diff/patch.lua                         | 2 +-
 lua/codetyper/core/diff/search_replace.lua                | 2 +-
 lua/codetyper/core/intent/init.lua                        | 4 ++--
 lua/codetyper/core/llm/confidence.lua                     | 2 +-
 lua/codetyper/core/llm/copilot.lua                        | 2 +-
 lua/codetyper/core/llm/gemini.lua                         | 2 +-
 lua/codetyper/core/llm/ollama.lua                         | 2 +-
 lua/codetyper/core/llm/openai.lua                         | 2 +-
 lua/codetyper/core/llm/parser.lua                         | 2 +-
 lua/codetyper/core/scheduler/loop.lua                     | 2 +-
 lua/codetyper/core/scheduler/scheduler.lua                | 2 +-
 lua/codetyper/core/scheduler/worker.lua                   | 2 +-
 lua/codetyper/core/scope/init.lua                         | 2 +-
 lua/codetyper/core/tools/bash.lua                         | 6 +++---
 lua/codetyper/core/tools/edit.lua                         | 6 +++---
 lua/codetyper/core/tools/grep.lua                         | 2 +-
 lua/codetyper/core/tools/init.lua                         | 4 ++--
 lua/codetyper/core/tools/view.lua                         | 2 +-
 lua/codetyper/features/agents/context_builder.lua         | 2 +-
 lua/codetyper/features/agents/engine.lua                  | 6 +++---
 lua/codetyper/features/agents/linter.lua                  | 4 ++--
 lua/codetyper/features/agents/permissions.lua             | 2 +-
 lua/codetyper/features/completion/inject.lua              | 2 +-
 lua/codetyper/params/{agent => agents}/bash.lua           | 0
 lua/codetyper/params/{agent => agents}/confidence.lua     | 2 +-
 lua/codetyper/params/{agent => agents}/conflict.lua       | 2 +-
 lua/codetyper/params/{agent => agents}/context.lua        | 2 +-
 lua/codetyper/params/{agent => agents}/edit.lua           | 0
 lua/codetyper/params/{agent => agents}/grep.lua           | 0
 lua/codetyper/params/{agent => agents}/intent.lua         | 2 +-
 lua/codetyper/params/{agent => agents}/languages.lua      | 2 +-
 lua/codetyper/params/{agent => agents}/linter.lua         | 2 +-
 lua/codetyper/params/{agent => agents}/logs.lua           | 2 +-
 lua/codetyper/params/{agent => agents}/parser.lua         | 2 +-
 lua/codetyper/params/{agent => agents}/patch.lua          | 2 +-
 lua/codetyper/params/{agent => agents}/permissions.lua    | 2 +-
 lua/codetyper/params/{agent => agents}/scheduler.lua      | 2 +-
 lua/codetyper/params/{agent => agents}/scope.lua          | 2 +-
 lua/codetyper/params/{agent => agents}/search_replace.lua | 2 +-
 lua/codetyper/params/{agent => agents}/tools.lua          | 2 +-
 lua/codetyper/params/{agent => agents}/view.lua           | 0
 lua/codetyper/params/{agent => agents}/worker.lua         | 2 +-
 lua/codetyper/prompts/{agent => agents}/diff.lua          | 2 +-
 lua/codetyper/prompts/{agent.lua => agents/init.lua}      | 2 +-
 lua/codetyper/prompts/{agent => agents}/intent.lua        | 2 +-
 lua/codetyper/prompts/{agent => agents}/linter.lua        | 2 +-
 lua/codetyper/prompts/{agent => agents}/loop.lua          | 2 +-
 lua/codetyper/prompts/{agent => agents}/modal.lua         | 2 +-
 lua/codetyper/prompts/{agent => agents}/scheduler.lua     | 2 +-
 lua/codetyper/prompts/{agent => agents}/tools.lua         | 2 +-
 lua/codetyper/prompts/init.lua                            | 2 +-
 56 files changed, 64 insertions(+), 64 deletions(-)
 rename lua/codetyper/params/{agent => agents}/bash.lua (100%)
 rename lua/codetyper/params/{agent => agents}/confidence.lua (90%)
 rename lua/codetyper/params/{agent => agents}/conflict.lua (91%)
 rename lua/codetyper/params/{agent => agents}/context.lua (94%)
 rename lua/codetyper/params/{agent => agents}/edit.lua (100%)
 rename lua/codetyper/params/{agent => agents}/grep.lua (100%)
 rename lua/codetyper/params/{agent => agents}/intent.lua (96%)
 rename lua/codetyper/params/{agent => agents}/languages.lua (96%)
 rename lua/codetyper/params/{agent => agents}/linter.lua (85%)
 rename lua/codetyper/params/{agent => agents}/logs.lua (91%)
 rename lua/codetyper/params/{agent => agents}/parser.lua (82%)
 rename lua/codetyper/params/{agent => agents}/patch.lua (83%)
 rename lua/codetyper/params/{agent => agents}/permissions.lua (89%)
 rename lua/codetyper/params/{agent => agents}/scheduler.lua (80%)
 rename lua/codetyper/params/{agent => agents}/scope.lua (96%)
 rename lua/codetyper/params/{agent => agents}/search_replace.lua (82%)
 rename lua/codetyper/params/{agent => agents}/tools.lua (98%)
 rename lua/codetyper/params/{agent => agents}/view.lua (100%)
 rename lua/codetyper/params/{agent => agents}/worker.lua (89%)
 rename lua/codetyper/prompts/{agent => agents}/diff.lua (95%)
 rename lua/codetyper/prompts/{agent.lua => agents/init.lua} (98%)
 rename lua/codetyper/prompts/{agent => agents}/intent.lua (95%)
 rename lua/codetyper/prompts/{agent => agents}/linter.lua (69%)
 rename lua/codetyper/prompts/{agent => agents}/loop.lua (97%)
 rename lua/codetyper/prompts/{agent => agents}/modal.lua (85%)
 rename lua/codetyper/prompts/{agent => agents}/scheduler.lua (74%)
 rename lua/codetyper/prompts/{agent => agents}/tools.lua (88%)

diff --git a/lua/codetyper/adapters/nvim/ui/context_modal.lua b/lua/codetyper/adapters/nvim/ui/context_modal.lua
index be772e7..0aa98e3 100644
--- a/lua/codetyper/adapters/nvim/ui/context_modal.lua
+++ b/lua/codetyper/adapters/nvim/ui/context_modal.lua
@@ -122,7 +122,7 @@ local function attach_requested_files()
 	end
 	local files = parse_requested_files(state.llm_response)
 	if #files == 0 then
-		local ui_prompts = require("codetyper.prompts.agent.modal").ui
+		local ui_prompts = require("codetyper.prompts.agents.modal").ui
 		vim.api.nvim_buf_set_lines(state.buf, vim.api.nvim_buf_line_count(state.buf), -1, false, ui_prompts.files_header)
 		return
 	end
@@ -191,7 +191,7 @@ function M.open(original_event, llm_response, callback, suggested_commands)
 	vim.wo[state.win].wrap = true
 	vim.wo[state.win].cursorline = true
 
-	local ui_prompts = require("codetyper.prompts.agent.modal").ui
+	local ui_prompts = require("codetyper.prompts.agents.modal").ui
 
 	-- Add header showing what the LLM said
 	local header_lines = {
@@ -325,7 +325,7 @@ local function run_project_inspect()
 		{ label = "Show repo files (git ls-files)", cmd = "git ls-files" },
 	}
 
-	local ui_prompts = require("codetyper.prompts.agent.modal").ui
+	local ui_prompts = require("codetyper.prompts.agents.modal").ui
 	local insert_pos = vim.api.nvim_buf_line_count(state.buf)
 	vim.api.nvim_buf_set_lines(state.buf, insert_pos, insert_pos, false, ui_prompts.project_inspect_header)
 
diff --git a/lua/codetyper/adapters/nvim/ui/diff_review.lua b/lua/codetyper/adapters/nvim/ui/diff_review.lua
index ff71c0f..d124360 100644
--- a/lua/codetyper/adapters/nvim/ui/diff_review.lua
+++ b/lua/codetyper/adapters/nvim/ui/diff_review.lua
@@ -6,7 +6,7 @@
 local M = {}
 
 local utils = require("codetyper.support.utils")
-local prompts = require("codetyper.prompts.agent.diff")
+local prompts = require("codetyper.prompts.agents.diff")
 
 
 ---@class DiffEntry
diff --git a/lua/codetyper/adapters/nvim/ui/logs.lua b/lua/codetyper/adapters/nvim/ui/logs.lua
index b0c922a..ce904ee 100644
--- a/lua/codetyper/adapters/nvim/ui/logs.lua
+++ b/lua/codetyper/adapters/nvim/ui/logs.lua
@@ -4,7 +4,7 @@
 
 local M = {}
 
-local params = require("codetyper.params.agent.logs")
+local params = require("codetyper.params.agents.logs")
 
 
 ---@class LogEntry
diff --git a/lua/codetyper/core/diff/conflict.lua b/lua/codetyper/core/diff/conflict.lua
index f5bfb52..7465ad8 100644
--- a/lua/codetyper/core/diff/conflict.lua
+++ b/lua/codetyper/core/diff/conflict.lua
@@ -15,7 +15,7 @@
 
 local M = {}
 
-local params = require("codetyper.params.agent.conflict")
+local params = require("codetyper.params.agents.conflict")
 
 --- Lazy load linter module
 local function get_linter()
diff --git a/lua/codetyper/core/diff/diff.lua b/lua/codetyper/core/diff/diff.lua
index 2870436..53c0ea1 100644
--- a/lua/codetyper/core/diff/diff.lua
+++ b/lua/codetyper/core/diff/diff.lua
@@ -157,7 +157,7 @@ function M.show_diff(diff_data, callback)
   end
 
   -- Show help message
-  local help_msg = require("codetyper.prompts.agent.diff").diff_help
+  local help_msg = require("codetyper.prompts.agents.diff").diff_help
 
   -- Iterate to replace {path} variable
   local final_help = {}
@@ -190,7 +190,7 @@ function M.show_bash_approval(command, callback)
   end
 
   -- Create approval dialog with options
-  local approval_prompts = require("codetyper.prompts.agent.diff").bash_approval
+  local approval_prompts = require("codetyper.prompts.agents.diff").bash_approval
   local lines = {
     "",
     approval_prompts.title,
diff --git a/lua/codetyper/core/diff/patch.lua b/lua/codetyper/core/diff/patch.lua
index 97916e7..232a6dd 100644
--- a/lua/codetyper/core/diff/patch.lua
+++ b/lua/codetyper/core/diff/patch.lua
@@ -7,7 +7,7 @@
 
 local M = {}
 
-local params = require("codetyper.params.agent.patch")
+local params = require("codetyper.params.agents.patch")
 
 
 --- Lazy load inject module to avoid circular requires
diff --git a/lua/codetyper/core/diff/search_replace.lua b/lua/codetyper/core/diff/search_replace.lua
index 9ff3612..0fc6eb9 100644
--- a/lua/codetyper/core/diff/search_replace.lua
+++ b/lua/codetyper/core/diff/search_replace.lua
@@ -6,7 +6,7 @@
 
 local M = {}
 
-local params = require("codetyper.params.agent.search_replace").patterns
+local params = require("codetyper.params.agents.search_replace").patterns
 
 ---@class SearchReplaceBlock
 ---@field search string The text to search for
diff --git a/lua/codetyper/core/intent/init.lua b/lua/codetyper/core/intent/init.lua
index 75a556a..169e5c9 100644
--- a/lua/codetyper/core/intent/init.lua
+++ b/lua/codetyper/core/intent/init.lua
@@ -13,10 +13,10 @@ local M = {}
 ---@field action string "replace"|"insert"|"append"|"none"
 ---@field keywords string[] Keywords that triggered this intent
 
-local params = require("codetyper.params.agent.intent")
+local params = require("codetyper.params.agents.intent")
 local intent_patterns = params.intent_patterns
 local scope_patterns = params.scope_patterns
-local prompts = require("codetyper.prompts.agent.intent")
+local prompts = require("codetyper.prompts.agents.intent")
 
 --- Detect intent from prompt content
 ---@param prompt string The prompt content
diff --git a/lua/codetyper/core/llm/confidence.lua b/lua/codetyper/core/llm/confidence.lua
index 1ac14c8..9aca047 100644
--- a/lua/codetyper/core/llm/confidence.lua
+++ b/lua/codetyper/core/llm/confidence.lua
@@ -6,7 +6,7 @@
 
 local M = {}
 
-local params = require("codetyper.params.agent.confidence")
+local params = require("codetyper.params.agents.confidence")
 
 --- Heuristic weights (must sum to 1.0)
 M.weights = params.weights
diff --git a/lua/codetyper/core/llm/copilot.lua b/lua/codetyper/core/llm/copilot.lua
index 17ecc1b..9376fce 100644
--- a/lua/codetyper/core/llm/copilot.lua
+++ b/lua/codetyper/core/llm/copilot.lua
@@ -437,7 +437,7 @@ function M.generate_with_tools(messages, context, tool_definitions, callback)
 		end
 
 		local tools_module = require("codetyper.core.tools")
-		local agent_prompts = require("codetyper.prompts.agent")
+		local agent_prompts = require("codetyper.prompts.agents")
 
 		-- Build system prompt with agent instructions and project context
 		local system_prompt = llm.build_system_prompt(context)
diff --git a/lua/codetyper/core/llm/gemini.lua b/lua/codetyper/core/llm/gemini.lua
index 20c081d..233c863 100644
--- a/lua/codetyper/core/llm/gemini.lua
+++ b/lua/codetyper/core/llm/gemini.lua
@@ -231,7 +231,7 @@ function M.generate_with_tools(messages, context, tool_definitions, callback)
 	end
 
 	local tools_module = require("codetyper.core.tools")
-	local agent_prompts = require("codetyper.prompts.agent")
+	local agent_prompts = require("codetyper.prompts.agents")
 
 	-- Build system prompt with agent instructions
 	local system_prompt = llm.build_system_prompt(context)
diff --git a/lua/codetyper/core/llm/ollama.lua b/lua/codetyper/core/llm/ollama.lua
index aea3fc6..a8aac68 100644
--- a/lua/codetyper/core/llm/ollama.lua
+++ b/lua/codetyper/core/llm/ollama.lua
@@ -218,7 +218,7 @@ end
 ---@param callback fun(response: table|nil, error: string|nil) Callback with Claude-like response format
 function M.generate_with_tools(messages, context, tool_definitions, callback)
 	local logs = require("codetyper.adapters.nvim.ui.logs")
-	local agent_prompts = require("codetyper.prompts.agent")
+	local agent_prompts = require("codetyper.prompts.agents")
 	local tools_module = require("codetyper.core.tools")
 
 	logs.request("ollama", get_model())
diff --git a/lua/codetyper/core/llm/openai.lua b/lua/codetyper/core/llm/openai.lua
index cb5be26..e4d8d6c 100644
--- a/lua/codetyper/core/llm/openai.lua
+++ b/lua/codetyper/core/llm/openai.lua
@@ -222,7 +222,7 @@ function M.generate_with_tools(messages, context, tool_definitions, callback)
 	end
 
 	local tools_module = require("codetyper.core.tools")
-	local agent_prompts = require("codetyper.prompts.agent")
+	local agent_prompts = require("codetyper.prompts.agents")
 
 	-- Build system prompt with agent instructions
 	local system_prompt = llm.build_system_prompt(context)
diff --git a/lua/codetyper/core/llm/parser.lua b/lua/codetyper/core/llm/parser.lua
index a5c630e..270566c 100644
--- a/lua/codetyper/core/llm/parser.lua
+++ b/lua/codetyper/core/llm/parser.lua
@@ -4,7 +4,7 @@
 
 local M = {}
 
-local params = require("codetyper.params.agent.parser")
+local params = require("codetyper.params.agents.parser")
 
 
 ---@class ParsedResponse
diff --git a/lua/codetyper/core/scheduler/loop.lua b/lua/codetyper/core/scheduler/loop.lua
index 1889b18..2f73222 100644
--- a/lua/codetyper/core/scheduler/loop.lua
+++ b/lua/codetyper/core/scheduler/loop.lua
@@ -6,7 +6,7 @@
 
 local M = {}
 
-local prompts = require("codetyper.prompts.agent.loop")
+local prompts = require("codetyper.prompts.agents.loop")
 
 ---@class AgentMessage
 ---@field role "system"|"user"|"assistant"|"tool"
diff --git a/lua/codetyper/core/scheduler/scheduler.lua b/lua/codetyper/core/scheduler/scheduler.lua
index 4c5b8ce..c002369 100644
--- a/lua/codetyper/core/scheduler/scheduler.lua
+++ b/lua/codetyper/core/scheduler/scheduler.lua
@@ -11,7 +11,7 @@ local patch = require("codetyper.core.diff.patch")
 local worker = require("codetyper.core.scheduler.worker")
 local confidence_mod = require("codetyper.core.llm.confidence")
 local context_modal = require("codetyper.adapters.nvim.ui.context_modal")
-local params = require("codetyper.params.agent.scheduler")
+local params = require("codetyper.params.agents.scheduler")
 
 -- Setup context modal cleanup on exit
 context_modal.setup()
diff --git a/lua/codetyper/core/scheduler/worker.lua b/lua/codetyper/core/scheduler/worker.lua
index 7b15c66..103c4c1 100644
--- a/lua/codetyper/core/scheduler/worker.lua
+++ b/lua/codetyper/core/scheduler/worker.lua
@@ -6,7 +6,7 @@
 
 local M = {}
 
-local params = require("codetyper.params.agent.worker")
+local params = require("codetyper.params.agents.worker")
 local confidence = require("codetyper.core.llm.confidence")
 
 ---@class WorkerResult
diff --git a/lua/codetyper/core/scope/init.lua b/lua/codetyper/core/scope/init.lua
index f52bed8..4386830 100644
--- a/lua/codetyper/core/scope/init.lua
+++ b/lua/codetyper/core/scope/init.lua
@@ -14,7 +14,7 @@ local M = {}
 ---@field name string|nil Name of the function/class if available
 
 --- Node types that represent function-like scopes per language
-local params = require("codetyper.params.agent.scope")
+local params = require("codetyper.params.agents.scope")
 local function_nodes = params.function_nodes
 local class_nodes = params.class_nodes
 local block_nodes = params.block_nodes
diff --git a/lua/codetyper/core/tools/bash.lua b/lua/codetyper/core/tools/bash.lua
index c5d0bbb..775b6c2 100644
--- a/lua/codetyper/core/tools/bash.lua
+++ b/lua/codetyper/core/tools/bash.lua
@@ -4,9 +4,9 @@
 ---@brief ]]
 
 local Base = require("codetyper.core.tools.base")
-local description = require("codetyper.prompts.agent.bash").description
-local params = require("codetyper.params.agent.bash").params
-local returns = require("codetyper.params.agent.bash").returns
+local description = require("codetyper.prompts.agents.bash").description
+local params = require("codetyper.params.agents.bash").params
+local returns = require("codetyper.params.agents.bash").returns
 local BANNED_COMMANDS = require("codetyper.commands.agents.banned").BANNED_COMMANDS
 local BANNED_PATTERNS = require("codetyper.commands.agents.banned").BANNED_PATTERNS
 
diff --git a/lua/codetyper/core/tools/edit.lua b/lua/codetyper/core/tools/edit.lua
index dfac9b2..000bc3f 100644
--- a/lua/codetyper/core/tools/edit.lua
+++ b/lua/codetyper/core/tools/edit.lua
@@ -6,9 +6,9 @@
 ---@brief ]]
 
 local Base = require("codetyper.core.tools.base")
-local description = require("codetyper.prompts.agent.edit").description
-local params = require("codetyper.params.agent.edit").params
-local returns = require("codetyper.params.agent.edit").returns
+local description = require("codetyper.prompts.agents.edit").description
+local params = require("codetyper.params.agents.edit").params
+local returns = require("codetyper.params.agents.edit").returns
 
 ---@class CoderTool
 local M = setmetatable({}, Base)
diff --git a/lua/codetyper/core/tools/grep.lua b/lua/codetyper/core/tools/grep.lua
index b16afed..8f9172e 100644
--- a/lua/codetyper/core/tools/grep.lua
+++ b/lua/codetyper/core/tools/grep.lua
@@ -4,7 +4,7 @@
 ---@brief ]]
 
 local Base = require("codetyper.core.tools.base")
-local description = require("codetyper.params.agent.grep").description
+local description = require("codetyper.params.agents.grep").description
 local params = require("codetyper.prompts.agents.grep").params
 local returns = require("codetyper.prompts.agents.grep").returns
 
diff --git a/lua/codetyper/core/tools/init.lua b/lua/codetyper/core/tools/init.lua
index e8e371b..5765632 100644
--- a/lua/codetyper/core/tools/init.lua
+++ b/lua/codetyper/core/tools/init.lua
@@ -5,7 +5,7 @@
 local M = {}
 
 --- Tool definitions in a provider-agnostic format
-M.definitions = require("codetyper.params.agent.tools").definitions
+M.definitions = require("codetyper.params.agents.tools").definitions
 
 --- Convert tool definitions to Claude API format
 ---@return table[] Tools in Claude's expected format
@@ -41,7 +41,7 @@ end
 --- Convert tool definitions to prompt format for Ollama
 ---@return string Formatted tool descriptions for system prompt
 function M.to_prompt_format()
-  local prompts = require("codetyper.prompts.agent.tools").instructions
+  local prompts = require("codetyper.prompts.agents.tools").instructions
   local lines = {
     prompts.intro,
     "",
diff --git a/lua/codetyper/core/tools/view.lua b/lua/codetyper/core/tools/view.lua
index a7251da..32f4a45 100644
--- a/lua/codetyper/core/tools/view.lua
+++ b/lua/codetyper/core/tools/view.lua
@@ -10,7 +10,7 @@ local M = setmetatable({}, Base)
 
 M.name = "view"
 
-local params = require("codetyper.params.agent.view")
+local params = require("codetyper.params.agents.view")
 local description = require("codetyper.prompts.agents.view").description
 
 M.description = description
diff --git a/lua/codetyper/features/agents/context_builder.lua b/lua/codetyper/features/agents/context_builder.lua
index 62ad83b..377509a 100644
--- a/lua/codetyper/features/agents/context_builder.lua
+++ b/lua/codetyper/features/agents/context_builder.lua
@@ -6,7 +6,7 @@
 local M = {}
 
 local utils = require("codetyper.support.utils")
-local params = require("codetyper.params.agent.context")
+local params = require("codetyper.params.agents.context")
 
 --- Get project structure as a tree string
 ---@param max_depth? number Maximum depth to traverse (default: 3)
diff --git a/lua/codetyper/features/agents/engine.lua b/lua/codetyper/features/agents/engine.lua
index f67c288..4233ff5 100644
--- a/lua/codetyper/features/agents/engine.lua
+++ b/lua/codetyper/features/agents/engine.lua
@@ -471,7 +471,7 @@ local function call_llm(messages, tools, system_prompt, provider, model, callbac
 		local client = require("codetyper.core.llm." .. provider)
 
 		-- Build prompt from messages
-		local prompts = require("codetyper.prompts.agent")
+		local prompts = require("codetyper.prompts.agents")
 		local prompt_parts = {}
 		for _, msg in ipairs(messages) do
 			if msg.role == "user" then
@@ -484,7 +484,7 @@ local function call_llm(messages, tools, system_prompt, provider, model, callbac
 		end
 
 		-- Add tool descriptions to prompt for text-based providers
-		local tool_desc = require("codetyper.prompts.agent").tool_instructions_text
+		local tool_desc = require("codetyper.prompts.agents").tool_instructions_text
 		for _, tool in ipairs(tools) do
 			local name = tool.name or (tool["function"] and tool["function"].name)
 			local desc = tool.description or (tool["function"] and tool["function"].description)
@@ -561,7 +561,7 @@ function M.run(opts)
 
 	-- Add initial file context if provided
 	if opts.files and #opts.files > 0 then
-		local file_context = require("codetyper.prompts.agent").format_file_context(opts.files)
+		local file_context = require("codetyper.prompts.agents").format_file_context(opts.files)
 		table.insert(history, { role = "user", content = file_context })
 		table.insert(history, { role = "assistant", content = "I've reviewed the provided files. What would you like me to do?" })
 	end
diff --git a/lua/codetyper/features/agents/linter.lua b/lua/codetyper/features/agents/linter.lua
index b9afcb1..3291506 100644
--- a/lua/codetyper/features/agents/linter.lua
+++ b/lua/codetyper/features/agents/linter.lua
@@ -6,8 +6,8 @@
 
 local M = {}
 
-local config_params = require("codetyper.params.agent.linter")
-local prompts = require("codetyper.prompts.agent.linter")
+local config_params = require("codetyper.params.agents.linter")
+local prompts = require("codetyper.prompts.agents.linter")
 
 --- Configuration
 local config = config_params.config
diff --git a/lua/codetyper/features/agents/permissions.lua b/lua/codetyper/features/agents/permissions.lua
index e9265c8..e9d6eb0 100644
--- a/lua/codetyper/features/agents/permissions.lua
+++ b/lua/codetyper/features/agents/permissions.lua
@@ -10,7 +10,7 @@ local M = {}
 ---@field allow_list table<string, boolean> Patterns always allowed
 ---@field deny_list table<string, boolean> Patterns always denied
 
-local params = require("codetyper.params.agent.permissions")
+local params = require("codetyper.params.agents.permissions")
 
 local state = {
 	session_allowed = {},
diff --git a/lua/codetyper/features/completion/inject.lua b/lua/codetyper/features/completion/inject.lua
index 8ff4f9c..cb82452 100644
--- a/lua/codetyper/features/completion/inject.lua
+++ b/lua/codetyper/features/completion/inject.lua
@@ -18,7 +18,7 @@ local M = {}
 ---@field import_lines table<number, boolean> Map of line numbers that are imports
 
 local utils = require("codetyper.support.utils")
-local languages = require("codetyper.params.agent.languages")
+local languages = require("codetyper.params.agents.languages")
 local import_patterns = languages.import_patterns
 
 --- Check if a line is an import statement for the given language
diff --git a/lua/codetyper/params/agent/bash.lua b/lua/codetyper/params/agents/bash.lua
similarity index 100%
rename from lua/codetyper/params/agent/bash.lua
rename to lua/codetyper/params/agents/bash.lua
diff --git a/lua/codetyper/params/agent/confidence.lua b/lua/codetyper/params/agents/confidence.lua
similarity index 90%
rename from lua/codetyper/params/agent/confidence.lua
rename to lua/codetyper/params/agents/confidence.lua
index c6e2bfe..2cb192b 100644
--- a/lua/codetyper/params/agent/confidence.lua
+++ b/lua/codetyper/params/agents/confidence.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.confidence Parameters for confidence scoring
+---@mod codetyper.params.agents.confidence Parameters for confidence scoring
 local M = {}
 
 --- Heuristic weights (must sum to 1.0)
diff --git a/lua/codetyper/params/agent/conflict.lua b/lua/codetyper/params/agents/conflict.lua
similarity index 91%
rename from lua/codetyper/params/agent/conflict.lua
rename to lua/codetyper/params/agents/conflict.lua
index 22e2800..5c77656 100644
--- a/lua/codetyper/params/agent/conflict.lua
+++ b/lua/codetyper/params/agents/conflict.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.conflict Parameters for conflict resolution
+---@mod codetyper.params.agents.conflict Parameters for conflict resolution
 local M = {}
 
 --- Configuration defaults
diff --git a/lua/codetyper/params/agent/context.lua b/lua/codetyper/params/agents/context.lua
similarity index 94%
rename from lua/codetyper/params/agent/context.lua
rename to lua/codetyper/params/agents/context.lua
index 7954763..cfa4acb 100644
--- a/lua/codetyper/params/agent/context.lua
+++ b/lua/codetyper/params/agents/context.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.context Parameters for context building
+---@mod codetyper.params.agents.context Parameters for context building
 local M = {}
 
 --- Common ignore patterns
diff --git a/lua/codetyper/params/agent/edit.lua b/lua/codetyper/params/agents/edit.lua
similarity index 100%
rename from lua/codetyper/params/agent/edit.lua
rename to lua/codetyper/params/agents/edit.lua
diff --git a/lua/codetyper/params/agent/grep.lua b/lua/codetyper/params/agents/grep.lua
similarity index 100%
rename from lua/codetyper/params/agent/grep.lua
rename to lua/codetyper/params/agents/grep.lua
diff --git a/lua/codetyper/params/agent/intent.lua b/lua/codetyper/params/agents/intent.lua
similarity index 96%
rename from lua/codetyper/params/agent/intent.lua
rename to lua/codetyper/params/agents/intent.lua
index 52dd8b0..4a5a411 100644
--- a/lua/codetyper/params/agent/intent.lua
+++ b/lua/codetyper/params/agents/intent.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.intent Intent patterns and scope configuration
+---@mod codetyper.params.agents.intent Intent patterns and scope configuration
 local M = {}
 
 --- Intent patterns with associated metadata
diff --git a/lua/codetyper/params/agent/languages.lua b/lua/codetyper/params/agents/languages.lua
similarity index 96%
rename from lua/codetyper/params/agent/languages.lua
rename to lua/codetyper/params/agents/languages.lua
index fabb959..7aee62c 100644
--- a/lua/codetyper/params/agent/languages.lua
+++ b/lua/codetyper/params/agents/languages.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.languages Language-specific patterns and configurations
+---@mod codetyper.params.agents.languages Language-specific patterns and configurations
 local M = {}
 
 --- Language-specific import patterns
diff --git a/lua/codetyper/params/agent/linter.lua b/lua/codetyper/params/agents/linter.lua
similarity index 85%
rename from lua/codetyper/params/agent/linter.lua
rename to lua/codetyper/params/agents/linter.lua
index b42ff3d..88644b1 100644
--- a/lua/codetyper/params/agent/linter.lua
+++ b/lua/codetyper/params/agents/linter.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.linter Linter configuration
+---@mod codetyper.params.agents.linter Linter configuration
 local M = {}
 
 M.config = {
diff --git a/lua/codetyper/params/agent/logs.lua b/lua/codetyper/params/agents/logs.lua
similarity index 91%
rename from lua/codetyper/params/agent/logs.lua
rename to lua/codetyper/params/agents/logs.lua
index d3f364b..6346f73 100644
--- a/lua/codetyper/params/agent/logs.lua
+++ b/lua/codetyper/params/agents/logs.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.logs Log parameters
+---@mod codetyper.params.agents.logs Log parameters
 local M = {}
 
 M.icons = {
diff --git a/lua/codetyper/params/agent/parser.lua b/lua/codetyper/params/agents/parser.lua
similarity index 82%
rename from lua/codetyper/params/agent/parser.lua
rename to lua/codetyper/params/agents/parser.lua
index 7608c6b..d014634 100644
--- a/lua/codetyper/params/agent/parser.lua
+++ b/lua/codetyper/params/agents/parser.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.parser Parser regex patterns
+---@mod codetyper.params.agents.parser Parser regex patterns
 local M = {}
 
 M.patterns = {
diff --git a/lua/codetyper/params/agent/patch.lua b/lua/codetyper/params/agents/patch.lua
similarity index 83%
rename from lua/codetyper/params/agent/patch.lua
rename to lua/codetyper/params/agents/patch.lua
index 2a46410..c328e0e 100644
--- a/lua/codetyper/params/agent/patch.lua
+++ b/lua/codetyper/params/agents/patch.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.patch Patch configuration
+---@mod codetyper.params.agents.patch Patch configuration
 local M = {}
 
 M.config = {
diff --git a/lua/codetyper/params/agent/permissions.lua b/lua/codetyper/params/agents/permissions.lua
similarity index 89%
rename from lua/codetyper/params/agent/permissions.lua
rename to lua/codetyper/params/agents/permissions.lua
index 804567b..bf49d34 100644
--- a/lua/codetyper/params/agent/permissions.lua
+++ b/lua/codetyper/params/agents/permissions.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.permissions Dangerous and safe command patterns
+---@mod codetyper.params.agents.permissions Dangerous and safe command patterns
 local M = {}
 
 --- Dangerous command patterns that should never be auto-allowed
diff --git a/lua/codetyper/params/agent/scheduler.lua b/lua/codetyper/params/agents/scheduler.lua
similarity index 80%
rename from lua/codetyper/params/agent/scheduler.lua
rename to lua/codetyper/params/agents/scheduler.lua
index cdc3b85..4936b17 100644
--- a/lua/codetyper/params/agent/scheduler.lua
+++ b/lua/codetyper/params/agents/scheduler.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.scheduler Scheduler configuration
+---@mod codetyper.params.agents.scheduler Scheduler configuration
 local M = {}
 
 M.config = {
diff --git a/lua/codetyper/params/agent/scope.lua b/lua/codetyper/params/agents/scope.lua
similarity index 96%
rename from lua/codetyper/params/agent/scope.lua
rename to lua/codetyper/params/agents/scope.lua
index ad99d2c..aa15eae 100644
--- a/lua/codetyper/params/agent/scope.lua
+++ b/lua/codetyper/params/agents/scope.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.scope Tree-sitter scope mappings
+---@mod codetyper.params.agents.scope Tree-sitter scope mappings
 local M = {}
 
 --- Node types that represent function-like scopes per language
diff --git a/lua/codetyper/params/agent/search_replace.lua b/lua/codetyper/params/agents/search_replace.lua
similarity index 82%
rename from lua/codetyper/params/agent/search_replace.lua
rename to lua/codetyper/params/agents/search_replace.lua
index 16793fb..54ede10 100644
--- a/lua/codetyper/params/agent/search_replace.lua
+++ b/lua/codetyper/params/agents/search_replace.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.search_replace Search/Replace patterns
+---@mod codetyper.params.agents.search_replace Search/Replace patterns
 local M = {}
 
 M.patterns = {
diff --git a/lua/codetyper/params/agent/tools.lua b/lua/codetyper/params/agents/tools.lua
similarity index 98%
rename from lua/codetyper/params/agent/tools.lua
rename to lua/codetyper/params/agents/tools.lua
index b0df5ca..94379dd 100644
--- a/lua/codetyper/params/agent/tools.lua
+++ b/lua/codetyper/params/agents/tools.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.tools Tool definitions
+---@mod codetyper.params.agents.tools Tool definitions
 local M = {}
 
 --- Tool definitions in a provider-agnostic format
diff --git a/lua/codetyper/params/agent/view.lua b/lua/codetyper/params/agents/view.lua
similarity index 100%
rename from lua/codetyper/params/agent/view.lua
rename to lua/codetyper/params/agents/view.lua
diff --git a/lua/codetyper/params/agent/worker.lua b/lua/codetyper/params/agents/worker.lua
similarity index 89%
rename from lua/codetyper/params/agent/worker.lua
rename to lua/codetyper/params/agents/worker.lua
index 5289b2c..b1220a9 100644
--- a/lua/codetyper/params/agent/worker.lua
+++ b/lua/codetyper/params/agents/worker.lua
@@ -1,4 +1,4 @@
----@mod codetyper.params.agent.worker Worker configuration and patterns
+---@mod codetyper.params.agents.worker Worker configuration and patterns
 local M = {}
 
 --- Patterns that indicate LLM needs more context (must be near start of response)
diff --git a/lua/codetyper/prompts/agent/diff.lua b/lua/codetyper/prompts/agents/diff.lua
similarity index 95%
rename from lua/codetyper/prompts/agent/diff.lua
rename to lua/codetyper/prompts/agents/diff.lua
index 97303c8..5c9bb5e 100644
--- a/lua/codetyper/prompts/agent/diff.lua
+++ b/lua/codetyper/prompts/agents/diff.lua
@@ -1,4 +1,4 @@
----@mod codetyper.prompts.agent.diff Prompts and UI strings for diff view and bash approval
+---@mod codetyper.prompts.agents.diff Prompts and UI strings for diff view and bash approval
 local M = {}
 
 --- Bash approval dialog strings
diff --git a/lua/codetyper/prompts/agent.lua b/lua/codetyper/prompts/agents/init.lua
similarity index 98%
rename from lua/codetyper/prompts/agent.lua
rename to lua/codetyper/prompts/agents/init.lua
index 1b1f662..2b98333 100644
--- a/lua/codetyper/prompts/agent.lua
+++ b/lua/codetyper/prompts/agents/init.lua
@@ -1,4 +1,4 @@
----@mod codetyper.prompts.agent Agent prompts for Codetyper.nvim
+---@mod codetyper.prompts.agents.init Agent prompts for Codetyper.nvim
 ---
 --- System prompts for the agentic mode with tool use.
 
diff --git a/lua/codetyper/prompts/agent/intent.lua b/lua/codetyper/prompts/agents/intent.lua
similarity index 95%
rename from lua/codetyper/prompts/agent/intent.lua
rename to lua/codetyper/prompts/agents/intent.lua
index 616c616..0c2dc15 100644
--- a/lua/codetyper/prompts/agent/intent.lua
+++ b/lua/codetyper/prompts/agents/intent.lua
@@ -1,4 +1,4 @@
----@mod codetyper.prompts.agent.intent Intent-specific system prompts
+---@mod codetyper.prompts.agents.intent Intent-specific system prompts
 local M = {}
 
 M.modifiers = {
diff --git a/lua/codetyper/prompts/agent/linter.lua b/lua/codetyper/prompts/agents/linter.lua
similarity index 69%
rename from lua/codetyper/prompts/agent/linter.lua
rename to lua/codetyper/prompts/agents/linter.lua
index edac77b..ef5ec09 100644
--- a/lua/codetyper/prompts/agent/linter.lua
+++ b/lua/codetyper/prompts/agents/linter.lua
@@ -1,4 +1,4 @@
----@mod codetyper.prompts.agent.linter Linter prompts
+---@mod codetyper.prompts.agents.linter Linter prompts
 local M = {}
 
 M.fix_request = [[
diff --git a/lua/codetyper/prompts/agent/loop.lua b/lua/codetyper/prompts/agents/loop.lua
similarity index 97%
rename from lua/codetyper/prompts/agent/loop.lua
rename to lua/codetyper/prompts/agents/loop.lua
index 5a71b0d..39bb09e 100644
--- a/lua/codetyper/prompts/agent/loop.lua
+++ b/lua/codetyper/prompts/agents/loop.lua
@@ -1,4 +1,4 @@
----@mod codetyper.prompts.agent.loop Agent Loop prompts
+---@mod codetyper.prompts.agents.loop Agent Loop prompts
 local M = {}
 
 M.default_system_prompt = [[You are a helpful coding assistant with access to tools.
diff --git a/lua/codetyper/prompts/agent/modal.lua b/lua/codetyper/prompts/agents/modal.lua
similarity index 85%
rename from lua/codetyper/prompts/agent/modal.lua
rename to lua/codetyper/prompts/agents/modal.lua
index 3693cc7..9d205c5 100644
--- a/lua/codetyper/prompts/agent/modal.lua
+++ b/lua/codetyper/prompts/agents/modal.lua
@@ -1,4 +1,4 @@
----@mod codetyper.prompts.agent.modal Prompts and UI strings for context modal
+---@mod codetyper.prompts.agents.modal Prompts and UI strings for context modal
 local M = {}
 
 --- Modal UI strings
diff --git a/lua/codetyper/prompts/agent/scheduler.lua b/lua/codetyper/prompts/agents/scheduler.lua
similarity index 74%
rename from lua/codetyper/prompts/agent/scheduler.lua
rename to lua/codetyper/prompts/agents/scheduler.lua
index a1efcf0..92558bb 100644
--- a/lua/codetyper/prompts/agent/scheduler.lua
+++ b/lua/codetyper/prompts/agents/scheduler.lua
@@ -1,4 +1,4 @@
----@mod codetyper.prompts.agent.scheduler Scheduler prompts
+---@mod codetyper.prompts.agents.scheduler Scheduler prompts
 local M = {}
 
 M.retry_context = [[
diff --git a/lua/codetyper/prompts/agent/tools.lua b/lua/codetyper/prompts/agents/tools.lua
similarity index 88%
rename from lua/codetyper/prompts/agent/tools.lua
rename to lua/codetyper/prompts/agents/tools.lua
index 990d22e..4a7d5eb 100644
--- a/lua/codetyper/prompts/agent/tools.lua
+++ b/lua/codetyper/prompts/agents/tools.lua
@@ -1,4 +1,4 @@
----@mod codetyper.prompts.agent.tools Tool system prompts
+---@mod codetyper.prompts.agents.tools Tool system prompts
 local M = {}
 
 M.instructions = {
diff --git a/lua/codetyper/prompts/init.lua b/lua/codetyper/prompts/init.lua
index f184789..eeb22bc 100644
--- a/lua/codetyper/prompts/init.lua
+++ b/lua/codetyper/prompts/init.lua
@@ -11,7 +11,7 @@ M.code = require("codetyper.prompts.code")
 M.ask = require("codetyper.prompts.ask")
 M.refactor = require("codetyper.prompts.refactor")
 M.document = require("codetyper.prompts.document")
-M.agent = require("codetyper.prompts.agent")
+M.agent = require("codetyper.prompts.agents")
 
 --- Get a prompt by category and name
 ---@param category string Category name (system, code, ask, refactor, document)