Fix Zookeeper bulk edit stale project handling

src/components/layout/areas/MlEphantConversationPaneWrapper.tsx

@@ -131,6 +131,7 @@ function MlEphantConversationPaneInner(props: AreaTypeComponentProps) {
 
   const {
     beginPendingZookeeperHistoryWrite,
+    cancelPendingZookeeperHistoryWrite,
     completePendingZookeeperHistoryWrite,
   } = useZookeeperEditPatchHistory({
     kclManager,
@@ -230,6 +231,11 @@ function MlEphantConversationPaneInner(props: AreaTypeComponentProps) {
                 })
               }
             },
+            onFileSystemError: () => {
+              if (shouldRecordZookeeperHistory) {
+                cancelPendingZookeeperHistoryWrite(exchangeId)
+              }
+            },
             ...(shouldRefreshActiveEditorAfterPlainOutput && activeFileOutput
               ? {
                   onSuccess: () => {
@@ -483,6 +489,16 @@ function useZookeeperEditPatchHistory({
     [tryFlushPendingZookeeperHistory]
   )
 
+  const cancelPendingZookeeperHistoryWrite = useCallback(
+    (exchangeId: number) => {
+      pendingZookeeperHistoryByExchange.current.delete(exchangeId)
+      if (pendingZookeeperHistoryByExchange.current.size === 0) {
+        kclManager.zookeeperHistoryRecordingInProgress = false
+      }
+    },
+    [kclManager]
+  )
+
   useFlushZookeeperHistoryOnResponseEnd(
     mlEphantManagerActor,
     pendingZookeeperHistoryByExchange,
@@ -491,6 +507,7 @@ function useZookeeperEditPatchHistory({
 
   return {
     beginPendingZookeeperHistoryWrite,
+    cancelPendingZookeeperHistoryWrite,
     completePendingZookeeperHistoryWrite,
   }
 }

src/machines/systemIO/systemIOMachine.ts

@@ -144,6 +144,7 @@ export const systemIOMachine = setup({
             override?: boolean
             requestedSubRoute?: string
             onFileSystemSuccess?: () => void
+            onFileSystemError?: () => void
             onSuccess?: () => void
           }
         }
@@ -669,6 +670,7 @@ export const systemIOMachine = setup({
             override?: boolean
             requestedSubRoute?: string
             onFileSystemSuccess?: () => void
+            onFileSystemError?: () => void
             onSuccess?: () => void
           }
         }): Promise<{
@@ -1708,6 +1710,7 @@ export const systemIOMachine = setup({
               event.data.requestedFileNameWithExtension,
             requestedSubRoute: event.data.requestedSubRoute,
             onFileSystemSuccess: event.data.onFileSystemSuccess,
+            onFileSystemError: event.data.onFileSystemError,
             onSuccess: event.data.onSuccess,
           }
         },

src/machines/systemIO/systemIOMachineImpl.ts

@@ -379,6 +379,15 @@ const sharedBulkDeleteWorkflow = async ({
     wasmInstance: ModuleType
   }
 }) => {
+  const requestedFilesToDelete = new Set(
+    (input.filesToDelete ?? []).map((file) =>
+      normalizeKCLFileDeletePath(file.requestedFileName)
+    )
+  )
+  if (requestedFilesToDelete.size === 0) {
+    return 0
+  }
+
   if (!input.context.folders) {
     console.warn('no folders')
     return
@@ -396,12 +405,6 @@ const sharedBulkDeleteWorkflow = async ({
     projectContext: project,
   })
 
-  const requestedFilesToDelete = new Set(
-    (input.filesToDelete ?? []).map((file) =>
-      normalizeKCLFileDeletePath(file.requestedFileName)
-    )
-  )
-
   // requestedFileName is the relative path too.
   const filesToDelete = filesInProject.filter(
     (file) =>
@@ -874,24 +877,33 @@ export const systemIOMachineImpl = systemIOMachine.provide({
             requestedFileNameWithExtension: string
             requestedSubRoute?: string
             onFileSystemSuccess?: () => void
+            onFileSystemError?: () => void
             onSuccess?: () => void
           }
         }) => {
-          const wasmInstance = await input.context.wasmInstancePromise
-          const message = await sharedBulkCreateWorkflow({
-            input: {
-              ...input,
-              wasmInstance,
-              override: input.override,
-            },
-          })
-          // We won't delete until everything's created / updated first.
-          const totalDeleted = await sharedBulkDeleteWorkflow({
-            input: {
-              ...input,
-              wasmInstance,
-            },
-          })
+          let message: Awaited<ReturnType<typeof sharedBulkCreateWorkflow>>
+          let totalDeleted = 0
+          try {
+            const wasmInstance = await input.context.wasmInstancePromise
+            message = await sharedBulkCreateWorkflow({
+              input: {
+                ...input,
+                wasmInstance,
+                override: input.override,
+              },
+            })
+            // We won't delete until everything's created / updated first.
+            totalDeleted =
+              (await sharedBulkDeleteWorkflow({
+                input: {
+                  ...input,
+                  wasmInstance,
+                },
+              })) ?? 0
+          } catch (error) {
+            input.onFileSystemError?.()
+            return Promise.reject(error)
+          }
 
           message.message += `, ${totalDeleted} deleted`
           input.onFileSystemSuccess?.()