@xenon-device-management/xenon 2.14.0 → 2.15.0

package/lib/src/sessions/SessionManager.js

@@ -51,7 +51,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SESSION_MANAGER = exports.SessionManager = void 0;
+exports.SESSION_MANAGER = exports.SessionManager = exports.HUB_RESTART_CATEGORY = void 0;
 const os_1 = __importDefault(require("os"));
 const typedi_1 = require("typedi");
 const prisma_1 = require("../prisma");
@@ -62,6 +62,12 @@ const device_store_1 = require("../data-service/device-store");
 const nodeWebDriverUrl_1 = require("../gateway/nodeWebDriverUrl");
 const XenonCapabilityManager_1 = require("../XenonCapabilityManager");
 const nodeMetrics_1 = require("../services/metrics/nodeMetrics");
+/**
+ * The `failure_category` of a session a restart ended: one still running at
+ * boot that couldn't be picked up again. The failure analysis writes every
+ * other category (`ANALYSIS_CATEGORIES`).
+ */
+exports.HUB_RESTART_CATEGORY = 'HUB_RESTART';
 /**
  * SessionManager with persistence and recovery capabilities.
  *
@@ -306,7 +312,7 @@ let SessionManager = class SessionManager {
                         status: 'failed',
                         endTime: new Date(),
                         failure_reason: reason,
-                        failure_category: 'HUB_RESTART',
+                        failure_category: exports.HUB_RESTART_CATEGORY,
                     },
                 });
             }

package/lib/src/sessions/sessionMemory.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.forgetSessionMemory = forgetSessionMemory;
+const typedi_1 = require("typedi");
+const OmniVisionService_1 = require("../services/omni-vision/OmniVisionService");
+const AutowaitService_1 = require("../services/autowait/AutowaitService");
+/**
+ * Drop what this server keeps in memory for a session's commands: the
+ * elements its finds and heals found in screenshots (OmniVisionService) and
+ * its autowait settings (AutowaitService). Called however the session ends
+ * here: the test's delete (SessionLifecycleService.deleteSession), Appium's
+ * new-command timeout or a crash (XenonPlugin.onUnexpectedShutdown), the idle
+ * release (releaseBlockedDevices), a stale heartbeat (OrphanSweeper) and a
+ * shutdown's drain (stopSessionForShutdown). Safe to call more than once.
+ *
+ * Through 2.14 the elements were never dropped, and the autowait settings
+ * only by the interceptor on `deleteSession`, a command Appium never hands
+ * it: XenonPlugin answers `deleteSession` itself.
+ */
+function forgetSessionMemory(sessionId) {
+    if (!sessionId)
+        return;
+    typedi_1.Container.get(OmniVisionService_1.OmniVisionService).forgetSession(sessionId);
+    typedi_1.Container.get(AutowaitService_1.AutowaitService).clearSession(sessionId);
+}

package/lib/test/helpers/fake-ai-provider.js

