borgmcp 0.9.56 → 0.9.58

package/dist/codex-remote.d.ts

@@ -1,21 +1,69 @@
+/**
+ * gh#528 — npm-managed Codex remote-wake.
+ *
+ * borg owns a per-launch DIRECT Codex app-server (`codex app-server --listen
+ * unix://<socket>`) as the primary wake path, instead of the standalone
+ * `codex app-server daemon start` (which only exists for standalone-installer
+ * Codex — npm-managed Codex has no daemon, so those sessions had NO push-wake
+ * and silently fell back to the ~30min /loop heartbeat). Per-launch direct
+ * app-server works for both install kinds and starts fresh each launch (so it
+ * always loads the current borgmcp MCP — no daemon-restart version refresh
+ * needed). The TUI is then launched with `codex --remote unix://<socket>` and
+ * Borg delivers wakes by connecting to that socket (see codex-app-wake.ts).
+ */
+export interface CodexAppServerHandle {
+    pid: number | undefined;
+    socketPath: string;
+    /** Kill the owned app-server + remove its socket/pidfile. Wire to TUI exit. */
+    cleanup: () => void;
+}
 export interface CodexRemoteLaunch {
     args: string[];
     env: Record<string, string>;
     warning?: string;
+    /** Present when borg owns a per-launch app-server that must be cleaned up on TUI exit. */
+    server?: CodexAppServerHandle;
 }
