utilitas 2001.1.86 → 2001.1.88

package/lib/alan.mjs

@@ -54,7 +54,8 @@ const [
     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',
@@ -73,7 +74,7 @@ const [
         '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]
@@ -102,14 +103,14 @@ const MODEL_ICONS = {
 };
 
 const FEATURE_ICONS = {
-    audio: '🔊', deepsearch: '🔍', fast: '⚡️', hearing: '👂', hidden: '🙈',
-    image: '🎨', json: '📊', reasoning: '🧠', tools: '🧰', video: '🎬',
+    audio: '🔊', 'deep-research': '🔍', fast: '⚡️', hearing: '👂', hidden: '🙈',
+    image: '🎨', reasoning: '🧠', structured: '📊', tools: '🧰', video: '🎬',
     vision: '👁️', // finetune: '🔧',
 };
 
 const GEMINI_RULES = {
     source: GOOGLE, contextWindow: m(1.05), maxOutputTokens: k(65.5),
-    hearing: true, json: true, reasoning: true, tools: true, vision: true,
+    hearing: true, reasoning: true, structured: true, tools: true, vision: true,
     supportedMimeTypes: [
         MIME_PNG, MIME_JPEG, MIME_MOV, MIME_MPEG, MIME_MP4, MIME_MPG, MIME_AVI,
         MIME_WMV, MIME_MPEGPS, MIME_FLV, MIME_PDF, MIME_AAC, MIME_FLAC,
@@ -120,7 +121,7 @@ const GEMINI_RULES = {
 
 const OPENAI_RULES = {
     source: OPENAI, contextWindow: k(400), maxOutputTokens: k(128),
-    hearing: true, json: true, reasoning: true, tools: true, vision: true,
+    hearing: true, reasoning: true, structured: true, tools: true, vision: true,
     supportedMimeTypes: [
         MIME_PNG, MIME_JPEG, MIME_GIF, MIME_WEBP, MIME_PDF, MIME_WAV
     ], defaultProvider: OPENROUTER,
@@ -128,7 +129,7 @@ const OPENAI_RULES = {
 
 const DEEPSEEK_32_RULES = {
     source: DEEPSEEK, contextWindow: k(163.8), maxOutputTokens: k(65.5),
-    json: true, tools: true, reasoning: true,
+    structured: true, tools: true, reasoning: true,
 };
 
 // https://platform.openai.com/docs/models
@@ -137,7 +138,7 @@ const DEEPSEEK_32_RULES = {
 const MODELS = {
     // fast and balanced models
     [GEMINI_30_FLASH]: { // https://gemini.google.com/app/c680748b3307790b
-        ...GEMINI_RULES, fast: true, json: false, // issue with json output via OpenRouter
+        ...GEMINI_RULES, fast: true, structured: false, // issue with json output via OpenRouter
     },
     // strong and fast
     [GPT_52]: { ...OPENAI_RULES, fast: true },
@@ -169,7 +170,7 @@ const MODELS = {
     [GPT_51_CODEX]: { ...OPENAI_RULES },
     [CLOUD_OPUS_45]: {
         source: ANTHROPIC, contextWindow: k(200), maxOutputTokens: k(64),
-        json: true, reasoning: true, tools: true, vision: true,
+        reasoning: true, structured: true, tools: true, vision: true,
         supportedMimeTypes: [
             MIME_TEXT, MIME_PNG, MIME_JPEG, MIME_GIF, MIME_WEBP, MIME_PDF,
         ], defaultProvider: OPENROUTER,
@@ -191,10 +192,14 @@ const MODELS = {
         source: OPENAI, maxInputTokens: 0,
         hearing: true, fast: true, hidden: true, defaultProvider: OPENAI,
     },
-    // models with deepsearch capabilities
+    // 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,
+    },
     [JINA_DEEPSEARCH]: { // @todo: parse more details from results, eg: "reed urls".
         maxInputTokens: Infinity, attachmentTokenCost: 0,
-        deepsearch: true, json: true, reasoning: true, vision: true,
+        'deep-research': true, reasoning: true,
         supportedMimeTypes: [MIME_PNG, MIME_JPEG, MIME_TEXT, MIME_WEBP, MIME_PDF],
         defaultProvider: JINA,
     },
@@ -204,7 +209,7 @@ const MODELS = {
     // best local model
     [GEMMA_3_27B]: {
         source: GOOGLE, contextWindow: k(128), maxOutputTokens: k(8),
-        fast: true, json: true, vision: true,
+        fast: true, structured: true, vision: true,
         supportedMimeTypes: [MIME_PNG, MIME_JPEG, MIME_GIF],
         defaultProvider: OLLAMA,
     },
@@ -252,7 +257,7 @@ for (const n in MODELS) {
 //     }
 //     // for other features, if any model supports it, then AUTO supports it
 //     for (const key of [
-//         'json', 'reasoning', 'tools', 'vision', 'fast', 'deepsearch', 'image',
+//         'structured', 'reasoning', 'tools', 'vision', 'fast', 'deep-research', 'image',
 //     ]) {
 //         MODELS[AUTO][key] = MODELS[AUTO][key] || MODELS[n][key];
 //     }
@@ -516,7 +521,7 @@ const packAi = (ais, options = {}) => {
 
 const getAi = async (id, options = {}) => {
     options?.select || (options.select = {});
-    options?.jsonMode && (options.select.json = true);
+    options?.jsonMode && (options.select.structured = true);
     if (id) {
         const ai = ais.find(x => x.id === id);
         assert(ai, `AI not found: ${id}.`);
@@ -687,7 +692,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
     //         }
     //     },
     // ];
@@ -732,7 +737,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,
         ]),
     };
@@ -750,8 +755,8 @@ const packModelId = (model_reference, options = {}) => {
 };
 
 const buildPrompts = async (model, input, options = {}) => {
-    assert(!(options.jsonMode && !model?.json),
-        `This model does not support JSON output: ${model.name}`);
+    assert(!(options.jsonMode && !model?.structured),
+        `This model does not support structured output: ${model.name}`);
     assert(!(options.reasoning && !model?.reasoning),
         `This model does not support reasoning: ${model.name}`);
     options.attachments = (await Promise.all((
@@ -1117,6 +1122,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.');
     }
@@ -1499,7 +1558,7 @@ const analyzeSessions = async (sessionIds, options) => {
         if (sm.length) { sses[ids[i]] = sm; }
     }
     const ai = await getAi(options?.aiId, {
-        jsonMode: true, simple: true, select: { json: true, fast: true },
+        jsonMode: true, simple: true, select: { structured: true, fast: true },
         ...options || {}
     });
     const pmt = options?.prompt || (

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "2001.1.86",
+    "version": "2001.1.88",
     "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.86",
+    "version": "2001.1.88",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",