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

gobby/conductor/token_tracker.py

@@ -0,0 +1,160 @@
+"""Session-based token tracking for budget management.
+
+This module provides SessionTokenTracker which aggregates usage from sessions
+over time and enables budget tracking for agent spawning decisions.
+"""
+
+from __future__ import annotations
+
+import logging
+from dataclasses import dataclass, field
+from datetime import UTC, datetime, timedelta
+from typing import Any
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class SessionTokenTracker:
+    """Track token usage from sessions for budget management.
+
+    This class aggregates usage data from sessions over time and provides
+    budget checking for agent spawning decisions.
+
+    Example:
+        tracker = SessionTokenTracker(
+            session_storage=session_manager,
+            daily_budget_usd=10.0,
+        )
+
+        # Get usage summary for last 7 days
+        summary = tracker.get_usage_summary(days=7)
+
+        # Check if we can spawn an agent
+        can_spawn, reason = tracker.can_spawn_agent()
+    """
+
+    session_storage: Any  # LocalSessionManager
+    daily_budget_usd: float = 50.0  # Default daily budget in USD
+
+    # Cached data
+    _usage_cache: dict[str, Any] = field(default_factory=dict)
+    _cache_time: datetime | None = field(default=None)
+    _cache_ttl_seconds: int = 60  # Cache for 60 seconds
+
+    def get_usage_summary(self, days: int = 1) -> dict[str, Any]:
+        """Get usage summary for the specified number of days.
+
+        Args:
+            days: Number of days to look back (default: 1 = today)
+
+        Returns:
+            Dict with total cost, tokens, session count, and model breakdown
+        """
+        since = datetime.now(UTC) - timedelta(days=days)
+        sessions = self.session_storage.get_sessions_since(since)
+
+        total_cost = 0.0
+        total_input_tokens = 0
+        total_output_tokens = 0
+        total_cache_creation_tokens = 0
+        total_cache_read_tokens = 0
+        usage_by_model: dict[str, dict[str, Any]] = {}
+
+        for session in sessions:
+            # Safely handle None values by defaulting to 0
+            total_cost += session.usage_total_cost_usd or 0
+            total_input_tokens += session.usage_input_tokens or 0
+            total_output_tokens += session.usage_output_tokens or 0
+            total_cache_creation_tokens += session.usage_cache_creation_tokens or 0
+            total_cache_read_tokens += session.usage_cache_read_tokens or 0
+
+            # Aggregate by model
+            model = session.model or "unknown"
+            if model not in usage_by_model:
+                usage_by_model[model] = {
+                    "cost": 0.0,
+                    "input_tokens": 0,
+                    "output_tokens": 0,
+                    "sessions": 0,
+                }
+
+            usage_by_model[model]["cost"] += session.usage_total_cost_usd or 0
+            usage_by_model[model]["input_tokens"] += session.usage_input_tokens or 0
+            usage_by_model[model]["output_tokens"] += session.usage_output_tokens or 0
+            usage_by_model[model]["sessions"] += 1
+
+        return {
+            "total_cost_usd": total_cost,
+            "total_input_tokens": total_input_tokens,
+            "total_output_tokens": total_output_tokens,
+            "total_cache_creation_tokens": total_cache_creation_tokens,
+            "total_cache_read_tokens": total_cache_read_tokens,
+            "session_count": len(sessions),
+            "usage_by_model": usage_by_model,
+            "period_days": days,
+        }
+
+    def get_budget_status(self) -> dict[str, Any]:
+        """Get current budget status for today.
+
+        Returns:
+            Dict with budget info: daily_budget_usd, used_today_usd,
+            remaining_usd, percentage_used, over_budget
+        """
+        summary = self.get_usage_summary(days=1)
+        used_today = summary["total_cost_usd"]
+
+        # Handle unlimited budget (daily_budget_usd <= 0)
+        if self.daily_budget_usd <= 0:
+            return {
+                "daily_budget_usd": self.daily_budget_usd,
+                "used_today_usd": used_today,
+                "remaining_usd": float("inf"),
+                "percentage_used": 0.0,
+                "over_budget": False,
+            }
+
+        remaining = self.daily_budget_usd - used_today
+
+        return {
+            "daily_budget_usd": self.daily_budget_usd,
+            "used_today_usd": used_today,
+            "remaining_usd": remaining,
+            "percentage_used": (used_today / self.daily_budget_usd * 100),
+            "over_budget": used_today > self.daily_budget_usd,
+        }
+
+    def can_spawn_agent(self, estimated_cost: float | None = None) -> tuple[bool, str | None]:
+        """Check if we can spawn an agent based on budget.
+
+        Args:
+            estimated_cost: Optional estimated cost for the agent run
+
+        Returns:
+            Tuple of (can_spawn, reason if not)
+        """
+        # Unlimited budget (0 or negative means no limit)
+        if self.daily_budget_usd <= 0.0:
+            return True, None
+
+        status = self.get_budget_status()
+
+        # Already over budget
+        if status["over_budget"]:
+            return (
+                False,
+                f"Daily budget exceeded: ${status['used_today_usd']:.2f} used "
+                f"of ${self.daily_budget_usd:.2f}",
+            )
+
+        # Check if estimated cost would exceed budget
+        if estimated_cost is not None:
+            if status["used_today_usd"] + estimated_cost > self.daily_budget_usd:
+                return (
+                    False,
+                    f"Estimated cost ${estimated_cost:.2f} would exceed budget. "
+                    f"Remaining: ${status['remaining_usd']:.2f}",
+                )
+
+        return True, None

