@kylewadegrove/cutline-mcp-cli 0.4.0 → 0.4.2

package/dist/commands/login.js

@@ -7,37 +7,25 @@ exports.loginCommand = loginCommand;
 const open_1 = __importDefault(require("open"));
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
-const firebase_admin_1 = __importDefault(require("firebase-admin"));
 const callback_js_1 = require("../auth/callback.js");
 const keychain_js_1 = require("../auth/keychain.js");
 const config_store_js_1 = require("../utils/config-store.js");
 const config_js_1 = require("../utils/config.js");
-async function getSubscriptionStatus(uid, projectId) {
+async function getSubscriptionStatus(idToken, isStaging) {
     try {
-        // Initialize Firebase Admin if not already
-        if (firebase_admin_1.default.apps.length === 0) {
-            firebase_admin_1.default.initializeApp({ projectId });
-        }
-        const db = firebase_admin_1.default.firestore();
-        const userDoc = await db.collection('users').doc(uid).get();
-        if (!userDoc.exists) {
-            return { status: 'free' };
-        }
-        const userData = userDoc.data();
-        const subscription = userData?.subscription;
-        if (!subscription) {
-            return { status: 'free' };
-        }
-        const status = subscription.status || 'unknown';
-        // Get plan name from price ID or default
-        let planName = 'Premium';
-        if (subscription.priceId?.includes('yearly') || subscription.interval === 'year') {
-            planName = 'Premium (Yearly)';
-        }
-        else if (subscription.priceId?.includes('monthly') || subscription.interval === 'month') {
-            planName = 'Premium (Monthly)';
-        }
-        return { status, planName };
+        const baseUrl = isStaging
+            ? 'https://us-central1-cutline-staging.cloudfunctions.net'
+            : 'https://us-central1-cutline-prod.cloudfunctions.net';
+        const response = await fetch(`${baseUrl}/mcpSubscriptionStatus`, {
+            method: 'GET',
+            headers: {
+                'Authorization': `Bearer ${idToken}`,
+            },
+        });
+        if (!response.ok) {
+            return { status: 'unknown' };
+        }
+        return await response.json();
     }
     catch (error) {
         // Silently fail - subscription check is optional during login
@@ -135,7 +123,7 @@ async function loginCommand(options) {
         catch (error) {
             console.warn(chalk_1.default.yellow('  ⚠️  Could not save to Keychain (skipping)'));
         }
-        // Save to file config (cross-platform) - don't store API key anymore
+        // Save to file config (cross-platform)
         try {
             (0, config_store_js_1.saveConfig)({
                 refreshToken,
@@ -155,14 +143,8 @@ async function loginCommand(options) {
         // Check subscription status
         try {
             spinner.start('Checking subscription...');
-            const projectId = options.staging ? 'cutline-staging' : 'cutline-prod';
             const idToken = await exchangeRefreshForIdToken(refreshToken, firebaseApiKey);
-            // Initialize Firebase Admin if needed
-            if (firebase_admin_1.default.apps.length === 0) {
-                firebase_admin_1.default.initializeApp({ projectId });
-            }
-            const decoded = await firebase_admin_1.default.auth().verifyIdToken(idToken);
-            const subscription = await getSubscriptionStatus(decoded.uid, projectId);
+            const subscription = await getSubscriptionStatus(idToken, !!options.staging);
             spinner.stop();
             if (subscription.status === 'active' || subscription.status === 'trialing') {
                 const statusLabel = subscription.status === 'trialing' ? ' (trial)' : '';

package/dist/commands/status.js

@@ -6,34 +6,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.statusCommand = statusCommand;
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
-const firebase_admin_1 = __importDefault(require("firebase-admin"));
 const keychain_js_1 = require("../auth/keychain.js");
 const config_js_1 = require("../utils/config.js");
-async function getSubscriptionStatus(uid) {
+async function getSubscriptionStatus(idToken, isStaging) {
     try {
-        const db = firebase_admin_1.default.firestore();
-        const userDoc = await db.collection('users').doc(uid).get();
-        if (!userDoc.exists) {
-            return { status: 'free' };
-        }
-        const userData = userDoc.data();
-        const subscription = userData?.subscription;
-        if (!subscription) {
-            return { status: 'free' };
-        }
-        const status = subscription.status || 'unknown';
-        const periodEnd = subscription.periodEndsAt
-            ? new Date(subscription.periodEndsAt)
-            : undefined;
-        // Get plan name from price ID or default
-        let planName = 'Premium';
-        if (subscription.priceId?.includes('yearly') || subscription.interval === 'year') {
-            planName = 'Premium (Yearly)';
-        }
-        else if (subscription.priceId?.includes('monthly') || subscription.interval === 'month') {
-            planName = 'Premium (Monthly)';
-        }
-        return { status, planName, periodEnd };
+        const baseUrl = isStaging
+            ? 'https://us-central1-cutline-staging.cloudfunctions.net'
+            : 'https://us-central1-cutline-prod.cloudfunctions.net';
+        const response = await fetch(`${baseUrl}/mcpSubscriptionStatus`, {
+            method: 'GET',
+            headers: {
+                'Authorization': `Bearer ${idToken}`,
+            },
+        });
+        if (!response.ok) {
+            return { status: 'unknown' };
+        }
+        return await response.json();
     }
     catch (error) {
         console.error('Error fetching subscription:', error);
@@ -89,16 +78,12 @@ async function statusCommand(options) {
         // Exchange refresh token for ID token
         spinner.text = 'Verifying credentials...';
         const idToken = await exchangeRefreshToken(refreshToken, firebaseApiKey);
-        // Initialize Firebase Admin with correct project ID
-        if (firebase_admin_1.default.apps.length === 0) {
-            const projectId = options.staging ? 'cutline-staging' : 'cutline-prod';
-            firebase_admin_1.default.initializeApp({ projectId });
-        }
-        // Verify the ID token
-        const decoded = await firebase_admin_1.default.auth().verifyIdToken(idToken);
+        // Decode JWT payload (base64) to get user info - no verification needed, just display
+        const payloadBase64 = idToken.split('.')[1];
+        const decoded = JSON.parse(Buffer.from(payloadBase64, 'base64').toString());
         spinner.succeed(chalk_1.default.green('Authenticated'));
-        console.log(chalk_1.default.gray('  User:'), chalk_1.default.white(decoded.email || decoded.uid));
-        console.log(chalk_1.default.gray('  UID:'), chalk_1.default.dim(decoded.uid));
+        console.log(chalk_1.default.gray('  User:'), chalk_1.default.white(decoded.email || decoded.user_id || decoded.sub));
+        console.log(chalk_1.default.gray('  UID:'), chalk_1.default.dim(decoded.user_id || decoded.sub));
         // Calculate token expiry
         const expiresIn = Math.floor((decoded.exp * 1000 - Date.now()) / 1000 / 60);
         console.log(chalk_1.default.gray('  Token expires in:'), chalk_1.default.white(`${expiresIn} minutes`));
@@ -109,14 +94,17 @@ async function statusCommand(options) {
         if (decoded.deviceId) {
             console.log(chalk_1.default.gray('  Device ID:'), chalk_1.default.dim(decoded.deviceId));
         }
-        // Check subscription status from Firestore
-        const subscription = await getSubscriptionStatus(decoded.uid);
+        // Check subscription status via Cloud Function
+        spinner.start('Checking subscription...');
+        const subscription = await getSubscriptionStatus(idToken, !!options.staging);
+        spinner.stop();
         if (subscription.status === 'active' || subscription.status === 'trialing') {
             const statusLabel = subscription.status === 'trialing' ? ' (trial)' : '';
             console.log(chalk_1.default.gray('  Plan:'), chalk_1.default.green(`✓ ${subscription.planName || 'Premium'}${statusLabel}`));
             if (subscription.periodEnd) {
-                const daysLeft = Math.ceil((subscription.periodEnd.getTime() - Date.now()) / (1000 * 60 * 60 * 24));
-                console.log(chalk_1.default.gray('  Renews:'), chalk_1.default.white(`${subscription.periodEnd.toLocaleDateString()} (${daysLeft} days)`));
+                const periodEndDate = new Date(subscription.periodEnd);
+                const daysLeft = Math.ceil((periodEndDate.getTime() - Date.now()) / (1000 * 60 * 60 * 24));
+                console.log(chalk_1.default.gray('  Renews:'), chalk_1.default.white(`${periodEndDate.toLocaleDateString()} (${daysLeft} days)`));
             }
         }
         else if (subscription.status === 'past_due') {
@@ -125,7 +113,7 @@ async function statusCommand(options) {
         else if (subscription.status === 'canceled') {
             console.log(chalk_1.default.gray('  Plan:'), chalk_1.default.yellow('Premium (canceled)'));
             if (subscription.periodEnd) {
-                console.log(chalk_1.default.gray('  Access until:'), chalk_1.default.white(subscription.periodEnd.toLocaleDateString()));
+                console.log(chalk_1.default.gray('  Access until:'), chalk_1.default.white(new Date(subscription.periodEnd).toLocaleDateString()));
             }
         }
         else {

package/dist/utils/config-store.js

@@ -20,6 +20,9 @@ function saveConfig(config) {
     ensureConfigDir();
     const current = loadConfig();
     const newConfig = { ...current, ...config };
+    // Remove legacy fields that are no longer stored (e.g. firebaseApiKey)
+    // to prevent stale values from causing cross-project auth mismatches
+    delete newConfig.firebaseApiKey;
     fs_1.default.writeFileSync(CONFIG_FILE, JSON.stringify(newConfig, null, 2), { mode: 0o600 });
 }
 function loadConfig() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kylewadegrove/cutline-mcp-cli",
-    "version": "0.4.0",
+    "version": "0.4.2",
     "description": "CLI tool for authenticating with Cutline MCP servers",
     "main": "dist/index.js",
     "bin": {

package/src/commands/login.ts

@@ -1,7 +1,6 @@
 import open from 'open';
 import chalk from 'chalk';
 import ora from 'ora';
-import admin from 'firebase-admin';
 import { startCallbackServer } from '../auth/callback.js';
 import { storeRefreshToken } from '../auth/keychain.js';
 import { saveConfig } from '../utils/config-store.js';
@@ -10,40 +9,27 @@ import { getConfig, fetchFirebaseApiKey } from '../utils/config.js';
 interface SubscriptionInfo {
     status: 'free' | 'active' | 'trialing' | 'past_due' | 'canceled' | 'unknown';
     planName?: string;
+    periodEnd?: string;
 }
 
-async function getSubscriptionStatus(uid: string, projectId: string): Promise<SubscriptionInfo> {
+async function getSubscriptionStatus(idToken: string, isStaging: boolean): Promise<SubscriptionInfo> {
     try {
-        // Initialize Firebase Admin if not already
-        if (admin.apps.length === 0) {
-            admin.initializeApp({ projectId });
-        }
-        
-        const db = admin.firestore();
-        const userDoc = await db.collection('users').doc(uid).get();
+        const baseUrl = isStaging 
+            ? 'https://us-central1-cutline-staging.cloudfunctions.net'
+            : 'https://us-central1-cutline-prod.cloudfunctions.net';
         
-        if (!userDoc.exists) {
-            return { status: 'free' };
+        const response = await fetch(`${baseUrl}/mcpSubscriptionStatus`, {
+            method: 'GET',
+            headers: {
+                'Authorization': `Bearer ${idToken}`,
+            },
+        });
+
+        if (!response.ok) {
+            return { status: 'unknown' };
         }
-        
-        const userData = userDoc.data();
-        const subscription = userData?.subscription;
-        
-        if (!subscription) {
-            return { status: 'free' };
-        }
-        
-        const status = subscription.status || 'unknown';
-        
-        // Get plan name from price ID or default
-        let planName = 'Premium';
-        if (subscription.priceId?.includes('yearly') || subscription.interval === 'year') {
-            planName = 'Premium (Yearly)';
-        } else if (subscription.priceId?.includes('monthly') || subscription.interval === 'month') {
-            planName = 'Premium (Monthly)';
-        }
-        
-        return { status, planName };
+
+        return await response.json();
     } catch (error) {
         // Silently fail - subscription check is optional during login
         return { status: 'unknown' };
@@ -162,7 +148,7 @@ export async function loginCommand(options: { staging?: boolean; signup?: boolea
             console.warn(chalk.yellow('  ⚠️  Could not save to Keychain (skipping)'));
         }
 
-        // Save to file config (cross-platform) - don't store API key anymore
+        // Save to file config (cross-platform)
         try {
             saveConfig({ 
                 refreshToken,
@@ -185,16 +171,8 @@ export async function loginCommand(options: { staging?: boolean; signup?: boolea
         // Check subscription status
         try {
             spinner.start('Checking subscription...');
-            const projectId = options.staging ? 'cutline-staging' : 'cutline-prod';
             const idToken = await exchangeRefreshForIdToken(refreshToken, firebaseApiKey);
-            
-            // Initialize Firebase Admin if needed
-            if (admin.apps.length === 0) {
-                admin.initializeApp({ projectId });
-            }
-            
-            const decoded = await admin.auth().verifyIdToken(idToken);
-            const subscription = await getSubscriptionStatus(decoded.uid, projectId);
+            const subscription = await getSubscriptionStatus(idToken, !!options.staging);
             spinner.stop();
             
             if (subscription.status === 'active' || subscription.status === 'trialing') {

package/src/commands/status.ts

@@ -1,45 +1,32 @@
 import chalk from 'chalk';
 import ora from 'ora';
-import admin from 'firebase-admin';
 import { getRefreshToken } from '../auth/keychain.js';
 import { fetchFirebaseApiKey } from '../utils/config.js';
 
 interface SubscriptionInfo {
     status: 'free' | 'active' | 'trialing' | 'past_due' | 'canceled' | 'unknown';
     planName?: string;
-    periodEnd?: Date;
+    periodEnd?: string;
 }
 
-async function getSubscriptionStatus(uid: string): Promise<SubscriptionInfo> {
+async function getSubscriptionStatus(idToken: string, isStaging: boolean): Promise<SubscriptionInfo> {
     try {
-        const db = admin.firestore();
-        const userDoc = await db.collection('users').doc(uid).get();
+        const baseUrl = isStaging 
+            ? 'https://us-central1-cutline-staging.cloudfunctions.net'
+            : 'https://us-central1-cutline-prod.cloudfunctions.net';
         
-        if (!userDoc.exists) {
-            return { status: 'free' };
+        const response = await fetch(`${baseUrl}/mcpSubscriptionStatus`, {
+            method: 'GET',
+            headers: {
+                'Authorization': `Bearer ${idToken}`,
+            },
+        });
+
+        if (!response.ok) {
+            return { status: 'unknown' };
         }
-        
-        const userData = userDoc.data();
-        const subscription = userData?.subscription;
-        
-        if (!subscription) {
-            return { status: 'free' };
-        }
-        
-        const status = subscription.status || 'unknown';
-        const periodEnd = subscription.periodEndsAt 
-            ? new Date(subscription.periodEndsAt) 
-            : undefined;
-        
-        // Get plan name from price ID or default
-        let planName = 'Premium';
-        if (subscription.priceId?.includes('yearly') || subscription.interval === 'year') {
-            planName = 'Premium (Yearly)';
-        } else if (subscription.priceId?.includes('monthly') || subscription.interval === 'month') {
-            planName = 'Premium (Monthly)';
-        }
-        
-        return { status, planName, periodEnd };
+
+        return await response.json();
     } catch (error) {
         console.error('Error fetching subscription:', error);
         return { status: 'unknown' };
@@ -105,19 +92,14 @@ export async function statusCommand(options: { staging?: boolean }) {
         spinner.text = 'Verifying credentials...';
         const idToken = await exchangeRefreshToken(refreshToken, firebaseApiKey);
 
-        // Initialize Firebase Admin with correct project ID
-        if (admin.apps.length === 0) {
-            const projectId = options.staging ? 'cutline-staging' : 'cutline-prod';
-            admin.initializeApp({ projectId });
-        }
-
-        // Verify the ID token
-        const decoded = await admin.auth().verifyIdToken(idToken);
+        // Decode JWT payload (base64) to get user info - no verification needed, just display
+        const payloadBase64 = idToken.split('.')[1];
+        const decoded = JSON.parse(Buffer.from(payloadBase64, 'base64').toString());
 
         spinner.succeed(chalk.green('Authenticated'));
 
-        console.log(chalk.gray('  User:'), chalk.white(decoded.email || decoded.uid));
-        console.log(chalk.gray('  UID:'), chalk.dim(decoded.uid));
+        console.log(chalk.gray('  User:'), chalk.white(decoded.email || decoded.user_id || decoded.sub));
+        console.log(chalk.gray('  UID:'), chalk.dim(decoded.user_id || decoded.sub));
 
         // Calculate token expiry
         const expiresIn = Math.floor((decoded.exp * 1000 - Date.now()) / 1000 / 60);
@@ -131,22 +113,25 @@ export async function statusCommand(options: { staging?: boolean }) {
             console.log(chalk.gray('  Device ID:'), chalk.dim(decoded.deviceId));
         }
 
-        // Check subscription status from Firestore
-        const subscription = await getSubscriptionStatus(decoded.uid);
+        // Check subscription status via Cloud Function
+        spinner.start('Checking subscription...');
+        const subscription = await getSubscriptionStatus(idToken, !!options.staging);
+        spinner.stop();
         
         if (subscription.status === 'active' || subscription.status === 'trialing') {
             const statusLabel = subscription.status === 'trialing' ? ' (trial)' : '';
             console.log(chalk.gray('  Plan:'), chalk.green(`✓ ${subscription.planName || 'Premium'}${statusLabel}`));
             if (subscription.periodEnd) {
-                const daysLeft = Math.ceil((subscription.periodEnd.getTime() - Date.now()) / (1000 * 60 * 60 * 24));
-                console.log(chalk.gray('  Renews:'), chalk.white(`${subscription.periodEnd.toLocaleDateString()} (${daysLeft} days)`));
+                const periodEndDate = new Date(subscription.periodEnd);
+                const daysLeft = Math.ceil((periodEndDate.getTime() - Date.now()) / (1000 * 60 * 60 * 24));
+                console.log(chalk.gray('  Renews:'), chalk.white(`${periodEndDate.toLocaleDateString()} (${daysLeft} days)`));
             }
         } else if (subscription.status === 'past_due') {
             console.log(chalk.gray('  Plan:'), chalk.yellow('⚠ Premium (payment past due)'));
         } else if (subscription.status === 'canceled') {
             console.log(chalk.gray('  Plan:'), chalk.yellow('Premium (canceled)'));
             if (subscription.periodEnd) {
-                console.log(chalk.gray('  Access until:'), chalk.white(subscription.periodEnd.toLocaleDateString()));
+                console.log(chalk.gray('  Access until:'), chalk.white(new Date(subscription.periodEnd).toLocaleDateString()));
             }
         } else {
             console.log(chalk.gray('  Plan:'), chalk.white('Free'));

package/src/utils/config-store.ts

@@ -22,6 +22,9 @@ export function saveConfig(config: McpConfig) {
     ensureConfigDir();
     const current = loadConfig();
     const newConfig = { ...current, ...config };
+    // Remove legacy fields that are no longer stored (e.g. firebaseApiKey)
+    // to prevent stale values from causing cross-project auth mismatches
+    delete (newConfig as any).firebaseApiKey;
     fs.writeFileSync(CONFIG_FILE, JSON.stringify(newConfig, null, 2), { mode: 0o600 });
 }