Fix CI: stale clickhouseInstance imports + Devin events-default routing

CI failures on the previous push had two causes:

1. Three files (AgentListPresenter, sessions list route, api.v1.sessions) still
   imported clickhouseClient from ~/services/clickhouseInstance.server, a path
   that was deleted by the initial commit of this branch. They came in via the
   recent merge from main and broke typecheck + e2e on production webapp boot.
   All three now resolve their ClickHouse client per-call via clickhouseFactory
   (async, awaits factory.isReady()), matching the pattern used elsewhere in
   the PR for non-hot-path callers.

2. getClickhouseForOrganizationSync's default branch grouped 'standard' and
   'events' together to return defaultClickhouseClient — but 'events' should
   resolve to defaultEventsClickhouseClient (EVENTS_CLICKHOUSE_URL singleton).
   The bug was unreachable today because the only caller of the events default
   path resolves via getEventsClickhouseClient() directly, but the API contract
   is now correct for any future caller. Flagged by Devin Review.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: matt-aitken

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

@@ -3,10 +3,10 @@ import {
   type RuntimeEnvironmentType,
   type TaskTriggerSource,
 } from "@trigger.dev/database";
-import { ClickHouse } from "@internal/clickhouse";
+import { type ClickHouse } from "@internal/clickhouse";
 import { z } from "zod";
 import { $replica } from "~/db.server";
-import { clickhouseClient } from "~/services/clickhouseInstance.server";
+import { clickhouseFactory } from "~/services/clickhouse/clickhouseFactoryInstance.server";
 import { singleton } from "~/utils/singleton";
 import { findCurrentWorkerFromEnvironment } from "~/v3/models/workerDeployment.server";
 
