@reverbia/sdk 1.0.0-next.20260109140427 → 1.0.0-next.20260109180912

package/dist/expo/index.mjs

@@ -1267,6 +1267,36 @@ function finalizeThoughtProcess(thoughtProcess) {
     (phase, idx) => idx === thoughtProcess.length - 1 ? { ...phase, status: "completed" } : phase
   );
 }
+function extractUserMessageFromMessages(messages) {
+  if (!messages || messages.length === 0) {
+    return null;
+  }
+  const userMessages = messages.filter((m) => m.role === "user");
+  const lastUserMessage = userMessages[userMessages.length - 1];
+  if (!lastUserMessage || !lastUserMessage.content) {
+    return null;
+  }
+  const textParts = [];
+  const files = [];
+  for (const part of lastUserMessage.content) {
+    if (part.type === "text" && part.text) {
+      textParts.push(part.text);
+    } else if (part.type === "image_url" && part.image_url?.url) {
+      files.push({
+        id: `img_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`,
+        name: "image",
+        type: "image/unknown",
+        size: 0,
+        url: part.image_url.url
+      });
+    }
+  }
+  const content = textParts.join("\n");
+  return {
+    content,
+    files: files.length > 0 ? files : void 0
+  };
+}
 
 // src/lib/db/chat/operations.ts
 import { Q } from "@nozbe/watermelondb";
