portacode 1.5.32.dev0__tar.gz → 1.5.32.dev2__tar.gz

{portacode-1.5.32.dev0 → portacode-1.5.32.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.5.32.dev0
+Version: 1.5.32.dev2
 Summary: Connect real machines to the Portacode AI development environment
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-1.5.32.dev0 → portacode-1.5.32.dev2}/portacode/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.5.32.dev0'
-__version_tuple__ = version_tuple = (1, 5, 32, 'dev0')
+__version__ = version = '1.5.32.dev2'
+__version_tuple__ = version_tuple = (1, 5, 32, 'dev2')
 
 __commit_id__ = commit_id = None

{portacode-1.5.32.dev0 → portacode-1.5.32.dev2}/portacode/connection/handlers/proxmox_infra.py

@@ -1044,6 +1044,17 @@ def _pick_container_disk_gib(kind: str, cfg: Dict[str, Any], entry: Dict[str, An
     return 0.0
 
 
+def _pick_container_disk_used_gib(entry: Dict[str, Any]) -> Optional[float]:
+    """Return Proxmox's current guest-volume usage when the API reports it."""
+    value = entry.get("disk")
+    if value is None:
+        return None
+    try:
+        return _bytes_to_gib(value)
+    except (TypeError, ValueError):
+        return None
+
+
 def _configured_memory_mib(value: Any) -> float:
     try:
         val = float(value)
@@ -1488,10 +1499,12 @@ def _build_managed_containers_summary(records: List[Dict[str, Any]]) -> Dict[str
             {
                 "vmid": str(_as_int(record.get("vmid"))) if record.get("vmid") is not None else None,
                 "device_id": record.get("device_id"),
+                "provisioning_id": record.get("provisioning_id"),
                 "hostname": record.get("hostname"),
                 "template": record.get("template"),
                 "storage": record.get("storage"),
                 "disk_gib": disk_gib,
+                "disk_used_gib": record.get("disk_used_gib"),
                 "ram_mib": ram_mib,
                 "cpu_share": cpu_share,
                 "created_at": record.get("created_at"),
@@ -1619,6 +1632,7 @@ def _build_full_container_summary(records: List[Dict[str, Any]], config: Dict[st
                 "status": (entry.get("status") or "unknown").lower(),
                 "storage": storage,
                 "disk_gib": disk_gib,
+                "disk_used_gib": _pick_container_disk_used_gib(entry),
                 "ram_mib": ram_mib,
                 "cpu_share": cpu_share,
                 "reserve_on_boot": reserve_on_boot,
@@ -1790,8 +1804,15 @@ def _compose_managed_containers_summary(
             continue
         base_entry = base_by_vmid.get(vmid) if vmid is not None else None
         if base_entry:
-            merged = base_entry.copy()
-            merged.update(entry)
+            # Proxmox is authoritative for every mutable runtime/configuration
+            # field.  The durable record exists to retain Portacode identity and
+            # history, not to overwrite a reconciliation scan with provisioning-
+            # time RAM, disk, CPU, status, hostname, or placement values.
+            merged = entry.copy()
+            merged.update(base_entry)
+            for identity_key in ("device_id", "provisioning_id", "template", "created_at"):
+                if entry.get(identity_key) not in (None, ""):
+                    merged[identity_key] = entry[identity_key]
         else:
             merged = entry.copy()
             merged.setdefault("managed", True)
@@ -1803,15 +1824,15 @@ def _compose_managed_containers_summary(
         merged_containers.append(merged)
     summary["updated_at"] = managed_summary["updated_at"]
     summary["count"] = managed_summary["count"]
-    summary["total_ram_mib"] = managed_summary["total_ram_mib"]
-    summary["total_disk_gib"] = managed_summary["total_disk_gib"]
-    summary["total_cpu_share"] = managed_summary["total_cpu_share"]
+    summary["total_ram_mib"] = int(sum(item.get("ram_mib") or 0 for item in merged_containers))
+    summary["total_disk_gib"] = int(sum(item.get("disk_gib") or 0 for item in merged_containers))
+    summary["total_cpu_share"] = round(sum(item.get("cpu_share") or 0 for item in merged_containers), 2)
     summary["containers"] = merged_containers
 
     pending_ram, pending_disk, pending_cpu = _pending_totals(pending)
-    delta_ram = managed_summary["total_ram_mib"] - int(initial_totals.get("ram_mib") or 0)
-    delta_disk = managed_summary["total_disk_gib"] - int(initial_totals.get("disk_gib") or 0)
-    delta_cpu = managed_summary["total_cpu_share"] - float(initial_totals.get("cpu_share") or 0.0)
+    delta_ram = summary["total_ram_mib"] - int(initial_totals.get("ram_mib") or 0)
+    delta_disk = summary["total_disk_gib"] - int(initial_totals.get("disk_gib") or 0)
+    delta_cpu = summary["total_cpu_share"] - float(initial_totals.get("cpu_share") or 0.0)
 
     if "allocated_ram_mib" in summary and summary.get("allocated_ram_mib") is not None:
         summary["allocated_ram_mib"] = round(float(summary["allocated_ram_mib"]) + delta_ram + pending_ram, 2)

{portacode-1.5.32.dev0 → portacode-1.5.32.dev2}/portacode/connection/handlers/test_proxmox_infra.py

@@ -78,6 +78,43 @@ class ProxmoxInfraHandlerTests(TestCase):
         self.assertEqual(summary["containers"], [])
         self.assertEqual(summary["missing_containers"][0]["vmid"], "144")
 
+    def test_composed_snapshot_keeps_live_proxmox_fields_and_durable_identity(self):
+        summary = _compose_managed_containers_summary(
+            [{
+                "vmid": 134, "device_id": "888", "provisioning_id": "provisioning",
+                "template": "ubuntu.tar.zst", "created_at": "created",
+                "hostname": "stale-name", "status": "running", "ram_mib": 4096,
+                "disk_gib": 10, "cpus": 4,
+            }],
+            [],
+            {
+                "containers": [{
+                    "vmid": "134", "device_id": "888", "hostname": "openclaw",
+                    "status": "stopped", "ram_mib": 16, "disk_gib": 12,
+                    "disk_used_gib": 5, "cpu_share": 1, "storage": "local-lvm",
+                    "reserve_on_boot": False, "matches_default_storage": True,
+                    "managed": True,
+                }],
+                "missing_containers": [],
+                "allocated_ram_mib": 16, "allocated_disk_gib": 12,
+                "allocated_cpu_share": 1, "available_ram_mib": 1000,
+                "available_disk_gib": 100,
+            },
+            {"ram_mib": 16, "disk_gib": 12, "cpu_share": 1},
+        )
+
+        container = summary["containers"][0]
+        self.assertEqual(container["ram_mib"], 16)
+        self.assertEqual(container["disk_gib"], 12)
+        self.assertEqual(container["disk_used_gib"], 5)
+        self.assertEqual(container["cpu_share"], 1)
+        self.assertEqual(container["status"], "stopped")
+        self.assertEqual(container["hostname"], "openclaw")
+        self.assertEqual(container["device_id"], "888")
+        self.assertEqual(container["provisioning_id"], "provisioning")
+        self.assertEqual(container["template"], "ubuntu.tar.zst")
+        self.assertEqual(container["created_at"], "created")
+
     @patch("portacode.connection.handlers.proxmox_infra._build_full_container_summary")
     @patch("portacode.connection.handlers.proxmox_infra._load_config", return_value={"node": "pve"})
     def test_reconciliation_atomically_replaces_inventory_baseline(self, _config, build_summary):
@@ -232,7 +269,7 @@ class ProxmoxInfraHandlerTests(TestCase):
         proxmox = MagicMock()
         node_api = proxmox.nodes.return_value
         node_api.lxc.get.return_value = [
-            {"vmid": 144, "name": "managed", "status": "running"},
+            {"vmid": 144, "name": "managed-live", "status": "stopped", "disk": 6 * 1024**3},
             {"vmid": 9000, "name": "cache", "status": "stopped"},
         ]
         node_api.qemu.get.return_value = []
@@ -264,7 +301,7 @@ class ProxmoxInfraHandlerTests(TestCase):
             "vmid": 9000, "source_template": "ubuntu.tar.zst", "cache_id": "v2", "status": "ready",
         }]
         records = [
-            {"vmid": 144, "device_id": "42", "hostname": "managed", "disk_gib": 32, "ram_mib": 2048, "cpus": 2},
+            {"vmid": 144, "device_id": "42", "hostname": "managed-stale", "disk_gib": 99, "ram_mib": 4096, "cpus": 8},
             {"vmid": 155, "device_id": "43", "hostname": "missing", "disk_gib": 8, "ram_mib": 512, "cpus": 1},
         ]
 
@@ -275,6 +312,12 @@ class ProxmoxInfraHandlerTests(TestCase):
 
         self.assertEqual(summary["inventory_schema_version"], 2)
         self.assertEqual(summary["containers"][0]["provisioning_id"], "abc")
+        self.assertEqual(summary["containers"][0]["hostname"], "managed-live")
+        self.assertEqual(summary["containers"][0]["status"], "stopped")
+        self.assertEqual(summary["containers"][0]["ram_mib"], 2048)
+        self.assertEqual(summary["containers"][0]["disk_gib"], 32)
+        self.assertEqual(summary["containers"][0]["disk_used_gib"], 6)
+        self.assertEqual(summary["containers"][0]["cpu_share"], 2)
         self.assertEqual(summary["templates"][0]["vmid"], "9000")
         self.assertEqual(summary["missing_containers"][0]["device_id"], "43")
         self.assertEqual(summary["storages"][0]["available_gib"], 75.0)

{portacode-1.5.32.dev0 → portacode-1.5.32.dev2}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.5.32.dev0
+Version: 1.5.32.dev2
 Summary: Connect real machines to the Portacode AI development environment
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian