gitarsenal-cli 1.9.37 → 1.9.39

package/.venv_status.json

@@ -1 +1 @@
-{"created":"2025-08-11T11:05:53.789Z","packages":["modal","gitingest","requests","anthropic"],"uv_version":"uv 0.8.4 (Homebrew 2025-07-30)"}
+{"created":"2025-08-11T11:27:54.801Z","packages":["modal","gitingest","requests","anthropic"],"uv_version":"uv 0.8.4 (Homebrew 2025-07-30)"}

package/bin/gitarsenal.js

@@ -357,13 +357,14 @@ async function fetchFullSetupAndRecs(repoUrl) {
 }
 
 // Function to send user data to web application
-async function sendUserData(userId, userName) {
+async function sendUserData(userId, userName, userEmail) {
   try {
-    console.log(chalk.blue(`🔗 Attempting to register user: ${userName} (${userId})`));
+    console.log(chalk.blue(`🔗 Attempting to register user: ${userName} (${userEmail})`));
     
     const userData = {
-      email: userId,  // Use userId as email (assuming it's an email)
-      name: userName
+      email: userEmail,  // Use actual email address
+      name: userName,
+      username: userId
     };
 
     const data = JSON.stringify(userData);
@@ -453,70 +454,153 @@ async function sendUserData(userId, userName) {
 async function collectUserCredentials(options) {
   let userId = options.userId;
   let userName = options.userName;
+  let userEmail = options.userEmail;
 
-  // Check for config file first
-  const configPath = path.join(__dirname, '..', 'config.json');
-  if (fs.existsSync(configPath)) {
+  // Check for user-specific config file first (in user's home directory)
+  const os = require('os');
+  const userConfigDir = path.join(os.homedir(), '.gitarsenal');
+  const userConfigPath = path.join(userConfigDir, 'user-config.json');
+  
+  if (fs.existsSync(userConfigPath)) {
     try {
-      const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-      if (config.userId && config.userName) {
+      const config = JSON.parse(fs.readFileSync(userConfigPath, 'utf8'));
+      if (config.userId && config.userName && config.userEmail) {
         userId = config.userId;
         userName = config.userName;
+        userEmail = config.userEmail;
+        console.log(chalk.green(`✅ Welcome back, ${userName}!`));
+        return { userId, userName, userEmail };
       }
     } catch (error) {
-      console.log(chalk.yellow('⚠️  Could not read config file'));
+      console.log(chalk.yellow('⚠️  Could not read user 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!'));
+  if (!userId || !userName || !userEmail) {
+    console.log(chalk.blue('\n🔐 GitArsenal Authentication'));
+    console.log(chalk.gray('Create an account or login to use 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'
-      },
+    const authChoice = await inquirer.prompt([
       {
-        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
+        type: 'list',
+        name: 'action',
+        message: 'What would you like to do?',
+        choices: [
+          { name: 'Create new account', value: 'register' },
+          { name: 'Login with existing account', value: 'login' }
+        ]
       }
     ]);
-    
-    userId = credentials.userId;
-    userName = credentials.userName;
 
-    // Save to config file if requested
-    if (credentials.saveConfig) {
-      try {
-        const config = {
-          userId,
-          userName,
-          webhookUrl: 'https://www.gitarsenal.dev/api/users'
-        };
-        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'));
+    if (authChoice.action === 'register') {
+      console.log(chalk.blue('\n📝 Create New Account'));
+      const credentials = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'userId',
+          message: 'Choose a username:',
+          validate: (input) => {
+            const username = input.trim();
+            if (username === '') return 'Username is required';
+            if (username.length < 3) return 'Username must be at least 3 characters';
+            if (!/^[a-zA-Z0-9_-]+$/.test(username)) return 'Username can only contain letters, numbers, _ and -';
+            return true;
+          }
+        },
+        {
+          type: 'input',
+          name: 'userEmail',
+          message: 'Enter your email address:',
+          validate: (input) => {
+            const email = input.trim();
+            if (email === '') return 'Email address is required';
+            if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+              return 'Please enter a valid email address (e.g., user@example.com)';
+            }
+            return true;
+          }
+        },
+        {
+          type: 'input',
+          name: 'userName',
+          message: 'Enter your full name:',
+          validate: (input) => input.trim() !== '' ? true : 'Name is required'
+        },
+        {
+          type: 'password',
+          name: 'password',
+          message: 'Create a password (min 8 characters):',
+          validate: (input) => {
+            if (input.length < 8) return 'Password must be at least 8 characters';
+            return true;
+          }
+        },
+        {
+          type: 'password',
+          name: 'confirmPassword',
+          message: 'Confirm your password:',
+          validate: (input, answers) => {
+            if (input !== answers.password) return 'Passwords do not match';
+            return true;
+          }
+        }
+      ]);
+      
+      userId = credentials.userId;
+      userName = credentials.userName;
+      userEmail = credentials.userEmail;
+      
+      console.log(chalk.green('✅ Account created successfully!'));
+    } else {
+      console.log(chalk.blue('\n🔑 Login'));
+      const credentials = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'userIdentifier',
+          message: 'Enter your username or email:',
+          validate: (input) => input.trim() !== '' ? true : 'Username/email is required'
+        },
+        {
+          type: 'password',
+          name: 'password',
+          message: 'Enter your password:',
+          validate: (input) => input.trim() !== '' ? true : 'Password is required'
+        }
+      ]);
+      
+      // For now, we'll simulate successful login
+      // In a real implementation, you'd validate against a user database
+      const identifier = credentials.userIdentifier;
+      userId = identifier.includes('@') ? identifier.split('@')[0] : identifier;
+      userName = `User ${userId}`; // Would be fetched from database
+      userEmail = identifier.includes('@') ? identifier : `${identifier}@example.com`;
+      
+      console.log(chalk.green('✅ Login successful!'));
+    }
+
+    // Save credentials to user-specific config file
+    try {
+      // Ensure user config directory exists
+      if (!fs.existsSync(userConfigDir)) {
+        fs.mkdirSync(userConfigDir, { recursive: true });
       }
+      
+      const config = {
+        userId,
+        userName,
+        userEmail,
+        savedAt: new Date().toISOString()
+      };
+      fs.writeFileSync(userConfigPath, JSON.stringify(config, null, 2));
+      console.log(chalk.green('✅ Credentials saved locally'));
+    } catch (error) {
+      console.log(chalk.yellow('⚠️  Could not save credentials locally'));
     }
   }
 
-  return { userId, userName };
+  return { userId, userName, userEmail };
 }
 
 // Activate virtual environment
@@ -621,12 +705,12 @@ async function runContainerCommand(options) {
 
     // Collect user credentials
     const userCredentials = await collectUserCredentials(options);
-    const { userId, userName } = userCredentials;
+    const { userId, userName, userEmail } = userCredentials;
 
     // Register user on dashboard immediately after collecting credentials
     console.log(chalk.blue('\n📝 Registering user on GitArsenal dashboard...'));
     // Send user data immediately so the dashboard records users
-    await sendUserData(userId, userName);
+    await sendUserData(userId, userName, userEmail);
 
     // Check for required dependencies
     const spinner = ora('Checking dependencies...').start();

package/package.json

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

package/config.json

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