From 13581110e20cf67c9d9d0c92eecfdd64d7c61080 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Wed, 8 Jul 2026 17:20:55 +0000
Subject: [PATCH] fix: resolve CLI Auth active-session emails from
 ContactChannel

ProjectUser has no primaryEmail column; the active_cli_users query
selected a nonexistent column, causing the endpoint to 500 whenever an
active CLI session existed. Join ContactChannel (type=EMAIL, isPrimary)
to fetch the primary email instead.

Co-Authored-By: Konstantin Wohlwend <n2d4xc@gmail.com>
---
 .../api/latest/internal/cli-auth/route.tsx    | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/apps/backend/src/app/api/latest/internal/cli-auth/route.tsx b/apps/backend/src/app/api/latest/internal/cli-auth/route.tsx
index 6a4b85deb..6cab88c15 100644
--- a/apps/backend/src/app/api/latest/internal/cli-auth/route.tsx
+++ b/apps/backend/src/app/api/latest/internal/cli-auth/route.tsx
@@ -184,14 +184,22 @@ export const GET = createSmartRouteHandler({
       if (activeTokens.length > 0) {
         // Fetch user info for the active tokens
         const userIds = [...new Set(activeTokens.map((t) => t.projectUserId))];
+        // ProjectUser has no email column; the primary email lives in ContactChannel
+        // (type = EMAIL, isPrimary = TRUE). isPrimary/type are Postgres enums, so we
+        // cast to text for a schema-agnostic comparison.
         const userRows = await prisma.$replica().$queryRaw<ProjectUserRow[]>(Prisma.sql`
           SELECT
-            "projectUserId",
-            "displayName",
-            "primaryEmail"
-          FROM ${sqlQuoteIdent(schema)}."ProjectUser"
-          WHERE "tenancyId" = ${tenancy.id}::UUID
-            AND "projectUserId" = ANY(${userIds}::UUID[])
+            pu."projectUserId",
+            pu."displayName",
+            cc."value" AS "primaryEmail"
+          FROM ${sqlQuoteIdent(schema)}."ProjectUser" pu
+          LEFT JOIN ${sqlQuoteIdent(schema)}."ContactChannel" cc
+            ON cc."tenancyId" = pu."tenancyId"
+            AND cc."projectUserId" = pu."projectUserId"
+            AND cc."type"::text = 'EMAIL'
+            AND cc."isPrimary"::text = 'TRUE'
+          WHERE pu."tenancyId" = ${tenancy.id}::UUID
+            AND pu."projectUserId" = ANY(${userIds}::UUID[])
         `);
         const userMap = new Map(userRows.map((u) => [u.projectUserId, u]));