limit agent creation based on tiers

Author: Soumyadas15

backend/agent/api.py

@@ -1767,7 +1767,6 @@ async def import_agent_from_json(
     request: JsonImportRequestModel,
     user_id: str = Depends(get_current_user_id_from_jwt)
 ):
-    """Import an agent from JSON with credential mappings"""
     logger.info(f"Importing agent from JSON - user: {user_id}")
 
     if not await is_enabled("custom_agents"):
@@ -1776,6 +1775,21 @@ async def import_agent_from_json(
             detail="Custom agents currently disabled. This feature is not available at the moment."
         )
 
+    client = await db.client
+    from .utils import check_agent_count_limit
+    limit_check = await check_agent_count_limit(client, user_id)
+    
+    if not limit_check['can_create']:
+        error_detail = {
+            "message": f"Maximum of {limit_check['limit']} agents allowed for your current plan. You have {limit_check['current_count']} agents.",
+            "current_count": limit_check['current_count'],
+            "limit": limit_check['limit'],
+            "tier_name": limit_check['tier_name'],
+            "error_code": "AGENT_LIMIT_EXCEEDED"
+        }
+        logger.warning(f"Agent limit exceeded for account {user_id}: {limit_check['current_count']}/{limit_check['limit']} agents")
+        raise HTTPException(status_code=402, detail=error_detail)
+    
     try:
         from agent.json_import_service import JsonImportService, JsonImportRequest
         import_service = JsonImportService(db)
@@ -1817,6 +1831,20 @@ async def create_agent(
         )
     client = await db.client
 
+    from .utils import check_agent_count_limit
+    limit_check = await check_agent_count_limit(client, user_id)
+    
+    if not limit_check['can_create']:
+        error_detail = {
+            "message": f"Maximum of {limit_check['limit']} agents allowed for your current plan. You have {limit_check['current_count']} agents.",
+            "current_count": limit_check['current_count'],
+            "limit": limit_check['limit'],
+            "tier_name": limit_check['tier_name'],
+            "error_code": "AGENT_LIMIT_EXCEEDED"
+        }
+        logger.warning(f"Agent limit exceeded for account {user_id}: {limit_check['current_count']}/{limit_check['limit']} agents")
+        raise HTTPException(status_code=402, detail=error_detail)
+    
     try:
         if agent_data.is_default:
             await client.table('agents').update({"is_default": False}).eq("account_id", user_id).eq("is_default", True).execute()
