@xenon-device-management/xenon 2.9.2 → 2.10.1

package/lib/src/app/routers/dashboard.js

@@ -45,6 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MUTE_REASON_MAX = void 0;
 exports.getRecentHealingEvents = getRecentHealingEvents;
 exports.aggregateHotspots = aggregateHotspots;
 exports.getSelectorHealth = getSelectorHealth;
@@ -59,12 +60,18 @@ const typedi_1 = require("typedi");
 const scopeGuard_1 = require("../../middleware/scopeGuard");
 const roleGuard_1 = require("../../middleware/roleGuard");
 const build_export_1 = __importDefault(require("./build-export"));
+const selector_health_1 = __importDefault(require("./selector-health"));
+const actor_1 = require("../../services/device-access/actor");
+const access_1 = require("../../services/selector-health/access");
 const NotificationService_1 = require("../../services/NotificationService");
 const SelectorStateService_1 = require("../../services/SelectorStateService");
 const path_1 = __importDefault(require("path"));
 const config_1 = require("../../config");
 const sessionVisibility_1 = require("../../services/device-access/sessionVisibility");
 const HealEtalonService_1 = require("../../services/healing/HealEtalonService");
+const metricsBody_1 = require("../../services/metrics/metricsBody");
+const healingTrend_1 = require("../../services/selector-health/healingTrend");
+const SessionMetricsService_1 = require("../../services/metrics/SessionMetricsService");
 const sessionInsights_1 = require("./sessionInsights");
 const logger_1 = __importDefault(require("../../logger"));
 const MJPEG_PROXY_CACHE = new Map();
@@ -324,26 +331,6 @@ function getRecentHealingEvents(request, response) {
         return response.status(200).json({ events, todayCount });
     });
 }
-// Rough per-heal cost estimates in USD. Local tiers are effectively free
-// (CPU/inference cost only); LLM is the headline number testers should
-// optimize against. Surfaced so engineering managers can quantify suite
-// hygiene work without reading raw billing data.
-const TIER_COST_USD = {
-    Native: 0,
-    Resilio: 0,
-    'Fuzzy XML': 0,
-    OCR: 0.0005,
-    'Visual AI': 0.002,
-    LLM: 0.04,
-};
-function estimateCost(byTier) {
-    var _a;
-    let sum = 0;
-    for (const [tier, count] of Object.entries(byTier)) {
-        sum += ((_a = TIER_COST_USD[tier]) !== null && _a !== void 0 ? _a : 0) * count;
-    }
-    return sum;
-}
 function parseWindowDays(raw, fallback = 30) {
     const n = parseInt(typeof raw === 'string' ? raw : '', 10);
     if (!Number.isFinite(n))
@@ -355,6 +342,7 @@ function parseWindowDays(raw, fallback = 30) {
 function getHealingSummary(request, response) {
     return __awaiter(this, void 0, void 0, function* () {
         const windowDays = parseWindowDays(request.query.windowDays);
+        const tz = (0, healingTrend_1.parseTzOffset)(request.query.tz);
         const now = new Date();
         const since = new Date(now);
         since.setDate(since.getDate() - windowDays);
@@ -370,6 +358,8 @@ function getHealingSummary(request, response) {
                     session_id: true,
                     original_selector: true,
                     healing_tier: true,
+                    createdAt: true,
+                    duration: true,
                 },
             }),
             prisma_1.prisma.sessionLog.findMany({
@@ -378,15 +368,20 @@ function getHealingSummary(request, response) {
                     session_id: true,
                     original_selector: true,
                     healing_tier: true,
+                    createdAt: true,
+                    duration: true,
                 },
             }),
         ]);
         const aggregate = (rows) => {
+            var _a;
             const sessions = new Set();
             const selectors = new Set();
             const byTier = {};
+            let timeSpentMs = 0;
             for (const r of rows) {
                 sessions.add(r.session_id);
+                timeSpentMs += (_a = r.duration) !== null && _a !== void 0 ? _a : 0;
                 if (r.original_selector)
                     selectors.add(r.original_selector);
                 const tier = r.healing_tier || 'Unknown';
@@ -397,7 +392,8 @@ function getHealingSummary(request, response) {
                 distinctSelectors: selectors.size,
                 sessionsTouched: sessions.size,
                 byTier,
-                estCostUsd: estimateCost(byTier),
+                // The commands that needed healing, start to end: what healing cost the run.
+                timeSpentMs,
             };
         };
         const current = aggregate(currentRows);
@@ -417,6 +413,7 @@ function getHealingSummary(request, response) {
             prior,
             resolvedCount,
             pendingCount,
+            trend: (0, healingTrend_1.dailyHeals)(currentRows.map((r) => ({ at: r.createdAt, method: r.healing_tier })), since, now, tz),
         });
     });
 }
