dank-ai 1.0.12 → 1.0.14

package/lib/docker/manager.js

@@ -132,16 +132,108 @@ class DockerManager {
   async installDockerMacOS() {
     this.logger.info('Installing Docker Desktop for macOS...');
     
-    // Check if Homebrew is available
+    // Check if Homebrew is available with multiple methods
+    let homebrewAvailable = false;
+    let homebrewPath = 'brew';
+    
     try {
-      await execAsync('which brew');
-      this.logger.info('Using Homebrew to install Docker Desktop...');
-      
-      // Install Docker Desktop via Homebrew
-      await this.runCommand('brew install --cask docker', 'Installing Docker Desktop via Homebrew');
-      
+      // Try different ways to detect Homebrew
+      await execAsync('brew --version');
+      homebrewAvailable = true;
+      homebrewPath = 'brew';
     } catch (error) {
+      try {
+        // Try with full path (Apple Silicon Macs)
+        await execAsync('/opt/homebrew/bin/brew --version');
+        homebrewAvailable = true;
+        homebrewPath = '/opt/homebrew/bin/brew';
+      } catch (error2) {
+        try {
+          // Try with usr/local path (Intel Macs)
+          await execAsync('/usr/local/bin/brew --version');
+          homebrewAvailable = true;
+          homebrewPath = '/usr/local/bin/brew';
+        } catch (error3) {
+          // Try to find brew in PATH
+          try {
+            const { stdout } = await execAsync('which brew');
+            if (stdout.trim()) {
+              await execAsync(`${stdout.trim()} --version`);
+              homebrewAvailable = true;
+              homebrewPath = stdout.trim();
+            }
+          } catch (error4) {
+            // Homebrew not found
+            this.logger.debug('Homebrew detection failed:', error4.message);
+          }
+        }
+      }
+    }
+    
+    if (homebrewAvailable) {
+      this.logger.info(`Using Homebrew to install Docker Desktop (found at: ${homebrewPath})...`);
+      
+      try {
+        // First, try to update Homebrew to ensure it's working
+        this.logger.info('Updating Homebrew...');
+        try {
+          await this.runCommandWithEnv(`${homebrewPath} update`, 'Updating Homebrew');
+        } catch (updateError) {
+          this.logger.warn('Homebrew update failed, continuing with installation...');
+        }
+        
+        // Try different installation approaches
+        let installSuccess = false;
+        
+        // Approach 1: Direct installation
+        try {
+          this.logger.info('Attempting direct installation...');
+          await this.runCommandWithEnv(`${homebrewPath} install --cask docker`, 'Installing Docker Desktop via Homebrew');
+          installSuccess = true;
+        } catch (error1) {
+          this.logger.warn('Direct installation failed, trying alternative approach...');
+          
+          // Approach 2: Try with --force flag
+          try {
+            this.logger.info('Attempting installation with --force flag...');
+            await this.runCommandWithEnv(`${homebrewPath} install --cask --force docker`, 'Installing Docker Desktop via Homebrew (force)');
+            installSuccess = true;
+          } catch (error2) {
+            this.logger.warn('Force installation failed, trying with --no-quarantine flag...');
+            
+            // Approach 3: Try with --no-quarantine flag
+            try {
+              this.logger.info('Attempting installation with --no-quarantine flag...');
+              await this.runCommandWithEnv(`${homebrewPath} install --cask --no-quarantine docker`, 'Installing Docker Desktop via Homebrew (no-quarantine)');
+              installSuccess = true;
+            } catch (error3) {
+              this.logger.error('All installation approaches failed');
+              throw error3;
+            }
+          }
+        }
+        
+        if (installSuccess) {
+          // Try to start Docker Desktop
+          this.logger.info('Starting Docker Desktop...');
+          try {
+            await this.runCommandWithEnv('open -a Docker', 'Starting Docker Desktop');
+          } catch (startError) {
+            this.logger.warn('Could not start Docker Desktop automatically. Please start it manually from Applications.');
+          }
+        }
+        
+      } catch (error) {
+        this.logger.warn('Homebrew found but installation failed. Please install Docker Desktop manually from https://www.docker.com/products/docker-desktop/');
+        this.logger.error(`Installation error: ${error.message}`);
+        this.logger.info('You can also try installing Docker Desktop manually:');
+        this.logger.info('1. Download from: https://www.docker.com/products/docker-desktop/');
+        this.logger.info('2. Or try: brew install --cask docker');
+        throw new Error('Docker Desktop installation via Homebrew failed. Please install manually from https://www.docker.com/products/docker-desktop/');
+      }
+    } else {
       this.logger.warn('Homebrew not found. Please install Docker Desktop manually from https://www.docker.com/products/docker-desktop/');
+      this.logger.info('You can install Homebrew by running: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"');
       throw new Error('Docker Desktop installation requires manual intervention. Please install from https://www.docker.com/products/docker-desktop/');
     }
   }
@@ -171,7 +263,7 @@ class DockerManager {
       // Install Docker
       await this.runCommand('sudo apt-get install -y docker-ce docker-ce-cli containerd.io', 'Installing Docker');
       
-      // Add current user to docker group
+      // Add current user to docker groupl
       await this.runCommand('sudo usermod -aG docker $USER', 'Adding user to docker group');
       
       this.logger.info('Docker installation completed. You may need to log out and back in for group changes to take effect.');
@@ -258,6 +350,7 @@ class DockerManager {
    */
   async runCommand(command, description) {
     this.logger.info(`${description}...`);
+    this.logger.debug(`Executing command: ${command}`);
     
     return new Promise((resolve, reject) => {
       const child = spawn('sh', ['-c', command], { 
@@ -269,11 +362,79 @@ class DockerManager {
       let stderr = '';
       
       child.stdout.on('data', (data) => {
-        stdout += data.toString();
+        const output = data.toString();
+        stdout += output;
+        // Log output in debug mode
+        this.logger.debug(`STDOUT: ${output.trim()}`);
+      });
+      
+      child.stderr.on('data', (data) => {
+        const output = data.toString();
+        stderr += output;
+        // Log stderr in debug mode
+        this.logger.debug(`STDERR: ${output.trim()}`);
+      });
+      
+      child.on('close', (code) => {
+        if (code === 0) {
+          this.logger.info(`${description} completed successfully`);
+          resolve({ stdout, stderr });
+        } else {
+          const error = new Error(`Command failed with exit code ${code}: ${stderr}`);
+          this.logger.error(`${description} failed: ${error.message}`);
+          this.logger.error(`Command: ${command}`);
+          this.logger.error(`STDOUT: ${stdout}`);
+          this.logger.error(`STDERR: ${stderr}`);
+          reject(error);
+        }
+      });
+      
+      child.on('error', (error) => {
+        this.logger.error(`${description} failed: ${error.message}`);
+        this.logger.error(`Command: ${command}`);
+        reject(error);
+      });
+    });
+  }
+
+  /**
+   * Run a command with proper environment setup for Homebrew
+   */
+  async runCommandWithEnv(command, description) {
+    this.logger.info(`${description}...`);
+    this.logger.debug(`Executing command: ${command}`);
+    
+    return new Promise((resolve, reject) => {
+      // Set up environment for Homebrew
+      const env = {
+        ...process.env,
+        PATH: process.env.PATH,
+        HOMEBREW_NO_AUTO_UPDATE: '1', // Prevent auto-update during installation
+        HOMEBREW_NO_INSTALL_CLEANUP: '1' // Keep installation files
+      };
+      
+      // Use bash instead of sh for better environment support
+      const child = spawn('bash', ['-c', command], { 
+        stdio: ['inherit', 'pipe', 'pipe'],
+        shell: true,
+        env: env
+      });
+      
+      let stdout = '';
+      let stderr = '';
+      
+      child.stdout.on('data', (data) => {
+        const output = data.toString();
+        stdout += output;
+        // Log output in debug mode
+        this.logger.debug(`STDOUT: ${output.trim()}`);
       });
       
       child.stderr.on('data', (data) => {
-        stderr += data.toString();
+        const output = data.toString();
+        stderr += output;
+        // Log stderr in debug mode
+        this.logger.debug(`STDERR: ${output.trim()}`);
       });
       
       child.on('close', (code) => {
@@ -283,12 +444,16 @@ class DockerManager {
         } else {
           const error = new Error(`Command failed with exit code ${code}: ${stderr}`);
           this.logger.error(`${description} failed: ${error.message}`);
+          this.logger.error(`Command: ${command}`);
+          this.logger.error(`STDOUT: ${stdout}`);
+          this.logger.error(`STDERR: ${stderr}`);
           reject(error);
         }
       });
       
       child.on('error', (error) => {
         this.logger.error(`${description} failed: ${error.message}`);
+        this.logger.error(`Command: ${command}`);
         reject(error);
       });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dank-ai",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "Dank Agent Service - Docker-based AI agent orchestration platform",
   "main": "lib/index.js",
   "exports": {