forgexa-cli 1.2.6__tar.gz → 1.2.7__tar.gz

{forgexa_cli-1.2.6 → forgexa_cli-1.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.2.6
+Version: 1.2.7
 Summary: Forgexa CLI — command-line client and AI agent runtime for the Forgexa platform
 Author-email: Jason Sun <dev.winds@gmail.com>
 License: MIT

{forgexa_cli-1.2.6 → forgexa_cli-1.2.7}/forgexa_cli/__init__.py

@@ -1,2 +1,2 @@
 """forgexa-cli — Forgexa command-line client."""
-__version__ = "1.2.6"
+__version__ = "1.2.7"

{forgexa_cli-1.2.6 → forgexa_cli-1.2.7}/forgexa_cli/daemon.py

@@ -242,6 +242,47 @@ def get_hardware_id() -> str:
     return uuid.uuid4().hex[:24]
 
 
+def get_os_info() -> str:
+    """Return a concise OS/arch summary string, e.g. 'macOS 15.0 arm64', 'Ubuntu 24.04 x86_64'."""
+    system = platform.system()
+    machine = platform.machine()
+    if system == "Darwin":
+        # e.g. "macOS 15.0 arm64"
+        mac_ver = platform.mac_ver()[0] or platform.release()
+        return f"macOS {mac_ver} {machine}"
+    elif system == "Linux":
+        # Try to get distro name+version from /etc/os-release
+        distro = _get_linux_distro()
+        if distro:
+            return f"{distro} {machine}"
+        return f"Linux {platform.release().split('-')[0]} {machine}"
+    elif system == "Windows":
+        # e.g. "Windows 10.0 AMD64"
+        win_ver = platform.version().split('.')[0:2]
+        return f"Windows {'.'.join(win_ver)} {machine}"
+    else:
+        return f"{system} {platform.release()} {machine}"
+
+
+def _get_linux_distro() -> str:
+    """Parse /etc/os-release to get distro name and version, e.g. 'Ubuntu 24.04'."""
+    try:
+        with open("/etc/os-release") as f:
+            info = {}
+            for line in f:
+                line = line.strip()
+                if "=" in line:
+                    key, _, val = line.partition("=")
+                    info[key] = val.strip('"')
+            name = info.get("NAME", "")
+            version = info.get("VERSION_ID", "")
+            if name:
+                return f"{name} {version}".strip()
+    except OSError:
+        pass
+    return ""
+
+
 # ── Data Classes ──
 
 
@@ -726,6 +767,35 @@ class WorkspaceManager:
                             )
                         except RuntimeError as exc2:
                             logger.warning("Failed to reset to origin/%s: %s", default_branch, exc2)
+                else:
+                    # Non-fresh-start (design/coding/testing): ensure working tree
+                    # is on the correct branch and has the latest commits from remote.
+                    # This is critical for cross-machine execution where a previous
+                    # node on another daemon pushed commits to the branch.
+                    logger.info("Syncing worktree %s to latest origin/%s", ws_path, branch_name)
+                    try:
+                        await self._git("checkout", branch_name, cwd=ws_path)
+                    except RuntimeError:
+                        # Branch might not exist locally yet — create tracking branch
+                        try:
+                            await self._git(
+                                "checkout", "-B", branch_name, f"origin/{branch_name}",
+                                cwd=ws_path,
+                            )
+                        except RuntimeError as exc:
+                            logger.warning("Failed to checkout %s: %s", branch_name, exc)
+                    # Reset working tree to match remote branch (fast-forward)
+                    try:
+                        await self._git(
+                            "reset", "--hard", f"origin/{branch_name}",
+                            cwd=ws_path,
+                        )
+                    except RuntimeError as exc:
+                        # Remote branch might not exist yet (first node in graph)
+                        logger.debug(
+                            "Could not reset to origin/%s: %s — branch may not exist on remote yet",
+                            branch_name, exc,
+                        )
                 return ws_path
 
         # Ensure _main repo is present and up-to-date
@@ -1761,6 +1831,7 @@ class HeartbeatService:
                         "active_tasks": self._active_tasks,
                         "available_agents": self._agents,
                         "system_metrics": self._collect_system_metrics(),
+                        "os_info": get_os_info(),
                     },
                     timeout=10,
                 )
@@ -1941,6 +2012,7 @@ class ServerConnection:
                     "daemon_id": self.daemon_id,
                     "hardware_id": self.hardware_id,
                     "device_name": platform.node(),
+                    "os_info": get_os_info(),
                     "available_agents": agent_dicts,
                     "max_concurrent_tasks": max_concurrent,
                     "capabilities": {

{forgexa_cli-1.2.6 → forgexa_cli-1.2.7}/forgexa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.2.6
+Version: 1.2.7
 Summary: Forgexa CLI — command-line client and AI agent runtime for the Forgexa platform
 Author-email: Jason Sun <dev.winds@gmail.com>
 License: MIT

{forgexa_cli-1.2.6 → forgexa_cli-1.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "forgexa-cli"
-version = "1.2.6"
+version = "1.2.7"
 description = "Forgexa CLI — command-line client and AI agent runtime for the Forgexa platform"
 requires-python = ">=3.9"
 license = { text = "MIT" }