gobby 0.2.6__py3-none-any.whl → 0.2.8__py3-none-any.whl

gobby/mcp_proxy/tools/sessions/_commits.py

@@ -0,0 +1,239 @@
+"""Commits and workflow tools for session management.
+
+This module contains MCP tools for:
+- Getting session commits (get_session_commits)
+- Marking autonomous loop complete (mark_loop_complete)
+"""
+
+from __future__ import annotations
+
+from datetime import UTC
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from gobby.mcp_proxy.tools.internal import InternalToolRegistry
+    from gobby.storage.sessions import LocalSessionManager
+
+
+def register_commits_tools(
+    registry: InternalToolRegistry,
+    session_manager: LocalSessionManager,
+) -> None:
+    """
+    Register commits and workflow tools with a registry.
+
+    Args:
+        registry: The InternalToolRegistry to register tools with
+        session_manager: LocalSessionManager instance for session operations
+    """
+
+    def _resolve_session_id(ref: str) -> str:
+        """Resolve session reference (#N, N, UUID, or prefix) to UUID."""
+        from gobby.utils.project_context import get_project_context
+
+        project_ctx = get_project_context()
+        project_id = project_ctx.get("id") if project_ctx else None
+
+        return session_manager.resolve_session_reference(ref, project_id)
+
+    @registry.tool(
+        name="get_session_commits",
+        description="Get git commits made during a session timeframe. Accepts #N, N, UUID, or prefix for session_id.",
+    )
+    def get_session_commits(
+        session_id: str,
+        max_commits: int = 20,
+    ) -> dict[str, Any]:
+        """
+        Get git commits made during a session's active timeframe.
+
+        Uses session.created_at and session.updated_at to filter
+        git log within that timeframe.
+
+        Args:
+            session_id: Session reference - supports #N, N (seq_num), UUID, or prefix
+            max_commits: Maximum commits to return (default 20)
+
+        Returns:
+            Session ID, list of commits, and count
+        """
+        import subprocess  # nosec B404 - subprocess needed for git commands
+        from datetime import datetime
+        from pathlib import Path
+
+        if session_manager is None:
+            return {"error": "Session manager not available"}
+
+        # Resolve session reference (#N, N, UUID, or prefix)
+        try:
+            resolved_id = _resolve_session_id(session_id)
+            session = session_manager.get(resolved_id)
+        except ValueError as e:
+            return {"error": str(e)}
+
+        if not session:
+            return {"error": f"Session {session_id} not found"}
+
+        # Get working directory from transcript path or project
+        cwd = None
+        if session.jsonl_path:
+            cwd = str(Path(session.jsonl_path).parent)
+
+        # Format timestamps for git --since/--until
+        # Git expects ISO format or relative dates
+        # Session timestamps may be ISO strings or datetime objects
+        if isinstance(session.created_at, str):
+            since_time = datetime.fromisoformat(session.created_at.replace("Z", "+00:00"))
+        else:
+            since_time = session.created_at
+
+        if session.updated_at:
+            if isinstance(session.updated_at, str):
+                until_time = datetime.fromisoformat(session.updated_at.replace("Z", "+00:00"))
+            else:
+                until_time = session.updated_at
+        else:
+            until_time = datetime.now(UTC)
+
+        # Format as ISO 8601 for git
+        since_str = since_time.strftime("%Y-%m-%dT%H:%M:%S")
+        until_str = until_time.strftime("%Y-%m-%dT%H:%M:%S")
+
+        try:
+            # Get commits within timeframe
+            cmd = [
+                "git",
+                "log",
+                f"--since={since_str}",
+                f"--until={until_str}",
+                f"-{max_commits}",
+                "--format=%H|%s|%aI",  # hash|subject|author-date-iso
+            ]
+
+            result = subprocess.run(  # nosec B603 - cmd built from hardcoded git arguments
+                cmd,
+                capture_output=True,
+                text=True,
+                timeout=10,
+                cwd=cwd,
+            )
+
+            if result.returncode != 0:
+                return {
+                    "session_id": session.id,
+                    "error": "Git command failed",
+                    "stderr": result.stderr.strip(),
+                }
+
+            commits = []
+            for line in result.stdout.strip().split("\n"):
+                if "|" in line:
+                    parts = line.split("|", 2)
+                    if len(parts) >= 2:
+                        commit = {
+                            "hash": parts[0],
+                            "message": parts[1],
+                        }
+                        if len(parts) >= 3:
+                            commit["timestamp"] = parts[2]
+                        commits.append(commit)
+
+            return {
+                "session_id": session.id,
+                "commits": commits,
+                "count": len(commits),
+                "timeframe": {
+                    "since": since_str,
+                    "until": until_str,
+                },
+            }
+
+        except subprocess.TimeoutExpired:
+            return {
+                "session_id": session.id,
+                "error": "Git command timed out",
+            }
+        except FileNotFoundError:
+            return {
+                "session_id": session.id,
+                "error": "Git not found or not a git repository",
+            }
+        except Exception as e:
+            return {
+                "session_id": session.id,
+                "error": f"Failed to get commits: {e!s}",
+            }
+
+    @registry.tool(
+        name="mark_loop_complete",
+        description="""Mark the autonomous loop as complete, preventing session chaining. Accepts #N, N, UUID, or prefix for session_id.
+
+Args:
+    session_id: (REQUIRED) Your session ID. Accepts #N, N, UUID, or prefix. Get it from:
+        1. Your injected context (look for 'Session Ref: #N' or 'session_id: xxx')
+        2. Or call get_current_session(external_id, source) first""",
+    )
+    def mark_loop_complete(session_id: str) -> dict[str, Any]:
+        """
+        Mark the autonomous loop as complete for a session.
+
+        This sets stop_reason='completed' in the workflow state, which
+        signals the auto-loop workflow to NOT chain a new session
+        when this session ends.
+
+        Use this when:
+        - A task is fully complete and no more work is needed
+        - You want to exit the autonomous loop gracefully
+        - The user has explicitly asked to stop
+
+        Args:
+            session_id: Session reference - supports #N, N (seq_num), UUID, or prefix (REQUIRED)
+
+        Returns:
+            Success status and session details
+        """
+        if not session_manager:
+            return {"error": "Session manager not available"}
+
+        # Resolve session reference (#N, N, UUID, or prefix)
+        try:
+            resolved_id = _resolve_session_id(session_id)
+            session = session_manager.get(resolved_id)
+        except ValueError as e:
+            return {"error": str(e), "session_id": session_id}
+
+        if not session:
+            return {"error": f"Session {session_id} not found", "session_id": session_id}
+
+        # Load and update workflow state
+        from gobby.storage.database import LocalDatabase
+        from gobby.workflows.definitions import WorkflowState
+        from gobby.workflows.state_manager import WorkflowStateManager
+
+        db = LocalDatabase()
+        state_manager = WorkflowStateManager(db)
+
+        # Get or create state for session
+        state = state_manager.get_state(session.id)
+        if not state:
+            # Create minimal state just to hold the variable
+            state = WorkflowState(
+                session_id=session.id,
+                workflow_name="auto-loop",
+                step="active",
+            )
+
+        # Mark loop complete using the action function
+        from gobby.workflows.state_actions import mark_loop_complete as action_mark_complete
+
+        action_mark_complete(state)
+
+        # Save updated state
+        state_manager.save_state(state)
+
+        return {
+            "success": True,
+            "session_id": session.id,
+            "stop_reason": "completed",
+            "message": "Autonomous loop marked complete - session will not chain",
+        }

