portacode 0.3.11.dev0__tar.gz → 0.3.11.dev2__tar.gz

{portacode-0.3.11.dev0 → portacode-0.3.11.dev2}/PKG-INFO

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

{portacode-0.3.11.dev0 → portacode-0.3.11.dev2}/portacode/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.11.dev'
-__version_tuple__ = version_tuple = (0, 3, 11, 'dev0')
+__version__ = version = '0.3.11.dev2'
+__version_tuple__ = version_tuple = (0, 3, 11, 'dev2')

{portacode-0.3.11.dev0 → portacode-0.3.11.dev2}/portacode/connection/handlers/session.py

@@ -36,10 +36,11 @@ def _build_child_env() -> Dict[str, str]:
 class TerminalSession:
     """Represents a local shell subprocess bound to a mux channel."""
 
-    def __init__(self, session_id: str, proc: Process, channel: "Channel"):
+    def __init__(self, session_id: str, proc: Process, channel: "Channel", project_id: Optional[str] = None):
         self.id = session_id
         self.proc = proc
         self.channel = channel
+        self.project_id = project_id
         self._reader_task: Optional[asyncio.Task[None]] = None
         self._buffer: deque[str] = deque(maxlen=400)
 
@@ -139,7 +140,7 @@ class TerminalSession:
 class WindowsTerminalSession(TerminalSession):
     """Terminal session backed by a Windows ConPTY."""
 
-    def __init__(self, session_id: str, pty, channel: "Channel"):
+    def __init__(self, session_id: str, pty, channel: "Channel", project_id: Optional[str] = None):
         # Create a proxy for the PTY process
         class _WinPTYProxy:
             def __init__(self, pty):
@@ -157,7 +158,7 @@ class WindowsTerminalSession(TerminalSession):
                 loop = asyncio.get_running_loop()
                 await loop.run_in_executor(None, self._pty.wait)
 
-        super().__init__(session_id, _WinPTYProxy(pty), channel)
+        super().__init__(session_id, _WinPTYProxy(pty), channel, project_id)
         self._pty = pty
 
     async def start_io_forwarding(self) -> None:
@@ -247,7 +248,7 @@ class SessionManager:
         """Allocate a new unique channel ID for a terminal session using UUID."""
         return uuid.uuid4().hex
 
-    async def create_session(self, shell: Optional[str] = None, cwd: Optional[str] = None) -> Dict[str, Any]:
+    async def create_session(self, shell: Optional[str] = None, cwd: Optional[str] = None, project_id: Optional[str] = None) -> Dict[str, Any]:
         """Create a new terminal session."""
         # Use the same UUID for both terminal_id and channel_id to ensure consistency
         session_uuid = uuid.uuid4().hex
@@ -279,7 +280,7 @@ class SessionManager:
                 raise RuntimeError("pywinpty not installed on client")
 
             pty_proc = PtyProcess.spawn(shell, cwd=cwd or None, env=_build_child_env())
-            session = WindowsTerminalSession(term_id, pty_proc, channel)
+            session = WindowsTerminalSession(term_id, pty_proc, channel, project_id)
         else:
             # Unix: try real PTY for proper TTY semantics
             try:
@@ -315,7 +316,7 @@ class SessionManager:
                     cwd=cwd,
                     env=_build_child_env(),
                 )
-            session = TerminalSession(term_id, proc, channel)
+            session = TerminalSession(term_id, proc, channel, project_id)
 
         self._sessions[term_id] = session
         await session.start_io_forwarding()
@@ -326,6 +327,7 @@ class SessionManager:
             "pid": session.proc.pid,
             "shell": shell,
             "cwd": cwd,
+            "project_id": project_id,
         }
 
     def get_session(self, terminal_id: str) -> Optional[TerminalSession]:
@@ -342,8 +344,19 @@ class SessionManager:
             logger.warning("session_manager: Attempted to remove non-existent session %s", terminal_id)
         return session
 
-    def list_sessions(self) -> List[Dict[str, Any]]:
-        """List all terminal sessions."""
+    def list_sessions(self, project_id: Optional[str] = None) -> List[Dict[str, Any]]:
+        """List all terminal sessions, optionally filtered by project_id."""
+        filtered_sessions = []
+        for s in self._sessions.values():
+            if project_id == "all":
+                filtered_sessions.append(s)
+            elif project_id is None:
+                if s.project_id is None:
+                    filtered_sessions.append(s)
+            else:
+                if s.project_id == project_id:
+                    filtered_sessions.append(s)
+
         return [
             {
                 "terminal_id": s.id,
@@ -355,8 +368,9 @@ class SessionManager:
                 "created_at": None,  # Could add timestamp if needed
                 "shell": None,  # Could store shell info if needed
                 "cwd": None,    # Could store cwd info if needed
+                "project_id": s.project_id,
             }
-            for s in self._sessions.values()
+            for s in filtered_sessions
         ]
 
     async def reattach_sessions(self, mux):

