content-grade 1.0.28 → 1.0.30

package/bin/content-grade.js

@@ -64,7 +64,14 @@ function getLicenseKey() {
 
 function getLicenseTier() {
   const cfg = loadConfig();
-  const tier = cfg.tier || 'free';
+  let tier = cfg.tier || 'free';
+  // Fallback: if config has no tier but license file exists, read tier from there
+  if (tier === 'free') {
+    try {
+      const lic = JSON.parse(readFileSync(LICENSE_FILE, 'utf8'));
+      if (lic.tier) tier = lic.tier;
+    } catch {}
+  }
   // Collapse legacy 'starter' tier to 'pro' — Starter was removed
   return tier === 'starter' ? 'pro' : tier;
 }
@@ -91,7 +98,7 @@ function incrementUsage() {
 
 // Upgrade links — Free → Pro → Business → Team
 const UPGRADE_LINKS = {
-  free:     'https://content-grade.github.io/Content-Grade/#pricing',  // Pro $9/mo — pricing page first
+  free:     'https://buy.stripe.com/4gM14p87GeCh9vn9ks8k80a',  // Pro $9/mo — direct checkout
   pro:      'https://buy.stripe.com/bJefZjafO2Tz36Z2W48k80b',  // Business $29/mo
   business: 'https://buy.stripe.com/cNiaEZfA8cu9bDv4088k80c',  // Team $79/mo
 };
@@ -145,7 +152,7 @@ function showFreeTierCTA(count) {
     console.log(`  ${MG}→ Pro: unlimited analyses + CI mode + bulk grading. $9/mo: ${CY}${UPGRADE_LINKS.free}${R}`);
   } else {
     // Runs remaining — light nudge with value hook
-    console.log(`  ${D}${count}/${limit} free analyses · ${remaining} left · Unlimited with Pro ($9/mo): ${CY}${UPGRADE_LINKS.free}${R}`);
+    console.log(`  ${WH}${count}/${limit} free analyses · ${remaining} left · Unlimited with Pro ($9/mo): ${CY}${UPGRADE_LINKS.free}${R}`);
   }
   hr();
 }
@@ -194,11 +201,23 @@ function showUsageFooter(count) {
   } else if (remaining === 1) {
     console.log(`  ${YL}[ ${count}/${limit} free runs used · 1 left. Unlimited runs: ${UPGRADE_LINKS.free} ]${R}`);
   } else {
-    console.log(`  ${D}[ ${count}/${limit} free runs today · ${remaining} left. Unlimited: ${UPGRADE_LINKS.free} ]${R}`);
+    console.log(`  ${D}[ ${count}/${limit} free runs used · ${remaining} left. Unlimited: ${UPGRADE_LINKS.free} ]${R}`);
   }
   maybeShowEarlyAdopterCTA(count);
 }
 
+// Returns { ok: boolean, count: number, limit: number } for tier-aware daily limit checks.
+// Used by batch mode to stop processing when the daily limit is reached.
+// Pro tier has Infinity limit and always returns ok: true.
+function checkDailyLimit() {
+  const tier = getLicenseTier();
+  const limit = TIER_LIMITS[tier] ?? TIER_LIMITS.free;
+  if (limit === Infinity) return { ok: true, count: 0, limit: Infinity };
+  const usage = getUsage();
+  const count = usage.count || 0;
+  return { ok: count < limit, count, limit };
+}
+
 // Block a run before it starts if the free tier is exhausted.
 // Returns true (blocked) and prints a visually distinct upgrade prompt.
 // Returns false if the user may proceed.
