refactor: make withPostgres/withClickHouse return pipe-compatible providers

Previously withPostgres and withClickHouse returned a Layer, requiring
callers to wrap every call site with Effect.provide(). They also accepted
(client, orgId, ...layers) which was hard to type correctly with variadic
layer arguments.

New signature: (layer, client, orgId?) => pipe-compatible function via
Effect.provide internally. Call sites can now use effect.pipe(withPostgres(...))
directly without the outer Effect.provide wrapper.

- Rename withClickHouse to the same shape as withPostgres
- Migrate all call sites in apps/web and apps/api to the new signature
- Consolidate auth functions to withPostgres instead of multiple
  Effect.provide(RepositoryLive) + Effect.provide(SqlClientLive) chains
- Switch exchangeCliSession from adminClient to scoped postgresClient
  since API key creation is org-scoped

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: geclos

apps/api/src/routes/api-keys.ts

@@ -175,7 +175,7 @@ export const createApiKeysRoutes = () => {
 
     const apiKey = await Effect.runPromise(
       generateApiKeyUseCase({ name }).pipe(
-        Effect.provide(withPostgres(c.var.postgresClient, c.var.organization.id, ApiKeyRepositoryLive)),
+        withPostgres(ApiKeyRepositoryLive, c.var.postgresClient, c.var.organization.id),
       ),
     )
     return c.json(toApiKeyResponse(apiKey), 201)
@@ -186,7 +186,7 @@ export const createApiKeysRoutes = () => {
       Effect.gen(function* () {
         const repo = yield* ApiKeyRepository
         return yield* repo.findAll()
-      }).pipe(Effect.provide(withPostgres(c.var.postgresClient, c.var.organization.id, ApiKeyRepositoryLive))),
+      }).pipe(withPostgres(ApiKeyRepositoryLive, c.var.postgresClient, c.var.organization.id)),
     )
     return c.json({ apiKeys: apiKeys.map(toApiKeyListItemResponse) }, 200)
   })
@@ -197,7 +197,7 @@ export const createApiKeysRoutes = () => {
     await Effect.runPromise(
       revokeApiKeyUseCase({ id: ApiKeyId(idParam) }).pipe(
         Effect.provideService(ApiKeyCacheInvalidator, createApiKeyCacheInvalidator(c.var.redis)),
-        Effect.provide(withPostgres(c.var.postgresClient, c.var.organization.id, ApiKeyRepositoryLive)),
+        withPostgres(ApiKeyRepositoryLive, c.var.postgresClient, c.var.organization.id),
       ),
     )
     return c.body(null, 204)

apps/api/src/routes/projects.ts

@@ -220,7 +220,7 @@ export const createProjectsRoutes = () => {
 
     const project = await Effect.runPromise(
       createProjectUseCase(input).pipe(
-        Effect.provide(withPostgres(c.var.postgresClient, c.var.organization.id, ProjectRepositoryLive)),
+        withPostgres(ProjectRepositoryLive, c.var.postgresClient, c.var.organization.id),
       ),
     )
     return c.json(toProjectResponse(project), 201)
@@ -231,7 +231,7 @@ export const createProjectsRoutes = () => {
       Effect.gen(function* () {
         const repo = yield* ProjectRepository
         return yield* repo.findAll()
-      }).pipe(Effect.provide(withPostgres(c.var.postgresClient, c.var.organization.id, ProjectRepositoryLive))),
+      }).pipe(withPostgres(ProjectRepositoryLive, c.var.postgresClient, c.var.organization.id)),
     )
 
     return c.json({ projects: projects.map(toProjectResponse) }, 200)
@@ -245,7 +245,7 @@ export const createProjectsRoutes = () => {
       Effect.gen(function* () {
         const repo = yield* ProjectRepository
         return yield* repo.findById(id)
-      }).pipe(Effect.provide(withPostgres(c.var.postgresClient, c.var.organization.id, ProjectRepositoryLive))),
+      }).pipe(withPostgres(ProjectRepositoryLive, c.var.postgresClient, c.var.organization.id)),
     )
 
     return c.json(toProjectResponse(project), 200)
@@ -261,7 +261,7 @@ export const createProjectsRoutes = () => {
         id,
         ...(body.name !== undefined ? { name: body.name } : {}),
         ...(body.description !== undefined ? { description: body.description } : {}),
-      }).pipe(Effect.provide(withPostgres(c.var.postgresClient, c.var.organization.id, ProjectRepositoryLive))),
+      }).pipe(withPostgres(ProjectRepositoryLive, c.var.postgresClient, c.var.organization.id)),
     )
 
     return c.json(toProjectResponse(updatedProject), 200)
