@rudderhq/server 0.7.15 → 0.7.16

package/dist/routes/chats.annotation-routes.js

@@ -13,13 +13,18 @@ export function turnContextFromUserMessage(userMessage) {
 export function createChatAnnotationRouteHelpers(input) {
     async function addUserMessage(conversation, body, actor, editUserMessageId, annotationInput) {
         input.assertLocalMutationAllowed(conversation);
-        let transactionCommitReported = false;
+        let persistenceDisposition = null;
         const reportTransactionCommit = (messageId) => {
-            if (transactionCommitReported)
+            if (persistenceDisposition)
                 return;
-            transactionCommitReported = true;
+            persistenceDisposition = "accepted";
             annotationInput?.onPersisted?.(messageId);
         };
+        const reportIdempotentReplay = () => {
+            if (persistenceDisposition)
+                return;
+            persistenceDisposition = "replayed";
+        };
         const transactionCommitOptions = annotationInput?.onPersisted
             ? { onTransactionCommitted: reportTransactionCommit }
             : {};
@@ -40,6 +45,13 @@ export function createChatAnnotationRouteHelpers(input) {
                     }
                     : {}),
                 ...transactionCommitOptions,
+                ...(annotationInput.clientMutationId
+                    ? {
+                        clientMutationId: annotationInput.clientMutationId,
+                        clientMutationFingerprint: annotationInput.clientMutationFingerprint ?? null,
+                        onIdempotentReplay: reportIdempotentReplay,
+                    }
+                    : {}),
             }
             : annotationInput?.storedAttachments?.length
                 ? {
@@ -49,14 +61,35 @@ export function createChatAnnotationRouteHelpers(input) {
                         createdByUserId: actor.actorType === "user" ? actor.actorId : null,
                     })),
                     ...transactionCommitOptions,
+                    ...(annotationInput.clientMutationId
+                        ? {
+                            clientMutationId: annotationInput.clientMutationId,
+                            clientMutationFingerprint: annotationInput.clientMutationFingerprint ?? null,
+                            onIdempotentReplay: reportIdempotentReplay,
+                        }
+                        : {}),
                 }
-                : annotationInput?.onPersisted
-                    ? transactionCommitOptions
+                : annotationInput?.onPersisted || annotationInput?.clientMutationId
+                    ? {
+                        ...transactionCommitOptions,
+                        ...(annotationInput.clientMutationId
+                            ? {
+                                clientMutationId: annotationInput.clientMutationId,
+                                clientMutationFingerprint: annotationInput.clientMutationFingerprint ?? null,
+                                onIdempotentReplay: reportIdempotentReplay,
+                            }
+                            : {}),
+                    }
                     : undefined;
         const userMessage = messageOptions
             ? await input.chats.addUserChatMessage(conversation.id, conversation.orgId, body, editUserMessageId ?? null, messageOptions)
             : await input.chats.addUserChatMessage(conversation.id, conversation.orgId, body, editUserMessageId ?? null);
-        reportTransactionCommit(userMessage.id);
+        if (!persistenceDisposition)
+            reportTransactionCommit(userMessage.id);
+        const accepted = persistenceDisposition === "accepted";
+        if (!accepted) {
+            return { message: userMessage, accepted: false };
+        }
         const persistedAnnotations = chatInlineAnnotationsFromStructuredPayload(userMessage.structuredPayload);
         await input.logActivity(input.db, {
             orgId: conversation.orgId,
@@ -106,7 +139,7 @@ export function createChatAnnotationRouteHelpers(input) {
                 contentType: attachment.contentType,
             },
         })));
