From 7f44043f59b5de0761f5ef4695115a7145ca2cd5 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Fri, 8 Aug 2025 14:02:09 -0700
Subject: [PATCH 01/24] feat: refactor mirabuf caching service

---
 fission/src/mirabuf/MirabufLoader.ts          | 572 +++++++-----------
 fission/src/mirabuf/MirabufSceneObject.ts     |  19 +-
 fission/src/test/MirabufParser.test.ts        |   6 +-
 .../src/test/mirabuf/MirabufLoader.test.ts    |  34 +-
 .../test/mirabuf/MirabufSceneObject.test.ts   |   2 +-
 fission/src/test/physics/Mechanism.test.ts    |   4 +-
 .../PhysicsSystemRobotSpawning.test.ts        |   4 +-
 .../mirabuf/ImportLocalMirabufModal.tsx       |   4 +-
 fission/src/ui/panels/DebugPanel.tsx          |  11 +-
 fission/src/ui/panels/DeveloperToolPanel.tsx  |  77 +--
 .../ui/panels/mirabuf/ImportMirabufPanel.tsx  | 114 ++--
 11 files changed, 310 insertions(+), 537 deletions(-)

diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index 475d6b3b39..03a9df3382 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -7,14 +7,11 @@ import World from "@/systems/World"
 const MIRABUF_LOCALSTORAGE_GENERATION_KEY = "Synthesis Nonce Key"
 const MIRABUF_LOCALSTORAGE_GENERATION = "4543246"
 
-export type MirabufCacheID = string
-
 export interface MirabufCacheInfo {
-    id: MirabufCacheID
+    hash: string
+    name: string
     miraType: MiraType
-    cacheKey: string
-    buffer?: Uint8Array<ArrayBufferLike>
-    name?: string
+    remotePath?: string
     thumbnailStorageID?: string
 }
 
@@ -23,35 +20,25 @@ export interface MirabufRemoteInfo {
     src: string
 }
 
-type MapCache = { [id: MirabufCacheID]: MirabufCacheInfo }
-
-const robotsDirName = "Robots"
-const fieldsDirName = "Fields"
+const localStorageEntryName = "MirabufAssets"
 const root = await navigator.storage.getDirectory()
