utilitas 2001.1.68 → 2001.1.70

package/lib/alan.mjs

@@ -54,7 +54,7 @@ const [
     GEMINI_30_PRO, GEMINI_25_FLASH, IMAGEN_4_ULTRA, VEO_31, IMAGEN_4_UPSCALE,
     ERROR_GENERATING, GEMINI_25_FLASH_TTS, GEMINI_25_PRO_TTS, wav,
     GPT_4O_MIMI_TTS, GPT_4O_TRANSCRIBE, INVALID_AUDIO, OGG_EXT, ELLIPSIS,
-    TOP_LIMIT, ATTACHMENT, PROCESSING, CURSOR, LN
+    TOP_LIMIT, ATTACHMENT, PROCESSING, CURSOR, LN, TOP
 ] = [
         'OpenAI', 'Google', 'Ollama', 'nova', 'deepseek-3.2-speciale', '```',
         'claude-opus-4.5', 'audio', 'wav', 'OPENAI_VOICE', 'medium', 'think',
@@ -72,7 +72,7 @@ const [
         'imagen-4.0-upscale-preview', 'Error generating content.',
         'gemini-2.5-flash-preview-tts', 'gemini-2.5-pro-tts', 'wav',
         'gpt-4o-mini-tts', 'gpt-4o-transcribe', 'Invalid audio data.', 'ogg',
-        '...', 3, 'ATTACHMENT', { processing: true }, ' █', '\n',
+        '...', 3, 'ATTACHMENT', { processing: true }, ' █', '\n', 'top',
     ];
 
 const LN2 = `${LN}${LN}`;
@@ -1235,7 +1235,7 @@ const collectAttachments = async (options = {}) => {
 const selectAi = async (options = {}) => {
     options.aiId = ensureArray(options?.aiId).filter(x => x);
     const ais = await getAi(null, { all: true });
-    if (options.aiId.includes('top')) {                 // Use top AIs
+    if (options.aiId.includes(TOP)) {                 // Use top AIs
         options.aiId = ais.slice(0, TOP_LIMIT).map(x => x.id);
     } else if (options.collected?.length) {             // Select by attachments
         const supported = {};
@@ -1254,20 +1254,16 @@ const selectAi = async (options = {}) => {
     } else {                                            // Select by preference
         options.aiId = options.aiId.filter(x => ais.find(y => y.id === x));
     }
-    options.aiId.length || (options.aiId = ais[0].id);
+    options.aiId.length || (options.aiId = [ais[0].id]);
     return options.aiId;
 };
 
 const talk = async (request, options = {}) => {
-    const SOUND_ICON = '🔊';
-    let [sessionId, msgs] = [options.sessionId || newSessionId(), {}];
+    // init
+    const [sessionId, msgs, stream, SOUND_ICON]
+        = [options.sessionId || newSessionId(), {}, options.stream, '🔊'];
     await selectAi(options);
-    await collectAttachments(options);
-    request = joinL2([ensureString(request), ...(options.collected || []).filter(
-        x => x.type !== ATTACHMENT && String.isString(x.content)
-    ).map(x => x.content)]);
-    const session = await getSession(sessionId, { ...options, prompt: request });
-    const stream = options.stream;
+    // init functions
     const packMsg = (opts) => ({
         text: Object.values(msgs).find(x => x.text) ? joinL2(options.aiId.map(n => {
             if (msgs[n]?.ignored) { return null };
@@ -1290,7 +1286,16 @@ const talk = async (request, options = {}) => {
         ai && r && (msgs[ai] = r);
         stream && await stream(packMsg(opts));
     };
+    // first response
     await multiStream(null, null, PROCESSING);
+    // build prompt
+    await collectAttachments(options);
+    request = joinL2([ensureString(request), ...(options.collected || []).filter(
+        x => x.type !== ATTACHMENT && String.isString(x.content)
+    ).map(x => x.content)]);
+    // get session
+    const session = await getSession(sessionId, { ...options, prompt: request });
+    // prompt
     await Promise.all(options.aiId.map(async ai => {
         try {
             return await prompt(request, {
@@ -1304,10 +1309,13 @@ const talk = async (request, options = {}) => {
             log(e);
         }
     }));
+    // pack response
     const response = joinL2(Object.values(msgs).map(x => x.text));
+    // save session
     const chat = { request, response };
     request && response && session.messages.push(chat);
     await setSession(sessionId, session, options);
+    // tts
     if ((options?.tts || session?.config?.tts)
         && Object.values(msgs).find(x => !x.audio?.length)) {
         await ignoreErrFunc(async () => {
@@ -1318,6 +1326,7 @@ const talk = async (request, options = {}) => {
             }, { processing: true });
         }, LOG);
     }
+    // return
     return { sessionId, ...chat, ...packMsg({ processing: false }) };
 };
 
@@ -1504,6 +1513,7 @@ export {
     MODELS,
     OPENAI_VOICE,
     RETRIEVAL,
+    TOP,
     VEO_31,
     analyzeSessions,
     countTokens,

package/lib/manifest.mjs

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