nothumanallowed 13.5.87 → 13.5.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nothumanallowed",
-  "version": "13.5.87",
+  "version": "13.5.89",
   "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

@@ -6528,7 +6528,11 @@ var wcState = {
     logs: [],
     error: null
   },
-  lastGenStats: null
+  lastGenStats: null,
+  repairing: false,
+  repairTotal: 0,
+  repairDone: 0,
+  repairCurrent: ''
 };
 var wcRightTab = 'files';
 var wcMainTab = 'new';     // 'new' | 'projects'
@@ -6550,6 +6554,10 @@ var _wcOverlayTimer = null;        // inactivity timer to restore overlay
 var _wcGenAbortCtrl = null;        // AbortController for generation stop
 var _wcSyntaxResults = [];   // [{file, ok, error}]
 var _wcSnapshots = [];       // [{ts, fileCount}]
+var _wcLastFilePlan = [];    // saved for manual repair trigger
+var _wcLastSysPreamble = '';
+var _wcTokIn = 0;            // global token counters (accumulate across generation + repair)
+var _wcTokOut = 0;
 // Skills state
 var wcSkills = [];          // [{name, content, type}] type: 'skill'|'memory'|'provider'
 var wcSkillModal = null;    // null | {mode:'edit'|'new', idx:number|null, name, content, type, generating}
