gitarsenal-cli 1.9.5 → 1.9.7

package/.venv_status.json

@@ -1 +1 @@
-{"created":"2025-08-03T17:35:41.855Z","packages":["modal","gitingest","requests"],"uv_version":"uv 0.8.4 (e176e1714 2025-07-30)"}
+{"created":"2025-08-03T18:14:08.672Z","packages":["modal","gitingest","requests"],"uv_version":"uv 0.8.4 (e176e1714 2025-07-30)"}

package/bin/gitarsenal.js

@@ -13,6 +13,8 @@ const pkg = require('../package.json');
 const boxen = require('boxen');
 const { spawn } = require('child_process');
 const fs = require('fs');
+const https = require('https');
+const http = require('http');
 
 // Function to activate virtual environment
 function activateVirtualEnvironment() {
@@ -102,6 +104,148 @@ function activateVirtualEnvironment() {
   return true;
 }
 
+// Function to send user data to web application
+async function sendUserData(userId, userName, command, repoUrl = null, success = true, error = null) {
+  try {
+    const userData = {
+      userId,
+      userName,
+      command,
+      repoUrl,
+      success,
+      error,
+      timestamp: new Date().toISOString()
+    };
+
+    const data = JSON.stringify(userData);
+    
+    // Get webhook URL from config or use default
+    let webhookUrl = 'https://gitarsenal.dev/api/users/cli-log';
+    const configPath = path.join(__dirname, '..', 'config.json');
+    if (fs.existsSync(configPath)) {
+      try {
+        const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+        if (config.webhookUrl) {
+          webhookUrl = config.webhookUrl;
+        }
+      } catch (error) {
+        // Use default URL if config can't be read
+      }
+    }
+    
+    const urlObj = new URL(webhookUrl);
+    const options = {
+      hostname: urlObj.hostname,
+      port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
+      path: urlObj.pathname,
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Content-Length': Buffer.byteLength(data)
+      }
+    };
+
+    return new Promise((resolve, reject) => {
+      const client = urlObj.protocol === 'https:' ? https : http;
+      const req = client.request(options, (res) => {
+        let responseData = '';
+        res.on('data', (chunk) => {
+          responseData += chunk;
+        });
+        res.on('end', () => {
+          if (res.statusCode >= 200 && res.statusCode < 300) {
+            console.log(chalk.green('✅ User activity logged to GitArsenal dashboard'));
+            resolve(responseData);
+          } else {
+            console.log(chalk.yellow('⚠️  Failed to log user activity (non-critical)'));
+            resolve(responseData);
+          }
+        });
+      });
+
+      req.on('error', (err) => {
+        console.log(chalk.yellow('⚠️  Could not connect to GitArsenal dashboard (non-critical)'));
+        resolve();
+      });
+
+      req.write(data);
+      req.end();
+    });
+  } catch (error) {
+    console.log(chalk.yellow('⚠️  Error logging user activity (non-critical)'));
+  }
+}
+
+// Function to collect user credentials
+async function collectUserCredentials(options) {
+  let userId = options.userId;
+  let userName = options.userName;
+
+  // Check for config file first
+  const configPath = path.join(__dirname, '..', 'config.json');
+  if (fs.existsSync(configPath)) {
+    try {
+      const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+      if (config.userId && config.userName) {
+        userId = config.userId;
+        userName = config.userName;
+      }
+    } catch (error) {
+      console.log(chalk.yellow('⚠️  Could not read config file'));
+    }
+  }
+
+  // If not provided via CLI or config, prompt for them
+  if (!userId || !userName) {
+    console.log(chalk.blue('\n🔐 GitArsenal User Identification'));
+    console.log(chalk.gray('Help us track your usage and improve GitArsenal!'));
+    console.log(chalk.gray('Your credentials will be saved locally for future use.'));
+    
+    const credentials = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'userId',
+        message: 'Enter your user ID (or email):',
+        default: userId || 'anonymous',
+        validate: (input) => input.trim() !== '' ? true : 'User ID is required'
+      },
+      {
+        type: 'input',
+        name: 'userName',
+        message: 'Enter your name:',
+        default: userName || 'Anonymous User',
+        validate: (input) => input.trim() !== '' ? true : 'Name is required'
+      },
+      {
+        type: 'confirm',
+        name: 'saveConfig',
+        message: 'Save these credentials for future use?',
+        default: true
+      }
+    ]);
+    
+    userId = credentials.userId;
+    userName = credentials.userName;
+
+    // Save to config file if requested
+    if (credentials.saveConfig) {
+      try {
+        const config = {
+          userId,
+          userName,
+          webhookUrl: 'https://gitarsenal.dev/api/users/cli-log'
+        };
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+        console.log(chalk.green('✅ Credentials saved to config file'));
+      } catch (error) {
+        console.log(chalk.yellow('⚠️  Could not save config file'));
+      }
+    }
+  }
+
+  return { userId, userName };
+}
+
 // Activate virtual environment
 activateVirtualEnvironment();
 
