@copilotz/chat-adapter 0.9.42 → 0.9.44

package/dist/index.d.ts

@@ -57,8 +57,8 @@ type StreamCallbacks = {
     onToken?: (token: string, isComplete: boolean, raw?: any, options?: {
         isReasoning?: boolean;
     }) => void;
-    onMessageEvent?: (payload: any) => void;
-    onAssetEvent?: (payload: any) => void;
+    onMessageEvent?: (payload: any) => void | Promise<void>;
+    onAssetEvent?: (payload: any) => void | Promise<void>;
     signal?: AbortSignal;
 };
 type RunOptions = {

package/dist/index.js

@@ -436,7 +436,7 @@ async function runCopilotzStream(options) {
     lastTokenWasReasoning = false;
     hadNonReasoningContent = false;
   };
-  const processEvent = (eventChunk) => {
+  const processEvent = async (eventChunk) => {
     if (!eventChunk.trim()) return;
     const lines = eventChunk.split("\n");
     let eventType = "message";
@@ -496,13 +496,13 @@ async function runCopilotzStream(options) {
         hadNonReasoningContent = true;
         lastTokenWasReasoning = false;
         collectedMessages.push(payload2);
-        onMessageEvent?.(payload2);
+        await onMessageEvent?.(payload2);
         break;
       }
       case "TOOL_CALL": {
         hadNonReasoningContent = true;
         lastTokenWasReasoning = false;
-        onMessageEvent?.(payload2);
+        await onMessageEvent?.(payload2);
         break;
       }
       case "TOOL_RESULT":
@@ -512,7 +512,7 @@ async function runCopilotzStream(options) {
           lastCompletedText = resultAnswer;
         }
         resetTokenAggregation();
-        onMessageEvent?.(payload2);
+        await onMessageEvent?.(payload2);
         break;
       }
       case "ASSET_CREATED": {
@@ -522,7 +522,7 @@ async function runCopilotzStream(options) {
             [assetPayload.assetId || "0"]: assetPayload.dataUrl
           };
         }
-        onAssetEvent?.(assetPayload);
+        await onAssetEvent?.(assetPayload);
         break;
       }
       case "ERROR":
@@ -530,9 +530,9 @@ async function runCopilotzStream(options) {
       default: {
         const hasEnvelope = payload2 && typeof payload2 === "object" && "type" in payload2;
         if (hasEnvelope) {
-          onMessageEvent?.(payload2);
+          await onMessageEvent?.(payload2);
         } else {
-          onMessageEvent?.({ type: eventType, payload: payload2 });
+          await onMessageEvent?.({ type: eventType, payload: payload2 });
         }
         break;
       }
@@ -549,12 +549,12 @@ async function runCopilotzStream(options) {
     while (eventBoundary >= 0) {
       const chunk = buffer.slice(0, eventBoundary);
       buffer = buffer.slice(eventBoundary + SSE_LINE_BREAK.length);
-      processEvent(chunk);
+      await processEvent(chunk);
       eventBoundary = buffer.indexOf(SSE_LINE_BREAK);
     }
   }
   if (buffer.length > 0) {
-    processEvent(buffer);
+    await processEvent(buffer);
   }
   return {
     text: lastCompletedText || aggregatedText,
@@ -925,27 +925,33 @@ var applyAssistantToolResult = (message, update) => {
   const index = items.findIndex((item2) => item2.kind === "tool" && (update.id && item2.id === update.id || !update.id && item2.toolName === update.name));
   if (index === -1) return message;
   const item = items[index];
+  const { error, ...toolCallUpdate } = update;
   const toolCall = item.details?.toolCall;
-  const nextToolCall = toolCall ? { ...toolCall, ...update } : {
-    id: update.id ?? item.id,
-    name: update.name,
+  const nextToolCall = toolCall ? { ...toolCall, ...toolCallUpdate } : {
+    id: toolCallUpdate.id ?? item.id,
+    name: toolCallUpdate.name,
     arguments: {},
-    status: update.status,
-    ...update.result !== void 0 ? { result: update.result } : {},
-    ...update.endTime !== void 0 ? { endTime: update.endTime } : {}
+    status: toolCallUpdate.status,
+    ...toolCallUpdate.result !== void 0 ? { result: toolCallUpdate.result } : {},
+    ...toolCallUpdate.endTime !== void 0 ? { endTime: toolCallUpdate.endTime } : {}
   };
   const status = toolStatusToActivityStatus(update.status);
+  const details = {
+    ...item.details ?? {},
+    toolCall: nextToolCall,
+    ...update.result !== void 0 ? { result: update.result } : {},
+    ...error !== void 0 ? { error } : {}
+  };
+  if (error === void 0 && update.status !== "failed") {
+    delete details.error;
+  }
   const next = [...items];
   next[index] = {
     ...item,
     status,
     toolName: update.name,
     ...status !== "active" ? { completedAt: update.endTime ?? Date.now() } : {},
-    details: {
-      ...item.details ?? {},
-      toolCall: nextToolCall,
-      ...update.result !== void 0 ? { result: update.result } : {}
-    }
+    details
   };
   return setItems(message, next);
 };
@@ -1243,8 +1249,18 @@ var expectToolStatus = (status, path) => {
   if (status === "pending") return "pending";
   if (status === "running" || status === "processing") return "running";
   if (status === "failed") return "failed";
+  if (status === "cancelled") return "failed";
   if (status === "completed") return "completed";
-  return fail(`${path} must be pending, running, processing, completed, or failed`);
+  return fail(`${path} must be pending, running, processing, completed, failed, or cancelled`);
+};
+var formatToolError = (error) => {
+  if (error === void 0) return void 0;
+  if (typeof error === "string") return error;
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return String(error);
+  }
 };
 var expectToolArguments = (value, path) => {
   if (isRecord(value)) return value;
@@ -1271,7 +1287,7 @@ var matchesToolResultUpdate = (target, update) => {
 var findMatchingToolItem = (toolItems, update) => toolItems.find((item) => matchesToolResultUpdate(
   { id: item.id, name: item.toolName },
   update
-) && (item.status === "active" || item.details?.result === void 0));
+) && (item.status === "active" || item.details?.result === void 0 && item.details?.error === void 0));
 var applyToolResultUpdateToMessages = (messages, update, assistantPatch) => {
   const nextMessages = [...messages];
   for (let i = nextMessages.length - 1; i >= 0; i--) {
@@ -1289,6 +1305,7 @@ var applyToolResultUpdateToMessages = (messages, update, assistantPatch) => {
         name: update.name ?? toolItem.toolName ?? toolItem.id,
         status: update.status,
         ...update.result !== void 0 ? { result: update.result } : {},
+        ...update.error !== void 0 ? { error: update.error } : {},
         endTime: update.endTime
       }),
       ...assistantPatch ?? {}
@@ -1314,12 +1331,13 @@ var extractLiveToolResultUpdate = (payload, now = () => Date.now()) => {
   const payloadRecord = expectRecord(payload, "TOOL_RESULT payload");
   const tool = expectRecord(payloadRecord.tool, "TOOL_RESULT payload.tool");
   const result = payloadRecord.projectedOutput !== void 0 ? payloadRecord.projectedOutput : payloadRecord.output;
-  if (result === void 0) fail("TOOL_RESULT payload requires output or projectedOutput");
+  const error = formatToolError(payloadRecord.error);
   return {
     id: expectString(payloadRecord.toolCallId, "TOOL_RESULT payload.toolCallId"),
     name: expectToolName(tool, "TOOL_RESULT payload.tool.id"),
     status: expectToolStatus(payloadRecord.status, "TOOL_RESULT payload.status"),
-    result,
+    ...result !== void 0 ? { result } : {},
+    ...error !== void 0 ? { error } : {},
     endTime: now()
   };
 };
@@ -1342,6 +1360,7 @@ var extractToolCallsFromServerMessage = (msg) => {
     const name = expectToolName(tool, "toolCall.tool.id");
     const argsRaw = primary.args ?? secondary?.args;
     const result = primary.output !== void 0 ? primary.output : secondary?.output !== void 0 ? secondary.output : primary.projectedOutput !== void 0 ? primary.projectedOutput : secondary?.projectedOutput;
+    const error = formatToolError(primary.error !== void 0 ? primary.error : secondary?.error);
     const rawStatus = primary.status ?? secondary?.status;
     return {
       id,
@@ -1349,6 +1368,7 @@ var extractToolCallsFromServerMessage = (msg) => {
       name,
       arguments: expectToolArguments(argsRaw, "toolCall.args"),
       ...result !== void 0 ? { result } : {},
+      ...error !== void 0 ? { error } : {},
       status: rawStatus === void 0 ? "running" : expectToolStatus(rawStatus, "toolCall.status")
     };
   };
@@ -1374,13 +1394,13 @@ var extractToolResultUpdateFromMessage = (msg, now = () => Date.now()) => {
   const toolCalls = extractToolCallsFromServerMessage(msg);
   if (toolCalls.length === 0) fail("tool message requires metadata.toolCalls");
   const firstToolCall = toolCalls[0];
-  if (firstToolCall.result === void 0) fail("tool result message requires tool call output");
   expectStringValue(msg.createdAt, "tool result message.createdAt");
   return {
     id: firstToolCall.id,
     ...firstToolCall.toolExecutionId ? { toolExecutionId: firstToolCall.toolExecutionId } : {},
     name: firstToolCall.name,
-    result: firstToolCall.result,
+    ...firstToolCall.result !== void 0 ? { result: firstToolCall.result } : {},
+    ...firstToolCall.error !== void 0 ? { error: firstToolCall.error } : {},
     status: firstToolCall.status,
     endTime: new Date(msg.createdAt).getTime()
   };
@@ -1618,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);
@@ -1632,40 +1663,18 @@ var isTerminalEmptyLlmResultEvent = (event) => {
   return true;
 };
 
-// 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 };
+// src/threadIdentity.ts
+var identityValues = ({ id, externalId }) => [id, externalId].filter((value) => typeof value === "string" && value.length > 0);
+var isSameThreadIdentity = (owner, current) => {
+  const ownerValues = identityValues(owner);
+  if (ownerValues.length === 0) return true;
+  const currentValues = new Set(identityValues(current));
+  return ownerValues.some((value) => currentValues.has(value));
 };
-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 {
@@ -1690,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 };
@@ -1698,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;
     }
@@ -1721,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: [
     {
@@ -2328,7 +2405,10 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
       let currentAssistantSender = params.assistantSender;
       const streamOwnerThreadId = currentThreadIdRef.current;
       const streamOwnerThreadExternalId = params.threadExternalId ?? currentThreadExternalIdRef.current;
-      const streamStillOwnsVisibleThread = () => streamOwnerThreadId ? currentThreadIdRef.current === streamOwnerThreadId : !streamOwnerThreadExternalId || currentThreadExternalIdRef.current === streamOwnerThreadExternalId || currentThreadIdRef.current === streamOwnerThreadExternalId;
+      const streamStillOwnsVisibleThread = () => isSameThreadIdentity(
+        { id: streamOwnerThreadId, externalId: streamOwnerThreadExternalId },
+        { id: currentThreadIdRef.current, externalId: currentThreadExternalIdRef.current }
+      );
       params.onBeforeStart?.(currentAssistantId);
       let hasStreamProgress = false;
       const updateStreamingMessage = (partial, opts) => {
@@ -2421,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");
@@ -2435,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];
@@ -2545,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();
               }
@@ -2724,16 +2811,23 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
       }
       const conversationKey = threadIdForSend ?? effectiveThreadExternalId;
       const sendOwnerThreadExternalId = effectiveThreadExternalId ?? curThreadExtId;
-      const stillShowingSendOwnerThread = () => sendOwnerThreadId ? currentThreadIdRef.current === sendOwnerThreadId : !sendOwnerThreadExternalId || currentThreadExternalIdRef.current === sendOwnerThreadExternalId || currentThreadIdRef.current === sendOwnerThreadExternalId;
+      const stillShowingSendOwnerThread = () => isSameThreadIdentity(
+        { id: sendOwnerThreadId, externalId: sendOwnerThreadExternalId },
+        { id: currentThreadIdRef.current, externalId: currentThreadExternalIdRef.current }
+      );
       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)
@@ -2782,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,