portacode 0.3.17.dev0__tar.gz → 0.3.17.dev2__tar.gz

{portacode-0.3.17.dev0 → portacode-0.3.17.dev2}/.claude/settings.local.json

@@ -7,7 +7,8 @@
       "Bash(python:*)",
       "Bash(find:*)",
       "Bash(touch:*)",
-      "Bash(npm run lint)"
+      "Bash(npm run lint)",
+      "Bash(node:*)"
     ],
     "deny": []
   }

{portacode-0.3.17.dev0 → portacode-0.3.17.dev2}/PKG-INFO

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

{portacode-0.3.17.dev0 → portacode-0.3.17.dev2}/portacode/_version.py

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

{portacode-0.3.17.dev0 → portacode-0.3.17.dev2}/portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -247,6 +247,13 @@ Project state actions manage the state of project folders, including file struct
 
 **Note:** Project state is automatically initialized when a client session connects with a `project_folder_path` property. No manual initialization command is required.
 
+**Tab Management:** Open tabs are internally managed using a dictionary structure with unique keys to prevent duplicates and race conditions:
+- File tabs use `file_path` as the unique key
+- Diff tabs use a composite key: `diff:{file_path}:{from_ref}:{to_ref}:{from_hash}:{to_hash}`
+- Untitled tabs use their `tab_id` as the unique key
+
+This ensures that sending the same command multiple times (e.g., `project_state_diff_open` with identical parameters) will not create duplicate tabs but will instead activate the existing tab.
+
 ### `project_state_folder_expand`
 
 Expands a folder in the project tree, loading its contents and enabling monitoring for that folder level. When a folder is expanded, the system proactively loads one level down for all subdirectories to enable immediate expansion in the UI. This action also scans items in the expanded folder and preloads content for any non-empty subdirectories.
@@ -279,6 +286,8 @@ Collapses a folder in the project tree, stopping monitoring for that folder leve
 
 Marks a file as open in the project state, tracking it as part of the current editing session.
 
+**Duplicate Prevention:** This action prevents creating duplicate file tabs by using the `file_path` as a unique key. If a file tab with the same path already exists, it will be activated instead of creating a new one.
+
 **Payload Fields:**
 
 *   `project_id` (string, mandatory): The project ID from the initialized project state.
@@ -322,6 +331,8 @@ Sets the currently active tab in the project state. Only one tab can be active a
 
 Opens a diff tab for comparing file versions at different points in the git timeline. This replaces the previous `project_state_create_diff_tab` action with a more efficient approach that doesn't require the client to provide file content, instead using git timeline references.
 
+**Duplicate Prevention:** This action prevents creating duplicate diff tabs by using a unique key based on `file_path`, `from_ref`, `to_ref`, `from_hash`, and `to_hash`. If a diff tab with the same parameters already exists, it will be activated instead of creating a new one.
+
 **Payload Fields:**
 
 *   `project_id` (string, mandatory): The project ID from the initialized project state.
@@ -578,7 +589,7 @@ Confirms that project state has been successfully initialized for a client sessi
         *   `is_staged` (boolean): Always true for staged changes.
     *   `unstaged_changes` (array, optional): Array of unstaged file changes with same structure as staged_changes but `is_staged` is always false.
     *   `untracked_files` (array, optional): Array of untracked files with same structure as staged_changes but `is_staged` is always false and `change_type` is always 'untracked'.
-*   `open_tabs` (array, mandatory): Array of tab objects currently open. Each tab object contains:
+*   `open_tabs` (array, mandatory): Array of tab objects currently open. Internally stored as a dictionary with unique keys to prevent duplicates, but serialized as an array for API responses. Each tab object contains:
     *   `tab_id` (string, mandatory): Unique identifier for the tab.
     *   `tab_type` (string, mandatory): Type of tab ("file", "diff", "untitled", "image", "audio", "video").
     *   `title` (string, mandatory): Display title for the tab.
@@ -619,7 +630,7 @@ Sent automatically when project state changes due to file system modifications,
 *   `git_branch` (string, optional): The current Git branch name if available.
 *   `git_status_summary` (object, optional): Updated summary of Git status counts.
 *   `git_detailed_status` (object, optional): Updated detailed Git status with comprehensive file change information and content hashes (same structure as in `project_state_initialized`).
