merge: resolve main integration conflicts

backend/engine/cdsl_engine/runtime.py

@@ -12,7 +12,7 @@ from .build123d_adapter import Build123dGeometryAdapter
 from .capabilities import CapabilityAnalyzer, pattern_transform_blocker, sketch_ids_required_by_contract
 from .runtime_types import (
     AxisSpec, BendSpec, CapabilityResult, FeaturePlanNode, FeatureResult, HoleSpec, PlaneSpec,
-    ThreadSpec, TopologyDelta, TopologyDeltaRelation, Vector3,
+    GearSpec, RackSpec, ThreadSpec, TopologyDelta, TopologyDeltaRelation, Vector3,
     RuntimeDiagnostic, SelectorResolution, TopologyRecord, TopologyRegistry,
     pattern_instance_member_id, transform_copy_member_id,
     vector_add, vector_cross, vector_dot, vector_scale, vector_subtract, vector_unit,
@@ -30,6 +30,7 @@ ALL_ATOMIC_IDS = frozenset({
     "pattern_circular", "boolean_bodies", "transform_bodies", "delete_bodies",
     "thread_add", "thread_cut",
     "bend_add",
+    "gear_add", "rack_add",
 })
 
 
@@ -115,6 +116,8 @@ class GeometryAdapter(Protocol):
     def sphere(self, radius_mm: float, center_mm: Vector3) -> Any: ...
     def thread_solid(self, spec: ThreadSpec) -> Any: ...
     def bend_solid(self, spec: BendSpec) -> Any: ...
+    def gear_solid(self, spec: GearSpec) -> Any: ...
+    def rack_solid(self, spec: RackSpec) -> Any: ...
     def hole_tool(self, spec: HoleSpec, starts: list[Vector3], inward: Vector3, through_depth_mm: float) -> Any: ...
     def body_center(self, body: Any) -> Vector3: ...
     def body_span(self, body: Any, direction: Vector3) -> float: ...
@@ -1101,9 +1104,32 @@ def _execute_reference_axis(node: FeaturePlanNode, session: ExecutionSession) ->
     return session.result(node, context=axis)
 
 
+def _register_added_solid(
+    session: ExecutionSession,
+    node: FeaturePlanNode,
+    solid: Any,
+) -> None:
+    """Register an additive primitive solid (box/cyl/sphere/thread/gear/rack/bend).
+
+    When ``node.params['result_mode'] == "new_body"`` the primitive is kept as
+    an independent body member so that downstream ``boolean_bodies`` can
+    reference it without pulling in the accumulated fuse history. The current
+    body is replaced by a Compound that preserves both, matching the
+    ``extrude_add_blind`` ``new_body`` semantics. Any other value (including
+    missing) falls back to the legacy fuse-into-body behavior.
+    """
+    if node.params.get("result_mode") == "new_body":
+        combined = session.adapter.combine(session.body, solid)
+        members = {**session.body_members, node.feature_id: solid}
+        session.register_body(node.feature_id, combined, replay_node=node, body_members=members)
+        return
+    fused = session.adapter.fuse(session.body, solid)
+    session.register_body(node.feature_id, fused, replay_node=node)
+
+
 def _execute_sphere(node: FeaturePlanNode, session: ExecutionSession) -> FeatureResult:
     # 球体特征（sphere_add）执行入口：按球心与半径生成球体并并入当前主体。
-    
+
     # 1. 解析参数：半径 radius_mm 与球心 center_mm。
     radius = float(node.params.get("radius_mm") or 0.0)
     center = node.params.get("center_mm") or []
@@ -1113,7 +1139,7 @@ def _execute_sphere(node: FeaturePlanNode, session: ExecutionSession) -> Feature
     # 3. 由适配器创建球体实体。
     solid = session.adapter.sphere(radius, (float(center[0]), float(center[1]), float(center[2])))
     # 4. 球体与当前主体做布尔并（fuse）后登记为新主体，并返回该特征的结果对象。
-    session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
+    _register_added_solid(session, node, solid)
     return session.result(node)
 
 
@@ -1139,7 +1165,7 @@ def _execute_box(node: FeaturePlanNode, session: ExecutionSession) -> FeatureRes
     plane = PlaneSpec.from_mapping({"origin_mm": corner, "x_dir": [1, 0, 0], "normal": [0, 0, 1]})
     solid = session.adapter.box(length, width, height, plane)
     # 3. 与当前主体做布尔并后登记为新主体，并返回该特征的结果对象。
-    session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
+    _register_added_solid(session, node, solid)
     return session.result(node)
 
 
@@ -1163,7 +1189,7 @@ def _execute_cylinder(node: FeaturePlanNode, session: ExecutionSession) -> Featu
     # 2. 由适配器创建原生圆柱（axis=None 即世界 +Z 过原点）。
     solid = session.adapter.cylinder(radius, height, axis)
     # 3. 与当前主体做布尔并后登记为新主体，并返回该特征的结果对象。
-    session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
+    _register_added_solid(session, node, solid)
     return session.result(node)
 
 
@@ -1174,7 +1200,7 @@ def _execute_thread(node: FeaturePlanNode, session: ExecutionSession) -> Feature
     # 2. 由适配器门面生成沿 spec.axis 放置的外螺纹实心段。
     solid = session.adapter.thread_solid(spec)
     # 3. 与当前主体做布尔并（fuse）后登记为新主体，并返回该特征的结果对象。
-    session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
+    _register_added_solid(session, node, solid)
     return session.result(node)
 
 
@@ -1208,7 +1234,7 @@ def _execute_bend(node: FeaturePlanNode, session: ExecutionSession) -> FeatureRe
     # 2. 由适配器门面生成沿 spec.frame 放置的折弯实心段。
     solid = session.adapter.bend_solid(spec)
     # 3. 与当前主体做布尔并（fuse）后登记为新主体，并返回该特征的结果对象。
-    session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
+    _register_added_solid(session, node, solid)
     return session.result(node)
 
 
@@ -1218,6 +1244,51 @@ def _bend_executor(node: FeaturePlanNode, session: ExecutionSession, sketch: dic
     return _execute_bend(node, session)
 
 
+def _execute_gear(node: FeaturePlanNode, session: ExecutionSession) -> FeatureResult:
+    # 齿轮特征（gear_add）执行入口：按规格生成渐开线齿轮并入当前主体。
+    # 1. 解析并校验模数/齿数/齿宽/螺旋角与放置轴，非法输入抛出带具体原因的 ValueError。
+    spec = GearSpec.from_feature(node.params)
+    # 2. 由适配器门面生成沿 spec.axis 放置的齿轮实体（直齿/斜齿/人字齿）。
+    solid = session.adapter.gear_solid(spec)
+    # 3. 与当前主体做布尔并（fuse）后登记为新主体，并返回该特征的结果对象。
+    _register_added_solid(session, node, solid)
+    # 4. 小齿数根切风险：不阻断执行，附加 info 级诊断供完成报告如实披露。
+    diagnostics: list[RuntimeDiagnostic] = []
+    if spec.teeth_count < 17:
+        diagnostics.append(RuntimeDiagnostic(
+            code="undercut_risk",
+            message=(
+                f"Gear with {spec.teeth_count} teeth and a 20 degree pressure angle is undercut-prone; "
+                "standard involute geometry is generated without profile shift"
+            ),
+            feature_id=node.feature_id,
+        ))
+    return session.result(node, diagnostics=diagnostics)
+
+
+def _gear_executor(node: FeaturePlanNode, session: ExecutionSession, sketch: dict[str, Any] | None) -> FeatureResult:
+    # 齿轮特征（gear_add）不需要草图平面，丢弃该参数后执行。
+    del sketch
+    return _execute_gear(node, session)
+
+
+def _execute_rack(node: FeaturePlanNode, session: ExecutionSession) -> FeatureResult:
+    # 齿条特征（rack_add）执行入口：按规格生成直线齿条并入当前主体。
+    # 1. 解析并校验模数/齿数/厚度/压力角与放置轴，非法输入抛出带具体原因的 ValueError。
+    spec = RackSpec.from_feature(node.params)
+    # 2. 由适配器门面生成沿 spec.axis 放置的齿条实体（齿沿轴方向伸出）。
+    solid = session.adapter.rack_solid(spec)
+    # 3. 与当前主体做布尔并（fuse）后登记为新主体，并返回该特征的结果对象。
+    _register_added_solid(session, node, solid)
+    return session.result(node)
+
+
+def _rack_executor(node: FeaturePlanNode, session: ExecutionSession, sketch: dict[str, Any] | None) -> FeatureResult:
+    # 齿条特征（rack_add）不需要草图平面，丢弃该参数后执行。
+    del sketch
+    return _execute_rack(node, session)
+
+
 def _host_plane(resolution: SelectorResolution) -> PlaneSpec:
     if resolution.record is None:
         raise ValueError(resolution.diagnostic.message if resolution.diagnostic else "host face was not resolved")
@@ -2411,6 +2482,8 @@ EXECUTORS: dict[str, ExecutorFunction] = {
     "thread_add": _thread_executor,
     "thread_cut": _thread_executor,
     "bend_add": _bend_executor,
+    "gear_add": _gear_executor,
+    "rack_add": _rack_executor,
     "extrude_add_blind": _primary_executor,
     "extrude_add_blind_with_hole": _primary_executor,
     "extrude_add_two_sided": _primary_executor,