gobby/mcp_proxy/tools/sessions/_crud.py

@@ -0,0 +1,253 @@
+"""Session CRUD tools for session management.
+
+This module contains MCP tools for:
+- Getting session details (get_session)
+- Getting current session (get_current_session)
+- Listing sessions (list_sessions)
+- Session statistics (session_stats)
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from gobby.mcp_proxy.tools.internal import InternalToolRegistry
+    from gobby.storage.sessions import LocalSessionManager
+
+
+def register_crud_tools(
+    registry: InternalToolRegistry,
+    session_manager: LocalSessionManager,
+) -> None:
+    """
+    Register session CRUD tools with a registry.
+
+    Args:
+        registry: The InternalToolRegistry to register tools with
+        session_manager: LocalSessionManager instance for session operations
+    """
+
+    @registry.tool(
+        name="get_session",
+        description="Get session details by ID. Accepts #N (project-scoped ref), UUID, or prefix. Use the session_id from your injected context.",
+    )
+    def get_session(session_id: str) -> dict[str, Any]:
+        """
+        Get session details by session reference.
+
+        Your session_id is injected into your context at session start.
+        Look for 'Session Ref: #N' or 'session_id: xxx' in your system reminders.
+
+        Args:
+            session_id: Session reference - supports #N (project-scoped), UUID, or prefix
+
+        Returns:
+            Session dict with all fields, or error if not found
+        """
+        from gobby.utils.project_context import get_project_context
+
+        # Support #N format, UUID, and prefix matching
+        if session_manager is None:
+            return {"error": "Session manager not available"}
+
+        # Get project_id for project-scoped resolution
+        project_ctx = get_project_context()
+        project_id = project_ctx.get("id") if project_ctx else None
+
+        # Try to resolve session reference (#N, UUID, or prefix)
+        try:
+            resolved_id = session_manager.resolve_session_reference(session_id, project_id)
+            session = session_manager.get(resolved_id)
+        except ValueError:
+            session = None
+
+        if not session:
+            return {"error": f"Session {session_id} not found", "found": False}
+
+        return {
+            "found": True,
+            **session.to_dict(),
+        }
+
+    @registry.tool(
+        name="get_current_session",
+        description="""Get YOUR current session ID - the CORRECT way to look up your session.
+
+Use this when session_id wasn't in your injected context. Pass your external_id
+(from transcript path or GOBBY_SESSION_ID env) and source (claude, gemini, codex).
+
+DO NOT use list_sessions to find your session - it won't work with multiple active sessions.""",
+    )
+    def get_current_session(
+        external_id: str,
+        source: str,
+    ) -> dict[str, Any]:
+        """
+        Look up your internal session_id from external_id and source.
+
+        The agent passes external_id (from injected context or GOBBY_SESSION_ID env var)
+        and source (claude, gemini, codex). project_id and machine_id are
+        auto-resolved from config files.
+
+        Args:
+            external_id: Your CLI's session ID (from context or GOBBY_SESSION_ID env)
+            source: CLI source - "claude", "gemini", or "codex"
+
+        Returns:
+            session_id: Internal Gobby session ID (use for parent_session_id, etc.)
+            Plus basic session metadata
+        """
+        from gobby.utils.machine_id import get_machine_id
+        from gobby.utils.project_context import get_project_context
+
+        if session_manager is None:
+            return {"error": "Session manager not available"}
+
+        # Auto-resolve context
+        machine_id = get_machine_id()
+        project_ctx = get_project_context()
+        project_id = project_ctx.get("id") if project_ctx else None
+
+        if not machine_id:
+            return {"error": "Could not determine machine_id"}
+        if not project_id:
+            return {"error": "Could not determine project_id (not in a gobby project?)"}
+
+        # Use find_by_external_id with full composite key (safe lookup)
+        session = session_manager.find_by_external_id(
+            external_id=external_id,
+            machine_id=machine_id,
+            project_id=project_id,
+            source=source,
+        )
+
+        if not session:
+            return {
+                "found": False,
+                "error": "Session not found",
+                "lookup": {
+                    "external_id": external_id,
+                    "source": source,
+                    "project_id": project_id,
+                },
+            }
+
+        return {
+            "found": True,
+            "session_id": session.id,
+            "project_id": session.project_id,
+            "status": session.status,
+            "agent_run_id": session.agent_run_id,
+        }
+
+    @registry.tool(
+        name="list_sessions",
+        description="""List sessions with optional filtering.
+
+WARNING: Do NOT use this to find your own session_id!
+- `list_sessions(status="active", limit=1)` will NOT reliably return YOUR session
+- Multiple sessions can be active simultaneously (parallel agents, multiple terminals)
+- Use `get_current_session(external_id, source)` instead - it uses your unique session key
+
+This tool is for browsing/listing sessions, not for self-identification.""",
+    )
+    def list_sessions(
+        project_id: str | None = None,
+        status: str | None = None,
+        source: str | None = None,
+        limit: int = 20,
+    ) -> dict[str, Any]:
+        """
+        List sessions with filters.
+
+        Args:
+            project_id: Filter by project ID
+            status: Filter by status (active, paused, expired, archived, handoff_ready)
+            source: Filter by CLI source (claude, gemini, codex)
+            limit: Max results (default 20)
+
+        Returns:
+            List of sessions and count
+        """
+        if session_manager is None:
+            return {"error": "Session manager not available"}
+
+        sessions = session_manager.list(
+            project_id=project_id,
+            status=status,
+            source=source,
+            limit=limit,
+        )
+
+        total = session_manager.count(
+            project_id=project_id,
+            status=status,
+            source=source,
+        )
+
+        # Detect likely misuse pattern: trying to find own session
+        if status == "active" and limit == 1:
+            return {
+                "warning": (
+                    "list_sessions(status='active', limit=1) will NOT reliably get YOUR session_id! "
+                    "Multiple sessions can be active simultaneously. "
+                    "Use get_current_session(external_id='<your-external-id>', source='claude') instead."
+                ),
+                "hint": "Your external_id is in your transcript path: /path/to/<external_id>.jsonl",
+                "sessions": [s.to_dict() for s in sessions],
+                "count": len(sessions),
+                "total": total,
+                "limit": limit,
+                "filters": {
+                    "project_id": project_id,
+                    "status": status,
+                    "source": source,
+                },
+            }
+
+        return {
+            "sessions": [s.to_dict() for s in sessions],
+            "count": len(sessions),
+            "total": total,
+            "limit": limit,
+            "filters": {
+                "project_id": project_id,
+                "status": status,
+                "source": source,
+            },
+        }
+
+    @registry.tool(
+        name="session_stats",
+        description="Get session statistics for a project.",
+    )
+    def session_stats(project_id: str | None = None) -> dict[str, Any]:
+        """
+        Get session statistics.
+
+        Args:
+            project_id: Filter by project ID (optional)
+
+        Returns:
+            Statistics including total, by_status, by_source
+        """
+        if session_manager is None:
+            return {"error": "Session manager not available"}
+
+        total = session_manager.count(project_id=project_id)
+        by_status = session_manager.count_by_status()
+
+        # Count by source
+        by_source: dict[str, int] = {}
+        for src in ["claude_code", "gemini", "codex"]:
+            count = session_manager.count(project_id=project_id, source=src)
+            if count > 0:
+                by_source[src] = count
+
+        return {
+            "total": total,
+            "by_status": by_status,
+            "by_source": by_source,
+            "project_id": project_id,
+        }

