gobby 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

gobby/adapters/codex_impl/types.py

@@ -0,0 +1,68 @@
+"""
+Type definitions and data classes for Codex adapter.
+
+Extracted from codex.py as part of Phase 3 Strangler Fig decomposition.
+These types are used throughout the Codex adapter implementation.
+"""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass, field
+from enum import Enum
+from typing import Any
+
+
+class CodexConnectionState(Enum):
+    """Connection state for the Codex app-server."""
+
+    DISCONNECTED = "disconnected"
+    CONNECTING = "connecting"
+    CONNECTED = "connected"
+    ERROR = "error"
+
+
+@dataclass
+class CodexThread:
+    """Represents a Codex conversation thread."""
+
+    id: str
+    preview: str = ""
+    model_provider: str = "openai"
+    created_at: int = 0
+
+
+@dataclass
+class CodexTurn:
+    """Represents a turn in a Codex conversation."""
+
+    id: str
+    thread_id: str
+    status: str = "pending"
+    items: list[dict[str, Any]] = field(default_factory=list)
+    error: str | None = None
+    usage: dict[str, int] | None = None
+
+
+@dataclass
+class CodexItem:
+    """Represents an item (message, tool call, etc.) in a turn."""
+
+    id: str
+    type: str  # "reasoning", "agent_message", "command_execution", "user_message", etc.
+    content: str = ""
+    status: str = "pending"
+    metadata: dict[str, Any] = field(default_factory=dict)
+
+
+# Type alias for notification handlers
+NotificationHandler = Callable[[str, dict[str, Any]], None]
+
+
+__all__ = [
+    "CodexConnectionState",
+    "CodexThread",
+    "CodexTurn",
+    "CodexItem",
+    "NotificationHandler",
+]

gobby/agents/definitions.py

@@ -8,11 +8,12 @@ lifecycle behavior, solving recursion loops in delegation.
 
 import logging
 from pathlib import Path
-from typing import Any
+from typing import Any, Literal
 
 import yaml
 from pydantic import BaseModel, Field
 
+from gobby.agents.sandbox import SandboxConfig
 from gobby.utils.project_context import get_project_context
 
 logger = logging.getLogger(__name__)
@@ -29,6 +30,15 @@ class AgentDefinition(BaseModel):
     # Execution parameters
     model: str | None = None
     mode: str = "headless"  # Default to headless for stability
+    provider: str = "claude"  # Provider: claude, gemini, codex
+
+    # Isolation configuration
+    isolation: Literal["current", "worktree", "clone"] | None = None
+    branch_prefix: str | None = None
+    base_branch: str = "main"
+
+    # Sandbox configuration
+    sandbox: SandboxConfig | None = None
 
     # Workflow configuration
     workflow: str | None = None

gobby/agents/isolation.py

