feat: change the lsp buffer naming and improve prompt

This reverts commit df206dce88.

.chatgpt_config.yaml

@@ -1,15 +1,27 @@
-initial_prompt: |
-  You are a coding assistant who receives a project’s context and user instructions. The user will provide a prompt, and you will return modifications to the project in a YAML structure. This YAML must have a top-level key named files, which should be a list of file changes. Each element in files must be a mapping with the keys path and content. The path should be the file path relative to the project’s root directory, and content should contain the new file content as a multiline string (using the YAML | literal style). Do not include additional commentary outside of the YAML.
-  Here is the structure expected in your final answer:
-    files:
-      - path: "relative/path/to/file1.ext"
-        content: |
-          <full file content here>
-      - path: "relative/path/to/file2.ext"
-        content: |
-          <full file content here>
-  Based on the prompt and project context provided, you must only return the YAML structure shown above (with actual file paths and contents substituted in). Any file that should be created or modified must appear as one of the files entries. The content should contain the complete and final code for that file, reflecting all changes requested by the user.
+project_name: "chatgpt_nvim"
+default_prompt_blocks:
+  - "basic-prompt"
+  - "secure-coding"
+initial_files:
+  - "README.md"
 
-directories:
-  - "lua"
-  - "plugin"
+debug: false
+improved_debug: false
+
+preview_changes: false
+interactive_file_selection: false
+partial_acceptance: false
+
+enable_debug_commands: true
+prompt_char_limit: 300000
+enable_chunking: false
+enable_step_by_step: true
+auto_lint: true
+
+# New tool auto-accept config
+tool_auto_accept:
+  readFile: false
+  editFile: false
+  executeCommand: false
+  # If you set any of these to true, it will auto accept them without prompting.
+  # 'executeCommand' should remain false by default unless you're certain it's safe.

README.md

@@ -1,20 +1,100 @@
 <!-- README.md -->
-# ChatGPT NeoVim Plugin (Updated for YAML)
+# ChatGPT NeoVim Plugin (Extensively Updated with Step-by-Step Prompting)
 
-This plugin integrates a ChatGPT O1 model workflow into Neovim. It allows you to generate prompts containing:
-- An **initial prompt** configured via a `.chatgpt_config.yaml` file in your project root.
-- A list of directories (also specified in the `.chatgpt_config.yaml`) from which it gathers the complete project structure and file contents.
-- The current file and the project's `README.md`, if present.
-- It uses YAML for configuration and also expects the ChatGPT response in YAML.
+This plugin integrates a ChatGPT O1 model workflow into Neovim. It allows you to:
 
-It also respects `.gitignore` entries, skipping those files from the prompt.
+1. Generate prompts containing:
+   - An **initial prompt** (from `.chatgpt_config.yaml`)
+   - A list of directories (also specified in `.chatgpt_config.yaml`) from which it gathers the project structure and file contents
+   - **Interactive file selection** if enabled, so you can pick exactly which directories to include
+   - Any **initial files** you define (e.g., `README.md`, etc.)
 
-## Configuration
+2. Copy these prompts to your clipboard to paste into ChatGPT O1.
+3. Receive YAML changes from ChatGPT, then run `:ChatGPTPaste` to apply them or supply additional files.
 
-Create a `.chatgpt_config.yaml` in your project root. For example:
+## New Key Features
+
+- **Step-by-Step Prompting** (`enable_step_by_step: true`):  
+  If the request grows too large (exceeds `token_limit`), the plugin automatically generates a special prompt asking the model to split the task into smaller steps, working through them one by one. This approach helps you stay within the model’s maximum token limit without having to manually break things apart.
+
+- **Partial Acceptance**: If `partial_acceptance: true`, you can open a buffer that lists the final changes. Remove or comment out lines you don’t want, then only those changes are applied.
+
+- **Preview Changes**: If `preview_changes: true`, you get a buffer showing proposed changes before you apply them.
+
+- **Interactive File Selection**: If `interactive_file_selection: true`, you choose which directories from `.chatgpt_config.yaml` get included in the prompt, reducing token usage.
+
+- **Improved Debug**: If `improved_debug: true`, debug logs go into a dedicated `ChatGPT_Debug_Log` buffer for easier reading.
+
+## Example `.chatgpt_config.yaml`
 
 ```yaml
-initial_prompt: "You are a helpful coding assistant that follows instructions meticulously."
+project_name: "chatgpt_nvim"
+default_prompt_blocks:
+  - "basic-prompt"
+  - "workflow-prompt"
 directories:
-  - "lua"
-  - "plugin"
+  - "."
+initial_files:
+  - "README.md"
+debug: false
+enable_step_by_step: true
+preview_changes: true
+interactive_file_selection: true
+partial_acceptance: true
+improved_debug: true
+token_limit: 3000
+```
+
+## Usage
+
+1. **`:ChatGPT`**  
+   - If `interactive_file_selection` is on, you’ll pick directories to include in a buffer named `ChatGPT_File_Selection`.
+   - Save & close with `:wq`, `:x`, or `:bd` (you don’t have to use `:q`).
+   - If `enable_step_by_step` is on and the prompt might exceed `token_limit`, the plugin will generate instructions prompting the model to address each step separately.
+
+2. **Paste Prompt to ChatGPT**  
+   - If the task is split into steps, simply copy/paste them one by one into ChatGPT.
+
+3. **`:ChatGPTPaste`**  
+   - The plugin reads the YAML from your clipboard. If it requests more files, it might again suggest a step-by-step approach.  
+   - If final changes are provided:
+     - Optionally preview them (`preview_changes`).  
+     - Optionally partially accept them (`partial_acceptance`).  
+     - Then the plugin writes/deletes files as specified.
+
+## Troubleshooting & Tips
+- Adjust `token_limit` in `.chatgpt_config.yaml` as needed.
+- If partial acceptance is confusing, remember to remove or prepend `#` to lines you don’t want before saving and closing the buffer.
+- If step-by-step prompting occurs, ensure you follow each prompt the model provides in the correct order.  
+- Check `ChatGPT_Debug_Log` if `improved_debug` is on, or the Neovim messages if `debug` is on, for detailed info.
+- You can close the selection or prompt buffers at any time with commands like `:bd`, `:x`, or `:wq`. No need to rely on `:q`.
+
+## Debug Commands
+If `enable_debug_commands` is true, you can include commands like these in your YAML:
+```yaml
+commands:
+  - command: "list"
+    dir: "some/directory"
+
+  - command: "grep"
+    pattern: "searchString"
+    target: "path/to/file/or/directory"
+```
+The **list** command now uses the Linux `ls` command to list directory contents. The **grep** command searches for a given pattern in a file or all files in a directory.
+
+Enjoy your improved, more flexible ChatGPT Neovim plugin with step-by-step support!
+
+## Test when developing
+add new plugin to runtimepath
+```vim
+:set rtp^=~/temp_plugins/chatgpt.vim
+```
+Clear Lua module cache
+```vim
+:lua for k in pairs(package.loaded) do if k:match("^chatgpt_nvim") then package.loaded[k]=nil end end
+```
+Load new plugin code
+```vim
+:runtime plugin/chatgpt.vim
+```
+

lua/chatgpt_nvim/config.lua

@@ -1,37 +1,25 @@
--- lua/chatgpt_nvim/config.lua
--- Modified to:
--- 1) Determine the Git root based on the currently opened file.
--- 2) If no file is open or not in Git repo, fallback to current working directory.
-
 local M = {}
 local uv = vim.loop
 
 local ok_yaml, lyaml = pcall(require, "lyaml")
+local prompts = require("chatgpt_nvim.prompts")
 
 local function get_project_root()
-  -- Get the directory of the currently opened file.
-  -- If no file is open, we fallback to current working directory.
   local current_file = vim.fn.expand("%:p")
   local root_dir
 
   if current_file == "" then
-    -- No file opened, fallback to cwd
     root_dir = vim.fn.getcwd()
   else
-    -- Extract directory from current file path
     local file_dir = current_file:match("(.*)/")
     if not file_dir then
-      -- If something went wrong extracting the directory, fallback to cwd
       root_dir = vim.fn.getcwd()
     else
-      -- Attempt to find git root from the file's directory
-      -- We run git rev-parse with `cd` to the file's directory.
       local cmd = string.format("cd %s && git rev-parse --show-toplevel 2>/dev/null", vim.fn.shellescape(file_dir))
       local git_root = vim.fn.systemlist(cmd)
       if vim.v.shell_error == 0 and git_root and #git_root > 0 then
         root_dir = git_root[1]
       else
-        -- Not a git repo or failed to find git root, fallback to the file's directory
         root_dir = file_dir
       end
     end
@@ -48,31 +36,121 @@ end
 function M.load()
   local path = get_config_path()
   local fd = uv.fs_open(path, "r", 438)
