From 99ce2341189e8eb7503fdec4504bf6b0b8721994 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Wed, 24 Jun 2026 23:28:57 -0400
Subject: [PATCH] refactor(schema): share server event assembly

---
 packages/schema/src/event-manifest.ts | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/schema/src/event-manifest.ts b/packages/schema/src/event-manifest.ts
index bf530f7e1d..4c69b46063 100644
--- a/packages/schema/src/event-manifest.ts
+++ b/packages/schema/src/event-manifest.ts
@@ -54,19 +54,16 @@ const featureDefinitions = Event.inventory(
   ...Question.Event.Definitions,
 )
 
-export const CurrentServerDefinitions = Event.inventory(
-  ...foundationDefinitions,
-  ...currentCoreDefinitions,
-  ...featureDefinitions,
-  ...SessionTodo.Event.Definitions,
-)
+const serverDefinitions = (coreDefinitions: ReadonlyArray<Event.Definition>) =>
+  Event.inventory(
+    ...foundationDefinitions,
+    ...coreDefinitions,
+    ...featureDefinitions,
+    ...SessionTodo.Event.Definitions,
+  )
 
-export const ServerDefinitions = Event.inventory(
-  ...foundationDefinitions,
-  ...compatibilityCoreDefinitions,
-  ...featureDefinitions,
-  ...SessionTodo.Event.Definitions,
-)
+export const CurrentServerDefinitions = serverDefinitions(currentCoreDefinitions)
+export const ServerDefinitions = serverDefinitions(compatibilityCoreDefinitions)
 
 export const Definitions = Event.inventory(
   ...foundationDefinitions,