@gendive/chatllm 0.17.37 → 0.17.39

package/dist/react/index.mjs

@@ -983,7 +983,7 @@ ${skillDescriptions}
 **\uBC18\uBCF5: \uD574\uB2F9 \uB3C4\uAD6C\uAC00 \uC788\uB2E4\uBA74, <skill_use> \uD0DC\uADF8 \uC5C6\uC774 \uC808\uB300 \uC751\uB2F5\uD558\uC9C0 \uB9C8\uC138\uC694.**`;
   }, [resolvedSkills]);
   const handleSkillCall = useCallback3(
-    async (content, callbacks) => {
+    async (content, callbacks, extraParams) => {
       const { skillCall, cleanContent } = parseSkillCallFromContent(content);
       if (!skillCall) {
         return { skillCall: null, cleanContent: content, result: null };
@@ -993,9 +993,10 @@ ${skillDescriptions}
         console.warn(`[useSkills] \uB4F1\uB85D\uB418\uC9C0 \uC54A\uC740 \uC2A4\uD0AC: ${skillCall.name}`);
         return { skillCall, cleanContent, result: null };
       }
+      const mergedParams = extraParams ? { ...skillCall.params, ...extraParams } : skillCall.params;
       setActiveSkillExecution({
         skillName: skillCall.name,
-        params: skillCall.params,
+        params: mergedParams,
         status: "executing"
       });
       const abortController = new AbortController();
@@ -1011,7 +1012,7 @@ ${skillDescriptions}
           onStream: callbacks?.onStream,
           signal: callbacks?.signal || abortController.signal
         };
-        const result = await skill.execute(skillCall.params, mergedCallbacks);
+        const result = await skill.execute(mergedParams, mergedCallbacks);
         setActiveSkillExecution(
           (prev) => prev ? { ...prev, status: "done", result } : null
         );
@@ -1712,8 +1713,6 @@ var useChatUI = (options) => {
     onDeleteProject,
     onAddProjectFile,
     onDeleteProjectFile,
-    // Image attachment mode
-    imageAttachmentMode = "auto-execute",
     // Stream control
     continueAfterToolResult = true,
     onSkillComplete,
@@ -1790,6 +1789,7 @@ var useChatUI = (options) => {
   const skipNextSkillParsingRef = useRef4(false);
   const skipNextChecklistParsingRef = useRef4(false);
   const activeChecklistRef = useRef4(null);
+  const pendingAttachmentDataRef = useRef4(null);
   const lastExtractionMsgCountRef = useRef4(0);
   const memoryOptions = useMemo2(
     () => ({
@@ -2534,20 +2534,12 @@ ${finalContent}`;
       })
     );
     let attachmentResults = [];
