@_xtribe/cli 1.0.4 → 1.0.6

package/install-tribe.js

@@ -16,14 +16,12 @@ const platform = os.platform();
 const nodeArch = os.arch();
 const arch = nodeArch === 'x64' ? 'amd64' : (nodeArch === 'arm64' || nodeArch === 'aarch64' ? 'arm64' : nodeArch);
 const homeDir = os.homedir();
-const binDir = path.join(homeDir, 'bin');
 const tribeDir = path.join(homeDir, '.tribe');
 const tribeBinDir = path.join(tribeDir, 'bin');
+// Use consistent directory for all binaries
+const binDir = tribeBinDir;
 
-// Ensure local bin directory exists
-if (!fs.existsSync(binDir)) {
-    fs.mkdirSync(binDir, { recursive: true });
-}
+// No need to create ~/bin anymore since we're using ~/.tribe/bin
 
 // Ensure TRIBE config directory exists
 if (!fs.existsSync(tribeDir)) {
@@ -98,13 +96,26 @@ async function downloadFile(url, dest) {
                 
                 // Check if this might be a pointer file
                 const stats = fs.statSync(dest);
-                if (stats.size < 100) {
+                if (stats.size < 500) { // Increased size check - binaries are much larger
                     const content = fs.readFileSync(dest, 'utf8').trim();
                     // Check if content looks like a path (e.g., "main-121/tribe-linux-amd64")
-                    if (content.match(/^[\w\-\/]+$/) && content.includes('/')) {
-                        console.log(`📎 Following pointer to: ${content}`);
-                        const baseUrl = url.substring(0, url.lastIndexOf('/'));
-                        const actualBinaryUrl = `${baseUrl}/${content}`;
+                    if (content.match(/^[\w\-\/]+$/) && !content.includes('<!DOCTYPE') && !content.includes('<html')) {
+                        console.log(`📎 Detected pointer file, following to: ${content}`);
+                        let actualBinaryUrl;
+                        
+                        // Handle different pointer formats
+                        if (content.startsWith('http')) {
+                            // Direct URL
+                            actualBinaryUrl = content;
+                        } else if (content.includes('/')) {
+                            // Relative path - construct full URL
+                            const baseUrl = url.substring(0, url.lastIndexOf('/'));
+                            actualBinaryUrl = `${baseUrl}/${content}`;
+                        } else {
+                            // Just a filename
+                            const baseUrl = url.substring(0, url.lastIndexOf('/'));
+                            actualBinaryUrl = `${baseUrl}/${content}`;
+                        }
                         
                         // Download the actual binary
                         fs.unlinkSync(dest); // Remove pointer file
@@ -564,6 +575,10 @@ async function installTribeCLI() {
             // Fallback to other methods if the API fails
         }
 
+        // Check if there's a local build available
+        const localBuildPath = path.join(__dirname, '..', '..', '..', 'sdk', 'cmd', 'cli-gui', 'tribe');
+        const hasLocalBuild = fs.existsSync(localBuildPath);
+        
         const sources = isTestEnv ? [isTestEnv] : [
             downloadUrl,
             // Public releases repository (primary source)
@@ -572,6 +587,8 @@ async function installTribeCLI() {
             `https://github.com/${githubRepo}/releases/latest/download/tribe-${platform}-${arch}`,
             // Try jsDelivr CDN (for better availability)
             `https://cdn.jsdelivr.net/gh/${githubRepo}@main/cli/latest-tribe-${platform}-${arch}`,
+            // Local build if available
+            ...(hasLocalBuild ? [`file://${localBuildPath}`] : [])
         ].filter(Boolean); // Filter out empty downloadUrl if API failed
         
         let downloaded = false;
@@ -611,8 +628,15 @@ async function installTribeCLI() {
                     spinner.text = `Found ${release.prerelease ? 'pre-release' : 'release'}: ${release.tag_name}`;
                 }
                 
-                spinner.text = `Downloading TRIBE CLI from ${new URL(downloadUrl).hostname}...`;
-                await downloadFile(downloadUrl, tribeDest);
+                if (downloadUrl.startsWith('file://')) {
+                    // Handle local file copy
+                    const sourcePath = downloadUrl.replace('file://', '');
+                    spinner.text = `Copying TRIBE CLI from local build...`;
+                    fs.copyFileSync(sourcePath, tribeDest);
+                } else {
+                    spinner.text = `Downloading TRIBE CLI from ${new URL(downloadUrl).hostname}...`;
+                    await downloadFile(downloadUrl, tribeDest);
+                }
                 
                 // Check if file is not empty
                 const stats = fs.statSync(tribeDest);
@@ -624,10 +648,22 @@ async function installTribeCLI() {
                 
                 // Verify the binary works
                 try {
+                    // Try version command first
                     execSync(`${tribeDest} version`, { stdio: 'ignore' });
                 } catch (versionError) {
-                    // If version fails, still consider it downloaded if file is valid
-                    log.warning('Binary downloaded but version check failed - may need different architecture');
+                    // If version command doesn't exist, try help to see if binary is valid
+                    try {
+                        const helpOutput = execSync(`${tribeDest} help`, { encoding: 'utf8' });
+                        if (helpOutput.includes('TRIBE') || helpOutput.includes('tribe')) {
+                            // Binary works, just doesn't have version command
+                            log.info('Binary validated (version command not available)');
+                        } else {
+                            throw new Error('Binary validation failed');
+                        }
+                    } catch (helpError) {
+                        // Binary might not be valid
+                        log.warning('Binary downloaded but validation failed - may need different architecture');
+                    }
                 }
                 
                 spinner.succeed('TRIBE CLI installed successfully');
@@ -1210,14 +1246,15 @@ async function forceCleanInstallation() {
         // It might not be installed, which is fine
     }
     
-    // List of binaries to remove from ~/bin
+    // Clean from old ~/bin location
+    const oldBinDir = path.join(homeDir, 'bin');
     const binariesToRemove = ['tribe', 'kubectl', 'colima'];
     
     for (const binary of binariesToRemove) {
-        const binaryPath = path.join(binDir, binary);
-        if (fs.existsSync(binaryPath)) {
+        const oldPath = path.join(oldBinDir, binary);
+        if (fs.existsSync(oldPath)) {
             try {
-                fs.unlinkSync(binaryPath);
+                fs.unlinkSync(oldPath);
                 log.success(`Removed existing ${binary} binary from ~/bin`);
             } catch (error) {
                 log.warning(`Could not remove ${binary}: ${error.message}`);
@@ -1225,9 +1262,8 @@ async function forceCleanInstallation() {
         }
     }
     
-    // Also clean from .tribe/bin
-    const tribeBinariesToRemove = ['tribe'];
-    for (const binary of tribeBinariesToRemove) {
+    // Clean from ~/.tribe/bin
+    for (const binary of binariesToRemove) {
         const binaryPath = path.join(tribeBinDir, binary);
         if (fs.existsSync(binaryPath)) {
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_xtribe/cli",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "TRIBE multi-agent development system - Zero to productive with one command",
   "main": "install-tribe.js",
   "bin": {