Fall back to Postgres eventRepository for non-ClickHouse stores

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

Author: devin-ai-integration[bot]

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

@@ -6,6 +6,7 @@ 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)
@@ -254,6 +255,14 @@ 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

@@ -79,8 +79,12 @@ export async function getEventRepository(
 ): Promise<{ repository: IEventRepository; store: string }> {
   const taskEventStore = parentStore ?? (await resolveTaskEventRepositoryFlag(featureFlags));
 
-  // Support legacy Postgres store for self-hosters
-  if (taskEventStore === EVENT_STORE_TYPES.POSTGRES) {
+  // Non-ClickHouse stores (e.g. the "taskEvent" DB default for Postgres-backed
+  // runs, or the legacy "postgres" value) resolve to the Prisma event repo.
+  if (
+    taskEventStore !== EVENT_STORE_TYPES.CLICKHOUSE &&
+    taskEventStore !== EVENT_STORE_TYPES.CLICKHOUSE_V2
+  ) {
     return { repository: eventRepository, store: getTaskEventStore() };
   }