4runr-os 2.1.34 → 2.1.39

package/package.json

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

package/scripts/setup.js

@@ -186,114 +186,114 @@ if (isWindows && rustInstalled && rustNeedsGNU) {
       'mingw-w64.mingw-w64',   // Direct MinGW package
       'mingw-w64',             // Alternative MinGW package name
     ];
-      
-      for (const pkg of wingetPackages) {
-        try {
-          console.log(`   Trying: winget install ${pkg}...`);
-          execSync(`winget install ${pkg} --accept-package-agreements --accept-source-agreements --silent`, { 
-            stdio: 'pipe',
-            timeout: 120000 // 2 minutes for MSYS2
-          });
-          installed = true;
-          console.log(`   ✅ Installed via winget: ${pkg}`);
+    
+    for (const pkg of wingetPackages) {
+      try {
+        console.log(`   Trying: winget install ${pkg}...`);
+        execSync(`winget install ${pkg} --accept-package-agreements --accept-source-agreements --silent`, { 
+          stdio: 'pipe',
+          timeout: 120000 // 2 minutes for MSYS2
+        });
+        installed = true;
+        console.log(`   ✅ Installed via winget: ${pkg}`);
+        
+        // If MSYS2 was just installed via winget, install MinGW inside it
+        if (pkg === 'msys2.msys2') {
+          // 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);
           
-          // If MSYS2 was just installed via winget, install MinGW inside it
-          if (pkg === 'msys2.msys2') {
-            // 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(`   ✅ MinGW already installed in MSYS2`);
-              mingwInstalled = true;
-              mingwPath = msys2MingwPath;
-            } else {
-              // Automatically install MinGW toolchain via MSYS2
-              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 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('   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);
-              }
-            }
-            
-            // 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;
-            }
+          // Check if MinGW is already installed
+          if (fs.existsSync(path.join(msys2MingwPath, 'dlltool.exe'))) {
+            console.log(`   ✅ MinGW already installed in MSYS2`);
+            mingwInstalled = true;
+            mingwPath = msys2MingwPath;
           } else {
-            // Direct MinGW package - wait and check PATH
-            const { setTimeout } = await import('timers/promises');
-            await setTimeout(2000);
+            // Automatically install MinGW toolchain via MSYS2
+            console.log('   🔨 Installing MinGW toolchain in MSYS2 (this may take 2-3 minutes)...');
             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');
+              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('   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);
             }
           }
-          break;
-        } catch (err) {
-          // Try next package
-          continue;
+          
+          // 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;
+          }
+        } 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;
+      } catch (err) {
+        // Try next package
+        continue;
       }
-      
-      if (!installed) {
-        console.error('\n❌ Failed to install MinGW automatically via winget');
-        console.error('\n   Please install MinGW-w64 manually using one of these methods:\n');
-        console.error('   Option 1: MSYS2 via winget (Easiest)');
-        console.error('   Run: winget install msys2.msys2');
-        console.error('   Then:');
-        console.error('   1. Open MSYS2 terminal (search for "MSYS2 MSYS" in Start menu)');
-        console.error('   2. Run: pacman -S mingw-w64-x86_64-toolchain --noconfirm');
-        console.error('   3. Add C:\\msys64\\mingw64\\bin to your PATH');
-        console.error('   4. Restart terminal and run: 4runr-setup\n');
-        console.error('   Option 1b: MSYS2 Manual Download');
-        console.error('   1. Download: https://www.msys2.org/');
-        console.error('   2. Install MSYS2');
-        console.error('   3. Open MSYS2 terminal and run: pacman -S mingw-w64-x86_64-toolchain --noconfirm');
-        console.error('   4. Add C:\\msys64\\mingw64\\bin to your PATH');
-        console.error('   5. Restart terminal and run: 4runr-setup\n');
-        console.error('   Option 2: WinLibs (Direct Download)');
-        console.error('   1. Download: https://winlibs.com/');
-        console.error('   2. Extract to C:\\mingw64');
-        console.error('   3. Add C:\\mingw64\\bin to your PATH');
-        console.error('   4. Restart terminal and run: 4runr-setup\n');
-        console.error('   Option 3: Chocolatey (if installed)');
-        console.error('   choco install mingw\n');
-        process.exit(1);
-      } else {
-        console.log('\n✅ MinGW-w64 installed!');
-        console.log('   IMPORTANT: Please restart your terminal to update PATH');
-        console.log('   Then run: 4runr-setup\n');
-        process.exit(0);
-      }
+    }
+    
+    if (!installed) {
+      console.error('\n❌ Failed to install MinGW automatically via winget');
+      console.error('\n   Please install MinGW-w64 manually using one of these methods:\n');
+      console.error('   Option 1: MSYS2 via winget (Easiest)');
+      console.error('   Run: winget install msys2.msys2');
+      console.error('   Then:');
+      console.error('   1. Open MSYS2 terminal (search for "MSYS2 MSYS" in Start menu)');
+      console.error('   2. Run: pacman -S mingw-w64-x86_64-toolchain --noconfirm');
+      console.error('   3. Add C:\\msys64\\mingw64\\bin to your PATH');
+      console.error('   4. Restart terminal and run: 4runr-setup\n');
+      console.error('   Option 1b: MSYS2 Manual Download');
+      console.error('   1. Download: https://www.msys2.org/');
+      console.error('   2. Install MSYS2');
+      console.error('   3. Open MSYS2 terminal and run: pacman -S mingw-w64-x86_64-toolchain --noconfirm');
+      console.error('   4. Add C:\\msys64\\mingw64\\bin to your PATH');
+      console.error('   5. Restart terminal and run: 4runr-setup\n');
+      console.error('   Option 2: WinLibs (Direct Download)');
+      console.error('   1. Download: https://winlibs.com/');
+      console.error('   2. Extract to C:\\mingw64');
+      console.error('   3. Add C:\\mingw64\\bin to your PATH');
+      console.error('   4. Restart terminal and run: 4runr-setup\n');
+      console.error('   Option 3: Chocolatey (if installed)');
+      console.error('   choco install mingw\n');
+      process.exit(1);
+    } else {
+      console.log('\n✅ MinGW-w64 installed!');
+      console.log('   IMPORTANT: Please restart your terminal to update PATH');
+      console.log('   Then run: 4runr-setup\n');
+      process.exit(0);
     }
   }
   
+  // Configure Rust to use GNU toolchain if MinGW is installed
   if (mingwInstalled) {
     // Make sure MinGW is in PATH for cargo
     if (mingwPath && process.env.PATH && !process.env.PATH.includes(mingwPath)) {
@@ -315,63 +315,69 @@ if (isWindows && rustInstalled && rustNeedsGNU) {
   }
 }
 
-// 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);
+});