portacode 1.4.13.dev7__tar.gz → 1.4.13.dev9__tar.gz

{portacode-1.4.13.dev7 → portacode-1.4.13.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.13.dev7
+Version: 1.4.13.dev9
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-1.4.13.dev7 → portacode-1.4.13.dev9}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.13.dev7'
-__version_tuple__ = version_tuple = (1, 4, 13, 'dev7')
+__version__ = version = '1.4.13.dev9'
+__version_tuple__ = version_tuple = (1, 4, 13, 'dev9')
 
 __commit_id__ = commit_id = None

{portacode-1.4.13.dev7 → portacode-1.4.13.dev9}/portacode/connection/handlers/proxmox_infra.py

@@ -979,13 +979,24 @@ def _bootstrap_portacode(
         history_snippet = ""
         if isinstance(history, list) and history:
             history_snippet = f" history={history[-3:]}"
+        command = details.get("cmd")
+        command_text = ""
+        if command:
+            if isinstance(command, (list, tuple)):
+                command_text = shlex.join(str(entry) for entry in command)
+            else:
+                command_text = str(command)
+        command_suffix = f" command={command_text}" if command_text else ""
         if summary:
             logger.warning(
-                "Portacode bootstrap failure summary=%s%s",
+                "Portacode bootstrap failure summary=%s%s%s",
                 summary,
                 f" history_len={len(history)}" if history else "",
+                f" command={command_text}" if command_text else "",
+            )
+            raise RuntimeError(
+                f"Portacode bootstrap steps failed: {summary}{history_snippet}{command_suffix}"
             )
-            raise RuntimeError(f"Portacode bootstrap steps failed: {summary}{history_snippet}")
         raise RuntimeError("Portacode bootstrap steps failed.")
     key_step = next((entry for entry in results if entry.get("name") == "portacode_connect"), None)
     public_key = key_step.get("public_key") if key_step else default_public_key

{portacode-1.4.13.dev7 → portacode-1.4.13.dev9}/portacode/connection/handlers/system_handlers.py

@@ -10,8 +10,9 @@ import platform
 import shutil
 import subprocess
 import threading
+import time
 from pathlib import Path
-from typing import Any, Dict
+from typing import Any, Dict, Optional
 
 from portacode import __version__
 import psutil
@@ -31,11 +32,25 @@ _cpu_percent = 0.0
 _cpu_thread = None
 _cpu_lock = threading.Lock()
 
+# Cgroup v2 tracking
+_CGROUP_CONTROLLERS = Path("/sys/fs/cgroup/cgroup.controllers")
+_CGROUP_CPU_STAT = Path("/sys/fs/cgroup/cpu.stat")
+_CGROUP_CPU_MAX = Path("/sys/fs/cgroup/cpu.max")
+_cgroup_v2_supported: Optional[bool] = None
+_last_cgroup_usage: Optional[int] = None
+_last_cgroup_time: Optional[float] = None
+
 def _cpu_monitor():
     """Background thread to update CPU usage every 5 seconds."""
     global _cpu_percent
     while True:
-        _cpu_percent = psutil.cpu_percent(interval=5.0)
+        percent = _get_cgroup_cpu_percent()
+        if percent is None:
+            # Fall back to psutil when cgroup stats are not available yet.
+            percent = psutil.cpu_percent(interval=5.0)
+        else:
+            time.sleep(5.0)
+        _cpu_percent = percent
 
 def _ensure_cpu_thread():
     """Ensure CPU monitoring thread is running (singleton)."""
@@ -130,6 +145,79 @@ def _get_playwright_info() -> Dict[str, Any]:
     return result
 
 
+def _detect_cgroup_v2() -> bool:
+    global _cgroup_v2_supported
+    if _cgroup_v2_supported is not None:
+        return _cgroup_v2_supported
+    _cgroup_v2_supported = _CGROUP_CONTROLLERS.exists() and _CGROUP_CPU_STAT.exists()
+    return _cgroup_v2_supported
+
+
+def _read_cgroup_cpu_usage() -> Optional[int]:
+    try:
+        data = _CGROUP_CPU_STAT.read_text()
+    except (OSError, UnicodeDecodeError):
+        return None
+    for line in data.splitlines():
+        parts = line.strip().split()
+        if len(parts) >= 2 and parts[0] == "usage_usec":
+            try:
+                return int(parts[1])
+            except ValueError:
+                return None
+    return None
+
+
+def _read_cgroup_cpu_limit() -> Optional[float]:
+    """Return the allowed CPU (cores) for this cgroup, if limited."""
+    if not _CGROUP_CPU_MAX.exists():
+        return None
+    try:
+        data = _CGROUP_CPU_MAX.read_text().strip()
+    except (OSError, UnicodeDecodeError):
+        return None
+    parts = data.split()
+    if len(parts) < 2:
+        return None
+    quota, period = parts[0], parts[1]
+    if quota == "max":
+        return None
+    try:
+        quota_value = int(quota)
+        period_value = int(period)
+    except ValueError:
+        return None
+    if period_value <= 0:
+        return None
+    return quota_value / period_value
+
+
+def _get_cgroup_cpu_percent() -> Optional[float]:
+    if not _detect_cgroup_v2():
+        return None
+    usage = _read_cgroup_cpu_usage()
+    if usage is None:
+        return None
+    limit_cpus = _read_cgroup_cpu_limit()
+    if limit_cpus is None or limit_cpus <= 0:
+        return None
+    now = time.monotonic()
+    global _last_cgroup_usage, _last_cgroup_time
+    prev_usage = _last_cgroup_usage
+    prev_time = _last_cgroup_time
+    _last_cgroup_usage = usage
+    _last_cgroup_time = now
+    if prev_usage is None or prev_time is None:
+        return None
+    delta_usage = usage - prev_usage
+    delta_time = now - prev_time
+    if delta_time <= 0 or delta_usage < 0:
+        return None
+    cpu_ratio = (delta_usage / 1_000_000) / delta_time
+    percent = (cpu_ratio / limit_cpus) * 100.0
+    return min(percent, 100.0)
+
+
 def _run_probe_command(cmd: list[str]) -> str | None:
     try:
         result = subprocess.run(cmd, capture_output=True, text=True, check=True, timeout=3)

{portacode-1.4.13.dev7 → portacode-1.4.13.dev9}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.13.dev7
+Version: 1.4.13.dev9
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian