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

claude_team_mcp/tools/spawn_workers.py

@@ -17,6 +17,7 @@ if TYPE_CHECKING:
     from ..server import AppContext
 
 from ..cli_backends import get_cli_backend
+from ..config import ConfigError, default_config, load_config
 from ..colors import generate_tab_color
 from ..formatting import format_badge_text, format_session_title
 from ..names import pick_names_for_count
@@ -58,7 +59,7 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
     async def spawn_workers(
         ctx: Context[ServerSession, "AppContext"],
         workers: list[WorkerConfig],
-        layout: Literal["auto", "new"] = "auto",
+        layout: Literal["auto", "new"] | None = None,
     ) -> dict:
         """
         Spawn Claude Code worker sessions.
@@ -83,7 +84,7 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
            - 4 workers: quad layout (2x2 grid)
 
         **tmux note:**
-           - Workers always get their own tmux window in the shared "claude-team" session.
+           - Workers get their own tmux window in a per-project claude-team session.
            - layout is ignored for tmux.
 
         **WorkerConfig fields:**
@@ -191,6 +192,18 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
         app_ctx = ctx.request_context.lifespan_context
         registry = app_ctx.registry
 
+        # Load config and apply defaults
+        try:
+            config = load_config()
+        except ConfigError as exc:
+            logger.warning("Invalid config file; using defaults: %s", exc)
+            config = default_config()
+        defaults = config.defaults
+
+        # Resolve layout from config if not explicitly provided
+        if layout is None:
+            layout = defaults.layout
+
         # Validate worker count
         if not workers:
             return error_response("At least one worker is required")
@@ -244,7 +257,10 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
 
             for i, (w, name) in enumerate(zip(workers, resolved_names)):
                 project_path = w["project_path"]
-                use_worktree = w.get("use_worktree", True)  # Default True
+                # Use config default when not explicitly set
+                use_worktree = w.get("use_worktree")
+                if use_worktree is None:
+                    use_worktree = defaults.use_worktree
                 worktree_config = w.get("worktree")
                 worktree_explicitly_requested = worktree_config is not None
                 worktree_branch = None
@@ -324,6 +340,16 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
             # Pre-generate session IDs for Stop hook injection
             session_ids = [str(uuid.uuid4())[:8] for _ in workers]
 
+            # Pre-calculate agent types for each worker (needed by profile customizations
+            # and agent startup)
+            agent_types: list[str] = []
+            for w in workers:
+                # Use config default when not explicitly set
+                agent_type = w.get("agent_type")
+                if agent_type is None:
+                    agent_type = defaults.agent_type
+                agent_types.append(agent_type)
+
             # Build profile customizations for each worker (iTerm-only)
             profile_customizations: list[object | None] = [None] * worker_count
             if isinstance(backend, ItermBackend):
@@ -335,7 +361,7 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
 
                     bead = w.get("bead")
                     annotation = w.get("annotation")
-                    agent_type = w.get("agent_type", "claude")
+                    agent_type = agent_types[i]
 
                     # Tab title
                     tab_title = format_session_title(
@@ -591,16 +617,8 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
 
                 pane_sessions = [panes[name] for name in pane_names[:worker_count]]
 
-            # Pre-calculate agent types for each worker
-            import asyncio
-
-            agent_types: list[str] = []
-
-            for i, w in enumerate(workers):
-                agent_type = w.get("agent_type", "claude")
-                agent_types.append(agent_type)
-
             # Start agent in all panes (both Claude and Codex)
+            import asyncio
             async def start_agent_for_worker(index: int) -> None:
                 session = pane_sessions[index]
                 project_path = resolved_paths[index]
@@ -618,11 +636,15 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
 
                 cli = get_cli_backend(agent_type)
                 stop_hook_marker_id = marker_id if agent_type == "claude" else None
+                # Use config default when not explicitly set
+                skip_permissions = worker_config.get("skip_permissions")
+                if skip_permissions is None:
+                    skip_permissions = defaults.skip_permissions
                 await backend.start_agent_in_session(
                     handle=session,
                     cli=cli,
                     project_path=project_path,
-                    dangerously_skip_permissions=worker_config.get("skip_permissions", False),
+                    dangerously_skip_permissions=skip_permissions,
                     env=env,
                     stop_hook_marker_id=stop_hook_marker_id,
                 )

claude_team_mcp/worktree.py

@@ -64,6 +64,20 @@ def slugify(text: str) -> str:
     return text
 
 
+def short_slug(text: str, max_length: int = 30) -> str:
+    """
+    Create a slug suitable for compact identifiers.
+
+    Truncates long slugs to keep branch and directory names short,
+    while preserving the leading portion of the slug.
+    """
+    slug = slugify(text)
+    if len(slug) <= max_length:
+        return slug
+    return slug[:max_length].rstrip("-")
+
+
+
 def ensure_gitignore_entry(repo_path: Path, entry: str) -> bool:
     """
     Ensure an entry exists in the repository's .gitignore file.
