portacode 0.3.20.dev1__tar.gz → 0.3.20.dev2__tar.gz

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

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

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

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

{portacode-0.3.20.dev1 → portacode-0.3.20.dev2}/portacode/connection/handlers/project_state/git_manager.py

@@ -1075,9 +1075,26 @@ class GitManager:
             # Convert to relative path from repo root
             rel_path = os.path.relpath(file_path, self.repo.working_dir)
             
-            # Reset the file from HEAD (unstage)
-            self.repo.git.restore('--staged', rel_path)
-            logger.info("Successfully unstaged file: %s", rel_path)
+            # Check if repository has any commits (HEAD exists)
+            has_commits = False
+            try:
+                # Try to get HEAD commit to check if repository has commits
+                self.repo.head.commit
+                has_commits = True
+            except Exception:
+                logger.debug("Repository has no commits yet (no HEAD)")
+                has_commits = False
+            
+            if has_commits:
+                # Repository has commits - use git restore --staged
+                self.repo.git.restore('--staged', rel_path)
+                logger.info("Successfully unstaged file using restore: %s", rel_path)
+            else:
+                # Repository has no commits - use git rm --cached
+                # This handles the case where files are staged but no initial commit exists
+                self.repo.git.rm('--cached', rel_path)
+                logger.info("Successfully unstaged file using rm --cached (no HEAD): %s", rel_path)
+            
             return True
             
         except Exception as e:

{portacode-0.3.20.dev1 → portacode-0.3.20.dev2}/portacode/connection/handlers/project_state/handlers.py

@@ -395,6 +395,13 @@ class ProjectStateGitStageHandler(AsyncHandler):
             project_state = manager.projects[source_client_session]
             project_state.git_status_summary = git_manager.get_status_summary()
             project_state.git_detailed_status = git_manager.get_detailed_status()
+            
+            # Force clear the last signature to ensure update is sent
+            # This is necessary because git operations should always trigger client updates
+            if hasattr(project_state, '_last_sent_signature'):
+                logger.info("Forcing git stage update by clearing signature cache")
+                project_state._last_sent_signature = None
+            
             await manager._send_project_state_update(project_state, server_project_id)
         
         return {
@@ -444,6 +451,13 @@ class ProjectStateGitUnstageHandler(AsyncHandler):
             project_state = manager.projects[source_client_session]
             project_state.git_status_summary = git_manager.get_status_summary()
             project_state.git_detailed_status = git_manager.get_detailed_status()
+            
+            # Force clear the last signature to ensure update is sent
+            # This is necessary because git operations should always trigger client updates
+            if hasattr(project_state, '_last_sent_signature'):
+                logger.info("Forcing git unstage update by clearing signature cache")
+                project_state._last_sent_signature = None
+            
             await manager._send_project_state_update(project_state, server_project_id)
         
         return {
@@ -493,6 +507,13 @@ class ProjectStateGitRevertHandler(AsyncHandler):
             project_state = manager.projects[source_client_session]
             project_state.git_status_summary = git_manager.get_status_summary()
             project_state.git_detailed_status = git_manager.get_detailed_status()
+            
+            # Force clear the last signature to ensure update is sent
+            # This is necessary because git operations should always trigger client updates
+            if hasattr(project_state, '_last_sent_signature'):
+                logger.info("Forcing git revert update by clearing signature cache")
+                project_state._last_sent_signature = None
+            
             await manager._send_project_state_update(project_state, server_project_id)
         
         return {

{portacode-0.3.20.dev1 → portacode-0.3.20.dev2}/portacode/connection/handlers/project_state/manager.py

@@ -887,10 +887,24 @@ class ProjectStateManager:
         logger.info("🔍 [TRACE] _send_project_state_update called for session: %s", project_state.client_session_id)
         
         # Create state signature for change detection
+        # Include detailed git file information to ensure staging/unstaging triggers updates
+        git_detailed_signature = None
+        if project_state.git_detailed_status:
+            # Create a more detailed signature that captures individual file staging states
+            staged_files = tuple(sorted([(f.file_abs_path, f.change_type) for f in project_state.git_detailed_status.staged_changes]))
+            unstaged_files = tuple(sorted([(f.file_abs_path, f.change_type) for f in project_state.git_detailed_status.unstaged_changes]))
+            untracked_files = tuple(sorted([f.file_abs_path for f in project_state.git_detailed_status.untracked_files]))
+            git_detailed_signature = {
+                "head_commit_hash": project_state.git_detailed_status.head_commit_hash,
+                "staged_files": staged_files,
+                "unstaged_files": unstaged_files,
+                "untracked_files": untracked_files
+            }
+        
         current_state_signature = {
             "git_branch": project_state.git_branch,
             "git_status_summary": project_state.git_status_summary,
-            "git_detailed_status": str(project_state.git_detailed_status) if project_state.git_detailed_status else None,
+            "git_detailed_status": git_detailed_signature,
             "open_tabs": tuple((tab.tab_id, tab.tab_type, tab.title) for tab in project_state.open_tabs.values()),
             "active_tab": project_state.active_tab.tab_id if project_state.active_tab else None,
             "items_count": len(project_state.items),

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

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