portacode 1.5.31.dev0__tar.gz → 1.5.31.dev2__tar.gz

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

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

{portacode-1.5.31.dev0 → portacode-1.5.31.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.31.dev0'
-__version_tuple__ = version_tuple = (1, 5, 31, 'dev0')
+__version__ = version = '1.5.31.dev2'
+__version_tuple__ = version_tuple = (1, 5, 31, 'dev2')
 
 __commit_id__ = commit_id = None

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

@@ -53,6 +53,7 @@ CACHE_SOURCE_MARKER = "cache_source="
 CACHE_PARENT_MARKER = "cache_parent="
 _PROVISIONING_MAINTENANCE_LAST_RUN = 0.0
 PROVISIONING_MAINTENANCE_INTERVAL_S = 300
+PROXMOX_INVENTORY_RECONCILE_INTERVAL_S = 300
 # Keep reusable roots small while leaving enough room for the OS, Portacode,
 # Codex, and (on apt systems) Playwright Chromium to be installed. A request
 # below this size still builds at its requested size; if the software cannot
@@ -154,6 +155,7 @@ _MANAGED_CONTAINERS_STATE: Dict[str, Any] = {
     "initial_totals": {"ram_mib": 0, "disk_gib": 0, "cpu_share": 0.0},
     "records": {},
     "pending": {},
+    "revision": 0,
 }
 TEMPLATES_REFRESH_INTERVAL_S = 300
 _TEMPLATE_CACHE_LOCK = threading.Lock()
@@ -1340,9 +1342,47 @@ def _initialize_managed_containers_state(force: bool = False) -> Dict[str, Any]:
         _MANAGED_CONTAINERS_STATE["initial_totals"] = initial_totals
         _MANAGED_CONTAINERS_STATE["records"] = record_map
         _MANAGED_CONTAINERS_STATE["pending"] = {}
+        _MANAGED_CONTAINERS_STATE["revision"] = int(
+            _MANAGED_CONTAINERS_STATE.get("revision") or 0
+        ) + 1
     return _copy_summary(base_summary)
 
 
+def reconcile_managed_containers_inventory() -> Dict[str, Any]:
+    """Refresh Proxmox inventory without blocking or racing provisioning.
+
+    The comparatively expensive Proxmox API scan runs outside the state lock.
+    A revision check makes the final swap conditional: if a managed create,
+    delete, or record update occurred during the scan, the stale result is
+    discarded and the next periodic pass retries it. Pending reservations are
+    never replaced by reconciliation.
+    """
+    _initialize_managed_containers_state()
+    with _MANAGED_CONTAINERS_STATE_LOCK:
+        revision = int(_MANAGED_CONTAINERS_STATE.get("revision") or 0)
+        records = [record.copy() for record in _MANAGED_CONTAINERS_STATE.get("records", {}).values()]
+
+    config = _load_config()
+    if not config:
+        return {"refreshed": False, "reason": "not_configured"}
+    refreshed_summary = _build_full_container_summary(records, config)
+    refreshed_totals = {
+        "ram_mib": int(refreshed_summary.get("total_ram_mib") or 0),
+        "disk_gib": int(refreshed_summary.get("total_disk_gib") or 0),
+        "cpu_share": float(refreshed_summary.get("total_cpu_share") or 0.0),
+    }
+
+    with _MANAGED_CONTAINERS_STATE_LOCK:
+        if int(_MANAGED_CONTAINERS_STATE.get("revision") or 0) != revision:
+            return {"refreshed": False, "reason": "state_changed"}
+        _MANAGED_CONTAINERS_STATE["base_summary"] = refreshed_summary
+        _MANAGED_CONTAINERS_STATE["initial_totals"] = refreshed_totals
+    return {
+        "refreshed": True,
+        "inventory_updated_at": refreshed_summary.get("inventory_updated_at"),
+    }
+
+
 def _load_managed_container_records() -> List[Dict[str, Any]]:
     _ensure_containers_dir()
     records: List[Dict[str, Any]] = []
@@ -1668,10 +1708,17 @@ def _compose_managed_containers_summary(
         for entry in base_summary.get("containers", [])
         if entry.get("vmid") is not None
     }
+    missing_vmids = {
+        str(entry.get("vmid"))
+        for entry in base_summary.get("missing_containers", [])
+        if entry.get("vmid") is not None
+    }
     default_storage = summary.get("default_storage")
     merged_containers: List[Dict[str, Any]] = []
     for entry in managed_summary["containers"]:
         vmid = str(entry.get("vmid")) if entry.get("vmid") is not None else None
+        if vmid in missing_vmids:
+            continue
         base_entry = base_by_vmid.get(vmid) if vmid is not None else None
         if base_entry:
             merged = base_entry.copy()
@@ -1748,9 +1795,9 @@ def _reserve_container_resources(payload: Dict[str, Any], *, device_id: str, req
         available_disk = summary.get("available_disk_gib")
         if available_disk is not None and disk_gib > available_disk:
             raise RuntimeError("Not enough disk space to create this container.")
-        available_cpu = summary.get("available_cpu_share")
-        if available_cpu is not None and cpu_share > available_cpu:
-            raise RuntimeError("Not enough CPU capacity to create this container.")
+        # CPU is oversubscribed by design. Keep the requested share in the
+        # reservation/inventory for accounting, but RAM and disk are the only
+        # consumable resources that can reject provisioning.
 
         _MANAGED_CONTAINERS_STATE["pending"][reservation_id] = {
             "reservation_id": reservation_id,
@@ -2832,12 +2879,18 @@ def _register_container_record(vmid: int, payload: Dict[str, Any], reservation_i
         if reservation_id:
             _MANAGED_CONTAINERS_STATE["pending"].pop(reservation_id, None)
         _MANAGED_CONTAINERS_STATE["records"][str(vmid)] = payload.copy()
+        _MANAGED_CONTAINERS_STATE["revision"] = int(
+            _MANAGED_CONTAINERS_STATE.get("revision") or 0
+        ) + 1
 
 
 def _unregister_container_record(vmid: int) -> None:
     _initialize_managed_containers_state()
     with _MANAGED_CONTAINERS_STATE_LOCK:
         _MANAGED_CONTAINERS_STATE["records"].pop(str(vmid), None)
+        _MANAGED_CONTAINERS_STATE["revision"] = int(
+            _MANAGED_CONTAINERS_STATE.get("revision") or 0
+        ) + 1
 
 
 def _write_container_record(vmid: int, payload: Dict[str, Any], reservation_id: Optional[str] = None) -> None:
@@ -4186,7 +4239,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
             reservation_id = _run_lifecycle_step(
                 "reserve_resources",
                 "Reserving capacity",
-                "Reserving CPU, RAM, and disk capacity…",
+                "Reserving RAM and disk capacity…",
                 "Capacity reserved.",
                 lambda: _reserve_container_resources(
                     payload, device_id=device_id, request_id=request_id

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

@@ -6,6 +6,7 @@ from unittest.mock import MagicMock, patch
 from portacode.connection.handlers.proxmox_infra import (
     RemoveProxmoxContainerHandler,
     _build_full_container_summary,
+    _compose_managed_containers_summary,
     _build_bootstrap_steps,
     _cacheable_bootstrap_steps,
     _claim_ctid_for_reservation,
@@ -25,11 +26,97 @@ from portacode.connection.handlers.proxmox_infra import (
     _pinned_portacode_install_command,
     _running_portacode_version_is_prerelease,
     _require_successful_proxmox_task,
+    _reserve_container_resources,
+    reconcile_managed_containers_inventory,
     _sanitize_project_paths,
 )
 
 
 class ProxmoxInfraHandlerTests(TestCase):
+    def test_reconciled_external_deletion_is_not_reinserted_from_local_record(self):
+        summary = _compose_managed_containers_summary(
+            [{"vmid": 144, "device_id": "42", "ram_mib": 2048, "disk_gib": 14, "cpus": 1}],
+            [],
+            {
+                "containers": [],
+                "missing_containers": [{"vmid": "144", "device_id": "42"}],
+                "allocated_ram_mib": 0,
+                "allocated_disk_gib": 0,
+                "allocated_cpu_share": 0,
+            },
+            {"ram_mib": 2048, "disk_gib": 14, "cpu_share": 1},
+        )
+
+        self.assertEqual(summary["containers"], [])
+        self.assertEqual(summary["missing_containers"][0]["vmid"], "144")
+
+    @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):
+        refreshed = {"inventory_updated_at": "new", "total_ram_mib": 2, "total_disk_gib": 3, "total_cpu_share": 1}
+        build_summary.return_value = refreshed
+        state = {
+            "initialized": True, "base_summary": {"inventory_updated_at": "old"},
+            "initial_totals": {}, "records": {"144": {"vmid": 144}},
+            "pending": {"reservation": {"ram_mib": 1}}, "revision": 4,
+        }
+        with patch("portacode.connection.handlers.proxmox_infra._MANAGED_CONTAINERS_STATE", state):
+            result = reconcile_managed_containers_inventory()
+
+        self.assertTrue(result["refreshed"])
+        self.assertIs(state["base_summary"], refreshed)
+        self.assertIn("reservation", state["pending"])
+        self.assertEqual(state["revision"], 4)
+
+    @patch("portacode.connection.handlers.proxmox_infra._load_config", return_value={"node": "pve"})
+    def test_reconciliation_discards_scan_when_managed_state_changes(self, _config):
+        state = {
+            "initialized": True, "base_summary": {"inventory_updated_at": "old"},
+            "initial_totals": {}, "records": {"144": {"vmid": 144}},
+            "pending": {}, "revision": 7,
+        }
+
+        def concurrent_scan(_records, _config):
+            state["records"]["145"] = {"vmid": 145}
+            state["revision"] += 1
+            return {"inventory_updated_at": "stale scan"}
+
+        with patch("portacode.connection.handlers.proxmox_infra._MANAGED_CONTAINERS_STATE", state), patch(
+            "portacode.connection.handlers.proxmox_infra._build_full_container_summary",
+            side_effect=concurrent_scan,
+        ):
+            result = reconcile_managed_containers_inventory()
+
+        self.assertEqual(result, {"refreshed": False, "reason": "state_changed"})
+        self.assertEqual(state["base_summary"]["inventory_updated_at"], "old")
+
+    def test_cpu_can_be_oversubscribed_when_ram_and_disk_are_available(self):
+        state = {
+            "initialized": True,
+            "base_summary": {
+                "available_ram_mib": 4096,
+                "available_disk_gib": 20,
+                "available_cpu_share": 0,
+                "allocated_ram_mib": 0,
+                "allocated_disk_gib": 0,
+                "allocated_cpu_share": 4,
+            },
+            "initial_totals": {"ram_mib": 0, "disk_gib": 0, "cpu_share": 0},
+            "records": {},
+            "pending": {},
+        }
+        with patch(
+            "portacode.connection.handlers.proxmox_infra._MANAGED_CONTAINERS_STATE", state
+        ):
+            reservation_id = _reserve_container_resources(
+                {"ram_mib": 1024, "disk_gib": 3, "cpus": 2},
+                device_id="123",
+                request_id="request",
+            )
+
+        self.assertIn(reservation_id, state["pending"])
+        self.assertEqual(state["pending"][reservation_id]["cpu_share"], 2)
+
     @patch("portacode.connection.handlers.proxmox_infra._load_provisioning_templates")
     @patch("portacode.connection.handlers.proxmox_infra._get_node_from_config", return_value="pve")
     @patch("portacode.connection.handlers.proxmox_infra._connect_proxmox")

{portacode-1.5.31.dev0 → portacode-1.5.31.dev2}/portacode/connection/terminal.py

@@ -513,6 +513,15 @@ class TerminalManager:
             self._periodic_provisioning_template_maintenance()
         )
 
+        if getattr(self, "_proxmox_inventory_reconciliation_task", None):
+            try:
+                self._proxmox_inventory_reconciliation_task.cancel()
+            except Exception:
+                pass
+        self._proxmox_inventory_reconciliation_task = asyncio.create_task(
+            self._periodic_proxmox_inventory_reconciliation()
+        )
+
         # Start exposed-services file monitor for realtime updates.
         if getattr(self, "_exposed_services_task", None):
             try:
@@ -686,6 +695,24 @@ class TerminalManager:
                 logger.exception("Provisioning template maintenance failed: %s", exc)
             await asyncio.sleep(PROVISIONING_MAINTENANCE_INTERVAL_S)
 
+    async def _periodic_proxmox_inventory_reconciliation(self) -> None:
+        """Periodically detect changes made directly through Proxmox."""
+        from .handlers.proxmox_infra import (
+            PROXMOX_INVENTORY_RECONCILE_INTERVAL_S,
+            reconcile_managed_containers_inventory,
+        )
+
+        while True:
+            await asyncio.sleep(PROXMOX_INVENTORY_RECONCILE_INTERVAL_S)
+            try:
+                result = await asyncio.to_thread(reconcile_managed_containers_inventory)
+                if result.get("reason") == "state_changed":
+                    logger.debug("Discarded Proxmox inventory scan after concurrent state change")
+            except asyncio.CancelledError:
+                raise
+            except Exception as exc:
+                logger.warning("Proxmox inventory reconciliation failed safely: %s", exc)
+
     def _read_exposed_services_snapshot(self) -> Dict[str, Any]:
         path = EXPOSED_SERVICES_MONITOR_PATH
         if not os.path.exists(path):

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

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