-    const aiDecideImageAttachments = [];
     if (currentAttachments.length > 0) {
-      const autoExecAttachments = imageAttachmentMode === "ai-decide" ? currentAttachments.filter((att) => {
-        if (att.type === "image") {
-          aiDecideImageAttachments.push(att);
-          return false;
-        }
-        return true;
-      }) : currentAttachments;
       const attachmentSkills = Object.entries(resolvedSkills).filter(
         ([, config]) => config.trigger === "attachment"
       );
       for (const [skillName, skillConfig] of attachmentSkills) {
-        const matchedFiles = autoExecAttachments.filter((att) => {
+        const matchedFiles = currentAttachments.filter((att) => {
           if (!skillConfig.acceptedTypes || skillConfig.acceptedTypes.length === 0) return true;
           return skillConfig.acceptedTypes.some((type) => {
             if (type.startsWith(".")) return att.name.toLowerCase().endsWith(type.toLowerCase());
@@ -2632,6 +2624,14 @@ ${finalContent}`;
           );
         }
       }
+      const hasImageAttachments = currentAttachments.some((a) => a.type === "image");
+      const hasUserText = finalContent.trim().length > 0;
+      if (hasImageAttachments && hasUserText) {
+        const imageAttachments = currentAttachments.filter((a) => a.type === "image");
+        pendingAttachmentDataRef.current = await convertAttachmentsToBase64(imageAttachments);
+      } else {
+        pendingAttachmentDataRef.current = null;
+      }
     }
     let shouldContinueAfterAttachment = continueAfterToolResult;
     if (attachmentResults.length > 0) {
@@ -2725,48 +2725,37 @@ ${currentContextSummary}` },
       } else {
         chatMessages = messagesToSend.map((m) => ({ role: m.role, content: m.content }));
       }
-      if (aiDecideImageAttachments.length > 0) {
-        const imageBase64s = await Promise.all(
-          aiDecideImageAttachments.map(async (att) => ({
-            mimeType: att.mimeType,
-            base64: await fileToBase64(att.file)
-          }))
-        );
-        for (let i = chatMessages.length - 1; i >= 0; i--) {
-          if (chatMessages[i].role === "user") {
-            const textContent = typeof chatMessages[i].content === "string" ? chatMessages[i].content : "";
-            const multimodalParts = [];
-            if (textContent.trim()) {
-              multimodalParts.push({ type: "text", text: textContent });
-            }
-            for (const img of imageBase64s) {
-              multimodalParts.push({
-                type: "image_url",
-                image_url: { url: `data:${img.mimeType};base64,${img.base64}` }
-              });
-            }
-            chatMessages[i] = { ...chatMessages[i], content: multimodalParts };
-            break;
-          }
-        }
-      }
       if (attachmentResults.length > 0 && shouldContinueAfterAttachment) {
-        skipNextSkillParsingRef.current = true;
         const attachmentContext = attachmentResults.filter((part) => part.type === "tool_result").map((part) => `[${part.label || part.toolName} \uACB0\uACFC]
 ${part.result.content}`).join("\n\n");
         if (attachmentContext) {
-          chatMessages.push({
-            role: "user",
-            /** @Todo vibecode - 원본 파일 재요청 방지 + skill_use 태그 사용 금지 명시 */
-            content: `\uC0AC\uC6A9\uC790\uAC00 \uCCA8\uBD80\uD55C \uD30C\uC77C\uC758 \uBD84\uC11D \uACB0\uACFC\uC785\uB2C8\uB2E4. \uC6D0\uBCF8 \uD30C\uC77C \uB0B4\uC6A9\uC774 \uC774\uBBF8 \uC544\uB798\uC5D0 \uD3EC\uD568\uB418\uC5B4 \uC788\uC73C\uBBC0\uB85C \uC6D0\uBCF8 \uD30C\uC77C\uC744 \uB2E4\uC2DC \uC694\uCCAD\uD558\uC9C0 \uB9C8\uC138\uC694.
+          const hasImageWithText = pendingAttachmentDataRef.current !== null;
+          if (hasImageWithText) {
+            chatMessages.push({
+              role: "user",
+              /** @Todo vibecode - 분석 결과 제공 + 도구 선택 허용 (편집/생성 등) */
+              content: `\uC0AC\uC6A9\uC790\uAC00 \uC774\uBBF8\uC9C0\uB97C \uCCA8\uBD80\uD588\uC2B5\uB2C8\uB2E4. \uC544\uB798\uB294 \uC774\uBBF8\uC9C0 \uC790\uB3D9 \uBD84\uC11D \uACB0\uACFC\uC785\uB2C8\uB2E4.
+
+${attachmentContext}
+
+\uC0AC\uC6A9\uC790\uC758 \uC694\uCCAD: "${finalContent}"
+
+\uC704 \uBD84\uC11D \uACB0\uACFC\uB97C \uCC38\uACE0\uD558\uB418, \uC0AC\uC6A9\uC790\uC758 \uC694\uCCAD \uC758\uB3C4\uC5D0 \uB530\uB77C \uC801\uC808\uD55C \uB3C4\uAD6C\uB97C \uC120\uD0DD\uD558\uC138\uC694. \uC774\uBBF8\uC9C0 \uD3B8\uC9D1\uC774\uB098 \uC0DD\uC131\uC774 \uD544\uC694\uD558\uBA74 \uD574\uB2F9 \uB3C4\uAD6C\uB97C \uD638\uCD9C\uD558\uACE0, \uBD84\uC11D \uACB0\uACFC\uB9CC\uC73C\uB85C \uCDA9\uBD84\uD558\uBA74 \uBC14\uB85C \uB2F5\uBCC0\uD558\uC138\uC694.`
+            });
+          } else {
+            skipNextSkillParsingRef.current = true;
+            chatMessages.push({
+              role: "user",
+              content: `\uC0AC\uC6A9\uC790\uAC00 \uCCA8\uBD80\uD55C \uD30C\uC77C\uC758 \uBD84\uC11D \uACB0\uACFC\uC785\uB2C8\uB2E4. \uC6D0\uBCF8 \uD30C\uC77C \uB0B4\uC6A9\uC774 \uC774\uBBF8 \uC544\uB798\uC5D0 \uD3EC\uD568\uB418\uC5B4 \uC788\uC73C\uBBC0\uB85C \uC6D0\uBCF8 \uD30C\uC77C\uC744 \uB2E4\uC2DC \uC694\uCCAD\uD558\uC9C0 \uB9C8\uC138\uC694.
 
 ${attachmentContext}
 
 \uC704 \uBD84\uC11D \uACB0\uACFC\uB9CC\uC73C\uB85C \uC0AC\uC6A9\uC790\uC758 \uC9C8\uBB38\uC5D0 \uB2F5\uBCC0\uD574\uC8FC\uC138\uC694. skill_use \uD0DC\uADF8\uB294 \uC0AC\uC6A9\uD558\uC9C0 \uB9C8\uC138\uC694.`
-          });
+            });
+          }
         }
       }
-      console.log("[ChatUI] Messages to send:", chatMessages.length, chatMessages.map((m) => ({ role: m.role, content: typeof m.content === "string" ? m.content.slice(0, 50) : "[multimodal]" })));
+      console.log("[ChatUI] Messages to send:", chatMessages.length, chatMessages.map((m) => ({ role: m.role, content: m.content.slice(0, 50) })));
       const baseSystemPrompt = buildSystemPrompt();
       const combinedSystemPrompt = [baseSystemPrompt, actionPrompt].filter(Boolean).join("\n\n");
       const messagesForApi = combinedSystemPrompt ? [{ role: "system", content: combinedSystemPrompt }, ...chatMessages] : chatMessages;
@@ -2984,9 +2973,11 @@ ${attachmentContext}
               })
             );
             try {
+              const attachExtra = pendingAttachmentDataRef.current ? { __attachedImages__: pendingAttachmentDataRef.current } : void 0;
               const { result: skillResult } = await handleSkillCall(assistantContent, {
                 signal: abortControllerRef.current?.signal
-              });
+              }, attachExtra);
+              pendingAttachmentDataRef.current = null;
               if (skillResult?.content) {
                 accumulatedContent = skillResult.content;
               }
@@ -3015,6 +3006,8 @@ ${attachmentContext}
               })
             );
             let streamedReport = "";
+            const attachExtraParams = pendingAttachmentDataRef.current ? { __attachedImages__: pendingAttachmentDataRef.current } : void 0;
+            pendingAttachmentDataRef.current = null;
             const { result } = await handleSkillCall(assistantContent, {
               onProgress: (progress) => {
                 setSessions(
@@ -3049,7 +3042,7 @@ ${attachmentContext}
                 );
               },
               signal: abortControllerRef.current?.signal
-            });
+            }, attachExtraParams);
             if (result) {
               if (result.metadata?.__toolResult__) {
                 const resultType = result.metadata.resultType;
@@ -12340,7 +12333,6 @@ var ChatUIWithHook = ({
   skills,
   tools,
   onToolCall,
-  imageAttachmentMode,
   continueAfterToolResult,
   onSkillComplete,
   onLoadModels,
@@ -12383,7 +12375,6 @@ var ChatUIWithHook = ({
     skills,
     tools,
     onToolCall,
-    imageAttachmentMode,
     continueAfterToolResult,
     onSkillComplete,
     onLoadModels,