@telora/daemon 0.21.26 → 0.21.82

package/dist/focus-loop.js

@@ -1,364 +0,0 @@
-/**
- * Focus iteration loop -- the cybernetic control layer for a focus.
- *
- * Differential Focus Spec model: each active focus advances through phases:
- *
- *   audit -> realign_crt -> propose_injections -> execute -> gate -> evaluate
- *      |                                                               |
- *      +--------------------- loop on outcome=continue -----------------+
- *
- * The loop layer ADDS to the existing focus engine; it does not replace
- * delivery execution. Per-delivery work continues to flow through the
- * listener; this loop drives focus-level state across iteration cycles.
- *
- * Per project memory: focus.status is human-controlled. The loop does NOT
- * mutate focus.status; on outcome=complete it records the evaluation and
- * lets humans close the loop.
- *
- * @module focus-loop
- */
-import { getFocusDeliveries as defaultGetFocusDeliveries } from './queries/focuses.js';
-import { createFocusCycleEvaluation, getRecentFocusCycleEvaluation, } from './queries/focus-cycle-evaluations.js';
-import { applyRatifiedProposals as defaultApplyRatifiedProposals, } from './realign-apply.js';
-const defaultDeps = {
-    getFocusDeliveries: defaultGetFocusDeliveries,
-    applyRatifiedProposals: (focusId) => defaultApplyRatifiedProposals(focusId),
-    getRecentFocusCycleEvaluation,
-    createFocusCycleEvaluation,
-};
-/**
- * Merge overrides onto the default focus-loop deps. The FocusEngine uses this to
- * inject the config/product-scoped `isFocusBranchAhead` check (which the static
- * defaultDeps cannot build, having no config) while keeping every other dep at
- * its real implementation.
- */
-export function buildFocusLoopDeps(overrides) {
-    return { ...defaultDeps, ...overrides };
-}
-// ---------------------------------------------------------------------------
-// Phase ordering
-// ---------------------------------------------------------------------------
-const MAX_FOCUS_ITERATIONS = 20;
-// NOTE: 'audit' is NO LONGER a phase in this rotation. CRT-validation was
-// repositioned out of the per-cycle focus-loop and into a self-invoked
-// scope-time refresh (FocusEngine.tickFocusLoop -> runAuditPhase, gated by the
-// scoping-entry + change-detection gates in audit-phase.ts) so it runs when a
-// decision is about to READ the tree, not on a blind cycle timer. The cycle now
-// opens at realign_crt.
-const PHASE_ORDER = [
-    'realign_crt',
-    'propose_injections',
-    'execute',
-    'gate',
-    'evaluate',
-];
-const FIRST_PHASE = PHASE_ORDER[0];
-/** Decide which phase to run next given the most recent evaluation row. */
-export function nextPhase(prev) {
-    if (!prev) {
-        return { phase: FIRST_PHASE, cycleNumber: 1 };
-    }
-    // After evaluate -> continue, increment cycle and start over at the first
-    // phase. After evaluate -> complete/escalate/blocked, stay on evaluate
-    // (terminal until something changes; the dispatcher will keep recording
-    // snapshots but they collapse to the existing row via the unique constraint,
-    // so we simply re-run the deterministic check and re-emit if it flips).
-    if (prev.phase === 'evaluate') {
-        if (prev.outcome === 'continue') {
-            return { phase: FIRST_PHASE, cycleNumber: prev.cycle_number + 1 };
-        }
-        return { phase: 'evaluate', cycleNumber: prev.cycle_number };
-    }
-    const idx = PHASE_ORDER.indexOf(prev.phase);
-    if (idx < 0 || idx === PHASE_ORDER.length - 1) {
-        // Defensive: unknown phase (e.g. a persisted legacy 'audit' row) -> reset to
-        // the first phase on the same cycle.
-        return { phase: FIRST_PHASE, cycleNumber: prev.cycle_number };
-    }
-    return { phase: PHASE_ORDER[idx + 1], cycleNumber: prev.cycle_number };
-}
-/**
- * Realign CRT. Applies ratified-but-not-yet-applied drift proposals for the
- * focus -- nothing else. Desired-effect restatement prose is authored as an
- * output of injection verification (see verify-restatement.ts), so this phase
- * no longer scans the tree for unauthored prose; reconciliation is a
- * per-injection verify event, not a standing per-tick observer.
- *
- * Always returns 'continue' -- a single failed proposal does not block the
- * loop; the error is surfaced via the rationale + metadata.errors field.
- */
-export async function runRealignCrtPhase(focusId, deps = defaultDeps) {
-    const result = await deps.applyRatifiedProposals(focusId);
-    const proposalsTotal = result.applied + result.failed;
-    if (proposalsTotal === 0) {
-        return {
-            outcome: 'continue',
-            rationale: 'realign_crt -- no ratified proposals to apply',
-        };
-    }
-    return {
-        outcome: 'continue',
-        rationale: `realign_crt -- applied ${result.applied} of ${proposalsTotal} ratified proposals`,
-        metadata: {
-            applied: result.applied,
-            failed: result.failed,
-            errors: result.errors,
-        },
-    };
-}
-/**
- * Propose injection adjustments to close CRT-FRT gap.
- *
- * Event-driven (NOT tick-driven): this phase is a no-op pass-through that
- * exists only to keep the loop's state machine intact (PHASE_ORDER). The
- * daemon does NOT auto-create injections.
- *
- * The work that used to live here is driven by two upstream events that
- * cause UDEs without active 'targets' injections to surface to operators:
- *
- *   1. `applyRatifiedProposals` (in realign_crt) -- when ratified drift is
- *      applied, the CRT shape changes. New UDEs may appear; existing
- *      injections may retire. The realtime subscriptions on
- *      reality_tree_nodes/reality_tree_edges then trigger the frontend
- *      `useFocusNeedsInjection` query to re-run.
- *
- *   2. `verifyInjectionOnPass` (in the verification engine) -- verifying
- *      an injection retires it and deletes its targets-edges; downstream
- *      UDEs may flip back to "needs injection" if no other injection
- *      covers them. Same realtime path drives the recompute.
- *
- * The actual surfacing happens in the UI: `getFocusNeedsInjectionUdes`
- * (queries/reality-tree) plus the FocusPage `NeedsInjectionPanel` invite
- * the operator to design injections in conversation with the AI agent
- * (the agent reads the tree on demand via `telora_reality_tree_*` MCP calls).
- *
- * Future enhancement: the daemon could push notifications when the set of
- * needs-injection UDEs grows, but for v1 the realtime + lazy-query path is
- * sufficient and keeps machine agency at the UI / dialog layer.
- */
-async function runProposeInjectionsPhase(_focusId) {
-    return {
-        outcome: 'continue',
-        rationale: 'propose_injections -- event-driven; UI surfaces needs-injection UDEs for agent-led design in conversation',
-    };
-}
-/**
- * Execute deliveries. The existing focus engine listener already drives
- * per-delivery execution; this phase records that execution is in progress
- * and yields back to the listener until the gate phase.
- */
-async function runExecutePhase(focusId, deps = defaultDeps) {
-    const deliveries = await deps.getFocusDeliveries(focusId);
-    const counts = countByStatus(deliveries.map(d => d.executionStatus));
-    return {
-        outcome: 'continue',
-        rationale: `execute phase -- delivery listener owns per-delivery work`,
-        metadata: { deliveryStatusCounts: counts, deliveryCount: deliveries.length },
-    };
-}
-/**
- * Gate. Returns 'continue' if any delivery still needs human/agent action.
- * Returns 'continue' to evaluate when execution is settled.
- */
-async function runGatePhase(focusId, deps = defaultDeps) {
-    const deliveries = await deps.getFocusDeliveries(focusId);
-    const blocking = deliveries.filter(d => isBlockingStatus(d.executionStatus));
-    if (blocking.length > 0) {
-        return {
-            outcome: 'continue',
-            rationale: `gate -- ${blocking.length} delivery(s) still active`,
-            metadata: {
-                blocking: blocking.map(d => ({ id: d.id, name: d.name, status: d.executionStatus })),
-            },
-        };
-    }
-    return {
-        outcome: 'continue',
-        rationale: 'gate -- all deliveries settled, advancing to evaluate',
-    };
-}
-/**
- * Evaluate. Deterministic check: are we done?
- *
- * - Any delivery in flight (queued/coding/verify_failed/planning/draft, OR
- *   verify): 'continue'. verify is in-flight because its verify->done gate has
- *   not crossed -- a delivery held at its gate must hold its focus open and
- *   reach 'complete' on its own once the hold clears (no human touch).
- * - All deliveries settled -- done or cancelled: 'complete'.
- * - Otherwise (paused/blocked, neither in flight nor settled): 'blocked'.
- */
-export async function runEvaluatePhase(focusId, deps = defaultDeps) {
-    const deliveries = await deps.getFocusDeliveries(focusId);
-    if (deliveries.length === 0) {
-        return {
-            outcome: 'blocked',
-            rationale: 'evaluate -- focus has no deliveries; cannot determine completion',
-        };
-    }
-    const counts = countByStatus(deliveries.map(d => d.executionStatus));
-    const inFlight = deliveries.filter(d => isInFlightStatus(d.executionStatus));
-    if (inFlight.length > 0) {
-        // Legibility: when what keeps the focus from complete is a delivery HELD at
-        // its verify->done gate (by an operator escalation or a measurement
-        // contradiction installed by the sibling gate deliveries), NAME it at the
-        // focus altitude -- the hold installed one level down must be visible here,
-        // not absorbed into a bare status count. The delivery's gate_state carries
-        // WHY it is held, so surface it rather than opening a second channel.
-        const heldAtGate = inFlight.filter(d => isHeldAtGateStatus(d.executionStatus));
-        const heldDeliveries = heldAtGate.map(d => ({
-            id: d.id,
-            name: d.name,
-            status: d.executionStatus,
-            gateState: d.gateState ?? null,
-        }));
-        const rationale = heldAtGate.length > 0
-            ? `evaluate -- ${inFlight.length} delivery(s) still in flight; ` +
-                `${heldAtGate.length} held at the verify gate (${heldAtGate.map(d => `"${d.name}"`).join(', ')})`
-            : `evaluate -- ${inFlight.length} delivery(s) still in flight`;
-        return {
-            outcome: 'continue',
-            rationale,
-            metadata: heldDeliveries.length > 0
-                ? { deliveryStatusCounts: counts, heldDeliveries }
-                : { deliveryStatusCounts: counts },
-        };
-    }
-    const settled = deliveries.filter(d => isSettledStatus(d.executionStatus));
-    if (settled.length === deliveries.length) {
-        // Landed-work gate: even with every delivery settled, a focus whose agent
-        // branch carries commits not reachable from integration has NOT landed its
-        // work -- a human inspecting the tree would see none of it (the observed
-        // "board says complete while the work is unlanded" failure). Hold `complete`
-        // open and return 'continue' so the merge-back loop lands the branch (the
-        // normal outcome); a genuinely-unmergeable branch becomes residue via the
-        // merge-back loop's stuck_focus_branch escalation, and the loop re-evaluates
-        // each tick so completion fires on its own once the branch lands -- no wedge,
-        // no human touch. Optional dep: when the FocusEngine has not injected it
-        // (unit tests), completion stays delivery-status-only.
-        if (deps.isFocusBranchAhead && (await deps.isFocusBranchAhead(focusId))) {
-            return {
-                outcome: 'continue',
-                rationale: 'evaluate -- all deliveries settled, but the focus branch carries commits not yet ' +
-                    'reachable from integration; merge-back will land it before the focus reads complete',
-                metadata: { deliveryStatusCounts: counts, branchAhead: true },
-            };
-        }
-        return {
-            outcome: 'complete',
-            rationale: 'evaluate -- all deliveries settled (done/cancelled; a delivery in verify holds the focus open). Awaiting human focus completion.',
-            metadata: { deliveryStatusCounts: counts },
-        };
-    }
-    return {
-        outcome: 'blocked',
-        rationale: 'evaluate -- deliveries are not in flight and not settled (paused/blocked)',
-        metadata: { deliveryStatusCounts: counts },
-    };
-}
-// ---------------------------------------------------------------------------
-// Status classification
-// ---------------------------------------------------------------------------
-// `verify` is IN-FLIGHT for focus completion, NOT settled: a delivery in verify
-// has NOT crossed its verify->done gate. The sibling gate deliveries on this
-// focus install HOLDS that park a delivery in verify (an open operator
-// escalation; a host measurement that contradicts the acceptance). While verify
-// counted as settled here, a focus every delivery of which was held still
-// evaluated to `complete` -- the exact signal-without-reality this focus exists
-// to close. Keeping verify in IN_FLIGHT makes the evaluate phase return
-// `continue` (re-evaluated each tick, reaching `complete` on its own once the
-// gate clears -- no wedge, no human touch required to release it).
-const IN_FLIGHT = new Set(['queued', 'coding', 'verify_failed', 'planning', 'draft', 'verify']);
-// `cancelled` stays settled by explicit choice: a cancelled delivery is
-// genuinely terminal -- it will never cross a gate, so it must not hold its
-// focus open. `done` is the only other settled state: a delivery that actually
-// passed its verify->done gate.
-const SETTLED = new Set(['done', 'cancelled']);
-function isInFlightStatus(status) {
-    return IN_FLIGHT.has(status ?? '');
-}
-function isSettledStatus(status) {
-    return SETTLED.has(status ?? '');
-}
-function isBlockingStatus(status) {
-    return IN_FLIGHT.has(status ?? '');
-}
-// Statuses that mean a delivery is HELD at its verify->done gate (in flight, but
-// specifically parked at the gate rather than actively coding). Currently just
-// `verify`. A Set membership (not a bare `=== 'verify'`) so the vocabulary lint's
-// bare-status-literal rule stays satisfied, matching IN_FLIGHT/SETTLED above.
-const HELD_AT_GATE = new Set(['verify']);
-function isHeldAtGateStatus(status) {
-    return HELD_AT_GATE.has(status ?? '');
-}
-function countByStatus(statuses) {
-    const out = {};
-    for (const s of statuses) {
-        const key = s ?? 'unknown';
-        out[key] = (out[key] ?? 0) + 1;
-    }
-    return out;
-}
-// ---------------------------------------------------------------------------
-// Dispatch
-// ---------------------------------------------------------------------------
-// Partial: 'audit' is intentionally NOT dispatchable -- it was repositioned to a
-// scope-time self-refresh (see PHASE_ORDER note). FocusPhase retains 'audit' so
-// legacy persisted rows still type, but nextPhase never RETURNS 'audit' (it maps
-// any such row to the first phase), so this map is never indexed with it. The
-// runFocusLoopOnce dispatch guards the lookup defensively regardless.
-const PHASE_RUNNERS = {
-    realign_crt: (focusId, deps) => runRealignCrtPhase(focusId, deps),
-    propose_injections: (focusId) => runProposeInjectionsPhase(focusId),
-    execute: (focusId, deps) => runExecutePhase(focusId, deps),
-    gate: (focusId, deps) => runGatePhase(focusId, deps),
-    evaluate: (focusId, deps) => runEvaluatePhase(focusId, deps),
-};
-/**
- * Run one tick of the focus loop for a single focus.
- * Reads the most recent evaluation, advances to the next phase, runs it,
- * and persists the outcome. Returns the inserted evaluation row, or null
- * if the loop is on a terminal evaluation row that has not changed.
- */
-export async function runFocusLoopOnce(focusId, deps = defaultDeps) {
-    const prev = await deps.getRecentFocusCycleEvaluation(focusId);
-    const { phase, cycleNumber } = nextPhase(prev);
-    if (cycleNumber > MAX_FOCUS_ITERATIONS) {
-        return await deps.createFocusCycleEvaluation({
-            focusId,
-            cycleNumber,
-            phase,
-            outcome: 'escalate',
-            rationale: `max iterations (${MAX_FOCUS_ITERATIONS}) reached -- escalating for human review`,
-        });
-    }
-    const runner = PHASE_RUNNERS[phase];
-    if (!runner) {
-        // Only reachable if a legacy 'audit' row slipped past nextPhase's reset.
-        // Record a no-op continue so the loop advances to the first phase next tick.
-        return await deps.createFocusCycleEvaluation({
-            focusId,
-            cycleNumber,
-            phase: FIRST_PHASE,
-            outcome: 'continue',
-            rationale: `phase '${phase}' is no longer dispatchable (audit repositioned to scope-time); advancing`,
-        });
-    }
-    const result = await runner(focusId, deps);
-    // Skip persistence if we'd rewrite the same terminal evaluate row.
-    if (prev &&
-        prev.phase === 'evaluate' &&
-        prev.cycle_number === cycleNumber &&
-        prev.phase === phase &&
-        prev.outcome === result.outcome) {
-        return null;
-    }
-    return await deps.createFocusCycleEvaluation({
-        focusId,
-        cycleNumber,
-        phase,
-        outcome: result.outcome,
-        rationale: result.rationale,
-        metadata: result.metadata,
-    });
-}
-//# sourceMappingURL=focus-loop.js.map