@@ -275,7 +275,7 @@ export const createProjectsRoutes = () => {
       Effect.gen(function* () {
         const repo = yield* ProjectRepository
         return yield* repo.softDelete(id)
-      }).pipe(Effect.provide(withPostgres(c.var.postgresClient, c.var.organization.id, ProjectRepositoryLive))),
+      }).pipe(withPostgres(ProjectRepositoryLive, c.var.postgresClient, c.var.organization.id)),
     )
     return c.body(null, 204)
   })

apps/web/src/domains/api-keys/api-keys.functions.ts

@@ -38,7 +38,7 @@ export const listApiKeys = createServerFn({ method: "GET" })
       Effect.gen(function* () {
         const repo = yield* ApiKeyRepository
         return yield* repo.findAll()
-      }).pipe(Effect.provide(withPostgres(client, organizationId, ApiKeyRepositoryLive))),
+      }).pipe(withPostgres(ApiKeyRepositoryLive, client, organizationId)),
     )
 
     return apiKeys.map(toRecord)
@@ -52,9 +52,7 @@ export const createApiKey = createServerFn({ method: "POST" })
     const client = getPostgresClient()
 
     const apiKey = await Effect.runPromise(
-      generateApiKeyUseCase({ name: data.name }).pipe(
-        Effect.provide(withPostgres(client, organizationId, ApiKeyRepositoryLive)),
-      ),
+      generateApiKeyUseCase({ name: data.name }).pipe(withPostgres(ApiKeyRepositoryLive, client, organizationId)),
     )
 
     return toRecord(apiKey)
@@ -69,7 +67,7 @@ export const updateApiKey = createServerFn({ method: "POST" })
 
     const apiKey = await Effect.runPromise(
       updateApiKeyUseCase({ id: ApiKeyId(data.id), name: data.name }).pipe(
-        Effect.provide(withPostgres(client, organizationId, ApiKeyRepositoryLive)),
+        withPostgres(ApiKeyRepositoryLive, client, organizationId),
       ),
     )
 
@@ -87,6 +85,6 @@ export const deleteApiKey = createServerFn({ method: "POST" })
       Effect.gen(function* () {
         const repo = yield* ApiKeyRepository
         yield* repo.delete(ApiKeyId(data.id))
-      }).pipe(Effect.provide(withPostgres(client, organizationId, ApiKeyRepositoryLive))),
+      }).pipe(withPostgres(ApiKeyRepositoryLive, client, organizationId)),
     )
   })

apps/web/src/domains/auth/auth.functions.ts

@@ -11,14 +11,13 @@ import {
   AuthIntentRepositoryLive,
   MembershipRepositoryLive,
   OrganizationRepositoryLive,
-  SqlClientLive,
   UserRepositoryLive,
   withPostgres,
 } from "@platform/db-postgres"
 import { createServerFn } from "@tanstack/react-start"
-import { Effect } from "effect"
+import { Effect, Layer } from "effect"
 import { z } from "zod"