@@ -0,0 +1,395 @@
+"""
+Isolation Handlers for Unified spawn_agent API.
+
+This module provides the abstraction layer for different isolation modes:
+- current: Work in the current directory (no isolation)
+- worktree: Create/reuse a git worktree for isolated work
+- clone: Create a shallow clone for full isolation
+
+Each handler implements the IsolationHandler ABC to provide:
+- Environment preparation (worktree/clone creation)
+- Context prompt building (adding isolation warnings)
+- Branch name generation
+"""
+
+import time
+from abc import ABC, abstractmethod
+from dataclasses import dataclass, field
+from typing import Any, Literal
+
+
+@dataclass
+class IsolationContext:
+    """Result of environment preparation."""
+
+    cwd: str
+    branch_name: str | None = None
+    worktree_id: str | None = None
+    clone_id: str | None = None
+    isolation_type: Literal["current", "worktree", "clone"] = "current"
+    extra: dict[str, Any] = field(default_factory=dict)
+
+
+@dataclass
+class SpawnConfig:
+    """Configuration passed to isolation handlers."""
+
+    prompt: str
+    task_id: str | None
+    task_title: str | None
+    task_seq_num: int | None
+    branch_name: str | None
+    branch_prefix: str | None
+    base_branch: str
+    project_id: str
+    project_path: str
+    provider: str
+    parent_session_id: str
+
+
+def generate_branch_name(config: SpawnConfig) -> str:
+    """
+    Auto-generate branch name from task or fallback to prefix+timestamp.
+
+    Priority:
+    1. Explicit branch_name if provided
+    2. task-{seq_num}-{slugified_title} if task info available
+    3. {branch_prefix}{timestamp} as fallback (default prefix: "agent/")
+    """
+    if config.branch_name:
+        return config.branch_name
+
+    if config.task_seq_num and config.task_title:
+        # Generate slug from task title
+        slug = config.task_title.lower().replace(" ", "-")
+        # Keep only alphanumeric and hyphens
+        slug = "".join(c for c in slug if c.isalnum() or c == "-")
+        # Truncate to 40 chars
+        slug = slug[:40]
+        return f"task-{config.task_seq_num}-{slug}"
+
+    # Fallback to prefix + timestamp
+    prefix = config.branch_prefix or "agent/"
+    return f"{prefix}{int(time.time())}"
+
+
+class IsolationHandler(ABC):
+    """Abstract base class for isolation handlers."""
+
+    @abstractmethod
+    async def prepare_environment(self, config: SpawnConfig) -> IsolationContext:
+        """
+        Prepare isolated environment (worktree/clone creation).
+
+        Args:
+            config: Spawn configuration with project and task info
+
+        Returns:
+            IsolationContext with cwd and isolation metadata
+        """
+
+    @abstractmethod
+    def build_context_prompt(self, original_prompt: str, ctx: IsolationContext) -> str:
+        """
+        Build prompt with isolation context warnings.
+
+        Args:
+            original_prompt: The original user prompt
+            ctx: Isolation context from prepare_environment
+
+        Returns:
+            Enhanced prompt with isolation context (or unchanged for current)
+        """
+
+
+class CurrentIsolationHandler(IsolationHandler):
+    """
+    No isolation - work in current directory.
+
+    This is the simplest handler that just returns the project path
+    as the working directory without any git branch changes.
+    """
+
+    async def prepare_environment(self, config: SpawnConfig) -> IsolationContext:
+        """Return project path as working directory."""
+        return IsolationContext(
+            cwd=config.project_path,
+            isolation_type="current",
+        )
+
+    def build_context_prompt(self, original_prompt: str, ctx: IsolationContext) -> str:
+        """Return prompt unchanged - no additional context needed."""
+        return original_prompt
+
+
+class WorktreeIsolationHandler(IsolationHandler):
+    """
+    Worktree isolation - create/reuse a git worktree for isolated work.
+
+    This handler:
+    - Checks for existing worktrees by branch name
+    - Creates new worktrees if needed
+    - Copies project.json and installs hooks
+    - Adds CRITICAL context warning to prompt
+    """
+
+    def __init__(
+        self,
+        git_manager: Any,  # WorktreeGitManager
+        worktree_storage: Any,  # LocalWorktreeManager
+    ) -> None:
+        """
+        Initialize WorktreeIsolationHandler with dependencies.
+
+        Args:
+            git_manager: Git manager for worktree operations
+            worktree_storage: Storage for worktree records
+        """
+        self._git_manager = git_manager
+        self._worktree_storage = worktree_storage
+
+    async def prepare_environment(self, config: SpawnConfig) -> IsolationContext:
+        """
+        Prepare worktree environment.
+
+        - Generate branch name if not provided
+        - Check for existing worktree for the branch
+        - Create new worktree if needed
+        - Return IsolationContext with worktree info
+        """
+        branch_name = generate_branch_name(config)
+
+        # Check if worktree already exists for this branch
+        existing = self._worktree_storage.get_by_branch(config.project_id, branch_name)
+        if existing:
+            # Use existing worktree
+            return IsolationContext(
+                cwd=existing.worktree_path,
+                branch_name=existing.branch_name,
+                worktree_id=existing.id,
+                isolation_type="worktree",
+                extra={"main_repo_path": self._git_manager.repo_path},
+            )
+
+        # Generate worktree path
+        from pathlib import Path
+
+        project_name = Path(self._git_manager.repo_path).name
+        worktree_path = self._generate_worktree_path(branch_name, project_name)
+
+        # Create git worktree
+        result = self._git_manager.create_worktree(
+            worktree_path=worktree_path,
+            branch_name=branch_name,
+            base_branch=config.base_branch,
+            create_branch=True,
+        )
+
+        if not result.success:
+            raise RuntimeError(f"Failed to create worktree: {result.error}")
+
+        # Record in storage
+        worktree = self._worktree_storage.create(
+            project_id=config.project_id,
+            branch_name=branch_name,
+            worktree_path=worktree_path,
+            base_branch=config.base_branch,
+            task_id=config.task_id,
+        )
+
+        return IsolationContext(
+            cwd=worktree.worktree_path,
+            branch_name=worktree.branch_name,
+            worktree_id=worktree.id,
+            isolation_type="worktree",
+            extra={"main_repo_path": self._git_manager.repo_path},
+        )
+
+    def build_context_prompt(self, original_prompt: str, ctx: IsolationContext) -> str:
+        """
+        Build prompt with CRITICAL worktree context warning.
+
+        Prepends isolation context to help the agent understand it's
+        working in a worktree, not the main repository.
+        """
+        warning = f"""CRITICAL: Worktree Context
+You are working in a git worktree, NOT the main repository.
+- Branch: {ctx.branch_name}
+- Worktree path: {ctx.cwd}
+- Main repo: {ctx.extra.get("main_repo_path", "unknown")}
+
+Changes in this worktree are isolated from the main repository.
+Commit your changes to the worktree branch when done.
+
+---
+
+"""
+        return warning + original_prompt
+
+    def _generate_worktree_path(self, branch_name: str, project_name: str) -> str:
+        """Generate a unique worktree path in temp directory."""
+        import tempfile
+
+        # Sanitize branch name for use in path
+        safe_branch = branch_name.replace("/", "-").replace("\\", "-")
+        worktree_dir = tempfile.gettempdir()
+        return f"{worktree_dir}/gobby-worktrees/{project_name}/{safe_branch}"
+
+
+class CloneIsolationHandler(IsolationHandler):
+    """
+    Clone isolation - create a shallow clone for full isolation.
+
+    This handler:
+    - Checks for existing clones by branch name
+    - Creates new shallow clones if needed
+    - Adds CRITICAL context warning to prompt
+    """
+
+    def __init__(
+        self,
+        clone_manager: Any,  # CloneGitManager
+        clone_storage: Any,  # LocalCloneManager
+    ) -> None:
+        """
+        Initialize CloneIsolationHandler with dependencies.
+
+        Args:
+            clone_manager: Git manager for clone operations
+            clone_storage: Storage for clone records
+        """
+        self._clone_manager = clone_manager
+        self._clone_storage = clone_storage
+
+    async def prepare_environment(self, config: SpawnConfig) -> IsolationContext:
+        """
+        Prepare clone environment.
+
+        - Generate branch name if not provided
+        - Check for existing clone for the branch
+        - Create new shallow clone if needed
+        - Return IsolationContext with clone info
+        """
+        branch_name = generate_branch_name(config)
+
+        # Check if clone already exists for this branch
+        existing = self._clone_storage.get_by_branch(config.project_id, branch_name)
+        if existing:
+            # Use existing clone
+            return IsolationContext(
+                cwd=existing.clone_path,
+                branch_name=existing.branch_name,
+                clone_id=existing.id,
+                isolation_type="clone",
+                extra={"source_repo": config.project_path},
+            )
+
+        # Generate clone path
+        from pathlib import Path
+
+        project_name = Path(config.project_path).name
+        clone_path = self._generate_clone_path(branch_name, project_name)
+
+        # Create shallow clone
+        result = self._clone_manager.create_clone(
+            clone_path=clone_path,
+            branch_name=branch_name,
+            base_branch=config.base_branch,
+            shallow=True,
+        )
+
+        if not result.success:
+            raise RuntimeError(f"Failed to create clone: {result.error}")
+
+        # Record in storage
+        clone = self._clone_storage.create(
+            project_id=config.project_id,
+            branch_name=branch_name,
+            clone_path=clone_path,
+            base_branch=config.base_branch,
+            task_id=config.task_id,
+        )
+
+        return IsolationContext(
+            cwd=clone.clone_path,
+            branch_name=clone.branch_name,
+            clone_id=clone.id,
+            isolation_type="clone",
+            extra={"source_repo": config.project_path},
+        )
+
+    def build_context_prompt(self, original_prompt: str, ctx: IsolationContext) -> str:
+        """
+        Build prompt with CRITICAL clone context warning.
+
+        Prepends isolation context to help the agent understand it's
+        working in a clone, not the original repository.
+        """
+        warning = f"""CRITICAL: Clone Context
+You are working in a shallow clone, NOT the original repository.
+- Branch: {ctx.branch_name}
+- Clone path: {ctx.cwd}
+- Source repo: {ctx.extra.get("source_repo", "unknown")}
+
+Changes in this clone are fully isolated from the original repository.
+Push your changes when ready to share with the original.
+
+---
+
+"""
+        return warning + original_prompt
+
+    def _generate_clone_path(self, branch_name: str, project_name: str) -> str:
+        """Generate a unique clone path in temp directory."""
+        import tempfile
+
+        # Sanitize branch name for use in path
+        safe_branch = branch_name.replace("/", "-").replace("\\", "-")
+        clone_dir = tempfile.gettempdir()
+        return f"{clone_dir}/gobby-clones/{project_name}/{safe_branch}"
+
+
+def get_isolation_handler(
+    mode: Literal["current", "worktree", "clone"],
+    *,
+    git_manager: Any | None = None,
+    worktree_storage: Any | None = None,
+    clone_manager: Any | None = None,
+    clone_storage: Any | None = None,
+) -> IsolationHandler:
+    """
+    Factory function to get the appropriate isolation handler.
+
+    Args:
+        mode: Isolation mode - 'current', 'worktree', or 'clone'
+        git_manager: Git manager for worktree operations (required for 'worktree')
+        worktree_storage: Storage for worktree records (required for 'worktree')
+        clone_manager: Git manager for clone operations (required for 'clone')
+        clone_storage: Storage for clone records (required for 'clone')
+
+    Returns:
+        IsolationHandler instance for the specified mode
+
+    Raises:
+        ValueError: If mode is unknown or required dependencies are missing
+    """
+    if mode == "current":
+        return CurrentIsolationHandler()
+
+    if mode == "worktree":
+        if git_manager is None or worktree_storage is None:
+            raise ValueError("git_manager and worktree_storage are required for worktree isolation")
+        return WorktreeIsolationHandler(
+            git_manager=git_manager,
+            worktree_storage=worktree_storage,
+        )
+
+    if mode == "clone":
+        if clone_manager is None or clone_storage is None:
+            raise ValueError("clone_manager and clone_storage are required for clone isolation")
+        return CloneIsolationHandler(
+            clone_manager=clone_manager,
+            clone_storage=clone_storage,
+        )
+
+    raise ValueError(f"Unknown isolation mode: {mode}")

gobby/agents/runner.py

@@ -607,6 +607,14 @@ class AgentRunner:
             else:
                 self._session_storage.update_status(child_session.id, "failed")
 
+            # Persist cost to session storage for budget tracking
+            if result.cost_info and result.cost_info.total_cost > 0:
+                self._session_storage.add_cost(child_session.id, result.cost_info.total_cost)
+                self.logger.debug(
+                    f"Persisted cost ${result.cost_info.total_cost:.4f} "
+                    f"for session {child_session.id}"
+                )
+
             # Remove from in-memory tracking
             self._untrack_running_agent(agent_run.id)