fraim 2.0.361 → 2.0.362-next.2

package/dist/src/routes/analytics.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.setAnalyticsDatabase = setAnalyticsDatabase;
 const license_presentation_1 = require("../fraim/license-presentation");
 const express_1 = __importDefault(require("express"));
 const path_1 = __importDefault(require("path"));
@@ -11,12 +12,59 @@ const db_service_js_1 = require("../fraim/db-service.js");
 const mcp_service_js_1 = require("../services/mcp-service.js");
 const git_utils_js_1 = require("../core/utils/git-utils.js");
 const job_phases_1 = require("../core/job-phases");
+const analytics_read_1 = require("../services/analytics-read");
 const router = express_1.default.Router();
+const readQueue = new analytics_read_1.AnalyticsReadQueue();
+let analyticsDatabase;
+let sharedAnalyticsService;
+function setAnalyticsDatabase(database) {
+    analyticsDatabase = database;
+    sharedAnalyticsService = undefined;
+}
+function getAnalyticsDatabase() {
+    if (!analyticsDatabase)
+        throw new Error('Analytics database was not initialized at server startup');
+    return analyticsDatabase;
+}
+function getAnalyticsService() {
+    return sharedAnalyticsService ??= new usage_analytics_service_js_1.UsageAnalyticsService(getAnalyticsDatabase());
+}
+function analyticsGet(route, handler) {
+    router.get(route, async (req, res) => {
+        const started = Date.now();
+        try {
+            await readQueue.run(async () => {
+                if (req.destroyed || res.destroyed)
+                    return;
+                try {
+                    return await handler(req, res);
+                }
+                catch (error) {
+                    if (!['MongoNetworkError', 'MongoServerSelectionError', 'MongoNotConnectedError', 'MongoTopologyClosedError'].includes(error.name))
+                        throw error;
+                    await getAnalyticsDatabase().recoverConnection();
+                    return handler(req, res);
+                }
+            });
+        }
+        catch (error) {
+            if (res.headersSent || res.destroyed)
+                return;
+            const { status, headers, body } = (0, analytics_read_1.analyticsReadErrorResponse)(error);
+            if (status === 500)
+                console.error('[analytics] Read failed:', error);
+            res.set(headers).status(status).json(body);
+        }
+        finally {
+            console.info(`[analytics] endpoint=${route} aggregation_ms=${Date.now() - started} status=${res.statusCode}`);
+        }
+    });
+}
 /**
  * GET /api/analytics/stats
  * Get usage statistics for a time period
  */
