@automagik/omni 2.260508.2 → 2.260508.4

package/dist/lib/pgserve-transport.d.ts

@@ -0,0 +1,113 @@
+/**
+ * pgserve transport discovery — Unix-socket first, TCP fallback.
+ *
+ * Mirror of `resolvePgserveTransport()` from
+ * `automagik-dev/genie:src/lib/db.ts` — keeps the byte-identical contract
+ * documented in `.genie/wishes/pgserve-singleton-no-proxy/SHARED-DESIGN.md`
+ * (§4.6 transport-discovery).
+ *
+ * Why this exists
+ * ---------------
+ * Phase 2 of the canonical-pgserve cutover (omni#595/#596/#597) flipped
+ * `useCanonicalPgserve` to true by default and pointed `DATABASE_URL` at
+ * the pm2-supervised pgserve instance on **TCP 8432** (the bun-bridge
+ * default). Phase 3 (this wish, `pgserve-singleton-no-proxy`) lands the
+ * canonical socket at `$XDG_RUNTIME_DIR/pgserve/.s.PGSQL.5432` and tells
+ * every consumer to prefer it, with TCP `localhost:5432` as the fallback.
+ *
+ * This module provides the discovery primitives. `runtime-env.ts` consumes
+ * them to compute the effective `DATABASE_URL` for the omni-api process.
+ *
+ * Force-flag overrides (matches genie's contract):
+ *   - `OMNI_PG_FORCE_TCP=1`     skips the UDS probe entirely.
+ *   - `OMNI_PG_FORCE_SOCKET=1`  inverts: skip TCP fallback, require UDS.
+ *   - `OMNI_PG_PORT=<n>`        legacy escape hatch — bypasses the
+ *                               `pgserve port` discovery and dials
+ *                               `127.0.0.1:<n>` directly. Pairs with
+ *                               `OMNI_PG_FORCE_TCP=1` for hosts that
+ *                               don't have `pgserve` on PATH.
+ */
+/** Canonical postgres port the postmaster binds when pgserve@>=2.3 runs in singleton mode. */
+export declare const CANONICAL_PG_PORT = 5432;
+/**
+ * Discriminated union returned by {@link resolvePgserveTransport}.
+ *
+ *   - `unix`: postgres.js dials the Unix socket at
+ *     `<socketDir>/.s.PGSQL.<port>`. `host` is the `socketDir`.
+ *   - `tcp`: postgres.js dials `<host>:<port>` over TCP loopback.
+ */
+export type PgserveTransport = {
+    kind: 'unix';
+    socketDir: string;
+    port: number;
+} | {
+    kind: 'tcp';
+    host: string;
+    port: number;
+};
+/**
+ * Resolve the directory holding pgserve's libpq-compat socket.
+ *
+ * Honors `$XDG_RUNTIME_DIR` (systemd / freedesktop convention) and falls
+ * back to `/tmp/pgserve` on hosts without XDG. Mirrors `resolveControlSocketDir`
+ * in pgserve/src/daemon.js so both ends agree on the path.
+ */
+export declare function resolvePgserveSocketDir(): string;
+/**
+ * Path to the libpq-compat socket file. Postgres' libpq dials a socket file
+ * named `.s.PGSQL.<port>` inside the configured socket directory.
+ */
+export declare function resolvePgserveLibpqSocketPath(): string;
+/**
+ * Path to pgserve v2's primary control socket (used by daemon-mode flows
+ * that route through SO_PEERCRED). Kept here so a future doctor probe can
+ * surface the file's presence without re-implementing the path.
+ */
+export declare function resolvePgserveControlSocketPath(): string;
+/**
+ * Synchronous probe: does the canonical libpq socket file exist?
+ *
+ * Used by the synchronous {@link buildRuntimeEnv} path in `runtime-env.ts`
+ * to pick UDS vs TCP without paying the cost of an async greet. The greet
+ * variant ({@link resolvePgserveTransport}) is reserved for boot-time and
+ * doctor flows that can afford the round trip.
+ */
+export declare function probeCanonicalSocketSync(): boolean;
+/**
+ * Build a `postgresql://` URL pointing at the given transport, using the
+ * supplied database name. Mirrors the URL shapes documented in
+ * SHARED-DESIGN.md §5.3 (omni-side scope).
+ *
+ * UDS shape: `postgresql://postgres:postgres@/omni?host=/run/user/1000/pgserve&port=5432`
+ * TCP shape: `postgresql://postgres:postgres@127.0.0.1:5432/omni`
+ *
+ * The username/password pair is preserved (not derived from the transport)
+ * because omni's pgserve consumer keeps libpq peer-auth via password —
+ * pgserve@>=2.3 issues a per-fingerprint role credential and the API
+ * stores that credential in `serverConfig.databaseUrl`. When stored, the
+ * caller passes their own URL through verbatim and never touches this
+ * helper.
+ */
+export declare function buildDatabaseUrlForTransport(transport: PgserveTransport, database: string, options?: {
+    username?: string;
+    password?: string;
+}): string;
+/**
+ * Resolve the active pgserve transport with UDS preference and TCP fallback.
+ *
+ * Probe order:
+ *   1. **Canonical UDS** — `$XDG_RUNTIME_DIR/pgserve/.s.PGSQL.5432`. Confirm
+ *      liveness by completing a Postgres greet (SSLRequest → server replies
+ *      'N' or 'S'). Use it if reachable.
+ *   2. **Explicit TCP port** (`OMNI_PG_PORT`) — legacy escape hatch. Bypasses
+ *      `pgserve port` discovery and dials `127.0.0.1:<port>` directly.
+ *   3. **TCP via `pgserve port`** — shells out to the pgserve CLI's published
+ *      discovery primitive. Emits `127.0.0.1:<discovered-port>`.
+ *   4. Throw with a hint that lists every probe attempt.
+ *
+ * Force-flag overrides:
+ *   - `OMNI_PG_FORCE_SOCKET=1` skips steps 2 + 3 (UDS-only).
+ *   - `OMNI_PG_FORCE_TCP=1` skips step 1 (TCP-only).
+ */
+export declare function resolvePgserveTransport(): Promise<PgserveTransport>;
+//# sourceMappingURL=pgserve-transport.d.ts.map

