portacode 0.3.16.dev4__tar.gz → 0.3.16.dev6__tar.gz

{portacode-0.3.16.dev4 → portacode-0.3.16.dev6}/PKG-INFO

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

{portacode-0.3.16.dev4 → portacode-0.3.16.dev6}/portacode/_version.py

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

{portacode-0.3.16.dev4 → portacode-0.3.16.dev6}/portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -545,8 +545,7 @@ Confirms that project state has been successfully initialized for a client sessi
 *   `git_status_summary` (object, optional): Summary of Git status counts (modified, added, deleted, untracked files).
 *   `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.
-*   `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.
+*   `items` (array, mandatory): Flattened array of all visible file/folder items. Always includes root level items and one level down from the project root (since the project root is treated as expanded by default). Also includes items within explicitly expanded folders and one level down from each expanded folder. Each item has a `parent_path` property indicating which folder it belongs to, and folder items have an `is_expanded` boolean property indicating their expansion state.
 *   `timestamp` (float, mandatory): Unix timestamp of when the state was generated.
 
 ### <a name="project_state_update"></a>`project_state_update`
@@ -562,8 +561,7 @@ Sent automatically when project state changes due to file system modifications,
 *   `git_status_summary` (object, optional): Updated summary of Git status counts.
 *   `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.
-*   `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.
+*   `items` (array, mandatory): Updated flattened array of all visible file/folder items. Always includes root level items and one level down from the project root (since the project root is treated as expanded by default). Also includes items within explicitly expanded folders and one level down from each expanded folder. Each item has a `parent_path` property indicating which folder it belongs to, and folder items have an `is_expanded` boolean property indicating their 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.dev4 → portacode-0.3.16.dev6}/portacode/connection/handlers/project_state_handlers.py

@@ -43,6 +43,7 @@ class FileItem:
     name: str
     path: str
     is_directory: bool
+    parent_path: str
     size: Optional[int] = None
     modified_time: Optional[float] = None
     is_git_tracked: Optional[bool] = None
@@ -64,13 +65,10 @@ class ProjectState:
     git_status_summary: Optional[Dict[str, int]] = None
     open_files: Set[str] = None
     active_file: Optional[str] = None
-    expanded_folders: Set[str] = None
     
     def __post_init__(self):
         if self.open_files is None:
             self.open_files = set()
-        if self.expanded_folders is None:
-            self.expanded_folders = set()
 
 
 class GitManager:
@@ -275,7 +273,6 @@ class ProjectStateManager:
                     "git_status_summary": state.git_status_summary,
                     "open_files": list(state.open_files),
                     "active_file": state.active_file,
-                    "expanded_folders": list(state.expanded_folders),
                     "items": [self._serialize_file_item(item) for item in state.items]
                 }
             
@@ -315,8 +312,8 @@ class ProjectStateManager:
             git_status_summary=git_manager.get_status_summary()
         )
         
-        # Load initial file structure with recursive expanded folder loading
-        await self._load_expanded_folders_recursively(project_state)
+        # Load initial file structure with flattened items
+        await self._build_flattened_items_structure(project_state)
         
         # Start watching the project folder
         self.file_watcher.start_watching(project_folder_path)
@@ -337,6 +334,10 @@ class ProjectStateManager:
             with os.scandir(directory_path) as entries:
                 for entry in entries:
                     try:
+                        # Skip .git folders and their contents
+                        if entry.name == '.git' and entry.is_dir():
+                            continue
+                            
                         stat_info = entry.stat()
                         is_hidden = entry.name.startswith('.')
                         
@@ -379,23 +380,99 @@ class ProjectStateManager:
         except (OSError, PermissionError) as e:
             logger.error("Error loading directory %s: %s", directory_path, e)
     
