updates

Author: gridworkz

backend/migrations/add_default_apps.sql

@@ -0,0 +1,111 @@
+-- ================================================================
+-- Migration: Add Default Apps for New Users
+-- ================================================================
+-- Adds is_default column to add_ons table and seeds Claude Agents
+-- as a new app. Marks Unicorn Chat (Open-WebUI) and Claude Agents
+-- as default apps for all newly registered users.
+--
+-- Date: 2026-02-17
+-- ================================================================
+
+-- Step 1: Add is_default column to add_ons table
+ALTER TABLE add_ons ADD COLUMN IF NOT EXISTS is_default BOOLEAN DEFAULT FALSE;
+COMMENT ON COLUMN add_ons.is_default IS 'When TRUE, this app is automatically granted to all newly registered users regardless of their subscription tier.';
+
+-- Step 2: Mark Unicorn Chat (Open-WebUI) as a default app
+UPDATE add_ons
+SET is_default = TRUE
+WHERE slug = 'open-webui';
+
+-- Step 3: Insert Claude Agents into add_ons catalog (if not exists)
+INSERT INTO add_ons (
+    name,
+    slug,
+    description,
+    icon_url,
+    launch_url,
+    category,
+    feature_key,
+    base_price,
+    billing_type,
+    is_active,
+    is_default,
+    is_featured,
+    sort_order,
+    features
+)
+SELECT
+    'Claude Agents',
+    'claude-agents',
+    'AI agent workflows powered by Claude — build, orchestrate, and execute multi-step agent pipelines',
+    '/logos/claude-agents.png',
+    '/admin/claude-agents',
+    'AI Agents',
+    'claude_agents_access',
+    0.00,
+    'included',
+    TRUE,
+    TRUE,
+    TRUE,
+    11,
+    '{"highlights": ["Multi-step agent flows", "API key management", "Execution history", "Streaming output", "Claude SDK integration"], "use_cases": ["Automated workflows", "Code generation pipelines", "Research agents", "Data processing"]}'::jsonb
+WHERE NOT EXISTS (
+    SELECT 1 FROM add_ons WHERE slug = 'claude-agents'
+);
+
+-- If Claude Agents already exists, just make sure is_default is TRUE
+UPDATE add_ons
+SET is_default = TRUE
+WHERE slug = 'claude-agents';
+
+-- Step 4: Add claude_agents_access to tier_feature_definitions (if not exists)
+INSERT INTO tier_feature_definitions (feature_key, feature_name, description, value_type, default_value, category, is_system)
+SELECT 'claude_agents_access', 'Claude Agents', 'Access to Claude Agent workflow builder', 'boolean', 'true', 'services', TRUE
+WHERE NOT EXISTS (
+    SELECT 1 FROM tier_feature_definitions WHERE feature_key = 'claude_agents_access'
+);
+
+-- Step 5: Enable claude_agents_access for ALL existing tiers
+-- (so every tier gets Claude Agents by default)
+INSERT INTO tier_features (tier_id, feature_key, feature_value, enabled)
+SELECT st.id, 'claude_agents_access', 'true', TRUE
+FROM subscription_tiers st
+WHERE NOT EXISTS (
+    SELECT 1 FROM tier_features tf
+    WHERE tf.tier_id = st.id AND tf.feature_key = 'claude_agents_access'
+);
+
+-- Step 6: Ensure chat_access is enabled for ALL tiers too
+-- (Unicorn Chat should be available to everyone)
+INSERT INTO tier_features (tier_id, feature_key, feature_value, enabled)
+SELECT st.id, 'chat_access', 'true', TRUE
+FROM subscription_tiers st
+WHERE NOT EXISTS (
+    SELECT 1 FROM tier_features tf
+    WHERE tf.tier_id = st.id AND tf.feature_key = 'chat_access'
+);
+
+-- Step 7: Auto-provision default apps for ALL existing users
+-- Creates user_add_ons records so existing users also get the default apps
+INSERT INTO user_add_ons (user_id, add_on_id, status, purchased_at)
+SELECT DISTINCT u.keycloak_id, ao.id, 'active', NOW()
+FROM users u
+CROSS JOIN add_ons ao
+WHERE ao.is_default = TRUE
+  AND ao.is_active = TRUE
+  AND u.keycloak_id IS NOT NULL
+  AND NOT EXISTS (
+      SELECT 1 FROM user_add_ons ua
+      WHERE ua.user_id = u.keycloak_id AND ua.add_on_id = ao.id
+  );
+
+-- ================================================================
+-- Verification
+-- ================================================================
+DO $$
+DECLARE
+    default_count INTEGER;
+BEGIN
+    SELECT COUNT(*) INTO default_count FROM add_ons WHERE is_default = TRUE;
+    RAISE NOTICE 'Default apps configured: % (expected: 2 — Unicorn Chat, Claude Agents)', default_count;
+END $$;

