refactor(gitcommit): improve adapter and configuration handling

- update generator to support table-based adapter configuration
- enhance adapter resolution with fallback mechanism
- add model override support in schema mapping
- update system prompt for Git workflow specialist tool

Author: jinzhongjia

README.md

@@ -25,7 +25,7 @@ Add this extension to your CodeCompanion configuration:
 require("codecompanion").setup({
   extensions = {
     gitcommit = {
-      callback = "codecompanion._extensions.gitcommit",
+      callback = "codecompanion.extensions.gitcommit",
       opts = {
         -- Basic configuration
         adapter = "openai",                       -- LLM adapter

lua/codecompanion/_extensions/gitcommit/generator.lua

@@ -19,24 +19,50 @@ local CONSTANTS = {
 --- @param adapter string?  The adapter to use for generation
 --- @param model string? The model of the adapter to use for generation
 function Generator.setup(adapter, model)
-  _adapter = adapter or codecompanion_config.strategies.chat.adapter
-  _model = model or codecompanion_config.strategies.chat.model
-
-  -- Validate adapter
-  if not codecompanion_adapter.resolve(_adapter) then
-    error("Invalid adapter specified: " .. tostring(_adapter))
+  -- Get the adapter configuration properly
+  local chat_config = codecompanion_config.strategies.chat
+
+  -- Handle adapter as a table (with name and model) or string
+  if type(chat_config.adapter) == "table" then
+    _adapter = adapter or chat_config.adapter.name
+    _model = model or chat_config.adapter.model or chat_config.model
+  else
+    _adapter = adapter or chat_config.adapter
+    _model = model or chat_config.model
   end
 end
 ---@param commit_history? string[] Array of recent commit messages for context (optional)
 function Generator.generate_commit_message(diff, lang, commit_history, callback)
-  -- Setup adapter
-  local adapter = codecompanion_adapter.resolve(_adapter)
+  -- Setup adapter with proper resolution
+  local adapter
+  local success, result = pcall(function()
+    return codecompanion_adapter.resolve({
+      name = _adapter,
+      model = _model,
+    })
+  end)
+
+  if not success then
+    -- Fallback to simple resolve
+    adapter = codecompanion_adapter.resolve(_adapter)
+  else
+    adapter = result
+  end
+
   if not adapter then
-    return callback(nil, "Failed to resolve adapter")
+    return callback(nil, "Failed to resolve adapter: " .. tostring(_adapter))
   end
 
+  -- Configure adapter for non-streaming
+  adapter.opts = adapter.opts or {}
   adapter.opts.stream = false
-  adapter = adapter:map_schema_to_params(codecompanion_schema.get_default(adapter, { model = _model }))
+
+  -- Map schema with model override if specified
+  local schema_opts = {}
+  if _model then
+    schema_opts.model = _model
+  end
+  adapter = adapter:map_schema_to_params(codecompanion_schema.get_default(adapter, schema_opts))
 
   -- Create HTTP client
   local new_client = codecompanion_client.new({

lua/codecompanion/_extensions/gitcommit/init.lua

@@ -107,19 +107,37 @@ local function setup_tools(opts)
     chat_tools.groups = chat_tools.groups or {}
     chat_tools.groups["git_bot"] = {
       description = "A Git agent that can perform read and write operations.",
-      system_prompt = [[Provide Git repository assistance and management
-
-When to use:
-• When users need comprehensive Git operations
-• When combining read and write Git operations
-• When providing guided Git workflow assistance
-• When troubleshooting Git repository issues
-
-Best practices:
-• Use git_read tool for repository analysis first
-• Ensure operations are safe before execution
-• Avoid destructive operations without user confirmation
-• Provide clear explanations for Git commands]],
+      system_prompt = [[You are a Git workflow specialist with expert-level knowledge of version control best practices and Git operations.
+
+CORE RESPONSIBILITIES:
+• Analyze repository state and provide comprehensive Git assistance
+• Execute safe and efficient Git operations through available tools
+• Guide users through complex Git workflows and troubleshooting
+• Maintain repository integrity and prevent data loss
+
+WORKFLOW APPROACH:
+1. Always start with git_read to understand the current repository state
+2. Analyze the situation before suggesting or executing operations
+3. Explain the impact of operations before execution
+4. Use git_edit only after confirming the intended changes
+
+SAFETY PROTOCOLS:
+• Never execute destructive operations (reset --hard, force push) without explicit confirmation
+• Always check current branch and uncommitted changes before operations
+• Warn about potential conflicts or issues before they occur
+• Preserve user's work by suggesting stash or backup when appropriate
+
+BEST PRACTICES:
+• Follow conventional commits and branching strategies
+• Provide clear explanations of Git concepts when needed
+• Suggest appropriate Git workflows based on project type
+• Help maintain clean and meaningful commit history
+
+When responding:
+- Be concise but thorough in explanations
+- Use git_read first to assess the situation
+- Propose operations step-by-step
+- Confirm understanding before using git_edit]],
       tools = {
         "git_read",
         "git_edit",