package/dist/lib/pgserve-transport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pgserve-transport.d.ts","sourceRoot":"","sources":["../../src/lib/pgserve-transport.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAOH,8FAA8F;AAC9F,eAAO,MAAM,iBAAiB,OAAO,CAAC;AActC;;;;;;GAMG;AACH,MAAM,MAAM,gBAAgB,GACxB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAIhD;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,IAAI,MAAM,CAEtD;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,IAAI,MAAM,CAExD;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,IAAI,OAAO,CAElD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,gBAAgB,EAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GACrD,MAAM,CAYR;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CA+BzE"}

package/dist/lib/requirements.d.ts

@@ -0,0 +1,112 @@
+/**
+ * Compile-time peer requirements manifest.
+ *
+ * Declares the minimum versions of peer CLIs (pgserve, genie) that omni
+ * is verified to work with. Consumed by:
+ *   - `omni requirements [--json]`              (this wish, G6)
+ *   - `omni update` step 4 / `preInstallPeerCheck` (this wish, G4)
+ *   - `omni doctor` peer-version check          (this wish, G5)
+ *
+ * The contract — see SHARED-DESIGN.md §3.3:
+ *
+ * > Each binary has `<cli> --requirements --json` returning
+ * > `{ pgserve: ">=2.3", genie: ">=5.0" }` etc.
+ *
+ * Version specs use the npm-style `>=X.Y[.Z]` form. Only the lower bound
+ * is enforced; upper bounds are not declared because the peers are
+ * cooperating CLIs in the same release train (operator runs
+ * `pgserve update` → `genie update` → `omni update`, so peers move
+ * forward together). A peer below the lower bound refuses the upgrade
+ * with an explicit remediation pointing at `<peer> update`.
+ */
+/**
+ * Peer requirements declared at compile time.
+ *
+ * Keys:
+ *   - `pgserve` — the singleton pgserve CLI. Version `2.3` introduced the
+ *     canonical UDS + cosign tier surface this wish targets.
+ *   - `genie` — peer agent runtime that shares the pgserve cluster. omni
+ *     does not directly invoke genie at runtime, but they coexist on the
+ *     same host and need to agree on the pgserve role-grant model.
+ *
+ * Adding a new peer: include both the version range and a `discover`
+ * entry in {@link PEER_DISCOVERERS} so `checkPeerVersion()` can shell
+ * out to fetch the live version. Discovery functions intentionally
+ * shell-out (rather than import the peer) so a missing peer fails
+ * gracefully without crashing the parent process.
+ */
+export declare const REQUIREMENTS: Readonly<Record<string, string>>;
+/**
+ * Result of a single peer-version probe.
+ *
+ *   - `ok=true`  → peer is at or above the required version.
+ *   - `ok=false` → peer is below the required version OR not installed.
+ *     `current` is `null` when the peer binary is absent / errored out.
+ *   - `current` is the raw version string parsed from `<peer> --version`.
+ */
+export interface PeerVersionResult {
+    name: string;
+    required: string;
+    current: string | null;
+    ok: boolean;
+    /** Human-readable reason when `ok=false`. */
+    reason?: string;
+}
+/**
+ * Parse a semver-ish version triple from arbitrary CLI version output.
+ *
+ * Many CLIs emit lines like `pgserve 2.3.1`, `genie v5.0.0-rc.2`, or
+ * `omni 2.260507.4`. We extract the first `MAJOR.MINOR[.PATCH]` triple,
+ * tolerating leading prefixes (binary name, `v`) and trailing suffixes
+ * (`-rc.N`, build metadata, hash). Returns null when no triple matches.
+ */
+export declare function parseVersionTriple(raw: string): {
+    major: number;
+    minor: number;
+    patch: number;
+} | null;
+/**
+ * Parse a `>=X.Y[.Z]` constraint into a version triple.
+ *
+ * Throws on malformed input — REQUIREMENTS is compile-time and any
+ * malformed entry is a programmer error. Released code never sees a
+ * malformed constraint at runtime.
+ */
+export declare function parseConstraint(spec: string): {
+    major: number;
+    minor: number;
+    patch: number;
+};
+/**
+ * Compare two version triples. Returns negative if a<b, 0 if equal,
+ * positive if a>b. Stable across major/minor/patch.
+ */
+export declare function compareVersions(a: {
+    major: number;
+    minor: number;
+    patch: number;
+}, b: {
+    major: number;
+    minor: number;
+    patch: number;
+}): number;
+/**
+ * Check a single concrete version string against a `>=` constraint.
+ * Pure helper — no I/O.
+ */
+export declare function satisfiesConstraint(currentRaw: string, constraint: string): boolean;
+/**
+ * Probe a single declared peer. Returns a typed result that callers
+ * (omni doctor, omni update preInstallPeerCheck) consume to decide
+ * whether to proceed.
+ *
+ * `currentOverride` lets tests inject a known version without spawning
+ * a child process. Production callers omit it and pay the shell-out.
+ */
+export declare function checkPeerVersion(name: keyof typeof REQUIREMENTS | string, currentOverride?: string | null): Promise<PeerVersionResult>;
+/**
+ * Probe every declared peer. Returned in declaration order so callers
+ * surfacing JSON output get stable key ordering.
+ */
+export declare function checkAllPeers(): Promise<PeerVersionResult[]>;
+//# sourceMappingURL=requirements.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"requirements.d.ts","sourceRoot":"","sources":["../../src/lib/requirements.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAGxD,CAAC;AAWH;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,EAAE,EAAE,OAAO,CAAC;IACZ,6CAA6C;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAWtG;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAY7F;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAClD,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjD,MAAM,CAIR;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAKnF;AA8DD;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,OAAO,YAAY,GAAG,MAAM,EACxC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CA4C5B;AAED;;;GAGG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAOlE"}

