portacode 1.4.15.dev15__py3-none-any.whl → 1.4.16.dev3__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.15.dev15'
-__version_tuple__ = version_tuple = (1, 4, 15, 'dev15')
+__version__ = version = '1.4.16.dev3'
+__version_tuple__ = version_tuple = (1, 4, 16, 'dev3')
 
 __commit_id__ = commit_id = None

portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -381,6 +381,7 @@ Starts a previously provisioned, Portacode-managed LXC container. Handled by [`S
 **Payload Fields:**
 
 *   `ctid` (string, required): Identifier of the container to start.
+*   `child_device_id` (string, required): Dashboard `Device.id` of the container that triggered the request; the handler validates the CT belongs to that device before issuing the start.
 
 **Responses:**
 
@@ -394,6 +395,7 @@ Stops a running Portacode-managed container. Handled by [`StopProxmoxContainerHa
 **Payload Fields:**
 
 *   `ctid` (string, required): Identifier of the container to stop.
+*   `child_device_id` (string, required): Dashboard `Device.id` that owns the container; the handler rejects the request if the CT is mapped to another device.
 
 **Responses:**
 
@@ -407,6 +409,7 @@ Deletes a managed container from Proxmox (stopping it first if necessary) and re
 **Payload Fields:**
 
 *   `ctid` (string, required): Identifier of the container to delete.
+*   `child_device_id` (string, required): Dashboard `Device.id` that should own the container metadata being purged.
 
 **Responses:**
 
@@ -1133,22 +1136,34 @@ Provides system information in response to a `system_info` action. Handled by [`
                     *   `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.
+                    *   `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.
+                            *   `managed` (boolean): `true` for Portacode-managed entries.
+                        *   `unmanaged_containers` (array[object]): Facts about containers Portacode did not provision; fields mirror the managed list but are marked `managed=false`.
+                        *   `unmanaged_count` (integer): Number of unmanaged containers detected on the node.
+                        *   `allocated_ram_mib` (integer): Total RAM reserved by both managed and unmanaged containers.
+                        *   `allocated_disk_gib` (integer): Total disk reserved by both managed and unmanaged containers.
+                        *   `allocated_cpu_share` (number): Total CPU shares requested by both managed and unmanaged containers.
+                        *   `available_ram_mib` (integer|null): Remaining RAM after subtracting all reservations from the host total (null when unavailable).
+                        *   `available_disk_gib` (integer|null): Remaining disk GB after subtracting allocations from the host total.
+                        *   `available_cpu_share` (number|null): Remaining CPU shares after allocations.
+                        *   `host_total_ram_mib` (integer|null): Host memory capacity observed via Proxmox.
+                        *   `host_total_disk_gib` (integer|null): Host disk capacity observed via Proxmox.
+                        *   `host_total_cpu_cores` (integer|null): Number of CPU cores reported by Proxmox.
     *   `portacode_version` (string): Installed CLI version returned by `portacode.__version__`.
 
 ### `proxmox_infra_configured`

portacode/connection/handlers/project_state/manager.py

@@ -21,6 +21,24 @@ from .git_manager import GitManager
 from .file_system_watcher import FileSystemWatcher
 from ....logging_categories import get_categorized_logger, LogCategory
 
+def _deterministic_file_tab_id(file_path: str) -> str:
+    try:
+        resolved = os.path.abspath(file_path)
+        mtime = int(Path(resolved).stat().st_mtime)
+    except OSError:
+        mtime = "unknown"
+        resolved = os.path.abspath(file_path)
+    return f"{resolved}:{mtime}"
+
+def _deterministic_diff_tab_id(
+    file_path: str,
+    from_ref: str,
+    to_ref: str,
+    from_hash: Optional[str],
+    to_hash: Optional[str]
+) -> str:
+    return f"diff:{os.path.abspath(file_path)}:{from_ref}:{to_ref}:{from_hash or ''}:{to_hash or ''}"
+
 logger = get_categorized_logger(__name__)
 
 # Global singleton instance
@@ -657,10 +675,10 @@ class ProjectStateManager:
         # Create new file tab using tab factory
         from ..tab_factory import get_tab_factory
         tab_factory = get_tab_factory()
-        
+
         try:
             logger.info(f"About to create tab for file: {file_path}")
-            new_tab = await tab_factory.create_file_tab(file_path)
+            new_tab = await tab_factory.create_file_tab(file_path, tab_id=_deterministic_file_tab_id(file_path))
             logger.info(f"Tab created successfully, adding to project state")
             project_state.open_tabs[tab_key] = new_tab
             if set_active:
@@ -842,7 +860,11 @@ class ProjectStateManager:
             diff_title = f"{os.path.basename(file_path)} ({' '.join(title_parts)})"
             
             diff_tab = await tab_factory.create_diff_tab_with_title(
-                file_path, original_content, modified_content, diff_title, 
+                file_path,
+                original_content,
+                modified_content,
+                diff_title,
+                tab_id=_deterministic_diff_tab_id(file_path, from_ref, to_ref, from_hash, to_hash),
                 diff_details=diff_details
             )
             

portacode/connection/handlers/proxmox_infra.py

@@ -7,6 +7,7 @@ import json
 import logging
 import math
 import os
+import re
 import secrets
 import shlex
 import shutil
@@ -18,7 +19,7 @@ import time
 import threading
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple
+from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Set, Tuple
 
 import platformdirs
 
@@ -201,6 +202,63 @@ def _current_time_iso() -> str:
     return datetime.now(timezone.utc).isoformat()
 
 
+def _to_int(value: Any, default: int = 0) -> int:
+    try:
+        return int(value)
+    except (TypeError, ValueError):
+        return default
+
+
+def _to_float(value: Any, default: float = 0.0) -> float:
+    try:
+        return float(value)
+    except (TypeError, ValueError):
+        return default
+
+
+def _calculate_available(total: Optional[float], used: float) -> Optional[float]:
+    if total is None:
+        return None
+    delta = total - used
+    return delta if delta >= 0 else 0.0
+
+
+def _normalize_bytes(value: Any) -> float:
+    if isinstance(value, (int, float)):
+        return float(value)
+    text = str(value or "").strip()
+    if not text:
+        return 0.0
+    match = re.match(r"(?i)^\s*([0-9]*\.?[0-9]+)\s*([kmgtp]?i?b?)?\s*$", text)
+    if not match:
+        return 0.0
+    number = match.group(1)
+    unit = (match.group(2) or "").lower()
+    try:
+        value = float(number)
+    except ValueError:
+        return 0.0
+    if unit.startswith("k"):
+        return value * 1024
+    if unit.startswith("m"):
+        return value * 1024**2
+    if unit.startswith("g"):
+        return value * 1024**3
+    if unit.startswith("t"):
+        return value * 1024**4
+    if unit.startswith("p"):
+        return value * 1024**5
+    return value
+
+
+def _bytes_to_mib(value: Any) -> int:
+    return int(round(_normalize_bytes(value) / (1024**2)))
+
+
+def _bytes_to_gib(value: Any) -> int:
+    return int(round(_normalize_bytes(value) / (1024**3)))
+
+
 def _parse_iso_timestamp(value: str) -> Optional[datetime]:
     if not value:
         return None
@@ -381,35 +439,67 @@ def _load_managed_container_records() -> List[Dict[str, Any]]:
     return records
 
 
-def _build_managed_containers_summary(records: List[Dict[str, Any]]) -> Dict[str, Any]:
+def _extract_host_totals(node_status: Dict[str, Any] | None) -> Tuple[Optional[int], Optional[int], Optional[int]]:
+    if not node_status:
+        return None, None, None
+    memory_total = node_status.get("memory", {}).get("total")
+    disk_total = node_status.get("disk", {}).get("total")
+    cpu_cores = node_status.get("cpuinfo", {}).get("cores")
+    host_ram = _bytes_to_mib(memory_total) if memory_total is not None else None
+    host_disk = _bytes_to_gib(disk_total) if disk_total is not None else None
+    host_cpu = _to_int(cpu_cores) if cpu_cores is not None else None
+    return host_ram, host_disk, host_cpu
+
+
+def _build_unmanaged_container_entry(ct: Dict[str, Any], cfg: Dict[str, Any], vmid: str) -> Dict[str, Any]:
+    ram_mib = _to_int(cfg.get("memory")) or _bytes_to_mib(ct.get("maxmem"))
+    disk_gib = _bytes_to_gib(ct.get("maxdisk"))
+    cpu_share = _to_float(
+        cfg.get("cpulimit")
+        or cfg.get("cpus")
+        or cfg.get("cores")
+        or ct.get("cpus")
+        or ct.get("cpu")
+    )
+    hostname = ct.get("name") or cfg.get("hostname") or f"ct{vmid}"
+    storage = cfg.get("storage") or ct.get("storage")
+    status = (ct.get("status") or "unknown").lower()
+    return {
+        "vmid": vmid,
+        "hostname": hostname,
+        "template": cfg.get("ostemplate"),
+        "storage": storage,
+        "disk_gib": disk_gib,
+        "ram_mib": ram_mib,
+        "cpu_share": cpu_share,
+        "status": status,
+        "managed": False,
+    }
+
+
+
+def _build_managed_containers_summary(
+    records: List[Dict[str, Any]],
+    unmanaged_records: List[Dict[str, Any]],
+    node_status: Dict[str, Any] | None,
+) -> Dict[str, Any]:
+    managed_containers: List[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"))
+    for record in sorted(records, key=lambda entry: _to_int(entry.get("vmid"))):
+        ram_mib = _to_int(record.get("ram_mib"))
+        disk_gib = _to_int(record.get("disk_gib"))
+        cpu_share = _to_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(
+        managed_containers.append(
             {
-                "vmid": str(_as_int(record.get("vmid"))) if record.get("vmid") is not None else None,
+                "vmid": str(_to_int(record.get("vmid"))) if record.get("vmid") is not None else None,
+                "device_id": record.get("device_id"),
                 "hostname": record.get("hostname"),
                 "template": record.get("template"),
                 "storage": record.get("storage"),
@@ -418,44 +508,76 @@ def _build_managed_containers_summary(records: List[Dict[str, Any]]) -> Dict[str
                 "cpu_share": cpu_share,
                 "created_at": record.get("created_at"),
                 "status": status,
+                "managed": True,
             }
         )
 
+    unmanaged_total_ram = sum(_to_int(entry.get("ram_mib")) for entry in unmanaged_records)
+    unmanaged_total_disk = sum(_to_int(entry.get("disk_gib")) for entry in unmanaged_records)
+    unmanaged_total_cpu = sum(_to_float(entry.get("cpu_share")) for entry in unmanaged_records)
+
+    allocated_ram = total_ram + unmanaged_total_ram
+    allocated_disk = total_disk + unmanaged_total_disk
+    allocated_cpu = total_cpu_share + unmanaged_total_cpu
+
+    host_ram, host_disk, host_cpu = _extract_host_totals(node_status)
+
     return {
         "updated_at": datetime.utcnow().isoformat() + "Z",
-        "count": len(containers),
+        "count": len(managed_containers),
         "total_ram_mib": total_ram,
         "total_disk_gib": total_disk,
         "total_cpu_share": round(total_cpu_share, 2),
-        "containers": containers,
+        "containers": managed_containers,
+        "unmanaged_containers": unmanaged_records,
+        "unmanaged_count": len(unmanaged_records),
+        "allocated_ram_mib": allocated_ram,
+        "allocated_disk_gib": allocated_disk,
+        "allocated_cpu_share": round(allocated_cpu, 2),
+        "available_ram_mib": _calculate_available(host_ram, allocated_ram) if host_ram is not None else None,
+        "available_disk_gib": _calculate_available(host_disk, allocated_disk) if host_disk is not None else None,
+        "available_cpu_share": _calculate_available(host_cpu, allocated_cpu) if host_cpu is not None else None,
+        "host_total_ram_mib": host_ram,
+        "host_total_disk_gib": host_disk,
+        "host_total_cpu_cores": host_cpu,
     }
 
 
 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
+    def _refresh_container_statuses(
+        records: List[Dict[str, Any]],
+        config: Dict[str, Any] | None,
+        managed_vmids: Set[str],
+    ) -> Tuple[Dict[str, str], List[Dict[str, Any]], Dict[str, Any] | None]:
+        statuses: Dict[str, str] = {}
+        unmanaged: List[Dict[str, Any]] = []
+        node_status: Dict[str, Any] | None = None
+        if not config:
+            return statuses, unmanaged, node_status
         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()
-            }
+            node_status = proxmox.nodes(node).status.get()
+            for ct in proxmox.nodes(node).lxc.get():
+                vmid_val = ct.get("vmid")
+                if vmid_val is None:
+                    continue
+                vmid_key = str(_to_int(vmid_val))
+                statuses[vmid_key] = (ct.get("status") or "unknown").lower()
+                if vmid_key in managed_vmids:
+                    continue
+                cfg: Dict[str, Any] = {}
+                try:
+                    cfg = proxmox.nodes(node).lxc(vmid_key).config.get() or {}
+                except Exception as exc:  # pragma: no cover - best effort
+                    logger.debug("Failed to read config for container %s: %s", vmid_key, exc)
+                description = (cfg.get("description") or "")
+                if MANAGED_MARKER in description:
+                    continue
+                unmanaged.append(_build_unmanaged_container_entry(ct, cfg, vmid_key))
         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
+        return statuses, unmanaged, node_status
 
     now = time.monotonic()
     with _MANAGED_CONTAINERS_CACHE_LOCK:
@@ -465,8 +587,19 @@ def _get_managed_containers_summary(force: bool = False) -> Dict[str, Any]:
         return cached
     config = _load_config()
     records = _load_managed_container_records()
-    _refresh_container_statuses(records, config)
-    summary = _build_managed_containers_summary(records)
+    managed_vmids: Set[str] = {
+        str(_to_int(record.get("vmid"))) for record in records if record.get("vmid") is not None
+    }
+    statuses, unmanaged, node_status = _refresh_container_statuses(records, config, managed_vmids)
+    for record in records:
+        vmid = record.get("vmid")
+        if vmid is None:
+            continue
+        vmid_key = str(_to_int(vmid))
+        status = statuses.get(vmid_key)
+        if status:
+            record["status"] = status
+    summary = _build_managed_containers_summary(records, unmanaged, node_status)
     with _MANAGED_CONTAINERS_CACHE_LOCK:
         _MANAGED_CONTAINERS_CACHE["timestamp"] = now
         _MANAGED_CONTAINERS_CACHE["summary"] = summary
@@ -496,6 +629,16 @@ def _friendly_step_label(step_name: str) -> str:
     return normalized.capitalize()
 
 
+_NETWORK_WAIT_CMD = (
+    "count=0; "
+    "while [ \"$count\" -lt 20 ]; do "
+    "  if command -v ip >/dev/null 2>&1 && ip route get 1.1.1.1 >/dev/null 2>&1; then break; fi; "
+    "  if [ -f /proc/net/route ] && grep -q '^00000000' /proc/net/route >/dev/null 2>&1; then break; fi; "
+    "  sleep 1; "
+    "  count=$((count+1)); "
+    "done"
+)
+
 _PACKAGE_MANAGER_PROFILES: Dict[str, Dict[str, Any]] = {
     "apt": {
         "update_cmd": "apt-get update -y",
@@ -524,7 +667,7 @@ _PACKAGE_MANAGER_PROFILES: Dict[str, Dict[str, Any]] = {
     "apk": {
         "update_cmd": "apk update",
         "update_step_name": "apk_update",
-        "install_cmd": "apk add --no-cache python3 py3-pip sudo",
+        "install_cmd": "apk add --no-cache python3 py3-pip sudo shadow",
         "install_step_name": "install_deps",
         "update_retries": 3,
         "install_retries": 5,
@@ -570,7 +713,9 @@ def _build_bootstrap_steps(
     package_manager: str = "apt",
 ) -> List[Dict[str, Any]]:
     profile = _PACKAGE_MANAGER_PROFILES.get(package_manager, _PACKAGE_MANAGER_PROFILES["apt"])
-    steps: List[Dict[str, Any]] = []
+    steps: List[Dict[str, Any]] = [
+        {"name": "wait_for_network", "cmd": _NETWORK_WAIT_CMD, "retries": 0},
+    ]
     update_cmd = profile.get("update_cmd")
     if update_cmd:
         steps.append(
@@ -595,8 +740,48 @@ def _build_bootstrap_steps(
         )
     steps.extend(
         [
-            {"name": "user_exists", "cmd": f"id -u {user} >/dev/null 2>&1 || adduser --disabled-password --gecos '' {user}", "retries": 0},
-            {"name": "add_sudo", "cmd": f"usermod -aG sudo {user}", "retries": 0},
+            {
+                "name": "user_exists",
+                "cmd": (
+                    f"id -u {user} >/dev/null 2>&1 || "
+                    f"(if command -v adduser >/dev/null 2>&1 && adduser --disabled-password --help >/dev/null 2>&1; then "
+                    f"    adduser --disabled-password --gecos '' {user}; "
+                    "else "
+                    f"    useradd -m -s /bin/sh {user}; "
+                    "fi)"
+                ),
+                "retries": 0,
+            },
+            {
+                "name": "add_sudo",
+                "cmd": (
+                    f"if command -v usermod >/dev/null 2>&1; then "
+                    "  if ! getent group sudo >/dev/null 2>&1; then "
+                    "    if command -v groupadd >/dev/null 2>&1; then "
+                    "      groupadd sudo >/dev/null 2>&1 || true; "
+                    "    fi; "
+                    "  fi; "
+                    f"  usermod -aG sudo {user}; "
+                    "else "
+                    "  for grp in wheel sudo; do "
+                    "    if ! getent group \"$grp\" >/dev/null 2>&1 && command -v groupadd >/dev/null 2>&1; then "
+                    "      groupadd \"$grp\" >/dev/null 2>&1 || true; "
+                    "    fi; "
+                    "    addgroup \"$grp\" >/dev/null 2>&1 || true; "
+                    f"    addgroup {user} \"$grp\" >/dev/null 2>&1 || true; "
+                    "  done; "
+                    "fi"
+                ),
+                "retries": 0,
+            },
+        {
+            "name": "add_sudoers",
+            "cmd": (
+                f"printf '%s ALL=(ALL) NOPASSWD:ALL\\n' {shlex.quote(user)} >/etc/sudoers.d/portacode && "
+                "chmod 0440 /etc/sudoers.d/portacode"
+            ),
+            "retries": 0,
+        },
         ]
     )
     if password:
@@ -824,12 +1009,17 @@ def _parse_ctid(message: Dict[str, Any]) -> int:
 
 
 def _ensure_container_managed(
-    proxmox: Any, node: str, vmid: int
+    proxmox: Any, node: str, vmid: int, *, device_id: Optional[str] = None
 ) -> 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.")
+    record_device_id = record.get("device_id")
+    if device_id and str(record_device_id or "") != str(device_id):
+        raise RuntimeError(
+            f"Container {vmid} is managed for device {record_device_id!r}, not {device_id!r}."
+        )
     return record, ct_cfg
 
 
@@ -846,7 +1036,8 @@ def _connect_proxmox(config: Dict[str, Any]) -> Any:
 
 
 def _run_pct(vmid: int, cmd: str, input_text: Optional[str] = None) -> Dict[str, Any]:
-    full = ["pct", "exec", str(vmid), "--", "bash", "-lc", cmd]
+    shell = "/bin/sh"
+    full = ["pct", "exec", str(vmid), "--", shell, "-c", cmd]
     start = time.time()
     proc = subprocess.run(full, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, input=input_text)
     return {
@@ -858,6 +1049,10 @@ def _run_pct(vmid: int, cmd: str, input_text: Optional[str] = None) -> Dict[str,
     }
 
 
+def _su_command(user: str, command: str) -> str:
+    return f"su - {user} -s /bin/sh -c {shlex.quote(command)}"
+
+
 def _run_pct_check(vmid: int, cmd: str) -> Dict[str, Any]:
     res = _run_pct(vmid, cmd)
     if res["returncode"] != 0:
@@ -917,7 +1112,7 @@ def _push_bytes_to_container(
 
 
 def _resolve_portacode_key_dir(vmid: int, user: str) -> str:
-    data_dir_cmd = f"su - {user} -c 'echo -n ${{XDG_DATA_HOME:-$HOME/.local/share}}'"
+    data_dir_cmd = _su_command(user, "echo -n ${XDG_DATA_HOME:-$HOME/.local/share}")
     data_home = _run_pct_check(vmid, data_dir_cmd)["stdout"].strip()
     portacode_dir = f"{data_home}/portacode"
     _run_pct_exec_check(vmid, ["mkdir", "-p", portacode_dir])
@@ -934,18 +1129,19 @@ def _deploy_device_keypair(vmid: int, user: str, private_key: str, public_key: s
 
 
 def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -> Dict[str, Any]:
-    cmd = ["pct", "exec", str(vmid), "--", "bash", "-lc", f"su - {user} -c 'portacode connect'"]
+    su_connect_cmd = _su_command(user, "portacode connect")
+    cmd = ["pct", "exec", str(vmid), "--", "/bin/sh", "-c", su_connect_cmd]
     proc = subprocess.Popen(cmd, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     start = time.time()
 
-    data_dir_cmd = f"su - {user} -c 'echo -n ${{XDG_DATA_HOME:-$HOME/.local/share}}'"
+    data_dir_cmd = _su_command(user, "echo -n ${XDG_DATA_HOME:-$HOME/.local/share}")
     data_dir = _run_pct_check(vmid, data_dir_cmd)["stdout"].strip()
     key_dir = f"{data_dir}/portacode/keys"
     pub_path = f"{key_dir}/id_portacode.pub"
     priv_path = f"{key_dir}/id_portacode"
 
     def file_size(path: str) -> Optional[int]:
-        stat_cmd = f"su - {user} -c 'test -s {path} && stat -c %s {path}'"
+        stat_cmd = _su_command(user, f"test -s {path} && stat -c %s {path}")
         res = _run_pct(vmid, stat_cmd)
         if res["returncode"] != 0:
             return None
@@ -1003,7 +1199,7 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
     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}'")
+        key_res = _run_pct(vmid, _su_command(user, f"cat {pub_path}"))
         if not process_exited:
             proc.terminate()
             try:
@@ -1043,7 +1239,7 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
     except subprocess.TimeoutExpired:
         proc.kill()
 
-    key_res = _run_pct(vmid, f"su - {user} -c 'cat {pub_path}'")
+    key_res = _run_pct(vmid, _su_command(user, f"cat {pub_path}"))
     return {
         "ok": True,
         "public_key": key_res["stdout"].strip(),
@@ -1324,6 +1520,13 @@ def _instantiate_container(proxmox: Any, node: str, payload: Dict[str, Any]) ->
             ssh_public_keys=payload.get("ssh_public_key") or None,
         )
         status, elapsed = _wait_for_task(proxmox, node, upid)
+        exitstatus = (status or {}).get("exitstatus")
+        if exitstatus and exitstatus.upper() != "OK":
+            msg = status.get("status") or "unknown error"
+            details = status.get("error") or status.get("errmsg") or status.get("description") or status
+            raise RuntimeError(
+                f"Container creation task failed ({exitstatus}): {msg} details={details}"
+            )
         return vmid, elapsed
     except ResourceException as exc:
         raise RuntimeError(f"Failed to create container: {exc}") from exc
@@ -1586,7 +1789,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
                 on_behalf_of_device=device_id,
             )
 
-            cmd = f"su - {payload['username']} -c 'sudo -S portacode service install'"
+            cmd = _su_command(payload["username"], "sudo -S portacode service install")
             res = _run_pct(vmid, cmd, input_text=payload["password"] + "\n")
 
             if res["returncode"] != 0:
@@ -1718,7 +1921,7 @@ class StartPortacodeServiceHandler(SyncHandler):
             on_behalf_of_device=on_behalf_of_device,
         )
 
-        cmd = f"su - {user} -c 'sudo -S portacode service install'"
+        cmd = _su_command(user, "sudo -S portacode service install")
         res = _run_pct(vmid, cmd, input_text=password + "\n")
 
         if res["returncode"] != 0:
@@ -1770,10 +1973,13 @@ class StartProxmoxContainerHandler(SyncHandler):
 
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
         vmid = _parse_ctid(message)
+        child_device_id = (message.get("child_device_id") or "").strip()
+        if not child_device_id:
+            raise ValueError("child_device_id is required for start_proxmox_container")
         config = _ensure_infra_configured()
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
-        _ensure_container_managed(proxmox, node, vmid)
+        _ensure_container_managed(proxmox, node, vmid, device_id=child_device_id)
 
         status, elapsed = _start_container(proxmox, node, vmid)
         _update_container_record(vmid, {"status": "running"})
@@ -1800,10 +2006,13 @@ class StopProxmoxContainerHandler(SyncHandler):
 
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
         vmid = _parse_ctid(message)
+        child_device_id = (message.get("child_device_id") or "").strip()
+        if not child_device_id:
+            raise ValueError("child_device_id is required for stop_proxmox_container")
         config = _ensure_infra_configured()
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
-        _ensure_container_managed(proxmox, node, vmid)
+        _ensure_container_managed(proxmox, node, vmid, device_id=child_device_id)
 
         status, elapsed = _stop_container(proxmox, node, vmid)
         final_status = status.get("status") or "stopped"
@@ -1836,10 +2045,13 @@ class RemoveProxmoxContainerHandler(SyncHandler):
 
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
         vmid = _parse_ctid(message)
+        child_device_id = (message.get("child_device_id") or "").strip()
+        if not child_device_id:
+            raise ValueError("child_device_id is required for remove_proxmox_container")
         config = _ensure_infra_configured()
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
-        _ensure_container_managed(proxmox, node, vmid)
+        _ensure_container_managed(proxmox, node, vmid, device_id=child_device_id)
 
         stop_status, stop_elapsed = _stop_container(proxmox, node, vmid)
         delete_status, delete_elapsed = _delete_container(proxmox, node, vmid)

portacode/connection/terminal.py

@@ -685,6 +685,7 @@ class TerminalManager:
                 try:
                     # Initialize project state
                     project_state = await manager.initialize_project_state(session_name, project_folder_path)
+                    await self._restore_tabs_from_session_metadata(manager, project_state, session)
                     
                     # Send initial project state to the client
                     initial_state_payload = {
@@ -710,6 +711,85 @@ class TerminalManager:
                     
         except Exception as exc:
             logger.exception("terminal_manager: Error initializing project states for new sessions: %s", exc)
+
+    async def _restore_tabs_from_session_metadata(self, manager, project_state, session):
+        """Restore open tabs/active tab from client session metadata if available."""
+        if not session or not project_state:
+            return
+
+        descriptors = session.get("open_tabs") or []
+        if not descriptors:
+            return
+
+        session_id = project_state.client_session_id
+        logger.info("terminal_manager: 🧭 Restoring %d tabs from metadata for session %s", len(descriptors), session_id)
+
+        for descriptor in descriptors:
+            parsed = self._parse_tab_descriptor(descriptor)
+            if not parsed:
+                continue
+
+            tab_type = parsed.get("tab_type")
+            file_path = parsed.get("file_path")
+            metadata = parsed.get("metadata", {})
+
+            if tab_type == "file" and file_path:
+                try:
+                    await manager.open_file(session_id, file_path, set_active=False)
+                except Exception as exc:
+                    logger.warning("terminal_manager: Failed to restore file tab %s for session %s: %s", file_path, session_id, exc)
+                continue
+
+            if tab_type == "diff" and file_path:
+                from_ref = metadata.get("from") or metadata.get("from_ref")
+                to_ref = metadata.get("to") or metadata.get("to_ref")
+                if not from_ref or not to_ref:
+                    logger.warning("terminal_manager: Skipping diff tab %s for session %s because from/to references are missing", file_path, session_id)
+                    continue
+                from_hash = metadata.get("from_hash") or metadata.get("fromHash")
+                to_hash = metadata.get("to_hash") or metadata.get("toHash")
+                try:
+                    await manager.open_diff_tab(session_id, file_path, from_ref, to_ref, from_hash=from_hash, to_hash=to_hash)
+                except Exception as exc:
+                    logger.warning("terminal_manager: Failed to restore diff tab %s for session %s: %s", file_path, session_id, exc)
+                continue
+
+            logger.debug("terminal_manager: Unknown tab descriptor ignored for session %s: %s", session_id, descriptor)
+
+        active_index = session.get("active_tab")
+        try:
+            active_index_int = int(active_index) if active_index is not None else None
+        except (TypeError, ValueError):
+            active_index_int = None
+
+        if active_index_int is not None and active_index_int >= 0:
+            current_tabs = list(project_state.open_tabs.values())
+            if 0 <= active_index_int < len(current_tabs):
+                try:
+                    await manager.set_active_tab(session_id, current_tabs[active_index_int].tab_id)
+                except Exception as exc:
+                    logger.warning("terminal_manager: Failed to set active tab for session %s: %s", session_id, exc)
+            else:
+                logger.debug("terminal_manager: Active tab index %s out of range for session %s", active_index_int, session_id)
+
+    def _parse_tab_descriptor(self, descriptor: str) -> Optional[Dict[str, Any]]:
+        """Parse a URL-friendly tab descriptor string."""
+        if not descriptor:
+            return None
+
+        try:
+            parts = descriptor.split("|")
+            tab_type = parts[0] if parts else None
+            file_path = parts[1] if len(parts) > 1 else None
+            metadata = {}
+            for part in parts[2:]:
+                if "=" in part:
+                    key, value = part.split("=", 1)
+                    metadata[key] = value
+            return {"tab_type": tab_type, "file_path": file_path, "metadata": metadata}
+        except Exception as exc:
+            logger.warning("terminal_manager: Failed to parse tab descriptor '%s': %s", descriptor, exc)
+            return None
     
     async def _send_targeted_terminal_list(self, message: Dict[str, Any], target_sessions: List[str]) -> None:
         """Send terminal_list command to specific client sessions.

{portacode-1.4.15.dev15.dist-info → portacode-1.4.16.dev3.dist-info}/METADATA

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

{portacode-1.4.15.dev15.dist-info → portacode-1.4.16.dev3.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=0X-Wp9VmwXeZPPl4KjWDu4REXY5P2jnbevaNhxIBWL0,721
+portacode/_version.py,sha256=HLH9O1BtoKVO_ZLCnGRXJ_xMQe43OyaD07QzQgNnelQ,719
 portacode/cli.py,sha256=mGLKoZ-T2FBF7IA9wUq0zyG0X9__-A1ao7gajjcVRH8,21828
 portacode/data.py,sha256=5-s291bv8J354myaHm1Y7CQZTZyRzMU3TGe5U4hb-FA,1591
 portacode/keypair.py,sha256=0OO4vHDcF1XMxCDqce61xFTlFwlTcmqe5HyGsXFEt7s,5838
@@ -12,9 +12,9 @@ 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=oyLPOVLPlUuN_eRvHPGazB51yi8W8JEF3oOEYxucGTE,45069
+portacode/connection/terminal.py,sha256=n1Uu92JacV5K6d1Qwx94Tw9OB2Tpke5HqsW2NDn76Ls,49032
 portacode/connection/handlers/README.md,sha256=HsLZG1QK1JNm67HsgL6WoDg9nxzKXxwkc5fJPFJdX5g,12169
-portacode/connection/handlers/WEBSOCKET_PROTOCOL.md,sha256=OtObmoVAXlf0uU1HidTWNmyJYBS1Yl6Rpgyh6TOTjUQ,100590
+portacode/connection/handlers/WEBSOCKET_PROTOCOL.md,sha256=U7zkUpwscWf5aqimNIP3uYXvg-t9S0MhyaZ3ygF-ADk,102593
 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
@@ -22,7 +22,7 @@ portacode/connection/handlers/diff_handlers.py,sha256=iYTIRCcpEQ03vIPKZCsMTE5aZb
 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=MIkDCRkc-Tkxm4FdvCBbiGcXKYKp6OUwtLtKHoOPF-I,69295
+portacode/connection/handlers/proxmox_infra.py,sha256=IG8qp607grx4v9jSWL5TawUrIN0VElIR2swjA_rpn9U,78132
 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=fr12QpOr_Z8KYGUU-AYrTQwRPAcrLK85hvj3SEq1Kw8,14757
@@ -35,7 +35,7 @@ portacode/connection/handlers/project_state/__init__.py,sha256=5ucIqk6Iclqg6bKkL
 portacode/connection/handlers/project_state/file_system_watcher.py,sha256=r9_UKxWTbzum0jGqxIafe68Ced2Y3xOp3ZmkpBOfRpw,8573
 portacode/connection/handlers/project_state/git_manager.py,sha256=iGQ7LYIA7uHsZHdj3HEc_LYo7S1Lqv6-AeyyMwknBPo,70027
 portacode/connection/handlers/project_state/handlers.py,sha256=qgOSt26rxAGNxW07AoevTwDPBdxblX4J-dX-EjOKtg4,38232
-portacode/connection/handlers/project_state/manager.py,sha256=pRMZqPOTK9YE3abNxiAbnERIJmRys673HFOEIBiKnm4,67184
+portacode/connection/handlers/project_state/manager.py,sha256=ori_QpeoY1sdpY8WDYIx-kl_gNfZ7o8eq84CcOBlvIs,67915
 portacode/connection/handlers/project_state/models.py,sha256=EZTKvxHKs8QlQUbzI0u2IqfzfRRXZixUIDBwTGCJATI,4313
 portacode/connection/handlers/project_state/utils.py,sha256=LsbQr9TH9Bz30FqikmtTxco4PlB_n0kUIuPKQ6Fb_mo,1665
 portacode/link_capture/__init__.py,sha256=93LjyYDqzOimsIDBhsPibTl7tr-8DiIzyDF7JWQkE2A,1231
@@ -65,7 +65,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.15.dev15.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
+portacode-1.4.16.dev3.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
@@ -91,8 +91,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.15.dev15.dist-info/METADATA,sha256=XJ2f3lsNMucCNlgkAJLKlnu8TYX1_eaSzKWCJnB-2Ik,13052
-portacode-1.4.15.dev15.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-portacode-1.4.15.dev15.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
-portacode-1.4.15.dev15.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
-portacode-1.4.15.dev15.dist-info/RECORD,,
+portacode-1.4.16.dev3.dist-info/METADATA,sha256=ulkuZ2NkbFWXncNI8ZPHvWD2ThvRJ3-rFMYBNuFHpG8,13051
+portacode-1.4.16.dev3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+portacode-1.4.16.dev3.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
+portacode-1.4.16.dev3.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
+portacode-1.4.16.dev3.dist-info/RECORD,,