backend/my_apps_api.py

@@ -169,6 +169,7 @@ async def get_my_apps(user_tier: str = Depends(get_current_user_tier)):
     Get apps the current user is authorized to access based on their subscription tier.
 
     Returns apps where:
+    - App is marked as default (is_default=TRUE) — always included for all users
     - User's tier includes the app's feature_key
     - User has purchased the app separately (future: check user_add_ons table)
     """
@@ -183,10 +184,11 @@ async def get_my_apps(user_tier: str = Depends(get_current_user_tier)):
         # Get enabled features for user's tier
         enabled_features = await get_user_tier_features(user_tier, conn)
 
-        # Get all active apps
+        # Get all active apps (including is_default column)
         apps_query = """
             SELECT id, name, slug, description, icon_url, launch_url,
-                   category, feature_key, base_price, features
+                   category, feature_key, base_price, features,
+                   COALESCE(is_default, FALSE) as is_default
             FROM add_ons
             WHERE is_active = TRUE
             ORDER BY sort_order, name
@@ -197,21 +199,42 @@ async def get_my_apps(user_tier: str = Depends(get_current_user_tier)):
             # add_ons table doesn't exist yet - return empty list
             logger.warning("add_ons table does not exist - returning empty app list")
             return []
+        except asyncpg.UndefinedColumnError:
+            # is_default column doesn't exist yet - fall back to query without it
+            logger.warning("is_default column not found, falling back to legacy query")
+            apps_query = """
+                SELECT id, name, slug, description, icon_url, launch_url,
+                       category, feature_key, base_price, features,
+                       FALSE as is_default
+                FROM add_ons
+                WHERE is_active = TRUE
+                ORDER BY sort_order, name
+            """
+            app_rows = await conn.fetch(apps_query)
 
-        # Filter apps based on user's tier
+        # Filter apps based on user's tier and default status
         authorized_apps = []
+        seen_slugs = set()
         for app in app_rows:
             app_dict = dict(app)
             feature_key = app_dict.get('feature_key')
+            is_default = app_dict.get('is_default', False)
 
             # Skip apps without launch URLs
             if not app_dict.get('launch_url'):
                 continue
 
+            # Skip duplicates
+            if app_dict['slug'] in seen_slugs:
+                continue
+
             # Check if user has access
             access_type = None
 
-            if feature_key and feature_key in enabled_features:
+            if is_default:
+                # Default apps are always included for all authenticated users
+                access_type = 'default'
+            elif feature_key and feature_key in enabled_features:
                 # User's tier includes this app
                 access_type = 'tier_included'
             elif app_dict['base_price'] == 0 and not feature_key:
@@ -222,6 +245,7 @@ async def get_my_apps(user_tier: str = Depends(get_current_user_tier)):
                 # (Later: check if user purchased it separately)
                 continue
 
