portacode 1.4.17.dev10__tar.gz → 1.4.18__tar.gz

{portacode-1.4.17.dev10 → portacode-1.4.18}/PKG-INFO

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

{portacode-1.4.17.dev10 → portacode-1.4.18}/portacode/_version.py

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

{portacode-1.4.17.dev10 → portacode-1.4.18}/portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -408,7 +408,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.
+*   `ctid` (string, optional): Identifier of the container to delete. If omitted, the handler resolves the CTID from the managed container records using `child_device_id`.
 *   `child_device_id` (string, required): Dashboard `Device.id` that should own the container metadata being purged.
 
 **Responses:**

{portacode-1.4.17.dev10 → portacode-1.4.18}/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:
@@ -216,4 +218,4 @@ 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) 

{portacode-1.4.17.dev10 → portacode-1.4.18}/portacode/connection/handlers/proxmox_infra.py

@@ -116,6 +116,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(
@@ -1071,7 +1072,7 @@ _PACKAGE_MANAGER_PROFILES: Dict[str, Dict[str, Any]] = {
     "zypper": {
         "update_cmd": "zypper refresh",
         "update_step_name": "zypper_update",
-        "install_cmd": "zypper install -y python3 python3-pip sudo",
+        "install_cmd": "zypper install -y python311 python311-pip sudo",
         "install_step_name": "install_deps",
         "update_retries": 3,
         "install_retries": 5,
@@ -1101,6 +1102,7 @@ def _build_bootstrap_steps(
     package_manager: str = "apt",
 ) -> List[Dict[str, Any]]:
     profile = _PACKAGE_MANAGER_PROFILES.get(package_manager, _PACKAGE_MANAGER_PROFILES["apt"])
+    python_cmd = "python3.11" if package_manager == "zypper" else "python3"
     steps: List[Dict[str, Any]] = [
         {"name": "wait_for_network", "cmd": _NETWORK_WAIT_CMD, "retries": 0},
     ]
@@ -1178,14 +1180,19 @@ 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,
             }
         )
     steps.extend(
         [
-            {"name": "pip_upgrade", "cmd": "python3 -m pip install --upgrade pip", "retries": 0},
-            {"name": "install_portacode", "cmd": "python3 -m pip install --upgrade portacode", "retries": 0},
+            {"name": "pip_upgrade", "cmd": f"{python_cmd} -m pip install --upgrade pip", "retries": 0},
+            {"name": "install_portacode", "cmd": f"{python_cmd} -m pip install --upgrade portacode", "retries": 0},
+            {
+                "name": "ensure_portacode_path",
+                "cmd": "if [ ! -f /etc/profile.d/portacode_path.sh ]; then printf 'export PATH=/usr/local/bin:$PATH\\n' >/etc/profile.d/portacode_path.sh; fi",
+                "retries": 0,
+            },
         ]
     )
     if include_portacode_connect:
@@ -1393,6 +1400,25 @@ def _parse_ctid(message: Dict[str, Any]) -> int:
     raise ValueError("ctid is required")
 
 
+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 ValueError("ctid is required for remove_proxmox_container")
+
+
 def _ensure_container_managed(
     proxmox: Any, node: str, vmid: int, *, device_id: Optional[str] = None
 ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
@@ -1438,6 +1464,23 @@ 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"))
+    path = (res.get("stdout") or "").strip()
+    if path:
+        return path
+    return "portacode"
+
+
 def _run_pct_check(vmid: int, cmd: str) -> Dict[str, Any]:
     res = _run_pct(vmid, cmd)
     if res["returncode"] != 0:
@@ -1465,12 +1508,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)
@@ -1482,7 +1526,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:
@@ -1501,7 +1545,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"
 
 
@@ -1514,7 +1559,8 @@ 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]:
-    su_connect_cmd = _su_command(user, "portacode connect")
+    cli_path = _resolve_portacode_cli_path(vmid, user)
+    su_connect_cmd = _su_command(user, f"{shlex.quote(cli_path)} 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()
@@ -2240,7 +2286,11 @@ class CreateProxmoxContainerHandler(SyncHandler):
                         on_behalf_of_device=device_id,
                     )
 
-                    cmd = _su_command(payload_local["username"], "sudo -S portacode service install")
+                    cli_path = _resolve_portacode_cli_path(vmid, payload_local["username"])
+                    cmd = _su_command(
+                        payload_local["username"],
+                        f"sudo -S {shlex.quote(cli_path)} service install",
+                    )
                     res = _run_pct(vmid, cmd, input_text=payload_local["password"] + "\n")
 
                     if res["returncode"] != 0:
@@ -2301,6 +2351,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,
                     },
@@ -2327,7 +2378,6 @@ class CreateProxmoxContainerHandler(SyncHandler):
             "event": "proxmox_container_accepted",
             "success": True,
             "message": "Provisioning accepted; resources reserved.",
-            "device_id": device_id,
             "request_id": request_id,
         }
 
@@ -2403,7 +2453,8 @@ class StartPortacodeServiceHandler(SyncHandler):
             on_behalf_of_device=on_behalf_of_device,
         )
 
-        cmd = _su_command(user, "sudo -S portacode service install")
+        cli_path = _resolve_portacode_cli_path(vmid, user)
+        cmd = _su_command(user, f"sudo -S {shlex.quote(cli_path)} service install")
         res = _run_pct(vmid, cmd, input_text=password + "\n")
 
         if res["returncode"] != 0:
@@ -2526,10 +2577,13 @@ 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")
+        try:
+            vmid = _parse_ctid(message)
+        except ValueError:
+            vmid = _resolve_vmid_for_device(child_device_id)
         config = _ensure_infra_configured()
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)

{portacode-1.4.17.dev10 → portacode-1.4.18}/portacode.egg-info/PKG-INFO

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