devcouncil 0.1.0 → 0.1.1

package/src/devcouncil/storage/repositories.py

@@ -1,6 +1,6 @@
-from sqlmodel import Session, select, delete
-from typing import List, Optional, Any
-import json
+from sqlmodel import Session, select, delete
+from typing import List, Optional, Any
+import json
 from devcouncil.storage.models import (
     RequirementModel,
     AssumptionModel,
@@ -17,36 +17,36 @@ from devcouncil.domain.gap import Gap
 from devcouncil.domain.evidence import CommandResult, DiffEvidence, TestEvidence
 from devcouncil.domain.critique import CritiqueFinding
 from devcouncil.artifacts.graph import ArtifactGraph
-
+
 class RequirementRepository:
-    def __init__(self, session: Session):
-        self.session = session
-
-    def get_all(self) -> List[Requirement]:
-        statement = select(RequirementModel)
-        models = self.session.exec(statement).all()
-        results = []
-        for m in models:
-            ac_list = [AcceptanceCriterion.model_validate(ac) for ac in json.loads(m.acceptance_criteria_json)]
-            results.append(Requirement(
-                id=m.id,
-                title=m.title,
-                description=m.description,
-                priority=m.priority,
-                source=m.source,
-                acceptance_criteria=ac_list
-            ))
-        return results
-
-    def save(self, req: Requirement):
-        model = RequirementModel(
-            id=req.id,
-            title=req.title,
-            description=req.description,
-            priority=req.priority,
-            source=req.source,
-            acceptance_criteria_json=json.dumps([ac.model_dump() for ac in req.acceptance_criteria])
-        )
+    def __init__(self, session: Session):
+        self.session = session
+
+    def get_all(self) -> List[Requirement]:
+        statement = select(RequirementModel)
+        models = self.session.exec(statement).all()
+        results = []
+        for m in models:
+            ac_list = [AcceptanceCriterion.model_validate(ac) for ac in json.loads(m.acceptance_criteria_json)]
+            results.append(Requirement(
+                id=m.id,
+                title=m.title,
+                description=m.description,
+                priority=m.priority,
+                source=m.source,
+                acceptance_criteria=ac_list
+            ))
+        return results
+
+    def save(self, req: Requirement):
+        model = RequirementModel(
+            id=req.id,
+            title=req.title,
+            description=req.description,
+            priority=req.priority,
+            source=req.source,
+            acceptance_criteria_json=json.dumps([ac.model_dump() for ac in req.acceptance_criteria])
+        )
         self.session.merge(model)
         self.session.commit()
 
@@ -85,104 +85,104 @@ class AssumptionRepository:
         )
         self.session.merge(model)
         self.session.commit()