-import { getAdminPostgresClient, getRedisClient } from "../../server/clients.ts"
+import { getAdminPostgresClient, getPostgresClient, getRedisClient } from "../../server/clients.ts"
 import { errorHandler } from "../../server/middlewares.ts"
 import { ensureSession } from "../sessions/session.functions.ts"
 import {
@@ -39,9 +38,7 @@ export const createLoginIntent = createServerFn({ method: "POST" })
 
     const intent = await Effect.runPromise(
       createLoginIntentUseCase({ email: data.email }).pipe(
-        Effect.provide(UserRepositoryLive),
-        Effect.provide(AuthIntentRepositoryLive),
-        Effect.provide(SqlClientLive(adminClient)),
+        withPostgres(Layer.mergeAll(UserRepositoryLive, AuthIntentRepositoryLive), adminClient),
       ),
     )
 
@@ -59,11 +56,7 @@ export const createSignupIntent = createServerFn({ method: "POST" })
         name: data.name,
         email: data.email,
         organizationName: data.organizationName,
-      }).pipe(
-        Effect.provide(UserRepositoryLive),
-        Effect.provide(AuthIntentRepositoryLive),
-        Effect.provide(SqlClientLive(adminClient)),
-      ),
+      }).pipe(withPostgres(Layer.mergeAll(UserRepositoryLive, AuthIntentRepositoryLive), adminClient)),
     )
 
     return {
@@ -89,7 +82,7 @@ export const getAuthIntentInfo = createServerFn({ method: "POST" })
       Effect.gen(function* () {
         const repo = yield* AuthIntentRepository
         return yield* repo.findById(data.intentId).pipe(Effect.catchTag("NotFoundError", () => Effect.succeed(null)))
-      }).pipe(Effect.provide(AuthIntentRepositoryLive), Effect.provide(SqlClientLive(adminClient))),
+      }).pipe(withPostgres(AuthIntentRepositoryLive, adminClient)),
     )
 
     if (!intent) {
@@ -121,11 +114,15 @@ export const completeAuthIntent = createServerFn({ method: "POST" })
         intentId: data.intentId,
         session: { userId, email, name },
       }).pipe(
-        Effect.provide(AuthIntentRepositoryLive),
-        Effect.provide(MembershipRepositoryLive),
-        Effect.provide(UserRepositoryLive),
-        Effect.provide(OrganizationRepositoryLive),
-        Effect.provide(SqlClientLive(adminClient)),
+        withPostgres(
+          Layer.mergeAll(
+            AuthIntentRepositoryLive,
+            MembershipRepositoryLive,
+            UserRepositoryLive,
+            OrganizationRepositoryLive,
+          ),
+          adminClient,
+        ),
       ),
     )
   })
@@ -151,16 +148,15 @@ export const exchangeCliSession = createServerFn({ method: "POST" })
 
     const sessionData = session.session as Record<string, unknown>
     const activeOrganizationId = sessionData.activeOrganizationId as string | undefined
-
     if (!activeOrganizationId) {
       throw new Error("No active organization. Please complete your account setup first.")
     }
 
-    const adminClient = getAdminPostgresClient()
+    const client = getPostgresClient()
     const createdAt = new Date().toISOString().slice(0, 10) // YYYY-MM-DD
     const apiKey = await Effect.runPromise(
       generateApiKeyUseCase({ name: `CLI (${createdAt})` }).pipe(
-        Effect.provide(withPostgres(adminClient, OrganizationId(activeOrganizationId), ApiKeyRepositoryLive)),
+        withPostgres(ApiKeyRepositoryLive, client, OrganizationId(activeOrganizationId)),
       ),
     )
 

apps/web/src/domains/datasets/datasets.functions.ts

@@ -134,8 +134,8 @@ export const listDatasetsQuery = createServerFn({ method: "GET" })
         organizationId: orgId,
         projectId: ProjectId(data.projectId),
       }).pipe(
-        Effect.provide(withPostgres(getPostgresClient(), orgId, DatasetRepositoryLive)),
-        Effect.provide(withClickHouse(getClickhouseClient(), orgId, DatasetRowRepositoryLive)),
+        withPostgres(DatasetRepositoryLive, getPostgresClient(), orgId),
+        withClickHouse(DatasetRowRepositoryLive, getClickhouseClient(), orgId),
       ),
     )
 
@@ -166,8 +166,8 @@ export const listRowsQuery = createServerFn({ method: "GET" })
         limit: data.limit,
         offset: data.offset,
       }).pipe(
-        Effect.provide(withPostgres(getPostgresClient(), orgId, DatasetRepositoryLive)),
-        Effect.provide(withClickHouse(getClickhouseClient(), orgId, DatasetRowRepositoryLive)),
+        withPostgres(DatasetRepositoryLive, getPostgresClient(), orgId),
+        withClickHouse(DatasetRowRepositoryLive, getClickhouseClient(), orgId),
       ),
     )
 
@@ -187,8 +187,8 @@ export const createDatasetMutation = createServerFn({ method: "POST" })
         projectId: ProjectId(data.projectId),
         name: data.name,
       }).pipe(
-        Effect.provide(withPostgres(getPostgresClient(), orgId, DatasetRepositoryLive)),
-        Effect.provide(withClickHouse(getClickhouseClient(), orgId, DatasetRowRepositoryLive)),
+        withPostgres(DatasetRepositoryLive, getPostgresClient(), orgId),
+        withClickHouse(DatasetRowRepositoryLive, getClickhouseClient(), orgId),
       ),
     )
 