@@ -140,6 +284,8 @@ const containerCmd = program
   .option('-y, --yes', 'Skip confirmation prompts')
   .option('-m, --manual', 'Disable automatic setup command detection')
   .option('--show-examples', 'Show usage examples')
+  .option('--user-id <id>', 'User ID for tracking')
+  .option('--user-name <name>', 'User name for tracking')
   .action(async (options) => {
     await runContainerCommand(options);
   });
@@ -189,6 +335,8 @@ program
   .option('-y, --yes', 'Skip confirmation prompts')
   .option('-m, --manual', 'Disable automatic setup command detection')
   .option('--show-examples', 'Show usage examples')
+  .option('--user-id <id>', 'User ID for tracking')
+  .option('--user-name <name>', 'User name for tracking')
   .action(async (options) => {
     // If options are provided directly, run the container command
     if (options.repo || options.showExamples || process.argv.length <= 3) {
@@ -208,12 +356,18 @@ async function runContainerCommand(options) {
       return;
     }
 
+    // Collect user credentials
+    const userCredentials = await collectUserCredentials(options);
+    const { userId, userName } = userCredentials;
+
     // Check for required dependencies
     const spinner = ora('Checking dependencies...').start();
     const dependenciesOk = await checkDependencies();
     
     if (!dependenciesOk) {
       spinner.fail('Missing dependencies. Please install them and try again.');
+      // Log failed dependency check
+      await sendUserData(userId, userName, 'dependency-check', null, false, 'Missing dependencies');
       process.exit(1);
     }
     spinner.succeed('Dependencies checked');
@@ -345,14 +499,28 @@ async function runContainerCommand(options) {
       }
     }
 
+    // Log command start
+    const commandString = `gitarsenal container ${repoUrl ? `--repo ${repoUrl}` : ''} ${gpuType ? `--gpu ${gpuType}` : ''}`;
+    await sendUserData(userId, userName, commandString, repoUrl, true);
+
     // Run the container
-    await runContainer({
-      repoUrl,
-      gpuType,
-      volumeName,
-      setupCommands,
-      useApi
-    });
+    try {
+      await runContainer({
+        repoUrl,
+        gpuType,
+        volumeName,
+        setupCommands,
+        useApi
+      });
+      
+      // Log successful completion
+      await sendUserData(userId, userName, commandString, repoUrl, true);
+      
+    } catch (containerError) {
+      // Log error
+      await sendUserData(userId, userName, commandString, repoUrl, false, containerError.message);
+      throw containerError;
+    }
 
   } catch (error) {
     console.error(chalk.red(`Error: ${error.message}`));
@@ -362,6 +530,10 @@ async function runContainerCommand(options) {
 
 async function handleKeysAdd(options) {
   try {
+    // Collect user credentials for keys operations
+    const userCredentials = await collectUserCredentials(options);
+    const { userId, userName } = userCredentials;
+    
     const spinner = ora('Adding API key...').start();
     
     let service = options.service;
@@ -413,11 +585,15 @@ async function handleKeysAdd(options) {
       output += data.toString();
     });
     
-    pythonProcess.on('close', (code) => {
+    pythonProcess.on('close', async (code) => {
       if (code === 0) {
         spinner.succeed(`API key for ${service} added successfully`);
+        // Log successful key addition
+        await sendUserData(userId, userName, `gitarsenal keys add --service ${service}`, null, true);
       } else {
         spinner.fail(`Failed to add API key: ${output}`);
+        // Log failed key addition
+        await sendUserData(userId, userName, `gitarsenal keys add --service ${service}`, null, false, output);
       }
     });
     
@@ -429,6 +605,10 @@ async function handleKeysAdd(options) {
 
 async function handleKeysList() {
   try {
+    // Collect user credentials for keys operations
+    const userCredentials = await collectUserCredentials({});
+    const { userId, userName } = userCredentials;
+    
     const spinner = ora('Fetching API keys...').start();
     
     // Call Python script to list keys
@@ -440,11 +620,13 @@ async function handleKeysList() {
       'list'
     ], { stdio: 'inherit' });
     
-    pythonProcess.on('close', (code) => {
+    pythonProcess.on('close', async (code) => {
       if (code !== 0) {
         spinner.fail('Failed to list API keys');
+        await sendUserData(userId, userName, 'gitarsenal keys list', null, false, 'Failed to list API keys');
       } else {
         spinner.stop();
+        await sendUserData(userId, userName, 'gitarsenal keys list', null, true);
       }
     });
     
@@ -456,6 +638,10 @@ async function handleKeysList() {
 
 async function handleKeysView(options) {
   try {
+    // Collect user credentials for keys operations
+    const userCredentials = await collectUserCredentials(options);
+    const { userId, userName } = userCredentials;
+    
     const spinner = ora('Viewing API key...').start();
     
     let service = options.service;
@@ -483,11 +669,13 @@ async function handleKeysView(options) {
       '--service', service
     ], { stdio: 'inherit' });
     
-    pythonProcess.on('close', (code) => {
+    pythonProcess.on('close', async (code) => {
       if (code !== 0) {
         spinner.fail(`Failed to view API key for ${service}`);
+        await sendUserData(userId, userName, `gitarsenal keys view --service ${service}`, null, false, `Failed to view API key for ${service}`);
       } else {
         spinner.stop();
+        await sendUserData(userId, userName, `gitarsenal keys view --service ${service}`, null, true);
       }
     });
     
@@ -499,6 +687,10 @@ async function handleKeysView(options) {
 
 async function handleKeysDelete(options) {
   try {
+    // Collect user credentials for keys operations
+    const userCredentials = await collectUserCredentials(options);
+    const { userId, userName } = userCredentials;
+    
     const spinner = ora('Deleting API key...').start();
     
     let service = options.service;
@@ -529,6 +721,7 @@ async function handleKeysDelete(options) {
     
     if (!confirmAnswer.confirm) {
       console.log(chalk.yellow('Operation cancelled by user.'));
+      await sendUserData(userId, userName, `gitarsenal keys delete --service ${service}`, null, false, 'Operation cancelled by user');
       return;
     }
     
@@ -553,11 +746,13 @@ async function handleKeysDelete(options) {
       output += data.toString();
     });
     
-    pythonProcess.on('close', (code) => {
+    pythonProcess.on('close', async (code) => {
       if (code === 0) {
         spinner.succeed(`API key for ${service} deleted successfully`);
+        await sendUserData(userId, userName, `gitarsenal keys delete --service ${service}`, null, true);
       } else {
         spinner.fail(`Failed to delete API key: ${output}`);
+        await sendUserData(userId, userName, `gitarsenal keys delete --service ${service}`, null, false, output);
       }
     });
     

package/config.json

@@ -0,0 +1,5 @@
+{
+  "userId": "rs545837",
+  "userName": "Rohan Sharma",
+  "webhookUrl": "https://gitarsenal.dev/api/users/cli-log"
+}

package/package.json

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

package/scripts/postinstall.js

@@ -32,9 +32,10 @@ async function checkAndInstallUv() {
     if (platform === 'darwin') {
       // macOS - prioritize Homebrew
       installMethods = [
-        'brew install uv',
         'curl -LsSf https://astral.sh/uv/install.sh | sh',
+        'pip install uv',
         'pip3 install uv',
+        'brew install uv',
         'cargo install uv'
       ];
     } else if (platform === 'win32') {