@usecrow/ui 0.1.50 → 0.1.51

package/dist/index.cjs

@@ -70,6 +70,7 @@ function useChat({
   persistAnonymousConversations,
   welcomeMessage,
   selectedModel: initialSelectedModel,
+  toolConsentSettings,
   onVerificationStatus,
   onConversationId,
   onWorkflowEvent,
@@ -94,6 +95,8 @@ function useChat({
   const abortControllerRef = React3.useRef(null);
   const hasCheckedPersistRef = React3.useRef(false);
   const streamingToolCallsRef = React3.useRef([]);
+  const toolConsentSettingsRef = React3.useRef(toolConsentSettings);
+  toolConsentSettingsRef.current = toolConsentSettings;
   React3.useEffect(() => {
     if (initialSelectedModel) {
       setSelectedModel((prev) => prev !== initialSelectedModel ? initialSelectedModel : prev);
@@ -345,26 +348,43 @@ function useChat({
                       }
                       break;
                     case "client_tool_call":
-                      onToolCall?.({
-                        type: "start",
-                        toolName: parsed.tool_name,
-                        arguments: parsed.arguments
-                      });
-                      const clientToolCall = {
-                        id: parsed.tool_call_id || `tool-${Date.now()}`,
-                        name: parsed.tool_name,
-                        displayName: parsed.display_name || void 0,
-                        arguments: parsed.arguments || {},
-                        status: "executing",
-                        timestamp: /* @__PURE__ */ new Date()
-                      };
-                      streamingToolCallsRef.current = [...streamingToolCallsRef.current, clientToolCall];
-                      setActiveToolCalls((prev) => [...prev, clientToolCall]);
-                      pendingClientTools.push({
-                        toolName: parsed.tool_name,
-                        toolCallId: parsed.tool_call_id,
-                        arguments: parsed.arguments
-                      });
+                      {
+                        const needsConsent = toolConsentSettingsRef.current?.[parsed.tool_name]?.requires_consent === true;
+                        onToolCall?.({
+                          type: "start",
+                          toolName: parsed.tool_name,
+                          arguments: parsed.arguments
+                        });
+                        if (needsConsent) {
+                          const consentClientTc = {
+                            id: parsed.tool_call_id || `tool-${Date.now()}`,
+                            name: parsed.tool_name,
+                            displayName: parsed.display_name || void 0,
+                            arguments: parsed.arguments || {},
+                            status: "awaiting_consent",
+                            requiresConsent: true,
+                            timestamp: /* @__PURE__ */ new Date()
+                          };
+                          streamingToolCallsRef.current = [...streamingToolCallsRef.current, consentClientTc];
+                          setActiveToolCalls((prev) => [...prev, consentClientTc]);
+                        } else {
+                          const clientToolCall = {
+                            id: parsed.tool_call_id || `tool-${Date.now()}`,
+                            name: parsed.tool_name,
+                            displayName: parsed.display_name || void 0,
+                            arguments: parsed.arguments || {},
+                            status: "executing",
+                            timestamp: /* @__PURE__ */ new Date()
+                          };
+                          streamingToolCallsRef.current = [...streamingToolCallsRef.current, clientToolCall];
+                          setActiveToolCalls((prev) => [...prev, clientToolCall]);
+                          pendingClientTools.push({
+                            toolName: parsed.tool_name,
+                            toolCallId: parsed.tool_call_id,
+                            arguments: parsed.arguments
+                          });
+                        }
+                      }
                       break;
                     case "tool_consent_required":
                       onToolCall?.({
@@ -746,21 +766,36 @@ function useChat({
                       break;
                     case "client_tool_call":
                       {
-                        const toolCallEntry = {
-                          id: parsed.tool_call_id || `tool-${Date.now()}`,
-                          name: parsed.tool_name,
-                          displayName: parsed.display_name || void 0,
-                          arguments: parsed.arguments || {},
-                          status: "executing",
-                          timestamp: /* @__PURE__ */ new Date()
-                        };
-                        streamingToolCallsRef.current = [...streamingToolCallsRef.current, toolCallEntry];
-                        setActiveToolCalls((prev) => [...prev, toolCallEntry]);
-                        pendingClientTools.push({
-                          toolName: parsed.tool_name,
-                          toolCallId: parsed.tool_call_id,
-                          arguments: parsed.arguments
-                        });
+                        const needsConsent2 = toolConsentSettingsRef.current?.[parsed.tool_name]?.requires_consent === true;
+                        if (needsConsent2) {
+                          const consentEntry2 = {
+                            id: parsed.tool_call_id || `tool-${Date.now()}`,
+                            name: parsed.tool_name,
+                            displayName: parsed.display_name || void 0,
+                            arguments: parsed.arguments || {},
+                            status: "awaiting_consent",
+                            requiresConsent: true,
+                            timestamp: /* @__PURE__ */ new Date()
+                          };
+                          streamingToolCallsRef.current = [...streamingToolCallsRef.current, consentEntry2];
+                          setActiveToolCalls((prev) => [...prev, consentEntry2]);
+                        } else {
+                          const toolCallEntry = {
+                            id: parsed.tool_call_id || `tool-${Date.now()}`,
+                            name: parsed.tool_name,
+                            displayName: parsed.display_name || void 0,
+                            arguments: parsed.arguments || {},
+                            status: "executing",
+                            timestamp: /* @__PURE__ */ new Date()
+                          };
+                          streamingToolCallsRef.current = [...streamingToolCallsRef.current, toolCallEntry];
+                          setActiveToolCalls((prev) => [...prev, toolCallEntry]);
+                          pendingClientTools.push({
+                            toolName: parsed.tool_name,
+                            toolCallId: parsed.tool_call_id,
+                            arguments: parsed.arguments
+                          });
+                        }
                       }
                       break;
                     case "tool_consent_required":
@@ -1527,6 +1562,9 @@ function useWidgetStyles({
   const [initialSuggestions, setInitialSuggestions] = React3.useState(
     styleCache.get(key)?.initialSuggestions || []
   );
+  const [toolConsentSettings, setToolConsentSettings] = React3.useState(
+    styleCache.get(key)?.toolConsentSettings || {}
+  );
   const [agentName, setAgentName] = React3.useState(
     styleCache.get(key)?.agentName || "Assistant"
   );
@@ -1567,6 +1605,7 @@ function useWidgetStyles({
       setWelcomeMessage(config.welcomeMessage ?? void 0);
       setSelectedModel(config.model ?? void 0);
       setInitialSuggestions(config.initialSuggestions || []);
+      setToolConsentSettings(config.toolConsentSettings || {});
     } catch (err) {
       console.error("[CrowWidget] Failed to fetch styles:", err);
       setError(err instanceof Error ? err : new Error(String(err)));
@@ -1605,6 +1644,7 @@ function useWidgetStyles({
     welcomeMessage,
     selectedModel,
     initialSuggestions,
+    toolConsentSettings,
     refetch: fetchStyles
   };
 }
@@ -1640,6 +1680,9 @@ function useCopilotStyles({
   const [selectedModel, setSelectedModel] = React3.useState(
     styleCache.get(key)?.model ?? void 0
   );
+  const [toolConsentSettings, setToolConsentSettings] = React3.useState(
+    styleCache.get(key)?.toolConsentSettings || {}
+  );
   const hasFetchedRef = React3.useRef(false);
   const fetchStyles = async () => {
     if (skip) return;
@@ -1656,6 +1699,7 @@ function useCopilotStyles({
       setPersistAnonymousConversations(config.persistAnonymousConversations ?? true);
       setWelcomeMessage(config.welcomeMessage ?? void 0);
       setSelectedModel(config.model ?? void 0);
+      setToolConsentSettings(config.toolConsentSettings || {});
     } catch (err) {
       console.error("[CrowCopilot] Failed to fetch styles:", err);
       setError(err instanceof Error ? err : new Error(String(err)));
@@ -1693,6 +1737,7 @@ function useCopilotStyles({
     persistAnonymousConversations,
     welcomeMessage,
     selectedModel,
+    toolConsentSettings,
     refetch: fetchStyles
   };
 }
@@ -3348,7 +3393,8 @@ function CrowWidget({
     persistAnonymousConversations,
     welcomeMessage: welcomeMessageFromAPI,
     selectedModel: selectedModelFromAPI,
-    initialSuggestions
+    initialSuggestions,
+    toolConsentSettings
   } = useWidgetStyles({
     productId,
     apiUrl,
@@ -3391,6 +3437,7 @@ function CrowWidget({
     persistAnonymousConversations,
     welcomeMessage,
     selectedModel,
+    toolConsentSettings,
     onVerificationStatus: (isVerified) => {
       setIsVerifiedUser(isVerified);
     },
@@ -3693,14 +3740,47 @@ function CrowWidget({
   const handleToolConsent = async (toolCallId, approved) => {
     const toolCall = chat.activeToolCalls.find((tc) => tc.id === toolCallId) || chat.messages.flatMap((m) => m.toolCalls || []).find((tc) => tc.id === toolCallId);
     if (!toolCall) return;
+    const isClientSide = !toolCall.serverSideExecution;
     if (approved) {
       chat.updateToolCallStatus(toolCallId, "executing");
-      if (submitToolResultRef.current) {
-        await submitToolResultRef.current(
-          toolCallId,
-          toolCall.name,
-          { consent_approved: true, tool_arguments: toolCall.arguments || {} }
-        );
+      if (isClientSide) {
+        try {
+          const result = await executeClientToolRef.current?.(
+            toolCall.name,
+            toolCall.arguments || {}
+          );
+          const resultObj = result;
+          const dataObj = resultObj?.data;
+          const wasUserCancelled = dataObj?.declined === true || typeof resultObj?.error === "string" && resultObj.error.includes("cancelled by user") || typeof resultObj?.error === "string" && resultObj.error.includes("declined");
+          if (wasUserCancelled) {
+            console.log("[Crow Widget] Tool was cancelled by user after consent");
+            return;
+          }
+          if (result && submitToolResultRef.current) {
+            await submitToolResultRef.current(
+              toolCallId,
+              toolCall.name,
+              result
+            );
+          }
+        } catch (e) {
+          console.error("[Crow Widget] Tool error after consent:", e);
+          if (submitToolResultRef.current) {
+            await submitToolResultRef.current(
+              toolCallId,
+              toolCall.name,
+              { success: false, error: String(e) }
+            );
+          }
+        }
+      } else {
+        if (submitToolResultRef.current) {
+          await submitToolResultRef.current(
+            toolCallId,
+            toolCall.name,
+            { consent_approved: true, tool_arguments: toolCall.arguments || {} }
+          );
+        }
       }
     } else {
       chat.updateToolCallStatus(toolCallId, "denied");
@@ -4129,7 +4209,8 @@ function CrowCopilot({
     pageNavigationRoutes,
     persistAnonymousConversations,
     welcomeMessage: welcomeMessageFromAPI,
-    selectedModel
+    selectedModel,
+    toolConsentSettings
   } = useCopilotStyles({
     productId,
     apiUrl,
@@ -4320,6 +4401,7 @@ function CrowCopilot({
     persistAnonymousConversations,
     welcomeMessage,
     selectedModel,
+    toolConsentSettings,
     onVerificationStatus: (isVerified) => {
       setIsVerifiedUser(isVerified);
     },
@@ -4518,14 +4600,54 @@ function CrowCopilot({
   const handleToolConsent = async (toolCallId, approved) => {
     const toolCall = chat.activeToolCalls.find((tc) => tc.id === toolCallId) || chat.messages.flatMap((m) => m.toolCalls || []).find((tc) => tc.id === toolCallId);
     if (!toolCall) return;
+    const isClientSide = !toolCall.serverSideExecution;
     if (approved) {
       chat.updateToolCallStatus(toolCallId, "executing");
-      if (submitToolResultRef.current) {
-        await submitToolResultRef.current(
-          toolCallId,
-          toolCall.name,
-          { consent_approved: true, tool_arguments: toolCall.arguments || {} }
-        );
+      if (isClientSide) {
+        try {
+          const result = await executeClientToolRef.current?.(
+            toolCall.name,
+            toolCall.arguments || {}
+          );
+          const resultObj = result;
+          const dataObj = resultObj?.data;
+          const wasUserCancelled = dataObj?.declined === true || typeof resultObj?.error === "string" && resultObj.error.includes("cancelled by user") || typeof resultObj?.error === "string" && resultObj.error.includes("declined");
+          if (wasUserCancelled) {
+            console.log("[Crow Copilot] Tool was cancelled by user after consent");
+            if (submitToolResultRef.current) {
+              await submitToolResultRef.current(
+                toolCallId,
+                toolCall.name,
+                { success: false, cancelled: true, error: "Action was cancelled by the user." }
+              );
+            }
+            return;
+          }
+          if (result && submitToolResultRef.current) {
+            await submitToolResultRef.current(
+              toolCallId,
+              toolCall.name,
+              result
+            );
+          }
+        } catch (e) {
+          console.error("[Crow Copilot] Tool error after consent:", e);
+          if (submitToolResultRef.current) {
+            await submitToolResultRef.current(
+              toolCallId,
+              toolCall.name,
+              { success: false, error: String(e) }
+            );
+          }
+        }
+      } else {
+        if (submitToolResultRef.current) {
+          await submitToolResultRef.current(
+            toolCallId,
+            toolCall.name,
+            { consent_approved: true, tool_arguments: toolCall.arguments || {} }
+          );
+        }
       }
     } else {
       chat.updateToolCallStatus(toolCallId, "denied");