-    async def _load_expanded_folders_recursively(self, project_state: ProjectState):
-        """Load one level down for all expanded folders recursively."""
-        # First load root level
-        await self._load_directory_items(project_state, project_state.project_folder_path, is_root=True)
-        
-        # Then load one level down for all expanded folders
-        for folder_path in project_state.expanded_folders:
-            folder_item = self._find_item_by_path(project_state.items, folder_path)
-            if folder_item and folder_item.is_directory:
-                # Load the folder's immediate children
-                await self._load_directory_items(project_state, folder_path, parent_item=folder_item)
-                
-                # Load one level down for each subfolder in this expanded folder
-                if folder_item.children:
-                    for child in folder_item.children:
-                        if child.is_directory and not child.is_loaded:
-                            await self._load_directory_items(project_state, child.path, parent_item=child)
+    async def _build_flattened_items_structure(self, project_state: ProjectState):
+        """Build a flattened items structure including all visible items and one level down from expanded folders."""
+        all_items = []
+        
+        # Load root items
+        root_items = await self._load_directory_items_list(project_state.project_folder_path, project_state.project_folder_path)
+        
+        for item in root_items:
+            all_items.append(item)
+            
+            # Always load one level down from root folders (project root is always "expanded")
+            # OR if this folder is explicitly expanded, add its children and one level down
+            if item.is_directory and (item.parent_path == project_state.project_folder_path or item.is_expanded):
+                children = await self._load_directory_items_list(item.path, item.path)
+                for child in children:
+                    all_items.append(child)
+                    
+                    # If child is a directory, load one level down
+                    if child.is_directory:
+                        grandchildren = await self._load_directory_items_list(child.path, child.path)
+                        all_items.extend(grandchildren)
+        
+        project_state.items = all_items
+    
+    async def _load_directory_items_list(self, directory_path: str, parent_path: str) -> List[FileItem]:
+        """Load directory items and return as a list with parent_path."""
+        git_manager = None
+        for manager in self.git_managers.values():
+            if directory_path.startswith(manager.project_path):
+                git_manager = manager
+                break
+        
+        items = []
+        
+        try:
+            with os.scandir(directory_path) as entries:
+                for entry in entries:
+                    try:
+                        # Skip .git folders and their contents
+                        if entry.name == '.git' and entry.is_dir():
+                            continue
+                            
+                        stat_info = entry.stat()
+                        is_hidden = entry.name.startswith('.')
+                        
+                        # Get Git status if available
+                        git_info = {"is_tracked": False, "status": None}
+                        if git_manager:
+                            git_info = git_manager.get_file_status(entry.path)
+                        
+                        # Check if this directory is expanded by finding it in current items
+                        is_expanded = False
+                        if entry.is_dir():
+                            # Check if this folder is expanded by looking for existing items with this path as parent
+                            is_expanded = self._is_folder_expanded(entry.path)
+                        
+                        file_item = FileItem(
+                            name=entry.name,
+                            path=entry.path,
+                            is_directory=entry.is_dir(),
+                            parent_path=parent_path,
+                            size=stat_info.st_size if entry.is_file() else None,
+                            modified_time=stat_info.st_mtime,
+                            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()
+                        )
+                        
+                        items.append(file_item)
+                        
+                    except (OSError, PermissionError) as e:
+                        logger.debug("Error reading entry %s: %s", entry.path, e)
+                        continue
+            
+            # Sort items: directories first, then files, both alphabetically
+            items.sort(key=lambda x: (not x.is_directory, x.name.lower()))
+            
+        except (OSError, PermissionError) as e:
+            logger.error("Error loading directory %s: %s", directory_path, e)
+        
+        return items
+    
+    def _is_folder_expanded(self, folder_path: str) -> bool:
+        """Check if a folder is expanded by looking at existing items."""
+        # During initial load, no folders are expanded
+        # During updates, check if any items have this folder as parent_path
+        for project_state in self.projects.values():
+            for item in project_state.items:
+                if item.parent_path == folder_path:
+                    return True
+        return False
     
     async def expand_folder(self, project_id: str, folder_path: str) -> bool:
         """Expand a folder and load its contents."""
@@ -404,19 +481,18 @@ class ProjectStateManager:
         
         project_state = self.projects[project_id]
         
-        # Find the folder item
+        # Find the folder item and mark it as expanded
         folder_item = self._find_item_by_path(project_state.items, folder_path)
         if not folder_item or not folder_item.is_directory:
             return False
         
         folder_item.is_expanded = True
-        project_state.expanded_folders.add(folder_path)
         
         # Start watching this folder
         self.file_watcher.start_watching(folder_path)
         
-        # Reload the entire structure to ensure consistency with recursive loading
-        await self._load_expanded_folders_recursively(project_state)
+        # Rebuild the entire flattened structure to include new expanded content
+        await self._build_flattened_items_structure(project_state)
         
         self._write_debug_state()
         return True
@@ -428,18 +504,20 @@ class ProjectStateManager:
         
         project_state = self.projects[project_id]
         
-        # Find the folder item
+        # Find the folder item and mark it as collapsed
         folder_item = self._find_item_by_path(project_state.items, folder_path)
         if not folder_item or not folder_item.is_directory:
             return False
         
         folder_item.is_expanded = False
-        project_state.expanded_folders.discard(folder_path)
         
         # Stop watching collapsed folders (except root)
         if folder_path != project_state.project_folder_path:
             self.file_watcher.stop_watching(folder_path)
         
+        # Rebuild the flattened structure to remove collapsed content
+        await self._build_flattened_items_structure(project_state)
+        
         self._write_debug_state()
         return True
     
@@ -546,8 +624,8 @@ class ProjectStateManager:
         self._write_debug_state()
     
     async def _reload_visible_structures(self, project_state: ProjectState):
-        """Reload all visible structures with recursive expanded folder loading."""
-        await self._load_expanded_folders_recursively(project_state)
+        """Reload all visible structures with flattened items."""
+        await self._build_flattened_items_structure(project_state)
     
     async def _send_project_state_update(self, project_state: ProjectState):
         """Send project state update to clients."""
@@ -560,7 +638,6 @@ class ProjectStateManager:
             "git_status_summary": project_state.git_status_summary,
             "open_files": list(project_state.open_files),
             "active_file": project_state.active_file,
-            "expanded_folders": list(project_state.expanded_folders),
             "items": [self._serialize_file_item(item) for item in project_state.items],
             "timestamp": time.time()
         }
@@ -575,8 +652,10 @@ class ProjectStateManager:
             
             # Stop watching all folders for this project
             self.file_watcher.stop_watching(project_state.project_folder_path)
-            for folder_path in project_state.expanded_folders:
-                self.file_watcher.stop_watching(folder_path)
+            # Stop watching all expanded folders
+            for item in project_state.items:
+                if item.is_directory and item.is_expanded:
+                    self.file_watcher.stop_watching(item.path)
             
             # Clean up managers
             self.git_managers.pop(project_id, None)

{portacode-0.3.16.dev4 → portacode-0.3.16.dev6}/portacode/connection/terminal.py

@@ -460,7 +460,6 @@ class TerminalManager:
                         "git_status_summary": project_state.git_status_summary,
                         "open_files": list(project_state.open_files),
                         "active_file": project_state.active_file,
-                        "expanded_folders": list(project_state.expanded_folders),
                         "items": [manager._serialize_file_item(item) for item in project_state.items],
                         "timestamp": time.time(),
                         "client_sessions": [session_name]  # Target this specific session

{portacode-0.3.16.dev4 → portacode-0.3.16.dev6}/portacode.egg-info/PKG-INFO

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