@rudderhq/server 0.7.24-canary.21 → 0.7.24-canary.22

package/dist/services/chats.js

@@ -3,6 +3,7 @@ import { parseShortRef, sanitizeChatStructuredPayload } from "@rudderhq/shared";
 import { withChatTranscriptGenerationProvenance } from "@rudderhq/shared/chat-transcript-provenance";
 import { and, asc, desc, eq, gt, inArray, isNotNull, isNull, lt, lte, or, sql } from "drizzle-orm";
 import { randomUUID } from "node:crypto";
+import { isDeepStrictEqual } from "node:util";
 import { conflict, HttpError, notFound, unprocessable } from "../errors.js";
 import { logActivity } from "./activity-log.js";
 import { agentService } from "./agents.js";
@@ -11,6 +12,7 @@ import { ensureChatFamilyGroup } from "./chat-family-groups.js";
 import { chatGenerationProtocolService } from "./chat-generation-protocol.js";
 import { validateCanonicalChatInlineAnnotations } from "./chat-inline-annotation-validation.js";
 import { selectedChatMessageBranchCondition } from "./chat-message-branch.js";
+import { createChatOrganizationBrandingService } from "./chat-organization-branding.js";
 import { hydrateQueuedMessage, materializeQueuedUserMessage, normalizeQueuedMessagePayload, QUEUED_ANNOTATION_ASSETS_KEY, queuedAnnotationAssetState, queuedMessageMutationFingerprint, withQueuedAnnotationAssetState, } from "./chat-queued-message-materialization.js";
 import { compareChatGenerationSelection, listChatGenerationTranscripts, listDetachedChatTranscripts, listDetachedChatTranscriptSummaries, loadChatTranscripts, replaceDetachedChatTranscript, selectChatTranscript, transcriptSummaryFromSources, } from "./chat-transcript-persistence.js";
 import { createChatAnnotationMessagePersistence, createChatMessageMutationLookup } from "./chats.annotation-persistence.js";
@@ -34,7 +36,7 @@ const CHAT_TITLE_MAX_LENGTH = 200;
 class InvalidQueueDeliveryActionLinkError extends Error {
 }
 import { createConversationUserStateInitializer } from "./chats.user-state-initialization.js";
