@rulemetric/cli 0.1.1 → 0.2.0

package/dist/lib/gateway-entry.js

@@ -4,7 +4,10 @@
  * Spawned as a detached child process by the CLI.
  */
 import { startGateway, GATEWAY_PORT, MITMPROXY_PORT } from './gateway.js';
-const { server, healthInterval } = startGateway(GATEWAY_PORT, MITMPROXY_PORT);
+const { server, healthInterval } = startGateway(GATEWAY_PORT, MITMPROXY_PORT, {
+    cliVersion: process.env.RULEMETRIC_CLI_VERSION,
+    cliEntry: process.env.RULEMETRIC_CLI_ENTRY,
+});
 function shutdown() {
     console.log(`[${new Date().toISOString()}] gateway shutting down`);
     clearInterval(healthInterval);

package/dist/lib/gateway-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-entry.js","sourceRoot":"","sources":["../../src/lib/gateway-entry.ts"],"names":[],"mappings":";AACA;;;GAGG;AACH,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE1E,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,YAAY,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;AAE9E,SAAS,QAAQ;IACf,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,yBAAyB,CAAC,CAAC;IACnE,aAAa,CAAC,cAAc,CAAC,CAAC;IAC9B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;QAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,iDAAiD;IACjD,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;AAClD,CAAC;AAED,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAChC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"gateway-entry.js","sourceRoot":"","sources":["../../src/lib/gateway-entry.ts"],"names":[],"mappings":";AACA;;;GAGG;AACH,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE1E,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,YAAY,CAAC,YAAY,EAAE,cAAc,EAAE;IAC5E,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB;IAC9C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;CAC3C,CAAC,CAAC;AAEH,SAAS,QAAQ;IACf,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,yBAAyB,CAAC,CAAC;IACnE,aAAa,CAAC,cAAc,CAAC,CAAC;IAC9B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;QAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,iDAAiD;IACjD,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;AAClD,CAAC;AAED,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAChC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC"}

package/dist/lib/gateway-lifecycle.d.ts

@@ -4,6 +4,6 @@ export declare const GATEWAY_PORT = 8787;
 export declare const MITMPROXY_PORT = 8788;
 export declare function isGatewayRunning(): boolean;
 export declare function getGatewayPid(): number | null;
-export declare function spawnGateway(): number;
+export declare function spawnGateway(cliVersion?: string): number;
 export declare function stopGateway(): boolean;
 //# sourceMappingURL=gateway-lifecycle.d.ts.map

