devcouncil 0.1.0 → 0.1.1

package/pyproject.toml

@@ -1,31 +1,34 @@
-[project]
-name = "devcouncil"
-version = "0.1.0"
-description = "Gated orchestrator for AI-assisted software development"
-readme = "README.md"
-requires-python = ">=3.12"
-dependencies = [
-    "typer>=0.12.3",
-    "rich>=13.7.1",
-    "pydantic>=2.7.1",
-    "pyyaml>=6.0.1",
+[project]
+name = "devcouncil"
+version = "0.1.1"
+description = "Gated orchestrator for AI-assisted software development"
+readme = "README.md"
+requires-python = ">=3.12"
+dependencies = [
+    "typer>=0.12.3",
+    "rich>=13.7.1",
+    "pydantic>=2.7.1",
+    "pyyaml>=6.0.1",
     "sqlmodel>=0.0.19",
     "httpx>=0.27.0",
     "gitpython>=3.1.43",
     "mcp>=1.27.0",
 ]
-
-[project.scripts]
-dev = "devcouncil.cli.main:app"
-devcouncil = "devcouncil.cli.main:app"
-
-[dependency-groups]
-dev = [
-    "pytest>=8.2.0",
-    "ruff>=0.4.4",
-    "mypy>=1.10.0",
-]
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
+
+[project.scripts]
+dev = "devcouncil.cli.main:app"
+devcouncil = "devcouncil.cli.main:app"
+
+[dependency-groups]
+dev = [
+    "pytest>=8.2.0",
+    "ruff>=0.4.4",
+    "mypy>=1.10.0",
+]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"

package/src/devcouncil/__main__.py

@@ -1,4 +1,4 @@
-from devcouncil.cli.main import app
-
-if __name__ == "__main__":
-    app()
+from devcouncil.cli.main import app
+
+if __name__ == "__main__":
+    app()

package/src/devcouncil/app/__init__.py

@@ -1,28 +1,28 @@
-from devcouncil.app.state_machine import StateMachine, ProjectPhase
-from devcouncil.app.run_context import RunContext
-from devcouncil.app.orchestrator import Orchestrator
-from devcouncil.app.events import EventBus, bus, EventTypes
-from devcouncil.app.errors import (
-    DevCouncilError,
-    GatingError,
-    ConfigurationError,
-    OrchestrationError,
-    ExecutionError,
-    VerificationError,
-)
-
-__all__ = [
-    "StateMachine",
-    "ProjectPhase",
-    "RunContext",
-    "Orchestrator",
-    "EventBus",
-    "bus",
-    "EventTypes",
-    "DevCouncilError",
-    "GatingError",
-    "ConfigurationError",
-    "OrchestrationError",
-    "ExecutionError",
-    "VerificationError",
-]
+from devcouncil.app.state_machine import StateMachine, ProjectPhase
+from devcouncil.app.run_context import RunContext
+from devcouncil.app.orchestrator import Orchestrator
+from devcouncil.app.events import EventBus, bus, EventTypes
+from devcouncil.app.errors import (
+    DevCouncilError,
+    GatingError,
+    ConfigurationError,
+    OrchestrationError,
+    ExecutionError,
+    VerificationError,
+)
+
+__all__ = [
+    "StateMachine",
+    "ProjectPhase",
+    "RunContext",
+    "Orchestrator",
+    "EventBus",
+    "bus",
+    "EventTypes",
+    "DevCouncilError",
+    "GatingError",
+    "ConfigurationError",
+    "OrchestrationError",
+    "ExecutionError",
+    "VerificationError",
+]

package/src/devcouncil/app/config.py

@@ -1,58 +1,58 @@
-"""Typed configuration loader with Pydantic validation.
-
-Replaces scattered yaml.safe_load() calls with a single validated config service.
-"""
-
-from __future__ import annotations
-
-import os
-from pathlib import Path
-from typing import Dict, List
-
+"""Typed configuration loader with Pydantic validation.
+
+Replaces scattered yaml.safe_load() calls with a single validated config service.
+"""
+
+from __future__ import annotations
+
+import os
+from pathlib import Path
+from typing import Dict, List
+
 from pydantic import BaseModel, Field
-
-
-class ModelRoleConfig(BaseModel):
-    model: str
-    temperature: float = 0.0
-
-
-class ModelsConfig(BaseModel):
-    provider: str = "openrouter"
-    roles: Dict[str, ModelRoleConfig] = Field(default_factory=dict)
-
-
-class ProjectConfig(BaseModel):
-    name: str = "devcouncil-project"
-    root: str = "."
-    default_branch: str = "main"
-
-
-class CommandsConfig(BaseModel):
-    test: List[str] = Field(default_factory=list)
-    lint: List[str] = Field(default_factory=list)
-    typecheck: List[str] = Field(default_factory=list)
-
-
-class GatesConfig(BaseModel):
-    require_clean_git_before_task: bool = True
-    block_orphan_diffs: bool = True
-    block_missing_tests_for_high_requirements: bool = True
-    block_dependency_changes_without_approval: bool = True
-    block_schema_change_without_migration: bool = True
-    block_failed_commands: bool = True
-
-
-class ExecutionConfig(BaseModel):
-    default_executor: str = "manual"
-    max_repair_attempts: int = 3
-    checkpoint_before_each_task: bool = True
-    command_timeout: int = 300
-
-
+
+
+class ModelRoleConfig(BaseModel):
+    model: str
+    temperature: float = 0.0
+
+
+class ModelsConfig(BaseModel):
+    provider: str = "openrouter"
+    roles: Dict[str, ModelRoleConfig] = Field(default_factory=dict)
+
+
+class ProjectConfig(BaseModel):
+    name: str = "devcouncil-project"
+    root: str = "."
+    default_branch: str = "main"
+
+
+class CommandsConfig(BaseModel):
+    test: List[str] = Field(default_factory=list)
+    lint: List[str] = Field(default_factory=list)
+    typecheck: List[str] = Field(default_factory=list)
+
+
+class GatesConfig(BaseModel):
+    require_clean_git_before_task: bool = True
+    block_orphan_diffs: bool = True
+    block_missing_tests_for_high_requirements: bool = True
+    block_dependency_changes_without_approval: bool = True
+    block_schema_change_without_migration: bool = True
+    block_failed_commands: bool = True
+
+
+class ExecutionConfig(BaseModel):
+    default_executor: str = "manual"
+    max_repair_attempts: int = 3
+    checkpoint_before_each_task: bool = True
+    command_timeout: int = 300
+
+
 class PrivacyConfig(BaseModel):
-    redact_env_vars: bool = True
-    redact_secrets_in_logs: bool = True
+    redact_env_vars: bool = True
+    redact_secrets_in_logs: bool = True
     store_prompts_locally: bool = True
 
 
@@ -68,64 +68,91 @@ class CodeReviewGraphIntegrationConfig(BaseModel):
     optional: bool = True
 
 
+class LiveReviewIntegrationConfig(BaseModel):
+    enabled: bool = True
+    cards_path: str = ".devcouncil/live/cards"
+    signals_path: str = ".devcouncil/live/signals"
+    default_client: str = "claude"
+
+
 class IntegrationsConfig(BaseModel):
     agent_flow: AgentFlowIntegrationConfig = Field(default_factory=AgentFlowIntegrationConfig)
     code_review_graph: CodeReviewGraphIntegrationConfig = Field(default_factory=CodeReviewGraphIntegrationConfig)
-
-
-class ProviderConfig(BaseModel):
-    sort: str = "price"
-    allow_fallbacks: bool = True
-    require_parameters: bool = True
-    data_collection: str = "deny"
-
-
-class DevCouncilConfig(BaseModel):
-    """Top-level validated configuration."""
-
-    project: ProjectConfig = Field(default_factory=ProjectConfig)
-    models: ModelsConfig = Field(default_factory=ModelsConfig)
-    provider: ProviderConfig = Field(default_factory=ProviderConfig)
-    commands: CommandsConfig = Field(default_factory=CommandsConfig)
-    gates: GatesConfig = Field(default_factory=GatesConfig)
+    live_review: LiveReviewIntegrationConfig = Field(default_factory=LiveReviewIntegrationConfig)
+
+
+class ProviderConfig(BaseModel):
+    sort: str = "price"
+    allow_fallbacks: bool = True
+    require_parameters: bool = True
+    data_collection: str = "deny"
+
+
+class DevCouncilConfig(BaseModel):
+    """Top-level validated configuration."""
+
+    project: ProjectConfig = Field(default_factory=ProjectConfig)
+    models: ModelsConfig = Field(default_factory=ModelsConfig)
+    provider: ProviderConfig = Field(default_factory=ProviderConfig)
+    commands: CommandsConfig = Field(default_factory=CommandsConfig)
+    gates: GatesConfig = Field(default_factory=GatesConfig)
     execution: ExecutionConfig = Field(default_factory=ExecutionConfig)
     privacy: PrivacyConfig = Field(default_factory=PrivacyConfig)
     integrations: IntegrationsConfig = Field(default_factory=IntegrationsConfig)
-
-
-def load_config(project_root: Path = Path(".")) -> DevCouncilConfig:
-    """Load and validate .devcouncil/config.yaml.
-    
-    Returns DevCouncilConfig with defaults for any missing fields.
-    Raises FileNotFoundError if config doesn't exist.
-    """
-    import yaml
-
-    config_path = project_root / ".devcouncil" / "config.yaml"
-    if not config_path.exists():
-        raise FileNotFoundError(f"Config not found at {config_path}. Run 'dev init' first.")
-
-    with open(config_path) as f:
-        raw = yaml.safe_load(f) or {}
-
-    return DevCouncilConfig.model_validate(raw)
-
-
-def get_api_key(provider: str = "openrouter") -> str:
-    """Retrieve the API key for the configured provider from environment.
-    
-    Raises ValueError if not found.
-    """
-    env_map = {
-        "openrouter": "OPENROUTER_API_KEY",
-        "openai": "OPENAI_API_KEY",
-        "anthropic": "ANTHROPIC_API_KEY",
-    }
-    env_var = env_map.get(provider, f"{provider.upper()}_API_KEY")
-    key = os.environ.get(env_var)
-    if not key:
-        raise ValueError(
-            f"API key not found. Set {env_var} in your environment. "
-            f"Provider: {provider}"
-        )
-    return key
+
+
+def load_config(project_root: Path = Path(".")) -> DevCouncilConfig:
+    """Load and validate .devcouncil/config.yaml.
+    
+    Returns DevCouncilConfig with defaults for any missing fields.
+    Raises FileNotFoundError if config doesn't exist.
+    """
+    import yaml
+
+    config_path = project_root / ".devcouncil" / "config.yaml"
+    if not config_path.exists():
+        raise FileNotFoundError(f"Config not found at {config_path}. Run 'dev init' first.")
+
+    with open(config_path) as f:
+        raw = yaml.safe_load(f) or {}
+
+    return DevCouncilConfig.model_validate(raw)
+
+
+def provider_api_key_env_var(provider: str = "openrouter") -> str:
+    env_map = {
+        "openrouter": "OPENROUTER_API_KEY",
+        "openai": "OPENAI_API_KEY",
+        "anthropic": "ANTHROPIC_API_KEY",
+    }
+    return env_map.get(provider, f"{provider.upper()}_API_KEY")
+
+
+def load_local_secrets(project_root: Path = Path(".")) -> Dict[str, str]:
+    secrets_path = project_root / ".devcouncil" / "secrets.env"
+    if not secrets_path.exists():
+        return {}
+
+    secrets: Dict[str, str] = {}
+    for line in secrets_path.read_text(encoding="utf-8").splitlines():
+        stripped = line.strip()
+        if not stripped or stripped.startswith("#") or "=" not in stripped:
+            continue
+        key, value = stripped.split("=", 1)
+        secrets[key.strip()] = value.strip().strip('"').strip("'")
+    return secrets
+
+
+def get_api_key(provider: str = "openrouter", project_root: Path = Path(".")) -> str:
+    """Retrieve the API key for the configured provider from environment.
+    
+    Raises ValueError if not found.
+    """
+    env_var = provider_api_key_env_var(provider)
+    key = os.environ.get(env_var) or load_local_secrets(project_root).get(env_var)
+    if not key:
+        raise ValueError(
+            f"API key not found. Set {env_var} in your environment or run 'dev setup'. "
+            f"Provider: {provider}"
+        )
+    return key

package/src/devcouncil/app/errors.py

@@ -1,23 +1,23 @@
-class DevCouncilError(Exception):
-    """Base exception for all DevCouncil errors."""
-    pass
-
-class GatingError(DevCouncilError):
-    """Raised when a task or plan fails a mandatory gate."""
-    pass
-
-class ConfigurationError(DevCouncilError):
-    """Raised when the project configuration is invalid or missing."""
-    pass
-
-class OrchestrationError(DevCouncilError):
-    """Raised when the orchestrator encounters an unexpected state."""
-    pass
-
-class ExecutionError(DevCouncilError):
-    """Raised when an external or internal executor fails to run a task."""
-    pass
-
-class VerificationError(DevCouncilError):
-    """Raised when the verifier fails to run its checks properly."""
-    pass
+class DevCouncilError(Exception):
+    """Base exception for all DevCouncil errors."""
+    pass
+
+class GatingError(DevCouncilError):
+    """Raised when a task or plan fails a mandatory gate."""
+    pass
+
+class ConfigurationError(DevCouncilError):
+    """Raised when the project configuration is invalid or missing."""
+    pass
+
+class OrchestrationError(DevCouncilError):
+    """Raised when the orchestrator encounters an unexpected state."""
+    pass
+
+class ExecutionError(DevCouncilError):
+    """Raised when an external or internal executor fails to run a task."""
+    pass
+
+class VerificationError(DevCouncilError):
+    """Raised when the verifier fails to run its checks properly."""
+    pass

package/src/devcouncil/app/events.py

@@ -1,44 +1,44 @@
-from typing import Any, Callable, Dict, List
-import inspect
-import logging
-
-logger = logging.getLogger(__name__)
-
-class EventBus:
-    """Simple asynchronous event bus for DevCouncil orchestration."""
-    def __init__(self):
-        self._listeners: Dict[str, List[Callable]] = {}
-
-    def subscribe(self, event_type: str, callback: Callable):
-        if event_type not in self._listeners:
-            self._listeners[event_type] = []
-        self._listeners[event_type].append(callback)
-
-    async def emit(self, event_type: str, payload: Any = None):
-        """Emit an event asynchronously to all registered listeners.
-        
-        Supports both sync and async callbacks.
-        """
-        logger.debug(f"Event emitted: {event_type}")
-        if event_type in self._listeners:
-            for callback in self._listeners[event_type]:
-                try:
-                    if inspect.iscoroutinefunction(callback):
-                        await callback(payload)
-                    else:
-                        callback(payload)
-                except Exception as e:
-                    logger.error(f"Error in event listener for {event_type}: {e}")
-
-# Global event bus instance
-bus = EventBus()
-
-# Standard Event Types
-class EventTypes:
-    PLANNING_STARTED = "planning_started"
-    PLANNING_COMPLETED = "planning_completed"
-    TASK_EXECUTING = "task_executing"
-    TASK_VERIFIED = "task_verified"
-    TASK_BLOCKED = "task_blocked"
-    GATE_FAILED = "gate_failed"
-    MODEL_CALLED = "model_called"
+from typing import Any, Callable, Dict, List
+import inspect
+import logging
+
+logger = logging.getLogger(__name__)
+
+class EventBus:
+    """Simple asynchronous event bus for DevCouncil orchestration."""
+    def __init__(self):
+        self._listeners: Dict[str, List[Callable]] = {}
+
+    def subscribe(self, event_type: str, callback: Callable):
+        if event_type not in self._listeners:
+            self._listeners[event_type] = []
+        self._listeners[event_type].append(callback)
+
+    async def emit(self, event_type: str, payload: Any = None):
+        """Emit an event asynchronously to all registered listeners.
+        
+        Supports both sync and async callbacks.
+        """
+        logger.debug(f"Event emitted: {event_type}")
+        if event_type in self._listeners:
+            for callback in self._listeners[event_type]:
+                try:
+                    if inspect.iscoroutinefunction(callback):
+                        await callback(payload)
+                    else:
+                        callback(payload)
+                except Exception as e:
+                    logger.error(f"Error in event listener for {event_type}: {e}")
+
+# Global event bus instance
+bus = EventBus()
+
+# Standard Event Types
+class EventTypes:
+    PLANNING_STARTED = "planning_started"
+    PLANNING_COMPLETED = "planning_completed"
+    TASK_EXECUTING = "task_executing"
+    TASK_VERIFIED = "task_verified"
+    TASK_BLOCKED = "task_blocked"
+    GATE_FAILED = "gate_failed"
+    MODEL_CALLED = "model_called"