@bevel-software/platform-core-backend 0.1.0

package/dist/modules/diff/diff.interface.d.ts

@@ -0,0 +1,73 @@
+import type { FileDiffPayload, ReviewSession } from '@bevel-software/platform-shared';
+/**
+ * Shape of the diff service. Backups live in a sibling root that mirrors the
+ * workspaces layout: each user/repo has `<backupsRoot>/<userId>/<repoName>/...`
+ * holding the "last user-confirmed state" of every diffable file. Drift between
+ * disk and backup is the pending-change set.
+ *
+ * Triggers that update the backup:
+ *   - First-time mount (lazy via `currentSession`) seeds from disk.
+ *   - User write/delete/rename through WorkspaceService → `syncFromDisk` /
+ *     `markUserDeleted`.
+ *   - User accept/reject of pending changes.
+ *
+ * Under the per-branch workspace model each branch has its own clone +
+ * its own backup folder, both seeded at bootstrap, so the legacy
+ * "branch switch wipes + reseeds the backup" trigger is gone. `resetBackup`
+ * + `resetBackupUnlocked` are still on the interface as primitives but
+ * have **no production callers** today — kept for potential future
+ * mutex-holding use cases.
+ *
+ * Agent edits, agent shell commits, and `git pull/merge/fetch/commit/push`
+ * leave the backup alone — the resulting drift is what the user reviews.
+ */
+export interface IDiffService {
+    /** Wipe the backup folder and reseed from the current working tree. */
+    resetBackup(workspaceId: string): Promise<void>;
+    /**
+     * Same as `resetBackup` but assumes the caller is already holding the
+     * workspace mutex (via `WorkspaceMutex.run`). Originally the post-switch
+     * backup-reseed hook for `GitService.switchBranch`; that caller is gone
+     * with the per-branch workspace model (each branch has its own workspace
+     * + its own backup, seeded at bootstrap), so this currently has no
+     * production callers — kept in the interface as a primitive for future
+     * mutex-holding callers that need a backup reset.
+     */
+    resetBackupUnlocked(workspaceId: string): Promise<void>;
+    /** Pending changes for the current branch, or null when none. */
+    currentSession(workspaceId: string): Promise<ReviewSession | null>;
+    /** Diff payload (baseline + current) for one path. */
+    fileDiff(workspaceId: string, relativePath: string): Promise<FileDiffPayload>;
+    /** Promote disk → backup for `relativePath`. Handles file or directory. */
+    syncFromDisk(workspaceId: string, relativePath: string): Promise<void>;
+    /** Drop backup entry for `relativePath` (file or dir, recursive). */
+    markUserDeleted(workspaceId: string, relativePath: string): Promise<void>;
+    /** Accept one pending path: backup ← disk (or drop backup if disk-gone). */
+    acceptOne(workspaceId: string, relativePath: string): Promise<ReviewSession | null>;
+    /** Reject one pending path: disk ← backup (or rm disk if backup-gone). */
+    rejectOne(workspaceId: string, relativePath: string): Promise<ReviewSession | null>;
+    /**
+     * Compute the batch revert plan for `paths` WITHOUT mutating anything: each
+     * diffable path resolves to either a write of its pre-agent baseline bytes
+     * (backup exists) or a delete (agent-added file, no backup). Also returns
+     * the workspace dir so the caller can run the plan through a
+     * `LockingFilesystem.writeFiles` batch — one lock sweep, one commit + push.
+     * Non-diffable paths are skipped.
+     */
+    revertPlan(workspaceId: string, paths: string[]): Promise<{
+        workspaceDir: string;
+        writes: {
+            path: string;
+            content: Buffer;
+        }[];
+        deletes: string[];
+    }>;
+    /**
+     * Accept every pending path in ONE batch (single mutex hold, single
+     * pending-list walk). `paths` optionally restricts the batch to an
+     * allow-list — the accept route passes the caller's readable paths so
+     * restricted nodes stay pending.
+     */
+    acceptAll(workspaceId: string, paths?: string[]): Promise<void>;
+}
+//# sourceMappingURL=diff.interface.d.ts.map

