flywheel-bootstrap-staging 0.1.9.202602011847__tar.gz → 0.1.9.202602021010__tar.gz

{flywheel_bootstrap_staging-0.1.9.202602011847 → flywheel_bootstrap_staging-0.1.9.202602021010}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flywheel-bootstrap-staging
-Version: 0.1.9.202602011847
+Version: 0.1.9.202602021010
 Summary: Bootstrap runner for Flywheel provisioned GPU instances
 Project-URL: Homepage, http://paradigma.inc/
 Author: Paradigma Labs

{flywheel_bootstrap_staging-0.1.9.202602011847 → flywheel_bootstrap_staging-0.1.9.202602021010}/bootstrap/git_ops.py

@@ -122,6 +122,24 @@ def setup_git_credentials(config: GitConfig) -> bool:
     return False
 
 
+def update_git_auth(config: GitConfig, github_token: str) -> bool:
+    """Update git auth token and remote URL before pushing."""
+    config.github_token = github_token
+    repo_url = config.repo_context.repo_url
+
+    if "github.com" in repo_url:
+        auth_url = repo_url.replace(
+            "https://github.com", f"https://x-access-token:{github_token}@github.com"
+        )
+        result = _run_git(
+            ["remote", "set-url", "origin", auth_url], cwd=config.workspace
+        )
+        if result.returncode != 0:
+            config.log("warning", f"Failed to update origin URL: {result.stderr}")
+
+    return setup_git_credentials(config)
+
+
 def clone_repository(config: GitConfig) -> bool:
     """Clone the repository to the workspace.
 
@@ -182,10 +200,20 @@ def setup_branch(config: GitConfig) -> bool:
     )
 
     if result.returncode == 0 and branch_name in result.stdout:
-        # Branch exists, check it out
+        # Branch exists, fetch it explicitly (single-branch clones don't fetch other heads)
         config.log("info", f"Checking out existing branch: {branch_name}")
+        fetch_result = _run_git(
+            ["fetch", "origin", branch_name],
+            cwd=workspace,
+        )
+        if fetch_result.returncode != 0:
+            config.log(
+                "error", f"Failed to fetch branch {branch_name}: {fetch_result.stderr}"
+            )
+            return False
+
         result = _run_git(
-            ["checkout", "-B", branch_name, f"origin/{branch_name}"],
+            ["checkout", "-B", branch_name, "FETCH_HEAD"],
             cwd=workspace,
         )
     else:

{flywheel_bootstrap_staging-0.1.9.202602011847 → flywheel_bootstrap_staging-0.1.9.202602021010}/bootstrap/orchestrator.py

@@ -26,9 +26,19 @@ from bootstrap.constants import (
     MAX_ARTIFACT_RETRIES,
 )
 from bootstrap.config_loader import UserConfig, load_codex_config
-from bootstrap.git_ops import GitConfig, initialize_repo, finalize_repo
+from bootstrap.git_ops import (
+    GitConfig,
+    commit_changes,
+    initialize_repo,
+    push_changes,
+    update_git_auth,
+)
 from bootstrap.install import codex_login_status_ok, codex_on_path, ensure_codex
-from bootstrap.payload import BootstrapPayload, fetch_bootstrap_payload
+from bootstrap.payload import (
+    BootstrapPayload,
+    fetch_bootstrap_payload,
+    fetch_github_token,
+)
 from bootstrap.prompts import build_prompt_text
 from bootstrap.runner import (
     CodexEvent,
@@ -246,27 +256,64 @@ class BootstrapOrchestrator:
         if self.git_config is None:
             return
 
+        commit_message = (
+            f"Flywheel experiment run: {self.config.run_id}"
+            if exit_code == 0
+            else f"[WIP] Flywheel experiment run (failed): {self.config.run_id}"
+        )
+
         if exit_code != 0:
             self._log(
-                f"Git: Codex exited with code {exit_code}, skipping push",
+                f"Git: Codex exited with code {exit_code}, committing WIP",
                 level="warning",
             )
-            # Still commit changes so they're not lost
-            from bootstrap.git_ops import commit_changes
+        else:
+            self._log("Git: Finalizing repository, committing and pushing changes")
 
-            commit_changes(
-                self.git_config,
-                f"[WIP] Flywheel experiment run (failed): {self.config.run_id}",
-            )
+        if not commit_changes(self.git_config, commit_message):
+            self._log("Git: Failed to commit changes", level="error")
             return
 
-        self._log("Git: Finalizing repository, committing and pushing changes")
+        self._refresh_github_token()
 
-        if finalize_repo(self.git_config, self.config.run_id):
+        if push_changes(self.git_config):
             self._log("Git: Changes pushed successfully")
         else:
             self._log("Git: Failed to push changes", level="error")
 
+    def _refresh_github_token(self) -> None:
+        """Refresh the GitHub token before pushing."""
+        if self.git_config is None:
+            return
+
+        try:
+            token = fetch_github_token(
+                self.config.server_url,
+                self.config.run_id,
+                self.config.capability_token,
+            )
+        except Exception as exc:
+            self._log(
+                f"Git: Failed to refresh GitHub token ({exc}); using existing token",
+                level="warning",
+            )
+            return
+
+        if not token:
+            self._log(
+                "Git: Empty GitHub token response; using existing token",
+                level="warning",
+            )
+            return
+
+        if update_git_auth(self.git_config, token):
+            self._log("Git: Refreshed GitHub token")
+        else:
+            self._log(
+                "Git: Failed to update git credentials after token refresh",
+                level="warning",
+            )
+
     def _ensure_codex_authenticated(self, codex_path: Path) -> None:
         """Fail fast if codex is present but not logged in."""
         if codex_login_status_ok(codex_path):

{flywheel_bootstrap_staging-0.1.9.202602011847 → flywheel_bootstrap_staging-0.1.9.202602021010}/bootstrap/payload.py

@@ -87,6 +87,23 @@ def fetch_bootstrap_payload(
     )
 
 
+def fetch_github_token(
+    server_url: str,
+    run_id: str,
+    token: str,
+) -> str:
+    """Retrieve a fresh GitHub installation token for this run."""
+    url = f"{server_url.rstrip('/')}/runs/{run_id}/github-token"
+    req = urllib.request.Request(url, headers={"X-Run-Token": token}, method="POST")
+    payload = _urlopen_json_with_retries(
+        req,
+        timeout_seconds=30,
+        attempts=4,
+        base_delay_seconds=0.5,
+    )
+    return str(payload.get("token", ""))
+
+
 def _urlopen_json_with_retries(
     req: urllib.request.Request,
     timeout_seconds: int,

{flywheel_bootstrap_staging-0.1.9.202602011847 → flywheel_bootstrap_staging-0.1.9.202602021010}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flywheel-bootstrap-staging"
-version = "0.1.9.202602011847"
+version = "0.1.9.202602021010"
 description = "Bootstrap runner for Flywheel provisioned GPU instances"
 readme = "README.md"
 requires-python = ">=3.11"

{flywheel_bootstrap_staging-0.1.9.202602011847 → flywheel_bootstrap_staging-0.1.9.202602021010}/tests/test_git_ops.py

@@ -16,6 +16,7 @@ from bootstrap.git_ops import (
     push_changes,
     setup_branch,
     setup_git_credentials,
+    update_git_auth,
 )
 from bootstrap.payload import RepoContext
 
@@ -87,6 +88,26 @@ class TestSetupGitCredentials:
         assert "flywheel" in result.stdout.lower()
 
 
+class TestUpdateGitAuth:
+    """Tests for update_git_auth."""
+
+    def test_update_git_auth_rewrites_credentials(self, git_config):
+        """Updated token should be written to credential store."""
+        _run_git(["init"], cwd=git_config.workspace)
+        _run_git(
+            ["remote", "add", "origin", "https://github.com/testuser/testrepo"],
+            cwd=git_config.workspace,
+        )
+        setup_git_credentials(git_config)
+
+        result = update_git_auth(git_config, "new-token-999")
+        assert result is True
+
+        credential_file = git_config.workspace / ".git-credentials"
+        content = credential_file.read_text()
+        assert "new-token-999" in content
+
+
 class TestCommitChanges:
     """Tests for commit_changes."""
 
@@ -213,12 +234,17 @@ class TestSetupBranch:
         mock_run_git.side_effect = [
             MagicMock(returncode=0),  # fetch
             MagicMock(returncode=0, stdout=branch),  # ls-remote (branch exists)
+            MagicMock(returncode=0),  # fetch branch
             MagicMock(returncode=0),  # checkout -B
         ]
 
         result = setup_branch(git_config)
         assert result is True
 
+        call_args_list = [call.args[0] for call in mock_run_git.call_args_list]
+        assert ["fetch", "origin", branch] in call_args_list
+        assert ["checkout", "-B", branch, "FETCH_HEAD"] in call_args_list
+
 
 class TestInitializeRepo:
     """Tests for initialize_repo (integration)."""

{flywheel_bootstrap_staging-0.1.9.202602011847 → flywheel_bootstrap_staging-0.1.9.202602021010}/tests/test_orchestrator.py

@@ -5,6 +5,8 @@ import pytest
 from bootstrap.artifacts import ManifestResult, ManifestStatus
 from bootstrap.config_loader import UserConfig
 from bootstrap.orchestrator import BootstrapConfig, BootstrapOrchestrator
+from bootstrap.git_ops import GitConfig
+from bootstrap.payload import RepoContext
 from bootstrap.payload import BootstrapPayload
 from bootstrap.runner import CodexInvocation, CodexEvent
 
@@ -184,6 +186,61 @@ def test_resolve_workspace_expands_run_id_placeholder(tmp_path) -> None:
     assert orchestrator.workspace == (tmp_path / "runs" / "run-xyz").resolve()
 
 
+def test_finalize_git_repo_pushes_on_failure(monkeypatch, tmp_path) -> None:
+    """Non-zero exit should still commit and push changes."""
+    cfg = BootstrapConfig(
+        run_id="run-123",
+        capability_token="token",
+        config_path=tmp_path / "config.toml",
+        server_url="http://server",
+        run_root=tmp_path,
+    )
+    orchestrator = BootstrapOrchestrator(cfg)
+    orchestrator.git_config = GitConfig(
+        workspace=tmp_path,
+        repo_context=RepoContext(
+            repo_url="https://github.com/testuser/repo",
+            repo_owner="testuser",
+            repo_name="repo",
+            branch_name="flywheel/test",
+            base_branch="main",
+        ),
+        github_token="old-token",
+        log_fn=lambda *_: None,
+    )
+
+    commit_calls = []
+    push_calls = []
+    update_calls = []
+
+    def _record_commit(config: GitConfig, message: str) -> bool:
+        commit_calls.append(message)
+        return True
+
+    def _record_push(config: GitConfig) -> bool:
+        push_calls.append(True)
+        return True
+
+    def _record_update_auth(config: GitConfig, token: str) -> bool:
+        update_calls.append(token)
+        return True
+
+    monkeypatch.setattr("bootstrap.orchestrator.commit_changes", _record_commit)
+    monkeypatch.setattr("bootstrap.orchestrator.push_changes", _record_push)
+    monkeypatch.setattr(
+        "bootstrap.orchestrator.fetch_github_token",
+        lambda *args, **kwargs: "new-token",
+    )
+    monkeypatch.setattr("bootstrap.orchestrator.update_git_auth", _record_update_auth)
+
+    orchestrator._finalize_git_repo(exit_code=2)
+
+    assert commit_calls
+    assert "[WIP]" in commit_calls[0]
+    assert update_calls == ["new-token"]
+    assert push_calls
+
+
 def test_malformed_manifest_triggers_two_retry_attempts(monkeypatch, tmp_path):
     """When manifest is malformed, the orchestrator retries up to 2 times with feedback."""