portacode 0.3.16.dev7__tar.gz → 0.3.16.dev9__tar.gz

{portacode-0.3.16.dev7 → portacode-0.3.16.dev9}/PKG-INFO

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

{portacode-0.3.16.dev7 → portacode-0.3.16.dev9}/portacode/_version.py

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

{portacode-0.3.16.dev7 → portacode-0.3.16.dev9}/portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -545,7 +545,20 @@ 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.
-*   `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.
+*   `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 object contains the following fields:
+    *   `name` (string, mandatory): The file or directory name.
+    *   `path` (string, mandatory): The absolute path to the file or directory.
+    *   `is_directory` (boolean, mandatory): Whether this item is a directory.
+    *   `parent_path` (string, mandatory): The absolute path to the parent directory.
+    *   `size` (integer, optional): File size in bytes. Only present for files, not directories.
+    *   `modified_time` (float, optional): Last modification time as Unix timestamp.
+    *   `is_git_tracked` (boolean, optional): Whether the file is tracked by Git. Only present if project is a Git repository.
+    *   `git_status` (string, optional): Git status of the file ("clean", "modified", "untracked", "ignored"). Only present if project is a Git repository.
+    *   `is_hidden` (boolean, mandatory): Whether the file/directory name starts with a dot (hidden file).
+    *   `is_ignored` (boolean, mandatory): Whether the file is ignored by Git. Only meaningful if project is a Git repository.
+    *   `children` (array, optional): Array of child FileItem objects for directories. Usually null in flattened structure as children are included as separate items.
+    *   `is_expanded` (boolean, mandatory): Whether this directory is expanded in the project tree. Only meaningful for directories.
+    *   `is_loaded` (boolean, mandatory): Whether the directory contents have been loaded. Always true for files, indicates loading state for directories.
 *   `timestamp` (float, mandatory): Unix timestamp of when the state was generated.
 
 ### <a name="project_state_update"></a>`project_state_update`
