fix: resolve circular imports, bump litellm, fix release tag format

.github/release-please-config.json

@@ -4,6 +4,7 @@
     ".": {
       "release-type": "python",
       "package-name": "ai-company",
+      "include-component-in-tag": false,
       "bump-minor-pre-major": true,
       "bump-patch-for-minor-pre-major": true,
       "changelog-sections": [

CLAUDE.md

@@ -66,11 +66,11 @@ curl http://localhost:3000/api/v1/health   # backend (via web proxy)
 ```text
 src/ai_company/
   api/            # Litestar REST + WebSocket API (controllers, guards, channels)
-  budget/         # Cost tracking, budget enforcement (pre-flight/in-flight checks, auto-downgrade), billing periods, cost tiers, quota/subscription tracking, CFO cost optimization (anomaly detection, efficiency analysis, downgrade recommendations, approval decisions), spending reports
+  budget/         # Cost tracking, budget enforcement (pre-flight/in-flight checks, auto-downgrade), billing periods, cost tiers, quota/subscription tracking, CFO cost optimization (anomaly detection, efficiency analysis, downgrade recommendations, approval decisions), spending reports, budget errors (BudgetExhaustedError, DailyLimitExceededError, QuotaExhaustedError)
   cli/            # CLI interface (future — thin API wrapper if needed)
   communication/  # Message bus, dispatcher, messenger, channels, delegation, loop prevention, conflict resolution, meeting protocol
   config/         # YAML company config loading and validation
-  core/           # Shared domain models and base classes
+  core/           # Shared domain models, base classes, and resilience config (RetryConfig, RateLimiterConfig)
   engine/         # Agent orchestration, execution loops, parallel execution, task decomposition, routing, task assignment, task lifecycle, recovery, shutdown, workspace isolation, coordination error classification, and prompt policy validation
   hr/             # HR engine: hiring, firing, onboarding, offboarding, agent registry, performance tracking (task metrics, collaboration scoring, trend detection), promotion/demotion (criteria evaluation, approval strategies, model mapping)
   memory/         # Persistent agent memory (Mem0 initial, custom stack future — ADR-001), retrieval pipeline (ranking, injection, context formatting, non-inferable filtering), shared org memory (org/), consolidation/archival (consolidation/)

DESIGN_SPEC.md

@@ -2775,7 +2775,8 @@ ai-company/
 │       │   ├── artifact.py         # Produced work items
 │       │   ├── role.py             # Role model
 │       │   ├── role_catalog.py     # Role catalog
-│       │   └── personality.py     # Personality compatibility scoring
+│       │   ├── personality.py     # Personality compatibility scoring
+│       │   └── resilience_config.py # RetryConfig, RateLimiterConfig (shared by config.schema + providers.resilience)
 │       ├── engine/                  # Agent orchestration, execution loops, parallel execution, task decomposition, routing, task assignment, task lifecycle, recovery, shutdown, workspace isolation, coordination error classification, and prompt policy validation
 │       │   ├── errors.py           # Engine error hierarchy
 │       │   ├── prompt.py           # System prompt builder
@@ -3048,7 +3049,6 @@ ai-company/
 │       │   │   ├── router.py      # Router orchestrator
 │       │   │   └── strategies.py  # Routing strategies
 │       │   └── resilience/         # Resilience patterns
-│       │       ├── config.py      # RetryConfig, RateLimiterConfig
 │       │       ├── errors.py      # RetryExhaustedError
 │       │       ├── rate_limiter.py # Token bucket rate limiter
 │       │       └── retry.py       # RetryHandler with backoff
@@ -3157,6 +3157,7 @@ ai-company/
 │       │   ├── enums.py            # Budget-related enums
 │       │   ├── billing.py          # Billing period computation utilities
 │       │   ├── enforcer.py         # BudgetEnforcer service (pre-flight, in-flight, auto-downgrade)
+│       │   ├── errors.py           # BudgetExhaustedError, DailyLimitExceededError, QuotaExhaustedError
 │       │   ├── optimizer.py        # CostOptimizer service — anomaly detection, efficiency analysis, downgrade recommendations, approval decisions (M5)
 │       │   ├── optimizer_models.py # CostOptimizer domain models — anomaly, efficiency, downgrade, approval, config (M5)
 │       │   ├── quota.py            # Quota/subscription models, degradation config, quota snapshots

pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
     "aiosqlite==0.22.1",
     "jinja2==3.1.6",
     "jsonschema==4.26.0",
-    "litellm==1.82.0",
+    "litellm==1.82.1",
     "litestar[standard,structlog,pydantic,brotli,prometheus]==2.21.1",
     "mcp==1.26.0",
     "pydantic==2.12.5",

src/ai_company/budget/__init__.py

@@ -38,6 +38,11 @@
 )
 from ai_company.budget.enforcer import BudgetEnforcer
 from ai_company.budget.enums import BudgetAlertLevel
+from ai_company.budget.errors import (
+    BudgetExhaustedError,
+    DailyLimitExceededError,
+    QuotaExhaustedError,
+)
 from ai_company.budget.hierarchy import (
     BudgetHierarchy,
     DepartmentBudget,
@@ -100,6 +105,7 @@
     "BudgetAlertLevel",
     "BudgetConfig",
     "BudgetEnforcer",
+    "BudgetExhaustedError",
     "BudgetHierarchy",
     "CategoryBreakdown",
     "CoordinationEfficiency",
@@ -113,6 +119,7 @@
     "CostTierDefinition",
     "CostTiersConfig",
     "CostTracker",
+    "DailyLimitExceededError",
     "DegradationAction",
     "DegradationConfig",
     "DepartmentBudget",
@@ -135,6 +142,7 @@
     "ProviderCostModel",
     "ProviderDistribution",
     "QuotaCheckResult",
+    "QuotaExhaustedError",
     "QuotaLimit",
     "QuotaSnapshot",
     "QuotaTracker",

src/ai_company/budget/enforcer.py

@@ -10,13 +10,13 @@
 
 from ai_company.budget.billing import billing_period_start, daily_period_start
 from ai_company.budget.enums import BudgetAlertLevel
-from ai_company.budget.quota import QuotaCheckResult
-from ai_company.constants import BUDGET_ROUNDING_PRECISION
-from ai_company.engine.errors import (
+from ai_company.budget.errors import (
     BudgetExhaustedError,
     DailyLimitExceededError,
     QuotaExhaustedError,
 )
+from ai_company.budget.quota import QuotaCheckResult
+from ai_company.constants import BUDGET_ROUNDING_PRECISION
 from ai_company.observability import get_logger
 from ai_company.observability.events.budget import (
     BUDGET_ALERT_THRESHOLD_CROSSED,

src/ai_company/budget/errors.py

@@ -0,0 +1,32 @@
+"""Budget-layer error hierarchy.
+
+Defines budget-specific exceptions in a leaf module with no intra-project
+imports, preventing circular dependency chains when these exceptions are
+needed by both the budget enforcer and the engine layer.
+"""
+
+
+class BudgetExhaustedError(Exception):
+    """Budget exhaustion signal.
+
+    Used in two contexts:
+
+    1. Raised directly by :meth:`BudgetEnforcer.check_can_execute`
+       when pre-flight budget checks fail (monthly hard stop or daily
+       limit exceeded).
+    2. Caught by the engine layer (``AgentEngine.run``) and converted
+       into an ``ExecutionResult`` with
+       ``TerminationReason.BUDGET_EXHAUSTED``.
+    """
+
+
+class DailyLimitExceededError(BudgetExhaustedError):
+    """Per-agent daily spending limit exceeded."""
+
+
+class QuotaExhaustedError(BudgetExhaustedError):
+    """Raised when provider quota is exhausted.
+
+    Raised for all degradation strategies. Degradation routing
+    (FALLBACK/QUEUE) is tracked in M7.
+    """

src/ai_company/config/schema.py

@@ -18,6 +18,7 @@
     WorkflowHandoff,
 )
 from ai_company.core.enums import AutonomyLevel, CompanyType, SeniorityLevel
+from ai_company.core.resilience_config import RateLimiterConfig, RetryConfig
 from ai_company.core.role import CustomRole  # noqa: TC001
 from ai_company.core.types import NotBlankStr  # noqa: TC001
 from ai_company.hr.promotion.config import PromotionConfig
@@ -35,94 +36,6 @@
 logger = get_logger(__name__)
 
 
-# ── Resilience config models ─────────────────────────────────────
-# Defined here (not in providers.resilience) to avoid circular imports
-# between config ↔ providers. Re-exported by providers.resilience.config.
-
-
-class RetryConfig(BaseModel):
-    """Configuration for automatic retry of transient provider errors.
-
-    Attributes:
-        max_retries: Maximum number of retry attempts (0 disables retries).
-        base_delay: Initial delay in seconds before the first retry.
-        max_delay: Upper bound on computed delay in seconds.
-        exponential_base: Multiplier for exponential backoff.
-        jitter: Whether to add random jitter to delay.
-    """
-
-    model_config = ConfigDict(frozen=True, allow_inf_nan=False)
-
-    max_retries: int = Field(
-        default=3,
-        ge=0,
-        le=10,
-        description="Maximum number of retry attempts (0 disables retries)",
-    )
-    base_delay: float = Field(
-        default=1.0,
-        gt=0.0,
-        description="Initial delay in seconds before the first retry",
-    )
-    max_delay: float = Field(
-        default=60.0,
-        gt=0.0,
-        description="Upper bound on computed delay in seconds",
-    )
-    exponential_base: float = Field(
-        default=2.0,
-        gt=1.0,
-        description="Multiplier for exponential backoff",
-    )
-    jitter: bool = Field(
-        default=True,
-        description="Whether to add random jitter to delay",
-    )
-
-    @model_validator(mode="after")
-    def _validate_delay_ordering(self) -> Self:
-        """Ensure base_delay does not exceed max_delay."""
-        if self.base_delay > self.max_delay:
-            msg = (
-                f"base_delay ({self.base_delay}) must be"
-                f" <= max_delay ({self.max_delay})"
-            )
-            logger.warning(
-                CONFIG_VALIDATION_FAILED,
-                model="RetryConfig",
-                field="base_delay/max_delay",
-                base_delay=self.base_delay,
-                max_delay=self.max_delay,
-                reason=msg,
-            )
-            raise ValueError(msg)
-        return self
-
-
-class RateLimiterConfig(BaseModel):
-    """Configuration for client-side rate limiting.
-
-    Attributes:
-        max_requests_per_minute: Maximum requests per minute
-            (0 means unlimited).
-        max_concurrent: Maximum concurrent in-flight requests
-            (0 means unlimited).
-    """
-
-    model_config = ConfigDict(frozen=True, allow_inf_nan=False)
-
-    max_requests_per_minute: int = Field(
-        default=0,
-        ge=0,
-        description="Maximum requests per minute (0 = unlimited)",
-    )
-    max_concurrent: int = Field(
-        default=0,
-        ge=0,
-        description="Maximum concurrent in-flight requests (0 = unlimited)",
-    )
-
-
 class ProviderModelConfig(BaseModel):
     """Configuration for a single LLM model within a provider.
 

src/ai_company/core/resilience_config.py

@@ -0,0 +1,97 @@
+"""Resilience configuration models (retry + rate limiting).
+
+Defined in ``core/`` to avoid circular imports between ``config.schema``
+and ``providers.resilience``.  Both modules import from here.
+"""
+
+from typing import Self
+
+from pydantic import BaseModel, ConfigDict, Field, model_validator
+
+from ai_company.observability import get_logger
+from ai_company.observability.events.config import CONFIG_VALIDATION_FAILED
+
+logger = get_logger(__name__)
+
+
+class RetryConfig(BaseModel):
+    """Configuration for automatic retry of transient provider errors.
+
+    Attributes:
+        max_retries: Maximum number of retry attempts (0 disables retries).
+        base_delay: Initial delay in seconds before the first retry.
+        max_delay: Upper bound on computed delay in seconds.
+        exponential_base: Multiplier for exponential backoff.
+        jitter: Whether to add random jitter to delay.
+    """
+
+    model_config = ConfigDict(frozen=True, allow_inf_nan=False)
+
+    max_retries: int = Field(
+        default=3,
+        ge=0,
+        le=10,
+        description="Maximum number of retry attempts (0 disables retries)",
+    )
+    base_delay: float = Field(
+        default=1.0,
+        gt=0.0,
+        description="Initial delay in seconds before the first retry",
+    )
+    max_delay: float = Field(
+        default=60.0,
+        gt=0.0,
+        description="Upper bound on computed delay in seconds",
+    )
+    exponential_base: float = Field(
+        default=2.0,
+        gt=1.0,
+        description="Multiplier for exponential backoff",
+    )
+    jitter: bool = Field(
+        default=True,
+        description="Whether to add random jitter to delay",
+    )
+
+    @model_validator(mode="after")
+    def _validate_delay_ordering(self) -> Self:
+        """Ensure base_delay does not exceed max_delay."""
+        if self.base_delay > self.max_delay:
+            msg = (
+                f"base_delay ({self.base_delay}) must be"
+                f" <= max_delay ({self.max_delay})"
+            )
+            logger.warning(
+                CONFIG_VALIDATION_FAILED,
+                model="RetryConfig",
+                field="base_delay/max_delay",
+                base_delay=self.base_delay,
+                max_delay=self.max_delay,
+                reason=msg,
+            )
+            raise ValueError(msg)
+        return self
+
+
+class RateLimiterConfig(BaseModel):
+    """Configuration for client-side rate limiting.
+
+    Attributes:
+        max_requests_per_minute: Maximum requests per minute
+            (0 means unlimited).
+        max_concurrent: Maximum concurrent in-flight requests
+            (0 means unlimited).
+    """
+
+    model_config = ConfigDict(frozen=True, allow_inf_nan=False)
+
+    max_requests_per_minute: int = Field(
+        default=0,
+        ge=0,
+        description="Maximum requests per minute (0 = unlimited)",
+    )
+    max_concurrent: int = Field(
+        default=0,
+        ge=0,
+        description="Maximum concurrent in-flight requests (0 = unlimited)",
+    )

src/ai_company/engine/__init__.py

@@ -55,8 +55,6 @@
     TaskStructureClassifier,
 )
 from ai_company.engine.errors import (
-    BudgetExhaustedError,
-    DailyLimitExceededError,
     DecompositionCycleError,
     DecompositionDepthError,
     DecompositionError,
@@ -67,7 +65,6 @@
     NoEligibleAgentError,
     ParallelExecutionError,
     PromptBuildError,
-    QuotaExhaustedError,
     ResourceConflictError,
     TaskAssignmentError,
     TaskRoutingError,
@@ -171,12 +168,10 @@
     "AuctionAssignmentStrategy",
     "AutoTopologyConfig",
     "BudgetChecker",
-    "BudgetExhaustedError",
     "ClassificationResult",
     "CleanupCallback",
     "CooperativeTimeoutStrategy",
     "CostOptimizedAssignmentStrategy",
-    "DailyLimitExceededError",
     "DecompositionContext",
     "DecompositionCycleError",
     "DecompositionDepthError",
@@ -221,7 +216,6 @@
     "ProgressCallback",
     "PromptBuildError",
     "PromptTokenEstimator",
-    "QuotaExhaustedError",
     "ReactLoop",
     "RecoveryResult",
     "RecoveryStrategy",