@@ -1643,9 +1673,8 @@ function useChatStorage(options) {
   const sendMessage = useCallback2(
     async (args) => {
       const {
-        content,
+        messages,
         model,
-        messages: providedMessages,
         includeHistory = true,
         maxHistoryMessages = 50,
         files,
@@ -1666,6 +1695,15 @@ function useChatStorage(options) {
         reasoning,
         thinking
       } = args;
+      const extracted = extractUserMessageFromMessages(messages);
+      if (!extracted || !extracted.content) {
+        return {
+          data: null,
+          error: "No user message found in messages array"
+        };
+      }
+      const contentForStorage = extracted.content;
+      const filesForStorage = files ?? extracted.files;
       let convId;
       try {
         convId = await ensureConversation();
@@ -1676,33 +1714,18 @@ function useChatStorage(options) {
         };
       }
       let messagesToSend = [];
-      if (includeHistory && !providedMessages) {
+      if (includeHistory) {
         const storedMessages = await getMessages(convId);
         const validMessages = storedMessages.filter((msg) => !msg.error);
         const limitedMessages = validMessages.slice(-maxHistoryMessages);
-        messagesToSend = limitedMessages.map(storedToLlmapiMessage);
-      } else if (providedMessages) {
-        messagesToSend = providedMessages;
-      }
-      const userMessageContent = [
-        { type: "text", text: content }
-      ];
-      if (files?.length) {
-        for (const file of files) {
-          if (file.url) {
-            userMessageContent.push({
-              type: "image_url",
-              image_url: { url: file.url }
-            });
-          }
-        }
+        messagesToSend = [
+          ...limitedMessages.map(storedToLlmapiMessage),
+          ...messages
+        ];
+      } else {
+        messagesToSend = [...messages];
       }
-      const userMessage = {
-        role: "user",
-        content: userMessageContent
-      };
-      messagesToSend.push(userMessage);
-      const sanitizedFiles = files?.map((file) => ({
+      const sanitizedFiles = filesForStorage?.map((file) => ({
         id: file.id,
         name: file.name,
         type: file.type,
@@ -1715,7 +1738,7 @@ function useChatStorage(options) {
         storedUserMessage = await createMessageOp(storageCtx, {
           conversationId: convId,
           role: "user",
-          content,
+          content: contentForStorage,
           files: sanitizedFiles,
           model
         });

package/dist/react/index.cjs

@@ -1569,10 +1569,7 @@ function useChat(options) {
               continue;
             }
             if (chunk && typeof chunk === "object") {
-              const { content: contentDelta, thinking: thinkingDelta } = strategy.processStreamChunk(
-                chunk,
-                accumulator
-              );
+              const { content: contentDelta, thinking: thinkingDelta } = strategy.processStreamChunk(chunk, accumulator);
               if (contentDelta) {
                 if (onData) onData(contentDelta);
                 if (globalOnData) globalOnData(contentDelta);
@@ -1605,7 +1602,11 @@ function useChat(options) {
         }
         const response = strategy.buildFinalResponse(accumulator);
         if (accumulator.toolCalls.size > 0) {
-          console.log("[Tool Debug] Found", accumulator.toolCalls.size, "tool calls");
+          console.log(
+            "[Tool Debug] Found",
+            accumulator.toolCalls.size,
+            "tool calls"
+          );
           const executorMap = createToolExecutorMap(tools);
           const toolCallsToExecute = [];
           for (const toolCall of accumulator.toolCalls.values()) {
@@ -1615,7 +1616,10 @@ function useChat(options) {
               console.log("[Tool Debug] Will auto-execute:", toolCall.name);
               toolCallsToExecute.push(toolCall);
             } else {
-              console.log("[Tool Debug] Emitting onToolCall event for:", toolCall.name);
+              console.log(
+                "[Tool Debug] Emitting onToolCall event for:",
+                toolCall.name
+              );
               if (onToolCall) {
                 onToolCall({
                   id: toolCall.id,
@@ -1629,7 +1633,11 @@ function useChat(options) {
             }
           }
           if (toolCallsToExecute.length > 0) {
-            console.log("[Tool Debug] Executing", toolCallsToExecute.length, "tools");
+            console.log(
+              "[Tool Debug] Executing",
+              toolCallsToExecute.length,
+              "tools"
+            );
             if (onThinking || globalOnThinking) {
               const toolInfo = toolCallsToExecute.map((tc) => {
                 try {
@@ -1659,7 +1667,12 @@ Executing tool: ${toolInfo}
                   toolCall,
                   executorConfig.executor
                 );
-                console.log("[Tool Debug] Tool execution result for", toolCall.name, ":", { result, error });
+                console.log(
+                  "[Tool Debug] Tool execution result for",
+                  toolCall.name,
+                  ":",
+                  { result, error }
+                );
                 return {
                   id: toolCall.id,
                   name: toolCall.name,
@@ -1668,7 +1681,10 @@ Executing tool: ${toolInfo}
                 };
               })
             );
-            console.log("[Tool Debug] All tools executed, results:", executionResults.length);
+            console.log(
+              "[Tool Debug] All tools executed, results:",
+              executionResults.length
+            );
             if (onThinking || globalOnThinking) {
               const resultsText = executionResults.map((r) => {
                 if (r.error) {
@@ -1704,8 +1720,14 @@ Executing tool: ${toolInfo}
                 tool_call_id: execResult.id
               });
             }
-            const continuationMessages = [...messagesWithContext, ...toolResultMessages];
-            console.log("[Tool Debug] Continuation messages:", JSON.stringify(continuationMessages, null, 2));
+            const continuationMessages = [
+              ...messagesWithContext,
+              ...toolResultMessages
+            ];
+            console.log(
+              "[Tool Debug] Continuation messages:",
+              JSON.stringify(continuationMessages, null, 2)
+            );
             const continuationRequestBody = strategy.buildRequestBody({
               messages: continuationMessages,
               model,
@@ -1742,10 +1764,7 @@ Executing tool: ${toolInfo}
                   continue;
                 }
                 if (chunk && typeof chunk === "object") {
-                  const { content: contentDelta, thinking: thinkingDelta } = strategy.processStreamChunk(
-                    chunk,
-                    continuationAccumulator
-                  );
+                  const { content: contentDelta, thinking: thinkingDelta } = strategy.processStreamChunk(chunk, continuationAccumulator);
                   if (contentDelta) {
                     if (onData) onData(contentDelta);
                     if (globalOnData) globalOnData(contentDelta);
@@ -1756,11 +1775,19 @@ Executing tool: ${toolInfo}
                   }
                 }
               }
-              console.log("[Tool Debug] Continuation stream complete - accumulated content:", continuationAccumulator.content);
-              console.log("[Tool Debug] Continuation stream complete - accumulated thinking:", continuationAccumulator.thinking);
+              console.log(
+                "[Tool Debug] Continuation stream complete - accumulated content:",
+                continuationAccumulator.content
+              );
+              console.log(
+                "[Tool Debug] Continuation stream complete - accumulated thinking:",
+                continuationAccumulator.thinking
+              );
             } catch (streamErr) {
               if (isAbortError(streamErr) || abortController.signal.aborted) {
-                const partialResponse = strategy.buildFinalResponse(continuationAccumulator);
+                const partialResponse = strategy.buildFinalResponse(
+                  continuationAccumulator
+                );
                 return {
                   data: partialResponse,
                   error: "Request aborted"
@@ -1769,7 +1796,9 @@ Executing tool: ${toolInfo}
               throw streamErr;
             }
             if (abortController.signal.aborted) {
-              const partialResponse = strategy.buildFinalResponse(continuationAccumulator);
+              const partialResponse = strategy.buildFinalResponse(
+                continuationAccumulator
+              );
               return {
                 data: partialResponse,
                 error: "Request aborted"
@@ -1778,7 +1807,9 @@ Executing tool: ${toolInfo}
             if (sseError) {
               throw sseError;
             }
-            const finalResponse = strategy.buildFinalResponse(continuationAccumulator);
+            const finalResponse = strategy.buildFinalResponse(
+              continuationAccumulator
+            );
             if (onFinish) {
               onFinish(finalResponse);
             }
@@ -1811,7 +1842,16 @@ Executing tool: ${toolInfo}
         }
       }
     },
-    [getToken, baseUrl, globalOnData, globalOnThinking, onFinish, onError, onToolCall, defaultApiType]
+    [
+      getToken,
+      baseUrl,
+      globalOnData,
+      globalOnThinking,
+      onFinish,
+      onError,
+      onToolCall,
+      defaultApiType
+    ]
   );
   return {
     isLoading,
@@ -2535,6 +2575,36 @@ function finalizeThoughtProcess(thoughtProcess) {
     (phase, idx) => idx === thoughtProcess.length - 1 ? { ...phase, status: "completed" } : phase
   );
 }
+function extractUserMessageFromMessages(messages) {
+  if (!messages || messages.length === 0) {
+    return null;
+  }
+  const userMessages = messages.filter((m) => m.role === "user");
+  const lastUserMessage = userMessages[userMessages.length - 1];
+  if (!lastUserMessage || !lastUserMessage.content) {
+    return null;
+  }
+  const textParts = [];
+  const files = [];
+  for (const part of lastUserMessage.content) {
+    if (part.type === "text" && part.text) {
+      textParts.push(part.text);
+    } else if (part.type === "image_url" && part.image_url?.url) {
+      files.push({
+        id: `img_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`,
+        name: "image",
+        type: "image/unknown",
+        size: 0,
+        url: part.image_url.url
+      });
+    }
+  }
+  const content = textParts.join("\n");
+  return {
+    content,
+    files: files.length > 0 ? files : void 0
+  };
+}
 
 // src/lib/db/chat/operations.ts
 var import_watermelondb3 = require("@nozbe/watermelondb");
@@ -3057,9 +3127,8 @@ function useChatStorage(options) {
   const sendMessage = (0, import_react2.useCallback)(
     async (args) => {
       const {
-        content,
+        messages,
         model,
-        messages: providedMessages,
         includeHistory = true,
         maxHistoryMessages = 50,
         files,
@@ -3083,6 +3152,15 @@ function useChatStorage(options) {
         apiType: requestApiType,
         writeFile
       } = args;
+      const extracted = extractUserMessageFromMessages(messages);
+      if (!extracted || !extracted.content) {
+        return {
+          data: null,
+          error: "No user message found in messages array"
+        };
+      }
+      const contentForStorage = extracted.content;
+      const filesForStorage = files ?? extracted.files;
       let convId;
       try {
         convId = await ensureConversation();
@@ -3093,33 +3171,18 @@ function useChatStorage(options) {
         };
       }
       let messagesToSend = [];
-      if (includeHistory && !providedMessages) {
+      if (includeHistory) {
         const storedMessages = await getMessages(convId);
         const validMessages = storedMessages.filter((msg) => !msg.error);
         const limitedMessages = validMessages.slice(-maxHistoryMessages);
-        messagesToSend = limitedMessages.map(storedToLlmapiMessage);
-      } else if (providedMessages) {
-        messagesToSend = providedMessages;
-      }
-      const userMessageContent = [
-        { type: "text", text: content }
-      ];
-      if (files && files.length > 0) {
-        for (const file of files) {
-          if (file.url && file.type.startsWith("image/")) {
-            userMessageContent.push({
-              type: "image_url",
-              image_url: { url: file.url }
-            });
-          }
-        }
+        messagesToSend = [
+          ...limitedMessages.map(storedToLlmapiMessage),
+          ...messages
+        ];
+      } else {
+        messagesToSend = [...messages];
       }
-      const userMessage = {
-        role: "user",
-        content: userMessageContent
-      };
-      messagesToSend.push(userMessage);
-      const sanitizedFiles = files?.map((file) => ({
+      const sanitizedFiles = filesForStorage?.map((file) => ({
         id: file.id,
         name: file.name,
         type: file.type,
@@ -3132,7 +3195,7 @@ function useChatStorage(options) {
         storedUserMessage = await createMessageOp(storageCtx, {
           conversationId: convId,
           role: "user",
-          content,
+          content: contentForStorage,
           files: sanitizedFiles,
           model
         });
@@ -6593,11 +6656,17 @@ function DropboxAuthProvider({
     if (!isConfigured) return;
     const handleCallback = async () => {
       if (isDropboxCallback()) {
-        const result = await handleDropboxCallback(callbackPath, apiClient, walletAddress);
+        const result = await handleDropboxCallback(
+          callbackPath,
+          apiClient,
+          walletAddress
+        );
         if (result.ok) {
           setAccessToken(result.data);
         } else {
-          console.error(`Dropbox OAuth failed: ${result.error.code} - ${result.error.message}`);
+          console.error(
+            `Dropbox OAuth failed: ${result.error.code} - ${result.error.message}`
+          );
         }
       }
     };
@@ -6623,7 +6692,14 @@ function DropboxAuthProvider({
       return storedToken;
     }
     return startDropboxAuth(appKey, callbackPath);
-  }, [accessToken, appKey, callbackPath, isConfigured, apiClient, walletAddress]);
+  }, [
+    accessToken,
+    appKey,
+    callbackPath,
+    isConfigured,
+    apiClient,
+    walletAddress
+  ]);
   const logout = (0, import_react10.useCallback)(async () => {
     await revokeDropboxToken(apiClient, walletAddress);
     setAccessToken(null);
@@ -6993,11 +7069,17 @@ function GoogleDriveAuthProvider({
     if (!isConfigured) return;
     const handleCallback = async () => {
       if (isGoogleDriveCallback()) {
-        const result = await handleGoogleDriveCallback(callbackPath, apiClient, walletAddress);
+        const result = await handleGoogleDriveCallback(
+          callbackPath,
+          apiClient,
+          walletAddress
+        );
         if (result.ok) {
           setAccessToken(result.data);
         } else {
-          console.error(`Google Drive OAuth failed: ${result.error.code} - ${result.error.message}`);
+          console.error(
+            `Google Drive OAuth failed: ${result.error.code} - ${result.error.message}`
+          );
         }
       }
     };
@@ -7017,13 +7099,23 @@ function GoogleDriveAuthProvider({
     if (accessToken) {
       return accessToken;
     }
-    const storedToken = await getGoogleDriveAccessToken(apiClient, walletAddress);
+    const storedToken = await getGoogleDriveAccessToken(
+      apiClient,
+      walletAddress
+    );
     if (storedToken) {
       setAccessToken(storedToken);
       return storedToken;
     }
     return startGoogleDriveAuth(clientId, callbackPath);
-  }, [accessToken, clientId, callbackPath, isConfigured, apiClient, walletAddress]);
+  }, [
+    accessToken,
+    clientId,
+    callbackPath,
+    isConfigured,
+    apiClient,
+    walletAddress
+  ]);
   const logout = (0, import_react12.useCallback)(async () => {
     await revokeGoogleDriveToken(apiClient, walletAddress);
     setAccessToken(null);
@@ -8095,7 +8187,9 @@ function BackupAuthProvider({
         if (result.ok) {
           setDropboxToken(result.data);
         } else {
-          console.error(`Dropbox OAuth failed: ${result.error.code} - ${result.error.message}`);
+          console.error(
+            `Dropbox OAuth failed: ${result.error.code} - ${result.error.message}`
+          );
         }
       }
     };
@@ -8113,7 +8207,9 @@ function BackupAuthProvider({
         if (result.ok) {
           setGoogleToken(result.data);
         } else {
-          console.error(`Google Drive OAuth failed: ${result.error.code} - ${result.error.message}`);
+          console.error(
+            `Google Drive OAuth failed: ${result.error.code} - ${result.error.message}`
+          );
         }
       }
     };
@@ -8136,7 +8232,13 @@ function BackupAuthProvider({
       return storedToken;
     }
     return startDropboxAuth(dropboxAppKey, dropboxCallbackPath);
-  }, [dropboxAppKey, dropboxCallbackPath, isDropboxConfigured, apiClient, walletAddress]);
+  }, [
+    dropboxAppKey,
+    dropboxCallbackPath,
+    isDropboxConfigured,
+    apiClient,
+    walletAddress
+  ]);
   const logoutDropbox = (0, import_react16.useCallback)(async () => {
     await revokeDropboxToken(apiClient, walletAddress);
     setDropboxToken(null);
@@ -8152,13 +8254,22 @@ function BackupAuthProvider({
     if (!isGoogleConfigured || !googleClientId) {
       throw new Error("Google Drive is not configured");
     }
-    const storedToken = await getGoogleDriveAccessToken(apiClient, walletAddress);
+    const storedToken = await getGoogleDriveAccessToken(
+      apiClient,
+      walletAddress
+    );
     if (storedToken) {
       setGoogleToken(storedToken);
       return storedToken;
     }
     return startGoogleDriveAuth(googleClientId, googleCallbackPath);
-  }, [googleClientId, googleCallbackPath, isGoogleConfigured, apiClient, walletAddress]);
+  }, [
+    googleClientId,
+    googleCallbackPath,
+    isGoogleConfigured,
+    apiClient,
+    walletAddress
+  ]);
   const logoutGoogle = (0, import_react16.useCallback)(async () => {
     await revokeGoogleDriveToken(apiClient, walletAddress);
     setGoogleToken(null);
@@ -8203,7 +8314,14 @@ function BackupAuthProvider({
       isGoogleConfigured ? logoutGoogle() : Promise.resolve(),
       isIcloudConfigured ? logoutIcloud() : Promise.resolve()
     ]);
-  }, [isDropboxConfigured, isGoogleConfigured, isIcloudConfigured, logoutDropbox, logoutGoogle, logoutIcloud]);
+  }, [
+    isDropboxConfigured,
+    isGoogleConfigured,
+    isIcloudConfigured,
+    logoutDropbox,
+    logoutGoogle,
+    logoutIcloud
+  ]);
   const dropboxState = {
     accessToken: dropboxToken,
     isAuthenticated: !!dropboxToken,