-
-class TaskRepository:
-    def __init__(self, session: Session):
-        self.session = session
-
-    def get_by_id(self, task_id: str) -> Optional[Task]:
-        statement = select(TaskModel).where(TaskModel.id == task_id)
-        m = self.session.exec(statement).first()
-        if not m:
-            return None
-        
-        pf_list = [PlannedFile.model_validate(pf) for pf in json.loads(m.planned_files_json)]
-        return Task(
-            id=m.id,
-            title=m.title,
-            description=m.description,
-            requirement_ids=json.loads(m.requirement_ids_json),
-            acceptance_criterion_ids=json.loads(m.acceptance_criterion_ids_json),
-            planned_files=pf_list,
-            expected_tests=json.loads(m.expected_tests_json),
-            allowed_commands=json.loads(m.allowed_commands_json),
-            forbidden_changes=json.loads(m.forbidden_changes_json),
-            status=m.status
-        )
-
-    def get_all(self) -> List[Task]:
-        statement = select(TaskModel)
-        models = self.session.exec(statement).all()
-        results = []
-        for m in models:
-            pf_list = [PlannedFile.model_validate(pf) for pf in json.loads(m.planned_files_json)]
-            results.append(Task(
-                id=m.id,
-                title=m.title,
-                description=m.description,
-                requirement_ids=json.loads(m.requirement_ids_json),
-                acceptance_criterion_ids=json.loads(m.acceptance_criterion_ids_json),
-                planned_files=pf_list,
-                expected_tests=json.loads(m.expected_tests_json),
-                allowed_commands=json.loads(m.allowed_commands_json),
-                forbidden_changes=json.loads(m.forbidden_changes_json),
-                status=m.status
-            ))
-        return results
-
-    def save(self, task: Task):
-        model = TaskModel(
-            id=task.id,
-            title=task.title,
-            description=task.description,
-            requirement_ids_json=json.dumps(task.requirement_ids),
-            acceptance_criterion_ids_json=json.dumps(task.acceptance_criterion_ids),
-            planned_files_json=json.dumps([pf.model_dump() for pf in task.planned_files]),
-            expected_tests_json=json.dumps(task.expected_tests),
-            allowed_commands_json=json.dumps(task.allowed_commands),
-            forbidden_changes_json=json.dumps(task.forbidden_changes),
-            status=task.status
-        )
-        self.session.merge(model)
-        self.session.commit()
-
-class GapRepository:
-    def __init__(self, session: Session):
-        self.session = session
-
-    def get_all(self) -> List[Gap]:
-        statement = select(GapModel)
-        models = self.session.exec(statement).all()
-        results = []
-        for m in models:
-            results.append(Gap(
-                id=m.id,
-                severity=m.severity,
-                gap_type=m.gap_type,
-                requirement_id=m.requirement_id,
-                task_id=m.task_id,
-                description=m.description,
-                evidence=json.loads(m.evidence_json),
-                recommended_fix=m.recommended_fix,
-                blocking=m.blocking
-            ))
-        return results
-
-    def save(self, gap: Gap):
-        model = GapModel(
-            id=gap.id,
-            severity=gap.severity,
-            gap_type=gap.gap_type,
-            requirement_id=gap.requirement_id,
-            task_id=gap.task_id,
-            description=gap.description,
-            evidence_json=json.dumps(gap.evidence),
-            recommended_fix=gap.recommended_fix,
-            blocking=gap.blocking
-        )
-        self.session.merge(model)
-        self.session.commit()
-
+
+class TaskRepository:
+    def __init__(self, session: Session):
+        self.session = session
+
+    def get_by_id(self, task_id: str) -> Optional[Task]:
+        statement = select(TaskModel).where(TaskModel.id == task_id)
+        m = self.session.exec(statement).first()
+        if not m:
+            return None
+        
+        pf_list = [PlannedFile.model_validate(pf) for pf in json.loads(m.planned_files_json)]
+        return Task(
+            id=m.id,
+            title=m.title,
+            description=m.description,
+            requirement_ids=json.loads(m.requirement_ids_json),
+            acceptance_criterion_ids=json.loads(m.acceptance_criterion_ids_json),
+            planned_files=pf_list,
+            expected_tests=json.loads(m.expected_tests_json),
+            allowed_commands=json.loads(m.allowed_commands_json),
+            forbidden_changes=json.loads(m.forbidden_changes_json),
+            status=m.status
+        )
+
+    def get_all(self) -> List[Task]:
+        statement = select(TaskModel)
+        models = self.session.exec(statement).all()
+        results = []
+        for m in models:
+            pf_list = [PlannedFile.model_validate(pf) for pf in json.loads(m.planned_files_json)]
+            results.append(Task(
+                id=m.id,
+                title=m.title,
+                description=m.description,
+                requirement_ids=json.loads(m.requirement_ids_json),
+                acceptance_criterion_ids=json.loads(m.acceptance_criterion_ids_json),
+                planned_files=pf_list,
+                expected_tests=json.loads(m.expected_tests_json),
+                allowed_commands=json.loads(m.allowed_commands_json),
+                forbidden_changes=json.loads(m.forbidden_changes_json),
+                status=m.status
+            ))
+        return results
+
+    def save(self, task: Task):
+        model = TaskModel(
+            id=task.id,
+            title=task.title,
+            description=task.description,
+            requirement_ids_json=json.dumps(task.requirement_ids),
+            acceptance_criterion_ids_json=json.dumps(task.acceptance_criterion_ids),
+            planned_files_json=json.dumps([pf.model_dump() for pf in task.planned_files]),
+            expected_tests_json=json.dumps(task.expected_tests),
+            allowed_commands_json=json.dumps(task.allowed_commands),
+            forbidden_changes_json=json.dumps(task.forbidden_changes),
+            status=task.status
+        )
+        self.session.merge(model)
+        self.session.commit()
+
+class GapRepository:
+    def __init__(self, session: Session):
+        self.session = session
+
+    def get_all(self) -> List[Gap]:
+        statement = select(GapModel)
+        models = self.session.exec(statement).all()
+        results = []
+        for m in models:
+            results.append(Gap(
+                id=m.id,
+                severity=m.severity,
+                gap_type=m.gap_type,
+                requirement_id=m.requirement_id,
+                task_id=m.task_id,
+                description=m.description,
+                evidence=json.loads(m.evidence_json),
+                recommended_fix=m.recommended_fix,
+                blocking=m.blocking
+            ))
+        return results
+
+    def save(self, gap: Gap):
+        model = GapModel(
+            id=gap.id,
+            severity=gap.severity,
+            gap_type=gap.gap_type,
+            requirement_id=gap.requirement_id,
+            task_id=gap.task_id,
+            description=gap.description,
+            evidence_json=json.dumps(gap.evidence),
+            recommended_fix=gap.recommended_fix,
+            blocking=gap.blocking
+        )
+        self.session.merge(model)
+        self.session.commit()
+
     def delete_for_task(self, task_id: str):
         self.session.exec(delete(GapModel).where(GapModel.task_id == task_id))
         self.session.commit()