gobby/mcp_proxy/tools/sessions/_factory.py

@@ -0,0 +1,63 @@
+"""Factory function for creating the session messages tool registry.
+
+Orchestrates the creation of all session tool sub-registries and merges them
+into a unified registry.
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from gobby.mcp_proxy.tools.internal import InternalToolRegistry
+from gobby.mcp_proxy.tools.sessions._commits import register_commits_tools
+from gobby.mcp_proxy.tools.sessions._crud import register_crud_tools
+from gobby.mcp_proxy.tools.sessions._handoff import register_handoff_tools
+from gobby.mcp_proxy.tools.sessions._messages import register_message_tools
+
+if TYPE_CHECKING:
+    from gobby.storage.session_messages import LocalSessionMessageManager
+    from gobby.storage.sessions import LocalSessionManager
+
+__all__ = ["create_session_messages_registry"]
+
+
+def create_session_messages_registry(
+    message_manager: LocalSessionMessageManager | None = None,
+    session_manager: LocalSessionManager | None = None,
+) -> InternalToolRegistry:
+    """
+    Create a sessions tool registry with session and message tools.
+
+    Args:
+        message_manager: LocalSessionMessageManager instance for message operations
+        session_manager: LocalSessionManager instance for session CRUD
+
+    Returns:
+        InternalToolRegistry with all session tools registered
+    """
+    registry = InternalToolRegistry(
+        name="gobby-sessions",
+        description="Session management and message querying - CRUD, retrieval, search",
+    )
+
+    # --- Message Tools ---
+    # Only register if message_manager is available
+    if message_manager is not None:
+        register_message_tools(registry, message_manager)
+
+    # --- Handoff Tools ---
+    # Only register if session_manager is available
+    if session_manager is not None:
+        register_handoff_tools(registry, session_manager)
+
+    # --- Session CRUD Tools ---
+    # Only register if session_manager is available
+    if session_manager is not None:
+        register_crud_tools(registry, session_manager)
+
+    # --- Commits Tools ---
+    # Only register if session_manager is available
+    if session_manager is not None:
+        register_commits_tools(registry, session_manager)
+
+    return registry