feat: add the possibility to also add all files to initial context

Reviewed-on: #2

README.md

@@ -4,8 +4,8 @@
 This plugin integrates a ChatGPT O1 model workflow into Neovim. It allows you to:
 
 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
+   - An **initial prompt** (from `.chatgpt_config.yaml` or `chatgpt_config.yaml`)
+   - A list of directories (also specified in `.chatgpt_config.yaml` or `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.)
 
@@ -21,11 +21,11 @@ This plugin integrates a ChatGPT O1 model workflow into Neovim. It allows you to
 
 - **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.
+- **Interactive File Selection**: If `interactive_file_selection: true`, you choose which directories from `.chatgpt_config.yaml` or `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`
+## Example `.chatgpt_config.yaml` or `chatgpt_config.yaml`
 
 ```yaml
 project_name: "chatgpt_nvim"

chatgpt_config.yaml

@@ -1,9 +1,7 @@
-project_name: "chatgpt_nvim"
+project_name: "chatgpt.vim"
 default_prompt_blocks:
   - "basic-prompt"
   - "secure-coding"
-initial_files:
-  - "README.md"
 
 debug: false
 improved_debug: false
@@ -20,8 +18,9 @@ auto_lint: true
 
 # New tool auto-accept config
 tool_auto_accept:
-  readFile: false
-  editFile: false
+  readFile: true
+  editFile: true
+  replace_in_file: true
   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.

lua/chatgpt_nvim/config.lua

@@ -4,6 +4,7 @@ local uv = vim.loop
 local ok_yaml, lyaml = pcall(require, "lyaml")
 local prompts = require("chatgpt_nvim.prompts")
 
+-- Determines the Git root or fallback directory.
 local function get_project_root()
   local current_file = vim.fn.expand("%:p")
   local root_dir
@@ -28,14 +29,30 @@ local function get_project_root()
   return root_dir
 end
 
+-- Attempt to locate either .chatgpt_config.yaml or chatgpt_config.yaml, returning whichever exists first.
 local function get_config_path()
   local root = get_project_root()
-  return root .. "/.chatgpt_config.yaml"
+  local dot_config = root .. "/.chatgpt_config.yaml"
+  local non_dot_config = root .. "/chatgpt_config.yaml"
+
+  local dot_fd = uv.fs_open(dot_config, "r", 438)
+  if dot_fd then
+    uv.fs_close(dot_fd)
+    return dot_config
+  end
+
+  local non_dot_fd = uv.fs_open(non_dot_config, "r", 438)
+  if non_dot_fd then
+    uv.fs_close(non_dot_fd)
+    return non_dot_config
+  end
+
+  return nil
 end
 
 function M.load()
+  -- Attempt to find either config file, else fallback
   local path = get_config_path()
-  local fd = uv.fs_open(path, "r", 438)
   local config = {
     initial_prompt = "",
     directories = { "." },
@@ -44,6 +61,7 @@ function M.load()
     project_name = "",
     debug = false,
     initial_files = {},
+    include_file_contents = false, -- NEW FLAG: include file contents in prompt if true
     preview_changes = false,
     interactive_file_selection = false,
     partial_acceptance = false,
@@ -62,10 +80,22 @@ function M.load()
     }
   }
 
+  -- If no config file found, alert user and return default config
+  if not path then
+    config.initial_prompt = "You are a coding assistant who receives a project's context and user instructions..."
+    vim.notify(
+      "No config file found (tried .chatgpt_config.yaml, chatgpt_config.yaml). Using defaults.",
+      vim.log.levels.WARN
+    )
+    return config
+  end
+
+  local fd = uv.fs_open(path, "r", 438)
   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
@@ -90,6 +120,9 @@ function M.load()
         if type(result.initial_files) == "table" then
           config.initial_files = result.initial_files
         end
+        if type(result.include_file_contents) == "boolean" then  -- LOAD NEW FLAG
+          config.include_file_contents = result.include_file_contents
+        end
         if type(result.preview_changes) == "boolean" then
           config.preview_changes = result.preview_changes
         end
@@ -109,7 +142,6 @@ function M.load()
           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
@@ -145,6 +177,12 @@ function M.load()
     end
   end
 
+  -- Include project name in the final initial prompt, if set
+  if config.project_name ~= "" then
+    config.initial_prompt =
+      "[Project Name: " .. config.project_name .. "]\n\n" .. config.initial_prompt
+  end
+
   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")

lua/chatgpt_nvim/context.lua

@@ -185,4 +185,22 @@ function M.get_file_contents(files, conf)
   return table.concat(sections, "\n")
 end
 