@@ -190,54 +190,54 @@ class GapRepository:
     def delete_plan_gaps(self):
         self.session.exec(delete(GapModel).where(GapModel.id.like("GAP-PLAN-%")))
         self.session.commit()
-
+
 class EvidenceRepository:
-    def __init__(self, session: Session):
-        self.session = session
-
-    def save_command_result(self, task_id: str, result: CommandResult):
-        model = EvidenceModel(
-            type="command",
-            task_id=task_id,
-            data_json=result.model_dump_json()
-        )
-        self.session.add(model)
-        self.session.commit()
-
-    def save_diff_evidence(self, ev: DiffEvidence):
-        model = EvidenceModel(
-            type="diff",
-            task_id=ev.task_id,
-            data_json=ev.model_dump_json()
-        )
-        self.session.add(model)
-        self.session.commit()
-
-    def save_test_evidence(self, ev: TestEvidence, task_id: Optional[str] = None):
-        model = EvidenceModel(
-            type="test",
-            task_id=task_id,
-            requirement_id=ev.requirement_id,
-            acceptance_criterion_id=ev.acceptance_criterion_id,
-            data_json=ev.model_dump_json()
-        )
-        self.session.add(model)
-        self.session.commit()
-
-    def get_all(self) -> List[Any]:
-        statement = select(EvidenceModel)
-        models = self.session.exec(statement).all()
-        results = []
-        for m in models:
-            data = json.loads(m.data_json)
-            if m.type == "command":
-                results.append(CommandResult.model_validate(data))
-            elif m.type == "diff":
-                results.append(DiffEvidence.model_validate(data))
-            elif m.type == "test":
-                results.append(TestEvidence.model_validate(data))
-        return results
-
+    def __init__(self, session: Session):
+        self.session = session
+
+    def save_command_result(self, task_id: str, result: CommandResult):
+        model = EvidenceModel(
+            type="command",
+            task_id=task_id,
+            data_json=result.model_dump_json()
+        )
+        self.session.add(model)
+        self.session.commit()
+
+    def save_diff_evidence(self, ev: DiffEvidence):
+        model = EvidenceModel(
+            type="diff",
+            task_id=ev.task_id,
+            data_json=ev.model_dump_json()
+        )
+        self.session.add(model)
+        self.session.commit()
+
+    def save_test_evidence(self, ev: TestEvidence, task_id: Optional[str] = None):
+        model = EvidenceModel(
+            type="test",
+            task_id=task_id,
+            requirement_id=ev.requirement_id,
+            acceptance_criterion_id=ev.acceptance_criterion_id,
+            data_json=ev.model_dump_json()
+        )
+        self.session.add(model)
+        self.session.commit()
+
+    def get_all(self) -> List[Any]:
+        statement = select(EvidenceModel)
+        models = self.session.exec(statement).all()
+        results = []
+        for m in models:
+            data = json.loads(m.data_json)
+            if m.type == "command":
+                results.append(CommandResult.model_validate(data))
+            elif m.type == "diff":
+                results.append(DiffEvidence.model_validate(data))
+            elif m.type == "test":
+                results.append(TestEvidence.model_validate(data))
+        return results
+
     def delete_for_task(self, task_id: str):
         self.session.exec(delete(EvidenceModel).where(EvidenceModel.task_id == task_id))
         self.session.commit()
@@ -283,19 +283,96 @@ class CritiqueFindingRepository:
         )
         self.session.merge(model)
         self.session.commit()
