portacode 1.4.11.dev10__py3-none-any.whl → 1.4.12__py3-none-any.whl

portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.11.dev10'
-__version_tuple__ = version_tuple = (1, 4, 11, 'dev10')
+__version__ = version = '1.4.12'
+__version_tuple__ = version_tuple = (1, 4, 12)
 
 __commit_id__ = commit_id = None

portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -367,6 +367,45 @@ Creates a Portacode-managed LXC container, starts it, and bootstraps the Portaco
 *   On success, the device will emit a [`proxmox_container_created`](#proxmox_container_created-event) event that includes the Portacode auth key produced inside the container.
 *   On failure, the device will emit an [`error`](#error) event.
 
+### `start_proxmox_container`
+
+Starts a previously provisioned, Portacode-managed LXC container. Handled by [`StartProxmoxContainerHandler`](./proxmox_infra.py).
+
+**Payload Fields:**
+
+*   `ctid` (string, required): Identifier of the container to start.
+
+**Responses:**
+
+*   Emits a [`proxmox_container_action`](#proxmox_container_action-event) event with `action="start"` and the refreshed infra snapshot.
+*   Emits an [`error`](#error) event when the request cannot be fulfilled (e.g., missing infra config, CT not tagged as managed, or API failure).
+
+### `stop_proxmox_container`
+
+Stops a running Portacode-managed container. Handled by [`StopProxmoxContainerHandler`](./proxmox_infra.py).
+
+**Payload Fields:**
+
+*   `ctid` (string, required): Identifier of the container to stop.
+
+**Responses:**
+
+*   Emits a [`proxmox_container_action`](#proxmox_container_action-event) event with `action="stop"` and the refreshed infra snapshot.
+*   Emits an [`error`](#error) event on failure.
+
+### `remove_proxmox_container`
+
+Deletes a managed container from Proxmox (stopping it first if necessary) and removes the stored metadata file. Handled by [`RemoveProxmoxContainerHandler`](./proxmox_infra.py).
+
+**Payload Fields:**
+
+*   `ctid` (string, required): Identifier of the container to delete.
+
+**Responses:**
+
+*   Emits a [`proxmox_container_action`](#proxmox_container_action-event) event with `action="remove"` and the refreshed infra snapshot after deletion.
+*   Emits an [`error`](#error) event on failure.
+
 ### `proxmox_container_created`
 
 Emitted after a successful `create_proxmox_container` action. Contains the new container ID, the Portacode public key produced inside the container, and the bootstrap logs.
@@ -1067,21 +1106,37 @@ Provides system information in response to a `system_info` action. Handled by [`
     *   `proxmox` (object): Detection hints for Proxmox VE nodes:
         *   `is_proxmox_node` (boolean): True when Proxmox artifacts (e.g., `/etc/proxmox-release`) exist.
         *   `version` (string|null): Raw contents of `/etc/proxmox-release` when readable.
-        *   `infra` (object): Portacode infrastructure configuration snapshot:
-            *   `configured` (boolean): True when `setup_proxmox_infra` stored an API token.
-            *   `host` (string|null): Hostname used for the API client (usually `localhost`).
-            *   `node` (string|null): Proxmox node name that was targeted.
-            *   `user` (string|null): API token owner (e.g., `root@pam`).
-            *   `token_name` (string|null): API token identifier.
-            *   `default_storage` (string|null): Storage pool chosen for future containers.
-            *   `templates` (array[string]): Cached list of available LXC templates.
-            *   `last_verified` (string|null): ISO timestamp when the token was last validated.
-            *   `network` (object):
-                *   `applied` (boolean): True when the bridge/NAT services were successfully configured.
-                *   `message` (string|null): Informational text about the network setup attempt.
-                *   `bridge` (string): The bridge interface configured (typically `vmbr1`).
-                *   `health` (string|null): `"healthy"` when the connectivity verification succeeded.
-            *   `node_status` (object|null): Status response returned by the Proxmox API when validating the token.
+            *   `infra` (object): Portacode infrastructure configuration snapshot:
+                *   `configured` (boolean): True when `setup_proxmox_infra` stored an API token.
+                *   `host` (string|null): Hostname used for the API client (usually `localhost`).
+                *   `node` (string|null): Proxmox node name that was targeted.
+                *   `user` (string|null): API token owner (e.g., `root@pam`).
+                *   `token_name` (string|null): API token identifier.
+                *   `default_storage` (string|null): Storage pool chosen for future containers.
+                *   `templates` (array[string]): Cached list of available LXC templates.
+                *   `last_verified` (string|null): ISO timestamp when the token was last validated.
+                *   `network` (object):
+                    *   `applied` (boolean): True when the bridge/NAT services were successfully configured.
+                    *   `message` (string|null): Informational text about the network setup attempt.
+                    *   `bridge` (string): The bridge interface configured (typically `vmbr1`).
+                    *   `health` (string|null): `"healthy"` when the connectivity verification succeeded.
+                *   `node_status` (object|null): Status response returned by the Proxmox API when validating the token.
+                *   `managed_containers` (object): Cached summary of the Portacode-managed containers:
+                    *   `updated_at` (string): ISO timestamp when this snapshot was last refreshed.
+                    *   `count` (integer): Number of managed containers.
+                    *   `total_ram_mib` (integer): RAM footprint summed across all containers.
+                    *   `total_disk_gib` (integer): Disk footprint summed across all containers.
+                    *   `total_cpu_share` (number): CPU shares requested across all containers.
+                    *   `containers` (array[object]): Container summaries with the following fields:
+                        *   `vmid` (string|null): Numeric CT ID.
+                        *   `hostname` (string|null): Hostname configured in the CT.
+                        *   `template` (string|null): Template identifier used.
+                        *   `storage` (string|null): Storage pool backing the rootfs.
+                        *   `disk_gib` (integer): Rootfs size in GiB.
+                        *   `ram_mib` (integer): Memory size in MiB.
+                        *   `cpu_share` (number): vCPU-equivalent share requested at creation.
+                        *   `status` (string): Lowercase lifecycle status (e.g., `running`, `stopped`, `deleted`).
+                        *   `created_at` (string|null): ISO timestamp recorded when the CT was provisioned.
     *   `portacode_version` (string): Installed CLI version returned by `portacode.__version__`.
 
 ### `proxmox_infra_configured`
@@ -1133,6 +1188,20 @@ Sent continuously while `create_proxmox_container` runs so dashboards can show a
 *   `details` (object, optional): Contains `attempt` (when retries are used) and `error_summary` on failure.
 *   `request_id` (string, optional): Mirrors the `create_proxmox_container` request when provided.
 
+### `proxmox_container_action`
+
+Emitted after `start_proxmox_container`, `stop_proxmox_container`, or `remove_proxmox_container` commands complete. Each event includes the refreshed infra snapshot so dashboards can immediately display the latest managed container totals even though the `proxmox.infra.managed_containers` cache updates only every ~30 seconds.
+
+**Event Fields:**
+
+*   `action` (string): The action that ran (`start`, `stop`, or `remove`).
+*   `success` (boolean): True when the requested action succeeded.
+*   `ctid` (string): Target CT ID.
+*   `message` (string): Human-friendly summary (e.g., `Stopped container 103`).
+*   `status` (string): The container’s new status (e.g., `running`, `stopped`, `deleted`).
+*   `details` (object, optional): Exit status information (e.g., `exitstatus`, `stop_exitstatus`, `delete_exitstatus`).
+*   `infra` (object): Same snapshot described under [`system_info`](#system_info-event) `proxmox.infra`, including the updated `managed_containers` summary.
+
 ### <a name="clock_sync_response"></a>`clock_sync_response`
 
 Reply sent by the gateway immediately after receiving a `clock_sync_request`. Devices use this event plus the measured round-trip time to keep their local `ntp_clock` offset accurate.

portacode/connection/handlers/__init__.py

@@ -46,6 +46,9 @@ from .proxmox_infra import (
     CreateProxmoxContainerHandler,
     RevertProxmoxInfraHandler,
     StartPortacodeServiceHandler,
+    StartProxmoxContainerHandler,
+    StopProxmoxContainerHandler,
+    RemoveProxmoxContainerHandler,
 )
 
 __all__ = [
@@ -86,6 +89,9 @@ __all__ = [
     "ProjectStateGitRevertHandler",
     "ProjectStateGitCommitHandler",
     "StartPortacodeServiceHandler",
+    "StartProxmoxContainerHandler",
+    "StopProxmoxContainerHandler",
+    "RemoveProxmoxContainerHandler",
     "UpdatePortacodeHandler",
     "RevertProxmoxInfraHandler",
 ] 

portacode/connection/handlers/proxmox_infra.py

@@ -12,6 +12,7 @@ import stat
 import subprocess
 import sys
 import time
+import threading
 from datetime import datetime
 from pathlib import Path
 from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple
@@ -40,6 +41,9 @@ DNS_SERVER = "1.1.1.1"
 IFACES_PATH = Path("/etc/network/interfaces")
 SYSCTL_PATH = Path("/etc/sysctl.d/99-portacode-forward.conf")
 UNIT_DIR = Path("/etc/systemd/system")
+_MANAGED_CONTAINERS_CACHE_TTL_S = 30.0
+_MANAGED_CONTAINERS_CACHE: Dict[str, Any] = {"timestamp": 0.0, "summary": None}
+_MANAGED_CONTAINERS_CACHE_LOCK = threading.Lock()
 
 ProgressCallback = Callable[[int, int, Dict[str, Any], str, Optional[Dict[str, Any]]], None]
 
@@ -55,6 +59,7 @@ def _emit_progress_event(
     message: str,
     phase: str,
     request_id: Optional[str],
+    client_sessions: Optional[List[str]] = None,
     details: Optional[Dict[str, Any]] = None,
 ) -> None:
     loop = handler.context.get("event_loop")
@@ -80,6 +85,8 @@ def _emit_progress_event(
         payload["request_id"] = request_id
     if details:
         payload["details"] = details
+    if client_sessions:
+        payload["client_sessions"] = client_sessions
 
     future = asyncio.run_coroutine_threadsafe(handler.send_response(payload), loop)
     future.add_done_callback(
@@ -290,6 +297,117 @@ def _ensure_containers_dir() -> None:
     CONTAINERS_DIR.mkdir(parents=True, exist_ok=True)
 
 
+def _invalidate_managed_containers_cache() -> None:
+    with _MANAGED_CONTAINERS_CACHE_LOCK:
+        _MANAGED_CONTAINERS_CACHE["timestamp"] = 0.0
+        _MANAGED_CONTAINERS_CACHE["summary"] = None
+
+
+def _load_managed_container_records() -> List[Dict[str, Any]]:
+    _ensure_containers_dir()
+    records: List[Dict[str, Any]] = []
+    for path in sorted(CONTAINERS_DIR.glob("ct-*.json")):
+        try:
+            payload = json.loads(path.read_text(encoding="utf-8"))
+        except Exception as exc:  # pragma: no cover - best effort logging
+            logger.debug("Unable to read container record %s: %s", path, exc)
+            continue
+        records.append(payload)
+    return records
+
+
+def _build_managed_containers_summary(records: List[Dict[str, Any]]) -> Dict[str, Any]:
+    total_ram = 0
+    total_disk = 0
+    total_cpu_share = 0.0
+    containers: List[Dict[str, Any]] = []
+
+    def _as_int(value: Any) -> int:
+        try:
+            return int(value)
+        except (TypeError, ValueError):
+            return 0
+
+    def _as_float(value: Any) -> float:
+        try:
+            return float(value)
+        except (TypeError, ValueError):
+            return 0.0
+
+    for record in sorted(records, key=lambda entry: _as_int(entry.get("vmid"))):
+        ram_mib = _as_int(record.get("ram_mib"))
+        disk_gib = _as_int(record.get("disk_gib"))
+        cpu_share = _as_float(record.get("cpus"))
+        total_ram += ram_mib
+        total_disk += disk_gib
+        total_cpu_share += cpu_share
+        status = (record.get("status") or "unknown").lower()
+        containers.append(
+            {
+                "vmid": str(_as_int(record.get("vmid"))) if record.get("vmid") is not None else None,
+                "hostname": record.get("hostname"),
+                "template": record.get("template"),
+                "storage": record.get("storage"),
+                "disk_gib": disk_gib,
+                "ram_mib": ram_mib,
+                "cpu_share": cpu_share,
+                "created_at": record.get("created_at"),
+                "status": status,
+            }
+        )
+
+    return {
+        "updated_at": datetime.utcnow().isoformat() + "Z",
+        "count": len(containers),
+        "total_ram_mib": total_ram,
+        "total_disk_gib": total_disk,
+        "total_cpu_share": round(total_cpu_share, 2),
+        "containers": containers,
+    }
+
+
+def _get_managed_containers_summary(force: bool = False) -> Dict[str, Any]:
+    def _refresh_container_statuses(records: List[Dict[str, Any]], config: Dict[str, Any] | None) -> None:
+        if not records or not config:
+            return
+        try:
+            proxmox = _connect_proxmox(config)
+            node = _get_node_from_config(config)
+            statuses = {
+                str(ct.get("vmid")): (ct.get("status") or "unknown").lower()
+                for ct in proxmox.nodes(node).lxc.get()
+            }
+        except Exception as exc:  # pragma: no cover - best effort
+            logger.debug("Failed to refresh container statuses: %s", exc)
+            return
+        for record in records:
+            vmid = record.get("vmid")
+            if vmid is None:
+                continue
+            try:
+                vmid_key = str(int(vmid))
+            except (ValueError, TypeError):
+                continue
+            status = statuses.get(vmid_key)
+            if status:
+                record["status"] = status
+
+    now = time.monotonic()
+    with _MANAGED_CONTAINERS_CACHE_LOCK:
+        cache_ts = _MANAGED_CONTAINERS_CACHE["timestamp"]
+        cached = _MANAGED_CONTAINERS_CACHE["summary"]
+    if not force and cached and now - cache_ts < _MANAGED_CONTAINERS_CACHE_TTL_S:
+        return cached
+    config = _load_config()
+    records = _load_managed_container_records()
+    _refresh_container_statuses(records, config)
+    summary = _build_managed_containers_summary(records)
+    with _MANAGED_CONTAINERS_CACHE_LOCK:
+        _MANAGED_CONTAINERS_CACHE["timestamp"] = now
+        _MANAGED_CONTAINERS_CACHE["summary"] = summary
+    return summary
+
+
 def _format_rootfs(storage: str, disk_gib: int, storage_type: str) -> str:
     if storage_type in ("lvm", "lvmthin"):
         return f"{storage}:{disk_gib}"
@@ -365,14 +483,14 @@ def _get_storage_type(storages: Iterable[Dict[str, Any]], storage_name: str) ->
     return ""
 
 
-def _validate_positive_int(value: Any, default: int) -> int:
+def _validate_positive_number(value: Any, default: float) -> float:
     try:
-        candidate = int(value)
+        candidate = float(value)
         if candidate > 0:
             return candidate
     except Exception:
         pass
-    return default
+    return float(default)
 
 
 def _wait_for_task(proxmox: Any, node: str, upid: str) -> Tuple[Dict[str, Any], float]:
@@ -424,10 +542,24 @@ def _start_container(proxmox: Any, node: str, vmid: int) -> Tuple[Dict[str, Any]
     return _wait_for_task(proxmox, node, upid)
 
 
+def _stop_container(proxmox: Any, node: str, vmid: int) -> Tuple[Dict[str, Any], float]:
+    status = proxmox.nodes(node).lxc(vmid).status.current.get()
+    if status.get("status") != "running":
+        return status, 0.0
+    upid = proxmox.nodes(node).lxc(vmid).status.stop.post()
+    return _wait_for_task(proxmox, node, upid)
+
+
+def _delete_container(proxmox: Any, node: str, vmid: int) -> Tuple[Dict[str, Any], float]:
+    upid = proxmox.nodes(node).lxc(vmid).delete()
+    return _wait_for_task(proxmox, node, upid)
+
+
 def _write_container_record(vmid: int, payload: Dict[str, Any]) -> None:
     _ensure_containers_dir()
     path = CONTAINERS_DIR / f"ct-{vmid}.json"
     path.write_text(json.dumps(payload, indent=2), encoding="utf-8")
+    _invalidate_managed_containers_cache()
 
 
 def _read_container_record(vmid: int) -> Dict[str, Any]:
@@ -437,6 +569,19 @@ def _read_container_record(vmid: int) -> Dict[str, Any]:
     return json.loads(path.read_text(encoding="utf-8"))
 
 
+def _update_container_record(vmid: int, updates: Dict[str, Any]) -> None:
+    record = _read_container_record(vmid)
+    record.update(updates)
+    _write_container_record(vmid, record)
+
+
+def _remove_container_record(vmid: int) -> None:
+    path = CONTAINERS_DIR / f"ct-{vmid}.json"
+    if path.exists():
+        path.unlink()
+        _invalidate_managed_containers_cache()
+
+
 def _build_container_payload(message: Dict[str, Any], config: Dict[str, Any]) -> Dict[str, Any]:
     templates = config.get("templates") or []
     default_template = templates[0] if templates else ""
@@ -446,9 +591,9 @@ def _build_container_payload(message: Dict[str, Any], config: Dict[str, Any]) ->
 
     bridge = config.get("network", {}).get("bridge", DEFAULT_BRIDGE)
     hostname = (message.get("hostname") or "").strip()
-    disk_gib = _validate_positive_int(message.get("disk_gib") or message.get("disk"), 32)
-    ram_mib = _validate_positive_int(message.get("ram_mib") or message.get("ram"), 2048)
-    cpus = _validate_positive_int(message.get("cpus"), 1)
+    disk_gib = int(max(round(_validate_positive_number(message.get("disk_gib") or message.get("disk"), 3)), 1))
+    ram_mib = int(max(round(_validate_positive_number(message.get("ram_mib") or message.get("ram"), 2048)), 1))
+    cpus = _validate_positive_number(message.get("cpus"), 0.2)
     storage = message.get("storage") or config.get("default_storage") or ""
     if not storage:
         raise ValueError("Storage pool could not be determined.")
@@ -473,6 +618,38 @@ def _build_container_payload(message: Dict[str, Any], config: Dict[str, Any]) ->
     return payload
 
 
+def _ensure_infra_configured() -> Dict[str, Any]:
+    config = _load_config()
+    if not config or not config.get("token_value"):
+        raise RuntimeError("Proxmox infrastructure is not configured.")
+    return config
+
+
+def _get_node_from_config(config: Dict[str, Any]) -> str:
+    return config.get("node") or DEFAULT_NODE_NAME
+
+
+def _parse_ctid(message: Dict[str, Any]) -> int:
+    for key in ("ctid", "vmid"):
+        value = message.get(key)
+        if value is not None:
+            try:
+                return int(str(value).strip())
+            except ValueError:
+                raise ValueError(f"{key} must be an integer") from None
+    raise ValueError("ctid is required")
+
+
+def _ensure_container_managed(
+    proxmox: Any, node: str, vmid: int
+) -> Tuple[Dict[str, Any], Dict[str, Any]]:
+    record = _read_container_record(vmid)
+    ct_cfg = proxmox.nodes(node).lxc(str(vmid)).config.get()
+    if not ct_cfg or MANAGED_MARKER not in (ct_cfg.get("description") or ""):
+        raise RuntimeError(f"Container {vmid} is not managed by Portacode.")
+    return record, ct_cfg
+
+
 def _connect_proxmox(config: Dict[str, Any]) -> Any:
     ProxmoxAPI = _ensure_proxmoxer()
     return ProxmoxAPI(
@@ -528,15 +705,22 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
 
     last_pub = last_priv = None
     stable = 0
+    history: List[Dict[str, Any]] = []
+
+    process_exited = False
+    exit_out = exit_err = ""
     while time.time() - start < timeout_s:
         if proc.poll() is not None:
-            out, err = proc.communicate(timeout=1)
-            return {
-                "ok": False,
-                "error": "portacode connect exited before keys were created",
-                "stdout": (out or "").strip(),
-                "stderr": (err or "").strip(),
-            }
+            process_exited = True
+            exit_out, exit_err = proc.communicate(timeout=1)
+            history.append(
+                {
+                    "timestamp_s": round(time.time() - start, 2),
+                    "status": "process_exited",
+                    "returncode": proc.returncode,
+                }
+            )
+            break
         pub_size = file_size(pub_path)
         priv_size = file_size(priv_path)
         if pub_size and priv_size:
@@ -546,21 +730,60 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
                 stable = 0
             last_pub, last_priv = pub_size, priv_size
             if stable >= 1:
+                history.append(
+                    {
+                        "timestamp_s": round(time.time() - start, 2),
+                        "pub_size": pub_size,
+                        "priv_size": priv_size,
+                        "stable": stable,
+                    }
+                )
                 break
+        history.append(
+            {
+                "timestamp_s": round(time.time() - start, 2),
+                "pub_size": pub_size,
+                "priv_size": priv_size,
+                "stable": stable,
+            }
+        )
         time.sleep(1)
 
-    if stable < 1:
+    final_pub = file_size(pub_path)
+    final_priv = file_size(priv_path)
+    if final_pub and final_priv:
+        key_res = _run_pct(vmid, f"su - {user} -c 'cat {pub_path}'")
+        if not process_exited:
+            proc.terminate()
+            try:
+                proc.wait(timeout=3)
+            except subprocess.TimeoutExpired:
+                proc.kill()
+        return {
+            "ok": True,
+            "public_key": key_res["stdout"].strip(),
+            "history": history,
+        }
+
+    if not process_exited:
         proc.terminate()
         try:
             proc.wait(timeout=3)
         except subprocess.TimeoutExpired:
             proc.kill()
-        out, err = proc.communicate(timeout=1)
+        exit_out, exit_err = proc.communicate(timeout=1)
+        history.append(
+            {
+                "timestamp_s": round(time.time() - start, 2),
+                "status": "timeout_waiting_for_keys",
+            }
+        )
         return {
             "ok": False,
             "error": "timed out waiting for portacode key files",
-            "stdout": (out or "").strip(),
-            "stderr": (err or "").strip(),
+            "stdout": (exit_out or "").strip(),
+            "stderr": (exit_err or "").strip(),
+            "history": history,
         }
 
     proc.terminate()
@@ -573,6 +796,7 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
     return {
         "ok": True,
         "public_key": key_res["stdout"].strip(),
+        "history": history,
     }
 
 
@@ -670,6 +894,19 @@ def _bootstrap_portacode(
         total_steps=total_steps,
     )
     if not ok:
+        details = results[-1] if results else {}
+        summary = details.get("error_summary") or details.get("stderr") or details.get("stdout") or details.get("name")
+        history = details.get("history")
+        history_snippet = ""
+        if isinstance(history, list) and history:
+            history_snippet = f" history={history[-3:]}"
+        if summary:
+            logger.warning(
+                "Portacode bootstrap failure summary=%s%s",
+                summary,
+                f" history_len={len(history)}" if history else "",
+            )
+            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 None
@@ -748,6 +985,7 @@ def configure_infrastructure(token_identifier: str, token_value: str, verify_ssl
     _save_config(config)
     snapshot = build_snapshot(config)
     snapshot["node_status"] = status
+    snapshot["managed_containers"] = _get_managed_containers_summary(force=True)
     return snapshot
 
 
@@ -756,6 +994,7 @@ def get_infra_snapshot() -> Dict[str, Any]:
     snapshot = build_snapshot(config)
     if config.get("node_status"):
         snapshot["node_status"] = config["node_status"]
+    snapshot["managed_containers"] = _get_managed_containers_summary()
     return snapshot
 
 
@@ -768,6 +1007,7 @@ def revert_infrastructure() -> Dict[str, Any]:
     snapshot["network"]["applied"] = False
     snapshot["network"]["message"] = "Reverted to previous network state"
     snapshot["network"]["bridge"] = DEFAULT_BRIDGE
+    snapshot["managed_containers"] = _get_managed_containers_summary(force=True)
     return snapshot
 
 
@@ -791,7 +1031,7 @@ def _instantiate_container(proxmox: Any, node: str, payload: Dict[str, Any]) ->
             rootfs=rootfs,
             memory=int(payload["ram_mib"]),
             swap=int(payload.get("swap_mb", 0)),
-            cores=int(payload.get("cpus", 1)),
+            cores=max(int(payload.get("cores", 1)), 1),
             cpuunits=int(payload.get("cpuunits", 256)),
             net0=payload["net0"],
             unprivileged=int(payload.get("unprivileged", 1)),
@@ -815,6 +1055,8 @@ class CreateProxmoxContainerHandler(SyncHandler):
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
         logger.info("create_proxmox_container command received")
         request_id = message.get("request_id")
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
         bootstrap_user, bootstrap_password, bootstrap_ssh_key = _get_provisioning_user_info(message)
         bootstrap_steps = _build_bootstrap_steps(bootstrap_user, bootstrap_password, bootstrap_ssh_key)
         total_steps = 3 + len(bootstrap_steps) + 2
@@ -838,6 +1080,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
                 message=start_message,
                 phase="lifecycle",
                 request_id=request_id,
+                client_sessions=client_sessions,
             )
             try:
                 result = action()
@@ -852,6 +1095,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
                     message=f"{step_label} failed: {exc}",
                     phase="lifecycle",
                     request_id=request_id,
+                    client_sessions=client_sessions,
                     details={"error": str(exc)},
                 )
                 raise
@@ -865,6 +1109,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
                 message=success_message,
                 phase="lifecycle",
                 request_id=request_id,
+                client_sessions=client_sessions,
             )
             current_step_index += 1
             return result
@@ -905,6 +1150,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
             vmid, _ = _instantiate_container(proxmox, node, payload)
             payload["vmid"] = vmid
             payload["created_at"] = datetime.utcnow().isoformat() + "Z"
+            payload["status"] = "creating"
             _write_container_record(vmid, payload)
             return proxmox, node, vmid, payload
 
@@ -926,6 +1172,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
             "Container startup completed.",
             _start_container_step,
         )
+        _update_container_record(vmid, {"status": "running"})
 
         def _bootstrap_progress_callback(
             step_index: int,
@@ -963,6 +1210,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
                 message=message_text,
                 phase="bootstrap",
                 request_id=request_id,
+                client_sessions=client_sessions,
                 details=details or None,
             )
 
@@ -978,7 +1226,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
         )
         current_step_index += len(bootstrap_steps)
 
-        return {
+        response = {
             "event": "proxmox_container_created",
             "success": True,
             "message": f"Container {vmid} is ready and Portacode key captured.",
@@ -995,6 +1243,9 @@ class CreateProxmoxContainerHandler(SyncHandler):
             },
             "setup_steps": steps,
         }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response
 
 
 class StartPortacodeServiceHandler(SyncHandler):
@@ -1022,6 +1273,8 @@ class StartPortacodeServiceHandler(SyncHandler):
         start_index = int(message.get("step_index", 1))
         total_steps = int(message.get("total_steps", start_index + 2))
         request_id = message.get("request_id")
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
 
         auth_step_name = "setup_device_authentication"
         auth_label = "Setting up device authentication"
@@ -1035,6 +1288,7 @@ class StartPortacodeServiceHandler(SyncHandler):
             message="Notifying the server of the new device…",
             phase="service",
             request_id=request_id,
+            client_sessions=client_sessions,
         )
         _emit_progress_event(
             self,
@@ -1046,6 +1300,7 @@ class StartPortacodeServiceHandler(SyncHandler):
             message="Authentication metadata recorded.",
             phase="service",
             request_id=request_id,
+            client_sessions=client_sessions,
         )
 
         install_step = start_index + 1
@@ -1060,6 +1315,7 @@ class StartPortacodeServiceHandler(SyncHandler):
             message="Running sudo portacode service install…",
             phase="service",
             request_id=request_id,
+            client_sessions=client_sessions,
         )
 
         cmd = f"su - {user} -c 'sudo -S portacode service install'"
@@ -1076,6 +1332,7 @@ class StartPortacodeServiceHandler(SyncHandler):
                 message=f"{install_label} failed: {res.get('stderr') or res.get('stdout')}",
                 phase="service",
                 request_id=request_id,
+                client_sessions=client_sessions,
                 details={
                     "stderr": res.get("stderr"),
                     "stdout": res.get("stdout"),
@@ -1093,14 +1350,133 @@ class StartPortacodeServiceHandler(SyncHandler):
             message="Portacode service install finished.",
             phase="service",
             request_id=request_id,
+            client_sessions=client_sessions,
         )
 
-        return {
+        response = {
             "event": "proxmox_service_started",
             "success": True,
             "message": "Portacode service install completed",
             "ctid": str(vmid),
         }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response
+
+
+class StartProxmoxContainerHandler(SyncHandler):
+    """Start a managed container via the Proxmox API."""
+
+    @property
+    def command_name(self) -> str:
+        return "start_proxmox_container"
+
+    def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
+        vmid = _parse_ctid(message)
+        config = _ensure_infra_configured()
+        proxmox = _connect_proxmox(config)
+        node = _get_node_from_config(config)
+        _ensure_container_managed(proxmox, node, vmid)
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
+
+        status, elapsed = _start_container(proxmox, node, vmid)
+        _update_container_record(vmid, {"status": "running"})
+
+        infra = get_infra_snapshot()
+        response = {
+            "event": "proxmox_container_action",
+            "action": "start",
+            "success": True,
+            "ctid": str(vmid),
+            "message": f"Started container {vmid} in {elapsed:.1f}s.",
+            "details": {"exitstatus": status.get("exitstatus")},
+            "status": status.get("status"),
+            "infra": infra,
+        }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response
+
+
+class StopProxmoxContainerHandler(SyncHandler):
+    """Stop a managed container via the Proxmox API."""
+
+    @property
+    def command_name(self) -> str:
+        return "stop_proxmox_container"
+
+    def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
+        vmid = _parse_ctid(message)
+        config = _ensure_infra_configured()
+        proxmox = _connect_proxmox(config)
+        node = _get_node_from_config(config)
+        _ensure_container_managed(proxmox, node, vmid)
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
+
+        status, elapsed = _stop_container(proxmox, node, vmid)
+        final_status = status.get("status") or "stopped"
+        _update_container_record(vmid, {"status": final_status})
+
+        infra = get_infra_snapshot()
+        message_text = (
+            f"Container {vmid} is already stopped."
+            if final_status != "running" and elapsed == 0.0
+            else f"Stopped container {vmid} in {elapsed:.1f}s."
+        )
+        response = {
+            "event": "proxmox_container_action",
+            "action": "stop",
+            "success": True,
+            "ctid": str(vmid),
+            "message": message_text,
+            "details": {"exitstatus": status.get("exitstatus")},
+            "status": final_status,
+            "infra": infra,
+        }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response
+
+
+class RemoveProxmoxContainerHandler(SyncHandler):
+    """Delete a managed container via the Proxmox API."""
+
+    @property
+    def command_name(self) -> str:
+        return "remove_proxmox_container"
+
+    def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
+        vmid = _parse_ctid(message)
+        config = _ensure_infra_configured()
+        proxmox = _connect_proxmox(config)
+        node = _get_node_from_config(config)
+        _ensure_container_managed(proxmox, node, vmid)
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
+
+        stop_status, stop_elapsed = _stop_container(proxmox, node, vmid)
+        delete_status, delete_elapsed = _delete_container(proxmox, node, vmid)
+        _remove_container_record(vmid)
+
+        infra = get_infra_snapshot()
+        response = {
+            "event": "proxmox_container_action",
+            "action": "remove",
+            "success": True,
+            "ctid": str(vmid),
+            "message": f"Deleted container {vmid} in {delete_elapsed:.1f}s.",
+            "details": {
+                "stop_exitstatus": stop_status.get("exitstatus"),
+                "delete_exitstatus": delete_status.get("exitstatus"),
+            },
+            "status": "deleted",
+            "infra": infra,
+        }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response
 
 
 class ConfigureProxmoxInfraHandler(SyncHandler):
@@ -1114,13 +1490,18 @@ class ConfigureProxmoxInfraHandler(SyncHandler):
         verify_ssl = bool(message.get("verify_ssl"))
         if not token_identifier or not token_value:
             raise ValueError("token_identifier and token_value are required")
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
         snapshot = configure_infrastructure(token_identifier, token_value, verify_ssl=verify_ssl)
-        return {
+        response = {
             "event": "proxmox_infra_configured",
             "success": True,
             "message": "Proxmox infrastructure configured",
             "infra": snapshot,
         }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response
 
 
 class RevertProxmoxInfraHandler(SyncHandler):
@@ -1129,10 +1510,15 @@ class RevertProxmoxInfraHandler(SyncHandler):
         return "revert_proxmox_infra"
 
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
         snapshot = revert_infrastructure()
-        return {
+        response = {
             "event": "proxmox_infra_reverted",
             "success": True,
             "message": "Proxmox infrastructure configuration reverted",
             "infra": snapshot,
         }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response

portacode/connection/terminal.py

@@ -56,6 +56,9 @@ from .handlers import (
     CreateProxmoxContainerHandler,
     RevertProxmoxInfraHandler,
     StartPortacodeServiceHandler,
+    StartProxmoxContainerHandler,
+    StopProxmoxContainerHandler,
+    RemoveProxmoxContainerHandler,
 )
 from .handlers.project_aware_file_handlers import (
     ProjectAwareFileWriteHandler,
@@ -480,6 +483,9 @@ class TerminalManager:
         self._command_registry.register(ConfigureProxmoxInfraHandler)
         self._command_registry.register(CreateProxmoxContainerHandler)
         self._command_registry.register(StartPortacodeServiceHandler)
+        self._command_registry.register(StartProxmoxContainerHandler)
+        self._command_registry.register(StopProxmoxContainerHandler)
+        self._command_registry.register(RemoveProxmoxContainerHandler)
         self._command_registry.register(RevertProxmoxInfraHandler)
         self._command_registry.register(UpdatePortacodeHandler)
 

{portacode-1.4.11.dev10.dist-info → portacode-1.4.12.dist-info}/METADATA

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

{portacode-1.4.11.dev10.dist-info → portacode-1.4.12.dist-info}/RECORD

@@ -1,7 +1,7 @@
 portacode/README.md,sha256=4dKtpvR8LNgZPVz37GmkQCMWIr_u25Ao63iW56s7Ke4,775
 portacode/__init__.py,sha256=oB3sV1wXr-um-RXio73UG8E5Xx6cF2ZVJveqjNmC-vQ,1086
 portacode/__main__.py,sha256=jmHTGC1hzmo9iKJLv-SSYe9BSIbPPZ2IOpecI03PlTs,296
-portacode/_version.py,sha256=N01xrWD9pWCsVQSV1BEau1bnnemce8pHIwKp_9Gicbo,721
+portacode/_version.py,sha256=fngNnJDsfflZ81w9BH0O75dXs5-skjVThUqmwrIaOd0,706
 portacode/cli.py,sha256=mGLKoZ-T2FBF7IA9wUq0zyG0X9__-A1ao7gajjcVRH8,21828
 portacode/data.py,sha256=5-s291bv8J354myaHm1Y7CQZTZyRzMU3TGe5U4hb-FA,1591
 portacode/keypair.py,sha256=0OO4vHDcF1XMxCDqce61xFTlFwlTcmqe5HyGsXFEt7s,5838
@@ -12,17 +12,17 @@ portacode/connection/README.md,sha256=f9rbuIEKa7cTm9C98rCiBbEtbiIXQU11esGSNhSMiJ
 portacode/connection/__init__.py,sha256=atqcVGkViIEd7pRa6cP2do07RJOM0UWpbnz5zXjGktU,250
 portacode/connection/client.py,sha256=jtLb9_YufqPkzi9t8VQH3iz_JEMisbtY6a8L9U5weiU,14181
 portacode/connection/multiplex.py,sha256=L-TxqJ_ZEbfNEfu1cwxgJ5vUdyRzZjsMy2Kx1diiZys,5237
-portacode/connection/terminal.py,sha256=07wxG_55JMy3yQ9TXCBldW9h43qCW3U8rv2yzGMx4FM,44757
+portacode/connection/terminal.py,sha256=oyLPOVLPlUuN_eRvHPGazB51yi8W8JEF3oOEYxucGTE,45069
 portacode/connection/handlers/README.md,sha256=HsLZG1QK1JNm67HsgL6WoDg9nxzKXxwkc5fJPFJdX5g,12169
-portacode/connection/handlers/WEBSOCKET_PROTOCOL.md,sha256=Z5L0gJWoHxV7UonHqxHko_PXZd7Z1mbI6yWtmjxna-s,93951
-portacode/connection/handlers/__init__.py,sha256=y-Aj5SXqc_QJt7i1xkl7kv381Fd2CIcUiG5gR1F8qkI,2711
+portacode/connection/handlers/WEBSOCKET_PROTOCOL.md,sha256=7tBYNEY8EBGAPIMT606BqeHnyMOQIZVlQYpH7me26LY,97962
+portacode/connection/handlers/__init__.py,sha256=WSeBmi65GWFQPYt9M3E10rn0uZ_EPCJzNJOzSf2HZyw,2921
 portacode/connection/handlers/base.py,sha256=oENFb-Fcfzwk99Qx8gJQriEMiwSxwygwjOiuCH36hM4,10231
 portacode/connection/handlers/chunked_content.py,sha256=h6hXRmxSeOgnIxoU8CkmvEf2Odv-ajPrpHIe_W3GKcA,9251
 portacode/connection/handlers/diff_handlers.py,sha256=iYTIRCcpEQ03vIPKZCsMTE5aZbQw6sF04M3dM6rUV8Q,24477
 portacode/connection/handlers/file_handlers.py,sha256=nAJH8nXnX07xxD28ngLpgIUzcTuRwZBNpEGEKdRqohw,39507
 portacode/connection/handlers/project_aware_file_handlers.py,sha256=AqgMnDqX2893T2NsrvUSCwjN5VKj4Pb2TN0S_SuboOE,9803
 portacode/connection/handlers/project_state_handlers.py,sha256=v6ZefGW9i7n1aZLq2jOGumJIjYb6aHlPI4m1jkYewm8,1686
-portacode/connection/handlers/proxmox_infra.py,sha256=dO1LjKOgIqubib_JF6AfILl3cMY3djP7Xq4iPrGPWMY,41192
+portacode/connection/handlers/proxmox_infra.py,sha256=qjzMq51xig7p4Y5EVZ1Oo9GA9mAxq4RG0anszL6leKw,55909
 portacode/connection/handlers/registry.py,sha256=qXGE60sYEWg6ZtVQzFcZ5YI2XWR6lMgw4hAL9x5qR1I,6181
 portacode/connection/handlers/session.py,sha256=uNGfiO_1B9-_yjJKkpvmbiJhIl6b-UXlT86UTfd6WYE,42219
 portacode/connection/handlers/system_handlers.py,sha256=AKh7IbwptlLYrbSw5f-DHigvlaKHsg9lDP-lkAUm8cE,10755
@@ -64,7 +64,7 @@ portacode/utils/__init__.py,sha256=NgBlWTuNJESfIYJzP_3adI1yJQJR0XJLRpSdVNaBAN0,3
 portacode/utils/diff_apply.py,sha256=4Oi7ft3VUCKmiUE4VM-OeqO7Gk6H7PF3WnN4WHXtjxI,15157
 portacode/utils/diff_renderer.py,sha256=S76StnQ2DLfsz4Gg0m07UwPfRp8270PuzbNaQq-rmYk,13850
 portacode/utils/ntp_clock.py,sha256=VqCnWCTehCufE43W23oB-WUdAZGeCcLxkmIOPwInYHc,2499
-portacode-1.4.11.dev10.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
+portacode-1.4.12.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
 test_modules/README.md,sha256=Do_agkm9WhSzueXjRAkV_xEj6Emy5zB3N3VKY5Roce8,9274
 test_modules/__init__.py,sha256=1LcbHodIHsB0g-g4NGjSn6AMuCoGbymvXPYLOb6Z7F0,53
 test_modules/test_device_online.py,sha256=QtYq0Dq9vME8Gp2O4fGSheqVf8LUtpsSKosXXk56gGM,1654
@@ -90,8 +90,8 @@ testing_framework/core/playwright_manager.py,sha256=Tw46qwxIhOFkS48C2IWIQHHNpEe-
 testing_framework/core/runner.py,sha256=j2QwNJmAxVBmJvcbVS7DgPJUKPNzqfLmt_4NNdaKmZU,19297
 testing_framework/core/shared_cli_manager.py,sha256=BESSNtyQb7BOlaOvZmm04T8Uezjms4KCBs2MzTxvzYQ,8790
 testing_framework/core/test_discovery.py,sha256=2FZ9fJ8Dp5dloA-fkgXoJ_gCMC_nYPBnA3Hs2xlagzM,4928
-portacode-1.4.11.dev10.dist-info/METADATA,sha256=MOIgg0chGfuiFrYIhUhiPegZ-06JrXL20Y5vsFs2wvo,13052
-portacode-1.4.11.dev10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-portacode-1.4.11.dev10.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
-portacode-1.4.11.dev10.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
-portacode-1.4.11.dev10.dist-info/RECORD,,
+portacode-1.4.12.dist-info/METADATA,sha256=lAGJrKnZnwWgPbSOe99hICWCxFjU_UMdIRfYOVmqxLI,13046
+portacode-1.4.12.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+portacode-1.4.12.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
+portacode-1.4.12.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
+portacode-1.4.12.dist-info/RECORD,,

{portacode-1.4.11.dev10.dist-info → portacode-1.4.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any