checkpoint-cli 0.5.0 → 0.5.2

package/dist/index.js

@@ -271,6 +271,19 @@ function launchNgrok(port) {
         } });
     });
 }
+async function getUserWorkspaceId(sb, userId) {
+    const { data: membership, error } = await sb
+        .from('workspace_members')
+        .select('workspace_id')
+        .eq('user_id', userId)
+        .order('created_at', { ascending: true })
+        .limit(1)
+        .maybeSingle();
+    if (error) {
+        throw error;
+    }
+    return membership?.workspace_id ?? null;
+}
 async function registerTunnel(sb, opts) {
     if (!isValidUrl(opts.tunnelUrl)) {
         console.log(chalk_1.default.yellow('  ⚠ Invalid tunnel URL'));
@@ -283,24 +296,32 @@ async function registerTunnel(sb, opts) {
     }
     const APP_URL = (0, config_js_1.getAppUrl)();
     const userId = userData.user.id;
+    const workspaceId = await getUserWorkspaceId(sb, userId);
+    if (!workspaceId) {
+        console.log(chalk_1.default.yellow('  ⚠ No workspace membership found. Complete setup in the dashboard first.'));
+        return null;
+    }
     // Try to find an existing tunnel with the same name for this user
     const { data: existing } = await sb
         .from('tunnels')
         .select('id, share_id')
         .eq('user_id', userId)
+        .eq('workspace_id', workspaceId)
         .eq('name', opts.name)
         .order('created_at', { ascending: false })
         .limit(1)
         .single();
     if (existing) {
         // Reconnect: reuse the same share_id, update the tunnel URL
+        const now = new Date().toISOString();
         const { error } = await sb
             .from('tunnels')
             .update({
             tunnel_url: opts.tunnelUrl,
             local_port: opts.port,
             status: 'active',
-            last_seen_at: new Date().toISOString(),
+            activated_at: now,
+            last_seen_at: now,
         })
             .eq('id', existing.id);
         if (error) {
@@ -310,8 +331,32 @@ async function registerTunnel(sb, opts) {
         console.log(chalk_1.default.green('  ✓ Reconnected to existing tunnel') + chalk_1.default.gray(` (${opts.name})`));
         return { shareUrl: `${APP_URL}/share/${existing.share_id}`, tunnelId: existing.id };
     }
+    // Check plan limits before creating a new tunnel
+    const { data: subscription } = await sb
+        .from('subscriptions')
+        .select('status, billing_plans(name)')
+        .eq('workspace_id', workspaceId)
+        .maybeSingle();
+    const isActiveSub = subscription?.status === 'active' || subscription?.status === 'trialing';
+    const planName = subscription?.billing_plans?.name?.toLowerCase() ?? '';
+    const isPro = planName.includes('pro') || planName.includes('enterprise');
+    const FREE_TUNNEL_LIMIT = 1;
+    if (!isActiveSub || !isPro) {
+        const { count } = await sb
+            .from('tunnels')
+            .select('id', { count: 'exact', head: true })
+            .eq('workspace_id', workspaceId);
+        if ((count ?? 0) >= FREE_TUNNEL_LIMIT) {
+            console.log('');
+            console.log(chalk_1.default.red(`  ✗ Tunnel limit reached (${FREE_TUNNEL_LIMIT} tunnels on the Free plan).`));
+            console.log(chalk_1.default.gray('  Upgrade to Pro for unlimited tunnels: ') + chalk_1.default.cyan(`${(0, config_js_1.getAppUrl)()}/dashboard/settings?tab=billing`));
+            console.log('');
+            return null;
+        }
+    }
     // No existing tunnel — create a new one
     const shareId = generateShareId();
+    const now = new Date().toISOString();
     const { data, error } = await sb.from('tunnels').insert({
         name: opts.name,
         local_port: opts.port,
@@ -319,7 +364,9 @@ async function registerTunnel(sb, opts) {
         share_id: shareId,
         status: 'active',
         user_id: userId,
-        last_seen_at: new Date().toISOString(),
+        workspace_id: workspaceId,
+        activated_at: now,
+        last_seen_at: now,
     }).select('id').single();
     if (error || !data) {
         console.log(chalk_1.default.yellow(`  ⚠ Could not register: ${error?.message ?? 'unknown'}`));
@@ -362,35 +409,60 @@ function openBrowser(url) {
 }
 function loginWithBrowser() {
     return new Promise((resolve, reject) => {
-        const server = http_1.default.createServer((req, res) => {
+        const server = http_1.default.createServer(async (req, res) => {
             const url = new URL(req.url || '/', `http://localhost`);
             if (url.pathname === '/callback') {
-                const access_token = url.searchParams.get('access_token');
-                const refresh_token = url.searchParams.get('refresh_token');
-                if (access_token && refresh_token) {
-                    // Success page
-                    res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-                    res.end(`
-            <html>
-              <body style="font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; display: flex; align-items: center; justify-content: center; height: 100vh; margin: 0; background: #13120A; color: #f0ede6;">
-                <div style="text-align: center; display: flex; flex-direction: column; align-items: center; gap: 16px;">
-                  <svg width="32" height="32" viewBox="0 0 256 256" fill="none">
-                    <circle cx="128" cy="128" r="112" fill="#22c55e"/>
-                    <polyline points="88,136 112,160 168,104" stroke="#13120A" stroke-width="16" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
-                  </svg>
-                  <h1 style="font-size: 20px; font-weight: 500; margin: 0; color: #f0ede6;">Logged in to Checkpoint</h1>
-                  <p style="color: #9e9889; margin: 0; font-size: 14px;">You can close this tab and return to your terminal.</p>
-                  <div style="margin-top: 8px; padding-top: 24px; border-top: 1px dashed rgba(73,67,58,0.3);">
-                    <p style="color: #9e9889; margin: 0px 0 24px; font-size: 13px;">Start sharing your localhost for feedback:</p>
-                    <code style="padding: 8px 12px; background: #1D1B15; border: 1px solid rgba(73,67,58,0.4); border-radius: 6px; font-family: 'JetBrains Mono','Fira Code','SF Mono',monospace; font-size: 13px; color: #9e9889;">checkpoint start -p <span style="color: #ff5700;">&lt;port&gt;</span></code>
-                    <p style="text-align: center; margin-top: 24px; font-size: 13px; color: #9e9889;">or <a href="${(0, config_js_1.getAppUrl)()}" style="color: #ff5700; text-decoration: none;">Go to Dashboard</a></p>
+                const code = url.searchParams.get('code');
+                if (code) {
+                    try {
+                        const APP_URL = (0, config_js_1.getAppUrl)();
+                        const exchangeRes = await fetch(`${APP_URL}/api/cli/auth-code?code=${encodeURIComponent(code)}`);
+                        if (!exchangeRes.ok)
+                            throw new Error('Code exchange failed');
+                        const { access_token, refresh_token } = await exchangeRes.json();
+                        res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+                        res.end(`
+              <html>
+                <body style="font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; display: flex; align-items: center; justify-content: center; height: 100vh; margin: 0; background: #13120A; color: #f0ede6;">
+                  <div style="text-align: center; display: flex; flex-direction: column; align-items: center; gap: 16px;">
+                    <svg width="32" height="32" viewBox="0 0 256 256" fill="none">
+                      <circle cx="128" cy="128" r="112" fill="#22c55e"/>
+                      <polyline points="88,136 112,160 168,104" stroke="#13120A" stroke-width="16" stroke-linecap="round" stroke-linejoin="round" fill="none"/>
+                    </svg>
+                    <h1 style="font-size: 20px; font-weight: 500; margin: 0; color: #f0ede6;">Logged in to Checkpoint</h1>
+                    <p style="color: #9e9889; margin: 0; font-size: 14px;">You can close this tab and return to your terminal.</p>
+                    <div style="margin-top: 8px; padding-top: 24px; border-top: 1px dashed rgba(73,67,58,0.3);">
+                      <p style="color: #9e9889; margin: 0px 0 24px; font-size: 13px;">Start sharing your localhost for feedback:</p>
+                      <code style="padding: 8px 12px; background: #1D1B15; border: 1px solid rgba(73,67,58,0.4); border-radius: 6px; font-family: 'JetBrains Mono','Fira Code','SF Mono',monospace; font-size: 13px; color: #9e9889;">checkpoint start -p <span style="color: #ff5700;">&lt;port&gt;</span></code>
+                      <p style="text-align: center; margin-top: 24px; font-size: 13px; color: #9e9889;">or <a href="${APP_URL}" style="color: #ff5700; text-decoration: none;">Go to Dashboard</a></p>
+                    </div>
                   </div>
-                </div>
-              </body>
-            </html>
-          `);
-                    server.close();
-                    resolve({ access_token, refresh_token });
+                </body>
+              </html>
+            `);
+                        server.close();
+                        resolve({ access_token, refresh_token });
+                    }
+                    catch {
+                        res.writeHead(500, { 'Content-Type': 'text/html; charset=utf-8' });
+                        res.end(`
+              <html>
+                <body style="font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; display: flex; align-items: center; justify-content: center; height: 100vh; margin: 0; background: #13120A; color: #f0ede6;">
+                  <div style="text-align: center; display: flex; flex-direction: column; align-items: center; gap: 16px;">
+                    <svg width="48" height="48" viewBox="0 0 256 256" fill="none">
+                      <circle cx="128" cy="128" r="112" fill="#ef4444"/>
+                      <line x1="96" y1="96" x2="160" y2="160" stroke="#13120A" stroke-width="16" stroke-linecap="round"/>
+                      <line x1="160" y1="96" x2="96" y2="160" stroke="#13120A" stroke-width="16" stroke-linecap="round"/>
+                    </svg>
+                    <h1 style="font-size: 20px; font-weight: 500; margin: 0; color: #f0ede6;">Login failed</h1>
+                    <p style="color: #9e9889; margin: 0; font-size: 14px;">Code exchange failed. Please try again.</p>
+                  </div>
+                </body>
+              </html>
+            `);
+                        server.close();
+                        reject(new Error('Code exchange failed'));
+                    }
                 }
                 else {
                     res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
@@ -404,13 +476,13 @@ function loginWithBrowser() {
                     <line x1="160" y1="96" x2="96" y2="160" stroke="#13120A" stroke-width="16" stroke-linecap="round"/>
                   </svg>
                   <h1 style="font-size: 20px; font-weight: 500; margin: 0; color: #f0ede6;">Login failed</h1>
-                  <p style="color: #9e9889; margin: 0; font-size: 14px;">Missing tokens. Please try again.</p>
+                  <p style="color: #9e9889; margin: 0; font-size: 14px;">Missing auth code. Please try again.</p>
                 </div>
               </body>
             </html>
           `);
                     server.close();
-                    reject(new Error('Missing tokens in callback'));
+                    reject(new Error('Missing auth code in callback'));
                 }
             }
             else {
@@ -429,17 +501,24 @@ function loginWithBrowser() {
             const loginUrl = `${APP_URL}/cli/auth?callback=${encodeURIComponent(callbackUrl)}`;
             console.log(`  ${chalk_1.default.cyan(loginUrl)}`);
             console.log('');
-            const rl = readline_1.default.createInterface({ input: process.stdin, output: process.stdout });
-            rl.question(chalk_1.default.gray('  Press ENTER to open the browser...'), () => {
-                rl.close();
+            process.stdout.write(chalk_1.default.gray('  Press ENTER to open the browser...'));
+            process.stdin.setRawMode?.(false);
+            process.stdin.resume();
+            process.stdin.setEncoding('utf8');
+            const onKey = () => {
+                process.stdin.removeListener('data', onKey);
+                process.stdout.write('\n');
                 openBrowser(loginUrl);
-            });
+                // Keep stdin resumed so the HTTP server's event loop stays alive
+                // until the browser callback arrives.
+            };
+            process.stdin.on('data', onKey);
         });
-        // Timeout after 5 minutes
+        // Timeout after 10 minutes
         setTimeout(() => {
             server.close();
-            reject(new Error('Login timed out (5 minutes). Please try again.'));
-        }, 5 * 60 * 1000);
+            reject(new Error('Login timed out (10 minutes). Please try again.'));
+        }, 10 * 60 * 1000);
     });
 }
 /* ── CLI ── */
@@ -447,7 +526,7 @@ const program = new commander_1.Command();
 program
     .name('checkpoint')
     .description('Share your localhost with reviewers — get visual feedback directly on the page.\n\nQuick start:\n  1. checkpoint login          Sign in to your Checkpoint account\n  2. checkpoint start -p 3000  Start tunneling and get a share link\n\nReuse a tunnel name to keep the same share URL and preserve all comments.')
-    .version('0.5.0');
+    .version('0.5.2');
 // ── checkpoint login ──
 program
     .command('login')
@@ -636,8 +715,36 @@ program
         console.log(chalk_1.default.red('  Session expired. Run `checkpoint login` again.'));
         process.exit(1);
     }
+    const workspaceId = await getUserWorkspaceId(sb, userData.user.id);
+    if (!workspaceId) {
+        console.log(chalk_1.default.red('  Failed: no workspace membership found. Complete setup in the dashboard first.'));
+        process.exit(1);
+    }
+    // Check plan limits
+    const { data: subscription } = await sb
+        .from('subscriptions')
+        .select('status, billing_plans(name)')
+        .eq('workspace_id', workspaceId)
+        .maybeSingle();
+    const isActiveSub = subscription?.status === 'active' || subscription?.status === 'trialing';
+    const planName = subscription?.billing_plans?.name?.toLowerCase() ?? '';
+    const isPro = planName.includes('pro') || planName.includes('enterprise');
+    const FREE_TUNNEL_LIMIT = 1;
+    if (!isActiveSub || !isPro) {
+        const { count } = await sb
+            .from('tunnels')
+            .select('id', { count: 'exact', head: true })
+            .eq('workspace_id', workspaceId);
+        if ((count ?? 0) >= FREE_TUNNEL_LIMIT) {
+            console.log(chalk_1.default.red(`  ✗ Tunnel limit reached (${FREE_TUNNEL_LIMIT} tunnels on the Free plan).`));
+            console.log(chalk_1.default.gray('  Upgrade to Pro for unlimited tunnels: ') + chalk_1.default.cyan(`${(0, config_js_1.getAppUrl)()}/dashboard/settings?tab=billing`));
+            console.log('');
+            process.exit(1);
+        }
+    }
     const APP_URL = (0, config_js_1.getAppUrl)();
     const shareId = generateShareId();
+    const now = new Date().toISOString();
     const { data, error } = await sb.from('tunnels').insert({
         name: opts.name,
         local_port: parseInt(opts.port, 10),
@@ -645,7 +752,9 @@ program
         share_id: shareId,
         status: 'active',
         user_id: userData.user.id,
-        last_seen_at: new Date().toISOString(),
+        workspace_id: workspaceId,
+        activated_at: now,
+        last_seen_at: now,
     }).select('id').single();
     if (error || !data) {
         console.log(chalk_1.default.red(`  Failed: ${error?.message ?? 'unknown error'}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "checkpoint-cli",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Share your localhost with reviewers — get visual feedback directly on the page",
   "keywords": [
     "checkpoint",