gobby/config/__init__.py

@@ -14,116 +14,31 @@ Module structure:
 - extensions.py: Hook extension configs (webhooks, plugins)
 - sessions.py: Session lifecycle and tracking configs
 - features.py: MCP proxy feature configs (code execution, tool recommendation)
+
+Import from submodules directly for specific configs:
+    from gobby.config.tasks import TaskValidationConfig
+    from gobby.config.extensions import WebhooksConfig
+
+Import from this package for app-level items:
+    from gobby.config import DaemonConfig, load_config
 """
 
 # Core configuration and utilities from app.py
 from gobby.config.app import (
     DaemonConfig,
     expand_env_vars,
+    generate_default_config,
     load_config,
+    load_yaml,
     save_config,
 )
 
-# Extension configs
-from gobby.config.extensions import (
-    HookExtensionsConfig,
-    PluginItemConfig,
-    PluginsConfig,
-    WebhookEndpointConfig,
-    WebhooksConfig,
-    WebSocketBroadcastConfig,
-)
-
-# Feature configs
-from gobby.config.features import (
-    ImportMCPServerConfig,
-    MetricsConfig,
-    ProjectVerificationConfig,
-    RecommendToolsConfig,
-    ToolSummarizerConfig,
-)
-
-# LLM provider configs
-from gobby.config.llm_providers import (
-    LLMProviderConfig,
-    LLMProvidersConfig,
-)
-
-# Logging configs
-from gobby.config.logging import LoggingSettings
-
-# Persistence configs
-from gobby.config.persistence import (
-    MemoryConfig,
-    MemorySyncConfig,
-)
-
-# Server configs
-from gobby.config.servers import (
-    MCPClientProxyConfig,
-    WebSocketSettings,
-)
-
-# Session configs
-from gobby.config.sessions import (
-    ContextInjectionConfig,
-    MessageTrackingConfig,
-    SessionLifecycleConfig,
-    SessionSummaryConfig,
-    TitleSynthesisConfig,
-)
-
-# Task configs
-from gobby.config.tasks import (
-    CompactHandoffConfig,
-    GobbyTasksConfig,
-    PatternCriteriaConfig,
-    TaskExpansionConfig,
-    TaskValidationConfig,
-    WorkflowConfig,
-)
-
 __all__ = [
-    # Core
+    # Core app-level exports only
     "DaemonConfig",
     "expand_env_vars",
+    "generate_default_config",
     "load_config",
+    "load_yaml",
     "save_config",
-    # Extension configs
-    "HookExtensionsConfig",
-    "PluginItemConfig",
-    "PluginsConfig",
-    "WebhookEndpointConfig",
-    "WebhooksConfig",
-    "WebSocketBroadcastConfig",
-    # Feature configs
-    "ImportMCPServerConfig",
-    "MetricsConfig",
-    "ProjectVerificationConfig",
-    "RecommendToolsConfig",
-    "ToolSummarizerConfig",
-    # LLM provider configs
-    "LLMProviderConfig",
-    "LLMProvidersConfig",
-    # Logging configs
-    "LoggingSettings",
-    # Persistence configs
-    "MemoryConfig",
-    "MemorySyncConfig",
-    # Server configs
-    "MCPClientProxyConfig",
-    "WebSocketSettings",
-    # Session configs
-    "ContextInjectionConfig",
-    "MessageTrackingConfig",
-    "SessionLifecycleConfig",
-    "SessionSummaryConfig",
-    "TitleSynthesisConfig",
-    # Task configs
-    "CompactHandoffConfig",
-    "GobbyTasksConfig",
-    "PatternCriteriaConfig",
-    "TaskExpansionConfig",
-    "TaskValidationConfig",
-    "WorkflowConfig",
 ]

gobby/config/app.py

@@ -15,14 +15,8 @@ from typing import Any
 import yaml
 from pydantic import BaseModel, Field, field_validator
 
-from gobby.config.extensions import (
-    HookExtensionsConfig,
-    PluginItemConfig,
-    PluginsConfig,
-    WebhookEndpointConfig,
-    WebhooksConfig,
-    WebSocketBroadcastConfig,
-)
+# Internal imports for DaemonConfig fields - NOT re-exported
+from gobby.config.extensions import HookExtensionsConfig
 from gobby.config.features import (
     ImportMCPServerConfig,
     MetricsConfig,
@@ -31,14 +25,10 @@ from gobby.config.features import (
     TaskDescriptionConfig,
     ToolSummarizerConfig,
 )
-
-# Re-export from extracted modules (Strangler Fig pattern for backwards compatibility)
-from gobby.config.llm_providers import LLMProviderConfig, LLMProvidersConfig
+from gobby.config.llm_providers import LLMProvidersConfig
 from gobby.config.logging import LoggingSettings
-from gobby.config.persistence import (
-    MemoryConfig,
-    MemorySyncConfig,
-)
+from gobby.config.persistence import MemoryConfig, MemorySyncConfig
+from gobby.config.search import SearchConfig
 from gobby.config.servers import MCPClientProxyConfig, WebSocketSettings
 from gobby.config.sessions import (
     ArtifactHandoffConfig,
@@ -48,57 +38,12 @@ from gobby.config.sessions import (
     SessionSummaryConfig,
     TitleSynthesisConfig,
 )
-from gobby.config.tasks import (
-    CompactHandoffConfig,
-    GobbyTasksConfig,
-    PatternCriteriaConfig,
-    TaskExpansionConfig,
-    TaskValidationConfig,
-    WorkflowConfig,
-)
+from gobby.config.skills import SkillsConfig
+from gobby.config.tasks import CompactHandoffConfig, GobbyTasksConfig, WorkflowConfig
 
-# Explicit exports for mypy (re-exported symbols from submodules)
 __all__ = [
-    # From gobby.config.extensions
-    "HookExtensionsConfig",
-    "PluginItemConfig",
-    "PluginsConfig",
-    "WebhookEndpointConfig",
-    "WebhooksConfig",
-    "WebSocketBroadcastConfig",
-    # From gobby.config.features
-    "ImportMCPServerConfig",
-    "MetricsConfig",
-    "ProjectVerificationConfig",
-    "RecommendToolsConfig",
-    "TaskDescriptionConfig",
-    "ToolSummarizerConfig",
-    # From gobby.config.llm_providers
-    "LLMProviderConfig",
-    "LLMProvidersConfig",
-    # From gobby.config.logging
-    "LoggingSettings",
-    # From gobby.config.persistence
-    "MemoryConfig",
-    "MemorySyncConfig",
-    # From gobby.config.servers
-    "MCPClientProxyConfig",
-    "WebSocketSettings",
-    # From gobby.config.sessions
-    "ArtifactHandoffConfig",
-    "ContextInjectionConfig",
-    "MessageTrackingConfig",
-    "SessionLifecycleConfig",
-    "SessionSummaryConfig",
-    "TitleSynthesisConfig",
-    # From gobby.config.tasks
-    "CompactHandoffConfig",
-    "GobbyTasksConfig",
-    "PatternCriteriaConfig",
-    "TaskExpansionConfig",
-    "TaskValidationConfig",
-    "WorkflowConfig",
-    # Local definitions
+    # Local definitions only - no re-exports
+    "ConductorConfig",
     "DaemonConfig",
     "expand_env_vars",
     "load_yaml",
@@ -114,6 +59,37 @@ __all__ = [
 ENV_VAR_PATTERN = re.compile(r"\$\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\}")
 
 
+class ConductorConfig(BaseModel):
+    """
+    Configuration for the Conductor orchestration system.
+
+    Controls token budget management and agent spawning throttling.
+    """
+
+    daily_budget_usd: float = Field(
+        default=50.0,
+        ge=0.0,
+        description="Daily budget limit in USD. Set to 0 for unlimited.",
+    )
+    warning_threshold: float = Field(
+        default=0.8,
+        ge=0.0,
+        le=1.0,
+        description="Budget percentage at which to issue warnings (0.0-1.0).",
+    )
+    throttle_threshold: float = Field(
+        default=0.9,
+        ge=0.0,
+        le=1.0,
+        description="Budget percentage at which to throttle agent spawning (0.0-1.0).",
+    )
+    tracking_window_days: int = Field(
+        default=7,
+        gt=0,
+        description="Number of days to track usage for reporting.",
+    )
+
+
 def expand_env_vars(content: str) -> str:
     """
     Expand environment variables in configuration content.
