Merge branch 'dev' into feat/ip-filtering

server/private/routers/eventStreamingDestination/createEventStreamingDestination.ts

@@ -37,7 +37,8 @@ const bodySchema = z.strictObject({
     sendConnectionLogs: z.boolean().optional().default(false),
     sendRequestLogs: z.boolean().optional().default(false),
     sendActionLogs: z.boolean().optional().default(false),
-    sendAccessLogs: z.boolean().optional().default(false)
+    sendAccessLogs: z.boolean().optional().default(false),
+    sendAISessionLogs: z.boolean().optional().default(false)
 });
 
 export type CreateEventStreamingDestinationResponse = {
@@ -122,7 +123,8 @@ export async function createEventStreamingDestination(
                 sendAccessLogs: parsedBody.data.sendAccessLogs,
                 sendActionLogs: parsedBody.data.sendActionLogs,
                 sendConnectionLogs: parsedBody.data.sendConnectionLogs,
-                sendRequestLogs: parsedBody.data.sendRequestLogs
+                sendRequestLogs: parsedBody.data.sendRequestLogs,
+                sendAISessionLogs: parsedBody.data.sendAISessionLogs
             })
             .returning();
 

server/private/routers/eventStreamingDestination/listEventStreamingDestinations.ts

@@ -60,6 +60,7 @@ export type ListEventStreamingDestinationsResponse = {
         sendRequestLogs: boolean;
         sendActionLogs: boolean;
         sendAccessLogs: boolean;
+        sendAISessionLogs: boolean;
     }[];
     pagination: {
         total: number;
@@ -83,7 +84,8 @@ const ListEventStreamingDestinationsResponseDataSchema = z.object({
             sendConnectionLogs: z.boolean(),
             sendRequestLogs: z.boolean(),
             sendActionLogs: z.boolean(),
-            sendAccessLogs: z.boolean()
+            sendAccessLogs: z.boolean(),
+            sendAISessionLogs: z.boolean()
         })
     ),
     pagination: z.object({

server/private/routers/eventStreamingDestination/updateEventStreamingDestination.ts

@@ -40,7 +40,8 @@ const bodySchema = z.strictObject({
     sendConnectionLogs: z.boolean().optional(),
     sendRequestLogs: z.boolean().optional(),
     sendActionLogs: z.boolean().optional(),
-    sendAccessLogs: z.boolean().optional()
+    sendAccessLogs: z.boolean().optional(),
+    sendAISessionLogs: z.boolean().optional()
 });
 
 export type UpdateEventStreamingDestinationResponse = {
@@ -125,7 +126,7 @@ export async function updateEventStreamingDestination(
             );
         }
 
-        const { type, config: configToUpdate, enabled, sendAccessLogs, sendActionLogs, sendConnectionLogs, sendRequestLogs } = parsedBody.data;
+        const { type, config: configToUpdate, enabled, sendAccessLogs, sendActionLogs, sendConnectionLogs, sendRequestLogs, sendAISessionLogs } = parsedBody.data;
 
         const updateData: Record<string, unknown> = {
             updatedAt: Date.now()
@@ -141,6 +142,7 @@ export async function updateEventStreamingDestination(
         if (sendActionLogs !== undefined) updateData.sendActionLogs = sendActionLogs;
         if (sendConnectionLogs !== undefined) updateData.sendConnectionLogs = sendConnectionLogs;
         if (sendRequestLogs !== undefined) updateData.sendRequestLogs = sendRequestLogs;
+        if (sendAISessionLogs !== undefined) updateData.sendAISessionLogs = sendAISessionLogs;
 
         await db
             .update(eventStreamingDestinations)

server/private/routers/remoteExitNode/createRemoteExitNode.ts

@@ -191,13 +191,20 @@ export async function createRemoteExitNode(
 
         // If this remote exit node isn't already backing an exit node in
         // another org, we're about to create a brand new one. Reserve a
-        // subnet for it up front so the allocation lock is held across the
-        // whole insert - this guarantees exit node subnets never overlap,
-        // even under concurrent creation, which matters for HA setups.
+        // subnet for it up front, scoped to this org's existing exit nodes,
+        // so the allocation lock is held across the whole insert - this
+        // guarantees exit node subnets never overlap within the org, even
+        // under concurrent creation, which matters for HA setups. Subnets
+        // may still be reused across different orgs; there isn't enough
+        // address space to avoid that, and it isn't necessary since HA only
+        // routes multiple exit nodes for the same org.
         let releaseSubnetLock: (() => Promise<void>) | null = null;
         let newExitNodeAddress: string | null = null;
         if (!existingExitNode) {
-            const { value, release } = await getNextAvailableSubnet();
+            const { value, release } = await getNextAvailableSubnet(
+                db,
+                orgId
+            );
             newExitNodeAddress = value;
             releaseSubnetLock = release;
         }