@@ -624,7 +621,6 @@ function aggregateHotspots(opts) {
             distinctSelectors: buckets.size,
             sessionsTouched: sessionsTouched.size,
             byTier,
-            estCostUsd: estimateCost(byTier),
             hotspots,
         };
     });
@@ -660,7 +656,6 @@ function getHealingViolations(request, response) {
             violationCount: agg.hotspots.length,
             totalHeals: agg.totalHeals,
             distinctSelectors: agg.distinctSelectors,
-            estCostUsd: agg.estCostUsd,
             violations: agg.hotspots,
         });
     });
@@ -685,7 +680,6 @@ function sendHealingDigest(request, response) {
             windowDays,
             totalHeals: agg.totalHeals,
             distinctSelectors: agg.distinctSelectors,
-            estCostUsd: agg.estCostUsd,
             hotspots: agg.hotspots,
         };
         const notifier = typedi_1.Container.get(NotificationService_1.NotificationService);
@@ -801,7 +795,6 @@ function getHealingSelectorDetail(request, response) {
             windowDays,
             healCount: rows.length,
             sessionCount: sessions.size,
-            estCostUsd: estimateCost(byTier),
             byTier,
             byPlatform,
             byBuild: Object.entries(byBuild)
@@ -878,14 +871,24 @@ function getSelectorHealth(request, response) {
 }
 // SelectorState lifecycle action endpoint — mark fixed / mute / unmute /
 // cancel verification. The action vocabulary is closed (any value not in
-// VALID_ACTIONS rejects with 400). A SelectorStateConflictError surfaces as
-// 409 with `currentStatus`; anything else logs and surfaces as 500.
+// VALID_ACTIONS rejects with 400). A member may act on a selector they can
+// see (healed in a session they can see); any other answers 404, as an
+// unknown one. The person acting is recorded (SelectorEvent), with the
+// reason for a mute. A SelectorStateConflictError surfaces as 409 with
+// `currentStatus`; anything else logs and surfaces as 500.
 const VALID_SELECTOR_ACTIONS = ['mark_fixed', 'mute', 'unmute', 'cancel_verification'];
+/** The longest reason a mute may give. */
+exports.MUTE_REASON_MAX = 500;
 function postSelectorStateAction(request, response) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const { original_strategy, original_selector, action } = ((_a = request.body) !== null && _a !== void 0 ? _a : {});
-        if (!original_strategy || !original_selector || !action) {
+        var _a, _b, _c, _d, _e;
+        const { original_strategy, original_selector, action, reason } = ((_a = request.body) !== null && _a !== void 0 ? _a : {});
+        // The strategy may be '': heals recorded before strategies were.
+        if (typeof original_strategy !== 'string' ||
+            typeof original_selector !== 'string' ||
+            !original_selector ||
+            typeof action !== 'string' ||
+            !action) {
             return response.status(400).json({
                 error: 'original_strategy, original_selector, and action are required',
             });
@@ -895,10 +898,29 @@ function postSelectorStateAction(request, response) {
                 error: `action must be one of ${VALID_SELECTOR_ACTIONS.join(', ')}`,
             });
         }
-        const apiKeyId = (_c = (_b = request.apiKey) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : '';
-        const ctx = { strategy: original_strategy, selector: original_selector, apiKeyId };
+        if (reason !== undefined &&
+            reason !== null &&
+            (typeof reason !== 'string' || reason.length > exports.MUTE_REASON_MAX)) {
+            return response.status(400).json({
+                error: `reason must be text of at most ${exports.MUTE_REASON_MAX} characters`,
+            });
+        }
+        const muteReason = action === 'mute' && typeof reason === 'string' ? reason.trim() : '';
+        const ctx = {
+            strategy: original_strategy,
+            selector: original_selector,
+            apiKeyId: (_c = (_b = request.apiKey) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : '',
+            userId: (_d = (0, actor_1.resolveActor)(request).userId) !== null && _d !== void 0 ? _d : null,
+            reason: muteReason || null,
+        };
         const service = typedi_1.Container.get(SelectorStateService_1.SelectorStateService);
         try {
+            // Inside the try: a failed lookup answers 500 rather than leaving the
+            // request open (Express 4 doesn't catch a rejected handler).
+            const scope = (yield (0, sessionVisibility_1.visibleSessionWhere)(authOf(request)));
+            if (!(yield (0, access_1.canSeeSelector)({ strategy: original_strategy, selector: original_selector }, scope))) {
+                return response.status(404).json(access_1.SELECTOR_NOT_FOUND);
+            }
             let row;
             switch (action) {
                 case 'mark_fixed':
@@ -920,7 +942,7 @@ function postSelectorStateAction(request, response) {
             if (err instanceof SelectorStateService_1.SelectorStateConflictError) {
                 return response.status(409).json({ error: err.message, currentStatus: err.currentStatus });
             }
-            logger_1.default.error(`[Dashboard] selector state action failed: ${(_d = err === null || err === void 0 ? void 0 : err.message) !== null && _d !== void 0 ? _d : err}`);
+            logger_1.default.error(`[Dashboard] selector state action failed: ${(_e = err === null || err === void 0 ? void 0 : err.message) !== null && _e !== void 0 ? _e : err}`);
             return response.status(500).json({ error: 'internal' });
         }
     });
@@ -1028,6 +1050,27 @@ function getProfilingData(request, response) {
         return response.status(200).json(profilingData);
     });
 }
+/** A session's CPU and memory samples, for the Performance panel. */
+function getSessionMetrics(request, response) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const sessionId = request.params.sessionId;
+        const [session, rows] = yield Promise.all([
+            prisma_1.prisma.session.findFirst({
+                where: { id: sessionId },
+                select: { device_platform: true, status: true },
+            }),
+            prisma_1.prisma.sessionMetric.findMany({ where: { session_id: sessionId }, orderBy: { at: 'asc' } }),
+        ]);
+        // A running session's page says whether it is sampled, not "Collecting…" for one nothing samples.
+        const recording = (session === null || session === void 0 ? void 0 : session.status) === 'running'
+            ? typedi_1.Container.get(SessionMetricsService_1.SessionMetricsService).recordingState(sessionId)
+            : null;
+        return response
+            .status(200)
+            .json((0, metricsBody_1.sessionMetricsBody)((_a = session === null || session === void 0 ? void 0 : session.device_platform) !== null && _a !== void 0 ? _a : '', rows, recording));
+    });
+}
 function streamLiveSessionVideo(request, response) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -1140,6 +1183,7 @@ function register(router) {
     router.get('/session/:sessionId/logs/device', getDeviceLogs);
     router.get('/session/:sessionId/logs/debug', getDebugLogs);
     router.get('/session/:sessionId/profiling', getProfilingData);
+    router.get('/session/:sessionId/metrics', getSessionMetrics);
     router.get('/session/:sessionId/asset/:kind/:file', getSessionAsset);
     // The healing reads count only heals from sessions the caller may see
     // (visibleSessionWhere); the digest below counts every team's.
@@ -1149,16 +1193,18 @@ function register(router) {
     router.get('/healing/hotspots/violations', getHealingViolations);
     router.get('/healing/selector', getHealingSelectorDetail);
     router.get('/healing/selector-health', getSelectorHealth);
+    // The Selector Health page's list and panel (selector-health.ts).
+    selector_health_1.default.register(router);
     // Outbound notification — admin only since it can fan out to every
     // configured webhook (Slack channels, etc.).
     router.post('/healing/digest/send', (0, roleGuard_1.roleGuard)('ADMIN'), (0, scopeGuard_1.scopeGuard)(['admin']), sendHealingDigest);
-    // SelectorState lifecycle: state mutations require admin (they affect what
-    // shows up in the live hotspot list, the CI gate, and the digest); the two
-    // reads inherit the existing dashboard auth. Both reads stay global, not
-    // team-scoped: a selector's mute or fix is one lab-wide row with no team
-    // column, shared by every team whose tests use that selector. The one
-    // heal-derived field, the muted list's `last_healed_at`, is the caller's.
-    router.post('/healing/selector/state', (0, roleGuard_1.roleGuard)('ADMIN'), (0, scopeGuard_1.scopeGuard)(['admin']), postSelectorStateAction);
+    // SelectorState lifecycle: members act on selectors they can see (the
+    // handler checks, and records who acted); the `sessions` scope is needed,
+    // which `admin` implies. The two reads stay global, not team-scoped: a
+    // selector's mute or fix is one lab-wide row with no team column, shared
+    // by every team whose tests use that selector. The one heal-derived field,
+    // the muted list's `last_healed_at`, is the caller's.
+    router.post('/healing/selector/state', (0, roleGuard_1.roleGuard)('MEMBER'), (0, scopeGuard_1.scopeGuard)(['sessions']), postSelectorStateAction);
     router.get('/healing/state/muted', getMutedSelectors);
     router.get('/healing/state/:strategy/:value', getSelectorStateByTuple);
     router.get('/config', getGlobalConfig);

package/lib/src/app/routers/selector-health.js

@@ -0,0 +1,75 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.callerOf = void 0;
+exports.scopeOf = scopeOf;
+exports.getSelectorList = getSelectorList;
+exports.getSelectorDetail = getSelectorDetail;
+const logger_1 = __importDefault(require("../../logger"));
+const sessionVisibility_1 = require("../../services/device-access/sessionVisibility");
+const access_1 = require("../../services/selector-health/access");
+const selectorDetail_1 = require("../../services/selector-health/selectorDetail");
+const selectorList_1 = require("../../services/selector-health/selectorList");
+const callerOf = (request) => request.auth;
+exports.callerOf = callerOf;
+/** The caller's sessions as a Session `where`; undefined for an admin, or with auth disabled. */
+function scopeOf(request) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield (0, sessionVisibility_1.visibleSessionWhere)((0, exports.callerOf)(request)));
+    });
+}
+/** One tab of Selector Health's list, the four tab counts, and whether the caller may act. */
+function getSelectorList(request, response) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        try {
+            const query = (0, selectorList_1.parseSelectorListQuery)(request.query);
+            const answer = yield (0, selectorList_1.listSelectors)(query, yield scopeOf(request));
+            return response
+                .status(200)
+                .json(Object.assign(Object.assign({}, answer), { canAct: (0, access_1.canActOnSelectors)((_a = (0, exports.callerOf)(request)) === null || _a === void 0 ? void 0 : _a.scopes) }));
+        }
+        catch (err) {
+            logger_1.default.error(`[SelectorHealth] list failed: ${(_b = err === null || err === void 0 ? void 0 : err.message) !== null && _b !== void 0 ? _b : err}`);
+            return response.status(500).json({ error: 'internal' });
+        }
+    });
+}
+/** Everything the side panel shows for one selector, and whether the caller may act on it. */
+function getSelectorDetail(request, response) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const query = (0, selectorDetail_1.parseSelectorDetailQuery)(request.query);
+        if (!query) {
+            return response.status(400).json({ error: 'bad_request', message: 'selector is required' });
+        }
+        try {
+            const detail = yield (0, selectorDetail_1.selectorDetail)(query, yield scopeOf(request));
+            if (!detail)
+                return response.status(404).json(access_1.SELECTOR_NOT_FOUND);
+            return response
+                .status(200)
+                .json(Object.assign(Object.assign({}, detail), { canAct: (0, access_1.canActOnSelectors)((_a = (0, exports.callerOf)(request)) === null || _a === void 0 ? void 0 : _a.scopes) }));
+        }
+        catch (err) {
+            logger_1.default.error(`[SelectorHealth] detail failed: ${(_b = err === null || err === void 0 ? void 0 : err.message) !== null && _b !== void 0 ? _b : err}`);
+            return response.status(500).json({ error: 'internal' });
+        }
+    });
+}
+function register(router) {
+    router.get('/healing/selectors', getSelectorList);
+    router.get('/healing/selectors/detail', getSelectorDetail);
+}
+exports.default = { register };

