nothumanallowed 13.5.83 → 13.5.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nothumanallowed",
-  "version": "13.5.83",
+  "version": "13.5.85",
   "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/services/web-ui.mjs

@@ -6527,7 +6527,8 @@ var wcState = {
     dir: null,
     logs: [],
     error: null
-  }
+  },
+  lastGenStats: null
 };
 var wcRightTab = 'files';
 var wcMainTab = 'new';     // 'new' | 'projects'
@@ -6569,9 +6570,11 @@ function renderWebCraft(el) {
         wcState.generatedFiles.map(function(f,i){
           var active = i === wcState.activeFile;
           var hasErr = !!f._error || !!f._syntaxError;
-          var tabColor = hasErr ? (active ? '#f87171' : '#7f4040') : (active ? 'var(--green)' : 'var(--dim)');
+          var isPending = !!f._pending;
+          var tabColor = hasErr ? (active ? '#f87171' : '#7f4040') : isPending ? (active ? '#9ca3af' : '#4b5563') : (active ? 'var(--green)' : 'var(--dim)');
           var tabBorder = hasErr ? (active ? '#f87171' : 'transparent') : (active ? 'var(--green3)' : 'transparent');
-          return '<button id="wcTab'+i+'" onclick="wcSetFile('+i+')" style="padding:6px 14px;font-size:11px;font-family:var(--mono);font-weight:'+(active?'700':'400')+';background:'+(active?'var(--bg3)':'transparent')+';border:none;border-bottom:2px solid '+tabBorder+';color:'+tabColor+';cursor:pointer;white-space:nowrap;flex-shrink:0">'+(hasErr?'&#9888; ':'')+wcEsc(f.name)+'</button>';
+          var tabPrefix = hasErr ? '&#9888; ' : isPending ? '&#8987; ' : '';
+          return '<button id="wcTab'+i+'" onclick="wcSetFile('+i+')" style="padding:6px 14px;font-size:11px;font-family:var(--mono);font-weight:'+(active?'700':'400')+';background:'+(active?'var(--bg3)':'transparent')+';border:none;border-bottom:2px solid '+tabBorder+';color:'+tabColor+';cursor:pointer;white-space:nowrap;flex-shrink:0">'+tabPrefix+wcEsc(f.name)+'</button>';
         }).join('') +
       '</div>'
     : '';
@@ -6661,7 +6664,13 @@ function renderWebCraft(el) {
             '<button onclick="wcToggleGrep()" title="Cerca nel codice" style="padding:9px 10px;background:'+(_wcGrepOpen?'var(--greendim)':'var(--bg3)')+';border:1px solid '+(_wcGrepOpen?'var(--green3)':'var(--border2)')+';border-radius:8px;color:'+(_wcGrepOpen?'var(--green)':'var(--dim)')+';font-size:11px;cursor:pointer">&#128269;</button>' +
             '<button onclick="wcManualSnapshot()" title="Salva snapshot" style="padding:9px 10px;background:var(--bg3);border:1px solid var(--border2);border-radius:8px;color:var(--dim);font-size:11px;cursor:pointer">&#128190;</button>' +
           '</div>' +
-          '<button onclick="wcStartSandbox()" id="wcSandboxBtn" style="width:100%;padding:10px;background:var(--bg3);border:1px solid var(--green3);border-radius:8px;color:var(--green);font-size:12px;font-weight:600;cursor:pointer">&#9654; '+t('wc_sandbox_start')+'</button>'
+          '<button onclick="wcStartSandbox()" id="wcSandboxBtn" style="width:100%;padding:10px;background:var(--bg3);border:1px solid var(--green3);border-radius:8px;color:var(--green);font-size:12px;font-weight:600;cursor:pointer">&#9654; '+t('wc_sandbox_start')+'</button>' +
+          (wcState.lastGenStats ? '<div style="padding:6px 8px;background:var(--bg3);border:1px solid var(--border);border-radius:6px;font-size:10px;color:var(--dim);font-family:var(--mono);display:flex;flex-wrap:wrap;gap:6px">' +
+            '<span>&#9201; '+(wcState.lastGenStats.seconds >= 60 ? Math.floor(wcState.lastGenStats.seconds/60)+'m '+(wcState.lastGenStats.seconds%60)+'s' : wcState.lastGenStats.seconds+'s')+'</span>' +
+            '<span>&#8679; '+wcState.lastGenStats.tokIn.toLocaleString()+' tok in</span>' +
+            '<span>&#8681; '+wcState.lastGenStats.tokOut.toLocaleString()+' tok out</span>' +
+            '<span>&#128196; '+wcState.lastGenStats.files+' file</span>' +
+          '</div>' : '')
         : '') +
       '</div>' +
       '<div data-wc-files style="position:relative;flex:1;min-width:0;background:var(--bg2);border:1px solid var(--border);border-radius:10px;display:flex;flex-direction:column;height:100%;overflow:hidden">' +
@@ -7870,11 +7879,35 @@ async function wcGenerate() {
   var _nl = String.fromCharCode(10);
   var sysPreamble = 'You are an expert full-stack engineer generating production-quality code.' + _nl + _nl + 'SECURITY RULES (non-negotiable):' + _nl + SECURITY_RULES + _nl + _nl + 'Project: ' + projName + _nl + 'Description: ' + desc + _nl + 'Enabled blocks: ' + blocksEnabled + _nl + _nl + 'Generate ONLY the file content requested. No explanations, no markdown code fences, no comments like "here is the file". Output raw file content only.';
 
+  var _wcGenStartTime = Date.now();
+  var _wcTokIn = 0, _wcTokOut = 0;
+  var _wcTimerInterval = null;
+
+  function wcGenElapsed() {
+    var s = Math.floor((Date.now() - _wcGenStartTime) / 1000);
+    var m = Math.floor(s / 60); s = s % 60;
+    return (m > 0 ? m + 'm ' : '') + s + 's';
+  }
+
+  function wcStartGenTimer() {
+    if (_wcTimerInterval) clearInterval(_wcTimerInterval);
+    _wcTimerInterval = setInterval(function() {
+      if (!wcState.running) { clearInterval(_wcTimerInterval); _wcTimerInterval = null; return; }
+      wcUpdateGenOverlay(_wcGenOverlayState.fi, _wcGenOverlayState.total, _wcGenOverlayState.name);
+    }, 1000);
+  }
+
+  var _wcGenOverlayState = { fi: 0, total: 0, name: '' };
+
   function wcUpdateGenOverlay(fi2, total, name) {
-    if (_wcOverlayMinimized) return; // don't touch minimized pill
+    _wcGenOverlayState = { fi: fi2, total: total, name: name };
+    if (_wcOverlayMinimized) return;
     var ov = document.getElementById('wcGenOverlay');
     if (!ov) return;
     var pct = Math.round((fi2 / total) * 100);
+    var tokLabel = (_wcTokIn + _wcTokOut) > 0
+      ? '<div style="font-size:10px;color:var(--dim);margin-top:4px;font-family:var(--mono)">&#8679;' + _wcTokIn.toLocaleString() + ' &#8681;' + _wcTokOut.toLocaleString() + ' tok</div>'
+      : '';
     ov.innerHTML =
       '<div style="font-size:38px;animation:wcRobotBob 1s ease-in-out infinite">&#129302;</div>' +
       '<div style="font-size:13px;font-weight:700;color:var(--green);margin-top:12px">Generazione in corso...</div>' +
@@ -7883,11 +7916,12 @@ async function wcGenerate() {
       '<div style="width:220px;height:4px;background:rgba(255,255,255,0.1);border-radius:2px;overflow:hidden;margin-top:12px">' +
         '<div style="height:100%;width:'+pct+'%;background:var(--green);border-radius:2px;transition:width .4s ease;animation:wcBarPulse 1.5s ease-in-out infinite"></div>' +
       '</div>' +
-      '<div style="font-size:10px;color:var(--dim);margin-top:6px">'+fi2+' / '+total+' file</div>' +
+      '<div style="font-size:10px;color:var(--dim);margin-top:6px">'+fi2+' / '+total+' file &nbsp;&#183;&nbsp; '+wcGenElapsed()+'</div>' +
+      tokLabel +
       '<div style="display:flex;gap:4px;margin-top:10px">'+[0,1,2,3,4].map(function(_,idx){ return '<div style="width:6px;height:6px;border-radius:50%;background:var(--green);animation:wcDot 1.1s ease-in-out infinite '+(idx*0.14)+'s"></div>'; }).join('')+'</div>';
   }
 
-  // Helper: generate one file, returns {ok, content} or {ok:false, err}
+  // Helper: generate one file
   async function wcGenOneFile(fp, signal) {
     var _nl2 = String.fromCharCode(10);
     var content = await wcCallLLM(sysPreamble, fp.prompt + _nl2 + _nl2 + 'File to generate: ' + fp.name, signal, fp.lang);
@@ -7898,21 +7932,49 @@ async function wcGenerate() {
     return wcLines.join(_nl2).trim();
   }
 
-  for (var fi = 0; fi < filePlan.length; fi++) {
-    var fp = filePlan[fi];
-    wcUpdateGenOverlay(fi, filePlan.length, fp.name);
+  wcStartGenTimer();
+
+  // Pre-populate generatedFiles in order so tabs appear immediately
+  filePlan.forEach(function(fp) {
+    wcState.generatedFiles.push({ name: fp.name, content: '', lang: fp.lang, _pending: true });
+  });
+  wcState.activeFile = 0;
+  renderWebCraft(document.getElementById('content'));
+
+  // Generate in parallel batches of 4 — each call is independent/fresh to Liara
+  var BATCH = 4;
+  var doneCount = 0;
+  for (var bi = 0; bi < filePlan.length; bi += BATCH) {
     if (_wcGenAbortCtrl && _wcGenAbortCtrl.signal.aborted) break;
-    try {
-      var content = await wcGenOneFile(fp, _wcGenAbortCtrl ? _wcGenAbortCtrl.signal : null);
-      wcState.generatedFiles.push({ name: fp.name, content: content, lang: fp.lang });
-      if (fi === 0) wcState.activeFile = 0;
-      renderWebCraft(document.getElementById('content'));
-    } catch(e) {
-      if (e && e.name === 'AbortError') break;
-      wcState.generatedFiles.push({ name: fp.name, content: '// Error generating this file: ' + (e.message || 'unknown error'), lang: fp.lang, _error: true });
-      if (fi === 0) wcState.activeFile = 0;
-      renderWebCraft(document.getElementById('content'));
-    }
+    var batch = filePlan.slice(bi, bi + BATCH);
+    wcUpdateGenOverlay(doneCount, filePlan.length, batch.map(function(f){ return f.name; }).join(', '));
+    var results = await Promise.allSettled(batch.map(function(fp) {
+      return wcGenOneFile(fp, _wcGenAbortCtrl ? _wcGenAbortCtrl.signal : null).then(function(c){ return { fp: fp, content: c }; });
+    }));
+    results.forEach(function(r) {
+      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;
+          }
+        }
+      } else if (r.reason && r.reason.name !== 'AbortError') {
+        var fpName = batch[results.indexOf(r)] ? batch[results.indexOf(r)].name : '?';
+        // find by matching position
+        var batchIdx = results.indexOf(r);
+        if (batch[batchIdx]) fpName = batch[batchIdx].name;
+        for (var gi2 = 0; gi2 < wcState.generatedFiles.length; gi2++) {
+          if (wcState.generatedFiles[gi2].name === fpName) {
+            wcState.generatedFiles[gi2] = { name: fpName, content: '// Error generating this file: ' + (r.reason.message || 'unknown error'), lang: (batch[batchIdx] || {}).lang || '', _error: true };
+            break;
+          }
+        }
+      }
+      doneCount++;
+    });
+    renderWebCraft(document.getElementById('content'));
   }
 
   // ── Retry pass: regenerate files that failed ──────────────────────────────
@@ -7998,9 +8060,14 @@ async function wcGenerate() {
     }
   }
 
+  if (_wcTimerInterval) { clearInterval(_wcTimerInterval); _wcTimerInterval = null; }
+  var _wcGenTotalTime = Math.floor((Date.now() - _wcGenStartTime) / 1000);
+
   wcState.running = false;
   _wcGenAbortCtrl = null;
   _wcOverlayMinimized = false;
+  // Store final stats for display after generation
+  wcState.lastGenStats = { tokIn: _wcTokIn, tokOut: _wcTokOut, seconds: _wcGenTotalTime, files: wcState.generatedFiles.length };
 
   // Auto-save project to ~/.nha/webcraft/<projectName>/
   try {
@@ -8092,6 +8159,15 @@ async function wcCallLLMRaw(sys, user, signal) {
     var r = await fetch(API + '/api/studio/webcraft', fetchOpts);
     if (r.ok) {
       var d = await r.json();
+      // Accumulate token counts if the server returns usage data
+      if (d && d.usage) {
+        if (typeof _wcTokIn !== 'undefined') _wcTokIn += (d.usage.prompt_tokens || d.usage.input_tokens || 0);
+        if (typeof _wcTokOut !== 'undefined') _wcTokOut += (d.usage.completion_tokens || d.usage.output_tokens || 0);
+      } else if (d && d.text) {
+        // Estimate from char count (4 chars ≈ 1 token)
+        if (typeof _wcTokIn !== 'undefined') _wcTokIn += Math.round((sys.length + user.length) / 4);
+        if (typeof _wcTokOut !== 'undefined') _wcTokOut += Math.round((d.text || '').length / 4);
+      }
       return (d && (d.text || d.content || d.result)) || '';
     }
     if (r.status < 500 || attempt === 2) {
@@ -8267,7 +8343,7 @@ async function wcStartSandbox() {
       headers: {'Content-Type':'application/json'},
       body: JSON.stringify({
         projectName: wcState.projectName || 'webcraft-sandbox',
-        files: wcState.generatedFiles.filter(function(f){ return !f._error; })
+        files: wcState.generatedFiles.filter(function(f){ return !f._error && !f._pending; })
       })
     });
     if (!r.ok || !r.body) throw new Error('Sandbox error ' + r.status);