gitarsenal-cli 1.9.0 → 1.9.2

package/.venv_status.json

@@ -0,0 +1 @@
+{"created":"2025-08-02T15:39:55.524Z","packages":["modal","gitingest","requests"],"uv_version":"uv 0.8.3 (7e78f54e7 2025-07-24)"}

package/bin/gitarsenal.js

@@ -15,116 +15,38 @@ const { spawn } = require('child_process');
 const fs = require('fs');
 
 // Function to activate virtual environment
-async function activateVirtualEnvironment() {
+function activateVirtualEnvironment() {
   const isWindows = process.platform === 'win32';
   const venvPath = path.join(__dirname, '..', '.venv');
+  const statusFile = path.join(__dirname, '..', '.venv_status.json');
+  
+  // Debug: Log the path we're looking for
+  console.log(chalk.gray(`🔍 Looking for virtual environment at: ${venvPath}`));
   
   // Check if virtual environment exists
   if (!fs.existsSync(venvPath)) {
-    console.log(chalk.yellow('⚠️ Virtual environment not found. Creating it automatically...'));
-    
+    console.log(chalk.red('❌ Virtual environment not found. Please reinstall the package:'));
+    console.log(chalk.yellow('   npm uninstall -g gitarsenal-cli'));
+    console.log(chalk.yellow('   npm install -g gitarsenal-cli'));
+    console.log(chalk.yellow(''));
+    console.log(chalk.yellow('💡 Or run the postinstall script manually:'));
+    console.log(chalk.yellow('   cd /root/.nvm/versions/node/v22.18.0/lib/node_modules/gitarsenal-cli'));
+    console.log(chalk.yellow('   node scripts/postinstall.js'));
+    return false;
+  }
+  
+  // Check if status file exists (indicates successful installation)
+  if (fs.existsSync(statusFile)) {
     try {
-      // Try to create virtual environment with uv first
-      const { execSync } = require('child_process');
-      
-      // Check if uv is available and install it if needed
-      let uvAvailable = false;
-      try {
-        execSync('uv --version', { stdio: 'pipe' });
-        uvAvailable = true;
-      } catch (error) {
-        console.log(chalk.yellow('⚠️ uv not found. Attempting to install...'));
-        
-        // Try different methods to install uv
-        const installMethods = [
-          'curl -LsSf https://astral.sh/uv/install.sh | sh',
-          'pip install uv',
-          'pip3 install uv',
-          'cargo install uv'
-        ];
-        
-        for (const method of installMethods) {
-          try {
-            console.log(chalk.gray(`🔄 Trying to install uv with: ${method}`));
-            
-            if (method.includes('curl')) {
-              // For curl installation, we need to handle the shell script
-              execSync(method, { 
-                env: { ...process.env, SHELL: '/bin/bash' },
-                stdio: 'inherit'
-              });
-            } else {
-              execSync(method, { stdio: 'inherit' });
-            }
-            
-            // Verify installation
-            execSync('uv --version', { stdio: 'pipe' });
-            console.log(chalk.green('✅ uv installed successfully!'));
-            uvAvailable = true;
-            break;
-          } catch (installError) {
-            console.log(chalk.gray(`⚠️ ${method} failed, trying next...`));
-          }
-        }
-      }
-      
-      if (uvAvailable) {
-        console.log(chalk.gray('🔄 Creating virtual environment with uv...'));
-        
-        // Create virtual environment with uv
-        execSync('uv venv', { 
-          cwd: path.join(__dirname, '..'),
-          stdio: 'inherit'
-        });
-        
-        console.log(chalk.green('✅ Virtual environment created with uv!'));
-        
-        // Install packages with uv
-        console.log(chalk.gray('🔄 Installing Python packages with uv...'));
-        execSync('uv pip install modal gitingest requests', {
-          cwd: path.join(__dirname, '..'),
-          stdio: 'inherit'
-        });
-        
-        console.log(chalk.green('✅ Python packages installed successfully!'));
-        
-      } else {
-        console.log(chalk.gray('⚠️ uv not available, trying Python venv...'));
-        
-        // Fallback to Python venv
-        const pythonCmd = isWindows ? 'python' : 'python3';
-        
-        // Create virtual environment
-        execSync(`${pythonCmd} -m venv "${venvPath}"`, {
-          stdio: 'inherit'
-        });
-        
-        console.log(chalk.green('✅ Virtual environment created with Python venv!'));
-        
-        // Install packages
-        const pipPath = isWindows ? 
-          path.join(venvPath, 'Scripts', 'pip.exe') : 
-          path.join(venvPath, 'bin', 'pip');
-        
-        console.log(chalk.gray('🔄 Installing Python packages...'));
-        execSync(`"${pipPath}" install modal gitingest requests`, {
-          stdio: 'inherit'
-        });
-        
-        console.log(chalk.green('✅ Python packages installed successfully!'));
-      }
-      
+      const status = JSON.parse(fs.readFileSync(statusFile, 'utf8'));
+      console.log(chalk.gray(`✅ Virtual environment created: ${status.created}`));
+      console.log(chalk.gray(`📦 Packages: ${status.packages.join(', ')}`));
     } catch (error) {
-      console.log(chalk.red(`❌ Failed to create virtual environment: ${error.message}`));
-      console.log(chalk.yellow('💡 Please run manually:'));
-      console.log(chalk.yellow('   cd /root/.nvm/versions/node/v22.18.0/lib/node_modules/gitarsenal-cli'));
-      console.log(chalk.yellow('   uv venv'));
-      console.log(chalk.yellow('   uv pip install modal gitingest requests'));
-      return false;
+      console.log(chalk.gray('✅ Virtual environment found'));
     }
   }
   
-  // Set environment variables to use the virtual environment
+  // Verify virtual environment structure
   const pythonPath = isWindows ? 
     path.join(venvPath, 'Scripts', 'python.exe') : 
     path.join(venvPath, 'bin', 'python');
@@ -133,6 +55,18 @@ async function activateVirtualEnvironment() {
     path.join(venvPath, 'Scripts', 'pip.exe') : 
     path.join(venvPath, 'bin', 'pip');
   
+  if (!fs.existsSync(pythonPath)) {
+    console.log(chalk.red('❌ Virtual environment is corrupted (Python not found)'));
+    console.log(chalk.yellow('💡 Please reinstall the package'));
+    return false;
+  }
+  
+  if (!fs.existsSync(pipPath)) {
+    console.log(chalk.red('❌ Virtual environment is corrupted (pip not found)'));
+    console.log(chalk.yellow('💡 Please reinstall the package'));
+    return false;
+  }
+  
   // Update PATH to prioritize virtual environment
   const pathSeparator = isWindows ? ';' : ':';
   const venvBinPath = isWindows ? 
@@ -147,13 +81,13 @@ async function activateVirtualEnvironment() {
   process.env.PYTHON_EXECUTABLE = pythonPath;
   process.env.PIP_EXECUTABLE = pipPath;
   
+  console.log(chalk.green('✅ Virtual environment activated successfully'));
+  
   return true;
 }
 
 // Activate virtual environment
-(async () => {
-  await activateVirtualEnvironment();
-})();
+activateVirtualEnvironment();
 
 // Check for updates
 updateNotifier({ pkg }).notify();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitarsenal-cli",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "CLI tool for creating Modal sandboxes with GitHub repositories",
   "main": "index.js",
   "bin": {

package/scripts/postinstall.js

@@ -19,8 +19,8 @@ const originalScriptPath = path.join(__dirname, '..', '..', '..', 'mcp-server',
 async function checkAndInstallUv() {
   try {
     // Check if uv is already installed
-    await execAsync('uv --version');
-    console.log(chalk.green('✅ uv is already installed'));
+    const { stdout } = await execAsync('uv --version');
+    console.log(chalk.green(`✅ uv is already installed: ${stdout.trim()}`));
     return true;
   } catch (error) {
     console.log(chalk.yellow('⚠️ uv not found. Attempting to install...'));
@@ -32,7 +32,7 @@ async function checkAndInstallUv() {
       'pip3 install uv',
       'cargo install uv'
     ];
-    a
+    
     for (const method of installMethods) {
       try {
         console.log(chalk.gray(`🔄 Trying to install uv with: ${method}`));
@@ -44,15 +44,15 @@ async function checkAndInstallUv() {
             stdio: 'inherit'
           });
         } else {
-          await execAsync(method);
+          await execAsync(method, { stdio: 'inherit' });
         }
         
         // Verify installation
-        await execAsync('uv --version');
-        console.log(chalk.green('✅ uv installed successfully!'));
+        const { stdout } = await execAsync('uv --version');
+        console.log(chalk.green(`✅ uv installed successfully: ${stdout.trim()}`));
         return true;
       } catch (installError) {
-        console.log(chalk.gray(`⚠️ ${method} failed, trying next...`));
+        console.log(chalk.gray(`⚠️ ${method} failed: ${installError.message}`));
       }
     }
     
@@ -68,25 +68,21 @@ async function checkAndInstallUv() {
 // Function to create and activate virtual environment using uv
 async function createVirtualEnvironment() {
   const packages = ['modal', 'gitingest', 'requests'];
+  const packageDir = path.join(__dirname, '..');
   
   console.log(chalk.yellow(`📦 Creating virtual environment with uv and installing packages: ${packages.join(', ')}`));
+  console.log(chalk.gray(`📁 Working directory: ${packageDir}`));
   
   try {
     // First, ensure uv is available
     let uvAvailable = false;
     try {
-      await execAsync('uv --version');
+      const { stdout } = await execAsync('uv --version');
+      console.log(chalk.green(`✅ uv found: ${stdout.trim()}`));
       uvAvailable = true;
     } catch (error) {
       console.log(chalk.yellow('⚠️ uv not found, attempting to install...'));
-      await checkAndInstallUv();
-      try {
-        await execAsync('uv --version');
-        uvAvailable = true;
-      } catch (installError) {
-        console.log(chalk.red('❌ Failed to install uv'));
-        return false;
-      }
+      uvAvailable = await checkAndInstallUv();
     }
     
     if (!uvAvailable) {
@@ -94,29 +90,53 @@ async function createVirtualEnvironment() {
       return false;
     }
     
+    // Check if virtual environment already exists
+    const venvPath = path.join(packageDir, '.venv');
+    if (await fs.pathExists(venvPath)) {
+      console.log(chalk.yellow('⚠️ Virtual environment already exists, removing it...'));
+      await fs.remove(venvPath);
+    }
+    
     console.log(chalk.gray(`🔄 Creating virtual environment with uv...`));
     
     // Create virtual environment using uv
     await execAsync('uv venv', {
-      cwd: path.join(__dirname, '..'),
-      env: { ...process.env, PYTHONIOENCODING: 'utf-8' }
+      cwd: packageDir,
+      env: { ...process.env, PYTHONIOENCODING: 'utf-8' },
+      stdio: 'inherit'
     });
     
+    // Verify virtual environment was created
+    if (!(await fs.pathExists(venvPath))) {
+      throw new Error('Virtual environment was not created');
+    }
+    
     console.log(chalk.green('✅ Virtual environment created successfully with uv!'));
     
     console.log(chalk.gray(`🔄 Installing packages in virtual environment with uv...`));
     
     // Install packages using uv pip
     await execAsync(`uv pip install ${packages.join(' ')}`, {
-      cwd: path.join(__dirname, '..'),
-      env: { ...process.env, PYTHONIOENCODING: 'utf-8' }
+      cwd: packageDir,
+      env: { ...process.env, PYTHONIOENCODING: 'utf-8' },
+      stdio: 'inherit'
     });
     
     console.log(chalk.green('✅ Python packages installed successfully in virtual environment!'));
     
+    // Verify packages are installed
+    const pythonPath = path.join(venvPath, 'bin', 'python');
+    for (const pkg of packages) {
+      try {
+        await execAsync(`${pythonPath} -c "import ${pkg}; print('${pkg} imported successfully')"`);
+        console.log(chalk.green(`✅ ${pkg} verified`));
+      } catch (error) {
+        console.log(chalk.yellow(`⚠️ ${pkg} verification failed: ${error.message}`));
+      }
+    }
+    
     // Create a script to activate the virtual environment
     const isWindows = process.platform === 'win32';
-    const venvPath = path.join(__dirname, '..', '.venv');
     
     const activateScript = isWindows ? 
       `@echo off
@@ -128,7 +148,7 @@ cd "$(dirname "$0")"
 source ".venv/bin/activate"
 exec "$@"`;
     
-    const activateScriptPath = path.join(__dirname, '..', 'activate_venv' + (isWindows ? '.bat' : '.sh'));
+    const activateScriptPath = path.join(packageDir, 'activate_venv' + (isWindows ? '.bat' : '.sh'));
     await fs.writeFile(activateScriptPath, activateScript);
     
     if (!isWindows) {
@@ -137,14 +157,23 @@ exec "$@"`;
     
     console.log(chalk.green(`✅ Virtual environment activation script created: ${activateScriptPath}`));
     
+    // Create a status file to indicate successful installation
+    const statusFile = path.join(packageDir, '.venv_status.json');
+    await fs.writeJson(statusFile, {
+      created: new Date().toISOString(),
+      packages: packages,
+      uv_version: (await execAsync('uv --version')).stdout.trim()
+    });
+    
+    console.log(chalk.green('✅ Virtual environment setup completed successfully!'));
+    
     return true;
   } catch (error) {
     console.log(chalk.red(`❌ Error creating virtual environment with uv: ${error.message}`));
     console.log(chalk.yellow('💡 Please run manually:'));
+    console.log(chalk.yellow('   cd /root/.nvm/versions/node/v22.18.0/lib/node_modules/gitarsenal-cli'));
     console.log(chalk.yellow('   uv venv'));
     console.log(chalk.yellow('   uv pip install modal gitingest requests'));
-    console.log(chalk.yellow('   source .venv/bin/activate  # On Unix/macOS'));
-    console.log(chalk.yellow('   .venv\\Scripts\\activate.bat  # On Windows'));
     return false;
   }
 }
@@ -186,13 +215,14 @@ async function checkGit() {
 async function postinstall() {
   try {
     console.log(chalk.blue('📦 Running GitArsenal CLI postinstall script...'));
+    console.log(chalk.gray(`📁 Package directory: ${path.join(__dirname, '..')}`));
     
     // Check Python first
     console.log(chalk.blue('🔍 Checking Python installation...'));
     const pythonOk = await checkPython();
     if (!pythonOk) {
       console.log(chalk.red('❌ Python is required for GitArsenal CLI'));
-      return;
+      process.exit(1);
     }
     
     // Check Git
@@ -205,7 +235,12 @@ async function postinstall() {
     
     // Install Python packages in virtual environment
     console.log(chalk.blue('🔍 Installing Python dependencies in virtual environment...'));
-    await createVirtualEnvironment();
+    const venvCreated = await createVirtualEnvironment();
+    
+    if (!venvCreated) {
+      console.log(chalk.red('❌ Failed to create virtual environment'));
+      process.exit(1);
+    }
     
     // Create the Python directory if it doesn't exist
     await fs.ensureDir(pythonScriptDir);
@@ -340,7 +375,7 @@ if __name__ == "__main__":
     
   } catch (error) {
     console.error(chalk.red(`❌ Error during postinstall: ${error.message}`));
-    // Don't exit with error to allow npm install to complete
+    process.exit(1);
   }
 }