portacode 1.4.13.dev1__py3-none-any.whl → 1.4.13.dev2__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.13.dev1'
-__version_tuple__ = version_tuple = (1, 4, 13, 'dev1')
+__version__ = version = '1.4.13.dev2'
+__version_tuple__ = version_tuple = (1, 4, 13, 'dev2')
 
 __commit_id__ = commit_id = None

portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -27,8 +27,6 @@ The Portacode server acts as a **routing middleman** between client sessions and
 
 - **`source_client_session`** (Server → Device): Server **adds this** when forwarding client commands to devices (so device knows which client sent the command and can target responses back). Clients never include this field.
 
-Device handlers that want to respond only to the session that issued a given command can rely on the helper defined in `portacode/connection/handlers/base.py` (`BaseHandler.send_response_to_source_session`). It wraps the boilerplate of reusing `request_id`/`trace`, injecting `client_sessions=[source_client_session]`, and sending via the control channel so the handler does not need to manually reconstruct routing metadata for each reply.
-
 This document describes the complete protocol for communicating with devices through the server, guiding app developers on how to get their client sessions to communicate with devices.
 
 ## Table of Contents
@@ -363,6 +361,9 @@ Creates a Portacode-managed LXC container, starts it, and bootstraps the Portaco
 *   `username` (string, optional): OS user to provision (defaults to `svcuser`).
 *   `password` (string, optional): Password for the user (used only during provisioning).
 *   `ssh_key` (string, optional): SSH public key to add to the user.
+*   `device_id` (string, optional): ID of the Device record that already exists on the dashboard.
+*   `device_public_key` (string, optional): PEM-encoded Portacode public key. When supplied together with `device_private_key` the handler injects the keypair, records the device metadata, and runs `portacode service install` automatically.
+*   `device_private_key` (string, optional): PEM-encoded private key that pairs with `device_public_key`. Both key fields must be present for the automatic service-install mode.
 
 **Responses:**
 
@@ -420,6 +421,8 @@ Emitted after a successful `create_proxmox_container` action. Contains the new c
 *   `public_key` (string): Portacode public auth key created inside the new container.
 *   `container` (object): Metadata such as `vmid`, `hostname`, `template`, `storage`, `disk_gib`, `ram_mib`, and `cpus`.
 *   `setup_steps` (array[object]): Detailed bootstrap step results (name, stdout/stderr, elapsed time, and status).
+*   `device_id` (string, optional): Mirrors the `device_id` supplied with `create_proxmox_container`, if any.
+*   `service_installed` (boolean): True when the handler already ran `portacode service install` (with a provided keypair); otherwise it remains False and the dashboard can call `start_portacode_service`.
 
 ### `proxmox_container_progress`
 
