Set the surface values appropriately for cloned objects

flake.nix

@@ -92,6 +92,7 @@
           NODE_ENV = "development";
           RUSTFMT = "${pkgs.nightlyRustfmt}/bin/rustfmt";
           CHROMEDRIVER = "${pkgs.chromedriver}/bin/chromedriver";
+          PYO3_PYTHON = "${pkgs.python3Full}/bin/python3";
         };
       }
     );

rust/kcl-lib/src/execution/geometry.rs

@@ -657,6 +657,9 @@ pub struct Sketch {
     /// If the sketch includes a mirror.
     #[serde(skip)]
     pub mirror: Option<uuid::Uuid>,
+    /// If the sketch is a clone of another sketch.
+    #[serde(skip)]
+    pub clone: Option<uuid::Uuid>,
     pub units: UnitLength,
     /// Metadata.
     #[serde(skip)]

rust/kcl-lib/src/std/clone.rs

@@ -111,6 +111,7 @@ async fn fix_tags_and_references(
     match new_geometry {
         GeometryWithImportedGeometry::ImportedGeometry(_) => {}
         GeometryWithImportedGeometry::Sketch(sketch) => {
+            sketch.clone = Some(old_geometry_id);
             fix_sketch_tags_and_references(sketch, &entity_id_map, exec_state, None).await?;
         }
         GeometryWithImportedGeometry::Solid(solid) => {
@@ -155,6 +156,7 @@ async fn fix_tags_and_references(
                 exec_state,
                 args,
                 None,
+                None,
             )
             .await?;
 

rust/kcl-lib/src/std/extrude.rs

@@ -313,6 +313,7 @@
                 exec_state,
                 &args,
                 None,
+                None,
             )
             .await?,
         );
@@ -337,6 +338,7 @@
     exec_state: &mut ExecState,
     args: &Args,
     edge_id: Option<Uuid>,
+    clone_id_map: Option<&HashMap<Uuid, Uuid>>, // old sketch id -> new sketch id
 ) -> Result<Solid, KclError> {
     // Bring the object to the front of the scene.
     // See: https://github.com/KittyCAD/modeling-app/issues/806
@@ -423,12 +425,31 @@
         if let Some(Some(actual_face_id)) = face_id_map.get(&path.get_base().geo_meta.id) {
             surface_of(path, *actual_face_id)
         } else if no_engine_commands {
+            println!(
+                "No face ID found for path ID {:?}, but in no-engine-commands mode, so faking it",
+                path.get_base().geo_meta.id
+            );
             // Only pre-populate the extrude surface if we are in mock mode.
             fake_extrude_surface(exec_state, path)
+        } else if sketch.clone.is_some() && clone_id_map.is_some() {
+            let new_path = clone_id_map.unwrap().get(&path.get_base().geo_meta.id)?;
+            let new_face_id = face_id_map.get(new_path);
+            if let Some(face_id) = new_face_id {
+                clone_surface_of(path, *new_path, face_id.unwrap())
+            } else {
+                None
+            }
         } else {
+            println!(
+                "No face ID found for path ID {:?}, and not in no-engine-commands mode, so skipping it",
+                path.get_base().geo_meta.id
+            );
             None
         }
     });
+    // if (outer_surfaces.len() < 1) && sketch.clone.is_some() {
+    //     // surface_of(path, actual_face_id)
+    // }
     new_value.extend(outer_surfaces);
     let inner_surfaces = sketch.inner_paths.iter().flat_map(|path| {
         if let Some(Some(actual_face_id)) = face_id_map.get(&path.get_base().geo_meta.id) {
@@ -586,6 +607,51 @@
     }
 }
 
+fn clone_surface_of(path: &Path, clone_path_id: Uuid, actual_face_id: Uuid) -> Option<ExtrudeSurface> {
+    match path {
+        Path::Arc { .. }
+        | Path::TangentialArc { .. }
+        | Path::TangentialArcTo { .. }
+        // TODO: (bc) fix me
+        | Path::Ellipse { .. }
+        | Path::Conic {.. }
+        | Path::Circle { .. }
+        | Path::CircleThreePoint { .. } => {
+            let extrude_surface = ExtrudeSurface::ExtrudeArc(crate::execution::ExtrudeArc {
+                face_id: actual_face_id,
+                tag: path.get_base().tag.clone(),
+                geo_meta: GeoMeta {
+                    id: clone_path_id,
+                    metadata: path.get_base().geo_meta.metadata,
+                },
+            });
+            Some(extrude_surface)
+        }
+        Path::Base { .. } | Path::ToPoint { .. } | Path::Horizontal { .. } | Path::AngledLineTo { .. } => {
+            let extrude_surface = ExtrudeSurface::ExtrudePlane(crate::execution::ExtrudePlane {
+                face_id: actual_face_id,
+                tag: path.get_base().tag.clone(),
+                geo_meta: GeoMeta {
+                    id: clone_path_id,
+                    metadata: path.get_base().geo_meta.metadata,
+                },
+            });
+            Some(extrude_surface)
+        }
+        Path::ArcThreePoint { .. } => {
+            let extrude_surface = ExtrudeSurface::ExtrudeArc(crate::execution::ExtrudeArc {
+                face_id: actual_face_id,
+                tag: path.get_base().tag.clone(),
+                geo_meta: GeoMeta {
+                    id: clone_path_id,
+                    metadata: path.get_base().geo_meta.metadata,
+                },
+            });
+            Some(extrude_surface)
+        }
+    }
+}
+
 /// Create a fake extrude surface to report for mock execution, when there's no engine response.
 fn fake_extrude_surface(exec_state: &mut ExecState, path: &Path) -> Option<ExtrudeSurface> {
     let extrude_surface = ExtrudeSurface::ExtrudePlane(crate::execution::ExtrudePlane {

rust/kcl-lib/src/std/loft.rs

@@ -104,6 +104,7 @@ async fn inner_loft(
             exec_state,
             &args,
             None,
+            None,
         )
         .await?,
     ))

rust/kcl-lib/src/std/revolve.rs

@@ -208,6 +208,7 @@ async fn inner_revolve(
                 exec_state,
                 &args,
                 edge_id,
+                None,
             )
             .await?,
         );

rust/kcl-lib/src/std/sketch.rs

@@ -1169,6 +1169,7 @@ pub(crate) async fn inner_start_profile(
         inner_paths: vec![],
         units,
         mirror: Default::default(),
+        clone: Default::default(),
         meta: vec![args.source_range.into()],
         tags: if let Some(tag) = &tag {
             let mut tag_identifier: TagIdentifier = tag.into();

rust/kcl-lib/src/std/sweep.rs

@@ -108,6 +108,7 @@ async fn inner_sweep(
                 exec_state,
                 &args,
                 None,
+                None,
             )
             .await?,
         );