package/dist/focus-loop.js.map

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

package/dist/focus-merge.d.ts

@@ -1,131 +0,0 @@
-/**
- * Focus branch merge logic.
- *
- * Handles merging a focus's work branch into the integration branch,
- * including workflow resolution and per-delivery git state reporting.
- */
-import type { DaemonConfig, FocusTeamState, MergeConflictResolutionResult } from './types.js';
-import { reportGitState } from './supabase.js';
-import { createEscalation, hasOpenWorktreeDirtyEscalation } from './queries/issues.js';
-import { worktreeHasUncommittedChanges } from './worktree/index.js';
-/**
- * Injectable collaborators for the dirty-worktree merge guard. Defaults to the
- * real implementations; tests override them to drive the refusal path without a
- * live worktree or Supabase.
- */
-export interface DirtyWorktreeGuardDeps {
-    worktreeHasUncommittedChanges?: typeof worktreeHasUncommittedChanges;
-    createEscalation?: typeof createEscalation;
-    hasOpenWorktreeDirtyEscalation?: typeof hasOpenWorktreeDirtyEscalation;
-}
-/**
- * Refuse a focus-branch merge when the worktree still has uncommitted changes.
- *
- * A merge of a dirty worktree would either silently drop the uncommitted work
- * or merge an unintended tree -- never acceptable. This guard runs before any
- * merge attempt: if the worktree is dirty it files an escalation (deduped
- * durably at focus grain across the sibling classes -- see
- * hasOpenWorktreeDirtyEscalation) and returns refused=true so the caller aborts
- * the merge. A read-only audit worktree that an agent dirtied is the canonical
- * case, but the guard is generic -- any dirty worktree refuses.
- *
- * Returns refused=false (proceed) when the worktree is clean or no path is
- * known.
- */
-export declare function refuseMergeIfWorktreeDirty(params: {
-    worktreePath: string | null | undefined;
-    organizationId: string;
-    sessionId: string;
-    deliveryId: string;
-    deliveryName: string;
-    focusId: string;
-    branchName: string;
-    integrationBranch: string;
-}, deps?: DirtyWorktreeGuardDeps): Promise<{
-    refused: boolean;
-}>;
-/**
- * Parameters for merge conflict escalation/reporting.
- */
-export interface MergeConflictParams {
-    organizationId: string;
-    sessionId: string;
-    deliveryId: string;
-    deliveryName: string;
-    focusId: string;
-    branchName: string;
-    integrationBranch: string;
-    mergeError: string;
-}
-/**
- * Report merge_conflict git state for a delivery.
- *
- * Makes the merge failure visible in the frontend delivery detail view.
- */
-export declare function reportMergeConflictState(deliveryId: string, branchName: string): Promise<void>;
-/**
- * Injectable collaborators for the merge-conflict escalation. Defaults to the
- * real implementations; tests override them to drive the suppression path
- * without a live Supabase.
- */
-export interface MergeConflictEscalationDeps {
-    createEscalation?: typeof createEscalation;
-    hasOpenWorktreeDirtyEscalation?: typeof hasOpenWorktreeDirtyEscalation;
-    reportGitState?: typeof reportGitState;
-}
-/**
- * Create an escalation for a merge conflict and report the git state.
- *
- * Durable, focus-grain dedup: skips escalation creation if any sibling
- * worktree-dirty escalation (advance_blocked / merge_conflict /
- * merge_refused_dirty) is already open for the FOCUS. Because the lookup
- * queries the DB rather than an in-memory Set, the suppression survives a
- * daemon restart and collapses across the sibling paths. Always reports
- * merge_conflict git state regardless (git-state surfacing is not deduped --
- * only the human-facing escalation row is).
- *
- * Called by all focus-level merge callers when mergeToIntegration fails.
- */
-export declare function escalateMergeConflict(params: MergeConflictParams, deps?: MergeConflictEscalationDeps): Promise<void>;
-/**
- * Check for deliveries stuck in merge_conflict state and retry the merge.
- *
- * Called once per poll cycle. Queries the API for deliveries with
- * merge_conflict git state, groups them by branch (to avoid duplicate
- * merges), and retries mergeToIntegration for each unique branch.
- *
- * On success: reports merged_to_integration for all deliveries on that
- * branch and auto-resolves their open merge_conflict escalations.
- * On failure: logs quietly (the existing escalation remains active).
- */
-export declare function checkResolvedMergeConflicts(config: DaemonConfig): Promise<void>;
-/**
- * Request the team lead to resolve merge conflicts in the worktree.
- *
- * Sends a user message via stdin with conflict details and instructions,
- * then polls git state to detect when conflicts are resolved (no more
- * unmerged files and a merge commit exists).
- *
- * Returns when resolution is detected or timeout expires.
- */
-export declare function requestTeamLeadResolution(teamState: FocusTeamState, conflictFiles: string[], branchName: string, integrationBranch: string, timeoutMs?: number): Promise<MergeConflictResolutionResult>;
-/**
- * Merge the focus branch to integration.
- *
- * Uses the first delivery ID as the representative for merge operations
- * (all deliveries share the same branch in the focus model).
- *
- * `workedDeliveryIds` is the set of deliveries the team actually built in
- * this merge cycle. Git state and the merge commit SHA are recorded only
- * for these deliveries — never for queued/planning deliveries that happen
- * to share the same focus branch but were never touched. When empty (e.g.,
- * a focus whose deliveries all reached done before this merge cycle, or a
- * state-driven merge-back tick on a fully-done focus), the merge still
- * proceeds — the planning-phase / read-only safety nets live in
- * `shouldAttemptMerge`, not here.
- */
-export declare function mergeFocusBranch(config: DaemonConfig, teamState: FocusTeamState, sessionId: string, branchName: string, workedDeliveryIds: string[]): Promise<{
-    mergeSucceeded: boolean;
-    exitReason: string;
-}>;
-//# sourceMappingURL=focus-merge.d.ts.map