-  if not fd then
-    return {
-      initial_prompt = "",
-      directories = { "." },
+  local config = {
+    initial_prompt = "",
+    directories = { "." },
+    default_prompt_blocks = {},
+    prompt_char_limit = 300000,
+    project_name = "",
+    debug = false,
+    initial_files = {},
+    preview_changes = false,
+    interactive_file_selection = false,
+    partial_acceptance = false,
+    improved_debug = false,
+    enable_chunking = false,
+    enable_step_by_step = true,
+
+    -- If auto_lint is true, we only do LSP-based checks.
+    auto_lint = false,
+
+    tool_auto_accept = {
+      readFile = false,
+      editFile = false,
+      replace_in_file = false,
+      executeCommand = false,
     }
+  }
+
+  if fd then
+    local stat = uv.fs_fstat(fd)
+    local data = uv.fs_read(fd, stat.size, 0)
+    uv.fs_close(fd)
+    if data and ok_yaml then
+      local ok, result = pcall(lyaml.load, data)
+      if ok and type(result) == "table" then
+        if type(result.initial_prompt) == "string" then
+          config.initial_prompt = result.initial_prompt
+        end
+        if type(result.directories) == "table" then
+          config.directories = result.directories
+        end
+        if type(result.default_prompt_blocks) == "table" then
+          config.default_prompt_blocks = result.default_prompt_blocks
+        end
+        if type(result.prompt_char_limit) == "number" then
+          config.prompt_char_limit = result.prompt_char_limit
+        end
+        if type(result.project_name) == "string" then
+          config.project_name = result.project_name
+        end
+        if type(result.debug) == "boolean" then
+          config.debug = result.debug
+        end
+        if type(result.initial_files) == "table" then
+          config.initial_files = result.initial_files
+        end
+        if type(result.preview_changes) == "boolean" then
+          config.preview_changes = result.preview_changes
+        end
+        if type(result.interactive_file_selection) == "boolean" then
+          config.interactive_file_selection = result.interactive_file_selection
+        end
+        if type(result.partial_acceptance) == "boolean" then
+          config.partial_acceptance = result.partial_acceptance
+        end
+        if type(result.improved_debug) == "boolean" then
+          config.improved_debug = result.improved_debug
+        end
+        if type(result.enable_chunking) == "boolean" then
+          config.enable_chunking = result.enable_chunking
+        end
+        if type(result.enable_step_by_step) == "boolean" then
+          config.enable_step_by_step = result.enable_step_by_step
+        end
+
+        -- auto_lint controls whether we do LSP-based checks
+        if type(result.auto_lint) == "boolean" then
+          config.auto_lint = result.auto_lint
+        end
+
+        if type(result.tool_auto_accept) == "table" then
+          for k, v in pairs(result.tool_auto_accept) do
+            if config.tool_auto_accept[k] ~= nil and type(v) == "boolean" then
+              config.tool_auto_accept[k] = v
+            end
+          end
+        end
+      end
+    end
+  else
+    config.initial_prompt = "You are a coding assistant who receives a project's context and user instructions..."
   end
-  local stat = uv.fs_fstat(fd)
-  local data = uv.fs_read(fd, stat.size, 0)
-  uv.fs_close(fd)
-  if data and ok_yaml then
-    local ok, result = pcall(lyaml.load, data)
-    if ok and type(result) == "table" then
-      local config = result
-      if type(config) == "table" then
-        return {
-          initial_prompt = config.initial_prompt or "",
-          directories = config.directories or { "." },
-        }
+
+  -- Merge default prompt blocks
+  if type(config.default_prompt_blocks) == "table" and #config.default_prompt_blocks > 0 then
+    local merged_prompt = {}
+    for _, block_name in ipairs(config.default_prompt_blocks) do
+      if prompts[block_name] then
+        table.insert(merged_prompt, prompts[block_name])
+      end
+    end
+    if #merged_prompt > 0 then
+      local combined_blocks = table.concat(merged_prompt, "\n\n")
+      if config.initial_prompt ~= "" then
+        config.initial_prompt = config.initial_prompt .. "\n\n" .. combined_blocks
+      else
+        config.initial_prompt = combined_blocks
       end
     end
   end
-  return {
-    initial_prompt = "You are a coding assistant who receives a project’s context and user instructions. The user will provide a prompt, and you will return modifications to the project in a YAML structure. This YAML must have a top-level key named files, which should be a list of file changes. Each element in files must be a mapping with the keys path and content. The path should be the file path relative to the project’s root directory, and content should contain the new file content as a multiline string (using the YAML | literal style). Do not include additional commentary outside of the YAML.\n  Here is the structure expected in your final answer:\n    files:\n      - path: \"relative/path/to/file1.ext\"\n        content: |\n          <full file content here>\n      - path: \"relative/path/to/file2.ext\"\n        content: |\n          <full file content here>\n  Based on the prompt and project context provided, you must only return the YAML structure shown above (with actual file paths and contents substituted in). Any file that should be created or modified must appear as one of the files entries. The content should contain the complete and final code for that file, reflecting all changes requested by the user.",
-    directories = { "." },
-  }
+
+  if config.debug then
+    vim.api.nvim_out_write("[chatgpt_nvim:config] Loaded config from: " .. path .. "\n")
+    vim.api.nvim_out_write("[chatgpt_nvim:config] Debug logging is enabled.\n")
+  end
+
+  return config
 end
 
 return M

lua/chatgpt_nvim/context.lua

@@ -2,10 +2,44 @@ local M = {}
 
 local uv = vim.loop
 
-local function load_gitignore_patterns(root)
+-- Converts a .gitignore-style pattern to a Lua pattern
+local function gitignore_to_lua_pattern(gip)
+  -- Trim spaces
+  gip = gip:gsub("^%s*(.-)%s*$", "%1")
+
+  -- Escape magic chars in Lua patterns
+  local magic_chars = "().^$+%-*?[]"
+  gip = gip:gsub("["..magic_chars.."]", "%%%1")
+
+  -- Convert ** to .- (match any path, including dirs)
+  gip = gip:gsub("%%%%%*%%%%%*", ".*")
+
+  -- Convert * to [^/]* (match anything except /)
+  gip = gip:gsub("%%%%%*", "[^/]*")
+
+  -- If pattern starts with /, ensure it matches start of string
+  if gip:sub(1,1) == "/" then
+    gip = "^" .. gip:sub(2)
+  else
+    -- Otherwise allow matching anywhere
+    gip = gip
+  end
+
+  -- If pattern ends with /, ensure it matches a directory
+  if gip:sub(-1) == "/" then
+    gip = gip .. ".*"
+  end
+
+  return gip
+end
+
+local function load_gitignore_patterns(root, conf)
   local gitignore_path = root .. "/.gitignore"
   local fd = uv.fs_open(gitignore_path, "r", 438)
   if not fd then
+    if conf.debug then
+      vim.api.nvim_out_write("[chatgpt_nvim:context] No .gitignore found.\n")
+    end
     return {}
   end
   local stat = uv.fs_fstat(fd)
@@ -14,37 +48,78 @@ local function load_gitignore_patterns(root)
   if not data then return {} end
   local patterns = {}
   for line in data:gmatch("[^\r\n]+") do
-    line = line:match("^%s*(.-)%s*$") -- trim
+    line = line:match("^%s*(.-)%s*$")
     if line ~= "" and not line:match("^#") then
-      patterns[#patterns+1] = line
+      table.insert(patterns, gitignore_to_lua_pattern(line))
     end
   end
+  if conf.debug then
+    vim.api.nvim_out_write("[chatgpt_nvim:context] Loaded " .. #patterns .. " gitignore patterns.\n")
+  end
   return patterns
 end
 
-local function should_ignore_file(file, ignore_patterns)
+local function should_ignore_file(file, ignore_patterns, conf)
   for _, pattern in ipairs(ignore_patterns) do
-    if file:find(pattern, 1, true) then
+    if file:match(pattern) then
+      if conf.debug then
+        vim.api.nvim_out_write("[chatgpt_nvim:context] Ignoring file/dir: " .. file .. " (matched pattern: " .. pattern .. ")\n")
+      end
       return true
     end
   end
   return false
 end
 
-local function scandir(dir, ignore_patterns, files)
-  files = files or {}
+local function is_text_file(file, conf)
+  local fd = uv.fs_open(file, "r", 438)
+  if not fd then
+    if conf.debug then
+      vim.api.nvim_out_write("[chatgpt_nvim:context] Could not open file: " .. file .. " for reading.\n")
+    end
+    return false
+  end
+  local chunk = uv.fs_read(fd, 1024, 0) or ""
+  uv.fs_close(fd)
+  if chunk:find("\0") then
+    if conf.debug then
+      vim.api.nvim_out_write("[chatgpt_nvim:context] File appears binary: " .. file .. "\n")
+    end
+    return false
+  end
+  return true
+end
+
+local function scandir(dir, ignore_patterns, files, conf)
   local fd = uv.fs_opendir(dir, nil, 50)
-  if not fd then return files end
+  if not fd then
+    if conf.debug then
+      vim.api.nvim_out_write("[chatgpt_nvim:context] Could not open dir: " .. dir .. "\n")
+    end
+    return files
+  end
   while true do
     local ents = uv.fs_readdir(fd)
     if not ents then break end
     for _, ent in ipairs(ents) do
       local fullpath = dir .. "/" .. ent.name
-      if not should_ignore_file(fullpath, ignore_patterns) then
-        if ent.type == "file" then
+      if not should_ignore_file(fullpath, ignore_patterns, conf) then
+        if ent.type == "file" and is_text_file(fullpath, conf) then
           table.insert(files, fullpath)
         elseif ent.type == "directory" and ent.name ~= ".git" then
-          scandir(fullpath, ignore_patterns, files)
+          scandir(fullpath, ignore_patterns, files, conf)
+        elseif ent.type == "link" then
+          local link_target = uv.fs_readlink(fullpath)
+          if link_target then
+            local st = uv.fs_stat(link_target)
+            if st and st.type == "directory" then
+              table.insert(files, fullpath .. " (symlink to directory " .. link_target .. ")")
+            else
+              table.insert(files, fullpath .. " (symlink to file " .. link_target .. ")")
+            end
+          else
+            table.insert(files, fullpath .. " (symlink)")
+          end
         end
       end
     end
@@ -53,34 +128,38 @@ local function scandir(dir, ignore_patterns, files)
   return files
 end
 
-function M.get_project_files(directories)
+function M.get_project_files(directories, conf)
   local root = vim.fn.getcwd()
-  local ignore_patterns = load_gitignore_patterns(root)
+  local ignore_patterns = load_gitignore_patterns(root, conf)
   local all_files = {}
   for _, dir in ipairs(directories) do
     local abs_dir = dir
     if not abs_dir:match("^/") then
       abs_dir = root .. "/" .. dir
     end
-    scandir(abs_dir, ignore_patterns, all_files)
+    scandir(abs_dir, ignore_patterns, all_files, conf)
   end
 
   local rel_files = {}
   for _, f in ipairs(all_files) do
-    local rel = f:gsub("^" .. root .. "/", "")
+    local rel = vim.fn.fnamemodify(f, ":.")
     table.insert(rel_files, rel)
   end
 
+  if conf.debug then
+    vim.api.nvim_out_write("[chatgpt_nvim:context] Found " .. #rel_files .. " project files.\n")
+  end
+
   return rel_files
 end
 
-function M.get_project_structure(directories)
-  local files = M.get_project_files(directories)
+function M.get_project_structure(directories, conf)
+  local files = M.get_project_files(directories, conf)
   local structure = "Files:\n" .. table.concat(files, "\n")
   return structure
 end
 
-function M.get_file_contents(files)
+function M.get_file_contents(files, conf)
   local root = vim.fn.getcwd()
   local sections = {}
   for _, f in ipairs(files) do
@@ -92,37 +171,18 @@ function M.get_file_contents(files)
         local data = uv.fs_read(fd, stat.size, 0)
         uv.fs_close(fd)
         if data then
-          table.insert(sections, "\n<<<CGPT Current File\n" .. path .. "\n" .. data .. "\n<<<CGPT Current File END\n")
+          table.insert(sections, "\nFile: `" .. f .. "`\n```\n" .. data .. "\n```\n")
         end
       else
         uv.fs_close(fd)
       end
+    else
+      if conf.debug then
+        vim.api.nvim_out_write("[chatgpt_nvim:context] Could not open file for content: " .. f .. "\n")
+      end
     end
   end
   return table.concat(sections, "\n")
 end
 
-function M.get_current_file()
-  local current_path = vim.fn.expand("%:p")
-  if current_path == "" then
-    return nil, nil
-  end
-  local fd = uv.fs_open(current_path, "r", 438)
-  if not fd then return nil, current_path end
-  local stat = uv.fs_fstat(fd)
-  local data = uv.fs_read(fd, stat.size, 0)
-  uv.fs_close(fd)
-  return data, current_path
-end
-
-function M.get_readme_content()
-  local root = vim.fn.getcwd()
-  local fd = uv.fs_open(root .. "/README.md", "r", 438)
-  if not fd then return nil end
-  local stat = uv.fs_fstat(fd)
-  local data = uv.fs_read(fd, stat.size, 0)
-  uv.fs_close(fd)
-  return data
-end
-
 return M

lua/chatgpt_nvim/handler.lua

@@ -1,17 +1,71 @@
 local M = {}
+local uv = vim.loop
 
-function M.get_clipboard_content()
-  return vim.fn.getreg('+')
+-- Remove local config = require('chatgpt_nvim.config')
+-- We'll accept conf from outside or init.lua
+-- local config = require('chatgpt_nvim.config')
+
+local function ensure_dir(path)
+  local st = uv.fs_stat(path)
+  if st and st.type == 'directory' then
+    return true
+  end
+  local parent = path:match("(.*)/")
+  if parent and parent ~= "" then
+    ensure_dir(parent)
+  end
+  uv.fs_mkdir(path, 511)
+  return true
 end
 
-function M.write_file(filepath, content)
-  local fd = vim.loop.fs_open(filepath, "w", 438)
+function M.get_clipboard_content(conf)
+  local content = vim.fn.getreg('+')
+  if conf.debug then
+    vim.api.nvim_out_write("[chatgpt_nvim:handler] Clipboard content length: " .. #content .. "\n")
+  end
+  return content
+end
+
+function M.write_file(filepath, content, conf)
+  local dir = filepath:match("(.*)/")
+  if dir and dir ~= "" then
+    ensure_dir(dir)
+  end
+  local fd = uv.fs_open(filepath, "w", 438)
   if not fd then
     vim.api.nvim_err_writeln("Could not open file for writing: " .. filepath)
+    if conf.debug then
+      vim.api.nvim_out_write("[chatgpt_nvim:handler] Failed to open file for writing: " .. filepath .. "\n")
+    end
     return
   end
-  vim.loop.fs_write(fd, content, -1)
-  vim.loop.fs_close(fd)
+  uv.fs_write(fd, content, -1)
+  uv.fs_close(fd)
+  if conf.debug then
+    vim.api.nvim_out_write("[chatgpt_nvim:handler] Successfully wrote file: " .. filepath .. "\n")
+  end
+end
+
+function M.delete_file(filepath, conf)
+  local st = uv.fs_stat(filepath)
+  if st then
+    local success, err = uv.fs_unlink(filepath)
+    if not success then
+      vim.api.nvim_err_writeln("Could not delete file: " .. filepath .. " - " .. (err or "unknown error"))
+      if conf.debug then
+        vim.api.nvim_out_write("[chatgpt_nvim:handler] Failed to delete file: " .. filepath .. "\n")
+      end
+    else
+      if conf.debug then
+        vim.api.nvim_out_write("[chatgpt_nvim:handler] Deleted file: " .. filepath .. "\n")
+      end
+    end
+  else
+    vim.api.nvim_err_writeln("File not found, cannot delete: " .. filepath)
+    if conf.debug then
+      vim.api.nvim_out_write("[chatgpt_nvim:handler] File not found for deletion: " .. filepath .. "\n")
+    end
+  end
 end
 
 function M.finish()

lua/chatgpt_nvim/init.lua

@@ -1,17 +1,24 @@
--- lua/chatgpt_nvim/init.lua
 local M = {}
 
 local context = require('chatgpt_nvim.context')
 local handler = require('chatgpt_nvim.handler')
 local config = require('chatgpt_nvim.config')
+local ui = require('chatgpt_nvim.ui')
+local prompts = require('chatgpt_nvim.prompts')
+
+local tools_manager = require("chatgpt_nvim.tools.manager")
+local tools_module = require("chatgpt_nvim.tools")
 
 local ok_yaml, lyaml = pcall(require, "lyaml")
 
+------------------------------------------------------------------------------
+-- UTILITIES
+------------------------------------------------------------------------------
 local function copy_to_clipboard(text)
   vim.fn.setreg('+', text)
 end
 
-local function parse_response(raw)
+local function parse_response(raw, conf)
   if not ok_yaml then
     vim.api.nvim_err_writeln("lyaml not available. Install with `luarocks install lyaml`.")
     return nil
@@ -19,69 +26,393 @@ local function parse_response(raw)
   local ok, data = pcall(lyaml.load, raw)
   if not ok or not data then
     vim.api.nvim_err_writeln("Failed to parse YAML response.")
+    ui.debug_log("RAW response that failed parsing:\n" .. raw)
     return nil
   end
+  ui.debug_log("Successfully parsed YAML response.")
   return data
 end
 
-function M.run_chatgpt_command()
-  local conf = config.load()
-  local user_input = vim.fn.input("Message for O1 Model: ")
-  if user_input == "" then
-    print("No input provided.")
-    return
-  end
-
-  local dirs = conf.directories or {"."}
-  local project_structure = context.get_project_structure(dirs)
-  local all_files = context.get_project_files(dirs)
-  local file_sections = context.get_file_contents(all_files)
-  local current_file_content, current_file_path = context.get_current_file()
-  local readme_content = context.get_readme_content()
-
-  -- Make the prompt more readable for the O1 model:
-  -- 1. Include initial prompt and user input at the start.
-  -- 2. Provide a clear project structure section.
-  -- 3. Clearly label the files section.
-  -- 4. The file_sections already include <<<CGPT Current File blocks for each file,
-  --    we just need to ensure there's a clear intro.
-
-  local sections = {
-    conf.initial_prompt .. "\n" .. user_input,
-    "\n\nProject Structure:\n",
-    project_structure,
-    "\n\nBelow are the files from the project, each enclosed in <<<CGPT Current File ... >>> blocks for clarity.\n"
-  }
-
-  table.insert(sections, file_sections)
-
-  local prompt = table.concat(sections, "\n")
-  copy_to_clipboard(prompt)
-  print("Prompt copied to clipboard! Paste it into the ChatGPT O1 model.")
+local function is_subpath(root, path)
+  local root_abs = vim.fn.fnamemodify(root, ":p")
+  local target_abs = vim.fn.fnamemodify(path, ":p")
+  return target_abs:sub(1, #root_abs) == root_abs
 end
 
-function M.run_chatgpt_paste_command()
+local function read_file(path)
+  local fd = vim.loop.fs_open(path, "r", 438)
+  if not fd then
+    return nil
+  end
+  local stat = vim.loop.fs_fstat(fd)
+  if not stat then
+    vim.loop.fs_close(fd)
+    return nil
+  end
+  local data = vim.loop.fs_read(fd, stat.size, 0)
+  vim.loop.fs_close(fd)
+  return data
+end
+
+local function close_existing_buffer_by_name(pattern)
+  for _, b in ipairs(vim.api.nvim_list_bufs()) do
+    local name = vim.api.nvim_buf_get_name(b)
+    if name:match(pattern) then
+      vim.api.nvim_buf_delete(b, { force = true })
+    end
+  end
+end
+
+------------------------------------------------------------------------------
+-- PROMPT CONSTRUCTION
+------------------------------------------------------------------------------
+local function build_tools_available_block()
+  local lines = {}
+  lines[#lines+1] = "<tools_available>"
+  for _, t in ipairs(tools_module.available_tools) do
+    lines[#lines+1] = string.format("- **%s**: %s\n  Usage: %s",
+      t.name, t.explanation, t.usage
+    )
+  end
+  lines[#lines+1] = "</tools_available>"
+  return table.concat(lines, "\n")
+end
+
+local function build_prompt(user_input, dirs, conf)
+  local root = vim.fn.getcwd()
+  local initial_files = conf.initial_files or {}
+  local final_sections = {}
+
+  -- 1) <initial_prompts>
+  if conf.initial_prompt and conf.initial_prompt ~= "" then
+    table.insert(final_sections, "<initial_prompts>\n" .. conf.initial_prompt .. "\n</initial_prompts>\n")
+  end
+
+  -- 2) <tools_available>
+  table.insert(final_sections, build_tools_available_block())
+
+  -- 3) <task>
+  local task_lines = {}
+  task_lines[#task_lines+1] = "<task>"
+  task_lines[#task_lines+1] = user_input
+  for _, file_path in ipairs(initial_files) do
+    task_lines[#task_lines+1] = ("'%s' (see below for file content)"):format(file_path)
+  end
+  task_lines[#task_lines+1] = "</task>\n"
+  table.insert(final_sections, table.concat(task_lines, "\n"))
+
+  -- 4) <file_content path="...">
+  local file_content_blocks = {}
+  for _, file_path in ipairs(initial_files) do
+    local full_path = root .. "/" .. file_path
+    if is_subpath(root, full_path) then
+      local fdata = read_file(full_path)
+      if fdata then
+        file_content_blocks[#file_content_blocks+1] = string.format(
+          "<file_content path=\"%s\">\n%s\n</file_content>", file_path, fdata
+        )
+      end
+    end
+  end
+  if #file_content_blocks > 0 then
+    table.insert(final_sections, table.concat(file_content_blocks, "\n\n"))
+  end
+
+  -- 5) <environment_details>
+  local env_lines = {}
+  env_lines[#env_lines+1] = "<environment_details>"
+  env_lines[#env_lines+1] = "# VSCode Visible Files"
+  for _, f in ipairs(initial_files) do
+    env_lines[#env_lines+1] = f
+  end
+  env_lines[#env_lines+1] = ""
+  env_lines[#env_lines+1] = "# VSCode Open Tabs"
+  env_lines[#env_lines+1] = "..."
+  env_lines[#env_lines+1] = ""
+  env_lines[#env_lines+1] = "# Current Time"
+  env_lines[#env_lines+1] = os.date("%x, %X (%Z)")
+  env_lines[#env_lines+1] = ""
+  env_lines[#env_lines+1] = "# Current Working Directory (" .. root .. ") Files"
+  env_lines[#env_lines+1] = context.get_project_structure(dirs, conf) or ""
+  env_lines[#env_lines+1] = ""
+  env_lines[#env_lines+1] = "# Current Mode"
+  env_lines[#env_lines+1] = "ACT MODE"
+  env_lines[#env_lines+1] = "</environment_details>"
+  table.insert(final_sections, table.concat(env_lines, "\n"))
+
+  return table.concat(final_sections, "\n\n")
+end
+
+local function handle_step_by_step_if_needed(prompt, conf)
+  local length = #prompt
+  local limit = conf.prompt_char_limit or 8000
+  if (not conf.enable_step_by_step) or (length <= limit) then
+    return { prompt }
+  end
+  return { prompts["step-prompt"] }
+end
+
+------------------------------------------------------------------------------
+-- :ChatGPT
+------------------------------------------------------------------------------
+local function run_chatgpt_command()
+  local conf = config.load()
+  ui.setup_ui(conf)
+  ui.debug_log("Running :ChatGPT command.")
+  local dirs = conf.directories or {"."}
+  if conf.interactive_file_selection then
+    dirs = ui.pick_directories(dirs, conf)
+    if #dirs == 0 then
+      dirs = conf.directories
+    end
+  end
+
+  close_existing_buffer_by_name("ChatGPT_Prompt.md$")
+  local bufnr = vim.api.nvim_create_buf(false, false)
+  vim.api.nvim_buf_set_name(bufnr, "ChatGPT_Prompt.md")
+  vim.api.nvim_buf_set_option(bufnr, "filetype", "markdown")
+  vim.api.nvim_buf_set_option(bufnr, "bufhidden", "wipe")
+  vim.api.nvim_buf_set_option(bufnr, "buftype", "")
+  vim.api.nvim_buf_set_option(bufnr, "modifiable", true)
+
+  vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, {
+    "# Enter your main user prompt (task) below.",
+    "",
+    "Save & close with :wq, :x, or :bd to finalize your prompt."
+  })
+
+  vim.api.nvim_create_autocmd("BufWriteCmd", {
+    buffer = bufnr,
+    callback = function()
+      local lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
+      local user_input = table.concat(lines, "\n")
+      if user_input == "" or user_input:find("^# Enter your main user prompt %(task%) below.") then
+        vim.api.nvim_out_write("No valid input provided.\n")
+        vim.api.nvim_buf_set_option(bufnr, "modified", false)
+        return
+      end
+
+      local final_prompt = build_prompt(user_input, dirs, conf)
+      local chunks = handle_step_by_step_if_needed(final_prompt, conf)
+
+      close_existing_buffer_by_name("ChatGPT_Generated_Prompt$")
+      local bufnr_ref = vim.api.nvim_create_buf(false, true)
+      vim.api.nvim_buf_set_name(bufnr_ref, "ChatGPT_Generated_Prompt")
+      vim.api.nvim_buf_set_option(bufnr_ref, "filetype", "markdown")
+
+      local prompt_lines = vim.split(chunks[1], "\n")
+      vim.api.nvim_buf_set_lines(bufnr_ref, 0, -1, false, prompt_lines)
+      vim.cmd("vsplit")
+      vim.cmd("buffer " .. bufnr_ref)
+
+      copy_to_clipboard(chunks[1])
+      if #chunks == 1 then
+        vim.api.nvim_out_write("Prompt copied to clipboard! Paste into ChatGPT.\n")
+      else
+        vim.api.nvim_out_write("Step-by-step prompt copied to clipboard!\n")
+      end
+
+      vim.api.nvim_buf_set_option(bufnr, "modified", false)
+    end
+  })
+
+  vim.cmd("buffer " .. bufnr)
+end
+
+------------------------------------------------------------------------------
+-- :ChatGPTPaste
+------------------------------------------------------------------------------
+local function run_chatgpt_paste_command()
+  local conf = config.load()
+  ui.setup_ui(conf)
+  ui.debug_log("Running :ChatGPTPaste command.")
   print("Reading ChatGPT YAML response from clipboard...")
-  local raw = handler.get_clipboard_content()
+  local raw = handler.get_clipboard_content(conf)
   if raw == "" then
     vim.api.nvim_err_writeln("Clipboard is empty. Please copy the YAML response from ChatGPT first.")
     return
   end
 
-  local data = parse_response(raw)
-  if not data or not data.files then
-    vim.api.nvim_err_writeln("No 'files' field found in the YAML response.")
+  local data = parse_response(raw, conf)
+  if not data then
     return
   end
 
-  for _, fileinfo in ipairs(data.files) do
-    if fileinfo.path and fileinfo.content then
-      handler.write_file(fileinfo.path, fileinfo.content)
-      print("Wrote file: " .. fileinfo.path)
-    else
-      vim.api.nvim_err_writeln("Invalid file entry. Must have 'path' and 'content'.")
+  -- Check if we have tools
+  if data.tools then
+    -- Must also verify project name
+    if not data.project_name or data.project_name ~= conf.project_name then
+      vim.api.nvim_err_writeln("Project name mismatch or missing. Aborting tool usage.")
+      return
     end
+
+    local output_messages = tools_manager.handle_tool_calls(data.tools, conf, is_subpath, read_file)
+    copy_to_clipboard(output_messages)
+    print("Tool call results have been processed and copied to clipboard.")
+    return
+  end
+
+  -- If we see project_name & files => older YAML style. We handle it but it's discouraged now.
+  if data.project_name and data.files then
+    if data.project_name ~= conf.project_name then
+      vim.api.nvim_err_writeln("Project name mismatch. Aborting.")
+      return
+    end
+
+    local is_final = false
+    for _, fileinfo in ipairs(data.files) do
+      if fileinfo.content or fileinfo.delete == true then
+        is_final = true
+        break
+      end
+    end
+
+    if is_final then
+      if conf.preview_changes then
+        require('chatgpt_nvim.init').preview_changes(data.files, conf)
+        print("Close the preview window to apply changes, or use :q to cancel.")
+        local closed = vim.wait(60000, function()
+          local bufs = vim.api.nvim_list_bufs()
+          for _, b in ipairs(bufs) do
+            local name = vim.api.nvim_buf_get_name(b)
+            if name:match("ChatGPT_Changes_Preview$") then
+              return false
+            end
+          end
+          return true
+        end)
+        if not closed then
+          vim.api.nvim_err_writeln("Preview not closed in time. Aborting.")
+          return
+        end
+      end
+
+      local final_files = data.files
+      if conf.partial_acceptance then
+        final_files = require('chatgpt_nvim.init').partial_accept(data.files, conf)
+        if #final_files == 0 then
+          vim.api.nvim_err_writeln("No changes remain after partial acceptance. Aborting.")
+          return
+        end
+      end
+
+      local root = vim.fn.getcwd()
+      for _, fileinfo in ipairs(final_files) do
+        if not fileinfo.path then
+          vim.api.nvim_err_writeln("Invalid file entry. Must have 'path'.")
+        else
+          if not is_subpath(root, fileinfo.path) then
+            vim.api.nvim_err_writeln("Invalid path outside project root: " .. fileinfo.path)
+          else
+            if fileinfo.delete == true then
+              ui.debug_log("Deleting file: " .. fileinfo.path)
+              handler.delete_file(fileinfo.path, conf)
+              print("Deleted: " .. fileinfo.path)
+            elseif fileinfo.content then
+              ui.debug_log("Writing file: " .. fileinfo.path)
+              handler.write_file(fileinfo.path, fileinfo.content, conf)
+              print("Wrote: " .. fileinfo.path)
+            else
+              vim.api.nvim_err_writeln("Invalid file entry. Must have 'content' or 'delete'.")
+            end
+          end
+        end
+      end
+    else
+      -- Not final => user is requesting more files
+      local requested_paths = {}
+      local root = vim.fn.getcwd()
+      for _, fileinfo in ipairs(data.files) do
+        if fileinfo.path then
+          table.insert(requested_paths, fileinfo.path)
+        end
+      end
+
+      local file_sections = {}
+      for _, f in ipairs(requested_paths) do
+        local path = root .. "/" .. f
+        local content = read_file(path)
+        if content then
+          table.insert(file_sections, ("\nFile: `%s`\n```\n%s\n```\n"):format(f, content))
+        else
+          table.insert(file_sections, ("\nFile: `%s`\n```\n(Could not read file)\n```\n"):format(f))
+        end
+      end
+
+      local sections = {
+        conf.initial_prompt,
+        "\n\nProject name: " .. (conf.project_name or ""),
+        "\n\nBelow are the requested files from the project, each preceded by its filename in backticks and enclosed in triple backticks.\n",
+        table.concat(file_sections, "\n"),
+        "\n\nIf you need more files, please respond again in YAML listing additional files, or use the 'tools:' approach. If you have all info, provide final changes or continue your instructions."
+      }
+
+      local prompt = table.concat(sections, "\n")
+      local length = #prompt
+      ui.debug_log("Returning requested files. Character count: " .. length)
+
+      if length > (conf.prompt_char_limit or 8000) and conf.enable_step_by_step then
+        local large_step = prompts["step-prompt"]
+        copy_to_clipboard(large_step)
+        print("Step-by-step guidance copied to clipboard!")
+        return
+      elseif length > (conf.prompt_char_limit or 8000) then
+        vim.api.nvim_err_writeln("Requested files exceed prompt character limit. No step-by-step support enabled.")
+        return
+      end
+
+      copy_to_clipboard(prompt)
+      print("Prompt (with requested files) copied to clipboard! Paste it into ChatGPT.")
+    end
+  else
+    vim.api.nvim_err_writeln("No tools or recognized file instructions found. Provide 'tools:' or older 'project_name & files'.")
   end
 end
 
+------------------------------------------------------------------------------
+-- :ChatGPTCurrentBuffer
+------------------------------------------------------------------------------
+local function run_chatgpt_current_buffer_command()
+  local conf = config.load()
+  ui.setup_ui(conf)
+  ui.debug_log("Running :ChatGPTCurrentBuffer command.")
+
+  local lines = vim.api.nvim_buf_get_lines(0, 0, -1, false)
+  local user_input = table.concat(lines, "\n")
+  local dirs = conf.directories or {"."}
+  if conf.interactive_file_selection then
+    dirs = ui.pick_directories(dirs, conf)
+    if #dirs == 0 then
+      dirs = conf.directories
+    end
+  end
+
+  local final_prompt = build_prompt(user_input, dirs, conf)
+  local chunks = handle_step_by_step_if_needed(final_prompt, conf)
+
+  close_existing_buffer_by_name("ChatGPT_Generated_Prompt$")
+  local bufnr_ref = vim.api.nvim_create_buf(false, true)
+  vim.api.nvim_buf_set_name(bufnr_ref, "ChatGPT_Generated_Prompt")
+  vim.api.nvim_buf_set_option(bufnr_ref, "filetype", "markdown")
+
+  local prompt_lines = vim.split(chunks[1], "\n")
+  vim.api.nvim_buf_set_lines(bufnr_ref, 0, -1, false, prompt_lines)
+  vim.cmd("vsplit")
+  vim.cmd("buffer " .. bufnr_ref)
+
+  copy_to_clipboard(chunks[1])
+  if #chunks == 1 then
+    vim.api.nvim_out_write("Prompt (from current buffer) copied to clipboard! Paste into ChatGPT.\n")
+  else
+    vim.api.nvim_out_write("Step-by-step prompt (from current buffer) copied to clipboard!\n")
+  end
+end
+
+------------------------------------------------------------------------------
+-- PUBLIC API
+------------------------------------------------------------------------------
+M.run_chatgpt_command = run_chatgpt_command
+M.run_chatgpt_paste_command = run_chatgpt_paste_command
+M.run_chatgpt_current_buffer_command = run_chatgpt_current_buffer_command
+
 return M

lua/chatgpt_nvim/prompts.lua

@@ -0,0 +1,367 @@
+local M = {
+  ["solidjs-development"] = [[
+    ### SolidJS Development Guidelines
+
+    You are helping me develop a large SolidJS application. Please keep the following points in mind when generating or explaining code:
+
+    1. **Project & Folder Structure**  
+       - Use a modern bundler/build tool (e.g., [Vite](https://vitejs.dev/)) with SolidJS support.  
+       - Maintain a clear, top-level directory layout, typically:
+         ```
+         my-solid-app/
+         ├── public/
+         ├── src/
+         │   ├── components/
+         │   ├── pages/
+         │   ├── routes/  (if using a router)
+         │   ├── store/   (for signals/contexts)
+         │   ├── styles/
+         │   └── index.tsx
+         ├── package.json
+         ├── vite.config.ts
+         └── tsconfig.json
+         ```
+       - Organize common UI elements (buttons, modals, etc.) in `src/components/`, separate page-level views in `src/pages/`, and keep global or shared state in `src/store/`.  
+
+    2. **SolidJS Reactivity & State Management**  
+       - Use **signals**, **memos**, and **effects** judiciously:
+         - `createSignal` for local state,  
+         - `createEffect` for reactive computations and side effects,  
+         - `createMemo` to cache expensive computations.  
+       - For global or cross-component state, use **Context** providers or a dedicated store pattern (with signals/contexts).  
+       - Avoid unnecessary reactivity—structure signals to update only when needed.  
+
+    3. **Routing & Navigation**  
+       - Leverage the official [Solid Router](https://github.com/solidjs/solid-router) or [Solid Start](https://start.solidjs.com/) for routing.  
+       - Keep routes organized, especially in large projects (e.g., a dedicated `routes/` folder or a route config file).  
+       - Support code splitting with dynamic imports where appropriate for faster initial loads.  
+
+    4. **Component & Code Organization**  
+       - Name components in **PascalCase** (e.g., `NavBar.tsx`, `UserProfile.tsx`), and keep them focused on a single responsibility.  
+       - Co-locate component-specific styles, tests, and other assets alongside the component file to simplify discovery (`MyComponent/` folder pattern).  
+       - Encourage **reuse** by factoring out small, generic components from more complex ones.  
+
+    5. **Styling & CSS Management**  
+       - Use your preferred styling approach (CSS Modules, [Tailwind CSS](https://tailwindcss.com/), or standard CSS/SCSS files).  
+       - Keep global styles minimal, focusing on utility classes or base styling; keep component-level styles scoped whenever possible.  
+     - If using CSS-in-JS solutions or third-party libraries, ensure they integrate cleanly with Solid’s reactivity.  
+
+    6. **TypeScript & Linting**  
+       - Use **TypeScript** to ensure type safety and improve maintainability.  
+       - Include a strict `tsconfig.json` configuration (e.g., `"strict": true`).  
+       - Employ linting and formatting tools:
+         - [ESLint](https://eslint.org/) with the [eslint-plugin-solid](https://github.com/solidjs-community/eslint-plugin-solid)  
+         - [Prettier](https://prettier.io/) for consistent formatting  
+       - Run these tools in a pre-commit hook or CI pipeline to maintain code quality.  
+
+    7. **Testing & Quality Assurance**  
+       - Write **unit tests** for smaller components with a testing library like [Vitest](https://vitest.dev/) or [Jest](https://jestjs.io/) (configured for SolidJS).  
+       - For **integration or end-to-end (E2E) tests**, use tools like [Cypress](https://www.cypress.io/) or [Playwright](https://playwright.dev/).  
+       - Aim for a robust CI workflow that runs tests automatically on every commit or pull request.  
+
+    8. **Performance & Optimization**  
+       - SolidJS is already performant with granular reactivity, but still follow best practices:
+         - Avoid creating signals/memos/effects in tight loops or repeatedly in render.  
+         - Use code splitting and lazy loading for large features or pages.  
+         - Leverage caching and memoization for expensive computations.  
+       - Profile your app with dev tools (e.g., [Solid DevTools](https://github.com/thetarnav/solid-devtools)) to identify and address performance bottlenecks.  
+
+    9. **Output Format**  
+       - Present any generated source code as well-organized files under the appropriate folders (e.g., `components/`, `pages/`).  
+       - When explaining your reasoning, include any architectural or design trade-offs (e.g., “I created a separate store signal for authentication to isolate login logic from other features.”).  
+       - If you modify existing files, specify precisely which lines or sections have changed, and why.  
+
+    Please follow these guidelines to ensure the generated or explained code aligns well with SolidJS best practices for large, maintainable projects.
+  ]],
+  ["go-development"] = [[
+    ### Go Development Guidelines
+
+    You are helping me develop a large Go (Golang) project. Please keep the following points in mind when generating or explaining code:
+
+    1. **Go Modules**  
+       - Use a single `go.mod` file at the project root for module management.  
+       - Ensure you use proper import paths based on the module name.  
+     - If you refer to internal packages, use relative paths consistent with the module’s structure (e.g., `moduleName/internal/packageA`).  
+
+    2. **Package Structure**  
+       - Each folder should contain exactly one package.  
+       - Avoid creating multiple packages in the same folder.  
+       - Use descriptive folder names and keep package names concise, following Go naming conventions.  
+       - Do not duplicate function or type names across different files in the same folder/package.  
+
+    3. **File & Folder Organization**  
+       - Organize source code in a folder hierarchy that reflects functionality. For example:
+         ```
+         myproject/
+         ├── go.mod
+         ├── cmd/
+         │   └── myapp/
+         │       └── main.go
+         ├── internal/
+         │   ├── service/
+         │   ├── repository/
+         │   └── ...
+         └── pkg/
+             └── shared/
+         ```
+       - Keep external-facing, reusable packages in `pkg/` and internal logic in `internal/`.  
+       - Place the `main()` function in the `cmd/<appname>` folder.  
+
+    4. **Coding Best Practices**  
+       - Maintain idiomatic Go code (e.g., short function and variable names where obvious, PascalCase for exported symbols).  
+       - Keep functions short, focused, and tested.  
+     - Use Go’s standard library where possible before adding third-party dependencies.  
+       - When introducing new functions or types, ensure they are uniquely named to avoid collisions.  
+
+    5. **Import Management**  
+       - Ensure that every import is actually used in your code.  
+       - Remove unused imports to keep your code clean and maintainable.  
+       - Include all necessary imports for anything referenced in your code to avoid missing imports.  
+     - Verify that any introduced import paths match your module’s structure and do not cause naming conflicts.  
+
+    6. **Output Format**  
+       - Present any generated source code as well-organized Go files, respecting the single-package-per-folder rule.  
+       - When explaining your reasoning, include any relevant architectural trade-offs and rationale (e.g., “I placed function X in package Y to keep the domain-specific logic separate from the main execution flow.”).  
+       - If you modify an existing file, specify precisely which changes or additions you are making.  
+
+  Please follow these guidelines to ensure the generated or explained code aligns well with Golang’s best practices for large, modular projects.
+  ]],
+  ["typo3-development"] = [[
+    ### TYPO3 Development Guidelines
+
+    You are helping me develop a large TYPO3 project. Please keep the following points in mind when generating or explaining code:
+
+    1. **Project & Folder Structure**  
+       - Organize the project to take advantage of Composer-based installation (e.g., `composer.json` referencing `typo3/cms-core` and any additional extensions).  
+       - Maintain a clean, well-defined folder hierarchy, typically:
+         ```
+         project-root/
+         ├── composer.json
+         ├── public/
+         │   ├── fileadmin/
+         │   ├── typo3/
+         │   └── typo3conf/
+         ├── config/
+         │   └── sites/
+         ├── var/
+         └── ...
+         ```
+       - Store custom extensions inside `public/typo3conf/ext/` or use Composer to manage them under `vendor/`.  
+       - Keep site configuration in `config/sites/` (for TYPO3 v9+).  
+
+    2. **Extension Development**  
+     - Create custom functionality as separate extensions (site packages, domain-specific extensions, etc.) following TYPO3’s recommended structure:
+         - **Key files**: `ext_emconf.php`, `ext_localconf.php`, `ext_tables.php`, `ext_tables.sql`, `Configuration/`, `Classes/`, `Resources/`.  
+         - Use **PSR-4** autoloading and name extensions logically (e.g., `my_sitepackage`, `my_blogextension`).  
+     - Keep your extension’s code under `Classes/` (e.g., Controllers, Models, Services).  
+       - Place Fluid templates, partials, and layouts under `Resources/Private/` (e.g., `Resources/Private/Templates`, `Resources/Private/Partials`, `Resources/Private/Layouts`).  
+
+    3. **Configuration (TypoScript & TCA)**  
+       - Maintain **TypoScript** files in a clear, hierarchical structure under `Configuration/TypoScript/` or `Resources/Private/TypoScript/`.  
+       - Use **ext_typoscript_setup.txt** and **ext_typoscript_constants.txt** (or `.typoscript` alternatives) for extension-wide configuration.  
+       - Define **TCA** for custom database tables or custom fields in `Configuration/TCA` or in `ext_tables.php/ext_localconf.php` as needed.  
+       - Respect naming conventions for database tables and fields to keep them unique to your extension (e.g., `tx_myextension_domain_model_xyz`).  
+
+    4. **Coding Standards & Best Practices**  
+       - Follow **PSR-2/PSR-12** coding standards for PHP (naming, indentation, etc.).  
+       - Keep classes short, focused, and well-documented with PHPDoc comments.  
+       - Separate concerns:  
+         - Controllers handle request logic,  
+         - Models represent data,  
+         - Repositories abstract data access,  
+         - Services implement business logic.  
+       - Avoid placing large chunks of code in Fluid templates—keep logic in PHP classes and pass the data to templates.  
+       - Use official TYPO3 APIs (e.g., `GeneralUtility`, `Context` API) where applicable rather than raw PHP or legacy code.  
+
+    5. **Fluid Templates & Rendering**  
+       - Keep template files in `Resources/Private/Templates/<ControllerName>/<ActionName>.html`.  
+       - Use `Resources/Private/Partials` and `Resources/Private/Layouts` to avoid duplicating common template sections.  
+       - Register your templates, partials, and layouts in TypoScript or in `Configuration/Services.yaml` for automatic discovery.  
+
+    6. **Documentation & Version Control**  
+       - Write README/CHANGELOG files at the extension root to describe major changes and usage.  
+       - Include inline documentation and use Git for version control.  
+       - Adhere to **Semantic Versioning** (`MAJOR.MINOR.PATCH`) for your custom extensions, when applicable.  
+
+    7. **Output Format**  
+       - Present any generated source code or configuration files in a well-organized structure.  
+       - Clearly indicate where each file should be placed in the TYPO3 directory layout.  
+     - When explaining your reasoning, include any relevant architectural decisions (e.g., “I created a separate extension for blog functionality to keep it isolated from the site’s main configuration.”).  
+       - If you modify or extend an existing file, specify precisely which changes or additions you are making.  
+
+  Please follow these guidelines to ensure the generated or explained code aligns well with TYPO3’s best practices for large, maintainable projects.
+  ]],
+  ["rust-development"] = [[
+    ### Rust Development Guidelines
+
+    You are helping me develop a large Rust project. Please keep the following points in mind when generating or explaining code:
+
+    1. **Cargo & Workspace Management**  
+       - Use a [Cargo workspace](https://doc.rust-lang.org/book/ch14-03-cargo-workspaces.html) for managing multiple crates under one top-level project.  
+       - Maintain a `Cargo.toml` at the workspace root, referencing the member crates in the `[workspace]` section.  
+       - Keep dependency versions up-to-date and consistent across crates.  
+
+    2. **Crates & Packages**  
+       - Split the application into logical crates (libraries and/or binaries).  
+       - Each crate should have a single main **library** (`lib.rs`) or **binary** (`main.rs`) in its `src/` folder.  
+     - Name crates, modules, and files clearly, following Rust’s naming conventions (e.g., `snake_case` for files/modules, `PascalCase` for types).  
+       - Avoid duplicating the same function or type in multiple crates; share common functionality via a dedicated library crate if needed.  
+
+    3. **Folder & Module Structure**  
+     - Organize code within each crate using Rust’s module system, keeping related functions and types in logical modules/submodules.  
+       - A typical directory layout for a workspace with multiple crates might look like:
+         ```
+         myproject/
+         ├── Cargo.toml        # Workspace root
+         ├── crates/
+         │   ├── my_lib/
+         │   │   ├── Cargo.toml
+         │   │   └── src/
+         │   │       ├── lib.rs
+         │   │       └── ...
+         │   └── my_app/
+         │       ├── Cargo.toml
+         │       └── src/
+         │           └── main.rs
+         ├── target/
+         └── ...
+         ```
+     - If you have integration tests, store them in a `tests/` folder at the crate root, or use the workspace root’s `tests/` directory if they span multiple crates.  
+
+    4. **Coding & Documentation Best Practices**  
+       - Write **idiomatic Rust** code:
+         - Use `cargo fmt` (formatting) and `cargo clippy` (linter) to maintain consistency and quality.  
+         - Use `?` operator for error handling, prefer `Result<T, E>` over panicking unless absolutely necessary.  
+       - Document your code using [Rustdoc](https://doc.rust-lang.org/rustdoc/) comments (`///` for public API) and provide examples when relevant.  
+       - Write **unit tests** alongside the code (in `src/` files) and **integration tests** in a dedicated `tests/` folder.  
+       - Keep functions short, focused, and ensure they have well-defined responsibilities.  
+
+    5. **Reusability & Shared Code**  
+       - Place common or reusable functionality into a dedicated **library** crate.  
+       - Ensure that crates depending on shared code add the appropriate `[dependencies]` or `[dev-dependencies]` in their `Cargo.toml`.  
+       - Use the Rust standard library whenever possible before introducing external dependencies.  
+
+    6. **Error Handling & Logging**  
+       - Use structured, typed error handling (e.g., [thiserror](https://crates.io/crates/thiserror) or [anyhow](https://crates.io/crates/anyhow)) for more readable error management if appropriate.  
+       - Provide clear, contextual error messages that help in debugging.  
+       - Include robust logging with a minimal overhead library (e.g., [log](https://crates.io/crates/log) with [env_logger](https://crates.io/crates/env_logger) or similar).  
+
+    7. **Output Format**  
+       - Present generated source code as well-organized Rust files, respecting the single main library or binary per crate (`lib.rs` or `main.rs`).  
+       - When explaining your reasoning, include any architectural or design decisions (e.g., “I placed function X in crate `my_lib` to keep the business logic separate from the command-line interface.”).  
+       - If you modify existing files, specify precisely which lines or sections have changed.  
+
+    Please follow these guidelines to ensure the generated or explained code aligns well with Rust best practices for large, modular projects.
+  ]],
+  ["basic-prompt"] = [[
+    ### Basic Prompt
+
+    You are assisting me in a coding workflow for a project (e.g., "my_project"). Whenever you need to inspect or modify files, or execute commands, you must provide both:
+
+    1. `project_name: "<actual_project_name>"` (matching the real project name)  
+    2. A `tools:` array describing the operations you want to perform.
+
+    **Example** (substitute `<actual_project_name>` with the real name):
+    ```yaml
+    project_name: "my_project"
+    tools:
+      - tool: "readFile"
+        path: "relative/path/to/file"
+
+      - tool: "replace_in_file"
+        path: "relative/path/to/file"
+        replacements:
+          - search: "old text"
+            replace: "new text"
+
+      - tool: "editFile"
+        path: "relative/path/to/file"
+        content: |
+          # Full updated file content here
+
+      - tool: "executeCommand"
+        command: "ls -la"
+    ```
+
+    **Key Points**:
+    - Always include `project_name: "<actual_project_name>"` in the same YAML as `tools`.
+    - If you only need one tool, include just one object in the `tools` array.
+    - If multiple tools are needed, list them sequentially in the `tools` array.
+    - Always run at least one tool (e.g., `readFile`, `editFile`, `executeCommand`), exept you have finished.
+    - Always just include one yaml in the response with all the tools you want to run in that yaml.
+    - The plugin will verify the `project_name` is correct before running any tools.
+    - If the response grows too large, I'll guide you to break it into smaller steps.
+  ]],
+  ["secure-coding"] = [[
+    ### Secure Coding Guidelines
+
+    You are assisting me in creating software that prioritizes security at every stage of the development process. Please adhere to the following guidelines whenever you propose code, architecture, or any form of implementation detail:
+
+    1. **Secure Coding Principles**  
+       - Emphasize **input validation**, **output encoding**, and **context-aware sanitization** (e.g., sanitizing user inputs against SQL injection, XSS, CSRF, etc.).  
+       - Follow the principle of **least privilege**:  
+         - Only request or grant the permissions necessary for each component’s functionality.  
+       - Implement robust **error handling** and **logging** without revealing sensitive data (e.g., do not log passwords, tokens, or PII).  
+
+    2. **OWASP Top Ten Alignment**  
+       - Consult the **OWASP Top Ten** (or equivalent security framework) to address common risks:  
+         - **Injection** (SQL, NoSQL, Command Injection)  
+         - **Broken Authentication**  
+         - **Sensitive Data Exposure**  
+         - **XML External Entities**  
+         - **Broken Access Control**  
+         - **Security Misconfiguration**  
+         - **Cross-Site Scripting (XSS)**  
+         - **Insecure Deserialization**  
+         - **Using Components with Known Vulnerabilities**  
+         - **Insufficient Logging & Monitoring**  
+       - Provide secure defaults and demonstrate how to mitigate each risk using example code.  
+
+    3. **Secure Communication & Data Handling**  
+       - Use **TLS/SSL** for all data in transit wherever possible.  
+       - Store sensitive data in encrypted form, leveraging secure, up-to-date cryptographic libraries.  
+       - Avoid hardcoding credentials or secrets in source code. Use secure secrets management solutions.  
+
+    4. **Dependency & Third-Party Library Management**  
+       - Use only reputable, **actively maintained** third-party libraries and verify they have no known critical vulnerabilities.  
+       - Keep all dependencies **updated** to minimize exposure to known security flaws.  
+
+    5. **Authentication & Authorization**  
+       - Implement **secure authentication flows** (e.g., token-based authentication, OAuth2, OpenID Connect).  
+       - Use robust **password hashing** algorithms such as bcrypt, scrypt, or Argon2 (avoid MD5 or SHA1).  
+       - Enforce **strong password** or credential policies.  
+       - Implement **role-based access control (RBAC)** or attribute-based access control (ABAC) where appropriate.  
+
+    6. **Secure Configuration**  
+       - Apply **secure configuration defaults** (e.g., disable unnecessary services, secure admin endpoints, etc.).  
+       - Avoid exposing internal ports or services to the public network.  
+       - Use a **Content Security Policy (CSP)** header, secure cookies, and other HTTP security headers where relevant.  
+
+    7. **Secure Deployment & Maintenance**  
+       - Include guidelines for **monitoring** (e.g., intrusion detection, anomaly detection).  
+       - Provide methods for **logging** security-relevant events (failed logins, data access anomalies).  
+       - Outline **incident response** steps (e.g., notifications, rollback procedures, quick patching, etc.).  
+
+    8. **Documentation & Continuous Improvement**  
+       - Document all security-related decisions and configurations.  
+       - Encourage periodic **code reviews** and **security audits**.  
+       - Support **continuous integration and deployment (CI/CD)** pipelines with automated security checks (static analysis, dependency scanning, etc.).  
+
+    9. **Output Format**  
+       - Present any generated source code with **secure defaults** and thorough in-code commentary about security measures.  
+       - If you propose changes to existing code or configurations, specify precisely how you’ve enhanced security.  
+       - Whenever possible, provide references to relevant security standards, best practices, or guidelines (e.g., OWASP, NIST).  
+
+    Please follow these guidelines to ensure the generated or explained code prioritizes security at every level, mitigating potential risks and maintaining best practices for building secure software.
+  ]],
+  ["step-prompt"] = [[
+    It appears this request might exceed the model's prompt character limit if done all at once.
+    Please break down the tasks into smaller steps and handle them one by one.
+    Thank you!
+  ]],
+  ["file-selection-instructions"] = [[
+    Delete lines for directories you do NOT want, then save & close (e.g. :wq, :x, or :bd)
+  ]]
+}
+
+return M

lua/chatgpt_nvim/tools/edit_file.lua

@@ -0,0 +1,37 @@
+local handler = require("chatgpt_nvim.handler")
+local robust_lsp = require("chatgpt_nvim.tools.lsp_robust_diagnostics")
+
+local M = {}
+
+M.run = function(tool_call, conf, prompt_user_tool_accept, is_subpath, read_file)
+  local path = tool_call.path
+  local new_content = tool_call.content
+
+  if not path or not new_content then
+    return "[edit_file] Missing 'path' or 'content'."
+  end
+  local root = vim.fn.getcwd()
+
+  if not is_subpath(root, path) then
+    return string.format("Tool [edit_file for '%s'] REJECTED. Path outside project root.", path)
+  end
+
+  -- 1) Write the new content
+  handler.write_file(path, new_content, conf)
+
+  local msg = {}
+  msg[#msg+1] = string.format("Tool [edit_file for '%s'] Result:\nThe content was successfully saved to %s.", path, path)
+  msg[#msg+1] = "\nHere is the full, updated content of the file that was saved:\n"
+  msg[#msg+1] = string.format("<final_file_content path=\"%s\">\n%s\n</final_file_content>", path, new_content)
+  msg[#msg+1] = "\nIMPORTANT: For any future changes to this file, use the final_file_content shown above as your reference.\n"
+
+  -- 2) If auto_lint => run robust LSP approach
+  if conf.auto_lint then
+    local diag_str = robust_lsp.lsp_check_file_content(path, new_content, 3000) -- 3s wait
+    msg[#msg+1] = "\n" .. diag_str
+  end
+
+  return table.concat(msg, "")
+end
+
+return M

lua/chatgpt_nvim/tools/execute_command.lua

@@ -0,0 +1,17 @@
+local M = {}
+
+M.run = function(tool_call, conf, prompt_user_tool_accept, is_subpath, read_file)
+  local cmd = tool_call.command
+  if not cmd then
+    return "[executeCommand] Missing 'command'."
+  end
+  local handle = io.popen(cmd)
+  if not handle then
+    return string.format("Tool [executeCommand '%s'] FAILED to popen.", cmd)
+  end
+  local result = handle:read("*a") or ""
+  handle:close()
+  return string.format("Tool [executeCommand '%s'] Result:\n%s", cmd, result)
+end
+
+return M

lua/chatgpt_nvim/tools/init.lua

@@ -0,0 +1,39 @@
+local read_file_tool = require("chatgpt_nvim.tools.read_file")
+local edit_file_tool = require("chatgpt_nvim.tools.edit_file")
+local replace_in_file_tool = require("chatgpt_nvim.tools.replace_in_file")
+local execute_command_tool = require("chatgpt_nvim.tools.execute_command")
+
+local M = {}
+
+-- We can store a table of available tools here
+M.available_tools = {
+  {
+    name = "readFile",
+    usage = "Retrieve the contents of a file. Provide { tool='readFile', path='...' }",
+    explanation = "Use this to read file content directly from the disk."
+  },
+  {
+    name = "editFile",
+    usage = "Overwrite an entire file's content. Provide { tool='editFile', path='...', content='...' }",
+    explanation = "Use this when you want to replace a file with new content."
+  },
+  {
+    name = "replace_in_file",
+    usage = "Perform a search-and-replace. Provide { tool='replace_in_file', path='...', replacements=[ { search='...', replace='...' }, ... ] }",
+    explanation = "Use this to apply incremental changes without fully overwriting the file."
+  },
+  {
+    name = "executeCommand",
+    usage = "Run a shell command. Provide { tool='executeCommand', command='...' }",
+    explanation = "Use with caution, especially for destructive operations (rm, sudo, etc.)."
+  },
+}
+
+M.tools_by_name = {
+  readFile = read_file_tool,
+  editFile = edit_file_tool,
+  replace_in_file = replace_in_file_tool,
+  executeCommand = execute_command_tool
+}
+
+return M

lua/chatgpt_nvim/tools/lsp_robust_diagnostics.lua

@@ -0,0 +1,177 @@
+local api = vim.api
+local lsp = vim.lsp
+
+local M = {}
+
+local function guess_filetype(path)
+  local ext = path:match("^.+%.([^./\\]+)$")
+  if not ext then return nil end
+  ext = ext:lower()
+  local map = {
+    lua = "lua",
+    go  = "go",
+    rs  = "rust",
+    js  = "javascript",
+    jsx = "javascriptreact",
+    ts  = "typescript",
+    tsx = "typescriptreact",
+    php = "php",
+  }
+  return map[ext]
+end
+
+local function create_scratch_buffer(path, content)
+  -- Create a unique buffer name so we never clash with an existing one
+  local scratch_name = string.format("chatgpt-scratch://%s#%d", path, math.random(100000, 999999))
+
+  local bufnr = api.nvim_create_buf(false, true)
+  if bufnr == 0 then
+    return nil
+  end
+
+  -- Assign the unique name to the buffer
+  api.nvim_buf_set_name(bufnr, scratch_name)
+
+  -- Convert content string to lines
+  local lines = {}
+  for line in (content.."\n"):gmatch("(.-)\n") do
+    table.insert(lines, line)
+  end
+  api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
+
+  -- Mark it as a scratch buffer
+  api.nvim_buf_set_option(bufnr, "bufhidden", "wipe")
+  api.nvim_buf_set_option(bufnr, "swapfile", false)
+
+  return bufnr
+end
+
+local function attach_existing_lsp_client(bufnr, filetype)
+  local clients = lsp.get_active_clients()
+  if not clients or #clients == 0 then
+    return nil, "No active LSP clients"
+  end
+
+  for _, client in ipairs(clients) do
+    local ft_conf = client.config.filetypes or {}
+    if vim.tbl_contains(ft_conf, filetype) then
+      if not client.attached_buffers[bufnr] then
+        vim.lsp.buf_attach_client(bufnr, client.id)
+      end
+      return client.id
+    end
+  end
+  return nil, ("No active LSP client supports filetype '%s'"):format(filetype)
+end
+
+local function send_did_open(bufnr, client_id, path, filetype)
+  local client = lsp.get_client_by_id(client_id)
+  if not client then
+    return "Invalid client ID."
+  end
+
+  local text = table.concat(api.nvim_buf_get_lines(bufnr, 0, -1, false), "\n")
+  -- Even though the buffer name is unique, the LSP server sees this file as if at 'path'
+  local uri = vim.uri_from_fname(path)
+
+  local didOpenParams = {
+    textDocument = {
+      uri = uri,
+      languageId = filetype,
+      version = 0,
+      text = text,
+    }
+  }
+  client.rpc.notify("textDocument/didOpen", didOpenParams)
+  return nil
+end
+
+local function send_did_change(bufnr, client_id)
+  local client = lsp.get_client_by_id(client_id)
+  if not client then return end
+
+  local text = table.concat(api.nvim_buf_get_lines(bufnr, 0, -1, false), "\n")
+  local uri = vim.uri_from_bufnr(bufnr)
+  local version = 1
+
+  client.rpc.notify("textDocument/didChange", {
+    textDocument = {
+      uri = uri,
+      version = version,
+    },
+    contentChanges = {
+      { text = text }
+    }
+  })
+end
+
+local function wait_for_diagnostics(bufnr, timeout_ms)
+  local done = false
+  local result_diags = {}
+
+  local augrp = api.nvim_create_augroup("chatgpt_lsp_diag_"..bufnr, { clear = true })
+  api.nvim_create_autocmd("DiagnosticChanged", {
+    group = augrp,
+    callback = function(args)
+      if args.buf == bufnr then
+        local diags = vim.diagnostic.get(bufnr)
+        result_diags = diags
+        done = true
+      end
+    end
+  })
+
+  local waited = 0
+  local interval = 50
+  while not done and waited < timeout_ms do
+    vim.cmd(("sleep %d m"):format(interval))
+    waited = waited + interval
+  end
+
+  pcall(api.nvim_del_augroup_by_id, augrp)
+  return result_diags
+end
+
+local function diagnostics_to_string(diags)
+  if #diags == 0 then
+    return "No LSP diagnostics reported."
+  end
+  local lines = { "--- LSP Diagnostics ---" }
+  for _, d in ipairs(diags) do
+    local sev = vim.diagnostic.severity[d.severity] or d.severity
+    lines[#lines+1] = string.format("Line %d [%s]: %s", d.lnum + 1, sev, d.message)
+  end
+  return table.concat(lines, "\n")
+end
+
+function M.lsp_check_file_content(path, new_content, timeout_ms)
+  local filetype = guess_filetype(path) or "plaintext"
+
+  local bufnr = create_scratch_buffer(path, new_content)
+  if not bufnr then
+    return "(LSP) Could not create scratch buffer."
+  end
+
+  local client_id, err = attach_existing_lsp_client(bufnr, filetype)
+  if not client_id then
+    api.nvim_buf_delete(bufnr, { force = true })
+    return "(LSP) " .. (err or "No suitable LSP client.")
+  end
+
+  local err2 = send_did_open(bufnr, client_id, path, filetype)
+  if err2 then
+    api.nvim_buf_delete(bufnr, { force = true })
+    return "(LSP) " .. err2
+  end
+
+  -- Optionally do a didChange
+  send_did_change(bufnr, client_id)
+
+  local diags = wait_for_diagnostics(bufnr, timeout_ms or 2000)
+  local diag_str = diagnostics_to_string(diags)
+
+  api.nvim_buf_delete(bufnr, { force = true })
+  return diag_str
+end
+
+return M

lua/chatgpt_nvim/tools/manager.lua

@@ -0,0 +1,79 @@
+local tools_module = require("chatgpt_nvim.tools")
+
+local M = {}
+
+local function is_destructive_command(cmd)
+  if not cmd then return false end
+  local destructive_list = { "rm", "sudo", "mv", "cp" }
+  for _, keyword in ipairs(destructive_list) do
+    if cmd:match("(^" .. keyword .. "[%s$])") or cmd:match("[%s]" .. keyword .. "[%s$]") then
+      return true
+    end
+  end
+  return false
+end
+
+local function prompt_user_tool_accept(tool_call, conf)
+  local auto_accept = conf.tool_auto_accept[tool_call.tool]
+
+  -- If this is an executeCommand and we see it's destructive, force a user prompt
+  if tool_call.tool == "executeCommand" and auto_accept then
+    if is_destructive_command(tool_call.command) then
+      auto_accept = false
+    end
+  end
+
+  if auto_accept then
+    -- If auto-accepted and not destructive, no prompt needed
+    return true
+  else
+    -- Build some context about the tool request
+    local msg = ("Tool request: %s\n"):format(tool_call.tool or "unknown")
+    if tool_call.path then
+      msg = msg .. ("Path: %s\n"):format(tool_call.path)
+    end
+    if tool_call.command then
+      msg = msg .. ("Command: %s\n"):format(tool_call.command)
+    end
+    if tool_call.replacements then
+      msg = msg .. ("Replacements: %s\n"):format(vim.inspect(tool_call.replacements))
+    end
+
+    msg = msg .. "Accept this tool request? [y/N]: "
+
+    -- Force a screen redraw so the user sees the prompt properly
+    vim.cmd("redraw")
+
+    local ans = vim.fn.input(msg)
+    return ans:lower() == "y"
+  end
+end
+
+local function handle_tool_calls(tools, conf, is_subpath_fn, read_file_fn)
+  local messages = {}
+
+  for _, call in ipairs(tools) do
+    local accepted = prompt_user_tool_accept(call, conf)
+    if not accepted then
+      table.insert(messages, ("Tool [%s] was rejected by user."):format(call.tool or "nil"))
+    else
+      local tool_impl = tools_module.tools_by_name[call.tool]
+      if tool_impl then
+        local msg = tool_impl.run(call, conf, prompt_user_tool_accept, is_subpath_fn, read_file_fn)
+        table.insert(messages, msg)
+      else
+        table.insert(messages, ("Unknown tool type: '%s'"):format(call.tool or "nil"))
+      end
+    end
+  end
+
+  local combined = table.concat(messages, "\n\n")
+  local limit = conf.prompt_char_limit or 8000
+  if #combined > limit then
+    return ("The combined tool output is too large (%d chars). Please break down the operations into smaller steps."):format(#combined)
+  end
+  return combined
+end
+
+M.handle_tool_calls = handle_tool_calls
+return M

lua/chatgpt_nvim/tools/read_file.lua

@@ -0,0 +1,17 @@
+local uv = vim.loop
+local M = {}
+
+M.run = function(tool_call, conf, prompt_user_tool_accept, is_subpath, read_file)
+  local path = tool_call.path
+  if not path then
+    return "[read_file] Missing 'path'."
+  end
+  local file_data = read_file(path)
+  if file_data then
+    return string.format("Tool [read_file for '%s'] Result:\n\n%s", path, file_data)
+  else
+    return string.format("Tool [read_file for '%s'] FAILED. File not found or not readable.", path)
+  end
+end
+
+return M

lua/chatgpt_nvim/tools/replace_in_file.lua

@@ -0,0 +1,51 @@
+local handler = require("chatgpt_nvim.handler")
+local robust_lsp = require("chatgpt_nvim.tools.lsp_robust_diagnostics")
+
+local M = {}
+
+local function search_and_replace(original, replacements)
+  local updated = original
+  for _, r in ipairs(replacements) do
+    local search_str = r.search or ""
+    local replace_str = r.replace or ""
+    updated = updated:gsub(search_str, replace_str)
+  end
+  return updated
+end
+
+M.run = function(tool_call, conf, prompt_user_tool_accept, is_subpath, read_file)
+  local path = tool_call.path
+  local replacements = tool_call.replacements or {}
+
+  if not path or #replacements == 0 then
+    return "[replace_in_file] Missing 'path' or 'replacements'."
+  end
+  local root = vim.fn.getcwd()
+
+  if not is_subpath(root, path) then
+    return string.format("Tool [replace_in_file for '%s'] REJECTED. Path outside project root.", path)
+  end
+
+  local orig_data = read_file(path)
+  if not orig_data then
+    return string.format("[replace_in_file for '%s'] FAILED. Could not read file.", path)
+  end
+
+  local updated_data = search_and_replace(orig_data, replacements)
+  handler.write_file(path, updated_data, conf)
+
+  local msg = {}
+  msg[#msg+1] = string.format("[replace_in_file for '%s'] Result:\nThe content was successfully saved to %s.", path, path)
+  msg[#msg+1] = "\nHere is the full, updated content of the file that was saved:\n"
+  msg[#msg+1] = string.format("<final_file_content path=\"%s\">\n%s\n</final_file_content>", path, updated_data)
+  msg[#msg+1] = "\nIMPORTANT: For any future changes to this file, use the final_file_content shown above as your reference.\n"
+
+  if conf.auto_lint then
+    local diag_str = robust_lsp.lsp_check_file_content(path, updated_data, 3000)
+    msg[#msg+1] = "\n" .. diag_str
+  end
+
+  return table.concat(msg, "")
+end
+
+return M

lua/chatgpt_nvim/ui.lua

@@ -0,0 +1,98 @@
+local M = {}
+-- Remove local conf = config.load()
+-- We'll have each function accept 'conf' from outside or handle it in init.lua
+-- local config = require('chatgpt_nvim.config')
+-- local conf = config.load()
+local prompts = require('chatgpt_nvim.prompts')
+
+local debug_bufnr = nil
+
+-- We'll store a reference to conf at runtime
+local runtime_conf = nil
+
+function M.setup_ui(conf)
+  runtime_conf = conf
+  if runtime_conf.improved_debug then
+    for _, buf in ipairs(vim.api.nvim_list_bufs()) do
+      local name = vim.api.nvim_buf_get_name(buf)
+      if name == "ChatGPT_Debug_Log" then
+        vim.api.nvim_buf_delete(buf, {force = true})
+      end
+    end
+    debug_bufnr = vim.api.nvim_create_buf(false, true)
+    vim.api.nvim_buf_set_name(debug_bufnr, "ChatGPT_Debug_Log")
+    vim.api.nvim_buf_set_option(debug_bufnr, "filetype", "log")
+  end
+end
+
+function M.debug_log(msg)
+  if runtime_conf and runtime_conf.improved_debug and debug_bufnr then
+    vim.api.nvim_buf_set_lines(debug_bufnr, -1, -1, false, { msg })
+  else
+    if runtime_conf and runtime_conf.debug then
+      vim.api.nvim_out_write("[chatgpt_nvim:debug] " .. msg .. "\n")
+    end
+  end
+end
+
+function M.pick_directories(dirs, conf)
+  local selected_dirs = {}
+  local selection_instructions = prompts["file-selection-instructions"]
+  local lines = { selection_instructions }
+
+  for _, d in ipairs(dirs) do
+    table.insert(lines, d)
+  end
+
+  for _, buf in ipairs(vim.api.nvim_list_bufs()) do
+    local name = vim.api.nvim_buf_get_name(buf)
+    if name:match("ChatGPT_File_Selection") then
+      vim.api.nvim_buf_delete(buf, {force = true})
+    end
+  end
+
+  local bufnr = vim.api.nvim_create_buf(false, false)
+  vim.api.nvim_buf_set_name(bufnr, "ChatGPT_File_Selection")
+  vim.api.nvim_buf_set_option(bufnr, "filetype", "markdown")
+  vim.api.nvim_buf_set_option(bufnr, "bufhidden", "wipe")
+  vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
+
+  local function on_write()
+    local new_lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
+    local final_dirs = {}
+    for _, l in ipairs(new_lines) do
+      if l ~= "" and not l:match("^Delete lines") and not l:match("^#") then
+        table.insert(final_dirs, l)
+      end
+    end
+    selected_dirs = final_dirs
+    vim.api.nvim_buf_set_option(bufnr, "modified", false)
+  end
+
+  vim.api.nvim_create_autocmd("BufWriteCmd", {
+    buffer = bufnr,
+    once = true,
+    callback = function()
+      on_write()
+      vim.cmd("bd! " .. bufnr)
+    end
+  })
+
+  vim.cmd("split")
+  vim.cmd("buffer " .. bufnr)
+
+  vim.wait(30000, function()
+    local winids = vim.api.nvim_tabpage_list_wins(0)
+    for _, w in ipairs(winids) do
+      local b = vim.api.nvim_win_get_buf(w)
+      if b == bufnr then
+        return false
+      end
+    end
+    return true
+  end)
+
+  return selected_dirs
+end
+
+return M

plugin/chatgpt.vim

@@ -1,2 +1,3 @@
 command! ChatGPT lua require('chatgpt_nvim').run_chatgpt_command()
 command! ChatGPTPaste lua require('chatgpt_nvim').run_chatgpt_paste_command()
+command! ChatGPTCurrentBuffer lua require('chatgpt_nvim').run_chatgpt_current_buffer_command()