portacode 1.3.30__py3-none-any.whl → 1.3.32__py3-none-any.whl

portacode/_version.py

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

portacode/connection/handlers/project_state/file_system_watcher.py

@@ -28,12 +28,13 @@ except ImportError:
 
 class FileSystemWatcher:
     """Watches file system changes for project folders."""
-    
+
     def __init__(self, project_manager):
         self.project_manager = project_manager  # Reference to ProjectStateManager
         self.observer: Optional[Observer] = None
         self.event_handler: Optional[FileSystemEventHandler] = None
         self.watched_paths: Set[str] = set()
+        self.watch_handles: dict = {}  # Map path -> watch handle for proper cleanup
         # Store reference to the event loop for thread-safe async task creation
         try:
             self.event_loop = asyncio.get_running_loop()
@@ -140,14 +141,15 @@ class FileSystemWatcher:
         if not WATCHDOG_AVAILABLE or not self.observer:
             logger.warning("Watchdog not available, cannot start watching: %s", path)
             return
-        
+
         if path not in self.watched_paths:
             try:
                 # Use recursive=False to watch only direct contents of each folder
-                self.observer.schedule(self.event_handler, path, recursive=False)
+                watch_handle = self.observer.schedule(self.event_handler, path, recursive=False)
                 self.watched_paths.add(path)
+                self.watch_handles[path] = watch_handle  # Store handle for cleanup
                 logger.info("Started watching path (non-recursive): %s", path)
-                
+
                 if not self.observer.is_alive():
                     self.observer.start()
                     logger.info("Started file system observer")
@@ -161,14 +163,15 @@ class FileSystemWatcher:
         if not WATCHDOG_AVAILABLE or not self.observer:
             logger.warning("Watchdog not available, cannot start watching git directory: %s", git_path)
             return
-        
+
         if git_path not in self.watched_paths:
             try:
                 # Watch .git directory recursively to catch changes in refs/, logs/, etc.
-                self.observer.schedule(self.event_handler, git_path, recursive=True)
+                watch_handle = self.observer.schedule(self.event_handler, git_path, recursive=True)
                 self.watched_paths.add(git_path)
+                self.watch_handles[git_path] = watch_handle  # Store handle for cleanup
                 logger.info("Started watching git directory (recursive): %s", git_path)
-                
+
                 if not self.observer.is_alive():
                     self.observer.start()
                     logger.info("Started file system observer")
@@ -181,9 +184,19 @@ class FileSystemWatcher:
         """Stop watching a specific path."""
         if not WATCHDOG_AVAILABLE or not self.observer:
             return
-        
+
         if path in self.watched_paths:
-            # Note: watchdog doesn't have direct path removal, would need to recreate observer
+            # Actually unschedule the watch using stored handle
+            watch_handle = self.watch_handles.get(path)
+            if watch_handle:
+                try:
+                    self.observer.unschedule(watch_handle)
+                    logger.info("Successfully unscheduled watch for: %s", path)
+                except Exception as e:
+                    logger.error("Error unscheduling watch for %s: %s", path, e)
+                finally:
+                    self.watch_handles.pop(path, None)
+
             self.watched_paths.discard(path)
             logger.debug("Stopped watching path: %s", path)
     
@@ -192,4 +205,5 @@ class FileSystemWatcher:
         if self.observer and self.observer.is_alive():
             self.observer.stop()
             self.observer.join()
-            self.watched_paths.clear()
+            self.watched_paths.clear()
+            self.watch_handles.clear()

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/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/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.30.dist-info → portacode-1.3.32.dist-info}/METADATA

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

{portacode-1.3.30.dist-info → portacode-1.3.32.dist-info}/RECORD

@@ -1,7 +1,7 @@
 portacode/README.md,sha256=4dKtpvR8LNgZPVz37GmkQCMWIr_u25Ao63iW56s7Ke4,775
 portacode/__init__.py,sha256=oB3sV1wXr-um-RXio73UG8E5Xx6cF2ZVJveqjNmC-vQ,1086
 portacode/__main__.py,sha256=jmHTGC1hzmo9iKJLv-SSYe9BSIbPPZ2IOpecI03PlTs,296
-portacode/_version.py,sha256=8UajrTwQ56tRwaDFCg4WEvI9v0ndkxuy6bK5yyvGTFI,706
+portacode/_version.py,sha256=d_JbLCEf2f0Y5ScYYYOP97vUKSwyr-VyTj2aQkfr7KU,706
 portacode/cli.py,sha256=eDqcZMVFHKzqqWxedhhx8ylu5WMVCLqeJQkbPR7RcJE,16333
 portacode/data.py,sha256=5-s291bv8J354myaHm1Y7CQZTZyRzMU3TGe5U4hb-FA,1591
 portacode/keypair.py,sha256=PAcOYqlVLOoZTPYi6LvLjfsY6BkrWbLOhSZLb8r5sHs,3635
