@l4yercak3/cli 1.0.3 → 1.0.5

package/bin/cli.js

@@ -14,6 +14,8 @@ const loginCommand = require('../src/commands/login');
 const logoutCommand = require('../src/commands/logout');
 const statusCommand = require('../src/commands/status');
 const spreadCommand = require('../src/commands/spread');
+const apiKeysCommand = require('../src/commands/api-keys');
+const upgradeCommand = require('../src/commands/upgrade');
 
 // Create CLI program
 const program = new Command();
@@ -48,6 +50,16 @@ program
   .description(spreadCommand.description)
   .action(spreadCommand.handler);
 
+program
+  .command(apiKeysCommand.command)
+  .description(apiKeysCommand.description)
+  .action(apiKeysCommand.handler);
+
+program
+  .command(upgradeCommand.command)
+  .description(upgradeCommand.description)
+  .action(upgradeCommand.handler);
+
 // Show logo and welcome message if no command provided
 if (process.argv.length === 2) {
   console.log(''); // initial spacing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@l4yercak3/cli",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Icing on the L4yercak3 - The sweet finishing touch for your Layer Cake integration",
   "main": "src/index.js",
   "bin": {

package/src/api/backend-client.js

@@ -37,6 +37,7 @@ class BackendClient {
 
   /**
    * Make API request
+   * Returns response data with error details preserved for specific handling
    */
   async request(method, endpoint, data = null) {
     const url = `${this.baseUrl}${endpoint}`;
@@ -54,7 +55,14 @@ class BackendClient {
       const responseData = await response.json();
 
       if (!response.ok) {
-        throw new Error(responseData.message || `API request failed: ${response.status}`);
+        // Create error with additional details from backend
+        const error = new Error(responseData.message || responseData.error || `API request failed: ${response.status}`);
+        error.code = responseData.code || 'UNKNOWN_ERROR';
+        error.suggestion = responseData.suggestion || null;
+        error.upgradeUrl = responseData.upgradeUrl || null;
+        error.upgradeCommand = responseData.upgradeCommand || null;
+        error.status = response.status;
+        throw error;
       }
 
       return responseData;
@@ -124,13 +132,19 @@ class BackendClient {
     }
   }
 
+  /**
+   * List API keys for an organization
+   * Returns: { keys, limit, currentCount, canCreateMore, limitDescription }
+   */
+  async listApiKeys(organizationId) {
+    return await this.request('GET', `/api/v1/api-keys/list?organizationId=${organizationId}`);
+  }
+
   /**
    * Generate API key for organization
    * Note: This calls Convex action directly, requires session
    */
   async generateApiKey(organizationId, name, scopes = ['*']) {
-    // This will need to call Convex action via backend API wrapper
-    // For now, placeholder
     return await this.request('POST', `/api/v1/api-keys/generate`, {
       organizationId,
       name,

package/src/commands/api-keys.js

@@ -0,0 +1,119 @@
+/**
+ * API Keys Command
+ * List and manage API keys for organizations
+ */
+
+const configManager = require('../config/config-manager');
+const backendClient = require('../api/backend-client');
+const inquirer = require('inquirer');
+const chalk = require('chalk');
+
+/**
+ * API Keys list command handler
+ */
+async function handleApiKeysList() {
+  // Check if logged in
+  if (!configManager.isLoggedIn()) {
+    console.log(chalk.yellow('  ⚠️  You must be logged in first'));
+    console.log(chalk.gray('\n  Run "l4yercak3 login" to authenticate\n'));
+    process.exit(1);
+  }
+
+  console.log(chalk.cyan('  🔑 API Keys\n'));
+
+  try {
+    // Get organizations
+    const orgsResponse = await backendClient.getOrganizations();
+    const organizations = Array.isArray(orgsResponse)
+      ? orgsResponse
+      : orgsResponse.organizations || orgsResponse.data || [];
+
+    if (organizations.length === 0) {
+      console.log(chalk.yellow('  ⚠️  No organizations found'));
+      console.log(chalk.gray('\n  Run "l4yercak3 spread" to create an organization\n'));
+      return;
+    }
+
+    // Select organization if multiple
+    let organizationId;
+    let organizationName;
+
+    if (organizations.length === 1) {
+      organizationId = organizations[0].id;
+      organizationName = organizations[0].name;
+    } else {
+      const { orgChoice } = await inquirer.prompt([
+        {
+          type: 'list',
+          name: 'orgChoice',
+          message: 'Select organization:',
+          choices: organizations.map(org => ({
+            name: `${org.name} (${org.id})`,
+            value: org.id,
+          })),
+        },
+      ]);
+      organizationId = orgChoice;
+      organizationName = organizations.find(org => org.id === orgChoice)?.name;
+    }
+
+    console.log(chalk.gray(`  Organization: ${organizationName}\n`));
+
+    // List API keys
+    const keysResponse = await backendClient.listApiKeys(organizationId);
+    const keys = keysResponse.keys || [];
+
+    if (keys.length === 0) {
+      console.log(chalk.yellow('  No API keys found for this organization'));
+      console.log(chalk.gray('\n  Run "l4yercak3 spread" to generate an API key\n'));
+      return;
+    }
+
+    // Display keys
+    console.log(chalk.green(`  Found ${keys.length} API key(s):\n`));
+
+    keys.forEach((key, i) => {
+      const maskedKey = key.key ? `${key.key.substring(0, 15)}...` : '[hidden]';
+      const name = key.name || `Key ${i + 1}`;
+      const created = key.createdAt ? new Date(key.createdAt).toLocaleDateString() : 'Unknown';
+
+      console.log(chalk.white(`  ${i + 1}. ${name}`));
+      console.log(chalk.gray(`     Key: ${maskedKey}`));
+      console.log(chalk.gray(`     Created: ${created}`));
+      if (key.scopes) {
+        console.log(chalk.gray(`     Scopes: ${key.scopes.join(', ')}`));
+      }
+      console.log('');
+    });
+
+    // Show limit info
+    if (keysResponse.limitDescription) {
+      console.log(chalk.gray(`  Limit: ${keysResponse.limitDescription}`));
+    }
+    if (keysResponse.canCreateMore !== undefined) {
+      if (keysResponse.canCreateMore) {
+        console.log(chalk.green(`  ✅ You can create more API keys`));
+      } else {
+        console.log(chalk.yellow(`  ⚠️  You've reached your API key limit`));
+        console.log(chalk.gray('     Upgrade at: https://app.l4yercak3.com/settings/billing'));
+      }
+    }
+    console.log('');
+
+  } catch (error) {
+    if (error.code === 'SESSION_EXPIRED') {
+      console.log(chalk.red(`\n  ❌ Session expired. Please run "l4yercak3 login" again.\n`));
+    } else if (error.code === 'NOT_AUTHORIZED') {
+      console.log(chalk.red(`\n  ❌ You don't have permission to view API keys for this organization.\n`));
+    } else {
+      console.error(chalk.red(`  ❌ Error listing API keys: ${error.message}\n`));
+    }
+    process.exit(1);
+  }
+}
+
+module.exports = {
+  command: 'api-keys',
+  description: 'List API keys for your organizations',
+  handler: handleApiKeysList,
+};

package/src/commands/login.js

@@ -9,6 +9,7 @@ const backendClient = require('../api/backend-client');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
 const projectDetector = require('../detectors');
+const { showLogo } = require('../logo');
 
 /**
  * Generate retro Windows 95 style HTML page
@@ -123,10 +124,19 @@ async function handleLogin() {
     // Check if already logged in
     if (configManager.isLoggedIn()) {
       const session = configManager.getSession();
-      console.log(chalk.yellow('  ⚠️  You are already logged in'));
-      console.log(chalk.gray(`  Email: ${session.email}`));
-      console.log(chalk.gray(`  Session expires: ${new Date(session.expiresAt).toLocaleString()}`));
-      console.log(chalk.gray('\n  Run "l4yercak3 logout" to log out first\n'));
+
+      // Show logo
+      console.log('');
+      showLogo(false);
+
+      console.log(chalk.green('  ✅ You are already logged in'));
+      if (session.email) {
+        console.log(chalk.gray(`  Email: ${session.email}`));
+      }
+      console.log(chalk.gray(`  Session expires: ${new Date(session.expiresAt).toLocaleString()}\n`));
+
+      // Still offer the setup wizard
+      await promptSetupWizard();
       return;
     }
 
@@ -175,7 +185,11 @@ async function handleLogin() {
       console.log(chalk.gray('  Session saved, but validation failed. You may need to log in again.'));
     }
 
-    console.log(chalk.green('\n  ✅ Successfully logged in!\n'));
+    // Show logo after successful login
+    console.log('');
+    showLogo(false);
+
+    console.log(chalk.green('  ✅ Successfully logged in!\n'));
 
     const finalSession = configManager.getSession();
     if (finalSession && finalSession.email) {

package/src/commands/spread.js

@@ -20,15 +20,36 @@ async function createOrganization(orgName) {
   // Handle different response formats
   const organizationId = newOrg.organizationId || newOrg.id || newOrg.data?.organizationId || newOrg.data?.id;
   const organizationName = newOrg.name || orgName;
-  
+
   if (!organizationId) {
     throw new Error('Organization ID not found in response. Please check backend API endpoint.');
   }
-  
+
   console.log(chalk.green(`  ✅ Organization created: ${organizationName}\n`));
   return { organizationId, organizationName };
 }
 
+/**
+ * Helper function to generate a new API key
+ */
+async function generateNewApiKey(organizationId) {
+  console.log(chalk.gray('  Generating API key...'));
+  const apiKeyResponse = await backendClient.generateApiKey(
+    organizationId,
+    'CLI Generated Key',
+    ['*']
+  );
+  // Handle different response formats
+  const apiKey = apiKeyResponse.key || apiKeyResponse.apiKey || apiKeyResponse.data?.key || apiKeyResponse.data?.apiKey;
+
+  if (!apiKey) {
+    throw new Error('API key not found in response. Please check backend API endpoint.');
+  }
+
+  console.log(chalk.green(`  ✅ API key generated\n`));
+  return apiKey;
+}
+
 async function handleSpread() {
   // Check if logged in
   if (!configManager.isLoggedIn()) {
@@ -181,28 +202,172 @@ async function handleSpread() {
       process.exit(1);
     }
 
-    // Step 3: Generate API key
+    // Step 3: API Key Setup
     console.log(chalk.cyan('  🔑 API Key Setup\n'));
     let apiKey;
 
     try {
-      console.log(chalk.gray('  Generating API key...'));
-      const apiKeyResponse = await backendClient.generateApiKey(
-        organizationId,
-        'CLI Generated Key',
-        ['*']
-      );
-      // Handle different response formats
-      apiKey = apiKeyResponse.key || apiKeyResponse.apiKey || apiKeyResponse.data?.key || apiKeyResponse.data?.apiKey;
-      
-      if (!apiKey) {
-        throw new Error('API key not found in response. Please check backend API endpoint.');
+      // First, check if organization already has API keys
+      console.log(chalk.gray('  Checking existing API keys...'));
+      let existingKeys = null;
+
+      try {
+        existingKeys = await backendClient.listApiKeys(organizationId);
+      } catch (listError) {
+        // If listing fails, continue to try generating
+        console.log(chalk.gray('  Could not check existing keys, attempting to generate...'));
+      }
+
+      if (existingKeys && existingKeys.keys && existingKeys.keys.length > 0) {
+        // Organization has existing keys
+        console.log(chalk.yellow(`  ⚠️  Found ${existingKeys.keys.length} existing API key(s)`));
+
+        if (existingKeys.limitDescription) {
+          console.log(chalk.gray(`     Limit: ${existingKeys.limitDescription}`));
+        }
+
+        // Show existing keys (masked)
+        existingKeys.keys.forEach((key, i) => {
+          const maskedKey = key.key ? `${key.key.substring(0, 10)}...` : key.name || `Key ${i + 1}`;
+          console.log(chalk.gray(`     • ${key.name || 'Unnamed'}: ${maskedKey}`));
+        });
+        console.log('');
+
+        if (!existingKeys.canCreateMore) {
+          // At limit - offer to use existing key
+          const { useExisting } = await inquirer.prompt([
+            {
+              type: 'confirm',
+              name: 'useExisting',
+              message: 'You\'ve reached your API key limit. Use an existing key from your .env.local file?',
+              default: true,
+            },
+          ]);
+
+          if (useExisting) {
+            const { manualKey } = await inquirer.prompt([
+              {
+                type: 'input',
+                name: 'manualKey',
+                message: 'Enter your existing API key:',
+                validate: (input) => input.trim().length > 0 || 'API key is required',
+              },
+            ]);
+            apiKey = manualKey.trim();
+            console.log(chalk.green(`  ✅ Using provided API key\n`));
+          } else {
+            console.log(chalk.yellow('\n  ⚠️  To generate more API keys, upgrade your plan at https://app.l4yercak3.com/settings/billing\n'));
+            process.exit(0);
+          }
+        } else {
+          // Can create more - ask what to do
+          const { keyAction } = await inquirer.prompt([
+            {
+              type: 'list',
+              name: 'keyAction',
+              message: 'What would you like to do?',
+              choices: [
+                { name: 'Generate a new API key', value: 'generate' },
+                { name: 'Enter an existing API key', value: 'existing' },
+              ],
+            },
+          ]);
+
+          if (keyAction === 'existing') {
+            const { manualKey } = await inquirer.prompt([
+              {
+                type: 'input',
+                name: 'manualKey',
+                message: 'Enter your existing API key:',
+                validate: (input) => input.trim().length > 0 || 'API key is required',
+              },
+            ]);
+            apiKey = manualKey.trim();
+            console.log(chalk.green(`  ✅ Using provided API key\n`));
+          } else {
+            // Generate new key
+            apiKey = await generateNewApiKey(organizationId);
+          }
+        }
+      } else {
+        // No existing keys - generate one
+        apiKey = await generateNewApiKey(organizationId);
       }
-      
-      console.log(chalk.green(`  ✅ API key generated\n`));
     } catch (error) {
-      console.error(chalk.red(`  ❌ Error generating API key: ${error.message}\n`));
-      process.exit(1);
+      // Handle specific error codes
+      if (error.code === 'API_KEY_LIMIT_REACHED') {
+        console.log(chalk.yellow(`\n  ⚠️  ${error.message}`));
+        if (error.suggestion) {
+          console.log(chalk.gray(`  ${error.suggestion}`));
+        }
+
+        // Show upgrade option if available
+        if (error.upgradeUrl) {
+          console.log(chalk.cyan(`\n  🚀 Upgrade your plan to get more API keys:`));
+          console.log(chalk.gray(`     ${error.upgradeUrl}\n`));
+
+          const { action } = await inquirer.prompt([
+            {
+              type: 'list',
+              name: 'action',
+              message: 'What would you like to do?',
+              choices: [
+                { name: 'Open upgrade page in browser', value: 'upgrade' },
+                { name: 'Enter an existing API key', value: 'existing' },
+                { name: 'Exit', value: 'exit' },
+              ],
+            },
+          ]);
+
+          if (action === 'upgrade') {
+            const { default: open } = require('open');
+            console.log(chalk.gray('  Opening browser...'));
+            await open(error.upgradeUrl);
+            console.log(chalk.gray('\n  After upgrading, run "l4yercak3 spread" again.\n'));
+            process.exit(0);
+          } else if (action === 'existing') {
+            const { manualKey } = await inquirer.prompt([
+              {
+                type: 'input',
+                name: 'manualKey',
+                message: 'Enter your existing API key:',
+                validate: (input) => input.trim().length > 0 || 'API key is required',
+              },
+            ]);
+            apiKey = manualKey.trim();
+            console.log(chalk.green(`  ✅ Using provided API key\n`));
+          } else {
+            process.exit(0);
+          }
+        } else {
+          // No upgrade URL - fallback to manual entry
+          console.log(chalk.gray('\n  You can enter an existing API key or upgrade your plan.\n'));
+
+          const { manualKey } = await inquirer.prompt([
+            {
+              type: 'input',
+              name: 'manualKey',
+              message: 'Enter your existing API key (or press Enter to exit):',
+            },
+          ]);
+
+          if (manualKey.trim()) {
+            apiKey = manualKey.trim();
+            console.log(chalk.green(`  ✅ Using provided API key\n`));
+          } else {
+            process.exit(0);
+          }
+        }
+      } else if (error.code === 'SESSION_EXPIRED') {
+        console.log(chalk.red(`\n  ❌ Session expired. Please run "l4yercak3 login" again.\n`));
+        process.exit(1);
+      } else if (error.code === 'NOT_AUTHORIZED') {
+        console.log(chalk.red(`\n  ❌ You don't have permission to manage API keys for this organization.\n`));
+        process.exit(1);
+      } else {
+        console.error(chalk.red(`  ❌ Error setting up API key: ${error.message}\n`));
+        process.exit(1);
+      }
     }
 
     // Step 4: Feature selection

package/src/commands/upgrade.js

@@ -0,0 +1,48 @@
+/**
+ * Upgrade Command
+ * Opens the upgrade page in the browser for plan upgrades
+ */
+
+const configManager = require('../config/config-manager');
+const chalk = require('chalk');
+const { default: open } = require('open');
+
+/**
+ * Upgrade command handler
+ */
+async function handleUpgrade() {
+  // Check if logged in
+  if (!configManager.isLoggedIn()) {
+    console.log(chalk.yellow('  ⚠️  You must be logged in first'));
+    console.log(chalk.gray('\n  Run "l4yercak3 login" to authenticate\n'));
+    process.exit(1);
+  }
+
+  const session = configManager.getSession();
+  const backendUrl = configManager.getBackendUrl();
+
+  console.log(chalk.cyan('  🚀 Opening upgrade page...\n'));
+
+  // Build upgrade URL with CLI token for seamless authentication
+  const upgradeUrl = `${backendUrl}/upgrade?token=${encodeURIComponent(session.token)}&reason=cli_upgrade`;
+
+  console.log(chalk.gray(`  URL: ${upgradeUrl}\n`));
+
+  try {
+    await open(upgradeUrl);
+    console.log(chalk.green('  ✅ Upgrade page opened in your browser\n'));
+    console.log(chalk.gray('  Select a plan to unlock more features:'));
+    console.log(chalk.gray('  • More API keys'));
+    console.log(chalk.gray('  • Priority support'));
+    console.log(chalk.gray('  • Advanced features\n'));
+  } catch (error) {
+    console.log(chalk.yellow('  ⚠️  Could not open browser automatically'));
+    console.log(chalk.gray(`\n  Please visit: ${upgradeUrl}\n`));
+  }
+}
+
+module.exports = {
+  command: 'upgrade',
+  description: 'Upgrade your L4YERCAK3 plan',
+  handler: handleUpgrade,
+};

package/tests/commands/login.test.js

@@ -16,6 +16,9 @@ jest.mock('../../src/detectors', () => ({
     projectPath: '/test/path',
   }),
 }));
+jest.mock('../../src/logo', () => ({
+  showLogo: jest.fn(),
+}));
 jest.mock('chalk', () => ({
   cyan: (str) => str,
   yellow: (str) => str,
@@ -77,7 +80,7 @@ describe('Login Command', () => {
   });
 
   describe('handler - already logged in', () => {
-    it('shows warning when already logged in', async () => {
+    it('shows success message when already logged in', async () => {
       configManager.isLoggedIn.mockReturnValue(true);
       configManager.getSession.mockReturnValue({
         email: 'user@example.com',
@@ -91,7 +94,7 @@ describe('Login Command', () => {
       expect(open).not.toHaveBeenCalled();
     });
 
-    it('suggests logout when already logged in', async () => {
+    it('shows session info and offers setup wizard when already logged in', async () => {
       configManager.isLoggedIn.mockReturnValue(true);
       configManager.getSession.mockReturnValue({
         email: 'user@example.com',
@@ -100,7 +103,8 @@ describe('Login Command', () => {
 
       await loginCommand.handler();
 
-      expect(consoleOutput.some((line) => line.includes('logout'))).toBe(true);
+      // Should show "What's Next" since we're not in a project (mocked)
+      expect(consoleOutput.some((line) => line.includes("What's Next"))).toBe(true);
     });
   });