package/dist/runtime-env.d.ts

@@ -43,14 +43,36 @@ export type RuntimeEnv = {
     NODE_ENV: string;
     LOG_LEVEL: string;
 };
-/** Default pgserve port when none is set explicitly. */
+/**
+ * Default pgserve port when none is set explicitly.
+ *
+ * Phase 2 of the canonical-pgserve cutover (omni#595/#596/#597) used the
+ * bun-bridge port `8432`. Phase 3 (`pgserve-singleton-no-proxy`) lands the
+ * postmaster directly on **5432** (canonical postgres port) and listens
+ * on the canonical UDS at `$XDG_RUNTIME_DIR/pgserve/.s.PGSQL.5432`.
+ *
+ * Kept as the module-level default for backwards compatibility with the
+ * stored `~/.omni/config.json` entries that still record `8432`. Use
+ * {@link resolveDatabaseUrl} as the entry point — it prefers the canonical
+ * UDS when available and falls back to the legacy port only when the
+ * socket is missing AND the operator hasn't migrated their config.
+ */
 export declare const DEFAULT_PGSERVE_PORT = 8432;
+/** Canonical postgres TCP port the postmaster binds in singleton mode. */
+export { CANONICAL_PG_PORT } from './lib/pgserve-transport.js';
 /**
  * Build the canonical embedded-mode `DATABASE_URL` from the configured
  * pgserve port. Used when the stored `server.databaseUrl` is empty or is
  * the legacy 5432 default.
  */
 export declare function buildEmbeddedDatabaseUrl(pgservePort?: number): string;
