Add merge conflict detection and pipeline serialisation per repo

packages/agent-definitions-api/src/lintel/agent_definitions_api/store.py

@@ -4,7 +4,23 @@
 
 from typing import Any
 
-from lintel.persistence.data_models import AgentDefinitionData
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class AgentDefinitionData(BaseModel):
+    """User-defined agent definition."""
+
+    agent_id: str
+    name: str = ""
+    description: str = ""
+    role: str = ""
+    system_prompt: str = ""
+    model_id: str = ""
+    temperature: float = 0.7
+    tools: list[str] = Field(default_factory=list)
+    skills: list[str] = Field(default_factory=list)
+
+    model_config = ConfigDict(extra="allow")
 
 
 class AgentDefinitionStore:

packages/domain/src/lintel/domain/seed_workflows.py

@@ -21,6 +21,7 @@
             "plan",
             "approve_spec",
             "implement",
+            "verify_implementation",
             "review",
             "approved_for_pr",
             "raise_pr",
@@ -34,6 +35,7 @@
             "plan",
             "approval_gate_spec",
             "implement",
+            "verify_implementation",
             "review",
             "approval_gate_pr",
             "close",

packages/workflows/src/lintel/workflows/events.py

@@ -151,6 +151,23 @@ class HumanInterruptTimedOut(EventEnvelope):
     event_type: str = "HumanInterruptTimedOut"
 
 
+# --- Implementation Verification Events ---
+
+
+@dataclass(frozen=True)
+class ImplementationVerified(EventEnvelope):
+    """Emitted when plan-vs-implementation verification passes."""
+
+    event_type: str = "ImplementationVerified"
+
+
+@dataclass(frozen=True)
+class ImplementationVerificationFailed(EventEnvelope):
+    """Emitted when plan-vs-implementation verification finds unaddressed tasks."""
+
+    event_type: str = "ImplementationVerificationFailed"
+
+
 # --- Guardrail Approval Events (GRD-6) ---
 
 
@@ -192,4 +209,6 @@ class GuardrailApprovalRequested(EventEnvelope):
     GuardrailApprovalRequested,
     ChangeRequestTriggered,
     WorkflowQueued,
+    ImplementationVerified,
+    ImplementationVerificationFailed,
 )

packages/workflows/src/lintel/workflows/feature_to_pr.py

@@ -24,6 +24,10 @@
 from lintel.workflows.nodes.review import review_output
 from lintel.workflows.nodes.route import route_intent
 from lintel.workflows.nodes.setup_workspace import setup_workspace
+from lintel.workflows.nodes.verify_implementation import (
+    VerifyImplementationNode,
+    route_after_verification,
+)
 from lintel.workflows.state import ThreadWorkflowState
 
 MAX_REVIEW_CYCLES = 3
@@ -40,6 +44,10 @@ def _resolve_max_review_cycles(state: ThreadWorkflowState) -> int:
     return int(state.get("max_review_cycles", DEFAULT_MAX_REVIEW_CYCLES))
 
 
+# Singleton node instance — safe because WorkflowNode is stateless between calls.
+_verify_implementation_node = VerifyImplementationNode()
+
+
 def build_feature_to_pr_graph() -> StateGraph[Any]:
     """Build the feature-to-PR workflow graph."""
     graph: StateGraph[Any] = StateGraph(ThreadWorkflowState)
@@ -58,6 +66,7 @@ def build_feature_to_pr_graph() -> StateGraph[Any]:
         partial(approval_gate, gate_type="spec_approval"),
     )
     graph.add_node("implement", spawn_implementation)
+    graph.add_node("verify_implementation", _verify_implementation_node)
     graph.add_node("review", review_output)
     graph.add_node(
         "approval_gate_pr",
@@ -83,7 +92,12 @@ def build_feature_to_pr_graph() -> StateGraph[Any]:
     graph.add_conditional_edges(
         "implement",
         _check_phase,
-        {"continue": "review", "close": "close"},
+        {"continue": "verify_implementation", "close": "close"},
+    )
+    graph.add_conditional_edges(
+        "verify_implementation",
+        route_after_verification,
+        {"review": "review", "implement": "implement", "close": "close"},
     )
     graph.add_conditional_edges(
         "review",

packages/workflows/src/lintel/workflows/nodes/_stage_tracking.py

@@ -24,6 +24,7 @@
     "plan": "plan",
     "approval_gate_spec": "approve_spec",
     "implement": "implement",
+    "verify_implementation": "verify_implementation",
     "test": "test",
     "review": "review",
     "approval_gate_pr": "approved_for_pr",