feat(gitcommit): add remote, fetch, pull support

Author: jinzhongjia

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

@@ -515,15 +515,15 @@ function GitTool.push(remote, branch, force, set_upstream, tags, tag_name)
   -- Handle tag pushing - single tag takes priority over all tags
   if tag_name and vim.trim(tag_name) ~= "" then
     -- Push single tag: git push origin tag_name
-    if remote then
-      cmd = cmd .. " " .. vim.fn.shellescape(remote)
-    end
+    -- Default to "origin" if no remote specified to avoid git interpreting tag_name as remote
+    local push_remote = remote or "origin"
+    cmd = cmd .. " " .. vim.fn.shellescape(push_remote)
     cmd = cmd .. " " .. vim.fn.shellescape(tag_name)
   elseif tags then
     -- Push all tags: git push origin --tags
-    if remote then
-      cmd = cmd .. " " .. vim.fn.shellescape(remote)
-    end
+    -- Default to "origin" if no remote specified
+    local push_remote = remote or "origin"
+    cmd = cmd .. " " .. vim.fn.shellescape(push_remote)
     cmd = cmd .. " --tags"
   else
     -- Regular branch push: git push origin branch
@@ -558,15 +558,13 @@ function GitTool.push_async(remote, branch, force, set_upstream, tags, tag_name,
   -- Handle tag pushing - single tag takes priority over all tags
   if tag_name and vim.trim(tag_name) ~= "" then
     -- Push single tag: git push origin tag_name
-    if remote then
-      table.insert(cmd, remote)
-    end
+    -- Default to "origin" if no remote specified to avoid git interpreting tag_name as remote
+    table.insert(cmd, remote or "origin")
     table.insert(cmd, tag_name)
   elseif tags then
     -- Push all tags: git push origin --tags
-    if remote then
-      table.insert(cmd, remote)
-    end
+    -- Default to "origin" if no remote specified
+    table.insert(cmd, remote or "origin")
     table.insert(cmd, "--tags")
   else
     -- Regular branch push with optional upstream setting
@@ -944,5 +942,101 @@ function GitTool.generate_release_notes(from_tag, to_tag, format)
   return true, release_notes, user_msg, llm_msg
 end
 
+---Add a new remote
+---@param name string Remote name
+---@param url string Remote URL
+---@return boolean success, string output
+function GitTool.add_remote(name, url)
+  if not name or vim.trim(name) == "" then
+    return false, "Remote name is required"
+  end
+  if not url or vim.trim(url) == "" then
+    return false, "Remote URL is required"
+  end
+  local cmd = "git remote add " .. vim.fn.shellescape(name) .. " " .. vim.fn.shellescape(url)
+  return execute_git_command(cmd)
+end
+
+---Remove a remote
+---@param name string Remote name
+---@return boolean success, string output
+function GitTool.remove_remote(name)
+  if not name or vim.trim(name) == "" then
+    return false, "Remote name is required"
+  end
+  local cmd = "git remote remove " .. vim.fn.shellescape(name)
+  return execute_git_command(cmd)
+end
+
+---Rename a remote
+---@param old_name string Current remote name
+---@param new_name string New remote name
+---@return boolean success, string output
+function GitTool.rename_remote(old_name, new_name)
+  if not old_name or vim.trim(old_name) == "" then
+    return false, "Current remote name is required"
+  end
+  if not new_name or vim.trim(new_name) == "" then
+    return false, "New remote name is required"
+  end
+  local cmd = "git remote rename " .. vim.fn.shellescape(old_name) .. " " .. vim.fn.shellescape(new_name)
+  return execute_git_command(cmd)
+end
+
+---Set remote URL
+---@param name string Remote name
+---@param url string New URL
+---@return boolean success, string output
+function GitTool.set_remote_url(name, url)
+  if not name or vim.trim(name) == "" then
+    return false, "Remote name is required"
+  end
+  if not url or vim.trim(url) == "" then
+    return false, "Remote URL is required"
+  end
+  local cmd = "git remote set-url " .. vim.fn.shellescape(name) .. " " .. vim.fn.shellescape(url)
+  return execute_git_command(cmd)
+end
+
+---Fetch from remote
+---@param remote? string Remote name (default: all remotes)
+---@param branch? string Specific branch to fetch
+---@param prune? boolean Remove remote-tracking references that no longer exist
+---@return boolean success, string output
+function GitTool.fetch(remote, branch, prune)
+  local cmd = "git fetch"
+  if prune then
+    cmd = cmd .. " --prune"
+  end
+  if remote then
+    cmd = cmd .. " " .. vim.fn.shellescape(remote)
+    if branch then
+      cmd = cmd .. " " .. vim.fn.shellescape(branch)
+    end
+  else
+    cmd = cmd .. " --all"
+  end
+  return execute_git_command(cmd)
+end
+
+---Pull from remote
+---@param remote? string Remote name (default: origin)
+---@param branch? string Branch to pull (default: current branch)
+---@param rebase? boolean Use rebase instead of merge
+---@return boolean success, string output
+function GitTool.pull(remote, branch, rebase)
+  local cmd = "git pull"
+  if rebase then
+    cmd = cmd .. " --rebase"
+  end
+  if remote then
+    cmd = cmd .. " " .. vim.fn.shellescape(remote)
+    if branch then
+      cmd = cmd .. " " .. vim.fn.shellescape(branch)
+    end
+  end
+  return execute_git_command(cmd)
+end
+
 M.GitTool = GitTool
 return M

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

@@ -29,6 +29,12 @@ GitEdit.schema = {
             "gitignore_add",
             "gitignore_remove",
             "push",
+            "fetch",
+            "pull",
+            "add_remote",
+            "remove_remote",
+            "rename_remote",
+            "set_remote_url",
             "cherry_pick",
             "revert",
             "create_tag",
@@ -140,6 +146,26 @@ GitEdit.schema = {
               type = "string",
               description = "An optional commit hash to tag",
             },
+            remote_name = {
+              type = "string",
+              description = "Name of the remote",
+            },
+            remote_url = {
+              type = "string",
+              description = "URL of the remote repository",
+            },
+            new_remote_name = {
+              type = "string",
+              description = "New name for the remote (used in rename_remote)",
+            },
+            prune = {
+              type = "boolean",
+              description = "Remove remote-tracking references that no longer exist (for fetch)",
+            },
+            rebase = {
+              type = "boolean",
+              description = "Use rebase instead of merge (for pull)",
+            },
           },
           additionalProperties = false,
         },
