feat(schema): v2 model layer — body nodes, split edge lists, Analysis envelope

Author: rahlk

codeanalyzer/core.py

@@ -455,23 +455,7 @@ def analyze(self) -> PyApplication:
             .build()
         )
 
-        if self.analysis_level >= 3:
-            # Level 3: native dataflow graphs (CFG/PDG/SDG) over the same
-            # signatures, gated so -a 1/-a 2 timings stay untouched.
-            from codeanalyzer.dataflow.builder import (
-                build_program_graphs,
-                to_program_graphs,
-            )
-
-            t0_l3 = time.perf_counter()
-            ir = build_program_graphs(app, k=self.options.graph_field_depth)
-            app.program_graphs = to_program_graphs(
-                ir, set(self.options.graphs.split(","))
-            )
-            logger.info(
-                "✅ Program graphs: %d functions, %d SDG edges in %.1fs",
-                len(ir.functions), len(ir.sdg_edges), time.perf_counter() - t0_l3,
-            )
+        # L3/L4 dataflow emission rebuilt on the v2 tree in Stage 3+
 
         # Save to cache
         self._save_analysis_cache(app, cache_file)

codeanalyzer/neo4j/project.py

@@ -74,10 +74,7 @@ def project(app: PyApplication, app_name: str) -> GraphRows:
             "PY_CALLS", src, tgt, _call_edge_props(e.weight, list(e.provenance or []))
         )
 
-    # Level-3 CPG overlay (present only at -a 3): the same program_graphs IR
-    # projected as :PyCFGNode nodes and PY_-namespaced dependence edge types.
-    if app.program_graphs is not None:
-        _project_program_graphs(b, app)
+    # CPG overlay projection rebuilt on the v2 tree in Stage 3
 
     return b.finish()
 

codeanalyzer/schema/__init__.py

@@ -2,29 +2,28 @@
 from packaging.version import parse as parse_version
 
 from .py_schema import (
+    Analysis,
+    BodyNode,
+    CdgEdge,
+    CfgEdge,
+    DdgEdge,
+    ParamEdge,
     PyApplication,
     PyCallable,
     PyCallableParameter,
-    PyCFG,
-    PyCFGEdge,
     PyClass,
     PyClassAttribute,
     PyComment,
     PyExternalSymbol,
-    PyFunctionGraphs,
-    PyGraphNode,
     PyImport,
     PyModule,
-    PyParamNode,
-    PyPDG,
-    PyPDGEdge,
-    PyProgramGraphs,
-    PySDGEdge,
-    PySDGEndpoint,
     PyVariableDeclaration,
+    Span,
+    SummaryEdge,
 )
 
 __all__ = [
+    "Analysis",
     "PyApplication",
     "PyExternalSymbol",
     "PyImport",
@@ -35,16 +34,13 @@
     "PyCallable",
     "PyClassAttribute",
     "PyCallableParameter",
-    "PyGraphNode",
-    "PyCFGEdge",
-    "PyPDGEdge",
-    "PyParamNode",
-    "PyCFG",
-    "PyPDG",
-    "PyFunctionGraphs",
-    "PySDGEndpoint",
-    "PySDGEdge",
-    "PyProgramGraphs",
+    "Span",
+    "BodyNode",
+    "CfgEdge",
+    "CdgEdge",
+    "DdgEdge",
+    "SummaryEdge",
+    "ParamEdge",
 ]
 
 try:
@@ -64,6 +60,7 @@
         PyClass=PyClass,
         PyModule=PyModule
     )
+    Analysis.update_forward_refs(PyApplication=PyApplication)
 
 # Compatibility helpers for Pydantic v1/v2
 def model_dump_json(model, **kwargs):