{portacode-0.3.11.dev0 → portacode-0.3.11.dev2}/portacode/connection/handlers/terminal_handlers.py

@@ -2,7 +2,7 @@
 
 import asyncio
 import logging
-from typing import Any, Dict
+from typing import Any, Dict, Optional
 
 from .base import AsyncHandler
 from .session import SessionManager
@@ -55,6 +55,7 @@ class TerminalStartHandler(AsyncHandler):
             "event": "terminal_exit",
             "terminal_id": terminal_id,
             "returncode": session.proc.returncode,
+            "project_id": session.project_id,
         })
         
         # Only cleanup session if it still exists (not already removed by stop handler)
@@ -118,28 +119,30 @@ class TerminalStopHandler(AsyncHandler):
         if not session:
             logger.warning("terminal_stop: Terminal %s not found, may have already been stopped", terminal_id)
             # Send completion event immediately for not found terminals
-            asyncio.create_task(self._send_not_found_completion(terminal_id))
+            asyncio.create_task(self._send_not_found_completion(terminal_id, None))
             return {
                 "event": "terminal_stopped",
                 "terminal_id": terminal_id,
                 "status": "not_found",
-                "message": "Terminal was not found or already stopped"
+                "message": "Terminal was not found or already stopped",
+                "project_id": None,
             }
         
         logger.info("terminal_stop: Found session for terminal %s (PID: %s), starting background stop process", 
                    terminal_id, getattr(session.proc, 'pid', 'unknown'))
         
         # Start stop process in background without blocking the control channel
-        asyncio.create_task(self._stop_session_safely(session, terminal_id))
+        asyncio.create_task(self._stop_session_safely(session, terminal_id, session.project_id))
         
         return {
             "event": "terminal_stopped",
             "terminal_id": terminal_id,
             "status": "stopping",
-            "message": "Terminal stop process initiated"
+            "message": "Terminal stop process initiated",
+            "project_id": session.project_id,
         }
     
-    async def _stop_session_safely(self, session, terminal_id: str) -> None:
+    async def _stop_session_safely(self, session, terminal_id: str, project_id: Optional[str] = None) -> None:
         """Safely stop a session in the background with timeout and error handling."""
         logger.info("terminal_stop: Starting background stop process for terminal %s", terminal_id)
         
@@ -153,7 +156,8 @@ class TerminalStopHandler(AsyncHandler):
                 "event": "terminal_stop_completed",
                 "terminal_id": terminal_id,
                 "status": "success",
-                "message": "Terminal stopped successfully"
+                "message": "Terminal stopped successfully",
+                "project_id": project_id,
             })
             
         except asyncio.TimeoutError:
@@ -175,7 +179,8 @@ class TerminalStopHandler(AsyncHandler):
                 "event": "terminal_stop_completed",
                 "terminal_id": terminal_id,
                 "status": "timeout",
-                "message": "Terminal stop timed out, process was force killed"
+                "message": "Terminal stop timed out, process was force killed",
+                "project_id": project_id,
             })
             
         except Exception as exc:
@@ -186,16 +191,18 @@ class TerminalStopHandler(AsyncHandler):
                 "event": "terminal_stop_completed",
                 "terminal_id": terminal_id,
                 "status": "error",
-                "message": f"Error stopping terminal: {str(exc)}"
+                "message": f"Error stopping terminal: {str(exc)}",
+                "project_id": project_id,
             })
 
-    async def _send_not_found_completion(self, terminal_id: str) -> None:
+    async def _send_not_found_completion(self, terminal_id: str, project_id: Optional[str] = None) -> None:
         """Send completion event for not found terminals."""
         await self.control_channel.send({
             "event": "terminal_stop_completed",
             "terminal_id": terminal_id,
             "status": "not_found",
-            "message": "Terminal was not found or already stopped"
+            "message": "Terminal was not found or already stopped",
+            "project_id": project_id,
         })
 
 
@@ -213,14 +220,15 @@ class TerminalListHandler(AsyncHandler):
             raise RuntimeError("Session manager not available")
         
         # Accept project_id argument: None (default) = only no project, 'all' = all, else = filter by project_id
-        project_id = message.get("project_id")
-        all_projects = False
-        if project_id == "all":
-            all_projects = True
-            project_id = None
-        sessions = session_manager.list_sessions(project_id=project_id, all_projects=all_projects)
+        requested_project_id = message.get("project_id")
+
+        if requested_project_id == "all":
+            sessions = session_manager.list_sessions(project_id="all")
+        else:
+            sessions = session_manager.list_sessions(project_id=requested_project_id)
         
         return {
             "event": "terminal_list",
             "sessions": sessions,
+            "project_id": requested_project_id,
         } 

{portacode-0.3.11.dev0 → portacode-0.3.11.dev2}/portacode.egg-info/PKG-INFO

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