@copilotz/chat-adapter 0.9.43 → 0.9.44

package/dist/index.js

@@ -1638,6 +1638,17 @@ var getStreamEventPayload = (event) => {
   if (!isRecord2(event)) return event;
   return "payload" in event ? event.payload : event;
 };
+var getLlmAttemptId = (event) => {
+  if (!isRecord2(event)) return null;
+  const metadata = isRecord2(event.metadata) ? event.metadata : {};
+  if (typeof metadata.llmAttemptId === "string" && metadata.llmAttemptId.trim().length > 0) {
+    return metadata.llmAttemptId.trim();
+  }
+  if (event.subjectType === "llm_attempt" && typeof event.subjectId === "string" && event.subjectId.trim().length > 0) {
+    return event.subjectId.trim();
+  }
+  return null;
+};
 var isTerminalEmptyLlmResultEvent = (event) => {
   if (!isRecord2(event) || event.type !== "LLM_RESULT") return false;
   const payload = getStreamEventPayload(event);
@@ -1661,40 +1672,9 @@ var isSameThreadIdentity = (owner, current) => {
   return ownerValues.some((value) => currentValues.has(value));
 };
 
-// src/useCopilotzChat.ts
-var nowTs = () => Date.now();
-var generateId = () => globalThis.crypto?.randomUUID?.() ?? `id-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
-var isAbortError = (error) => error instanceof DOMException && error.name === "AbortError" || typeof error === "object" && error !== null && "name" in error && error.name === "AbortError";
-var getEventPayload = (event) => getStreamEventPayload(event);
-var getEventSenderType = (payload) => payload?.senderType || payload?.sender?.type;
-var isRecord3 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-var normalizeThreadTag = (value) => {
-  if (!isRecord3(value)) return null;
-  const id = typeof value.id === "string" ? value.id.trim() : "";
-  const name = typeof value.name === "string" ? value.name.trim() : "";
-  const color = typeof value.color === "string" && value.color.trim() ? value.color.trim() : void 0;
-  if (!id || !name) return null;
-  return color ? { id, name, color } : { id, name };
-};
-var getThreadTagsFromMetadata = (metadata) => {
-  if (!isRecord3(metadata) || !isRecord3(metadata.public)) return [];
-  const tags = metadata.public.tags;
-  if (!Array.isArray(tags)) return [];
-  return tags.map(normalizeThreadTag).filter((tag) => !!tag);
-};
-var patchMetadataPublicTags = (metadata, tags) => ({
-  ...metadata ?? {},
-  public: {
-    ...isRecord3(metadata?.public) ? metadata.public : {},
-    tags
-  }
-});
-var THREAD_MESSAGES_PAGE_SIZE = 50;
-var createEmptyMessagePageInfo = () => ({
-  hasMoreBefore: false,
-  oldestMessageId: null,
-  newestMessageId: null
-});
+// src/messageReconciliation.ts
+var CLIENT_MESSAGE_ID_METADATA_KEY = "clientMessageId";
+var LLM_ATTEMPT_ID_METADATA_KEY = "llmAttemptId";
 var stringifyForCompare = (value) => {
   if (value === void 0) return "";
   try {
@@ -1719,6 +1699,36 @@ var getMessageSignature = (message) => JSON.stringify({
     agentId: message.sender.agentId
   } : null
 });
+var getMetadataString = (message, key) => {
+  const value = message.metadata?.[key];
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+};
+var getCorrelationKeys = (message) => {
+  const clientMessageId = getMetadataString(
+    message,
+    CLIENT_MESSAGE_ID_METADATA_KEY
+  );
+  const llmAttemptId = getMetadataString(
+    message,
+    LLM_ATTEMPT_ID_METADATA_KEY
+  );
+  return [
+    ...clientMessageId ? [`client-message:${message.role}:${clientMessageId}`] : [],
+    ...llmAttemptId ? [`llm-attempt:${message.role}:${llmAttemptId}`] : []
+  ];
+};
+var indexUniqueFreshCorrelations = (freshMessages) => {
+  const messagesByCorrelation = /* @__PURE__ */ new Map();
+  for (const message of freshMessages) {
+    for (const key of getCorrelationKeys(message)) {
+      messagesByCorrelation.set(
+        key,
+        messagesByCorrelation.has(key) ? null : message
+      );
+    }
+  }
+  return messagesByCorrelation;
+};
 var reconcileThreadMessages = (currentMessages, freshMessages) => {
   if (freshMessages.length === 0) {
     return { messages: currentMessages, changed: false };
@@ -1727,12 +1737,15 @@ var reconcileThreadMessages = (currentMessages, freshMessages) => {
     return { messages: freshMessages, changed: true };
   }
   const freshById = new Map(freshMessages.map((message) => [message.id, message]));
+  const freshByCorrelation = indexUniqueFreshCorrelations(freshMessages);
   const seen = /* @__PURE__ */ new Set();
   let changed = false;
   const nextMessages = currentMessages.map((message) => {
-    const fresh = freshById.get(message.id);
+    const exactMatch = freshById.get(message.id);
+    const correlatedMatch = exactMatch ? null : getCorrelationKeys(message).map((key) => freshByCorrelation.get(key)).find((candidate) => candidate !== null && candidate !== void 0 && !seen.has(candidate.id));
+    const fresh = exactMatch ?? correlatedMatch;
     if (!fresh) return message;
-    seen.add(message.id);
+    seen.add(fresh.id);
     if (getMessageSignature(message) === getMessageSignature(fresh)) {
       return message;
     }
@@ -1750,6 +1763,41 @@ var reconcileThreadMessages = (currentMessages, freshMessages) => {
   }
   return changed ? { messages: nextMessages, changed } : { messages: currentMessages, changed: false };
 };
+
+// src/useCopilotzChat.ts
+var nowTs = () => Date.now();
+var generateId = () => globalThis.crypto?.randomUUID?.() ?? `id-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
+var isAbortError = (error) => error instanceof DOMException && error.name === "AbortError" || typeof error === "object" && error !== null && "name" in error && error.name === "AbortError";
+var getEventPayload = (event) => getStreamEventPayload(event);
+var getEventSenderType = (payload) => payload?.senderType || payload?.sender?.type;
+var isRecord3 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var normalizeThreadTag = (value) => {
+  if (!isRecord3(value)) return null;
+  const id = typeof value.id === "string" ? value.id.trim() : "";
+  const name = typeof value.name === "string" ? value.name.trim() : "";
+  const color = typeof value.color === "string" && value.color.trim() ? value.color.trim() : void 0;
+  if (!id || !name) return null;
+  return color ? { id, name, color } : { id, name };
+};
+var getThreadTagsFromMetadata = (metadata) => {
+  if (!isRecord3(metadata) || !isRecord3(metadata.public)) return [];
+  const tags = metadata.public.tags;
+  if (!Array.isArray(tags)) return [];
+  return tags.map(normalizeThreadTag).filter((tag) => !!tag);
+};
+var patchMetadataPublicTags = (metadata, tags) => ({
+  ...metadata ?? {},
+  public: {
+    ...isRecord3(metadata?.public) ? metadata.public : {},
+    tags
+  }
+});
+var THREAD_MESSAGES_PAGE_SIZE = 50;
+var createEmptyMessagePageInfo = () => ({
+  hasMoreBefore: false,
+  oldestMessageId: null,
+  newestMessageId: null
+});
 var createPendingAssistantActivity = () => ({
   items: [
     {
@@ -2453,7 +2501,7 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
           liveToolUpdatesRef.current.push(update);
         }
       };
-      const finalizeActiveAssistantTurn = (finalAnswer) => {
+      const finalizeActiveAssistantTurn = (finalAnswer, llmAttemptId) => {
         if (!streamStillOwnsVisibleThread()) return;
         setMessages((prev) => {
           const currentIdx = prev.findIndex((message2) => message2.id === currentAssistantId && message2.role === "assistant");
@@ -2467,8 +2515,15 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
           })();
           if (fallbackIdx < 0) return prev;
           const message = prev[fallbackIdx];
-          const nextMessage = finalizeAssistantMessage(message, finalAnswer);
-          if (message.content === nextMessage.content && message.isStreaming === nextMessage.isStreaming && message.isComplete === nextMessage.isComplete && message.activity === nextMessage.activity) {
+          const correlatedMessage = llmAttemptId ? {
+            ...message,
+            metadata: {
+              ...message.metadata ?? {},
+              [LLM_ATTEMPT_ID_METADATA_KEY]: llmAttemptId
+            }
+          } : message;
+          const nextMessage = finalizeAssistantMessage(correlatedMessage, finalAnswer);
+          if (message.content === nextMessage.content && message.isStreaming === nextMessage.isStreaming && message.isComplete === nextMessage.isComplete && message.activity === nextMessage.activity && message.metadata === nextMessage.metadata) {
             return prev;
           }
           const updated = [...prev];
@@ -2577,7 +2632,7 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
             }
             if (type === "LLM_RESULT") {
               const finalAnswer = typeof payload?.answer === "string" ? payload.answer : void 0;
-              finalizeActiveAssistantTurn(finalAnswer);
+              finalizeActiveAssistantTurn(finalAnswer, getLlmAttemptId(event));
               if (isTerminalEmptyLlmResultEvent(event)) {
                 finalizeStreamingPlaceholders();
               }
@@ -2762,13 +2817,17 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
       );
       const currentMetadata = threadMetadataMapRef.current[conversationKey];
       const pendingTitle = currentMetadata?.pendingTitle;
+      const userMessageId = generateId();
       const userMessage = {
-        id: generateId(),
+        id: userMessageId,
         role: "user",
         content,
         timestamp,
         attachments: attachments.length > 0 ? attachments : void 0,
         isComplete: true,
+        metadata: {
+          [CLIENT_MESSAGE_ID_METADATA_KEY]: userMessageId
+        },
         sender: resolveUserSender({
           id: userId,
           name: getCurrentUserDisplayName(userName, userId)
@@ -2817,6 +2876,7 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
           userId,
           userName: getCurrentUserDisplayName(userName, userId),
           agentName: preferredAgentRef.current,
+          metadata: userMessage.metadata,
           assistantMessageId: assistantPlaceholder.id,
           assistantSender,
           preserveActiveRun,