devs-webhook 2.0.0__tar.gz → 2.0.2__tar.gz

{devs_webhook-2.0.0 → devs_webhook-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-webhook
-Version: 2.0.0
+Version: 2.0.2
 Summary: GitHub webhook handler for automated devcontainer operations with Claude Code
 Author: Dan Lester
 License-Expression: MIT

{devs_webhook-2.0.0 → devs_webhook-2.0.2}/devs_webhook/core/container_pool.py

@@ -901,6 +901,8 @@ class ContainerPool:
             logger.info("Checked out default branch",
                        repo=repo_name,
                        branch=default_branch)
+            # Reset to match remote branch so we pick up fetched changes
+            await self._reset_to_remote(repo_path, default_branch)
             # Clean untracked files after checkout
             await self._clean_untracked_files(repo_path)
         elif default_branch == "dev":
@@ -918,6 +920,8 @@ class ContainerPool:
             if process.returncode == 0:
                 logger.info("Checked out main branch",
                            repo=repo_name)
+                # Reset to match remote branch so we pick up fetched changes
+                await self._reset_to_remote(repo_path, "main")
                 # Clean untracked files after checkout
                 await self._clean_untracked_files(repo_path)
             else:
@@ -932,6 +936,34 @@ class ContainerPool:
                           branch=default_branch,
                           stderr=stderr.decode()[:200] if stderr else "")
 
+    async def _reset_to_remote(self, repo_path: Path, branch: str) -> None:
+        """Reset local branch to match the remote tracking branch.
+
+        After 'git fetch --all', the local branch may still be behind origin.
+        This ensures the working tree matches the latest fetched remote state.
+
+        Args:
+            repo_path: Path to the repository
+            branch: Branch name to reset (e.g. "main")
+        """
+        reset_cmd = ["git", "-C", str(repo_path), "reset", "--hard", f"origin/{branch}"]
+        process = await asyncio.create_subprocess_exec(
+            *reset_cmd,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE
+        )
+        stdout, stderr = await process.communicate()
+
+        if process.returncode == 0:
+            logger.info("Reset branch to match remote",
+                       repo_path=str(repo_path),
+                       branch=branch)
+        else:
+            logger.warning("Could not reset to remote branch",
+                          repo_path=str(repo_path),
+                          branch=branch,
+                          stderr=stderr.decode()[:200] if stderr else "")
+
     async def _clean_untracked_files(self, repo_path: Path) -> None:
         """Remove untracked files and directories from repository.
 

{devs_webhook-2.0.0 → devs_webhook-2.0.2}/devs_webhook.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-webhook
-Version: 2.0.0
+Version: 2.0.2
 Summary: GitHub webhook handler for automated devcontainer operations with Claude Code
 Author: Dan Lester
 License-Expression: MIT

{devs_webhook-2.0.0 → devs_webhook-2.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devs-webhook"
-version = "2.0.0"
+version = "2.0.2"
 description = "GitHub webhook handler for automated devcontainer operations with Claude Code"
 readme = "README.md"
 requires-python = ">=3.8"