swipium 1.4.0 → 2.0.0

package/dist/session/processRegistry.js

@@ -0,0 +1,433 @@
+// Cross-restart registry of the long-lived child processes Swipium spawns (Metro bundler,
+// managed WDA xcodebuild, screen recorders, emulators) in ~/.swipium/processes.json, so a
+// crashed server's orphans can be reaped on the next startup.
+//
+// Safety rules:
+//  - Every entry records the OWNING server pid. A child whose owner is still a live
+//    node/swipium process belongs to a concurrent server instance and is never touched.
+//  - Every entry records the child's FINGERPRINT at spawn time: its start time
+//    (`ps -o lstart=`, read under LC_ALL=C so the format is locale-independent) and full command
+//    line (for WDA that includes the project path and `-destination id=<udid>`). Before
+//    signalling (or adopting), both are re-read via `ps`. The START TIME must match exactly (the
+//    hard pid-recycling guard: a recycled pid has a different start time). The command must match
+//    per kind: for WDA / recordings / emulators the program is compared by BASENAME and the
+//    argument tail exactly (Xcode's /usr/bin/xcodebuild and xcrun shims re-exec the real tool
+//    under the same pid + start time, so `xcodebuild -project …` later reads
+//    `/Applications/Xcode.app/…/usr/bin/xcodebuild -project …`); for Metro (spawned via `npx`, which
+//    npm retitles right after spawn: `node …/npx react-native start` > `npm exec react-native
+//    start`) the launcher-stripped program+args tail must match. A PID recycled by the OS to
+//    an unrelated process (another node, the adb server, the user's own xcodebuild/Appium WDA) is
+//    never killed or adopted. Entries without a fingerprint (written by an older build, or when
+//    `ps` was unavailable) are unverifiable and are dropped without signalling.
+//  - A process GROUP is only signalled when Swipium created the child as a group leader
+//    (spawned detached: pgid == pid at registration); otherwise only the pid itself is signalled.
+//  - The owning server's start time is recorded too, so a recycled server pid (any node process)
+//    is not mistaken for a live concurrent server.
+//  - Emulators are ADOPTED, not killed: an orphaned emulator stays booted and remains
+//    usable via adb for the next run.
+//  - Managed WDA (xcodebuild test-without-building) is deliberately NOT stopped on a graceful
+//    shutdown either (only Metro and screen recorders are; see startServer), so the next server
+//    can resume the iOS session on the same WDA. At startup an orphaned WDA entry is ADOPTED when
+//    it is younger than WDA_ADOPT_MAX_AGE_MS (12 h) AND its recorded endpoint answers GET /status
+//    ready; adoption keeps the entry and re-owns it (serverPid = this server), so `qa_wda stop`
+//    can still stop it and a later crash/restart applies the same rule. An older, unhealthy, or
+//    endpoint-less WDA entry is reaped like any other orphan.
+import { existsSync, mkdirSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { homedir } from 'node:os';
+import { spawnSync } from 'node:child_process';
+import { withFileLock, writeFileAtomicSync } from '../lib/lockfile.js';
+import { log } from '../lib/logger.js';
+import { checkWda } from '../lib/wda.js';
+/** An orphaned managed WDA older than this is reaped even when healthy (bounded lifetime). */
+export const WDA_ADOPT_MAX_AGE_MS = 12 * 60 * 60 * 1000;
+const WDA_ADOPT_PROBE_TIMEOUT_MS = 1500;
+const REGISTRY_DIR = join(homedir(), '.swipium');
+const PROCESSES_FILE = join(REGISTRY_DIR, 'processes.json');
+const PROCESSES_LOCK = `${PROCESSES_FILE}.lock`;
+const MAX_ENTRIES = 100;
+/** Coarse sanity check on top of the exact fingerprint match (defence in depth). */
+const KIND_COMMAND_RE = {
+    metro: /metro|expo|react-native|npx|npm|node/i,
+    wda: /xcodebuild/i,
+    recording: /screenrecord|recordvideo|simctl|adb/i,
+    emulator: /emulator|qemu/i,
+};
+const norm = (s) => (s == null ? null : s.trim().replace(/\s+/g, ' ') || null);
+function pidAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/** Environment for every `ps` we parse: the C locale, so `lstart` is always `Mon Sep 28 …`
+ *  (under e.g. de_DE it would be `Mo. 28 Sep. …` and never match a fingerprint taken elsewhere). */
+export function psEnv(base = process.env) {
+    return { ...base, LC_ALL: 'C', LANG: 'C' };
+}
+/** A `ps -o <field>=` value for `pid`, or null when it is gone / unreadable (POSIX `ps`). */
+function psField(pid, field) {
+    if (process.platform === 'win32')
+        return null;
+    try {
+        const out = spawnSync('ps', ['-o', `${field}=`, '-p', String(pid)], { encoding: 'utf8', env: psEnv() });
+        if (out.status !== 0 || !out.stdout?.trim())
+            return null;
+        return out.stdout.trim();
+    }
+    catch {
+        return null;
+    }
+}
+const psCommand = (pid) => psField(pid, 'command');
+const psStartTime = (pid) => norm(psField(pid, 'lstart'));
+function psPgid(pid) {
+    const n = Number(psField(pid, 'pgid'));
+    return Number.isInteger(n) && n > 0 ? n : null;
+}
+function readEntries() {
+    try {
+        if (!existsSync(PROCESSES_FILE))
+            return [];
+        const parsed = JSON.parse(readFileSync(PROCESSES_FILE, 'utf8'));
+        if (!Array.isArray(parsed))
+            return [];
+        return parsed.filter((e) => typeof e?.pid === 'number');
+    }
+    catch (e) {
+        log('warn', 'managed-process registry unreadable, starting fresh', { file: PROCESSES_FILE, err: String(e) });
+        return [];
+    }
+}
+function writeEntries(entries) {
+    writeFileAtomicSync(PROCESSES_FILE, JSON.stringify(entries.slice(-MAX_ENTRIES), null, 2)); // tmp + rename (Windows-retried)
+}
+function mutateEntries(fn) {
+    try {
+        mkdirSync(REGISTRY_DIR, { recursive: true });
+        withFileLock(PROCESSES_LOCK, () => writeEntries(fn(readEntries())));
+    }
+    catch (e) {
+        log('error', 'failed to update managed-process registry; a crash may leave this child unreaped', {
+            file: PROCESSES_FILE,
+            err: String(e),
+        });
+    }
+}
+/** Capture a live child's fingerprint (start time, command, group leadership) + our own start. */
+export function captureFingerprint(pid, ops = REAL_OPS) {
+    const procStart = norm(ops.psStartTime(pid));
+    const command = norm(ops.psCommand(pid));
+    const serverStart = norm(ops.psStartTime(process.pid));
+    return {
+        ...(procStart ? { procStart } : {}),
+        ...(command ? { command } : {}),
+        groupLeader: ops.psPgid(pid) === pid,
+        ...(serverStart ? { serverStart } : {}),
+    };
+}
+/** Record a long-lived child we spawned so a future server instance can reap it if we crash.
+ *  Must be called right after spawn() returned a pid (the child has exec'd by then), so the
+ *  recorded fingerprint is the child's own. */
+export function registerManagedProcess(pid, kind, sessionId, extra = {}) {
+    if (!pid || pid <= 0)
+        return;
+    const fp = captureFingerprint(pid, extra.ops);
+    mutateEntries((entries) => [
+        ...entries.filter((e) => e.pid !== pid),
+        { pid, kind, serverPid: process.pid, sessionId, startedAt: Date.now(), ...(extra.endpoint ? { endpoint: extra.endpoint } : {}), ...fp },
+    ]);
+}
+/** A managed WDA this server adopted at startup (or started itself) for `sessionId`, per the
+ *  registry. Lets `qa_wda stop` stop a WDA started by a previous server run. */
+export function registeredWdaForSession(sessionId) {
+    return readEntries()
+        .filter((e) => e.kind === 'wda' && e.sessionId === sessionId && e.serverPid === process.pid)
+        .pop();
+}
+/** Remove a child we stopped (or that finished) from the registry. */
+export function unregisterManagedProcess(pid) {
+    if (!pid || pid <= 0)
+        return;
+    mutateEntries((entries) => entries.filter((e) => e.pid !== pid));
+}
+/** SIGTERM the child's process group when Swipium spawned it as a group leader, else the pid. */
+function killTree(pid, group) {
+    if (group) {
+        try {
+            process.kill(-pid, 'SIGTERM');
+            return true;
+        }
+        catch {
+            /* group already gone; fall back to the pid itself */
+        }
+    }
+    try {
+        process.kill(pid, 'SIGTERM');
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+const REAL_OPS = { pidAlive, psCommand, psStartTime, psPgid, killTree };
+/** True when `serverPid` is a live process that IS the server that registered the entry: its
+ *  start time must equal the recorded one (any node process could have recycled the pid). Legacy
+ *  entries without a recorded server start fall back to the old node/swipium command check.
+ *  That errs toward "alive" (never touch), which is the safe direction. */
+function serverStillAlive(entry, ops = REAL_OPS) {
+    const { serverPid } = entry;
+    if (serverPid === process.pid)
+        return false; // our pid at startup = a recycled dead server's
+    if (!ops.pidAlive(serverPid))
+        return false;
+    if (entry.serverStart)
+        return norm(ops.psStartTime(serverPid)) === entry.serverStart;
+    const cmd = ops.psCommand(serverPid);
+    return cmd != null && /node|swipium/i.test(cmd);
+}
+/** Is this child pid registered to a DIFFERENT, still-live server instance? (adopt, don't touch) */
+export function pidOwnedByLiveServer(pid) {
+    const entry = readEntries().find((e) => e.pid === pid);
+    return !!entry && serverStillAlive(entry);
+}
+/** Leading launcher tokens npx/npm put in front of the real program (and the retitle swaps).
+ *  `env` covers the `#!/usr/bin/env node` shebang: on Linux a process registered right after spawn
+ *  can still show as `/usr/bin/env node …/npx expo start` before env execs node. */
+const LAUNCHER_TOKEN = /^(?:env|node|nodejs|npx|npm|npx-cli\.js|npm-cli\.js|exec|--)$/i;
+/** A command line with its node/npx/npm launcher prefix stripped: `node /x/bin/npx expo start`
+ *  and `npm exec expo start` both become `expo start`. Exported for tests. */
+export function commandTail(cmd) {
+    const tokens = cmd.trim().split(/\s+/);
+    let i = 0;
+    while (i < tokens.length && LAUNCHER_TOKEN.test(tokens[i].split('/').pop() ?? ''))
+        i++;
+    return tokens.slice(i).join(' ');
+}
+/** The real program of each non-metro kind (matched against a token's basename). */
+const KIND_PROGRAM_RE = {
+    wda: /^xcodebuild$/i,
+    recording: /^(?:simctl|adb)$/i,
+    emulator: /^(?:emulator|qemu-system-[\w.-]+)$/i,
+};
+/** Launchers that exec the real program under the same pid (`xcrun simctl …` > `…/simctl …`). */
+const EXEC_LAUNCHER = /^(?:xcrun|env)$/i;
+/** A command line reduced to `<program basename> <args…>`, anchored at the first token whose
+ *  basename matches `program`. Xcode's `/usr/bin/xcodebuild` (and `xcrun`) shims re-exec the real
+ *  tool under the SAME pid + start time, so `ps` later shows
+ *  `/Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild -project …` for a child spawned
+ *  as `xcodebuild -project …`. Everything before the program must be either a launcher
+ *  (xcrun/env) or the space-split pieces of the program's own absolute path (`/Applications/Xcode
+ *  16.app/…/xcodebuild`), never flags or another program. Null when no such anchor exists.
+ *  Exported for tests. */
+export function programTail(cmd, program) {
+    const tokens = cmd.trim().split(/\s+/);
+    const i = tokens.findIndex((t) => program.test(t.split('/').pop() ?? ''));
+    if (i < 0)
+        return null;
+    const prefix = tokens.slice(0, i);
+    const launcherOnly = prefix.every((t) => EXEC_LAUNCHER.test(t.split('/').pop() ?? ''));
+    // One absolute path split at its spaces: starts with '/', no later piece starts a new path, no
+    // piece is a flag / assignment.
+    const pathPieces = prefix.length > 0 &&
+        prefix[0].startsWith('/') &&
+        tokens[i].includes('/') &&
+        !tokens[i].startsWith('/') &&
+        prefix.slice(1).every((t) => !t.includes('/')) &&
+        prefix.every((t) => !t.startsWith('-') && !t.includes('='));
+    if (!launcherOnly && !pathPieces)
+        return null;
+    return [tokens[i].split('/').pop(), ...tokens.slice(i + 1)].join(' ');
+}
+/** `-project` / `-destination` / `-derivedDataPath` values of a managed-WDA xcodebuild command. */
+export function wdaCommandIdentity(cmd) {
+    const tokens = cmd.trim().split(/\s+/);
+    const valueOf = (flag) => {
+        const i = tokens.indexOf(flag);
+        return i >= 0 && i + 1 < tokens.length ? tokens[i + 1] : undefined;
+    };
+    return { project: valueOf('-project'), destination: valueOf('-destination'), derivedDataPath: valueOf('-derivedDataPath') };
+}
+/** Per-kind command identity (on top of the exact start-time match). */
+function commandMatches(kind, recorded, live) {
+    if (!KIND_COMMAND_RE[kind].test(live))
+        return false;
+    if (live === recorded)
+        return true;
+    if (kind === 'metro') {
+        // Metro is launched via `npx`, which npm retitles shortly after spawn. Compare what runs.
+        const tail = commandTail(live);
+        return tail !== '' && tail === commandTail(recorded);
+    }
+    // Program path normalised to its basename (shim re-exec); the argument tail must be identical.
+    const program = KIND_PROGRAM_RE[kind];
+    if (!program)
+        return false;
+    const liveTail = programTail(live, program);
+    const recordedTail = programTail(recorded, program);
+    if (!liveTail || liveTail !== recordedTail)
+        return false;
+    if (kind === 'wda') {
+        // Defence in depth: the managed WDA's project + simulator destination must be present.
+        const id = wdaCommandIdentity(recordedTail);
+        return !!id.project && !!id.destination;
+    }
+    return true;
+}
+/** Does the live `pid` still carry the fingerprint recorded at spawn? Start time is the hard
+ *  requirement (exact); the command is compared per kind (see commandMatches). */
+function fingerprintMatches(entry, ops) {
+    if (!entry.procStart || !entry.command)
+        return false; // unverifiable > never signal/adopt
+    const start = norm(ops.psStartTime(entry.pid));
+    if (!start || start !== entry.procStart)
+        return false;
+    const cmd = norm(ops.psCommand(entry.pid));
+    return cmd != null && commandMatches(entry.kind, entry.command, cmd);
+}
+/** Verify that `pid` is still the child we registered (exact start time + per-kind command, per
+ *  the registry entry, or `entry` when given), then kill or adopt it. A pid with no verifiable
+ *  registry fingerprint, or whose fingerprint differs, is reported 'recycled' and never signalled.
+ *  Only a child Swipium spawned as a group leader has its process group signalled. */
+export function reclaimPid(pid, kind, ops = REAL_OPS, entry = readEntries().find((e) => e.pid === pid && e.kind === kind)) {
+    if (!ops.pidAlive(pid))
+        return 'gone';
+    if (!entry || entry.pid !== pid || !fingerprintMatches(entry, ops))
+        return 'recycled';
+    if (kind === 'emulator')
+        return 'adopted'; // still a real emulator; leave it booted (usable via adb)
+    return ops.killTree(pid, entry.groupLeader === true) ? 'killed' : 'gone';
+}
+async function defaultWdaHealthy(endpoint) {
+    return (await checkWda(endpoint, WDA_ADOPT_PROBE_TIMEOUT_MS)).ready;
+}
+/** Orphaned WDA entries eligible for adoption: owner dead, < 12 h old, endpoint recorded, pid
+ *  still a live xcodebuild (ps-checked), and /status healthy. Probed concurrently, before the lock. */
+async function adoptableWdaPids(entries, opts) {
+    const candidates = entries.filter((e) => e.kind === 'wda' &&
+        typeof e.endpoint === 'string' &&
+        opts.now - e.startedAt < WDA_ADOPT_MAX_AGE_MS &&
+        !serverStillAlive(e, opts.ops) &&
+        opts.ops.pidAlive(e.pid) &&
+        fingerprintMatches(e, opts.ops));
+    const healthy = await Promise.all(candidates.map((e) => opts.wdaHealthy(e.endpoint).catch(() => false)));
+    return new Set(candidates.filter((_, i) => healthy[i]).map((e) => e.pid));
+}
+/** Startup sweep (called once from startServer): reap children whose owning server died,
+ *  except a young, healthy managed WDA, which is adopted (see the header comment). */
+export async function reapOrphanedProcesses(options = {}) {
+    const opts = {
+        ops: options.ops ?? REAL_OPS,
+        now: options.now ?? Date.now(),
+        wdaHealthy: options.wdaHealthy ?? defaultWdaHealthy,
+    };
+    const adoptable = await adoptableWdaPids(readEntries(), opts);
+    mutateEntries((entries) => {
+        const keep = [];
+        for (const e of entries) {
+            if (serverStillAlive(e, opts.ops)) {
+                keep.push(e); // a live concurrent server owns it, not ours to touch
+                continue;
+            }
+            if (e.kind === 'wda' && adoptable.has(e.pid)) {
+                // Re-own it (startedAt kept, so the 12 h cap counts from the WDA's real start).
+                keep.push({ ...e, serverPid: process.pid });
+                log('info', 'adopted managed WDA from a previous server run (healthy, < 12 h old)', {
+                    pid: e.pid,
+                    endpoint: e.endpoint,
+                    sessionId: e.sessionId,
+                });
+                continue;
+            }
+            const outcome = reclaimPid(e.pid, e.kind, opts.ops, e);
+            if (outcome === 'killed') {
+                log('warn', 'reaped orphaned child process from a previous server run', { pid: e.pid, kind: e.kind, sessionId: e.sessionId });
+            }
+            else if (outcome === 'adopted') {
+                log('info', 'adopted orphaned emulator (left booted; reachable via adb)', { pid: e.pid, sessionId: e.sessionId });
+            }
+            else if (outcome === 'recycled') {
+                log('info', 'dropped orphan entry: PID recycled or fingerprint unverifiable, not signalled', { pid: e.pid, kind: e.kind });
+            }
+            // In every other non-live-owner case the entry is dropped: it has been handled.
+        }
+        return keep;
+    });
+}
+function lsofListeners(port) {
+    if (process.platform === 'win32')
+        return [];
+    try {
+        const out = spawnSync('lsof', ['-nP', `-iTCP:${port}`, '-sTCP:LISTEN', '-Fp'], { encoding: 'utf8', env: psEnv() });
+        return (out.stdout ?? '')
+            .split('\n')
+            .filter((l) => l.startsWith('p'))
+            .map((l) => Number(l.slice(1)))
+            .filter((n) => Number.isInteger(n) && n > 0);
+    }
+    catch {
+        return [];
+    }
+}
+function psAll() {
+    if (process.platform === 'win32')
+        return [];
+    try {
+        const out = spawnSync('ps', ['-axo', 'pid=,command='], { encoding: 'utf8', env: psEnv(), maxBuffer: 16 * 1024 * 1024 });
+        if (out.status !== 0)
+            return [];
+        return (out.stdout ?? '')
+            .split('\n')
+            .map((l) => /^\s*(\d+)\s+(.*)$/.exec(l))
+            .filter((m) => !!m)
+            .map((m) => ({ pid: Number(m[1]), command: m[2] }));
+    }
+    catch {
+        return [];
+    }
+}
+const REAL_WDA_SCAN_OPS = { listeners: lsofListeners, listProcesses: psAll, psCommand };
+/** Does `command` look exactly like the managed WDA runner Swipium starts for `sig`?
+ *  xcodebuild by basename (shim-proof), `test-without-building`, and the recorded
+ *  `-project` / `-destination id=<udid>` (/ `-derivedDataPath`) arguments. Exported for tests. */
+export function isManagedWdaCommand(command, sig) {
+    const tail = programTail(norm(command) ?? '', /^xcodebuild$/i);
+    if (!tail)
+        return false;
+    const padded = ` ${tail} `;
+    return (padded.includes(` -project ${sig.projectPath} `) &&
+        padded.includes(` -destination id=${sig.udid} `) &&
+        padded.includes(' test-without-building ') &&
+        (!sig.derivedDataPath || padded.includes(` -derivedDataPath ${sig.derivedDataPath} `)));
+}
+/** Pids of live managed-WDA xcodebuild processes matching `sig`. Used by `qa_wda stop` when the
+ *  registry entry for a WDA this session started was lost. The process LISTENing on the managed
+ *  port is checked first; on a simulator that listener is usually the XCTest runner (not
+ *  xcodebuild), so every process is then scanned for the exact managed-WDA signature. Only
+ *  processes whose command matches (see isManagedWdaCommand) are ever returned. */
+export function findManagedWdaProcesses(sig, ops = REAL_WDA_SCAN_OPS) {
+    const found = new Set();
+    if (sig.port) {
+        for (const pid of ops.listeners(sig.port)) {
+            const cmd = ops.psCommand(pid);
+            if (pid !== process.pid && cmd && isManagedWdaCommand(cmd, sig))
+                found.add(pid);
+        }
+    }
+    if (found.size === 0) {
+        for (const p of ops.listProcesses()) {
+            if (p.pid !== process.pid && isManagedWdaCommand(p.command, sig))
+                found.add(p.pid);
+        }
+    }
+    return [...found];
+}
+/** SIGTERM a managed WDA found by signature (its process group when it leads one; `qa_wda
+ *  start` spawns it detached). Exported so qa_wda can share the real kill primitive. */
+export function killManagedWda(pid, ops = REAL_OPS) {
+    return ops.killTree(pid, ops.psPgid(pid) === pid);
+}
+//# sourceMappingURL=processRegistry.js.map

package/dist/session/processRegistry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"processRegistry.js","sourceRoot":"","sources":["../../src/session/processRegistry.ts"],"names":[],"mappings":"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"}

package/dist/session/progress.js

@@ -51,6 +51,6 @@ export function progressLine(p) {
     if (!p)
         return undefined;
     const sec = Math.round((p.updatedAt - p.startedAt) / 1000);
-    return `${p.phase} (${sec}s)${p.userActionRequired ? ' ⚠ needs you' : ''}: ${p.statusText}` + (p.nextExpected ? ` → ${p.nextExpected}` : '');
+    return (`${p.phase} (${sec}s)${p.userActionRequired ? ' ⚠ needs you' : ''}: ${p.statusText}` + (p.nextExpected ? ` > ${p.nextExpected}` : ''));
 }
 //# sourceMappingURL=progress.js.map

package/dist/session/progress.js.map

@@ -1 +1 @@
-{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/session/progress.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,gGAAgG;AAChG,gGAAgG;AAChG,gGAAgG;AAahG,MAAM,UAAU,aAAa,CAC3B,QAAsB,EACtB,OAAgB,EAChB,GAAc,EACd,KAAa,EACb,OAAuE,EAAE,UAAU,EAAE,KAAK,EAAE;IAE5F,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,KAAK,GAAkB;QAC3B,KAAK;QACL,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;QACd,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,kBAAkB,EAAE,KAAK;KAC1B,CAAC;IACF,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,QAAQ,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,UAAU,EAAE,cAAc,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC;IAC1G,CAAC,CAAC;IACF,KAAK,EAAE,CAAC;IACR,OAAO;QACL,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;QACnE,KAAK,CAAC,SAAS,EAAE,IAAI;YACnB,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;YAC5B,IAAI,IAAI,EAAE,UAAU;gBAAE,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;YACzD,IAAI,IAAI,EAAE,YAAY;gBAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;YAC/D,KAAK,EAAE,CAAC;QACV,CAAC;QACD,MAAM,CAAC,MAAM;YACX,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YACtB,KAAK,EAAE,CAAC;QACV,CAAC;QACD,SAAS,CAAC,UAAU;YAClB,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAChC,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;YAC9B,KAAK,EAAE,CAAC;QACV,CAAC;QACD,IAAI,CAAC,UAAU;YACb,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,IAAI,UAAU;gBAAE,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;YAC9C,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC;YAC/B,KAAK,EAAE,CAAC;QACV,CAAC;KACF,CAAC;AACJ,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,YAAY,CAAC,CAA4B;IACvD,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;IAC3D,OAAO,GAAG,CAAC,CAAC,KAAK,KAAK,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAC/I,CAAC"}
+{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/session/progress.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,gGAAgG;AAChG,gGAAgG;AAChG,gGAAgG;AAahG,MAAM,UAAU,aAAa,CAC3B,QAAsB,EACtB,OAAgB,EAChB,GAAc,EACd,KAAa,EACb,OAAuE,EAAE,UAAU,EAAE,KAAK,EAAE;IAE5F,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,KAAK,GAAkB;QAC3B,KAAK;QACL,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;QACd,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,kBAAkB,EAAE,KAAK;KAC1B,CAAC;IACF,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,QAAQ,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,UAAU,EAAE,cAAc,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC;IAC1G,CAAC,CAAC;IACF,KAAK,EAAE,CAAC;IACR,OAAO;QACL,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;QACnE,KAAK,CAAC,SAAS,EAAE,IAAI;YACnB,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;YAC5B,IAAI,IAAI,EAAE,UAAU;gBAAE,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;YACzD,IAAI,IAAI,EAAE,YAAY;gBAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;YAC/D,KAAK,EAAE,CAAC;QACV,CAAC;QACD,MAAM,CAAC,MAAM;YACX,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YACtB,KAAK,EAAE,CAAC;QACV,CAAC;QACD,SAAS,CAAC,UAAU;YAClB,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAChC,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;YAC9B,KAAK,EAAE,CAAC;QACV,CAAC;QACD,IAAI,CAAC,UAAU;YACb,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,IAAI,UAAU;gBAAE,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;YAC9C,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC;YAC/B,KAAK,EAAE,CAAC;QACV,CAAC;KACF,CAAC;AACJ,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,YAAY,CAAC,CAA4B;IACvD,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;IAC3D,OAAO,CACL,GAAG,CAAC,CAAC,KAAK,KAAK,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACtI,CAAC;AACJ,CAAC"}