-export interface CodexRemoteStartResult {
-    status: number | null;
-    stdout: string;
-    stderr: string;
+export interface CodexChild {
+    pid: number | undefined;
+    kill: () => void;
 }
-export interface CodexRemoteLaunchOptions {
-    installedBorgmcpVersion?: string;
-    versionRefreshStatePath?: string;
+export interface PrepareCodexRemoteDeps {
+    /** Spawn the long-lived `codex app-server --listen unix://<socketPath>` child. */
+    spawnAppServer: (socketPath: string) => CodexChild;
+    /** Readiness probe: a real CodexAppServerClient connect + thread/loaded/list round-trip. */
+    probeReady: (socketPath: string) => Promise<boolean>;
+    /** Delay between readiness polls (injected so tests don't actually wait). */
+    sleep: (ms: number) => Promise<void>;
+    /** 0700 runtime dir (default ~/.config/borgmcp/codex-remote). */
+    runtimeDir?: string;
+    /** Unique socket id generator (default 32-hex). Injected for deterministic tests. */
+    socketId?: () => string;
+    /** Readiness timeout (default 8000ms) + poll interval (default 250ms). */
+    readyTimeoutMs?: number;
+    pollIntervalMs?: number;
+    /** Whether a pid is alive (default process.kill(pid, 0)). Injected for tests. */
+    isAlive?: (pid: number) => boolean;
 }
-export declare function prepareCodexRemoteLaunch(runSync: (cmd: string, args: string[]) => CodexRemoteStartResult, options?: CodexRemoteLaunchOptions): CodexRemoteLaunch;
+export declare const DEFAULT_CODEX_REMOTE_DIR: string;
 export declare function withCodexCwdArg(args: string[], cwd: string): string[];
-export declare function refreshCodexMcpServerForInstalledVersion(runSync: (cmd: string, args: string[]) => CodexRemoteStartResult, options?: CodexRemoteLaunchOptions): {
-    restarted: boolean;
-    warning?: string;
-};
+/**
+ * Start a borg-owned per-launch Codex app-server, probe it for readiness, and
+ * return the `--remote` launch args + an owned handle (or a fail-loud warning).
+ * Async + lifecycle-owning: the caller MUST call `result.server?.cleanup()` on
+ * TUI exit.
+ */
+export declare function prepareCodexRemoteLaunch(deps: PrepareCodexRemoteDeps): Promise<CodexRemoteLaunch>;
+/**
+ * Production deps for prepareCodexRemoteLaunch — spawn the real `codex
+ * app-server` child + probe it with the real CodexAppServerClient. Shared by
+ * claude.ts and assimilate-deps.ts so there's ONE wiring.
+ *
+ * The readiness probe uses Codex app-server RPCs ONLY (connect + thread/loaded/
+ * list) — it never calls a borg /api/drone/* endpoint — so it can never advance
+ * last_seen/last_regen_at and mask a deaf Codex (the gh#46/gh#406 signal-truth
+ * invariant; the app-server socket is the wake-DELIVERY wire, not a liveness
+ * signal).
+ */
+export declare function defaultCodexRemoteDeps(): Pick<PrepareCodexRemoteDeps, 'spawnAppServer' | 'probeReady' | 'sleep'>;
 //# sourceMappingURL=codex-remote.d.ts.map

package/dist/codex-remote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-remote.d.ts","sourceRoot":"","sources":["../src/codex-remote.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAaD,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,sBAAsB,EAChE,OAAO,GAAE,wBAA6B,GACrC,iBAAiB,CAcnB;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAGrE;AA2CD,wBAAgB,wCAAwC,CACtD,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,sBAAsB,EAChE,OAAO,GAAE,wBAA6B,GACrC;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CA2B1C"}
+{"version":3,"file":"codex-remote.d.ts","sourceRoot":"","sources":["../src/codex-remote.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,+EAA+E;IAC/E,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0FAA0F;IAC1F,MAAM,CAAC,EAAE,oBAAoB,CAAC;CAC/B;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,kFAAkF;IAClF,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,UAAU,CAAC;IACnD,4FAA4F;IAC5F,UAAU,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD,6EAA6E;IAC7E,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,iEAAiE;IACjE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qFAAqF;IACrF,QAAQ,CAAC,EAAE,MAAM,MAAM,CAAC;IACxB,0EAA0E;IAC1E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iFAAiF;IACjF,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACpC;AAED,eAAO,MAAM,wBAAwB,QAAwD,CAAC;AAE9F,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAGrE;AA0DD;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CA+E5B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAC5C,sBAAsB,EACtB,gBAAgB,GAAG,YAAY,GAAG,OAAO,CAC1C,CAoCA"}

package/dist/codex-remote.js

@@ -1,19 +1,10 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { mkdirSync, chmodSync, readdirSync, rmSync, writeFileSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { dirname, join } from 'node:path';
-const DEFAULT_VERSION_REFRESH_STATE_PATH = join(homedir(), '.config', 'borgmcp', 'codex-mcp-version-refresh.json');
-export function prepareCodexRemoteLaunch(runSync, options = {}) {
-    const refresh = refreshCodexMcpServerForInstalledVersion(runSync, options);
-    const daemonResult = runSync('codex', ['app-server', 'daemon', 'start']);
-    const daemon = withRefreshWarning(parseCodexRemoteResult(daemonResult, 'Codex app-server daemon start'), refresh.warning);
-    if (daemon.args.length > 0)
-        return daemon;
-    return {
-        args: [],
-        env: {},
-        warning: daemon.warning,
-    };
-}
+import { join } from 'node:path';
+import { randomBytes } from 'node:crypto';
+import { spawn } from 'node:child_process';
+import { CodexAppServerClient } from './codex-app-server.js';
+export const DEFAULT_CODEX_REMOTE_DIR = join(homedir(), '.config', 'borgmcp', 'codex-remote');
 export function withCodexCwdArg(args, cwd) {
     if (hasCodexCwdArg(args))
         return args;
@@ -22,86 +13,188 @@ export function withCodexCwdArg(args, cwd) {
 function hasCodexCwdArg(args) {
     return args.some((arg) => arg === '--cd' || arg.startsWith('--cd=') || arg === '-C');
 }
-function parseCodexRemoteResult(result, commandLabel) {
-    if (result.status !== 0) {
-        return {
-            args: [],
-            env: {},
-            warning: `${commandLabel} failed; automatic Borg wakeups disabled. ${result.stderr.trim()}`,
-        };
+function defaultIsAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (err) {
+        // EPERM ⇒ the process exists but we can't signal it (still alive).
+        return err?.code === 'EPERM';
+    }
+}
+function safeRm(p) {
+    try {
+        rmSync(p, { force: true });
+    }
+    catch {
+        // best-effort
     }
-    let parsed;
+}
+/**
+ * Remove sockets in the owned dir whose owning app-server pid is no longer
+ * alive (crashed prior launches), leaving live concurrent sessions' sockets
+ * untouched. Operates ONLY inside the borg-owned runtime dir.
+ */
+function pruneStaleSockets(runtimeDir, isAlive) {
+    let entries;
     try {
-        parsed = JSON.parse(result.stdout);
+        entries = readdirSync(runtimeDir);
     }
     catch {
-        return {
-            args: [],
-            env: {},
-            warning: `${commandLabel} returned invalid JSON; automatic Borg wakeups disabled.`,
-        };
+        return;
     }
-    const socketPath = parsed?.daemon?.socketPath ?? parsed?.socketPath;
-    if (typeof socketPath !== 'string' || socketPath.length === 0) {
-        return {
-            args: [],
-            env: {},
-            warning: `${commandLabel} did not return a socket path; automatic Borg wakeups disabled.`,
-        };
+    for (const name of entries) {
+        if (!name.endsWith('.pid'))
+            continue;
+        const pidPath = join(runtimeDir, name);
+        const sockPath = join(runtimeDir, name.replace(/\.pid$/, '.sock'));
+        let pid;
+        try {
+            pid = Number.parseInt(readFileSync(pidPath, 'utf-8').trim(), 10);
+        }
+        catch {
+            safeRm(pidPath);
+            continue;
+        }
+        if (Number.isNaN(pid) || !isAlive(pid)) {
+            safeRm(sockPath);
+            safeRm(pidPath);
+        }
     }
-    return {
-        args: ['--remote', `unix://${socketPath}`],
-        env: { BORG_CODEX_REMOTE_WAKE: '1' },
-    };
 }
-export function refreshCodexMcpServerForInstalledVersion(runSync, options = {}) {
-    const installedVersion = options.installedBorgmcpVersion;
-    if (!installedVersion || installedVersion === 'unknown')
-        return { restarted: false };
-    const statePath = options.versionRefreshStatePath ?? DEFAULT_VERSION_REFRESH_STATE_PATH;
-    const previousVersion = readLastRefreshedVersion(statePath);
-    if (previousVersion === installedVersion)
-        return { restarted: false };
-    const restart = runSync('codex', ['app-server', 'daemon', 'restart']);
-    if (restart.status !== 0) {
-        const detail = restart.stderr.trim();
-        return {
-            restarted: false,
-            warning: `Codex app-server restart for borgmcp ${installedVersion} failed; stale borg MCP children may persist.${detail ? ` ${detail}` : ''}`,
-        };
+function failLoud(reason) {
+    return { args: [], env: {}, warning: reason };
+}
+/**
+ * Start a borg-owned per-launch Codex app-server, probe it for readiness, and
+ * return the `--remote` launch args + an owned handle (or a fail-loud warning).
+ * Async + lifecycle-owning: the caller MUST call `result.server?.cleanup()` on
+ * TUI exit.
+ */
+export async function prepareCodexRemoteLaunch(deps) {
+    const runtimeDir = deps.runtimeDir ?? DEFAULT_CODEX_REMOTE_DIR;
+    const isAlive = deps.isAlive ?? defaultIsAlive;
+    const readyTimeoutMs = deps.readyTimeoutMs ?? 8000;
+    const pollIntervalMs = deps.pollIntervalMs ?? 250;
+    // 1. 0700 owned dir + prune crashed prior sockets (concurrent-safe via pid liveness).
+    try {
+        mkdirSync(runtimeDir, { recursive: true, mode: 0o700 });
+        chmodSync(runtimeDir, 0o700); // enforce 0700 even if it pre-existed with looser perms
+        pruneStaleSockets(runtimeDir, isAlive);
+    }
+    catch (err) {
+        return failLoud(`Codex remote-wake disabled: could not prepare ${runtimeDir} (${err?.message ?? err}); run borg:regen manually.`);
     }
+    // 2. unique, non-predictable socket path inside the owned dir.
+    const id = (deps.socketId ?? (() => randomBytes(16).toString('hex')))();
+    const socketPath = join(runtimeDir, `${id}.sock`);
+    const pidPath = join(runtimeDir, `${id}.pid`);
+    // 3. spawn the long-lived app-server.
+    let child;
     try {
-        writeLastRefreshedVersion(statePath, installedVersion);
+        child = deps.spawnAppServer(socketPath);
     }
     catch (err) {
-        return {
-            restarted: true,
-            warning: `Codex app-server restarted for borgmcp ${installedVersion}, but refresh marker could not be saved: ${err?.message ?? err}`,
-        };
+        safeRm(socketPath);
+        return failLoud(`Codex remote-wake disabled: could not start \`codex app-server\` (${err?.message ?? err}) — ` +
+            `is Codex installed + up to date? This session only wakes on the ~30min /loop fallback; ` +
+            `run borg:regen manually.`);
     }
-    return { restarted: true };
-}
-function withRefreshWarning(launch, warning) {
-    if (!warning)
-        return launch;
-    return {
-        ...launch,
-        warning: `${warning} ${launch.warning ?? ''}`.trim(),
+    if (child.pid != null) {
+        try {
+            writeFileSync(pidPath, String(child.pid));
+        }
+        catch {
+            // pidfile is only for stale-prune; launch still proceeds.
+        }
+    }
+    const cleanup = () => {
+        try {
+            child.kill();
+        }
+        catch {
+            // best-effort
+        }
+        safeRm(socketPath);
+        safeRm(pidPath);
     };
-}
-function readLastRefreshedVersion(statePath) {
-    try {
-        if (!existsSync(statePath))
-            return null;
-        const parsed = JSON.parse(readFileSync(statePath, 'utf-8'));
-        return typeof parsed.lastRefreshedVersion === 'string' ? parsed.lastRefreshedVersion : null;
+    // 4. readiness via a real protocol round-trip — bounded attempts (no clock dep).
+    const attempts = Math.max(1, Math.ceil(readyTimeoutMs / pollIntervalMs));
+    let ready = false;
+    for (let i = 0; i < attempts && !ready; i++) {
+        try {
+            ready = await deps.probeReady(socketPath);
+        }
+        catch {
+            ready = false;
+        }
+        if (!ready && i < attempts - 1)
+            await deps.sleep(pollIntervalMs);
     }
-    catch {
-        return null;
+    if (!ready) {
+        cleanup();
+        return failLoud(`Codex remote-wake disabled: could not reach a Codex app-server at ${socketPath} within ` +
+            `${readyTimeoutMs}ms (is Codex up to date? \`codex app-server --listen\` is required). ` +
+            `This session only wakes on the ~30min /loop fallback — run borg:regen manually when you return.`);
     }
+    // 5. ready → owned remote launch.
+    return {
+        args: ['--remote', `unix://${socketPath}`],
+        env: { BORG_CODEX_REMOTE_WAKE: '1' },
+        server: { pid: child.pid, socketPath, cleanup },
+    };
 }
-function writeLastRefreshedVersion(statePath, version) {
-    mkdirSync(dirname(statePath), { recursive: true });
-    writeFileSync(statePath, JSON.stringify({ lastRefreshedVersion: version, updatedAt: new Date().toISOString() }, null, 2) + '\n');
+/**
+ * Production deps for prepareCodexRemoteLaunch — spawn the real `codex
+ * app-server` child + probe it with the real CodexAppServerClient. Shared by
+ * claude.ts and assimilate-deps.ts so there's ONE wiring.
+ *
+ * The readiness probe uses Codex app-server RPCs ONLY (connect + thread/loaded/
+ * list) — it never calls a borg /api/drone/* endpoint — so it can never advance
+ * last_seen/last_regen_at and mask a deaf Codex (the gh#46/gh#406 signal-truth
+ * invariant; the app-server socket is the wake-DELIVERY wire, not a liveness
+ * signal).
+ */
+export function defaultCodexRemoteDeps() {
+    return {
+        spawnAppServer: (socketPath) => {
+            const child = spawn('codex', ['app-server', '--listen', `unix://${socketPath}`], {
+                stdio: 'ignore',
+                shell: false,
+            });
+            return {
+                pid: child.pid,
+                kill: () => {
+                    try {
+                        child.kill();
+                    }
+                    catch {
+                        // best-effort
+                    }
+                },
+            };
+        },
+        probeReady: async (socketPath) => {
+            const probe = new CodexAppServerClient(socketPath);
+            try {
+                await probe.connect();
+                await probe.loadedThreadIds();
+                return true;
+            }
+            catch {
+                return false;
+            }
+            finally {
+                try {
+                    probe.close();
+                }
+                catch {
+                    // best-effort
+                }
+            }
+        },
+        sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
+    };
 }
 //# sourceMappingURL=codex-remote.js.map

package/dist/codex-remote.js.map

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

package/dist/config.d.ts

@@ -1,27 +1,30 @@
 /**
- * Store Google OAuth ID token securely in the OS keychain.
+ * Store Google OAuth ID token securely in the selected backend.
  */
 export declare function storeIdToken(idToken: string, expiresAt: number): Promise<void>;
 /**
- * Store Google OAuth refresh token securely in the OS keychain.
+ * Store Google OAuth refresh token securely in the selected backend.
  */
 export declare function storeRefreshToken(refreshToken: string): Promise<void>;
 /**
- * Retrieve the Google OAuth ID token from the OS keychain.
- * Returns null if not stored or expired (5-minute buffer).
+ * Retrieve the Google OAuth ID token.
  *
- * `getPassword` on a missing entry returns null/undefined depending
- * on platform binding; normalize with `?? null` so the caller
- * contract (`string | null`) is platform-stable.
+ * A caller-managed token (BORG_TOKEN / BORG_TOKEN_FILE) takes precedence and
+ * is returned verbatim — the caller owns its freshness, so the expiry buffer
+ * does not apply. Otherwise reads the persistent backend and returns null if
+ * not stored or within the 5-minute expiry buffer.
  */
 export declare function getIdToken(): Promise<string | null>;
 /**
- * Retrieve the Google OAuth refresh token from the OS keychain.
+ * Retrieve the Google OAuth refresh token. There is no refresh_token in
+ * caller-managed mode (the externally-supplied id_token has no refresh
+ * counterpart), so this returns null whenever a caller-managed token is set.
  */
 export declare function getRefreshToken(): Promise<string | null>;
 /**
- * Clear all stored tokens from the OS keychain. Idempotent — calling
- * on an already-empty keychain is a no-op (NoEntry errors absorbed).
+ * Clear all stored tokens from the selected backend. Idempotent — clearing
+ * an already-empty store is a no-op. Does not touch caller-managed env vars
+ * (those are the caller's to manage).
  */
 export declare function clearTokens(): Promise<void>;
 /**

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAuDA;;GAEG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGpF;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3E;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiBzD;AAED;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAE9D;AAED;;;GAGG;AACH,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAIjD;AAED;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC,CAGxD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAkGA;;GAEG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIpF;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG3E;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAqBzD;AAED;;;;GAIG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAI9D;AAED;;;;GAIG;AACH,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAKjD;AAED;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC,CAGxD"}