@@ -0,0 +1,188 @@
+"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.OLLAMA_URL = exports.PROVIDERS = void 0;
+exports.useFakeAiProviders = useFakeAiProviders;
+const axios_1 = __importDefault(require("axios"));
+const sinon_1 = __importDefault(require("sinon"));
+const config_1 = require("../../src/config");
+exports.PROVIDERS = ['gemini', 'openai', 'anthropic', 'ollama'];
+const AI_SETTINGS = [
+    'aiProvider',
+    'aiModel',
+    'aiBaseUrl',
+    'geminiApiKey',
+    'openaiApiKey',
+    'anthropicApiKey',
+    'geminiModel',
+    'openaiModel',
+    'anthropicModel',
+    'ollamaModel',
+];
+exports.OLLAMA_URL = 'http://ollama.test:11434';
+function json(status, body) {
+    return new Response(JSON.stringify(body), {
+        status,
+        // The OpenAI and Anthropic SDKs retry a 429 after a pause unless told not to.
+        headers: { 'content-type': 'application/json', 'x-should-retry': 'false' },
+    });
+}
+function okBody(provider, text) {
+    switch (provider) {
+        case 'gemini':
+            return {
+                candidates: [
+                    { content: { role: 'model', parts: [{ text }] }, finishReason: 'STOP', index: 0 },
+                ],
+            };
+        case 'openai':
+            return {
+                id: 'chatcmpl-test',
+                object: 'chat.completion',
+                created: 0,
+                model: 'test',
+                choices: [
+                    { index: 0, message: { role: 'assistant', content: text }, finish_reason: 'stop' },
+                ],
+            };
+        case 'anthropic':
+            return {
+                id: 'msg_test',
+                type: 'message',
+                role: 'assistant',
+                model: 'test',
+                content: [{ type: 'text', text }],
+                stop_reason: 'end_turn',
+                usage: { input_tokens: 1, output_tokens: 1 },
+            };
+        default:
+            return { response: text };
+    }
+}
+function errorBody(provider, status, said) {
+    const message = said !== null && said !== void 0 ? said : (status === 429 ? 'Resource has been exhausted (e.g. check quota).' : `HTTP ${status}`);
+    switch (provider) {
+        case 'gemini':
+            return { error: { code: status, message, status: 'RESOURCE_EXHAUSTED' } };
+        case 'anthropic':
+            return { type: 'error', error: { type: 'rate_limit_error', message } };
+        default:
+            return { error: { message, type: 'requests', code: 'rate_limit_exceeded' } };
+    }
+}
+function aborted() {
+    const err = new Error('This operation was aborted');
+    err.name = 'AbortError';
+    return err;
+}
+/** Resolves never, and rejects as fetch does when the request's signal aborts. */
+function hangUntilAborted(signal) {
+    return new Promise((_, reject) => {
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted)
+            return reject(aborted());
+        signal === null || signal === void 0 ? void 0 : signal.addEventListener('abort', () => reject(aborted()));
+    });
+}
+function useFakeAiProviders() {
+    let saved = {};
+    let savedMockEnv;
+    let provider = 'gemini';
+    let current = { status: 500 };
+    let ollamaUp = true;
+    const calls = [];
+    const sandbox = sinon_1.default.createSandbox();
+    beforeEach(() => {
+        saved = Object.fromEntries(AI_SETTINGS.map((k) => [k, config_1.config[k]]));
+        savedMockEnv = process.env.GEMINI_API_KEY;
+        // 'mock' would put the service in its built-in mock mode.
+        if (process.env.GEMINI_API_KEY === 'mock')
+            delete process.env.GEMINI_API_KEY;
+        for (const k of AI_SETTINGS)
+            config_1.config[k] = undefined;
+        config_1.config.aiProvider = 'gemini';
+        calls.length = 0;
+        current = { status: 500 };
+        ollamaUp = true;
+        sandbox.stub(globalThis, 'fetch').callsFake(((_url, init) => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            const signal = (_a = init === null || init === void 0 ? void 0 : init.signal) !== null && _a !== void 0 ? _a : undefined;
+            calls.push({ provider, body: String((_b = init === null || init === void 0 ? void 0 : init.body) !== null && _b !== void 0 ? _b : ''), signal });
+            if (current === 'hang')
+                return hangUntilAborted(signal);
+            if ('text' in current)
+                return json(200, okBody(provider, current.text));
+            return json(current.status, errorBody(provider, current.status, current.message));
+        })));
+        // Ollama: its health check answers, then the generate call as told.
+        sandbox.stub(axios_1.default, 'get').callsFake(((url) => __awaiter(this, void 0, void 0, function* () {
+            if (url.startsWith(exports.OLLAMA_URL)) {
+                if (ollamaUp)
+                    return { status: 200, data: { models: [] } };
+                throw Object.assign(new Error(`connect ECONNREFUSED ${exports.OLLAMA_URL}`), {
+                    code: 'ECONNREFUSED',
+                });
+            }
+            throw new Error(`no network in tests: GET ${url}`);
+        })));
+        sandbox.stub(axios_1.default, 'post').callsFake(((url, body, cfg) => __awaiter(this, void 0, void 0, function* () {
+            if (!url.startsWith(exports.OLLAMA_URL))
+                throw new Error(`no network in tests: POST ${url}`);
+            const signal = cfg === null || cfg === void 0 ? void 0 : cfg.signal;
+            calls.push({ provider: 'ollama', body: JSON.stringify(body), signal });
+            if (current === 'hang')
+                return hangUntilAborted(signal);
+            if ('text' in current)
+                return { status: 200, data: okBody('ollama', current.text) };
+            const err = new Error(`Request failed with status code ${current.status}`);
+            err.response = {
+                status: current.status,
+                data: errorBody('ollama', current.status, current.message),
+            };
+            throw err;
+        })));
+    });
+    afterEach(() => {
+        sandbox.restore();
+        for (const k of AI_SETTINGS)
+            config_1.config[k] = saved[k];
+        if (savedMockEnv === undefined)
+            delete process.env.GEMINI_API_KEY;
+        else
+            process.env.GEMINI_API_KEY = savedMockEnv;
+    });
+    return {
+        calls,
+        use(name, opts = {}) {
+            provider = name;
+            const model = `test-${name}-${Math.random().toString(36).slice(2)}`;
+            const key = opts.key === false ? undefined : 'test-key';
+            config_1.config.aiProvider = name;
+            if (name === 'gemini')
+                Object.assign(config_1.config, { geminiApiKey: key, geminiModel: model });
+            if (name === 'openai')
+                Object.assign(config_1.config, { openaiApiKey: key, openaiModel: model });
+            if (name === 'anthropic')
+                Object.assign(config_1.config, { anthropicApiKey: key, anthropicModel: model });
+            if (name === 'ollama')
+                Object.assign(config_1.config, { aiBaseUrl: exports.OLLAMA_URL, ollamaModel: model });
+            return { model };
+        },
+        answer(answer) {
+            current = answer;
+        },
+        ollamaUp(up) {
+            ollamaUp = up;
+        },
+    };
+}