package/dist/modules/diff/diff.interface.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff.interface.d.ts","sourceRoot":"","sources":["../../../src/modules/diff/diff.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEtF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,WAAW,YAAY;IAC3B,uEAAuE;IACvE,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhD;;;;;;;;OAQG;IACH,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD,iEAAiE;IACjE,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IAEnE,sDAAsD;IACtD,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IAE9E,2EAA2E;IAC3E,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvE,qEAAqE;IACrE,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1E,4EAA4E;IAC5E,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IAEpF,0EAA0E;IAC1E,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IAEpF;;;;;;;OAOG;IACH,UAAU,CACR,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IAErG;;;;;OAKG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE"}

package/dist/modules/diff/diff.interface.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=diff.interface.js.map

package/dist/modules/diff/diff.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff.interface.js","sourceRoot":"","sources":["../../../src/modules/diff/diff.interface.ts"],"names":[],"mappings":""}

package/dist/modules/diff/diff.routes.d.ts

@@ -0,0 +1,35 @@
+import express from 'express';
+import type { AuthUser, IWorkflowService } from '@bevel-software/platform-shared';
+import type { IDiffService } from './diff.interface.js';
+import type { AuthService } from '../auth/auth.service.js';
+import type { IAccessControl } from '../access/access-control.interface.js';
+import '../auth/auth.middleware.js';
+/**
+ * Reject the given paths as ONE atomic batch via `LockingFilesystem.writeFiles`:
+ * acquire every path's lock up front, restore each pre-agent baseline on disk
+ * (or delete an agent-added file), then commit + push the whole set as a single
+ * change and release. Fail-closed: a contended lock or a failed write/commit
+ * aborts the batch with nothing committed (`writeFiles` discards the
+ * uncommitted bytes via `releaseLockNoCommit`).
+ *
+ * This replaced a per-path acquire → `DiffService.rejectOne` → `releaseLock`
+ * loop, which was O(changes × workspace-size) — every `rejectOne` re-walked and
+ * re-diffed the whole workspace to recompute the session — and queued one
+ * background commit + push PER FILE. On a large agent change-set that pinned
+ * the reject for many minutes; the batch is one walk (`revertPlan`), one lock
+ * sweep, one commit.
+ *
+ * The lock-first property is preserved: `writeFiles` holds every lock before
+ * the first disk mutation, so a restore can never race a concurrent editor.
+ */
+export declare function rejectPathsLocked(workflowService: IWorkflowService, diffService: IDiffService, workspaceId: string, user: AuthUser, paths: string[]): Promise<void>;
+/**
+ * Pending-changes API. URL paths are preserved from the previous review
+ * service so the frontend wire contract is unchanged.
+ *   GET  /workspace/:id/review                → { session: ReviewSession | null }
+ *   GET  /workspace/:id/review/file?path=...  → FileDiffPayload
+ *   POST /workspace/:id/review/accept         → { session }; body { path? }
+ *   POST /workspace/:id/review/reject         → { session }; body { path? }
+ */
+export declare function createDiffRoutes(diffService: IDiffService, authService: AuthService, workflowService: IWorkflowService, accessControl: IAccessControl, kbDirName: string): express.Router;
+//# sourceMappingURL=diff.routes.d.ts.map

package/dist/modules/diff/diff.routes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff.routes.d.ts","sourceRoot":"","sources":["../../../src/modules/diff/diff.routes.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAK5E,OAAO,4BAA4B,CAAC;AAepC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,gBAAgB,EACjC,WAAW,EAAE,YAAY,EACzB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,IAAI,CAAC,CA8Bf;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,YAAY,EACzB,WAAW,EAAE,WAAW,EACxB,eAAe,EAAE,gBAAgB,EACjC,aAAa,EAAE,cAAc,EAC7B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAsLhB"}

package/dist/modules/diff/diff.routes.js

