4runr-os 2.1.30 → 2.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "4runr-os",
-  "version": "2.1.30",
+  "version": "2.1.33",
   "type": "module",
   "description": "4Runr AI Agent OS - Interactive terminal for managing AI agents",
   "main": "dist/index.js",

package/scripts/setup.js

@@ -9,6 +9,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
+import * as readline from 'readline';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -110,21 +111,63 @@ if (isWindows && rustInstalled && rustNeedsGNU) {
       'C:\\mingw64\\bin',
       'C:\\msys64\\mingw64\\bin',
       'C:\\Program Files\\mingw-w64\\x86_64-8.1.0-posix-seh-rt_v6-rev0\\mingw64\\bin',
-      path.join(process.env.ProgramFiles || 'C:\\Program Files', 'mingw-w64', 'x86_64-*-*-*-*-*', 'mingw64', 'bin'),
     ];
     
-    for (const testPath of commonPaths) {
-      const dlltoolPath = path.join(testPath, 'dlltool.exe');
-      if (fs.existsSync(dlltoolPath)) {
+    // Check if MSYS2 exists and might have MinGW
+    const msys2MingwPath = 'C:\\msys64\\mingw64\\bin';
+    const msys2Bash = 'C:\\msys64\\usr\\bin\\bash.exe';
+    
+    // First check if MSYS2 exists - if so, check/install MinGW automatically
+    if (fs.existsSync(msys2Bash)) {
+      console.log('   ✅ MSYS2 found - checking for MinGW...');
+      if (fs.existsSync(path.join(msys2MingwPath, 'dlltool.exe'))) {
         mingwInstalled = true;
-        mingwPath = testPath;
-        console.log('✅ MinGW found at:', mingwPath);
-        console.log('   Adding to PATH for this session...');
-        process.env.PATH = process.env.PATH ? `${mingwPath};${process.env.PATH}` : mingwPath;
-        break;
+        mingwPath = msys2MingwPath;
+        console.log('   ✅ MinGW found in MSYS2');
+      } else {
+        // MSYS2 exists but MinGW not installed - install it automatically
+        console.log('   🔨 Installing MinGW toolchain in MSYS2 (this may take a few minutes)...');
+        try {
+          execSync(`"${msys2Bash}" -lc "pacman -S mingw-w64-x86_64-toolchain --noconfirm"`, {
+            stdio: 'inherit',
+            timeout: 300000 // 5 minutes
+          });
+          
+          if (fs.existsSync(path.join(msys2MingwPath, 'dlltool.exe'))) {
+            mingwInstalled = true;
+            mingwPath = msys2MingwPath;
+            console.log('   ✅ MinGW toolchain installed successfully');
+          } else {
+            console.warn('   ⚠️  Installation completed but MinGW not found');
+            console.warn('   Please restart terminal and run 4runr-setup again');
+          }
+        } catch (installError) {
+          console.warn('   ⚠️  Failed to install MinGW automatically');
+          console.warn('   Please run manually in MSYS2 terminal: pacman -S mingw-w64-x86_64-toolchain --noconfirm');
+        }
       }
     }
     
+    // Check other common paths if MSYS2 didn't work
+    if (!mingwInstalled) {
+      for (const testPath of commonPaths) {
+        if (fs.existsSync(testPath)) {
+          const dlltoolPath = path.join(testPath, 'dlltool.exe');
+          if (fs.existsSync(dlltoolPath)) {
+            mingwInstalled = true;
+            mingwPath = testPath;
+            console.log('   ✅ MinGW found at:', mingwPath);
+            break;
+          }
+        }
+      }
+    }
+    
+    if (mingwInstalled && mingwPath) {
+      console.log('   Adding to PATH for this session...');
+      process.env.PATH = process.env.PATH ? `${mingwPath};${process.env.PATH}` : mingwPath;
+    }
+    
     if (!mingwInstalled) {
       console.log('   Installing MinGW-w64...');
       
@@ -148,14 +191,77 @@ if (isWindows && rustInstalled && rustNeedsGNU) {
           installed = true;
           console.log(`   ✅ Installed via winget: ${pkg}`);
           
-          // If MSYS2 was installed, need to install MinGW inside it
+          // If MSYS2 was installed, automatically install MinGW toolchain
           if (pkg === 'msys2.msys2') {
-            console.log('\n   ⚠️  MSYS2 installed. You need to:');
-            console.log('   1. Open MSYS2 terminal (search for "MSYS2 MSYS" in Start menu)');
-            console.log('   2. Run: pacman -S mingw-w64-x86_64-toolchain --noconfirm');
-            console.log('   3. Add C:\\msys64\\mingw64\\bin to your PATH');
-            console.log('   4. Restart terminal and run: 4runr-setup\n');
-            process.exit(0);
+            const msys2MingwPath = 'C:\\msys64\\mingw64\\bin';
+            const msys2Bash = 'C:\\msys64\\usr\\bin\\bash.exe';
+            
+            // Check if MinGW is already installed
+            if (fs.existsSync(path.join(msys2MingwPath, 'dlltool.exe'))) {
+              console.log(`\n   ✅ MinGW already installed in MSYS2`);
+              mingwInstalled = true;
+              mingwPath = msys2MingwPath;
+            } else {
+              // Automatically install MinGW toolchain via MSYS2
+              console.log('\n   🔨 Installing MinGW toolchain in MSYS2 (this may take a few minutes)...');
+              try {
+                execSync(`"${msys2Bash}" -lc "pacman -S mingw-w64-x86_64-toolchain --noconfirm"`, {
+                  stdio: 'inherit',
+                  timeout: 300000 // 5 minutes for installation
+                });
+                
+                // Verify installation
+                if (fs.existsSync(path.join(msys2MingwPath, 'dlltool.exe'))) {
+                  console.log('   ✅ MinGW toolchain installed successfully');
+                  mingwInstalled = true;
+                  mingwPath = msys2MingwPath;
+                } else {
+                  console.warn('   ⚠️  Installation completed but MinGW not found. Please restart terminal and run 4runr-setup again.');
+                  process.exit(0);
+                }
+              } catch (installError) {
+                console.error('   ❌ Failed to install MinGW automatically');
+                console.error('   Please install manually:');
+                console.error('   1. Open MSYS2 terminal');
+                console.error('   2. Run: pacman -S mingw-w64-x86_64-toolchain --noconfirm');
+                console.error('   3. Restart terminal and run: 4runr-setup\n');
+                process.exit(1);
+              }
+            }
+            
+            // Add to PATH for current session
+            if (mingwInstalled && mingwPath) {
+              console.log(`   ✅ Adding ${mingwPath} to PATH for this session...`);
+              process.env.PATH = process.env.PATH ? `${mingwPath};${process.env.PATH}` : mingwPath;
+              
+              // Try to add to permanent PATH (may require admin)
+              try {
+                const currentPath = execSync('powershell -Command "[Environment]::GetEnvironmentVariable(\'Path\', \'User\')"', { encoding: 'utf-8' }).trim();
+                if (!currentPath.includes(mingwPath)) {
+                  // Use synchronous readline for simpler flow
+                  process.stdout.write('\n   Add MinGW to PATH permanently? (recommended) [Y/n]: ');
+                  const rl = readline.createInterface({
+                    input: process.stdin,
+                    output: process.stdout
+                  });
+                  
+                  rl.on('line', (answer) => {
+                    rl.close();
+                    if (!answer || answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
+                      try {
+                        execSync(`powershell -Command "[Environment]::SetEnvironmentVariable('Path', [Environment]::GetEnvironmentVariable('Path', 'User') + ';${mingwPath}', 'User')"`, { stdio: 'pipe' });
+                        console.log('   ✅ Added to PATH permanently');
+                      } catch {
+                        console.log('   ⚠️  Could not add to PATH permanently. Please add manually:');
+                        console.log(`      ${mingwPath}`);
+                      }
+                    }
+                  });
+                }
+              } catch {
+                // Ignore - PATH update failed, user can add manually
+              }
+            }
           }
           break;
         } catch (err) {