@@ -319,7 +333,7 @@ def create_local_worktree(
     if bead_id:
         # Bead-based naming: {bead_id}-{annotation}
         if annotation:
-            dir_name = f"{bead_id}-{slugify(annotation)}"
+            dir_name = f"{bead_id}-{short_slug(annotation)}"
         else:
             dir_name = bead_id
     else:
@@ -327,7 +341,7 @@ def create_local_worktree(
         short_uuid = uuid.uuid4().hex[:8]
         name_slug = slugify(worker_name)
         if annotation:
-            dir_name = f"{name_slug}-{short_uuid}-{slugify(annotation)}"
+            dir_name = f"{name_slug}-{short_uuid}-{short_slug(annotation)}"
         else:
             dir_name = f"{name_slug}-{short_uuid}"
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-team-mcp
-Version: 0.7.0
+Version: 0.8.2
 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 → claude_team_mcp-0.8.2.dist-info}/RECORD

@@ -1,38 +1,40 @@
 claude_team/__init__.py,sha256=vDgDXeillUkQr0QDv-wcscJIuSgA6lctbMQrWfxhGJ0,293
-claude_team/events.py,sha256=USQ7ywFNvDmdsD-739CEntTLVu4LDwue7J4GWgEfHMY,14899
+claude_team/events.py,sha256=u-IHZm35J6P_2040CvPQI1b32X79OvHwAlNp4-RJ3oY,15757
 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/config.py,sha256=1-aJ6cYLQfEzu52CMFvUEVa3k9xOSFSAQHhQfAKB3M4,10099
+claude_team_mcp/config_cli.py,sha256=2v2kXyK81p5CvBoclivSO9cmq2kQQt6H3PYOdirxwUA,8209
 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/server.py,sha256=Yblf5W2VpYcNitWN-iacF_zHcF35_7DZ-z-bg0MJtbQ,16363
 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/worktree.py,sha256=q05yhIqlpsG9CW-QDRq5SyqC7T3iYYxjLDkUiGX2M-g,19102
+claude_team_mcp/cli_backends/__init__.py,sha256=uPIiZ0nxzhtunMfdwfWoNmLIUb7YMaWzoaFaECChKFU,1128
 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/cli_backends/claude.py,sha256=r9CW-JHZ3nVEadjf6W0AQ2Ypt4wGCvqSKczl3cRu0MY,4312
+claude_team_mcp/cli_backends/codex.py,sha256=bQvHZFfivF8Oe92gX_3qHDeaHfABDYTjqNg_6aSMido,4479
+claude_team_mcp/issue_tracker/__init__.py,sha256=88wN3ZUUZcSh_lK2jncWH546dYXATY0FShRpAczjAQs,6101
 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/__init__.py,sha256=qH8JHQPiyisO1LPOLq6aHxGMJv_TU04uR_88k6CZw20,1351
 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/terminal_backends/tmux.py,sha256=blMb669GlGjxedOLLu35NmuZpsN74Z4bq1EmMGqO7G0,24512
 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/discover_workers.py,sha256=wR2wEPRG1jggYuWJhEqC1Sw5ZrOrm9gwgOxEY4HFTD8,11830
 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
@@ -40,13 +42,13 @@ claude_team_mcp/tools/list_worktrees.py,sha256=_EIwpwoCMLaQh4dHws-jO53MS-E-L7hC7
 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/spawn_workers.py,sha256=Md5EsEq5rhXx1WweabX8lPN-em2_s3h1C1xmYezrqS8,37723
 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.8.2.dist-info/METADATA,sha256=xihVjYbyF9NHtVtpxFUc_UdbNnLsMIfbQuLKcetgeNo,16020
+claude_team_mcp-0.8.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+claude_team_mcp-0.8.2.dist-info/entry_points.txt,sha256=cmk5dmK50RVquExT-k_J72akl3qKIerPpVqfit7kQtQ,53
+claude_team_mcp-0.8.2.dist-info/RECORD,,