@@ -0,0 +1,228 @@
+import express from 'express';
+import { toKbRelative, resolveReadableMap } from '../access/kb-read-filter.js';
+import { WorkflowDomainError, WorkflowValidationError } from '../workflow/workflow.errors.js';
+import { LockingFilesystem } from '../workflow/locking-filesystem.js';
+import { branchForWorkspaceId } from '../workspace/workspace.service.js';
+import '../auth/auth.middleware.js';
+function toHttpError(err) {
+    if (err instanceof WorkflowDomainError) {
+        return {
+            status: err.status,
+            body: { error: err.message, ...(err.payload ?? {}) },
+        };
+    }
+    const message = err instanceof Error ? err.message : 'Unknown error';
+    return { status: 500, body: { error: message } };
+}
+/**
+ * Reject the given paths as ONE atomic batch via `LockingFilesystem.writeFiles`:
+ * acquire every path's lock up front, restore each pre-agent baseline on disk
+ * (or delete an agent-added file), then commit + push the whole set as a single
+ * change and release. Fail-closed: a contended lock or a failed write/commit
+ * aborts the batch with nothing committed (`writeFiles` discards the
+ * uncommitted bytes via `releaseLockNoCommit`).
+ *
+ * This replaced a per-path acquire → `DiffService.rejectOne` → `releaseLock`
+ * loop, which was O(changes × workspace-size) — every `rejectOne` re-walked and
+ * re-diffed the whole workspace to recompute the session — and queued one
+ * background commit + push PER FILE. On a large agent change-set that pinned
+ * the reject for many minutes; the batch is one walk (`revertPlan`), one lock
+ * sweep, one commit.
+ *
+ * The lock-first property is preserved: `writeFiles` holds every lock before
+ * the first disk mutation, so a restore can never race a concurrent editor.
+ */
+export async function rejectPathsLocked(workflowService, diffService, workspaceId, user, paths) {
+    if (paths.length === 0)
+        return;
+    const branch = branchForWorkspaceId(workspaceId);
+    const plan = await diffService.revertPlan(workspaceId, paths);
+    const total = plan.writes.length + plan.deletes.length;
+    if (total === 0)
+        return;
+    const lockingFs = new LockingFilesystem({ basePath: plan.workspaceDir, contained: true }, { workflow: workflowService, workspaceId, branch, user });
+    try {
+        await lockingFs.writeFiles(plan.writes, `Revert agent changes (${total} file${total === 1 ? '' : 's'})`, plan.deletes);
+    }
+    catch (err) {
+        // Fail-closed: writeFiles committed nothing. Surface ONE clean 4xx
+        // sentence (the raw error is status-less → would 500). The contention
+        // case is rebuilt rather than nested: writeFiles' own text says
+        // "Continuing with other edits", which is wrong here — the batch aborted.
+        const raw = err instanceof Error ? err.message : 'unknown error';
+        const contended = /Skipped editing "(.+?)" — locked by (.+?)\./.exec(raw);
+        const reason = contended
+            ? `"${contended[1]}" is being edited by ${contended[2]}`
+            : raw.replace(/\.\s*$/, '');
+        throw new WorkflowValidationError(`Couldn't revert: ${reason}. No changes were committed — try again when the files are free.`);
+    }
+}
+/**
+ * Pending-changes API. URL paths are preserved from the previous review
+ * service so the frontend wire contract is unchanged.
+ *   GET  /workspace/:id/review                → { session: ReviewSession | null }
+ *   GET  /workspace/:id/review/file?path=...  → FileDiffPayload
+ *   POST /workspace/:id/review/accept         → { session }; body { path? }
+ *   POST /workspace/:id/review/reject         → { session }; body { path? }
+ */
+export function createDiffRoutes(diffService, authService, workflowService, accessControl, kbDirName) {
+    const router = express.Router({ mergeParams: true });
+    // Authentication gate only. Per PLAN §3 the workspace `:id` is a branch
+    // identifier — any authenticated user can access any branch.
+    async function requireUser(req, res) {
+        if (!req.userId) {
+            res.status(401).json({ error: 'Unauthenticated' });
+            return null;
+        }
+        try {
+            const user = await authService.getUserById(req.userId);
+            if (!user) {
+                res.status(401).json({ error: 'User not found' });
+                return null;
+            }
+            return user;
+        }
+        catch (err) {
+            const { status, body } = toHttpError(err);
+            res.status(status).json(body);
+            return null;
+        }
+    }
+    /** Filter change paths to those the caller may read (same gate as GET /review). */
+    async function readablePaths(workspaceId, email, paths) {
+        if (paths.length === 0)
+            return [];
+        const verdict = await resolveReadableMap((w, e, rels) => accessControl.canReadBatch(w, e, rels), workspaceId, email, kbDirName, paths);
+        return paths.filter((p) => verdict.get(p) === true);
+    }
+    /** Read gate for a single change path (mirrors GET /review/file). Returns true to proceed. */
+    async function canReadPath(workspaceId, email, pathParam) {
+        const rel = toKbRelative(pathParam, kbDirName);
+        // Non-KB paths (toKbRelative → null) carry no read rules and pass.
+        return rel === null || (await accessControl.canRead(workspaceId, email, rel));
+    }
+    router.get('/workspace/:id/review', async (req, res) => {
+        const user = await requireUser(req, res);
+        if (!user)
+            return;
+        try {
+            let session = await diffService.currentSession(req.params.id);
+            // Drop changes to nodes the caller can't read — the review view must not
+            // leak a restricted node's path or that it changed. Change paths are
+            // workspace-relative (kbDir-prefixed); FULL read check (per-node
+            // frontmatter), matching the content route. An emptied session → null,
+            // matching the "nothing to review" contract.
+            if (session) {
+                const verdict = await resolveReadableMap((w, e, rels) => accessControl.canReadBatch(w, e, rels), req.params.id, user.email, kbDirName, session.changes.map((c) => c.path));
+                const changes = session.changes.filter((c) => verdict.get(c.path) === true);
+                session = changes.length > 0 ? { ...session, changes } : null;
+            }
+            res.json({ session });
+        }
+        catch (err) {
+            const { status, body } = toHttpError(err);
+            res.status(status).json(body);
+        }
+    });
+    router.get('/workspace/:id/review/file', async (req, res) => {
+        const user = await requireUser(req, res);
+        if (!user)
+            return;
+        const pathParam = typeof req.query.path === 'string' ? req.query.path : '';
+        if (!pathParam) {
+            res.status(400).json({ error: 'path query param is required' });
+            return;
+        }
+        try {
+            // Read gate (mirrors the content route's assertCanRead). Non-KB paths
+            // (toKbRelative → null) carry no read rules and pass.
+            const rel = toKbRelative(pathParam, kbDirName);
+            if (rel !== null && !(await accessControl.canRead(req.params.id, user.email, rel))) {
+                res.status(403).json({ error: `You don't have permission to read "${pathParam}".` });
+                return;
+            }
+            const payload = await diffService.fileDiff(req.params.id, pathParam);
+            res.json(payload);
+        }
+        catch (err) {
+            const { status, body } = toHttpError(err);
+            res.status(status).json(body);
+        }
+    });
+    router.post('/workspace/:id/review/accept', async (req, res) => {
+        const user = await requireUser(req, res);
+        if (!user)
+            return;
+        const pathParam = (req.body ?? {}).path;
+        if (pathParam !== undefined && typeof pathParam !== 'string') {
+            res.status(400).json({ error: 'path must be a string when provided' });
+            return;
+        }
+        try {
+            if (pathParam) {
+                // Gate the single path: never let a caller accept a change they can't read.
+                if (!(await canReadPath(req.params.id, user.email, pathParam))) {
+                    res.status(403).json({ error: `You don't have permission to read "${pathParam}".` });
+                    return;
+                }
+                const session = await diffService.acceptOne(req.params.id, pathParam);
+                res.json({ session });
+            }
+            else {
+                // Accept-all only acts on changes the caller may read — restricted nodes
+                // stay pending rather than being silently mutated. ONE batched service
+                // call: looping `acceptOne` here re-walked + re-diffed the whole
+                // workspace per accepted file (O(changes × files)), which pinned this
+                // request for minutes on large agent change-sets.
+                const current = await diffService.currentSession(req.params.id);
+                const readable = await readablePaths(req.params.id, user.email, current?.changes.map((c) => c.path) ?? []);
+                await diffService.acceptAll(req.params.id, readable);
+                // Recompute once: non-null when restricted nodes stayed pending.
+                const session = await diffService.currentSession(req.params.id);
+                res.json({ session });
+            }
+        }
+        catch (err) {
+            const { status, body } = toHttpError(err);
+            res.status(status).json(body);
+        }
+    });
+    router.post('/workspace/:id/review/reject', async (req, res) => {
+        const user = await requireUser(req, res);
+        if (!user)
+            return;
+        const pathParam = (req.body ?? {}).path;
+        if (pathParam !== undefined && typeof pathParam !== 'string') {
+            res.status(400).json({ error: 'path must be a string when provided' });
+            return;
+        }
+        try {
+            // Resolve the paths to reject, then run them as ONE locked batch
+            // (acquire every lock → restore baselines on disk → one commit + push).
+            // Holding the locks before the disk mutation is what keeps a concurrent
+            // editor from racing the restores — the route never mutates disk unlocked.
+            let paths;
+            if (pathParam) {
+                // Gate the single path: never let a caller reject a change they can't read.
+                if (!(await canReadPath(req.params.id, user.email, pathParam))) {
+                    res.status(403).json({ error: `You don't have permission to read "${pathParam}".` });
+                    return;
+                }
+                paths = [pathParam];
+            }
+            else {
+                // Reject-all only acts on changes the caller may read.
+                const current = await diffService.currentSession(req.params.id);
+                paths = await readablePaths(req.params.id, user.email, current?.changes.map((c) => c.path) ?? []);
+            }
+            await rejectPathsLocked(workflowService, diffService, req.params.id, user, paths);
+            res.json({ session: await diffService.currentSession(req.params.id) });
+        }
+        catch (err) {
+            const { status, body } = toHttpError(err);
+            res.status(status).json(body);
+        }
+    });
+    return router;
+}
+//# sourceMappingURL=diff.routes.js.map

