@gendive/chatllm 0.17.25 → 0.17.26

package/dist/react/index.js

@@ -2634,6 +2634,7 @@ ${finalContent}`;
     try {
       const shouldSkipSkillParsing = skipNextSkillParsingRef.current;
       skipNextSkillParsingRef.current = false;
+      let accumulatedContent = "";
       let messagesToSend = [...existingMessages, userMessage];
       const recompressionThreshold = DEFAULT_RECOMPRESSION_THRESHOLD;
       const tokenLimit = DEFAULT_TOKEN_LIMIT;
@@ -2722,6 +2723,7 @@ ${attachmentContext}
           systemPrompt: combinedSystemPrompt
         });
         if (typeof result === "string") {
+          accumulatedContent = result;
           setSessions(
             (prev) => prev.map((s) => {
               if (s.id === capturedSessionId) {
@@ -2735,9 +2737,8 @@ ${attachmentContext}
               return s;
             })
           );
-          return;
-        }
-        if (typeof result === "object" && "content" in result) {
+        } else if (typeof result === "object" && "content" in result) {
+          accumulatedContent = result.content;
           setSessions(
             (prev) => prev.map((s) => {
               if (s.id === capturedSessionId) {
@@ -2751,9 +2752,9 @@ ${attachmentContext}
               return s;
             })
           );
-          return;
+        } else {
+          response = new Response(result);
         }
-        response = new Response(result);
       } else {
         const isOllama = provider === "ollama" || apiEndpoint.includes("ollama") || apiEndpoint.includes("11434");
         const requestBody = isOllama ? { model: selectedModel, messages: messagesForApi, stream: true } : {
@@ -2770,104 +2771,105 @@ ${attachmentContext}
           signal: abortControllerRef.current.signal
         });
       }
-      if (!response.ok) throw new Error("API error");
-      const reader = response.body?.getReader();
-      if (!reader) throw new Error("No reader");
-      const decoder = new TextDecoder();
-      let buffer = "";
-      let accumulatedContent = "";
-      let skillTagDetected = false;
-      let checklistTagDetected = false;
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) break;
-        buffer += decoder.decode(value, { stream: true });
-        const lines = buffer.split("\n");
-        buffer = lines.pop() || "";
-        for (const line of lines) {
-          if (!line.trim()) continue;
-          let data = line;
-          if (line.startsWith("data: ")) {
-            data = line.slice(6);
-            if (data === "[DONE]") continue;
+      if (response) {
+        if (!response.ok) throw new Error("API error");
+        const reader = response.body?.getReader();
+        if (!reader) throw new Error("No reader");
+        const decoder = new TextDecoder();
+        let buffer = "";
+        let skillTagDetected = false;
+        let checklistTagDetected = false;
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          buffer += decoder.decode(value, { stream: true });
+          const lines = buffer.split("\n");
+          buffer = lines.pop() || "";
+          for (const line of lines) {
+            if (!line.trim()) continue;
+            let data = line;
+            if (line.startsWith("data: ")) {
+              data = line.slice(6);
+              if (data === "[DONE]") continue;
+            }
+            try {
+              const parsed = JSON.parse(data);
+              const content2 = parsed.message?.content || parsed.content || parsed.text || "";
+              const thinking = parsed.message?.thinking || "";
+              if (content2 || thinking) {
+                if (content2) accumulatedContent += content2;
+                if (!shouldSkipSkillParsing && accumulatedContent.includes("</skill_use>")) {
+                  const endIdx = accumulatedContent.indexOf("</skill_use>");
+                  accumulatedContent = accumulatedContent.substring(0, endIdx + "</skill_use>".length);
+                  skillTagDetected = true;
+                }
+                if (!skipNextChecklistParsingRef.current && accumulatedContent.includes("</checklist>")) {
+                  const endIdx = accumulatedContent.indexOf("</checklist>");
+                  accumulatedContent = accumulatedContent.substring(0, endIdx + "</checklist>".length);
+                  checklistTagDetected = true;
+                }
+                const displayContent = skillTagDetected ? accumulatedContent : null;
+                setSessions(
+                  (prev) => prev.map((s) => {
+                    if (s.id === capturedSessionId) {
+                      return {
+                        ...s,
+                        messages: s.messages.map((m) => {
+                          if (m.id !== assistantMessageId) return m;
+                          if (displayContent) {
+                            return { ...m, content: displayContent };
+                          }
+                          let newContent = m.content;
+                          if (thinking) {
+                            if (!newContent.includes("<thinking>")) {
+                              newContent = "<thinking>" + thinking;
+                            } else if (!newContent.includes("</thinking>")) {
+                              newContent += thinking;
+                            }
+                          }
+                          if (content2) {
+                            if (newContent.includes("<thinking>") && !newContent.includes("</thinking>")) {
+                              newContent += "</thinking>\n\n";
+                            }
+                            newContent += content2;
+                          }
+                          return { ...m, content: newContent };
+                        })
+                      };
+                    }
+                    return s;
+                  })
+                );
+                if (skillTagDetected || checklistTagDetected) break;
+              }
+            } catch {
+            }
           }
+          if (skillTagDetected || checklistTagDetected) break;
+        }
+        if (buffer.trim()) {
           try {
-            const parsed = JSON.parse(data);
-            const content2 = parsed.message?.content || parsed.content || parsed.text || "";
-            const thinking = parsed.message?.thinking || "";
-            if (content2 || thinking) {
-              if (content2) accumulatedContent += content2;
-              if (!shouldSkipSkillParsing && accumulatedContent.includes("</skill_use>")) {
-                const endIdx = accumulatedContent.indexOf("</skill_use>");
-                accumulatedContent = accumulatedContent.substring(0, endIdx + "</skill_use>".length);
-                skillTagDetected = true;
-              }
-              if (!skipNextChecklistParsingRef.current && accumulatedContent.includes("</checklist>")) {
-                const endIdx = accumulatedContent.indexOf("</checklist>");
-                accumulatedContent = accumulatedContent.substring(0, endIdx + "</checklist>".length);
-                checklistTagDetected = true;
-              }
-              const displayContent = skillTagDetected ? accumulatedContent : null;
+            const parsed = JSON.parse(buffer);
+            const content2 = parsed.message?.content || parsed.content || parsed.text;
+            if (content2) {
+              accumulatedContent += content2;
               setSessions(
                 (prev) => prev.map((s) => {
                   if (s.id === capturedSessionId) {
                     return {
                       ...s,
-                      messages: s.messages.map((m) => {
-                        if (m.id !== assistantMessageId) return m;
-                        if (displayContent) {
-                          return { ...m, content: displayContent };
-                        }
-                        let newContent = m.content;
-                        if (thinking) {
-                          if (!newContent.includes("<thinking>")) {
-                            newContent = "<thinking>" + thinking;
-                          } else if (!newContent.includes("</thinking>")) {
-                            newContent += thinking;
-                          }
-                        }
-                        if (content2) {
-                          if (newContent.includes("<thinking>") && !newContent.includes("</thinking>")) {
-                            newContent += "</thinking>\n\n";
-                          }
-                          newContent += content2;
-                        }
-                        return { ...m, content: newContent };
-                      })
+                      messages: s.messages.map(
+                        (m) => m.id === assistantMessageId ? { ...m, content: m.content + content2 } : m
+                      )
                     };
                   }
                   return s;
                 })
               );
-              if (skillTagDetected || checklistTagDetected) break;
             }
           } catch {
           }
         }
-        if (skillTagDetected || checklistTagDetected) break;
-      }
-      if (buffer.trim()) {
-        try {
-          const parsed = JSON.parse(buffer);
-          const content2 = parsed.message?.content || parsed.content || parsed.text;
-          if (content2) {
-            accumulatedContent += content2;
-            setSessions(
-              (prev) => prev.map((s) => {
-                if (s.id === capturedSessionId) {
-                  return {
-                    ...s,
-                    messages: s.messages.map(
-                      (m) => m.id === assistantMessageId ? { ...m, content: m.content + content2 } : m
-                    )
-                  };
-                }
-                return s;
-              })
-            );
-          }
-        } catch {
-        }
       }
       const saveMessagesOnEarlyReturn = () => {
         if (!useExternalStorage || !capturedSessionId) return;