portacode 1.4.18.dev0__tar.gz → 1.4.19__tar.gz

{portacode-1.4.18.dev0 → portacode-1.4.19}/PKG-INFO

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

{portacode-1.4.18.dev0 → portacode-1.4.19}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.18.dev0'
-__version_tuple__ = version_tuple = (1, 4, 18, 'dev0')
+__version__ = version = '1.4.19'
+__version_tuple__ = version_tuple = (1, 4, 19)
 
 __commit_id__ = commit_id = None

{portacode-1.4.18.dev0 → portacode-1.4.19}/portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -380,7 +380,7 @@ Starts a previously provisioned, Portacode-managed LXC container. Handled by [`S
 
 **Payload Fields:**
 
-*   `ctid` (string, required): Identifier of the container to start.
+*   `ctid` (string, optional): Identifier of the container to start. If omitted, the handler resolves the CTID from the managed container records using `child_device_id`.
 *   `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,7 +394,7 @@ Stops a running Portacode-managed container. Handled by [`StopProxmoxContainerHa
 
 **Payload Fields:**
 
-*   `ctid` (string, required): Identifier of the container to stop.
+*   `ctid` (string, optional): Identifier of the container to stop. If omitted, the handler resolves the CTID from managed container records and, if needed, by scanning managed container descriptions for the matching `device_id` marker.
 *   `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:**
@@ -408,12 +408,13 @@ Deletes a managed container from Proxmox (stopping it first if necessary) and re
 
 **Payload Fields:**
 
-*   `ctid` (string, required): Identifier of the container to delete.
+*   `ctid` (string, optional): Identifier of the container to delete. If omitted, the handler resolves the CTID from managed container records and, if needed, by scanning managed container descriptions for the matching `device_id` marker.
 *   `child_device_id` (string, required): Dashboard `Device.id` that should own the container metadata being purged.
 
 **Responses:**
 
 *   Emits a [`proxmox_container_action`](#proxmox_container_action-event) event with `action="remove"` and the refreshed infra snapshot after deletion.
+*   If no managed container matches the requested `child_device_id`, emits a `proxmox_container_action` event with `success=false`, `status="not_found"`, and a human-readable message (no error event).
 *   Emits an [`error`](#error) event on failure.
 
 ### `proxmox_container_created`

{portacode-1.4.18.dev0 → portacode-1.4.19}/portacode/connection/handlers/base.py

@@ -62,16 +62,18 @@ class BaseHandler(ABC):
         # Get client session manager from context
         client_session_manager = self.context.get("client_session_manager")
 
+        bypass_session_gate = bool(payload.get("bypass_session_gate"))
         if client_session_manager and client_session_manager.has_interested_clients():
             # Get target sessions
             target_sessions = client_session_manager.get_target_sessions(project_id)
-            if not target_sessions:
+            if not target_sessions and not bypass_session_gate:
                 logger.debug("handler: No target sessions found, skipping response send")
                 return
 
             # Add session targeting information
             enhanced_payload = dict(payload)
-            enhanced_payload["client_sessions"] = target_sessions
+            if target_sessions:
+                enhanced_payload["client_sessions"] = target_sessions
 
             # Add backward compatibility reply_channel (first session if not provided)
             if not reply_channel:
@@ -89,15 +91,24 @@ class BaseHandler(ABC):
                 payload["reply_channel"] = reply_channel
             await self.control_channel.send(payload)
     
-    async def send_error(self, message: str, reply_channel: Optional[str] = None, project_id: str = None) -> None:
+    async def send_error(
+        self,
+        message: str,
+        reply_channel: Optional[str] = None,
+        project_id: str = None,
+        request_id: Optional[str] = None,
+    ) -> None:
         """Send an error response with client session awareness.
         
         Args:
             message: Error message
             reply_channel: Optional reply channel for backward compatibility
             project_id: Optional project filter for targeting specific sessions
+            request_id: Optional request_id to correlate error with a request
         """
         payload = {"event": "error", "message": message}
+        if request_id:
+            payload["request_id"] = request_id
         await self.send_response(payload, reply_channel, project_id)
 
 
@@ -163,7 +174,12 @@ class AsyncHandler(BaseHandler):
             logger.exception("handler: Error in async handler %s: %s", self.command_name, exc)
             # Extract project_id from original message for error targeting
             project_id = message.get("project_id")
-            await self.send_error(str(exc), reply_channel, project_id)
+            await self.send_error(
+                str(exc),
+                reply_channel,
+                project_id,
+                request_id=message.get("request_id"),
+            )
 
 
 class SyncHandler(BaseHandler):
@@ -216,4 +232,9 @@ class SyncHandler(BaseHandler):
             logger.exception("Error in sync handler %s: %s", self.command_name, exc)
             # Extract project_id from original message for error targeting
             project_id = message.get("project_id")
-            await self.send_error(str(exc), reply_channel, project_id) 
+            await self.send_error(
+                str(exc),
+                reply_channel,
+                project_id,
+                request_id=message.get("request_id"),
+            )

{portacode-1.4.18.dev0 → portacode-1.4.19}/portacode/connection/handlers/proxmox_infra.py

@@ -17,6 +17,7 @@ import sys
 import tempfile
 import time
 import threading
+import random
 from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple
@@ -33,6 +34,44 @@ REPO_ROOT = Path(__file__).resolve().parents[3]
 NET_SETUP_SCRIPT = REPO_ROOT / "proxmox_management" / "net_setup.py"
 CONTAINERS_DIR = CONFIG_DIR / "containers"
 MANAGED_MARKER = "portacode-managed:true"
+DEVICE_ID_MARKER = "device_id="
+PROVISIONING_ID_MARKER = "provisioning_id="
+
+
+def _sanitize_description_value(value: Any) -> str:
+    return str(value).strip().replace(";", "_")
+
+
+def _build_managed_description(
+    base: Optional[str],
+    *,
+    device_id: Optional[str] = None,
+    provisioning_id: Optional[str] = None,
+) -> str:
+    parts = [part for part in (base or "").split(";") if part]
+    if MANAGED_MARKER not in parts:
+        parts.insert(0, MANAGED_MARKER)
+    if device_id:
+        device_id_value = _sanitize_description_value(device_id)
+        if not any(part.startswith(DEVICE_ID_MARKER) for part in parts):
+            parts.append(f"{DEVICE_ID_MARKER}{device_id_value}")
+    if provisioning_id:
+        provisioning_value = _sanitize_description_value(provisioning_id)
+        if not any(part.startswith(PROVISIONING_ID_MARKER) for part in parts):
+            parts.append(f"{PROVISIONING_ID_MARKER}{provisioning_value}")
+    return ";".join(parts)
+
+
+def _extract_marker_value(description: str, prefix: str) -> Optional[str]:
+    for part in description.split(";"):
+        part = part.strip()
+        if part.startswith(prefix):
+            return part[len(prefix) :].strip()
+    return None
+
+
+def _parse_device_id_from_description(description: str) -> Optional[str]:
+    return _extract_marker_value(description, DEVICE_ID_MARKER)
 
 DEFAULT_HOST = "localhost"
 DEFAULT_NODE_NAME = os.uname().nodename.split(".", 1)[0]
@@ -116,6 +155,7 @@ def _emit_progress_event(
         payload["details"] = details
     if on_behalf_of_device:
         payload["on_behalf_of_device"] = str(on_behalf_of_device)
+        payload["bypass_session_gate"] = True
 
     future = asyncio.run_coroutine_threadsafe(handler.send_response(payload), loop)
     future.add_done_callback(
@@ -1179,7 +1219,7 @@ def _build_bootstrap_steps(
         steps.append(
             {
                 "name": "add_ssh_key",
-                "cmd": f"install -d -m 700 /home/{user}/.ssh && echo '{ssh_key}' >> /home/{user}/.ssh/authorized_keys && chown -R {user}:{user} /home/{user}/.ssh",
+                "cmd": f"install -d -m 700 /home/{user}/.ssh && echo '{ssh_key}' >> /home/{user}/.ssh/authorized_keys && chown -R {user}:$(id -gn {shlex.quote(user)}) /home/{user}/.ssh",
                 "retries": 0,
             }
         )
@@ -1256,12 +1296,21 @@ def _validate_positive_number(value: Any, default: float) -> float:
 
 
 def _wait_for_task(proxmox: Any, node: str, upid: str) -> Tuple[Dict[str, Any], float]:
+    from proxmoxer.core import ResourceException
     start = time.time()
+    poll = 2.0 
     while True:
-        status = proxmox.nodes(node).tasks(upid).status.get()
+        try:
+            status = proxmox.nodes(node).tasks(upid).status.get()
+        except ResourceException as e:
+            if str(e).startswith("599 "):
+                # transient proxy glitch; task may still be running
+                time.sleep(poll + random.random() * 0.5)  # small jitter
+                continue
+            raise
         if status.get("status") == "stopped":
             return status, time.time() - start
-        time.sleep(1)
+        time.sleep(poll)
 
 
 def _list_running_managed(proxmox: Any, node: str) -> List[Tuple[str, Dict[str, Any]]]:
@@ -1399,18 +1448,97 @@ def _parse_ctid(message: Dict[str, Any]) -> int:
     raise ValueError("ctid is required")
 
 
+class _DeviceLookupError(ValueError):
+    pass
+
+
+def _resolve_vmid_for_device(device_id: str) -> int:
+    _initialize_managed_containers_state()
+    records = list(_MANAGED_CONTAINERS_STATE.get("records", {}).values())
+    for record in records:
+        record_device_id = record.get("device_id")
+        if record_device_id is None:
+            continue
+        if str(record_device_id) != str(device_id):
+            continue
+        vmid = record.get("vmid")
+        if vmid is None:
+            continue
+        try:
+            return int(str(vmid).strip())
+        except ValueError:
+            raise ValueError("ctid must be an integer") from None
+    raise _DeviceLookupError(
+        f"No managed container record found for device_id {device_id!r}."
+    )
+
+
+def _resolve_vmid_for_device_in_proxmox(
+    proxmox: Any, node: str, device_id: str
+) -> int:
+    device_id_value = str(device_id).strip()
+    matches: List[int] = []
+    try:
+        containers = proxmox.nodes(node).lxc.get()
+    except Exception as exc:  # pragma: no cover - proxmox failure
+        raise _DeviceLookupError(
+            f"Unable to query Proxmox containers for device_id {device_id_value!r}: {exc}"
+        ) from exc
+    for entry in containers or []:
+        vmid = entry.get("vmid")
+        if vmid is None:
+            continue
+        try:
+            cfg = proxmox.nodes(node).lxc(str(vmid)).config.get()
+        except Exception:
+            continue
+        description = (cfg or {}).get("description") or ""
+        if MANAGED_MARKER not in description:
+            continue
+        desc_device_id = _parse_device_id_from_description(description)
+        if desc_device_id is None:
+            continue
+        if str(desc_device_id) != device_id_value:
+            continue
+        matches.append(int(str(vmid).strip()))
+    if not matches:
+        raise _DeviceLookupError(
+            f"No managed container found for device_id {device_id_value!r}. It may already be deleted."
+        )
+    if len(matches) > 1:
+        raise _DeviceLookupError(
+            f"Multiple managed containers found for device_id {device_id_value!r}: {matches}."
+        )
+    return matches[0]
+
+
 def _ensure_container_managed(
     proxmox: Any, node: str, vmid: int, *, device_id: Optional[str] = None
 ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
-    record = _read_container_record(vmid)
+    try:
+        record = _read_container_record(vmid)
+    except FileNotFoundError:
+        record = {}
     ct_cfg = proxmox.nodes(node).lxc(str(vmid)).config.get()
-    if not ct_cfg or MANAGED_MARKER not in (ct_cfg.get("description") or ""):
+    description = (ct_cfg or {}).get("description") or ""
+    if not ct_cfg or MANAGED_MARKER not in description:
         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}."
-        )
+    description_device_id = _parse_device_id_from_description(description)
+    if device_id:
+        device_id_value = str(device_id)
+        if description_device_id and str(description_device_id) != device_id_value:
+            raise RuntimeError(
+                f"Container {vmid} is managed for device {description_device_id!r}, not {device_id_value!r}."
+            )
+        if record_device_id and str(record_device_id) != device_id_value:
+            raise RuntimeError(
+                f"Container {vmid} is managed for device {record_device_id!r}, not {device_id_value!r}."
+            )
+        if not description_device_id and not record_device_id:
+            raise RuntimeError(
+                f"Container {vmid} is missing a device_id marker; refusing to operate without ctid."
+            )
     return record, ct_cfg
 
 
@@ -1444,6 +1572,14 @@ def _su_command(user: str, command: str) -> str:
     return f"su - {user} -s /bin/sh -c {shlex.quote(command)}"
 
 
+def _resolve_user_group(vmid: int, user: str) -> str:
+    res = _run_pct(vmid, f"id -gn {shlex.quote(user)}")
+    group = (res.get("stdout") or "").strip()
+    if group:
+        return f"{user}:{group}"
+    return f"{user}:{user}"
+
+
 def _resolve_portacode_cli_path(vmid: int, user: str) -> str:
     """Resolve the full path to the portacode CLI inside the container."""
     res = _run_pct(vmid, _su_command(user, "command -v portacode"))
@@ -1480,12 +1616,13 @@ def _push_bytes_to_container(
 ) -> None:
     logger.debug("Preparing to push %d bytes to container vmid=%s path=%s for user=%s", len(data), vmid, path, user)
     tmp_path: Optional[str] = None
+    owner = _resolve_user_group(vmid, user)
     try:
         parent = Path(path).parent
         parent_str = parent.as_posix()
         if parent_str not in {"", ".", "/"}:
             _run_pct_exec_check(vmid, ["mkdir", "-p", parent_str])
-            _run_pct_exec_check(vmid, ["chown", "-R", f"{user}:{user}", parent_str])
+            _run_pct_exec_check(vmid, ["chown", "-R", owner, parent_str])
 
         with tempfile.NamedTemporaryFile(delete=False) as tmp:
             tmp.write(data)
@@ -1497,7 +1634,7 @@ def _push_bytes_to_container(
         if push_res.returncode != 0:
             raise RuntimeError(push_res.stderr or push_res.stdout or f"pct push returned {push_res.returncode}")
 
-        _run_pct_exec_check(vmid, ["chown", f"{user}:{user}", path])
+        _run_pct_exec_check(vmid, ["chown", owner, path])
         _run_pct_exec_check(vmid, ["chmod", format(mode, "o"), path])
         logger.debug("Successfully pushed %d bytes to vmid=%s path=%s", len(data), vmid, path)
     except Exception as exc:
@@ -1516,7 +1653,8 @@ def _resolve_portacode_key_dir(vmid: int, user: str) -> str:
     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])
-    _run_pct_exec_check(vmid, ["chown", "-R", f"{user}:{user}", portacode_dir])
+    owner = _resolve_user_group(vmid, user)
+    _run_pct_exec_check(vmid, ["chown", "-R", owner, portacode_dir])
     return f"{portacode_dir}/keys"
 
 
@@ -2085,7 +2223,11 @@ class CreateProxmoxContainerHandler(SyncHandler):
             payload, device_id=device_id, request_id=request_id
         )
         provisioning_id = secrets.token_hex(6)
-        payload["description"] = f"{payload.get('description', MANAGED_MARKER)};provisioning_id={provisioning_id}"
+        payload["description"] = _build_managed_description(
+            payload.get("description"),
+            device_id=device_id,
+            provisioning_id=provisioning_id,
+        )
 
         def _provision_background() -> None:
             nonlocal current_step_index
@@ -2321,6 +2463,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
                         "setup_steps": steps,
                         "device_id": device_id,
                         "on_behalf_of_device": device_id,
+                        "bypass_session_gate": True,
                         "service_installed": service_installed,
                         "request_id": request_id,
                     },
@@ -2347,7 +2490,6 @@ class CreateProxmoxContainerHandler(SyncHandler):
             "event": "proxmox_container_accepted",
             "success": True,
             "message": "Provisioning accepted; resources reserved.",
-            "device_id": device_id,
             "request_id": request_id,
         }
 
@@ -2475,13 +2617,19 @@ class StartProxmoxContainerHandler(SyncHandler):
         return "start_proxmox_container"
 
     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)
+        try:
+            vmid = _parse_ctid(message)
+        except ValueError:
+            try:
+                vmid = _resolve_vmid_for_device(child_device_id)
+            except _DeviceLookupError:
+                vmid = _resolve_vmid_for_device_in_proxmox(proxmox, node, child_device_id)
         _ensure_container_managed(proxmox, node, vmid, device_id=child_device_id)
 
         status, elapsed = _start_container(proxmox, node, vmid)
@@ -2508,13 +2656,19 @@ class StopProxmoxContainerHandler(SyncHandler):
         return "stop_proxmox_container"
 
     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)