package/lib/src/app/swagger-docs.js

@@ -218,11 +218,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *   post:
  *     summary: Apply a lifecycle action to a selector
  *     description: |
- *       Mutates the SelectorState row for a (strategy, selector) tuple.
- *       Actions are bounded — `mark_fixed`, `mute`, `unmute`,
- *       `cancel_verification`. Returns 409 with `currentStatus` if the
- *       action is incompatible with the row's current state (e.g.
- *       mark_fixed on a muted selector).
+ *       Mutates the SelectorState row for a (strategy, selector) tuple and
+ *       records the change, with the person, in SelectorEvent. Actions are
+ *       bounded — `mark_fixed`, `mute`, `unmute`, `cancel_verification`.
+ *       Members and admins may act on a selector healed in a session they
+ *       can see; any other answers 404, as an unknown one. Needs the
+ *       `sessions` scope (`admin` implies it). `original_strategy` may be
+ *       empty, for heals recorded with no strategy. Returns 409 with
+ *       `currentStatus` if the action is incompatible with the row's
+ *       current state (e.g. mark_fixed on a muted selector).
  *     tags: [Selector Health]
  *     security:
  *       - apiKey: []
@@ -243,13 +247,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *               action:
  *                 type: string
  *                 enum: [mark_fixed, mute, unmute, cancel_verification]
