refactor(gitcommit): optimize module imports and improve glob matching

- Cache GitTool require at module level instead of per-function calls
- Add proper glob-to-lua-pattern conversion with ** support
- Reuse Git.is_repository() instead of duplicating is_git_repo logic
- Normalize path separators for cross-platform glob matching

Author: jinzhongjia

lua/codecompanion/_extensions/gitcommit/git.lua

@@ -78,6 +78,51 @@ function Git._filter_diff(diff_content)
   return table.concat(filtered_lines, "\n")
 end
 
+---Convert a glob pattern to a Lua pattern
+---Handles: * (any non-slash), ** (any including slash), ? (single char), escapes special chars
+---@param glob string The glob pattern (e.g., "*.lua", "**/*.js", "dist/*")
+---@return string lua_pattern The converted Lua pattern
+local function glob_to_lua_pattern(glob)
+  local escaped = glob:gsub("([%.%+%-%^%$%(%)%[%]%%])", "%%%1")
+  escaped = escaped:gsub("%*%*", "\0DOUBLESTAR\0")
+  escaped = escaped:gsub("%*", "[^/]*")
+  escaped = escaped:gsub("%?", "[^/]")
+  escaped = escaped:gsub("\0DOUBLESTAR\0", ".*")
+
+  if escaped:sub(1, 1) == "/" then
+    escaped = "^" .. escaped:sub(2)
+  end
+
+  if not glob:match("/") then
+    escaped = escaped .. "$"
+  else
+    escaped = escaped .. "$"
+  end
+
+  return escaped
+end
+
+---Check if filepath matches a glob pattern (handles basename matching for patterns without /)
+---@param filepath string The file path to check
+---@param pattern string The glob pattern
+---@return boolean matches True if filepath matches
+local function matches_glob(filepath, pattern)
+  local lua_pattern = glob_to_lua_pattern(pattern)
+
+  if filepath:match(lua_pattern) then
+    return true
+  end
+
+  if not pattern:match("/") then
+    local basename = filepath:match("[^/]+$") or filepath
+    if basename:match(lua_pattern) then
+      return true
+    end
+  end
+
+  return false
+end
+
 ---Check if file should be excluded by patterns
 ---@param filepath string The file path to check
 ---@return boolean should_exclude True if file should be excluded
@@ -86,10 +131,10 @@ function Git._should_exclude_file(filepath)
     return false
   end
 
+  local normalized_path = filepath:gsub("\\", "/")
+
   for _, pattern in ipairs(config.exclude_files) do
-    -- Convert glob pattern to Lua pattern
-    local lua_pattern = pattern:gsub("%*", ".*"):gsub("?", ".")
-    if filepath:match(lua_pattern) then
+    if matches_glob(normalized_path, pattern) then
       return true
     end
   end

lua/codecompanion/_extensions/gitcommit/init.lua

@@ -6,6 +6,7 @@ local Langs = require("codecompanion._extensions.gitcommit.langs")
 local GitRead = require("codecompanion._extensions.gitcommit.tools.git_read")
 local GitEdit = require("codecompanion._extensions.gitcommit.tools.git_edit")
 local Config = require("codecompanion._extensions.gitcommit.config")
+local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
 
 local M = {}
 
@@ -390,82 +391,71 @@ return
     ---Get buffer configuration
     get_buffer_config = Buffer.get_config,
 
