@codebam/cf-workers-telegram-bot 12.6.14 → 12.6.16

package/dist/ai.js

@@ -66,6 +66,22 @@ input, config) {
             parameters: t.parameters,
         },
     }));
+    // Inject instructions if tools are provided
+    if (tools.length > 0) {
+        let systemMsg = messages.find((m) => m.role === 'system');
+        if (!systemMsg) {
+            systemMsg = { role: 'system', content: '' };
+            messages.unshift(systemMsg);
+        }
+        const toolInstructions = tools
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            .map((t) => {
+            return `- Name: ${t.name}\n  Description: ${t.description}\n  Parameters: ${JSON.stringify(t.parameters)}`;
+        })
+            .join('\n');
+        const promptInstruction = `\n\n[SYSTEM INSTRUCTION] You have access to the following tools:\n${toolInstructions}\n\nTo use a tool, you MUST output a tool call wrapped in XML format, like so:\n<tool_call>{"name": "search", "arguments": {"q": "query" }}</tool_call>\nor\n<tool_call>{"name": "fetch", "arguments": {"url": "https://example.com" }}</tool_call>\n\nMake sure the tool call is outputted EXACTLY as shown. The system will intercept this call, execute the tool, and return the output to you. Do not write code or direct the user to run code; call the tools yourself.`;
+        systemMsg.content = systemMsg.content + promptInstruction;
+    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const runModel = async (msgs, stream) => {
         if (isGemini) {
@@ -87,7 +103,7 @@ input, config) {
         }
         return await ai.run(model, { messages: msgs, tools: cfTools.length > 0 ? cfTools : undefined, stream });
     };
-    if (cfTools.length === 0 || isGemini) {
+    if (cfTools.length === 0) {
         return await runModel(messages, config.streamFinalResponse);
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/dist/utils.js

@@ -164,7 +164,7 @@ export const searchTool = {
                 // Continue to next fallback
             }
         }
-        // Final fallback to Wikipedia Search if all SearXNG instances fail/are rate-limited
+        // Fallback to Wikipedia Search if all SearXNG instances fail/are rate-limited
         try {
             const wikiUrl = `https://en.wikipedia.org/w/api.php?action=query&list=search&srsearch=${encodeURIComponent(query)}&utf8=&format=json`;
             const res = await fetch(wikiUrl, {
@@ -173,18 +173,51 @@ export const searchTool = {
             if (res.status === 200) {
                 const data = (await res.json());
                 if (data && data.query && Array.isArray(data.query.search)) {
-                    const results = data.query.search.map((item) => ({
+                    const wikiResults = data.query.search.map((item) => ({
                         title: item.title,
                         snippet: item.snippet.replace(/<\/?[^>]+(>|$)/g, ''), // strip HTML tags
                         url: `https://en.wikipedia.org/wiki/${encodeURIComponent(item.title)}`,
                     }));
-                    return JSON.stringify({ results });
+                    if (wikiResults.length > 0) {
+                        return JSON.stringify({ results: wikiResults });
+                    }
                 }
             }
         }
-        catch (e) {
-            return `Error executing search: All public search instances and Wikipedia fallback failed. Error: ${String(e)}`;
+        catch {
+            // Continue to next fallback
+        }
+        // Final fallback to Google News RSS search for recent general web/news results
+        try {
+            const googleNewsUrl = `https://news.google.com/rss/search?q=${encodeURIComponent(query)}&hl=en-US&gl=US&ceid=US:en`;
+            const res = await fetch(googleNewsUrl, {
+                headers: { 'User-Agent': userAgent },
+            });
+            if (res.status === 200) {
+                const xml = await res.text();
+                const items = [];
+                const itemRegex = /<item>([\s\S]*?)<\/item>/g;
+                let match;
+                while ((match = itemRegex.exec(xml)) !== null && items.length < 5) {
+                    const content = match[1];
+                    const titleMatch = /<title>([\s\S]*?)<\/title>/.exec(content);
+                    const linkMatch = /<link>([\s\S]*?)<\/link>/.exec(content);
+                    const descMatch = /<description>([\s\S]*?)<\/description>/.exec(content);
+                    const title = titleMatch ? titleMatch[1].replace(/<!\[CDATA\[([\s\S]*?)\]\]>/g, '$1') : '';
+                    const link = linkMatch ? linkMatch[1] : '';
+                    const desc = descMatch ? descMatch[1].replace(/<[^>]*>/g, '').replace(/<!\[CDATA\[([\s\S]*?)\]\]>/g, '$1') : '';
+                    if (title && link) {
+                        items.push({ title, url: link, snippet: desc });
+                    }
+                }
+                if (items.length > 0) {
+                    return JSON.stringify({ results: items });
+                }
+            }
+        }
+        catch {
+            // Continue
         }
-        return 'Error executing search: All public search instances and Wikipedia fallback returned no results.';
+        return 'Error executing search: All public search instances, Wikipedia fallback, and Google News fallback returned no results.';
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@codebam/cf-workers-telegram-bot",
-	"version": "12.6.14",
+	"version": "12.6.16",
 	"description": "serverless telegram bot on cf workers",
 	"main": "./dist/main.js",
 	"module": "./dist/main.js",