cardstack · IanCal · Dec 23, 2025 · Dec 23, 2025 · Dec 24, 2025 · Jan 27, 2026
diff --git a/packages/base/matrix-event.gts b/packages/base/matrix-event.gts
@@ -401,23 +401,27 @@ export interface IncrementalIndexEventContent {
   indexType: 'incremental';
   invalidations: string[];
   clientRequestId?: string | null;
+  realmURL: string;
 }
 
 interface FullIndexEventContent {
   eventName: 'index';
   indexType: 'full';
+  realmURL: string;
 }
 
 interface CopiedIndexEventContent {
   eventName: 'index';
   indexType: 'copy';
   sourceRealmURL: string;
+  realmURL: string;
 }
 
 export interface IncrementalIndexInitiationContent {
   eventName: 'index';
   indexType: 'incremental-index-initiation';
   updatedFile: string;
+  realmURL: string;
 }
 
 export type UpdateRealmEventContent =
@@ -428,18 +432,27 @@ export type UpdateRealmEventContent =
 export interface FileAddedEventContent {
   eventName: 'update';
   added: string;
+  realmURL: string;
 }
 
 export interface FileUpdatedEventContent {
   eventName: 'update';
   updated: string;
+  realmURL: string;
 }
 
 export interface FileRemovedEventContent {
   eventName: 'update';
   removed: string;
+  realmURL: string;
 }
 
+// File watcher events don't include realmURL - it gets added by the Realm
+export type FileWatcherEventContent =
+  | Omit<FileAddedEventContent, 'realmURL'>
+  | Omit<FileUpdatedEventContent, 'realmURL'>
+  | Omit<FileRemovedEventContent, 'realmURL'>;
+
 export interface StopGeneratingEvent extends BaseMatrixEvent {
   type: typeof APP_BOXEL_STOP_GENERATING_EVENT_TYPE;
 }

diff --git a/packages/billing/billing-queries.ts b/packages/billing/billing-queries.ts
@@ -138,6 +138,7 @@ export async function getUserById(
     stripeCustomerId: results[0].stripe_customer_id,
     stripeCustomerEmail: results[0].stripe_customer_email,
     matrixRegistrationToken: results[0].matrix_registration_token,
+    sessionRoomId: results[0].session_room_id ?? null,
   } as User;
 }
 
@@ -159,6 +160,7 @@ export async function getUserByStripeId(
     matrixUserId: results[0].matrix_user_id,
     stripeCustomerId: results[0].stripe_customer_id,
     matrixRegistrationToken: results[0].matrix_registration_token,
+    sessionRoomId: results[0].session_room_id ?? null,
   } as User;
 }
 
@@ -181,6 +183,7 @@ export async function getUserByMatrixUserId(
     stripeCustomerId: results[0].stripe_customer_id,
     stripeCustomerEmail: results[0].stripe_customer_email,
     matrixRegistrationToken: results[0].matrix_registration_token,
+    sessionRoomId: results[0].session_room_id ?? null,
   } as User;
 }
 

diff --git a/packages/host/app/services/matrix-service.ts b/packages/host/app/services/matrix-service.ts
@@ -1895,28 +1895,17 @@ export default class MatrixService extends Service {
         return;
       }
 
-      let realmResourceForEvent = this.realm.realmForSessionRoomId(
-        event.room_id!,
-      );
-      if (!realmResourceForEvent) {
+      const content = event.content as RealmEventContent;
+      if (!content.realmURL) {
         realmEventsLogger.debug(
-          'Ignoring realm event because no realm found',
+          'Ignoring realm event because no realm URL was provided',
           event,
         );
-      } else {
-        if (realmResourceForEvent.info?.realmUserId !== event.sender) {
-          realmEventsLogger.warn(
-            `Realm event sender ${event.sender} is not the realm user ${realmResourceForEvent.info?.realmUserId}`,
-            event,
-          );
-        }
-
-        (event.content as any).origin_server_ts = event.origin_server_ts;
-        this.messageService.relayRealmEvent(
-          realmResourceForEvent.url,
-          event.content as RealmEventContent,
-        );
+        return;
       }
+
+      (content as any).origin_server_ts = event.origin_server_ts;
+      this.messageService.relayRealmEvent(content);
     }
   }
 

