From b56559480ab49bed59a7556442704f29fb4896bc Mon Sep 17 00:00:00 2001
From: Thomas Honeyman <admin@thomashoneyman.com>
Date: Sat, 17 Oct 2026 23:57:54 +0000
Subject: [PATCH] Fix interrupted package set upgrade recovery

Clear partial compiler output when an upgrade leaves a backup behind, and remove backups after completed rollbacks to preserve incremental compilation.
---
 app/src/App/Effect/PackageSets.purs  |  7 ++++-
 app/test/App/Effect/PackageSets.purs | 38 ++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/app/src/App/Effect/PackageSets.purs b/app/src/App/Effect/PackageSets.purs
index 9309f248..dfe4dba7 100644
--- a/app/src/App/Effect/PackageSets.purs
+++ b/app/src/App/Effect/PackageSets.purs
@@ -92,10 +92,13 @@ handle env = case _ of
     Log.info $ "Performing atomic upgrade of package set " <> Version.print (un PackageSet oldSet).version
 
     -- Always clean up the backup directory, which is transient and may be
-    -- left over from a previous crashed job.
+    -- left over from a previous crashed job. Clear the output first, since it
+    -- may contain results from the interrupted build.
     do
       exists <- Run.liftEffect $ FS.Sync.exists backupWorkDir
       when exists do
+        Log.info "Interrupted package set upgrade, wiping output directory"
+        FS.Extra.remove outputWorkDir
         Log.debug $ "Removing leftover backup directory " <> backupWorkDir
         FS.Extra.remove backupWorkDir
 
@@ -287,6 +290,7 @@ handle env = case _ of
         FS.Extra.copy { from: backupWorkDir, to: outputWorkDir, preserveTimestamps: true }
         removePackages additions
         installPackages oldVersions
+        FS.Extra.remove backupWorkDir
         pure $ Left err
       Right _ -> do
         FS.Extra.remove backupWorkDir
@@ -320,6 +324,7 @@ handle env = case _ of
           Remove -> pure unit
           Update version -> removePackage package version
         for_ maybeOldVersion (installPackage package)
+        FS.Extra.remove backupWorkDir
         pure $ Left err
       Right _ -> do
         FS.Extra.remove backupWorkDir
diff --git a/app/test/App/Effect/PackageSets.purs b/app/test/App/Effect/PackageSets.purs
index f56562ab..078b00ff 100644
--- a/app/test/App/Effect/PackageSets.purs
+++ b/app/test/App/Effect/PackageSets.purs
@@ -4,17 +4,55 @@ import Registry.App.Prelude
 
 import Data.Map as Map
 import Data.Set as Set
+import Effect.Aff as Aff
+import Node.FS.Sync as FS.Sync
+import Node.Path as Path
+import Registry.App.Effect.Log (Log(..))
+import Registry.App.Effect.Log as Log
 import Registry.App.Effect.PackageSets (Change(..))
 import Registry.App.Effect.PackageSets as PackageSets
+import Registry.App.Effect.Registry (RegistryRead(..))
+import Registry.App.Effect.Registry as Registry
+import Registry.App.Effect.Storage as Storage
+import Registry.Foreign.FSExtra as FS.Extra
+import Registry.Foreign.Tmp as Tmp
 import Registry.ManifestIndex as ManifestIndex
 import Registry.PackageName as PackageName
 import Registry.Test.Assert as Assert
 import Registry.Test.Utils as Utils
 import Registry.Version as Version
+import Run as Run
+import Run.Except as Except
 import Test.Spec as Spec
 
 spec :: Spec.Spec Unit
 spec = do
+  Spec.describe "package set recovery" do
+    for_ [ true, false ] \hasBackup ->
+      Spec.it (if hasBackup then "Discards output after an interrupted upgrade" else "Retains output when no backup remains") do
+        Aff.bracket Tmp.mkTmpDir FS.Extra.remove \tmp -> do
+          let
+            output = Path.concat [ tmp, "output" ]
+            backup = Path.concat [ tmp, "output-backup" ]
+            oldSet = (un PackageSet packageSet) { packages = Map.singleton (Utils.unsafePackageName "missing") (Utils.unsafeVersion "1.0.0") }
+          FS.Extra.ensureDirectory output
+          when hasBackup $ FS.Extra.ensureDirectory backup
+          -- Stop at installation, after recovery but before invoking a compiler.
+          result <- PackageSets.upgradeAtomic (PackageSet oldSet) oldSet.compiler Map.empty
+            # PackageSets.interpret (PackageSets.handle { workdir: tmp })
+            # Registry.interpretRead
+                ( case _ of
+                    ReadMetadata _ reply -> pure $ reply $ Right Nothing
+                    _ -> Except.throw "Unexpected registry operation"
+                )
+            # Storage.interpret (\_ -> Except.throw "Unexpected storage operation")
+            # Log.interpret (\(Log _ _ next) -> pure next)
+            # Except.runExcept
+            # Run.runBaseAff'
+          result `Assert.shouldEqual` Left "No metadata found for missing@1.0.0"
+          liftEffect (FS.Sync.exists output) >>= (_ `Assert.shouldEqual` not hasBackup)
+          liftEffect (FS.Sync.exists backup) >>= (_ `Assert.shouldEqual` false)
+
   Spec.it "Reports package set changelog correctly" do
     let
       operations = Map.fromFoldable