package/lib/test/helpers/loki-stores.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLokiStores = useLokiStores;
+exports.usePrismaStores = usePrismaStores;
 const device_store_1 = require("../../src/data-service/device-store");
+const prisma_store_1 = require("../../src/data-service/prisma-store");
 // DeviceStoreFactory's cached stores, one per kind.
 const CACHES = ['_deviceStore', '_pendingSessionStore', '_cliArgsStore', '_healEtalonStore'];
 /**
@@ -39,3 +41,34 @@ function useLokiStores() {
             process.env.NODE_ENV = previousEnv;
     });
 }
+/**
+ * The Prisma stores (what a server with SQLite runs) for the enclosing
+ * `describe`, however the file was started. Put the suite's database behind
+ * them first: `useScratchDatabase({ wholeSuite: true })`.
+ *
+ * `npm run test:all` sets NODE_ENV to 'test', so DeviceStoreFactory hands it
+ * Loki stores, while `npx mocha <file>` gets Prisma ones. A spec written
+ * against the Prisma store's queries then tested Loki in the full run, and its
+ * phones stayed in Loki's one collection for every later spec. This hands the
+ * factory new Prisma stores for the suite, then puts the old ones back. A
+ * module that took its store when it was imported (`grid.ts`) keeps that one.
+ *
+ * Call it inside a `describe`, before the hooks that use a store, never at the
+ * top of a file.
+ */
+function usePrismaStores() {
+    const factory = device_store_1.DeviceStoreFactory;
+    const saved = {};
+    before(() => {
+        for (const key of CACHES)
+            saved[key] = factory[key];
+        factory._deviceStore = new prisma_store_1.PrismaDeviceStore();
+        factory._pendingSessionStore = new prisma_store_1.PrismaPendingSessionStore();
+        factory._cliArgsStore = new prisma_store_1.PrismaCLIArgsStore();
+        factory._healEtalonStore = new prisma_store_1.PrismaHealEtalonStore();
+    });
+    after(() => {
+        for (const key of CACHES)
+            factory[key] = saved[key];
+    });
+}

