@gendive/chatllm 0.17.30 → 0.17.31

package/dist/react/index.js

@@ -2955,6 +2955,7 @@ ${attachmentContext}
         }
         if (detectedSkill && !resolvedSkills[detectedSkill.name]) {
           console.warn(`[useChatUI] \uC2A4\uD0AC "${detectedSkill.name}" \uAC10\uC9C0\uB418\uC5C8\uC73C\uB098 \uBBF8\uB4F1\uB85D. \uB4F1\uB85D\uB41C \uC2A4\uD0AC:`, Object.keys(resolvedSkills));
+          accumulatedContent = skillCleanContent;
           setSessions(
             (prev) => prev.map((s) => {
               if (s.id !== capturedSessionId) return s;
@@ -2969,84 +2970,157 @@ ${attachmentContext}
           );
         }
         if (detectedSkill && resolvedSkills[detectedSkill.name]) {
-          setSessions(
-            (prev) => prev.map((s) => {
-              if (s.id !== capturedSessionId) return s;
-              return {
-                ...s,
-                messages: s.messages.map((m) => {
-                  if (m.id !== assistantMessageId) return m;
-                  return {
-                    ...m,
-                    content: skillCleanContent,
-                    skillExecution: {
-                      skillName: detectedSkill.name,
-                      params: detectedSkill.params,
-                      status: "executing"
-                    }
-                  };
-                })
-              };
-            })
-          );
-          let streamedReport = "";
-          const { result } = await handleSkillCall(assistantContent, {
-            onProgress: (progress) => {
-              setSessions(
-                (prev) => prev.map((s) => {
-                  if (s.id !== capturedSessionId) return s;
-                  return {
-                    ...s,
-                    messages: s.messages.map((m) => {
-                      if (m.id !== assistantMessageId) return m;
-                      return {
-                        ...m,
-                        skillExecution: { ...m.skillExecution, progress }
-                      };
-                    })
-                  };
-                })
-              );
-            },
-            onStream: (chunk) => {
-              streamedReport += chunk;
-              setSessions(
-                (prev) => prev.map((s) => {
-                  if (s.id !== capturedSessionId) return s;
-                  return {
-                    ...s,
-                    messages: s.messages.map((m) => {
-                      if (m.id !== assistantMessageId) return m;
-                      return { ...m, content: streamedReport };
-                    })
-                  };
-                })
-              );
-            },
-            signal: abortControllerRef.current?.signal
-          });
-          if (result) {
-            if (result.metadata?.__toolResult__) {
-              const resultType = result.metadata.resultType;
-              const toolName = result.metadata.toolName;
-              const toolLabel = result.metadata.toolLabel;
-              const toolIcon = result.metadata.toolIcon;
-              const parts = [];
-              if (skillCleanContent.trim()) {
-                parts.push({ type: "text", content: skillCleanContent });
+          if (activeChecklistRef.current) {
+            console.log("[useChatUI] \uCCB4\uD06C\uB9AC\uC2A4\uD2B8 \uB2E8\uACC4 \uB0B4 \uC2A4\uD0AC \uC2E4\uD589:", detectedSkill.name);
+            accumulatedContent = skillCleanContent;
+            setSessions(
+              (prev) => prev.map((s) => {
+                if (s.id !== capturedSessionId) return s;
+                return { ...s, messages: s.messages.map((m) => m.id !== assistantMessageId ? m : { ...m, content: skillCleanContent }) };
+              })
+            );
+            try {
+              const { result: skillResult } = await handleSkillCall(assistantContent, {
+                signal: abortControllerRef.current?.signal
+              });
+              if (skillResult?.content) {
+                accumulatedContent = skillResult.content;
               }
-              parts.push({
-                type: "tool_result",
-                toolName,
-                label: toolLabel,
-                icon: toolIcon,
-                result: {
-                  type: resultType,
-                  content: result.content,
-                  metadata: result.metadata,
-                  sources: result.sources
+            } catch (e) {
+              console.warn("[useChatUI] \uCCB4\uD06C\uB9AC\uC2A4\uD2B8 \uB0B4 \uC2A4\uD0AC \uC2E4\uD589 \uC2E4\uD328:", e);
+            }
+          } else {
+            setSessions(
+              (prev) => prev.map((s) => {
+                if (s.id !== capturedSessionId) return s;
+                return {
+                  ...s,
+                  messages: s.messages.map((m) => {
+                    if (m.id !== assistantMessageId) return m;
+                    return {
+                      ...m,
+                      content: skillCleanContent,
+                      skillExecution: {
+                        skillName: detectedSkill.name,
+                        params: detectedSkill.params,
+                        status: "executing"
+                      }
+                    };
+                  })
+                };
+              })
+            );
+            let streamedReport = "";
+            const { result } = await handleSkillCall(assistantContent, {
+              onProgress: (progress) => {
+                setSessions(
+                  (prev) => prev.map((s) => {
+                    if (s.id !== capturedSessionId) return s;
+                    return {
+                      ...s,
+                      messages: s.messages.map((m) => {
+                        if (m.id !== assistantMessageId) return m;
+                        return {
+                          ...m,
+                          skillExecution: { ...m.skillExecution, progress }
+                        };
+                      })
+                    };
+                  })
+                );
+              },
+              onStream: (chunk) => {
+                streamedReport += chunk;
+                setSessions(
+                  (prev) => prev.map((s) => {
+                    if (s.id !== capturedSessionId) return s;
+                    return {
+                      ...s,
+                      messages: s.messages.map((m) => {
+                        if (m.id !== assistantMessageId) return m;
+                        return { ...m, content: streamedReport };
+                      })
+                    };
+                  })
+                );
+              },
+              signal: abortControllerRef.current?.signal
+            });
+            if (result) {
+              if (result.metadata?.__toolResult__) {
+                const resultType = result.metadata.resultType;
+                const toolName = result.metadata.toolName;
+                const toolLabel = result.metadata.toolLabel;
+                const toolIcon = result.metadata.toolIcon;
+                const parts = [];
+                if (skillCleanContent.trim()) {
+                  parts.push({ type: "text", content: skillCleanContent });
                 }
-              });
+                parts.push({
+                  type: "tool_result",
+                  toolName,
+                  label: toolLabel,
+                  icon: toolIcon,
+                  result: {
+                    type: resultType,
+                    content: result.content,
+                    metadata: result.metadata,
+                    sources: result.sources
+                  }
+                });
+                setSessions(
+                  (prev) => prev.map((s) => {
+                    if (s.id !== capturedSessionId) return s;
+                    return {
+                      ...s,
+                      messages: s.messages.map((m) => {
+                        if (m.id !== assistantMessageId) return m;
+                        return {
+                          ...m,
+                          contentParts: parts,
+                          skillExecution: {
+                            ...m.skillExecution,
+                            status: "done",
+                            result
+                          }
+                        };
+                      })
+                    };
+                  })
+                );
+                if (resultType === "image" || resultType === "file") {
+                  saveMessagesOnEarlyReturn();
+                  setIsLoading(false);
+                  abortControllerRef.current = null;
+                  return;
+                }
+                let shouldContinue = continueAfterToolResult;
+                if (onSkillCompleteRef.current) {
+                  const decision = onSkillCompleteRef.current(toolName, result);
+                  shouldContinue = decision === "continue";
+                }
+                if (!shouldContinue) {
+                  saveMessagesOnEarlyReturn();
+                  setIsLoading(false);
+                  abortControllerRef.current = null;
+                  return;
+                }
+                skipNextSkillParsingRef.current = true;
+                saveMessagesOnEarlyReturn();
+                const feedbackPrompt = resultType === "error" ? `\uB3C4\uAD6C "${toolName}" \uC2E4\uD589 \uC911 \uC624\uB958 \uBC1C\uC0DD: ${result.content}
+
+\uC0AC\uC6A9\uC790\uC5D0\uAC8C \uC624\uB958\uB97C \uC548\uB0B4\uD574\uC8FC\uC138\uC694. skill_use \uD0DC\uADF8\uB294 \uC0AC\uC6A9\uD558\uC9C0 \uB9C8\uC138\uC694.` : `\uB3C4\uAD6C "${toolName}" \uACB0\uACFC:
+
+${result.content}
+
+\uC704 \uACB0\uACFC\uB97C \uBC14\uD0D5\uC73C\uB85C \uB2F5\uBCC0\uD574\uC8FC\uC138\uC694. skill_use \uD0DC\uADF8\uB294 \uC0AC\uC6A9\uD558\uC9C0 \uB9C8\uC138\uC694.`;
+                setTimeout(() => {
+                  sendMessage(feedbackPrompt, { hiddenUserMessage: true });
+                }, 100);
+                setIsLoading(false);
+                abortControllerRef.current = null;
+                return;
+              }
               setSessions(
                 (prev) => prev.map((s) => {
                   if (s.id !== capturedSessionId) return s;
@@ -3056,7 +3130,7 @@ ${attachmentContext}
                       if (m.id !== assistantMessageId) return m;
                       return {
                         ...m,
-                        contentParts: parts,
+                        sources: result.sources || m.sources,
                         skillExecution: {
                           ...m.skillExecution,
                           status: "done",
@@ -3067,18 +3141,18 @@ ${attachmentContext}
                   };
                 })
               );
-              if (resultType === "image" || resultType === "file") {
+              if (streamedReport) {
                 saveMessagesOnEarlyReturn();
                 setIsLoading(false);
                 abortControllerRef.current = null;
                 return;
               }
-              let shouldContinue = continueAfterToolResult;
+              let shouldContinueSkill = continueAfterToolResult;
               if (onSkillCompleteRef.current) {
-                const decision = onSkillCompleteRef.current(toolName, result);
-                shouldContinue = decision === "continue";
+                const decision = onSkillCompleteRef.current(detectedSkill.name, result);
+                shouldContinueSkill = decision === "continue";
               }
-              if (!shouldContinue) {
+              if (!shouldContinueSkill) {
                 saveMessagesOnEarlyReturn();
                 setIsLoading(false);
                 abortControllerRef.current = null;
@@ -3086,70 +3160,18 @@ ${attachmentContext}
               }
               skipNextSkillParsingRef.current = true;
               saveMessagesOnEarlyReturn();
-              const feedbackPrompt = resultType === "error" ? `\uB3C4\uAD6C "${toolName}" \uC2E4\uD589 \uC911 \uC624\uB958 \uBC1C\uC0DD: ${result.content}
-
-\uC0AC\uC6A9\uC790\uC5D0\uAC8C \uC624\uB958\uB97C \uC548\uB0B4\uD574\uC8FC\uC138\uC694. skill_use \uD0DC\uADF8\uB294 \uC0AC\uC6A9\uD558\uC9C0 \uB9C8\uC138\uC694.` : `\uB3C4\uAD6C "${toolName}" \uACB0\uACFC:
+              const resultPrompt = `\uC2A4\uD0AC "${detectedSkill.name}" \uC2E4\uD589 \uACB0\uACFC:
 
 ${result.content}
 
-\uC704 \uACB0\uACFC\uB97C \uBC14\uD0D5\uC73C\uB85C \uB2F5\uBCC0\uD574\uC8FC\uC138\uC694. skill_use \uD0DC\uADF8\uB294 \uC0AC\uC6A9\uD558\uC9C0 \uB9C8\uC138\uC694.`;
+\uC704 \uACB0\uACFC\uB97C \uBC14\uD0D5\uC73C\uB85C \uC0AC\uC6A9\uC790\uC758 \uC6D0\uB798 \uC9C8\uBB38\uC5D0 \uB2F5\uBCC0\uD574\uC8FC\uC138\uC694. skill_use \uD0DC\uADF8\uB294 \uC0AC\uC6A9\uD558\uC9C0 \uB9C8\uC138\uC694.`;
               setTimeout(() => {
-                sendMessage(feedbackPrompt, { hiddenUserMessage: true });
+                sendMessage(resultPrompt, { hiddenUserMessage: true });
               }, 100);
               setIsLoading(false);
               abortControllerRef.current = null;
               return;
             }
-            setSessions(
-              (prev) => prev.map((s) => {
-                if (s.id !== capturedSessionId) return s;
-                return {
-                  ...s,
-                  messages: s.messages.map((m) => {
-                    if (m.id !== assistantMessageId) return m;
-                    return {
-                      ...m,
-                      sources: result.sources || m.sources,
-                      skillExecution: {
-                        ...m.skillExecution,
-                        status: "done",
-                        result
-                      }
-                    };
-                  })
-                };
-              })
-            );
-            if (streamedReport) {
-              saveMessagesOnEarlyReturn();
-              setIsLoading(false);
-              abortControllerRef.current = null;
-              return;
-            }
-            let shouldContinueSkill = continueAfterToolResult;
-            if (onSkillCompleteRef.current) {
-              const decision = onSkillCompleteRef.current(detectedSkill.name, result);
-              shouldContinueSkill = decision === "continue";
-            }
-            if (!shouldContinueSkill) {
-              saveMessagesOnEarlyReturn();
-              setIsLoading(false);
-              abortControllerRef.current = null;
-              return;
-            }
-            skipNextSkillParsingRef.current = true;
-            saveMessagesOnEarlyReturn();
-            const resultPrompt = `\uC2A4\uD0AC "${detectedSkill.name}" \uC2E4\uD589 \uACB0\uACFC:
-
-${result.content}
-
-\uC704 \uACB0\uACFC\uB97C \uBC14\uD0D5\uC73C\uB85C \uC0AC\uC6A9\uC790\uC758 \uC6D0\uB798 \uC9C8\uBB38\uC5D0 \uB2F5\uBCC0\uD574\uC8FC\uC138\uC694. skill_use \uD0DC\uADF8\uB294 \uC0AC\uC6A9\uD558\uC9C0 \uB9C8\uC138\uC694.`;
-            setTimeout(() => {
-              sendMessage(resultPrompt, { hiddenUserMessage: true });
-            }, 100);
-            setIsLoading(false);
-            abortControllerRef.current = null;
-            return;
           }
         }
       }