flywheel-bootstrap 0.1.9.202601311405__py3-none-any.whl → 0.1.9.202602021053__py3-none-any.whl

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:

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):
@@ -644,13 +691,17 @@ class BootstrapOrchestrator:
             self._stop_heartbeats.wait(HEARTBEAT_INTERVAL_SECONDS)
 
     def _handle_event(self, event: CodexEvent) -> None:
+        extra: dict[str, object] = {}
+        if isinstance(event.raw, dict):
+            # Preserve structured event data so the server can parse usage.
+            extra = {"event": event.raw}
         post_log(
             self.config.server_url,
             self.config.run_id,
             self.config.capability_token,
             level="info",
             message=str(event.raw),
-            extra={},
+            extra=extra,
         )
         if isinstance(event.raw, dict):
             run_id = event.raw.get("run_id")

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-0.1.9.202601311405.dist-info → flywheel_bootstrap-0.1.9.202602021053.dist-info}/METADATA

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

{flywheel_bootstrap-0.1.9.202601311405.dist-info → flywheel_bootstrap-0.1.9.202602021053.dist-info}/RECORD

@@ -3,15 +3,15 @@ bootstrap/__main__.py,sha256=F94dlGd3P4icWVZnb16LjrKpBhLPCvjwqyWDqhX3JjE,1338
 bootstrap/artifacts.py,sha256=pdwDfxduT-G9VMJiGdm9MHkfUf35TzMGhFTHn135nU4,4188
 bootstrap/config_loader.py,sha256=dgypIOi4a5auGsarIDB5MI6qJO38UWO6RJkRTzvA9Zs,3936
 bootstrap/constants.py,sha256=Q3bNGvKKgQxyP9Hrx6o5GydFHwDq2SRkLnxwRNyM-OY,633
-bootstrap/git_ops.py,sha256=HPn-CAURQEMRSLJRUuy1Lor7YwPYZjb6i6ku6WhJo7M,9267
+bootstrap/git_ops.py,sha256=1_9E-iu2AerTzuT4rXajVkVmBlL5M5Q0gIn0v63YWc4,10274
 bootstrap/install.py,sha256=Es1F0UBOYDhuv7i9veA5Bt-yyTyTZ-dAsHmGc-iRY5k,4166
-bootstrap/orchestrator.py,sha256=zWRroJSoC6rjyNS1-YAnl4frk-uCWveWO_BeQnr_iRw,33468
-bootstrap/payload.py,sha256=JugHguvdjHuoEY_wTE72PFDWlmFFgEk8_wiINNNjV_Q,3417
+bootstrap/orchestrator.py,sha256=7KzG3fvHBleW-Rrg0S_C0zyK4nUsgSknzOzfFPGmSXw,34878
+bootstrap/payload.py,sha256=3yGYq6W0gCdKBPWNYFjvaiwP70E2_3fAFNN7aTxDZ3Y,3906
 bootstrap/prompts.py,sha256=trtZLytPyliuc50WV3glm6YcEs68tbvi4Iob5cUdbdQ,4664
 bootstrap/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 bootstrap/runner.py,sha256=qFqDnHKxUIOBAfk9cX7EipXz7mJCwTJPeKMQI30x4Do,4509
 bootstrap/telemetry.py,sha256=ONPvKTpc2puCygkakdQW7-Kkrx_yqEzZz-0FMtCQ-RQ,3983
-flywheel_bootstrap-0.1.9.202601311405.dist-info/METADATA,sha256=FfNmt3agejYVckh_MzrTuOJO85WMt6jX2IsKTEOiZIQ,4630
-flywheel_bootstrap-0.1.9.202601311405.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-flywheel_bootstrap-0.1.9.202601311405.dist-info/entry_points.txt,sha256=uluR7l4k_RhY5K4nYN5e6uwtceW3_7h_kvpM-csjzrg,63
-flywheel_bootstrap-0.1.9.202601311405.dist-info/RECORD,,
+flywheel_bootstrap-0.1.9.202602021053.dist-info/METADATA,sha256=KGR_0Z8lqhGCFGUOtZod2nWcG9N1rrvC6GDBaG8BHXQ,4630
+flywheel_bootstrap-0.1.9.202602021053.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+flywheel_bootstrap-0.1.9.202602021053.dist-info/entry_points.txt,sha256=uluR7l4k_RhY5K4nYN5e6uwtceW3_7h_kvpM-csjzrg,63
+flywheel_bootstrap-0.1.9.202602021053.dist-info/RECORD,,