+ *               reason: { type: string, maxLength: 500, description: 'Why the selector is muted; mute only' }
  *     responses:
  *       200:
  *         description: Updated SelectorState row
  *       400:
- *         description: Missing fields or unknown action
+ *         description: Missing fields, unknown action, or a reason over 500 characters
  *       403:
- *         description: API key lacks `admin` scope
+ *         description: The caller lacks the `sessions` scope
+ *       404:
+ *         description: '`{ error: "not_found", message: "Selector not found" }`'
  *       409:
  *         description: Action conflicts with current state (returns currentStatus)
  *       401: { $ref: '#/components/responses/Unauthorized' }
@@ -1221,6 +1228,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *       - in: query
  *         name: windowDays
  *         schema: { type: integer, minimum: 1, maximum: 365, default: 30 }
+ *       - in: query
+ *         name: tz
+ *         schema: { type: integer, minimum: -840, maximum: 840, default: 0 }
+ *         description: "The caller's offset from UTC in minutes (east positive), so `trend` days are theirs"
  *     responses:
  *       200:
  *         description: KPI summary
@@ -1237,15 +1248,73 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *                     distinctSelectors: { type: integer }
  *                     sessionsTouched: { type: integer }
  *                     byTier: { type: object, additionalProperties: { type: integer } }
