@constructorfleet/sketchforge-engine 1.19.0 → 1.21.0

package/dist/engine.js

@@ -14,7 +14,9 @@
  * -- including the project lock, which a macro writing a directory needs and
  * does not have today -- without pulling `next/server` in with it.
  */
-import { applyEdgeTreatment, applyBakedMirror, applyDraftPrism, shapeEdges, shapeWithCadResult, ServerCadError, } from "./serverCadOperations.js";
+import { allEdgeTreatmentEdgeCount, applyEdgeTreatment, applyBakedMirror, applyDraftPrism, applySketchFaceDraft, exactPlainSketchRevolveResult, isPlainFullTurnSketchRevolve, shapeEdges, shapeWithCadResult, ServerCadError, } from "./serverCadOperations.js";
+import { draftFaceForSketchSegment, legacyDraftSegmentForShape, sketchSegmentForDraftFace } from "./faceDraftSegmentLineage.js";
+import { cadSketchRegions, cadSketchSweepPaths } from "./sketchCadProfile.js";
 import { applyShell, shapeFaces, } from "./serverCadShell.js";
 import { measureBetween as measureBetweenEntities, shapeMeasurements, } from "./serverCadMeasure.js";
 import { shapeProperties } from "./serverCadProperties.js";
@@ -32,11 +34,69 @@ import { serverManifoldRuntime } from "./serverManifoldRuntime.js";
 import { createLocalId } from "./localIds.js";
 import { invalidSketchSweepProfile, sketchSweepShapeFromRequest } from "./sketchSweepRequest.js";
 import { sketchExtrusionShapeFromRequest } from "./sketchExtrusionRequest.js";
-import { findSketchOutput, recomputeSketchOutput } from "./parametricRecompute.js";
+import { findSketchOutput, recomputeSketchOutput, replaySingleAllEdgeTreatment } from "./parametricRecompute.js";
 import { boundsForShapes, footprintCenter, shapeBounds } from "./shapeBounds.js";
 import { REQUESTABLE_SHAPE_KINDS, shapeFromRequest, shapeWithRequestedChanges, SHAPE_PARAMETERS, } from "./shapeRequests.js";
 import { canonicalizeShape, cleanNearZero, cleanRotationDegrees, cloneWorkplaneShapeTreeWithFreshIds, withHoleMode, } from "./workplaneShapes.js";
 const UNIQUE_CURVED_FACE_SURFACES = new Set(["cone", "sphere", "torus", "cylinder"]);
+const FACE_DRAFT_AXES = new Set(["x", "y", "z", "-x", "-y", "-z"]);
+function faceDraftInput(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return null;
+    const draft = value;
+    if (typeof draft.sourceFaceId !== "string" || !draft.sourceFaceId.trim()
+        || typeof draft.angle !== "number" || !Number.isFinite(draft.angle) || draft.angle === 0 || Math.abs(draft.angle) >= 45
+        || typeof draft.pullDirection !== "string" || !FACE_DRAFT_AXES.has(draft.pullDirection))
+        return null;
+    return {
+        sourceFaceId: draft.sourceFaceId,
+        angle: draft.angle,
+        pullDirection: draft.pullDirection,
+    };
+}
+function isSingleLoopSketchExtrusion(shape) {
+    if (shape.sketchOperation !== "extrude" || !shape.sketchProfile)
+        return false;
+    const regions = cadSketchRegions(shape.sketchProfile);
+    return regions.length === 1 && regions[0]?.holes.length === 0;
+}
+function isSingleSectionSketchSweep(shape) {
+    if (shape.sketchOperation !== "sweep" || !shape.sketchProfile)
+        return false;
+    try {
+        const { sections, spine } = cadSketchSweepPaths(shape.sketchProfile);
+        return sections.length === 1 && sections[0]?.holes.length === 0 && spine.steps.length > 0;
+    }
+    catch {
+        return false;
+    }
+}
+function revolveSourceScale(shape) {
+    const mesh = shape.importedMesh;
+    const ratio = (drawn, natural) => natural && natural > 0 ? drawn / natural : 1;
+    return {
+        width: ratio(shape.width, mesh?.baseWidth),
+        depth: ratio(shape.depth, mesh?.baseDepth),
+        height: ratio(shape.height, mesh?.baseHeight),
+    };
+}
+function resizeRebuiltRevolve(shape, scale) {
+    const mesh = shape.importedMesh;
+    if (!mesh)
+        return shape;
+    const width = Math.max(0.01, (mesh.baseWidth ?? shape.width) * scale.width);
+    const depth = Math.max(0.01, (mesh.baseDepth ?? shape.depth) * scale.depth);
+    const height = Math.max(0.01, (mesh.baseHeight ?? shape.height) * scale.height);
+    return { ...shape, width, depth, height, size: Math.max(width, depth) };
+}
+function faceNormalMatches(left, right) {
+    return Math.hypot(left.x - right.x, left.y - right.y, left.z - right.z) <= 1e-5;
+}
+async function findUniqueDraftFace(shape, normal) {
+    const matches = (await shapeFaces(shape)).filter((face) => face.surfaceType === "plane" && face.normal
+        && faceNormalMatches(face.normal, normal));
+    return matches.length === 1 ? matches[0] : null;
+}
 /**
  * Carry face metadata across a parameter edit only when a face has a unique
  * counterpart. Curved faces may change their sampled normal as their defining
@@ -331,13 +391,42 @@ export function createEngine(store) {
         });
     }
     /** The shared tail of `treat` and `shell`: run the kernel, store the result on the shape. */
