4runr-os 2.1.33 → 2.1.37

package/package.json

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

package/scripts/setup.js

@@ -17,6 +17,8 @@ const __dirname = dirname(__filename);
 const platform = process.platform;
 const isWindows = platform === 'win32';
 
+// Main setup function (async for delays)
+async function runSetup() {
 console.log('🔍 Checking 4runr-os setup...\n');
 
 // Check Node.js
@@ -97,59 +99,65 @@ if (isWindows && rustInstalled && rustNeedsGNU) {
   let mingwInstalled = false;
   let mingwPath = '';
   
-  try {
-    const dlltoolPath = execSync('where dlltool.exe', { encoding: 'utf-8', stdio: 'pipe' }).trim();
-    mingwInstalled = true;
-    mingwPath = path.dirname(dlltoolPath);
-    console.log('✅ MinGW found at:', mingwPath);
-  } catch {
-    console.log('⚠️  MinGW not found in PATH - required for GNU toolchain');
-    console.log('   Checking common installation locations...');
-    
-    // Check common MinGW locations
-    const commonPaths = [
-      'C:\\mingw64\\bin',
-      'C:\\msys64\\mingw64\\bin',
-      'C:\\Program Files\\mingw-w64\\x86_64-8.1.0-posix-seh-rt_v6-rev0\\mingw64\\bin',
-    ];
-    
-    // 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 = 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');
+  // PRIORITY 1: Check if MSYS2 exists FIRST (most reliable)
+  const msys2MingwPath = 'C:\\msys64\\mingw64\\bin';
+  const msys2Bash = 'C:\\msys64\\usr\\bin\\bash.exe';
+  
+  if (fs.existsSync(msys2Bash)) {
+    console.log('   ✅ MSYS2 found - checking for MinGW...');
+    if (fs.existsSync(path.join(msys2MingwPath, 'dlltool.exe'))) {
+      mingwInstalled = true;
+      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 2-3 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');
+          process.exit(0);
         }
+      } catch (installError) {
+        console.error('   ❌ Failed to install MinGW automatically');
+        console.error('   Quick fix - run this command:');
+        console.error(`   "${msys2Bash}" -lc "pacman -S mingw-w64-x86_64-toolchain --noconfirm"`);
+        console.error('   Then restart terminal and run: 4runr-setup\n');
+        process.exit(1);
       }
     }
     
-    // Check other common paths if MSYS2 didn't work
-    if (!mingwInstalled) {
+    // 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;
+    }
+  }
+  
+  // PRIORITY 2: Check PATH if MSYS2 didn't work
+  if (!mingwInstalled) {
+    try {
+      const dlltoolPath = execSync('where dlltool.exe', { encoding: 'utf-8', stdio: 'pipe' }).trim();
+      mingwInstalled = true;
+      mingwPath = path.dirname(dlltoolPath);
+      console.log('   ✅ MinGW found in PATH at:', mingwPath);
+    } catch {
+      // Check other common paths
+      console.log('   Checking common installation locations...');
+      const commonPaths = [
+        'C:\\mingw64\\bin',
+        'C:\\Program Files\\mingw-w64\\x86_64-8.1.0-posix-seh-rt_v6-rev0\\mingw64\\bin',
+      ];
+      
       for (const testPath of commonPaths) {
         if (fs.existsSync(testPath)) {
           const dlltoolPath = path.join(testPath, 'dlltool.exe');
@@ -157,29 +165,27 @@ if (isWindows && rustInstalled && rustNeedsGNU) {
             mingwInstalled = true;
             mingwPath = testPath;
             console.log('   ✅ MinGW found at:', mingwPath);
+            process.env.PATH = process.env.PATH ? `${mingwPath};${process.env.PATH}` : mingwPath;
             break;
           }
         }
       }
     }
+  }
     
-    if (mingwInstalled && mingwPath) {
-      console.log('   Adding to PATH for this session...');
-      process.env.PATH = process.env.PATH ? `${mingwPath};${process.env.PATH}` : mingwPath;
-    }
+  // PRIORITY 3: Only if still not found, try winget installation
+  if (!mingwInstalled) {
+    console.log('   Installing MinGW-w64 via winget...');
     
-    if (!mingwInstalled) {
-      console.log('   Installing MinGW-w64...');
-      
-      // Try multiple installation methods
-      let installed = false;
-      
-      // Try winget - MSYS2 is more reliable and includes MinGW
-      const wingetPackages = [
-        'msys2.msys2',           // MSYS2 (includes MinGW, most reliable)
-        'mingw-w64.mingw-w64',   // Direct MinGW package
-        'mingw-w64',             // Alternative MinGW package name
-      ];
+    // Try multiple installation methods
+    let installed = false;
+    
+    // Try winget - MSYS2 is more reliable and includes MinGW
+    const wingetPackages = [
+      'msys2.msys2',           // MSYS2 (includes MinGW, most reliable)
+      'mingw-w64.mingw-w64',   // Direct MinGW package
+      'mingw-w64',             // Alternative MinGW package name
+    ];
       
       for (const pkg of wingetPackages) {
         try {
@@ -191,19 +197,21 @@ if (isWindows && rustInstalled && rustNeedsGNU) {
           installed = true;
           console.log(`   ✅ Installed via winget: ${pkg}`);
           
-          // If MSYS2 was installed, automatically install MinGW toolchain
+          // If MSYS2 was just installed via winget, install MinGW inside it
           if (pkg === 'msys2.msys2') {
-            const msys2MingwPath = 'C:\\msys64\\mingw64\\bin';
-            const msys2Bash = 'C:\\msys64\\usr\\bin\\bash.exe';
+            // Wait a moment for MSYS2 installation to complete
+            console.log('   Waiting for MSYS2 installation to complete...');
+            const { setTimeout } = await import('timers/promises');
+            await setTimeout(5000);
             
             // Check if MinGW is already installed
             if (fs.existsSync(path.join(msys2MingwPath, 'dlltool.exe'))) {
-              console.log(`\n   ✅ MinGW already installed in MSYS2`);
+              console.log(`   ✅ 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)...');
+              console.log('   🔨 Installing MinGW toolchain in MSYS2 (this may take 2-3 minutes)...');
               try {
                 execSync(`"${msys2Bash}" -lc "pacman -S mingw-w64-x86_64-toolchain --noconfirm"`, {
                   stdio: 'inherit',
@@ -221,10 +229,9 @@ if (isWindows && rustInstalled && rustNeedsGNU) {
                 }
               } 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');
+                console.error('   Quick fix - run this command:');
+                console.error(`   "${msys2Bash}" -lc "pacman -S mingw-w64-x86_64-toolchain --noconfirm"`);
+                console.error('   Then restart terminal and run: 4runr-setup\n');
                 process.exit(1);
               }
             }
@@ -233,34 +240,18 @@ if (isWindows && rustInstalled && rustNeedsGNU) {
             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
-              }
+            }
+          } else {
+            // Direct MinGW package - wait and check PATH
+            const { setTimeout } = await import('timers/promises');
+            await setTimeout(2000);
+            try {
+              const dlltoolPath = execSync('where dlltool.exe', { encoding: 'utf-8', stdio: 'pipe' }).trim();
+              mingwInstalled = true;
+              mingwPath = path.dirname(dlltoolPath);
+            } catch {
+              // Not in PATH yet - user will need to restart terminal
+              console.warn('   ⚠️  Installed but not in PATH - please restart terminal');
             }
           }
           break;
@@ -322,64 +313,70 @@ if (isWindows && rustInstalled && rustNeedsGNU) {
       console.warn('   rustup default stable-x86_64-pc-windows-gnu');
     }
   }
-}
 
-// Check if 4runr-os is installed
-try {
-  execSync('4r --version', { stdio: 'ignore' });
-  console.log('✅ 4runr-os is installed');
-} catch {
-  console.log('⚠️  4runr-os not found in PATH');
-  console.log('   Installing 4runr-os...');
+  // Check if 4runr-os is installed
   try {
-    execSync('npm install -g 4runr-os@latest', { stdio: 'inherit' });
-    console.log('✅ 4runr-os installed');
+    execSync('4r --version', { stdio: 'ignore' });
+    console.log('✅ 4runr-os is installed');
   } catch {
-    console.error('❌ Failed to install 4runr-os');
-    console.error('   Run manually: npm install -g 4runr-os@latest');
-    process.exit(1);
+    console.log('⚠️  4runr-os not found in PATH');
+    console.log('   Installing 4runr-os...');
+    try {
+      execSync('npm install -g 4runr-os@latest', { stdio: 'inherit' });
+      console.log('✅ 4runr-os installed');
+    } catch {
+      console.error('❌ Failed to install 4runr-os');
+      console.error('   Run manually: npm install -g 4runr-os@latest');
+      process.exit(1);
+    }
   }
-}
 
-// Verify mk3-tui binary (check global install location)
-let mk3Dir = null;
-try {
-  // Try to find global install location
-  const npmPrefix = execSync('npm config get prefix', { encoding: 'utf-8' }).trim();
-  const globalPath = isWindows 
-    ? path.join(npmPrefix, 'node_modules', '4runr-os', 'mk3-tui')
-    : path.join(npmPrefix, 'lib', 'node_modules', '4runr-os', 'mk3-tui');
-  
-  if (fs.existsSync(globalPath)) {
-    mk3Dir = globalPath;
+  // Verify mk3-tui binary (check global install location)
+  let mk3Dir = null;
+  try {
+    // Try to find global install location
+    const npmPrefix = execSync('npm config get prefix', { encoding: 'utf-8' }).trim();
+    const globalPath = isWindows 
+      ? path.join(npmPrefix, 'node_modules', '4runr-os', 'mk3-tui')
+      : path.join(npmPrefix, 'lib', 'node_modules', '4runr-os', 'mk3-tui');
+    
+    if (fs.existsSync(globalPath)) {
+      mk3Dir = globalPath;
+    }
+  } catch {
+    // Fallback to local
+    mk3Dir = path.join(__dirname, '..', 'mk3-tui');
   }
-} catch {
-  // Fallback to local
-  mk3Dir = path.join(__dirname, '..', 'mk3-tui');
-}
 
-if (mk3Dir && fs.existsSync(mk3Dir)) {
-  const binaryName = isWindows ? 'mk3-tui.exe' : 'mk3-tui';
-  const binaryPath = path.join(mk3Dir, 'target', 'release', binaryName);
-  
-  if (!fs.existsSync(binaryPath)) {
-    console.log('\n🔨 Building mk3-tui binary...');
-    try {
-      execSync('cargo build --release', {
-        cwd: mk3Dir,
-        stdio: 'inherit',
-      });
-      console.log('✅ mk3-tui built successfully');
-    } catch (error) {
-      console.warn('⚠️  Failed to build mk3-tui');
-      console.warn('   The binary will be built automatically on first run of 4r');
+  if (mk3Dir && fs.existsSync(mk3Dir)) {
+    const binaryName = isWindows ? 'mk3-tui.exe' : 'mk3-tui';
+    const binaryPath = path.join(mk3Dir, 'target', 'release', binaryName);
+    
+    if (!fs.existsSync(binaryPath)) {
+      console.log('\n🔨 Building mk3-tui binary...');
+      try {
+        execSync('cargo build --release', {
+          cwd: mk3Dir,
+          stdio: 'inherit',
+        });
+        console.log('✅ mk3-tui built successfully');
+      } catch (error) {
+        console.warn('⚠️  Failed to build mk3-tui');
+        console.warn('   The binary will be built automatically on first run of 4r');
+      }
+    } else {
+      console.log('✅ mk3-tui binary found');
     }
   } else {
-    console.log('✅ mk3-tui binary found');
+    console.log('⚠️  mk3-tui source not found - will build on first run of 4r');
   }
-} else {
-  console.log('⚠️  mk3-tui source not found - will build on first run of 4r');
+
+  console.log('\n✅ Setup complete! You can now run: 4r\n');
 }
 
-console.log('\n✅ Setup complete! You can now run: 4r\n');
+// Run the setup
+runSetup().catch((error) => {
+  console.error('\n❌ Setup failed:', error);
+  process.exit(1);
+});