package/lib/test/helpers/page-sources.js

@@ -0,0 +1,164 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ios = exports.android = void 0;
+exports.elementIdOf = elementIdOf;
+exports.pageDriver = pageDriver;
+const xmldom_1 = require("@xmldom/xmldom");
+const xpath_1 = require("xpath");
+/**
+ * Page sources shaped like the drivers' own (UiAutomator2's `hierarchy`,
+ * XCUITest's `AppiumAUT`), and a driver that answers finds by running the
+ * XPath on them, as the real drivers do, for specs that check which element a
+ * healed locator selects. No phone.
+ */
+const W3C_ELEMENT_KEY = 'element-6066-11e4-a52e-4f735466cecf';
+const attrs = (o) => Object.entries(o)
+    .map(([k, v]) => `${k}="${v}"`)
+    .join(' ');
+function androidNode(tag, index, bounds, extra = {}, children) {
+    const a = attrs(Object.assign({ index, package: 'com.example.shop', class: tag, text: '', 'resource-id': '', 'content-desc': '', checkable: 'false', checked: 'false', clickable: 'false', enabled: 'true', focusable: 'false', focused: 'false', 'long-clickable': 'false', password: 'false', scrollable: 'false', selected: 'false', bounds, displayed: 'true' }, extra));
+    return children === undefined ? `<${tag} ${a} />` : `<${tag} ${a}>${children}</${tag}>`;
+}
+exports.android = {
+    button: (index, id, text, bounds) => androidNode('android.widget.Button', index, bounds, {
+        'resource-id': `com.example.shop:id/${id}`,
+        text,
+        'content-desc': text,
+        clickable: 'true',
+        focusable: 'true',
+    }),
+    field: (index, id, text, bounds) => androidNode('android.widget.EditText', index, bounds, {
+        'resource-id': `com.example.shop:id/${id}`,
+        text,
+        clickable: 'true',
+        focusable: 'true',
+    }),
+    text: (index, id, text, bounds) => androidNode('android.widget.TextView', index, bounds, {
+        'resource-id': `com.example.shop:id/${id}`,
+        text,
+    }),
+    image: (index, id, description, bounds) => androidNode('android.widget.ImageView', index, bounds, {
+        'resource-id': `com.example.shop:id/${id}`,
+        'content-desc': description,
+    }),
+    /** A clickable row holding other elements, as list rows and compound buttons are. */
+    row: (index, id, bounds, children) => androidNode('android.widget.LinearLayout', index, bounds, { 'resource-id': `com.example.shop:id/${id}`, clickable: 'true', focusable: 'true' }, children),
+    layout: (index, id, bounds, children) => androidNode('android.widget.LinearLayout', index, bounds, { 'resource-id': id ? `com.example.shop:id/${id}` : '' }, children),
+    page: (children) => "<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>" +
+        '<hierarchy index="0" class="hierarchy" rotation="0" width="1080" height="2220">' +
+        androidNode('android.widget.FrameLayout', 0, '[0,0][1080,2220]', {}, children) +
+        '</hierarchy>',
+};
+function iosNode(type, a, children = '') {
+    return `<${type} ${attrs(Object.assign({ type, enabled: 'true', visible: 'true', accessible: 'true' }, a))}>${children}</${type}>`;
+}
+exports.ios = {
+    button: (name, label, y) => iosNode('XCUIElementTypeButton', { name, label, x: 20, y, width: 350, height: 44 }),
+    field: (name, value, y) => iosNode('XCUIElementTypeTextField', { name, value, x: 20, y, width: 350, height: 44 }),
+    group: (children) => iosNode('XCUIElementTypeOther', { x: 0, y: 100, width: 390, height: 600 }, children),
+    page: (children) => '<?xml version="1.0" encoding="UTF-8"?><AppiumAUT>' +
+        iosNode('XCUIElementTypeApplication', { name: 'Shop', label: 'Shop', x: 0, y: 0, width: 390, height: 844 }, iosNode('XCUIElementTypeWindow', { x: 0, y: 0, width: 390, height: 844 }, children)) +
+        '</AppiumAUT>',
+};
+/** The element id the fake driver gives an element: its resource-id or name. */
+function elementIdOf(el) {
+    return `el:${el.getAttribute('resource-id') || el.getAttribute('name') || el.tagName}`;
+}
+/**
+ * A driver showing `pageSource`: finds run the XPath on it and answer the
+ * first match, attributes and rects are the element's own. `show` changes the
+ * screen.
+ */
+function pageDriver(pageSource) {
+    let doc = new xmldom_1.DOMParser().parseFromString(pageSource, 'text/xml');
+    let source = pageSource;
+    const known = new Map();
+    const select = (using, value) => {
+        if (using !== 'xpath')
+            throw new Error(`unsupported locator strategy ${using}`);
+        return (0, xpath_1.select)(value, doc).filter((n) => n.nodeType === 1);
+    };
+    const ref = (el) => {
+        const id = elementIdOf(el);
+        known.set(id, el);
+        return { ELEMENT: id, [W3C_ELEMENT_KEY]: id };
+    };
+    const element = (id) => {
+        const el = known.get(id);
+        if (!el)
+            throw new Error(`no element ${id}`);
+        return el;
+    };
+    return {
+        show(next) {
+            source = next;
+            doc = new xmldom_1.DOMParser().parseFromString(next, 'text/xml');
+        },
+        getPageSource() {
+            return __awaiter(this, void 0, void 0, function* () {
+                return source;
+            });
+        },
+        findElement(using, value) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const [first] = select(using, value);
+                if (!first) {
+                    throw Object.assign(new Error('NoSuchElement: An element could not be located'), {
+                        name: 'NoSuchElementError',
+                    });
+                }
+                return ref(first);
+            });
+        },
+        findElements(using, value) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return select(using, value).map(ref);
+            });
+        },
+        caps: { platformName: /<XCUIElementType/.test(pageSource) ? 'iOS' : 'Android' },
+        /**
+         * As the drivers answer: getAttribute(name, elementId). UiAutomator2
+         * answers String(value), so an attribute the element hasn't set is
+         * "null"; WebDriverAgent answers null.
+         */
+        getAttribute(name, id) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const value = element(id).getAttribute(name);
+                if (value)
+                    return value;
+                return /<XCUIElementType/.test(source) ? null : 'null';
+            });
+        },
+        getName(id) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return element(id).tagName;
+            });
+        },
+        getElementRect(id) {
+            return __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const el = element(id);
+                const bounds = el.getAttribute('bounds');
+                if (bounds) {
+                    const [x1, y1, x2, y2] = ((_a = bounds.match(/\d+/g)) !== null && _a !== void 0 ? _a : []).map(Number);
+                    return { x: x1, y: y1, width: x2 - x1, height: y2 - y1 };
+                }
+                return {
+                    x: Number(el.getAttribute('x')),
+                    y: Number(el.getAttribute('y')),
+                    width: Number(el.getAttribute('width')),
+                    height: Number(el.getAttribute('height')),
+                };
+            });
+        },
+    };
+}