-    ---Access to git tool functions
+    ---Access to git tool functions (uses cached GitTool module)
     git_tool = {
       ---Get git status
       status = function()
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.get_status()
       end,
 
       ---Get git log
       ---@param count? number Number of commits
       ---@param format? string Log format
       log = function(count, format)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.get_log(count, format)
       end,
 
       ---Get git diff
       ---@param staged? boolean Show staged changes
       ---@param file? string Specific file
       diff = function(staged, file)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.get_diff(staged, file)
       end,
 
       ---Get current branch
       current_branch = function()
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.get_current_branch()
       end,
 
       ---Get all branches
       ---@param remote_only? boolean Show only remote branches
       branches = function(remote_only)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.get_branches(remote_only)
       end,
 
       ---Stage files
       ---@param files string|table Files to stage
       stage = function(files)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.stage_files(files)
       end,
 
       ---Unstage files
       ---@param files string|table Files to unstage
       unstage = function(files)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.unstage_files(files)
       end,
 
       ---Create new branch
       ---@param branch_name string Name of new branch
       ---@param checkout? boolean Whether to checkout
       create_branch = function(branch_name, checkout)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.create_branch(branch_name, checkout)
       end,
 
       ---Checkout branch or commit
       ---@param target string Branch or commit to checkout
       checkout = function(target)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.checkout(target)
       end,
 
       ---Get remotes
       remotes = function()
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.get_remotes()
       end,
 
       ---Show commit details
       ---@param commit_hash? string Commit hash
       show = function(commit_hash)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.show_commit(commit_hash)
       end,
 
@@ -474,36 +464,31 @@ return
       ---@param line_start? number Start line
       ---@param line_end? number End line
       blame = function(file_path, line_start, line_end)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.get_blame(file_path, line_start, line_end)
       end,
 
       ---Stash changes
       ---@param message? string Stash message
       ---@param include_untracked? boolean Include untracked files
       stash = function(message, include_untracked)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.stash(message, include_untracked)
       end,
 
       ---List stashes
       stash_list = function()
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.list_stashes()
       end,
 
       ---Apply stash
       ---@param stash_ref? string Stash reference
       apply_stash = function(stash_ref)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.apply_stash(stash_ref)
       end,
 
       ---Reset to commit
       ---@param commit_hash string Commit hash
       ---@param mode? string Reset mode (soft, mixed, hard)
       reset = function(commit_hash, mode)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.reset(commit_hash, mode)
       end,
 
@@ -512,29 +497,25 @@ return
       ---@param commit2? string Second commit
       ---@param file_path? string Specific file
       diff_commits = function(commit1, commit2, file_path)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.diff_commits(commit1, commit2, file_path)
       end,
 
       ---Get top contributors
       ---@param count? number Number of contributors
       contributors = function(count)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.get_contributors(count)
       end,
 
       ---Search commits by message
       ---@param pattern string Search pattern
       ---@param count? number Max results
       search_commits = function(pattern, count)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.search_commits(pattern, count)
       end,
 
       ---Merge a branch
       ---@param branch string The branch to merge
       merge = function(branch)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.merge(branch)
       end,
 
@@ -546,7 +527,6 @@ return
       ---@param tags? boolean Push all tags
       ---@param tag_name? string Single tag to push
       push = function(remote, branch, force, set_upstream, tags, tag_name)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.push(remote, branch, force, set_upstream, tags, tag_name)
       end,
 
@@ -559,7 +539,6 @@ return
       ---@return string user_msg
       ---@return string llm_msg
       generate_release_notes = function(from_tag, to_tag, format)
-        local GitTool = require("codecompanion._extensions.gitcommit.tools.git").GitTool
         return GitTool.generate_release_notes(from_tag, to_tag, format)
       end,
     },

lua/codecompanion/_extensions/gitcommit/tools/git.lua

@@ -1,3 +1,5 @@
+local Git = require("codecompanion._extensions.gitcommit.git")
+
 local M = {}
 
 ---Git tool for CodeCompanion GitCommit extension
@@ -168,13 +170,7 @@ function GitTool.is_ignored(file)
 end
 
 local function is_git_repo()
-  -- Use Neovim built-in vim.fn.system instead of io.popen
-  local ok, result = pcall(function()
-    local cmd = "git rev-parse --is-inside-work-tree"
-    local output = vim.fn.system(cmd)
-    return vim.v.shell_error == 0 and output:match("true") ~= nil
-  end)
-  return ok and result or false
+  return Git.is_repository()
 end
 
 local function execute_git_command(cmd)