@@ -176,14 +202,25 @@ GitEdit.system_prompt = [[# Git Edit Tool (`git_edit`)
 | `reset` | Reset to commit | commit_hash (required), mode? |
 | `gitignore_add` | Add .gitignore rules | gitignore_rules (required) |
 | `gitignore_remove` | Remove .gitignore rules | gitignore_rule (required) |
-| `push` | Push to remote | remote?, branch?, set_upstream? |
+| `push` | Push to remote | remote?, branch?, set_upstream?, tags?, single_tag_name? |
+| `fetch` | Fetch from remote | remote?, branch?, prune? |
+| `pull` | Pull from remote | remote?, branch?, rebase? |
+| `add_remote` | Add new remote | remote_name (required), remote_url (required) |
+| `remove_remote` | Remove remote | remote_name (required) |
+| `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) |
 | `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) |
 | `help` | Show help | - |
 
+## PUSH OPERATION NOTES
+- To push a single tag: use `single_tag_name` parameter (remote defaults to "origin")
+- To push all tags: use `tags: true` parameter
+- Do NOT use `single_tag_name` as the `branch` parameter
+
 ## SAFETY RESTRICTIONS
 - Never use force push without explicit user confirmation.
 - Always verify staged changes before committing.
@@ -206,6 +243,12 @@ local VALID_OPERATIONS = {
   "gitignore_add",
   "gitignore_remove",
   "push",
+  "fetch",
+  "pull",
+  "add_remote",
+  "remove_remote",
+  "rename_remote",
+  "set_remote_url",
   "cherry_pick",
   "revert",
   "create_tag",
@@ -245,6 +288,12 @@ Available write-access Git operations:
 • gitignore_add: Add rule to .gitignore
 • gitignore_remove: Remove rule from .gitignore
 • push: Push changes to a remote repository (WARNING: force push is dangerous)
+• fetch: Fetch from remote (prune option available)
+• pull: Pull from remote (rebase option available)
+• add_remote: Add a new remote repository
+• remove_remote: Remove a remote repository
+• rename_remote: Rename a remote repository
+• set_remote_url: Change URL of a remote repository
 • cherry_pick: Apply changes from existing commits
 • revert: Revert a commit
 • create_tag: Create a new tag
@@ -425,6 +474,59 @@ Available write-access Git operations:
           return param_err
         end
         success, output = GitTool.merge(op_args.branch)
+      elseif operation == "fetch" then
+        param_err = validation.first_error({
+          validation.optional_string(op_args.remote, "remote", TOOL_NAME),
+          validation.optional_string(op_args.branch, "branch", TOOL_NAME),
+          validation.optional_boolean(op_args.prune, "prune", TOOL_NAME),
+        })
+        if param_err then
+          return param_err
+        end
+        success, output = GitTool.fetch(op_args.remote, op_args.branch, op_args.prune)
+      elseif operation == "pull" then
+        param_err = validation.first_error({
+          validation.optional_string(op_args.remote, "remote", TOOL_NAME),
+          validation.optional_string(op_args.branch, "branch", TOOL_NAME),
+          validation.optional_boolean(op_args.rebase, "rebase", TOOL_NAME),
+        })
+        if param_err then
+          return param_err
+        end
+        success, output = GitTool.pull(op_args.remote, op_args.branch, op_args.rebase)
+      elseif operation == "add_remote" then
+        param_err = validation.first_error({
+          validation.require_string(op_args.remote_name, "remote_name", TOOL_NAME),
+          validation.require_string(op_args.remote_url, "remote_url", TOOL_NAME),
+        })
+        if param_err then
+          return param_err
+        end
+        success, output = GitTool.add_remote(op_args.remote_name, op_args.remote_url)
+      elseif operation == "remove_remote" then
+        param_err = validation.require_string(op_args.remote_name, "remote_name", TOOL_NAME)
+        if param_err then
+          return param_err
+        end
+        success, output = GitTool.remove_remote(op_args.remote_name)
+      elseif operation == "rename_remote" then
+        param_err = validation.first_error({
+          validation.require_string(op_args.remote_name, "remote_name", TOOL_NAME),
+          validation.require_string(op_args.new_remote_name, "new_remote_name", TOOL_NAME),
+        })
+        if param_err then
+          return param_err
+        end
+        success, output = GitTool.rename_remote(op_args.remote_name, op_args.new_remote_name)
+      elseif operation == "set_remote_url" then
+        param_err = validation.first_error({
+          validation.require_string(op_args.remote_name, "remote_name", TOOL_NAME),
+          validation.require_string(op_args.remote_url, "remote_url", TOOL_NAME),
+        })
+        if param_err then
+          return param_err
+        end
+        success, output = GitTool.set_remote_url(op_args.remote_name, op_args.remote_url)
       else
         return validation.format_error(TOOL_NAME, "Unknown Git edit operation: " .. tostring(operation))
       end