diff --git a/packages/host/app/services/message-service.ts b/packages/host/app/services/message-service.ts
@@ -44,7 +44,11 @@ export default class MessageService extends Service {
     }
   }
 
-  relayRealmEvent(realmURL: string, event: RealmEventContent) {
+  relayRealmEvent(event: RealmEventContent) {
+    const realmURL = event.realmURL;
+    if (!realmURL) {
+      return;
+    }
     this.listenerCallbacks.get(realmURL)?.forEach((cb) => {
       cb(event);
     });

diff --git a/...st/config/schema/1770623937158_schema.sql → ...st/config/schema/1771264925000_schema.sql b/...st/config/schema/1770623937158_schema.sql → ...st/config/schema/1771264925000_schema.sql
diff --git a/packages/host/tests/acceptance/query-fields-test.gts b/packages/host/tests/acceptance/query-fields-test.gts
@@ -14,7 +14,7 @@ import { module, test } from 'qunit';
 
 import type { Loader } from '@cardstack/runtime-common';
 import { SupportedMimeType } from '@cardstack/runtime-common';
-import { testRealmURLToUsername } from '@cardstack/runtime-common/helpers/const';
+import { testRealmInfo } from '@cardstack/runtime-common/helpers/const';
 import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-constants';
 
 import type NetworkService from '@cardstack/host/services/network';
@@ -361,7 +361,7 @@ module(
           'no query runs while hydrating server-provided results',
         );
 
-        let realmMatrixUsername = testRealmURLToUsername(testRealmURL);
+        let realmMatrixUsername = testRealmInfo.realmUserId!;
         let realmRoomId = mockMatrixUtils.getRoomIdForRealmAndUser(
           testRealmURL,
           '@testuser:localhost',
@@ -379,6 +379,7 @@ module(
             eventName: 'index',
             indexType: 'incremental',
             invalidations: [`${testRealmURL}Person/new-match`],
+            realmURL: testRealmURL,
           },
           { type: APP_BOXEL_REALM_EVENT_TYPE },
         );
@@ -476,7 +477,7 @@ module(
         (store as any).store.sweep(cardAPI);
         await settled();
 
-        let realmMatrixUsername = testRealmURLToUsername(testRealmURL);
+        let realmMatrixUsername = testRealmInfo.realmUserId!;
         let realmRoomId = mockMatrixUtils.getRoomIdForRealmAndUser(
           testRealmURL,
           '@testuser:localhost',
@@ -494,6 +495,7 @@ module(
             eventName: 'index',
             indexType: 'incremental',
             invalidations: [`${testRealmURL}Person/new-match`],
+            realmURL: testRealmURL,
           },
           { type: APP_BOXEL_REALM_EVENT_TYPE },
         );

diff --git a/packages/host/tests/helpers/adapter.ts b/packages/host/tests/helpers/adapter.ts
@@ -28,10 +28,8 @@ import type {
 } from '@cardstack/runtime-common/realm';
 
 import type {
-  FileAddedEventContent,
-  FileUpdatedEventContent,
+  FileWatcherEventContent,
   RealmEventContent,
-  UpdateRealmEventContent,
 } from 'https://cardstack.com/base/matrix-event';
 
 import { WebMessageStream, messageCloseHandler } from './stream';
@@ -66,7 +64,7 @@ export class TestRealmAdapter implements RealmAdapter {
   #files: Dir = { kind: 'directory', contents: {} };
   #lastModified: Map<string, number> = new Map();
   #paths: RealmPaths;
-  #subscriber: ((message: UpdateRealmEventContent) => void) | undefined;
+  #subscriber: ((message: FileWatcherEventContent) => void) | undefined;
   #loader: Loader | undefined; // Will be set in the realm's constructor - needed for openFile for shimming purposes
   #ready = new Deferred<void>();
   #potentialModulesAndInstances: { content: any; url: URL }[] = [];
@@ -128,8 +126,13 @@ export class TestRealmAdapter implements RealmAdapter {
       rid.replace('test-session-room-realm-', '').startsWith(realmUrl),
     );
 
+    const eventWithRealmURL: RealmEventContent = {
+      ...event,
+      realmURL: realmUrl,
+    };
+
     for (let roomId of targetRoomIds) {
-      simulateRemoteMessage(roomId, realmMatrixUsername, event, {
+      simulateRemoteMessage(roomId, realmMatrixUsername, eventWithRealmURL, {
         type: APP_BOXEL_REALM_EVENT_TYPE,
       });
     }
@@ -308,7 +311,7 @@ export class TestRealmAdapter implements RealmAdapter {
       );
     }
 
-    let updateEvent: FileAddedEventContent | FileUpdatedEventContent;
+    let updateEvent: FileWatcherEventContent;
 
     let lastModified = unixTime(Date.now());
     this.#lastModified.set(this.#paths.fileURL(path).href, lastModified);
@@ -343,7 +346,7 @@ export class TestRealmAdapter implements RealmAdapter {
     };
   }
 
-  postUpdateEvent(data: UpdateRealmEventContent) {
+  postUpdateEvent(data: FileWatcherEventContent) {
     this.#subscriber?.(data);
   }
 
@@ -439,7 +442,7 @@ export class TestRealmAdapter implements RealmAdapter {
   }
 
   async subscribe(
-    cb: (message: UpdateRealmEventContent) => void,
+    cb: (message: FileWatcherEventContent) => void,
   ): Promise<void> {
     this.#subscriber = cb;
   }

diff --git a/packages/host/tests/helpers/index.gts b/packages/host/tests/helpers/index.gts
@@ -27,7 +27,6 @@ import {
   testHostModeRealmURL,
   testRealmInfo,
   testRealmURL,
-  testRealmURLToUsername,
   Worker,
   DEFAULT_CARD_SIZE_LIMIT_BYTES,
   type DefinitionLookup,
@@ -788,15 +787,11 @@ async function setupTestRealm({
   realm = new Realm({
     url: realmURL,
     adapter,
-    matrix: {
-      ...baseTestMatrix,
-      username: testRealmURLToUsername(realmURL),
-    },
     secretSeed: testRealmSecretSeed,
     virtualNetwork,
     dbAdapter,
     queue,
-    realmServerMatrixClient: new MatrixClient({
+    matrixClient: new MatrixClient({
       matrixURL: baseTestMatrix.url,
       username: testRealmServerMatrixUsername,
       seed: testRealmSecretSeed,

diff --git a/packages/host/tests/integration/message-service-subscription-test.gts b/packages/host/tests/integration/message-service-subscription-test.gts
@@ -10,7 +10,7 @@ import { getService } from '@universal-ember/test-support';
 import { module, test } from 'qunit';
 
 import { baseRealm } from '@cardstack/runtime-common';
-import { testRealmURLToUsername } from '@cardstack/runtime-common/helpers/const';
+import { testRealmInfo } from '@cardstack/runtime-common/helpers/const';
 import type { Loader } from '@cardstack/runtime-common/loader';
 import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-constants';
 
@@ -45,7 +45,7 @@ module('Integration | message service subscription', function (hooks) {
     autostart: true,
   });
 
-  let realmMatrixUsername = testRealmURLToUsername(testRealmURL);
+  let realmMatrixUsername = testRealmInfo.realmUserId!;
 
   let realmRoomId = mockMatrixUtils.getRoomIdForRealmAndUser(
     testRealmURL,
@@ -107,6 +107,7 @@ module('Integration | message service subscription', function (hooks) {
         eventName: 'index',
         indexType: 'incremental-index-initiation',
         updatedFile: 'index.json',
+        realmURL: testRealmURL,
       },
     });
 

diff --git a/packages/host/tests/integration/realm-test.gts b/packages/host/tests/integration/realm-test.gts
@@ -385,7 +385,7 @@ module('Integration | realm', function (hooks) {
               backgroundURL:
                 'https://i.postimg.cc/tgRHRV8C/pawel-czerwinski-h-Nrd99q5pe-I-unsplash.jpg',
               iconURL: 'https://boxel-images.boxel.ai/icons/cardstack.png',
-              realmUserId: '@test_realm:localhost',
+              realmUserId: '@realm_server:localhost',
               showAsCatalog: null,
               visibility: 'public',
               publishable: null,
@@ -3288,7 +3288,7 @@ module('Integration | realm', function (hooks) {
               backgroundURL:
                 'https://i.postimg.cc/tgRHRV8C/pawel-czerwinski-h-Nrd99q5pe-I-unsplash.jpg',
               iconURL: 'https://boxel-images.boxel.ai/icons/cardstack.png',
-              realmUserId: '@test_realm:localhost',
+              realmUserId: '@realm_server:localhost',
               showAsCatalog: null,
               visibility: 'public',
               publishable: null,
@@ -3575,7 +3575,7 @@ posts/ignore-me.gts
             name: 'Example Workspace',
             backgroundURL: 'https://example-background-url.com',
             iconURL: 'https://example-icon-url.com',
-            realmUserId: '@realm/test-realm-test:localhost',
+            realmUserId: '@realm_server:localhost',
             showAsCatalog: null,
             visibility: 'public',
             publishable: null,

diff --git a/packages/matrix/helpers/index.ts b/packages/matrix/helpers/index.ts
@@ -120,31 +120,6 @@ export async function setRealmRedirects(page: Page) {
 }
 
 export async function registerRealmUsers(synapse: SynapseInstance) {
-  await registerUser(
-    synapse,
-    'base_realm',
-    await realmPassword('base_realm', realmSecretSeed),
-  );
-  await registerUser(
-    synapse,
-    'experiments_realm',
-    await realmPassword('experiments_realm', realmSecretSeed),
-  );
-  await registerUser(
-    synapse,
-    'catalog_realm',
-    await realmPassword('catalog_realm', realmSecretSeed),
-  );
-  await registerUser(
-    synapse,
-    'skills_realm',
-    await realmPassword('skills_realm', realmSecretSeed),
-  );
-  await registerUser(
-    synapse,
-    'test_realm',
-    await realmPassword('test_realm', realmSecretSeed),
-  );
   await registerUser(
     synapse,
     'node-test_realm',

diff --git a/packages/matrix/tests/messages.spec.ts b/packages/matrix/tests/messages.spec.ts
@@ -359,7 +359,7 @@ test.describe('Room messages', () => {
     await expect(
       page.locator(`[data-test-attached-card="${appURL}/hassan"]`),
     ).toHaveCount(1);
-    await expect(page.locator(`[data-test-attached-file]`)).toHaveCount(1);
+    await expect(page.locator(`[data-test-attached-file]`)).toHaveCount(2);
     await expect(
       page.locator(`[data-test-attached-file="${appURL}/person.gts"]`),
     ).toHaveCount(1);

diff --git a/packages/postgres/migrations/1771264925000_move-session-room-to-users.js b/packages/postgres/migrations/1771264925000_move-session-room-to-users.js
@@ -0,0 +1,19 @@
+exports.up = (pgm) => {
+  pgm.addColumns('users', {
+    session_room_id: { type: 'varchar' },
+  });
+
+  pgm.sql(`
+    UPDATE users
+    SET session_room_id = sr.room_id
+    FROM session_rooms sr
+    WHERE users.matrix_user_id = sr.matrix_user_id
+      AND sr.realm_url = '__realm-server__'
+  `);
+
+  pgm.dropTable('session_rooms');
+};
+
+exports.down = (pgm) => {
+  pgm.dropColumns('users', ['session_room_id']);
+};