@vibecheckai/cli 3.2.3 → 3.2.5

package/mcp-server/tier-auth.js

@@ -169,8 +169,8 @@ async function loadUserConfig() {
  * Determine tier from API key
  * Matches CLI entitlements-v2.js logic
  */
-function getTierFromApiKey(apiKey) {
-  if (!apiKey) return 'free';
+async function getTierFromApiKey(apiKey) {
+  if (!apiKey) return null; // No API key = no access
   
   // Check API key prefix patterns (matches CLI)
   if (apiKey.startsWith('gr_starter_')) return 'starter';
@@ -178,16 +178,43 @@ function getTierFromApiKey(apiKey) {
   if (apiKey.startsWith('gr_compliance_') || apiKey.startsWith('gr_ent_')) return 'compliance';
   if (apiKey.startsWith('gr_free_')) return 'free';
   
-  // Try to fetch from API (same as CLI)
-  // For now, default to free - API lookup would happen in production
-  return 'free'; // default for unknown keys
-}
+  // Try to validate with API
+  try {
+    const response = await fetch('https://api.vibecheckai.dev/whoami', {
+      headers: {
+        'Authorization': `Bearer ${apiKey}`,
+        'Content-Type': 'application/json',
+      },
+    });
+    
+    if (!response.ok) {
+      return null; // Invalid API key
+    }
+    
+    const data = await response.json();
+    
+    // Map API response to tier
+    switch (data.plan?.toLowerCase()) {
+      case 'starter':
+        return 'starter';
+      case 'pro':
+        return 'pro';
+      case 'compliance':
+        return 'compliance';
+      default:
+        return 'free';
+    }
+  } catch (error) {
+    console.error('API validation failed:', error);
+    return null; // On error, deny access
+  }
+} // default for unknown keys
 
 /**
  * Check if user has access to a specific feature
  * Matches CLI entitlements-v2.js logic
  */
-export async function checkFeatureAccess(featureName, providedApiKey = null) {
+export async function getFeatureAccessStatus(featureName, providedApiKey = null) {
   // Try to load user config
   const userConfig = await loadUserConfig();
   const apiKey = providedApiKey || userConfig?.apiKey;
@@ -195,13 +222,22 @@ export async function checkFeatureAccess(featureName, providedApiKey = null) {
   if (!apiKey) {
     return {
       hasAccess: false,
-      tier: 'free',
-      reason: 'No API key provided. Run: vibecheck auth --key YOUR_API_KEY',
-      upgradeUrl: 'https://vibecheckai.dev/pricing'
+      tier: null,
+      reason: 'No API key provided. Please set your API key with `vibecheck login`.',
+      upgradeUrl: 'https://vibecheckai.dev'
     };
   }
   
-  const currentTier = getTierFromApiKey(apiKey);
+  const currentTier = await getTierFromApiKey(apiKey);
+  
+  if (!currentTier) {
+    return {
+      hasAccess: false,
+      tier: null,
+      reason: 'Invalid API key. Please check your API key or get a new one at https://vibecheckai.dev',
+      upgradeUrl: 'https://vibecheckai.dev'
+    };
+  }
   const currentTierConfig = TIERS[currentTier];
   
   // Find which tier has this feature
@@ -222,7 +258,7 @@ export async function checkFeatureAccess(featureName, providedApiKey = null) {
       hasAccess: false,
       tier: currentTier,
       reason: `${featureName} is not available in any tier`,
-      upgradeUrl: 'https://vibecheckai.dev/pricing'
+      upgradeUrl: 'https://vibecheckai.dev'
     };
   }
   
@@ -235,7 +271,7 @@ export async function checkFeatureAccess(featureName, providedApiKey = null) {
       tier: currentTier,
       requiredTier,
       reason: `${featureName} requires ${requiredTierConfig.name} tier ($${requiredTierConfig.price}/mo) or higher. Current tier: ${currentTierConfig.name}`,
-      upgradeUrl: 'https://vibecheckai.dev/pricing'
+      upgradeUrl: 'https://vibecheckai.dev'
     };
   }
   
@@ -273,11 +309,30 @@ export function withTierCheck(featureName, handler) {
  * Check if user has access to a specific MCP tool
  * MCP tools have specific tier requirements separate from CLI features
  */
-export async function checkMcpToolAccess(toolName, providedApiKey = null) {
+export async function getMcpToolAccess(toolName, providedApiKey = null) {
   const userConfig = await loadUserConfig();
   const apiKey = providedApiKey || userConfig?.apiKey;
   
-  const currentTier = getTierFromApiKey(apiKey);
+  if (!apiKey) {
+    return {
+      hasAccess: false,
+      tier: null,
+      reason: 'No API key provided. Please set your API key with `vibecheck login`.',
+      upgradeUrl: 'https://vibecheckai.dev'
+    };
+  }
+  
+  const currentTier = await getTierFromApiKey(apiKey);
+  
+  if (!currentTier) {
+    return {
+      hasAccess: false,
+      tier: null,
+      reason: 'Invalid API key. Please check your API key or get a new one at https://vibecheckai.dev',
+      upgradeUrl: 'https://vibecheckai.dev'
+    };
+  }
+  
   const currentTierConfig = TIERS[currentTier];
   
   // Check if tool is allowed for current tier
@@ -322,7 +377,7 @@ export async function checkMcpToolAccess(toolName, providedApiKey = null) {
       reason: requiredTierConfig 
         ? `${toolName} requires ${requiredTierConfig.name} tier ($${requiredTierConfig.price}/mo). Current: ${currentTierConfig.name}`
         : `${toolName} is not available`,
-      upgradeUrl: 'https://vibecheckai.dev/pricing'
+      upgradeUrl: 'https://vibecheckai.dev'
     };
   }
   

package/mcp-server/tools/index.js

@@ -1,72 +1,72 @@
-/**
- * MCP Tools Index - Single Entry Point for All Tools
- * 
- * This module exports all MCP tools in a unified structure.
- * Internal modules are organized by category but presented as one toolset.
- * 
- * Tool Categories:
- * - Core: scan, ship, reality, fix, prove, report
- * - Truth: ctx, guard, validate_claim, compile_context
- * - AI: checkpoint, architect, intelligence
- * 
- * Usage:
- *   import { ALL_TOOLS, handleTool } from './tools/index.js';
- */
-
-// Re-export consolidated tools as the primary interface
-export { CONSOLIDATED_TOOLS, handleConsolidatedTool } from '../consolidated-tools.js';
-
-// Re-export truth firewall (hallucination stopper)
-export { TRUTH_FIREWALL_TOOLS, handleTruthFirewallTool } from '../truth-firewall-tools.js';
-
-// Re-export truth context
-export { TRUTH_CONTEXT_TOOLS, handleTruthContextTool } from '../truth-context.js';
-
-/**
- * Get all recommended tools (consolidated + truth firewall)
- */
-export function getRecommendedTools() {
-  const { CONSOLIDATED_TOOLS } = require('../consolidated-tools.js');
-  const { TRUTH_FIREWALL_TOOLS } = require('../truth-firewall-tools.js');
-  return [...CONSOLIDATED_TOOLS, ...TRUTH_FIREWALL_TOOLS];
-}
-
-/**
- * Handle any tool call by routing to the appropriate handler
- */
-export async function handleToolCall(toolName, args) {
-  // Route to consolidated handler first
-  const { handleConsolidatedTool, CONSOLIDATED_TOOLS } = await import('../consolidated-tools.js');
-  const consolidatedNames = CONSOLIDATED_TOOLS.map(t => t.name);
-  
-  if (consolidatedNames.includes(toolName)) {
-    return handleConsolidatedTool(toolName, args);
-  }
-  
-  // Route to truth firewall
-  const { handleTruthFirewallTool, TRUTH_FIREWALL_TOOLS } = await import('../truth-firewall-tools.js');
-  const firewallNames = TRUTH_FIREWALL_TOOLS.map(t => t.name);
-  
-  if (firewallNames.includes(toolName)) {
-    return handleTruthFirewallTool(toolName, args);
-  }
-  
-  // Route to truth context
-  const { handleTruthContextTool, TRUTH_CONTEXT_TOOLS } = await import('../truth-context.js');
-  const contextNames = TRUTH_CONTEXT_TOOLS.map(t => t.name);
-  
-  if (contextNames.includes(toolName)) {
-    return handleTruthContextTool(toolName, args);
-  }
-  
-  throw new Error(`Unknown tool: ${toolName}`);
-}
-
-/**
- * Tool categories for documentation
- */
-export const TOOL_CATEGORIES = {
-  core: ['vibecheck.scan', 'vibecheck.ship', 'vibecheck.reality', 'vibecheck.fix', 'vibecheck.prove', 'vibecheck.report'],
-  truth: ['vibecheck.ctx', 'vibecheck.get_truthpack', 'vibecheck.validate_claim', 'vibecheck.compile_context'],
-  guard: ['vibecheck.guard', 'vibecheck.check_route', 'vibecheck.check_env', 'vibecheck.check_auth'],
-};
+/**
+ * MCP Tools Index - Single Entry Point for All Tools
+ * 
+ * This module exports all MCP tools in a unified structure.
+ * Internal modules are organized by category but presented as one toolset.
+ * 
+ * Tool Categories:
+ * - Core: scan, ship, reality, fix, prove, report
+ * - Truth: ctx, guard, validate_claim, compile_context
+ * - AI: checkpoint, architect, intelligence
+ * 
+ * Usage:
+ *   import { ALL_TOOLS, handleTool } from './tools/index.js';
+ */
+
+// Re-export consolidated tools as the primary interface
+export { CONSOLIDATED_TOOLS, handleConsolidatedTool } from '../consolidated-tools.js';
+
+// Re-export truth firewall (hallucination stopper)
+export { TRUTH_FIREWALL_TOOLS, handleTruthFirewallTool } from '../truth-firewall-tools.js';
+
+// Re-export truth context
+export { TRUTH_CONTEXT_TOOLS, handleTruthContextTool } from '../truth-context.js';
+
+/**
+ * Get all recommended tools (consolidated + truth firewall)
+ */
+export function getRecommendedTools() {
+  const { CONSOLIDATED_TOOLS } = require('../consolidated-tools.js');
+  const { TRUTH_FIREWALL_TOOLS } = require('../truth-firewall-tools.js');
+  return [...CONSOLIDATED_TOOLS, ...TRUTH_FIREWALL_TOOLS];
+}
+
+/**
+ * Handle any tool call by routing to the appropriate handler
+ */
+export async function handleToolCall(toolName, args) {
+  // Route to consolidated handler first
+  const { handleConsolidatedTool, CONSOLIDATED_TOOLS } = await import('../consolidated-tools.js');
+  const consolidatedNames = CONSOLIDATED_TOOLS.map(t => t.name);
+  
+  if (consolidatedNames.includes(toolName)) {
+    return handleConsolidatedTool(toolName, args);
+  }
+  
+  // Route to truth firewall
+  const { handleTruthFirewallTool, TRUTH_FIREWALL_TOOLS } = await import('../truth-firewall-tools.js');
+  const firewallNames = TRUTH_FIREWALL_TOOLS.map(t => t.name);
+  
+  if (firewallNames.includes(toolName)) {
+    return handleTruthFirewallTool(toolName, args);
+  }
+  
+  // Route to truth context
+  const { handleTruthContextTool, TRUTH_CONTEXT_TOOLS } = await import('../truth-context.js');
+  const contextNames = TRUTH_CONTEXT_TOOLS.map(t => t.name);
+  
+  if (contextNames.includes(toolName)) {
+    return handleTruthContextTool(toolName, args);
+  }
+  
+  throw new Error(`Unknown tool: ${toolName}`);
+}
+
+/**
+ * Tool categories for documentation
+ */
+export const TOOL_CATEGORIES = {
+  core: ['vibecheck.scan', 'vibecheck.ship', 'vibecheck.reality', 'vibecheck.fix', 'vibecheck.prove', 'vibecheck.report'],
+  truth: ['vibecheck.ctx', 'vibecheck.get_truthpack', 'vibecheck.validate_claim', 'vibecheck.compile_context'],
+  guard: ['vibecheck.guard', 'vibecheck.check_route', 'vibecheck.check_env', 'vibecheck.check_auth'],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibecheckai/cli",
-  "version": "3.2.3",
+  "version": "3.2.5",
   "description": "Vibecheck CLI - Ship with confidence. One verdict: SHIP | WARN | BLOCK.",
   "main": "bin/vibecheck.js",
   "bin": {