Batch hydrate normalized messages for session load

packages/ui/src/stores/instances.ts

@@ -13,7 +13,6 @@ import {
   fetchSessions,
   fetchAgents,
   fetchProviders,
-  removeSessionIndexes,
   clearInstanceDraftPrompts,
 } from "./sessions"
 import { fetchCommands, clearCommands } from "./commands"
@@ -21,6 +20,7 @@ import { preferences } from "./preferences"
 import { setSessionPendingPermission } from "./session-state"
 import { setHasInstances } from "./ui"
 import { messageStoreBus } from "./message-v2/bus"
+import { clearScrollCacheForInstance } from "../lib/scroll-cache"
 import type { MessageRecord } from "./message-v2/types"
 
 
@@ -296,7 +296,8 @@ function removeInstance(id: string) {
   }
 
   // Clean up session indexes and drafts for removed instance
-  removeSessionIndexes(id)
+  clearScrollCacheForInstance(id)
+  messageStoreBus.unregisterInstance(id)
   clearInstanceDraftPrompts(id)
 }