portacode 0.3.16.dev1__tar.gz → 0.3.16.dev2__tar.gz

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

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

{portacode-0.3.16.dev1 → portacode-0.3.16.dev2}/portacode/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.16.dev1'
-__version_tuple__ = version_tuple = (0, 3, 16, 'dev1')
+__version__ = version = '0.3.16.dev2'
+__version_tuple__ = version_tuple = (0, 3, 16, 'dev2')

{portacode-0.3.16.dev1 → portacode-0.3.16.dev2}/portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -247,7 +247,7 @@ Project state actions manage the state of project folders, including file struct
 
 ### `project_state_folder_expand`
 
-Expands a folder in the project tree, loading its contents and enabling monitoring for that folder level.
+Expands a folder in the project tree, loading its contents and enabling monitoring for that folder level. When a folder is expanded, the system proactively loads one level down for all subdirectories to enable immediate expansion in the UI. This action also scans items in the expanded folder and preloads content for any non-empty subdirectories.
 
 **Payload Fields:**
 
@@ -256,7 +256,7 @@ Expands a folder in the project tree, loading its contents and enabling monitori
 
 **Responses:**
 
-*   On success, the device will respond with a [`project_state_folder_expand_response`](#project_state_folder_expand_response) event, followed by a [`project_state_update`](#project_state_update) event.
+*   On success, the device will respond with a [`project_state_folder_expand_response`](#project_state_folder_expand_response) event, followed by a [`project_state_update`](#project_state_update) event containing the updated file structure with preloaded subdirectory contents.
 *   On error, a generic [`error`](#error) event is sent.
 
 ### `project_state_folder_collapse`
@@ -539,7 +539,6 @@ Confirms that project state has been successfully initialized for a client sessi
 
 **Event Fields:**
 
-*   `project_id` (string, mandatory): The unique ID assigned to this project state.
 *   `project_folder_path` (string, mandatory): The absolute path to the project folder.
 *   `is_git_repo` (boolean, mandatory): Whether the project folder is a Git repository.
 *   `git_branch` (string, optional): The current Git branch name if available.
@@ -547,7 +546,7 @@ Confirms that project state has been successfully initialized for a client sessi
 *   `open_files` (array, mandatory): Array of file paths currently marked as open.
 *   `active_file` (string, optional): Path to the currently active file.
 *   `expanded_folders` (array, mandatory): Array of folder paths currently expanded.
-*   `root_items` (array, mandatory): Array of file/folder items at the project root level.
+*   `items` (array, mandatory): Array of file/folder items including root level and one level down for all folders. Each folder item has an `is_expanded` boolean property indicating its expansion state.
 *   `timestamp` (float, mandatory): Unix timestamp of when the state was generated.
 
 ### <a name="project_state_update"></a>`project_state_update`
@@ -564,7 +563,7 @@ Sent automatically when project state changes due to file system modifications,
 *   `open_files` (array, mandatory): Updated array of open file paths.
 *   `active_file` (string, optional): Updated active file path.
 *   `expanded_folders` (array, mandatory): Updated array of expanded folder paths.
-*   `root_items` (array, mandatory): Updated array of file/folder items at the project root level.
+*   `items` (array, mandatory): Updated array of file/folder items including root level and one level down for all folders. Each folder item has an `is_expanded` boolean property indicating its expansion state.
 *   `timestamp` (float, mandatory): Unix timestamp of when the update was generated.
 
 ### <a name="project_state_folder_expand_response"></a>`project_state_folder_expand_response`

{portacode-0.3.16.dev1 → portacode-0.3.16.dev2}/portacode/connection/handlers/project_state_handlers.py

@@ -58,7 +58,7 @@ class ProjectState:
     """Represents the complete state of a project."""
     project_id: str
     project_folder_path: str
-    root_items: List[FileItem]
+    items: List[FileItem]
     is_git_repo: bool = False
     git_branch: Optional[str] = None
     git_status_summary: Optional[Dict[str, int]] = None
@@ -276,7 +276,7 @@ class ProjectStateManager:
                     "open_files": list(state.open_files),
                     "active_file": state.active_file,
                     "expanded_folders": list(state.expanded_folders),
-                    "root_items": [self._serialize_file_item(item) for item in state.root_items]
+                    "items": [self._serialize_file_item(item) for item in state.items]
                 }
             
             with open(self.debug_file_path, 'w', encoding='utf-8') as f:
@@ -309,7 +309,7 @@ class ProjectStateManager:
         project_state = ProjectState(
             project_id=project_id,
             project_folder_path=project_folder_path,
-            root_items=[],
+            items=[],
             is_git_repo=git_manager.is_git_repo,
             git_branch=git_manager.get_branch_name(),
             git_status_summary=git_manager.get_status_summary()
@@ -326,8 +326,8 @@ class ProjectStateManager:
         
         return project_state
     
-    async def _load_directory_items(self, project_state: ProjectState, directory_path: str, is_root: bool = False, parent_item: Optional[FileItem] = None, load_one_level_down: bool = True):
-        """Load directory items with Git metadata and optionally preload one level down."""
+    async def _load_directory_items(self, project_state: ProjectState, directory_path: str, is_root: bool = False, parent_item: Optional[FileItem] = None):
+        """Load directory items with Git metadata."""
         git_manager = self.git_managers.get(project_state.project_id)
         
         try:
@@ -345,6 +345,9 @@ class ProjectStateManager:
                         if git_manager:
                             git_info = git_manager.get_file_status(entry.path)
                         
+                        # Check if this directory is expanded
+                        is_expanded = entry.path in project_state.expanded_folders if entry.is_dir() else False
+                        
                         file_item = FileItem(
                             name=entry.name,
                             path=entry.path,
@@ -354,19 +357,10 @@ class ProjectStateManager:
                             is_git_tracked=git_info["is_tracked"],
                             git_status=git_info["status"],
                             is_hidden=is_hidden,
+                            is_expanded=is_expanded,
                             is_loaded=not entry.is_dir()  # Files are always "loaded", directories need expansion
                         )
                         
-                        # If this is a directory and we should load one level down, do it now
-                        if entry.is_dir() and load_one_level_down:
-                            await self._load_directory_items(
-                                project_state, 
-                                entry.path, 
-                                is_root=False, 
-                                parent_item=file_item, 
-                                load_one_level_down=False  # Don't go deeper than one level
-                            )
-                        
                         items.append(file_item)
                         
                     except (OSError, PermissionError) as e:
@@ -377,7 +371,11 @@ class ProjectStateManager:
             items.sort(key=lambda x: (not x.is_directory, x.name.lower()))
             
             if is_root:
-                project_state.root_items = items
+                project_state.items = items
+                # Load one level down for folders to enable immediate expansion
+                for item in items:
+                    if item.is_directory:
+                        await self._load_directory_items(project_state, item.path, parent_item=item)
             elif parent_item:
                 parent_item.children = items
                 parent_item.is_loaded = True
@@ -385,51 +383,36 @@ class ProjectStateManager:
         except (OSError, PermissionError) as e:
             logger.error("Error loading directory %s: %s", directory_path, e)
     
-    async def expand_folder(self, project_id: str, folder_path: str) -> tuple[bool, bool]:
-        """Expand a folder and determine if updates are needed.
-        
-        Returns:
-            (success, needs_update): success indicates if expansion worked,
-            needs_update indicates if client needs a state update
-        """
+    async def expand_folder(self, project_id: str, folder_path: str) -> bool:
+        """Expand a folder and load its contents."""
         if project_id not in self.projects:
-            return False, False
+            return False
         
         project_state = self.projects[project_id]
         
         # Find the folder item
-        folder_item = self._find_item_by_path(project_state.root_items, folder_path)
+        folder_item = self._find_item_by_path(project_state.items, folder_path)
         if not folder_item or not folder_item.is_directory:
-            return False, False
+            return False
+        
+        # Load children if not already loaded
+        if not folder_item.is_loaded:
+            await self._load_directory_items(project_state, folder_path, parent_item=folder_item)
         
-        # Mark as expanded and start watching
         folder_item.is_expanded = True
         project_state.expanded_folders.add(folder_path)
+        
+        # Start watching this folder
         self.file_watcher.start_watching(folder_path)
         
-        # Check if any subfolders have content that needs to be loaded
-        needs_update = False
+        # Preload one level down for newly expanded folders
         if folder_item.children:
             for child in folder_item.children:
                 if child.is_directory and not child.is_loaded:
-                    # Check if this subfolder has content
-                    try:
-                        with os.scandir(child.path) as entries:
-                            # If there are any items in this subfolder, we need to load them
-                            if any(True for _ in entries):
-                                await self._load_directory_items(
-                                    project_state, 
-                                    child.path, 
-                                    parent_item=child, 
-                                    load_one_level_down=True
-                                )
-                                needs_update = True
-                    except (OSError, PermissionError):
-                        # If we can't read the directory, assume it's empty
-                        pass
+                    await self._load_directory_items(project_state, child.path, parent_item=child)
         
         self._write_debug_state()
-        return True, needs_update
+        return True
     
     async def collapse_folder(self, project_id: str, folder_path: str) -> bool:
         """Collapse a folder."""
@@ -439,7 +422,7 @@ class ProjectStateManager:
         project_state = self.projects[project_id]
         
         # Find the folder item
-        folder_item = self._find_item_by_path(project_state.root_items, folder_path)
+        folder_item = self._find_item_by_path(project_state.items, folder_path)
         if not folder_item or not folder_item.is_directory:
             return False
         
@@ -562,7 +545,7 @@ class ProjectStateManager:
         
         # Reload expanded folders
         for folder_path in project_state.expanded_folders:
-            folder_item = self._find_item_by_path(project_state.root_items, folder_path)
+            folder_item = self._find_item_by_path(project_state.items, folder_path)
             if folder_item and folder_item.is_directory:
                 await self._load_directory_items(project_state, folder_path, parent_item=folder_item)
     
@@ -570,6 +553,7 @@ class ProjectStateManager:
         """Send project state update to clients."""
         payload = {
             "event": "project_state_update",
+            "project_id": project_state.project_id,
             "project_folder_path": project_state.project_folder_path,
             "is_git_repo": project_state.is_git_repo,
             "git_branch": project_state.git_branch,
@@ -577,7 +561,7 @@ class ProjectStateManager:
             "open_files": list(project_state.open_files),
             "active_file": project_state.active_file,
             "expanded_folders": list(project_state.expanded_folders),
-            "root_items": [self._serialize_file_item(item) for item in project_state.root_items],
+            "items": [self._serialize_file_item(item) for item in project_state.items],
             "timestamp": time.time()
         }
         
@@ -639,18 +623,18 @@ class ProjectStateFolderExpandHandler(AsyncHandler):
         
         manager = _get_or_create_project_state_manager(self.context, self.control_channel)
         
-        success, needs_update = await manager.expand_folder(project_id, folder_path)
+        success = await manager.expand_folder(project_id, folder_path)
         
-        if success and needs_update:
-            # Only send updated state if there were changes (new subfolder contents loaded)
+        if success:
+            # Send updated state
             project_state = manager.projects[project_id]
             await manager._send_project_state_update(project_state)
         
         return {
             "event": "project_state_folder_expand_response",
+            "project_id": project_id,
             "folder_path": folder_path,
-            "success": success,
-            "updated": needs_update
+            "success": success
         }
 
 
@@ -682,6 +666,7 @@ class ProjectStateFolderCollapseHandler(AsyncHandler):
         
         return {
             "event": "project_state_folder_collapse_response",
+            "project_id": project_id,
             "folder_path": folder_path,
             "success": success
         }
@@ -719,6 +704,7 @@ class ProjectStateFileOpenHandler(AsyncHandler):
         
         return {
             "event": "project_state_file_open_response",
+            "project_id": project_id,
             "file_path": file_path,
             "success": success,
             "set_active": set_active
@@ -753,6 +739,7 @@ class ProjectStateFileCloseHandler(AsyncHandler):
         
         return {
             "event": "project_state_file_close_response",
+            "project_id": project_id,
             "file_path": file_path,
             "success": success
         }
@@ -784,6 +771,7 @@ class ProjectStateSetActiveFileHandler(AsyncHandler):
         
         return {
             "event": "project_state_set_active_file_response",
+            "project_id": project_id,
             "file_path": file_path,
             "success": success
         }

{portacode-0.3.16.dev1 → portacode-0.3.16.dev2}/portacode/connection/terminal.py

@@ -454,7 +454,6 @@ class TerminalManager:
                     # Send initial project state to the client
                     initial_state_payload = {
                         "event": "project_state_initialized",
-                        "project_id": project_state.project_id,
                         "project_folder_path": project_state.project_folder_path,
                         "is_git_repo": project_state.is_git_repo,
                         "git_branch": project_state.git_branch,

{portacode-0.3.16.dev1 → portacode-0.3.16.dev2}/portacode.egg-info/PKG-INFO

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