From 1203d5c6a36d3340827bb4b15c86911fb368a00f Mon Sep 17 00:00:00 2001
From: paukstelis <paukstel@umd.edu>
Date: Thu, 10 Sep 2026 15:35:32 -0400
Subject: [PATCH 1/2] camForceZMax enforces safeZ moves

---
 src/kiri/mode/cam/work/prepare.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/kiri/mode/cam/work/prepare.js b/src/kiri/mode/cam/work/prepare.js
index c6ed072c2..df227cec7 100644
--- a/src/kiri/mode/cam/work/prepare.js
+++ b/src/kiri/mode/cam/work/prepare.js
@@ -551,7 +551,10 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
             isMove = (emit === 0 || emit === false),
             hasBounds = (travelBounds || lastTravelBounds),
             upAndOver = false;
-
+        // propose camForceZMax enforces moves to safeZ
+        if (camForceZMax) {
+            upAndOver = true;
+        } else
         // contouring logic
         if (isMove && contouring) {
             if (coastline && deltaXY < 5 && coastlineMove(point)) {
@@ -636,7 +639,7 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
             if (bigXY || bigZ || midZ) {
                 if (debug) console.log({ fromz: printPoint.z, toz: point.z });
                 // for big moves intersecting stock...
-                if (camForceZMax || inStock) {
+                if (inStock) {
                     upAndOver = true;
                 }
             }

From cacc333ef6636decc9b0a9ab689a861bbb031939 Mon Sep 17 00:00:00 2001
From: paukstelis <paukstel@umd.edu>
Date: Thu, 10 Sep 2026 16:18:26 -0400
Subject: [PATCH 2/2] forgot isMove

---
 src/kiri/mode/cam/work/prepare.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kiri/mode/cam/work/prepare.js b/src/kiri/mode/cam/work/prepare.js
index df227cec7..d466960f4 100644
--- a/src/kiri/mode/cam/work/prepare.js
+++ b/src/kiri/mode/cam/work/prepare.js
@@ -552,7 +552,7 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
             hasBounds = (travelBounds || lastTravelBounds),
             upAndOver = false;
         // propose camForceZMax enforces moves to safeZ
-        if (camForceZMax) {
+        if (isMove && camForceZMax) {
             upAndOver = true;
         } else
         // contouring logic