nothumanallowed 15.1.21 → 15.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nothumanallowed",
-  "version": "15.1.21",
+  "version": "15.1.22",
   "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 = '15.1.21';
+export const VERSION = '15.1.22';
 export const BASE_URL = 'https://nothumanallowed.com/cli';
 export const API_BASE = 'https://nothumanallowed.com/api/v1';
 

package/src/server/routes/webcraft.mjs

@@ -291,37 +291,10 @@ class SandboxManager {
     if (matchedPattern && _attempt < MAX_RETRIES) {
       emit({ type: 'phase', phase: 'autofix', msg: `Runtime error detected: ${matchedPattern.name} — analyzing...` });
 
-      // ── Special pre-fix for require/import mismatches ──
-      // For "require is not defined" the project is ESM but uses CJS syntax.
-      // Easiest fix: flip package.json — REMOVE "type":"module" so CJS works,
-      // OR rewrite files. We try the package.json toggle FIRST (cheaper) only
-      // when the failing files clearly use `require()`. For the inverse case
-      // ("Cannot use import statement outside a module") we ADD "type":"module".
       const pkgPath = path.join(projectDir, 'package.json');
       const isRequireError = /require is not defined/i.test(stderrBuf);
       const isImportError  = /Cannot use import statement outside a module/i.test(stderrBuf);
 
-      if ((isRequireError || isImportError) && fs.existsSync(pkgPath)) {
-        try {
-          const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-          if (isImportError && pkg.type !== 'module') {
-            pkg.type = 'module';
-            fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
-            emit({ type: 'status', msg: 'Auto-fix: added "type":"module" to package.json — retrying...' });
-            return this.start(projectName, projectDir, emit, _attempt + 1);
-          }
-          if (isRequireError && pkg.type === 'module') {
-            // Flip OFF "type":"module" so require() works again
-            delete pkg.type;
-            fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
-            emit({ type: 'status', msg: 'Auto-fix: removed "type":"module" from package.json — retrying...' });
-            return this.start(projectName, projectDir, emit, _attempt + 1);
-          }
-        } catch (e) {
-          emit({ type: 'warn', msg: `package.json toggle failed: ${e.message.slice(0, 200)}` });
-        }
-      }
-
       // ── Extract file path from stack trace (multiple patterns) ──
       // Try several regex forms to be robust against various Node stack formats.
       const allPaths = new Set();
@@ -378,10 +351,89 @@ class SandboxManager {
         }
       }
 
+      // ── Deterministic fixes BEFORE LLM repair (faster, no token cost) ──
+      // The trick is to consider the file extension because it overrides
+      // package.json "type" in Node.
+      let deterministicFixApplied = false;
+      if ((isRequireError || isImportError) && projectFiles.length > 0) {
+        for (const rel of projectFiles) {
+          const ext = path.extname(rel).toLowerCase();
+          const abs = path.join(projectDir, rel);
+
+          // Case A: file is .mjs (forced ESM) using require() → rename to .cjs
+          // This is the FAST fix Node itself suggests in the error message.
+          if (isRequireError && ext === '.mjs') {
+            const newAbs = abs.replace(/\.mjs$/i, '.cjs');
+            try {
+              fs.renameSync(abs, newAbs);
+              // Update package.json "main" if it pointed to the old file
+              if (fs.existsSync(pkgPath)) {
+                const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+                if (pkg.main && pkg.main.endsWith(rel)) {
+                  pkg.main = pkg.main.replace(/\.mjs$/i, '.cjs');
+                  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
+                }
+              }
+              emit({ type: 'status', msg: `Auto-fix: renamed ${rel} → ${path.basename(newAbs)} (Node suggests this for CJS-in-.mjs)` });
+              deterministicFixApplied = true;
+            } catch (e) {
+              emit({ type: 'warn', msg: `Rename ${rel} failed: ${e.message.slice(0, 200)}` });
+            }
+          }
+          // Case B: file is .cjs (forced CJS) using import → rename to .mjs
+          else if (isImportError && ext === '.cjs') {
+            const newAbs = abs.replace(/\.cjs$/i, '.mjs');
+            try {
+              fs.renameSync(abs, newAbs);
+              if (fs.existsSync(pkgPath)) {
+                const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+                if (pkg.main && pkg.main.endsWith(rel)) {
+                  pkg.main = pkg.main.replace(/\.cjs$/i, '.mjs');
+                  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
+                }
+              }
+              emit({ type: 'status', msg: `Auto-fix: renamed ${rel} → ${path.basename(newAbs)} (Node suggests this for import-in-.cjs)` });
+              deterministicFixApplied = true;
+            } catch (e) {
+              emit({ type: 'warn', msg: `Rename ${rel} failed: ${e.message.slice(0, 200)}` });
+            }
+          }
+        }
+      }
+
+      // Case C: ambiguous .js files — toggle package.json "type"
+      // ONLY effective when files are .js (extension doesn't force a mode)
+      if (!deterministicFixApplied && (isRequireError || isImportError) && fs.existsSync(pkgPath)) {
+        const onlyJsFiles = projectFiles.every(p => path.extname(p).toLowerCase() === '.js');
+        if (onlyJsFiles) {
+          try {
+            const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+            if (isImportError && pkg.type !== 'module') {
+              pkg.type = 'module';
+              fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
+              emit({ type: 'status', msg: 'Auto-fix: added "type":"module" to package.json (for .js with import)' });
+              deterministicFixApplied = true;
+            } else if (isRequireError && pkg.type === 'module') {
+              delete pkg.type;
+              fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
+              emit({ type: 'status', msg: 'Auto-fix: removed "type":"module" from package.json (for .js with require)' });
+              deterministicFixApplied = true;
+            }
+          } catch (e) {
+            emit({ type: 'warn', msg: `package.json toggle failed: ${e.message.slice(0, 200)}` });
+          }
+        }
+      }
+
+      if (deterministicFixApplied) {
+        emit({ type: 'status', msg: `Auto-fix: restarting sandbox (attempt ${_attempt + 1}/${MAX_RETRIES})...` });
+        return this.start(projectName, projectDir, emit, _attempt + 1);
+      }
+
       if (projectFiles.length === 0) {
         emit({ type: 'warn', msg: `Auto-fix: could not identify a target file to repair. Stack trace shown above.` });
       } else {
-        emit({ type: 'phase', phase: 'autofix', msg: `Auto-fix repairing ${projectFiles.length} file(s): ${projectFiles.join(', ')}` });
+        emit({ type: 'phase', phase: 'autofix', msg: `Auto-fix repairing ${projectFiles.length} file(s) with LLM: ${projectFiles.join(', ')}` });
         let anyFixed = false;
         for (const rel of projectFiles) {
           const abs = path.join(projectDir, rel);