claude-team-mcp 0.6.1__py3-none-any.whl → 0.7.0__py3-none-any.whl

claude_team_mcp/worktree.py

@@ -224,11 +224,42 @@ def create_worktree(
     return worktree_path
 
 
+def _resolve_worktree_base(repo_path: Path, base: str) -> str:
+    # Resolve base ref to a commit hash to avoid worktree-locked branch refs.
+    def _rev_parse(ref: str) -> Optional[str]:
+        result = subprocess.run(
+            ["git", "-C", str(repo_path), "rev-parse", "--verify", ref],
+            capture_output=True,
+            text=True,
+        )
+        if result.returncode == 0:
+            return result.stdout.strip()
+        return None
+
+    commit = _rev_parse(f"{base}^{{commit}}")
+    if commit:
+        return commit
+
+    normalized_base = base.removeprefix("refs/heads/")
+    try:
+        for worktree in list_git_worktrees(repo_path):
+            if worktree.get("branch") == normalized_base and worktree.get("commit"):
+                return worktree["commit"]
+    except WorktreeError:
+        pass
+
+    raise WorktreeError(
+        f"Base ref not found: {base}. Ensure it exists locally or fetch it."
+    )
+
+
 def create_local_worktree(
     repo_path: Path,
     worker_name: str,
     bead_id: Optional[str] = None,
     annotation: Optional[str] = None,
+    branch: Optional[str] = None,
+    base: Optional[str] = None,
 ) -> Path:
     """
     Create a git worktree in the repo's .worktrees/ directory.
@@ -237,18 +268,23 @@ def create_local_worktree(
         {repo}/.worktrees/{bead_id}-{annotation}/  (if bead_id provided)
         {repo}/.worktrees/{worker_name}-{uuid}-{annotation}/  (otherwise)
 
-    The branch name matches the worktree directory name for consistency.
+    The branch name matches the worktree directory name for consistency unless
+    an explicit branch is provided.
     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.
+    If a generated 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.
+    When an explicit branch is provided, pre-existing branches are treated
+    as an error.
 
     Args:
         repo_path: Path to the main repository
         worker_name: Name of the worker (used in fallback naming)
         bead_id: Optional bead issue ID (e.g., "cic-abc123")
         annotation: Optional annotation for the worktree
+        branch: Optional branch name to create for the worktree
+        base: Optional base ref/branch for the new branch
 
     Returns:
         Path to the created worktree
@@ -319,17 +355,30 @@ def create_local_worktree(
     worktree_path = worktrees_dir / dir_name
     suffix = 0
 
-    while worktree_path.exists() or branch_exists(dir_name):
-        suffix += 1
-        dir_name = f"{base_dir_name}-{suffix}"
-        worktree_path = worktrees_dir / dir_name
+    if branch:
+        if branch_exists(branch):
+            raise WorktreeError(f"Branch already exists: {branch}")
+        while worktree_path.exists():
+            suffix += 1
+            dir_name = f"{base_dir_name}-{suffix}"
+            worktree_path = worktrees_dir / dir_name
+        branch_name = branch
+    else:
+        while worktree_path.exists() or branch_exists(dir_name):
+            suffix += 1
+            dir_name = f"{base_dir_name}-{suffix}"
+            worktree_path = worktrees_dir / dir_name
+        branch_name = dir_name
 
-    # Branch name matches directory name for clarity
-    branch_name = dir_name
+    resolved_base = None
+    if base:
+        resolved_base = _resolve_worktree_base(repo_path, base)
 
     # 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)]
+    if resolved_base:
+        cmd.append(resolved_base)
 
     result = subprocess.run(cmd, capture_output=True, text=True)
 
@@ -537,5 +586,3 @@ def list_local_worktrees(repo_path: Path) -> list[dict]:
         })
 
     return worktrees
-
-

{claude_team_mcp-0.6.1.dist-info → claude_team_mcp-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-team-mcp
-Version: 0.6.1
+Version: 0.7.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

claude_team_mcp-0.7.0.dist-info/RECORD

@@ -0,0 +1,52 @@
+claude_team/__init__.py,sha256=vDgDXeillUkQr0QDv-wcscJIuSgA6lctbMQrWfxhGJ0,293
+claude_team/events.py,sha256=USQ7ywFNvDmdsD-739CEntTLVu4LDwue7J4GWgEfHMY,14899
+claude_team/idle_detection.py,sha256=x91HZdbp01gizTYMAY2SpMFnkJBMomgi8lSafFmRoao,5627
+claude_team/poller.py,sha256=C4A6Rr_ABTC5suCGPuBhLn_-e_z5tSzSKwSYl-SERlk,8363
+claude_team_mcp/__init__.py,sha256=HnGWRX1P2CxUafElaxq6zXvXznQeUF5XiQBqu9eJU0Q,481
+claude_team_mcp/__main__.py,sha256=JOG9n8ZCjy3JN96T0n97Ro-ZWtOU-RTJks7ahz81NRM,134
+claude_team_mcp/colors.py,sha256=f-PcPep9WkZ7zbt-IF0Ey4OXfZeiY-y2uXERFtiY8Pk,3270
+claude_team_mcp/formatting.py,sha256=tcBmKyaZm15nkeJfssuIMkoFQTlmwDllf7ulZvWkcv4,3831
+claude_team_mcp/idle_detection.py,sha256=KRnhObbVM--S8HPowWq7UkjXxq5AMpGdVHY5UUv3Z0o,16331
+claude_team_mcp/iterm_utils.py,sha256=Imp4yUwq06avwdEw3bOSaO168DpCUveazc71Q8AZOFw,37621
+claude_team_mcp/names.py,sha256=qUJlO2WlFjxB4Q1vLLTcEjTvKA63fJ3i2QBz80ABgnQ,15978
+claude_team_mcp/profile.py,sha256=yqytAE0dIe6NQ6FodldSepO-ZIeR7-C0UfK3FsO7Pn4,12326
+claude_team_mcp/registry.py,sha256=LWOoXxZ2VUhY-qZbKM0riCGrDdC1EbIKrKNprafUZNY,14945
+claude_team_mcp/server.py,sha256=8cBe4hB5ipWyhxyur41pIQ-dsQY_JUOxikL4hVBfZDY,14019
+claude_team_mcp/session_state.py,sha256=DFNPWog7yyc5yF1_lMhDMcBMpCRGi22YRI6IdoIEf0o,46814
+claude_team_mcp/subprocess_cache.py,sha256=6Q1NIMn2X5_75S4s_a9iPBka-UCz6RW0EMxPSPEaLxo,3612
+claude_team_mcp/worker_prompt.py,sha256=NvzUrR6Zqjp8HuL-xOeAncdvACHbyN7O0nISWyySHq4,15771
+claude_team_mcp/worktree.py,sha256=enlgqsqAj3BaytHWd4cBOfgBDm9gKwfI5YIuQCt6MYo,18729
+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
+claude_team_mcp/cli_backends/codex.py,sha256=OTTAw9P4EKBggGmKK32-BYQkF7jpfZSOiIfa77wxG1Q,3408
+claude_team_mcp/issue_tracker/__init__.py,sha256=JYcVEdXkqDKXd9BAUoz3emYyZ9bvVRsuTB7Vxfw3jhU,3792
+claude_team_mcp/schemas/__init__.py,sha256=IingbdgdQx9C0ZLBOhZ-doqIJRbO7aeAQjuCHMuVA84,99
+claude_team_mcp/schemas/codex.py,sha256=KwUkTmD70kQLZvzl366tHAsuwKbtsk86ySTOW6b9wDk,5949
+claude_team_mcp/terminal_backends/__init__.py,sha256=g4xbZByDSkSXjRDqVMjD_0TXglq9qiOlgOGR-CtFr9Q,781
+claude_team_mcp/terminal_backends/base.py,sha256=9GrFDm-Jah8y6DALQrq8dei9UgWeZkWXYbbcrfkFAHA,3202
+claude_team_mcp/terminal_backends/iterm.py,sha256=A5klhOpzDrZ-636aN1Hlnnfxk4OA-Rz_OuaQi1ABz0Y,9317
+claude_team_mcp/terminal_backends/tmux.py,sha256=BDqq5w8Vhb3hL-5W3IUvaq2lE36WTSNx7OOf6nqbE3M,23218
+claude_team_mcp/tools/__init__.py,sha256=YPKaGC81WDHouee6MQlVOhk2teI0adYvbo949LCCKd0,1593
+claude_team_mcp/tools/adopt_worker.py,sha256=P4HlUaKqS5piOh-0Or27h935WRtkfEXtznCZ_cQF1j4,6897
+claude_team_mcp/tools/annotate_worker.py,sha256=mBo4YMaaaNQxQBduYK1DPA-Ioift-ZQ9tYlBM6S15t8,1639
+claude_team_mcp/tools/check_idle_workers.py,sha256=IjDNDeal9M7lTONWjKZrt8bXu7O277ossHz_2oyLRcY,3374
+claude_team_mcp/tools/close_workers.py,sha256=MlxyEKkDBJEP3FXY8ESQ1x7cjulzJi-fVNCsC4Z2Aig,7878
+claude_team_mcp/tools/discover_workers.py,sha256=yc-c4voHRktBYhcpg8J-EMZMerJ6TyhcZJDqv5udvq4,11834
+claude_team_mcp/tools/examine_worker.py,sha256=7Nd3EOdsGVDjMJ8ov9NhmcrjN8K9IE4i_noXHOP1uI8,1620
+claude_team_mcp/tools/issue_tracker_help.py,sha256=KxgjFhXp3NCUDjqTl3UnIiFV-Y5DM80C1EoZXfA82QM,1668
+claude_team_mcp/tools/list_workers.py,sha256=EqKXNsVH-eOmmE6YpVwgXacA7sf3nqarKETKDcdcomg,3710
+claude_team_mcp/tools/list_worktrees.py,sha256=_EIwpwoCMLaQh4dHws-jO53MS-E-L7hC7oPT7xC26lw,3665
+claude_team_mcp/tools/message_workers.py,sha256=pWZYcbDyezrNeWrkmFcLHROWtJqKmKaXgvd7aj8-h3Y,13260
+claude_team_mcp/tools/poll_worker_changes.py,sha256=xR2yeSPnM7fjKxst-DFfF4sec6wBcy_Q-V-A8iTElYQ,7770
+claude_team_mcp/tools/read_worker_logs.py,sha256=9gccM6MSaoxu97Xjsk7nUalLEU8XHV7r3SKggBRpNww,5913
+claude_team_mcp/tools/spawn_workers.py,sha256=nIZApkFoLUA22BMVc687LmvP7MG9D1simxt4sWwl0x8,36728
+claude_team_mcp/tools/wait_idle_workers.py,sha256=EAPBinBsrRtisADQJZQGPHR8CAIB6lYrXMe5DmeMciM,5279
+claude_team_mcp/utils/__init__.py,sha256=Jyc-N1RXZnMdXLjSgRBB2ih04v-h0woUzZcVYYfc7wQ,647
+claude_team_mcp/utils/constants.py,sha256=FGDHeo0reZ89365fuXJGIl2Y5MFQAoKfWtmYr7UQzhQ,5815
+claude_team_mcp/utils/errors.py,sha256=kP0MPjLIpEOZkbGAzDxonMFERbsjwfID5VVY5qAR2II,2949
+claude_team_mcp/utils/worktree_detection.py,sha256=oMGcb7p1jvr7qWs06sxUMTAV8jRialcVqziCTCdW7XU,3251
+claude_team_mcp-0.7.0.dist-info/METADATA,sha256=ffya6G-3AGXo7wuXD9EQ09wtpqxK44QyYxB0_hTRccc,16020
+claude_team_mcp-0.7.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+claude_team_mcp-0.7.0.dist-info/entry_points.txt,sha256=cmk5dmK50RVquExT-k_J72akl3qKIerPpVqfit7kQtQ,53
+claude_team_mcp-0.7.0.dist-info/RECORD,,

claude_team_mcp-0.6.1.dist-info/RECORD

@@ -1,43 +0,0 @@
-claude_team_mcp/__init__.py,sha256=HnGWRX1P2CxUafElaxq6zXvXznQeUF5XiQBqu9eJU0Q,481
-claude_team_mcp/__main__.py,sha256=JOG9n8ZCjy3JN96T0n97Ro-ZWtOU-RTJks7ahz81NRM,134
-claude_team_mcp/colors.py,sha256=f-PcPep9WkZ7zbt-IF0Ey4OXfZeiY-y2uXERFtiY8Pk,3270
-claude_team_mcp/formatting.py,sha256=tcBmKyaZm15nkeJfssuIMkoFQTlmwDllf7ulZvWkcv4,3831
-claude_team_mcp/idle_detection.py,sha256=_bYN6-43q0Klt64oOPQWY2QCtGOCdeD5j4_c3L0nf20,15869
-claude_team_mcp/iterm_utils.py,sha256=XeCVogj5kf8pBLhPtWb7nHaPKJ3R6-adND_rXf7ccmI,40248
-claude_team_mcp/names.py,sha256=qUJlO2WlFjxB4Q1vLLTcEjTvKA63fJ3i2QBz80ABgnQ,15978
-claude_team_mcp/profile.py,sha256=yqytAE0dIe6NQ6FodldSepO-ZIeR7-C0UfK3FsO7Pn4,12326
-claude_team_mcp/registry.py,sha256=y14ggF7qCia-xYYWJZhTsUAnBn5fFEkS7LspfEwhGQI,14399
-claude_team_mcp/server.py,sha256=oOYWVJo0-P0izs1wyxeouK1MJP16-P5djRZH8trSrqM,12726
-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=NvzUrR6Zqjp8HuL-xOeAncdvACHbyN7O0nISWyySHq4,15771
-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
-claude_team_mcp/cli_backends/codex.py,sha256=OTTAw9P4EKBggGmKK32-BYQkF7jpfZSOiIfa77wxG1Q,3408
-claude_team_mcp/issue_tracker/__init__.py,sha256=JYcVEdXkqDKXd9BAUoz3emYyZ9bvVRsuTB7Vxfw3jhU,3792
-claude_team_mcp/schemas/__init__.py,sha256=IingbdgdQx9C0ZLBOhZ-doqIJRbO7aeAQjuCHMuVA84,99
-claude_team_mcp/schemas/codex.py,sha256=KwUkTmD70kQLZvzl366tHAsuwKbtsk86ySTOW6b9wDk,5949
-claude_team_mcp/tools/__init__.py,sha256=qILDACyNju45dX19QOmtCnVlRWCfGx7y96h5aJ_J5OU,1506
-claude_team_mcp/tools/adopt_worker.py,sha256=oWSamOzOqnLPWADWb4tk7qSPHroxIhQXkFDnhy_EOkw,4560
-claude_team_mcp/tools/annotate_worker.py,sha256=mBo4YMaaaNQxQBduYK1DPA-Ioift-ZQ9tYlBM6S15t8,1639
-claude_team_mcp/tools/check_idle_workers.py,sha256=IjDNDeal9M7lTONWjKZrt8bXu7O277ossHz_2oyLRcY,3374
-claude_team_mcp/tools/close_workers.py,sha256=glVUNM5Q32z8DyzvNKpxExN9pDR16rzjuyzEjI-eInM,6633
-claude_team_mcp/tools/discover_workers.py,sha256=PkdnURZBex_y0kFx_pv-EgWrEbtQtsg5TjqycNs7BJI,5437
-claude_team_mcp/tools/examine_worker.py,sha256=7Nd3EOdsGVDjMJ8ov9NhmcrjN8K9IE4i_noXHOP1uI8,1620
-claude_team_mcp/tools/issue_tracker_help.py,sha256=KxgjFhXp3NCUDjqTl3UnIiFV-Y5DM80C1EoZXfA82QM,1668
-claude_team_mcp/tools/list_workers.py,sha256=6cvsgHOYtakkSgoZdYez4VEQ3I8aWAKaGWhfiZyPf2c,2390
-claude_team_mcp/tools/list_worktrees.py,sha256=_EIwpwoCMLaQh4dHws-jO53MS-E-L7hC7oPT7xC26lw,3665
-claude_team_mcp/tools/message_workers.py,sha256=02XAE2EsJkkcZdmjaxQRiyUhAFTN4uB8kYzSkOwbxk0,12220
-claude_team_mcp/tools/read_worker_logs.py,sha256=9gccM6MSaoxu97Xjsk7nUalLEU8XHV7r3SKggBRpNww,5913
-claude_team_mcp/tools/spawn_workers.py,sha256=A08erciMM-q0TCPaFeVn6KvtVerIWdlbm6bH7P_E5G8,32366
-claude_team_mcp/tools/wait_idle_workers.py,sha256=ITnhBiJYCgkz-DGJaYouAyTDh6cPIL_9RrptqC_xHu0,5232
-claude_team_mcp/utils/__init__.py,sha256=Jyc-N1RXZnMdXLjSgRBB2ih04v-h0woUzZcVYYfc7wQ,647
-claude_team_mcp/utils/constants.py,sha256=FGDHeo0reZ89365fuXJGIl2Y5MFQAoKfWtmYr7UQzhQ,5815
-claude_team_mcp/utils/errors.py,sha256=9uPFHp7UJYB5t3p7P_5Sh3PVpYh4_vj_RLzX5GcJPEU,2738
-claude_team_mcp/utils/worktree_detection.py,sha256=oMGcb7p1jvr7qWs06sxUMTAV8jRialcVqziCTCdW7XU,3251
-claude_team_mcp-0.6.1.dist-info/METADATA,sha256=Au4mhF7eDsGIyGSCerEJUjPPR3fSj_1brDFL9CoC4O8,16020
-claude_team_mcp-0.6.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-claude_team_mcp-0.6.1.dist-info/entry_points.txt,sha256=cmk5dmK50RVquExT-k_J72akl3qKIerPpVqfit7kQtQ,53
-claude_team_mcp-0.6.1.dist-info/RECORD,,