package/dist/focus-merge.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"focus-merge.d.ts","sourceRoot":"","sources":["../src/focus-merge.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EAEd,6BAA6B,EAC9B,MAAM,YAAY,CAAC;AAEpB,OAAO,EAA0B,cAAc,EAA8B,MAAM,eAAe,CAAC;AAInG,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAI/B,MAAM,qBAAqB,CAAC;AAU7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAOpE;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,6BAA6B,CAAC,EAAE,OAAO,6BAA6B,CAAC;IACrE,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,CAAC;IAC3C,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;CACxE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE;IACN,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,EACD,IAAI,GAAE,sBAA2B,GAChC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAkE/B;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CASf;AAED;;;;GAIG;AACH,MAAM,WAAW,2BAA2B;IAC1C,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,CAAC;IAC3C,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;IACvE,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;CACxC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,GAAE,2BAAgC,GACrC,OAAO,CAAC,IAAI,CAAC,CA6Ff;AAiCD;;;;;;;;;;GAUG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC,CAiHf;AAUD;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,cAAc,EACzB,aAAa,EAAE,MAAM,EAAE,EACvB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,SAAS,GAAE,MAA6C,GACvD,OAAO,CAAC,6BAA6B,CAAC,CA4DxC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EAAE,GAC1B,OAAO,CAAC;IAAE,cAAc,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAiM1D"}