@copilotz/chat-adapter 0.1.23 → 0.1.25

package/dist/index.d.ts

@@ -130,10 +130,9 @@ type RestMessage = {
     updatedAt?: string;
 };
 type StreamCallbacks = {
-    /**
-     * `text` = non-reasoning token stream; `reasoningText` = accumulated reasoning when the backend sets `payload.isReasoning`.
-     */
-    onToken?: (text: string, isComplete: boolean, raw?: any, reasoningText?: string) => void;
+    onToken?: (token: string, isComplete: boolean, raw?: any, options?: {
+        isReasoning?: boolean;
+    }) => void;
     onMessageEvent?: (payload: any) => void;
     onAssetEvent?: (payload: any) => void;
     signal?: AbortSignal;

package/dist/index.js

@@ -406,6 +406,8 @@ async function runCopilotzStream(options) {
   let buffer = "";
   let aggregatedText = "";
   let aggregatedReasoning = "";
+  let lastTokenWasReasoning = false;
+  let hadNonReasoningContent = false;
   const collectedMessages = [];
   let collectedMedia = null;
   const processEvent = (eventChunk) => {
@@ -431,9 +433,15 @@ async function runCopilotzStream(options) {
     switch (eventType) {
       case "TOKEN": {
         const inner = payload2?.payload ?? payload2;
-        const chunk = typeof inner?.token === "string" ? inner.token : typeof payload2?.token === "string" ? payload2.token : "";
+        const chunk = typeof inner?.token === "string" ? inner.token : "";
         const isReasoning = Boolean(inner?.isReasoning);
-        const isComplete = Boolean(inner?.isComplete ?? payload2?.isComplete);
+        if (isReasoning && !lastTokenWasReasoning && hadNonReasoningContent) {
+          aggregatedReasoning = "";
+          aggregatedText = "";
+          hadNonReasoningContent = false;
+        }
+        lastTokenWasReasoning = isReasoning;
+        if (!isReasoning) hadNonReasoningContent = true;
         if (chunk) {
           if (isReasoning) {
             aggregatedReasoning = appendChunk(aggregatedReasoning, chunk);
@@ -441,12 +449,16 @@ async function runCopilotzStream(options) {
             aggregatedText = appendChunk(aggregatedText, chunk);
           }
         }
+        const isComplete = Boolean(inner?.isComplete);
         if (chunk || isComplete) {
-          onToken?.(aggregatedText, isComplete, payload2, aggregatedReasoning);
+          const tokenText = isReasoning ? aggregatedReasoning : aggregatedText;
+          onToken?.(tokenText, isComplete, payload2, { isReasoning });
         }
         break;
       }
       case "MESSAGE": {
+        hadNonReasoningContent = true;
+        lastTokenWasReasoning = false;
         collectedMessages.push(payload2);
         onMessageEvent?.(payload2);
         const senderType = payload2?.payload?.senderType ?? payload2?.payload?.sender?.type;
@@ -456,6 +468,8 @@ async function runCopilotzStream(options) {
         break;
       }
       case "TOOL_CALL": {
+        hadNonReasoningContent = true;
+        lastTokenWasReasoning = false;
         onMessageEvent?.(payload2);
         break;
       }
@@ -510,12 +524,11 @@ async function fetchThreads(userId, getRequestHeaders) {
     const errorText = await res.text().catch(() => res.statusText);
     throw new Error(errorText || `Failed to load threads (${res.status})`);
   }
-  const json = await res.json();
-  const list = json?.data ?? json?.body;
-  if (!Array.isArray(list)) {
+  const { data } = await res.json();
+  if (!Array.isArray(data)) {
     return [];
   }
-  return list;
+  return data;
 }
 async function fetchThreadMessages(threadId, getRequestHeaders) {
   const graphParams = new URLSearchParams();
@@ -555,12 +568,11 @@ async function fetchThreadMessages(threadId, getRequestHeaders) {
     const errorText = await res.text().catch(() => res.statusText);
     throw new Error(errorText || `Failed to load thread messages (${res.status})`);
   }
-  const json = await res.json();
-  const list = json?.data ?? json?.body;
-  if (!Array.isArray(list)) {
+  const { data } = await res.json();
+  if (!Array.isArray(data)) {
     return [];
   }
-  return list;
+  return data;
 }
 async function updateThread(threadId, updates, getRequestHeaders) {
   const res = await fetch(apiUrl(`/v1/rest/threads/${threadId}`), {
@@ -805,23 +817,6 @@ var generateId = () => globalThis.crypto?.randomUUID?.() ?? `id-${Date.now()}-${
 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 getEventSenderType = (payload) => payload?.senderType || payload?.sender?.type;
-var hasToolCallsInPayload = (payload) => {
-  if (!payload || typeof payload !== "object") return false;
-  const p = payload;
-  if (Array.isArray(p.toolCalls) && p.toolCalls.length > 0) return true;
-  const meta = p.metadata;
-  if (!meta || typeof meta !== "object" || Array.isArray(meta)) return false;
-  const m = meta.toolCalls;
-  return Array.isArray(m) && m.length > 0;
-};
-var isAgentToolOnlyPlaceholderPayload = (payload) => {
-  if (!payload || typeof payload !== "object") return false;
-  const p = payload;
-  if (getEventSenderType(p) !== "agent") return false;
-  const content = typeof p.content === "string" ? p.content : "";
-  if (content.trim().length > 0) return false;
-  return hasToolCallsInPayload(p);
-};
 var hasVisibleAssistantOutput = (message) => {
   if (message.role !== "assistant") return false;
   if (typeof message.content === "string" && message.content.trim().length > 0) return true;
@@ -856,29 +851,16 @@ var extractToolCallsFromServerMessage = (msg) => {
   const metadataToolCalls = Array.isArray(metadata?.toolCalls) ? metadata.toolCalls : [];
   const usedMetadataIndexes = /* @__PURE__ */ new Set();
   const parsed = [];
-  const candidateToolLabel = (c) => {
-    if (typeof c.name === "string") return c.name;
-    const t = c.tool && typeof c.tool === "object" && c.tool !== null && !Array.isArray(c.tool) ? c.tool : void 0;
-    if (typeof t?.name === "string") return t.name;
-    if (typeof t?.id === "string") return t.id;
-    return void 0;
-  };
   const findMatchingMetadataIndex = (toolCall) => {
     const id = typeof toolCall.id === "string" ? toolCall.id : void 0;
-    const nested = toolCall.tool && typeof toolCall.tool === "object" && toolCall.tool !== null && !Array.isArray(toolCall.tool) ? toolCall.tool : void 0;
-    const name = (typeof toolCall.name === "string" ? toolCall.name : void 0) || (typeof nested?.name === "string" ? nested.name : void 0) || (typeof nested?.id === "string" ? nested.id : void 0);
+    const name = typeof toolCall.name === "string" ? toolCall.name : void 0;
     const byId = id ? metadataToolCalls.findIndex((candidate, idx) => !usedMetadataIndexes.has(idx) && candidate?.id === id) : -1;
     if (byId >= 0) return byId;
-    return name ? metadataToolCalls.findIndex((candidate, idx) => {
-      if (usedMetadataIndexes.has(idx)) return false;
-      const label = candidateToolLabel(candidate);
-      return label === name;
-    }) : -1;
+    return name ? metadataToolCalls.findIndex((candidate, idx) => !usedMetadataIndexes.has(idx) && candidate?.name === name) : -1;
   };
   const parseToolCall = (primary, secondary) => {
-    const nestedTool = primary && typeof primary.tool === "object" && primary.tool !== null && !Array.isArray(primary.tool) ? primary.tool : void 0;
     const id = typeof primary.id === "string" ? primary.id : typeof secondary?.id === "string" ? secondary.id : void 0;
-    const name = typeof primary.name === "string" ? primary.name : (typeof nestedTool?.name === "string" ? nestedTool.name : typeof nestedTool?.id === "string" ? nestedTool.id : void 0) ?? (typeof secondary?.name === "string" ? secondary.name : "tool");
+    const name = typeof primary.name === "string" ? primary.name : typeof secondary?.name === "string" ? secondary.name : "tool";
     const argsRaw = primary.args ?? primary.arguments ?? secondary?.args ?? secondary?.arguments;
     const result = primary.output !== void 0 ? primary.output : primary.result !== void 0 ? primary.result : secondary?.output !== void 0 ? secondary.output : secondary?.result;
     const status = normalizeToolStatus(primary.status ?? secondary?.status);
@@ -900,17 +882,7 @@ var extractToolCallsFromServerMessage = (msg) => {
     if (usedMetadataIndexes.has(index)) return;
     parsed.push(parseToolCall(toolCall));
   });
-  const seenIds = /* @__PURE__ */ new Set();
-  const deduped = [];
-  for (const p of parsed) {
-    const id = p.id;
-    if (typeof id === "string" && id.length > 0) {
-      if (seenIds.has(id)) continue;
-      seenIds.add(id);
-    }
-    deduped.push(p);
-  }
-  return deduped;
+  return parsed;
 };
 var extractToolResultUpdateFromMessage = (msg) => {
   if (msg.senderType !== "tool") return null;
@@ -1148,11 +1120,6 @@ function useCopilotz({
       return;
     }
     if (senderType === "agent" && typeof payload.content === "string") {
-      const trimmedContent = payload.content.trim();
-      const hasToolCalls = hasToolCallsInPayload(payload);
-      if (!trimmedContent && hasToolCalls) {
-        return;
-      }
       setMessages((prev) => {
         const next = [...prev];
         for (let i = next.length - 1; i >= 0; i--) {
@@ -1162,6 +1129,7 @@ function useCopilotz({
             return next;
           }
         }
+        const trimmedContent = payload.content.trim();
         if (!trimmedContent) {
           return prev;
         }
@@ -1218,11 +1186,9 @@ function useCopilotz({
     if (!nextThreadId && normalized.length > 0) {
       nextThreadId = normalized[0].id;
     }
-    if (nextThreadId) {
-      setCurrentThreadId(nextThreadId);
-      setCurrentThreadExternalId(externalMap[nextThreadId] ?? null);
-    }
-    return nextThreadId ?? curId ?? null;
+    setCurrentThreadId(nextThreadId ?? null);
+    setCurrentThreadExternalId(nextThreadId ? externalMap[nextThreadId] ?? null : null);
+    return nextThreadId;
   }, []);
   const fetchAndSetThreadsState = useCallback2(async (uid, preferredExternalId) => {
     try {
@@ -1417,60 +1383,57 @@ function useCopilotz({
     params.onBeforeStart?.(currentAssistantId);
     let hasStreamProgress = false;
     let pendingStartNewAssistantBubble = false;
-    const updateStreamingMessage = (partial, _isComplete, _raw, reasoningPartial) => {
+    const updateStreamingMessage = (partial, opts) => {
       if (partial && partial.length > 0) {
         hasStreamProgress = true;
       }
-      if (reasoningPartial !== void 0 && reasoningPartial.length > 0) {
-        hasStreamProgress = true;
-      }
       const nextStreaming = true;
       const nextComplete = false;
+      const isReasoning = opts?.isReasoning ?? false;
+      const applyUpdate = (msg) => {
+        if (isReasoning) {
+          return { ...msg, reasoning: partial, isReasoningStreaming: true, isStreaming: nextStreaming, isComplete: nextComplete };
+        }
+        const reasoningPatch = msg.reasoning ? { isReasoningStreaming: false } : {};
+        return { ...msg, content: partial, ...reasoningPatch, isStreaming: nextStreaming, isComplete: nextComplete };
+      };
       setMessages((prev) => {
-        const patch = (msg) => ({
-          ...msg,
-          content: partial,
-          ...reasoningPartial !== void 0 ? { reasoning: reasoningPartial } : {},
-          isStreaming: nextStreaming,
-          isComplete: nextComplete
-        });
         const idx = prev.findIndex((m) => m.id === currentAssistantId);
         if (idx >= 0 && prev[idx].role === "assistant" && prev[idx].isStreaming) {
           const msg = prev[idx];
-          if (msg.content === partial && (msg.reasoning ?? "") === (reasoningPartial ?? "") && msg.isStreaming === nextStreaming && msg.isComplete === nextComplete) {
+          const next = applyUpdate(msg);
+          if (msg.content === next.content && msg.reasoning === next.reasoning && msg.isReasoningStreaming === next.isReasoningStreaming && msg.isStreaming === next.isStreaming && msg.isComplete === next.isComplete) {
             return prev;
           }
           const updated = [...prev];
-          updated[idx] = patch(msg);
+          updated[idx] = next;
           return updated;
         }
         const last = prev[prev.length - 1];
         if (last && last.role === "assistant" && last.isStreaming) {
           currentAssistantId = last.id;
           pendingStartNewAssistantBubble = false;
-          if (last.content === partial && (last.reasoning ?? "") === (reasoningPartial ?? "") && last.isStreaming === nextStreaming && last.isComplete === nextComplete) {
+          const next = applyUpdate(last);
+          if (last.content === next.content && last.reasoning === next.reasoning && last.isReasoningStreaming === next.isReasoningStreaming && last.isStreaming === next.isStreaming && last.isComplete === next.isComplete) {
             return prev;
           }
           const updated = [...prev];
-          updated[prev.length - 1] = patch(last);
+          updated[prev.length - 1] = next;
           return updated;
         }
         if (pendingStartNewAssistantBubble || !prev.length || (prev[prev.length - 1].role !== "assistant" || !prev[prev.length - 1].isStreaming)) {
           const newId = generateId();
           currentAssistantId = newId;
           pendingStartNewAssistantBubble = false;
-          return [
-            ...prev,
-            {
-              id: newId,
-              role: "assistant",
-              content: partial,
-              ...reasoningPartial !== void 0 ? { reasoning: reasoningPartial } : {},
-              timestamp: nowTs(),
-              isStreaming: nextStreaming,
-              isComplete: nextComplete
-            }
-          ];
+          const base = {
+            id: newId,
+            role: "assistant",
+            content: "",
+            timestamp: nowTs(),
+            isStreaming: nextStreaming,
+            isComplete: nextComplete
+          };
+          return [...prev, applyUpdate(base)];
         }
         return prev;
       });
@@ -1493,21 +1456,37 @@ function useCopilotz({
       const payload = event?.payload ?? event;
       if (type === "TOOL_CALL") {
         const metadata = payload?.metadata ?? {};
-        const tc = payload?.toolCall ?? payload?.call ?? metadata.call;
-        const nestedTool = tc && typeof tc.tool === "object" && tc.tool !== null && !Array.isArray(tc.tool) ? tc.tool : void 0;
-        const toolName = (typeof nestedTool?.name === "string" ? nestedTool.name : void 0) || (typeof nestedTool?.id === "string" ? nestedTool.id : void 0) || (typeof payload.name === "string" ? payload.name : void 0) || metadata.toolName || "tool";
+        const tc = payload?.toolCall ?? void 0;
+        const tcTool = tc?.tool ?? void 0;
+        const call = payload?.call ?? metadata?.call;
+        const func = call?.function ?? payload?.function;
+        const toolName = tcTool?.name || func?.name || payload?.name || call?.name || metadata.toolName || metadata.tool || "tool";
         let argsObj = {};
-        const argsRaw = tc?.args ?? payload?.args ?? metadata.args;
-        if (typeof argsRaw === "string") {
+        const possibleArgs = [
+          tc?.args,
+          func?.arguments,
+          payload?.args,
+          call?.arguments,
+          metadata?.args,
+          metadata?.arguments
+        ];
+        for (const candidate of possibleArgs) {
+          if (candidate === void 0 || candidate === null) continue;
           try {
-            argsObj = JSON.parse(argsRaw);
+            if (typeof candidate === "string") {
+              argsObj = JSON.parse(candidate);
+              break;
+            }
+            if (typeof candidate === "object") {
+              argsObj = candidate;
+              break;
+            }
           } catch {
           }
-        } else if (argsRaw && typeof argsRaw === "object" && !Array.isArray(argsRaw)) {
-          argsObj = argsRaw;
         }
-        const callId = (typeof tc?.id === "string" ? tc.id : void 0) || (typeof payload.id === "string" ? payload.id : void 0) || generateId();
-        const statusVal = "running";
+        const output = (tc?.output !== void 0 ? tc.output : void 0) ?? (metadata?.output !== void 0 ? metadata.output : void 0) ?? (payload?.output !== void 0 ? payload.output : void 0);
+        const callId = tc?.id || call?.id || func?.id || payload?.id || generateId();
+        const statusVal = tc?.status || payload?.status || event?.status || "pending";
         return {
           id: generateId(),
           threadId: curThreadId ?? "",
@@ -1517,6 +1496,7 @@ function useCopilotz({
             id: callId,
             name: toolName,
             args: argsObj,
+            output,
             status: statusVal
           }]
         };
@@ -1595,9 +1575,7 @@ function useCopilotz({
         toolCalls: params.toolCalls,
         selectedAgent: params.agentName ?? preferredAgentRef.current ?? null,
         getRequestHeaders,
-        onToken: (token, isComplete, raw, reasoning) => {
-          updateStreamingMessage(token, isComplete, raw, reasoning);
-        },
+        onToken: (token, _isComplete, _raw, opts) => updateStreamingMessage(token, opts),
         onMessageEvent: async (event) => {
           const intercepted = applyEventInterceptor(event);
           if (intercepted?.handled) {
@@ -1607,9 +1585,6 @@ function useCopilotz({
           const payload = getEventPayload(event);
           if (type === "MESSAGE" || type === "NEW_MESSAGE") {
             const senderType = getEventSenderType(payload);
-            if (senderType === "agent" && hasStreamProgress) {
-              return;
-            }
             if (senderType === "tool") {
               const metadata = payload?.metadata ?? {};
               const toolCallsArray = metadata?.toolCalls;
@@ -1619,16 +1594,8 @@ function useCopilotz({
               }
               processToolOutput(metadata);
               const toolCallId = toolCallData.id;
-              const nestedTool = toolCallData.tool;
-              const toolCallName = toolCallData.name || (typeof nestedTool?.name === "string" ? nestedTool.name : void 0) || (typeof nestedTool?.id === "string" ? nestedTool.id : void 0);
-              const toolResultRaw = toolCallData.output || payload?.content;
-              const toolResult = typeof toolResultRaw === "string" ? (() => {
-                try {
-                  return JSON.parse(toolResultRaw);
-                } catch {
-                  return toolResultRaw;
-                }
-              })() : toolResultRaw;
+              const toolCallName = toolCallData.name;
+              const toolResult = toolCallData.output || payload?.content;
               const toolStatus = toolCallData.status || "completed";
               const isFailed = toolStatus === "failed" || toolCallData?.error;
               setMessages((prev) => {
@@ -1667,7 +1634,7 @@ function useCopilotz({
               return;
             }
             handleStreamMessageEvent(event);
-            if (senderType === "agent" && !isAgentToolOnlyPlaceholderPayload(payload)) {
+            if (senderType === "agent") {
               currentAssistantId = generateId();
               pendingStartNewAssistantBubble = true;
             }
@@ -1680,27 +1647,20 @@ function useCopilotz({
             if (!toolCall) return;
             setMessages(
               (prev) => (() => {
-                const appendToolCall = (msg) => {
-                  const existing = Array.isArray(msg.toolCalls) ? msg.toolCalls : [];
-                  const id = toolCall.id ?? generateId();
-                  if (existing.some((t) => t.id === id)) {
-                    return msg;
-                  }
-                  return {
-                    ...msg,
-                    toolCalls: [
-                      ...existing,
-                      {
-                        id,
-                        name: toolCall.name ?? "tool",
-                        arguments: toolCall.args ?? toolCall.arguments ?? {},
-                        result: toolCall.output,
-                        status: toolCall.status ?? "running",
-                        startTime: Date.now()
-                      }
-                    ]
-                  };
-                };
+                const appendToolCall = (msg) => ({
+                  ...msg,
+                  toolCalls: [
+                    ...Array.isArray(msg.toolCalls) ? msg.toolCalls : [],
+                    {
+                      id: toolCall.id ?? generateId(),
+                      name: toolCall.name ?? "tool",
+                      arguments: toolCall.args ?? toolCall.arguments ?? {},
+                      result: toolCall.output,
+                      status: toolCall.status ?? "running",
+                      startTime: Date.now()
+                    }
+                  ]
+                });
                 const currentIdx = prev.findIndex((message) => message.id === currentAssistantId && message.role === "assistant" && message.isStreaming);
                 if (currentIdx >= 0) {
                   const next = [...prev];
@@ -1712,7 +1672,7 @@ function useCopilotz({
                   return next;
                 }
                 const last = prev[prev.length - 1];
-                if (last?.role === "assistant" && last.isStreaming) {
+                if (!pendingStartNewAssistantBubble && last?.role === "assistant" && last.isStreaming) {
                   currentAssistantId = last.id;
                   const next = [...prev];
                   next[prev.length - 1] = appendToolCall({
@@ -1739,6 +1699,7 @@ function useCopilotz({
               })()
             );
             hasStreamProgress = true;
+            pendingStartNewAssistantBubble = true;
             return;
           }
           const sm = await toServerMessageFromEvent(event);
@@ -1797,10 +1758,8 @@ function useCopilotz({
         effectiveThreadExternalId = generateId();
       }
       setCurrentThreadExternalId(effectiveThreadExternalId);
-      currentThreadExternalIdRef.current = effectiveThreadExternalId;
     } else if (curThreadExtId !== (effectiveThreadExternalId ?? null)) {
       setCurrentThreadExternalId(effectiveThreadExternalId ?? null);
-      currentThreadExternalIdRef.current = effectiveThreadExternalId ?? null;
     }
     const conversationKey = threadIdForSend ?? effectiveThreadExternalId;
     const currentMetadata = threadMetadataMapRef.current[conversationKey];
@@ -1834,13 +1793,6 @@ function useCopilotz({
       setThreads((prev) => [newThread, ...prev]);
       setThreadMetadataMap((prev) => ({ ...prev, [conversationKey]: {} }));
       setThreadExternalIdMap((prev) => ({ ...prev, [conversationKey]: effectiveThreadExternalId ?? null }));
-      setCurrentThreadId(conversationKey);
-      currentThreadIdRef.current = conversationKey;
-      threadsRef.current = [newThread, ...threadsRef.current];
-      threadExternalIdMapRef.current = {
-        ...threadExternalIdMapRef.current,
-        [conversationKey]: effectiveThreadExternalId ?? null
-      };
     }
     try {
       await sendCopilotzMessage({