+            seen_slugs.add(app_dict['slug'])
             authorized_apps.append({
                 'id': str(app_dict['id']),  # Convert UUID to string
                 'name': app_dict['name'],
@@ -274,7 +298,8 @@ async def get_marketplace_apps(user_tier: str = Depends(get_current_user_tier)):
         # Get all active apps
         apps_query = """
             SELECT id, name, slug, description, icon_url, launch_url,
-                   category, feature_key, base_price, billing_type
+                   category, feature_key, base_price, billing_type,
+                   COALESCE(is_default, FALSE) as is_default
             FROM add_ons
             WHERE is_active = TRUE
             ORDER BY base_price DESC, name
@@ -286,11 +311,16 @@ async def get_marketplace_apps(user_tier: str = Depends(get_current_user_tier)):
         for app in app_rows:
             app_dict = dict(app)
             feature_key = app_dict.get('feature_key')
+            is_default = app_dict.get('is_default', False)
 
             # Skip apps without launch URLs
             if not app_dict.get('launch_url'):
                 continue
 
+            # Skip default apps (users already have them)
+            if is_default:
+                continue
+
             # Skip apps user already has access to
             if feature_key and feature_key in enabled_features:
                 continue

backend/openwebui_api.py

@@ -593,8 +593,8 @@ async def seed_app_records(request: Request):
                 await conn.execute("""
                     INSERT INTO add_ons (name, slug, description, icon_url, launch_url,
                                          category, feature_key, base_price, billing_type,
-                                         is_active, sort_order, features)
-                    VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12::jsonb)
+                                         is_active, is_default, sort_order, features)
+                    VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13::jsonb)
                 """,
                     "Unicorn Chat",
                     "open-webui",
@@ -606,6 +606,7 @@ async def seed_app_records(request: Request):
                     0.0,
                     "included",
                     True,
+                    True,   # is_default — always granted to new users
                     10,
                     features_json,
                 )

backend/server.py

@@ -2331,63 +2331,9 @@ async def require_user(current_user: dict = Depends(get_current_user)):
         )
     return current_user
 
-# My Apps API
-
-@app.get("/api/v1/my-apps/authorized")
-async def get_my_apps_authorized(current_user: dict = Depends(get_current_user)):
-    """Get apps the user has access to based on their subscription and add-ons"""
-    try:
-        # Get user ID - fallback to 'default' if not specified
-        user_id = current_user.get("preferred_username") or current_user.get("username") or current_user.get("sub") or "default"
-        
-        logger.info(f"Fetching apps for user: {user_id}")
-        
-        # Connect to Lago database to fetch user add-ons
-        lago_conn = await asyncpg.connect(os.getenv('LAGO_DATABASE_URL', 'postgresql://unicorn:s3cr3t@lago-db:5432/lago'))
-        
-        try:
-            # Query user's active add-ons with app details
-            query = """
-                SELECT 
-                    a.id,
-                    a.name,
-                    a.slug,
-                    a.description,
-                    a.icon_url,
-                    a.launch_url,
-                    ua.status
-                FROM user_add_ons ua
-                JOIN add_ons a ON ua.add_on_id = a.id
-                WHERE ua.user_id = $1 
-                AND ua.status = 'active'
-                AND a.is_active = true
-                ORDER BY a.name
-            """
-            
-            rows = await lago_conn.fetch(query, user_id)
-            
-            logger.info(f"Found {len(rows)} active apps for user {user_id}")
-            
-            apps = []
-            for row in rows:
-                apps.append({
-                    "id": str(row["id"]),
-                    "name": row["name"],
-                    "slug": row["slug"],
-                    "description": row["description"] or "",
-                    "icon_url": row["icon_url"],
-                    "launch_url": row["launch_url"] or f"/{row['slug']}",
-                    "status": row["status"]
-                })
-            
-            return apps
-            
-        finally:
-            await lago_conn.close()
-            
-    except Exception as e:
-        logger.error(f"Error fetching user apps: {str(e)}")
-        raise HTTPException(status_code=500, detail=f"Failed to fetch apps: {str(e)}")
+# My Apps API — deferred to my_apps_api.py router (app.include_router(my_apps_router))
+# The router at /api/v1/my-apps handles /authorized and /marketplace
+# using tier-based feature matching and is_default flags.
 
 # API Routes
 
@@ -5319,6 +5265,38 @@ async def register_user(request: Request):
             logger.error(f"Failed to create credit account during registration for {email}: {credit_error}")
             logger.warning(f"User will have credits auto-provisioned on first API call")
 
+        # Step 5.6: Auto-provision default apps (Unicorn Chat, Claude Agents, etc.)
+        default_apps_provisioned = False
+        try:
+            user_identifier = keycloak_user_id or local_user["id"]
+            db_conn = await asyncpg.connect(
+                host=os.getenv("POSTGRES_HOST", "unicorn-postgresql"),
+                port=int(os.getenv("POSTGRES_PORT", "5432")),
+                user=os.getenv("POSTGRES_USER", "unicorn"),
+                password=os.getenv("POSTGRES_PASSWORD", "unicorn"),
+                database=os.getenv("POSTGRES_DB", "unicorn_db")
+            )
+            try:
+                # Find all default apps and provision them for the new user
+                default_apps = await db_conn.fetch(
+                    "SELECT id, name FROM add_ons WHERE is_default = TRUE AND is_active = TRUE"
+                )
+                for app in default_apps:
+                    await db_conn.execute("""
+                        INSERT INTO user_add_ons (user_id, add_on_id, status, purchased_at)
+                        VALUES ($1, $2, 'active', NOW())
+                        ON CONFLICT (user_id, add_on_id) DO NOTHING
+                    """, user_identifier, app['id'])
+                    logger.info(f"Provisioned default app '{app['name']}' for user {email}")
+                default_apps_provisioned = True
+                logger.info(f"Provisioned {len(default_apps)} default app(s) for {email}")
+            finally:
+                await db_conn.close()
+        except Exception as apps_error:
+            # Don't fail registration if default app provisioning fails
+            logger.error(f"Failed to provision default apps for {email}: {apps_error}")
+            logger.warning(f"Default apps will be available via tier features fallback")
+
         # Step 6: Audit log successful registration
         if AUDIT_ENABLED:
             await log_auth_success(
@@ -5332,7 +5310,8 @@ async def register_user(request: Request):
                     "org_id": org_id,
                     "org_name": org_name,
                     "lago_customer_created": lago_customer_created,
-                    "credit_account_created": credit_account_created
+                    "credit_account_created": credit_account_created,
+                    "default_apps_provisioned": default_apps_provisioned
                 }
             )