@@ -27,10 +27,10 @@ portacode/connection/handlers/tab_factory.py,sha256=VBZnwtxgeNJCsfBzUjkFWAAGBdij
 portacode/connection/handlers/terminal_handlers.py,sha256=HRwHW1GiqG1NtHVEqXHKaYkFfQEzCDDH6YIlHcb4XD8,11866
 portacode/connection/handlers/project_state/README.md,sha256=trdd4ig6ungmwH5SpbSLfyxbL-QgPlGNU-_XrMEiXtw,10114
 portacode/connection/handlers/project_state/__init__.py,sha256=5ucIqk6Iclqg6bKkL8r_wVs5Tlt6B9J7yQH6yQUt7gc,2541
-portacode/connection/handlers/project_state/file_system_watcher.py,sha256=w-93ioUZZKZxzPFr8djJnGhWjMVFVdDsmo0fVAukoKk,10150
-portacode/connection/handlers/project_state/git_manager.py,sha256=oqE5jC1Xk8Sne1BruQuAqotvbX_v7vPYYQUIp0pPe3U,87964
-portacode/connection/handlers/project_state/handlers.py,sha256=03RYNeWfX_Ym9Lx4VdA6iwLSWFdjRtjWI5T1buBg4Mc,37941
-portacode/connection/handlers/project_state/manager.py,sha256=_tkVu6sruKVTMxGPj1iLv7-IMGDWYid4xl_fCUppadA,60554
+portacode/connection/handlers/project_state/file_system_watcher.py,sha256=2zingW9BoNKRijghHC2eHHdRoyDRdLmIl1yH1y-iuF8,10831
+portacode/connection/handlers/project_state/git_manager.py,sha256=tVcuiGYKk1GJ0f7dgjoSGNL13IXCHUOtoi_VBc8ZTqQ,88682
+portacode/connection/handlers/project_state/handlers.py,sha256=nhs-3yiENdewAzVZnSdn2Ir-e6TQ9Nz_Bxk3iiFPd9c,37985
+portacode/connection/handlers/project_state/manager.py,sha256=XX3wMgGdPbRgBBs_R1dXtQ4D9j-itETrJR_6IfBeDU0,61296
 portacode/connection/handlers/project_state/models.py,sha256=EZTKvxHKs8QlQUbzI0u2IqfzfRRXZixUIDBwTGCJATI,4313
 portacode/connection/handlers/project_state/utils.py,sha256=LsbQr9TH9Bz30FqikmtTxco4PlB_n0kUIuPKQ6Fb_mo,1665
 portacode/static/js/test-ntp-clock.html,sha256=bUow9sifIuLNPqKvuPbpQozmEE6RhdCI4Plib3CqUmw,2130
@@ -38,7 +38,7 @@ portacode/static/js/utils/ntp-clock.js,sha256=KMeHGT-IlUSlxVRZZ899z25dQCJh6EJbgX
 portacode/utils/NTP_ARCHITECTURE.md,sha256=WkESTbz5SNAgdmDKk3DrHMhtYOPji_Kt3_a9arWdRig,3894
 portacode/utils/__init__.py,sha256=NgBlWTuNJESfIYJzP_3adI1yJQJR0XJLRpSdVNaBAN0,33
 portacode/utils/ntp_clock.py,sha256=6QJOVZr9VQuxIyJt9KNG4dR-nZ3bKNyipMxjqDWP89Y,5152
-portacode-1.3.30.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
+portacode-1.3.32.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
 test_modules/README.md,sha256=Do_agkm9WhSzueXjRAkV_xEj6Emy5zB3N3VKY5Roce8,9274
 test_modules/__init__.py,sha256=1LcbHodIHsB0g-g4NGjSn6AMuCoGbymvXPYLOb6Z7F0,53
 test_modules/test_device_online.py,sha256=yiSyVaMwKAugqIX_ZIxmLXiOlmA_8IRXiUp12YmpB98,1653
@@ -63,8 +63,8 @@ testing_framework/core/playwright_manager.py,sha256=8xl-19b8NQjKNdiRyDjyeXlYyKPZ
 testing_framework/core/runner.py,sha256=j2QwNJmAxVBmJvcbVS7DgPJUKPNzqfLmt_4NNdaKmZU,19297
 testing_framework/core/shared_cli_manager.py,sha256=BESSNtyQb7BOlaOvZmm04T8Uezjms4KCBs2MzTxvzYQ,8790
 testing_framework/core/test_discovery.py,sha256=2FZ9fJ8Dp5dloA-fkgXoJ_gCMC_nYPBnA3Hs2xlagzM,4928
-portacode-1.3.30.dist-info/METADATA,sha256=3xWMA6M-dWJki0dVUMoFw8UiMNBrhs0WiWe1ZARA9Yw,6989
-portacode-1.3.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-portacode-1.3.30.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
-portacode-1.3.30.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
-portacode-1.3.30.dist-info/RECORD,,
+portacode-1.3.32.dist-info/METADATA,sha256=rTf7KoQ6JhbUqq_aOd-8ASc7UfR53vtrxdaLQ-ANsZ8,6989
+portacode-1.3.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+portacode-1.3.32.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
+portacode-1.3.32.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
+portacode-1.3.32.dist-info/RECORD,,