portacode 1.4.13.dev0__tar.gz → 1.4.13.dev1__tar.gz

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

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

{portacode-1.4.13.dev0 → portacode-1.4.13.dev1}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.13.dev0'
-__version_tuple__ = version_tuple = (1, 4, 13, 'dev0')
+__version__ = version = '1.4.13.dev1'
+__version_tuple__ = version_tuple = (1, 4, 13, 'dev1')
 
 __commit_id__ = commit_id = None

{portacode-1.4.13.dev0 → portacode-1.4.13.dev1}/portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -27,6 +27,8 @@ 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

{portacode-1.4.13.dev0 → portacode-1.4.13.dev1}/portacode/connection/handlers/base.py

@@ -88,6 +88,42 @@ 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.
@@ -141,22 +177,16 @@ class AsyncHandler(BaseHandler):
                 if "request_id" in message and "request_id" not in response:
                     response["request_id"] = message["request_id"]
 
-                # 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"])
+                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:
-                        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)
+                        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})")
+
             else:
                 logger.info("handler: %s handled response transmission directly", self.command_name)
         except Exception as exc:
@@ -216,4 +246,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.13.dev0 → portacode-1.4.13.dev1}/portacode/connection/handlers/proxmox_infra.py

@@ -1261,6 +1261,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
         }
         if client_sessions:
             response["client_sessions"] = client_sessions
+        response["_reply_to_source_session"] = True
         return response
 
 
@@ -1390,6 +1391,7 @@ class StartPortacodeServiceHandler(SyncHandler):
         }
         if client_sessions:
             response["client_sessions"] = client_sessions
+        response["_reply_to_source_session"] = True
         return response
 
 
@@ -1431,6 +1433,7 @@ class StartProxmoxContainerHandler(SyncHandler):
         }
         if client_sessions:
             response["client_sessions"] = client_sessions
+        response["_reply_to_source_session"] = True
         return response
 
 
@@ -1478,6 +1481,7 @@ class StopProxmoxContainerHandler(SyncHandler):
         }
         if client_sessions:
             response["client_sessions"] = client_sessions
+        response["_reply_to_source_session"] = True
         return response
 
 
@@ -1523,6 +1527,7 @@ class RemoveProxmoxContainerHandler(SyncHandler):
         }
         if client_sessions:
             response["client_sessions"] = client_sessions
+        response["_reply_to_source_session"] = True
         return response
 
 
@@ -1548,6 +1553,7 @@ class ConfigureProxmoxInfraHandler(SyncHandler):
         }
         if client_sessions:
             response["client_sessions"] = client_sessions
+        response["_reply_to_source_session"] = True
         return response
 
 
@@ -1568,4 +1574,5 @@ class RevertProxmoxInfraHandler(SyncHandler):
         }
         if client_sessions:
             response["client_sessions"] = client_sessions
+        response["_reply_to_source_session"] = True
         return response

{portacode-1.4.13.dev0 → portacode-1.4.13.dev1}/portacode.egg-info/PKG-INFO

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