-
-class ArtifactGraphRepository:
-    def __init__(self, session: Session):
-        self.session = session
+
+
+class PlanningStateRepository:
+    """Manage the persisted active plan graph."""
+
+    def __init__(self, session: Session):
+        self.session = session
+
+    def clear_active_plan(self):
+        for model in (
+            EvidenceModel,
+            GapModel,
+            CritiqueFindingModel,
+            TaskModel,
+            AssumptionModel,
+            RequirementModel,
+        ):
+            self.session.exec(delete(model))
+
+    def replace_active_plan(
+        self,
+        requirements: list[Requirement],
+        assumptions: list[Assumption],
+        tasks: list[Task],
+        findings: list[CritiqueFinding],
+    ):
+        self.clear_active_plan()
+        for req in requirements:
+            self.session.merge(RequirementModel(
+                id=req.id,
+                title=req.title,
+                description=req.description,
+                priority=req.priority,
+                source=req.source,
+                acceptance_criteria_json=json.dumps([ac.model_dump() for ac in req.acceptance_criteria]),
+            ))
+
+        for assumption in assumptions:
+            self.session.merge(AssumptionModel(
+                id=assumption.id,
+                statement=assumption.statement,
+                confidence=assumption.confidence,
+                impact=assumption.impact,
+                reversible=assumption.reversible,
+                requires_user_confirmation=assumption.requires_user_confirmation,
+                linked_requirement_ids_json=json.dumps(assumption.linked_requirement_ids),
+                status=assumption.status,
+            ))
+
+        for task in tasks:
+            self.session.merge(TaskModel(
+                id=task.id,
+                title=task.title,
+                description=task.description,
+                requirement_ids_json=json.dumps(task.requirement_ids),
+                acceptance_criterion_ids_json=json.dumps(task.acceptance_criterion_ids),
+                planned_files_json=json.dumps([pf.model_dump() for pf in task.planned_files]),
+                expected_tests_json=json.dumps(task.expected_tests),
+                allowed_commands_json=json.dumps(task.allowed_commands),
+                forbidden_changes_json=json.dumps(task.forbidden_changes),
+                status=task.status,
+            ))
+
+        for finding in findings:
+            self.session.merge(CritiqueFindingModel(
+                id=finding.id,
+                source_agent=finding.source_agent,
+                target_plan_id=finding.target_plan_id,
+                severity=finding.severity,
+                finding_type=finding.finding_type,
+                claim=finding.claim,
+                linked_requirement_id=finding.linked_requirement_id,
+                suggested_requirement=finding.suggested_requirement,
+                suggested_task=finding.suggested_task,
+                falsifiable_check=finding.falsifiable_check,
+                status=finding.status,
+            ))
+
+class ArtifactGraphRepository:
+    def __init__(self, session: Session):
+        self.session = session
         self.req_repo = RequirementRepository(session)
         self.assumption_repo = AssumptionRepository(session)
         self.task_repo = TaskRepository(session)
         self.gap_repo = GapRepository(session)
         self.evidence_repo = EvidenceRepository(session)
         self.finding_repo = CritiqueFindingRepository(session)
-
-    def load_graph(self) -> ArtifactGraph:
-        graph = ArtifactGraph()
+
+    def load_graph(self) -> ArtifactGraph:
+        graph = ArtifactGraph()
         for req in self.req_repo.get_all():
             graph.add_requirement(req)
         for assumption in self.assumption_repo.get_all():
@@ -306,41 +383,41 @@ class ArtifactGraphRepository:
             graph.add_finding(finding)
         for gap in self.gap_repo.get_all():
             graph.add_gap(gap)