-        return userMessage;
+        return { message: userMessage, accepted: true };
     }
     async function storeUserMessageFiles(conversation, files) {
         const storedFiles = [];

package/dist/routes/chats.annotation-routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"chats.annotation-routes.js","sourceRoot":"","sources":["../../src/routes/chats.annotation-routes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chats.annotation-routes.js","sourceRoot":"","sources":["../../src/routes/chats.annotation-routes.ts"],"names":[],"mappings":"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"}

package/dist/routes/chats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chats.d.ts","sourceRoot":"","sources":["../../src/routes/chats.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AA0BvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AA2D/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,8BAA8B,CAAC;AA8BtC,wBAAgB,UAAU,CACxB,EAAE,EAAE,EAAE,EACN,OAAO,EAAE,cAAc,EACvB,iBAAiB,GAAE,qBAAqD,EACxE,gCAAgC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,8CAowGnG"}
+{"version":3,"file":"chats.d.ts","sourceRoot":"","sources":["../../src/routes/chats.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AA0BvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AA4D/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,8BAA8B,CAAC;AA8BtC,wBAAgB,UAAU,CACxB,EAAE,EAAE,EAAE,EACN,OAAO,EAAE,cAAc,EACvB,iBAAiB,GAAE,qBAAqD,EACxE,gCAAgC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,8CA4zGnG"}

package/dist/routes/chats.js

@@ -13,6 +13,7 @@ import { CHAT_ASSISTANT_USER_ERROR_MESSAGE, chatAssistantErrorForLog, chatAssist
 import { cancelAndReleaseActiveChatGeneration, claimChatGeneration, createChatRuntimeControlCoordinator, getActiveChatGeneration, hasActiveChatGeneration, interruptActiveChatGeneration, steerActiveChatGeneration } from "../services/chat-generation-locks.js";
 import { hashChatGenerationBody } from "../services/chat-generation-protocol.js";
 import { chatInlineAnnotationService } from "../services/chat-inline-annotations.js";
+import { chatMessageMutationFingerprint } from "../services/chat-message-mutation-fingerprint.js";
 import { chatSteerMessageService } from "../services/chat-steer-messages.js";
 import { buildChatTitlePromptFromMessages, chatTitleGenerationService, } from "../services/chat-title-generation.js";
 import { chatWorkManifestService } from "../services/chat-work-manifest.js";
@@ -2810,6 +2811,30 @@ export function chatRoutes(db, storage, backgroundRuntime = createChatBackground
             return;
         }
         const inlineAnnotationsProvided = res.locals.inlineAnnotationsProvided === true;
+        const clientMutationFingerprint = req.body.clientMutationId
+            ? chatMessageMutationFingerprint({
+                body: req.body.body,
+                editUserMessageId: req.body.editUserMessageId ?? null,
+                inlineAnnotationsProvided,
+                inlineAnnotations: req.body.inlineAnnotations,
+                modelOverride: req.body.modelOverride ?? null,
+                effortOverride: req.body.effortOverride ?? null,
+                files: [],
+            })
+            : null;
+        if (req.body.clientMutationId) {
+            const replayedMutation = await svc.getUserMessageMutationByClientMutationId(conversation.orgId, conversation.id, req.body.clientMutationId);
+            if (replayedMutation) {
+                const replayedUserMessage = replayedMutation.message;
+                if (replayedUserMessage.body !== req.body.body
+                    || (replayedMutation.fingerprint !== null
+                        && replayedMutation.fingerprint !== clientMutationFingerprint)) {
+                    throw conflict("Chat mutation key was already used for different content");
+                }
+                res.status(200).json({ messages: [replayedUserMessage] });
+                return;
+            }
+        }
         const preparedAnnotations = inlineAnnotationsProvided
             ? await inlineAnnotations.prepare({
                 orgId: conversation.orgId,
@@ -2824,16 +2849,25 @@ export function chatRoutes(db, storage, backgroundRuntime = createChatBackground
             res.status(503).json({ error: assistantAvailability.error });
             return;
         }
-        const releaseGeneration = claimChatGeneration(conversation.id, null, null);
+        const releaseGeneration = claimChatGeneration(conversation.id, null, null, req.body.clientMutationId ?? null);
         if (!releaseGeneration) {
             if (req.body.editUserMessageId) {
                 res.status(409).json({ error: "Stop the current response before editing this message" });
                 return;
             }
+            const activeGeneration = getActiveChatGeneration(conversation.id);
+            if (req.body.clientMutationId
+                && activeGeneration?.clientMutationId === req.body.clientMutationId) {
+                throw conflict("This message is already being sent. Try again shortly.", {
+                    code: "chat_send_in_progress",
+                    phase: "message_acceptance",
+                });
+            }
             const item = await svc.createQueuedMessage({
                 orgId: conversation.orgId,
                 conversationId: conversation.id,
-                clientMutationId: `message:${randomUUID()}`,
+                clientMutationId: req.body.clientMutationId ?? `message:${randomUUID()}`,
+                mutationFingerprint: clientMutationFingerprint ?? undefined,
                 runtimeSnapshotVersion: 1,
                 expectedGenerationId: getActiveChatGeneration(conversation.id)?.generationId ?? null,
                 requestActor: queueRequestActor(req),
@@ -2857,10 +2891,17 @@ export function chatRoutes(db, storage, backgroundRuntime = createChatBackground
             return;
         }
         try {
-            const userMessage = await addUserMessage(conversation, req.body.body, actor, req.body.editUserMessageId ?? null, {
+            const persistence = await addUserMessage(conversation, req.body.body, actor, req.body.editUserMessageId ?? null, {
                 provided: inlineAnnotationsProvided,
                 prepared: preparedAnnotations,
+                clientMutationId: req.body.clientMutationId ?? null,
+                clientMutationFingerprint,
             });
+            const userMessage = persistence.message;
+            if (!persistence.accepted) {
+                res.status(200).json({ messages: [userMessage] });
+                return;
+            }
             await touchSideChat(req, conversation);
             if (!req.body.editUserMessageId) {
                 startChatTitleGeneration(conversation, userMessage);