@copilotz/chat-adapter 0.9.31 → 0.9.33

package/dist/index.js

@@ -1285,6 +1285,7 @@ var applyToolResultUpdateToMessages = (messages, update, assistantPatch) => {
     nextMessages[i] = {
       ...applyAssistantToolResult(message, {
         ...update.id ? { id: update.id } : {},
+        ...update.toolExecutionId ? { toolExecutionId: update.toolExecutionId } : {},
         name: update.name ?? toolItem.toolName ?? toolItem.id,
         status: update.status,
         ...update.result !== void 0 ? { result: update.result } : {},
@@ -1302,6 +1303,7 @@ var extractLiveToolCall = (payload) => {
   const tool = expectRecord(toolCall.tool, "TOOL_CALL payload.toolCall.tool");
   return {
     id: expectString(toolCall.id, "TOOL_CALL payload.toolCall.id"),
+    ...typeof payloadRecord.toolExecutionId === "string" ? { toolExecutionId: payloadRecord.toolExecutionId } : {},
     name: expectToolName(tool, "TOOL_CALL payload.toolCall.tool.id"),
     arguments: expectToolArguments(toolCall.args, "TOOL_CALL payload.toolCall.args"),
     status: toolCall.status === void 0 ? "running" : expectToolStatus(toolCall.status, "TOOL_CALL payload.toolCall.status"),
@@ -1325,6 +1327,7 @@ var extractToolCallsFromServerMessage = (msg) => {
   const metadata = msg.metadata === null || msg.metadata === void 0 ? void 0 : expectRecord(msg.metadata, "message.metadata");
   const topLevelToolCalls = readToolCallArray(msg.toolCalls, "message.toolCalls");
   const metadataToolCalls = readToolCallArray(metadata?.toolCalls, "message.metadata.toolCalls");
+  const messageToolExecutionId = typeof metadata?.toolExecutionId === "string" ? metadata.toolExecutionId : void 0;
   const usedMetadataIndexes = /* @__PURE__ */ new Set();
   const parsed = [];
   const findMatchingMetadataIndex = (toolCall) => {
@@ -1342,6 +1345,7 @@ var extractToolCallsFromServerMessage = (msg) => {
     const rawStatus = primary.status ?? secondary?.status;
     return {
       id,
+      ...typeof primary.toolExecutionId === "string" ? { toolExecutionId: primary.toolExecutionId } : typeof secondary?.toolExecutionId === "string" ? { toolExecutionId: secondary.toolExecutionId } : messageToolExecutionId ? { toolExecutionId: messageToolExecutionId } : {},
       name,
       arguments: expectToolArguments(argsRaw, "toolCall.args"),
       ...result !== void 0 ? { result } : {},
@@ -1374,6 +1378,7 @@ var extractToolResultUpdateFromMessage = (msg, now = () => Date.now()) => {
   expectStringValue(msg.createdAt, "tool result message.createdAt");
   return {
     id: firstToolCall.id,
+    ...firstToolCall.toolExecutionId ? { toolExecutionId: firstToolCall.toolExecutionId } : {},
     name: firstToolCall.name,
     result: firstToolCall.result,
     status: firstToolCall.status,
@@ -1513,6 +1518,7 @@ var convertServerMessage = (msg, options = {}) => {
   const shouldRenderToolCalls = msg.senderType !== "tool";
   const mappedToolCalls = parsedToolCalls.map((toolCall) => ({
     id: toolCall.id ?? (options.createId ?? defaultCreateId)(),
+    ...toolCall.toolExecutionId ? { toolExecutionId: toolCall.toolExecutionId } : {},
     name: toolCall.name,
     arguments: toolCall.arguments,
     status: toolCall.status,
@@ -1605,15 +1611,36 @@ var prepareHydratedMessages = async (rawMessages, options = {}) => {
   };
 };
 
+// src/streamEvents.ts
+var isRecord2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var hasValues = (value) => Array.isArray(value) && value.length > 0;
+var getStreamEventPayload = (event) => {
+  if (!isRecord2(event)) return event;
+  return "payload" in event ? event.payload : event;
+};
+var isTerminalEmptyLlmResultEvent = (event) => {
+  if (!isRecord2(event) || event.type !== "LLM_RESULT") return false;
+  const payload = getStreamEventPayload(event);
+  if (!isRecord2(payload)) return false;
+  if (payload.answer !== "") return false;
+  if (payload.finishReason === "tool_calls") return false;
+  if (hasValues(payload.toolCalls)) return false;
+  const metadata = isRecord2(event.metadata) ? event.metadata : {};
+  const routing = isRecord2(metadata.routing) ? metadata.routing : {};
+  if (hasValues(routing.routeTo) || hasValues(routing.askTo)) return false;
+  if (hasValues(metadata.targetQueue)) return false;
+  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) => event?.payload ?? event;
+var getEventPayload = (event) => getStreamEventPayload(event);
 var getEventSenderType = (payload) => payload?.senderType || payload?.sender?.type;
-var isRecord2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var isRecord3 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var normalizeThreadTag = (value) => {
-  if (!isRecord2(value)) return null;
+  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;
@@ -1621,7 +1648,7 @@ var normalizeThreadTag = (value) => {
   return color ? { id, name, color } : { id, name };
 };
 var getThreadTagsFromMetadata = (metadata) => {
-  if (!isRecord2(metadata) || !isRecord2(metadata.public)) return [];
+  if (!isRecord3(metadata) || !isRecord3(metadata.public)) return [];
   const tags = metadata.public.tags;
   if (!Array.isArray(tags)) return [];
   return tags.map(normalizeThreadTag).filter((tag) => !!tag);
@@ -1629,7 +1656,7 @@ var getThreadTagsFromMetadata = (metadata) => {
 var patchMetadataPublicTags = (metadata, tags) => ({
   ...metadata ?? {},
   public: {
-    ...isRecord2(metadata?.public) ? metadata.public : {},
+    ...isRecord3(metadata?.public) ? metadata.public : {},
     tags
   }
 });
@@ -2519,6 +2546,9 @@ function useCopilotz({ userId, userName, userAvatar, assistantName, agentOptions
             if (type === "LLM_RESULT") {
               const finalAnswer = typeof payload?.answer === "string" ? payload.answer : void 0;
               finalizeActiveAssistantTurn(finalAnswer);
+              if (isTerminalEmptyLlmResultEvent(event)) {
+                finalizeStreamingPlaceholders();
+              }
               return;
             }
             if (type === "MESSAGE" || type === "NEW_MESSAGE") {