-export function chatService(db, storage) {
+export function chatService(db, storage, rustFoundationBridge) {
     const generationProtocol = chatGenerationProtocolService(db);
     const QUEUED_MESSAGE_CLAIM_LEASE_MS = 2 * 60 * 1000;
     const issuesSvc = issueService(db, storage);
@@ -44,6 +46,15 @@ export function chatService(db, storage) {
     const agentsSvc = agentService(db);
     const addUserChatMessage = createChatAnnotationMessagePersistence(db, getMessage);
     const getUserMessageMutationByClientMutationId = createChatMessageMutationLookup(db, getMessage);
+    const organizationBrandingSvc = createChatOrganizationBrandingService({
+        db,
+        organizationsSvc,
+        agentsSvc,
+        bridge: rustFoundationBridge,
+        getMessage,
+        updateMessageStructuredPayload,
+        addMessage,
+    });
     const ensureConversationUserStates = createConversationUserStateInitializer(db);
     async function listConversationUserStates(orgId, userId, conversationIds) {
         if (conversationIds.length === 0)
@@ -3233,10 +3244,8 @@ export function chatService(db, storage) {
         const sanitizedPayload = sanitizeChatStructuredPayload(input.structuredPayload ?? null);
         const transcriptFromPayload = chatTranscriptFromPayload(sanitizedPayload);
         const transcript = input.transcript ?? transcriptFromPayload;
-        const { message } = await db.transaction(async (tx) => {
-            const [inserted] = await tx
-                .insert(chatMessages)
-                .values({
+        const { message, created } = await db.transaction(async (tx) => {
+            const values = {
                 orgId: input.orgId,
                 conversationId,
                 role: input.role,
@@ -3247,24 +3256,51 @@ export function chatService(db, storage) {
                 approvalId: input.approvalId ?? null,
                 runId: input.runId ?? null,
                 replyingAgentId: input.replyingAgentId ?? null,
+                clientMutationId: input.clientMutationId ?? null,
                 chatTurnId: input.chatTurnId ?? null,
                 turnVariant: input.turnVariant ?? 0,
-            })
-                .returning();
-            if (!inserted)
+            };
+            const [inserted] = input.clientMutationId
+                ? await tx.insert(chatMessages).values(values).onConflictDoNothing().returning()
+                : await tx.insert(chatMessages).values(values).returning();
+            if (inserted) {
+                if (transcript.length > 0) {
+                    await replaceDetachedChatTranscript(tx, {
+                        orgId: input.orgId,
+                        messageId: inserted.id,
+                        entries: transcript,
+                    });
+                }
+                return { message: inserted, created: true };
+            }
+            if (!input.clientMutationId)
                 throw new Error("Failed to create chat message");
             if (transcript.length > 0) {
-                await replaceDetachedChatTranscript(tx, {
-                    orgId: input.orgId,
-                    messageId: inserted.id,
-                    entries: transcript,
-                });
+                throw conflict("Idempotent Chat system events cannot replace transcript content");
             }
-            return { message: inserted };
+            const existing = await tx
+                .select()
+                .from(chatMessages)
+                .where(and(eq(chatMessages.conversationId, conversationId), eq(chatMessages.clientMutationId, input.clientMutationId)))
+                .then((rows) => rows[0] ?? null);
+            if (!existing)
+                throw new Error("Chat message idempotency key conflicted without a matching message");
+            if (existing.orgId !== values.orgId
+                || existing.role !== values.role
+                || existing.kind !== values.kind
+                || existing.status !== values.status
+                || existing.body !== values.body
+                || existing.approvalId !== values.approvalId
+                || existing.runId !== values.runId
+                || existing.replyingAgentId !== values.replyingAgentId
+                || !isDeepStrictEqual(existing.structuredPayload, values.structuredPayload)) {
+                throw conflict("Chat message idempotency key was reused with different content");
+            }
+            return { message: existing, created: false };
         });
         if (!message)
             throw new Error("Failed to create chat message");
-        if (input.role === "user" || isVisibleIncomingChatMessage(message)) {
+        if (created && (input.role === "user" || isVisibleIncomingChatMessage(message))) {
             await refreshConversationTouch(conversationId, message.createdAt);
         }
         const [hydrated] = await hydrateMessages([message]);
@@ -3631,9 +3667,6 @@ export function chatService(db, storage) {
             throw unprocessable("This operation proposal is managed through approvals");
         }
         const currentState = operationProposalDecisionStatusFromPayload(message.structuredPayload);
-        if (currentState.status !== "pending") {
-            throw unprocessable("Only pending lightweight changes can be resolved");
-        }
         const proposal = operationProposalFromPayload(message.structuredPayload);
         if (!proposal) {
             throw unprocessable("Chat operation proposal payload was incomplete");
@@ -3647,52 +3680,25 @@ export function chatService(db, storage) {
                 throw unprocessable("Agent lightweight changes must target an agent in the same organization");
             }
         }
+        if (input.action === "approve" && proposal.targetType === "organization") {
+            return organizationBrandingSvc.resolveOperationProposal({
+                conversationId,
+                messageId,
+                orgId: conversation.orgId,
+                messagePayload: message.structuredPayload,
+                proposal: { ...proposal, targetType: "organization" },
+                currentState,
+                actorUserId: input.actorUserId,
+                actor: input.actor,
+                decisionNote: input.decisionNote,
+            });
+        }
+        if (currentState.status !== "pending") {
+            throw unprocessable("Only pending lightweight changes can be resolved");
+        }
         const decisionNote = safeTrim(input.decisionNote);
         const decidedAtIso = new Date().toISOString();
         if (input.action === "approve") {
-            if (proposal.targetType === "organization") {
-                const updated = await organizationsSvc.update(proposal.targetId, proposal.patch);
-                if (!updated)
-                    throw notFound("Organization not found");
-                const updatedMessage = await updateMessageStructuredPayload(conversationId, messageId, withOperationProposalDecisionState(message.structuredPayload, {
-                    status: "approved",
-                    decisionNote,
-                    decidedByUserId: input.actorUserId,
-                    decidedAt: decidedAtIso,
-                }));
-                if (!updatedMessage) {
-                    throw notFound("Operation proposal not found");
-                }
-                const systemMessage = await addMessage(conversationId, {
-                    orgId: conversation.orgId,
-                    role: "system",
-                    kind: "system_event",
-                    body: `Applied lightweight change: ${proposal.summary}.`,
-                    structuredPayload: {
-                        eventType: "operation_applied",
-                        source: "chat",
-                        sourceMessageId: messageId,
-                        targetType: "organization",
-                        targetId: proposal.targetId,
-                        decisionNote,
-                    },
-                });
-                await logActivity(db, {
-                    orgId: conversation.orgId,
-                    actorType: "user",
-                    actorId: input.actorUserId ?? "board",
-                    action: "organization.updated",
-                    entityType: "organization",
-                    entityId: proposal.targetId,
-                    details: {
-                        source: "chat_lightweight_change",
-                        sourceMessageId: messageId,
-                        decisionNote,
-                        ...proposal.patch,
-                    },
-                });
-                return { message: updatedMessage, systemMessage };
-            }
             const updated = await agentsSvc.update(proposal.targetId, proposal.patch);
             if (!updated || updated.orgId !== conversation.orgId) {
                 throw notFound("Agent not found");
@@ -3763,7 +3769,7 @@ export function chatService(db, storage) {
         });
         return { message: updatedMessage, systemMessage };
     }
-    async function applyApprovedApproval(approval, actorUserId) {
+    async function applyApprovedApproval(approval, actorUserId, actor, options = {}) {
         if (approval.type !== "chat_issue_creation" && approval.type !== "chat_operation") {
             return null;
         }
@@ -3866,31 +3872,14 @@ export function chatService(db, storage) {
             }
         }
         if (proposal.targetType === "organization") {
-            const updated = await organizationsSvc.update(proposal.targetId, proposal.patch);
-            if (!updated)
-                throw notFound("Organization not found");
-            await addMessage(conversationId, {
-                orgId: approval.orgId,
-                role: "system",
-                kind: "system_event",
-                body: `Applied approved organization change: ${proposal.summary}.`,
-                structuredPayload: {
-                    eventType: "operation_applied",
-                    approvalId: approval.id,
-                    targetType: "organization",
-                    targetId: proposal.targetId,
-                },
-            });
-            await logActivity(db, {
-                orgId: approval.orgId,
-                actorType: "user",
-                actorId: actorUserId ?? "board",
-                action: "organization.updated",
-                entityType: "organization",
-                entityId: proposal.targetId,
-                details: proposal.patch,
+            return organizationBrandingSvc.applyApprovedApproval({
+                approval,
+                actorUserId,
+                actor,
+                recoveryOnly: options.recoveryOnly ?? false,
+                conversationId,
+                proposal: { ...proposal, targetType: "organization" },
             });
-            return updated;
         }
         const updated = await agentsSvc.update(proposal.targetId, proposal.patch);
         if (!updated)
@@ -4005,6 +3994,7 @@ export function chatService(db, storage) {
         getMessage,
         getUserMessageMutationByClientMutationId,
         applyApprovedApproval,
+        validateApprovedApproval: organizationBrandingSvc.validateApprovedApproval,
         createProposalApproval,
         resolveOperationProposal,
     };