4runr-os 2.1.32 → 2.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "4runr-os",
-  "version": "2.1.32",
+  "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

@@ -111,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...');