-router.get('/stats', async (req, res) => {
+analyticsGet('/stats', async (req, res) => {
     let dbService;
     let analyticsService;
     try {
@@ -26,10 +74,9 @@ router.get('/stats', async (req, res) => {
             return res.status(401).json({ error: 'Authentication required' });
         }
         // Create database connection
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         // Create analytics service
-        analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
+        analyticsService = getAnalyticsService();
         const { type, apiKey, repoIdentifier } = req.query;
         const timeframe = resolveAnalyticsTimeframe(req.query);
         const types = type ? (Array.isArray(type) ? type : [type]) : undefined;
@@ -59,20 +106,14 @@ router.get('/stats', async (req, res) => {
         res.json(stats);
     }
     catch (error) {
-        console.error('Error fetching usage stats:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
  * GET /api/analytics/components/top
  * Get top components by usage count
  */
-router.get('/components/top', async (req, res) => {
+analyticsGet('/components/top', async (req, res) => {
     let dbService;
     let analyticsService;
     try {
@@ -82,10 +123,9 @@ router.get('/components/top', async (req, res) => {
             return res.status(401).json({ error: 'Authentication required' });
         }
         // Create database connection
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         // Create analytics service
-        analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
+        analyticsService = getAnalyticsService();
         const { limit = '10', apiKey, type, repoIdentifier } = req.query;
         const timeframe = resolveAnalyticsTimeframe(req.query);
         const types = type ? (Array.isArray(type) ? type : [type]) : undefined;
@@ -108,20 +148,14 @@ router.get('/components/top', async (req, res) => {
         res.json(components);
     }
     catch (error) {
-        console.error('Error fetching top components:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
  * GET /api/analytics/trends
  * Get trend data for a specific component
  */
-router.get('/trends', async (req, res) => {
+analyticsGet('/trends', async (req, res) => {
     let dbService;
     let analyticsService;
     try {
@@ -136,10 +170,9 @@ router.get('/trends', async (req, res) => {
             return res.status(400).json({ error: 'Component name and type are required' });
         }
         // Create database connection
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         // Create analytics service
-        analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
+        analyticsService = getAnalyticsService();
         let targetUserId;
         if (apiKey && typeof apiKey === 'string') {
             const isAdmin = apiKeyData.userId === 'sid.mathur@gmail.com';
@@ -159,20 +192,14 @@ router.get('/trends', async (req, res) => {
         res.json(trend);
     }
     catch (error) {
-        console.error('Error fetching component trends:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
  * GET /api/analytics/jobs/timeline
  * Get job execution timeline for the bubble chart
  */
-router.get('/jobs/timeline', async (req, res) => {
+analyticsGet('/jobs/timeline', async (req, res) => {
     let dbService;
     let analyticsService;
     try {
@@ -182,9 +209,8 @@ router.get('/jobs/timeline', async (req, res) => {
         }
         const { apiKey, dateUnit, repoIdentifier } = req.query;
         const timeframe = resolveAnalyticsTimeframe(req.query);
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
-        analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
+        dbService = getAnalyticsDatabase();
+        analyticsService = getAnalyticsService();
         let targetUserId;
         if (apiKey && typeof apiKey === 'string') {
             const isAdmin = apiKeyData.userId === 'sid.mathur@gmail.com';
@@ -204,20 +230,14 @@ router.get('/jobs/timeline', async (req, res) => {
         res.json(timeline);
     }
     catch (error) {
-        console.error('Error fetching job timeline:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
  * GET /api/analytics/jobs/completion
  * Get job completion metrics for analytics dashboard
  */
-router.get('/jobs/completion', async (req, res) => {
+analyticsGet('/jobs/completion', async (req, res) => {
     let dbService;
     let analyticsService;
     try {
@@ -227,9 +247,8 @@ router.get('/jobs/completion', async (req, res) => {
         }
         const { jobName, apiKey, repoIdentifier } = req.query;
         const timeframe = resolveAnalyticsTimeframe(req.query);
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
-        analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
+        dbService = getAnalyticsDatabase();
+        analyticsService = getAnalyticsService();
         let targetUserId;
         if (apiKey && typeof apiKey === 'string') {
             const isAdmin = apiKeyData.userId === 'sid.mathur@gmail.com';
@@ -250,33 +269,26 @@ router.get('/jobs/completion', async (req, res) => {
         res.json(metrics);
     }
     catch (error) {
-        console.error('Error fetching job completion metrics:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
  * GET /api/analytics/jobs/runs
  * Get recent job runs for a specific job name (for clickable table rows)
  */
-router.get('/jobs/runs', async (req, res) => {
+analyticsGet('/jobs/runs', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
         if (!apiKeyData) {
             return res.status(401).json({ error: 'Authentication required' });
         }
-        const { period = '30d', jobName, limit = '50', repoIdentifier } = req.query;
+        const { jobName, limit = '50', repoIdentifier } = req.query;
         const timeframe = resolveAnalyticsTimeframe(req.query);
         if (!jobName || typeof jobName !== 'string') {
             return res.status(400).json({ error: 'jobName query parameter is required' });
         }
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         const targetUserId = await resolveTargetUserIdFromQuery(dbService, apiKeyData, req.query);
         const timeRangeDays = parsePeriodDays(timeframe.period);
         const startDate = timeframe.startDate ?? new Date(Date.now() - timeRangeDays * 24 * 60 * 60 * 1000);
@@ -284,24 +296,14 @@ router.get('/jobs/runs', async (req, res) => {
         res.json(runs);
     }
     catch (error) {
-        if (error.status === 403)
-            return res.status(403).json({ error: error.message });
-        if (error.status === 404)
-            return res.status(404).json({ error: error.message });
-        console.error('Error fetching job runs:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
  * GET /api/analytics/jobs/run/:jobId/timeline
  * Get phase-by-phase timeline for a specific job run
  */
-router.get('/jobs/run/:jobId/timeline', async (req, res) => {
+analyticsGet('/jobs/run/:jobId/timeline', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
@@ -312,8 +314,7 @@ router.get('/jobs/run/:jobId/timeline', async (req, res) => {
         if (!jobId) {
             return res.status(400).json({ error: 'jobId parameter is required' });
         }
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         const targetUserId = await resolveTargetUserIdFromQuery(dbService, apiKeyData, req.query);
         const jobName = req.query.jobName;
         const events = await dbService.getJobRunTimeline(jobId, targetUserId, jobName);
@@ -330,24 +331,14 @@ router.get('/jobs/run/:jobId/timeline', async (req, res) => {
         res.json(timeline);
     }
     catch (error) {
-        if (error.status === 403)
-            return res.status(403).json({ error: error.message });
-        if (error.status === 404)
-            return res.status(404).json({ error: error.message });
-        console.error('Error fetching job run timeline:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
  * GET /api/analytics/jobs/:jobName/phases
  * Get the declared FRAIM phase sequence for a job in registry order.
  */
-router.get('/jobs/:jobName/phases', async (req, res) => {
+analyticsGet('/jobs/:jobName/phases', async (req, res) => {
     try {
         const apiKeyData = req.apiKeyData;
         if (!apiKeyData) {
@@ -365,8 +356,7 @@ router.get('/jobs/:jobName/phases', async (req, res) => {
         res.json({ jobName, phases });
     }
     catch (error) {
-        console.error('Error fetching job phases:', error);
-        res.status(500).json({ error: 'Internal server error' });
+        throw error;
     }
 });
 function formatDuration(ms) {
@@ -382,7 +372,7 @@ function formatDuration(ms) {
  * GET /api/analytics/jobs/:jobId/tokens
  * Get per-job token usage (delta computed from cumulative snapshots)
  */
-router.get('/jobs/:jobId/tokens', async (req, res) => {
+analyticsGet('/jobs/:jobId/tokens', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
@@ -393,8 +383,7 @@ router.get('/jobs/:jobId/tokens', async (req, res) => {
         if (!jobId) {
             return res.status(400).json({ error: 'jobId parameter is required' });
         }
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         const targetUserId = await resolveTargetUserIdFromQuery(dbService, apiKeyData, req.query);
         const result = await dbService.getTokenUsageByJob(jobId, targetUserId);
         if (!result) {
@@ -413,17 +402,7 @@ router.get('/jobs/:jobId/tokens', async (req, res) => {
         res.json(result);
     }
     catch (error) {
-        if (error.status === 403)
-            return res.status(403).json({ error: error.message });
-        if (error.status === 404)
-            return res.status(404).json({ error: error.message });
-        console.error('Error fetching job token usage:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
@@ -431,7 +410,7 @@ router.get('/jobs/:jobId/tokens', async (req, res) => {
  * Issue #330 / R2.1 — token + cost aggregate for the You / Team accordion.
  * Honors apiKey admin-gate (C2) and rejects local-path repoIdentifier (C3).
  */
-router.get('/usage/aggregate', async (req, res) => {
+analyticsGet('/usage/aggregate', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
@@ -444,8 +423,7 @@ router.get('/usage/aggregate', async (req, res) => {
         if (repoIdentifier && typeof repoIdentifier === 'string' && repoIdentifier.length > 0 && (0, git_utils_js_1.isExplicitLocalRepoPath)(repoIdentifier)) {
             return res.status(400).json({ error: 'Invalid repoIdentifier — local paths are not permitted' });
         }
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         // C2 — admin-only when querying another user's data.
         let targetUserId;
         if (apiKey && typeof apiKey === 'string') {
@@ -471,20 +449,14 @@ router.get('/usage/aggregate', async (req, res) => {
         res.json(aggregate);
     }
     catch (error) {
-        console.error('Error fetching usage aggregate:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
  * GET /api/analytics/jobs/:jobName/agent-summary
  * Issue #330 / R2.8 — per-job-name agent split for the per-job page.
  */
-router.get('/jobs/:jobName/agent-summary', async (req, res) => {
+analyticsGet('/jobs/:jobName/agent-summary', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
@@ -500,8 +472,7 @@ router.get('/jobs/:jobName/agent-summary', async (req, res) => {
         if (repoIdentifier && typeof repoIdentifier === 'string' && repoIdentifier.length > 0 && (0, git_utils_js_1.isExplicitLocalRepoPath)(repoIdentifier)) {
             return res.status(400).json({ error: 'Invalid repoIdentifier — local paths are not permitted' });
         }
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         const targetUserId = await resolveTargetUserIdFromQuery(dbService, apiKeyData, req.query);
         const summary = await dbService.getJobAgentSummary({
             jobName,
@@ -513,55 +484,35 @@ router.get('/jobs/:jobName/agent-summary', async (req, res) => {
         res.json(summary);
     }
     catch (error) {
-        if (error.status === 403)
-            return res.status(403).json({ error: error.message });
-        if (error.status === 404)
-            return res.status(404).json({ error: error.message });
-        console.error('Error fetching job agent summary:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
  * GET /api/analytics/jobs/token-summary
  * Aggregated token usage across all jobs for a user
  */
-router.get('/jobs/token-summary', async (req, res) => {
+analyticsGet('/jobs/token-summary', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
         if (!apiKeyData) {
             return res.status(401).json({ error: 'Authentication required' });
         }
-        const period = req.query.period || '30d';
-        const daysMatch = period.match(/^(\d+)d$/);
-        const days = daysMatch ? parseInt(daysMatch[1], 10) : 30;
-        const startDate = new Date();
-        startDate.setDate(startDate.getDate() - days);
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        const timeframe = resolveAnalyticsTimeframe(req.query);
+        const startDate = timeframe.startDate ?? new Date(Date.now() - parsePeriodDays(timeframe.period) * 86400_000);
+        dbService = getAnalyticsDatabase();
         const result = await dbService.getTokenUsageSummary(apiKeyData.userId, startDate);
         res.json(result);
     }
     catch (error) {
-        console.error('Error fetching token usage summary:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
  * GET /api/analytics/export
  * Export usage data as CSV
  */
-router.get('/export', async (req, res) => {
+analyticsGet('/export', async (req, res) => {
     let dbService;
     let analyticsService;
     try {
@@ -576,10 +527,9 @@ router.get('/export', async (req, res) => {
             return res.status(400).json({ error: 'Only CSV format is currently supported' });
         }
         // Create database connection
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         // Create analytics service
-        analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
+        analyticsService = getAnalyticsService();
         let targetUserId;
         if (apiKey && typeof apiKey === 'string') {
             const isAdmin = apiKeyData.userId === 'sid.mathur@gmail.com';
@@ -608,20 +558,14 @@ router.get('/export', async (req, res) => {
         res.send(csvData);
     }
     catch (error) {
-        console.error('Error exporting usage data:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
  * GET /api/analytics/users
  * Get list of users with their API keys and event counts (admin only)
  */
-router.get('/users', async (req, res) => {
+analyticsGet('/users', async (req, res) => {
     let dbService;
     try {
         // Get API key data from middleware
@@ -635,8 +579,7 @@ router.get('/users', async (req, res) => {
             return res.status(403).json({ error: 'Admin access required' });
         }
         // Create database connection
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         // Get all API keys
         const apiKeys = await dbService.listApiKeys();
         // Get event counts for each API key
@@ -663,20 +606,14 @@ router.get('/users', async (req, res) => {
         res.json(usersWithCounts);
     }
     catch (error) {
-        console.error('Error fetching users:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
  * GET /api/analytics/repos
  * Get unique repositories that have generated telemetry for a user
  */
-router.get('/repos', async (req, res) => {
+analyticsGet('/repos', async (req, res) => {
     let dbService;
     let analyticsService;
     try {
@@ -684,20 +621,13 @@ router.get('/repos', async (req, res) => {
         if (!apiKeyData) {
             return res.status(401).json({ error: 'Authentication required' });
         }
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
-        analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
+        dbService = getAnalyticsDatabase();
+        analyticsService = getAnalyticsService();
         const repos = await analyticsService.getUniqueRepos(apiKeyData.userId);
         res.json(repos);
     }
     catch (error) {
-        console.error('Error fetching repositories:', error);
-        res.status(500).json({ error: 'Internal server error' });
-    }
-    finally {
-        if (dbService) {
-            await dbService.close();
-        }
+        throw error;
     }
 });
 /**
@@ -875,7 +805,7 @@ router.post('/quality-score', async (req, res) => {
  * GET /api/analytics/me
  * Get current user information
  */
-router.get('/me', async (req, res) => {
+analyticsGet('/me', async (req, res) => {
     try {
         // Get API key data from middleware
         const apiKeyData = req.apiKeyData;
@@ -889,8 +819,7 @@ router.get('/me', async (req, res) => {
         });
     }
     catch (error) {
-        console.error('Error getting user info:', error);
-        res.status(500).json({ error: 'Failed to get user information' });
+        throw error;
     }
 });
 // ===== TEAM ROUTES =====
@@ -913,7 +842,9 @@ function parseDateParam(value, endOfDay = false) {
     return date;
 }
 function resolveAnalyticsTimeframe(query) {
-    const period = typeof query.period === 'string' && query.period ? query.period : '30d';
+    const requestedPeriod = typeof query.period === 'string' && query.period ? query.period : '7d';
+    const period = requestedPeriod === '365d' ? '90d'
+        : ['7d', '30d', '90d'].includes(requestedPeriod) ? requestedPeriod : '7d';
     const startDate = parseDateParam(query.startDate);
     const endDate = parseDateParam(query.endDate, true);
     if ((query.startDate || query.endDate) && (!startDate || !endDate)) {
@@ -926,7 +857,11 @@ function resolveAnalyticsTimeframe(query) {
         err.status = 400;
         throw err;
     }
-    return startDate && endDate ? { period: 'custom', startDate, endDate } : { period };
+    if (startDate && endDate) {
+        const retainedStart = new Date(Date.now() - 90 * 24 * 60 * 60 * 1000);
+        return { period: 'custom', startDate: startDate < retainedStart ? retainedStart : startDate, endDate };
+    }
+    return { period };
 }
 async function resolveManagerMember(dbService, managerId, memberId) {
     const members = await dbService.getTeamMembers(managerId);
@@ -976,30 +911,46 @@ async function resolveTargetUserIdFromQuery(dbService, apiKeyData, query) {
  * Returns team member IDs only — fast, no stats queries.
  * Used by the dashboard to render the member list immediately before lazy-loading stats.
  */
-router.get('/team/members/list', async (req, res) => {
+analyticsGet('/team/members/list', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
         if (!apiKeyData)
             return res.status(401).json({ error: 'Authentication required' });
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         const members = await dbService.getTeamMembers(apiKeyData.userId);
         res.json(members.map(m => ({ memberId: m.memberId, labels: m.labels || [] })));
     }
     catch (error) {
-        res.status(error.status || 500).json({ error: error.message || 'Failed to load team' });
-    }
-    finally {
-        if (dbService)
-            await dbService.close();
+        throw error;
     }
 });
+analyticsGet('/team/members/summaries', async (req, res) => {
+    const apiKeyData = req.apiKeyData;
+    if (!apiKeyData)
+        return res.status(401).json({ error: 'Authentication required' });
+    const ids = typeof req.query.ids === 'string' ? req.query.ids.split(',') : [];
+    if (!ids.length || ids.some(id => !id.trim() || id !== id.trim() || id.length > 320) || ids.length > 20) {
+        return res.status(400).json({ error: 'ids must contain between 1 and 20 member IDs' });
+    }
+    const memberIds = [...new Set(ids)];
+    const timeframe = resolveAnalyticsTimeframe(req.query);
+    const database = getAnalyticsDatabase();
+    const members = await database.getTeamMembers(apiKeyData.userId);
+    const authorized = new Set(members.map(member => member.memberId));
+    if (memberIds.some(id => !authorized.has(id)))
+        return res.status(403).json({ error: 'Not authorized to view this member' });
+    const repoIdentifier = typeof req.query.repoIdentifier === 'string' ? req.query.repoIdentifier : undefined;
+    if (repoIdentifier && (0, git_utils_js_1.isExplicitLocalRepoPath)(repoIdentifier))
+        return res.status(400).json({ error: 'Invalid repoIdentifier' });
+    const summaries = await getAnalyticsService().getTeamMemberSummaries(timeframe.period, memberIds, repoIdentifier, timeframe.startDate, timeframe.endDate);
+    return res.json(summaries);
+});
 /**
  * GET /api/analytics/team/members/:memberId/summary?period=30d
  * Returns stats for a single member. Called lazily per-member after the list renders.
  */
-router.get('/team/members/:memberId/summary', async (req, res) => {
+analyticsGet('/team/members/:memberId/summary', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
@@ -1007,17 +958,20 @@ router.get('/team/members/:memberId/summary', async (req, res) => {
             return res.status(401).json({ error: 'Authentication required' });
         const timeframe = resolveAnalyticsTimeframe(req.query);
         const memberId = req.params.memberId;
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         await resolveManagerMember(dbService, apiKeyData.userId, memberId); // auth check
-        const analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
-        const [dominant, stats, allTimeLastEventAt, hasFraimSetup, keyLifecycle] = await Promise.allSettled([
+        const analyticsService = getAnalyticsService();
+        const summaryResults = await Promise.allSettled([
             analyticsService.getDominantJobCategory(timeframe.period, memberId, undefined, timeframe.startDate, timeframe.endDate),
             analyticsService.getUsageStats({ period: timeframe.period, startDate: timeframe.startDate, endDate: timeframe.endDate, types: ['job'], userId: memberId }),
             dbService.getLatestUsageEventAt(memberId, ['job']),
             dbService.hasFraimSetup(memberId),
             dbService.getApiKeyByUserId(memberId, false),
         ]);
+        const summaryFailure = summaryResults.find(result => result.status === 'rejected');
+        if (summaryFailure?.status === 'rejected')
+            throw summaryFailure.reason;
+        const [dominant, stats, allTimeLastEventAt, hasFraimSetup, keyLifecycle] = summaryResults;
         const lastEventAt = stats.status === 'fulfilled' ? stats.value.lastEventAt ?? null : null;
         const historicalLastEventAt = allTimeLastEventAt.status === 'fulfilled' ? allTimeLastEventAt.value ?? null : null;
         const lifecycle = keyLifecycle.status === 'fulfilled'
@@ -1036,11 +990,7 @@ router.get('/team/members/:memberId/summary', async (req, res) => {
         });
     }
     catch (error) {
-        res.status(error.status || 500).json({ error: error.message || 'Failed to load member summary' });
-    }
-    finally {
-        if (dbService)
-            await dbService.close();
+        throw error;
     }
 });
 /**
@@ -1048,56 +998,34 @@ router.get('/team/members/:memberId/summary', async (req, res) => {
  * Returns team members with dominant category (manager view).
  * Kept for backwards compatibility — prefer /list + /summary for non-blocking UI.
  */
-router.get('/team/members', async (req, res) => {
+analyticsGet('/team/members', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
         if (!apiKeyData)
             return res.status(401).json({ error: 'Authentication required' });
         const timeframe = resolveAnalyticsTimeframe(req.query);
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
-        const analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
+        dbService = getAnalyticsDatabase();
+        const analyticsService = getAnalyticsService();
         const members = await dbService.getTeamMembers(apiKeyData.userId);
         if (members.length === 0)
             return res.json([]);
-        const results = await Promise.allSettled(members.map(async (m) => {
-            const [dominant, stats, allTimeLastEventAt, hasFraimSetup] = await Promise.allSettled([
-                analyticsService.getDominantJobCategory(timeframe.period, m.memberId, undefined, timeframe.startDate, timeframe.endDate),
-                analyticsService.getUsageStats({ period: timeframe.period, startDate: timeframe.startDate, endDate: timeframe.endDate, types: ['job'], userId: m.memberId }),
-                dbService.getLatestUsageEventAt(m.memberId, ['job']),
-                dbService.hasFraimSetup(m.memberId)
-            ]);
-            const lastEventAt = stats.status === 'fulfilled' ? stats.value.lastEventAt ?? null : null;
-            const historicalLastEventAt = allTimeLastEventAt.status === 'fulfilled' ? allTimeLastEventAt.value ?? null : null;
-            return {
-                memberId: m.memberId,
-                labels: m.labels || [],
-                dominantCategory: dominant.status === 'fulfilled' ? dominant.value?.category ?? null : null,
-                dominantCategoryCount: dominant.status === 'fulfilled' ? dominant.value?.count ?? 0 : 0,
-                totalEvents: stats.status === 'fulfilled' ? stats.value.totalEvents : 0,
-                hasFraimSetup: hasFraimSetup.status === 'fulfilled' ? hasFraimSetup.value : false,
-                lastEventAt,
-                allTimeLastEventAt: historicalLastEventAt,
-                lastActiveAt: lastEventAt
-            };
-        }));
-        res.json(results
-            .filter(r => r.status === 'fulfilled')
-            .map(r => r.value));
+        const summaries = await analyticsService.getTeamMemberSummaries(timeframe.period, members.map(member => member.memberId), undefined, timeframe.startDate, timeframe.endDate);
+        // Historical activity remains available for callers of the legacy endpoint,
+        // but is not part of the default overview request.
+        const historical = await dbService.getLatestUsageEventsByUser(members.map(member => member.memberId), ['job']);
+        const labels = new Map(members.map(member => [member.memberId, member.labels || []]));
+        res.json(summaries.map(summary => ({ ...summary, labels: labels.get(summary.memberId),
+            allTimeLastEventAt: historical.get(summary.memberId) ?? null })));
     }
     catch (error) {
-        res.status(error.status || 500).json({ error: error.message || 'Failed to load team' });
-    }
-    finally {
-        if (dbService)
-            await dbService.close();
+        throw error;
     }
 });
 /**
  * GET /api/analytics/team/member/:memberId/stats
  */
-router.get('/team/member/:memberId/stats', async (req, res) => {
+analyticsGet('/team/member/:memberId/stats', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
@@ -1106,10 +1034,9 @@ router.get('/team/member/:memberId/stats', async (req, res) => {
         const { memberId } = req.params;
         const { repoIdentifier } = req.query;
         const timeframe = resolveAnalyticsTimeframe(req.query);
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         const memberUserId = await resolveManagerMember(dbService, apiKeyData.userId, memberId);
-        const analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
+        const analyticsService = getAnalyticsService();
         const stats = await analyticsService.getUsageStats({
             period: timeframe.period,
             startDate: timeframe.startDate,
@@ -1121,11 +1048,7 @@ router.get('/team/member/:memberId/stats', async (req, res) => {
         res.json(stats);
     }
     catch (error) {
-        res.status(error.status || 500).json({ error: error.message || 'Failed to load member stats' });
-    }
-    finally {
-        if (dbService)
-            await dbService.close();
+        throw error;
     }
 });
 /**
@@ -1133,7 +1056,7 @@ router.get('/team/member/:memberId/stats', async (req, res) => {
  * Issue #330 / R2.5 — token + cost aggregate for a team member, scoped
  * to the calling manager's permission set via resolveManagerMember.
  */
-router.get('/team/member/:memberId/usage/aggregate', async (req, res) => {
+analyticsGet('/team/member/:memberId/usage/aggregate', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
@@ -1145,8 +1068,7 @@ router.get('/team/member/:memberId/usage/aggregate', async (req, res) => {
         if (repoIdentifier && typeof repoIdentifier === 'string' && repoIdentifier.length > 0 && (0, git_utils_js_1.isExplicitLocalRepoPath)(repoIdentifier)) {
             return res.status(400).json({ error: 'Invalid repoIdentifier — local paths are not permitted' });
         }
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         const memberUserId = await resolveManagerMember(dbService, apiKeyData.userId, memberId);
         const aggregate = await dbService.getUsageAggregate({
             userId: memberUserId,
@@ -1157,17 +1079,13 @@ router.get('/team/member/:memberId/usage/aggregate', async (req, res) => {
         res.json(aggregate);
     }
     catch (error) {
-        res.status(error.status || 500).json({ error: error.message || 'Failed to load member usage aggregate' });
-    }
-    finally {
-        if (dbService)
-            await dbService.close();
+        throw error;
     }
 });
 /**
  * GET /api/analytics/team/member/:memberId/components/top
  */
-router.get('/team/member/:memberId/components/top', async (req, res) => {
+analyticsGet('/team/member/:memberId/components/top', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
@@ -1176,25 +1094,20 @@ router.get('/team/member/:memberId/components/top', async (req, res) => {
         const { memberId } = req.params;
         const { limit = '10', repoIdentifier } = req.query;
         const timeframe = resolveAnalyticsTimeframe(req.query);
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         const memberUserId = await resolveManagerMember(dbService, apiKeyData.userId, memberId);
-        const analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
+        const analyticsService = getAnalyticsService();
         const components = await analyticsService.getTopComponents(parseInt(limit, 10), timeframe.period, ['job'], memberUserId, repoIdentifier, timeframe.startDate, timeframe.endDate);
         res.json(components);
     }
     catch (error) {
-        res.status(error.status || 500).json({ error: error.message || 'Failed to load member components' });
-    }
-    finally {
-        if (dbService)
-            await dbService.close();
+        throw error;
     }
 });
 /**
  * GET /api/analytics/team/member/:memberId/jobs/timeline
  */
-router.get('/team/member/:memberId/jobs/timeline', async (req, res) => {
+analyticsGet('/team/member/:memberId/jobs/timeline', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
@@ -1203,64 +1116,49 @@ router.get('/team/member/:memberId/jobs/timeline', async (req, res) => {
         const { memberId } = req.params;
         const { dateUnit, repoIdentifier } = req.query;
         const timeframe = resolveAnalyticsTimeframe(req.query);
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         const memberUserId = await resolveManagerMember(dbService, apiKeyData.userId, memberId);
-        const analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
+        const analyticsService = getAnalyticsService();
         const timeline = await analyticsService.getJobRunsOverTime(timeframe.period, memberUserId, dateUnit, repoIdentifier, timeframe.startDate, timeframe.endDate);
         res.json(timeline);
     }
     catch (error) {
-        res.status(error.status || 500).json({ error: error.message || 'Failed to load member timeline' });
-    }
-    finally {
-        if (dbService)
-            await dbService.close();
+        throw error;
     }
 });
-router.get('/team/member/:memberId/repos', async (req, res) => {
+analyticsGet('/team/member/:memberId/repos', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
         if (!apiKeyData)
             return res.status(401).json({ error: 'Authentication required' });
         const { memberId } = req.params;
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         const memberUserId = await resolveManagerMember(dbService, apiKeyData.userId, memberId);
-        const analyticsService = new usage_analytics_service_js_1.UsageAnalyticsService(dbService);
+        const analyticsService = getAnalyticsService();
         const repos = await analyticsService.getUniqueRepos(memberUserId);
         res.json(repos);
     }
     catch (error) {
-        res.status(error.status || 500).json({ error: error.message || 'Failed to load member repositories' });
-    }
-    finally {
-        if (dbService)
-            await dbService.close();
+        throw error;
     }
 });
 /**
  * GET /api/analytics/team/my-managers
  * Returns list of manager emails for the current user (for transparency notice)
  */
-router.get('/team/my-managers', async (req, res) => {
+analyticsGet('/team/my-managers', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
         if (!apiKeyData)
             return res.status(401).json({ error: 'Authentication required' });
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         const managers = await dbService.getManagersForMember(apiKeyData.userId);
         res.json(managers);
     }
     catch (error) {
-        res.status(500).json({ error: 'Failed to load managers' });
-    }
-    finally {
-        if (dbService)
-            await dbService.close();
+        throw error;
     }
 });
 /**
@@ -1268,7 +1166,7 @@ router.get('/team/my-managers', async (req, res) => {
  * Returns per-interview quality scores and latest gate decision for a team member.
  * Used by the manager dashboard Quality tab (Issue #251).
  */
-router.get('/team/member/:memberId/quality/interviews', async (req, res) => {
+analyticsGet('/team/member/:memberId/quality/interviews', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
@@ -1276,8 +1174,7 @@ router.get('/team/member/:memberId/quality/interviews', async (req, res) => {
             return res.status(401).json({ error: 'Authentication required' });
         const { memberId } = req.params;
         const { repoIdentifier } = req.query;
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         // Privacy check: manager must have active relationship with member
         await resolveManagerMember(dbService, apiKeyData.userId, memberId);
         // Fetch interview quality scores (chronological)
@@ -1330,11 +1227,7 @@ router.get('/team/member/:memberId/quality/interviews', async (req, res) => {
         });
     }
     catch (error) {
-        res.status(error.status || 500).json({ error: error.message || 'Failed to load quality data' });
-    }
-    finally {
-        if (dbService)
-            await dbService.close();
+        throw error;
     }
 });
 /**
@@ -1377,7 +1270,7 @@ router.post('/quality', async (req, res) => {
  * Returns quality scorecard: one summary per founder journey stage.
  * Used by the quality tile grid in both personal and manager views.
  */
-router.get('/quality/scorecard/:userId', async (req, res) => {
+analyticsGet('/quality/scorecard/:userId', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
@@ -1387,8 +1280,7 @@ router.get('/quality/scorecard/:userId', async (req, res) => {
         const { repoIdentifier } = req.query;
         const timeframe = resolveAnalyticsTimeframe(req.query);
         const periodDays = timeframe.startDate ? undefined : parsePeriodDays(timeframe.period);
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         // If requesting another user's data, verify manager-member relationship
         if (apiKeyData.userId !== userId) {
             await resolveManagerMember(dbService, apiKeyData.userId, userId);
@@ -1397,18 +1289,14 @@ router.get('/quality/scorecard/:userId', async (req, res) => {
         res.json({ stages });
     }
     catch (error) {
-        res.status(error.status || 500).json({ error: error.message || 'Failed to load quality scorecard' });
-    }
-    finally {
-        if (dbService)
-            await dbService.close();
+        throw error;
     }
 });
 /**
  * GET /api/analytics/quality/stage/:userId/:stageCategory
  * Returns full assessment history for a single stage (tile click detail view).
  */
-router.get('/quality/stage/:userId/:stageCategory', async (req, res) => {
+analyticsGet('/quality/stage/:userId/:stageCategory', async (req, res) => {
     let dbService;
     try {
         const apiKeyData = req.apiKeyData;
@@ -1418,8 +1306,7 @@ router.get('/quality/stage/:userId/:stageCategory', async (req, res) => {
         const { repoIdentifier } = req.query;
         const timeframe = resolveAnalyticsTimeframe(req.query);
         const periodDays = timeframe.startDate ? undefined : parsePeriodDays(timeframe.period);
-        dbService = new db_service_js_1.FraimDbService();
-        await dbService.connect();
+        dbService = getAnalyticsDatabase();
         // If requesting another user's data, verify manager-member relationship
         if (apiKeyData.userId !== userId) {
             await resolveManagerMember(dbService, apiKeyData.userId, userId);
@@ -1428,11 +1315,7 @@ router.get('/quality/stage/:userId/:stageCategory', async (req, res) => {
         res.json(detail);
     }
     catch (error) {
-        res.status(error.status || 500).json({ error: error.message || 'Failed to load stage detail' });
-    }
-    finally {
-        if (dbService)
-            await dbService.close();
+        throw error;
     }
 });
 /**