claude-team-mcp 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

claude_team_mcp/worktree.py

@@ -240,6 +240,10 @@ def create_local_worktree(
     The branch name matches the worktree directory name for consistency.
     Automatically adds .worktrees to .gitignore if not present.
 
+    If a worktree path or branch already exists, appends an incrementing
+    suffix (-1, -2, etc.) until an available name is found. This allows
+    multiple workers to work on the same bead in parallel.
+
     Args:
         repo_path: Path to the main repository
         worker_name: Name of the worker (used in fallback naming)
@@ -262,6 +266,9 @@ def create_local_worktree(
         )
         # Returns: Path("/path/to/repo/.worktrees/cic-abc-add-local-worktrees")
 
+        # If called again with same bead/annotation:
+        # Returns: Path("/path/to/repo/.worktrees/cic-abc-add-local-worktrees-1")
+
         # Without bead ID
         path = create_local_worktree(
             repo_path=Path("/path/to/repo"),
@@ -290,7 +297,6 @@ def create_local_worktree(
 
     # Worktree path inside the repo
     worktrees_dir = repo_path / LOCAL_WORKTREE_DIR
-    worktree_path = worktrees_dir / dir_name
 
     # Ensure .worktrees is in .gitignore
     ensure_gitignore_entry(repo_path, LOCAL_WORKTREE_DIR)
@@ -298,29 +304,32 @@ def create_local_worktree(
     # Ensure .worktrees directory exists
     worktrees_dir.mkdir(parents=True, exist_ok=True)
 
-    # Check if worktree already exists
-    if worktree_path.exists():
-        raise WorktreeError(f"Worktree already exists at {worktree_path}")
+    # Find an available name, handling collisions with incrementing suffix.
+    # Check both path existence and branch existence (git won't allow the same
+    # branch checked out in multiple worktrees).
+    def branch_exists(name: str) -> bool:
+        result = subprocess.run(
+            ["git", "-C", str(repo_path), "rev-parse", "--verify", f"refs/heads/{name}"],
+            capture_output=True,
+            text=True,
+        )
+        return result.returncode == 0
 
-    # Branch name matches directory name for clarity
-    branch_name = dir_name
+    base_dir_name = dir_name
+    worktree_path = worktrees_dir / dir_name
+    suffix = 0
 
-    # Build the git worktree add command
-    cmd = ["git", "-C", str(repo_path), "worktree", "add"]
+    while worktree_path.exists() or branch_exists(dir_name):
+        suffix += 1
+        dir_name = f"{base_dir_name}-{suffix}"
+        worktree_path = worktrees_dir / dir_name
 
-    # Check if branch exists
-    branch_check = subprocess.run(
-        ["git", "-C", str(repo_path), "rev-parse", "--verify", f"refs/heads/{branch_name}"],
-        capture_output=True,
-        text=True,
-    )
+    # Branch name matches directory name for clarity
+    branch_name = dir_name
 
-    if branch_check.returncode == 0:
-        # Branch exists, check it out
-        cmd.extend([str(worktree_path), branch_name])
-    else:
-        # Branch doesn't exist, create it with -b
-        cmd.extend(["-b", branch_name, str(worktree_path)])
+    # Build the git worktree add command.
+    # Branch is guaranteed not to exist (collision loop checked for it).
+    cmd = ["git", "-C", str(repo_path), "worktree", "add", "-b", branch_name, str(worktree_path)]
 
     result = subprocess.run(cmd, capture_output=True, text=True)
 

{claude_team_mcp-0.4.0.dist-info → claude_team_mcp-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-team-mcp
-Version: 0.4.0
+Version: 0.5.0
 Summary: MCP server for managing multiple Claude Code sessions via iTerm2
 Project-URL: Homepage, https://github.com/Martian-Engineering/claude-team
 Project-URL: Repository, https://github.com/Martian-Engineering/claude-team
@@ -93,7 +93,7 @@ This automatically configures the MCP server - no manual setup needed.
 Once published, install via:
 
 ```bash
-uvx --from claude-team-mcp claude-team
+uvx --from claude-team-mcp@latest claude-team
 ```
 
 ### From Source
@@ -120,7 +120,7 @@ Add to your Claude Code MCP settings. You can configure this at:
   "mcpServers": {
     "claude-team": {
       "command": "uvx",
-      "args": ["--from", "claude-team-mcp", "claude-team"]
+      "args": ["--from", "claude-team-mcp@latest", "claude-team"]
     }
   }
 }

{claude_team_mcp-0.4.0.dist-info → claude_team_mcp-0.5.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ claude_team_mcp/server.py,sha256=oOYWVJo0-P0izs1wyxeouK1MJP16-P5djRZH8trSrqM,127
 claude_team_mcp/session_state.py,sha256=OcViByS05afdiCrBNRLR9qKrAn77H-2ALTe7yHfUUDs,34837
 claude_team_mcp/subprocess_cache.py,sha256=6Q1NIMn2X5_75S4s_a9iPBka-UCz6RW0EMxPSPEaLxo,3612
 claude_team_mcp/worker_prompt.py,sha256=Cz6yByWKVLg74_Y4DiwfO1oUel0-gkHvC8RK7h1JwzM,12594
-claude_team_mcp/worktree.py,sha256=jFKLfNbuWnYyff08dSq_A3is5Hernew7yl5s-yx01Ko,16472
+claude_team_mcp/worktree.py,sha256=s5X4mePVb4AlPzYsTklLGKgLD-4GJX1iokpsF6WwrdU,17015
 claude_team_mcp/cli_backends/__init__.py,sha256=9lpklc5lGWn-AdHoVqFMHau3UgzsN276grC1istHI2k,1038
 claude_team_mcp/cli_backends/base.py,sha256=dArm2Yqjzs3smN0JpSGR79e9I_kQYJFgQ8gYpNrmS-o,3923
 claude_team_mcp/cli_backends/claude.py,sha256=5axMph_IX-wX-DMulq0B_xQ3mVbhlwZjIi_WqjQwyL4,3268
@@ -36,7 +36,7 @@ claude_team_mcp/utils/__init__.py,sha256=_O-de711DxfMdjCAHHoifyOtzdllciE9FFV-tZ5
 claude_team_mcp/utils/constants.py,sha256=R5BRg50hAkbsZFNRZye7O8bCqsCkzMGz-re_PK14USE,2465
 claude_team_mcp/utils/errors.py,sha256=9uPFHp7UJYB5t3p7P_5Sh3PVpYh4_vj_RLzX5GcJPEU,2738
 claude_team_mcp/utils/worktree_detection.py,sha256=NfEK8c_toFiz8dqF2ht1FJzW9a9VstVm7Y5SNXvwAD8,2564
-claude_team_mcp-0.4.0.dist-info/METADATA,sha256=00AjFNo5EpM1L4DCeEcXrZ1YkG44tHPxHd7lBsGEIe0,15683
-claude_team_mcp-0.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-claude_team_mcp-0.4.0.dist-info/entry_points.txt,sha256=cmk5dmK50RVquExT-k_J72akl3qKIerPpVqfit7kQtQ,53
-claude_team_mcp-0.4.0.dist-info/RECORD,,
+claude_team_mcp-0.5.0.dist-info/METADATA,sha256=_hmIf5fWm2Zm-LVyuYqkoiIayPbQlb0bMPT_kCl7aJo,15697
+claude_team_mcp-0.5.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+claude_team_mcp-0.5.0.dist-info/entry_points.txt,sha256=cmk5dmK50RVquExT-k_J72akl3qKIerPpVqfit7kQtQ,53
+claude_team_mcp-0.5.0.dist-info/RECORD,,