claude-team-mcp 0.9.1__py3-none-any.whl → 0.9.2__py3-none-any.whl

claude_team_mcp/registry.py

@@ -139,6 +139,7 @@ class RecoveredSession:
     coordinator_annotation: Optional[str] = None
     worktree_path: Optional[str] = None
     main_repo_path: Optional[str] = None
+    codex_jsonl_path: Optional[str] = None
 
     @staticmethod
     def map_event_state_to_status(event_state: EventState) -> SessionStatus:
@@ -178,6 +179,7 @@ class RecoveredSession:
             "worktree_path": self.worktree_path,
             "main_repo_path": self.main_repo_path,
             "agent_type": self.agent_type,
+            "codex_jsonl_path": self.codex_jsonl_path,
             # Recovery-specific fields
             "source": "event_log",
             "event_state": self.event_state,
@@ -227,6 +229,9 @@ class ManagedSession:
     # Agent type: "claude" (default) or "codex"
     agent_type: AgentType = "claude"
 
+    # Cached Codex JSONL path (discovered at spawn time via marker polling)
+    codex_jsonl_path: Optional[Path] = None
+
     def __post_init__(self):
         """Auto-populate terminal_id from terminal_session if not set."""
         if self.terminal_id is None:
@@ -255,6 +260,7 @@ class ManagedSession:
             "worktree_path": str(self.worktree_path) if self.worktree_path else None,
             "main_repo_path": str(self.main_repo_path) if self.main_repo_path else None,
             "agent_type": self.agent_type,
+            "codex_jsonl_path": str(self.codex_jsonl_path) if self.codex_jsonl_path else None,
             # Source field for distinguishing live vs recovered sessions
             "source": "registry",
         }
@@ -292,22 +298,29 @@ class ManagedSession:
         Get the path to this session's JSONL file.
 
         For Claude workers: uses marker-based discovery in ~/.claude/projects/.
-        For Codex workers: uses marker-based discovery in ~/.codex/sessions/.
+        For Codex workers: uses cached path or marker-based discovery in
+        ~/.codex/sessions/. Returns None (not a wrong file) when discovery fails.
 
         Returns:
             Path object, or None if session cannot be discovered
         """
         if self.agent_type == "codex":
-            from .idle_detection import find_codex_session_file
+            # Use cached path if available (set at spawn time)
+            if self.codex_jsonl_path and self.codex_jsonl_path.exists():
+                return self.codex_jsonl_path
 
-            # Prefer marker-based match, fall back to most recent for legacy sessions.
+            # Try marker-based discovery with generous timeout (workers can run for hours)
             match = find_codex_session_by_internal_id(
                 self.session_id,
-                max_age_seconds=600,
+                max_age_seconds=86400,
             )
             if match:
+                # Cache for future calls
+                self.codex_jsonl_path = match.jsonl_path
                 return match.jsonl_path
-            return find_codex_session_file(max_age_seconds=600)
+
+            # No blind fallback - returning None is better than returning wrong data
+            return None
         else:
             # For Claude, use marker-based discovery
             # Auto-discover if not already known
@@ -353,16 +366,10 @@ class ManagedSession:
             True if idle, False if working or session file not available
         """
         if self.agent_type == "codex":
-            from .idle_detection import find_codex_session_file, is_codex_idle
+            from .idle_detection import is_codex_idle
 
-            # Prefer marker-based match, fall back to most recent for legacy sessions.
-            match = find_codex_session_by_internal_id(
-                self.session_id,
-                max_age_seconds=600,
-            )
-            session_file = match.jsonl_path if match else None
-            if not session_file:
-                session_file = find_codex_session_file(max_age_seconds=600)
+            # Use the same path resolution as get_jsonl_path() (cached or marker-based)
+            session_file = self.get_jsonl_path()
             if not session_file:
                 return False
             return is_codex_idle(session_file)
@@ -795,6 +802,7 @@ class SessionRegistry:
             coordinator_annotation=data.get("coordinator_annotation"),
             worktree_path=data.get("worktree_path"),
             main_repo_path=data.get("main_repo_path"),
+            codex_jsonl_path=data.get("codex_jsonl_path"),
         )
 
     def count(self) -> int:

claude_team_mcp/session_state.py

