@emblemvault/hustle-react 1.4.1 → 1.4.3

package/dist/components/index.cjs

@@ -3623,7 +3623,14 @@ function HustleChat({
     setIsStreaming(true);
     setCurrentToolCalls([]);
     try {
-      const chatMessages = messagesRef.current.filter((m) => !m.isStreaming).map((m) => ({ role: m.role, content: m.content }));
+      const chatMessages = messagesRef.current.filter((m) => !m.isStreaming).map((m) => {
+        const msg = { role: m.role, content: m.content };
+        if (m.role === "assistant" && m.toolInvocations && m.toolInvocations.length > 0) {
+          msg.toolInvocations = m.toolInvocations;
+          msg.parts = m.parts;
+        }
+        return msg;
+      });
       chatMessages.push({ role: "user", content: "continue" });
       const stream = chatStream({
         messages: chatMessages,
@@ -3631,6 +3638,9 @@ function HustleChat({
       });
       let fullContent = "";
       const toolCallsAccumulated = [];
+      const toolInvocationsAccumulated = [];
+      const partsAccumulated = [{ type: "step-start" }];
+      let stepCounter = 0;
       for await (const chunk of stream) {
         if (chunk.type === "text") {
           fullContent += chunk.value;
@@ -3642,22 +3652,79 @@ function HustleChat({
         } else if (chunk.type === "tool_call") {
           const toolCall = chunk.value;
           toolCallsAccumulated.push(toolCall);
+          const invocation = {
+            state: "call",
+            step: stepCounter++,
+            toolCallId: toolCall.toolCallId,
+            toolName: toolCall.toolName,
+            args: toolCall.args
+          };
+          toolInvocationsAccumulated.push(invocation);
+          partsAccumulated.push({ type: "tool-invocation", toolInvocation: invocation });
           setCurrentToolCalls([...toolCallsAccumulated]);
           setMessages(
             (prev) => prev.map(
-              (m) => m.id === assistantMessage.id ? { ...m, toolCalls: [...toolCallsAccumulated] } : m
+              (m) => m.id === assistantMessage.id ? {
+                ...m,
+                toolCalls: [...toolCallsAccumulated],
+                toolInvocations: [...toolInvocationsAccumulated],
+                parts: [...partsAccumulated]
+              } : m
             )
           );
           onToolCall?.(toolCall);
+        } else if (chunk.type === "tool_result") {
+          const toolResult = chunk.value;
+          const invocationIndex = toolInvocationsAccumulated.findIndex(
+            (inv) => inv.toolCallId === toolResult.toolCallId
+          );
+          if (invocationIndex !== -1) {
+            toolInvocationsAccumulated[invocationIndex] = {
+              ...toolInvocationsAccumulated[invocationIndex],
+              state: "result",
+              result: toolResult.result
+            };
+            const partIndex = partsAccumulated.findIndex(
+              (p) => p.type === "tool-invocation" && p.toolInvocation.toolCallId === toolResult.toolCallId
+            );
+            if (partIndex !== -1) {
+              partsAccumulated[partIndex] = {
+                type: "tool-invocation",
+                toolInvocation: toolInvocationsAccumulated[invocationIndex]
+              };
+            }
+          }
+          setMessages(
+            (prev) => prev.map(
+              (m) => m.id === assistantMessage.id ? {
+                ...m,
+                toolInvocations: [...toolInvocationsAccumulated],
+                parts: [...partsAccumulated]
+              } : m
+            )
+          );
         } else if (chunk.type === "error") {
           console.error("Stream error:", chunk.value);
         }
       }
       const processedResponse = await stream.response;
       const finalContent = processedResponse?.content || fullContent || "(No response)";
+      const finalParts = [{ type: "step-start" }];
+      if (finalContent) {
+        finalParts.push({ type: "text", text: finalContent });
+      }
+      for (const inv of toolInvocationsAccumulated) {
+        finalParts.push({ type: "tool-invocation", toolInvocation: inv });
+      }
       setMessages(
         (prev) => prev.map(
-          (m) => m.id === assistantMessage.id ? { ...m, isStreaming: false, content: finalContent } : m
+          (m) => m.id === assistantMessage.id ? {
+            ...m,
+            isStreaming: false,
+            content: finalContent,
+            toolInvocations: toolInvocationsAccumulated.length > 0 ? toolInvocationsAccumulated : void 0,
+            parts: toolInvocationsAccumulated.length > 0 ? finalParts : void 0
+          } : m
         )
       );
       onResponse?.(finalContent);
@@ -3719,7 +3786,14 @@ function HustleChat({
     setIsStreaming(true);
     setCurrentToolCalls([]);
     try {
-      const chatMessages = messages.filter((m) => !m.isStreaming).map((m) => ({ role: m.role, content: m.content }));
+      const chatMessages = messages.filter((m) => !m.isStreaming).map((m) => {
+        const msg = { role: m.role, content: m.content };
+        if (m.role === "assistant" && m.toolInvocations && m.toolInvocations.length > 0) {
+          msg.toolInvocations = m.toolInvocations;
+          msg.parts = m.parts;
+        }
+        return msg;
+      });
       chatMessages.push({ role: "user", content });
       const stream = chatStream({
         messages: chatMessages,
@@ -3729,6 +3803,9 @@ function HustleChat({
       setAttachments([]);
       let fullContent = "";
       const toolCallsAccumulated = [];
+      const toolInvocationsAccumulated = [];
+      const partsAccumulated = [{ type: "step-start" }];
+      let stepCounter = 0;
       for await (const chunk of stream) {
         if (chunk.type === "text") {
           fullContent += chunk.value;
@@ -3740,22 +3817,79 @@ function HustleChat({
         } else if (chunk.type === "tool_call") {
           const toolCall = chunk.value;
           toolCallsAccumulated.push(toolCall);
+          const invocation = {
+            state: "call",
+            step: stepCounter++,
+            toolCallId: toolCall.toolCallId,
+            toolName: toolCall.toolName,
+            args: toolCall.args
+          };
+          toolInvocationsAccumulated.push(invocation);
+          partsAccumulated.push({ type: "tool-invocation", toolInvocation: invocation });
           setCurrentToolCalls([...toolCallsAccumulated]);
           setMessages(
             (prev) => prev.map(
-              (m) => m.id === assistantMessage.id ? { ...m, toolCalls: [...toolCallsAccumulated] } : m
+              (m) => m.id === assistantMessage.id ? {
+                ...m,
+                toolCalls: [...toolCallsAccumulated],
+                toolInvocations: [...toolInvocationsAccumulated],
+                parts: [...partsAccumulated]
+              } : m
             )
           );
           onToolCall?.(toolCall);
+        } else if (chunk.type === "tool_result") {
+          const toolResult = chunk.value;
+          const invocationIndex = toolInvocationsAccumulated.findIndex(
+            (inv) => inv.toolCallId === toolResult.toolCallId
+          );
+          if (invocationIndex !== -1) {
+            toolInvocationsAccumulated[invocationIndex] = {
+              ...toolInvocationsAccumulated[invocationIndex],
+              state: "result",
+              result: toolResult.result
+            };
+            const partIndex = partsAccumulated.findIndex(
+              (p) => p.type === "tool-invocation" && p.toolInvocation.toolCallId === toolResult.toolCallId
+            );
+            if (partIndex !== -1) {
+              partsAccumulated[partIndex] = {
+                type: "tool-invocation",
+                toolInvocation: toolInvocationsAccumulated[invocationIndex]
+              };
+            }
+          }
+          setMessages(
+            (prev) => prev.map(
+              (m) => m.id === assistantMessage.id ? {
+                ...m,
+                toolInvocations: [...toolInvocationsAccumulated],
+                parts: [...partsAccumulated]
+              } : m
+            )
+          );
         } else if (chunk.type === "error") {
           console.error("Stream error:", chunk.value);
         }
       }
       const processedResponse = await stream.response;
       const finalContent = processedResponse?.content || fullContent || "(No response)";
+      const finalParts = [{ type: "step-start" }];
+      if (finalContent) {
+        finalParts.push({ type: "text", text: finalContent });
+      }
+      for (const inv of toolInvocationsAccumulated) {
+        finalParts.push({ type: "tool-invocation", toolInvocation: inv });
+      }
       setMessages(
         (prev) => prev.map(
-          (m) => m.id === assistantMessage.id ? { ...m, isStreaming: false, content: finalContent } : m
+          (m) => m.id === assistantMessage.id ? {
+            ...m,
+            isStreaming: false,
+            content: finalContent,
+            toolInvocations: toolInvocationsAccumulated.length > 0 ? toolInvocationsAccumulated : void 0,
+            parts: toolInvocationsAccumulated.length > 0 ? finalParts : void 0
+          } : m
         )
       );
       onResponse?.(finalContent);