package/lib/test/helpers/scratch-database.js

@@ -52,16 +52,54 @@ const MODELS = [
     'sessionMetric',
     'selectorEvent',
 ];
+let scratchCount = 0;
+let template;
+/**
+ * A database migrated once for the whole process, which each suite copies.
+ * Removed when the process exits.
+ */
+function migratedTemplate() {
+    if (template)
+        return template;
+    const file = path_1.default.join(os_1.default.tmpdir(), `xenon-scratch-template-${process.pid}-${Date.now()}.db`);
+    (0, child_process_1.execSync)('npx prisma migrate deploy', {
+        cwd: path_1.default.resolve(__dirname, '../..'),
+        env: Object.assign(Object.assign({}, process.env), { DATABASE_URL: `file:${file}` }),
+        stdio: 'pipe',
+    });
+    process.once('exit', () => {
+        for (const f of [file, `${file}-journal`]) {
+            try {
+                fs_1.default.unlinkSync(f);
+            }
+            catch (_a) {
+                // already gone
+            }
+        }
+    });
+    template = file;
+    return file;
+}
 /**
  * Back the whole `prisma` wrapper with a scratch SQLite file for the enclosing
  * `describe`, so the real queries (the device store, the session lifecycle,
  * SessionOwnerResolver) run against a real database that is not the server's.
  * Like useScratchPortLeases, for every model.
  *
- * Call it inside a `describe`, never at the top of a file. The database is
- * migrated once per suite; the stubs are made before each test and removed
- * after it, so a spec's own `sinon.restore()` can't leave the next test on
- * the real database. Tests empty the tables they use.
+ * Call it inside a `describe`, never at the top of a file. Each suite gets a
+ * fresh database: a copy of one migrated once per process (migrating takes
+ * seconds). The stubs are made before each test and removed after it, so a
+ * spec's own `sinon.restore()` can't leave the next test on the real
+ * database. Tests empty the tables they use.
+ *
+ * With `wholeSuite`, the stubs are made once, before the suite's own `before`
+ * hooks (call it first in the describe), and removed after the suite. Making
+ * them takes tens of milliseconds, which a suite of hundreds of short tests
+ * otherwise pays per test. Its `before` hooks can then seed the rows every
+ * test reads, and nothing needs deleting: the file goes with the suite. Only
+ * for a suite that doesn't stub or restore `prisma` itself. Its own `after`
+ * hooks run once the stubs are gone, so they must not touch `prisma`: it is
+ * the real database again by then.
  *
  * With `captureQueries`, `queries` holds the SQL each test ran, so a spec can
  * ask SQLite how it reads a table (`EXPLAIN QUERY PLAN`).
@@ -72,13 +110,10 @@ function useScratchDatabase(options = {}) {
     let dbPath = '';
     before(function () {
         this.timeout(90000);
-        dbPath = path_1.default.join(os_1.default.tmpdir(), `xenon-scratch-${process.pid}-${Date.now()}.db`);
+        scratchCount += 1;
+        dbPath = path_1.default.join(os_1.default.tmpdir(), `xenon-scratch-${process.pid}-${Date.now()}-${scratchCount}.db`);
+        fs_1.default.copyFileSync(migratedTemplate(), dbPath);
         const url = `file:${dbPath}`;
-        (0, child_process_1.execSync)('npx prisma migrate deploy', {
-            cwd: path_1.default.resolve(__dirname, '../..'),
-            env: Object.assign(Object.assign({}, process.env), { DATABASE_URL: url }),
-            stdio: 'pipe',
-        });
         if (options.captureQueries) {
             const db = new client_1.PrismaClient({
                 datasources: { db: { url } },
@@ -90,9 +125,10 @@ function useScratchDatabase(options = {}) {
         else {
             ctx.db = new client_1.PrismaClient({ datasources: { db: { url } } });
         }
+        if (options.wholeSuite)
+            stubPrisma();
     });
-    beforeEach(() => {
-        ctx.queries.length = 0;
+    function stubPrisma() {
         for (const model of MODELS) {
             const wrapper = prisma_1.prisma[model];
             const delegate = ctx.db[model];
@@ -102,8 +138,16 @@ function useScratchDatabase(options = {}) {
                 sandbox.stub(wrapper, name).callsFake((...args) => delegate[name](...args));
             }
         }
+    }
+    beforeEach(() => {
+        ctx.queries.length = 0;
+        if (!options.wholeSuite)
+            stubPrisma();
+    });
+    afterEach(() => {
+        if (!options.wholeSuite)
+            sandbox.restore();
     });
-    afterEach(() => sandbox.restore());
     after(() => __awaiter(this, void 0, void 0, function* () {
         sandbox.restore();
         if (ctx.db)

package/lib/test/integration/audit-ingest.spec.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const chai_1 = require("chai");
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const sinon_1 = __importDefault(require("sinon"));
 // Static import (matches the passing integration-spec idiom, e.g. selector-health-endpoint.spec):
 // a dynamic `await import('...routers/audit')` fails ESM resolution on the extensionless path
@@ -37,7 +37,7 @@ describe('POST /xenon/api/audit/events', () => {
         app.use('/xenon/api/audit', (0, audit_1.makeRouter)({ eventLogService: eventLogSvc }));
     });
     it('202s on a valid batch of 2 events and appends each via EventLogService.appendSafe with type mcp_audit', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/audit/events')
             .send({
             events: [
@@ -70,20 +70,20 @@ describe('POST /xenon/api/audit/events', () => {
         (0, chai_1.expect)(secondArg.payload).to.deep.include({ sessionId: 'sess-1' });
     }));
     it('400s when events is missing', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(app).post('/xenon/api/audit/events').send({});
+        const res = yield (0, loopbackRequest_1.default)(app).post('/xenon/api/audit/events').send({});
         (0, chai_1.expect)(res.status).to.equal(400);
         (0, chai_1.expect)(res.body.error).to.equal('bad_request');
         (0, chai_1.expect)(eventLogSvc.appendSafe.called).to.be.false;
     }));
     it('400s when events is not an array', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/audit/events')
             .send({ events: 'nope' });
         (0, chai_1.expect)(res.status).to.equal(400);
         (0, chai_1.expect)(res.body.error).to.equal('bad_request');
     }));
     it('400s when a batch event is malformed (missing tool)', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/audit/events')
             .send({
             events: [{ subject: 'agent-1', decision: 'allow', latencyMs: 10 }],
@@ -100,7 +100,7 @@ describe('POST /xenon/api/audit/events', () => {
             decision: 'allow',
             latencyMs: i,
         }));
-        const res = yield (0, supertest_1.default)(app).post('/xenon/api/audit/events').send({ events });
+        const res = yield (0, loopbackRequest_1.default)(app).post('/xenon/api/audit/events').send({ events });
         (0, chai_1.expect)(res.status).to.equal(400);
         (0, chai_1.expect)(res.body.error).to.equal('bad_request');
         (0, chai_1.expect)(eventLogSvc.appendSafe.called).to.be.false;
@@ -131,12 +131,12 @@ describe('POST /xenon/api/audit/events — guard (router-level roleGuard(MEMBER)
     });
     it('401s when unauthenticated', () => __awaiter(void 0, void 0, void 0, function* () {
         const app = yield makeApp(eventLogSvc)();
-        const res = yield (0, supertest_1.default)(app).post('/xenon/api/audit/events').send(validBody);
+        const res = yield (0, loopbackRequest_1.default)(app).post('/xenon/api/audit/events').send(validBody);
         (0, chai_1.expect)(res.status).to.equal(401);
     }));
     it('403s for a role below MEMBER', () => __awaiter(void 0, void 0, void 0, function* () {
         const app = yield makeApp(eventLogSvc)();
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/audit/events')
             .set('x-test-role', 'BOGUS')
             .set('x-test-scopes', 'admin')
@@ -145,7 +145,7 @@ describe('POST /xenon/api/audit/events — guard (router-level roleGuard(MEMBER)
     }));
     it('403s for MEMBER role without the admin scope', () => __awaiter(void 0, void 0, void 0, function* () {
         const app = yield makeApp(eventLogSvc)();
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/audit/events')
             .set('x-test-role', 'MEMBER')
             .set('x-test-scopes', 'devices')
@@ -155,7 +155,7 @@ describe('POST /xenon/api/audit/events — guard (router-level roleGuard(MEMBER)
     }));
     it('202s for MEMBER role with the admin scope', () => __awaiter(void 0, void 0, void 0, function* () {
         const app = yield makeApp(eventLogSvc)();
-        const res = yield (0, supertest_1.default)(app)
+        const res = yield (0, loopbackRequest_1.default)(app)
             .post('/xenon/api/audit/events')
             .set('x-test-role', 'MEMBER')
             .set('x-test-scopes', 'admin')