@@ -6694,6 +6702,13 @@ function renderWebCraft(el) {
         (wcState.running ?
           '<div style="width:100%;padding:11px;background:var(--bg3);border:1px solid var(--border);border-radius:8px;color:var(--dim);font-size:12px;text-align:center">&#9203; '+t('wc_generating')+'...</div>'
         : '') +
+        (wcState.repairing ?
+          '<div style="width:100%;padding:10px 12px;background:rgba(234,179,8,0.08);border:1px solid rgba(234,179,8,0.4);border-radius:8px;display:flex;flex-direction:column;gap:4px">' +
+            '<div style="display:flex;align-items:center;gap:6px;font-size:11px;color:#facc15;font-weight:600">&#128295; Correzione automatica in corso...</div>' +
+            '<div style="font-size:10px;color:var(--dim)">'+wcState.repairDone+' / '+wcState.repairTotal+' file</div>' +
+            (wcState.repairCurrent ? '<div style="font-size:10px;color:#fde68a;font-family:var(--mono);overflow:hidden;text-overflow:ellipsis;white-space:nowrap">'+wcEsc(wcState.repairCurrent)+'</div>' : '') +
+          '</div>'
+        : '') +
         (wcState.generatedFiles.length > 0 && !wcState.running ?
           '<div style="display:flex;gap:6px;flex-wrap:wrap">' +
             '<button onclick="wcDownloadZip()" style="flex:1;padding:9px;background:var(--bg3);border:1px solid var(--border2);border-radius:8px;color:var(--text);font-size:11px;font-weight:600;cursor:pointer">&#8681; ZIP</button>' +
@@ -6701,6 +6716,9 @@ 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>' +
+          (wcState.generatedFiles.some(function(f){ return f._error || f._syntaxError; }) && !wcState.repairing ?
+            '<button onclick="wcTriggerRepair()" style="width:100%;padding:9px;background:rgba(234,179,8,0.08);border:1px solid rgba(234,179,8,0.5);border-radius:8px;color:#facc15;font-size:11px;font-weight:600;cursor:pointer">&#128295; Correggi tutti i file rossi</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>' +
@@ -7916,9 +7934,11 @@ 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.';
+  _wcLastFilePlan = filePlan;
+  _wcLastSysPreamble = sysPreamble;
 
   var _wcGenStartTime = Date.now();
-  var _wcTokIn = 0, _wcTokOut = 0;
+  _wcTokIn = 0; _wcTokOut = 0;  // reset global counters for this generation run
   var _wcTimerInterval = null;
 
   function wcGenElapsed() {
@@ -8023,103 +8043,114 @@ async function wcGenerate() {
     renderWebCraft(document.getElementById('content'));
   }
 
-  // ── Retry pass: regenerate files that failed ──────────────────────────────
-  var failedFiles = wcState.generatedFiles.filter(function(f){ return f._error; });
-  if (failedFiles.length > 0 && !(_wcGenAbortCtrl && _wcGenAbortCtrl.signal.aborted)) {
-    var retryPlan = filePlan.filter(function(fp){ return failedFiles.some(function(f){ return f.name === fp.name; }); });
-    for (var ri = 0; ri < retryPlan.length; ri++) {
-      var rfp = retryPlan[ri];
-      wcUpdateGenOverlay(ri, retryPlan.length, 'Retry: ' + rfp.name);
-      if (_wcGenAbortCtrl && _wcGenAbortCtrl.signal.aborted) break;
-      // Wait 3s before retry to let Liara recover
-      await new Promise(function(resolve){ setTimeout(resolve, 3000); });
-      try {
-        var retryContent = await wcGenOneFile(rfp, _wcGenAbortCtrl ? _wcGenAbortCtrl.signal : null);
-        // Replace the error entry with the successful one
-        for (var gi = 0; gi < wcState.generatedFiles.length; gi++) {
-          if (wcState.generatedFiles[gi].name === rfp.name) {
-            wcState.generatedFiles[gi] = { name: rfp.name, content: retryContent, lang: rfp.lang };
-            break;
-          }
-        }
-        renderWebCraft(document.getElementById('content'));
-      } catch(re) {
-        if (re && re.name === 'AbortError') break;
-        // Keep as error — already in generatedFiles
-      }
-    }
-  }
+  if (_wcTimerInterval) { clearInterval(_wcTimerInterval); _wcTimerInterval = null; }
+
+  wcState.running = false;
+  _wcGenAbortCtrl = null;
+  _wcOverlayMinimized = false;
+
+  // Auto-save
+  try {
+    await fetch(API + '/api/studio/webcraft/projects/save', {
+      method: 'POST', headers: {'Content-Type':'application/json'},
+      body: JSON.stringify({ projectName: wcState.projectName, description: wcState.description, files: wcState.generatedFiles })
+    });
+  } catch(_) {}
 
-  // ── Post-generation syntax scan ──────────────────────────────────────────
-  // Zero LLM calls — pure structural check on every generated file
-  // Files with syntax errors get _syntaxError set and are re-queued for retry
-  var syntaxFailedNames = [];
+  // Post-generation syntax scan — mark truncated/broken files before repair
   wcState.generatedFiles.forEach(function(f) {
-    if (f._error) return; // already failed at LLM level
-    var lang = f.lang || (f.name.endsWith('.css') ? 'css' : f.name.endsWith('.js') ? 'javascript' : f.name.endsWith('.html') ? 'html' : f.name.endsWith('.json') ? 'json' : 'text');
-    var check = wcSyntaxCheck(f.content, lang);
-    if (!check.ok) {
-      f._syntaxError = check.reason;
-      syntaxFailedNames.push(f.name);
-    } else {
-      delete f._syntaxError;
-    }
+    if (f._error || f._pending || !f.content) return;
+    var chk = wcSyntaxCheck(f.content, f.lang || '');
+    if (!chk.ok) f._syntaxError = chk.reason;
   });
 
-  // Re-fix syntax-broken files — continue/patch, do NOT regenerate from scratch
-  if (syntaxFailedNames.length > 0 && !(_wcGenAbortCtrl && _wcGenAbortCtrl.signal.aborted)) {
-    var syntaxRetryPlan = filePlan.filter(function(fp2){ return syntaxFailedNames.indexOf(fp2.name) !== -1; });
-    for (var si2 = 0; si2 < syntaxRetryPlan.length; si2++) {
-      var sfp = syntaxRetryPlan[si2];
-      var brokenFile = wcState.generatedFiles.filter(function(f){ return f.name === sfp.name; })[0];
-      if (!brokenFile) continue;
-      wcUpdateGenOverlay(si2, syntaxRetryPlan.length, 'Fix: ' + sfp.name);
-      if (_wcGenAbortCtrl && _wcGenAbortCtrl.signal.aborted) break;
-      await new Promise(function(resolve){ setTimeout(resolve, 1500); });
-      try {
-        var _nl3 = String.fromCharCode(10);
-        // Build a targeted fix prompt — pass the broken file and ask only for the fix/completion
-        var fixSys = sysPreamble + _nl3 + 'You are fixing a truncated or broken file. Output ONLY the corrected complete file content. No explanations, no markdown fences.';
-        var fixUser = 'File: ' + sfp.name + _nl3 +
-          'Syntax error: ' + (brokenFile._syntaxError || 'truncated') + _nl3 + _nl3 +
-          'Current (broken) content:' + _nl3 + brokenFile.content + _nl3 + _nl3 +
-          'Output the complete corrected file. If it was truncated, continue from where it stopped and output the FULL file from the beginning.';
-        var fixedContent = await wcCallLLM(fixSys, fixUser, _wcGenAbortCtrl ? _wcGenAbortCtrl.signal : null, sfp.lang);
-        // Strip fences if model added them
-        var _fence2 = String.fromCharCode(96,96,96);
-        var fixLines = fixedContent.split(_nl3);
-        if (fixLines.length > 0 && fixLines[0].indexOf(_fence2) === 0) fixLines.shift();
-        if (fixLines.length > 0 && fixLines[fixLines.length-1].trim() === _fence2) fixLines.pop();
-        fixedContent = fixLines.join(_nl3).trim();
-        var fixCheck = wcSyntaxCheck(fixedContent, sfp.lang);
-        for (var gi2 = 0; gi2 < wcState.generatedFiles.length; gi2++) {
-          if (wcState.generatedFiles[gi2].name === sfp.name) {
-            wcState.generatedFiles[gi2] = { name: sfp.name, content: fixedContent, lang: sfp.lang };
-            if (!fixCheck.ok) wcState.generatedFiles[gi2]._syntaxError = fixCheck.reason;
-            break;
-          }
+  renderWebCraft(document.getElementById('content'));
+
+  // Auto-repair: run immediately after generation completes
+  await wcAutoRepair(filePlan, sysPreamble);
+
+  // Update stats AFTER repair so token counts include repair calls
+  wcState.lastGenStats = { tokIn: _wcTokIn, tokOut: _wcTokOut, seconds: Math.floor((Date.now() - _wcGenStartTime) / 1000), files: wcState.generatedFiles.length };
+  renderWebCraft(document.getElementById('content'));
+}
+
+// ── Auto-repair pass — fixes _error and _syntaxError files ────────────────
+// Called automatically after generation and available as manual button
+var _wcRepairRunning = false;
+async function wcAutoRepair(filePlan, sysPreamble) {
+  if (_wcRepairRunning) return;
+  // Collect broken files: LLM errors + syntax errors
+  var toFix = wcState.generatedFiles.filter(function(f){ return f._error || f._syntaxError; });
+  if (toFix.length === 0) return;
+
+  _wcRepairRunning = true;
+  wcState.repairing = true;
+  wcState.repairTotal = toFix.length;
+  wcState.repairDone = 0;
+  renderWebCraft(document.getElementById('content'));
+
+  // Build a map name→plan for prompt lookup
+  var planMap = {};
+  if (filePlan) filePlan.forEach(function(fp){ planMap[fp.name] = fp; });
+
+  var _nl3 = String.fromCharCode(10);
+  var sysBase = sysPreamble || ('You are an expert full-stack engineer. Output ONLY the complete corrected file content. No explanations, no markdown fences.');
+
+  for (var ri = 0; ri < toFix.length; ri++) {
+    var broken = toFix[ri];
+    var plan = planMap[broken.name];
+    wcState.repairDone = ri;
+    wcState.repairCurrent = broken.name;
+    renderWebCraft(document.getElementById('content'));
+
+    await new Promise(function(resolve){ setTimeout(resolve, 2000); });
+    try {
+      var fixSys = sysBase + _nl3 + 'You are fixing a broken or truncated file. Output ONLY the complete corrected file. No fences, no explanations.';
+      var fixUser;
+      if (broken._error) {
+        // LLM failed entirely — regenerate from original prompt
+        fixUser = plan
+          ? plan.prompt + _nl3 + _nl3 + 'File to generate: ' + broken.name
+          : 'Regenerate the file: ' + broken.name;
+      } else {
+        // Syntax error — pass existing content + error for targeted fix
+        fixUser = 'File: ' + broken.name + _nl3 +
+          'Error: ' + (broken._syntaxError || 'truncated/incomplete') + _nl3 + _nl3 +
+          'Current broken content (last 800 chars shown if long):' + _nl3 +
+          (broken.content.length > 800 ? broken.content.slice(0, 400) + _nl3 + '...' + _nl3 + broken.content.slice(-400) : broken.content) + _nl3 + _nl3 +
+          'Output the COMPLETE corrected file from the beginning.';
+      }
+      var fixed = await wcCallLLM(fixSys, fixUser, null, broken.lang || plan && plan.lang);
+      var _fence3 = String.fromCharCode(96,96,96);
+      var fixLines = fixed.split(_nl3);
+      if (fixLines.length > 0 && fixLines[0].indexOf(_fence3) === 0) fixLines.shift();
+      if (fixLines.length > 0 && fixLines[fixLines.length-1].trim() === _fence3) fixLines.pop();
+      fixed = fixLines.join(_nl3).trim();
+      var lang2 = broken.lang || (plan && plan.lang) || 'text';
+      var check2 = wcSyntaxCheck(fixed, lang2);
+      for (var gi3 = 0; gi3 < wcState.generatedFiles.length; gi3++) {
+        if (wcState.generatedFiles[gi3].name === broken.name) {
+          wcState.generatedFiles[gi3] = { name: broken.name, content: fixed, lang: lang2 };
+          if (!check2.ok) wcState.generatedFiles[gi3]._syntaxError = check2.reason;
+          break;
         }
-        renderWebCraft(document.getElementById('content'));
-      } catch(se) {
-        if (se && se.name === 'AbortError') break;
       }
-    }
+    } catch(e) { /* keep as broken */ }
+
+    wcState.repairDone = ri + 1;
+    renderWebCraft(document.getElementById('content'));
   }
 
-  if (_wcTimerInterval) { clearInterval(_wcTimerInterval); _wcTimerInterval = null; }
-  var _wcGenTotalTime = Math.floor((Date.now() - _wcGenStartTime) / 1000);
+  _wcRepairRunning = false;
+  wcState.repairing = false;
+  wcState.repairTotal = 0;
+  wcState.repairDone = 0;
+  wcState.repairCurrent = '';
 
-  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>/
+  // Save after repair
   try {
     await fetch(API + '/api/studio/webcraft/projects/save', {
-      method: 'POST',
-      headers: {'Content-Type':'application/json'},
+      method: 'POST', headers: {'Content-Type':'application/json'},
       body: JSON.stringify({ projectName: wcState.projectName, description: wcState.description, files: wcState.generatedFiles })
     });
   } catch(_) {}
@@ -8127,6 +8158,12 @@ async function wcGenerate() {
   renderWebCraft(document.getElementById('content'));
 }
 
+// Manual trigger for repair — called from "Correggi tutti" button
+function wcTriggerRepair() {
+  if (_wcRepairRunning) return;
+  wcAutoRepair(_wcLastFilePlan, _wcLastSysPreamble);
+}
+
 // Quick structural check — returns {ok, reason} without calling the LLM
 // Reads only structure (braces, tags) — does NOT add content to any context
 function wcSyntaxCheck(content, lang) {
@@ -8207,12 +8244,12 @@ async function wcCallLLMRaw(sys, user, signal) {
       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);
+        _wcTokIn  += (d.usage.prompt_tokens || d.usage.input_tokens || 0);
+        _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);
+        _wcTokIn  += Math.round((sys.length + user.length) / 4);
+        _wcTokOut += Math.round((d.text || '').length / 4);
       }
       return (d && (d.text || d.content || d.result)) || '';
     }
@@ -8381,6 +8418,7 @@ async function wcStartSandbox() {
   wcState.sandbox = { running: true, port: null, dir: null, logs: [], error: null };
   wcState.rightTab = 'preview';
   wcRightTab = 'preview';
+  _wcSkillsLoaded = false;   // force skill panel reload after sandbox completes
   renderWebCraft(document.getElementById('content'));
 
   try {