@@ -452,6 +455,7 @@ Runs `sudo portacode service install` inside the container after the dashboard h
 *   Emits additional [`proxmox_container_progress`](#proxmox_container_progress-event) events to report the authentication and service-install steps.
 *   On success, emits a [`proxmox_service_started`](#proxmox_service_started-event).
 *   On failure, emits a generic [`error`](#error) event.
+*   When `create_proxmox_container` already provided a dashboard-generated keypair, the handler may have installed the service already, so this call is optional unless you need to re-run the install.
 
 ### `proxmox_service_started`
 

portacode/connection/handlers/base.py

@@ -88,42 +88,6 @@ class BaseHandler(ABC):
             if reply_channel:
                 payload["reply_channel"] = reply_channel
             await self.control_channel.send(payload)
-
-    async def send_response_to_source_session(
-        self,
-        message: Dict[str, Any],
-        payload: Dict[str, Any],
-        reply_channel: Optional[str] = None,
-    ) -> None:
-        """Send a response directly to the client session that issued ``message``.
-
-        This bypasses ``ClientSessionManager`` routing and ensures only the session
-        whose ``source_client_session`` was injected by the server will receive the
-        response. The helper also copies ``request_id``/``trace`` timing data so tracing
-        and logging remain consistent.
-        """
-        response = dict(payload)
-        request_id = message.get("request_id")
-        if request_id and "request_id" not in response:
-            response["request_id"] = request_id
-
-        if "trace" in message and "request_id" in message and "trace" not in response:
-            trace_data = dict(message["trace"])
-            handler_complete_time = ntp_clock.now_ms()
-            if handler_complete_time is not None:
-                trace_data["handler_complete"] = handler_complete_time
-                if "client_send" in trace_data:
-                    trace_data["ping"] = handler_complete_time - trace_data["client_send"]
-            response["trace"] = trace_data
-
-        source_client_session = message.get("source_client_session")
-        if source_client_session:
-            response["client_sessions"] = [source_client_session]
-
-        if reply_channel:
-            response["reply_channel"] = reply_channel
-
-        await self.control_channel.send(response)
     
     async def send_error(self, message: str, reply_channel: Optional[str] = None, project_id: str = None) -> None:
         """Send an error response with client session awareness.
@@ -177,16 +141,22 @@ class AsyncHandler(BaseHandler):
                 if "request_id" in message and "request_id" not in response:
                     response["request_id"] = message["request_id"]
 
-                if "trace" in message and "request_id" in message and "trace" not in response:
-                    trace_data = dict(message["trace"])
+                # Pass through trace from request to response (add to existing trace, don't create new one)
+                if "trace" in message and "request_id" in message:
+                    response["trace"] = dict(message["trace"])
                     handler_complete_time = ntp_clock.now_ms()
                     if handler_complete_time is not None:
-                        trace_data["handler_complete"] = handler_complete_time
-                        if "client_send" in trace_data:
-                            trace_data["ping"] = handler_complete_time - trace_data["client_send"]
-                    response["trace"] = trace_data
-                    logger.info(f"✅ Handler completed: {message['request_id']} ({self.command_name})")
-
+                        response["trace"]["handler_complete"] = handler_complete_time
+                        # Update ping to show total time from client_send
+                        if "client_send" in response["trace"]:
+                            response["trace"]["ping"] = handler_complete_time - response["trace"]["client_send"]
+                        logger.info(f"✅ Handler completed: {message['request_id']} ({self.command_name})")
+
+                # Extract project_id from response for session targeting
+                project_id = response.get("project_id")
+                logger.info("handler: %s response project_id=%s, response=%s",
+                           self.command_name, project_id, response)
+                await self.send_response(response, reply_channel, project_id)
             else:
                 logger.info("handler: %s handled response transmission directly", self.command_name)
         except Exception as exc:
@@ -246,4 +216,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/connection/handlers/proxmox_infra.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+import base64
 import json
 import logging
 import os
@@ -11,7 +12,6 @@ import shutil
 import stat
 import subprocess
 import sys
-import time
 import threading
 from datetime import datetime
 from pathlib import Path
@@ -59,7 +59,6 @@ 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")
@@ -85,8 +84,6 @@ 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(
@@ -431,7 +428,12 @@ def _friendly_step_label(step_name: str) -> str:
     return normalized.capitalize()
 
 
-def _build_bootstrap_steps(user: str, password: str, ssh_key: str) -> List[Dict[str, Any]]:
+def _build_bootstrap_steps(
+    user: str,
+    password: str,
+    ssh_key: str,
+    include_portacode_connect: bool = True,
+) -> List[Dict[str, Any]]:
     steps = [
         {
             "name": "apt_update",
@@ -468,11 +470,14 @@ def _build_bootstrap_steps(user: str, password: str, ssh_key: str) -> List[Dict[
             "cmd": f"install -d -m 700 /home/{user}/.ssh && echo '{ssh_key}' >> /home/{user}/.ssh/authorized_keys && chown -R {user}:{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": "portacode_connect", "type": "portacode_connect", "timeout_s": 30},
-    ])
+    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},
+        ]
+    )
+    if include_portacode_connect:
+        steps.append({"name": "portacode_connect", "type": "portacode_connect", "timeout_s": 30})
     return steps
 
 
@@ -682,6 +687,36 @@ def _run_pct_check(vmid: int, cmd: str) -> Dict[str, Any]:
     return res
 
 
+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_home = _run_pct_check(vmid, data_dir_cmd)["stdout"].strip()
+    return f"{data_home}/portacode/keys"
+
+
+def _write_bytes_as_user(vmid: int, user: str, path: str, data: bytes, mode: int = 0o600) -> None:
+    encoded = base64.b64encode(data).decode()
+    path_literal = json.dumps(path)
+    script = (
+        f"su - {user} -c 'python3 - <<\"PY\"\n"
+        "import base64\n"
+        "from pathlib import Path\n"
+        f"path = Path({path_literal})\n"
+        "path.parent.mkdir(parents=True, exist_ok=True)\n"
+        f"path.write_bytes(base64.b64decode(\"{encoded}\"))\n"
+        f"path.chmod({mode})\n"
+        "PY'"
+    )
+    _run_pct_check(vmid, script)
+
+
+def _deploy_device_keypair(vmid: int, user: str, private_key: str, public_key: str) -> None:
+    key_dir = _resolve_portacode_key_dir(vmid, user)
+    priv_path = f"{key_dir}/id_portacode"
+    pub_path = f"{key_dir}/id_portacode.pub"
+    _write_bytes_as_user(vmid, user, priv_path, private_key.encode(), mode=0o600)
+    _write_bytes_as_user(vmid, user, pub_path, public_key.encode(), mode=0o644)
+
+
 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'"]
     proc = subprocess.Popen(cmd, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -883,6 +918,7 @@ def _bootstrap_portacode(
     progress_callback: Optional[ProgressCallback] = None,
     start_index: int = 1,
     total_steps: Optional[int] = None,
+    default_public_key: Optional[str] = None,
 ) -> Tuple[str, List[Dict[str, Any]]]:
     actual_steps = steps if steps is not None else _build_bootstrap_steps(user, password, ssh_key)
     results, ok = _run_setup_steps(
@@ -909,7 +945,7 @@ def _bootstrap_portacode(
             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
+    public_key = key_step.get("public_key") if key_step else default_public_key
     if not public_key:
         raise RuntimeError("Portacode connect did not return a public key.")
     return public_key, results
@@ -1053,16 +1089,19 @@ class CreateProxmoxContainerHandler(SyncHandler):
         return "create_proxmox_container"
 
     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")
-        logger.info(
-            "create_proxmox_container command received request_id=%s client_session=%s",
-            request_id,
-            source_client_session,
-        )
-        client_sessions = [source_client_session] if source_client_session else None
+        device_id = message.get("device_id")
+        device_public_key = (message.get("device_public_key") or "").strip()
+        device_private_key = (message.get("device_private_key") or "").strip()
+        has_device_keypair = bool(device_public_key and device_private_key)
         bootstrap_user, bootstrap_password, bootstrap_ssh_key = _get_provisioning_user_info(message)
-        bootstrap_steps = _build_bootstrap_steps(bootstrap_user, bootstrap_password, bootstrap_ssh_key)
+        bootstrap_steps = _build_bootstrap_steps(
+            bootstrap_user,
+            bootstrap_password,
+            bootstrap_ssh_key,
+            include_portacode_connect=not has_device_keypair,
+        )
         total_steps = 3 + len(bootstrap_steps) + 2
         current_step_index = 1
 
@@ -1084,7 +1123,6 @@ class CreateProxmoxContainerHandler(SyncHandler):
                 message=start_message,
                 phase="lifecycle",
                 request_id=request_id,
-                client_sessions=client_sessions,
             )
             try:
                 result = action()
@@ -1099,7 +1137,6 @@ class CreateProxmoxContainerHandler(SyncHandler):
                     message=f"{step_label} failed: {exc}",
                     phase="lifecycle",
                     request_id=request_id,
-                    client_sessions=client_sessions,
                     details={"error": str(exc)},
                 )
                 raise
@@ -1113,7 +1150,6 @@ class CreateProxmoxContainerHandler(SyncHandler):
                 message=success_message,
                 phase="lifecycle",
                 request_id=request_id,
-                client_sessions=client_sessions,
             )
             current_step_index += 1
             return result
@@ -1143,7 +1179,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
             payload["cpuunits"] = max(int(payload["cpus"] * 1024), 10)
             payload["memory"] = int(payload["ram_mib"])
             payload["node"] = node
-            logger.info(
+            logger.debug(
                 "Provisioning container node=%s template=%s ram=%s cpu=%s storage=%s",
                 node,
                 payload["template"],
@@ -1156,12 +1192,6 @@ class CreateProxmoxContainerHandler(SyncHandler):
             payload["created_at"] = datetime.utcnow().isoformat() + "Z"
             payload["status"] = "creating"
             _write_container_record(vmid, payload)
-            logger.info(
-                "Container record written vmid=%s hostname=%s client_session=%s",
-                vmid,
-                payload["hostname"],
-                source_client_session,
-            )
             return proxmox, node, vmid, payload
 
         proxmox, node, vmid, payload = _run_lifecycle_step(
@@ -1220,16 +1250,9 @@ class CreateProxmoxContainerHandler(SyncHandler):
                 message=message_text,
                 phase="bootstrap",
                 request_id=request_id,
-                client_sessions=client_sessions,
                 details=details or None,
             )
 
-        logger.info(
-            "Bootstrapping Portacode in container vmid=%s user=%s client_session=%s",
-            vmid,
-            payload["username"],
-            source_client_session,
-        )
         public_key, steps = _bootstrap_portacode(
             vmid,
             payload["username"],
@@ -1239,10 +1262,103 @@ class CreateProxmoxContainerHandler(SyncHandler):
             progress_callback=_bootstrap_progress_callback,
             start_index=current_step_index,
             total_steps=total_steps,
+            default_public_key=device_public_key if has_device_keypair else None,
         )
         current_step_index += len(bootstrap_steps)
 
-        response = {
+        service_installed = False
+        if has_device_keypair:
+            logger.info(
+                "deploying dashboard-provided Portacode keypair (device_id=%s) into container %s",
+                device_id,
+                vmid,
+            )
+            _deploy_device_keypair(
+                vmid,
+                payload["username"],
+                device_private_key,
+                device_public_key,
+            )
+            service_installed = True
+            service_start_index = current_step_index
+
+            auth_step_name = "setup_device_authentication"
+            auth_label = "Setting up device authentication"
+            _emit_progress_event(
+                self,
+                step_index=service_start_index,
+                total_steps=total_steps,
+                step_name=auth_step_name,
+                step_label=auth_label,
+                status="in_progress",
+                message="Notifying the server of the new device…",
+                phase="service",
+                request_id=request_id,
+            )
+            _emit_progress_event(
+                self,
+                step_index=service_start_index,
+                total_steps=total_steps,
+                step_name=auth_step_name,
+                step_label=auth_label,
+                status="completed",
+                message="Authentication metadata recorded.",
+                phase="service",
+                request_id=request_id,
+            )
+
+            install_step = service_start_index + 1
+            install_label = "Launching Portacode service"
+            _emit_progress_event(
+                self,
+                step_index=install_step,
+                total_steps=total_steps,
+                step_name="launch_portacode_service",
+                step_label=install_label,
+                status="in_progress",
+                message="Running sudo portacode service install…",
+                phase="service",
+                request_id=request_id,
+            )
+
+            cmd = f"su - {payload['username']} -c 'sudo -S portacode service install'"
+            res = _run_pct(vmid, cmd, input_text=payload["password"] + "\n")
+
+            if res["returncode"] != 0:
+                _emit_progress_event(
+                    self,
+                    step_index=install_step,
+                    total_steps=total_steps,
+                    step_name="launch_portacode_service",
+                    step_label=install_label,
+                    status="failed",
+                    message=f"{install_label} failed: {res.get('stderr') or res.get('stdout')}",
+                    phase="service",
+                    request_id=request_id,
+                    details={
+                        "stderr": res.get("stderr"),
+                        "stdout": res.get("stdout"),
+                    },
+                )
+                raise RuntimeError(res.get("stderr") or res.get("stdout") or "Service install failed")
+
+            _emit_progress_event(
+                self,
+                step_index=install_step,
+                total_steps=total_steps,
+                step_name="launch_portacode_service",
+                step_label=install_label,
+                status="completed",
+                message="Portacode service install finished.",
+                phase="service",
+                request_id=request_id,
+            )
+
+            logger.info("create_proxmox_container: portacode service install completed inside ct %s", vmid)
+
+            current_step_index += 2
+
+        return {
             "event": "proxmox_container_created",
             "success": True,
             "message": f"Container {vmid} is ready and Portacode key captured.",
@@ -1258,11 +1374,9 @@ class CreateProxmoxContainerHandler(SyncHandler):
                 "cpus": payload["cpus"],
             },
             "setup_steps": steps,
+            "device_id": device_id,
+            "service_installed": service_installed,
         }
-        if client_sessions:
-            response["client_sessions"] = client_sessions
-        response["_reply_to_source_session"] = True
-        return response
 
 
 class StartPortacodeServiceHandler(SyncHandler):
@@ -1290,15 +1404,6 @@ 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
-
-        logger.info(
-            "start_portacode_service invoked vmid=%s user=%s client_session=%s",
-            vmid,
-            user,
-            source_client_session,
-        )
 
         auth_step_name = "setup_device_authentication"
         auth_label = "Setting up device authentication"
@@ -1312,7 +1417,6 @@ 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,
@@ -1324,7 +1428,6 @@ class StartPortacodeServiceHandler(SyncHandler):
             message="Authentication metadata recorded.",
             phase="service",
             request_id=request_id,
-            client_sessions=client_sessions,
         )
 
         install_step = start_index + 1
@@ -1339,7 +1442,6 @@ 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'"
@@ -1356,7 +1458,6 @@ 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"),
@@ -1364,12 +1465,6 @@ class StartPortacodeServiceHandler(SyncHandler):
             )
             raise RuntimeError(res.get("stderr") or res.get("stdout") or "Service install failed")
 
-        logger.info(
-            "portacode service install command completed vmid=%s returncode=%s",
-            vmid,
-            res["returncode"],
-        )
-
         _emit_progress_event(
             self,
             step_index=install_step,
@@ -1380,19 +1475,14 @@ class StartPortacodeServiceHandler(SyncHandler):
             message="Portacode service install finished.",
             phase="service",
             request_id=request_id,
-            client_sessions=client_sessions,
         )
 
-        response = {
+        return {
             "event": "proxmox_service_started",
             "success": True,
             "message": "Portacode service install completed",
             "ctid": str(vmid),
         }
-        if client_sessions:
-            response["client_sessions"] = client_sessions
-        response["_reply_to_source_session"] = True
-        return response
 
 
 class StartProxmoxContainerHandler(SyncHandler):
@@ -1408,20 +1498,12 @@ class StartProxmoxContainerHandler(SyncHandler):
         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
-
-        logger.info(
-            "start_proxmox_container invoked vmid=%s client_session=%s",
-            vmid,
-            source_client_session,
-        )
 
         status, elapsed = _start_container(proxmox, node, vmid)
         _update_container_record(vmid, {"status": "running"})
 
         infra = get_infra_snapshot()
-        response = {
+        return {
             "event": "proxmox_container_action",
             "action": "start",
             "success": True,
@@ -1431,10 +1513,6 @@ class StartProxmoxContainerHandler(SyncHandler):
             "status": status.get("status"),
             "infra": infra,
         }
-        if client_sessions:
-            response["client_sessions"] = client_sessions
-        response["_reply_to_source_session"] = True
-        return response
 
 
 class StopProxmoxContainerHandler(SyncHandler):
@@ -1450,14 +1528,6 @@ class StopProxmoxContainerHandler(SyncHandler):
         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
-
-        logger.info(
-            "stop_proxmox_container invoked vmid=%s client_session=%s",
-            vmid,
-            source_client_session,
-        )
 
         status, elapsed = _stop_container(proxmox, node, vmid)
         final_status = status.get("status") or "stopped"
@@ -1469,7 +1539,7 @@ class StopProxmoxContainerHandler(SyncHandler):
             if final_status != "running" and elapsed == 0.0
             else f"Stopped container {vmid} in {elapsed:.1f}s."
         )
-        response = {
+        return {
             "event": "proxmox_container_action",
             "action": "stop",
             "success": True,
@@ -1479,10 +1549,6 @@ class StopProxmoxContainerHandler(SyncHandler):
             "status": final_status,
             "infra": infra,
         }
-        if client_sessions:
-            response["client_sessions"] = client_sessions
-        response["_reply_to_source_session"] = True
-        return response
 
 
 class RemoveProxmoxContainerHandler(SyncHandler):
@@ -1498,21 +1564,13 @@ class RemoveProxmoxContainerHandler(SyncHandler):
         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
-
-        logger.info(
-            "remove_proxmox_container invoked vmid=%s client_session=%s",
-            vmid,
-            source_client_session,
-        )
 
         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 = {
+        return {
             "event": "proxmox_container_action",
             "action": "remove",
             "success": True,
@@ -1525,10 +1583,6 @@ class RemoveProxmoxContainerHandler(SyncHandler):
             "status": "deleted",
             "infra": infra,
         }
-        if client_sessions:
-            response["client_sessions"] = client_sessions
-        response["_reply_to_source_session"] = True
-        return response
 
 
 class ConfigureProxmoxInfraHandler(SyncHandler):
@@ -1542,19 +1596,13 @@ 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)
-        response = {
+        return {
             "event": "proxmox_infra_configured",
             "success": True,
             "message": "Proxmox infrastructure configured",
             "infra": snapshot,
         }
-        if client_sessions:
-            response["client_sessions"] = client_sessions
-        response["_reply_to_source_session"] = True
-        return response
 
 
 class RevertProxmoxInfraHandler(SyncHandler):
@@ -1563,16 +1611,10 @@ 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()
-        response = {
+        return {
             "event": "proxmox_infra_reverted",
             "success": True,
             "message": "Proxmox infrastructure configuration reverted",
             "infra": snapshot,
         }
-        if client_sessions:
-            response["client_sessions"] = client_sessions
-        response["_reply_to_source_session"] = True
-        return response

portacode/connection/handlers/test_proxmox_infra.py

@@ -0,0 +1,13 @@
+from unittest import TestCase
+
+from portacode.connection.handlers.proxmox_infra import _build_bootstrap_steps
+
+
+class ProxmoxInfraHandlerTests(TestCase):
+    def test_build_bootstrap_steps_includes_portacode_connect_by_default(self):
+        steps = _build_bootstrap_steps("svcuser", "pass", "", include_portacode_connect=True)
+        self.assertTrue(any(step.get("name") == "portacode_connect" for step in steps))
+
+    def test_build_bootstrap_steps_skips_portacode_connect_when_requested(self):
+        steps = _build_bootstrap_steps("svcuser", "pass", "", include_portacode_connect=False)
+        self.assertFalse(any(step.get("name") == "portacode_connect" for step in steps))

{portacode-1.4.13.dev1.dist-info → portacode-1.4.13.dev2.dist-info}/METADATA

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

{portacode-1.4.13.dev1.dist-info → portacode-1.4.13.dev2.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=LRfIU5637o003YhvJfKkC-W6_vMYzK36mKyg9SlBZi0,719
+portacode/_version.py,sha256=DNXD9h6WnEeb90CTXVgfmtrpDU4zmIz1R3oJab1QQyY,719
 portacode/cli.py,sha256=mGLKoZ-T2FBF7IA9wUq0zyG0X9__-A1ao7gajjcVRH8,21828
 portacode/data.py,sha256=5-s291bv8J354myaHm1Y7CQZTZyRzMU3TGe5U4hb-FA,1591
 portacode/keypair.py,sha256=0OO4vHDcF1XMxCDqce61xFTlFwlTcmqe5HyGsXFEt7s,5838
@@ -14,20 +14,21 @@ portacode/connection/client.py,sha256=jtLb9_YufqPkzi9t8VQH3iz_JEMisbtY6a8L9U5wei
 portacode/connection/multiplex.py,sha256=L-TxqJ_ZEbfNEfu1cwxgJ5vUdyRzZjsMy2Kx1diiZys,5237
 portacode/connection/terminal.py,sha256=oyLPOVLPlUuN_eRvHPGazB51yi8W8JEF3oOEYxucGTE,45069
 portacode/connection/handlers/README.md,sha256=HsLZG1QK1JNm67HsgL6WoDg9nxzKXxwkc5fJPFJdX5g,12169
-portacode/connection/handlers/WEBSOCKET_PROTOCOL.md,sha256=2sFO9VsvZUl57RM6R4cgYzN4WYlIQLASlKMa7r0NMSc,98404
+portacode/connection/handlers/WEBSOCKET_PROTOCOL.md,sha256=--NNK-qrqQhZ9O4RHuAQfDQb6QxKtl_No101c1Sy_cQ,98994
 portacode/connection/handlers/__init__.py,sha256=WSeBmi65GWFQPYt9M3E10rn0uZ_EPCJzNJOzSf2HZyw,2921
-portacode/connection/handlers/base.py,sha256=YKjXeS_PDbM6RyrSauZBJvmndU2bfvCMOwckYLVLn-U,11296
+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=bZVlM6k--CyLEBbhPvFafHTN-cyryRxy86EG6PpXoII,57628
+portacode/connection/handlers/proxmox_infra.py,sha256=m9JKbJUBIpuv-7QGU1LBVqoZJXvPQzhNcx1MLatjNhs,58972
 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
 portacode/connection/handlers/tab_factory.py,sha256=yn93h6GASjD1VpvW1oqpax3EpoT0r7r97zFXxML1wdA,16173
 portacode/connection/handlers/terminal_handlers.py,sha256=HRwHW1GiqG1NtHVEqXHKaYkFfQEzCDDH6YIlHcb4XD8,11866
+portacode/connection/handlers/test_proxmox_infra.py,sha256=d6iBB4pwAqWWdEGRayLxDEexqCElbGZDJlCB4bXba24,682
 portacode/connection/handlers/update_handler.py,sha256=f2K4LmG4sHJZ3LahzzoRtHBULTKkPUNwuyhwuAAg3RA,2054
 portacode/connection/handlers/project_state/README.md,sha256=trdd4ig6ungmwH5SpbSLfyxbL-QgPlGNU-_XrMEiXtw,10114
 portacode/connection/handlers/project_state/__init__.py,sha256=5ucIqk6Iclqg6bKkL8r_wVs5Tlt6B9J7yQH6yQUt7gc,2541
@@ -64,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.13.dev1.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
+portacode-1.4.13.dev2.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 +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.13.dev1.dist-info/METADATA,sha256=mSEfLnN_1l9Wjf0LHMvOp5Gai18-BsmIgQ-jD80vAVY,13051
-portacode-1.4.13.dev1.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-portacode-1.4.13.dev1.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
-portacode-1.4.13.dev1.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
-portacode-1.4.13.dev1.dist-info/RECORD,,
+portacode-1.4.13.dev2.dist-info/METADATA,sha256=mVp7O5PlhPfvcaUdyshscyW9aH8bfYJ-FNIRkhunycE,13051
+portacode-1.4.13.dev2.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+portacode-1.4.13.dev2.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
+portacode-1.4.13.dev2.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
+portacode-1.4.13.dev2.dist-info/RECORD,,