-        for ev in self.evidence_repo.get_all():
-            if isinstance(ev, CommandResult):
-                graph.add_command_result(ev)
-            elif isinstance(ev, DiffEvidence):
-                graph.add_diff_evidence(ev)
-            elif isinstance(ev, TestEvidence):
-                graph.add_test_evidence(ev)
-        return graph
-
-
-class StateRepository:
-    def __init__(self, session: Session):
-        self.session = session
-
-    def get_state(self) -> Optional[ProjectStateModel]:
-        statement = select(ProjectStateModel).where(ProjectStateModel.id == "singleton")
-        return self.session.exec(statement).first()
-
-    def save_state(self, state: ProjectStateModel | str, history: Optional[List[str]] = None):
-        if isinstance(state, ProjectStateModel):
-            state.id = "singleton"
-        else:
-            state = ProjectStateModel(
-                id="singleton",
-                current_phase=state,
-                history_json=json.dumps(history or []),
-            )
-        self.session.merge(state)
-        self.session.commit()
-
-    def record_phase(self, phase: str):
-        current = self.get_state()
-        history = []
-        if current:
-            history = json.loads(current.history_json)
-        if not history or history[-1] != phase:
-            history.append(phase)
-        self.save_state(phase, history)
+        for ev in self.evidence_repo.get_all():
+            if isinstance(ev, CommandResult):
+                graph.add_command_result(ev)
+            elif isinstance(ev, DiffEvidence):
+                graph.add_diff_evidence(ev)
+            elif isinstance(ev, TestEvidence):
+                graph.add_test_evidence(ev)
+        return graph
+
+
+class StateRepository:
+    def __init__(self, session: Session):
+        self.session = session
+
+    def get_state(self) -> Optional[ProjectStateModel]:
+        statement = select(ProjectStateModel).where(ProjectStateModel.id == "singleton")
+        return self.session.exec(statement).first()
+
+    def save_state(self, state: ProjectStateModel | str, history: Optional[List[str]] = None):
+        if isinstance(state, ProjectStateModel):
+            state.id = "singleton"
+        else:
+            state = ProjectStateModel(
+                id="singleton",
+                current_phase=state,
+                history_json=json.dumps(history or []),
+            )
+        self.session.merge(state)
+        self.session.commit()
+
+    def record_phase(self, phase: str):
+        current = self.get_state()
+        history = []
+        if current:
+            history = json.loads(current.history_json)
+        if not history or history[-1] != phase:
+            history.append(phase)
+        self.save_state(phase, history)

package/src/devcouncil/telemetry/cost.py

@@ -1,34 +1,34 @@
-import logging
-from typing import Dict
-
-logger = logging.getLogger(__name__)
-
-class CostEstimator:
-    """Estimates LLM usage cost based on provider pricing."""
-    
-    # Rough estimates, update for production
-    PRICING = {
-        "anthropic/claude-3.5-sonnet": {"input": 0.000003, "output": 0.000015},
-        "anthropic/claude-3-opus": {"input": 0.000015, "output": 0.000075},
-        "anthropic/claude-sonnet-4": {"input": 0.000003, "output": 0.000015},
-        "google/gemini-pro-1.5": {"input": 0.00000125, "output": 0.000005},
-        "google/gemini-2.5-pro": {"input": 0.00000125, "output": 0.00001},
-        "openai/gpt-4o": {"input": 0.000005, "output": 0.000015},
-        "openai/o3-mini": {"input": 0.0000011, "output": 0.0000044},
-    }
-
-    # Conservative default for unknown models
-    DEFAULT_PRICING = {"input": 0.000005, "output": 0.000015}
-
-    @classmethod
-    def estimate_cost(cls, model: str, usage: Dict[str, int]) -> float:
-        prices = cls.PRICING.get(model)
-        if not prices:
-            logger.debug("Unknown model for cost estimation: %s — using default pricing", model)
-            prices = cls.DEFAULT_PRICING
-            
-        prompt_tokens = usage.get("prompt_tokens", 0)
-        completion_tokens = usage.get("completion_tokens", 0)
-        
-        cost = (prompt_tokens * prices["input"]) + (completion_tokens * prices["output"])
-        return cost
+import logging
+from typing import Dict
+
+logger = logging.getLogger(__name__)
+
+class CostEstimator:
+    """Estimates LLM usage cost based on provider pricing."""
+    
+    # Rough estimates, update for production
+    PRICING = {
+        "anthropic/claude-3.5-sonnet": {"input": 0.000003, "output": 0.000015},
+        "anthropic/claude-3-opus": {"input": 0.000015, "output": 0.000075},
+        "anthropic/claude-sonnet-4": {"input": 0.000003, "output": 0.000015},
+        "google/gemini-pro-1.5": {"input": 0.00000125, "output": 0.000005},
+        "google/gemini-2.5-pro": {"input": 0.00000125, "output": 0.00001},
+        "openai/gpt-4o": {"input": 0.000005, "output": 0.000015},
+        "openai/o3-mini": {"input": 0.0000011, "output": 0.0000044},
+    }
+
+    # Conservative default for unknown models
+    DEFAULT_PRICING = {"input": 0.000005, "output": 0.000015}
+
+    @classmethod
+    def estimate_cost(cls, model: str, usage: Dict[str, int]) -> float:
+        prices = cls.PRICING.get(model)
+        if not prices:
+            logger.debug("Unknown model for cost estimation: %s — using default pricing", model)
+            prices = cls.DEFAULT_PRICING
+            
+        prompt_tokens = usage.get("prompt_tokens", 0)
+        completion_tokens = usage.get("completion_tokens", 0)
+        
+        cost = (prompt_tokens * prices["input"]) + (completion_tokens * prices["output"])
+        return cost