Merge pull request #8 from Abizrh/6-bug-prompt

6 bug prompt

Author: Abizrh

lua/commit-ai/commit.lua

@@ -34,7 +34,6 @@ end
 local function generate_commit_suggestions(cb)
   local diff = Utils.get_git_diff()
   if not diff or diff == "" then
-    print("No staged changes found")
     return {}
   end
 

lua/commit-ai/prompt.lua

@@ -8,20 +8,21 @@ Analyze the following Git diff and suggest commit messages.
 Follow this format exactly:
 - <icon> <prefix> (<scope>): <commit message>
 
-Use one of the options below for <icon> and <prefix>, depending on the change type:
+Choose an appropriate <icon> and <prefix> from the list below based on the type of change:
 
 %s
 
-Rules:
+Commit rules:
 1. Only use the above icons and prefixes.
 2. Use "chore" for configuration files (*.yml, *.json, *.env), CI/CD changes, build systems, or general non-code tasks.
 3. Use "fix" for bug fixes.
 4. Use "feat" ONLY for user-facing features or newly introduced functionality.
 5. Use "docs" for documentation-only changes, including README.md and LICENSE.
 6. Use "refactor" for breaking internal code changes that don’t affect functionality.
 7. Use "enhance" for performance improvements or minor internal enhancements.
-8. The scope in parentheses should reflect the affected module or file group (e.g., doctor, config, auth).
-9. Keep commit message short and imperative (e.g., "add config for <context>
+8. The <scope> should desribe the affected module or file group or folder.
+9. Keep commit message should be concise and written in the imperative mood  (e.g., "add config for <context>
+10. Only use lowercase letters in the commit message.
 
 Git diff:
 %s

lua/commit-ai/utils.lua

@@ -2,40 +2,63 @@ local log = require("commit-ai.log")
 local M = {}
 
 function M.get_git_diff()
-    local staged_diff = vim.fn.system('git diff --cached --no-color')
-    if staged_diff == "" then
-        staged_diff = vim.fn.system('git diff --no-color')
-    end
-    staged_diff = staged_diff:gsub("^%s*(.-)%s*$", "%1") -- Remove trailing newlines
+  local status_lines = vim.fn.systemlist('git status --porcelain')
+  local untracked_files = vim.tbl_filter(function(line)
+    return line:match("^%?%?")
+  end, status_lines)
 
-    -- Check if we're in a git repository
-    if vim.fn.system('git rev-parse --is-inside-work-tree 2>/dev/null'):find("true") == nil then
-        log.error("Not in a git repository")
-        return nil
+  if #untracked_files > 0 then
+    for _, line in ipairs(untracked_files) do
+      local file = line:sub(4)
+      log.info("‼️ Untracked file: " .. file)
     end
-
-    -- Check if there are any changes
-    if staged_diff == "" then
-        log.warn("No changes detected")
-        return nil
+    local answer = vim.fn.input("Do you want to add them to the staging area? (y/n) ")
+    if answer:lower() == "y" then
+      for _, line in ipairs(untracked_files) do
+        local file = line:sub(4)
+        vim.fn.system("git add " .. file)
+        log.info("📝 Added " .. file .. " to the staging area")
+      end
+    else
+      log.error("Aborting")
+      return nil
     end
+    return nil
+  end
+  local staged_diff = vim.fn.system('git diff --cached --no-color')
+  if staged_diff == "" then
+    staged_diff = vim.fn.system('git diff --no-color')
+  end
+  staged_diff = staged_diff:gsub("^%s*(.-)%s*$", "%1") -- Remove trailing newlines
+
+  -- Check if we're in a git repository
+  if vim.fn.system('git rev-parse --is-inside-work-tree 2>/dev/null'):find("true") == nil then
+    log.error("Not in a git repository")
+    return nil
+  end
 
-    return staged_diff
+  -- Check if there are any changes
+  if staged_diff == "" then
+    log.error("No staged changes found")
+    return nil
+  end
+
+  return staged_diff
 end
 
 function M.get_api_key(env_var)
-    local api_key
-    if type(env_var) == 'function' then
-        api_key = env_var()
-    elseif type(env_var) == 'string' then
-        api_key = vim.env[env_var]
-    end
+  local api_key
+  if type(env_var) == 'function' then
+    api_key = env_var()
+  elseif type(env_var) == 'string' then
+    api_key = vim.env[env_var]
+  end
 
-    if type(api_key) ~= 'string' or api_key == '' then
-        return nil
-    end
+  if type(api_key) ~= 'string' or api_key == '' then
+    return nil
+  end
 
-    return api_key
+  return api_key
 end
 
 return M