nothumanallowed 13.5.158 → 13.5.160

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nothumanallowed",
-  "version": "13.5.158",
+  "version": "13.5.160",
   "description": "NotHumanAllowed — 38 AI agents, 80 tools, Studio (visual agentic workflows). Email, calendar, browser automation, screen capture, canvas, cron/heartbeat, Alexandria E2E messaging, GitHub, Notion, Slack, voice chat, free AI (Liara), 28 languages. Zero-dependency CLI.",
   "type": "module",
   "bin": {

package/src/constants.mjs

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-export const VERSION = '13.5.158';
+export const VERSION = '13.5.160';
 export const BASE_URL = 'https://nothumanallowed.com/cli';
 export const API_BASE = 'https://nothumanallowed.com/api/v1';
 

package/src/services/web-ui.mjs

@@ -8844,15 +8844,24 @@ async function wcGenerate() {
     var splitPrompts = WC_CSS_SPLIT[fp.name];
     if (splitPrompts) {
       // Two-pass generation: streaming on first pass only
-      var part1 = await wcCallLLM(sysPreamble, splitPrompts[0] + _nl2 + _nl2 + 'File: ' + fp.name, signal, fp.lang, 8192, onLiveUpdate);
+      var part1 = await wcCallLLM(sysPreamble, splitPrompts[0] + _nl2 + _nl2 + 'File: ' + fp.name, signal, fp.lang, 8192, onLiveUpdate, fp.name);
       part1 = wcStripFences(part1);
       if (signal && signal.aborted) return part1;
-      var part2 = await wcCallLLM(sysPreamble, splitPrompts[1] + _nl2 + _nl2 + 'File: ' + fp.name, signal, fp.lang, 8192, function(p2) { if (onLiveUpdate) onLiveUpdate(part1 + _nl2 + _nl2 + p2); });
+      var part2 = await wcCallLLM(sysPreamble, splitPrompts[1] + _nl2 + _nl2 + 'File: ' + fp.name, signal, fp.lang, 8192, function(p2) { if (onLiveUpdate) onLiveUpdate(part1 + _nl2 + _nl2 + p2); }, fp.name);
       part2 = wcStripFences(part2);
       return part1 + _nl2 + _nl2 + part2;
     }
-    var content = await wcCallLLM(sysPreamble, fp.prompt + _nl2 + _nl2 + 'File to generate: ' + fp.name, signal, fp.lang, undefined, onLiveUpdate);
+    var content = await wcCallLLM(sysPreamble, fp.prompt + _nl2 + _nl2 + 'File to generate: ' + fp.name, signal, fp.lang, undefined, onLiveUpdate, fp.name);
     content = wcStripFences(content);
+    // Detect model confusion: if output looks like a conversational reply instead of code, retry once
+    var firstLine = content.trim().split(_nl2)[0] || '';
+    var confusionPhrases = ['I notice', 'Could you please', 'I need to know', 'I don', 'To help you', 'Please clarify', 'I apologize', 'Unfortunately', 'As an AI'];
+    var isConfused = confusionPhrases.some(function(p) { return firstLine.indexOf(p) === 0; });
+    if (isConfused && !(signal && signal.aborted)) {
+      var retryPrompt = 'IMPORTANT: Output ONLY the raw file content for ' + fp.name + '. No explanations, no questions, no markdown. Just the code.' + _nl2 + _nl2 + fp.prompt;
+      content = await wcCallLLM(sysPreamble, retryPrompt + _nl2 + _nl2 + 'File to generate: ' + fp.name, signal, fp.lang, undefined, onLiveUpdate, fp.name);
+      content = wcStripFences(content);
+    }
     // Post-process: fix LLM streaming artifacts (spaces inserted inside keywords/identifiers)
     if (fp.lang === 'javascript' || fp.lang === 'typescript') {
       // Fix spaces inside JS/TS keywords that LLMs sometimes split during streaming
@@ -8951,50 +8960,43 @@ async function wcGenerate() {
     }, 80);
   }
 
-  // Generate in parallel batches of 4 — each call is independent/fresh to Liara
-  // Counter increments 1 per file as it completes, not per batch
-  var BATCH = 4;
+  // Generate sequentially — one file at a time so every file streams visibly
+  // and the progress bar increments file by file
   var doneCount = 0;
   wcUpdateGenOverlay(0, filePlan.length, '');
-  for (var bi = 0; bi < filePlan.length; bi += BATCH) {
+  for (var si = 0; si < filePlan.length; si++) {
     if (_wcGenAbortCtrl && _wcGenAbortCtrl.signal.aborted) break;
-    var batch = filePlan.slice(bi, bi + BATCH);
-    var results = await Promise.allSettled(batch.map(function(fp, bii) {
-      // Point activeFile at the first file of this batch so tokens appear immediately
-      if (bii === 0) {
-        var firstIdx = wcState.generatedFiles.findIndex(function(f){ return f.name === fp.name; });
-        if (firstIdx >= 0) wcState.activeFile = firstIdx;
-      }
-      // Show file name in overlay as soon as it starts
-      wcUpdateGenOverlay(doneCount, filePlan.length, fp.name);
-      var liveCallback = function(partial) { wcLiveUpdateFile(fp.name, fp.lang, partial); };
-      return wcGenOneFile(fp, _wcGenAbortCtrl ? _wcGenAbortCtrl.signal : null, liveCallback).then(function(c){ return { fp: fp, content: c }; });
-    }));
-    results.forEach(function(r, ri) {
-      var batchIdx = ri;
-      if (r.status === 'fulfilled') {
-        var fp = r.value.fp;
-        for (var gi = 0; gi < wcState.generatedFiles.length; gi++) {
-          if (wcState.generatedFiles[gi].name === fp.name) {
-            wcState.generatedFiles[gi] = { name: fp.name, content: r.value.content, lang: fp.lang };
-            break;
-          }
+    var fp = filePlan[si];
+
+    // Switch viewer to this file and show its name in the bar
+    var fileIdx = wcState.generatedFiles.findIndex(function(f){ return f.name === fp.name; });
+    if (fileIdx >= 0) wcState.activeFile = fileIdx;
+    wcUpdateGenOverlay(doneCount, filePlan.length, fp.name);
+
+    var liveCallback = (function(fpCap) {
+      return function(partial) { wcLiveUpdateFile(fpCap.name, fpCap.lang, partial); };
+    }(fp));
+
+    try {
+      var genContent = await wcGenOneFile(fp, _wcGenAbortCtrl ? _wcGenAbortCtrl.signal : null, liveCallback);
+      for (var gi = 0; gi < wcState.generatedFiles.length; gi++) {
+        if (wcState.generatedFiles[gi].name === fp.name) {
+          wcState.generatedFiles[gi] = { name: fp.name, content: genContent, lang: fp.lang };
+          break;
         }
-      } else if (r.reason && r.reason.name !== 'AbortError') {
-        var fpErr = batch[batchIdx];
-        if (fpErr) {
-          for (var gi2 = 0; gi2 < wcState.generatedFiles.length; gi2++) {
-            if (wcState.generatedFiles[gi2].name === fpErr.name) {
-              wcState.generatedFiles[gi2] = { name: fpErr.name, content: '// Error generating this file: ' + (r.reason.message || 'unknown error'), lang: fpErr.lang || '', _error: true };
-              break;
-            }
-          }
+      }
+    } catch(genErr) {
+      if (genErr && genErr.name === 'AbortError') break;
+      for (var gi2 = 0; gi2 < wcState.generatedFiles.length; gi2++) {
+        if (wcState.generatedFiles[gi2].name === fp.name) {
+          wcState.generatedFiles[gi2] = { name: fp.name, content: '// Error generating this file: ' + (genErr && genErr.message || 'unknown error'), lang: fp.lang || '', _error: true };
+          break;
         }
       }
-      doneCount++;
-      // Update counter immediately on each file completion — no full re-render
-      wcUpdateGenOverlay(doneCount, filePlan.length, doneCount < filePlan.length ? (batch[Math.min(batchIdx+1, batch.length-1)] || batch[batchIdx] || {}).name || '' : '');
-    });
+    }
+
+    doneCount++;
+    wcUpdateGenOverlay(doneCount, filePlan.length, si + 1 < filePlan.length ? filePlan[si + 1].name : '');
   }
 
   if (_wcTimerInterval) { clearInterval(_wcTimerInterval); _wcTimerInterval = null; }
@@ -9301,19 +9303,21 @@ async function wcCallLLMRaw(sys, user, signal, maxTok, onToken) {
   }
 }
 
-async function wcCallLLM(sys, user, signal, lang, maxTok, onToken) {
+async function wcCallLLM(sys, user, signal, lang, maxTok, onToken, fileName) {
   var content = await wcCallLLMRaw(sys, user, signal, maxTok, onToken);
   // Continuation loop: if response is truncated, ask model to continue (no streaming for continuations)
   var maxContinuations = 2;
   for (var ci = 0; ci < maxContinuations; ci++) {
     if (!wcIsTruncated(content, lang || 'text')) break;
     if (signal && signal.aborted) break;
-    var continuePrompt = 'Continue generating the file EXACTLY from where you stopped. Do not repeat anything already written. Output ONLY the remaining code, starting from the next character after where you stopped.' +
-      String.fromCharCode(10) + String.fromCharCode(10) + 'The file so far ends with:' +
-      String.fromCharCode(10) + content.slice(-300);
+    var _nlc = String.fromCharCode(10);
+    var continuePrompt = (fileName ? 'File: ' + fileName + _nlc + _nlc : '') +
+      'You were generating this file and ran out of tokens. The file is INCOMPLETE.' + _nlc +
+      'Continue EXACTLY from where you stopped. Output ONLY the remaining code — do NOT repeat anything already written, do NOT explain, do NOT use markdown fences.' + _nlc + _nlc +
+      'The file so far ends with (last 600 chars):' + _nlc + content.slice(-600);
     var continuation = await wcCallLLMRaw(sys, continuePrompt, signal, maxTok);
     if (!continuation || continuation.trim().length < 5) break;
-    content = content + String.fromCharCode(10) + continuation;
+    content = content + _nlc + continuation;
     if (onToken) onToken(content);
   }
   return content;