-*   `open_tabs` (array, mandatory): Updated array of tab objects currently open.
+*   `open_tabs` (array, mandatory): Updated array of tab objects currently open. Internally stored as a dictionary with unique keys to prevent duplicates, but serialized as an array for API responses.
 *   `active_tab` (object, optional): Updated active tab object.
 *   `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.

{portacode-0.3.17.dev0 → portacode-0.3.17.dev2}/portacode/connection/handlers/project_state_handlers.py

@@ -118,12 +118,12 @@ class ProjectState:
     git_branch: Optional[str] = None
     git_status_summary: Optional[Dict[str, int]] = None  # Kept for backward compatibility
     git_detailed_status: Optional[GitDetailedStatus] = None  # New detailed git state
-    open_tabs: List['TabInfo'] = None
+    open_tabs: Dict[str, 'TabInfo'] = None  # Changed from List to Dict with unique keys
     active_tab: Optional['TabInfo'] = None
     
     def __post_init__(self):
         if self.open_tabs is None:
-            self.open_tabs = []
+            self.open_tabs = {}
         if self.monitored_folders is None:
             self.monitored_folders = []
     
@@ -172,27 +172,30 @@ class GitManager:
             return {"is_tracked": False, "status": None, "is_ignored": False}
         
         try:
-            rel_path = os.path.relpath(file_path, self.repo.working_dir).replace('\\', '/')
+            rel_path = os.path.relpath(file_path, self.repo.working_dir)
             
-            # Check if ignored
+            # Check if ignored - GitPython handles path normalization internally
             is_ignored = self.repo.ignored(rel_path)
             if is_ignored:
                 return {"is_tracked": False, "status": "ignored", "is_ignored": True}
             
             # For directories, only report status if they contain tracked or untracked files
             if os.path.isdir(file_path):
-                # Check if directory contains any untracked files
-                has_untracked = any(f.startswith(rel_path + '/') for f in self.repo.untracked_files)
+                # Check if directory contains any untracked files using path.startswith()
+                # This handles cross-platform path separators correctly
+                has_untracked = any(
+                    os.path.commonpath([f, rel_path]) == rel_path and f != rel_path
+                    for f in self.repo.untracked_files
+                )
                 if has_untracked:
                     return {"is_tracked": False, "status": "untracked", "is_ignored": False}
                 
-                # Check if directory is dirty (has tracked files with changes)
+                # Check if directory is dirty - GitPython handles path normalization
                 if self.repo.is_dirty(path=rel_path):
                     return {"is_tracked": True, "status": "modified", "is_ignored": False}
                 
-                # Directory exists in git if it's clean (no changes) but not empty in index
+                # Check if directory has tracked files - let GitPython handle paths
                 try:
-                    # Simple check: if ls-files returns anything, directory has tracked content
                     tracked_files = self.repo.git.ls_files(rel_path)
                     is_tracked = bool(tracked_files.strip())
                     status = "clean" if is_tracked else None
@@ -202,15 +205,15 @@ class GitManager:
             
             # For files
             else:
-                # Check if untracked
+                # Check if untracked - direct comparison works cross-platform
                 if rel_path in self.repo.untracked_files:
                     return {"is_tracked": False, "status": "untracked", "is_ignored": False}
                 
-                # Check if tracked and dirty
+                # Check if tracked and dirty - GitPython handles path normalization
                 if self.repo.is_dirty(path=rel_path):
                     return {"is_tracked": True, "status": "modified", "is_ignored": False}
                 
-                # Check if tracked and clean
+                # Check if tracked and clean - GitPython handles paths
                 try:
                     self.repo.git.ls_files(rel_path, error_unmatch=True)
                     return {"is_tracked": True, "status": "clean", "is_ignored": False}
@@ -577,7 +580,7 @@ class ProjectStateManager:
                     "git_branch": state.git_branch,
                     "git_status_summary": state.git_status_summary,
                     "git_detailed_status": asdict(state.git_detailed_status) if state.git_detailed_status else None,
-                    "open_tabs": [self._serialize_tab_info(tab) for tab in state.open_tabs],
+                    "open_tabs": [self._serialize_tab_info(tab) for tab in state.open_tabs.values()],
                     "active_tab": self._serialize_tab_info(state.active_tab) if state.active_tab else None,
                     "monitored_folders": [asdict(mf) for mf in state.monitored_folders],
                     "items": [self._serialize_file_item(item) for item in state.items]
@@ -950,9 +953,12 @@ class ProjectStateManager:
         
         project_state = self.projects[client_session_key]
         
+        # Generate unique key for file tab
+        tab_key = generate_tab_key('file', file_path)
+        
         # Check if file is already open
-        existing_tab = next((tab for tab in project_state.open_tabs if tab.file_path == file_path and tab.tab_type == 'file'), None)
-        if existing_tab:
+        if tab_key in project_state.open_tabs:
+            existing_tab = project_state.open_tabs[tab_key]
             if set_active:
                 project_state.active_tab = existing_tab
             self._write_debug_state()
@@ -964,7 +970,7 @@ class ProjectStateManager:
         
         try:
             new_tab = await tab_factory.create_file_tab(file_path)
-            project_state.open_tabs.append(new_tab)
+            project_state.open_tabs[tab_key] = new_tab
             if set_active:
                 project_state.active_tab = new_tab
             
@@ -982,17 +988,25 @@ class ProjectStateManager:
         
         project_state = self.projects[client_session_key]
         
-        # Find and remove the tab
-        tab_to_remove = next((tab for tab in project_state.open_tabs if tab.tab_id == tab_id), None)
+        # Find and remove the tab by searching through the dictionary values
+        tab_key_to_remove = None
+        tab_to_remove = None
+        for key, tab in project_state.open_tabs.items():
+            if tab.tab_id == tab_id:
+                tab_key_to_remove = key
+                tab_to_remove = tab
+                break
+        
         if not tab_to_remove:
             return False
         
-        project_state.open_tabs.remove(tab_to_remove)
+        del project_state.open_tabs[tab_key_to_remove]
         
         # Clear active tab if it was the closed tab
         if project_state.active_tab and project_state.active_tab.tab_id == tab_id:
             # Set active tab to the last remaining tab, or None if no tabs left
-            project_state.active_tab = project_state.open_tabs[-1] if project_state.open_tabs else None
+            remaining_tabs = list(project_state.open_tabs.values())
+            project_state.active_tab = remaining_tabs[-1] if remaining_tabs else None
         
         self._write_debug_state()
         return True
@@ -1005,8 +1019,12 @@ class ProjectStateManager:
         project_state = self.projects[client_session_key]
         
         if tab_id:
-            # Find the tab by ID
-            tab = next((t for t in project_state.open_tabs if t.tab_id == tab_id), None)
+            # Find the tab by ID in the dictionary values
+            tab = None
+            for t in project_state.open_tabs.values():
+                if t.tab_id == tab_id:
+                    tab = t
+                    break
             if not tab:
                 return False
             project_state.active_tab = tab
@@ -1030,6 +1048,19 @@ class ProjectStateManager:
             logger.error("Cannot create diff tab: not a git repository")
             return False
         
+        # Generate unique key for diff tab
+        tab_key = generate_tab_key('diff', file_path, 
+                                 from_ref=from_ref, to_ref=to_ref, 
+                                 from_hash=from_hash, to_hash=to_hash)
+        
+        # Check if this diff tab is already open
+        if tab_key in project_state.open_tabs:
+            existing_tab = project_state.open_tabs[tab_key]
+            project_state.active_tab = existing_tab
+            logger.info(f"Diff tab already exists, activating: {tab_key}")
+            self._write_debug_state()
+            return True
+        
         try:
             # Get content based on the reference type
             original_content = ""
@@ -1100,7 +1131,7 @@ class ProjectStateManager:
                 'diff_timeline': True
             })
             
-            project_state.open_tabs.append(diff_tab)
+            project_state.open_tabs[tab_key] = diff_tab
             project_state.active_tab = diff_tab
             
             logger.info(f"Created timeline diff tab for: {file_path} ({from_ref} → {to_ref})")
@@ -1194,7 +1225,7 @@ class ProjectStateManager:
             "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,
-            "open_tabs": tuple((tab.tab_id, tab.tab_type, tab.title) for tab in project_state.open_tabs),
+            "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),
             "monitored_folders": tuple((mf.folder_path, mf.is_expanded) for mf in sorted(project_state.monitored_folders, key=lambda x: x.folder_path))
@@ -1218,7 +1249,7 @@ class ProjectStateManager:
             "git_branch": project_state.git_branch,
             "git_status_summary": project_state.git_status_summary,
             "git_detailed_status": asdict(project_state.git_detailed_status) if project_state.git_detailed_status else None,
-            "open_tabs": [self._serialize_tab_info(tab) for tab in project_state.open_tabs],
+            "open_tabs": [self._serialize_tab_info(tab) for tab in project_state.open_tabs.values()],
             "active_tab": self._serialize_tab_info(project_state.active_tab) if project_state.active_tab else None,
             "items": [self._serialize_file_item(item) for item in project_state.items],
             "timestamp": time.time(),
@@ -1271,6 +1302,35 @@ class ProjectStateManager:
         logger.info("Cleaned up %d project states", len(keys_to_remove))
 
 
+def generate_tab_key(tab_type: str, file_path: str, **kwargs) -> str:
+    """Generate a unique key for a tab.
+    
+    Args:
+        tab_type: Type of tab ('file', 'diff', 'untitled', etc.)
+        file_path: Path to the file
+        **kwargs: Additional parameters for diff tabs (from_ref, to_ref, from_hash, to_hash)
+    
+    Returns:
+        Unique string key for the tab
+    """
+    import uuid
+    
+    if tab_type == 'file':
+        return file_path
+    elif tab_type == 'diff':
+        from_ref = kwargs.get('from_ref', '')
+        to_ref = kwargs.get('to_ref', '')
+        from_hash = kwargs.get('from_hash', '')
+        to_hash = kwargs.get('to_hash', '')
+        return f"diff:{file_path}:{from_ref}:{to_ref}:{from_hash}:{to_hash}"
+    elif tab_type == 'untitled':
+        # For untitled tabs, use the tab_id as the key since they don't have a file path
+        return kwargs.get('tab_id', str(uuid.uuid4()))
+    else:
+        # For other tab types, use file_path if available, otherwise tab_id
+        return file_path if file_path else kwargs.get('tab_id', str(uuid.uuid4()))
+
+
 # Helper function for other handlers to get/create project state manager
 def _get_or_create_project_state_manager(context: Dict[str, Any], control_channel) -> 'ProjectStateManager':
     """Get or create project state manager with debug setup."""

{portacode-0.3.17.dev0 → portacode-0.3.17.dev2}/portacode.egg-info/PKG-INFO

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