@@ -235,7 +235,7 @@ export const saveDatasetCsv = createServerFn({ method: "POST" })
       Effect.gen(function* () {
         const repo = yield* DatasetRepository
         return yield* repo.updateFileKey({ id: DatasetId(datasetId), fileKey })
-      }).pipe(Effect.provide(withPostgres(getPostgresClient(), orgId, DatasetRepositoryLive))),
+      }).pipe(withPostgres(DatasetRepositoryLive, getPostgresClient(), orgId)),
     )
 
     const parsed = Papa.parse<Record<string, string>>(content, { header: true, skipEmptyLines: true })
@@ -252,8 +252,8 @@ export const saveDatasetCsv = createServerFn({ method: "POST" })
         rows: mappedRows,
         source: "csv",
       }).pipe(
-        Effect.provide(withPostgres(getPostgresClient(), orgId, DatasetRepositoryLive)),
-        Effect.provide(withClickHouse(getClickhouseClient(), orgId, DatasetRowRepositoryLive)),
+        withPostgres(DatasetRepositoryLive, getPostgresClient(), orgId),
+        withClickHouse(DatasetRowRepositoryLive, getClickhouseClient(), orgId),
       ),
     )
 

apps/web/src/domains/members/members.functions.ts

@@ -8,7 +8,7 @@ import {
   withPostgres,
 } from "@platform/db-postgres"
 import { createServerFn } from "@tanstack/react-start"
-import { Effect } from "effect"
+import { Effect, Layer } from "effect"
 import { z } from "zod"
 import { requireSession } from "../../server/auth.ts"
 import { getPostgresClient } from "../../server/clients.ts"
@@ -42,7 +42,7 @@ export const listMembers = createServerFn({ method: "GET" })
         const pendingInvites = yield* intentRepo.findPendingInvitesByOrganizationId(organizationId)
 
         return [members, pendingInvites] as const
-      }).pipe(Effect.provide(withPostgres(client, organizationId, MembershipRepositoryLive, AuthIntentRepositoryLive))),
+      }).pipe(withPostgres(Layer.mergeAll(MembershipRepositoryLive, AuthIntentRepositoryLive), client, organizationId)),
     )
 
     const activeMembers: MemberRecord[] = members.map((m) => ({
@@ -86,7 +86,7 @@ export const inviteMember = createServerFn({ method: "POST" })
       Effect.gen(function* () {
         const repo = yield* OrganizationRepository
         return yield* repo.findById(organizationId)
-      }).pipe(Effect.provide(withPostgres(client, organizationId, OrganizationRepositoryLive))),
+      }).pipe(withPostgres(OrganizationRepositoryLive, client, organizationId)),
     )
     const organizationName = org.name
 
@@ -96,7 +96,7 @@ export const inviteMember = createServerFn({ method: "POST" })
         organizationId,
         organizationName,
         inviterName,
-      }).pipe(Effect.provide(withPostgres(client, organizationId, AuthIntentRepositoryLive, UserRepositoryLive))),
+      }).pipe(withPostgres(Layer.mergeAll(AuthIntentRepositoryLive, UserRepositoryLive), client, organizationId)),
     )
 
     return { intentId: intent.id }
@@ -113,6 +113,6 @@ export const removeMember = createServerFn({ method: "POST" })
       removeMemberUseCase({
         membershipId: data.membershipId,
         requestingUserId: userId,
-      }).pipe(Effect.provide(withPostgres(client, organizationId, MembershipRepositoryLive))),
+      }).pipe(withPostgres(MembershipRepositoryLive, client, organizationId)),
     )
   })

apps/web/src/domains/organizations/organizations.functions.ts

@@ -1,10 +1,5 @@
 import { MembershipRepository, OrganizationRepository } from "@domain/organizations"
-import {
-  MembershipRepositoryLive,
-  OrganizationRepositoryLive,
-  SqlClientLive,
-  withPostgres,
-} from "@platform/db-postgres"
+import { MembershipRepositoryLive, OrganizationRepositoryLive, withPostgres } from "@platform/db-postgres"
 import { createServerFn } from "@tanstack/react-start"
 import { Effect } from "effect"
 import { requireSession } from "../../server/auth.ts"
@@ -26,7 +21,7 @@ export const countUserOrganizations = createServerFn({ method: "GET" })
       Effect.gen(function* () {
         const repo = yield* MembershipRepository
         return yield* repo.findByUserId(userId)
-      }).pipe(Effect.provide(MembershipRepositoryLive), Effect.provide(SqlClientLive(adminClient))),
+      }).pipe(withPostgres(MembershipRepositoryLive, adminClient)),
     )
     return members.length
   })