@@ -208,9 +227,12 @@ function checkFreeTierLimit() {
   const limit = TIER_LIMITS.free;
   if (usage.count < limit) return false;
 
+  // Track funnel event — user hit the limit and saw the upgrade prompt
+  recordEvent({ event: 'free_limit_hit', version: _version });
+
   blank();
   hr();
-  console.log(`  ${YL}${B}${limit}/${limit} free analyses used today.${R}`);
+  console.log(`  ${YL}${B}${limit}/${limit} free analyses used — limit reached.${R}`);
   blank();
   console.log(`  ${D}Pro removes the cap — unlimited analyses, $9/mo:${R}`);
   console.log(`  ${D}├── Unlimited analyses   — no cap, ever${R}`);
@@ -1008,7 +1030,13 @@ async function cmdActivate() {
     } else {
       process.stdout.write('\n');
       blank();
-      fail(data.message || `Invalid or expired license key. Get a new key: ${UPGRADE_LINKS.free}`);
+      const msg = data.message || `Invalid or expired license key.`;
+      fail(msg);
+      if (/not found/i.test(msg) || /invalid/i.test(msg)) {
+        blank();
+        console.log(`  ${D}If you recently purchased, retrieve your key:${R}`);
+        console.log(`  ${CY}  https://content-grade.onrender.com/my-license${R}`);
+      }
       blank();
       process.exit(1);
     }
@@ -2047,6 +2075,51 @@ const _telem = initTelemetry();
 // Defer first-run telemetry notice so users see value first
 const _showTelemNotice = _telem.isNew;
 
+// ── License key startup validation ───────────────────────────────────────────
+// Background check: re-validate stored license key against server every 7 days.
+// Non-blocking — never delays the CLI. Clears invalid/revoked keys silently.
+(async () => {
+  const storedKey = getLicenseKey();
+  if (!storedKey) return;
+  const cfg = loadConfig();
+  const lastCheck = cfg?.lastLicenseCheck;
+  const sevenDays = 7 * 24 * 60 * 60 * 1000;
+  if (lastCheck && Date.now() - new Date(lastCheck).getTime() < sevenDays) return;
+  const serverUrl = process.env.CONTENT_GRADE_SERVER_URL || 'https://content-grade.onrender.com';
+  try {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), 3000);
+    const response = await fetch(`${serverUrl}/api/license/validate`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ key: storedKey }),
+      signal: controller.signal,
+    });
+    clearTimeout(timer);
+    const data = await response.json();
+    const updated = loadConfig();
+    updated.lastLicenseCheck = new Date().toISOString();
+    if (data.valid) {
+      const productKeyToTier = {
+        contentgrade_starter: 'starter',
+        contentgrade_pro: 'pro',
+        contentgrade_team: 'team',
+      };
+      updated.tier = productKeyToTier[data.productKey] || 'pro';
+    } else if (data.reason === 'revoked' || data.reason === 'subscription_expired') {
+      // Only delete the key on confirmed revocation or expired subscription — NOT on 'not_found'
+      // (which can happen after a Render cold start wipes the ephemeral /tmp DB).
+      delete updated.licenseKey;
+      delete updated.tier;
+      try { unlinkSync(LICENSE_FILE); } catch {}
+    }
+    // If reason is 'not_found' or 'format_invalid', keep the stored key — server DB may have been wiped.
+    saveConfig(updated);
+  } catch {
+    // Server unreachable — skip silently
+  }
+})();
+
 // Smart path detection: first arg is a path if it starts with ., /, ~ or is an existing FS entry
 function looksLikePath(s) {
   if (!s) return false;

package/bin/telemetry.js

@@ -124,7 +124,7 @@ export function recordEvent(data) {
   const event = {
     ...data,
     package: 'content-grade',
-    installId,
+    install_id: installId,
     run_count_bucket: data.run_count_bucket ?? getRunCountBucket(totalRuns),
     timestamp: new Date().toISOString(),
   };

package/dist-server/server/routes/license.js

@@ -1,5 +1,5 @@
 import { validateLicenseKey, getLicenseKeysForEmail } from '../services/license.js';
-import { hasActiveSubscription } from '../services/stripe.js';
+import { hasActiveSubscriptionLive } from '../services/stripe.js';
 // Simple in-memory rate limiter: max 10 calls per IP per minute
 const _validateRateLimiter = new Map();
 function checkRateLimit(ip) {
@@ -39,13 +39,22 @@ export function registerLicenseRoutes(app) {
         }
         const result = validateLicenseKey(key);
         if (!result.valid) {
-            return { valid: false, message: 'Invalid or expired license key.' };
+            // Key not in DB — could be Render cold start DB wipe. Guide user to self-serve recovery.
+            const isValidFormat = /^CG-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}$/i.test(key);
+            if (isValidFormat) {
+                return { valid: false, reason: 'not_found', message: 'Key not found. If you are a Pro subscriber, retrieve your key at: https://content-grade.onrender.com/my-license' };
+            }
+            return { valid: false, reason: 'format_invalid', message: 'Invalid license key format.' };
+        }
+        if (result.status !== 'active') {
+            return { valid: false, reason: 'revoked', message: 'License key has been revoked.' };
         }
-        // Also verify Stripe subscription is still active for subscription-based keys
+        // Also verify Stripe subscription is still active for subscription-based keys.
+        // Uses live Stripe check (with DB fallback) so DB wipes on Render cold start don't invalidate valid subscribers.
         if (result.productKey === 'contentgrade_pro' && result.email) {
-            const subActive = hasActiveSubscription(result.email);
+            const subActive = await hasActiveSubscriptionLive(result.email);
             if (!subActive) {
-                return { valid: false, message: 'Subscription is no longer active. Please renew at content-grade.onrender.com.' };
+                return { valid: false, reason: 'subscription_expired', message: 'Subscription is no longer active. Please renew at content-grade.onrender.com.' };
             }
         }
         return { valid: true, email: result.email, productKey: result.productKey };

package/dist-server/server/routes/stripe.js

@@ -110,7 +110,7 @@ export function registerStripeRoutes(app) {
         try {
             const data = event.data?.object;
             if (event.type === 'checkout.session.completed') {
-                const email = (data.client_reference_id ?? data.customer_email ?? '').toLowerCase();
+                const email = (data.client_reference_id ?? data.customer_email ?? data.customer_details?.email ?? '').toLowerCase();
                 const stripeCustomerId = data.customer;
                 if (!email) {
                     console.error('[stripe_webhook] checkout.session.completed missing customer email — session:', data.id, '— license key NOT generated');
@@ -250,7 +250,7 @@ export function registerStripeRoutes(app) {
                 reply.type('text/html').status(402);
                 return successHtml('Payment pending', '<p>Your payment has not completed yet. Please wait a moment and refresh.</p>');
             }
-            const email = (session.client_reference_id ?? session.customer_email ?? '').toLowerCase();
+            const email = (session.client_reference_id ?? session.customer_email ?? session.customer_details?.email ?? '').toLowerCase();
             if (!email) {
                 reply.type('text/html').status(400);
                 return successHtml('Email not found', '<p>We couldn\'t identify your account. Please contact support with your Stripe receipt.</p>');
@@ -265,8 +265,7 @@ export function registerStripeRoutes(app) {
         <p>Activate it in your terminal:</p>
         <pre style="background:#111;color:#ccc;padding:12px;border-radius:6px">content-grade activate ${licenseKey}</pre>
         <p style="font-size:0.9em;color:#888">
-          Save this key — it won't be shown again.<br>
-          Retrieve it any time: <code>GET /api/stripe/license-key?email=${encodeURIComponent(email)}</code>
+          Retrieve it any time: <a href="/my-license?email=${encodeURIComponent(email)}">/my-license?email=${encodeURIComponent(email)}</a>
         </p>
       `);
         }
@@ -276,6 +275,72 @@ export function registerStripeRoutes(app) {
             return successHtml('Error retrieving order', '<p>We could not load your order details. Please contact support with your Stripe receipt.</p>');
         }
     });
+    // Self-service license key retrieval page — for users who paid via static Stripe link
+    // and weren't redirected to /checkout/success, or who lost their key.
+    app.get('/my-license', async (req, reply) => {
+        const query = req.query;
+        const email = (query.email ?? '').trim().toLowerCase();
+        if (email && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+            // Email provided — look up their key
+            const isActive = await hasActiveSubscriptionLive(email);
+            if (!isActive) {
+                reply.type('text/html');
+                return successHtml('No active subscription found', `
+          <p>No active Content-Grade Pro subscription was found for <strong>${email}</strong>.</p>
+          <p>If you just paid, it can take up to a minute for the webhook to process. Try again shortly.</p>
+          <p>If you believe this is an error, contact support with your Stripe receipt.</p>
+          <p><a href="/my-license">Try a different email</a></p>
+        `);
+            }
+            const customerId = getCustomerStripeId(email);
+            const licenseKey = upsertLicenseKey(email, customerId ?? undefined, 'contentgrade_pro');
+            reply.type('text/html');
+            return successHtml('Your Content-Grade Pro License', `
+        <p>Active Pro subscription confirmed for <strong>${email}</strong>.</p>
+        <p>Your license key:</p>
+        <pre style="background:#111;color:#7fff7f;padding:16px;border-radius:6px;font-size:1.1em;letter-spacing:0.05em">${licenseKey}</pre>
+        <p>Activate it in your terminal:</p>
+        <pre style="background:#111;color:#ccc;padding:12px;border-radius:6px">content-grade activate ${licenseKey}</pre>
+        <p style="font-size:0.9em;color:#888">
+          Bookmark this page to retrieve your key any time.<br>
+          Replace the email in the URL: <code>/my-license?email=${encodeURIComponent(email)}</code>
+        </p>
+      `);
+        }
+        // No email — show the form
+        reply.type('text/html');
+        return `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8"/>
+  <meta name="viewport" content="width=device-width,initial-scale=1"/>
+  <title>Retrieve License Key — Content-Grade</title>
+  <style>
+    body{font-family:system-ui,sans-serif;background:#0d0d0d;color:#e8e8e8;display:flex;align-items:center;justify-content:center;min-height:100vh;margin:0}
+    .card{max-width:480px;width:90%;background:#1a1a1a;border:1px solid #333;border-radius:12px;padding:40px}
+    h1{margin-top:0;font-size:1.5em}
+    input{width:100%;box-sizing:border-box;padding:10px 14px;background:#111;border:1px solid #444;border-radius:6px;color:#e8e8e8;font-size:1em;margin:8px 0 16px}
+    button{width:100%;padding:12px;background:#7fff7f;color:#000;border:none;border-radius:6px;font-size:1em;font-weight:600;cursor:pointer}
+    button:hover{background:#5fdf5f}
+    p{color:#aaa;font-size:0.9em}
+    a{color:#7fc4ff}
+  </style>
+</head>
+<body>
+  <div class="card">
+    <h1>Retrieve Your License Key</h1>
+    <p>Enter the email address you used when purchasing Content-Grade Pro.</p>
+    <form method="GET" action="/my-license">
+      <input type="email" name="email" placeholder="you@example.com" required autofocus/>
+      <button type="submit">Get My License Key</button>
+    </form>
+    <p style="margin-top:24px">
+      Don't have Pro yet? <a href="/upgrade">Upgrade for $9/mo →</a>
+    </p>
+  </div>
+</body>
+</html>`;
+    });
     // Upgrade redirect — CLI rate-limit messages point here for a clean, stable URL
     app.get('/upgrade', async (_req, reply) => {
         const proLink = process.env.STRIPE_PAYMENT_LINK_CONTENTGRADE_PRO

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "content-grade",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "AI-powered content analysis CLI. Score any blog post, landing page, or ad copy in under 30 seconds — runs on Claude CLI, no API key needed.",
   "type": "module",
   "bin": {