+-- NEW FUNCTION: Build the project prompt by optionally including file contents.
+function M.get_project_prompt(directories, conf)
+  local structure = M.get_project_structure(directories, conf)
+  if conf.include_file_contents then
+    local files = M.get_project_files(directories, conf)
+    local contents = M.get_file_contents(files, conf)
+    local total_chars = #contents
+    if total_chars > conf.prompt_char_limit then
+      vim.notify("Total file contents (" .. total_chars .. " characters) exceed the prompt limit (" .. conf.prompt_char_limit .. "). Please disable 'include_file_contents' in your config.", vim.log.levels.ERROR)
+      return structure
+    else
+      return structure .. "\n" .. contents
+    end
+  else
+    return structure
+  end
+end
+
 return M

lua/chatgpt_nvim/init.lua

@@ -133,7 +133,8 @@ local function build_prompt(user_input, dirs, conf)
   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 ""
+  -- Using the new get_project_prompt function instead of get_project_structure.
+  env_lines[#env_lines+1] = context.get_project_prompt(dirs, conf) or ""
   env_lines[#env_lines+1] = ""
   env_lines[#env_lines+1] = "# Current Mode"
   env_lines[#env_lines+1] = "ACT MODE"

lua/chatgpt_nvim/prompts.lua

@@ -289,8 +289,62 @@ local M = {
     - 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.
+    - Never do write operations on a file which you have not read before. Its contents must be in your context before writing. This does not apply if you create a new file.
     - 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.
+
+    You are assisting me in a coding workflow for a project (e.g., "my_project"). 
+
+    1. **Gather Context / Ask Questions**  
+       - If you need more information or something is unclear, **ask me directly** in plain text, without calling any tools.
+
+    2. **Inspect Files**  
+       - When you need to check a file’s content, use:
+         ```yaml
+         project_name: "my_project"
+         tools:
+           - tool: "readFile"
+             path: "relative/path/to/file"
+         ```
+       - Read the file before deciding on any modifications.
+
+    3. **Make Changes**  
+       - If you need to modify an existing file (after reading it), use:
+         ```yaml
+         project_name: "my_project"
+         tools:
+           - tool: "editFile"
+             path: "relative/path/to/file"
+             content: |
+               # Full updated file content
+         ```
+       - Or perform incremental text replacements with:
+         ```yaml
+         project_name: "my_project"
+         tools:
+           - tool: "replace_in_file"
+             path: "relative/path/to/file"
+             replacements:
+               - search: "old text"
+                 replace: "new text"
+         ```
+
+    4. **Run Commands (Optional)**  
+       - To run tests, list files, or do other checks, use:
+         ```yaml
+         project_name: "my_project"
+         tools:
+           - tool: "executeCommand"
+             command: "shell command here"
+         ```
+
+    5. **Important Rules**  
+       - Always start with 1 or 2, but afterwards you can mix 1, 2, 3, and 4 as needed.
+       - Include `project_name: "my_project"` whenever you call `tools`.
+       - Keep each tool call in the `tools` array (multiple if needed).
+       - **Never write to a file you haven’t read** in this session and already got the content from an response (unless creating a new file).
+       - Follow secure coding guidelines (input validation, least privilege, no sensitive info in logs, etc.).
+       - When done, provide a final answer **without** calling any tools.
   ]],
   ["secure-coding"] = [[
     ### Secure Coding Guidelines

lua/chatgpt_nvim/tools/execute_command.lua

@@ -1,17 +1,36 @@
 local M = {}
 
 M.run = function(tool_call, conf, prompt_user_tool_accept, is_subpath, read_file)
+  -- Validate the command exists
   local cmd = tool_call.command
   if not cmd then
     return "[executeCommand] Missing 'command'."
   end
-  local handle = io.popen(cmd)
+
+  -- Capture stderr and stdout together by redirecting stderr to stdout
+  -- This will help diagnose if there's an error causing no output
+  cmd = cmd .. " 2>&1"
+
+  -- Attempt to popen the command
+  local handle = io.popen(cmd, "r")
   if not handle then
     return string.format("Tool [executeCommand '%s'] FAILED to popen.", cmd)
   end
+
+  -- Read the full output (stdout + stderr)
   local result = handle:read("*a") or ""
-  handle:close()
-  return string.format("Tool [executeCommand '%s'] Result:\n%s", cmd, result)
+
+  -- Attempt to close, capturing exit info
+  local _, exit_reason, exit_code = handle:close()
+
+  -- Provide a richer summary including exit code and reason
+  return string.format(
+    "Tool [executeCommand '%s'] exited with code %s (%s)\n%s",
+    cmd,
+    tostring(exit_code),
+    tostring(exit_reason),
+    result
+  )
 end
 
 return M

lua/chatgpt_nvim/tools/init.lua

@@ -14,7 +14,7 @@ M.available_tools = {
   },
   {
     name = "editFile",
-    usage = "Overwrite an entire file's content. Provide { tool='editFile', path='...', content='...' }",
+    usage = "Overwrite an entire file's content. Provide { tool='editFile', path='...', content='...' }, Allways include the whole file content",
     explanation = "Use this when you want to replace a file with new content."
   },
   {
@@ -25,7 +25,7 @@ M.available_tools = {
   {
     name = "executeCommand",
     usage = "Run a shell command. Provide { tool='executeCommand', command='...' }",
-    explanation = "Use with caution, especially for destructive operations (rm, sudo, etc.)."
+    explanation = "Just run one single command per tool invocation, without comment. It must be a single line. Use with caution, especially for destructive operations (rm, sudo, etc.)."
   },
 }
 

lua/chatgpt_nvim/tools/lsp_robust_diagnostics.lua

@@ -86,12 +86,12 @@ local function send_did_open(bufnr, client_id, path, filetype)
   return nil
 end
 
-local function send_did_change(bufnr, client_id)
+local function send_did_change(bufnr, client_id, path)
   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 uri = vim.uri_from_fname(path)
   local version = 1
 
   client.rpc.notify("textDocument/didChange", {
@@ -105,6 +105,7 @@ local function send_did_change(bufnr, client_id)
   })
 end
 
+-- Use vim.wait to allow the event loop to process LSP diagnostics
 local function wait_for_diagnostics(bufnr, timeout_ms)
   local done = false
   local result_diags = {}
@@ -121,12 +122,9 @@ local function wait_for_diagnostics(bufnr, timeout_ms)
     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
+  vim.wait(timeout_ms, function()
+    return done
+  end, 50)
 
   pcall(api.nvim_del_augroup_by_id, augrp)
   return result_diags
@@ -164,8 +162,8 @@ function M.lsp_check_file_content(path, new_content, timeout_ms)
     return "(LSP) " .. err2
   end
 
-  -- Optionally do a didChange
-  send_did_change(bufnr, client_id)
+  -- Optionally do a didChange with consistent URI
+  send_did_change(bufnr, client_id, path)
 
   local diags = wait_for_diagnostics(bufnr, timeout_ms or 2000)
   local diag_str = diagnostics_to_string(diags)

lua/chatgpt_nvim/tools/replace_in_file.lua

@@ -3,14 +3,41 @@ local robust_lsp = require("chatgpt_nvim.tools.lsp_robust_diagnostics")
 
 local M = {}
 
+-- Function to escape all Lua pattern magic characters:
+local function escape_lua_pattern(s)
+  return s:gsub("([%^%$%(%)%%%.%[%]%*%+%-%?])", "%%%1")
+end
+
 local function search_and_replace(original, replacements)
   local updated = original
+  local info_msgs = {}
+
   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)
+
+    -- Escape special pattern chars to ensure literal matching:
+    local escaped_search = escape_lua_pattern(search_str)
+
+    local replacement_count = 0
+    updated, replacement_count = updated:gsub(escaped_search, replace_str)
+
+    -- If the string was not found, append an info message
+    if replacement_count == 0 then
+      table.insert(info_msgs, string.format(
+        "[replace_in_file Info] The string '%s' was NOT found in the file and was not replaced.",
+        search_str
+      ))
+    else
+      table.insert(info_msgs, string.format(
+        "[replace_in_file Info] The string '%s' was replaced %d time(s).",
+        search_str,
+        replacement_count
+      ))
+    end
   end
-  return updated
+
+  return updated, table.concat(info_msgs, "\n")
 end
 
 M.run = function(tool_call, conf, prompt_user_tool_accept, is_subpath, read_file)
@@ -20,8 +47,8 @@ M.run = function(tool_call, conf, prompt_user_tool_accept, is_subpath, read_file
   if not path or #replacements == 0 then
     return "[replace_in_file] Missing 'path' or 'replacements'."
   end
-  local root = vim.fn.getcwd()
 
+  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
@@ -31,7 +58,8 @@ M.run = function(tool_call, conf, prompt_user_tool_accept, is_subpath, read_file
     return string.format("[replace_in_file for '%s'] FAILED. Could not read file.", path)
   end
 
-  local updated_data = search_and_replace(orig_data, replacements)
+  -- Now we get not only the updated data but also info messages about replacements
+  local updated_data, info_messages = search_and_replace(orig_data, replacements)
   handler.write_file(path, updated_data, conf)
 
   local msg = {}
@@ -40,6 +68,11 @@ M.run = function(tool_call, conf, prompt_user_tool_accept, is_subpath, read_file
   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 there are any info messages (strings not found, etc.), include them
+  if info_messages and info_messages ~= "" then
+    msg[#msg+1] = "\nAdditional info about the replacement operation:\n" .. info_messages .. "\n"
+  end
+
   if conf.auto_lint then
     local diag_str = robust_lsp.lsp_check_file_content(path, updated_data, 3000)
     msg[#msg+1] = "\n" .. diag_str