utilitas 2001.1.87 → 2001.1.89

package/lib/alan.mjs

@@ -49,12 +49,13 @@ const [
     TOOLS_STR, TOOLS_END, TOOLS, TEXT, OK, FUNC, GPT_52, GPT_51_CODEX,
     GPT_IMAGE_15, GEMMA_3_27B, ANTHROPIC, ais, MAX_TOOL_RECURSION, LOG, name,
     user, system, assistant, JSON_OBJECT, PROMPT_IS_REQUIRED, k, trimTailing,
-    trimBeginning, GEMINI_30_PRO_IMAGE, IMAGE, JINA, JINA_DEEPSEARCH,
-    SILICONFLOW, SF_DEEPSEEK_32, OPENROUTER_API, OPENROUTER, AUTO, TOOL, ONLINE,
+    trimBeginning, GEMINI_30_PRO_IMAGE, IMAGE, JINA, SILICONFLOW,
+    SF_DEEPSEEK_32, OPENROUTER_API, OPENROUTER, AUTO, TOOL, ONLINE,
     GEMINI_30_PRO, GEMINI_30_FLASH, IMAGEN_4_ULTRA, VEO_31, IMAGEN_4_UPSCALE,
     ERROR_GENERATING, GEMINI_25_FLASH_TTS, GEMINI_25_PRO_TTS, wav, PNG_EXT,
     GPT_4O_MIMI_TTS, GPT_4O_TRANSCRIBE, INVALID_AUDIO, OGG_EXT, ELLIPSIS,
-    TOP_LIMIT, ATTACHMENT, PROCESSING, CURSOR, LN1, LN2, TOP, DEEPSEEK
+    TOP_LIMIT, ATTACHMENT, PROCESSING, CURSOR, LN1, LN2, TOP, DEEPSEEK,
+    DEEP_RESEARCH_PRO,
 ] = [
         'OpenAI', 'Google', 'Ollama', 'nova', 'deepseek-3.2-speciale', '```',
         'claude-opus-4.5', 'audio', 'wav', 'OPENAI_VOICE', 'medium', 'think',
@@ -64,16 +65,15 @@ const [
         { role: 'assistant' }, 'json_object', 'Prompt is required.',
         x => 1000 * x, x => x.replace(/[\.\s]*$/, ''),
         x => x.replace(/^[\.\s]*/, ''), 'gemini-3-pro-image-preview', 'image',
-        'Jina', 'jina-deepsearch-v1', 'SiliconFlow',
-        'deepseek-ai/DeepSeek-V3.2-exp', 'https://openrouter.ai/api/v1',
-        'OpenRouter', 'openrouter/auto', 'tool', ':online',
-        'gemini-3-pro-preview', 'gemini-3-flash-preview',
+        'Jina', 'SiliconFlow', 'deepseek-ai/DeepSeek-V3.2-exp',
+        'https://openrouter.ai/api/v1', 'OpenRouter', 'openrouter/auto', 'tool',
+        ':online', 'gemini-3-pro-preview', 'gemini-3-flash-preview',
         'imagen-4.0-ultra-generate-001', 'veo-3.1-generate-preview',
         'imagen-4.0-upscale-preview', 'Error generating content.',
         'gemini-2.5-flash-preview-tts', 'gemini-2.5-pro-preview-tts', 'wav',
         'png', 'gpt-4o-mini-tts', 'gpt-4o-transcribe', 'Invalid audio data.',
         'ogg', '...', 3, 'ATTACHMENT', { processing: true }, ' █', '\n\n',
-        '\n\n\n', 'top', 'DeepSeek',
+        '\n\n\n', 'top', 'DeepSeek', 'deep-research-pro-preview-12-2025',
     ];
 
 const [joinL1, joinL2]
@@ -97,12 +97,12 @@ const m = x => k(k(x));
 const [MAX_TOKENS, ATTACHMENT_TOKEN_COST] = [m(1), k(10)];
 
 const MODEL_ICONS = {
-    [OPENROUTER]: '🔀', [OPENAI]: '⚛️', [JINA]: '✴️', [GOOGLE]: '♊️',
+    [OPENROUTER]: '🔀', [OPENAI]: '⚛️', [GOOGLE]: '♊️', // [JINA]: '✴️',
     [OLLAMA]: '🦙', [ANTHROPIC]: '✳️', [SILICONFLOW]: '🧬', [DEEPSEEK]: '🐬',
 };
 
 const FEATURE_ICONS = {
-    audio: '🔊', deepsearch: '🔍', fast: '⚡️', hearing: '👂', hidden: '🙈',
+    audio: '🔊', 'deep-research': '🔍', fast: '⚡️', hearing: '👂', hidden: '🙈',
     image: '🎨', reasoning: '🧠', structured: '📊', tools: '🧰', video: '🎬',
     vision: '👁️', // finetune: '🔧',
 };
@@ -191,12 +191,10 @@ const MODELS = {
         source: OPENAI, maxInputTokens: 0,
         hearing: true, fast: true, hidden: true, defaultProvider: OPENAI,
     },
-    // models with deepsearch capabilities
-    [JINA_DEEPSEARCH]: { // @todo: parse more details from results, eg: "reed urls".
-        maxInputTokens: Infinity, attachmentTokenCost: 0,
-        deepsearch: true, reasoning: true, structured: true, vision: true,
-        supportedMimeTypes: [MIME_PNG, MIME_JPEG, MIME_TEXT, MIME_WEBP, MIME_PDF],
-        defaultProvider: JINA,
+    // agents with deep-research capabilities
+    [DEEP_RESEARCH_PRO]: {
+        source: GOOGLE, contextWindow: m(1.05), maxOutputTokens: k(65.5),
+        'deep-research': true, reasoning: true, defaultProvider: GOOGLE,
     },
     // best Chinese models
     [DEEPSEEK_32]: DEEPSEEK_32_RULES,
@@ -252,7 +250,7 @@ for (const n in MODELS) {
 //     }
 //     // for other features, if any model supports it, then AUTO supports it
 //     for (const key of [
-//         'structured', 'reasoning', 'tools', 'vision', 'fast', 'deepsearch', 'image',
+//         'structured', 'reasoning', 'tools', 'vision', 'fast', 'deep-research', 'image',
 //     ]) {
 //         MODELS[AUTO][key] = MODELS[AUTO][key] || MODELS[n][key];
 //     }
@@ -266,7 +264,6 @@ for (const n in MODELS) {
 const DEFAULT_MODELS = {
     [OPENROUTER]: GEMINI_30_FLASH,
     [SILICONFLOW]: SF_DEEPSEEK_32,
-    [JINA]: JINA_DEEPSEARCH,
     [OLLAMA]: GEMMA_3_27B,
     [OPENAI_VOICE]: NOVA,
 };
@@ -275,7 +272,7 @@ let _tools;
 
 const unifyProvider = provider => {
     assert(provider = (provider || '').trim(), 'AI provider is required.');
-    for (let type of [OPENROUTER, GOOGLE, OPENAI, JINA, OLLAMA, SILICONFLOW]) {
+    for (let type of [OPENROUTER, GOOGLE, OPENAI, OLLAMA, SILICONFLOW]) { // JINA,
         if (insensitiveCompare(provider, type)) { return type; }
     }
     throwError(`Invalid AI provider: ${provider}.`);
@@ -443,17 +440,6 @@ const init = async (options = {}) => {
                 });
             }
             break;
-        case JINA:
-            assertApiKey(provider, options);
-            var { client } = await OpenAI({
-                baseURL: 'https://deepsearch.jina.ai/v1/', ...options,
-            });
-            for (let model of models) {
-                setupAi({
-                    provider, model, client, prompt: promptOpenRouter, priority,
-                });
-            }
-            break;
         case OLLAMA:
             // https://github.com/ollama/ollama/blob/main/docs/openai.md
             const baseURL = 'http://localhost:11434/v1/';
@@ -687,7 +673,7 @@ const packResp = async (resp, options) => {
     //             "title": "在線時鐘- 目前時間- 線上時鐘- 時鐘線上 - 鬧鐘",
     //             "url": "https://naozhong.tw/shijian/",
     //             "content": "- [鬧鐘](https://naozhong.tw/)\n- [計時器](https://naozhong.tw/jishiqi/)\n- [碼錶](https://naozhong.tw/miaobiao/)\n- [時間](https://naozhong.tw/shijian/)\n\n# 現在時間\n\n加入\n\n- [編輯](javascript:;)\n- [移至頂端](javascript:;)\n- [上移](javascript:;)\n- [下移](javascript:;)\n- [刪除](javascript:;)\n\n# 最常用\n\n| | |\n| --- | --- |\n| [台北](https://naozhong.tw/shijian/%E5%8F%B0%E5%8C%97/) | 10:09:14 |\n| [北京，中國](https://naozhong.tw/shijian/%E5%8C%97%E4%BA%AC-%E4%B8%AD%E5%9C%8B/) | 10:09:14 |\n| [上海，中國](https://naozhong.tw/shijian/%E4%B8%8A%E6%B5%B7-%E4%B8%AD%E5%9C%8B/) | 10:09:14 |\n| [烏魯木齊，中國](https://naozhong.tw/shijian/%E7%83%8F%E9%AD%AF%",
-    //             "dateTime": "2025-03-13 06:48:01" // jina deepsearch only
+    //             "dateTime": "2025-03-13 06:48:01" // jina deep-research only
     //         }
     //     },
     // ];
@@ -700,21 +686,21 @@ const packResp = async (resp, options) => {
         ).join('\n');
     }
     txt = txt.split('\n');
-    const [reJinaStr, reJinaEnd]
-        = [`^\s*(${THINK_STR})`, `(${THINK_END})\s*$`].map(x => new RegExp(x));
-    const fixJina = [];
-    for (let l of txt) {
-        let catched = false;
-        if (reJinaStr.test(l)) {
-            fixJina.push(THINK_STR);
-            l = l.replace(reJinaStr, '');
-        }
-        if (reJinaEnd.test(l)) {
-            l = l.replace(reJinaEnd, '');
-            catched = true;
-        }
-        fixJina.push(l, ...catched ? [THINK_END, ''] : []);
-    }
+    // const [reJinaStr, reJinaEnd]
+    //     = [`^\s*(${THINK_STR})`, `(${THINK_END})\s*$`].map(x => new RegExp(x));
+    // const fixJina = [];
+    // for (let l of txt) {
+    //     let catched = false;
+    //     if (reJinaStr.test(l)) {
+    //         fixJina.push(THINK_STR);
+    //         l = l.replace(reJinaStr, '');
+    //     }
+    //     if (reJinaEnd.test(l)) {
+    //         l = l.replace(reJinaEnd, '');
+    //         catched = true;
+    //     }
+    //     fixJina.push(l, ...catched ? [THINK_END, ''] : []);
+    // }
     txt = fixJina;
     for (let i in txt) {
         switch (txt[i]) {
@@ -732,7 +718,7 @@ const packResp = async (resp, options) => {
         ...audio ? { audio } : {}, ...images?.length ? { images } : {},
         processing: !!options?.processing,
         model: packModelId([
-            options.provider, options?.router?.provider,
+            options?.provider, options?.router?.provider,
             options?.router?.model || options?.model,
         ]),
     };
@@ -1117,6 +1103,60 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
                 }, model: packModelId([provider, M.source, M.name]),
             };
         }
+    } else if (M?.['deep-research']) {
+        const pkgOptions = { ...options || {}, provider, model: M.name };
+        let interactionId, last_event_id, isComplete = false;
+        let [thought, text, result] = ['', '', ''];
+        var resp;
+        // Helper to handle the event logic
+        const handleStream = async (stream) => {
+            for await (const chunk of stream) {
+                chunk.event_type === 'interaction.start'
+                    && (interactionId = chunk.interaction.id);
+                chunk.event_id && (last_event_id = chunk.event_id);
+                let deltaThought = '', deltaText = '', delta = '';
+                if (chunk.event_type === 'content.delta') {
+                    if (chunk.delta.type === 'text') {
+                        thought && (deltaThought = `${THINK_END}\n\n`);
+                        text += (deltaText = chunk.delta.text);
+                    } else if (chunk.delta.type === 'thought_summary') {
+                        deltaThought = chunk.delta.content.text;
+                        thought || (deltaThought = `${THINK_STR}\n${deltaThought}`);
+                        thought += deltaThought;
+                    }
+                    result += (delta = deltaThought + deltaText);
+                    await streamResp({
+                        text: options.delta ? delta : result,
+                    }, pkgOptions);
+                } else if (chunk.event_type === 'interaction.complete') {
+                    isComplete = true;
+                }
+            }
+        };
+        // 1. Start the task with streaming
+        resp = await client.interactions.create({
+            input: prompt, agent: M.name, background: true, store: true,
+            stream: true, // tools: [],
+            agent_config: { type: 'deep-research', thinking_summaries: 'auto' },
+            previous_interaction_id: options?.previous_interaction_id,
+        });
+        await handleStream(resp);
+        // 2. Reconnect Loop
+        while (!isComplete && interactionId) {
+            log(`[DRS] Reconnecting to interaction ${interactionId} from event ${last_event_id}...`);
+            try {
+                resp = await client.interactions.get(interactionId, {
+                    stream: true, last_event_id,
+                });
+                await handleStream(resp);
+            } catch (e) {
+                log('[DRS] Reconnection failed, retrying in 2s...');
+                await timeout(2000);
+            }
+        }
+        // 3. Return response
+        options?.raw || (resp = await packResp({ text: result }, pkgOptions));
+        return resp;
     } else {
         throwError('Unsupported model.');
     }

package/lib/manifest.mjs

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

package/package.json

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