package/dist/lib/gateway-lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-lifecycle.d.ts","sourceRoot":"","sources":["../../src/lib/gateway-lifecycle.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,gBAAgB,QAAkC,CAAC;AAChE,eAAO,MAAM,gBAAgB,QAAkC,CAAC;AAChE,eAAO,MAAM,YAAY,OAAO,CAAC;AACjC,eAAO,MAAM,cAAc,OAAO,CAAC;AAEnC,wBAAgB,gBAAgB,IAAI,OAAO,CAa1C;AAED,wBAAgB,aAAa,IAAI,MAAM,GAAG,IAAI,CAK7C;AAiBD,wBAAgB,YAAY,IAAI,MAAM,CAyBrC;AAED,wBAAgB,WAAW,IAAI,OAAO,CAYrC"}
+{"version":3,"file":"gateway-lifecycle.d.ts","sourceRoot":"","sources":["../../src/lib/gateway-lifecycle.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,gBAAgB,QAAkC,CAAC;AAChE,eAAO,MAAM,gBAAgB,QAAkC,CAAC;AAChE,eAAO,MAAM,YAAY,OAAO,CAAC;AACjC,eAAO,MAAM,cAAc,OAAO,CAAC;AAEnC,wBAAgB,gBAAgB,IAAI,OAAO,CAa1C;AAED,wBAAgB,aAAa,IAAI,MAAM,GAAG,IAAI,CAK7C;AAiBD,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAoCxD;AAED,wBAAgB,WAAW,IAAI,OAAO,CAYrC"}

package/dist/lib/gateway-lifecycle.js

@@ -46,7 +46,7 @@ function findGatewayEntry() {
     throw new Error('Could not find gateway-entry.js. Is the CLI built?\n' +
         'Searched:\n' + candidates.map(c => `  ${c}`).join('\n'));
 }
-export function spawnGateway() {
+export function spawnGateway(cliVersion) {
     if (isGatewayRunning()) {
         const pid = getGatewayPid();
         if (pid)
@@ -58,7 +58,18 @@ export function spawnGateway() {
     const child = spawn(process.execPath, [entryPath], {
         detached: true,
         stdio: ['ignore', logFd, logFd],
-        env: process.env,
+        // The gateway inherits the spawning CLI's env. RULEMETRIC_CLI_VERSION
+        // identifies the CLI version that started this gateway — used to
+        // detect drift when a newer CLI starts mitmproxy with a different
+        // version. RULEMETRIC_CLI_ENTRY is the path to the oclif entry point
+        // (process.argv[1]) so the gateway can re-invoke the CLI for
+        // `proxy restart` without needing the binary in PATH. Falls back to
+        // "unknown" if the caller didn't pass them.
+        env: {
+            ...process.env,
+            RULEMETRIC_CLI_VERSION: cliVersion ?? 'unknown',
+            RULEMETRIC_CLI_ENTRY: process.argv[1] ?? '',
+        },
     });
     child.unref();
     if (!child.pid) {

package/dist/lib/gateway-lifecycle.js.map

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

package/dist/lib/gateway.d.ts

@@ -1,11 +1,10 @@
-/**
- * Resilient HTTP proxy gateway that always accepts connections on GATEWAY_PORT.
- * Routes through mitmproxy when it's alive, direct to upstream when it's not.
- */
 import * as http from 'node:http';
 export declare const GATEWAY_PORT = 8787;
 export declare const MITMPROXY_PORT = 8788;
-export declare function startGateway(port?: number, mitmproxyPort?: number): {
+export declare function startGateway(port?: number, mitmproxyPort?: number, options?: {
+    cliVersion?: string;
+    cliEntry?: string;
+}): {
     server: http.Server;
     healthInterval: NodeJS.Timeout;
 };

package/dist/lib/gateway.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/lib/gateway.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,eAAO,MAAM,YAAY,OAAO,CAAC;AACjC,eAAO,MAAM,cAAc,OAAO,CAAC;AAuJnC,wBAAgB,YAAY,CAC1B,IAAI,GAAE,MAAqB,EAC3B,aAAa,GAAE,MAAuB,GACrC;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC,OAAO,CAAA;CAAE,CA4BzD"}
+{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["../../src/lib/gateway.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAKlC,eAAO,MAAM,YAAY,OAAO,CAAC;AACjC,eAAO,MAAM,cAAc,OAAO,CAAC;AAoNnC,wBAAgB,YAAY,CAC1B,IAAI,GAAE,MAAqB,EAC3B,aAAa,GAAE,MAAuB,EACtC,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GACvD;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC,OAAO,CAAA;CAAE,CAmCzD"}

package/dist/lib/gateway.js

@@ -2,18 +2,79 @@
  * Resilient HTTP proxy gateway that always accepts connections on GATEWAY_PORT.
  * Routes through mitmproxy when it's alive, direct to upstream when it's not.
  */
+import { spawn } from 'node:child_process';
+import * as fs from 'node:fs';
 import * as http from 'node:http';
 import * as net from 'node:net';
+import * as os from 'node:os';
+import * as path from 'node:path';
 export const GATEWAY_PORT = 8787;
 export const MITMPROXY_PORT = 8788;
 const HEALTH_INTERVAL = 3000;
 const HEALTH_TIMEOUT = 500;
+// Floor on auto-restarts so a misconfigured drift can't trigger a restart
+// loop. Plenty long for the user to fix any underlying problem manually.
+const RESTART_COOLDOWN_MS = 60_000;
+const VERSION_FILE = path.join(os.homedir(), '.config', 'rulemetric', 'proxy-addon.version');
 let isProxyAlive = false;
 let lastState = null;
+// Drift state — tracked across health-check ticks. lastSeenAddonVersion is
+// what the file said last time we read it; lastRestartAt prevents loops.
+let lastSeenAddonVersion = null;
+let lastRestartAt = 0;
 function log(msg) {
     const ts = new Date().toISOString();
     console.log(`[${ts}] ${msg}`);
 }
+function readAddonVersion() {
+    try {
+        return fs.readFileSync(VERSION_FILE, 'utf-8').trim() || null;
+    }
+    catch {
+        // File may not exist yet (proxy not started, or older addon that doesn't
+        // write the file). Returning null disables drift checks for this tick.
+        return null;
+    }
+}
+function maybeRestartOnDrift(gatewayCliVersion, cliEntry) {
+    // No reference version means we can't compare — skip.
+    if (gatewayCliVersion === 'unknown' || !cliEntry)
+        return;
+    const addonVersion = readAddonVersion();
+    if (!addonVersion || addonVersion === 'unknown')
+        return;
+    // Same as last tick — nothing changed, no need to log or act.
+    if (addonVersion === lastSeenAddonVersion)
+        return;
+    lastSeenAddonVersion = addonVersion;
+    if (addonVersion === gatewayCliVersion) {
+        // Drift cleared (e.g. proxy was just restarted). Quiet log, no action.
+        log(`addon version matches gateway (${gatewayCliVersion})`);
+        return;
+    }
+    const sinceLast = Date.now() - lastRestartAt;
+    if (sinceLast < RESTART_COOLDOWN_MS) {
+        log(`addon version drift (gateway=${gatewayCliVersion}, addon=${addonVersion}); ` +
+            `restart cooldown active (${Math.round((RESTART_COOLDOWN_MS - sinceLast) / 1000)}s left)`);
+        return;
+    }
+    log(`addon version drift detected (gateway=${gatewayCliVersion}, addon=${addonVersion}). ` +
+        `Restarting proxy to pick up latest code.`);
+    lastRestartAt = Date.now();
+    // Detached spawn — we don't want the gateway to block on the restart
+    // completing. Output goes to /dev/null; the proxy.log captures the
+    // restart events from mitmproxy itself.
+    try {
+        const child = spawn(process.execPath, [cliEntry, 'proxy', 'restart'], {
+            detached: true,
+            stdio: 'ignore',
+        });
+        child.unref();
+    }
+    catch (err) {
+        log(`restart spawn failed: ${err.message}`);
+    }
+}
 function checkProxyHealth(mitmproxyPort) {
     const sock = net.connect({ port: mitmproxyPort, timeout: HEALTH_TIMEOUT });
     sock.on('connect', () => {
@@ -124,7 +185,9 @@ function handleRequest(req, res, mitmproxyPort) {
     });
     req.pipe(proxyReq);
 }
-export function startGateway(port = GATEWAY_PORT, mitmproxyPort = MITMPROXY_PORT) {
+export function startGateway(port = GATEWAY_PORT, mitmproxyPort = MITMPROXY_PORT, options = {}) {
+    const cliVersion = options.cliVersion ?? process.env.RULEMETRIC_CLI_VERSION ?? 'unknown';
+    const cliEntry = options.cliEntry ?? process.env.RULEMETRIC_CLI_ENTRY ?? null;
     const server = http.createServer((req, res) => {
         handleRequest(req, res, mitmproxyPort);
     });
@@ -139,11 +202,14 @@ export function startGateway(port = GATEWAY_PORT, mitmproxyPort = MITMPROXY_PORT
     });
     const healthInterval = setInterval(() => {
         checkProxyHealth(mitmproxyPort);
+        maybeRestartOnDrift(cliVersion, cliEntry);
     }, HEALTH_INTERVAL);
     // Do an immediate check
     checkProxyHealth(mitmproxyPort);
+    maybeRestartOnDrift(cliVersion, cliEntry);
     server.listen(port, '127.0.0.1', () => {
-        log(`gateway listening on 127.0.0.1:${port} (mitmproxy target: :${mitmproxyPort})`);
+        log(`gateway listening on 127.0.0.1:${port} (mitmproxy target: :${mitmproxyPort}, ` +
+            `cli version: ${cliVersion})`);
     });
     return { server, healthInterval };
 }

package/dist/lib/gateway.js.map

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

package/dist/lib/graphile-worker-runner.d.ts

@@ -0,0 +1,124 @@
+import { type JobHelpers, type Task } from 'graphile-worker';
+export interface WorkerOptions {
+    connectionString: string;
+    log: (msg: string) => void;
+    /**
+     * The user this worker belongs to. Drives per-user task name suffixes
+     * (`process_eval__<userId>` etc.) so this laptop only claims its own
+     * user's jobs from the shared Graphile queue. The API enqueues with the
+     * matching suffix in `enqueueJob`. See docs/audits/2026-05-07-worker-audit.md.
+     */
+    userId: string;
+    /**
+     * Called when the watchdog has decided the worker is wedged and the
+     * process should die so launchd can relaunch it. Default: `process.exit(1)`.
+     * Injectable so tests can assert the watchdog fires without killing the
+     * test runner.
+     */
+    onFatal?: (reason: string) => void;
+    /** Override `Date.now` for deterministic watchdog tests. */
+    now?: () => number;
+}
+export interface WatchdogState {
+    consecutiveHeartbeatFailures: number;
+    /** ms timestamp of last successful pool:listen, or null if none yet. */
+    lastListenSuccessAt: number | null;
+    /** ms timestamp of last pool:listen:error, or null if none yet. */
+    lastListenErrorAt: number | null;
+}
+/**
+ * Pure decision function: given watchdog state and "now", return a fatal
+ * reason string if the worker should exit, or null if it's healthy. Extracted
+ * so the threshold logic can be unit-tested without booting graphile-worker
+ * or stubbing process.exit.
+ */
+export declare function watchdogVerdict(_state: WatchdogState, _now: number): string | null;
+/**
+ * Derive a short status string from watchdog state for `lastError` reporting.
+ * Returns null when nothing notable; otherwise a human-readable signal the
+ * dashboard can surface (e.g. "pg listen has been failing for 240s"). This is
+ * the logged-signal replacement for the old exit paths.
+ */
+export declare function watchdogStatus(state: WatchdogState, now: number): string | null;
+/**
+ * Parse `lsof -i TCP -P -n` output into a count of established sockets to the
+ * Supabase pooler, grouped by remote host.
+ *
+ * Matches BOTH pooler ports: 6543 (transaction mode) and 5432 (session mode).
+ * The worker connects through the session pooler — see deriveSessionPoolerUrl
+ * in commands/evals/listen.ts — while the API uses the transaction pooler; a
+ * counter that matched only :6543 would silently report 0 sockets for every
+ * worker. The `->` anchor is load-bearing: it matches the REMOTE port, not a
+ * local source port that happens to share those digits.
+ */
+export declare function parsePoolerSockets(lsofStdout: string): {
+    total: number;
+    byNode: Record<string, number>;
+};
+/**
+ * Row shape returned by `reclaimStaleLocks`'s SQL — exported only so the
+ * unit test can build a matching fake without duplicating the type.
+ */
+export interface StaleLockRow {
+    id: number;
+    identifier: string;
+}
+/**
+ * Executor abstraction used by `reclaimStaleLocks`: a function that runs a
+ * parameterised query and returns rows. The unit test passes a `vi.fn()`; the
+ * production wrapper (`reclaimStaleLocksWithConnection`) wraps a postgres-js
+ * client. Dependency injection keeps the SQL logic testable without a live DB.
+ */
+export type SqlExecutor = <T = Record<string, unknown>>(sql: string, params: ReadonlyArray<unknown>) => Promise<ReadonlyArray<T>>;
+/**
+ * Release stale Graphile job locks owned by this worker's user.
+ *
+ * The graphile_worker._private_jobs table tracks in-flight jobs via
+ * `locked_at`/`locked_by`. When a worker crashes mid-job (SIGKILL, OOM, the
+ * 10s graceful-shutdown timeout in evals/listen.ts forcing exit before
+ * graphile can release locks) those fields stay populated — and graphile's
+ * built-in lock-timeout sweeper only reclaims them after a 4-hour TTL by
+ * default. Until that fires, the job is invisible to every worker: it's not
+ * `available`, but no one is actually running it.
+ *
+ * At worker BOOT we know that no jobs belonging to OUR user are legitimately
+ * in flight (the previous instance is dead — that's why we're starting). Any
+ * lock on a task identifier ending `__<userId>` is therefore stale and safe
+ * to clear. We scope by suffix so multiple users on a shared pooler don't
+ * accidentally release each other's live locks.
+ *
+ * Best-effort: a thrown executor error is logged but swallowed. If reclaim
+ * fails, graphile's 4h timeout still kicks in eventually, and crippling
+ * worker startup over a transient DB hiccup is worse than waiting it out.
+ *
+ * Returns the count of rows released (0 on error or no-op).
+ */
+export declare function reclaimStaleLocks(exec: SqlExecutor, userId: string, log: (msg: string) => void): Promise<number>;
+/**
+ * Wrap a typed handler so it conforms to graphile-worker's `Task` shape AND
+ * intercepts `PermanentJobError` to skip retry waste.
+ *
+ * How the skip works: graphile-worker decides retry-vs-permanent-fail by
+ * comparing `job.attempts >= job.max_attempts` on the in-memory `Job` object
+ * AFTER the handler throws (see graphile-worker dist/worker.js). We mutate
+ * `helpers.job.max_attempts` to equal the current attempt count just before
+ * re-throwing — that flips the inequality so Graphile emits `job:failed`
+ * instead of scheduling another retry. The mutation is purely in JS memory;
+ * Graphile uses the in-memory `Job` object for its decision and never re-reads
+ * `max_attempts` from the DB on this code path, so a SQL update isn't needed.
+ *
+ * Exported for use in integration tests that want the same retry-skip behavior
+ * the runner applies in production.
+ */
+export declare function makeTask<P>(handler: (payload: P, helpers: JobHelpers) => Promise<unknown>): Task;
+/**
+ * Boot a graphile-worker runner with the four task handlers wired up.
+ *
+ * Returns a cleanup function that:
+ *   1. clears the heartbeat interval
+ *   2. fires a final `status: 'shutting_down'` heartbeat so the dashboard
+ *      can show a clean shutdown rather than a missed-heartbeat timeout
+ *   3. awaits `runner.stop()` for graceful drain (in-flight jobs finish)
+ */
+export declare function startWorker(options: WorkerOptions): Promise<() => Promise<void>>;
+//# sourceMappingURL=graphile-worker-runner.d.ts.map

package/dist/lib/graphile-worker-runner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphile-worker-runner.d.ts","sourceRoot":"","sources":["../../src/lib/graphile-worker-runner.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAiB,KAAK,UAAU,EAAsB,KAAK,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAahG,MAAM,WAAW,aAAa;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3B;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,4DAA4D;IAC5D,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAWD,MAAM,WAAW,aAAa;IAC5B,4BAA4B,EAAE,MAAM,CAAC;IACrC,wEAAwE;IACxE,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,mEAAmE;IACnE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAalF;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAW/E;AAuBD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC,CAYA;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,KAC3B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AAE/B;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GACzB,OAAO,CAAC,MAAM,CAAC,CAqBjB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EACxB,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,GAC7D,IAAI,CAcN;AAED;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAoWtF"}