-const robotFolderHandle = await root.getDirectoryHandle(robotsDirName, {
-    create: true,
-})
-const fieldFolderHandle = await root.getDirectoryHandle(fieldsDirName, {
+const fsHandle = await root.getDirectoryHandle(localStorageEntryName, {
     create: true,
 })
 
-export let backUpRobots: MapCache = {}
-export let backUpFields: MapCache = {}
+export const memoryBuffer: Record<string, ArrayBuffer> = {}
 
 export const canOPFS = await (async () => {
     try {
-        if (robotFolderHandle.name == robotsDirName) {
-            robotFolderHandle.entries
-            robotFolderHandle.keys
-
-            const fileHandle = await robotFolderHandle.getFileHandle("0", {
+        if (fsHandle.name == localStorageEntryName) {
+            const fileHandle = await fsHandle.getFileHandle("0", {
                 create: true,
             })
             const writable = await fileHandle.createWritable()
             await writable.close()
             await fileHandle.getFile()
 
-            robotFolderHandle.removeEntry(fileHandle.name)
+            await fsHandle.removeEntry(fileHandle.name)
 
             return true
         } else {
@@ -62,19 +49,9 @@ export const canOPFS = await (async () => {
         console.log(`No access to OPFS`)
 
         // Copy-pasted from RemoveAll()
-        for await (const key of robotFolderHandle.keys()) {
-            robotFolderHandle.removeEntry(key)
-        }
-        for await (const key of fieldFolderHandle.keys()) {
-            fieldFolderHandle.removeEntry(key)
+        for await (const key of fsHandle.keys()) {
+            await fsHandle.removeEntry(key)
         }
-
-        window.localStorage.setItem(robotsDirName, "{}")
-        window.localStorage.setItem(fieldsDirName, "{}")
-
-        backUpRobots = {}
-        backUpFields = {}
-
         return false
     }
 })()
@@ -88,31 +65,109 @@ export function unzipMira(buff: Uint8Array): Uint8Array {
     }
 }
 
+class CacheMap {
+    private _map: Map<string, MirabufCacheInfo> = new Map()
+
+    private static isMirabufCacheInfo(data: unknown): data is MirabufCacheInfo {
+        return typeof data === "object" && data != null && "hash" in data && "name" in data && "miraType" in data
+    }
+    public load() {
+        const lookup = window.localStorage.getItem(localStorageEntryName)
+
+        if (lookup == null) {
+            this.save()
+            return
+        }
+        const parsed = JSON.parse(lookup) as unknown
+        if (!Array.isArray(parsed)) {
+            console.warn("Invalid localstorage cache")
+            this.save()
+            return
+        }
+        parsed.forEach((data: unknown) => {
+            if (!CacheMap.isMirabufCacheInfo(data)) {
+                console.warn("malformed mirabuf cache info", data)
+                return
+            }
+            this._map.set(data.hash, data)
+        })
+    }
+
+    public save() {
+        window.localStorage.setItem(localStorageEntryName, JSON.stringify([...this._map.values()]))
+    }
+
+    public get(hash: string): Readonly<MirabufCacheInfo> | undefined {
+        return this._map.get(hash)
+    }
+
+    public add(entry: MirabufCacheInfo): void {
+        if (this._map.has(entry.hash)) {
+            console.warn("attempting to add existing element to CacheMap")
+            return
+        }
+        this._map.set(entry.hash, entry)
+        this.save()
+    }
+
+    public store(entry: MirabufCacheInfo): void {
+        this._map.set(entry.hash, entry)
+        this.save()
+    }
+
+    public remove(hash: string): void {
+        this._map.delete(hash)
+        this.save()
+    }
+
+    public getAll(miraType?: MiraType): MirabufCacheInfo[] {
+        const all = [...this._map.values()]
+        if (miraType != null) {
+            return all.filter(x => x.miraType == miraType)
+        }
+        return all
+    }
+
+    public update(hash: string, updater: (item: MirabufCacheInfo) => void) {
+        const val = this._map.get(hash)
+        if (val) {
+            updater(val)
+            this.save()
+        } else {
+            console.warn("Could not find item to update")
+        }
+    }
+
+    public clear() {
+        this._map.clear()
+        this.save()
+    }
+}
+
 class MirabufCachingService {
-    /**
-     * Get the map of mirabuf keys and paired MirabufCacheInfo from local storage
-     *
-     * @param {MiraType} miraType Type of Mirabuf Assembly
-     *
-     * @returns {MapCache} Map of cached keys and paired MirabufCacheInfo
-     */
-    public static getCacheMap(miraType: MiraType): MapCache {
+    private static _cacheMap = new CacheMap()
+
+    static {
         if (
             (window.localStorage.getItem(MIRABUF_LOCALSTORAGE_GENERATION_KEY) ?? "") != MIRABUF_LOCALSTORAGE_GENERATION
         ) {
             window.localStorage.setItem(MIRABUF_LOCALSTORAGE_GENERATION_KEY, MIRABUF_LOCALSTORAGE_GENERATION)
-            this.removeAll()
-            return {}
+            this.removeAll().catch(console.error)
+            this._cacheMap.clear()
+        } else {
+            this._cacheMap.load()
+            if (canOPFS) {
+                setTimeout(() => this.clearExtraAssets()) // make sure nothing extra got left behind due to preferences clearing / whatever
+            }
         }
+    }
 
-        const key = miraType == MiraType.ROBOT ? robotsDirName : fieldsDirName
-        const map = window.localStorage.getItem(key)
-
-        if (map) {
-            return JSON.parse(map)
-        } else {
-            window.localStorage.setItem(key, "{}")
-            return {}
+    private static async clearExtraAssets() {
+        const files = fsHandle.keys()
+        for await (const filename of files) {
+            if (!this._cacheMap.get(filename)) {
+                await fsHandle.removeEntry(filename)
+            }
         }
     }
 
@@ -127,28 +182,28 @@ class MirabufCachingService {
      */
     public static async cacheRemote(
         fetchLocation: string,
-        miraType?: MiraType,
+        miraType: MiraType,
         name?: string
     ): Promise<MirabufCacheInfo | undefined> {
-        if (miraType !== undefined) {
-            const map = MirabufCachingService.getCacheMap(miraType)
-            const target = map[fetchLocation]
-            if (target) return target
-        }
         try {
             // grab file remote
             const resp = await fetch(encodeURI(fetchLocation), import.meta.env.DEV ? { cache: "no-store" } : undefined)
             if (!resp.ok) throw new Error(`${resp.status} ${resp.statusText}`)
 
             const miraBuff = await resp.arrayBuffer()
+            name ??= this.assemblyFromBuffer(miraBuff).info?.name ?? fetchLocation
 
             World.analyticsSystem?.event("Remote Download", {
-                assemblyName: name ?? fetchLocation,
+                assemblyName: name,
                 type: miraType === MiraType.ROBOT ? "robot" : "field",
                 fileSize: miraBuff.byteLength,
             })
 
-            const cached = await MirabufCachingService.storeInCache(fetchLocation, miraBuff, miraType, name)
+            const cached = await MirabufCachingService.storeInCache(miraBuff, {
+                miraType,
+                name,
+                remotePath: fetchLocation,
+            })
 
             if (cached) return cached
 
@@ -156,10 +211,8 @@ class MirabufCachingService {
 
             // fallback: return raw buffer wrapped in MirabufCacheInfo
             return {
-                id: Date.now().toString(),
-                miraType: miraType ?? (this.assemblyFromBuffer(miraBuff).dynamic ? MiraType.ROBOT : MiraType.FIELD),
-                cacheKey: fetchLocation,
-                buffer: new Uint8Array(miraBuff),
+                hash: await this.hashBuffer(miraBuff),
+                miraType: miraType,
                 name: name,
             }
         } catch (e) {
@@ -174,13 +227,6 @@ class MirabufCachingService {
             return undefined
         }
 
-        const map = MirabufCachingService.getCacheMap(miraType)
-        const target = map[data.id]
-
-        if (target) {
-            return target
-        }
-
         const miraBuff = await downloadData(data)
         if (!miraBuff) {
             console.error("Failed to download file")
@@ -192,70 +238,10 @@ class MirabufCachingService {
             fileSize: miraBuff.byteLength,
         })
 
-        return await MirabufCachingService.storeInCache(data.id, miraBuff, miraType)
-    }
-
-    /**
-     * Cache local Mirabuf file
-     *
-     * @param {ArrayBuffer} buffer ArrayBuffer of Mirabuf file.
-     * @param {MiraType} miraType Type of Mirabuf Assembly.
-     *
-     * @returns {Promise<MirabufCacheInfo | undefined>} Promise with the result of the promise. Metadata on the mirabuf file if successful, undefined if not.
-     */
-    public static async cacheLocal(buffer: ArrayBuffer, miraType: MiraType): Promise<MirabufCacheInfo | undefined> {
-        const key = await this.hashBuffer(buffer)
-
-        const map = MirabufCachingService.getCacheMap(miraType)
-        const target = map[key]
-
-        if (target) {
-            return target
-        }
-
-        return await MirabufCachingService.storeInCache(key, buffer, miraType)
-    }
-
-    /**
-     * Caches metadata (name or thumbnailStorageID) for a key
-     *
-     * @param {string} key Key to the given Mirabuf file entry in the caching service. Obtainable via GetCacheMaps().
-     * @param {MiraType} miraType Type of Mirabuf Assembly.
-     * @param {string} name (Optional) Name of Mirabuf Assembly.
-     * @param {string} thumbnailStorageID (Optional) ID of the the thumbnail storage for the Mirabuf Assembly.
-     */
-    public static async cacheInfo(
-        key: string,
-        miraType: MiraType,
-        name?: string,
-        thumbnailStorageID?: string
-    ): Promise<boolean> {
-        try {
-            const map: MapCache = this.getCacheMap(miraType)
-            const id = map[key].id
-            const buffer = miraType == MiraType.ROBOT ? backUpRobots[id].buffer : backUpFields[id].buffer
-            const defaultName = map[key].name
-            const defaultStorageID = map[key].thumbnailStorageID
-            const info: MirabufCacheInfo = {
-                id: id,
-                cacheKey: key,
-                miraType: miraType,
-                buffer: buffer,
-                name: name ?? defaultName,
-                thumbnailStorageID: thumbnailStorageID ?? defaultStorageID,
-            }
-            map[key] = info
-            if (miraType == MiraType.ROBOT) {
-                backUpRobots[id] = info
-            } else {
-                backUpFields[id] = info
-            }
-            window.localStorage.setItem(miraType == MiraType.ROBOT ? robotsDirName : fieldsDirName, JSON.stringify(map))
-            return true
-        } catch (e) {
-            console.error(`Failed to cache info\n${e}`)
-            return false
-        }
+        return await MirabufCachingService.storeInCache(miraBuff, {
+            miraType,
+            name: this.assemblyFromBuffer(miraBuff).info?.name ?? "Unknown APS",
+        })
     }
 
     /**
@@ -266,160 +252,105 @@ class MirabufCachingService {
      *
      * @returns {Promise<{assembly: mirabuf.Assembly, cacheInfo: MirabufCacheInfo} | undefined>} Promise with the result of the promise. Assembly and cache info of the mirabuf file if successful, undefined if not.
      */
-    public static async cacheAndGetLocalWithInfo(
+    public static async cacheLocalAndReturn(
         buffer: ArrayBuffer,
         miraType: MiraType
     ): Promise<{ assembly: mirabuf.Assembly; cacheInfo: MirabufCacheInfo } | undefined> {
-        const key = await this.hashBuffer(buffer)
-        const map = MirabufCachingService.getCacheMap(miraType)
-        const target = map[key]
         const assembly = this.assemblyFromBuffer(buffer)
-
-        // Check if assembly has devtool data and update name accordingly
-        let displayName = assembly.info?.name ?? undefined
-        if (assembly.data?.parts?.userData?.data) {
-            const devtoolKeys = Object.keys(assembly.data.parts.userData.data).filter(k => k.startsWith("devtool:"))
-            if (devtoolKeys.length > 0) {
-                displayName = displayName ? `Edited ${displayName}` : "Edited Field"
-            }
-        }
+        const hash = await this.hashBuffer(buffer)
 
         World.analyticsSystem?.event("Local Upload", {
-            assemblyName: displayName,
             fileSize: buffer.byteLength,
-            key,
+            key: hash,
             type: miraType == MiraType.ROBOT ? "robot" : "field",
         })
 
-        if (!target) {
-            const cacheInfo = await MirabufCachingService.storeInCache(key, buffer, miraType, displayName)
-            if (cacheInfo) {
-                return { assembly, cacheInfo }
-            }
-        } else {
-            // Update existing cache info with new name if it has devtool data
-            if (displayName && displayName !== target.name) {
-                await MirabufCachingService.cacheInfo(key, miraType, displayName)
-                target.name = displayName
-            }
-            return { assembly, cacheInfo: target }
-        }
+        const info = await MirabufCachingService.storeAssemblyInCache(assembly, { miraType })
+        if (!info) return
 
-        return undefined
+        return { assembly, cacheInfo: info }
     }
 
     /**
-     * Caches and gets local Mirabuf file
-     *
-     * @param {ArrayBuffer} buffer ArrayBuffer of Mirabuf file.
-     * @param {MiraType} miraType Type of Mirabuf Assembly.
-     *
-     * @returns {Promise<mirabufAssembly | undefined>} Promise with the result of the promise. Assembly of the mirabuf file if successful, undefined if not.
+     * Gets a given Mirabuf file from the cache
      */
-    public static async cacheAndGetLocal(
-        buffer: ArrayBuffer,
-        miraType: MiraType
-    ): Promise<mirabuf.Assembly | undefined> {
-        const key = await this.hashBuffer(buffer)
-        const map = MirabufCachingService.getCacheMap(miraType)
-        const target = map[key]
-        const assembly = this.assemblyFromBuffer(buffer)
-
-        // Check if assembly has devtool data and update name accordingly
-        let displayName = assembly.info?.name ?? undefined
-        if (assembly.data?.parts?.userData?.data) {
-            const devtoolKeys = Object.keys(assembly.data.parts.userData.data).filter(k => k.startsWith("devtool:"))
-            if (devtoolKeys.length > 0) {
-                displayName = displayName ? `Edited ${displayName}` : "Edited Field"
+    public static async get(hash: string): Promise<mirabuf.Assembly | undefined> {
+        try {
+            const encodedData = await this.getEncoded(hash)
+            if (!encodedData) {
+                return
+            }
+            const { buffer, info } = encodedData
+            // If we have buffer, get assembly
+            const assembly = this.assemblyFromBuffer(buffer)
+            if (!info.name) {
+                this._cacheMap.update(hash, v => {
+                    v.name = assembly?.info?.name ?? ""
+                })
             }
-        }
 
-        if (!target) {
-            await MirabufCachingService.storeInCache(key, buffer, miraType, displayName)
+            World.analyticsSystem?.event("Cache Get", {
+                key: info.hash,
+                type: info.miraType == MiraType.ROBOT ? "robot" : "field",
+                assemblyName: info.name,
+                fileSize: buffer.byteLength,
+            })
+            return assembly
+        } catch (e) {
+            console.error(`Failed to find file\n${e}`)
+            return undefined
         }
-
-        return assembly
     }
 
-    /**
-     * Gets a given Mirabuf file from the cache
-     *
-     * @param {MirabufCacheID} id ID to the given Mirabuf file in the caching service. Obtainable via GetCacheMaps().
-     * @param {MiraType} miraType Type of Mirabuf Assembly.
-     *
-     * @returns {Promise<mirabufAssembly | undefined>} Promise with the result of the promise. Assembly of the mirabuf file if successful, undefined if not.
-     */
-    public static async get(id: MirabufCacheID, miraType: MiraType): Promise<mirabuf.Assembly | undefined> {
+    public static async getEncoded(hash: string): Promise<{ buffer: ArrayBuffer; info: MirabufCacheInfo } | undefined> {
         try {
+            const info = this._cacheMap.get(hash)
+            if (!info) {
+                console.warn("Could not find buffer")
+                return
+            }
             // Get buffer from hashMap. If not in hashMap, check OPFS. Otherwise, buff is undefined
-            const cache = miraType == MiraType.ROBOT ? backUpRobots : backUpFields
-            const buff =
-                cache[id]?.buffer ??
-                (await (async () => {
-                    const fileHandle = canOPFS
-                        ? await (miraType == MiraType.ROBOT ? robotFolderHandle : fieldFolderHandle).getFileHandle(id, {
-                              create: false,
-                          })
-                        : undefined
-                    return fileHandle
-                        ? new Uint8Array(
-                              (await fileHandle.getFile().then(async x => await x.arrayBuffer())) as ArrayBuffer
-                          )
-                        : undefined
-                })())
 
-            // If we have buffer, get assembly
-            if (buff) {
-                const assembly = this.assemblyFromBuffer(buff.buffer as ArrayBuffer)
-                World.analyticsSystem?.event("Cache Get", {
-                    key: id,
-                    type: miraType == MiraType.ROBOT ? "robot" : "field",
-                    assemblyName: assembly.info!.name!,
-                    fileSize: buff.byteLength,
+            const memCache = memoryBuffer[hash]
+            if (memCache) {
+                return { buffer: memCache, info }
+            }
+            if (canOPFS) {
+                const fileHandle = await fsHandle.getFileHandle(hash, {
+                    create: false,
                 })
-                return assembly
-            } else {
-                console.error(`Failed to find arrayBuffer for id: ${id}`)
+                return { buffer: await fileHandle.getFile().then(x => x.arrayBuffer()), info }
             }
         } catch (e) {
-            console.error(`Failed to find file\n${e}`)
+            console.error("could not get encoded assembly", e)
             return undefined
         }
     }
 
+    public static getAll(miraType?: MiraType) {
+        return this._cacheMap.getAll(miraType)
+    }
+
     /**
-     * Removes a given Mirabuf file from the cache
-     *
-     * @param {string} key Key to the given Mirabuf file entry in the caching service. Obtainable via GetCacheMaps().
-     * @param {MirabufCacheID} id ID to the given Mirabuf file in the caching service. Obtainable via GetCacheMaps().
-     * @param {MiraType} miraType Type of Mirabuf Assembly.
-     *
-     * @returns {Promise<boolean>} Promise with the result of the promise. True if successful, false if not.
+     * Removes a given Mirabuf item from the cache
      */
-    public static async remove(key: string, id: MirabufCacheID, miraType: MiraType): Promise<boolean> {
+    public static async remove(hash: string): Promise<boolean> {
         try {
-            const map = this.getCacheMap(miraType)
-            if (map) {
-                delete map[key]
-                window.localStorage.setItem(
-                    miraType == MiraType.ROBOT ? robotsDirName : fieldsDirName,
-                    JSON.stringify(map)
-                )
-            }
+            const info = this._cacheMap.get(hash)
+
+            this._cacheMap.remove(hash)
 
             if (canOPFS) {
-                const dir = miraType == MiraType.ROBOT ? robotFolderHandle : fieldFolderHandle
-                await dir.removeEntry(id)
+                await fsHandle.removeEntry(hash)
             }
-
-            const backUpCache = miraType == MiraType.ROBOT ? backUpRobots : backUpFields
-            if (backUpCache) {
-                delete backUpCache[id]
+            if (!info) {
+                console.warn("couldn't find cached item to remove", hash)
+                return true
             }
-
             World.analyticsSystem?.event("Cache Remove", {
-                key: key,
-                type: miraType == MiraType.ROBOT ? "robot" : "field",
+                key: info.hash,
+                type: info.miraType == MiraType.ROBOT ? "robot" : "field",
+                assemblyName: info.name,
             })
             return true
         } catch (e) {
@@ -433,127 +364,66 @@ class MirabufCachingService {
      * Removes all Mirabuf files from the caching services. Mostly for debugging purposes.
      */
     public static async removeAll() {
+        console.log("removing")
         if (canOPFS) {
-            for await (const key of robotFolderHandle.keys()) {
-                robotFolderHandle.removeEntry(key)
-            }
-            for await (const key of fieldFolderHandle.keys()) {
-                fieldFolderHandle.removeEntry(key)
+            // Remove old separated directories
+            root.removeEntry("Robots", { recursive: true }).catch(() => {})
+            root.removeEntry("Fields", { recursive: true }).catch(() => {})
+            root.removeEntry("Pieces", { recursive: true }).catch(() => {})
+            for await (const key of fsHandle.keys()) {
+                await fsHandle.removeEntry(key).catch(e => console.warn("could not remove file", key, e))
             }
         }
-
-        window.localStorage.setItem(robotsDirName, "{}")
-        window.localStorage.setItem(fieldsDirName, "{}")
-
-        backUpRobots = {}
-        backUpFields = {}
+        this._cacheMap.clear()
     }
 
-    /**
-     * Persists devtool changes back to the cache by re-encoding the assembly
-     *
-     * @param {MirabufCacheID} id ID of the cached mirabuf file
-     * @param {MiraType} miraType Type of Mirabuf Assembly
-     * @param {mirabuf.Assembly} assembly The updated assembly with devtool changes
-     *
-     * @returns {Promise<boolean>} Promise with the result. True if successful, false if not.
-     */
-    public static async persistDevtoolChanges(
-        id: MirabufCacheID,
-        miraType: MiraType,
-        assembly: mirabuf.Assembly
-    ): Promise<boolean> {
-        try {
-            // Re-encode the assembly with devtool changes
-            const updatedBuffer = mirabuf.Assembly.encode(assembly).finish()
-
-            // Update the cached buffer
-            const cache = miraType == MiraType.ROBOT ? backUpRobots : backUpFields
-            if (cache[id]) {
-                cache[id].buffer = updatedBuffer
-            }
-
-            // Update OPFS if available
-            if (canOPFS) {
-                const fileHandle = await (miraType == MiraType.ROBOT
-                    ? robotFolderHandle
-                    : fieldFolderHandle
-                ).getFileHandle(id, { create: false })
-                const writable = await fileHandle.createWritable()
-                await writable.write(updatedBuffer.buffer as ArrayBuffer)
-                await writable.close()
-            }
-
-            World.analyticsSystem?.event("Devtool Cache Persist", {
-                key: id,
-                type: miraType == MiraType.ROBOT ? "robot" : "field",
-                assemblyName: assembly.info?.name ?? "unknown",
-                fileSize: updatedBuffer.byteLength,
-            })
+    public static async storeAssemblyInCache(
+        assembly: mirabuf.Assembly,
+        extra: Omit<MirabufCacheInfo, "hash" | "name"> & { name?: string }
+    ) {
+        const buffer = mirabuf.Assembly.encode(assembly).finish()
 
-            return true
-        } catch (e) {
-            console.error("Failed to persist devtool changes", e)
-            World.analyticsSystem?.exception("Failed to persist devtool changes to cache")
-            return false
-        }
+        return await this.storeInCache(buffer.buffer, {
+            ...extra,
+            name: extra.name ?? assembly.info?.name ?? "Unknown",
+        })
     }
 
     // Optional name for when assembly is being decoded anyway like in CacheAndGetLocal()
     private static async storeInCache(
-        key: string,
-        miraBuff: ArrayBuffer,
-        miraType?: MiraType,
-        name?: string
+        buffer: ArrayBuffer,
+        extra: Omit<MirabufCacheInfo, "hash">
     ): Promise<MirabufCacheInfo | undefined> {
         try {
-            const backupID = Date.now().toString()
-            if (!miraType) {
-                console.debug("Double loading")
-                miraType = this.assemblyFromBuffer(miraBuff).dynamic ? MiraType.ROBOT : MiraType.FIELD
-            }
+            const hash = await this.hashBuffer(buffer)
+            memoryBuffer[hash] = buffer
+            const existing = this._cacheMap.get(hash)
+            extra = { ...extra, ...existing }
 
             // Local cache map
-            const map: MapCache = this.getCacheMap(miraType)
             const info: MirabufCacheInfo = {
-                id: backupID,
-                miraType: miraType,
-                cacheKey: key,
-                name: name,
+                ...extra,
+                hash: hash,
             }
-            map[key] = info
-            window.localStorage.setItem(miraType == MiraType.ROBOT ? robotsDirName : fieldsDirName, JSON.stringify(map))
+
+            this._cacheMap.store(info)
 
             World.analyticsSystem?.event("Cache Store", {
-                assemblyName: name ?? "-",
-                key: key,
-                type: miraType == MiraType.ROBOT ? "robot" : "field",
-                fileSize: miraBuff.byteLength,
+                assemblyName: info.name,
+                key: info.hash,
+                type: info.miraType == MiraType.ROBOT ? "robot" : "field",
+                fileSize: buffer.byteLength,
             })
 
             // Store buffer
             if (canOPFS) {
                 // Store in OPFS
-                const fileHandle = await (miraType == MiraType.ROBOT
-                    ? robotFolderHandle
-                    : fieldFolderHandle
-                ).getFileHandle(backupID, { create: true })
+                const fileHandle = await fsHandle.getFileHandle(info.hash, { create: true })
                 const writable = await fileHandle.createWritable()
-                await writable.write(miraBuff)
+                await writable.write(buffer)
                 await writable.close()
             }
 
-            // Store in hash
-            const cache = miraType == MiraType.ROBOT ? backUpRobots : backUpFields
-            const mapInfo: MirabufCacheInfo = {
-                id: backupID,
-                miraType: miraType,
-                cacheKey: key,
-                buffer: new Uint8Array(miraBuff),
-                name: name,
-            }
-            cache[backupID] = mapInfo
-
             return info
         } catch (e) {
             console.error("Failed to cache mira " + e)
@@ -562,13 +432,11 @@ class MirabufCachingService {
         }
     }
 
-    private static async hashBuffer(buffer: ArrayBuffer): Promise<string> {
-        const hashBuffer = await crypto.subtle.digest("SHA-256", buffer)
-        let hash = ""
-        new Uint8Array(hashBuffer).forEach(x => {
-            hash = hash + String.fromCharCode(x)
-        })
-        return btoa(hash).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "")
+    public static async hashBuffer(buffer: ArrayBuffer): Promise<string> {
+        const hashBuffer = await crypto.subtle.digest("SHA-1", buffer)
+        return Array.from(new Uint8Array(hashBuffer))
+            .map(x => x.toString(16))
+            .join("")
     }
 
     private static assemblyFromBuffer(buffer: ArrayBuffer): mirabuf.Assembly {
diff --git a/fission/src/mirabuf/MirabufSceneObject.ts b/fission/src/mirabuf/MirabufSceneObject.ts
index 8eb8b1ee19..0814f3799c 100644
--- a/fission/src/mirabuf/MirabufSceneObject.ts
+++ b/fission/src/mirabuf/MirabufSceneObject.ts
@@ -67,6 +67,7 @@ export function getSpotlightAssembly(): MirabufSceneObject | undefined {
 class MirabufSceneObject extends SceneObject implements ContextSupplier {
     private _assemblyName: string
     private _mirabufInstance: MirabufInstance
+
     private _mechanism: Mechanism
     private _brain: Brain | undefined
     private _alliance: Alliance | undefined
@@ -95,7 +96,6 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
     private static readonly EJECTABLE_TOAST_COOLDOWN_MS = 500
 
     private _collision?: (event: OnContactAddedEvent) => void
-    private _cacheId?: string
 
     public get intakeActive() {
         return this._intakeActive
@@ -180,21 +180,11 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
         this._station = station
     }
 
-    public get cacheId() {
-        return this._cacheId
-    }
-
-    public constructor(
-        mirabufInstance: MirabufInstance,
-        assemblyName: string,
-        progressHandle?: ProgressHandle,
-        cacheId?: string
-    ) {
+    public constructor(mirabufInstance: MirabufInstance, assemblyName: string, progressHandle?: ProgressHandle) {
         super()
 
         this._mirabufInstance = mirabufInstance
         this._assemblyName = assemblyName
-        this._cacheId = cacheId
 
         progressHandle?.update("Creating mechanism...", 0.9)
 
@@ -913,8 +903,7 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
 
 export async function createMirabuf(
     assembly: mirabuf.Assembly,
-    progressHandle?: ProgressHandle,
-    cacheId?: string
+    progressHandle?: ProgressHandle
 ): Promise<MirabufSceneObject | null | undefined> {
     const parser = new MirabufParser(assembly, progressHandle)
     if (parser.maxErrorSeverity >= ParseErrorSeverity.UNIMPORTABLE) {
@@ -922,7 +911,7 @@ export async function createMirabuf(
         return
     }
 
-    return new MirabufSceneObject(new MirabufInstance(parser), assembly.info!.name!, progressHandle, cacheId)
+    return new MirabufSceneObject(new MirabufInstance(parser), assembly.info!.name!, progressHandle)
 }
 
 /**
diff --git a/fission/src/test/MirabufParser.test.ts b/fission/src/test/MirabufParser.test.ts
index 8ccb5f74d2..ba5ea83aaf 100644
--- a/fission/src/test/MirabufParser.test.ts
+++ b/fission/src/test/MirabufParser.test.ts
@@ -8,7 +8,7 @@ describe("Mirabuf Parser Tests", () => {
         const spikeMira = await MirabufCachingService.cacheRemote(
             "/api/mira/robots/Dozer_v9.mira",
             MiraType.ROBOT
-        ).then(x => MirabufCachingService.get(x!.id, MiraType.ROBOT))
+        ).then(x => MirabufCachingService.get(x!.hash))
 
         const t = new MirabufParser(spikeMira!)
         const rn = [...t.rigidNodes.values()]
@@ -35,7 +35,7 @@ describe("Mirabuf Parser Tests", () => {
         const spikeMira = await MirabufCachingService.cacheRemote(
             "/api/mira/private/Multi-Joint_Wheels_v0.mira",
             MiraType.ROBOT
-        ).then(x => MirabufCachingService.get(x!.id, MiraType.ROBOT))
+        ).then(x => MirabufCachingService.get(x!.hash))
 
         const t = new MirabufParser(spikeMira!)
         const rn = [...t.rigidNodes.values()]
@@ -60,7 +60,7 @@ describe("Mirabuf Parser Tests", () => {
         const field = await MirabufCachingService.cacheRemote(
             "/api/mira/Fields/FRC Field 2018_v13.mira",
             MiraType.FIELD
-        ).then(x => MirabufCachingService.get(x!.id, MiraType.FIELD))
+        ).then(x => MirabufCachingService.get(x!.hash))
         const t = new MirabufParser(field!)
 
         expect(filterNonPhysicsNodes([...t.rigidNodes.values()], field!).length).toBe(34)
diff --git a/fission/src/test/mirabuf/MirabufLoader.test.ts b/fission/src/test/mirabuf/MirabufLoader.test.ts
index a175a5498e..cf4a77c250 100644
--- a/fission/src/test/mirabuf/MirabufLoader.test.ts
+++ b/fission/src/test/mirabuf/MirabufLoader.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, type MockedFunction, test, vi } from "vitest"
-import MirabufLoader, { backUpRobots, MiraType } from "../../mirabuf/MirabufLoader"
+import MirabufLoader, { MiraType } from "../../mirabuf/MirabufLoader"
 
 vi.mock("@/systems/World", () => ({
     default: {
@@ -124,12 +124,6 @@ describe("MirabufLoader", () => {
         }
     })
 
-    test("GetCacheMap initializes and retrieves cache", () => {
-        const map = MirabufLoader.getCacheMap(MiraType.ROBOT)
-        expect(map).toEqual({})
-        expect(globalThis.localStorage.setItem).toHaveBeenCalled()
-    })
-
     test("CacheRemote returns fallback on cache failure (GH-1141)", async () => {
         const buffer = new ArrayBuffer(8)
         fetchMock.mockResolvedValue(new Response(buffer, { status: 200 }))
@@ -149,31 +143,7 @@ describe("MirabufLoader", () => {
         expect(result).toBeDefined()
     })
 
-    test("CacheInfo updates cache info, returns true, and updated map", async () => {
-        const key = "key"
-        const id = "id"
-        const miraType = MiraType.ROBOT
-
-        localStorageMock["Synthesis Nonce Key"] = "4543246"
-        const map = { [key]: { id, miraType, cacheKey: key } }
-        localStorageMock["Robots"] = JSON.stringify(map)
-        backUpRobots[id] = { id, miraType, cacheKey: key, buffer: new Uint8Array(new ArrayBuffer(1)) }
-
-        const name = "Test Robot"
-        const thumbnailStorageID = "thumb123"
-        const result = await MirabufLoader.cacheInfo(key, miraType, name, thumbnailStorageID)
-
-        expect(result).toBe(true)
-
-        const updatedMap = JSON.parse(localStorageMock["Robots"])
-        expect(updatedMap[key].name).toBe(name)
-        expect(updatedMap[key].thumbnailStorageID).toBe(thumbnailStorageID)
-        expect(updatedMap[key].id).toBe(id)
-        expect(updatedMap[key].miraType).toBe(miraType)
-        expect(updatedMap[key].cacheKey).toBe(key)
-    })
-
-    test("HashBuffer returns a base64 string", async () => {
+    test("HashBuffer returns a string", async () => {
         const buffer = new ArrayBuffer(8)
         const hash = await MirabufLoader["hashBuffer"](buffer)
         expect(typeof hash).toBe("string")
diff --git a/fission/src/test/mirabuf/MirabufSceneObject.test.ts b/fission/src/test/mirabuf/MirabufSceneObject.test.ts
index b7de6060ff..42c9914830 100644
--- a/fission/src/test/mirabuf/MirabufSceneObject.test.ts
+++ b/fission/src/test/mirabuf/MirabufSceneObject.test.ts
@@ -232,7 +232,7 @@ describe("MirabufSceneObject - Real Systems Integration", () => {
             context.skip()
         }
 
-        const assembly = await MirabufCachingService.get(cacheInfo!.id, MiraType.ROBOT)
+        const assembly = await MirabufCachingService.get(cacheInfo!.hash)
 
         if (!assembly) {
             context.skip()
diff --git a/fission/src/test/physics/Mechanism.test.ts b/fission/src/test/physics/Mechanism.test.ts
index b300a747c0..d43592d3bd 100644
--- a/fission/src/test/physics/Mechanism.test.ts
+++ b/fission/src/test/physics/Mechanism.test.ts
@@ -290,7 +290,7 @@ describe("Mirabuf Mechanism Creation", () => {
 
     test("Body Loading (Dozer)", async () => {
         const assembly = await MirabufCachingService.cacheRemote("/api/mira/robots/Dozer_v9.mira", MiraType.ROBOT).then(
-            x => MirabufCachingService.get(x!.id, MiraType.ROBOT)
+            x => MirabufCachingService.get(x!.hash)
         )
         const parser = new MirabufParser(assembly!)
 
@@ -305,7 +305,7 @@ describe("Mirabuf Mechanism Creation", () => {
         const assembly = await MirabufCachingService.cacheRemote(
             "/api/mira/private/Multi-Joint_Wheels_v0.mira",
             MiraType.ROBOT
-        ).then(x => MirabufCachingService.get(x!.id, MiraType.ROBOT))
+        ).then(x => MirabufCachingService.get(x!.hash))
         const parser = new MirabufParser(assembly!)
 
         const mechanism = physSystem.createMechanismFromParser(parser)
diff --git a/fission/src/test/physics/PhysicsSystemRobotSpawning.test.ts b/fission/src/test/physics/PhysicsSystemRobotSpawning.test.ts
index 4a2f9926eb..2cf0bcda3d 100644
--- a/fission/src/test/physics/PhysicsSystemRobotSpawning.test.ts
+++ b/fission/src/test/physics/PhysicsSystemRobotSpawning.test.ts
@@ -6,7 +6,7 @@ import PhysicsSystem, { LayerReserve } from "@/systems/physics/PhysicsSystem"
 describe("Mirabuf Physics Loading", () => {
     test("Body Loading (Dozer)", async () => {
         const assembly = await MirabufCachingService.cacheRemote("/api/mira/robots/Dozer_v9.mira", MiraType.ROBOT).then(
-            x => MirabufCachingService.get(x!.id, MiraType.ROBOT)
+            x => MirabufCachingService.get(x!.hash)
         )
         const parser = new MirabufParser(assembly!)
         const physSystem = new PhysicsSystem()
@@ -26,7 +26,7 @@ describe("Mirabuf Physics Loading", () => {
         const assembly = await MirabufCachingService.cacheRemote(
             "/api/mira/private/Multi-Joint_Wheels_v0.mira",
             MiraType.ROBOT
-        ).then(x => MirabufCachingService.get(x!.id, MiraType.ROBOT))
+        ).then(x => MirabufCachingService.get(x!.hash))
         const parser = new MirabufParser(assembly!)
         const physSystem = new PhysicsSystem()
         const mapping = physSystem.createBodiesFromParser(parser, new LayerReserve())
diff --git a/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx b/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
index 324866258e..f11798f1da 100644
--- a/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
+++ b/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
@@ -47,10 +47,10 @@ const ImportLocalMirabufModal: React.FC<ModalImplProps<void, void>> = ({ modal }
             if (selectedFile && miraType !== undefined) {
                 const hashBuffer = await selectedFile.arrayBuffer()
                 World.physicsSystem.holdPause(PAUSE_REF_ASSEMBLY_SPAWNING)
-                await MirabufCachingService.cacheAndGetLocalWithInfo(hashBuffer, miraType)
+                await MirabufCachingService.cacheLocalAndReturn(hashBuffer, miraType)
                     .then(result => {
                         if (result) {
-                            return createMirabuf(result.assembly, undefined, result.cacheInfo.id)
+                            return createMirabuf(result.assembly, undefined)
                         }
                         return undefined
                     })
diff --git a/fission/src/ui/panels/DebugPanel.tsx b/fission/src/ui/panels/DebugPanel.tsx
index 1a34b680e5..efc166c197 100644
--- a/fission/src/ui/panels/DebugPanel.tsx
+++ b/fission/src/ui/panels/DebugPanel.tsx
@@ -2,11 +2,7 @@ import { Box, Button, Stack } from "@mui/material"
 import type React from "react"
 import { useEffect } from "react"
 import APS from "@/aps/APS"
-import MirabufCachingService, {
-    backUpFields as hashedMiraFields,
-    backUpRobots as hashedMiraRobots,
-    MiraType,
-} from "@/mirabuf/MirabufLoader"
+import MirabufCachingService, { MiraType } from "@/mirabuf/MirabufLoader"
 import PreferencesSystem from "@/systems/preferences/PreferencesSystem"
 import World from "@/systems/World"
 import { random } from "@/util/Random"
@@ -95,10 +91,7 @@ const DebugPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) => {
                 <Label size="sm">Caching Services</Label>
                 <Button
                     onClick={() => {
-                        console.log(MirabufCachingService.getCacheMap(MiraType.ROBOT))
-                        console.log(MirabufCachingService.getCacheMap(MiraType.FIELD))
-                        console.log(hashedMiraRobots)
-                        console.log(hashedMiraFields)
+                        console.log(MirabufCachingService.getAll(MiraType.ROBOT))
                     }}
                     className="w-full"
                 >
diff --git a/fission/src/ui/panels/DeveloperToolPanel.tsx b/fission/src/ui/panels/DeveloperToolPanel.tsx
index 7a6971e5d7..b95272f7f7 100644
--- a/fission/src/ui/panels/DeveloperToolPanel.tsx
+++ b/fission/src/ui/panels/DeveloperToolPanel.tsx
@@ -33,6 +33,29 @@ function isScoringZonePreferencesArray(val: unknown): val is ScoringZonePreferen
     )
 }
 
+async function saveToCache() {
+    const field = World.sceneRenderer.mirabufSceneObjects.getField()
+    if (field) {
+        const assembly = field.mirabufInstance.parser.assembly
+        const newName = assembly.info?.name != null ? `Edited ${assembly.info.name}` : undefined
+        const existing = MirabufCachingService.getAll().find(info => info.name == newName)
+        const cacheInfo = await MirabufCachingService.storeAssemblyInCache(assembly, {
+            miraType: MiraType.FIELD,
+            name: newName,
+        })
+
+        if (cacheInfo != null) {
+            globalAddToast("info", "Devtool Saved", "Changes have been persisted to cache.")
+        } else {
+            globalAddToast("warning", "Devtool Warning", "Changes saved but failed to persist to cache.")
+        }
+
+        if (existing) {
+            await MirabufCachingService.remove(existing.hash)
+        }
+    }
+}
+
 const DeveloperToolPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) => {
     const { configureScreen } = useUIContext()
     const [selectedKey, setSelectedKey] = useState<DevtoolKey | undefined>(undefined)
@@ -101,7 +124,7 @@ const DeveloperToolPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) =>
         }
     }, [selectedKey, editor])
 
-    const handleSave = () => {
+    const handleSave = async () => {
         if (!editor || !selectedKey) return
         try {
             const parsed = JSON.parse(jsonValue)
@@ -110,32 +133,7 @@ const DeveloperToolPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) =>
             setKeys(editor.getAllDevtoolKeys())
 
             // Persist changes to cache
-            const field = World.sceneRenderer.mirabufSceneObjects.getField()
-            if (field) {
-                const assembly = field.mirabufInstance.parser.assembly
-                const cacheId = field.cacheId // add to MirabufSceneObject
-                if (cacheId) {
-                    MirabufCachingService.persistDevtoolChanges(cacheId, MiraType.FIELD, assembly)
-                        .then(success => {
-                            if (success) {
-                                globalAddToast?.("info", "Devtool Saved", "Changes have been persisted to cache.")
-                            } else {
-                                globalAddToast?.(
-                                    "warning",
-                                    "Devtool Warning",
-                                    "Changes saved but failed to persist to cache."
-                                )
-                            }
-                        })
-                        .catch(() => {
-                            globalAddToast?.(
-                                "warning",
-                                "Devtool Warning",
-                                "Changes saved but failed to persist to cache."
-                            )
-                        })
-                }
-            }
+            await saveToCache()
 
             if (selectedKey === "devtool:scoring_zones") {
                 const field = World.sceneRenderer.mirabufSceneObjects.getField()
@@ -160,7 +158,7 @@ const DeveloperToolPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) =>
         }
     }
 
-    const handleRemove = () => {
+    const handleRemove = async () => {
         if (!editor || !selectedKey) return
         editor.removeUserData(selectedKey)
         setKeys(editor.getAllDevtoolKeys())
@@ -169,28 +167,7 @@ const DeveloperToolPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) =>
         setError("")
 
         // Persist removal to cache
-        const field = World.sceneRenderer.mirabufSceneObjects.getField()
-        if (field) {
-            const assembly = field.mirabufInstance.parser.assembly
-            const cacheId = field.cacheId
-            if (cacheId) {
-                MirabufCachingService.persistDevtoolChanges(cacheId, MiraType.FIELD, assembly)
-                    .then(success => {
-                        if (success) {
-                            globalAddToast?.("info", "Devtool Removed", "Removal has been persisted to cache.")
-                        } else {
-                            globalAddToast?.(
-                                "warning",
-                                "Devtool Warning",
-                                "Removal saved but failed to persist to cache."
-                            )
-                        }
-                    })
-                    .catch(() => {
-                        globalAddToast?.("warning", "Devtool Warning", "Removal saved but failed to persist to cache.")
-                    })
-            }
-        }
+        await saveToCache()
 
         if (selectedKey === "devtool:scoring_zones") {
             const field = World.sceneRenderer.mirabufSceneObjects.getField()
diff --git a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
index 5846197f0a..1fa9fe0887 100644
--- a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
+++ b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
@@ -21,14 +21,7 @@ import {
     MirabufFilesUpdateEvent,
     requestMirabufFiles,
 } from "@/aps/APSDataManagement"
-import MirabufCachingService, {
-    backUpFields,
-    backUpRobots,
-    canOPFS,
-    type MirabufCacheInfo,
-    type MirabufRemoteInfo,
-    MiraType,
-} from "@/mirabuf/MirabufLoader"
+import MirabufCachingService, { type MirabufCacheInfo, type MirabufRemoteInfo, MiraType } from "@/mirabuf/MirabufLoader"
 import { createMirabuf } from "@/mirabuf/MirabufSceneObject"
 import { PAUSE_REF_ASSEMBLY_SPAWNING } from "@/systems/physics/PhysicsTypes"
 import { SoundPlayer } from "@/systems/sound/SoundPlayer"
@@ -84,31 +77,21 @@ export type MiraManifest = {
     fields: MirabufRemoteInfo[]
 }
 
-function getCacheInfo(miraType: MiraType): MirabufCacheInfo[] {
-    return Object.values(
-        canOPFS
-            ? MirabufCachingService.getCacheMap(miraType)
-            : miraType === MiraType.ROBOT
-              ? backUpRobots
-              : backUpFields
-    )
-}
-
-export function spawnCachedMira(info: MirabufCacheInfo, type: MiraType, progressHandle?: ProgressHandle) {
+export async function spawnCachedMira(info: MirabufCacheInfo, type: MiraType, progressHandle?: ProgressHandle) {
     // If spawning a field, then remove all other fields
     if (type === MiraType.FIELD) {
         World.sceneRenderer.removeAllFields()
     }
 
     if (!progressHandle) {
-        progressHandle = new ProgressHandle(info.name ?? info.cacheKey)
+        progressHandle = new ProgressHandle(info.name)
     }
 
     World.physicsSystem.holdPause(PAUSE_REF_ASSEMBLY_SPAWNING)
-    MirabufCachingService.get(info.id, type)
-        .then(assembly => {
+    await MirabufCachingService.get(info.hash)
+        .then(async assembly => {
             if (assembly) {
-                createMirabuf(assembly, progressHandle, info.id).then(mirabufSceneObject => {
+                await createMirabuf(assembly, progressHandle).then(mirabufSceneObject => {
                     if (mirabufSceneObject) {
                         World.sceneRenderer.registerSceneObject(mirabufSceneObject)
                         progressHandle.done()
@@ -143,8 +126,8 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
 
     const { configurationType } = panel!.props.custom
 
-    const [cachedRobots, setCachedRobots] = useState(getCacheInfo(MiraType.ROBOT))
-    const [cachedFields, setCachedFields] = useState(getCacheInfo(MiraType.FIELD))
+    const [cachedRobots, setCachedRobots] = useState(MirabufCachingService.getAll(MiraType.ROBOT))
+    const [cachedFields, setCachedFields] = useState(MirabufCachingService.getAll(MiraType.FIELD))
 
     const [manifest, setManifest] = useState<MiraManifest | undefined>()
     const [viewType, setViewType] = useState<MiraType>(MiraType.ROBOT)
@@ -208,25 +191,24 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
             fetch(`${baseUrl}/api/mira/manifest.json`)
                 .then(x => x.json())
                 .then(x => {
-                    const map = MirabufCachingService.getCacheMap(MiraType.ROBOT)
                     const robots: MirabufRemoteInfo[] = []
                     for (const src of x["robots"]) {
-                        if (typeof src == "string") {
-                            const str = `${baseUrl}/api/mira/robots/${src}`
-                            if (!map[str]) robots.push({ displayName: src, src: str })
-                        } else {
-                            if (!map[src.src]) robots.push({ displayName: src.displayName, src: src.src })
-                        }
+                        const obj =
+                            typeof src == "string"
+                                ? { displayName: src, src: `${baseUrl}/api/mira/robots/${src}` }
+                                : { displayName: src.displayName, src: src.src }
+                        robots.push(obj)
                     }
+
                     const fields: MirabufRemoteInfo[] = []
                     for (const src of x["fields"]) {
-                        if (typeof src == "string") {
-                            const str = `${baseUrl}/api/mira/fields/${src}`
-                            if (!map[str]) fields.push({ displayName: src, src: str })
-                        } else {
-                            if (!map[src.src]) fields.push({ displayName: src.displayName, src: src.src })
-                        }
+                        const obj =
+                            typeof src == "string"
+                                ? { displayName: src, src: `${baseUrl}/api/mira/fields/${src}` }
+                                : { displayName: src.displayName, src: src.src }
+                        fields.push(obj)
                     }
+
                     setManifest({
                         robots,
                         fields,
@@ -241,8 +223,8 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
 
     // Select a mirabuf assembly from the cache.
     const selectCache = useCallback(
-        (info: MirabufCacheInfo, type: MiraType) => {
-            spawnCachedMira(info, type)
+        async (info: MirabufCacheInfo, type: MiraType) => {
+            await spawnCachedMira(info, type)
 
             if (panel) closePanel(panel.id, CloseType.Cancel)
         },
@@ -256,9 +238,9 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
             status.update("Downloading from Synthesis...", 0.05)
 
             MirabufCachingService.cacheRemote(info.src, type, info.displayName)
-                .then(cacheInfo => {
+                .then(async cacheInfo => {
                     if (cacheInfo) {
-                        spawnCachedMira(cacheInfo, type, status)
+                        await spawnCachedMira(cacheInfo, type, status)
                     } else {
                         status.fail("Failed to cache")
                     }
@@ -292,9 +274,9 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
             status.update("Downloading from APS...", 0.05)
 
             MirabufCachingService.cacheAPS(data, type)
-                .then(cacheInfo => {
+                .then(async cacheInfo => {
                     if (cacheInfo) {
-                        spawnCachedMira(cacheInfo, type, status)
+                        await spawnCachedMira(cacheInfo, type, status)
                     } else {
                         status.fail("Failed to cache")
                     }
@@ -313,18 +295,17 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
                 .sort((a, b) => a.name?.localeCompare(b.name ?? "") ?? -1)
                 .map(info =>
                     ItemCard({
-                        name: info.name || info.cacheKey || "Unnamed Robot",
-                        id: info.id,
+                        name: info.name || "Unnamed Robot",
+                        id: info.hash,
                         primaryButtonNode: SynthesisIcons.ADD_LARGE,
-                        primaryOnClick: () => {
-                            console.log(`Selecting cached robot: ${info.cacheKey}`)
-                            selectCache(info, MiraType.ROBOT)
+                        primaryOnClick: async () => {
+                            console.log(`Selecting cached robot: ${info.name}`)
+                            await selectCache(info, MiraType.ROBOT)
                         },
-                        secondaryOnClick: () => {
-                            console.log(`Deleting cache of: ${info.cacheKey}`)
-                            MirabufCachingService.remove(info.cacheKey, info.id, MiraType.ROBOT)
-
-                            setCachedRobots(getCacheInfo(MiraType.ROBOT))
+                        secondaryOnClick: async () => {
+                            console.log(`Deleting cache of: ${info.name}`)
+                            await MirabufCachingService.remove(info.hash)
+                            setCachedRobots(MirabufCachingService.getAll(MiraType.ROBOT))
                         },
                     })
                 ),
@@ -338,18 +319,17 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
                 .sort((a, b) => a.name?.localeCompare(b.name ?? "") ?? -1)
                 .map(info =>
                     ItemCard({
-                        name: info.name || info.cacheKey || "Unnamed Field",
-                        id: info.id,
+                        name: info.name || "Unnamed Field",
+                        id: info.hash,
                         primaryButtonNode: SynthesisIcons.ADD_LARGE,
                         primaryOnClick: () => {
-                            console.log(`Selecting cached field: ${info.cacheKey}`)
+                            console.log(`Selecting cached field: ${info.hash}`)
                             selectCache(info, MiraType.FIELD)
                         },
-                        secondaryOnClick: () => {
-                            console.log(`Deleting cache of: ${info.cacheKey}`)
-                            MirabufCachingService.remove(info.cacheKey, info.id, MiraType.FIELD)
-
-                            setCachedFields(getCacheInfo(MiraType.FIELD))
+                        secondaryOnClick: async () => {
+                            console.log(`Deleting cache of: ${info.hash}`)
+                            await MirabufCachingService.remove(info.hash)
+                            setCachedFields(MirabufCachingService.getAll(MiraType.FIELD))
                         },
                     })
                 ),
@@ -358,9 +338,7 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
 
     // Generate Item cards for remote robots.
     const remoteRobotElements = useMemo(() => {
-        const remoteRobots = manifest?.robots.filter(
-            path => !cachedRobots.some(info => info.cacheKey.includes(path.src))
-        )
+        const remoteRobots = manifest?.robots.filter(path => !cachedRobots.some(info => info.remotePath == path.src))
         return remoteRobots
             ?.sort((a, b) => a.displayName.localeCompare(b.displayName))
             .map(path =>
@@ -378,9 +356,7 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
 
     // Generate Item cards for remote fields.
     const remoteFieldElements = useMemo(() => {
-        const remoteFields = manifest?.fields.filter(
-            path => !cachedFields.some(info => info.cacheKey.includes(path.src))
-        )
+        const remoteFields = manifest?.fields.filter(path => !cachedFields.some(info => info.remotePath == path.src))
         return remoteFields
             ?.sort((a, b) => a.displayName.localeCompare(b.displayName))
             .map(path =>
@@ -404,7 +380,7 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
             const remotes = manifest ? manifest[property] : []
 
             remotes
-                .filter(path => !cached.some(info => info.cacheKey.includes(path.src)))
+                .filter(path => !cached.some(info => info.remotePath?.includes(path.src)))
                 .forEach(path => cacheRemoteOnly(path, miraType))
 
             if (panel) closePanel(panel.id, CloseType.Cancel)

From eb31c16d4289c97f3126aa35aa174dc3cf6212b0 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Fri, 8 Aug 2025 14:36:39 -0700
Subject: [PATCH 02/24] fix: make old caches not die

---
 fission/src/mirabuf/MirabufLoader.ts                 | 2 +-
 fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index 03a9df3382..54a06e670e 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -5,7 +5,7 @@ import { mirabuf } from "@/proto/mirabuf"
 import World from "@/systems/World"
 
 const MIRABUF_LOCALSTORAGE_GENERATION_KEY = "Synthesis Nonce Key"
-const MIRABUF_LOCALSTORAGE_GENERATION = "4543246"
+const MIRABUF_LOCALSTORAGE_GENERATION = "978534"
 
 export interface MirabufCacheInfo {
     hash: string
diff --git a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
index 1fa9fe0887..38a24df3d4 100644
--- a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
+++ b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
@@ -347,7 +347,7 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
                     id: path.src,
                     primaryButtonNode: SynthesisIcons.DOWNLOAD_LARGE,
                     primaryOnClick: () => {
-                        console.log(`Selecting remote: ${path}`)
+                        console.log(`Selecting remote: ${path.src}`)
                         selectRemote(path, MiraType.ROBOT)
                     },
                 })
@@ -365,7 +365,7 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
                     id: path.src,
                     primaryButtonNode: SynthesisIcons.DOWNLOAD_LARGE,
                     primaryOnClick: () => {
-                        console.log(`Selecting remote: ${path}`)
+                        console.log(`Selecting remote: ${path.src}`)
                         selectRemote(path, MiraType.FIELD)
                     },
                 })

From 5c34a75705c49130d0c8b69134c12a8accb5b416 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Fri, 8 Aug 2025 14:37:54 -0700
Subject: [PATCH 03/24] fix: also remove old localstorage keys

---
 fission/src/mirabuf/MirabufLoader.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index 54a06e670e..b6fb6d69d4 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -370,6 +370,9 @@ class MirabufCachingService {
             root.removeEntry("Robots", { recursive: true }).catch(() => {})
             root.removeEntry("Fields", { recursive: true }).catch(() => {})
             root.removeEntry("Pieces", { recursive: true }).catch(() => {})
+            localStorage.removeItem("Robots")
+            localStorage.removeItem("Fields")
+            localStorage.removeItem("Pieces")
             for await (const key of fsHandle.keys()) {
                 await fsHandle.removeEntry(key).catch(e => console.warn("could not remove file", key, e))
             }

From 003d4711d2006ee6d3c9554cad08d4451dbe1d8a Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Fri, 8 Aug 2025 14:34:40 -0700
Subject: [PATCH 04/24] fix: unit tests

---
 fission/src/mirabuf/MirabufLoader.ts          |   2 +-
 .../src/test/mirabuf/MirabufLoader.test.ts    | 220 +++++++++---------
 2 files changed, 117 insertions(+), 105 deletions(-)

diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index b6fb6d69d4..978d153619 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -386,7 +386,7 @@ class MirabufCachingService {
     ) {
         const buffer = mirabuf.Assembly.encode(assembly).finish()
 
-        return await this.storeInCache(buffer.buffer, {
+        return await this.storeInCache(buffer.buffer as ArrayBuffer, {
             ...extra,
             name: extra.name ?? assembly.info?.name ?? "Unknown",
         })
diff --git a/fission/src/test/mirabuf/MirabufLoader.test.ts b/fission/src/test/mirabuf/MirabufLoader.test.ts
index cf4a77c250..ee6e3cc341 100644
--- a/fission/src/test/mirabuf/MirabufLoader.test.ts
+++ b/fission/src/test/mirabuf/MirabufLoader.test.ts
@@ -28,125 +28,137 @@ describe("MirabufLoader", () => {
     const originalConsoleWarn = console.warn
     const originalConsoleDebug = console.debug
 
-    let localStorageMock: Record<string, string>
     let fetchMock: MockedFunction<typeof fetch>
     let originalDigest: typeof crypto.subtle.digest
     let unhandledRejectionHandler: ((event: PromiseRejectionEvent) => void) | undefined
+    describe("Fake Fetch", () => {
+        beforeEach(() => {
+            fetchMock = vi.fn() as MockedFunction<typeof fetch>
+            vi.stubGlobal("fetch", fetchMock)
 
-    beforeEach(() => {
-        localStorageMock = {}
-        vi.stubGlobal("localStorage", {
-            getItem: vi.fn(key => localStorageMock[key] ?? null),
-            setItem: vi.fn((key, value) => {
-                localStorageMock[key] = value
-            }),
-            removeItem: vi.fn(key => {
-                delete localStorageMock[key]
-            }),
-            clear: vi.fn(() => {
-                localStorageMock = {}
-            }),
-            key: vi.fn(),
-            length: 0,
-        })
-        fetchMock = vi.fn() as MockedFunction<typeof fetch>
-        globalThis.fetch = fetchMock
-        if (!globalThis.crypto) {
-            // @ts-expect-error: Polyfill for crypto in test environment
-            globalThis.crypto = {}
-        }
-        if (!globalThis.crypto.subtle) {
-            // @ts-expect-error: Polyfill for crypto.subtle in test environment
-            globalThis.crypto.subtle = {}
-        }
-        originalDigest = globalThis.crypto.subtle.digest
-        globalThis.crypto.subtle.digest = vi.fn(async (_alg, _data) => {
-            return new Uint8Array(32).buffer
-        }) as typeof crypto.subtle.digest
-
-        // Mock OPFS APIs (use Object.defineProperty to avoid read-only errors)
-        if (typeof navigator !== "undefined") {
-            if (!navigator.storage) {
-                Object.defineProperty(navigator, "storage", {
-                    value: {},
-                    configurable: true,
-                })
+            if (!globalThis.crypto) {
+                vi.stubGlobal("crypto", { subtle: {} })
             }
-            Object.defineProperty(navigator.storage, "getDirectory", {
-                value: vi.fn(async () => ({
-                    getDirectoryHandle: vi.fn(async () => ({
-                        name: "Robots",
-                        getFileHandle: vi.fn(async () => ({
-                            createWritable: vi.fn(async () => ({
-                                write: vi.fn(),
-                                close: vi.fn(),
+            originalDigest = globalThis.crypto.subtle.digest
+            globalThis.crypto.subtle.digest = vi.fn(async (_alg, _data) => {
+                return new Uint8Array(32).buffer
+            }) as typeof crypto.subtle.digest
+
+            // Mock OPFS APIs (use Object.defineProperty to avoid read-only errors)
+            if (typeof navigator !== "undefined") {
+                if (!navigator.storage) {
+                    Object.defineProperty(navigator, "storage", {
+                        value: {},
+                        configurable: true,
+                    })
+                }
+                Object.defineProperty(navigator.storage, "getDirectory", {
+                    value: vi.fn(async () => ({
+                        getDirectoryHandle: vi.fn(async () => ({
+                            name: "Robots",
+                            getFileHandle: vi.fn(async () => ({
+                                createWritable: vi.fn(async () => ({
+                                    write: vi.fn(),
+                                    close: vi.fn(),
+                                })),
+                                getFile: vi.fn(async () => new Blob()),
+                                name: "0",
                             })),
-                            getFile: vi.fn(async () => new Blob()),
-                            name: "0",
+                            keys: vi.fn(async function* () {}),
+                            removeEntry: vi.fn(),
+                            entries: vi.fn(),
                         })),
-                        keys: vi.fn(async function* () {}),
-                        removeEntry: vi.fn(),
-                        entries: vi.fn(),
                     })),
-                })),
-                configurable: true,
-            })
-        }
-
-        console.log = vi.fn()
-        console.error = vi.fn()
-        console.warn = vi.fn()
-        console.debug = vi.fn()
-
-        // Suppress unhandled NotFoundError rejections
-        unhandledRejectionHandler = (event: PromiseRejectionEvent) => {
-            if (event.reason && event.reason.name === "NotFoundError") {
-                event.preventDefault()
+                    configurable: true,
+                })
             }
-        }
-        window.addEventListener("unhandledrejection", unhandledRejectionHandler)
-    })
 
-    afterEach(() => {
-        vi.restoreAllMocks()
-        vi.unstubAllGlobals()
-        if (globalThis.crypto && globalThis.crypto.subtle && originalDigest) {
-            globalThis.crypto.subtle.digest = originalDigest
-        }
-
-        console.log = originalConsoleLog
-        console.error = originalConsoleError
-        console.warn = originalConsoleWarn
-        console.debug = originalConsoleDebug
-
-        if (unhandledRejectionHandler) {
-            window.removeEventListener("unhandledrejection", unhandledRejectionHandler)
-        }
-    })
+            console.log = vi.fn()
+            console.error = vi.fn()
+            console.warn = vi.fn()
+            console.debug = vi.fn()
 
-    test("CacheRemote returns fallback on cache failure (GH-1141)", async () => {
-        const buffer = new ArrayBuffer(8)
-        fetchMock.mockResolvedValue(new Response(buffer, { status: 200 }))
+            // Suppress unhandled NotFoundError rejections
+            unhandledRejectionHandler = (event: PromiseRejectionEvent) => {
+                if (event.reason && event.reason.name === "NotFoundError") {
+                    event.preventDefault()
+                }
+            }
+            window.addEventListener("unhandledrejection", unhandledRejectionHandler)
+        })
 
-        const result = await MirabufLoader.cacheRemote("/fake/path", MiraType.ROBOT)
-        expect(result).toBeDefined()
-        expect(result).toHaveProperty("miraType", MiraType.ROBOT)
-        expect(result).toHaveProperty("cacheKey", "/fake/path")
+        afterEach(() => {
+            vi.restoreAllMocks()
+            vi.unstubAllGlobals()
+            if (globalThis.crypto && globalThis.crypto.subtle && originalDigest) {
+                globalThis.crypto.subtle.digest = originalDigest
+            }
 
-        if ("buffer" in result!) expect(result.buffer).toBeInstanceOf(ArrayBuffer)
-    })
+            console.log = originalConsoleLog
+            console.error = originalConsoleError
+            console.warn = originalConsoleWarn
+            console.debug = originalConsoleDebug
 
-    test("CacheRemote caches and returns info on success", async () => {
-        const buffer = new ArrayBuffer(8)
-        fetchMock.mockResolvedValue(new Response(buffer, { status: 200 }))
-        const result = await MirabufLoader.cacheRemote("/fake/path", MiraType.ROBOT)
-        expect(result).toBeDefined()
+            if (unhandledRejectionHandler) {
+                window.removeEventListener("unhandledrejection", unhandledRejectionHandler)
+            }
+        })
+
+        test("CacheRemote returns fallback on cache failure (GH-1141)", async () => {
+            const buffer = new ArrayBuffer(8)
+            fetchMock.mockResolvedValue(new Response(buffer, { status: 200 }))
+
+            const result = await MirabufLoader.cacheRemote("/fake/path", MiraType.ROBOT)
+            expect(result).toBeDefined()
+            expect(result).toHaveProperty("miraType", MiraType.ROBOT)
+            expect(result).toHaveProperty("remotePath", "/fake/path")
+
+            if ("buffer" in result!) expect(result.buffer).toBeInstanceOf(ArrayBuffer)
+        })
+
+        test("CacheRemote caches and returns info on success", async () => {
+            const buffer = new ArrayBuffer(8)
+            fetchMock.mockResolvedValue(new Response(buffer, { status: 200 }))
+            const result = await MirabufLoader.cacheRemote("/fake/path", MiraType.ROBOT)
+            expect(result).toBeDefined()
+        })
+
+        test("HashBuffer returns a string", async () => {
+            const buffer = new ArrayBuffer(8)
+            const hash = await MirabufLoader["hashBuffer"](buffer)
+            expect(typeof hash).toBe("string")
+            expect(hash.length).toBeGreaterThan(0)
+        })
     })
 
-    test("HashBuffer returns a string", async () => {
-        const buffer = new ArrayBuffer(8)
-        const hash = await MirabufLoader["hashBuffer"](buffer)
-        expect(typeof hash).toBe("string")
-        expect(hash.length).toBeGreaterThan(0)
+    describe("Real Fetch", () => {
+        beforeEach(async () => {
+            await MirabufLoader.removeAll()
+        })
+        test("Loads Robot", async () => {
+            const info = await MirabufLoader.cacheRemote("/api/mira/robots/Dozer_v9.mira", MiraType.ROBOT)
+            expect(info).toBeDefined()
+            expect(info?.miraType).toBe(MiraType.ROBOT)
+            expect(info?.name).toBe("Dozer v9")
+            const assembly = await MirabufLoader.get(info!.hash)
+            expect(assembly).toBeDefined()
+            expect(assembly?.info?.name).toBe(info!.name)
+            expect(MirabufLoader.getAll()).toStrictEqual([info])
+            expect(MirabufLoader.getAll(MiraType.ROBOT)).toStrictEqual([info])
+            expect(MirabufLoader.getAll(MiraType.FIELD)).toStrictEqual([])
+        })
+
+        test("Loads Field", async () => {
+            const info = await MirabufLoader.cacheRemote("/api/mira/fields/FRC Field 2023_v7.mira", MiraType.FIELD)
+            expect(info).toBeDefined()
+            expect(info?.miraType).toBe(MiraType.FIELD)
+            expect(info?.name).toBe("FRC Field 2023 v7")
+            const assembly = await MirabufLoader.get(info!.hash)
+            expect(assembly).toBeDefined()
+            expect(assembly?.info?.name).toBe(info!.name)
+            expect(MirabufLoader.getAll()).toStrictEqual([info])
+            expect(MirabufLoader.getAll(MiraType.FIELD)).toStrictEqual([info])
+            expect(MirabufLoader.getAll(MiraType.ROBOT)).toStrictEqual([])
+        })
     })
 })

From b5e1bef4f2a1d870a08352846c5a90b5abe81ad8 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Mon, 11 Aug 2025 08:18:26 -0700
Subject: [PATCH 05/24] feat: allow loading directly from memory cache as
 fallback

---
 fission/src/mirabuf/MirabufLoader.ts | 32 +++++++++++++++-------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index 978d153619..a79dae7e38 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -283,18 +283,20 @@ class MirabufCachingService {
             const { buffer, info } = encodedData
             // If we have buffer, get assembly
             const assembly = this.assemblyFromBuffer(buffer)
-            if (!info.name) {
-                this._cacheMap.update(hash, v => {
-                    v.name = assembly?.info?.name ?? ""
+            if (info != null) {
+                if (!info.name) {
+                    this._cacheMap.update(hash, v => {
+                        v.name = assembly?.info?.name ?? ""
+                    })
+                }
+
+                World.analyticsSystem?.event("Cache Get", {
+                    key: info.hash,
+                    type: info.miraType == MiraType.ROBOT ? "robot" : "field",
+                    assemblyName: info.name,
+                    fileSize: buffer.byteLength,
                 })
             }
-
-            World.analyticsSystem?.event("Cache Get", {
-                key: info.hash,
-                type: info.miraType == MiraType.ROBOT ? "robot" : "field",
-                assemblyName: info.name,
-                fileSize: buffer.byteLength,
-            })
             return assembly
         } catch (e) {
             console.error(`Failed to find file\n${e}`)
@@ -302,13 +304,11 @@ class MirabufCachingService {
         }
     }
 
-    public static async getEncoded(hash: string): Promise<{ buffer: ArrayBuffer; info: MirabufCacheInfo } | undefined> {
+    public static async getEncoded(
+        hash: string
+    ): Promise<{ buffer: ArrayBuffer; info?: MirabufCacheInfo } | undefined> {
         try {
             const info = this._cacheMap.get(hash)
-            if (!info) {
-                console.warn("Could not find buffer")
-                return
-            }
             // Get buffer from hashMap. If not in hashMap, check OPFS. Otherwise, buff is undefined
 
             const memCache = memoryBuffer[hash]
@@ -321,6 +321,8 @@ class MirabufCachingService {
                 })
                 return { buffer: await fileHandle.getFile().then(x => x.arrayBuffer()), info }
             }
+            console.warn("Could not find assembly for hash", hash, info)
+            return
         } catch (e) {
             console.error("could not get encoded assembly", e)
             return undefined

From 18df571938531ba4fd622f8da3bac19a7ced0531 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Tue, 12 Aug 2025 09:17:55 -0700
Subject: [PATCH 06/24] fix: make memory cache actually used

---
 fission/src/mirabuf/MirabufLoader.ts | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index a79dae7e38..44502e4a08 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -26,7 +26,7 @@ const fsHandle = await root.getDirectoryHandle(localStorageEntryName, {
     create: true,
 })
 
-export const memoryBuffer: Record<string, ArrayBuffer> = {}
+export const inMemoryCache: Record<string, ArrayBuffer | undefined> = {}
 
 export const canOPFS = await (async () => {
     try {
@@ -311,15 +311,29 @@ class MirabufCachingService {
             const info = this._cacheMap.get(hash)
             // Get buffer from hashMap. If not in hashMap, check OPFS. Otherwise, buff is undefined
 
-            const memCache = memoryBuffer[hash]
+            const memCache = inMemoryCache[hash]
             if (memCache) {
+                console.log(`Retrieved ${info?.name ?? hash} from memory`)
                 return { buffer: memCache, info }
             }
             if (canOPFS) {
                 const fileHandle = await fsHandle.getFileHandle(hash, {
                     create: false,
                 })
-                return { buffer: await fileHandle.getFile().then(x => x.arrayBuffer()), info }
+                const buffer = await fileHandle
+                    .getFile()
+                    .then(x => x.arrayBuffer())
+                    .catch((e: DOMException) => {
+                        if (e.name != "FileNotFound") console.error("Error accessing OPFS", { error: e, hash })
+                        return undefined
+                    })
+                if (!buffer) {
+                    console.warn(`Could not find ${hash} in OPFS`)
+                    return undefined
+                }
+                inMemoryCache[hash] = buffer
+                console.log(`Retrieved ${info?.name ?? hash} from OPFS`)
+                return { buffer: buffer, info }
             }
             console.warn("Could not find assembly for hash", hash, info)
             return
@@ -341,7 +355,7 @@ class MirabufCachingService {
             const info = this._cacheMap.get(hash)
 
             this._cacheMap.remove(hash)
-
+            delete inMemoryCache[hash]
             if (canOPFS) {
                 await fsHandle.removeEntry(hash)
             }
@@ -401,7 +415,7 @@ class MirabufCachingService {
     ): Promise<MirabufCacheInfo | undefined> {
         try {
             const hash = await this.hashBuffer(buffer)
-            memoryBuffer[hash] = buffer
+            inMemoryCache[hash] = buffer
             const existing = this._cacheMap.get(hash)
             extra = { ...extra, ...existing }
 

From 42d1497ca657ac82f6441fcd7b3f6240ff3fc376 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Wed, 13 Aug 2025 17:27:34 -0700
Subject: [PATCH 07/24] fix: unit tests

---
 fission/src/test/mirabuf/FieldMiraEditor.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fission/src/test/mirabuf/FieldMiraEditor.test.ts b/fission/src/test/mirabuf/FieldMiraEditor.test.ts
index 757f022133..a65c9c72de 100644
--- a/fission/src/test/mirabuf/FieldMiraEditor.test.ts
+++ b/fission/src/test/mirabuf/FieldMiraEditor.test.ts
@@ -149,7 +149,7 @@ describe("Devtool Scoring Zones Caching Tests", () => {
 describe("Asset tests", () => {
     test("FRC Field 2018_v13 has spawn locations", async () => {
         const file = await MirabufCachingService.cacheRemote("/api/mira/Fields/FRC Field 2018_v13.mira", MiraType.FIELD)
-            .then(x => MirabufCachingService.get(x!.id, MiraType.FIELD))
+            .then(x => MirabufCachingService.get(x!.hash))
             .catch(e => {
                 console.error("Could not get mirabuf file", e)
                 return undefined

From 4d0ae09a02a0cea935dd5fff658de205e4baee1d Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Thu, 14 Aug 2025 08:56:57 -0700
Subject: [PATCH 08/24] fix: merge conflicts

---
 fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
index 5b9b3b0c61..6d105d1c6e 100644
--- a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
+++ b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
@@ -94,8 +94,6 @@ export async function spawnCachedMira(info: MirabufCacheInfo, type: MiraType, pr
                         progressHandle.fail()
                     }
                 })
-
-                if (!info.name) MirabufCachingService.cacheInfo(info.cacheKey, type, assembly.info?.name ?? undefined)
             } else {
                 progressHandle.fail()
                 console.error("Failed to spawn robot")

From 1c45f2f84c79d787106034cd8ced73aea7bf8c1e Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Thu, 14 Aug 2025 09:30:46 -0700
Subject: [PATCH 09/24] feat: prevent uploading local files as wrong mira type

---
 fission/src/mirabuf/MirabufLoader.ts          |  9 +++++++
 .../mirabuf/ImportLocalMirabufModal.tsx       | 26 +++++++++++++++----
 .../assembly-config/ConfigTypes.ts            | 22 ++++++++++++++++
 .../ui/panels/mirabuf/ImportMirabufPanel.tsx  | 14 +++++++---
 4 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index 44502e4a08..177f2f2692 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -264,6 +264,15 @@ class MirabufCachingService {
             key: hash,
             type: miraType == MiraType.ROBOT ? "robot" : "field",
         })
+        if (assembly.dynamic && miraType == MiraType.FIELD) {
+            globalAddToast("warning", "Cannot import robot assembly as a field")
+            return
+        }
+
+        if (!assembly.dynamic && miraType != MiraType.FIELD) {
+            globalAddToast("warning", "Cannot import field assembly as a robot")
+            return
+        }
 
         const info = await MirabufCachingService.storeAssemblyInCache(assembly, { miraType })
         if (!info) return
diff --git a/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx b/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
index f5d15dc9e5..2fafd55bf8 100644
--- a/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
+++ b/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
@@ -1,5 +1,6 @@
 import { Stack, styled } from "@mui/material"
 import { type ChangeEvent, useEffect, useState } from "react"
+import { globalOpenModal } from "@/components/GlobalUIControls.ts"
 import MirabufCachingService, { MiraType } from "@/mirabuf/MirabufLoader"
 import { createMirabuf } from "@/mirabuf/MirabufSceneObject"
 import { PAUSE_REF_ASSEMBLY_SPAWNING } from "@/systems/physics/PhysicsTypes"
@@ -8,7 +9,11 @@ import Label from "@/ui/components/Label"
 import type { ModalImplProps } from "@/ui/components/Modal"
 import { Button, ToggleButton, ToggleButtonGroup } from "@/ui/components/StyledComponents"
 import { CloseType, useUIContext } from "@/ui/helpers/UIProviderHelpers"
-import type { ConfigurationType } from "@/ui/panels/configuring/assembly-config/ConfigTypes"
+import {
+    type ConfigurationType,
+    configTypeToMiraType,
+    miraTypeToConfigType,
+} from "@/ui/panels/configuring/assembly-config/ConfigTypes"
 import InitialConfigPanel from "@/ui/panels/configuring/initial-config/InitialConfigPanel"
 import ImportMirabufPanel from "@/ui/panels/mirabuf/ImportMirabufPanel"
 
@@ -23,13 +28,18 @@ const VisuallyHiddenInput = styled("input")({
     whiteSpace: "nowrap",
     width: 1,
 })
+interface ImportLocalMirabufProps {
+    configurationType: ConfigurationType
+}
 
-const ImportLocalMirabufModal: React.FC<ModalImplProps<void, void>> = ({ modal }) => {
+const ImportLocalMirabufModal: React.FC<ModalImplProps<void, ImportLocalMirabufProps>> = ({ modal }) => {
     // update tooltip based on type of drivetrain, receive message from Synthesis
     const { openPanel, closeModal, configureScreen } = useUIContext()
 
+    const { configurationType } = modal!.props.custom
+
     const [selectedFile, setSelectedFile] = useState<File | undefined>(undefined)
-    const [miraType, setSelectedType] = useState<MiraType | undefined>(MiraType.ROBOT)
+    const [miraType, setSelectedType] = useState<MiraType | undefined>()
 
     const onInputChanged = (e: ChangeEvent<HTMLInputElement>) => {
         if (e.target.files) {
@@ -40,7 +50,7 @@ const ImportLocalMirabufModal: React.FC<ModalImplProps<void, void>> = ({ modal }
 
     useEffect(() => {
         const onCancel = () => {
-            openPanel(ImportMirabufPanel, { configurationType: "ROBOTS" as ConfigurationType })
+            openPanel(ImportMirabufPanel, { configurationType: miraTypeToConfigType(miraType ?? MiraType.ROBOT) })
         }
 
         const onBeforeAccept = async () => {
@@ -52,6 +62,9 @@ const ImportLocalMirabufModal: React.FC<ModalImplProps<void, void>> = ({ modal }
                         if (result) {
                             return createMirabuf(result.assembly, undefined)
                         }
+                        globalOpenModal(ImportLocalMirabufModal, {
+                            configurationType: miraTypeToConfigType(miraType ?? MiraType.ROBOT),
+                        })
                         return undefined
                     })
                     .then(mirabufSceneObject => {
@@ -75,8 +88,11 @@ const ImportLocalMirabufModal: React.FC<ModalImplProps<void, void>> = ({ modal }
             { title: "Import from File", hideAccept: selectedFile === undefined || miraType === undefined },
             { onBeforeAccept, onCancel }
         )
-    }, [selectedFile, miraType, openPanel, modal])
+    }, [selectedFile, miraType, openPanel, modal, closeModal, configureScreen])
 
+    useEffect(() => {
+        setSelectedType(configTypeToMiraType(configurationType))
+    }, [configurationType])
     return (
         <Stack className="items-center" gap={5}>
             <ToggleButtonGroup
diff --git a/fission/src/ui/panels/configuring/assembly-config/ConfigTypes.ts b/fission/src/ui/panels/configuring/assembly-config/ConfigTypes.ts
index 4319bb1bfe..0383514a13 100644
--- a/fission/src/ui/panels/configuring/assembly-config/ConfigTypes.ts
+++ b/fission/src/ui/panels/configuring/assembly-config/ConfigTypes.ts
@@ -1,6 +1,28 @@
+import { MiraType } from "@/mirabuf/MirabufLoader.ts"
+
 export const CONFIG_OPTS = ["ROBOTS", "FIELDS", "INPUTS"] as const
 export type ConfigurationType = (typeof CONFIG_OPTS)[number]
 
+export function configTypeToMiraType(config: ConfigurationType): MiraType | undefined {
+    switch (config) {
+        case "FIELDS":
+            return MiraType.FIELD
+        case "ROBOTS":
+            return MiraType.ROBOT
+        default:
+            return undefined
+    }
+}
+
+export function miraTypeToConfigType(config: MiraType): ConfigurationType {
+    switch (config) {
+        case MiraType.ROBOT:
+            return "ROBOTS"
+        case MiraType.FIELD:
+            return "FIELDS"
+    }
+}
+
 export enum ConfigMode {
     SUBSYSTEMS,
     EJECTOR,
diff --git a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
index 6d105d1c6e..02dd52dee2 100644
--- a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
+++ b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
@@ -32,7 +32,11 @@ import { useStateContext } from "@/ui/helpers/StateProviderHelpers"
 import { CloseType, useUIContext } from "@/ui/helpers/UIProviderHelpers"
 import ImportLocalMirabufModal from "@/ui/modals/mirabuf/ImportLocalMirabufModal"
 import type TaskStatus from "@/util/TaskStatus"
-import type { ConfigurationType } from "../configuring/assembly-config/ConfigTypes"
+import {
+    type ConfigurationType,
+    configTypeToMiraType,
+    miraTypeToConfigType,
+} from "../configuring/assembly-config/ConfigTypes"
 import InitialConfigPanel from "../configuring/initial-config/InitialConfigPanel"
 
 interface ItemCardProps {
@@ -398,8 +402,8 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
         [files, selectAPS, viewType]
     )
     useEffect(() => {
-        setViewType(configurationType === "ROBOTS" ? MiraType.ROBOT : MiraType.FIELD)
-    }, [])
+        setViewType(configTypeToMiraType(configurationType) ?? MiraType.ROBOT)
+    }, [configurationType])
     return (
         <Stack direction="column" gap={2} className="overflow-y-auto">
             <ToggleButtonGroup
@@ -496,7 +500,9 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
             <Box alignSelf={"center"}>
                 <Button
                     onClick={() => {
-                        openModal(ImportLocalMirabufModal, undefined)
+                        openModal(ImportLocalMirabufModal, {
+                            configurationType: miraTypeToConfigType(viewType ?? MiraType.ROBOT),
+                        })
                         closePanel(panel!.id, CloseType.Overwrite)
                     }}
                 >

From 57a8c4c31316551faca5a2e800591af333e81c9b Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Thu, 14 Aug 2025 09:41:56 -0700
Subject: [PATCH 10/24] feat: remove files that don't exist in OPFS on load

---
 fission/src/mirabuf/MirabufLoader.ts | 40 +++++++++++++++++++---------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index 177f2f2692..1eac39a734 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -71,7 +71,8 @@ class CacheMap {
     private static isMirabufCacheInfo(data: unknown): data is MirabufCacheInfo {
         return typeof data === "object" && data != null && "hash" in data && "name" in data && "miraType" in data
     }
-    public load() {
+
+    public async load() {
         const lookup = window.localStorage.getItem(localStorageEntryName)
 
         if (lookup == null) {
@@ -84,13 +85,27 @@ class CacheMap {
             this.save()
             return
         }
-        parsed.forEach((data: unknown) => {
-            if (!CacheMap.isMirabufCacheInfo(data)) {
-                console.warn("malformed mirabuf cache info", data)
-                return
-            }
-            this._map.set(data.hash, data)
-        })
+        if (!canOPFS) {
+            console.warn("no OPFS, can't load from cache")
+            return
+        }
+        await Promise.all(
+            parsed.map(async (data: unknown) => {
+                if (!CacheMap.isMirabufCacheInfo(data)) {
+                    console.warn("malformed mirabuf cache info", data)
+                    return
+                }
+                const hasFile = await fsHandle
+                    .getFileHandle(data.hash)
+                    .then(() => true)
+                    .catch(() => false)
+                if (!hasFile) {
+                    console.warn(`Could not find ${data.hash} (${data.name}) in OPFS`)
+                    return
+                }
+                this._map.set(data.hash, data)
+            })
+        )
     }
 
     public save() {
@@ -155,10 +170,11 @@ class MirabufCachingService {
             this.removeAll().catch(console.error)
             this._cacheMap.clear()
         } else {
-            this._cacheMap.load()
-            if (canOPFS) {
-                setTimeout(() => this.clearExtraAssets()) // make sure nothing extra got left behind due to preferences clearing / whatever
-            }
+            this._cacheMap.load().then(() => {
+                if (canOPFS) {
+                    setTimeout(() => this.clearExtraAssets()) // make sure nothing extra got left behind due to preferences clearing / whatever
+                }
+            })
         }
     }
 

From 82e8fdfe41f7ec3072bf04db735b0d838f75df92 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Thu, 14 Aug 2025 10:16:01 -0700
Subject: [PATCH 11/24] feat: allow mirabuf caching service to work in insecure
 contexts

---
 fission/src/mirabuf/MirabufLoader.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index 1eac39a734..235e705998 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -21,15 +21,17 @@ export interface MirabufRemoteInfo {
 }
 
 const localStorageEntryName = "MirabufAssets"
-const root = await navigator.storage.getDirectory()
-const fsHandle = await root.getDirectoryHandle(localStorageEntryName, {
-    create: true,
-})
+let root: FileSystemDirectoryHandle
+let fsHandle: FileSystemDirectoryHandle
 
 export const inMemoryCache: Record<string, ArrayBuffer | undefined> = {}
 
 export const canOPFS = await (async () => {
     try {
+        root = await navigator.storage.getDirectory()
+        fsHandle = await root.getDirectoryHandle(localStorageEntryName, {
+            create: true,
+        })
         if (fsHandle.name == localStorageEntryName) {
             const fileHandle = await fsHandle.getFileHandle("0", {
                 create: true,
@@ -47,11 +49,6 @@ export const canOPFS = await (async () => {
         }
     } catch (_e) {
         console.log(`No access to OPFS`)
-
-        // Copy-pasted from RemoveAll()
-        for await (const key of fsHandle.keys()) {
-            await fsHandle.removeEntry(key)
-        }
         return false
     }
 })()
@@ -477,6 +474,10 @@ class MirabufCachingService {
     }
 
     public static async hashBuffer(buffer: ArrayBuffer): Promise<string> {
+        if (crypto?.subtle?.digest == null) {
+            console.warn("Crypto not available, using timestamp as key")
+            return Date.now().toString(16)
+        }
         const hashBuffer = await crypto.subtle.digest("SHA-1", buffer)
         return Array.from(new Uint8Array(hashBuffer))
             .map(x => x.toString(16))

From bf6c3bfe154dc82af07c652bdf882f363edef859 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Thu, 14 Aug 2025 15:50:34 -0700
Subject: [PATCH 12/24] refactor: early return

---
 fission/src/ui/panels/DeveloperToolPanel.tsx | 31 ++++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/fission/src/ui/panels/DeveloperToolPanel.tsx b/fission/src/ui/panels/DeveloperToolPanel.tsx
index 54efa51dd2..fa8a5f0d2f 100644
--- a/fission/src/ui/panels/DeveloperToolPanel.tsx
+++ b/fission/src/ui/panels/DeveloperToolPanel.tsx
@@ -14,24 +14,23 @@ import { useUIContext } from "../helpers/UIProviderHelpers"
 
 async function saveToCache() {
     const field = World.sceneRenderer.mirabufSceneObjects.getField()
-    if (field) {
-        const assembly = field.mirabufInstance.parser.assembly
-        const newName = assembly.info?.name != null ? `Edited ${assembly.info.name}` : undefined
-        const existing = MirabufCachingService.getAll().find(info => info.name == newName)
-        const cacheInfo = await MirabufCachingService.storeAssemblyInCache(assembly, {
-            miraType: MiraType.FIELD,
-            name: newName,
-        })
+    if (!field) return
+    const assembly = field.mirabufInstance.parser.assembly
+    const newName = assembly.info?.name != null ? `Edited ${assembly.info.name}` : undefined
+    const existing = MirabufCachingService.getAll().find(info => info.name == newName)
+    const cacheInfo = await MirabufCachingService.storeAssemblyInCache(assembly, {
+        miraType: MiraType.FIELD,
+        name: newName,
+    })
 
-        if (cacheInfo != null) {
-            globalAddToast("info", "Devtool Saved", "Changes have been persisted to cache.")
-        } else {
-            globalAddToast("warning", "Devtool Warning", "Changes saved but failed to persist to cache.")
-        }
+    if (cacheInfo != null) {
+        globalAddToast("info", "Devtool Saved", "Changes have been persisted to cache.")
+    } else {
+        globalAddToast("warning", "Devtool Warning", "Changes saved but failed to persist to cache.")
+    }
 
-        if (existing) {
-            await MirabufCachingService.remove(existing.hash)
-        }
+    if (existing) {
+        await MirabufCachingService.remove(existing.hash)
     }
 }
 

From 8c58465290e7ff8b9610d22be852e231252a5925 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Mon, 18 Aug 2025 11:35:54 -0700
Subject: [PATCH 13/24] feat: make manifest system more robust

---
 fission/public/assetpack.zip                  |   4 +-
 fission/src/mirabuf/DefaultAssetLoader.ts     |  51 ++++
 fission/src/mirabuf/MirabufLoader.ts          |  55 ++--
 .../src/test/mirabuf/FieldMiraEditor.test.ts  |   2 +-
 .../src/test/mirabuf/MirabufLoader.test.ts    |   7 -
 .../src/test/mirabuf/MirabufParser.test.ts    |   4 +-
 .../mirabuf/ImportLocalMirabufModal.tsx       |   4 +-
 fission/src/ui/panels/DeveloperToolPanel.tsx  |   1 -
 .../ui/panels/mirabuf/ImportMirabufPanel.tsx  | 234 ++++++++----------
 fission/src/util/Utility.ts                   |  11 +
 fission/tsconfig.node.json                    |   3 +-
 fission/update_manifest.ts                    |  30 +++
 fission/vite.config.ts                        |   4 +-
 13 files changed, 228 insertions(+), 182 deletions(-)
 create mode 100644 fission/src/mirabuf/DefaultAssetLoader.ts
 create mode 100644 fission/update_manifest.ts

diff --git a/fission/public/assetpack.zip b/fission/public/assetpack.zip
index 57bd655496..f44737e5e9 100644
--- a/fission/public/assetpack.zip
+++ b/fission/public/assetpack.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23bfaf7899d84b00331c12bf1ada20d27d3c50856b14bb5733821b44848812ba
-size 193147860
+oid sha256:d7c06a45fc1a37173c46069cb39ece2e6b8e68a3861949ec376f5b47c7fdcbae
+size 72045507
diff --git a/fission/src/mirabuf/DefaultAssetLoader.ts b/fission/src/mirabuf/DefaultAssetLoader.ts
new file mode 100644
index 0000000000..6d1103abd5
--- /dev/null
+++ b/fission/src/mirabuf/DefaultAssetLoader.ts
@@ -0,0 +1,51 @@
+import { type MirabufCacheInfo, MiraType } from "@/mirabuf/MirabufLoader.ts"
+import type { ManifestFileType } from "../../update_manifest.ts"
+
+export type DefaultAssetInfo = Required<Pick<MirabufCacheInfo, "hash" | "remotePath" | "miraType" | "name">>
+
+class DefaultAssetLoader {
+    private static _assets: DefaultAssetInfo[] = []
+
+    static {
+        setTimeout(() => this.refresh(), 1000)
+    }
+
+    private static async refresh() {
+        this._assets = []
+
+        const isElectron = window.electronAPI != null
+        const host = isElectron ? "https://synthesis.autodesk.com" : ""
+        const baseUrl = `${host}/api/mira`
+
+        const manifest: ManifestFileType = await fetch(`${baseUrl}/manifest.json`).then(x => x.json())
+
+        const miraTypeMap: Partial<Record<keyof ManifestFileType, MiraType>> = {
+            robots: MiraType.ROBOT,
+            fields: MiraType.FIELD,
+        }
+
+        Object.entries(manifest).forEach(([dir, assets]) => {
+            const miraType = miraTypeMap[dir as keyof ManifestFileType]
+            if (miraType == undefined) return
+
+            assets.forEach(obj => {
+                this._assets.push({
+                    remotePath: `${baseUrl}/${dir}/${obj.filename}`,
+                    hash: obj.hash,
+                    miraType,
+                    name: obj.filename,
+                })
+            })
+        })
+    }
+
+    public static get robots() {
+        return this._assets.filter(obj => obj.miraType == MiraType.ROBOT)
+    }
+
+    public static get fields() {
+        return this._assets.filter(obj => obj.miraType == MiraType.FIELD)
+    }
+}
+
+export default DefaultAssetLoader
diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index 235e705998..61bcde769c 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -3,6 +3,7 @@ import { type Data, downloadData } from "@/aps/APSDataManagement"
 import { globalAddToast } from "@/components/GlobalUIControls"
 import { mirabuf } from "@/proto/mirabuf"
 import World from "@/systems/World"
+import { hashBuffer } from "@/util/Utility.ts"
 
 const MIRABUF_LOCALSTORAGE_GENERATION_KEY = "Synthesis Nonce Key"
 const MIRABUF_LOCALSTORAGE_GENERATION = "978534"
@@ -196,7 +197,8 @@ class MirabufCachingService {
     public static async cacheRemote(
         fetchLocation: string,
         miraType: MiraType,
-        name?: string
+        name?: string,
+        expectedHash?: string
     ): Promise<MirabufCacheInfo | undefined> {
         try {
             // grab file remote
@@ -218,13 +220,20 @@ class MirabufCachingService {
                 remotePath: fetchLocation,
             })
 
+            if (expectedHash != null && cached?.hash != null && cached?.hash != expectedHash) {
+                globalAddToast("warning", "Hash Mismatch", `Try downloading again`)
+                console.log(expectedHash, cached?.hash)
+                console.log(expectedHash == cached?.hash)
+                // await this.remove(cached.hash)
+            }
+
             if (cached) return cached
 
             globalAddToast("error", "Cache Fallback", `Unable to cache “${fetchLocation}”. Using raw buffer instead.`)
 
             // fallback: return raw buffer wrapped in MirabufCacheInfo
             return {
-                hash: await this.hashBuffer(miraBuff),
+                hash: await hashBuffer(miraBuff),
                 miraType: miraType,
                 name: name,
             }
@@ -270,7 +279,7 @@ class MirabufCachingService {
         miraType: MiraType
     ): Promise<{ assembly: mirabuf.Assembly; cacheInfo: MirabufCacheInfo } | undefined> {
         const assembly = this.assemblyFromBuffer(buffer)
-        const hash = await this.hashBuffer(buffer)
+        const hash = await hashBuffer(buffer)
 
         World.analyticsSystem?.event("Local Upload", {
             fileSize: buffer.byteLength,
@@ -331,13 +340,16 @@ class MirabufCachingService {
     ): Promise<{ buffer: ArrayBuffer; info?: MirabufCacheInfo } | undefined> {
         try {
             const info = this._cacheMap.get(hash)
-            // Get buffer from hashMap. If not in hashMap, check OPFS. Otherwise, buff is undefined
 
             const memCache = inMemoryCache[hash]
             if (memCache) {
                 console.log(`Retrieved ${info?.name ?? hash} from memory`)
                 return { buffer: memCache, info }
             }
+            if (info == null) {
+                console.warn(`${hash} not found in cache`)
+                return
+            }
             if (canOPFS) {
                 const fileHandle = await fsHandle.getFileHandle(hash, {
                     create: false,
@@ -390,6 +402,7 @@ class MirabufCachingService {
                 type: info.miraType == MiraType.ROBOT ? "robot" : "field",
                 assemblyName: info.name,
             })
+            console.log(`Removed ${hash} from cache`)
             return true
         } catch (e) {
             console.error(`Failed to remove\n${e}`)
@@ -436,7 +449,8 @@ class MirabufCachingService {
         extra: Omit<MirabufCacheInfo, "hash">
     ): Promise<MirabufCacheInfo | undefined> {
         try {
-            const hash = await this.hashBuffer(buffer)
+            const hash = await hashBuffer(buffer)
+
             inMemoryCache[hash] = buffer
             const existing = this._cacheMap.get(hash)
             extra = { ...extra, ...existing }
@@ -447,6 +461,15 @@ class MirabufCachingService {
                 hash: hash,
             }
 
+            // Store buffer
+            if (!canOPFS) return info
+
+            // Store in OPFS
+            const fileHandle = await fsHandle.getFileHandle(info.hash, { create: true })
+            const writable = await fileHandle.createWritable()
+            await writable.write(buffer)
+            await writable.close()
+
             this._cacheMap.store(info)
 
             World.analyticsSystem?.event("Cache Store", {
@@ -455,16 +478,7 @@ class MirabufCachingService {
                 type: info.miraType == MiraType.ROBOT ? "robot" : "field",
                 fileSize: buffer.byteLength,
             })
-
-            // Store buffer
-            if (canOPFS) {
-                // Store in OPFS
-                const fileHandle = await fsHandle.getFileHandle(info.hash, { create: true })
-                const writable = await fileHandle.createWritable()
-                await writable.write(buffer)
-                await writable.close()
-            }
-
+            console.log(`Added cache entry for ${hash}`)
             return info
         } catch (e) {
             console.error("Failed to cache mira " + e)
@@ -473,17 +487,6 @@ class MirabufCachingService {
         }
     }
 
-    public static async hashBuffer(buffer: ArrayBuffer): Promise<string> {
-        if (crypto?.subtle?.digest == null) {
-            console.warn("Crypto not available, using timestamp as key")
-            return Date.now().toString(16)
-        }
-        const hashBuffer = await crypto.subtle.digest("SHA-1", buffer)
-        return Array.from(new Uint8Array(hashBuffer))
-            .map(x => x.toString(16))
-            .join("")
-    }
-
     private static assemblyFromBuffer(buffer: ArrayBuffer): mirabuf.Assembly {
         return mirabuf.Assembly.decode(unzipMira(new Uint8Array(buffer)))
     }
diff --git a/fission/src/test/mirabuf/FieldMiraEditor.test.ts b/fission/src/test/mirabuf/FieldMiraEditor.test.ts
index a65c9c72de..4d324515d1 100644
--- a/fission/src/test/mirabuf/FieldMiraEditor.test.ts
+++ b/fission/src/test/mirabuf/FieldMiraEditor.test.ts
@@ -148,7 +148,7 @@ describe("Devtool Scoring Zones Caching Tests", () => {
 
 describe("Asset tests", () => {
     test("FRC Field 2018_v13 has spawn locations", async () => {
-        const file = await MirabufCachingService.cacheRemote("/api/mira/Fields/FRC Field 2018_v13.mira", MiraType.FIELD)
+        const file = await MirabufCachingService.cacheRemote("/api/mira/fields/FRC Field 2018_v13.mira", MiraType.FIELD)
             .then(x => MirabufCachingService.get(x!.hash))
             .catch(e => {
                 console.error("Could not get mirabuf file", e)
diff --git a/fission/src/test/mirabuf/MirabufLoader.test.ts b/fission/src/test/mirabuf/MirabufLoader.test.ts
index ee6e3cc341..3546968579 100644
--- a/fission/src/test/mirabuf/MirabufLoader.test.ts
+++ b/fission/src/test/mirabuf/MirabufLoader.test.ts
@@ -122,13 +122,6 @@ describe("MirabufLoader", () => {
             const result = await MirabufLoader.cacheRemote("/fake/path", MiraType.ROBOT)
             expect(result).toBeDefined()
         })
-
-        test("HashBuffer returns a string", async () => {
-            const buffer = new ArrayBuffer(8)
-            const hash = await MirabufLoader["hashBuffer"](buffer)
-            expect(typeof hash).toBe("string")
-            expect(hash.length).toBeGreaterThan(0)
-        })
     })
 
     describe("Real Fetch", () => {
diff --git a/fission/src/test/mirabuf/MirabufParser.test.ts b/fission/src/test/mirabuf/MirabufParser.test.ts
index 455a7406fd..8d2c787ce8 100644
--- a/fission/src/test/mirabuf/MirabufParser.test.ts
+++ b/fission/src/test/mirabuf/MirabufParser.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test } from "vitest"
+import { mirabuf } from "@/proto/mirabuf"
 import MirabufCachingService, { MiraType } from "../../mirabuf/MirabufLoader.ts"
 import MirabufParser, { type RigidNodeReadOnly } from "../../mirabuf/MirabufParser.ts"
-import { mirabuf } from "../../proto/mirabuf"
 
 describe("Mirabuf Parser Tests", () => {
     test("Generate Rigid Nodes (Dozer_v9.mira)", async () => {
@@ -58,7 +58,7 @@ describe("Mirabuf Parser Tests", () => {
 
     test("Generate Rigid Nodes (FRC Field 2018_v13.mira)", async () => {
         const field = await MirabufCachingService.cacheRemote(
-            "/api/mira/Fields/FRC Field 2018_v13.mira",
+            "/api/mira/fields/FRC Field 2018_v13.mira",
             MiraType.FIELD
         ).then(x => MirabufCachingService.get(x!.hash))
         const t = new MirabufParser(field!)
diff --git a/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx b/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
index 2fafd55bf8..28215c1478 100644
--- a/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
+++ b/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
@@ -55,9 +55,9 @@ const ImportLocalMirabufModal: React.FC<ModalImplProps<void, ImportLocalMirabufP
 
         const onBeforeAccept = async () => {
             if (selectedFile && miraType !== undefined) {
-                const hashBuffer = await selectedFile.arrayBuffer()
+                const buffer = await selectedFile.arrayBuffer()
                 World.physicsSystem.holdPause(PAUSE_REF_ASSEMBLY_SPAWNING)
-                await MirabufCachingService.cacheLocalAndReturn(hashBuffer, miraType)
+                await MirabufCachingService.cacheLocalAndReturn(buffer, miraType)
                     .then(result => {
                         if (result) {
                             return createMirabuf(result.assembly, undefined)
diff --git a/fission/src/ui/panels/DeveloperToolPanel.tsx b/fission/src/ui/panels/DeveloperToolPanel.tsx
index fa8a5f0d2f..fd4bd52448 100644
--- a/fission/src/ui/panels/DeveloperToolPanel.tsx
+++ b/fission/src/ui/panels/DeveloperToolPanel.tsx
@@ -43,7 +43,6 @@ const DeveloperToolPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) =>
     const [keys, setKeys] = useState<string[]>([])
     const [fieldLoaded, setFieldLoaded] = useState<boolean>(false)
     const prevFieldObj = useRef<MirabufSceneObject | undefined>(undefined)
-
     // Effect: Watch for field changes and update editor/keys only if field changes
     useEffect(() => {
         const updateEditor = () => {
diff --git a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
index 02dd52dee2..84d30ed22d 100644
--- a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
+++ b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
@@ -10,7 +10,8 @@ import {
     MirabufFilesUpdateEvent,
     requestMirabufFiles,
 } from "@/aps/APSDataManagement"
-import MirabufCachingService, { type MirabufCacheInfo, type MirabufRemoteInfo, MiraType } from "@/mirabuf/MirabufLoader"
+import DefaultAssetLoader, { type DefaultAssetInfo } from "@/mirabuf/DefaultAssetLoader.ts"
+import MirabufCachingService, { type MirabufCacheInfo, MiraType } from "@/mirabuf/MirabufLoader"
 import { createMirabuf } from "@/mirabuf/MirabufSceneObject"
 import { PAUSE_REF_ASSEMBLY_SPAWNING } from "@/systems/physics/PhysicsTypes"
 import World from "@/systems/World"
@@ -67,14 +68,9 @@ const ItemCard: React.FC<ItemCardProps> = ({ id, name, primaryButtonNode, primar
     )
 }
 
-export type MiraManifest = {
-    robots: MirabufRemoteInfo[]
-    fields: MirabufRemoteInfo[]
-}
-
-export async function spawnCachedMira(info: MirabufCacheInfo, type: MiraType, progressHandle?: ProgressHandle) {
+export async function spawnCachedMira(info: MirabufCacheInfo, progressHandle?: ProgressHandle) {
     // If spawning a field, then remove all other fields
-    if (type === MiraType.FIELD) {
+    if (info.miraType === MiraType.FIELD) {
         World.sceneRenderer.removeAllFields()
     }
 
@@ -122,7 +118,9 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
     const [cachedRobots, setCachedRobots] = useState(MirabufCachingService.getAll(MiraType.ROBOT))
     const [cachedFields, setCachedFields] = useState(MirabufCachingService.getAll(MiraType.FIELD))
 
-    const [manifest, setManifest] = useState<MiraManifest | undefined>()
+    // const [manifest, setManifest] = useState<MiraManifest | undefined>()
+    const manifestRobots = useMemo(() => DefaultAssetLoader.robots, [])
+    const manifestFields = useMemo(() => DefaultAssetLoader.fields, [])
     const [viewType, setViewType] = useState<MiraType>(MiraType.ROBOT)
 
     const [filesStatus, setFilesStatus] = useState<TaskStatus>({
@@ -156,7 +154,7 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
 
     useEffect(() => {
         if (!hasMirabufFiles()) {
-            requestMirabufFiles()
+            requestMirabufFiles().catch(console.error)
         } else {
             setFiles(getMirabufFiles())
         }
@@ -173,52 +171,10 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
         if (parent) closePanel(parent.id, CloseType.Cancel)
     }, [])
 
-    // Get Default Mirabuf Data, Load into manifest.
-    useEffect(() => {
-        // To remove the prettier warning
-        const x = async () => {
-            // Detect if we're running in electron and use direct remote URL
-            const isElectron = window.electronAPI != null
-            const baseUrl = isElectron ? "https://synthesis.autodesk.com" : ""
-
-            fetch(`${baseUrl}/api/mira/manifest.json`)
-                .then(x => x.json())
-                .then(x => {
-                    const robots: MirabufRemoteInfo[] = []
-                    for (const src of x["robots"]) {
-                        const obj =
-                            typeof src == "string"
-                                ? { displayName: src, src: `${baseUrl}/api/mira/robots/${src}` }
-                                : { displayName: src.displayName, src: src.src }
-                        robots.push(obj)
-                    }
-
-                    const fields: MirabufRemoteInfo[] = []
-                    for (const src of x["fields"]) {
-                        const obj =
-                            typeof src == "string"
-                                ? { displayName: src, src: `${baseUrl}/api/mira/fields/${src}` }
-                                : { displayName: src.displayName, src: src.src }
-                        fields.push(obj)
-                    }
-
-                    setManifest({
-                        robots,
-                        fields,
-                    })
-                })
-                .catch(error => {
-                    console.error("Failed to fetch manifest:", error)
-                })
-        }
-        x()
-    }, [])
-
     // Select a mirabuf assembly from the cache.
     const selectCache = useCallback(
-        async (info: MirabufCacheInfo, type: MiraType) => {
-            await spawnCachedMira(info, type)
-
+        async (info: MirabufCacheInfo) => {
+            await spawnCachedMira(info)
             if (panel) closePanel(panel.id, CloseType.Cancel)
         },
         [closePanel, panel]
@@ -226,14 +182,14 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
 
     // Cache a selected remote mirabuf assembly, load from cache.
     const selectRemote = useCallback(
-        (info: MirabufRemoteInfo, type: MiraType) => {
-            const status = new ProgressHandle(info.displayName)
+        (info: DefaultAssetInfo) => {
+            const status = new ProgressHandle(info.name)
             status.update("Downloading from Synthesis...", 0.05)
 
-            MirabufCachingService.cacheRemote(info.src, type, info.displayName)
+            MirabufCachingService.cacheRemote(info.remotePath, info.miraType, info.name, info.hash)
                 .then(async cacheInfo => {
                     if (cacheInfo) {
-                        await spawnCachedMira(cacheInfo, type, status)
+                        await spawnCachedMira(cacheInfo, status)
                     } else {
                         status.fail("Failed to cache")
                     }
@@ -245,22 +201,6 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
         [closePanel, panel]
     )
 
-    // Cache a selected remote mirabuf assembly, without load.
-    const cacheRemoteOnly = useCallback((info: MirabufRemoteInfo, type: MiraType) => {
-        const status = new ProgressHandle(info.displayName)
-        status.update("Downloading from Synthesis...", 0.05)
-
-        MirabufCachingService.cacheRemote(info.src, type, info.displayName)
-            .then(cacheInfo => {
-                if (cacheInfo) {
-                    status.done()
-                } else {
-                    status.fail("Failed to cache")
-                }
-            })
-            .catch(() => status.fail())
-    }, [])
-
     const selectAPS = useCallback(
         (data: Data, type: MiraType) => {
             const status = new ProgressHandle(data.attributes.displayName ?? data.id)
@@ -269,7 +209,7 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
             MirabufCachingService.cacheAPS(data, type)
                 .then(async cacheInfo => {
                     if (cacheInfo) {
-                        await spawnCachedMira(cacheInfo, type, status)
+                        await spawnCachedMira(cacheInfo, status)
                     } else {
                         status.fail("Failed to cache")
                     }
@@ -280,108 +220,128 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
         },
         [closePanel, panel]
     )
-
-    // Generate Item cards for cached robots.
-    const cachedRobotElements = useMemo(
-        () =>
-            cachedRobots
+    const createCachedAssetElements = useCallback(
+        (items: MirabufCacheInfo[]) => {
+            return items
                 .sort((a, b) => a.name?.localeCompare(b.name ?? "") ?? -1)
                 .map(info =>
                     ItemCard({
-                        name: info.name || "Unnamed Robot",
+                        name: info.name || "Unnamed",
                         id: info.hash,
                         primaryButtonNode: SynthesisIcons.ADD_LARGE,
                         primaryOnClick: async () => {
-                            console.log(`Selecting cached robot: ${info.name}`)
-                            await selectCache(info, MiraType.ROBOT)
+                            console.log(`Selecting cached: ${info.name}`)
+                            await selectCache(info)
                         },
                         secondaryOnClick: async () => {
                             console.log(`Deleting cache of: ${info.name}`)
                             await MirabufCachingService.remove(info.hash)
-                            setCachedRobots(MirabufCachingService.getAll(MiraType.ROBOT))
+                            if (info.miraType == MiraType.ROBOT) {
+                                setCachedRobots(MirabufCachingService.getAll(MiraType.ROBOT))
+                            } else {
+                                setCachedFields(MirabufCachingService.getAll(MiraType.FIELD))
+                            }
                         },
                     })
-                ),
-        [cachedRobots, selectCache]
+                )
+        },
+        [selectCache]
+    )
+    // Generate Item cards for cached robots.
+    const cachedRobotElements = useMemo(
+        () => createCachedAssetElements(cachedRobots),
+        [cachedRobots, createCachedAssetElements]
     )
 
     // Generate Item cards for cached fields.
     const cachedFieldElements = useMemo(
-        () =>
-            cachedFields
-                .sort((a, b) => a.name?.localeCompare(b.name ?? "") ?? -1)
-                .map(info =>
-                    ItemCard({
-                        name: info.name || "Unnamed Field",
-                        id: info.hash,
-                        primaryButtonNode: SynthesisIcons.ADD_LARGE,
-                        primaryOnClick: () => {
-                            console.log(`Selecting cached field: ${info.hash}`)
-                            selectCache(info, MiraType.FIELD)
-                        },
-                        secondaryOnClick: async () => {
-                            console.log(`Deleting cache of: ${info.hash}`)
-                            await MirabufCachingService.remove(info.hash)
-                            setCachedFields(MirabufCachingService.getAll(MiraType.FIELD))
-                        },
-                    })
-                ),
-        [cachedFields, selectCache]
+        () => createCachedAssetElements(cachedFields),
+        [cachedFields, createCachedAssetElements]
     )
 
     // Generate Item cards for remote robots.
     const remoteRobotElements = useMemo(() => {
-        const remoteRobots = manifest?.robots.filter(path => !cachedRobots.some(info => info.remotePath == path.src))
+        const remoteRobots = manifestRobots.filter(
+            remoteRobot => !cachedRobots.some(info => info.hash == remoteRobot.hash)
+        )
         return remoteRobots
-            ?.sort((a, b) => a.displayName.localeCompare(b.displayName))
-            .map(path =>
+            ?.sort((a, b) => a.name.localeCompare(b.name))
+            .map(item =>
                 ItemCard({
-                    name: path.displayName,
-                    id: path.src,
+                    name: item.name,
+                    id: item.hash,
                     primaryButtonNode: SynthesisIcons.DOWNLOAD_LARGE,
                     primaryOnClick: () => {
-                        console.log(`Selecting remote: ${path.src}`)
-                        selectRemote(path, MiraType.ROBOT)
+                        console.log(`Selecting remote: ${item.remotePath}`)
+                        selectRemote(item)
                     },
                 })
             )
-    }, [manifest?.robots, cachedRobots, selectRemote])
+    }, [manifestRobots, cachedRobots, selectRemote])
 
     // Generate Item cards for remote fields.
     const remoteFieldElements = useMemo(() => {
-        const remoteFields = manifest?.fields.filter(path => !cachedFields.some(info => info.remotePath == path.src))
+        const remoteFields = manifestFields.filter(
+            remoteField => !cachedFields.some(info => info.hash == remoteField.hash)
+        )
         return remoteFields
-            ?.sort((a, b) => a.displayName.localeCompare(b.displayName))
-            .map(path =>
+            ?.sort((a, b) => a.name.localeCompare(b.name))
+            .map(asset =>
                 ItemCard({
-                    name: path.displayName,
-                    id: path.src,
+                    name: asset.name,
+                    id: asset.hash,
                     primaryButtonNode: SynthesisIcons.DOWNLOAD_LARGE,
                     primaryOnClick: () => {
-                        console.log(`Selecting remote: ${path.src}`)
-                        selectRemote(path, MiraType.FIELD)
+                        console.log(`Selecting remote: ${asset.remotePath}`)
+                        selectRemote(asset)
                     },
                 })
             )
-    }, [manifest?.fields, cachedFields, selectRemote])
-
-    function downloadAllRemote(cached: MirabufCacheInfo[]): () => void {
-        // biome-ignore lint: Returning a callback is fine to avoid repeating ourselves
-        return useCallback(() => {
-            const miraType: MiraType | undefined = cached[0]?.miraType
-            const property = miraType === MiraType.ROBOT ? "robots" : "fields"
-            const remotes = manifest ? manifest[property] : []
-
-            remotes
-                .filter(path => !cached.some(info => info.remotePath?.includes(path.src)))
-                .forEach(path => cacheRemoteOnly(path, miraType))
+    }, [manifestFields, cachedFields, selectRemote])
+
+    const downloadAllRemote = useCallback(
+        (manifestAssets: DefaultAssetInfo[], cachedAssets: MirabufCacheInfo[]) => {
+            const status = new ProgressHandle("Caching Remote Assets")
+
+            const toCache = manifestAssets.filter(asset => !cachedAssets.some(info => info.hash === asset.hash))
+
+            let completeCount = 0
+            const totalCount = toCache.length
+            status.update(`Downloading... (0/${totalCount})}`, 0.05)
+
+            toCache.forEach(asset => {
+                MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType, asset.name, asset.hash)
+                    .then(cacheInfo => {
+                        if (cacheInfo) {
+                            completeCount++
+                            if (completeCount == totalCount) {
+                                status.done()
+                            } else {
+                                status.update(
+                                    `Downloading... (${completeCount}/${totalCount})}`,
+                                    completeCount / totalCount
+                                )
+                            }
+                        } else {
+                            status.fail("Failed to cache")
+                        }
+                    })
+                    .catch(() => status.fail())
+            })
 
             if (panel) closePanel(panel.id, CloseType.Cancel)
-        }, [manifest, cached, cacheRemoteOnly, closePanel, panel])
-    }
+        },
+        [closePanel, panel]
+    )
 
-    const downloadAllRemoteRobots = downloadAllRemote(cachedRobots)
-    const downloadAllRemoteFields = downloadAllRemote(cachedFields)
+    const downloadAllRemoteRobots = useCallback(
+        () => downloadAllRemote(manifestRobots, cachedRobots),
+        [manifestRobots, cachedRobots, downloadAllRemote]
+    )
+    const downloadAllRemoteFields = useCallback(
+        () => downloadAllRemote(manifestFields, cachedFields),
+        [manifestFields, cachedFields, downloadAllRemote]
+    )
 
     // Generate Item cards for APS robots and fields.
     const hubElements = useMemo(
diff --git a/fission/src/util/Utility.ts b/fission/src/util/Utility.ts
index 295d29017f..f7fb014a43 100644
--- a/fission/src/util/Utility.ts
+++ b/fission/src/util/Utility.ts
@@ -26,3 +26,14 @@ export function findListDifference<T>(previousList: T[], currentList: T[]): { ad
 
     return { added, removed }
 }
+
+export async function hashBuffer(buffer: ArrayBuffer, allowDateFallback: boolean = true): Promise<string> {
+    if (crypto?.subtle?.digest == null && allowDateFallback) {
+        console.warn("Crypto not available, using timestamp as key")
+        return Date.now().toString(16)
+    }
+    const hashBuffer = await crypto.subtle.digest("SHA-1", buffer)
+    return Array.from(new Uint8Array(hashBuffer))
+        .map(x => x.toString(16))
+        .join("")
+}
diff --git a/fission/tsconfig.node.json b/fission/tsconfig.node.json
index 0edafce9d9..3a6ad937c1 100644
--- a/fission/tsconfig.node.json
+++ b/fission/tsconfig.node.json
@@ -6,7 +6,8 @@
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true,
     "strict": true,
+    "allowImportingTsExtensions": true,
     "target": "ESNext"
   },
-  "include": ["vite.config.ts"]
+  "include": ["vite.config.ts", "update_manifest.ts", "src/util/Utility.ts"]
 }
diff --git a/fission/update_manifest.ts b/fission/update_manifest.ts
new file mode 100644
index 0000000000..b6d6a5b811
--- /dev/null
+++ b/fission/update_manifest.ts
@@ -0,0 +1,30 @@
+import path from "node:path";
+import * as fs from "fs/promises"
+import {hashBuffer} from "./src/util/Utility.ts";
+
+
+const basepath = "public/Downloadables/Mira"
+const keys = ["fields", "robots", "private"] as const
+
+export type ManifestFileType = Record<typeof keys[number], { filename: string, hash: string }[]>
+
+const map: ManifestFileType = {fields: [], private: [], robots: []}
+
+const dirs = Object.keys(map) as (keyof typeof map)[]
+
+async function main() {
+    for (const dirname of dirs) {
+        const list = map[dirname]
+        for await (const file of await fs.opendir(path.join(basepath, dirname))) {
+            if (file.isDirectory() || !file.name.endsWith(".mira")) {
+                continue
+            }
+
+            const data = await fs.readFile(path.join(file.parentPath, file.name))
+            list.push({filename: file.name, hash: await hashBuffer(data.buffer as ArrayBuffer)})
+        }
+    }
+    await fs.writeFile(path.join(basepath, "manifest.json"), JSON.stringify(map))
+}
+
+main().catch(console.error)
\ No newline at end of file
diff --git a/fission/vite.config.ts b/fission/vite.config.ts
index 9e22009ddb..549d9ee51c 100644
--- a/fission/vite.config.ts
+++ b/fission/vite.config.ts
@@ -65,9 +65,7 @@ export default defineConfig(async ({ mode }) => {
               secure: false,
               rewrite: path =>
                   path
-                      .replace(/^\/api\/mira/, "/Downloadables/Mira")
-                      .replace("robots", "Robots")
-                      .replace("fields", "Fields"),
+                      .replace(/^\/api\/mira/, "/Downloadables/mira")
           }
         : {
               target: `https://synthesis.autodesk.com/`,

From edee81d927d006d40c06cac3d41ea15f91af39eb Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Mon, 18 Aug 2025 12:23:38 -0700
Subject: [PATCH 14/24] fix: ts configs

fix: try to make unit tests work

fix: actually make unit tests work

feat: add unit tests for default assets

fix: tsconfig issues again
---
 fission/manifest.d.ts                         |  1 +
 fission/package.json                          |  4 +-
 fission/src/mirabuf/DefaultAssetLoader.ts     | 11 +++--
 fission/src/mirabuf/MirabufLoader.ts          |  3 +-
 fission/src/test/bootstrap/AppMount.test.tsx  |  2 +
 .../src/test/mirabuf/DefaultAssets.test.ts    | 40 +++++++++++++++++++
 .../src/test/mirabuf/FieldMiraEditor.test.ts  | 15 +++----
 .../src/test/mirabuf/MirabufLoader.test.ts    |  1 +
 fission/src/ui/modals/MainMenuModal.tsx       |  6 +--
 fission/src/util/TypeConversions.ts           |  2 +-
 fission/src/util/Utility.ts                   |  4 +-
 fission/tsconfig.json                         |  6 ++-
 fission/tsconfig.node.json                    |  3 +-
 fission/update_manifest.ts                    | 17 ++++----
 fission/vite.config.ts                        |  2 +-
 15 files changed, 84 insertions(+), 33 deletions(-)
 create mode 100644 fission/manifest.d.ts
 create mode 100644 fission/src/test/mirabuf/DefaultAssets.test.ts

diff --git a/fission/manifest.d.ts b/fission/manifest.d.ts
new file mode 100644
index 0000000000..e7fdf8a6a8
--- /dev/null
+++ b/fission/manifest.d.ts
@@ -0,0 +1 @@
+export type ManifestFileType = Record<"robots"|"private"|"fields", { filename: string, hash: string }[]>
\ No newline at end of file
diff --git a/fission/package.json b/fission/package.json
index 92669d9a6d..6ae6d15d4f 100644
--- a/fission/package.json
+++ b/fission/package.json
@@ -21,8 +21,8 @@
     "fmt:fix": "bunx --bun biome format src --write",
     "style": "bun run fmt && bun run lint",
     "style:fix": "bun run fmt:fix && bun run lint:fix",
-    "assetpack": "git lfs pull && tar -xf public/assetpack.zip -C public/",
-    "assetpack:update": "cd public && zip -FS -r assetpack.zip Downloadables",
+    "assetpack": "git lfs pull && (rm -rf public/Downloadables;tar -xf public/assetpack.zip -C public/)",
+    "assetpack:update": "bun update_manifest.ts && cd public && zip -FS -r assetpack.zip Downloadables",
     "playwright:install": "bun x playwright install",
     "electron:start": "electron-forge start",
     "electron:package": "electron-forge package",
diff --git a/fission/src/mirabuf/DefaultAssetLoader.ts b/fission/src/mirabuf/DefaultAssetLoader.ts
index 6d1103abd5..c47b003cab 100644
--- a/fission/src/mirabuf/DefaultAssetLoader.ts
+++ b/fission/src/mirabuf/DefaultAssetLoader.ts
@@ -1,16 +1,19 @@
 import { type MirabufCacheInfo, MiraType } from "@/mirabuf/MirabufLoader.ts"
-import type { ManifestFileType } from "../../update_manifest.ts"
+import type { ManifestFileType } from "../../manifest.d.ts"
 
 export type DefaultAssetInfo = Required<Pick<MirabufCacheInfo, "hash" | "remotePath" | "miraType" | "name">>
 
 class DefaultAssetLoader {
     private static _assets: DefaultAssetInfo[] = []
-
+    private static _hasLoaded = false
     static {
-        setTimeout(() => this.refresh(), 1000)
+        setTimeout(() => {
+            if (!this._hasLoaded) this.refresh().catch(console.error)
+        }, 1000)
     }
 
-    private static async refresh() {
+    public static async refresh() {
+        this._hasLoaded = true
         this._assets = []
 
         const isElectron = window.electronAPI != null
diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index 61bcde769c..6bce0ec5c4 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -222,8 +222,7 @@ class MirabufCachingService {
 
             if (expectedHash != null && cached?.hash != null && cached?.hash != expectedHash) {
                 globalAddToast("warning", "Hash Mismatch", `Try downloading again`)
-                console.log(expectedHash, cached?.hash)
-                console.log(expectedHash == cached?.hash)
+                console.warn("mismatched hashes", expectedHash, cached?.hash)
                 // await this.remove(cached.hash)
             }
 
diff --git a/fission/src/test/bootstrap/AppMount.test.tsx b/fission/src/test/bootstrap/AppMount.test.tsx
index 721cc0e3e6..ccd65e6c9d 100644
--- a/fission/src/test/bootstrap/AppMount.test.tsx
+++ b/fission/src/test/bootstrap/AppMount.test.tsx
@@ -53,6 +53,8 @@ describe("React Mounting", async () => {
     test("App fully mounts through main.tsx", async ({ annotate, skip }) => {
         skip(server.browser == "firefox", "WebGL bug in Github Actions on Firefox")
 
+        // biome-ignore lint/nursery/noTsIgnore: ts-expect-error doesn't work here for some reason
+        // @ts-ignore funky dynamic import
         await import("@/main.tsx")
 
         expect(window.convertAuthToken).toBeDefined()
diff --git a/fission/src/test/mirabuf/DefaultAssets.test.ts b/fission/src/test/mirabuf/DefaultAssets.test.ts
new file mode 100644
index 0000000000..aee21c6e9e
--- /dev/null
+++ b/fission/src/test/mirabuf/DefaultAssets.test.ts
@@ -0,0 +1,40 @@
+import { assert, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"
+import DefaultAssetLoader from "@/mirabuf/DefaultAssetLoader.ts"
+import MirabufLoader from "@/mirabuf/MirabufLoader.ts"
+import MirabufCachingService, { MiraType } from "@/mirabuf/MirabufLoader.ts"
+
+describe("Default Asset Tests", () => {
+    beforeAll(async () => {
+        await DefaultAssetLoader.refresh()
+        vi.spyOn(console, "log").mockImplementation(() => {})
+    })
+    beforeEach(async () => {
+        await MirabufLoader.removeAll()
+    })
+
+    test("Manifest loaded", () => {
+        expect(DefaultAssetLoader.fields.length).toBeGreaterThan(1)
+        expect(DefaultAssetLoader.robots.length).toBeGreaterThan(1)
+    })
+
+    test("Manifest hashes match assets (fields)", async () => {
+        for (const asset of DefaultAssetLoader.fields) {
+            const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
+            assert.exists(info)
+            expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
+            expect(asset.miraType).toBe(MiraType.FIELD)
+            await MirabufCachingService.remove(info.hash)
+        }
+        expect(MirabufCachingService.getAll()).toHaveLength(0)
+    })
+    test("Manifest hashes match assets (robots)", async () => {
+        for (const asset of DefaultAssetLoader.robots) {
+            const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
+            assert.exists(info)
+            expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
+            expect(asset.miraType).toBe(MiraType.ROBOT)
+            await MirabufCachingService.remove(info.hash)
+        }
+        expect(MirabufCachingService.getAll()).toHaveLength(0)
+    })
+})
diff --git a/fission/src/test/mirabuf/FieldMiraEditor.test.ts b/fission/src/test/mirabuf/FieldMiraEditor.test.ts
index 4d324515d1..c07f1492c6 100644
--- a/fission/src/test/mirabuf/FieldMiraEditor.test.ts
+++ b/fission/src/test/mirabuf/FieldMiraEditor.test.ts
@@ -1,13 +1,13 @@
 import { assert, describe, expect, test, vi } from "vitest"
 import MirabufCachingService, { MiraType } from "@/mirabuf/MirabufLoader.ts"
 import { createMirabuf } from "@/mirabuf/MirabufSceneObject.ts"
+import { mirabuf } from "@/proto/mirabuf"
 import {
     type Alliance,
     defaultRobotSpawnLocation,
     type ScoringZonePreferences,
 } from "@/systems/preferences/PreferenceTypes.ts"
 import FieldMiraEditor from "../../mirabuf/FieldMiraEditor.ts"
-import { mirabuf } from "../../proto/mirabuf"
 
 function mockParts(): mirabuf.IParts {
     return { userData: { data: {} } }
@@ -148,17 +148,18 @@ describe("Devtool Scoring Zones Caching Tests", () => {
 
 describe("Asset tests", () => {
     test("FRC Field 2018_v13 has spawn locations", async () => {
-        const file = await MirabufCachingService.cacheRemote("/api/mira/fields/FRC Field 2018_v13.mira", MiraType.FIELD)
-            .then(x => MirabufCachingService.get(x!.hash))
-            .catch(e => {
-                console.error("Could not get mirabuf file", e)
-                return undefined
-            })
+        const cacheInfo = await MirabufCachingService.cacheRemote(
+            "/api/mira/fields/FRC Field 2018_v13.mira",
+            MiraType.FIELD
+        )
+        assert.exists(cacheInfo)
+        const file = await MirabufCachingService.get(cacheInfo.hash)
         assert.exists(file)
 
         const mirabuf = await createMirabuf(file)
         assert.exists(mirabuf)
         assert.exists(mirabuf.fieldPreferences)
+        console.log(mirabuf.fieldPreferences)
         expect(mirabuf.fieldPreferences.spawnLocations.hasConfiguredLocations).toBe(true)
         expect(mirabuf.fieldPreferences.spawnLocations.red["1"]).not.toStrictEqual(defaultRobotSpawnLocation())
         expect(mirabuf.fieldPreferences.spawnLocations.default).not.toStrictEqual(defaultRobotSpawnLocation())
diff --git a/fission/src/test/mirabuf/MirabufLoader.test.ts b/fission/src/test/mirabuf/MirabufLoader.test.ts
index 3546968579..5e7ef4a422 100644
--- a/fission/src/test/mirabuf/MirabufLoader.test.ts
+++ b/fission/src/test/mirabuf/MirabufLoader.test.ts
@@ -146,6 +146,7 @@ describe("MirabufLoader", () => {
             expect(info).toBeDefined()
             expect(info?.miraType).toBe(MiraType.FIELD)
             expect(info?.name).toBe("FRC Field 2023 v7")
+            expect(info?.hash).toBe("96b0d75cf3fde2c90a9b63e2497170e37b3e40")
             const assembly = await MirabufLoader.get(info!.hash)
             expect(assembly).toBeDefined()
             expect(assembly?.info?.name).toBe(info!.name)
diff --git a/fission/src/ui/modals/MainMenuModal.tsx b/fission/src/ui/modals/MainMenuModal.tsx
index 41888bbded..35f0bf6510 100644
--- a/fission/src/ui/modals/MainMenuModal.tsx
+++ b/fission/src/ui/modals/MainMenuModal.tsx
@@ -46,10 +46,10 @@ const MainMenuModal: React.FC<ModalImplProps<void, MainMenuCustomProps>> = ({ mo
                     Promise.all([
                         MirabufCachingService.cacheRemote("/api/mira/fields/FRC Field 2023_v7.mira", MiraType.FIELD),
                         MirabufCachingService.cacheRemote("/api/mira/robots/Dozer_v9.mira", MiraType.ROBOT),
-                    ]).then(([cachedField, cachedRobot]) => {
+                    ]).then(async ([cachedField, cachedRobot]) => {
                         if (cachedField && cachedRobot) {
-                            spawnCachedMira(cachedField, MiraType.FIELD)
-                            spawnCachedMira(cachedRobot, MiraType.ROBOT)
+                            await spawnCachedMira(cachedField)
+                            await spawnCachedMira(cachedRobot)
                         }
                     })
                 }}
diff --git a/fission/src/util/TypeConversions.ts b/fission/src/util/TypeConversions.ts
index 4100cd8e35..f6b43511c4 100644
--- a/fission/src/util/TypeConversions.ts
+++ b/fission/src/util/TypeConversions.ts
@@ -1,7 +1,7 @@
 import type Jolt from "@azaleacolburn/jolt-physics"
 import type { RgbaColor } from "react-colorful"
 import * as THREE from "three"
-import type { mirabuf } from "../proto/mirabuf"
+import type { mirabuf } from "@/proto/mirabuf"
 import JOLT from "./loading/JoltSyncLoader"
 
 export function convertThreeToJoltQuat(a: THREE.Euler | THREE.Quaternion | undefined) {
diff --git a/fission/src/util/Utility.ts b/fission/src/util/Utility.ts
index f7fb014a43..39b6c29bc6 100644
--- a/fission/src/util/Utility.ts
+++ b/fission/src/util/Utility.ts
@@ -27,8 +27,8 @@ export function findListDifference<T>(previousList: T[], currentList: T[]): { ad
     return { added, removed }
 }
 
-export async function hashBuffer(buffer: ArrayBuffer, allowDateFallback: boolean = true): Promise<string> {
-    if (crypto?.subtle?.digest == null && allowDateFallback) {
+export async function hashBuffer(buffer: ArrayBuffer): Promise<string> {
+    if (crypto?.subtle?.digest == null) {
         console.warn("Crypto not available, using timestamp as key")
         return Date.now().toString(16)
     }
diff --git a/fission/tsconfig.json b/fission/tsconfig.json
index 0cc09060c0..b0b55a1731 100644
--- a/fission/tsconfig.json
+++ b/fission/tsconfig.json
@@ -40,12 +40,14 @@
         "noUnusedLocals": true,
         "noUnusedParameters": true,
         "noFallthroughCasesInSwitch": true,
+        "composite": true,
         "types": [
             "vite-plugin-glsl/ext"
-        ],
+        ]
     },
     "include": [
-        "src"
+        "src/**/*.ts",
+        "src/**/*.tsx"
     ],
     "references": [
         {
diff --git a/fission/tsconfig.node.json b/fission/tsconfig.node.json
index 3a6ad937c1..1e02dd14f6 100644
--- a/fission/tsconfig.node.json
+++ b/fission/tsconfig.node.json
@@ -6,8 +6,7 @@
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true,
     "strict": true,
-    "allowImportingTsExtensions": true,
     "target": "ESNext"
   },
-  "include": ["vite.config.ts", "update_manifest.ts", "src/util/Utility.ts"]
+  "include": ["vite.config.ts", "update_manifest.ts"]
 }
diff --git a/fission/update_manifest.ts b/fission/update_manifest.ts
index b6d6a5b811..ce5bec5656 100644
--- a/fission/update_manifest.ts
+++ b/fission/update_manifest.ts
@@ -1,13 +1,9 @@
+import crypto from "node:crypto"
 import path from "node:path";
 import * as fs from "fs/promises"
-import {hashBuffer} from "./src/util/Utility.ts";
-
+import type {ManifestFileType} from "./manifest";
 
 const basepath = "public/Downloadables/Mira"
-const keys = ["fields", "robots", "private"] as const
-
-export type ManifestFileType = Record<typeof keys[number], { filename: string, hash: string }[]>
-
 const map: ManifestFileType = {fields: [], private: [], robots: []}
 
 const dirs = Object.keys(map) as (keyof typeof map)[]
@@ -27,4 +23,11 @@ async function main() {
     await fs.writeFile(path.join(basepath, "manifest.json"), JSON.stringify(map))
 }
 
-main().catch(console.error)
\ No newline at end of file
+main().catch(console.error)
+
+export async function hashBuffer(buffer:ArrayBuffer) {
+    const hashBuffer = await crypto.subtle.digest("SHA-1", buffer)
+    return Array.from(new Uint8Array(hashBuffer))
+        .map(x => x.toString(16))
+        .join("")
+}
\ No newline at end of file
diff --git a/fission/vite.config.ts b/fission/vite.config.ts
index 549d9ee51c..d50b87759d 100644
--- a/fission/vite.config.ts
+++ b/fission/vite.config.ts
@@ -42,7 +42,7 @@ if (useSsl) {
 }
 
 const localAssetsExist = await fs
-    .access("./public/Downloadables/Mira", fs.constants.R_OK)
+    .access("./public/Downloadables/mira", fs.constants.R_OK)
     .then(() => true)
     .catch(() => false)
 

From e7bb1e126d07f242976e31ba6c88c4469ddf67d7 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Wed, 20 Aug 2025 15:20:30 -0700
Subject: [PATCH 15/24] fix: undo import sorting

---
 fission/src/ui/UIProvider.tsx                        |  2 +-
 fission/src/ui/components/AnalyticsConsent.tsx       |  2 +-
 fission/src/ui/components/ContextMenu.tsx            |  2 +-
 fission/src/ui/components/MainHUD.tsx                |  3 ++-
 fission/src/ui/components/Modal.tsx                  |  2 +-
 fission/src/ui/components/Panel.tsx                  |  2 +-
 fission/src/ui/components/SelectButton.tsx           |  3 ++-
 fission/src/ui/components/SelectMenu.tsx             |  3 ++-
 fission/src/ui/components/StyledComponents.tsx       | 12 ++++++------
 fission/src/ui/components/TransformGizmoControl.tsx  |  3 ++-
 .../src/ui/components/simulation/FlowControls.tsx    |  2 +-
 fission/src/ui/modals/MatchResultsModal.tsx          |  2 +-
 fission/src/ui/modals/common/ConfirmModal.tsx        |  2 +-
 fission/src/ui/modals/configuring/RoboRIOModal.tsx   |  2 +-
 fission/src/ui/modals/configuring/SettingsModal.tsx  |  3 ++-
 .../ui/panels/configuring/CameraSelectionPanel.tsx   |  2 +-
 .../configuring/CreateNewMatchModeConfigPanel.tsx    |  8 ++++----
 .../ui/panels/configuring/MatchModeConfigPanel.tsx   |  3 ++-
 .../configuring/assembly-config/ConfigurePanel.tsx   |  2 +-
 .../interfaces/AllianceSelectionInterface.tsx        |  2 +-
 .../interfaces/BrainSelectionInterface.tsx           |  2 +-
 .../interfaces/ConfigureGamepiecePickupInterface.tsx |  3 ++-
 .../interfaces/ConfigureShotTrajectoryInterface.tsx  |  3 ++-
 .../interfaces/SequentialBehaviorsInterface.tsx      |  3 ++-
 .../interfaces/SimulationInterface.tsx               |  2 +-
 .../interfaces/inputs/ConfigureSchemeInterface.tsx   |  3 ++-
 .../interfaces/inputs/EditInputInterface.tsx         |  3 ++-
 .../scoring/ConfigureScoringZonesInterface.tsx       |  3 ++-
 .../scoring/ScoringZoneConfigInterface.tsx           |  2 +-
 .../initial-config/InitialConfigPanel.tsx            |  2 +-
 .../initial-config/InputSchemeSelection.tsx          |  3 ++-
 fission/src/ui/panels/simulation/AutoTestPanel.tsx   |  3 ++-
 .../src/ui/panels/simulation/DriverStationPanel.tsx  |  2 +-
 fission/src/ui/panels/simulation/WiringPanel.tsx     |  2 +-
 fission/src/util/TypeConversions.ts                  |  2 +-
 35 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/fission/src/ui/UIProvider.tsx b/fission/src/ui/UIProvider.tsx
index 1bac6eb363..9cb2c7c00f 100644
--- a/fission/src/ui/UIProvider.tsx
+++ b/fission/src/ui/UIProvider.tsx
@@ -1,4 +1,5 @@
 import CloseIcon from "@mui/icons-material/Close"
+import { IconButton } from "./components/StyledComponents"
 import type { SnackbarKey, SnackbarMessage, VariantType } from "notistack"
 import { useSnackbar } from "notistack"
 import type React from "react"
@@ -7,7 +8,6 @@ import { useCallback, useReducer, useState } from "react"
 import { v4 as uuidv4 } from "uuid"
 import type { ModalImplProps } from "./components/Modal"
 import type { PanelImplProps } from "./components/Panel"
-import { IconButton } from "./components/StyledComponents"
 import {
     CloseType,
     type ConfigureScreenFn,
diff --git a/fission/src/ui/components/AnalyticsConsent.tsx b/fission/src/ui/components/AnalyticsConsent.tsx
index de07f8e758..400ff46970 100644
--- a/fission/src/ui/components/AnalyticsConsent.tsx
+++ b/fission/src/ui/components/AnalyticsConsent.tsx
@@ -1,7 +1,7 @@
 import { Box } from "@mui/material"
+import { Button } from "./StyledComponents"
 import { AiOutlineClose } from "react-icons/ai"
 import Label from "./Label"
-import { Button } from "./StyledComponents"
 
 interface AnalyticsConsentProps {
     onClose: () => void
diff --git a/fission/src/ui/components/ContextMenu.tsx b/fission/src/ui/components/ContextMenu.tsx
index 8440a694aa..f1cd8a9937 100644
--- a/fission/src/ui/components/ContextMenu.tsx
+++ b/fission/src/ui/components/ContextMenu.tsx
@@ -1,10 +1,10 @@
 import { Divider, Stack } from "@mui/material"
+import { Button } from "./StyledComponents"
 import type React from "react"
 import { useEffect, useState } from "react"
 import { type ContextData, ContextSupplierEvent } from "./ContextMenuData"
 import { globalOpenModal, globalOpenPanel } from "./GlobalUIControls"
 import Label from "./Label"
-import { Button } from "./StyledComponents"
 
 interface ContextMenuStateData {
     data: ContextData
diff --git a/fission/src/ui/components/MainHUD.tsx b/fission/src/ui/components/MainHUD.tsx
index 45db372a0d..817ec6e8f8 100644
--- a/fission/src/ui/components/MainHUD.tsx
+++ b/fission/src/ui/components/MainHUD.tsx
@@ -1,4 +1,5 @@
 import { Box, Stack } from "@mui/material"
+import { Button, IconButton } from "./StyledComponents"
 import { motion } from "framer-motion"
 import type React from "react"
 import { useEffect, useState } from "react"
@@ -19,7 +20,7 @@ import DebugPanel from "../panels/DebugPanel"
 import DeveloperToolPanel from "../panels/DeveloperToolPanel"
 import ImportMirabufPanel from "../panels/mirabuf/ImportMirabufPanel"
 import { setAddToast, setOpenModal, setOpenPanel } from "./GlobalUIControls"
-import { Button, IconButton, SynthesisIcons } from "./StyledComponents"
+import { SynthesisIcons } from "./StyledComponents"
 import { TouchControlsEvent, TouchControlsEventKeys } from "./TouchControls"
 import UserIcon from "./UserIcon"
 
diff --git a/fission/src/ui/components/Modal.tsx b/fission/src/ui/components/Modal.tsx
index 4c659563db..5251540e82 100644
--- a/fission/src/ui/components/Modal.tsx
+++ b/fission/src/ui/components/Modal.tsx
@@ -1,8 +1,8 @@
 import { Card, CardActions, CardContent, CardHeader, Modal as MUIModal } from "@mui/material"
+import { Button } from "./StyledComponents"
 import React, { type ReactElement } from "react"
 import type { Modal as ModalType, Panel as PanelType } from "../helpers/UIProviderHelpers"
 import { CloseType, useUIContext } from "../helpers/UIProviderHelpers"
-import { Button } from "./StyledComponents"
 
 export type ModalImplProps<T, P> = Partial<{
     modal: ModalType<T, P>
diff --git a/fission/src/ui/components/Panel.tsx b/fission/src/ui/components/Panel.tsx
index 29122bbbfe..3e057e56b3 100644
--- a/fission/src/ui/components/Panel.tsx
+++ b/fission/src/ui/components/Panel.tsx
@@ -1,4 +1,5 @@
 import { Card, CardActions, CardContent, CardHeader } from "@mui/material"
+import { Button } from "./StyledComponents"
 import React, { type ReactElement } from "react"
 import Draggable from "react-draggable"
 import {
@@ -8,7 +9,6 @@ import {
     type Panel as PanelType,
     useUIContext,
 } from "../helpers/UIProviderHelpers"
-import { Button } from "./StyledComponents"
 
 // biome-ignore-start lint/suspicious/noExplicitAny: need to be able to extend
 export type PanelImplProps<T, P> = Partial<{
diff --git a/fission/src/ui/components/SelectButton.tsx b/fission/src/ui/components/SelectButton.tsx
index bd5a82f027..16be53f17e 100644
--- a/fission/src/ui/components/SelectButton.tsx
+++ b/fission/src/ui/components/SelectButton.tsx
@@ -1,10 +1,11 @@
 import type Jolt from "@azaleacolburn/jolt-physics"
 import { Stack } from "@mui/material"
+import { Button } from "./StyledComponents"
 import type React from "react"
 import { useCallback, useEffect, useRef, useState } from "react"
 import World from "@/systems/World"
 import { convertThreeVector3ToJoltVec3 } from "@/util/TypeConversions"
-import { Button, LabelWithTooltip } from "./StyledComponents"
+import { LabelWithTooltip } from "./StyledComponents"
 
 // raycasting constants
 const RAY_MAX_LENGTH = 20.0
diff --git a/fission/src/ui/components/SelectMenu.tsx b/fission/src/ui/components/SelectMenu.tsx
index 4c0c9a08ec..09765a098a 100644
--- a/fission/src/ui/components/SelectMenu.tsx
+++ b/fission/src/ui/components/SelectMenu.tsx
@@ -1,8 +1,9 @@
 import { Divider, Stack } from "@mui/material"
+import { Button, IconButton } from "./StyledComponents"
 import type React from "react"
 import { useEffect, useState } from "react"
 import Label from "./Label"
-import { Button, CustomTooltip, IconButton, Spacer, SynthesisIcons } from "./StyledComponents"
+import { CustomTooltip, Spacer, SynthesisIcons } from "./StyledComponents"
 
 /** Extend this to make a type that contains custom data */
 export class SelectMenuOption {
diff --git a/fission/src/ui/components/StyledComponents.tsx b/fission/src/ui/components/StyledComponents.tsx
index 4b92d5fa5b..80da91eff9 100644
--- a/fission/src/ui/components/StyledComponents.tsx
+++ b/fission/src/ui/components/StyledComponents.tsx
@@ -1,17 +1,18 @@
 import InfoIcon from "@mui/icons-material/Info"
 import {
     Box,
-    type ButtonProps,
-    type IconButtonProps,
     Button as MuiButton,
+    type ButtonProps,
     IconButton as MuiIconButton,
+    type IconButtonProps,
+    Stack,
+    Tooltip,
     ToggleButton as MuiToggleButton,
+    type ToggleButtonProps,
     ToggleButtonGroup as MuiToggleButtonGroup,
-    Stack,
     type ToggleButtonGroupProps,
-    type ToggleButtonProps,
-    Tooltip,
 } from "@mui/material"
+import { SoundPlayer } from "@/systems/sound/SoundPlayer"
 import { AiFillWarning, AiOutlineDoubleRight, AiOutlineInfoCircle } from "react-icons/ai"
 import { BiRefresh } from "react-icons/bi"
 import { BsCodeSquare } from "react-icons/bs"
@@ -37,7 +38,6 @@ import { GiSteeringWheel } from "react-icons/gi"
 import { GrConnect } from "react-icons/gr"
 import { HiDownload } from "react-icons/hi"
 import { IoCheckmark, IoPencil, IoPeople, IoPlayOutline, IoTrashBin } from "react-icons/io5"
-import { SoundPlayer } from "@/systems/sound/SoundPlayer"
 import Label from "./Label"
 
 export class SynthesisIcons {
diff --git a/fission/src/ui/components/TransformGizmoControl.tsx b/fission/src/ui/components/TransformGizmoControl.tsx
index 43d57dd528..cc9bd2a6d8 100644
--- a/fission/src/ui/components/TransformGizmoControl.tsx
+++ b/fission/src/ui/components/TransformGizmoControl.tsx
@@ -1,10 +1,11 @@
+import { Button, ToggleButton, ToggleButtonGroup } from "./StyledComponents"
 import type React from "react"
 import { useEffect, useState } from "react"
 import * as THREE from "three"
 import InputSystem from "@/systems/input/InputSystem"
 import GizmoSceneObject, { type GizmoMode } from "@/systems/scene/GizmoSceneObject"
+
 import World from "@/systems/World"
-import { Button, ToggleButton, ToggleButtonGroup } from "./StyledComponents"
 import type TransformGizmoControlProps from "./TransformGizmoControlProps"
 
 /**
diff --git a/fission/src/ui/components/simulation/FlowControls.tsx b/fission/src/ui/components/simulation/FlowControls.tsx
index 30da1a7dc9..b7baa57455 100644
--- a/fission/src/ui/components/simulation/FlowControls.tsx
+++ b/fission/src/ui/components/simulation/FlowControls.tsx
@@ -1,8 +1,8 @@
+import { Button } from "../StyledComponents"
 import { Panel as FlowPanel, useReactFlow } from "@xyflow/react"
 import { FaPlus } from "react-icons/fa6"
 import { MdFitScreen, MdZoomInMap, MdZoomOutMap } from "react-icons/md"
 import type { FlowControlsProps } from "@/systems/simulation/SimConfigShared"
-import { Button } from "../StyledComponents"
 
 function FlowControls({ onCreateJunction }: FlowControlsProps) {
     const { zoomIn, zoomOut, fitView } = useReactFlow()
diff --git a/fission/src/ui/modals/MatchResultsModal.tsx b/fission/src/ui/modals/MatchResultsModal.tsx
index db5b34535c..fa5db71f8a 100644
--- a/fission/src/ui/modals/MatchResultsModal.tsx
+++ b/fission/src/ui/modals/MatchResultsModal.tsx
@@ -1,11 +1,11 @@
 import { Stack, styled, Typography } from "@mui/material"
+import { Button } from "../components/StyledComponents"
 import type React from "react"
 import { useEffect } from "react"
 import MatchMode from "@/systems/match_mode/MatchMode"
 import SimulationSystem from "@/systems/simulation/SimulationSystem"
 import Label from "../components/Label"
 import type { ModalImplProps } from "../components/Modal"
-import { Button } from "../components/StyledComponents"
 import { CloseType, useUIContext } from "../helpers/UIProviderHelpers"
 
 type Entry = {
diff --git a/fission/src/ui/modals/common/ConfirmModal.tsx b/fission/src/ui/modals/common/ConfirmModal.tsx
index f424fb0ca6..be180b8a3a 100644
--- a/fission/src/ui/modals/common/ConfirmModal.tsx
+++ b/fission/src/ui/modals/common/ConfirmModal.tsx
@@ -1,8 +1,8 @@
 import { Stack, Typography } from "@mui/material"
 import type React from "react"
 import { useEffect } from "react"
-import type { ModalImplProps } from "@/ui/components/Modal"
 import { useUIContext } from "@/ui/helpers/UIProviderHelpers"
+import type { ModalImplProps } from "@/ui/components/Modal"
 
 export type ConfirmModalCustomProps = {
     message: string
diff --git a/fission/src/ui/modals/configuring/RoboRIOModal.tsx b/fission/src/ui/modals/configuring/RoboRIOModal.tsx
index 32917657c3..c038437e48 100644
--- a/fission/src/ui/modals/configuring/RoboRIOModal.tsx
+++ b/fission/src/ui/modals/configuring/RoboRIOModal.tsx
@@ -1,8 +1,8 @@
 import { FormControlLabel } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import type React from "react"
 import { useEffect } from "react"
 import type { ModalImplProps } from "@/ui/components/Modal"
-import { Button } from "@/ui/components/StyledComponents"
 import { useUIContext } from "@/ui/helpers/UIProviderHelpers"
 import RCCreateDeviceModal from "./rio-config/RCCreateDeviceModal"
 
diff --git a/fission/src/ui/modals/configuring/SettingsModal.tsx b/fission/src/ui/modals/configuring/SettingsModal.tsx
index 09b26d5d03..ee1fdbc0b8 100644
--- a/fission/src/ui/modals/configuring/SettingsModal.tsx
+++ b/fission/src/ui/modals/configuring/SettingsModal.tsx
@@ -1,4 +1,5 @@
 import { Box, Stack, Tab, Tabs, TextField } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import type React from "react"
 import { useCallback, useEffect, useReducer, useState } from "react"
 import { GiPerspectiveDiceSixFacesOne } from "react-icons/gi"
@@ -11,7 +12,7 @@ import Checkbox from "@/ui/components/Checkbox"
 import Label from "@/ui/components/Label"
 import type { ModalImplProps } from "@/ui/components/Modal"
 import StatefulSlider from "@/ui/components/StatefulSlider"
-import { Button, Spacer } from "@/ui/components/StyledComponents"
+import { Spacer } from "@/ui/components/StyledComponents"
 import { useThemeContext } from "@/ui/helpers/ThemeProviderHelpers"
 import { useUIContext } from "@/ui/helpers/UIProviderHelpers"
 import { randomColor } from "@/util/Random"
diff --git a/fission/src/ui/panels/configuring/CameraSelectionPanel.tsx b/fission/src/ui/panels/configuring/CameraSelectionPanel.tsx
index c299c168cd..6978cf12a2 100644
--- a/fission/src/ui/panels/configuring/CameraSelectionPanel.tsx
+++ b/fission/src/ui/panels/configuring/CameraSelectionPanel.tsx
@@ -1,3 +1,4 @@
+import { ToggleButton, ToggleButtonGroup } from "@/ui/components/StyledComponents"
 import type React from "react"
 import { useCallback, useEffect, useState } from "react"
 import buttonPressSound from "@/assets/sound-files/ButtonPress.mp3"
@@ -6,7 +7,6 @@ import { SoundPlayer } from "@/systems/sound/SoundPlayer"
 import World from "@/systems/World"
 import Checkbox from "@/ui/components/Checkbox"
 import type { PanelImplProps } from "@/ui/components/Panel"
-import { ToggleButton, ToggleButtonGroup } from "@/ui/components/StyledComponents"
 import { useUIContext } from "@/ui/helpers/UIProviderHelpers"
 
 interface OrbitSettingsProps {
diff --git a/fission/src/ui/panels/configuring/CreateNewMatchModeConfigPanel.tsx b/fission/src/ui/panels/configuring/CreateNewMatchModeConfigPanel.tsx
index ccc77b438a..1f4643942a 100644
--- a/fission/src/ui/panels/configuring/CreateNewMatchModeConfigPanel.tsx
+++ b/fission/src/ui/panels/configuring/CreateNewMatchModeConfigPanel.tsx
@@ -1,10 +1,10 @@
-import { Box, Button, Divider, FormControlLabel, Stack, TextField, Typography } from "@mui/material"
-import { useCallback, useEffect, useState } from "react"
-import DefaultMatchModeConfigs from "@/systems/match_mode/DefaultMatchModeConfigs"
-import Checkbox from "@/ui/components/Checkbox"
 import type { PanelImplProps } from "@/ui/components/Panel"
 import { CloseType, useUIContext } from "@/ui/helpers/UIProviderHelpers"
+import { Box, TextField, FormControlLabel, Stack, Divider, Button, Typography } from "@mui/material"
+import Checkbox from "@/ui/components/Checkbox"
+import { useEffect, useState, useCallback } from "react"
 import type { MatchModeConfig } from "./MatchModeConfigPanel"
+import DefaultMatchModeConfigs from "@/systems/match_mode/DefaultMatchModeConfigs"
 import { validateAndNormalizeMatchModeConfig } from "./MatchModeConfigPanel"
 
 interface ValidationRule {
diff --git a/fission/src/ui/panels/configuring/MatchModeConfigPanel.tsx b/fission/src/ui/panels/configuring/MatchModeConfigPanel.tsx
index d3bde76d49..255980707b 100644
--- a/fission/src/ui/panels/configuring/MatchModeConfigPanel.tsx
+++ b/fission/src/ui/panels/configuring/MatchModeConfigPanel.tsx
@@ -1,4 +1,5 @@
 import { Box, Divider } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import { Stack } from "@mui/system"
 import type React from "react"
 import { type ChangeEvent, useEffect, useMemo, useRef, useState } from "react"
@@ -10,7 +11,7 @@ import Checkbox from "@/ui/components/Checkbox"
 import { globalAddToast } from "@/ui/components/GlobalUIControls"
 import Label from "@/ui/components/Label"
 import type { PanelImplProps } from "@/ui/components/Panel"
-import { Button, NegativeButton, PositiveButton, SynthesisIcons } from "@/ui/components/StyledComponents"
+import { NegativeButton, PositiveButton, SynthesisIcons } from "@/ui/components/StyledComponents"
 import { CloseType, useUIContext } from "@/ui/helpers/UIProviderHelpers"
 import CreateNewMatchModeConfigPanel from "./CreateNewMatchModeConfigPanel"
 
diff --git a/fission/src/ui/panels/configuring/assembly-config/ConfigurePanel.tsx b/fission/src/ui/panels/configuring/assembly-config/ConfigurePanel.tsx
index 4ba18a9136..7b378e1c62 100644
--- a/fission/src/ui/panels/configuring/assembly-config/ConfigurePanel.tsx
+++ b/fission/src/ui/panels/configuring/assembly-config/ConfigurePanel.tsx
@@ -1,3 +1,4 @@
+import { Button, ToggleButton, ToggleButtonGroup } from "@/ui/components/StyledComponents"
 import type React from "react"
 import { useEffect, useMemo, useRef, useState } from "react"
 import { ConfigurationSavedEvent } from "@/events/ConfigurationSavedEvent"
@@ -12,7 +13,6 @@ import type SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisB
 import World from "@/systems/World"
 import Label from "@/ui/components/Label"
 import type { PanelImplProps } from "@/ui/components/Panel"
-import { Button, ToggleButton, ToggleButtonGroup } from "@/ui/components/StyledComponents"
 import TransformGizmoControl from "@/ui/components/TransformGizmoControl"
 import { CloseType, type UIScreen, useUIContext } from "@/ui/helpers/UIProviderHelpers"
 import ChooseInputSchemePanel from "../ChooseInputSchemePanel"
diff --git a/fission/src/ui/panels/configuring/assembly-config/interfaces/AllianceSelectionInterface.tsx b/fission/src/ui/panels/configuring/assembly-config/interfaces/AllianceSelectionInterface.tsx
index 6c91f8ce93..86850585ce 100644
--- a/fission/src/ui/panels/configuring/assembly-config/interfaces/AllianceSelectionInterface.tsx
+++ b/fission/src/ui/panels/configuring/assembly-config/interfaces/AllianceSelectionInterface.tsx
@@ -1,9 +1,9 @@
 import { Box, Stack } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import { useState } from "react"
 import type MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
 import type { Alliance, Station } from "@/systems/preferences/PreferenceTypes"
 import Label from "@/ui/components/Label"
-import { Button } from "@/ui/components/StyledComponents"
 
 type AllianceSelectionInterfaceProps = {
     selectedAssembly: MirabufSceneObject
diff --git a/fission/src/ui/panels/configuring/assembly-config/interfaces/BrainSelectionInterface.tsx b/fission/src/ui/panels/configuring/assembly-config/interfaces/BrainSelectionInterface.tsx
index f61f5eb05f..b3bdf22eb8 100644
--- a/fission/src/ui/panels/configuring/assembly-config/interfaces/BrainSelectionInterface.tsx
+++ b/fission/src/ui/panels/configuring/assembly-config/interfaces/BrainSelectionInterface.tsx
@@ -1,9 +1,9 @@
+import { ToggleButton, ToggleButtonGroup } from "@/ui/components/StyledComponents"
 import { useState } from "react"
 import type MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
 import type { BrainType } from "@/systems/simulation/Brain"
 import SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
 import WPILibBrain from "@/systems/simulation/wpilib_brain/WPILibBrain"
-import { ToggleButton, ToggleButtonGroup } from "@/ui/components/StyledComponents"
 
 type BrainSelectionInterfaceProps = {
     selectedAssembly: MirabufSceneObject
diff --git a/fission/src/ui/panels/configuring/assembly-config/interfaces/ConfigureGamepiecePickupInterface.tsx b/fission/src/ui/panels/configuring/assembly-config/interfaces/ConfigureGamepiecePickupInterface.tsx
index ebe117ccca..096c4800bc 100644
--- a/fission/src/ui/panels/configuring/assembly-config/interfaces/ConfigureGamepiecePickupInterface.tsx
+++ b/fission/src/ui/panels/configuring/assembly-config/interfaces/ConfigureGamepiecePickupInterface.tsx
@@ -1,5 +1,6 @@
 import type Jolt from "@azaleacolburn/jolt-physics"
 import { Stack } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import { useCallback, useEffect, useMemo, useRef, useState } from "react"
 import * as THREE from "three"
 import SelectButton from "@/components/SelectButton"
@@ -14,7 +15,7 @@ import type GizmoSceneObject from "@/systems/scene/GizmoSceneObject"
 import World from "@/systems/World"
 import Checkbox from "@/ui/components/Checkbox"
 import StatefulSlider from "@/ui/components/StatefulSlider"
-import { Button, Spacer } from "@/ui/components/StyledComponents"
+import { Spacer } from "@/ui/components/StyledComponents"
 import TransformGizmoControl from "@/ui/components/TransformGizmoControl"
 import {
     convertArrayToThreeMatrix4,
diff --git a/fission/src/ui/panels/configuring/assembly-config/interfaces/ConfigureShotTrajectoryInterface.tsx b/fission/src/ui/panels/configuring/assembly-config/interfaces/ConfigureShotTrajectoryInterface.tsx
index baf294f235..af99277289 100644
--- a/fission/src/ui/panels/configuring/assembly-config/interfaces/ConfigureShotTrajectoryInterface.tsx
+++ b/fission/src/ui/panels/configuring/assembly-config/interfaces/ConfigureShotTrajectoryInterface.tsx
@@ -1,5 +1,6 @@
 import type Jolt from "@azaleacolburn/jolt-physics"
 import { Stack } from "@mui/material"
+import { Button, ToggleButton, ToggleButtonGroup } from "@/ui/components/StyledComponents"
 import { useCallback, useEffect, useMemo, useRef, useState } from "react"
 import * as THREE from "three"
 import SelectButton from "@/components/SelectButton"
@@ -12,7 +13,7 @@ import PreferencesSystem from "@/systems/preferences/PreferencesSystem"
 import type GizmoSceneObject from "@/systems/scene/GizmoSceneObject"
 import World from "@/systems/World"
 import StatefulSlider from "@/ui/components/StatefulSlider"
-import { Button, LabelWithTooltip, Spacer, ToggleButton, ToggleButtonGroup } from "@/ui/components/StyledComponents"
+import { LabelWithTooltip, Spacer } from "@/ui/components/StyledComponents"
 import TransformGizmoControl from "@/ui/components/TransformGizmoControl"
 import {
     convertArrayToThreeMatrix4,
diff --git a/fission/src/ui/panels/configuring/assembly-config/interfaces/SequentialBehaviorsInterface.tsx b/fission/src/ui/panels/configuring/assembly-config/interfaces/SequentialBehaviorsInterface.tsx
index 8e1c45c92e..6b1162e7ef 100644
--- a/fission/src/ui/panels/configuring/assembly-config/interfaces/SequentialBehaviorsInterface.tsx
+++ b/fission/src/ui/panels/configuring/assembly-config/interfaces/SequentialBehaviorsInterface.tsx
@@ -1,4 +1,5 @@
 import { Stack } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import type React from "react"
 import { useCallback, useEffect, useReducer, useState } from "react"
 import { ConfigurationSavedEvent } from "@/events/ConfigurationSavedEvent"
@@ -9,7 +10,7 @@ import GenericArmBehavior from "@/systems/simulation/behavior/synthesis/GenericA
 import SequenceableBehavior from "@/systems/simulation/behavior/synthesis/SequenceableBehavior"
 import type SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
 import Label from "@/ui/components/Label"
-import { Button, Spacer, SynthesisIcons } from "@/ui/components/StyledComponents"
+import { Spacer, SynthesisIcons } from "@/ui/components/StyledComponents"
 
 interface BehaviorCardProps {
     elementKey: number
diff --git a/fission/src/ui/panels/configuring/assembly-config/interfaces/SimulationInterface.tsx b/fission/src/ui/panels/configuring/assembly-config/interfaces/SimulationInterface.tsx
index c6274215ce..56beef176f 100644
--- a/fission/src/ui/panels/configuring/assembly-config/interfaces/SimulationInterface.tsx
+++ b/fission/src/ui/panels/configuring/assembly-config/interfaces/SimulationInterface.tsx
@@ -1,10 +1,10 @@
+import { Button } from "@/ui/components/StyledComponents"
 import { useState } from "react"
 import type MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
 import { setSpotlightAssembly } from "@/mirabuf/MirabufSceneObject"
 import PreferencesSystem from "@/systems/preferences/PreferencesSystem"
 import Checkbox from "@/ui/components/Checkbox"
 import type { PanelImplProps } from "@/ui/components/Panel"
-import { Button } from "@/ui/components/StyledComponents"
 import { CloseType, useUIContext } from "@/ui/helpers/UIProviderHelpers"
 import AutoTestPanel from "@/ui/panels/simulation/AutoTestPanel"
 import WiringPanel from "@/ui/panels/simulation/WiringPanel"
diff --git a/fission/src/ui/panels/configuring/assembly-config/interfaces/inputs/ConfigureSchemeInterface.tsx b/fission/src/ui/panels/configuring/assembly-config/interfaces/inputs/ConfigureSchemeInterface.tsx
index bb29178865..3111bd3244 100644
--- a/fission/src/ui/panels/configuring/assembly-config/interfaces/inputs/ConfigureSchemeInterface.tsx
+++ b/fission/src/ui/panels/configuring/assembly-config/interfaces/inputs/ConfigureSchemeInterface.tsx
@@ -1,4 +1,5 @@
 import { Divider, Stack } from "@mui/material"
+import { Button, IconButton } from "@/ui/components/StyledComponents"
 import type React from "react"
 import { useCallback, useEffect, useReducer, useRef, useState } from "react"
 import Checkbox from "@/components/Checkbox.tsx"
@@ -8,7 +9,7 @@ import type { InputScheme } from "@/systems/input/InputTypes"
 import AxisInput from "@/systems/input/inputs/AxisInput.ts"
 import type Input from "@/systems/input/inputs/Input"
 import Label from "@/ui/components/Label"
-import { Button, IconButton, SynthesisIcons } from "@/ui/components/StyledComponents"
+import { SynthesisIcons } from "@/ui/components/StyledComponents"
 import EditInputInterface from "./EditInputInterface"
 
 interface ConfigSchemeProps {
diff --git a/fission/src/ui/panels/configuring/assembly-config/interfaces/inputs/EditInputInterface.tsx b/fission/src/ui/panels/configuring/assembly-config/interfaces/inputs/EditInputInterface.tsx
index 180d67e348..79cfad08f0 100644
--- a/fission/src/ui/panels/configuring/assembly-config/interfaces/inputs/EditInputInterface.tsx
+++ b/fission/src/ui/panels/configuring/assembly-config/interfaces/inputs/EditInputInterface.tsx
@@ -1,4 +1,5 @@
 import { Box, Divider, MenuItem, Select, Stack } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import type React from "react"
 import { useEffect, useState } from "react"
 import InputSystem from "@/systems/input/InputSystem"
@@ -9,7 +10,7 @@ import type Input from "@/systems/input/inputs/Input"
 import type { KeyCode } from "@/systems/input/KeyboardTypes"
 import Checkbox from "@/ui/components/Checkbox"
 import Label from "@/ui/components/Label"
-import { Button, SynthesisIcons } from "@/ui/components/StyledComponents"
+import { SynthesisIcons } from "@/ui/components/StyledComponents"
 
 // Converts camelCase to Title Case for the inputs modal
 const toTitleCase = (camelCase: string) => {
diff --git a/fission/src/ui/panels/configuring/assembly-config/interfaces/scoring/ConfigureScoringZonesInterface.tsx b/fission/src/ui/panels/configuring/assembly-config/interfaces/scoring/ConfigureScoringZonesInterface.tsx
index fc9606106c..9b5ea175d2 100644
--- a/fission/src/ui/panels/configuring/assembly-config/interfaces/scoring/ConfigureScoringZonesInterface.tsx
+++ b/fission/src/ui/panels/configuring/assembly-config/interfaces/scoring/ConfigureScoringZonesInterface.tsx
@@ -1,4 +1,5 @@
 import { Box, Divider, Stack } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import type React from "react"
 import { useState } from "react"
 import { ConfigurationSavedEvent } from "@/events/ConfigurationSavedEvent"
@@ -6,7 +7,7 @@ import type MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
 import PreferencesSystem from "@/systems/preferences/PreferencesSystem"
 import type { ScoringZonePreferences } from "@/systems/preferences/PreferenceTypes"
 import Label from "@/ui/components/Label"
-import { Button, SynthesisIcons } from "@/ui/components/StyledComponents"
+import { SynthesisIcons } from "@/ui/components/StyledComponents"
 import ManageScoringZonesInterface from "./ManageScoringZonesInterface"
 import ZoneConfigInterface from "./ScoringZoneConfigInterface"
 
diff --git a/fission/src/ui/panels/configuring/assembly-config/interfaces/scoring/ScoringZoneConfigInterface.tsx b/fission/src/ui/panels/configuring/assembly-config/interfaces/scoring/ScoringZoneConfigInterface.tsx
index 875022fc31..065dc3a5b5 100644
--- a/fission/src/ui/panels/configuring/assembly-config/interfaces/scoring/ScoringZoneConfigInterface.tsx
+++ b/fission/src/ui/panels/configuring/assembly-config/interfaces/scoring/ScoringZoneConfigInterface.tsx
@@ -1,5 +1,6 @@
 import type Jolt from "@azaleacolburn/jolt-physics"
 import { TextField } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import { useCallback, useEffect, useMemo, useRef, useState } from "react"
 import * as THREE from "three"
 import { ConfigurationSavedEvent } from "@/events/ConfigurationSavedEvent"
@@ -13,7 +14,6 @@ import type GizmoSceneObject from "@/systems/scene/GizmoSceneObject"
 import World from "@/systems/World"
 import Checkbox from "@/ui/components/Checkbox"
 import SelectButton from "@/ui/components/SelectButton"
-import { Button } from "@/ui/components/StyledComponents"
 import TransformGizmoControl from "@/ui/components/TransformGizmoControl"
 import {
     convertArrayToThreeMatrix4,
diff --git a/fission/src/ui/panels/configuring/initial-config/InitialConfigPanel.tsx b/fission/src/ui/panels/configuring/initial-config/InitialConfigPanel.tsx
index 3f731b1bd5..aa6966bf0a 100644
--- a/fission/src/ui/panels/configuring/initial-config/InitialConfigPanel.tsx
+++ b/fission/src/ui/panels/configuring/initial-config/InitialConfigPanel.tsx
@@ -1,4 +1,5 @@
 import { Box, Stack } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import type React from "react"
 import { useCallback, useEffect, useMemo, useState } from "react"
 import { MiraType } from "@/mirabuf/MirabufLoader"
@@ -13,7 +14,6 @@ import SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
 import World from "@/systems/World"
 import Label from "@/ui/components/Label"
 import type { PanelImplProps } from "@/ui/components/Panel"
-import { Button } from "@/ui/components/StyledComponents"
 import TransformGizmoControl from "@/ui/components/TransformGizmoControl"
 import { useStateContext } from "@/ui/helpers/StateProviderHelpers"
 import { useUIContext } from "@/ui/helpers/UIProviderHelpers"
diff --git a/fission/src/ui/panels/configuring/initial-config/InputSchemeSelection.tsx b/fission/src/ui/panels/configuring/initial-config/InputSchemeSelection.tsx
index 9ca9134278..b14ff07fde 100644
--- a/fission/src/ui/panels/configuring/initial-config/InputSchemeSelection.tsx
+++ b/fission/src/ui/panels/configuring/initial-config/InputSchemeSelection.tsx
@@ -1,4 +1,5 @@
 import { Box, Divider, FormControl, InputLabel, MenuItem, Select, Stack, Tooltip } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import { type ReactElement, useCallback, useEffect, useReducer, useState } from "react"
 import InputSchemeManager from "@/systems/input/InputSchemeManager"
 import InputSystem from "@/systems/input/InputSystem"
@@ -7,7 +8,7 @@ import PreferencesSystem from "@/systems/preferences/PreferencesSystem"
 import { DriveType } from "@/systems/simulation/behavior/Behavior"
 import SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
 import Label from "@/ui/components/Label"
-import { Button, DeleteButton, EditButton, PositiveButton, SynthesisIcons } from "@/ui/components/StyledComponents"
+import { DeleteButton, EditButton, PositiveButton, SynthesisIcons } from "@/ui/components/StyledComponents"
 import { TouchControlsEvent, TouchControlsEventKeys } from "@/ui/components/TouchControls"
 import { useStateContext } from "@/ui/helpers/StateProviderHelpers"
 
diff --git a/fission/src/ui/panels/simulation/AutoTestPanel.tsx b/fission/src/ui/panels/simulation/AutoTestPanel.tsx
index 1ad1d6b7d7..bdff71fcc1 100644
--- a/fission/src/ui/panels/simulation/AutoTestPanel.tsx
+++ b/fission/src/ui/panels/simulation/AutoTestPanel.tsx
@@ -1,5 +1,6 @@
 import type Jolt from "@azaleacolburn/jolt-physics"
 import { TextField } from "@mui/material"
+import { Button, ToggleButton, ToggleButtonGroup } from "@/ui/components/StyledComponents"
 import { Stack, styled } from "@mui/system"
 import type React from "react"
 import { useCallback, useEffect, useMemo, useState } from "react"
@@ -8,10 +9,10 @@ import * as THREE from "three"
 import type MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
 import SimDriverStation from "@/systems/simulation/wpilib_brain/sim/SimDriverStation"
 import { type AllianceStation, RobotSimMode } from "@/systems/simulation/wpilib_brain/WPILibTypes"
+
 import World from "@/systems/World"
 import Label from "@/ui/components/Label"
 import type { PanelImplProps } from "@/ui/components/Panel"
-import { Button, ToggleButton, ToggleButtonGroup } from "@/ui/components/StyledComponents"
 import TransformGizmoControl from "@/ui/components/TransformGizmoControl"
 import { useUIContext } from "@/ui/helpers/UIProviderHelpers"
 import JOLT from "@/util/loading/JoltSyncLoader"
diff --git a/fission/src/ui/panels/simulation/DriverStationPanel.tsx b/fission/src/ui/panels/simulation/DriverStationPanel.tsx
index 1655b32601..23f74d54cd 100644
--- a/fission/src/ui/panels/simulation/DriverStationPanel.tsx
+++ b/fission/src/ui/panels/simulation/DriverStationPanel.tsx
@@ -1,8 +1,8 @@
 import { MenuItem, Select, Stack } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import type React from "react"
 import { useEffect, useState } from "react"
 import type { PanelImplProps } from "@/ui/components/Panel"
-import { Button } from "@/ui/components/StyledComponents"
 import { useUIContext } from "@/ui/helpers/UIProviderHelpers"
 
 const DriverStationPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) => {
diff --git a/fission/src/ui/panels/simulation/WiringPanel.tsx b/fission/src/ui/panels/simulation/WiringPanel.tsx
index baf460658d..44ba4b3b83 100644
--- a/fission/src/ui/panels/simulation/WiringPanel.tsx
+++ b/fission/src/ui/panels/simulation/WiringPanel.tsx
@@ -1,4 +1,5 @@
 import { Grid, Stack } from "@mui/material"
+import { Button } from "@/ui/components/StyledComponents"
 import {
     type Connection,
     type FinalConnectionState,
@@ -32,7 +33,6 @@ import Checkbox from "@/ui/components/Checkbox"
 import Label from "@/ui/components/Label"
 import type { PanelImplProps } from "@/ui/components/Panel"
 import ScrollView from "@/ui/components/ScrollView"
-import { Button } from "@/ui/components/StyledComponents"
 import FlowControls from "@/ui/components/simulation/FlowControls"
 import FlowInfo from "@/ui/components/simulation/FlowInfo"
 import { useUIContext } from "../../helpers/UIProviderHelpers"
diff --git a/fission/src/util/TypeConversions.ts b/fission/src/util/TypeConversions.ts
index f6b43511c4..4100cd8e35 100644
--- a/fission/src/util/TypeConversions.ts
+++ b/fission/src/util/TypeConversions.ts
@@ -1,7 +1,7 @@
 import type Jolt from "@azaleacolburn/jolt-physics"
 import type { RgbaColor } from "react-colorful"
 import * as THREE from "three"
-import type { mirabuf } from "@/proto/mirabuf"
+import type { mirabuf } from "../proto/mirabuf"
 import JOLT from "./loading/JoltSyncLoader"
 
 export function convertThreeToJoltQuat(a: THREE.Euler | THREE.Quaternion | undefined) {

From a4a7174f2ae906af6f01126d017047a1018a7c85 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zarutman+git@gmail.com>
Date: Wed, 20 Aug 2025 15:21:59 -0700
Subject: [PATCH 16/24] Update
 fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx

Co-authored-by: Julian Wright <PepperLola@users.noreply.github.com>
---
 fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
index 84d30ed22d..e9aadcc6c5 100644
--- a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
+++ b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
@@ -307,7 +307,7 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
 
             let completeCount = 0
             const totalCount = toCache.length
-            status.update(`Downloading... (0/${totalCount})}`, 0.05)
+            status.update(`Downloading... (0/${totalCount})`, 0.05)
 
             toCache.forEach(asset => {
                 MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType, asset.name, asset.hash)

From 563f0ece8dbebe8009676ec27809fee57884a8b2 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zarutman+git@gmail.com>
Date: Wed, 20 Aug 2025 16:14:39 -0700
Subject: [PATCH 17/24] Update
 fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx

Co-authored-by: Julian Wright <PepperLola@users.noreply.github.com>
---
 fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
index e9aadcc6c5..4f7aa8c0ba 100644
--- a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
+++ b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
@@ -318,7 +318,7 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
                                 status.done()
                             } else {
                                 status.update(
-                                    `Downloading... (${completeCount}/${totalCount})}`,
+                                    `Downloading... (${completeCount}/${totalCount})`,
                                     completeCount / totalCount
                                 )
                             }

From fc3bb1b21a6530f6f0bdbc3b4ffd716fd932ce97 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Wed, 20 Aug 2025 17:12:45 -0700
Subject: [PATCH 18/24] fix: prevent unit tests timing out

---
 .../src/test/mirabuf/DefaultAssets.test.ts    | 42 ++++++++-----------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/fission/src/test/mirabuf/DefaultAssets.test.ts b/fission/src/test/mirabuf/DefaultAssets.test.ts
index aee21c6e9e..29ccdeb6c6 100644
--- a/fission/src/test/mirabuf/DefaultAssets.test.ts
+++ b/fission/src/test/mirabuf/DefaultAssets.test.ts
@@ -1,14 +1,12 @@
-import { assert, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"
+import { afterAll, assert, describe, expect, test, vi } from "vitest"
 import DefaultAssetLoader from "@/mirabuf/DefaultAssetLoader.ts"
 import MirabufLoader from "@/mirabuf/MirabufLoader.ts"
 import MirabufCachingService, { MiraType } from "@/mirabuf/MirabufLoader.ts"
 
-describe("Default Asset Tests", () => {
-    beforeAll(async () => {
-        await DefaultAssetLoader.refresh()
-        vi.spyOn(console, "log").mockImplementation(() => {})
-    })
-    beforeEach(async () => {
+describe("Default Asset Tests", async () => {
+    await DefaultAssetLoader.refresh()
+    vi.spyOn(console, "log").mockImplementation(() => {})
+    afterAll(async () => {
         await MirabufLoader.removeAll()
     })
 
@@ -17,24 +15,18 @@ describe("Default Asset Tests", () => {
         expect(DefaultAssetLoader.robots.length).toBeGreaterThan(1)
     })
 
-    test("Manifest hashes match assets (fields)", async () => {
-        for (const asset of DefaultAssetLoader.fields) {
-            const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
-            assert.exists(info)
-            expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
-            expect(asset.miraType).toBe(MiraType.FIELD)
-            await MirabufCachingService.remove(info.hash)
-        }
-        expect(MirabufCachingService.getAll()).toHaveLength(0)
+    test.each(DefaultAssetLoader.fields)("Manifest hashes match assets ($name)", async asset => {
+        const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
+        assert.exists(info)
+        expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
+        expect(asset.miraType).toBe(MiraType.FIELD)
+        await MirabufCachingService.remove(info.hash)
     })
-    test("Manifest hashes match assets (robots)", async () => {
-        for (const asset of DefaultAssetLoader.robots) {
-            const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
-            assert.exists(info)
-            expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
-            expect(asset.miraType).toBe(MiraType.ROBOT)
-            await MirabufCachingService.remove(info.hash)
-        }
-        expect(MirabufCachingService.getAll()).toHaveLength(0)
+    test.each(DefaultAssetLoader.robots)("Manifest hashes match assets ($name)", async asset => {
+        const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
+        assert.exists(info)
+        expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
+        expect(asset.miraType).toBe(MiraType.ROBOT)
+        await MirabufCachingService.remove(info.hash)
     })
 })

From ef509f547a522ba5c95b2f2dc99709d3b15bda1c Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Thu, 21 Aug 2025 09:54:43 -0700
Subject: [PATCH 19/24] fix: don't run hash tests, add test for removal

---
 fission/src/mirabuf/MirabufLoader.ts          |  23 ++--
 .../src/test/mirabuf/DefaultAssets.test.ts    |  10 +-
 .../src/test/mirabuf/MirabufLoader.test.ts    | 116 +++++++-----------
 3 files changed, 58 insertions(+), 91 deletions(-)

diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index 6bce0ec5c4..47f5c75939 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -25,8 +25,6 @@ const localStorageEntryName = "MirabufAssets"
 let root: FileSystemDirectoryHandle
 let fsHandle: FileSystemDirectoryHandle
 
-export const inMemoryCache: Record<string, ArrayBuffer | undefined> = {}
-
 export const canOPFS = await (async () => {
     try {
         root = await navigator.storage.getDirectory()
@@ -159,8 +157,9 @@ class CacheMap {
 
 class MirabufCachingService {
     private static _cacheMap = new CacheMap()
-
+    private static _inMemoryCache: Record<string, ArrayBuffer | undefined> = {}
     static {
+        window.mirabuf = MirabufCachingService
         if (
             (window.localStorage.getItem(MIRABUF_LOCALSTORAGE_GENERATION_KEY) ?? "") != MIRABUF_LOCALSTORAGE_GENERATION
         ) {
@@ -340,7 +339,7 @@ class MirabufCachingService {
         try {
             const info = this._cacheMap.get(hash)
 
-            const memCache = inMemoryCache[hash]
+            const memCache = this._inMemoryCache[hash]
             if (memCache) {
                 console.log(`Retrieved ${info?.name ?? hash} from memory`)
                 return { buffer: memCache, info }
@@ -364,7 +363,7 @@ class MirabufCachingService {
                     console.warn(`Could not find ${hash} in OPFS`)
                     return undefined
                 }
-                inMemoryCache[hash] = buffer
+                this._inMemoryCache[hash] = buffer
                 console.log(`Retrieved ${info?.name ?? hash} from OPFS`)
                 return { buffer: buffer, info }
             }
@@ -388,7 +387,7 @@ class MirabufCachingService {
             const info = this._cacheMap.get(hash)
 
             this._cacheMap.remove(hash)
-            delete inMemoryCache[hash]
+            delete this._inMemoryCache[hash]
             if (canOPFS) {
                 await fsHandle.removeEntry(hash)
             }
@@ -414,19 +413,21 @@ class MirabufCachingService {
      * Removes all Mirabuf files from the caching services. Mostly for debugging purposes.
      */
     public static async removeAll() {
-        console.log("removing")
+        // remove old separated localstorage keys
+        localStorage.removeItem("Robots")
+        localStorage.removeItem("Fields")
+        localStorage.removeItem("Pieces")
         if (canOPFS) {
             // Remove old separated directories
             root.removeEntry("Robots", { recursive: true }).catch(() => {})
             root.removeEntry("Fields", { recursive: true }).catch(() => {})
             root.removeEntry("Pieces", { recursive: true }).catch(() => {})
-            localStorage.removeItem("Robots")
-            localStorage.removeItem("Fields")
-            localStorage.removeItem("Pieces")
+
             for await (const key of fsHandle.keys()) {
                 await fsHandle.removeEntry(key).catch(e => console.warn("could not remove file", key, e))
             }
         }
+        Object.keys(this._inMemoryCache).forEach(key => delete this._inMemoryCache[key])
         this._cacheMap.clear()
     }
 
@@ -450,7 +451,7 @@ class MirabufCachingService {
         try {
             const hash = await hashBuffer(buffer)
 
-            inMemoryCache[hash] = buffer
+            this._inMemoryCache[hash] = buffer
             const existing = this._cacheMap.get(hash)
             extra = { ...extra, ...existing }
 
diff --git a/fission/src/test/mirabuf/DefaultAssets.test.ts b/fission/src/test/mirabuf/DefaultAssets.test.ts
index 29ccdeb6c6..d395c7f0f3 100644
--- a/fission/src/test/mirabuf/DefaultAssets.test.ts
+++ b/fission/src/test/mirabuf/DefaultAssets.test.ts
@@ -1,28 +1,24 @@
-import { afterAll, assert, describe, expect, test, vi } from "vitest"
+import { assert, describe, expect, test, vi } from "vitest"
 import DefaultAssetLoader from "@/mirabuf/DefaultAssetLoader.ts"
-import MirabufLoader from "@/mirabuf/MirabufLoader.ts"
 import MirabufCachingService, { MiraType } from "@/mirabuf/MirabufLoader.ts"
 
 describe("Default Asset Tests", async () => {
     await DefaultAssetLoader.refresh()
     vi.spyOn(console, "log").mockImplementation(() => {})
-    afterAll(async () => {
-        await MirabufLoader.removeAll()
-    })
 
     test("Manifest loaded", () => {
         expect(DefaultAssetLoader.fields.length).toBeGreaterThan(1)
         expect(DefaultAssetLoader.robots.length).toBeGreaterThan(1)
     })
 
-    test.each(DefaultAssetLoader.fields)("Manifest hashes match assets ($name)", async asset => {
+    test.skip.each(DefaultAssetLoader.fields)("Manifest hashes match assets ($name)", async asset => {
         const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
         assert.exists(info)
         expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
         expect(asset.miraType).toBe(MiraType.FIELD)
         await MirabufCachingService.remove(info.hash)
     })
-    test.each(DefaultAssetLoader.robots)("Manifest hashes match assets ($name)", async asset => {
+    test.skip.each(DefaultAssetLoader.robots)("Manifest hashes match assets ($name)", async asset => {
         const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
         assert.exists(info)
         expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
diff --git a/fission/src/test/mirabuf/MirabufLoader.test.ts b/fission/src/test/mirabuf/MirabufLoader.test.ts
index 5e7ef4a422..1ced52ab90 100644
--- a/fission/src/test/mirabuf/MirabufLoader.test.ts
+++ b/fission/src/test/mirabuf/MirabufLoader.test.ts
@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, type MockedFunction, test, vi } from "vitest"
+import { afterEach, assert, beforeEach, describe, expect, type MockedFunction, test, vi } from "vitest"
 import MirabufLoader, { MiraType } from "../../mirabuf/MirabufLoader"
 
 vi.mock("@/systems/World", () => ({
@@ -9,75 +9,37 @@ vi.mock("@/systems/World", () => ({
     },
 }))
 
-// Polyfill btoa for Uint8Array to base64 (browser compatible, no Buffer)
-function uint8ToBase64(bytes: Uint8Array): string {
-    let binary = ""
-    for (let i = 0; i < bytes.byteLength; i++) binary += String.fromCharCode(bytes[i])
-    return btoa(binary)
-}
-
-globalThis.btoa =
-    globalThis.btoa ||
-    ((str: string) => {
-        return uint8ToBase64(new TextEncoder().encode(str))
-    })
+// // Polyfill btoa for Uint8Array to base64 (browser compatible, no Buffer)
+// function uint8ToBase64(bytes: Uint8Array): string {
+//     let binary = ""
+//     for (let i = 0; i < bytes.byteLength; i++) binary += String.fromCharCode(bytes[i])
+//     return btoa(binary)
+// }
+//
+// globalThis.btoa =
+//     globalThis.btoa ||
+//     ((str: string) => {
+//         return uint8ToBase64(new TextEncoder().encode(str))
+//     })
 
 describe("MirabufLoader", () => {
-    const originalConsoleLog = console.log
-    const originalConsoleError = console.error
-    const originalConsoleWarn = console.warn
-    const originalConsoleDebug = console.debug
-
     let fetchMock: MockedFunction<typeof fetch>
-    let originalDigest: typeof crypto.subtle.digest
     let unhandledRejectionHandler: ((event: PromiseRejectionEvent) => void) | undefined
+
+    beforeEach(() => {
+        vi.spyOn(console, "log").mockImplementation(() => {})
+        vi.spyOn(console, "warn").mockImplementation(() => {})
+        vi.spyOn(console, "error").mockImplementation(() => {})
+        vi.spyOn(console, "debug").mockImplementation(() => {})
+    })
+    afterEach(() => {
+        vi.restoreAllMocks()
+        vi.unstubAllGlobals()
+    })
     describe("Fake Fetch", () => {
         beforeEach(() => {
             fetchMock = vi.fn() as MockedFunction<typeof fetch>
             vi.stubGlobal("fetch", fetchMock)
-
-            if (!globalThis.crypto) {
-                vi.stubGlobal("crypto", { subtle: {} })
-            }
-            originalDigest = globalThis.crypto.subtle.digest
-            globalThis.crypto.subtle.digest = vi.fn(async (_alg, _data) => {
-                return new Uint8Array(32).buffer
-            }) as typeof crypto.subtle.digest
-
-            // Mock OPFS APIs (use Object.defineProperty to avoid read-only errors)
-            if (typeof navigator !== "undefined") {
-                if (!navigator.storage) {
-                    Object.defineProperty(navigator, "storage", {
-                        value: {},
-                        configurable: true,
-                    })
-                }
-                Object.defineProperty(navigator.storage, "getDirectory", {
-                    value: vi.fn(async () => ({
-                        getDirectoryHandle: vi.fn(async () => ({
-                            name: "Robots",
-                            getFileHandle: vi.fn(async () => ({
-                                createWritable: vi.fn(async () => ({
-                                    write: vi.fn(),
-                                    close: vi.fn(),
-                                })),
-                                getFile: vi.fn(async () => new Blob()),
-                                name: "0",
-                            })),
-                            keys: vi.fn(async function* () {}),
-                            removeEntry: vi.fn(),
-                            entries: vi.fn(),
-                        })),
-                    })),
-                    configurable: true,
-                })
-            }
-
-            console.log = vi.fn()
-            console.error = vi.fn()
-            console.warn = vi.fn()
-            console.debug = vi.fn()
-
             // Suppress unhandled NotFoundError rejections
             unhandledRejectionHandler = (event: PromiseRejectionEvent) => {
                 if (event.reason && event.reason.name === "NotFoundError") {
@@ -88,17 +50,6 @@ describe("MirabufLoader", () => {
         })
 
         afterEach(() => {
-            vi.restoreAllMocks()
-            vi.unstubAllGlobals()
-            if (globalThis.crypto && globalThis.crypto.subtle && originalDigest) {
-                globalThis.crypto.subtle.digest = originalDigest
-            }
-
-            console.log = originalConsoleLog
-            console.error = originalConsoleError
-            console.warn = originalConsoleWarn
-            console.debug = originalConsoleDebug
-
             if (unhandledRejectionHandler) {
                 window.removeEventListener("unhandledrejection", unhandledRejectionHandler)
             }
@@ -154,5 +105,24 @@ describe("MirabufLoader", () => {
             expect(MirabufLoader.getAll(MiraType.FIELD)).toStrictEqual([info])
             expect(MirabufLoader.getAll(MiraType.ROBOT)).toStrictEqual([])
         })
+        test("Remove All Cleans Up", async () => {
+            const field1 = await MirabufLoader.cacheRemote("/api/mira/fields/FRC Field 2023_v7.mira", MiraType.FIELD)
+            const robot1 = await MirabufLoader.cacheRemote("/api/mira/robots/Dozer_v9.mira", MiraType.ROBOT)
+            assert.exists(field1)
+            assert.exists(robot1)
+            expect(MirabufLoader.getAll()).toHaveLength(2)
+            await MirabufLoader.removeAll()
+            expect(MirabufLoader.getAll()).toHaveLength(0)
+            assert.notExists(await MirabufLoader.get(field1.hash))
+            assert.notExists(await MirabufLoader.get(robot1.hash))
+
+            const opfsRoot = await navigator.storage.getDirectory()
+            for await (const dir of opfsRoot.keys()) {
+                const handle = await opfsRoot.getDirectoryHandle(dir)
+                for await (const key of handle.keys()) {
+                    expect.fail(key, "", "Directory should be empty", "does not exist")
+                }
+            }
+        })
     })
 })

From ce6e743fa8894c03c103e86673949ff3be4e9467 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Thu, 21 Aug 2025 09:56:11 -0700
Subject: [PATCH 20/24] fix: remove debug tool

---
 fission/src/mirabuf/MirabufLoader.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
index 47f5c75939..89a58078cd 100644
--- a/fission/src/mirabuf/MirabufLoader.ts
+++ b/fission/src/mirabuf/MirabufLoader.ts
@@ -159,7 +159,6 @@ class MirabufCachingService {
     private static _cacheMap = new CacheMap()
     private static _inMemoryCache: Record<string, ArrayBuffer | undefined> = {}
     static {
-        window.mirabuf = MirabufCachingService
         if (
             (window.localStorage.getItem(MIRABUF_LOCALSTORAGE_GENERATION_KEY) ?? "") != MIRABUF_LOCALSTORAGE_GENERATION
         ) {

From 4593cd08c182ab620850fe9d4b1c9729ca5ea6e4 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Thu, 21 Aug 2025 12:30:13 -0700
Subject: [PATCH 21/24] fix: make unit tests pass

---
 fission/src/test/mirabuf/MirabufLoader.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fission/src/test/mirabuf/MirabufLoader.test.ts b/fission/src/test/mirabuf/MirabufLoader.test.ts
index 1ced52ab90..e1b624f45c 100644
--- a/fission/src/test/mirabuf/MirabufLoader.test.ts
+++ b/fission/src/test/mirabuf/MirabufLoader.test.ts
@@ -97,7 +97,7 @@ describe("MirabufLoader", () => {
             expect(info).toBeDefined()
             expect(info?.miraType).toBe(MiraType.FIELD)
             expect(info?.name).toBe("FRC Field 2023 v7")
-            expect(info?.hash).toBe("96b0d75cf3fde2c90a9b63e2497170e37b3e40")
+            expect(info?.hash).toBe("60440aa3010e1fa2f12877ae52aafbea68e81d")
             const assembly = await MirabufLoader.get(info!.hash)
             expect(assembly).toBeDefined()
             expect(assembly?.info?.name).toBe(info!.name)

From f0c87ce18076338a89cf6d1c5d991eae586bfb3d Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Thu, 21 Aug 2025 15:17:33 -0700
Subject: [PATCH 22/24] feat: add tests for assetpack as separate workflow

---
 .github/workflows/FissionUnitTest.yml         | 40 ++++++++++++++++++-
 .../src/test/mirabuf/DefaultAssets.test.ts    | 34 +++++++++-------
 .../src/test/mirabuf/MirabufLoader.test.ts    | 30 +++++---------
 .../__snapshots__/MirabufLoader.test.ts.snap  |  9 +++++
 4 files changed, 79 insertions(+), 34 deletions(-)
 create mode 100644 fission/src/test/mirabuf/__snapshots__/MirabufLoader.test.ts.snap

diff --git a/.github/workflows/FissionUnitTest.yml b/.github/workflows/FissionUnitTest.yml
index 812ca50d45..ba5fe22eb0 100644
--- a/.github/workflows/FissionUnitTest.yml
+++ b/.github/workflows/FissionUnitTest.yml
@@ -11,7 +11,7 @@ jobs:
   runUnitTests:
     name: Playwright Unit Tests
     container:
-      image: mcr.microsoft.com/playwright:v1.54.0-noble
+      image: mcr.microsoft.com/playwright:v1.55.0-noble
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -57,3 +57,41 @@ jobs:
 
       - name: Run Tests
         run: HOME=/root npm run test
+
+  runAssetpackTests:
+    name: Assetpack Tests
+    needs: runUnitTests
+    container:
+      image: mcr.microsoft.com/playwright:v1.55.0-noble
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: "fission"
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: JavaScript Setup
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Cache Unzipped Synthesis Assets
+        id: cache-assets
+        uses: actions/cache@v3
+        with:
+          path: fission/public/Downloadables
+          key: ${{ runner.os }}-assets-${{hashFiles('fission/public/assetpack.zip')}}
+
+      - name: Cache Node Dependencies
+        uses: actions/cache@v3
+        with:
+          key: "${{runner.os}}-npm-fission-${{hashFiles('fission/package.json')}}"
+          path: "fission/node_modules"
+          restore-keys: |
+            ${{runner.os}}-npm-fission-
+            ${{runner.os}}-npm
+
+      - name: Run Assetpack Tests
+        run: HOME=/root npm run test src/test/mirabuf/DefaultAssets.test.ts
+        env:
+          RUN_ASSETPACK_TESTS: true
diff --git a/fission/src/test/mirabuf/DefaultAssets.test.ts b/fission/src/test/mirabuf/DefaultAssets.test.ts
index d395c7f0f3..5d807dafed 100644
--- a/fission/src/test/mirabuf/DefaultAssets.test.ts
+++ b/fission/src/test/mirabuf/DefaultAssets.test.ts
@@ -11,18 +11,24 @@ describe("Default Asset Tests", async () => {
         expect(DefaultAssetLoader.robots.length).toBeGreaterThan(1)
     })
 
-    test.skip.each(DefaultAssetLoader.fields)("Manifest hashes match assets ($name)", async asset => {
-        const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
-        assert.exists(info)
-        expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
-        expect(asset.miraType).toBe(MiraType.FIELD)
-        await MirabufCachingService.remove(info.hash)
-    })
-    test.skip.each(DefaultAssetLoader.robots)("Manifest hashes match assets ($name)", async asset => {
-        const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
-        assert.exists(info)
-        expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
-        expect(asset.miraType).toBe(MiraType.ROBOT)
-        await MirabufCachingService.remove(info.hash)
-    })
+    test.runIf(import.meta.env.RUN_ASSETPACK_TESTS).each(DefaultAssetLoader.fields)(
+        "Manifest hashes match assets ($name)",
+        async asset => {
+            const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
+            assert.exists(info)
+            expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
+            expect(asset.miraType).toBe(MiraType.FIELD)
+            await MirabufCachingService.remove(info.hash)
+        }
+    )
+    test.runIf(import.meta.env.RUN_ASSETPACK_TESTS).each(DefaultAssetLoader.robots)(
+        "Manifest hashes match assets ($name)",
+        async asset => {
+            const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
+            assert.exists(info)
+            expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
+            expect(asset.miraType).toBe(MiraType.ROBOT)
+            await MirabufCachingService.remove(info.hash)
+        }
+    )
 })
diff --git a/fission/src/test/mirabuf/MirabufLoader.test.ts b/fission/src/test/mirabuf/MirabufLoader.test.ts
index e1b624f45c..56fd6e7dab 100644
--- a/fission/src/test/mirabuf/MirabufLoader.test.ts
+++ b/fission/src/test/mirabuf/MirabufLoader.test.ts
@@ -79,32 +79,24 @@ describe("MirabufLoader", () => {
         beforeEach(async () => {
             await MirabufLoader.removeAll()
         })
-        test("Loads Robot", async () => {
-            const info = await MirabufLoader.cacheRemote("/api/mira/robots/Dozer_v9.mira", MiraType.ROBOT)
+        const tests: [string, MiraType][] = [
+            ["/api/mira/robots/Dozer_v9.mira", MiraType.ROBOT],
+            ["/api/mira/fields/FRC Field 2023_v7.mira", MiraType.FIELD],
+        ]
+        test.for(tests)("Loads Asset ($0)", async ([url, miratype]) => {
+            const info = await MirabufLoader.cacheRemote(url, miratype)
             expect(info).toBeDefined()
-            expect(info?.miraType).toBe(MiraType.ROBOT)
-            expect(info?.name).toBe("Dozer v9")
+            expect(info?.miraType).toBe(miratype)
+            expect(info?.name).toMatchSnapshot()
+            expect(info?.hash).toMatchSnapshot()
             const assembly = await MirabufLoader.get(info!.hash)
             expect(assembly).toBeDefined()
             expect(assembly?.info?.name).toBe(info!.name)
             expect(MirabufLoader.getAll()).toStrictEqual([info])
-            expect(MirabufLoader.getAll(MiraType.ROBOT)).toStrictEqual([info])
-            expect(MirabufLoader.getAll(MiraType.FIELD)).toStrictEqual([])
+            expect(MirabufLoader.getAll(miratype)).toStrictEqual([info])
+            expect(MirabufLoader.getAll(miratype == MiraType.FIELD ? MiraType.ROBOT : MiraType.FIELD)).toStrictEqual([])
         })
 
-        test("Loads Field", async () => {
-            const info = await MirabufLoader.cacheRemote("/api/mira/fields/FRC Field 2023_v7.mira", MiraType.FIELD)
-            expect(info).toBeDefined()
-            expect(info?.miraType).toBe(MiraType.FIELD)
-            expect(info?.name).toBe("FRC Field 2023 v7")
-            expect(info?.hash).toBe("60440aa3010e1fa2f12877ae52aafbea68e81d")
-            const assembly = await MirabufLoader.get(info!.hash)
-            expect(assembly).toBeDefined()
-            expect(assembly?.info?.name).toBe(info!.name)
-            expect(MirabufLoader.getAll()).toStrictEqual([info])
-            expect(MirabufLoader.getAll(MiraType.FIELD)).toStrictEqual([info])
-            expect(MirabufLoader.getAll(MiraType.ROBOT)).toStrictEqual([])
-        })
         test("Remove All Cleans Up", async () => {
             const field1 = await MirabufLoader.cacheRemote("/api/mira/fields/FRC Field 2023_v7.mira", MiraType.FIELD)
             const robot1 = await MirabufLoader.cacheRemote("/api/mira/robots/Dozer_v9.mira", MiraType.ROBOT)
diff --git a/fission/src/test/mirabuf/__snapshots__/MirabufLoader.test.ts.snap b/fission/src/test/mirabuf/__snapshots__/MirabufLoader.test.ts.snap
new file mode 100644
index 0000000000..f85bc5ad72
--- /dev/null
+++ b/fission/src/test/mirabuf/__snapshots__/MirabufLoader.test.ts.snap
@@ -0,0 +1,9 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`MirabufLoader > Real Fetch > Loads Asset ('/api/mira/fields/FRC Field 2023_v7.mi…') 1`] = `"FRC Field 2023 v7"`;
+
+exports[`MirabufLoader > Real Fetch > Loads Asset ('/api/mira/fields/FRC Field 2023_v7.mi…') 2`] = `"60440aa3010e1fa2f12877ae52aafbea68e81d"`;
+
+exports[`MirabufLoader > Real Fetch > Loads Asset ('/api/mira/robots/Dozer_v9.mira') 1`] = `"Dozer v9"`;
+
+exports[`MirabufLoader > Real Fetch > Loads Asset ('/api/mira/robots/Dozer_v9.mira') 2`] = `"fc2094375a8373ee3782ba92ced2f7a60e697f3"`;

From 468cc8a21ec5dc4665cb0e4cd87e7733e4638f33 Mon Sep 17 00:00:00 2001
From: Zach Rutman <zarutman+git@gmail.com>
Date: Thu, 21 Aug 2025 15:20:57 -0700
Subject: [PATCH 23/24] Downgrade playwight version because github actions
 doesn't know about the new one

---
 .github/workflows/FissionUnitTest.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/FissionUnitTest.yml b/.github/workflows/FissionUnitTest.yml
index ba5fe22eb0..4c104489ca 100644
--- a/.github/workflows/FissionUnitTest.yml
+++ b/.github/workflows/FissionUnitTest.yml
@@ -11,7 +11,7 @@ jobs:
   runUnitTests:
     name: Playwright Unit Tests
     container:
-      image: mcr.microsoft.com/playwright:v1.55.0-noble
+      image: mcr.microsoft.com/playwright:v1.54.2-noble
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -62,7 +62,7 @@ jobs:
     name: Assetpack Tests
     needs: runUnitTests
     container:
-      image: mcr.microsoft.com/playwright:v1.55.0-noble
+      image: mcr.microsoft.com/playwright:v1.54.2-noble
     runs-on: ubuntu-latest
     defaults:
       run:

From b6dac0a087a74313bee8f0a7d0c46871c4c9715a Mon Sep 17 00:00:00 2001
From: Zach Rutman <zachary.rutman@autodesk.com>
Date: Thu, 21 Aug 2025 15:27:43 -0700
Subject: [PATCH 24/24] fix: make env variable be exposed

---
 .github/workflows/FissionUnitTest.yml          | 2 +-
 fission/src/test/mirabuf/DefaultAssets.test.ts | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/FissionUnitTest.yml b/.github/workflows/FissionUnitTest.yml
index 4c104489ca..7c208aca8f 100644
--- a/.github/workflows/FissionUnitTest.yml
+++ b/.github/workflows/FissionUnitTest.yml
@@ -94,4 +94,4 @@ jobs:
       - name: Run Assetpack Tests
         run: HOME=/root npm run test src/test/mirabuf/DefaultAssets.test.ts
         env:
-          RUN_ASSETPACK_TESTS: true
+          VITE_RUN_ASSETPACK_TEST: true
diff --git a/fission/src/test/mirabuf/DefaultAssets.test.ts b/fission/src/test/mirabuf/DefaultAssets.test.ts
index 5d807dafed..e3499c683e 100644
--- a/fission/src/test/mirabuf/DefaultAssets.test.ts
+++ b/fission/src/test/mirabuf/DefaultAssets.test.ts
@@ -10,8 +10,7 @@ describe("Default Asset Tests", async () => {
         expect(DefaultAssetLoader.fields.length).toBeGreaterThan(1)
         expect(DefaultAssetLoader.robots.length).toBeGreaterThan(1)
     })
-
-    test.runIf(import.meta.env.RUN_ASSETPACK_TESTS).each(DefaultAssetLoader.fields)(
+    test.runIf(import.meta.env.VITE_RUN_ASSETPACK_TEST).each(DefaultAssetLoader.fields)(
         "Manifest hashes match assets ($name)",
         async asset => {
             const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
@@ -21,7 +20,7 @@ describe("Default Asset Tests", async () => {
             await MirabufCachingService.remove(info.hash)
         }
     )
-    test.runIf(import.meta.env.RUN_ASSETPACK_TESTS).each(DefaultAssetLoader.robots)(
+    test.runIf(import.meta.env.VITE_RUN_ASSETPACK_TEST).each(DefaultAssetLoader.robots)(
         "Manifest hashes match assets ($name)",
         async asset => {
             const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)