portacode 1.3.31__tar.gz → 1.3.32__tar.gz

{portacode-1.3.31 → portacode-1.3.32}/PKG-INFO

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

{portacode-1.3.31 → portacode-1.3.32}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.3.31'
-__version_tuple__ = version_tuple = (1, 3, 31)
+__version__ = version = '1.3.32'
+__version_tuple__ = version_tuple = (1, 3, 32)
 
 __commit_id__ = commit_id = None

{portacode-1.3.31 → portacode-1.3.32}/portacode/connection/handlers/project_state/git_manager.py

@@ -350,9 +350,18 @@ class GitManager:
                 status_output = self.repo.git.status(*rel_paths, porcelain=True)
                 if status_output.strip():
                     for line in status_output.strip().split('\n'):
+                        # Git porcelain format: XY path (X=index, Y=worktree, then space, then path)
+                        # Some files may have renamed format: XY path -> new_path
                         if len(line) >= 3:
-                            file_path_from_status = line[3:] if len(line) > 3 else ""
-                            status_map[file_path_from_status] = line
+                            # Skip first 3 characters (2 status + 1 space) to get the file path
+                            # But git uses exactly 2 chars for status then space, so position 3 onwards is path
+                            parts = line.split(None, 1)  # Split on first whitespace to separate status from path
+                            if len(parts) >= 2:
+                                file_path_from_status = parts[1]
+                                # Handle renames (format: "old_path -> new_path")
+                                if ' -> ' in file_path_from_status:
+                                    file_path_from_status = file_path_from_status.split(' -> ')[1]
+                                status_map[file_path_from_status] = line
             except Exception as e:
                 logger.debug("Error getting batch status: %s", e)
 
@@ -469,7 +478,6 @@ class GitManager:
                         elif index_status == 'D' or worktree_status == 'D':
                             has_deleted = True
 
-            # Priority order: untracked > modified/deleted > clean
             if has_untracked:
                 return {"is_tracked": False, "status": "untracked", "is_ignored": False, "is_staged": is_staged}
             elif has_deleted:

{portacode-1.3.31 → portacode-1.3.32}/portacode/connection/handlers/project_state/handlers.py

@@ -408,10 +408,10 @@ class ProjectStateGitStageHandler(AsyncHandler):
             success = git_manager.stage_file(file_paths_to_stage[0])
         else:
             success = git_manager.stage_files(file_paths_to_stage)
-        
+
         if success:
-            # Refresh entire project state to ensure consistency
-            await manager._refresh_project_state(source_client_session)
+            # Refresh git status only (no filesystem changes from staging)
+            await manager._refresh_project_state(source_client_session, git_only=True)
         
         # Build response
         response = {
@@ -482,10 +482,10 @@ class ProjectStateGitUnstageHandler(AsyncHandler):
             success = git_manager.unstage_file(file_paths_to_unstage[0])
         else:
             success = git_manager.unstage_files(file_paths_to_unstage)
-        
+
         if success:
-            # Refresh entire project state to ensure consistency
-            await manager._refresh_project_state(source_client_session)
+            # Refresh git status only (no filesystem changes from unstaging)
+            await manager._refresh_project_state(source_client_session, git_only=True)
         
         # Build response
         response = {
@@ -620,9 +620,9 @@ class ProjectStateGitCommitHandler(AsyncHandler):
             if success:
                 # Get the commit hash of the new commit
                 commit_hash = git_manager.get_head_commit_hash()
-                
-                # Refresh entire project state to ensure consistency
-                await manager._refresh_project_state(source_client_session)
+
+                # Refresh git status only (no filesystem changes from commit)
+                await manager._refresh_project_state(source_client_session, git_only=True)
         except Exception as e:
             error_message = str(e)
             logger.error("Error during commit: %s", error_message)

{portacode-1.3.31 → portacode-1.3.32}/portacode/connection/handlers/project_state/manager.py

@@ -152,7 +152,8 @@ class ProjectStateManager:
         async def git_change_callback():
             """Callback when git status changes are detected."""
             logger.debug("Git change detected, refreshing project state for %s", client_session_id)
-            await self._refresh_project_state(client_session_id)
+            # Git directory changes only affect git status, not filesystem
+            await self._refresh_project_state(client_session_id, git_only=True)
         
         git_manager = GitManager(project_folder_path, change_callback=git_change_callback)
         self.git_managers[client_session_id] = git_manager
@@ -877,9 +878,17 @@ class ProjectStateManager:
         self._pending_changes.clear()
         logger.debug("🔍 [TRACE] ✅ Finished processing file changes")
     
-    async def _refresh_project_state(self, client_session_id: str):
-        """Refresh project state after file changes."""
-        logger.debug("🔍 [TRACE] _refresh_project_state called for session: %s", client_session_id)
+    async def _refresh_project_state(self, client_session_id: str, git_only: bool = False):
+        """Refresh project state after file changes.
+
+        Args:
+            client_session_id: The client session ID
+            git_only: If True, only git status changed (skip filesystem operations like
+                     detecting new directories and syncing file state). Use this for
+                     git operations (stage, unstage, revert) to avoid unnecessary work.
+        """
+        logger.debug("🔍 [TRACE] _refresh_project_state called for session: %s (git_only=%s)",
+                   client_session_id, git_only)
         
         if client_session_id not in self.projects:
             logger.debug("🔍 [TRACE] ❌ Session not found in projects: %s", client_session_id)
@@ -930,15 +939,20 @@ class ProjectStateManager:
                        old_status_summary, project_state.git_status_summary)
         else:
             logger.debug("🔍 [TRACE] ❌ No git manager found for session: %s", client_session_id)
-        
-        # Detect and add new directories in expanded folders before syncing
-        logger.debug("🔍 [TRACE] Detecting and adding new directories...")
-        await self._detect_and_add_new_directories(project_state)
-        
-        # Sync all dependent state (items, watchdog) with updated monitored folders
+
+        # For git-only operations, skip scanning for new directories
+        # but still sync items to update git attributes for UI
+        if not git_only:
+            # Detect and add new directories in expanded folders before syncing
+            logger.debug("🔍 [TRACE] Detecting and adding new directories...")
+            await self._detect_and_add_new_directories(project_state)
+        else:
+            logger.debug("🔍 [TRACE] Skipping directory detection (git_only=True)")
+
+        # Always sync state to update git attributes on items (needed for UI updates)
         logger.debug("🔍 [TRACE] Syncing all state with monitored folders...")
         await self._sync_all_state_with_monitored_folders(project_state)
-        
+
         # Send update to clients
         logger.debug("🔍 [TRACE] About to send project state update...")
         await self._send_project_state_update(project_state)

{portacode-1.3.31 → portacode-1.3.32}/portacode.egg-info/PKG-INFO

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