+        try:
+            vmid = _parse_ctid(message)
+        except ValueError:
+            try:
+                vmid = _resolve_vmid_for_device(child_device_id)
+            except _DeviceLookupError:
+                vmid = _resolve_vmid_for_device_in_proxmox(proxmox, node, child_device_id)
         _ensure_container_managed(proxmox, node, vmid, device_id=child_device_id)
 
         status, elapsed = _stop_container(proxmox, node, vmid)
@@ -2547,13 +2701,33 @@ class RemoveProxmoxContainerHandler(SyncHandler):
         return "remove_proxmox_container"
 
     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")
+        request_id = message.get("request_id")
         config = _ensure_infra_configured()
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
+        try:
+            vmid = _parse_ctid(message)
+        except ValueError:
+            try:
+                vmid = _resolve_vmid_for_device(child_device_id)
+            except _DeviceLookupError:
+                try:
+                    vmid = _resolve_vmid_for_device_in_proxmox(proxmox, node, child_device_id)
+                except _DeviceLookupError as exc:
+                    infra = get_infra_snapshot()
+                    return {
+                        "event": "proxmox_container_action",
+                        "action": "remove",
+                        "success": False,
+                        "message": str(exc),
+                        "status": "not_found",
+                        "child_device_id": child_device_id,
+                        "request_id": request_id,
+                        "infra": infra,
+                    }
         _ensure_container_managed(proxmox, node, vmid, device_id=child_device_id)
 
         stop_status, stop_elapsed = _stop_container(proxmox, node, vmid)