+/**
+ * Build the canonical UDS-mode `DATABASE_URL`. postgres.js / libpq accept
+ * the `host=<dir>&port=<n>` query-param form to dial a Unix socket at
+ * `<dir>/.s.PGSQL.<n>`. Used by {@link resolveDatabaseUrl} when the
+ * canonical socket file is present at boot.
+ */
+export declare function buildCanonicalSocketDatabaseUrl(): string;
 /**
  * Extract the effective pgserve port. Honors an explicit override on the
  * server config first (`server.pgservePort`, if ever added), then the
@@ -63,7 +85,16 @@ export declare function resolvePgservePort(serverConfig: ServerConfig): number;
  *
  * Precedence:
  *   1. `serverConfig.databaseUrl`, if it's a non-empty, non-legacy value.
- *   2. Otherwise, the canonical embedded URL on the configured pgserve port.
+ *      Operator-provided URLs (external DB, custom port) pass through
+ *      verbatim.
+ *   2. Otherwise, prefer the canonical UDS at
+ *      `$XDG_RUNTIME_DIR/pgserve/.s.PGSQL.5432` when the socket file is
+ *      present (synchronous probe — see
+ *      {@link probeCanonicalSocketSync}). UDS preference matches genie's
+ *      `resolvePgserveTransport` contract documented in
+ *      `.genie/wishes/pgserve-singleton-no-proxy/SHARED-DESIGN.md` §4.6.
+ *   3. Otherwise, fall back to the configured TCP port (legacy phase-2
+ *      bridge). Honors `serverConfig.pgservePort` when set.
  *
  * This function never reads `process.env.DATABASE_URL`.
  */
@@ -73,21 +104,16 @@ export declare function resolveDatabaseUrl(serverConfig: ServerConfig): string;
  *
  * All values come from `serverConfig` / `cliConfig`. No shell env reads.
  *
- * `PGSERVE_EMBEDDED` semantics (Phase 2 of canonical-pgserve removal):
- *   - serverConfig.useCanonicalPgserve === false  → 'true'  (embedded — explicit opt-in)
- *   - serverConfig.useCanonicalPgserve === true   → 'false' (canonical — explicit opt-in)
- *   - undefined / missing                          → 'false' (canonical — NEW DEFAULT)
- *
- * Phase 1 (omni#595, 2026-05-01) added the deprecation warning to
- * `startEmbeddedPgserve`. Phase 2 (this file) flips the default for
- * undefined values: legacy installs that never set the flag now get
- * canonical instead of embedded. Operators on legacy embedded who
- * haven't migrated must explicitly set `useCanonicalPgserve: false` in
- * `~/.omni/config.json` (or run `omni doctor --fix` to migrate to
- * canonical, the supported path).
- *
- * Phase 3 (future) deletes the embedded code entirely + drops the
- * pgserve runtime dep from `packages/api`.
+ * Phase 3 (`pgserve-singleton-no-proxy` G2) deleted the embedded
+ * pgserve code path entirely from `packages/api/`. omni-api connects
+ * to a peer-supervised pgserve via `DATABASE_URL` only.
+ * `PGSERVE_EMBEDDED` and `useCanonicalPgserve` are kept here for
+ * back-compat with `~/.omni/config.json` files written by phase-2
+ * installers, but the values no longer change runtime behavior:
+ * `PGSERVE_EMBEDDED` is always `'false'`, and a legacy
+ * `useCanonicalPgserve: false` triggers a one-shot warning surfaced by
+ * `omni doctor --fix` (which rewrites the config). The env keys remain
+ * in {@link RuntimeEnv} until a future major bumps the env contract.
  */
 export declare function buildRuntimeEnv(serverConfig: ServerConfig, cliConfig: Config): RuntimeEnv;
 //# sourceMappingURL=runtime-env.d.ts.map

package/dist/runtime-env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-env.d.ts","sourceRoot":"","sources":["../src/runtime-env.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAKF,wDAAwD;AACxD,eAAO,MAAM,oBAAoB,OAAO,CAAC;AAEzC;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,GAAE,MAA6B,GAAG,MAAM,CAE3F;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAMrE;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAMrE;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,UAAU,CAoBzF"}
+{"version":3,"file":"runtime-env.d.ts","sourceRoot":"","sources":["../src/runtime-env.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAQxD;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAQF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,oBAAoB,OAAO,CAAC;AAEzC,0EAA0E;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,GAAE,MAA6B,GAAG,MAAM,CAE3F;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,IAAI,MAAM,CAKxD;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAMrE;AAgBD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAiBrE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,UAAU,CAqBzF"}