4runr-os 2.1.21 → 2.1.22

package/dist/index.js

@@ -2520,14 +2520,12 @@ else {
         // Try to find mk3-tui binary in multiple locations
         const binaryName = process.platform === 'win32' ? 'mk3-tui.exe' : 'mk3-tui';
         const possiblePaths = [
-            // From npm package 4runr-os-mk3 (global install) - binary is in PATH as 'mk3-tui'
-            binaryName,
-            // From npm package 4runr-os-mk3 (local node_modules via dependency)
-            path.join(__dirname, '..', 'node_modules', '4runr-os-mk3', 'target', 'release', binaryName),
+            // From 4runr-os package itself (included mk3-tui)
+            path.join(__dirname, '..', 'mk3-tui', 'target', 'release', binaryName),
             // From local build in monorepo (development)
             path.join(__dirname, '..', '..', '..', 'apps', 'mk3-tui', 'target', 'release', binaryName),
-            // From npm package 4runr-os-mk3 (local node_modules at root)
-            path.join(__dirname, '..', '..', '..', 'node_modules', '4runr-os-mk3', 'target', 'release', binaryName),
+            // Fallback: try PATH (for backwards compatibility)
+            binaryName,
         ];
         let binaryPath = null;
         for (const testPath of possiblePaths) {
@@ -2555,135 +2553,52 @@ else {
             const platform = process.platform;
             const isWindows = platform === 'win32';
             process.stderr.write('\n[ERROR] mk3-tui binary not found.\n');
-            if (isWindows) {
-                process.stderr.write('\n⚠️  Windows binary not yet available in npm package.\n');
-                process.stderr.write('   The current package only includes Linux binaries.\n\n');
-                // Check if Rust is installed
-                const { checkAndInstallRust } = await import('./rust-check.js');
-                const autoInstallRust = process.env.AUTO_INSTALL_RUST === '1';
-                const rustInstalled = await checkAndInstallRust(autoInstallRust);
-                if (rustInstalled) {
-                    process.stderr.write('\n✅ Rust is installed! Building mk3-tui from npm package...\n\n');
-                    // Try to build from npm package
-                    try {
-                        const { execSync } = await import('child_process');
-                        const npmPackagePath = path.join(__dirname, '..', 'node_modules', '4runr-os-mk3');
-                        if (fs.existsSync(npmPackagePath)) {
-                            process.stderr.write('🔨 Building from npm package...\n');
-                            execSync('cargo build --release', {
-                                cwd: npmPackagePath,
-                                stdio: 'inherit',
-                            });
-                            // Retry finding binary
-                            const builtBinary = path.join(npmPackagePath, 'target', 'release', binaryName);
-                            if (fs.existsSync(builtBinary)) {
-                                binaryPath = builtBinary;
-                                process.stderr.write('\n✅ Build successful! Launching...\n\n');
-                            }
-                            else {
-                                process.stderr.write('\n⚠️  Build completed but binary not found at expected location.\n');
-                                process.stderr.write('   Please try running "4r" again.\n\n');
-                                process.exit(1);
-                            }
-                        }
-                        else {
-                            process.stderr.write('\n⚠️  4runr-os-mk3 package not found in node_modules.\n');
-                            process.stderr.write('   Installing...\n\n');
-                            execSync('npm install -g 4runr-os-mk3', { stdio: 'inherit' });
-                            // The postinstall script should have built it, try to find it
-                            const globalPath = process.platform === 'win32'
-                                ? path.join(process.env.APPDATA || '', 'npm', 'node_modules', '4runr-os-mk3', 'target', 'release', binaryName)
-                                : path.join('/usr/local/lib/node_modules', '4runr-os-mk3', 'target', 'release', binaryName);
-                            if (fs.existsSync(globalPath)) {
-                                binaryPath = globalPath;
-                            }
-                            else {
-                                // Try PATH
-                                try {
-                                    const whichCmd = platform === 'win32' ? 'where' : 'which';
-                                    execSync(`${whichCmd} ${binaryName}`, { stdio: 'ignore' });
-                                    binaryPath = binaryName;
-                                }
-                                catch {
-                                    process.stderr.write('\n⚠️  Please restart your terminal and run "4r" again.\n\n');
-                                    process.exit(1);
-                                }
-                            }
-                        }
-                    }
-                    catch (buildError) {
-                        process.stderr.write('\n⚠️  Build failed. You can build manually:\n');
-                        process.stderr.write('   cd %APPDATA%\\npm\\node_modules\\4runr-os-mk3\n');
-                        process.stderr.write('   cargo build --release\n');
-                        process.stderr.write('   Then run: 4r\n\n');
-                        process.exit(1);
-                    }
-                }
-                else {
-                    process.stderr.write('   To use 4runr-os on Windows, you have two options:\n\n');
-                    process.stderr.write('   Option 1: Install Rust and build locally\n');
-                    process.stderr.write('   1. Install Rust (see instructions above)\n');
-                    process.stderr.write('   2. Build: cd %USERPROFILE% && git clone https://github.com/KyanBergeron4Runr/4Runr-AI-Agent-OS.git\n');
-                    process.stderr.write('   3. Build: cd 4Runr-AI-Agent-OS\\apps\\mk3-tui && cargo build --release\n');
-                    process.stderr.write('   4. Add to PATH or run: .\\target\\release\\mk3-tui.exe\n\n');
-                    process.stderr.write('   Option 2: Use WSL (Windows Subsystem for Linux)\n');
-                    process.stderr.write('   1. Install WSL: wsl --install\n');
-                    process.stderr.write('   2. In WSL: npm install -g 4runr-os\n');
-                    process.stderr.write('   3. Run: 4r\n\n');
-                    process.stderr.write('   Windows binary support coming soon!\n\n');
-                }
-            }
-            else {
-                process.stderr.write('The 4runr-os package requires 4runr-os-mk3.\n');
-                process.stderr.write('Installing automatically...\n\n');
+            // Check if Rust is installed and try to build
+            const { checkAndInstallRust, getRustInstallCommand } = await import('./rust-check.js');
+            const autoInstallRust = process.env.AUTO_INSTALL_RUST === '1';
+            const rustInstalled = await checkAndInstallRust(autoInstallRust);
+            if (rustInstalled) {
+                process.stderr.write('\n✅ Rust is installed! Building mk3-tui from 4runr-os package...\n\n');
+                // Try to build from 4runr-os package (mk3-tui is included)
                 try {
-                    // Try to install 4runr-os-mk3 automatically
                     const { execSync } = await import('child_process');
-                    execSync('npm install -g 4runr-os-mk3', { stdio: 'inherit' });
-                    // Retry finding binary after install
-                    const retryPaths = [
-                        binaryName,
-                        path.join(__dirname, '..', 'node_modules', '4runr-os-mk3', 'target', 'release', binaryName),
-                    ];
-                    for (const testPath of retryPaths) {
-                        if (testPath === binaryName) {
-                            try {
-                                const whichCmd = platform === 'win32' ? 'where' : 'which';
-                                execSync(`${whichCmd} ${testPath}`, { stdio: 'ignore' });
-                                binaryPath = testPath;
-                                break;
-                            }
-                            catch {
-                                continue;
-                            }
+                    const mk3Path = path.join(__dirname, '..', 'mk3-tui');
+                    if (fs.existsSync(mk3Path)) {
+                        process.stderr.write('🔨 Building from 4runr-os package...\n');
+                        execSync('cargo build --release', {
+                            cwd: mk3Path,
+                            stdio: 'inherit',
+                        });
+                        // Retry finding binary
+                        const builtBinary = path.join(mk3Path, 'target', 'release', binaryName);
+                        if (fs.existsSync(builtBinary)) {
+                            binaryPath = builtBinary;
+                            process.stderr.write('\n✅ Build successful! Launching...\n\n');
                         }
-                        else if (fs.existsSync(testPath)) {
-                            binaryPath = testPath;
-                            break;
+                        else {
+                            process.stderr.write('\n⚠️  Build completed but binary not found at expected location.\n');
+                            process.stderr.write('   Please try running "4r" again.\n\n');
+                            process.exit(1);
                         }
                     }
-                    if (!binaryPath) {
-                        process.stderr.write('\n[ERROR] Installation completed but binary still not found.\n');
-                        process.stderr.write('Please run: npm install -g 4runr-os-mk3\n');
-                        process.stderr.write('Then try again: 4r\n\n');
+                    else {
+                        process.stderr.write('\n⚠️  mk3-tui source not found in 4runr-os package.\n');
+                        process.stderr.write('   Please reinstall: npm install -g 4runr-os@latest\n\n');
                         process.exit(1);
                     }
                 }
-                catch (installError) {
-                    process.stderr.write('\n[ERROR] Auto-install failed. Please install manually:\n');
-                    process.stderr.write('  npm install -g 4runr-os-mk3\n');
-                    process.stderr.write('Then run: 4r\n\n');
-                    // Check if Rust might help (for building from source)
-                    const { isRustInstalled, getRustInstallCommand } = await import('./rust-check.js');
-                    if (!isRustInstalled()) {
-                        process.stderr.write('\n💡 Alternative: Build from source (requires Rust):\n');
-                        process.stderr.write(`   Install Rust: ${getRustInstallCommand()}\n`);
-                        process.stderr.write('   Then build: git clone https://github.com/KyanBergeron4Runr/4Runr-AI-Agent-OS.git\n');
-                        process.stderr.write('   cd 4Runr-AI-Agent-OS/apps/mk3-tui && cargo build --release\n\n');
-                    }
+                catch (buildError) {
+                    process.stderr.write('\n⚠️  Build failed. Please ensure Rust is properly installed.\n');
+                    process.stderr.write(`   Install Rust: ${getRustInstallCommand()}\n`);
+                    process.stderr.write('   Then run "4r" again.\n\n');
                     process.exit(1);
                 }
             }
+            else {
+                process.stderr.write('\n💡 To build mk3-tui, you need Rust installed.\n');
+                process.stderr.write(`   Install Rust: ${getRustInstallCommand()}\n`);
+                process.stderr.write('   Then run "4r" again - it will build automatically.\n\n');
+            }
             if (!binaryPath) {
                 process.exit(1);
             }