utilitas 2001.1.93 → 2001.1.94

package/lib/alan.mjs

@@ -1109,6 +1109,7 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
             };
         }
     } else if (M?.['deep-research']) {
+        // TODO: previous_interaction_id support
         const pkgOptions = { ...options || {}, provider, model: M.name };
         let interactionId, last_event_id, isComplete = false;
         let [thought, text, result] = ['', '', ''];
@@ -1122,7 +1123,7 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
                 let deltaThought = '', deltaText = '', delta = '';
                 if (chunk.event_type === 'content.delta') {
                     if (chunk.delta.type === 'text') {
-                        thought && (deltaThought = `${THINK_END}\n\n`);
+                        thought && (deltaThought = `\n${THINK_END}\n\n`);
                         text += (deltaText = chunk.delta.text);
                     } else if (chunk.delta.type === 'thought_summary') {
                         deltaThought = chunk.delta.content.text;

package/lib/manifest.mjs

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

package/lib/shell.mjs

@@ -1,20 +1,30 @@
 import { exec as _exec } from 'child_process';
 import { log as _log } from './utilitas.mjs';
-import { promisify } from 'util';
 
 const log = (content) => _log(content, import.meta.url);
 const vF = (cmd, cbf) => { log(`Can not run in browser: ${cmd}`); cbf(); };
-const pmsExec = promisify(_exec || vF);
 const assertCommand = (command) => assert(command, 'Command is required.', 500);
 const exist = (bin) => { assertCommand(bin); return which(bin); };
 
 const exec = async (command, options = {}) => {
     assertCommand(command);
-    const { stdout, stderr } = await pmsExec(command);
-    assert(options?.acceptError || !stderr, stderr, 500);
-    return options?.acceptError
-        ? [stdout, stderr].map(x => x.trim()).filter(x => x).join('\n')
-        : stdout.trim();
+    return new Promise((resolve, reject) => {
+        const child = (_exec || vF)(command, (error, stdout, stderr) => {
+            if (error && !options?.acceptError) { return reject(error); }
+            try {
+                assert(options?.acceptError || !stderr, stderr, 500);
+            } catch (e) {
+                return reject(e);
+            }
+            resolve(options?.acceptError
+                ? [stdout, stderr].map(x => x.trim()).filter(x => x).join('\n')
+                : stdout.trim());
+        });
+        if (options?.stream && child?.stdout) {
+            child.stdout.on('data', options.stream);
+            child.stderr.on('data', options.stream);
+        }
+    });
 };
 
 const which = async (bin) => {

package/package.json

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