refactor: use serializers to eliminate duplicated result building

Replace all inline dict-building for execution and validation results in
server/mcp.py and agents/orchestrator.py with ExecutionResultSerializer.to_dict()
and ValidationResultSerializer.to_dict() calls from core.serializers.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

agents/orchestrator.py

@@ -28,6 +28,7 @@ from agents.prompts import (
 from agents.design_state import DesignState, extract_decisions
 from core.backends import LLMBackend, MockBackend
 from core.executor import execute_cadquery, export_all
+from core.serializers import ExecutionResultSerializer, ValidationResultSerializer
 from core.validator import validate_for_cnc
 
 
@@ -112,23 +113,8 @@ def _execute_cad_code(
         "part_name": part_name,
         "stl_url": f"/api/models/{part_name}.stl",
         "step_url": f"/api/models/{part_name}.step",
-        "execution": {
-            "success": True,
-            "volume_mm3": exec_result.volume,
-            "bounding_box_mm": list(exec_result.bounding_box),
-            "face_count": exec_result.face_count,
-            "edge_count": exec_result.edge_count,
-        },
-        "validation": {
-            "machinable": validation.machinable,
-            "axis_recommendation": validation.axis_recommendation,
-            "error_count": validation.error_count,
-            "warning_count": validation.warning_count,
-            "issues": [
-                {"severity": i.severity, "category": i.category, "message": i.message}
-                for i in validation.issues
-            ],
-        },
+        "execution": ExecutionResultSerializer.to_dict(exec_result),
+        "validation": ValidationResultSerializer.to_dict(validation),
     }
 
 

server/mcp.py

@@ -17,14 +17,14 @@ Usage:
 
 import json
 import os
-import sys
 from pathlib import Path
 
 from mcp.server.fastmcp import FastMCP
 
 from core.cadquery_prompts import build_messages, CADQUERY_SYSTEM_PROMPT
-from core.executor import ExecutionResult, execute_cadquery, export_all, sanitize_code
-from core.validator import validate_for_cnc, CNCValidationResult
+from core.executor import execute_cadquery, export_all
+from core.serializers import ExecutionResultSerializer, ValidationResultSerializer
+from core.validator import validate_for_cnc
 
 # ── Server Setup ──────────────────────────────────────────────────────────
 
@@ -117,27 +117,11 @@ def generate_cnc_model(
         "part_name": part_name,
         "retries": result.retry_count,
         "generated_code": result.generated_code,
-        "execution": {
-            "success": result.execution.success,
-            "volume_mm3": result.execution.volume,
-            "bounding_box_mm": list(result.execution.bounding_box) if result.execution.bounding_box else [],
-            "face_count": result.execution.face_count,
-            "edge_count": result.execution.edge_count,
-            "error": result.execution.error,
-        },
+        "execution": ExecutionResultSerializer.to_dict(result.execution),
     }
 
     if result.validation:
-        response["validation"] = {
-            "machinable": result.validation.machinable,
-            "axis_recommendation": result.validation.axis_recommendation,
-            "error_count": result.validation.error_count,
-            "warning_count": result.validation.warning_count,
-            "issues": [
-                {"severity": i.severity, "category": i.category, "message": i.message}
-                for i in result.validation.issues
-            ],
-        }
+        response["validation"] = ValidationResultSerializer.to_dict(result.validation)
 
     if result.exported_files:
         response["exported_files"] = {
@@ -189,14 +173,7 @@ def validate_cnc_model(
         }
         validation = validate_for_cnc(exec_result.result, part_name=part_name, config=config)
         response["validation"] = {
-            "machinable": validation.machinable,
-            "axis_recommendation": validation.axis_recommendation,
-            "error_count": validation.error_count,
-            "warning_count": validation.warning_count,
-            "issues": [
-                {"severity": i.severity, "category": i.category, "message": i.message}
-                for i in validation.issues
-            ],
+            **ValidationResultSerializer.to_dict(validation),
             "summary": validation.summary(),
         }
 
@@ -231,13 +208,8 @@ def execute_cadquery_code(
     exec_result = execute_cadquery(code)
 
     response = {
-        "success": exec_result.success,
-        "error": exec_result.error,
+        **ExecutionResultSerializer.to_dict(exec_result),
         "stdout": exec_result.stdout,
-        "volume_mm3": exec_result.volume,
-        "bounding_box_mm": list(exec_result.bounding_box) if exec_result.bounding_box else [],
-        "face_count": exec_result.face_count,
-        "edge_count": exec_result.edge_count,
     }
 
     if exec_result.success and export_path:
@@ -358,28 +330,12 @@ def generate_from_image(
         "backend": backend,
         "retries": retry_count,
         "generated_code": generated_code,
-        "execution": {
-            "success": exec_result.success,
-            "volume_mm3": exec_result.volume,
-            "bounding_box_mm": list(exec_result.bounding_box) if exec_result.bounding_box else [],
-            "face_count": exec_result.face_count,
-            "edge_count": exec_result.edge_count,
-            "error": exec_result.error,
-        },
+        "execution": ExecutionResultSerializer.to_dict(exec_result),
     }
 
     if exec_result.success:
         validation = validate_for_cnc(exec_result.result, part_name=part_name)
-        response["validation"] = {
-            "machinable": validation.machinable,
-            "axis_recommendation": validation.axis_recommendation,
-            "error_count": validation.error_count,
-            "warning_count": validation.warning_count,
-            "issues": [
-                {"severity": i.severity, "category": i.category, "message": i.message}
-                for i in validation.issues
-            ],
-        }
+        response["validation"] = ValidationResultSerializer.to_dict(validation)
 
         base_path = DEFAULT_OUTPUT_DIR / part_name
         try: