Fix cold shutdown not clearing last_snapshot_timestamp, causing next boot to try loading a deleted snapshot.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: samuelclay

server/utils/emulator_shutdown_manager.py

@@ -102,7 +102,7 @@ def shutdown_emulator(  # noqa: C901 (complexity is acceptable for entry‑point
         server = AutomationServer.get_instance()
         automator = server.automators.get(email)
         if automator is None:
-            return self._handle_orphaned_emulator(email, summary)
+            return self._handle_orphaned_emulator(email, summary, cold=cold)
 
         # ------------------------------------------------------------------
         # 3. UI navigation (navigate to library if needed)             ──────
@@ -229,8 +229,14 @@ def _mark_for_restart(email: str, mark_for_restart: Optional[bool]):
 
     # ----------------------- orphan‑handling ------------------------ #
 
-    def _handle_orphaned_emulator(self, email: str, summary: Dict[str, bool]):  # noqa: C901
+    def _handle_orphaned_emulator(
+        self, email: str, summary: Dict[str, bool], cold: bool = False
+    ):  # noqa: C901
         """Stop an emulator that is still running but has no live automator."""
+        # Handle cold boot cleanup even if there's no running emulator
+        if cold:
+            self._clear_snapshot_timestamp(email)
+
         vnc_manager = VNCInstanceManager.get_instance()
         vnc_instance = vnc_manager.get_instance_for_profile(email)
         if not vnc_instance or not vnc_instance.get("emulator_id"):
@@ -485,6 +491,9 @@ def _delete_existing_snapshot(self, automator, email: str, summary: Dict[str, bo
                 logger.debug(f"No default_boot snapshot found to delete for {email}")
                 summary["snapshot_deleted"] = False
 
+            # Clear the snapshot timestamp so the next boot uses -no-snapshot-load
+            self._clear_snapshot_timestamp(email)
+
         except Exception as e:
             logger.error(f"Error deleting snapshot for {email}: {e}", exc_info=True)
             summary["snapshot_deleted"] = False
@@ -525,6 +534,17 @@ def _take_snapshot(self, automator, email: str, summary: Dict[str, bool]):
                 snapshot_attempted=True,
             )
 
+    @staticmethod
+    def _clear_snapshot_timestamp(email: str):
+        """Clear the snapshot timestamp so the next boot uses cold boot (-no-snapshot-load)."""
+        with contextlib.suppress(Exception):
+            from views.core.avd_profile_manager import AVDProfileManager
+
+            avd_mgr = AVDProfileManager.get_instance()
+            avd_mgr.set_user_field(email, "last_snapshot_timestamp", None)
+            avd_mgr.set_user_field(email, "last_snapshot", None)
+            logger.info(f"Cleared snapshot timestamp for {email} - next boot will cold boot")
+
     @staticmethod
     def _update_snapshot_timestamp(email: str):
         """Persist the default_boot snapshot timestamp to the user's AVD profile."""