Fix git credentials

Author: amrit110

src/aieng_bot_maintain/auto_merger/workflow_client.py

@@ -265,7 +265,7 @@ def _manual_rebase(self, pr: PRQueueItem) -> bool:
                     env=env,
                 )
 
-                # Configure git user for commits
+                # Configure git user and credentials for commits
                 subprocess.run(
                     ["git", "config", "user.name", "aieng-bot-maintain[bot]"],
                     cwd=repo_dir,
@@ -284,6 +284,31 @@ def _manual_rebase(self, pr: PRQueueItem) -> bool:
                     capture_output=True,
                 )
 
+                # Configure git to use GH_TOKEN for authentication
+                # This sets up credential helper to use the token for HTTPS pushes
+                subprocess.run(
+                    [
+                        "git",
+                        "config",
+                        "credential.helper",
+                        "store --file=/dev/null",  # Don't persist credentials
+                    ],
+                    cwd=repo_dir,
+                    check=True,
+                    capture_output=True,
+                )
+
+                # Set remote URL to include token for authentication
+                remote_url = (
+                    f"https://x-access-token:{self.gh_token}@github.com/{pr.repo}.git"
+                )
+                subprocess.run(
+                    ["git", "remote", "set-url", "origin", remote_url],
+                    cwd=repo_dir,
+                    check=True,
+                    capture_output=True,
+                )
+
                 # Fetch the PR branch
                 log_info(f"    Fetching branch {head_ref}...")
                 subprocess.run(

tests/auto_merger/test_workflow_client.py

@@ -217,6 +217,10 @@ def test_trigger_rebase_precommit_success(
             MagicMock(returncode=0, stdout=""),
             # git config user.email
             MagicMock(returncode=0, stdout=""),
+            # git config credential.helper
+            MagicMock(returncode=0, stdout=""),
+            # git remote set-url
+            MagicMock(returncode=0, stdout=""),
             # git fetch origin head_ref
             MagicMock(returncode=0, stdout=""),
             # git checkout
@@ -233,7 +237,7 @@ def test_trigger_rebase_precommit_success(
 
         assert result is True
         # Should make multiple git-related calls
-        assert mock_run.call_count == 9
+        assert mock_run.call_count == 11
 
     @patch("subprocess.run")
     def test_trigger_rebase_precommit_failure(
@@ -253,6 +257,10 @@ def test_trigger_rebase_precommit_failure(
             MagicMock(returncode=0, stdout=""),
             # git config user.email
             MagicMock(returncode=0, stdout=""),
+            # git config credential.helper
+            MagicMock(returncode=0, stdout=""),
+            # git remote set-url
+            MagicMock(returncode=0, stdout=""),
             # git fetch origin head_ref
             MagicMock(returncode=0, stdout=""),
             # git checkout