@@ -24,10 +24,7 @@ export type AgentActiveState = {
 };
 
 export class AgentListPresenter {
-  constructor(
-    private readonly clickhouse: ClickHouse,
-    private readonly _replica: PrismaClientOrTransaction
-  ) {}
+  constructor(private readonly _replica: PrismaClientOrTransaction) {}
 
   public async call({
     organizationId,
@@ -40,6 +37,11 @@ export class AgentListPresenter {
     environmentId: string;
     environmentType: RuntimeEnvironmentType;
   }) {
+    const clickhouse = await clickhouseFactory.getClickhouseForOrganization(
+      organizationId,
+      "standard"
+    );
+
     const currentWorker = await findCurrentWorkerFromEnvironment(
       {
         id: environmentId,
@@ -89,20 +91,21 @@ export class AgentListPresenter {
     }
 
     // All queries are deferred for streaming
-    const activeStates = this.#getActiveStates(environmentId, slugs);
-    const conversationSparklines = this.#getConversationSparklines(environmentId, slugs);
-    const costSparklines = this.#getCostSparklines(environmentId, slugs);
-    const tokenSparklines = this.#getTokenSparklines(environmentId, slugs);
+    const activeStates = this.#getActiveStates(clickhouse, environmentId, slugs);
+    const conversationSparklines = this.#getConversationSparklines(clickhouse, environmentId, slugs);
+    const costSparklines = this.#getCostSparklines(clickhouse, environmentId, slugs);
+    const tokenSparklines = this.#getTokenSparklines(clickhouse, environmentId, slugs);
 
     return { agents, activeStates, conversationSparklines, costSparklines, tokenSparklines };
   }
 
   /** Count runs currently executing vs suspended per agent */
   async #getActiveStates(
+    clickhouse: ClickHouse,
     environmentId: string,
     slugs: string[]
   ): Promise<Record<string, AgentActiveState>> {
-    const queryFn = this.clickhouse.reader.query({
+    const queryFn = clickhouse.reader.query({
       name: "agentActiveStates",
       query: `SELECT
           task_identifier,
@@ -140,10 +143,11 @@ export class AgentListPresenter {
 
   /** 24h hourly sparkline of conversation (run) count per agent */
   async #getConversationSparklines(
+    clickhouse: ClickHouse,
     environmentId: string,
     slugs: string[]
   ): Promise<Record<string, number[]>> {
-    const queryFn = this.clickhouse.reader.query({
+    const queryFn = clickhouse.reader.query({
       name: "agentConversationSparklines",
       query: `SELECT
           task_identifier,
@@ -172,10 +176,11 @@ export class AgentListPresenter {
 
   /** 24h hourly sparkline of LLM cost per agent */
   async #getCostSparklines(
+    clickhouse: ClickHouse,
     environmentId: string,
     slugs: string[]
   ): Promise<Record<string, number[]>> {
-    const queryFn = this.clickhouse.reader.query({
+    const queryFn = clickhouse.reader.query({
       name: "agentCostSparklines",
       query: `SELECT
           task_identifier,
@@ -203,10 +208,11 @@ export class AgentListPresenter {
 
   /** 24h hourly sparkline of total tokens per agent */
   async #getTokenSparklines(
+    clickhouse: ClickHouse,
     environmentId: string,
     slugs: string[]
   ): Promise<Record<string, number[]>> {
-    const queryFn = this.clickhouse.reader.query({
+    const queryFn = clickhouse.reader.query({
       name: "agentTokenSparklines",
       query: `SELECT
           task_identifier,
@@ -284,5 +290,5 @@ export class AgentListPresenter {
 export const agentListPresenter = singleton("agentListPresenter", setupAgentListPresenter);
 
 function setupAgentListPresenter() {
-  return new AgentListPresenter(clickhouseClient, $replica);
+  return new AgentListPresenter($replica);
 }

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.sessions._index/route.tsx

@@ -16,7 +16,7 @@ import { findProjectBySlug } from "~/models/project.server";
 import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
 import { getSessionFiltersFromRequest } from "~/presenters/SessionFilters.server";
 import { SessionListPresenter } from "~/presenters/v3/SessionListPresenter.server";
-import { clickhouseClient } from "~/services/clickhouseInstance.server";
+import { clickhouseFactory } from "~/services/clickhouse/clickhouseFactoryInstance.server";
 import { requireUserId } from "~/services/session.server";
 import { docsPath, EnvironmentParamSchema } from "~/utils/pathBuilder";
 import { throwNotFound } from "~/utils/httpErrors";
@@ -45,7 +45,11 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 
   const filters = getSessionFiltersFromRequest(request);
 
-  const presenter = new SessionListPresenter($replica, clickhouseClient);
+  const clickhouse = await clickhouseFactory.getClickhouseForOrganization(
+    project.organizationId,
+    "standard"
+  );
+  const presenter = new SessionListPresenter($replica, clickhouse);
   const list = await presenter.call(project.organizationId, environment.id, {
     userId,
     projectId: project.id,

apps/webapp/app/routes/api.v1.sessions.ts

@@ -10,7 +10,7 @@ import {
 import { SessionId } from "@trigger.dev/core/v3/isomorphic";
 import type { Prisma, Session } from "@trigger.dev/database";
 import { $replica, prisma, type PrismaClient } from "~/db.server";
-import { clickhouseClient } from "~/services/clickhouseInstance.server";
+import { clickhouseFactory } from "~/services/clickhouse/clickhouseFactoryInstance.server";
 import { logger } from "~/services/logger.server";
 import { mintSessionToken } from "~/services/realtime/mintSessionToken.server";
 import {
@@ -58,8 +58,12 @@ export const loader = createLoaderApiRoute(
     findResource: async () => 1,
   },
   async ({ searchParams, authentication }) => {
+    const clickhouse = await clickhouseFactory.getClickhouseForOrganization(
+      authentication.environment.organizationId,
+      "standard"
+    );
     const repository = new SessionsRepository({
-      clickhouse: clickhouseClient,
+      clickhouse,
       prisma: $replica as PrismaClient,
     });
 

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

@@ -338,8 +338,9 @@ export class ClickhouseFactory {
     if (!dataStore) {
       switch (clientType) {
         case "standard":
-        case "events":
           return defaultClickhouseClient;
+        case "events":
+          return defaultEventsClickhouseClient;
         case "replication":
           return defaultRunsReplicationClickhouseClient;
         case "sessions_replication":