@@ -146,32 +122,6 @@ def expand_env_vars(content: str) -> str:
     return ENV_VAR_PATTERN.sub(replace_match, content)
 
 
-# WebSocketSettings moved to gobby.config.servers (re-exported above)
-# LoggingSettings moved to gobby.config.logging (re-exported above)
-# CompactHandoffConfig moved to gobby.config.tasks (re-exported above)
-
-# ContextInjectionConfig, SessionSummaryConfig, TitleSynthesisConfig,
-# MessageTrackingConfig, SessionLifecycleConfig
-# moved to gobby.config.sessions (re-exported above)
-
-# ToolSummarizerConfig, RecommendToolsConfig, ImportMCPServerConfig,
-# MetricsConfig, ProjectVerificationConfig
-# moved to gobby.config.features (re-exported above)
-
-# WebSocketBroadcastConfig, WebhookEndpointConfig, WebhooksConfig,
-# PluginItemConfig, PluginsConfig, HookExtensionsConfig
-# moved to gobby.config.extensions (re-exported above)
-
-# PatternCriteriaConfig, TaskExpansionConfig, TaskValidationConfig, WorkflowConfig,
-# GobbyTasksConfig, CompactHandoffConfig
-# moved to gobby.config.tasks (re-exported above)
-
-# MCPClientProxyConfig moved to gobby.config.servers (re-exported above)
-# LLMProviderConfig and LLMProvidersConfig moved to gobby.config.llm_providers (re-exported above)
-# MemoryConfig, MemorySyncConfig
-# moved to gobby.config.persistence (re-exported above)
-
-
 class DaemonConfig(BaseModel):
     """
     Main configuration for Gobby daemon.
@@ -188,19 +138,27 @@ class DaemonConfig(BaseModel):
 
     # Daemon settings
     daemon_port: int = Field(
-        default=8765,
+        default=60887,
         description="Port for daemon to listen on",
     )
     daemon_health_check_interval: float = Field(
         default=10.0,
         description="Daemon health check interval in seconds",
     )
+    test_mode: bool = Field(
+        default=False,
+        description="Run daemon in test mode (enables test endpoints)",
+    )
 
     # Local storage
     database_path: str = Field(
         default="~/.gobby/gobby-hub.db",
         description="Path to hub database for cross-project queries.",
     )
+    use_flattened_baseline: bool = Field(
+        default=True,
+        description="Use flattened V2 baseline schema (v75) for new databases instead of legacy migrations.",
+    )
 
     # Sub-configs
     websocket: WebSocketSettings = Field(
@@ -279,6 +237,10 @@ class DaemonConfig(BaseModel):
         default_factory=MemorySyncConfig,
         description="Memory synchronization configuration",
     )
+    skills: SkillsConfig = Field(
+        default_factory=SkillsConfig,
+        description="Skills injection configuration",
+    )
     message_tracking: MessageTrackingConfig = Field(
         default_factory=MessageTrackingConfig,
         description="Session message tracking configuration",
@@ -295,6 +257,14 @@ class DaemonConfig(BaseModel):
         default_factory=ProjectVerificationConfig,
         description="Default verification commands for projects without auto-detected config",
     )
+    conductor: ConductorConfig = Field(
+        default_factory=ConductorConfig,
+        description="Conductor orchestration system configuration",
+    )
+    search: SearchConfig = Field(
+        default_factory=SearchConfig,
+        description="Unified search configuration with embedding fallback",
+    )
 
     def get_recommend_tools_config(self) -> RecommendToolsConfig:
         """Get recommend_tools configuration."""
@@ -324,6 +294,10 @@ class DaemonConfig(BaseModel):
         """Get memory sync configuration."""
         return self.memory_sync
 
+    def get_skills_config(self) -> SkillsConfig:
+        """Get skills configuration."""
+        return self.skills
+
     def get_gobby_tasks_config(self) -> GobbyTasksConfig:
         """Get gobby-tasks configuration."""
         return self.gobby_tasks
@@ -336,6 +310,10 @@ class DaemonConfig(BaseModel):
         """Get default verification commands configuration."""
         return self.verification_defaults
 
+    def get_search_config(self) -> SearchConfig:
+        """Get search configuration."""
+        return self.search
+
     @field_validator("daemon_port")
     @classmethod
     def validate_port(cls, v: int) -> int:

gobby/config/extensions.py

@@ -137,8 +137,8 @@ class PluginsConfig(BaseModel):
         description="Enable plugin system (disabled by default for security)",
     )
     plugin_dirs: list[str] = Field(
-        default_factory=lambda: ["~/.gobby/plugins", ".gobby/plugins"],
-        description="Directories to scan for plugins (supports ~ expansion)",
+        default_factory=lambda: [".gobby/plugins"],
+        description="Directories to scan for plugins (project-scoped)",
     )
     auto_discover: bool = Field(
         default=True,