Move Postgres event repository fallback out of ClickHouse factory

The factory should not import eventRepository.server.ts — doing so pulls
the tracePubSub singleton into any module graph that imports the factory,
which eagerly connects to Redis at module load time (see singleton.ts).

The fallback now lives in index.server.ts via getEventRepositoryForStore,
which is called from RunPresenter, SpanPresenter, and recordRunEvent.
This restores runsReplicationBenchmark.test.ts's module isolation while
still handling non-ClickHouse ("taskEvent"/"postgres") stores.

Co-Authored-By: Matt Aitken <matt@mattaitken.com>

Author: devin-ai-integration[bot]

apps/webapp/app/presenters/v3/RunPresenter.server.ts

@@ -7,7 +7,7 @@ import { SpanSummary } from "~/v3/eventRepository/eventRepository.types";
 import { getTaskEventStoreTableForRun } from "~/v3/taskEventStore.server";
 import { isFinalRunStatus } from "~/v3/taskStatus";
 import { env } from "~/env.server";
-import { clickhouseFactory } from "~/services/clickhouse/clickhouseFactory.server";
+import { getEventRepositoryForStore } from "~/v3/eventRepository/index.server";
 
 type Result = Awaited<ReturnType<RunPresenter["call"]>>;
 export type Run = Result["run"];
@@ -145,7 +145,7 @@ export class RunPresenter {
       };
     }
 
-    const { repository } = await clickhouseFactory.getEventRepositoryForOrganization(
+    const repository = await getEventRepositoryForStore(
       run.taskEventStore,
       run.runtimeEnvironment.organizationId
     );

apps/webapp/app/presenters/v3/SpanPresenter.server.ts

@@ -29,7 +29,7 @@ import {
   extractAIToolCallData,
   extractAIEmbedData,
 } from "~/components/runs/v3/ai";
-import { clickhouseFactory } from "~/services/clickhouse/clickhouseFactory.server";
+import { getEventRepositoryForStore } from "~/v3/eventRepository/index.server";
 
 export type PromptSpanData = {
   slug: string;
@@ -130,7 +130,7 @@ export class SpanPresenter extends BasePresenter {
 
     const { traceId } = parentRun;
 
-    const { repository } = await clickhouseFactory.getEventRepositoryForOrganization(
+    const repository = await getEventRepositoryForStore(
       parentRun.taskEventStore,
       project.organizationId
     );

apps/webapp/app/services/clickhouse/clickhouseFactory.server.ts

@@ -6,7 +6,6 @@ import { singleton } from "~/utils/singleton";
 import { organizationDataStoresRegistry } from "~/services/dataStores/organizationDataStoresRegistryInstance.server";
 import type { OrganizationDataStoresRegistry } from "~/services/dataStores/organizationDataStoresRegistry.server";
 import { type IEventRepository } from "~/v3/eventRepository/eventRepository.types";
-import { eventRepository as postgresEventRepository } from "~/v3/eventRepository/eventRepository.server";
 
 // ---------------------------------------------------------------------------
 // Default clients (singleton per process)
@@ -255,14 +254,6 @@ export class ClickhouseFactory {
     store: string,
     organizationId: string
   ): { key: string; repository: IEventRepository } {
-    // Non-ClickHouse stores (e.g. the "taskEvent" DB default for Postgres-backed
-    // runs, or "postgres") fall back to the Prisma event repository. This lets
-    // callers pass `run.taskEventStore` directly without needing to guard
-    // against legacy/Postgres values.
-    if (store !== "clickhouse" && store !== "clickhouse_v2") {
-      return { key: `postgres:${store}`, repository: postgresEventRepository };
-    }
-
     const dataStore = this._registry.get(organizationId, "CLICKHOUSE");
 
     if (!dataStore) {

apps/webapp/app/v3/eventRepository/index.server.ts

@@ -32,6 +32,27 @@ export function resolveEventRepositoryForStore(
   return eventRepository;
 }
 
+/**
+ * Async variant of {@link resolveEventRepositoryForStore}. Awaits the factory's
+ * registry readiness before returning the ClickHouse event repository; for
+ * non-ClickHouse stores (e.g. the "taskEvent" DB default for Postgres-backed
+ * runs) it returns the Prisma event repository without ever touching the
+ * factory — so the factory never needs to know about Postgres.
+ */
+export async function getEventRepositoryForStore(
+  store: string,
+  organizationId: string
+): Promise<IEventRepository> {
+  if (store !== EVENT_STORE_TYPES.CLICKHOUSE && store !== EVENT_STORE_TYPES.CLICKHOUSE_V2) {
+    return eventRepository;
+  }
+  const { repository } = await clickhouseFactory.getEventRepositoryForOrganization(
+    store,
+    organizationId
+  );
+  return repository;
+}
+
 export async function getConfiguredEventRepository(
   organizationId: string
 ): Promise<{ repository: IEventRepository; store: EventStoreType }> {
@@ -219,11 +240,10 @@ async function recordRunEvent(
       };
     }
 
-    const { repository: $eventRepository } =
-      await clickhouseFactory.getEventRepositoryForOrganization(
-        foundRun.taskEventStore,
-        foundRun.runtimeEnvironment.organizationId
-      );
+    const $eventRepository = await getEventRepositoryForStore(
+      foundRun.taskEventStore,
+      foundRun.runtimeEnvironment.organizationId
+    );
 
     const { attributes, startTime, ...optionsRest } = options;