@@ -838,6 +838,42 @@ async def await_marker_in_jsonl(
     return None
 
 
+async def await_codex_marker_in_jsonl(
+    session_id: str,
+    timeout: float = 30.0,
+    poll_interval: float = 0.5,
+) -> Optional[CodexSessionMatch]:
+    """
+    Poll for a Codex session marker to appear in the JSONL.
+
+    Codex workers write markers into ~/.codex/sessions/ files. This function
+    polls until the marker for the given session_id is found.
+
+    Args:
+        session_id: The internal session ID to search for in markers
+        timeout: Maximum seconds to wait (default 30)
+        poll_interval: Seconds between polls (default 0.5, slower than Claude
+            because Codex takes longer to start)
+
+    Returns:
+        CodexSessionMatch if found, None on timeout
+    """
+    import asyncio
+
+    start = time.time()
+
+    while time.time() - start < timeout:
+        match = find_codex_session_by_internal_id(
+            session_id,
+            max_age_seconds=300,
+        )
+        if match:
+            return match
+        await asyncio.sleep(poll_interval)
+
+    return None
+
+
 # =============================================================================
 # Session Discovery
 # =============================================================================

claude_team_mcp/tools/adopt_worker.py

@@ -78,7 +78,8 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
         # Check if already managed
         for managed in registry.list_all():
             if (
-                managed.terminal_session.backend_id == backend_id
+                hasattr(managed, 'terminal_session')
+                and managed.terminal_session.backend_id == backend_id
                 and managed.terminal_session.native_id == target_id
             ):
                 return error_response(

claude_team_mcp/tools/discover_workers.py

@@ -90,7 +90,7 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
         managed_ids = {
             s.terminal_session.native_id
             for s in registry.list_all()
-            if s.terminal_session.backend_id == backend_id
+            if hasattr(s, 'terminal_session') and s.terminal_session.backend_id == backend_id
         }
 
         try:

claude_team_mcp/tools/spawn_workers.py

@@ -187,7 +187,11 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
             # Then immediately:
             message_workers(session_ids=["Groucho"], message="Your task is...")
         """
-        from ..session_state import await_marker_in_jsonl, generate_marker_message
+        from ..session_state import (
+            await_codex_marker_in_jsonl,
+            await_marker_in_jsonl,
+            generate_marker_message,
+        )
 
         app_ctx = ctx.request_context.lifespan_context
         registry = app_ctx.registry
@@ -452,7 +456,7 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
                     managed_session_ids = {
                         s.terminal_session.native_id
                         for s in registry.list_all()
-                        if s.terminal_session.backend_id == backend.backend_id
+                        if hasattr(s, 'terminal_session') and s.terminal_session.backend_id == backend.backend_id
                     }
 
                     # Find a window with enough space for ALL workers
@@ -693,7 +697,7 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
                     submit=True,
                 )
 
-            # Wait for markers to appear in JSONL (Claude only)
+            # Wait for markers to appear in JSONL (Claude and Codex)
             for i, managed in enumerate(managed_sessions):
                 if managed.agent_type == "claude":
                     claude_session_id = await await_marker_in_jsonl(
@@ -709,6 +713,24 @@ def register_tools(mcp: FastMCP, ensure_connection) -> None:
                             f"Marker polling timed out for {managed.session_id}, "
                             "JSONL correlation unavailable"
                         )
+                elif managed.agent_type == "codex":
+                    # Poll for Codex marker and cache the JSONL path
+                    codex_match = await await_codex_marker_in_jsonl(
+                        managed.session_id,
+                        timeout=30.0,
+                        poll_interval=0.5,
+                    )
+                    if codex_match:
+                        managed.codex_jsonl_path = codex_match.jsonl_path
+                        logger.info(
+                            f"Codex JSONL path cached for {managed.session_id}: "
+                            f"{codex_match.jsonl_path}"
+                        )
+                    else:
+                        logger.warning(
+                            f"Codex marker polling timed out for {managed.session_id}, "
+                            "JSONL correlation unavailable"
+                        )
 
             # Send worker prompts - always use generate_worker_prompt with bead/custom_prompt
             workers_awaiting_task: list[str] = []  # Workers with no bead and no prompt

{claude_team_mcp-0.9.1.dist-info → claude_team_mcp-0.9.2.dist-info}/METADATA

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

@@ -12,9 +12,9 @@ claude_team_mcp/idle_detection.py,sha256=KRnhObbVM--S8HPowWq7UkjXxq5AMpGdVHY5UUv
 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=VGEG1eWaHW4RdBtpK6F8nc9tfm363Fl48nSu-jpHRDE,29554
+claude_team_mcp/registry.py,sha256=iJ1UApZ3zWzHWvMayyaNLoXBRE2mO9hbuD0KQ2XfmpQ,29985
 claude_team_mcp/server.py,sha256=HmpGfckw6rgXPNcJCJzLbiqsFM9yoDr05MgwonUuQNU,18969
-claude_team_mcp/session_state.py,sha256=DFNPWog7yyc5yF1_lMhDMcBMpCRGi22YRI6IdoIEf0o,46814
+claude_team_mcp/session_state.py,sha256=juDC1xpBlQpLCvZgOUTjmAb-d-RCSHRaTyn-NS-b4Hs,47819
 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=q05yhIqlpsG9CW-QDRq5SyqC7T3iYYxjLDkUiGX2M-g,19102
@@ -30,11 +30,11 @@ claude_team_mcp/terminal_backends/base.py,sha256=9GrFDm-Jah8y6DALQrq8dei9UgWeZkW
 claude_team_mcp/terminal_backends/iterm.py,sha256=A5klhOpzDrZ-636aN1Hlnnfxk4OA-Rz_OuaQi1ABz0Y,9317
 claude_team_mcp/terminal_backends/tmux.py,sha256=blMb669GlGjxedOLLu35NmuZpsN74Z4bq1EmMGqO7G0,24512
 claude_team_mcp/tools/__init__.py,sha256=NrtUzCC5Df-0GDqdQKlFqD4yv69pf5qbKIsypRxuxRg,1659
-claude_team_mcp/tools/adopt_worker.py,sha256=LuuRv9S6_ecN0vYA2ADANvuKMi64QQAMA6vRiwXaGqc,7053
+claude_team_mcp/tools/adopt_worker.py,sha256=UFgg9P_wytO98lYQVfGgPRCqaYaJJGUdt5-rYVXnwlk,7110
 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=A--QqoL5KBUFbsNNe4-SYxsKOn1plY5_IfV6wHT8gvE,8029
-claude_team_mcp/tools/discover_workers.py,sha256=3hjSBx-cuK8YXDAUQY4cRaS4VvZr61wYwpR18nIz_Uo,11986
+claude_team_mcp/tools/discover_workers.py,sha256=_QVZRGfVP0k1-ZUNix1UlsfHrdVBuyM2ohtw_h1zIv0,12021
 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=bD-i1kI_qCgFF1TJc_U5TpEc_Gk6baqkFzAInKLVJgs,4906
@@ -42,14 +42,14 @@ claude_team_mcp/tools/list_worktrees.py,sha256=EXPxzvHRX7a1c9CedBjZVn-lckiljdTH7
 claude_team_mcp/tools/message_workers.py,sha256=xa-y88gb2ugi36eRNE0ChAAZ1tJ62HuXwSlGhp7qDlE,13464
 claude_team_mcp/tools/poll_worker_changes.py,sha256=uv2-jhhJCZ4sTkuKqSBLK894GHof3Ue9roplgPwaTu0,8329
 claude_team_mcp/tools/read_worker_logs.py,sha256=Xe1Ch1ZJShI11et_beOwFL9q0WM5yMorhgDpstOd4Dw,6120
-claude_team_mcp/tools/spawn_workers.py,sha256=Md5EsEq5rhXx1WweabX8lPN-em2_s3h1C1xmYezrqS8,37723
+claude_team_mcp/tools/spawn_workers.py,sha256=PGY4-LzRnJfnWVQ4kyhNNie1HNPhbioe6dXiRDohEoM,38730
 claude_team_mcp/tools/wait_idle_workers.py,sha256=VvHeIK2BM1q6SoY0DODCeKAEkAj3-MsB6g87scu2cyM,5555
 claude_team_mcp/tools/worker_events.py,sha256=s1_pFMFrH-Kppni6RT9yzQbsJ_ChhmF8ujM2lkdEl1s,9448
 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.9.1.dist-info/METADATA,sha256=omNaScxSlSY6-VENPCe3u-gxvqcMM5dmF0Vf5MtA6Ug,21211
-claude_team_mcp-0.9.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-claude_team_mcp-0.9.1.dist-info/entry_points.txt,sha256=cmk5dmK50RVquExT-k_J72akl3qKIerPpVqfit7kQtQ,53
-claude_team_mcp-0.9.1.dist-info/RECORD,,
+claude_team_mcp-0.9.2.dist-info/METADATA,sha256=7NIO_cETJlIIft77OreT48npeIFtGXnV9NXQ0o31l5U,21211
+claude_team_mcp-0.9.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+claude_team_mcp-0.9.2.dist-info/entry_points.txt,sha256=cmk5dmK50RVquExT-k_J72akl3qKIerPpVqfit7kQtQ,53
+claude_team_mcp-0.9.2.dist-info/RECORD,,