feat(gitcommit): add cherry-pick/merge abort/continue

- Add cherry_pick_skip operation
- Improve error messages with conflict resolution guidance

Author: jinzhongjia

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

@@ -634,8 +634,94 @@ function GitTool.cherry_pick(commit_hash)
   if not commit_hash then
     return false, "Commit hash is required for cherry-pick"
   end
+
+  if not is_git_repo() then
+    return false, "Not in a git repository"
+  end
+
   local cmd = "git cherry-pick --no-edit " .. vim.fn.shellescape(commit_hash)
-  return execute_git_command(cmd)
+  local output = vim.fn.system(cmd)
+  local exit_code = vim.v.shell_error
+
+  if exit_code == 0 then
+    return true, output
+  else
+    if output:match("CONFLICT") or output:match("conflict") then
+      return false,
+        "Cherry-pick conflict detected. Please resolve the conflicts manually.\n"
+          .. "Options:\n"
+          .. "  • Use 'cherry_pick_continue' after resolving conflicts\n"
+          .. "  • Use 'cherry_pick_abort' to cancel the cherry-pick\n"
+          .. "  • Use 'cherry_pick_skip' to skip this commit"
+    else
+      return false, output
+    end
+  end
+end
+
+---Abort cherry-pick operation
+---@return boolean success, string output
+function GitTool.cherry_pick_abort()
+  if not is_git_repo() then
+    return false, "Not in a git repository"
+  end
+
+  local cmd = "git cherry-pick --abort"
+  local output = vim.fn.system(cmd)
+  local exit_code = vim.v.shell_error
+
+  if exit_code == 0 then
+    return true, "Cherry-pick aborted successfully"
+  else
+    if output:match("no cherry%-pick") or output:match("not in progress") then
+      return false, "No cherry-pick in progress to abort"
+    end
+    return false, output
+  end
+end
+
+---Continue cherry-pick after resolving conflicts
+---@return boolean success, string output
+function GitTool.cherry_pick_continue()
+  if not is_git_repo() then
+    return false, "Not in a git repository"
+  end
+
+  local cmd = "git cherry-pick --continue"
+  local output = vim.fn.system(cmd)
+  local exit_code = vim.v.shell_error
+
+  if exit_code == 0 then
+    return true, "Cherry-pick continued successfully"
+  else
+    if output:match("CONFLICT") or output:match("conflict") then
+      return false, "Conflicts still exist. Please resolve all conflicts before continuing."
+    elseif output:match("no cherry%-pick") or output:match("not in progress") then
+      return false, "No cherry-pick in progress to continue"
+    end
+    return false, output
+  end
+end
+
+---Skip current commit in cherry-pick
+---@return boolean success, string output
+function GitTool.cherry_pick_skip()
+  if not is_git_repo() then
+    return false, "Not in a git repository"
+  end
+
+  local cmd = "git cherry-pick --skip"
+  local output = vim.fn.system(cmd)
+  local exit_code = vim.v.shell_error
+
+  if exit_code == 0 then
+    return true, "Current commit skipped successfully"
+  else
+    if output:match("no cherry%-pick") or output:match("not in progress") then
+      return false, "No cherry-pick in progress to skip"
+    end
+    return false, output
+  end
 end
 
 ---Revert a commit
@@ -714,15 +800,62 @@ function GitTool.merge(branch)
   if exit_code == 0 then
     return true, output
   else
-    if output:match("CONFLICT") then
+    if output:match("CONFLICT") or output:match("conflict") then
       return false,
-        "Merge conflict detected. Please resolve the conflicts manually. You can use 'git merge --abort' to cancel."
+        "Merge conflict detected. Please resolve the conflicts manually.\n"
+          .. "Options:\n"
+          .. "  • Use 'merge_continue' after resolving conflicts\n"
+          .. "  • Use 'merge_abort' to cancel the merge"
     else
       return false, output
     end
   end
 end
 
