@l4yercak3/cli 1.1.0 → 1.1.2

package/package.json

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

@@ -7,9 +7,16 @@ const crypto = require('crypto');
 const fetch = require('node-fetch');
 const configManager = require('../config/config-manager');
 
+// API Base URL - All CLI API endpoints go through Convex HTTP
+const API_BASE_URL = 'https://aromatic-akita-723.convex.site';
+
+// App URL - Only used for browser login page (Next.js serves the OAuth UI)
+const APP_URL = 'https://app.l4yercak3.com';
+
 class BackendClient {
   constructor() {
-    this.baseUrl = configManager.getBackendUrl();
+    this.baseUrl = API_BASE_URL;
+    this.appUrl = APP_URL;
   }
 
   /**
@@ -37,6 +44,7 @@ class BackendClient {
 
   /**
    * Make API request
+   * All CLI API endpoints go through the Convex HTTP base URL
    * Returns response data with error details preserved for specific handling
    */
   async request(method, endpoint, data = null) {
@@ -115,20 +123,20 @@ class BackendClient {
 
   /**
    * Get CLI login URL with state parameter for CSRF protection
+   * Browser login is served by Next.js at APP_URL (not the Convex API URL)
    * @param {string} state - The state token generated by the CLI
    * @param {string|null} provider - Optional OAuth provider for direct auth
    * @returns {string} The login URL
    */
   getLoginUrl(state, provider = null) {
-    const backendUrl = configManager.getBackendUrl();
     const callbackUrl = 'http://localhost:3000/callback';
 
     if (provider) {
       // Direct OAuth provider URL
-      return `${backendUrl}/api/auth/oauth-signup?provider=${provider}&sessionType=cli&state=${state}&callback=${encodeURIComponent(callbackUrl)}`;
+      return `${this.appUrl}/api/auth/oauth-signup?provider=${provider}&sessionType=cli&state=${state}&callback=${encodeURIComponent(callbackUrl)}`;
     } else {
       // Provider selection page
-      return `${backendUrl}/auth/cli-login?state=${state}&callback=${encodeURIComponent(callbackUrl)}`;
+      return `${this.appUrl}/auth/cli-login?state=${state}&callback=${encodeURIComponent(callbackUrl)}`;
     }
   }
 
@@ -137,15 +145,14 @@ class BackendClient {
    * Returns: { keys, limit, currentCount, canCreateMore, limitDescription }
    */
   async listApiKeys(organizationId) {
-    return await this.request('GET', `/api/v1/api-keys/list?organizationId=${organizationId}`);
+    return await this.request('GET', `/api/v1/auth/cli/api-keys?organizationId=${organizationId}`);
   }
 
   /**
    * Generate API key for organization
-   * Note: This calls Convex action directly, requires session
    */
   async generateApiKey(organizationId, name, scopes = ['*']) {
-    return await this.request('POST', `/api/v1/api-keys/generate`, {
+    return await this.request('POST', `/api/v1/auth/cli/api-keys`, {
       organizationId,
       name,
       scopes,
@@ -156,14 +163,14 @@ class BackendClient {
    * Get organizations for current user
    */
   async getOrganizations() {
-    return await this.request('GET', '/api/v1/organizations');
+    return await this.request('GET', '/api/v1/auth/cli/organizations');
   }
 
   /**
    * Create organization
    */
   async createOrganization(name) {
-    return await this.request('POST', '/api/v1/organizations', {
+    return await this.request('POST', '/api/v1/auth/cli/organizations', {
       name,
     });
   }
@@ -229,6 +236,16 @@ class BackendClient {
   async listApplications(organizationId) {
     return await this.request('GET', `/api/v1/cli/applications?organizationId=${organizationId}`);
   }
+
+  /**
+   * Sync application data
+   * @param {string} applicationId - The application ID
+   * @param {object} syncData - Sync configuration (direction, models)
+   * @returns {Promise<object>}
+   */
+  async syncApplication(applicationId, syncData) {
+    return await this.request('POST', `/api/v1/cli/applications/${applicationId}/sync`, syncData);
+  }
 }
 
 module.exports = new BackendClient();

package/src/commands/spread.js

@@ -592,7 +592,8 @@ async function handleSpread() {
     } catch (regError) {
       // Registration failed but files were generated - warn but don't fail
       console.log(chalk.yellow(`  ⚠️  Could not register with backend: ${regError.message}`));
-      console.log(chalk.gray('     Your files were generated. Registration can be retried later.\n'));
+      console.log(chalk.gray('     Your files were generated successfully.'));
+      console.log(chalk.gray('     Backend registration will be available in a future update.\n'));
     }
 
     // Save project configuration
@@ -614,7 +615,14 @@ async function handleSpread() {
     configManager.saveProjectConfig(detection.projectPath, projectConfig);
     console.log(chalk.gray(`  📝 Configuration saved to ~/.l4yercak3/config.json\n`));
 
-    console.log(chalk.cyan('\n  🎉 Setup complete!\n'));
+    // Show appropriate completion message based on registration status
+    if (applicationId) {
+      console.log(chalk.cyan('\n  🎉 Setup complete!\n'));
+    } else {
+      console.log(chalk.cyan('\n  🎉 Local setup complete!\n'));
+      console.log(chalk.yellow('  ⚠️  Note: Backend registration pending - your app works locally but'));
+      console.log(chalk.yellow('     won\'t appear in the L4YERCAK3 dashboard until endpoints are available.\n'));
+    }
 
     if (features.includes('oauth')) {
       console.log(chalk.yellow('  📋 Next steps:\n'));

package/tests/backend-client.test.js

@@ -14,13 +14,19 @@ configManager.getBackendUrl.mockReturnValue('https://backend.test.com');
 // Need to require after mocking
 const BackendClient = require('../src/api/backend-client');
 
+// API Base URL for all CLI endpoints (Convex HTTP)
+const API_BASE_URL = 'https://aromatic-akita-723.convex.site';
+// App URL only for browser login
+const APP_URL = 'https://app.l4yercak3.com';
+
 describe('BackendClient', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    configManager.getBackendUrl.mockReturnValue('https://backend.test.com');
+    configManager.getBackendUrl.mockReturnValue(API_BASE_URL);
     configManager.getSession.mockReturnValue(null);
-    // Reset baseUrl since the module was already instantiated
-    BackendClient.baseUrl = 'https://backend.test.com';
+    // Reset URLs since the module was already instantiated
+    BackendClient.baseUrl = API_BASE_URL;
+    BackendClient.appUrl = APP_URL;
   });
 
   describe('getHeaders', () => {
@@ -61,7 +67,7 @@ describe('BackendClient', () => {
       const result = await BackendClient.request('GET', '/api/test');
 
       expect(fetch).toHaveBeenCalledWith(
-        'https://backend.test.com/api/test',
+        `${API_BASE_URL}/api/test`,
         expect.objectContaining({
           method: 'GET',
         })
@@ -79,7 +85,7 @@ describe('BackendClient', () => {
       await BackendClient.request('POST', '/api/test', { name: 'test' });
 
       expect(fetch).toHaveBeenCalledWith(
-        'https://backend.test.com/api/test',
+        `${API_BASE_URL}/api/test`,
         expect.objectContaining({
           method: 'POST',
           body: JSON.stringify({ name: 'test' }),
@@ -262,7 +268,8 @@ describe('BackendClient', () => {
       const state = 'test-state-token';
       const url = BackendClient.getLoginUrl(state);
 
-      expect(url).toContain('https://backend.test.com');
+      // Login URL uses APP_URL (Next.js), not API_BASE_URL
+      expect(url).toContain(APP_URL);
       expect(url).toContain('/auth/cli-login');
       expect(url).toContain('state=test-state-token');
       expect(url).toContain('callback=');
@@ -272,6 +279,7 @@ describe('BackendClient', () => {
       const state = 'test-state-token';
       const url = BackendClient.getLoginUrl(state, 'google');
 
+      expect(url).toContain(APP_URL);
       expect(url).toContain('/api/auth/oauth-signup');
       expect(url).toContain('provider=google');
       expect(url).toContain('sessionType=cli');
@@ -300,7 +308,7 @@ describe('BackendClient', () => {
       const result = await BackendClient.generateApiKey('org-123', 'My Key', ['read', 'write']);
 
       expect(fetch).toHaveBeenCalledWith(
-        expect.stringContaining('/api/v1/api-keys/generate'),
+        expect.stringContaining('/api/v1/auth/cli/api-keys'),
         expect.objectContaining({
           method: 'POST',
           body: JSON.stringify({
@@ -348,7 +356,7 @@ describe('BackendClient', () => {
       const result = await BackendClient.getOrganizations();
 
       expect(fetch).toHaveBeenCalledWith(
-        expect.stringContaining('/api/v1/organizations'),
+        expect.stringContaining('/api/v1/auth/cli/organizations'),
         expect.objectContaining({ method: 'GET' })
       );
       expect(result.organizations).toHaveLength(1);
@@ -369,7 +377,7 @@ describe('BackendClient', () => {
       const result = await BackendClient.createOrganization('New Org');
 
       expect(fetch).toHaveBeenCalledWith(
-        expect.stringContaining('/api/v1/organizations'),
+        expect.stringContaining('/api/v1/auth/cli/organizations'),
         expect.objectContaining({
           method: 'POST',
           body: JSON.stringify({ name: 'New Org' }),
@@ -380,7 +388,7 @@ describe('BackendClient', () => {
   });
 
   // ============================================
-  // Connected Applications API Tests
+  // Connected Applications API Tests (Convex HTTP)
   // ============================================
 
   describe('checkExistingApplication', () => {
@@ -399,8 +407,9 @@ describe('BackendClient', () => {
 
       const result = await BackendClient.checkExistingApplication('org-123', 'hash123');
 
+      // Should use Convex URL, not main backend
       expect(fetch).toHaveBeenCalledWith(
-        expect.stringContaining('/api/v1/cli/applications/by-path?organizationId=org-123&hash=hash123'),
+        'https://aromatic-akita-723.convex.site/api/v1/cli/applications/by-path?organizationId=org-123&hash=hash123',
         expect.objectContaining({ method: 'GET' })
       );
       expect(result.found).toBe(true);
@@ -434,7 +443,7 @@ describe('BackendClient', () => {
   });
 
   describe('registerApplication', () => {
-    it('registers new application', async () => {
+    it('registers new application via Convex URL', async () => {
       const mockResponse = {
         ok: true,
         json: jest.fn().mockResolvedValue({
@@ -459,8 +468,9 @@ describe('BackendClient', () => {
 
       const result = await BackendClient.registerApplication(registrationData);
 
+      // Should use Convex URL, not main backend
       expect(fetch).toHaveBeenCalledWith(
-        expect.stringContaining('/api/v1/cli/applications'),
+        'https://aromatic-akita-723.convex.site/api/v1/cli/applications',
         expect.objectContaining({
           method: 'POST',
           body: JSON.stringify(registrationData),
@@ -471,7 +481,7 @@ describe('BackendClient', () => {
   });
 
   describe('updateApplication', () => {
-    it('updates existing application', async () => {
+    it('updates existing application via Convex URL', async () => {
       const mockResponse = {
         ok: true,
         json: jest.fn().mockResolvedValue({
@@ -490,7 +500,7 @@ describe('BackendClient', () => {
       const result = await BackendClient.updateApplication('app-123', updates);
 
       expect(fetch).toHaveBeenCalledWith(
-        expect.stringContaining('/api/v1/cli/applications/app-123'),
+        'https://aromatic-akita-723.convex.site/api/v1/cli/applications/app-123',
         expect.objectContaining({
           method: 'PATCH',
           body: JSON.stringify(updates),
@@ -501,7 +511,7 @@ describe('BackendClient', () => {
   });
 
   describe('getApplication', () => {
-    it('fetches application details', async () => {
+    it('fetches application details via Convex URL', async () => {
       const mockResponse = {
         ok: true,
         json: jest.fn().mockResolvedValue({
@@ -515,7 +525,7 @@ describe('BackendClient', () => {
       const result = await BackendClient.getApplication('app-123');
 
       expect(fetch).toHaveBeenCalledWith(
-        expect.stringContaining('/api/v1/cli/applications/app-123'),
+        'https://aromatic-akita-723.convex.site/api/v1/cli/applications/app-123',
         expect.objectContaining({ method: 'GET' })
       );
       expect(result.id).toBe('app-123');
@@ -524,7 +534,7 @@ describe('BackendClient', () => {
   });
 
   describe('listApplications', () => {
-    it('lists applications for organization', async () => {
+    it('lists applications for organization via Convex URL', async () => {
       const mockResponse = {
         ok: true,
         json: jest.fn().mockResolvedValue({
@@ -539,10 +549,40 @@ describe('BackendClient', () => {
       const result = await BackendClient.listApplications('org-123');
 
       expect(fetch).toHaveBeenCalledWith(
-        expect.stringContaining('/api/v1/cli/applications?organizationId=org-123'),
+        'https://aromatic-akita-723.convex.site/api/v1/cli/applications?organizationId=org-123',
         expect.objectContaining({ method: 'GET' })
       );
       expect(result.applications).toHaveLength(2);
     });
   });
+
+  describe('syncApplication', () => {
+    it('syncs application data via Convex URL', async () => {
+      const mockResponse = {
+        ok: true,
+        json: jest.fn().mockResolvedValue({
+          success: true,
+          syncedRecords: 42,
+        }),
+      };
+      fetch.mockResolvedValue(mockResponse);
+
+      const syncData = {
+        direction: 'bidirectional',
+        models: ['contacts', 'organizations'],
+      };
+
+      const result = await BackendClient.syncApplication('app-123', syncData);
+
+      expect(fetch).toHaveBeenCalledWith(
+        'https://aromatic-akita-723.convex.site/api/v1/cli/applications/app-123/sync',
+        expect.objectContaining({
+          method: 'POST',
+          body: JSON.stringify(syncData),
+        })
+      );
+      expect(result.success).toBe(true);
+      expect(result.syncedRecords).toBe(42);
+    });
+  });
 });