Refactor: standardize 'agent' -> 'agents' for params and prompts

This commit is contained in:
2026-01-16 12:01:42 -05:00
parent 10c1de8843
commit 6a69a524ea
56 changed files with 64 additions and 64 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -4,7 +4,7 @@
local M = {}
local params = require("codetyper.params.agent.logs")
local params = require("codetyper.params.agents.logs")
---@class LogEntry

View File

@@ -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()

View File

@@ -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,

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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)

View File

@@ -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())

View File

@@ -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)

View File

@@ -4,7 +4,7 @@
local M = {}
local params = require("codetyper.params.agent.parser")
local params = require("codetyper.params.agents.parser")
---@class ParsedResponse

View File

@@ -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"

View File

@@ -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()

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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,
"",

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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 = {},

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -1,4 +1,4 @@
---@mod codetyper.params.agent.linter Linter configuration
---@mod codetyper.params.agents.linter Linter configuration
local M = {}
M.config = {

View File

@@ -1,4 +1,4 @@
---@mod codetyper.params.agent.logs Log parameters
---@mod codetyper.params.agents.logs Log parameters
local M = {}
M.icons = {

View File

@@ -1,4 +1,4 @@
---@mod codetyper.params.agent.parser Parser regex patterns
---@mod codetyper.params.agents.parser Parser regex patterns
local M = {}
M.patterns = {

View File

@@ -1,4 +1,4 @@
---@mod codetyper.params.agent.patch Patch configuration
---@mod codetyper.params.agents.patch Patch configuration
local M = {}
M.config = {

View File

@@ -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

View File

@@ -1,4 +1,4 @@
---@mod codetyper.params.agent.scheduler Scheduler configuration
---@mod codetyper.params.agents.scheduler Scheduler configuration
local M = {}
M.config = {

View File

@@ -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

View File

@@ -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 = {

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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.

View File

@@ -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 = {

View File

@@ -1,4 +1,4 @@
---@mod codetyper.prompts.agent.linter Linter prompts
---@mod codetyper.prompts.agents.linter Linter prompts
local M = {}
M.fix_request = [[

View File

@@ -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.

View File

@@ -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

View File

@@ -1,4 +1,4 @@
---@mod codetyper.prompts.agent.scheduler Scheduler prompts
---@mod codetyper.prompts.agents.scheduler Scheduler prompts
local M = {}
M.retry_context = [[

View File

@@ -1,4 +1,4 @@
---@mod codetyper.prompts.agent.tools Tool system prompts
---@mod codetyper.prompts.agents.tools Tool system prompts
local M = {}
M.instructions = {

View File

@@ -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)