+---Abort merge operation
+---@return boolean success, string output
+function GitTool.merge_abort()
+  if not is_git_repo() then
+    return false, "Not in a git repository"
+  end
+
+  local cmd = "git merge --abort"
+  local output = vim.fn.system(cmd)
+  local exit_code = vim.v.shell_error
+
+  if exit_code == 0 then
+    return true, "Merge aborted successfully"
+  else
+    if output:match("not merging") or output:match("no merge") then
+      return false, "No merge in progress to abort"
+    end
+    return false, output
+  end
+end
+
+---Continue merge after resolving conflicts
+---@return boolean success, string output
+function GitTool.merge_continue()
+  if not is_git_repo() then
+    return false, "Not in a git repository"
+  end
+
+  local cmd = "git merge --continue"
+  local output = vim.fn.system(cmd)
+  local exit_code = vim.v.shell_error
+
+  if exit_code == 0 then
+    return true, "Merge continued successfully"
+  else
+    if output:match("CONFLICT") or output:match("conflict") then
+      return false, "Conflicts still exist. Please resolve all conflicts before continuing."
+    elseif output:match("not merging") or output:match("no merge") then
+      return false, "No merge in progress to continue"
+    end
+    return false, output
+  end
+end
+
 --- Generate release notes between two tags
 ---@param from_tag string|nil Starting tag (if not provided, uses second latest tag)
 ---@param to_tag string|nil Ending tag (if not provided, uses latest tag)

lua/codecompanion/_extensions/gitcommit/tools/git_edit.lua

@@ -36,10 +36,15 @@ GitEdit.schema = {
             "rename_remote",
             "set_remote_url",
             "cherry_pick",
+            "cherry_pick_abort",
+            "cherry_pick_continue",
+            "cherry_pick_skip",
             "revert",
             "create_tag",
             "delete_tag",
             "merge",
+            "merge_abort",
+            "merge_continue",
             "help",
           },
           description = "The write-access Git operation to perform.",
@@ -210,10 +215,15 @@ GitEdit.system_prompt = [[# Git Edit Tool (`git_edit`)
 | `rename_remote` | Rename remote | remote_name (required), new_remote_name (required) |
 | `set_remote_url` | Change remote URL | remote_name (required), remote_url (required) |
 | `cherry_pick` | Apply commit | cherry_pick_commit_hash (required) |
+| `cherry_pick_abort` | Abort cherry-pick | - |
+| `cherry_pick_continue` | Continue cherry-pick | - |
+| `cherry_pick_skip` | Skip current commit | - |
 | `revert` | Revert commit | revert_commit_hash (required) |
 | `create_tag` | Create tag | tag_name (required), tag_message? |
 | `delete_tag` | Delete tag | tag_name (required) |
 | `merge` | Merge branch | branch (required) |
+| `merge_abort` | Abort merge | - |
+| `merge_continue` | Continue merge | - |
 | `help` | Show help | - |
 
 ## PUSH OPERATION NOTES
@@ -250,10 +260,15 @@ local VALID_OPERATIONS = {
   "rename_remote",
   "set_remote_url",
   "cherry_pick",
+  "cherry_pick_abort",
+  "cherry_pick_continue",
+  "cherry_pick_skip",
   "revert",
   "create_tag",
   "delete_tag",
   "merge",
+  "merge_abort",
+  "merge_continue",
   "help",
 }
 local VALID_RESET_MODES = { "soft", "mixed", "hard" }
@@ -295,10 +310,15 @@ Available write-access Git operations:
 • rename_remote: Rename a remote repository
 • set_remote_url: Change URL of a remote repository
 • cherry_pick: Apply changes from existing commits
+• cherry_pick_abort: Abort cherry-pick in progress
+• cherry_pick_continue: Continue cherry-pick after resolving conflicts
+• cherry_pick_skip: Skip current commit in cherry-pick
 • revert: Revert a commit
 • create_tag: Create a new tag
 • delete_tag: Delete a tag
 • merge: Merge a branch into the current branch (requires branch parameter)
+• merge_abort: Abort merge in progress
+• merge_continue: Continue merge after resolving conflicts
       ]]
       return { status = "success", data = help_text }
     end
@@ -443,6 +463,12 @@ Available write-access Git operations:
           return param_err
         end
         success, output = GitTool.cherry_pick(op_args.cherry_pick_commit_hash)
+      elseif operation == "cherry_pick_abort" then
+        success, output = GitTool.cherry_pick_abort()
+      elseif operation == "cherry_pick_continue" then
+        success, output = GitTool.cherry_pick_continue()
+      elseif operation == "cherry_pick_skip" then
+        success, output = GitTool.cherry_pick_skip()
       elseif operation == "revert" then
         param_err = validation.require_string(op_args.revert_commit_hash, "revert_commit_hash", TOOL_NAME)
         if param_err then
@@ -474,6 +500,10 @@ Available write-access Git operations:
           return param_err
         end
         success, output = GitTool.merge(op_args.branch)
+      elseif operation == "merge_abort" then
+        success, output = GitTool.merge_abort()
+      elseif operation == "merge_continue" then
+        success, output = GitTool.merge_continue()
       elseif operation == "fetch" then
         param_err = validation.first_error({
           validation.optional_string(op_args.remote, "remote", TOOL_NAME),