@l4yercak3/cli 1.1.3 → 1.1.5

package/.claude/settings.local.json

@@ -14,7 +14,8 @@
       "Bash(gh repo create:*)",
       "Bash(npm whoami:*)",
       "Bash(npm pkg fix:*)",
-      "Bash(git push:*)"
+      "Bash(git push:*)",
+      "Bash(session\" errors when trying to use features.\n\nNow the login command validates the session with the backend first.\nIf validation fails, it clears the local session and prompts for\nfresh login, avoiding the confusing loop.\n\n🤖 Generated with [Claude Code]\\(https://claude.com/claude-code\\)\n\nCo-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>\nEOF\n\\)\")"
     ]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@l4yercak3/cli",
-  "version": "1.1.3",
+  "version": "1.1.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

@@ -129,7 +129,8 @@ class BackendClient {
    * @returns {string} The login URL
    */
   getLoginUrl(state, provider = null) {
-    const callbackUrl = 'http://localhost:3000/callback';
+    // Use port 3333 to avoid conflicts with Next.js dev server (port 3000)
+    const callbackUrl = 'http://localhost:3333/callback';
 
     if (provider) {
       // Direct OAuth provider URL

package/src/commands/login.js

@@ -39,6 +39,9 @@ function generateRetroPage({ title, icon, heading, headingColor, message, submes
 </html>`;
 }
 
+// CLI callback port - different from Next.js dev server (3000)
+const CLI_CALLBACK_PORT = 3333;
+
 /**
  * Start local server to receive OAuth callback
  * @param {string} expectedState - The state token to verify against
@@ -48,7 +51,7 @@ function startCallbackServer(expectedState) {
     const http = require('http');
 
     const server = http.createServer((req, res) => {
-      const url = new URL(req.url, 'http://localhost:3000');
+      const url = new URL(req.url, `http://localhost:${CLI_CALLBACK_PORT}`);
 
       if (url.pathname === '/callback') {
         const token = url.searchParams.get('token');
@@ -104,7 +107,16 @@ function startCallbackServer(expectedState) {
       }
     });
 
-    server.listen(3000, 'localhost', () => {
+    // Handle server errors (e.g., port already in use)
+    server.on('error', (err) => {
+      if (err.code === 'EADDRINUSE') {
+        reject(new Error(`Port ${CLI_CALLBACK_PORT} is already in use. Please close any other l4yercak3 processes and try again.`));
+      } else {
+        reject(err);
+      }
+    });
+
+    server.listen(CLI_CALLBACK_PORT, 'localhost', () => {
       console.log(chalk.gray('  Waiting for authentication...'));
     });
 
@@ -121,7 +133,7 @@ function startCallbackServer(expectedState) {
  */
 async function handleLogin() {
   try {
-    // Check if already logged in
+    // Check if already logged in (local check)
     if (configManager.isLoggedIn()) {
       const session = configManager.getSession();
 
@@ -129,15 +141,26 @@ async function handleLogin() {
       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`));
+      // Validate session with backend to ensure it's actually valid
+      console.log(chalk.gray('  Validating session with backend...'));
+      const validationResult = await backendClient.validateSession();
 
-      // Still offer the setup wizard
-      await promptSetupWizard();
-      return;
+      if (validationResult) {
+        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;
+      } else {
+        // Session is invalid on backend - clear it and proceed to login
+        console.log(chalk.yellow('  ⚠️  Your session has expired or is invalid'));
+        console.log(chalk.gray('  Starting fresh login...\n'));
+        configManager.clearSession();
+      }
     }
 
     console.log(chalk.cyan('  🔐 Opening browser for authentication...\n'));

package/tests/backend-client.test.js

@@ -290,7 +290,7 @@ describe('BackendClient', () => {
       const state = 'test-state-token';
       const url = BackendClient.getLoginUrl(state, 'github');
 
-      expect(url).toContain(encodeURIComponent('http://localhost:3000/callback'));
+      expect(url).toContain(encodeURIComponent('http://localhost:3333/callback'));
     });
   });
 

package/tests/commands/login.test.js

@@ -57,6 +57,8 @@ describe('Login Command', () => {
 
     configManager.getSession.mockReturnValue(null);
     backendClient.getLoginUrl.mockReturnValue('https://backend.test.com/auth/cli-login');
+    // Mock validateSession to return valid result by default
+    backendClient.validateSession.mockResolvedValue({ valid: true, userId: 'user-123' });
   });
 
   afterEach(() => {