utilitas 1999.1.72 → 1999.1.73

package/lib/alan.mjs

@@ -911,13 +911,10 @@ const handleToolsCall = async (msg, options) => {
         toolsResponse = (toolsResponse + m).trim();
         await streamResp({ text: options?.delta ? m : toolsResponse }, options);
     };
-    const calls = msg.tool_calls || msg.content || msg.parts || [];
+    const calls = msg.tool_calls || msg.content
+        || (msg.parts ? msg.parts.filter(x => x.functionCall) : null) || [];
     if (calls.length) {
-        switch (options?.flavor) {
-            case ANTHROPIC: preRes.push(msg); break;
-            case GEMINI: preRes.push(msg); break;
-            case OPENAI: default: preRes.push(msg); break;
-        }
+        preRes.push(msg);
         for (const fn of calls) {
             switch (options?.flavor) {
                 case ANTHROPIC:
@@ -977,7 +974,7 @@ const handleToolsCall = async (msg, options) => {
         if (content.length) {
             switch (options?.flavor) {
                 case ANTHROPIC: content = [{ role: user, content }]; break;
-                case GEMINI: content = [{ role: FUNC, parts: content }]; break;
+                case GEMINI: content = [{ role: user, parts: content }]; break;
             }
         }
         responded && await resp(TOOLS_END);
@@ -1183,8 +1180,10 @@ const packGeminiReferences = (chunks, supports) => {
 
 const promptGemini = async (aiId, content, options = {}) => {
     let { provider, client, model } = await getAi(aiId);
-    let [event, result, references, functionCalls, responded, images] =
-        [null, options.result ?? '', null, [], false, []];
+    let [
+        event, result, text, thinking, references, functionCalls, responded,
+        images, thinkEnd,
+    ] = [null, options.result ?? '', '', '', null, [], false, [], false];
     options.model = options.model || model.name;
     model?.image === true && (options.imageMode = true);
     assert(!(options.imageMode && !model.image), 'Image mode is not supported.');
@@ -1198,12 +1197,11 @@ const promptGemini = async (aiId, content, options = {}) => {
     const chat = client.chats.create({
         model: options.model, history, config: {
             responseMimeType: options.jsonMode ? MIME_JSON : MIME_TEXT,
+            thinkingConfig: model.reasoning ? { includeThoughts: true } : {},
             systemInstruction, responseModalities: options.modalities || (
                 options.imageMode ? [TEXT, IMAGE] : undefined
             ), ...options?.config || {}, ...model?.tools && !options.jsonMode
-                // @todo: Gemini 2.5 flash 05-20 refusing to use certain tool calls
-                // https://discuss.ai.google.dev/t/gemini-2-5-flash-05-20-refusing-to-use-certain-tool-calls/84086
-                && ![GEMINI_20_FLASH, GEMINI_25_FLASH].includes(options.model)
+                && ![GEMINI_20_FLASH].includes(options.model)
                 ? (options.tools ?? {
                     tools: [
                         // @todo: Gemini will failed when using these tools together.
@@ -1228,15 +1226,23 @@ const promptGemini = async (aiId, content, options = {}) => {
             chunk?.promptFeedback?.blockReason
         );
         event = chunk?.candidates?.[0];
-        let [deltaText, deltaImages] = ['', []];
+        let [deltaText, deltaThink, deltaImages] = ['', '', []];
         event?.content?.parts?.map(x => {
-            if (x.text) { deltaText = x.text; }
+            if (x.text && x.thought) { deltaThink = x.text; }
+            else if (x.text) { deltaText = x.text; }
             else if (x.functionCall) { functionCalls.push(x); }
             else if (x.inlineData?.mimeType === MIME_PNG) {
                 deltaImages.push(x.inlineData);
                 images.push(x.inlineData);
             }
         });
+        text += deltaText;
+        thinking += deltaThink;
+        deltaThink && deltaThink === thinking
+            && (deltaThink = `${THINK_STR}\n${deltaThink}`);
+        thinking && deltaText && !thinkEnd
+            && (thinkEnd = deltaThink = `${deltaThink}${THINK_END}\n\n`);
+        deltaText = deltaThink + deltaText;
         const rfc = packGeminiReferences(
             event?.groundingMetadata?.groundingChunks,
             event?.groundingMetadata?.groundingSupports
@@ -1250,9 +1256,15 @@ const promptGemini = async (aiId, content, options = {}) => {
             images: options.delta ? deltaImages : images,
         }, options);
     }
+    event = {
+        role: MODEL, parts: [
+            ...thinking ? [{ thought: true, text: thinking }] : [],
+            ...text ? [{ text }] : [],
+            ...functionCalls,
+        ],
+    };
     const { toolsResult, toolsResponse } = await handleToolsCall(
-        { role: MODEL, parts: functionCalls },
-        { ...options, result, flavor: GEMINI }
+        event, { ...options, result, flavor: GEMINI }
     );
     if (toolsResult.length
         && countToolCalls(toolsResponse) < MAX_TOOL_RECURSION) {

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1999.1.72",
+    "version": "1999.1.73",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/lib/web.mjs

@@ -198,7 +198,7 @@ const search = async (query, options = {}) => {
             return options?.raw ? resp.content : {
                 totalResults: resp?.content?.searchInformation?.totalResults || 0,
                 startIndex: resp?.content?.queries?.request?.[0]?.startIndex || 1,
-                items: resp?.content?.items.map(x => ({
+                items: (resp?.content?.items || []).map(x => ({
                     title: x.title, link: options?.image ? null : x.link,
                     snippet: x.snippet, image: (
                         options?.image ? x.link : x.pagemap?.cse_image?.[0]?.src

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1999.1.72",
+    "version": "1999.1.73",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",