@@ -2572,6 +2746,8 @@ class RemoveProxmoxContainerHandler(SyncHandler):
                 "delete_exitstatus": delete_status.get("exitstatus"),
             },
             "status": "deleted",
+            "child_device_id": child_device_id,
+            "request_id": request_id,
             "infra": infra,
         }
 

{portacode-1.4.18.dev0 → portacode-1.4.19}/portacode/connection/handlers/registry.py

@@ -106,12 +106,25 @@ class CommandRegistry:
         except Exception as exc:
             logger.exception("registry: Error dispatching command %s: %s", command_name, exc)
             # Send session-aware error response
-            await self._send_session_aware_error(str(exc), reply_channel, message.get("project_id"))
+            await self._send_session_aware_error(
+                str(exc),
+                reply_channel,
+                message.get("project_id"),
+                request_id=message.get("request_id"),
+            )
             return False
     
-    async def _send_session_aware_error(self, message: str, reply_channel: Optional[str] = None, project_id: str = None) -> None:
+    async def _send_session_aware_error(
+        self,
+        message: str,
+        reply_channel: Optional[str] = None,
+        project_id: str = None,
+        request_id: Optional[str] = None,
+    ) -> None:
         """Send an error response with client session awareness."""
         error_payload = {"event": "error", "message": message}
+        if request_id:
+            error_payload["request_id"] = request_id
         
         # Get client session manager from context
         client_session_manager = self.context.get("client_session_manager")
@@ -151,4 +164,4 @@ class CommandRegistry:
         
         # Update context for all existing handlers
         for handler in self._handlers.values():
-            handler.context = self.context 
+            handler.context = self.context 

{portacode-1.4.18.dev0 → portacode-1.4.19}/portacode.egg-info/PKG-INFO

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