utilitas 2001.1.94 → 2001.1.98

package/lib/alan.mjs

@@ -938,7 +938,7 @@ const promptOpenRouter = async (aiId, content, options = {}) => {
         delteReasoning && delteReasoning === resultReasoning
             && (delteReasoning = `${result ? '\n\n' : ''}${THINK_STR}\n${delteReasoning}`);
         resultReasoning && (deltaText || delta.tool_calls?.length) && !reasoningEnd && (
-            reasoningEnd = delteReasoning = `${delteReasoning}${THINK_END}\n\n`
+            reasoningEnd = delteReasoning = `${delteReasoning}\n${THINK_END}\n\n`
         );
         deltaText = delteReasoning + deltaText;
         result += deltaText;

package/lib/manifest.mjs

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

package/lib/shell.mjs

@@ -1,4 +1,4 @@
-import { exec as _exec } from 'child_process';
+import { spawn } from 'child_process';
 import { log as _log } from './utilitas.mjs';
 
 const log = (content) => _log(content, import.meta.url);
@@ -8,21 +8,44 @@ const exist = (bin) => { assertCommand(bin); return which(bin); };
 
 const exec = async (command, options = {}) => {
     assertCommand(command);
+    const limit = options?.limit || 3000;
     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);
+        const child = (spawn || vF)(command, { ...options || {}, shell: true });
+        const buf = { stdout: { lines: [], p: '' }, stderr: { lines: [], p: '' } };
+        const collect = (k, d) => {
+            if (options?.stream) { options.stream(d); }
+            const p = (buf[k].p + d).split(/\r?\n/);
+            buf[k].p = p.pop();
+            buf[k].lines = buf[k].lines.concat(p);
+            if (buf[k].lines.length > limit) {
+                buf[k].lines = buf[k].lines.slice(-limit);
             }
-            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 getBuf = (k) => {
+            const c = buf[k].lines.join('\n');
+            return c + (c && buf[k].p ? '\n' : '') + buf[k].p;
+        };
+        if (child?.stdout) {
+            child.stdout.on('data', d => collect('stdout', d));
+            child.stderr.on('data', d => collect('stderr', d));
+            child.on('close', code => {
+                const stdout = getBuf('stdout');
+                const stderr = getBuf('stderr');
+                if (code && !options?.acceptError) {
+                    const err = new Error(stderr || `Command failed: ${command}\n${stdout}`);
+                    err.code = code;
+                    return reject(err);
+                }
+                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());
+            });
+            child.on('error', reject);
+        } else {
+            vF(command, resolve);
         }
     });
 };

package/package.json

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