package/dist/modules/diff/diff.routes.js.map

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

package/dist/modules/diff/diff.service.d.ts

@@ -0,0 +1,51 @@
+import type { FileDiffPayload, ReviewSession } from '@bevel-software/platform-shared';
+import type { IDiffService } from './diff.interface.js';
+import type { WorkspaceService } from '../workspace/workspace.service.js';
+import type { WorkspaceMutex } from '../workflow/git/mutex.js';
+/**
+ * On-disk backup ledger. Owns `<backupsRoot>/<userId>/<repoName>/...` and
+ * exposes pending-change / accept / reject ops over it. See `diff.interface.ts`
+ * for trigger semantics.
+ */
+export declare class DiffService implements IDiffService {
+    private readonly workspaceService;
+    private readonly mutex;
+    private readonly workspacesRoot;
+    private readonly backupsRoot;
+    private readonly kbDirName;
+    constructor(workspaceService: WorkspaceService, mutex: WorkspaceMutex, workspacesRoot: string, backupsRoot: string, kbDirName: string);
+    resetBackup(workspaceId: string): Promise<void>;
+    resetBackupUnlocked(workspaceId: string): Promise<void>;
+    currentSession(workspaceId: string): Promise<ReviewSession | null>;
+    fileDiff(workspaceId: string, relativePath: string): Promise<FileDiffPayload>;
+    syncFromDisk(workspaceId: string, relativePath: string): Promise<void>;
+    markUserDeleted(workspaceId: string, relativePath: string): Promise<void>;
+    acceptOne(workspaceId: string, relativePath: string): Promise<ReviewSession | null>;
+    rejectOne(workspaceId: string, relativePath: string): Promise<ReviewSession | null>;
+    acceptAll(workspaceId: string, paths?: string[]): Promise<void>;
+    revertPlan(workspaceId: string, paths: string[]): Promise<{
+        workspaceDir: string;
+        writes: {
+            path: string;
+            content: Buffer;
+        }[];
+        deletes: string[];
+    }>;
+    private sessionUnlocked;
+    private listPendingUnlocked;
+    private ensureSeededUnlocked;
+    private reseedUnlocked;
+    private acceptOneUnlocked;
+    private rejectOneUnlocked;
+    private getBackupDir;
+    private resolvePair;
+    private copyDiffableTree;
+    /**
+     * Read the current branch name from `<repo>/.git/HEAD` without going through
+     * GitService (which would create a circular dep). Returns '' if HEAD points
+     * at a detached commit or anything else we can't parse — the field is
+     * cosmetic on the response and the frontend tolerates an empty string.
+     */
+    private tryReadCurrentBranch;
+}
+//# sourceMappingURL=diff.service.d.ts.map

package/dist/modules/diff/diff.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff.service.d.ts","sourceRoot":"","sources":["../../../src/modules/diff/diff.service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAiB,aAAa,EAAc,MAAM,iCAAiC,CAAC;AACjH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAM/D;;;;GAIG;AACH,qBAAa,WAAY,YAAW,YAAY;IAE5C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAJT,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,cAAc,EACrB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM;IAK9B,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvD,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAIlE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAgC7E,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBtE,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOzE,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAYnF,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAWnF,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB/D,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;YA6BtF,eAAe;YAYf,mBAAmB;YAgBnB,oBAAoB;YA6CpB,cAAc;YAsCd,iBAAiB;YAkBjB,iBAAiB;YAoBjB,YAAY;YASZ,WAAW;YAaX,gBAAgB;IA4B9B;;;;;OAKG;YACW,oBAAoB;CAanC"}