@@ -561,7 +574,20 @@ 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.
-*   `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.
+*   `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 object contains the following fields:
+    *   `name` (string, mandatory): The file or directory name.
+    *   `path` (string, mandatory): The absolute path to the file or directory.
+    *   `is_directory` (boolean, mandatory): Whether this item is a directory.
+    *   `parent_path` (string, mandatory): The absolute path to the parent directory.
+    *   `size` (integer, optional): File size in bytes. Only present for files, not directories.
+    *   `modified_time` (float, optional): Last modification time as Unix timestamp.
+    *   `is_git_tracked` (boolean, optional): Whether the file is tracked by Git. Only present if project is a Git repository.
+    *   `git_status` (string, optional): Git status of the file ("clean", "modified", "untracked", "ignored"). Only present if project is a Git repository.
+    *   `is_hidden` (boolean, mandatory): Whether the file/directory name starts with a dot (hidden file).
+    *   `is_ignored` (boolean, mandatory): Whether the file is ignored by Git. Only meaningful if project is a Git repository.
+    *   `children` (array, optional): Array of child FileItem objects for directories. Usually null in flattened structure as children are included as separate items.
+    *   `is_expanded` (boolean, mandatory): Whether this directory is expanded in the project tree. Only meaningful for directories.
+    *   `is_loaded` (boolean, mandatory): Whether the directory contents have been loaded. Always true for files, indicates loading state for directories.
 *   `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.dev7 → portacode-0.3.16.dev9}/portacode/connection/handlers/project_state_handlers.py

@@ -37,6 +37,12 @@ except ImportError:
 logger = logging.getLogger(__name__)
 
 
+@dataclass
+class MonitoredFolder:
+    """Represents a folder that is being monitored for changes."""
+    folder_path: str
+    is_expanded: bool = False
+
 @dataclass
 class FileItem:
     """Represents a file or directory item with metadata."""
@@ -61,6 +67,7 @@ class ProjectState:
     project_id: str
     project_folder_path: str
     items: List[FileItem]
+    monitored_folders: List[MonitoredFolder] = None
     is_git_repo: bool = False
     git_branch: Optional[str] = None
     git_status_summary: Optional[Dict[str, int]] = None
@@ -70,6 +77,8 @@ class ProjectState:
     def __post_init__(self):
         if self.open_files is None:
             self.open_files = set()
+        if self.monitored_folders is None:
+            self.monitored_folders = []
 
 
 class GitManager:
@@ -285,6 +294,7 @@ class ProjectStateManager:
                     "git_status_summary": state.git_status_summary,
                     "open_files": list(state.open_files),
                     "active_file": state.active_file,
+                    "monitored_folders": [asdict(mf) for mf in state.monitored_folders],
                     "items": [self._serialize_file_item(item) for item in state.items]
                 }
             
@@ -324,17 +334,71 @@ class ProjectStateManager:
             git_status_summary=git_manager.get_status_summary()
         )
         
+        # Initialize monitored folders with project root and its immediate subdirectories
+        await self._initialize_monitored_folders(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)
+        # Start watching all monitored folders
+        await self._start_watching_monitored_folders(project_state)
         
         self.projects[project_id] = project_state
         self._write_debug_state()
         
         return project_state
     
+    async def _initialize_monitored_folders(self, project_state: ProjectState):
+        """Initialize monitored folders with project root (expanded) and its immediate subdirectories (collapsed)."""
+        # Add project root as expanded
+        project_state.monitored_folders.append(
+            MonitoredFolder(folder_path=project_state.project_folder_path, is_expanded=True)
+        )
+        
+        # Scan project root for immediate subdirectories and add them as collapsed
+        try:
+            with os.scandir(project_state.project_folder_path) as entries:
+                for entry in entries:
+                    if entry.is_dir() and entry.name != '.git' and not entry.name.startswith('.'):
+                        project_state.monitored_folders.append(
+                            MonitoredFolder(folder_path=entry.path, is_expanded=False)
+                        )
+        except (OSError, PermissionError) as e:
+            logger.error("Error scanning project root for subdirectories: %s", e)
+    
+    async def _start_watching_monitored_folders(self, project_state: ProjectState):
+        """Start watching all monitored folders."""
+        for monitored_folder in project_state.monitored_folders:
+            self.file_watcher.start_watching(monitored_folder.folder_path)
+    
+    async def _add_subdirectories_to_monitored(self, project_state: ProjectState, parent_folder_path: str):
+        """Add all subdirectories of a folder to monitored_folders if not already present."""
+        try:
+            existing_paths = {mf.folder_path for mf in project_state.monitored_folders}
+            new_folders = []
+            
+            with os.scandir(parent_folder_path) as entries:
+                for entry in entries:
+                    if entry.is_dir() and entry.name != '.git' and not entry.name.startswith('.'):
+                        if entry.path not in existing_paths:
+                            new_monitored = MonitoredFolder(folder_path=entry.path, is_expanded=False)
+                            project_state.monitored_folders.append(new_monitored)
+                            new_folders.append(new_monitored)
+            
+            # Start watching the new folders
+            for folder in new_folders:
+                self.file_watcher.start_watching(folder.folder_path)
+                
+        except (OSError, PermissionError) as e:
+            logger.error("Error scanning folder %s for subdirectories: %s", parent_folder_path, e)
+    
+    def _find_monitored_folder(self, project_state: ProjectState, folder_path: str) -> Optional[MonitoredFolder]:
+        """Find a monitored folder by path."""
+        for monitored_folder in project_state.monitored_folders:
+            if monitored_folder.folder_path == folder_path:
+                return monitored_folder
+        return None
+    
     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)
@@ -395,23 +459,35 @@ class ProjectStateManager:
             logger.error("Error loading directory %s: %s", directory_path, e)
     
     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."""
+        """Build a flattened items structure based on monitored folders and their expansion states."""
         all_items = []
         
+        # Create a set of expanded folder paths for quick lookup
+        expanded_paths = {mf.folder_path for mf in project_state.monitored_folders if mf.is_expanded}
+        
         # Load root items
         root_items = await self._load_directory_items_list(project_state.project_folder_path, project_state.project_folder_path)
         
+        # Mark root directories as expanded if they are in expanded_paths
         for item in root_items:
+            if item.is_directory and item.path in expanded_paths:
+                item.is_expanded = True
             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 each expanded folder, load its contents and one level down from each subdirectory
+        for monitored_folder in project_state.monitored_folders:
+            if monitored_folder.is_expanded and monitored_folder.folder_path != project_state.project_folder_path:
+                # Load direct children of the expanded folder
+                children = await self._load_directory_items_list(monitored_folder.folder_path, monitored_folder.folder_path)
+                
+                # Mark children directories as expanded if they are in expanded_paths
                 for child in children:
+                    if child.is_directory and child.path in expanded_paths:
+                        child.is_expanded = True
                     all_items.append(child)
-                    
-                    # If child is a directory, load one level down
+                
+                # For each subdirectory in the expanded folder, load one level down (preview)
+                for child in children:
                     if child.is_directory:
                         grandchildren = await self._load_directory_items_list(child.path, child.path)
                         all_items.extend(grandchildren)
@@ -444,12 +520,6 @@ class ProjectStateManager:
                         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,
@@ -461,7 +531,7 @@ class ProjectStateManager:
                             git_status=git_info["status"],
                             is_hidden=is_hidden,
                             is_ignored=git_info["is_ignored"],
-                            is_expanded=is_expanded,
+                            is_expanded=False,
                             is_loaded=not entry.is_dir()
                         )
                         
@@ -479,16 +549,6 @@ class ProjectStateManager:
         
         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."""
         if project_id not in self.projects:
@@ -503,8 +563,13 @@ class ProjectStateManager:
         
         folder_item.is_expanded = True
         
-        # Start watching this folder
-        self.file_watcher.start_watching(folder_path)
+        # Update the monitored folder to expanded state
+        monitored_folder = self._find_monitored_folder(project_state, folder_path)
+        if monitored_folder:
+            monitored_folder.is_expanded = True
+        
+        # Add all subdirectories of the expanded folder to monitored folders
+        await self._add_subdirectories_to_monitored(project_state, folder_path)
         
         # Rebuild the entire flattened structure to include new expanded content
         await self._build_flattened_items_structure(project_state)
@@ -526,9 +591,13 @@ class ProjectStateManager:
         
         folder_item.is_expanded = False
         
-        # Stop watching collapsed folders (except root)
-        if folder_path != project_state.project_folder_path:
-            self.file_watcher.stop_watching(folder_path)
+        # Update the monitored folder to collapsed state
+        monitored_folder = self._find_monitored_folder(project_state, folder_path)
+        if monitored_folder:
+            monitored_folder.is_expanded = False
+        
+        # Note: We keep monitoring collapsed folders for file changes
+        # but don't stop watching them as we want to detect new files/folders
         
         # Rebuild the flattened structure to remove collapsed content
         await self._build_flattened_items_structure(project_state)
@@ -665,12 +734,9 @@ class ProjectStateManager:
         if project_id in self.projects:
             project_state = self.projects[project_id]
             
-            # Stop watching all folders for this project
-            self.file_watcher.stop_watching(project_state.project_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)
+            # Stop watching all monitored folders for this project
+            for monitored_folder in project_state.monitored_folders:
+                self.file_watcher.stop_watching(monitored_folder.folder_path)
             
             # Clean up managers
             self.git_managers.pop(project_id, None)

{portacode-0.3.16.dev7 → portacode-0.3.16.dev9}/portacode.egg-info/PKG-INFO

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