@@ -41,7 +36,7 @@ export const getOrganization = createServerFn({ method: "GET" })
       Effect.gen(function* () {
         const repo = yield* OrganizationRepository
         return yield* repo.findById(organizationId)
-      }).pipe(Effect.provide(withPostgres(client, organizationId, OrganizationRepositoryLive))),
+      }).pipe(withPostgres(OrganizationRepositoryLive, client, organizationId)),
     )
     return { id: org.id, name: org.name }
   })

apps/web/src/domains/projects/projects.functions.ts

@@ -41,7 +41,7 @@ export const listProjects = createServerFn({ method: "GET" })
       Effect.gen(function* () {
         const repo = yield* ProjectRepository
         return yield* repo.findAll()
-      }).pipe(Effect.provide(withPostgres(client, organizationId, ProjectRepositoryLive))),
+      }).pipe(withPostgres(ProjectRepositoryLive, client, organizationId)),
     )
 
     return projects.map(toRecord)
@@ -59,7 +59,7 @@ export const createProject = createServerFn({ method: "POST" })
         name: data.name,
         ...(data.description !== undefined ? { description: data.description } : {}),
         createdById: UserId(userId),
-      }).pipe(Effect.provide(withPostgres(client, organizationId, ProjectRepositoryLive))),
+      }).pipe(withPostgres(ProjectRepositoryLive, client, organizationId)),
     )
 
     return toRecord(project)
@@ -83,7 +83,7 @@ export const updateProject = createServerFn({ method: "POST" })
         id: ProjectId(data.id),
         ...(data.name !== undefined ? { name: data.name } : {}),
         ...(data.description !== undefined ? { description: data.description } : {}),
-      }).pipe(Effect.provide(withPostgres(client, organizationId, ProjectRepositoryLive))),
+      }).pipe(withPostgres(ProjectRepositoryLive, client, organizationId)),
     )
 
     return toRecord(updatedProject)
@@ -100,6 +100,6 @@ export const deleteProject = createServerFn({ method: "POST" })
       Effect.gen(function* () {
         const repo = yield* ProjectRepository
         return yield* repo.softDelete(ProjectId(data.id))
-      }).pipe(Effect.provide(withPostgres(client, organizationId, ProjectRepositoryLive))),
+      }).pipe(withPostgres(ProjectRepositoryLive, client, organizationId)),
     )
   })

packages/platform/db-clickhouse/src/with-clickhouse.ts

@@ -1,23 +1,21 @@
 import type { ClickHouseClient } from "@clickhouse/client"
-import type { ChSqlClient, OrganizationId } from "@domain/shared"
-import { Layer } from "effect"
+import { OrganizationId, type OrganizationId as OrganizationIdType } from "@domain/shared"
+import { Effect, Layer } from "effect"
 import { ChSqlClientLive } from "./ch-sql-client.ts"
 
 /**
- * Bundle one or more ClickHouse repository layers with their ChSqlClient dependency.
+ * Bundle one or more ClickHouse repository layers with their ChSqlClient dependency,
+ * returning a pipe-compatible provider function.
  *
  * @example
  * ```ts
  * effect.pipe(
- *   Effect.provide(withClickHouse(chClient, orgId, DatasetRowRepositoryLive)),
+ *   withClickHouse(DatasetRowRepositoryLive, chClient, orgId),
  * )
  * ```
  */
-export const withClickHouse = (
+export const withClickHouse = <A, E, R>(
+  layer: Layer.Layer<A, E, R>,
   client: ClickHouseClient,
-  organizationId: OrganizationId,
-  // biome-ignore lint/suspicious/noExplicitAny: Layer type variance requires any for repo union
-  first: Layer.Layer<any, any, ChSqlClient>,
-  // biome-ignore lint/suspicious/noExplicitAny: Layer type variance requires any for repo union
-  ...rest: Layer.Layer<any, any, ChSqlClient>[]
-) => Layer.mergeAll(first, ...rest).pipe(Layer.provideMerge(ChSqlClientLive(client, organizationId)))
+  organizationId: OrganizationIdType = OrganizationId("system"),
+) => Effect.provide(layer.pipe(Layer.provideMerge(ChSqlClientLive(client, organizationId))))