-    async function cadTreatment(projectId, shapeId, run) {
+    async function cadTreatment(projectId, shapeId, operation, run) {
         return mutating(projectId, async (document) => {
             const found = oneShape(document, shapeId);
             if (!found.ok)
                 return found;
             if (found.value.locked)
                 return failed({ reason: "shape_locked", ids: [shapeId] });
+            const hasEdgeTreatments = (found.value.edgeTreatments?.length ?? 0) > 0
+                || (found.value.edgeTreatmentHistory?.length ?? 0) > 0;
+            const hasDraftPrism = found.value.draftPrismAngle !== undefined;
+            const replayablePrismTreatment = (operation === "all-edge-treatment" || operation === "all-edge-chamfer-treatment")
+                && !hasEdgeTreatments
+                && found.value.sketchOperation === "extrude"
+                && Boolean(found.value.sketchProfile)
+                && hasDraftPrism;
+            const replayableFaceDraftTreatment = (operation === "all-edge-treatment" || operation === "all-edge-chamfer-treatment")
+                && !hasEdgeTreatments
+                && found.value.faceDraft !== undefined
+                && (isPlainFullTurnSketchRevolve(found.value)
+                    || isSingleLoopSketchExtrusion(found.value)
+                        && (operation === "all-edge-treatment" || operation === "all-edge-chamfer-treatment")
+                    || operation === "all-edge-treatment" && isSingleSectionSketchSweep(found.value)
+                    || operation === "all-edge-chamfer-treatment" && isSingleSectionSketchSweep(found.value));
+            const incompatible = found.value.faceDraft !== undefined && !replayableFaceDraftTreatment
+                || operation === "edge-treatment" && hasDraftPrism
+                || (operation === "all-edge-treatment" || operation === "all-edge-chamfer-treatment")
+                    && hasDraftPrism && !replayablePrismTreatment
+                || operation === "prism-draft" && hasEdgeTreatments
+                || operation === "shell" && (found.value.draftPrismAngle !== undefined || hasEdgeTreatments);
+            if (incompatible) {
+                return failed({
+                    reason: "cad_refused",
+                    message: "Face drafts support one symmetric 45-degree all-edge chamfer or all-edge fillet on a single-loop sketch extrusion, one symmetric 45-degree all-edge chamfer or all-edge fillet on a single-section sketch sweep, or one symmetric all-edge chamfer or all-edge fillet on a plain full-turn sketch revolve; prism drafts support one all-edge treatment only on a sketch extrusion. Other draft and treatment combinations, and shelling with persisted features, are refused.",
+                    status: 422,
+                });
+            }
             let changed;
             try {
                 changed = await run(found.value);
@@ -413,11 +502,15 @@ export function createEngine(store) {
         changeShape: (projectId, shapeId, changes) => mutating(projectId, async (document) => {
             const byOutputId = oneShape(document, shapeId);
             // A persisted sketch source is an input node, not a renderable shape.
-            // When a caller edits that node's profile, resolve its dependent sweep
-            // output and rebuild it before the single project write below. The
+            // When a caller edits that node's profile or revolve settings, resolve
+            // its dependent output and rebuild it before the single project write. The
             // output keeps its own stable object ID; SKF export derives the source
             // node from the synchronized profile on that output.
-            const sourceOutputs = !byOutputId.ok && changes.sketchProfile !== undefined
+            const sourceFeatureInputChanged = changes.sketchProfile !== undefined
+                || changes.draftPrismAngle !== undefined
+                || Object.hasOwn(changes, "faceDraft")
+                || REVOLVE_CHANGE_FIELDS.some((field) => changes[field] !== undefined);
+            const sourceOutputs = !byOutputId.ok && sourceFeatureInputChanged
                 ? findSketchOutput(document.shapes, shapeId)
                 : [];
             const sourceSketchTarget = !byOutputId.ok && sourceOutputs.length === 1;
@@ -430,7 +523,9 @@ export function createEngine(store) {
                 return found;
             const existing = found.value;
             if (sourceSketchTarget) {
-                const outputFields = Object.keys(changes).filter((field) => field !== "sketchProfile");
+                const isRevolveSource = isRevolveShape(existing);
+                const outputFields = Object.keys(changes).filter((field) => field !== "sketchProfile" && field !== "draftPrismAngle" && field !== "faceDraft"
+                    && !(isRevolveSource && REVOLVE_CHANGE_FIELDS.includes(field)));
                 if (outputFields.length > 0) {
                     return failed({ reason: "unapplicable_fields", kind: existing.kind, fields: outputFields, because: "not_this_kind" });
                 }
@@ -441,9 +536,80 @@ export function createEngine(store) {
             if (existing.locked && changes.locked !== false)
                 return failed({ reason: "shape_locked", ids: [shapeId] });
             const replacingSketchProfile = changes.sketchProfile !== undefined;
+            const faceDraftChanged = Object.hasOwn(changes, "faceDraft");
+            const clearingFaceDraft = faceDraftChanged && changes.faceDraft === null && existing.faceDraft !== undefined;
+            const requestedFaceDraft = faceDraftChanged
+                ? changes.faceDraft === null ? undefined : faceDraftInput(changes.faceDraft)
+                : existing.faceDraft;
             const isSketchSweep = existing.sketchOperation === "sweep" && Boolean(existing.sketchProfile);
             const isSketchExtrusion = existing.sketchOperation === "extrude" && Boolean(existing.sketchProfile);
-            if (replacingSketchProfile && !isSketchSweep && !isSketchExtrusion) {
+            const isSketchRevolve = isRevolveShape(existing);
+            if (faceDraftChanged && changes.faceDraft !== null && !requestedFaceDraft) {
+                return failed({ reason: "invalid_shape_request", message: "A face draft requires a stable source face ID, a non-zero angle below 45 degrees, and a signed local pull axis." });
+            }
+            const isExactSketchRevolve = isPlainFullTurnSketchRevolve(existing);
+            if ((faceDraftChanged || (replacingSketchProfile && existing.faceDraft))
+                && !isSketchExtrusion && !isSketchSweep && !isExactSketchRevolve) {
+                return failed({ reason: "unapplicable_fields", kind: existing.kind, fields: ["faceDraft"], because: "not_this_kind" });
+            }
+            const hasExistingTreatment = (existing.edgeTreatments?.length ?? 0) > 0
+                || (existing.edgeTreatmentHistory?.length ?? 0) > 0;
+            const canReplayFaceDraftTreatment = existing.faceDraft !== undefined
+                && existing.draftPrismAngle === undefined
+                && (!faceDraftChanged || requestedFaceDraft !== undefined && requestedFaceDraft !== null
+                    && requestedFaceDraft.sourceFaceId === existing.faceDraft.sourceFaceId)
+                && (isPlainFullTurnSketchRevolve(existing)
+                    || isSingleLoopSketchExtrusion(existing)
+                        && (existing.edgeTreatments?.[0]?.kind === "fillet" || existing.edgeTreatments?.[0]?.kind === "chamfer")
+                    || isSingleSectionSketchSweep(existing)
+                        && (existing.edgeTreatments?.[0]?.kind === "fillet" || existing.edgeTreatments?.[0]?.kind === "chamfer"))
+                && existing.edgeTreatments?.length === 1
+                && (existing.edgeTreatments[0]?.kind === "chamfer" || existing.edgeTreatments[0]?.kind === "fillet")
+                && existing.edgeTreatments[0]?.allEdges === true
+                && existing.edgeTreatmentHistory?.length === 1
+                && existing.edgeTreatmentHistory[0]?.feature.kind === existing.edgeTreatments[0]?.kind
+                && existing.edgeTreatmentHistory[0]?.feature.allEdges === true
+                && (existing.edgeTreatments[0]?.kind !== "chamfer"
+                    || Math.abs((existing.edgeTreatments[0].chamferAngle ?? 45) - 45) < 0.001
+                        && Math.abs((existing.edgeTreatmentHistory[0]?.feature.chamferAngle ?? 45) - 45) < 0.001);
+            if (requestedFaceDraft
+                && (existing.draftPrismAngle !== undefined || hasExistingTreatment && !canReplayFaceDraftTreatment)) {
+                return failed({ reason: "invalid_shape_request", message: "This face draft cannot be combined with the requested persisted draft or treatment history." });
+            }
+            const canReselectUntreatedExtrusionFace = isSingleLoopSketchExtrusion(existing)
+                && existing.draftPrismAngle === undefined
+                && !hasExistingTreatment;
+            if (faceDraftChanged && existing.faceDraft && requestedFaceDraft
+                && requestedFaceDraft.sourceFaceId !== existing.faceDraft.sourceFaceId
+                && replacingSketchProfile) {
+                return failed({ reason: "invalid_shape_request", message: "Change the sketch profile and face draft selection in separate edits." });
+            }
+            if (faceDraftChanged && existing.faceDraft && requestedFaceDraft
+                && requestedFaceDraft.sourceFaceId !== existing.faceDraft.sourceFaceId) {
+                const currentOutputFaces = await shapeFaces(existing);
+                if (!canReselectUntreatedExtrusionFace
+                    || !existing.faceDraftSourceFaceIds?.includes(requestedFaceDraft.sourceFaceId)
+                    || currentOutputFaces.filter((face) => face.id === requestedFaceDraft.sourceFaceId && face.surfaceType === "plane").length !== 1) {
+                    return failed({ reason: "invalid_shape_request", message: "Clear the existing face draft before selecting a different source face." });
+                }
+            }
+            const draftPrismChanged = changes.draftPrismAngle !== undefined;
+            const requestedDraftPrismAngle = typeof changes.draftPrismAngle === "number" ? changes.draftPrismAngle : undefined;
+            if (draftPrismChanged && (!isSketchExtrusion || requestedDraftPrismAngle === undefined || !Number.isFinite(requestedDraftPrismAngle)
+                || requestedDraftPrismAngle === 0 || Math.abs(requestedDraftPrismAngle) >= 45)) {
+                return failed({
+                    reason: "invalid_shape_request",
+                    message: "A draft prism angle must be non-zero and between -45 and 45 degrees on a sketch extrusion.",
+                });
+            }
+            if (draftPrismChanged && requestedFaceDraft) {
+                return failed({ reason: "invalid_shape_request", message: "Face drafts cannot be combined with prism drafts yet." });
+            }
+            if (draftPrismChanged && existing.draftPrismAngle === undefined
+                && ((existing.edgeTreatments?.length ?? 0) > 0 || (existing.edgeTreatmentHistory?.length ?? 0) > 0)) {
+                return failed({ reason: "invalid_shape_request", message: "A prism draft cannot be added after an edge treatment." });
+            }
+            if (replacingSketchProfile && !isSketchSweep && !isSketchExtrusion && !isSketchRevolve) {
                 return failed({ reason: "unapplicable_fields", kind: existing.kind, fields: ["sketchProfile"], because: "no_sweep" });
             }
             const sweptShape = isRevolveShape(existing);
@@ -456,8 +622,10 @@ export function createEngine(store) {
             // leave a thread's pitch readable but not writable.
             const revolveChanges = sweptShape ? REVOLVE_CHANGE_FIELDS.filter((field) => changes[field] !== undefined) : [];
             let swept = existing;
-            if (replacingSketchProfile && isSketchExtrusion) {
-                const frame = existing.cadBrepFrame;
+            if ((replacingSketchProfile && isSketchExtrusion) || (draftPrismChanged && isSketchExtrusion)
+                || (faceDraftChanged && isSketchExtrusion)) {
+                const sourceFrame = existing.faceDraftSourceFrame ?? existing.draftPrismSourceFrame ?? existing.cadBrepFrame;
+                const sourceHeight = existing.draftPrismSourceHeight ?? existing.faceDraftSourceFrame?.height ?? existing.height;
                 try {
                     const rebuilt = await sketchExtrusionShapeFromRequest({
                         id: existing.id,
@@ -465,34 +633,148 @@ export function createEngine(store) {
                         name: existing.name,
                         color: existing.color,
                         hole: existing.hole,
-                        profile: changes.sketchProfile,
-                        height: existing.height,
-                        x: existing.x - (frame?.x ?? 0),
-                        z: existing.z - (frame?.z ?? 0),
-                        elevation: (existing.elevation ?? 0) - (frame?.elevation ?? 0),
+                        profile: replacingSketchProfile ? changes.sketchProfile : existing.sketchProfile,
+                        height: sourceHeight,
+                        x: existing.x - (sourceFrame?.x ?? 0),
+                        z: existing.z - (sourceFrame?.z ?? 0),
+                        elevation: (existing.elevation ?? 0) - (sourceFrame?.elevation ?? 0),
                         rotation: existing.rotation,
                         rotationX: existing.rotationX,
                         rotationZ: existing.rotationZ,
                     });
                     const { faceIds: _oldFaceIds, faceColors: _faceColors, edgeTreatments: _edgeTreatments, edgeTreatmentHistory: _edgeTreatmentHistory, cadDisplayEdges: _cadDisplayEdges, cadDisplayEdgesVersion: _cadDisplayEdgesVersion, ...sourceMetadata } = existing;
-                    swept = { ...sourceMetadata, ...rebuilt, id: existing.id, sketchSourceId: existing.sketchSourceId ?? rebuilt.sketchSourceId };
+                    const draftPrismAngle = draftPrismChanged ? requestedDraftPrismAngle : existing.draftPrismAngle;
+                    const rebuiltSource = {
+                        ...sourceMetadata,
+                        ...rebuilt,
+                        id: existing.id,
+                        sketchSourceId: existing.sketchSourceId ?? rebuilt.sketchSourceId,
+                        faceDraft: undefined,
+                        faceDraftSourceFrame: undefined,
+                        faceDraftSourceFaceIds: undefined,
+                        faceDraftSourceSegmentId: undefined,
+                        ...(faceDraftChanged && !replacingSketchProfile && !existing.faceDraft && !hasExistingTreatment
+                            && existing.draftPrismAngle === undefined && existing.faceIds?.length === rebuilt.faceIds?.length
+                            ? { faceIds: existing.faceIds }
+                            : {}),
+                        ...(!replacingSketchProfile && existing.faceDraft && existing.faceDraftSourceFaceIds?.length === rebuilt.faceIds?.length
+                            ? { faceIds: existing.faceDraftSourceFaceIds }
+                            : {}),
+                        ...(draftPrismAngle === undefined ? {} : {
+                            draftPrismSourceHeight: sourceHeight,
+                            ...(sourceFrame ? { draftPrismSourceFrame: sourceFrame } : {}),
+                        }),
+                    };
+                    const hasRetainedTreatments = (existing.edgeTreatments?.length ?? 0) > 0
+                        || (existing.edgeTreatmentHistory?.length ?? 0) > 0;
+                    const replayDraftAndTreatment = hasRetainedTreatments
+                        && draftPrismAngle !== undefined
+                        && (replacingSketchProfile || clearingFaceDraft || draftPrismChanged);
+                    const replayFaceDraftAndTreatment = hasRetainedTreatments && faceDraftChanged && requestedFaceDraft !== undefined;
+                    const replayOriginal = clearingFaceDraft
+                        ? { ...existing, faceDraft: undefined }
+                        : replayFaceDraftAndTreatment && existing.faceDraft
+                            ? { ...existing, faceDraft: { ...existing.faceDraft, ...requestedFaceDraft } }
+                            : existing;
+                    const replayedSource = (replacingSketchProfile || clearingFaceDraft || draftPrismChanged || replayFaceDraftAndTreatment)
+                        && hasRetainedTreatments
+                        ? await replaySingleAllEdgeTreatment(replayOriginal, rebuiltSource, draftPrismChanged ? requestedDraftPrismAngle : undefined)
+                        : rebuiltSource;
+                    if (requestedFaceDraft && replayedSource.faceDraft) {
+                        swept = replayedSource;
+                    }
+                    else if (requestedFaceDraft) {
+                        const priorReference = existing.faceDraft?.sourceFaceId === requestedFaceDraft.sourceFaceId
+                            ? existing.faceDraft.sourceFaceNormal
+                            : undefined;
+                        const selectedOnPrior = priorReference ? undefined
+                            : (await shapeFaces(existing, isExactSketchRevolve ? { topology: "exact" } : undefined))
+                                .find((face) => face.id === requestedFaceDraft.sourceFaceId);
+                        const isReselection = existing.faceDraft !== undefined
+                            && requestedFaceDraft.sourceFaceId !== existing.faceDraft.sourceFaceId;
+                        const exactReselectedSourceFace = isReselection
+                            ? (await shapeFaces(replayedSource)).find((face) => face.id === requestedFaceDraft.sourceFaceId)
+                            : undefined;
+                        const exactSelectedSourceFace = !replacingSketchProfile && !existing.faceDraft
+                            ? (await shapeFaces(replayedSource)).find((face) => face.id === requestedFaceDraft.sourceFaceId)
+                            : undefined;
+                        const legacySegmentMatch = replacingSketchProfile && existing.faceDraft && !existing.faceDraftSourceSegmentId
+                            ? await legacyDraftSegmentForShape(existing)
+                            : undefined;
+                        if (legacySegmentMatch?.status === "ambiguous") {
+                            throw new Error("The saved face draft does not identify one source sketch segment.");
+                        }
+                        const retainedSourceSegmentId = existing.faceDraftSourceSegmentId
+                            ?? (legacySegmentMatch?.status === "matched" ? legacySegmentMatch.segmentId : undefined);
+                        const retainedSegmentFace = replacingSketchProfile && retainedSourceSegmentId
+                            ? await draftFaceForSketchSegment(replayedSource, retainedSourceSegmentId)
+                            : undefined;
+                        if (retainedSegmentFace && retainedSegmentFace.status !== "matched") {
+                            throw new Error("The selected sketch segment no longer maps to exactly one extrusion side face.");
+                        }
+                        let currentFaceId = retainedSegmentFace?.status === "matched"
+                            ? retainedSegmentFace.faceId
+                            : exactReselectedSourceFace?.surfaceType === "plane" ? exactReselectedSourceFace.id
+                                : exactSelectedSourceFace?.surfaceType === "plane" ? exactSelectedSourceFace.id : undefined;
+                        const sourceFaceNormal = retainedSegmentFace?.status === "matched"
+                            ? retainedSegmentFace.normal
+                            : exactReselectedSourceFace?.normal ?? exactSelectedSourceFace?.normal ?? priorReference ?? selectedOnPrior?.normal;
+                        if (!sourceFaceNormal || selectedOnPrior && selectedOnPrior.surfaceType !== "plane") {
+                            throw new Error("The selected source face has no stable planar reference.");
+                        }
+                        if (!currentFaceId)
+                            currentFaceId = (await findUniqueDraftFace(replayedSource, sourceFaceNormal))?.id;
+                        if (!currentFaceId)
+                            throw new Error("The selected source face is missing or ambiguous after the sketch edit.");
+                        const segmentMatch = retainedSegmentFace?.status === "matched"
+                            ? retainedSegmentFace
+                            : await sketchSegmentForDraftFace(replayedSource, currentFaceId);
+                        if (segmentMatch.status === "ambiguous") {
+                            throw new Error("The selected lateral face matches multiple sketch segments.");
+                        }
+                        if (segmentMatch.status === "missing") {
+                            throw new Error("The selected extrusion side face has no exact sketch-segment boundary match.");
+                        }
+                        const faceDraft = { ...requestedFaceDraft, sourceFaceNormal };
+                        const result = await applySketchFaceDraft(replayedSource, {
+                            ...requestedFaceDraft,
+                            sourceFaceId: currentFaceId,
+                        });
+                        swept = {
+                            ...shapeWithCadResult(replayedSource, result),
+                            faceDraft: { ...faceDraft, sourceFaceId: currentFaceId },
+                            faceDraftSourceFaceIds: replayedSource.faceIds,
+                            faceDraftSourceSegmentId: segmentMatch.status === "matched" ? segmentMatch.segmentId : undefined,
+                            faceDraftSourceFrame: existing.faceDraftSourceFrame ?? existing.cadBrepFrame,
+                        };
+                    }
+                    else if (draftPrismAngle !== undefined && !replayDraftAndTreatment) {
+                        swept = {
+                            ...shapeWithCadResult(replayedSource, await applyDraftPrism(replayedSource, { angle: draftPrismAngle })),
+                            draftPrismAngle,
+                        };
+                    }
+                    else {
+                        swept = replayedSource;
+                    }
                 }
                 catch (error) {
                     return failed({ reason: "sweep_failed", message: error instanceof Error ? error.message : "The sketch extrusion could not be rebuilt." });
                 }
             }
-            if (replacingSketchProfile && isSketchSweep) {
-                const invalidProfile = invalidSketchSweepProfile(changes.sketchProfile);
+            if ((replacingSketchProfile || faceDraftChanged) && isSketchSweep) {
+                const profileToBuild = replacingSketchProfile ? changes.sketchProfile : existing.sketchProfile;
+                const invalidProfile = replacingSketchProfile ? invalidSketchSweepProfile(profileToBuild) : undefined;
                 if (invalidProfile)
                     return failed({ reason: "invalid_shape_request", message: invalidProfile });
-                const frame = existing.cadBrepFrame;
+                const frame = existing.faceDraftSourceFrame ?? existing.cadBrepFrame;
                 try {
                     const rebuilt = await sketchSweepShapeFromRequest({
                         id: existing.id,
                         name: existing.name,
                         color: existing.color,
                         hole: existing.hole,
-                        profile: changes.sketchProfile,
+                        profile: profileToBuild,
                         x: existing.x - (frame?.x ?? 0),
                         z: existing.z - (frame?.z ?? 0),
                         elevation: (existing.elevation ?? 0) - (frame?.elevation ?? 0),
@@ -514,14 +796,61 @@ export function createEngine(store) {
                     resized.size = Math.max(resized.width, resized.depth);
                     const refreshedFaceIds = (await shapeFaces(rebuilt))
                         .map((face) => `face_${createLocalId(`${existing.id}-${face.index}`)}`);
-                    const { faceIds: _oldFaceIds, faceColors: _faceColors, edgeTreatments: _edgeTreatments, edgeTreatmentHistory: _edgeTreatmentHistory, cadDisplayEdges: _cadDisplayEdges, cadDisplayEdgesVersion: _cadDisplayEdgesVersion, ...sourceMetadata } = existing;
-                    swept = {
+                    const { faceIds: _oldFaceIds, faceColors: _faceColors, edgeTreatments: _edgeTreatments, edgeTreatmentHistory: _edgeTreatmentHistory, cadDisplayEdges: _cadDisplayEdges, cadDisplayEdgesVersion: _cadDisplayEdgesVersion, faceDraft: _faceDraft, faceDraftSourceFrame: _faceDraftSourceFrame, ...sourceMetadata } = existing;
+                    const rebuiltSweep = {
                         ...sourceMetadata,
                         ...resized,
                         id: existing.id,
                         sketchSourceId: existing.sketchSourceId ?? rebuilt.sketchSourceId,
                         faceIds: refreshedFaceIds,
+                        faceDraft: undefined,
+                        faceDraftSourceFrame: undefined,
                     };
+                    const hasRetainedTreatments = (existing.edgeTreatments?.length ?? 0) > 0
+                        || (existing.edgeTreatmentHistory?.length ?? 0) > 0;
+                    const replayFaceDraftAndTreatment = hasRetainedTreatments && faceDraftChanged && requestedFaceDraft !== undefined;
+                    const replayOriginal = clearingFaceDraft
+                        ? { ...existing, faceDraft: undefined }
+                        : replayFaceDraftAndTreatment && existing.faceDraft
+                            ? { ...existing, faceDraft: { ...existing.faceDraft, ...requestedFaceDraft } }
+                            : existing;
+                    const replayedSource = (replacingSketchProfile || clearingFaceDraft || replayFaceDraftAndTreatment) && hasRetainedTreatments
+                        ? await replaySingleAllEdgeTreatment(replayOriginal, rebuiltSweep)
+                        : rebuiltSweep;
+                    if (requestedFaceDraft && replayedSource.faceDraft) {
+                        // `replaySingleAllEdgeTreatment` has already rebuilt the retained
+                        // draft before its treatment; applying the draft again would try
+                        // to operate on post-fillet topology and make source edits fail.
+                        swept = replayedSource;
+                    }
+                    else if (requestedFaceDraft) {
+                        const priorReference = existing.faceDraft?.sourceFaceId === requestedFaceDraft.sourceFaceId
+                            ? existing.faceDraft.sourceFaceNormal
+                            : undefined;
+                        const selectedOnPrior = priorReference ? undefined
+                            : (await shapeFaces(existing, isExactSketchRevolve ? { topology: "exact" } : undefined))
+                                .find((face) => face.id === requestedFaceDraft.sourceFaceId);
+                        const sourceFaceNormal = priorReference ?? selectedOnPrior?.normal;
+                        if (!sourceFaceNormal || selectedOnPrior && selectedOnPrior.surfaceType !== "plane") {
+                            throw new Error("The selected source face has no stable planar reference.");
+                        }
+                        const currentFace = await findUniqueDraftFace(replayedSource, sourceFaceNormal);
+                        if (!currentFace)
+                            throw new Error("The selected source face is missing or ambiguous after the sketch edit.");
+                        const faceDraft = { ...requestedFaceDraft, sourceFaceNormal };
+                        const result = await applySketchFaceDraft(replayedSource, {
+                            ...requestedFaceDraft,
+                            sourceFaceId: currentFace.id,
+                        });
+                        swept = {
+                            ...shapeWithCadResult(replayedSource, result),
+                            faceDraft,
+                            faceDraftSourceFrame: existing.faceDraftSourceFrame ?? existing.cadBrepFrame,
+                        };
+                    }
+                    else {
+                        swept = replayedSource;
+                    }
                 }
                 catch (error) {
                     return failed({
@@ -530,7 +859,89 @@ export function createEngine(store) {
                     });
                 }
             }
-            if (revolveChanges.length > 0 && sweptShape) {
+            if ((faceDraftChanged || (replacingSketchProfile && existing.faceDraft)
+                || (revolveChanges.length > 0 && existing.faceDraft)) && isSketchRevolve) {
+                try {
+                    const runtime = await serverManifoldRuntime();
+                    const sourceFrame = existing.faceDraftSourceFrame ?? existing.cadBrepFrame;
+                    const rebuildSeed = sourceFrame ? {
+                        ...existing,
+                        x: sourceFrame.x,
+                        z: sourceFrame.z,
+                        elevation: sourceFrame.elevation,
+                    } : existing;
+                    const rebuiltAtNaturalScale = rebuiltRevolveShape(runtime, rebuildSeed, {
+                        profile: (replacingSketchProfile ? changes.sketchProfile : existing.sketchProfile),
+                        settings: revolveChanges.length > 0
+                            ? requestedRevolveSettings(existing.sketchRevolve, changes)
+                            : existing.sketchRevolve,
+                    });
+                    const sourceScale = existing.faceDraftSourceScale ?? revolveSourceScale(existing);
+                    const rebuilt = resizeRebuiltRevolve(rebuiltAtNaturalScale, sourceScale);
+                    if (requestedFaceDraft) {
+                        const exactBase = shapeWithCadResult(rebuilt, await exactPlainSketchRevolveResult(rebuilt));
+                        const priorReference = existing.faceDraft?.sourceFaceId === requestedFaceDraft.sourceFaceId
+                            ? existing.faceDraft.sourceFaceNormal
+                            : undefined;
+                        const selectedOnPrior = priorReference ? undefined
+                            : (await shapeFaces(existing, { topology: "exact" }))
+                                .find((face) => face.id === requestedFaceDraft.sourceFaceId);
+                        const sourceFaceNormal = priorReference ?? selectedOnPrior?.normal;
+                        if (!sourceFaceNormal || selectedOnPrior && selectedOnPrior.surfaceType !== "plane") {
+                            throw new Error("The selected source face has no stable planar reference.");
+                        }
+                        const currentFace = await findUniqueDraftFace(exactBase, sourceFaceNormal);
+                        if (!currentFace)
+                            throw new Error("The selected source face is missing or ambiguous after the sketch edit.");
+                        const faceDraft = { ...requestedFaceDraft, sourceFaceNormal };
+                        const result = await applySketchFaceDraft(exactBase, {
+                            ...requestedFaceDraft,
+                            sourceFaceId: currentFace.id,
+                        });
+                        swept = {
+                            ...shapeWithCadResult(exactBase, result),
+                            faceDraft,
+                            faceDraftSourceFrame: existing.faceDraftSourceFrame ?? existing.cadBrepFrame ?? exactBase.cadBrepFrame,
+                            faceDraftSourceScale: sourceScale,
+                        };
+                        swept = await replaySingleAllEdgeTreatment(existing, swept);
+                    }
+                    else {
+                        const clearedDraft = {
+                            ...rebuilt,
+                            faceDraft: undefined,
+                            faceDraftSourceFrame: undefined,
+                            faceDraftSourceScale: undefined,
+                        };
+                        swept = clearingFaceDraft
+                            ? await replaySingleAllEdgeTreatment({ ...existing, faceDraft: undefined }, clearedDraft)
+                            : clearedDraft;
+                    }
+                }
+                catch (error) {
+                    return failed({
+                        reason: "sweep_failed",
+                        message: error instanceof Error ? error.message : "The sketch revolve could not be rebuilt.",
+                    });
+                }
+            }
+            else if (replacingSketchProfile && isSketchRevolve) {
+                try {
+                    const runtime = await serverManifoldRuntime();
+                    const rebuilt = rebuiltRevolveShape(runtime, existing, {
+                        profile: changes.sketchProfile,
+                        settings: existing.sketchRevolve,
+                    });
+                    swept = await replaySingleAllEdgeTreatment(existing, rebuilt);
+                }
+                catch (error) {
+                    return failed({
+                        reason: "sweep_failed",
+                        message: error instanceof Error ? error.message : "The sketch revolve could not be rebuilt.",
+                    });
+                }
+            }
+            if (revolveChanges.length > 0 && sweptShape && !existing.faceDraft) {
                 const outline = changes.profile ?? changes.outline ?? outlineFromProfile(existing.sketchProfile);
                 if (!outline) {
                     return failed({
@@ -545,10 +956,11 @@ export function createEngine(store) {
                     return failed({ reason: "invalid_shape_request", message: parsed.error });
                 try {
                     const runtime = await serverManifoldRuntime();
-                    swept = rebuiltRevolveShape(runtime, existing, {
+                    const rebuilt = rebuiltRevolveShape(runtime, existing, {
                         profile: parsed.profile,
                         settings: requestedRevolveSettings(existing.sketchRevolve, changes),
                     });
+                    swept = await replaySingleAllEdgeTreatment(existing, rebuilt);
                 }
                 catch (error) {
                     return failed({
@@ -562,6 +974,8 @@ export function createEngine(store) {
             const sweepFields = [
                 ...(sweptShape ? REVOLVE_CHANGE_FIELDS : REVOLVE_ONLY_FIELDS),
                 "sketchProfile",
+                "draftPrismAngle",
+                "faceDraft",
             ];
             // Shape summaries expose the source ID for identity; echoing a full
             // summary into PATCH must not let callers replace that identity.
@@ -806,12 +1220,12 @@ export function createEngine(store) {
                 return failed(cadFailure(error));
             }
         }),
-        faces: (projectId, shapeId) => reading(projectId, async (document) => {
+        faces: (projectId, shapeId, topology) => reading(projectId, async (document) => {
             const found = oneShape(document, shapeId);
             if (!found.ok)
                 return found;
             try {
-                return ok(await shapeFaces(found.value));
+                return ok(await shapeFaces(found.value, topology === "exact" ? { topology } : undefined));
             }
             catch (error) {
                 return failed(cadFailure(error));
@@ -868,8 +1282,47 @@ export function createEngine(store) {
                 return failed(cadFailure(error));
             }
         }),
-        treat: (projectId, shapeId, treatment) => cadTreatment(projectId, shapeId, async (shape) => (shapeWithCadResult(shape, await applyEdgeTreatment(shape, treatment)))),
-        draftPrism: (projectId, shapeId, angle) => cadTreatment(projectId, shapeId, async (shape) => (shapeWithCadResult(shape, await applyDraftPrism(shape, { angle })))),
+        treat: (projectId, shapeId, treatment) => cadTreatment(projectId, shapeId, (treatment.edges === undefined || treatment.edges.length === 0)
+            && treatment.kind === "chamfer" && (treatment.angle === undefined || Math.abs(treatment.angle - 45) < 0.001)
+            ? "all-edge-chamfer-treatment"
+            : (treatment.edges === undefined || treatment.edges.length === 0)
+                && treatment.kind === "fillet"
+                ? "all-edge-treatment"
+                : "edge-treatment", async (shape) => {
+            const treated = shapeWithCadResult(shape, await applyEdgeTreatment(shape, treatment));
+            if (shape.draftPrismAngle === undefined && shape.faceDraft === undefined)
+                return treated;
+            const feature = {
+                kind: treatment.kind,
+                amount: treatment.amount,
+                edgeCount: await allEdgeTreatmentEdgeCount(shape, treatment.kind),
+                allEdges: true,
+                ...(treatment.kind === "chamfer" ? { chamferAngle: treatment.angle ?? 45 } : {}),
+            };
+            const history = shape.edgeTreatmentHistory ?? [];
+            return {
+                ...treated,
+                edgeTreatments: [...(shape.edgeTreatments ?? []), feature],
+                edgeTreatmentHistory: [
+                    ...history,
+                    {
+                        id: createLocalId("edge-history"),
+                        createdAt: Date.now(),
+                        feature,
+                        before: structuredClone(shape),
+                    },
+                ],
+            };
+        }),
+        draftPrism: (projectId, shapeId, angle) => cadTreatment(projectId, shapeId, "prism-draft", async (shape) => {
+            const sourceFrame = shape.draftPrismSourceFrame ?? shape.cadBrepFrame;
+            return {
+                ...shapeWithCadResult(shape, await applyDraftPrism(shape, { angle })),
+                draftPrismAngle: angle,
+                draftPrismSourceHeight: shape.draftPrismSourceHeight ?? shape.height,
+                ...(sourceFrame ? { draftPrismSourceFrame: sourceFrame } : {}),
+            };
+        }),
         mirrorBaked: (projectId, ids, axis) => mutating(projectId, async (document) => {
             if (ids.length < 1)
                 return failed({ reason: "selection_too_small", needed: 1, given: 0 });
@@ -899,7 +1352,7 @@ export function createEngine(store) {
                 revision: await writeShapes(projectId, document, shapes),
             });
         }),
-        shell: (projectId, shapeId, request) => cadTreatment(projectId, shapeId, async (shape) => (shapeWithCadResult(shape, await applyShell(shape, request)))),
+        shell: (projectId, shapeId, request) => cadTreatment(projectId, shapeId, "shell", async (shape) => (shapeWithCadResult(shape, await applyShell(shape, request)))),
     };
 }
 //# sourceMappingURL=engine.js.map