@factadev/cli 0.2.11 → 0.2.13

package/bin/nest.cjs

@@ -1,99 +1,138 @@
 #!/usr/bin/env node
-/**
- * NEST CLI launcher — resolves and runs the platform-specific binary.
- * npm install @factadev/cli installs one optional dependency matching this machine
- * (os/cpu); this script finds that binary and execs it. No runtime npm install.
- */
-const { execFileSync } = require('child_process');
+
+const { execFileSync, execSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
 const platform = process.platform;
 const arch = process.arch;
-
 const RELEASE_URL = 'https://github.com/Facta-Dev/ctx0_nest/releases';
-
-// Map Node platform/arch to our package suffix (must match @factadev/cli-<name>)
-const PLATFORM_MAP = [
-    { os: 'darwin', cpu: 'arm64', key: 'darwin-arm64' },
-    { os: 'darwin', cpu: 'x64', key: 'darwin-x64' },
-    { os: 'linux', cpu: 'arm64', key: 'linux-arm64' },
-    { os: 'linux', cpu: 'x64', key: 'linux-x64' },
-    { os: 'win32', cpu: 'x64', key: 'win32-x64' },
+const SUPPORTED_PLATFORMS = [
+    { key: 'darwin-arm64', label: 'darwin-arm64 (macOS Apple Silicon)' },
+    { key: 'darwin-x64', label: 'darwin-x64 (macOS Intel)' },
+    { key: 'linux-arm64', label: 'linux-arm64' },
+    { key: 'linux-x64', label: 'linux-x64' },
+    { key: 'win32-x64', label: 'win32-x64' },
 ];
 
-function getPlatformKey() {
-    const entry = PLATFORM_MAP.find(
-        (e) => e.os === platform && e.cpu === arch
-    );
-    return entry ? entry.key : null;
+function getPlatformKey(p = platform, a = arch) {
+    return `${p}-${a}`;
 }
 
-function getBinaryPath() {
-    const platformKey = getPlatformKey();
-    if (!platformKey) return null;
-
-    const pkgName = `@factadev/cli-${platformKey}`;
-    const binName = platform === 'win32' ? 'nest.exe' : 'nest';
-
-    // Main package root (where this script lives: .../bin/nest.cjs)
-    const mainRoot = path.resolve(__dirname, '..');
+function isSupportedPlatform(p = platform, a = arch) {
+    return SUPPORTED_PLATFORMS.some(item => item.key === getPlatformKey(p, a));
+}
 
-    const candidates = [
-        // 1. Optional dep nested under main package (npm/yarn typical)
-        path.join(mainRoot, 'node_modules', pkgName, 'bin', binName),
-        // 2. Sibling under same scope (global npm: .../node_modules/@factadev/cli, .../cli-*)
-        path.join(mainRoot, '..', `cli-${platformKey}`, 'bin', binName),
-        // 3. Unix global: PREFIX/lib/node_modules/@factadev/cli-*
-        path.join(
-            process.env.npm_config_prefix || process.env.PREFIX || '/usr/local',
-            'lib',
-            'node_modules',
-            pkgName,
-            'bin',
-            binName
-        ),
-        // 4. Windows global (prefix often = npm dir with node_modules)
-        path.join(
-            process.env.npm_config_prefix ||
-                path.join(process.env.APPDATA || '', 'npm'),
-            'node_modules',
-            pkgName,
-            'bin',
-            binName
-        ),
+function getBinaryPath(platformName = platform, archName = arch) {
+    const pkgName = `@factadev/cli-${platformName}-${archName}`;
+    const binName = platformName === 'win32' ? 'nest.exe' : 'nest';
+    
+    // Try multiple locations where the package might be installed
+    const possiblePaths = [
+        // 1. Top-level node_modules (if installed separately)
+        path.join(__dirname, '..', '..', pkgName, 'bin', binName),
+        // 2. Inside @factadev/cli/node_modules (if installed as optional dep)
+        path.join(__dirname, '..', 'node_modules', pkgName, 'bin', binName),
+        // 3. Global node_modules
+        path.join(process.env.PREFIX || '/usr/local', 'lib', 'node_modules', pkgName, 'bin', binName),
     ];
+    
+    for (const binPath of possiblePaths) {
+        if (fs.existsSync(binPath)) {
+            return binPath;
+        }
+    }
+    
+    return null;
+}
 
-    for (const binPath of candidates) {
-        if (fs.existsSync(binPath)) return binPath;
+function installPlatformPackage(platformName = platform, archName = arch) {
+    const pkgName = `@factadev/cli-${platformName}-${archName}`;
+    console.log(`Installing ${pkgName}...`);
+    try {
+        execSync(`npm install -g ${pkgName}`, { stdio: 'inherit' });
+        return true;
+    } catch (e) {
+        return false;
+    }
+}
+
+function getInstalledVersion(platformName = platform, archName = arch) {
+    const binPath = getBinaryPath(platformName, archName);
+    if (binPath) {
+        return 'installed';
     }
     return null;
 }
 
+function getLatestVersion(platformName = platform, archName = arch) {
+    const pkgName = `@factadev/cli-${platformName}-${archName}`;
+    try {
+        const result = execSync(`npm view ${pkgName} version`, { encoding: 'utf8' });
+        return result.trim();
+    } catch (e) {
+        return null;
+    }
+}
+
+function getBunPath() {
+    const bunPaths = [
+        path.join(__dirname, '..', 'node_modules', '.bin', 'bun'),
+        path.join(process.env.HOME || '', '.bun', 'bin', 'bun'),
+        path.join(process.env.APPDATA || '', 'bun', 'bin', 'bun.exe'),
+        '/usr/local/bin/bun',
+        '/opt/homebrew/bin/bun',
+    ];
+    for (const p of bunPaths) {
+        try { fs.accessSync(p, fs.constants.X_OK); return p; } catch {}
+    }
+    return 'bun';
+}
+
 function main() {
-    const platformKey = getPlatformKey();
-    if (!platformKey) {
-        console.error(
-            `Unsupported platform: ${platform}-${arch}. Supported: darwin-arm64, darwin-x64, linux-arm64, linux-x64, win32-x64.`
-        );
-        console.error(`See ${RELEASE_URL}`);
+    if (!isSupportedPlatform()) {
+        console.error(`Unsupported platform: ${platform}-${arch}`);
         process.exit(1);
     }
 
-    const binPath = getBinaryPath();
+    const platformKey = getPlatformKey();
+    let binPath = getBinaryPath();
+
+    // Check if platform package needs update or install
     if (!binPath) {
-        console.error(
-            `Platform binary not found for ${platformKey}. Reinstall so npm can fetch the matching optional dependency:`
-        );
-        console.error('  npm install -g @factadev/cli');
-        console.error('Or download the binary manually from:', RELEASE_URL);
-        process.exit(1);
+        console.log('No platform binary found. Installing...');
+        installPlatformPackage();
+        binPath = getBinaryPath();
+    } else {
+        // Check version and update if needed (optional)
+        const currentVer = getInstalledVersion();
+        const latestVer = getLatestVersion();
+        if (currentVer && latestVer && currentVer !== latestVer) {
+            console.log(`Updating to v${latestVer}...`);
+            installPlatformPackage();
+            binPath = getBinaryPath();
+        }
+    }
+
+    // Fallback to bun if no binary
+    if (!binPath) {
+        const bunPath = getBunPath();
+        const cliPath = path.join(__dirname, '..', 'src', 'index.ts');
+        console.log('No pre-built binary. Using bun...\n');
+        try {
+            execFileSync(bunPath, [cliPath, ...process.argv.slice(2)], { stdio: 'inherit' });
+            return;
+        } catch (error) {
+            console.error(`Failed to run with bun: ${error.message}`);
+            process.exit(1);
+        }
     }
 
+    // Run the binary
     try {
         execFileSync(binPath, process.argv.slice(2), { stdio: 'inherit' });
-    } catch (err) {
-        process.exit(typeof err.status === 'number' ? err.status : 1);
+    } catch (error) {
+        process.exit(error.status || 1);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@factadev/cli",
-    "version": "0.2.11",
+    "version": "0.2.13",
     "description": "NEST CLI - Enterprise AI coding agent control center. Run Claude Code, Codex, Cursor, Gemini, OpenCode locally and control remotely via web.",
     "author": "Carlos Matias Baglieri",
     "license": "AGPL-3.0-only",
@@ -20,10 +20,10 @@
         "NOTICE"
     ],
     "optionalDependencies": {
-        "@factadev/cli-darwin-arm64": "0.2.11",
-        "@factadev/cli-darwin-x64": "0.2.11",
-        "@factadev/cli-linux-arm64": "0.2.11",
-        "@factadev/cli-linux-x64": "0.2.11",
-        "@factadev/cli-win32-x64": "0.2.11"
+        "@factadev/cli-darwin-arm64": "0.2.10",
+        "@factadev/cli-darwin-x64": "0.2.10",
+        "@factadev/cli-linux-arm64": "0.2.10",
+        "@factadev/cli-linux-x64": "0.2.10",
+        "@factadev/cli-win32-x64": "0.2.10"
     }
 }