- *                     estCostUsd: { type: number }
+ *                     timeSpentMs: { type: integer, description: 'Total duration of the commands that needed healing' }
  *                 prior:
  *                   type: object
  *                   description: 'Same shape as `current` for the immediately preceding window'
  *                 resolvedCount: { type: integer }
  *                 pendingCount: { type: integer }
+ *                 trend:
+ *                   type: array
+ *                   description: 'Heals per day of the period, in the caller''s time zone, days with none included'
+ *                   items:
+ *                     type: object
+ *                     properties:
+ *                       t: { type: integer, description: 'When the day began, epoch ms' }
+ *                       heals: { type: integer }
+ *                       aiHeals: { type: integer, description: 'Heals by Visual AI or an LLM' }
  *       401: { $ref: '#/components/responses/Unauthorized' }
  *       429: { $ref: '#/components/responses/RateLimited' }
  */
+/**
+ * @swagger
+ * /api/healing/selectors:
+ *   get:
+ *     summary: One tab of the Selector Health list
+ *     description: |
+ *       `fix` groups the period's heals by selector and leaves out selectors
+ *       being verified, fixed or muted; the other tabs list the selectors with
+ *       that status (`fixed`: verified within the period). Only selectors
+ *       healed, at any time, in sessions the caller can see. `counts` follow
+ *       the period, not the search or filters. A page past the end answers the
+ *       last page.
+ *     tags: [Selector Health]
+ *     parameters:
+ *       - { in: query, name: tab, schema: { type: string, enum: [fix, verifying, fixed, muted], default: fix } }
+ *       - { in: query, name: days, schema: { type: integer, minimum: 1, maximum: 365, default: 30 } }
+ *       - { in: query, name: q, schema: { type: string }, description: 'Text in the selector, or (fix) in its suggested fix' }
+ *       - { in: query, name: platform, schema: { type: string }, description: 'fix only' }
+ *       - { in: query, name: method, schema: { type: string }, description: 'Healing method, e.g. LLM; fix only' }
+ *       - { in: query, name: sort, schema: { type: string, enum: [heals, recent, time], default: heals }, description: 'fix only' }
+ *       - { in: query, name: page, schema: { type: integer, minimum: 1, default: 1 } }
+ *       - { in: query, name: pageSize, schema: { type: integer, minimum: 1, maximum: 100, default: 50 } }
+ *     responses:
+ *       200: { description: '`{ tab, days, page, pageSize, total, counts, canAct, items }`' }
+ *       401: { $ref: '#/components/responses/Unauthorized' }
+ */
+/**
+ * @swagger
+ * /api/healing/selectors/detail:
+ *   get:
+ *     summary: Everything the Selector Health side panel shows for one selector
+ *     description: |
+ *       Its heals in the period (suggested fixes with their share, methods and
+ *       confidence; heals per day; platforms, builds and devices; the latest 20
+ *       heals), its status, the latest 50 status changes with who made them,
+ *       and whether the caller may act. A selector no session the caller can
+ *       see has healed answers 404, exactly as an unknown one.
+ *     tags: [Selector Health]
+ *     parameters:
+ *       - { in: query, name: selector, required: true, schema: { type: string } }
+ *       - { in: query, name: strategy, schema: { type: string }, description: "Empty for heals recorded with no strategy" }
+ *       - { in: query, name: days, schema: { type: integer, minimum: 1, maximum: 365, default: 30 } }
+ *       - { in: query, name: tz, schema: { type: integer, minimum: -840, maximum: 840, default: 0 } }
+ *     responses:
+ *       200: { description: 'The panel for one selector' }
+ *       400: { description: 'No selector given' }
+ *       404: { description: '`{ error: "not_found", message: "Selector not found" }`' }
+ *       401: { $ref: '#/components/responses/Unauthorized' }
+ */
 /**
  * @swagger
  * /api/healing/digest/send:

package/lib/src/dashboard/event-manager.js

@@ -64,8 +64,6 @@ const asset_manager_1 = require("./asset-manager");
 const commands_1 = require("./commands");
 const SessionStatus_1 = require("../types/SessionStatus");
 const appium_ios_device_1 = require("appium-ios-device");
-const AndroidAppProfiler_1 = require("../profiling/AndroidAppProfiler");
-const appium_adb_1 = require("appium-adb");
 const config_1 = require("../config");
 const helpers_2 = require("../helpers");
 const typedi_1 = require("typedi");
@@ -80,6 +78,7 @@ const SocketEvents_1 = require("../enums/SocketEvents");
 const types_1 = require("../services/healing/types");
 const SelectorStateService_1 = require("../services/SelectorStateService");
 const recording_store_1 = require("../services/recording/recording-store");
+const SessionMetricsService_1 = require("../services/metrics/SessionMetricsService");
 const typedi_2 = require("typedi");
 /**
  * What a Session row keeps of the capabilities the driver returned. The row
@@ -105,8 +104,6 @@ let DashboardEventManager = class DashboardEventManager {
         this.sessionToUdid = new Map();
         // Map session ID to device info
         this.sessionToDevice = new Map();
-        // Store app profilers for Android sessions
-        this.appProfilers = new Map();
         // Track last log line for each session (for device logs)
         this.lastLogLine = new Map();
         // Track start time for each command to calculate duration
@@ -124,8 +121,10 @@ let DashboardEventManager = class DashboardEventManager {
             };
             // create directory to store screenshots, videos and log files for the session
             (0, asset_manager_1.prepareDirectory)(session.getId());
-            // Initialize app profiling for Android sessions
-            const { is_profiling_available, device_info } = yield this.startAppProfiling(session.getId(), device, session.getCapabilities());
+            // CPU and memory for the session page's Performance panel; sampling
+            // starts once the session's row exists, since the samples point at it.
+            const metrics = typedi_1.Container.get(SessionMetricsService_1.SessionMetricsService);
+            const sampled = metrics.appliesTo(device);
             // If iOS real device, start performance recording (Time Profiler)
             // Note: This only works on real devices with XCUITest driver 4.5+
             let isIosProfilingStarted = false;
@@ -149,10 +148,17 @@ let DashboardEventManager = class DashboardEventManager {
             const sessionResponse = lodash_1.default.assign({}, session.getCapabilities());
             const tracingService = typedi_1.Container.get(TracingService_1.TracingService);
             const traceId = tracingService.getTraceId(session.getId());
-            const createData = Object.assign(Object.assign({ id: session.getId(), build: build.id ? { connect: { id: build.id } } : undefined, name: capabilities[XenonCapabilityManager_1.XENON_CAPABILITIES.SESSION_NAME] || undefined }, storedSessionCapabilities(sessionResponse)), { node_id: device.nodeId || '', has_live_video: session.getLiveVideoUrl() !== null, video_recording_enabled: capabilities[XenonCapabilityManager_1.XENON_CAPABILITIES.VIDEO_RECORDING] === true, is_profiling_available: is_profiling_available || isIosProfilingStarted, device_info: device_info ? JSON.stringify(device_info) : null, device_udid: device.udid || '', device_platform: device.platform || '', device_version: device.sdk || '', device_name: device.name, trace_id: traceId, status: 'running', api_key_id: (_a = session.apiKeyId) !== null && _a !== void 0 ? _a : null, user_id: (_b = session.userId) !== null && _b !== void 0 ? _b : null });
+            const createData = Object.assign(Object.assign({ id: session.getId(), build: build.id ? { connect: { id: build.id } } : undefined, name: capabilities[XenonCapabilityManager_1.XENON_CAPABILITIES.SESSION_NAME] || undefined }, storedSessionCapabilities(sessionResponse)), { node_id: device.nodeId || '', has_live_video: session.getLiveVideoUrl() !== null, video_recording_enabled: capabilities[XenonCapabilityManager_1.XENON_CAPABILITIES.VIDEO_RECORDING] === true, is_profiling_available: sampled || isIosProfilingStarted, device_udid: device.udid || '', device_platform: device.platform || '', device_version: device.sdk || '', device_name: device.name, trace_id: traceId, status: 'running', api_key_id: (_a = session.apiKeyId) !== null && _a !== void 0 ? _a : null, user_id: (_b = session.userId) !== null && _b !== void 0 ? _b : null });
             yield prisma_1.prisma.session.create({
                 data: createData,
             });
+            if (sampled) {
+                metrics.start({
+                    sessionId: session.getId(),
+                    device,
+                    capabilities: session.getCapabilities(),
+                });
+            }
             // Emit session started event
             void typedi_1.Container.get(SocketServer_1.SocketServer).emitToDashboardForDevices(SocketEvents_1.SocketEvents.SESSION_STARTED, Object.assign(Object.assign({}, createData), { status: 'running', build_name: buildName }), { udid: device.udid });
             // Increment Metrics
@@ -198,14 +204,14 @@ let DashboardEventManager = class DashboardEventManager {
             this.stoppingSessionIds.add(sessionId);
             try {
                 logger_1.default.info(`🟢 onSessionStopped called for session ${sessionId}`);
+                // However the session ended, in memory or not, its sampler stops here.
+                yield typedi_1.Container.get(SessionMetricsService_1.SessionMetricsService).stop(sessionId);
                 // Video recording is now handled in plugin.ts deleteSession() before the session is deleted
                 // This ensures we can call stop_recording_screen while the session is still active
                 // Here we just handle the session status update
                 const session = SessionManager_1.SESSION_MANAGER.getSession(sessionId);
                 if (session) {
                     logger_1.default.info(`Session ${sessionId} found in SESSION_MANAGER`);
-                    // Save Android profiling data before cleanup
-                    yield this.saveAppProfilingData(sessionId);
                     // iOS profiling is now handled in plugin.ts deleteSession() before the session is deleted
                     // This ensures we can call mobile: stopPerfRecord while the driver is still alive
                     // Clean up syslog service for real iOS devices
@@ -689,96 +695,6 @@ let DashboardEventManager = class DashboardEventManager {
             }
         });
     }
-    startAppProfiling(sessionId, device, sessionCapabilities) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Only support Android profiling
-            if (device.platform.toLowerCase() !== 'android') {
-                return { is_profiling_available: false };
-            }
-            // Check if we have an app package
-            const appPackage = (sessionCapabilities === null || sessionCapabilities === void 0 ? void 0 : sessionCapabilities.appPackage) || (sessionCapabilities === null || sessionCapabilities === void 0 ? void 0 : sessionCapabilities['appium:appPackage']);
-            if (!appPackage) {
-                logger_1.default.info(`[Profiling] No app package found for session ${sessionId}, skipping profiling`);
-                return { is_profiling_available: false };
-            }
-            try {
-                // Principal Intelligence: Use the Properly configured ADB from the manager
-                // instead of a naked instance, to avoid 'defaultArgs not iterable' crashes.
-                const deviceManager = typedi_1.Container.get(device_managers_1.XenonManager);
-                const androidManager = (yield deviceManager.deviceInstances()).find((m) => m instanceof AndroidDeviceManager_1.default);
-                let adb;
-                if (androidManager) {
-                    adb = yield androidManager.getAdbForDevice(device.udid);
-                }
-                else {
-                    adb = yield appium_adb_1.ADB.createADB({});
-                }
-                // Create app profiler
-                const profiler = new AndroidAppProfiler_1.AndroidAppProfiler({
-                    adb,
-                    deviceUDID: device.udid,
-                    appPackage,
-                });
-                // Get device info and start capture
-                const device_info = yield profiler.getDeviceInfo();
-                yield profiler.startCapture();
-                // Store profiler for this session
-                this.appProfilers.set(sessionId, profiler);
-                logger_1.default.info(`[Profiling] Started app profiling for session ${sessionId}`);
-                return {
-                    is_profiling_available: true,
-                    device_info,
-                };
-            }
-            catch (err) {
-                logger_1.default.error(`[Profiling] Error initializing app profiler for session ${sessionId}: ${err.message}`);
-                return { is_profiling_available: false };
-            }
-        });
-    }
-    saveAppProfilingData(sessionId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const profiler = this.appProfilers.get(sessionId);
-            if (!profiler) {
-                return;
-            }
-            try {
-                // Stop capture
-                yield profiler.stopCapture();
-                // Get logs
-                const logs = profiler.getLogs();
-                if (logs.length === 0) {
-                    logger_1.default.info(`[Profiling] No profiling data to save for session ${sessionId}`);
-                    return;
-                }
-                // Save to database
-                const profilingEntries = logs.map((log) => ({
-                    session_id: sessionId,
-                    cpu: log.cpu,
-                    memory: log.memory,
-                    total_cpu_used: log.total_cpu_used.toString(),
-                    total_memory_used: log.total_memory_used.toString(),
-                    raw_cpu_log: log.raw_cpu_log,
-                    raw_memory_log: log.raw_memory_log,
-                    timestamp: new Date(log.timestamp),
-                }));
-                // Batch insert profiling data
-                for (const entry of profilingEntries) {
-                    yield prisma_1.prisma.profiling.create({
-                        data: entry,
-                    });
-                }
-                logger_1.default.info(`[Profiling] Saved ${profilingEntries.length} profiling entries for session ${sessionId}`);
-            }
-            catch (err) {
-                logger_1.default.error(`[Profiling] Error saving profiling data for session ${sessionId}: ${err.message}`);
-            }
-            finally {
-                // Clean up profiler
-                this.appProfilers.delete(sessionId);
-            }
-        });
-    }
     // ─── Recording (free-form mosaic) events ─────────────────────────────────
     // Emitted by RecordingOrchestrator. Distinct namespace from SESSION_*; the
     // dashboard listens to both independently. Team-scoped: a group's started