@@ -1874,6 +1902,10 @@ async def create_agent(
             await client.table('agents').delete().eq('agent_id', agent['agent_id']).execute()
             raise HTTPException(status_code=500, detail="Failed to create initial version")
 
+        # Invalidate agent count cache after successful creation
+        from utils.cache import Cache
+        await Cache.invalidate(f"agent_count_limit:{user_id}")
+        
         logger.info(f"Created agent {agent['agent_id']} with v1 for user: {user_id}")
         return AgentResponse(
             agent_id=agent['agent_id'],
@@ -2275,7 +2307,20 @@ async def delete_agent(agent_id: str, user_id: str = Depends(get_current_user_id
         if agent['is_default']:
             raise HTTPException(status_code=400, detail="Cannot delete default agent")
 
-        await client.table('agents').delete().eq('agent_id', agent_id).execute()
+        if agent.get('metadata', {}).get('is_suna_default', False):
+            raise HTTPException(status_code=400, detail="Cannot delete Suna default agent")
+        
+        delete_result = await client.table('agents').delete().eq('agent_id', agent_id).execute()
+        
+        if not delete_result.data:
+            logger.warning(f"No agent was deleted for agent_id: {agent_id}, user_id: {user_id}")
+            raise HTTPException(status_code=403, detail="Unable to delete agent - permission denied or agent not found")
+        
+        try:
+            from utils.cache import Cache
+            await Cache.invalidate(f"agent_count_limit:{user_id}")
+        except Exception as cache_error:
+            logger.warning(f"Cache invalidation failed for user {user_id}: {str(cache_error)}")
 
         logger.info(f"Successfully deleted agent: {agent_id}")
         return {"message": "Agent deleted successfully"}

backend/agent/json_import_service.py

@@ -114,6 +114,9 @@ async def import_json(self, request: JsonImportRequest) -> JsonImportResult:
             request.custom_system_prompt or json_data.get('system_prompt', '')
         )
 
+        from utils.cache import Cache
+        await Cache.invalidate(f"agent_count_limit:{request.account_id}")
+        
         logger.info(f"Successfully imported agent {agent_id} from JSON")
 
         return JsonImportResult(

backend/agent/utils.py

@@ -138,3 +138,63 @@ async def check_agent_run_limit(client, account_id: str) -> Dict[str, Any]:
             'running_count': 0,
             'running_thread_ids': []
         }
+
+
+async def check_agent_count_limit(client, account_id: str) -> Dict[str, Any]:
+    try:
+        try:
+            result = await Cache.get(f"agent_count_limit:{account_id}")
+            if result:
+                logger.debug(f"Cache hit for agent count limit: {account_id}")
+                return result
+        except Exception as cache_error:
+            logger.warning(f"Cache read failed for agent count limit {account_id}: {str(cache_error)}")
+
+        agents_result = await client.table('agents').select('agent_id, metadata').eq('account_id', account_id).execute()
+        
+        non_suna_agents = []
+        for agent in agents_result.data or []:
+            metadata = agent.get('metadata', {}) or {}
+            is_suna_default = metadata.get('is_suna_default', False)
+            if not is_suna_default:
+                non_suna_agents.append(agent)
+                
+        current_count = len(non_suna_agents)
+        logger.debug(f"Account {account_id} has {current_count} custom agents (excluding Suna defaults)")
+        
+        try:
+            from services.billing import get_subscription_tier
+            tier_name = await get_subscription_tier(client, account_id)
+            logger.debug(f"Account {account_id} subscription tier: {tier_name}")
+        except Exception as billing_error:
+            logger.warning(f"Could not get subscription tier for {account_id}: {str(billing_error)}, defaulting to free")
+            tier_name = 'free'
+        
+        agent_limit = config.AGENT_LIMITS.get(tier_name, config.AGENT_LIMITS['free'])
+        
+        can_create = current_count < agent_limit
+        
+        result = {
+            'can_create': can_create,
+            'current_count': current_count,
+            'limit': agent_limit,
+            'tier_name': tier_name
+        }
+        
+        try:
+            await Cache.set(f"agent_count_limit:{account_id}", result, ttl=300)
+        except Exception as cache_error:
+            logger.warning(f"Cache write failed for agent count limit {account_id}: {str(cache_error)}")
+        
+        logger.info(f"Account {account_id} has {current_count}/{agent_limit} agents (tier: {tier_name}) - can_create: {can_create}")
+        
+        return result
+        
+    except Exception as e:
+        logger.error(f"Error checking agent count limit for account {account_id}: {str(e)}", exc_info=True)
+        return {
+            'can_create': True,
+            'current_count': 0,
+            'limit': config.AGENT_LIMITS['free'],
+            'tier_name': 'free'
+        }

backend/services/billing.py

@@ -592,6 +592,30 @@ async def can_use_model(client, user_id: str, model_name: str):
 
     return False, f"Your current subscription plan does not include access to {model_name}. Please upgrade your subscription or choose from your available models: {', '.join(allowed_models)}", allowed_models
 
+async def get_subscription_tier(client, user_id: str) -> str:
+    try:
+        subscription = await get_user_subscription(user_id)
+        
+        if not subscription:
+            return 'free'
+        
+        price_id = None
+        if subscription.get('items') and subscription['items'].get('data') and len(subscription['items']['data']) > 0:
+            price_id = subscription['items']['data'][0]['price']['id']
+        else:
+            price_id = subscription.get('price_id', config.STRIPE_FREE_TIER_ID)
+        
+        tier_info = SUBSCRIPTION_TIERS.get(price_id)
+        if tier_info:
+            return tier_info['name']
+        
+        logger.warning(f"Unknown price_id {price_id} for user {user_id}, defaulting to free tier")
+        return 'free'
+        
+    except Exception as e:
+        logger.error(f"Error getting subscription tier for user {user_id}: {str(e)}")
+        return 'free'
+
 async def check_billing_status(client, user_id: str) -> Tuple[bool, str, Optional[Dict]]:
     """
     Check if a user can run agents based on their subscription and usage.
@@ -634,8 +658,6 @@ async def check_billing_status(client, user_id: str) -> Tuple[bool, str, Optiona
     # Calculate current month's usage
     current_usage = await calculate_monthly_usage(client, user_id)
 
-    # TODO: also do user's AAL check
-    # Check if within limits
     if current_usage >= tier_info['cost']:
         return False, f"Monthly limit of {tier_info['cost']} dollars reached. Please upgrade your plan or wait until next month.", subscription
 

backend/templates/api.py

@@ -325,15 +325,22 @@ async def install_template(
     request: InstallTemplateRequest,
     user_id: str = Depends(get_current_user_id_from_jwt)
 ):
-    """
-    Install a template as a new agent instance.
-    
-    Requires:
-    - User must have access to the template (own it or it's public)
-    """
     try:
-        # Validate template access first
-        template = await validate_template_access_and_get(request.template_id, user_id)
+        await validate_template_access_and_get(request.template_id, user_id)
+        client = await db.client
+        from agent.utils import check_agent_count_limit
+        limit_check = await check_agent_count_limit(client, user_id)
+        
+        if not limit_check['can_create']:
+            error_detail = {
+                "message": f"Maximum of {limit_check['limit']} agents allowed for your current plan. You have {limit_check['current_count']} agents.",
+                "current_count": limit_check['current_count'],
+                "limit": limit_check['limit'],
+                "tier_name": limit_check['tier_name'],
+                "error_code": "AGENT_LIMIT_EXCEEDED"
+            }
+            logger.warning(f"Agent limit exceeded for account {user_id}: {limit_check['current_count']}/{limit_check['limit']} agents")
+            raise HTTPException(status_code=402, detail=error_detail)
 
         logger.info(f"User {user_id} installing template {request.template_id}")
 
@@ -362,7 +369,6 @@ async def install_template(
         )
 
     except HTTPException:
-        # Re-raise HTTP exceptions from our validation functions
         raise
     except TemplateInstallationError as e:
         logger.warning(f"Template installation failed: {e}")

backend/templates/installation_service.py

@@ -107,6 +107,9 @@ async def install_template(self, request: TemplateInstallationRequest) -> Templa
 
         await self._increment_download_count(template.template_id)
 
+        from utils.cache import Cache
+        await Cache.invalidate(f"agent_count_limit:{request.account_id}")
+        
         agent_name = request.instance_name or f"{template.name} (from marketplace)"
         logger.info(f"Successfully installed template {template.template_id} as agent {agent_id}")
 

backend/utils/config.py

@@ -270,6 +270,30 @@ def STRIPE_TIER_25_170_YEARLY_COMMITMENT_ID(self) -> str:
 
     # Agent execution limits (can be overridden via environment variable)
     _MAX_PARALLEL_AGENT_RUNS_ENV: Optional[str] = None
+    
+    # Agent limits per billing tier
+    AGENT_LIMITS = {
+        'free': 2,
+        'tier_2_20': 5,
+        'tier_6_50': 20,
+        'tier_12_100': 20,
+        'tier_25_200': 100,
+        'tier_50_400': 100,
+        'tier_125_800': 100,
+        'tier_200_1000': 100,
+        # Yearly plans have same limits as monthly
+        'tier_2_20_yearly': 5,
+        'tier_6_50_yearly': 20,
+        'tier_12_100_yearly': 20,
+        'tier_25_200_yearly': 100,
+        'tier_50_400_yearly': 100,
+        'tier_125_800_yearly': 100,
+        'tier_200_1000_yearly': 100,
+        # Yearly commitment plans
+        'tier_2_17_yearly_commitment': 5,
+        'tier_6_42_yearly_commitment': 20,
+        'tier_25_170_yearly_commitment': 100,
+    }
 
     @property
     def MAX_PARALLEL_AGENT_RUNS(self) -> int:

frontend/src/app/(dashboard)/agents/page.tsx

@@ -23,6 +23,8 @@ import { PublishDialog } from '@/components/agents/custom-agents-page/publish-di
 import { LoadingSkeleton } from '@/components/agents/custom-agents-page/loading-skeleton';
 import { NewAgentDialog } from '@/components/agents/new-agent-dialog';
 import { MarketplaceAgentPreviewDialog } from '@/components/agents/marketplace-agent-preview-dialog';
+import { AgentCountLimitDialog } from '@/components/agents/agent-count-limit-dialog';
+import { AgentCountLimitError } from '@/lib/api';
 
 type ViewMode = 'grid' | 'list';
 type AgentSortOption = 'name' | 'created_at' | 'updated_at' | 'tools_count';
@@ -86,6 +88,8 @@ export default function AgentsPage() {
 
   const [publishingAgentId, setPublishingAgentId] = useState<string | null>(null);
   const [showNewAgentDialog, setShowNewAgentDialog] = useState(false);
+  const [showAgentLimitDialog, setShowAgentLimitDialog] = useState(false);
+  const [agentLimitError, setAgentLimitError] = useState<AgentCountLimitError | null>(null);
 
   const activeTab = useMemo(() => {
     return searchParams.get('tab') || 'my-agents';
@@ -146,7 +150,6 @@ export default function AgentsPage() {
 
     if (marketplaceTemplates) {
       marketplaceTemplates.forEach(template => {
-
         const item: MarketplaceTemplate = {
           id: template.template_id,
           creator_id: template.creator_id,
@@ -174,14 +177,12 @@ export default function AgentsPage() {
                  item.creator_name?.toLowerCase().includes(searchLower);
         })();
 
-        if (!matchesSearch) return; // Skip items that don't match search
+        if (!matchesSearch) return;
 
-        // Always add user's own templates to mineItems for the "mine" filter
         if (user?.id === template.creator_id) {
           mineItems.push(item);
         }
 
-        // Categorize all templates (including user's own) for the "all" view
         if (template.is_kortix_team) {
           kortixItems.push(item);
         } else {
@@ -392,6 +393,12 @@ export default function AgentsPage() {
     } catch (error: any) {
       console.error('Installation error:', error);
 
+      if (error instanceof AgentCountLimitError) {
+        setAgentLimitError(error);
+        setShowAgentLimitDialog(true);
+        return;
+      }
+
       if (error.message?.includes('already in your library')) {
         toast.error('This agent is already in your library');
       } else if (error.message?.includes('Credential profile not found')) {
@@ -628,6 +635,15 @@ export default function AgentsPage() {
           onInstall={handlePreviewInstall}
           isInstalling={installingItemId === selectedItem?.id}
         />
+        {agentLimitError && (
+          <AgentCountLimitDialog
+            open={showAgentLimitDialog}
+            onOpenChange={setShowAgentLimitDialog}
+            currentCount={agentLimitError.detail.current_count}
+            limit={agentLimitError.detail.limit}
+            tierName={agentLimitError.detail.tier_name}
+          />
+        )}
       </div>
     </div>
   );