portacode 1.4.13.dev1__tar.gz → 1.4.13.dev2__tar.gz

{portacode-1.4.13.dev1 → portacode-1.4.13.dev2}/PKG-INFO

@@ -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 → portacode-1.4.13.dev2}/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-1.4.13.dev1 → portacode-1.4.13.dev2}/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-1.4.13.dev1 → portacode-1.4.13.dev2}/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)