@sagmans/dsh-tui 0.1.2 → 0.3.0

package/lib/theme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../src/theme.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAmB,MAAM,wBAAwB,CAAA;AAQzF,sDAAsD;AACtD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB;AAED,8EAA8E;AAC9E,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;IACjC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IAC1B,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IAC1B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IAC5B,mFAAmF;IACnF,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IAC3B,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IAC7B,wEAAwE;IACxE,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IAC5B,kFAAkF;IAClF,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IAC5B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IAC5B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;IAC5B,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAA;CACjC;AA6CD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,OAAO,CAG/G;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,QAAQ,CAyBpD"}
+{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../src/theme.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,WAAW,EAAE,KAAK,aAAa,EAAwB,MAAM,wBAAwB,CAAA;AACpH,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACzE,OAAO,EAAoF,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACnI,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAazD;;;;;GAKG;AACH,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,8BAA8B;IAC9B,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IAC5C,4EAA4E;IAC5E,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC3D,4EAA4E;IAC5E,KAAK,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAA;IAC9B,0CAA0C;IAC1C,OAAO,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAA;IACjC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;IAC5B,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAA;CACjC;AA2CD;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,IAAI,GAAE,UAA0C,EAAE,SAAS,GAAE,cAA6B,GAAG,QAAQ,CAoChI;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,WAAW,GAAG,WAAW,CAWzE;AAED,8DAA8D;AAC9D,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,aAAa,GAAG,aAAa,CAiB/E"}

package/lib/theme.js

@@ -1,84 +1,133 @@
-const RESET = '\u001B[0m';
-function sgr(code, enabled) {
-    return enabled ? text => `\u001B[${code}m${text}${RESET}` : text => text;
-}
+import { truncateToWidth } from '@earendil-works/pi-tui';
+import { detectColourMode } from "./theme-capability.js";
+import { DEFAULT_PALETTE, DEFAULT_TOKENS, resetSequence, resolveToken } from "./theme-tokens.js";
+/** What a caller gets when it has written no settings at all. */
+const NO_OVERRIDES = { palette: DEFAULT_PALETTE, tokens: new Map() };
 /**
- * Style markdown through the same palette as the rest of the surface.
+ * Distinguishes one theme table from the next.
  *
- * Code blocks stay unstyled on purpose: a fenced block is already set apart by
- * its border and indentation, and coloring it would fight the reader's own
- * terminal theme.
+ * A renderer caches rows against the theme that produced them, so the revision
+ * is how a cache learns its rows were drawn under a table that is now stale.
  */
+let themeRevision = 0;
+/** Style markdown through the same table as the rest of the surface. */
 function markdownTheme(style) {
     return {
-        heading: text => style.bold(style.accent(text)),
-        link: text => style.underline(style.accent(text)),
-        linkUrl: style.dim,
-        code: style.accent,
-        codeBlock: text => text,
-        codeBlockBorder: style.dim,
-        quote: style.dim,
-        quoteBorder: style.dim,
-        hr: style.dim,
-        listBullet: style.accent,
-        bold: style.bold,
-        italic: style.italic,
-        strikethrough: style.strike,
-        underline: style.underline,
+        heading: text => style('markdown.heading', text),
+        link: text => style('markdown.link', text),
+        linkUrl: text => style('markdown.linkUrl', text),
+        code: text => style('markdown.code', text),
+        codeBlock: text => style('markdown.codeBlock', text),
+        codeBlockBorder: text => style('markdown.codeBlockBorder', text),
+        quote: text => style('markdown.quote', text),
+        quoteBorder: text => style('markdown.quoteBorder', text),
+        hr: text => style('markdown.hr', text),
+        listBullet: text => style('markdown.listBullet', text),
+        bold: text => style('markdown.bold', text),
+        italic: text => style('markdown.italic', text),
+        strikethrough: text => style('markdown.strikethrough', text),
+        underline: text => style('markdown.underline', text),
     };
 }
-function selectListTheme(dim, accent, bold) {
+/** The editor keeps only a border colour and a select list, so both come from tokens. */
+function editorTheme(style, visible) {
     return {
-        selectedPrefix: accent,
-        selectedText: bold,
-        description: dim,
-        scrollInfo: dim,
-        noMatch: dim,
+        // Hiding the border has to remove it: returning the text unstyled would draw
+        // it louder than the muted default the reader was trying to remove.
+        borderColor: text => (visible('editor.border') ? style('editor.border', text) : ''),
+        // A select-list row is framework-owned text, so a hidden entry can only be
+        // unstyled rather than absent; the README records that limit.
+        selectList: {
+            selectedPrefix: text => style('editor.selectList.selectedPrefix', text),
+            selectedText: text => style('editor.selectList.selectedText', text),
+            description: text => style('editor.selectList.description', text),
+            scrollInfo: text => style('editor.selectList.scrollInfo', text),
+            noMatch: text => style('editor.selectList.noMatch', text),
+        },
     };
 }
 /**
- * Whether styling is on, given the launch flag and the environment.
+ * Build the surface theme.
  *
- * `NO_COLOR` is a cross-tool convention (no-color.org): when it is present and
- * not empty, a program that colors by default must not, regardless of its own
- * flags. Honouring it means one environment variable turns styling off for
- * every tool in a session, which is how a reader actually wants it to work.
+ * Every token is resolved once, when the theme is built, rather than per frame:
+ * a repaint walks the whole transcript and re-resolving a palette chain for
+ * every row would pay for the same answer thousands of times. A settings change
+ * builds a new theme instead, which is also what makes the swap atomic.
  */
-export function colorEnabled(requested, env = process.env) {
-    const noColor = env.NO_COLOR;
-    return requested && (noColor === undefined || noColor === '');
+export function createTheme(mode = detectColourMode(process.env), overrides = NO_OVERRIDES) {
+    const resolved = new Map();
+    const resolve = (token) => {
+        const cached = resolved.get(token);
+        if (cached !== undefined)
+            return cached;
+        const style = resolveToken(token, overrides.tokens, overrides.palette, mode);
+        resolved.set(token, style);
+        return style;
+    };
+    const style = (token, text) => {
+        const { prefix, suffix } = resolve(token);
+        return prefix === '' ? text : `${prefix}${text}${suffix}`;
+    };
+    /**
+     * Truncate to a width, honouring the promise that `none` emits nothing.
+     *
+     * pi-tui closes a cut by writing a reset unconditionally, whether or not the
+     * text carried any styling, so a truncated row leaks escapes even when
+     * colour is off. Those resets close styles this surface never opened, so
+     * dropping them restores the contract without changing what is drawn.
+     */
+    const cut = (text, width, ellipsis = '') => {
+        const truncated = truncateToWidth(text, width, ellipsis);
+        return mode === 'none' ? truncated.replaceAll(resetSequence(), '') : truncated;
+    };
+    const visible = (token) => !resolve(token).hidden;
+    return {
+        revision: ++themeRevision,
+        color: mode !== 'none',
+        style,
+        cut,
+        glyph: token => resolve(token).glyph,
+        visible,
+        editor: editorTheme(style, visible),
+        markdown: markdownTheme(style),
+    };
 }
 /**
- * Build the surface theme.
+ * An editor theme that follows a moving source.
  *
- * Styling uses the standard 16 ANSI colors and terminal defaults rather than
- * true-color values, so a light or dark terminal remaps the interface on its
- * own and the surface needs no theme setting.
+ * The editor keeps the theme it was built with for the life of the session, so
+ * a settings change has to reach it through a stable object instead of by
+ * replacing the one it captured.
  */
-export function createTheme(color) {
-    const dim = sgr('2', color);
-    const bold = sgr('1', color);
-    const accent = sgr('36', color);
-    const warn = sgr('33', color);
-    const added = sgr('32', color);
-    const removed = sgr('31', color);
-    const italic = sgr('3', color);
-    const underline = sgr('4', color);
-    const strike = sgr('9', color);
+export function forwardEditorTheme(source) {
+    return {
+        borderColor: text => source().borderColor(text),
+        selectList: {
+            selectedPrefix: text => source().selectList.selectedPrefix(text),
+            selectedText: text => source().selectList.selectedText(text),
+            description: text => source().selectList.description(text),
+            scrollInfo: text => source().selectList.scrollInfo(text),
+            noMatch: text => source().selectList.noMatch(text),
+        },
+    };
+}
+/** The markdown counterpart of {@link forwardEditorTheme}. */
+export function forwardMarkdownTheme(source) {
     return {
-        color,
-        glyphs: { user: '›', assistant: '⏺', tool: '⚒', notice: '·', reasoning: '▸', marker: '⧉' },
-        dim,
-        bold,
-        tool: warn,
-        notice: dim,
-        added,
-        removed,
-        marker: dim,
-        accent,
-        italic,
-        editor: { borderColor: dim, selectList: selectListTheme(dim, accent, bold) },
-        markdown: markdownTheme({ dim, bold, accent, italic, underline, strike }),
+        heading: text => source().heading(text),
+        link: text => source().link(text),
+        linkUrl: text => source().linkUrl(text),
+        code: text => source().code(text),
+        codeBlock: text => source().codeBlock(text),
+        codeBlockBorder: text => source().codeBlockBorder(text),
+        quote: text => source().quote(text),
+        quoteBorder: text => source().quoteBorder(text),
+        hr: text => source().hr(text),
+        listBullet: text => source().listBullet(text),
+        bold: text => source().bold(text),
+        italic: text => source().italic(text),
+        strikethrough: text => source().strikethrough(text),
+        underline: text => source().underline(text),
     };
 }
 //# sourceMappingURL=theme.js.map

package/lib/theme.js.map

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

package/lib/tokens.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Token estimates shared by every row that reports a size.
+ *
+ * The exact count needs the provider's own tokenizer, which a terminal does not
+ * have; four characters per token is the estimate a reader can compare against,
+ * and one definition keeps a reasoning row, a status row, and a tool card from
+ * disagreeing about the same text.
+ */
+/** Characters a provider bills as roughly one token. */
+export declare const CHARS_PER_TOKEN = 4;
+/** A thought's or a payload's size in tokens, rounded up so a non-empty text never reads as zero. */
+export declare function countTokens(text: string): number;
+/** Compact a token count, because the exact number changes nothing a reader decides. */
+export declare function formatTokens(count: number): string;
+//# sourceMappingURL=tokens.d.ts.map

package/lib/tokens.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,wDAAwD;AACxD,eAAO,MAAM,eAAe,IAAI,CAAA;AAMhC,qGAAqG;AACrG,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wFAAwF;AACxF,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMlD"}

package/lib/tokens.js

@@ -0,0 +1,29 @@
+/**
+ * Token estimates shared by every row that reports a size.
+ *
+ * The exact count needs the provider's own tokenizer, which a terminal does not
+ * have; four characters per token is the estimate a reader can compare against,
+ * and one definition keeps a reasoning row, a status row, and a tool card from
+ * disagreeing about the same text.
+ */
+/** Characters a provider bills as roughly one token. */
+export const CHARS_PER_TOKEN = 4;
+const THOUSAND = 1000;
+const HUNDRED_THOUSAND = 100 * THOUSAND;
+const MILLION = 1_000_000;
+/** A thought's or a payload's size in tokens, rounded up so a non-empty text never reads as zero. */
+export function countTokens(text) {
+    return Math.ceil(text.length / CHARS_PER_TOKEN);
+}
+/** Compact a token count, because the exact number changes nothing a reader decides. */
+export function formatTokens(count) {
+    if (count >= MILLION)
+        return `${(count / MILLION).toFixed(1)}M`;
+    // A decimal on a five-digit count is noise: 128.0k reads worse than 128k.
+    if (count >= HUNDRED_THOUSAND)
+        return `${Math.round(count / THOUSAND)}k`;
+    if (count >= THOUSAND)
+        return `${(count / THOUSAND).toFixed(1)}k`;
+    return String(count);
+}
+//# sourceMappingURL=tokens.js.map

package/lib/tokens.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,wDAAwD;AACxD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAA;AAEhC,MAAM,QAAQ,GAAG,IAAI,CAAA;AACrB,MAAM,gBAAgB,GAAG,GAAG,GAAG,QAAQ,CAAA;AACvC,MAAM,OAAO,GAAG,SAAS,CAAA;AAEzB,qGAAqG;AACrG,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,CAAA;AACjD,CAAC;AAED,wFAAwF;AACxF,MAAM,UAAU,YAAY,CAAC,KAAa;IACxC,IAAI,KAAK,IAAI,OAAO;QAAE,OAAO,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAA;IAC/D,0EAA0E;IAC1E,IAAI,KAAK,IAAI,gBAAgB;QAAE,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAA;IACxE,IAAI,KAAK,IAAI,QAAQ;QAAE,OAAO,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAA;IACjE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;AACtB,CAAC"}

package/lib/transcript.d.ts

@@ -49,9 +49,23 @@ export declare class TranscriptModel {
     private readonly now;
     private readonly settled;
     private readonly pending;
+    /**
+     * Where each nested call landed on its root card.
+     *
+     * A dispatch logs a start and then a settle, so the second event has to find
+     * the row the first one drew instead of adding a second line for one call.
+     */
+    private readonly pendingSub;
     private live;
     private liveReasoning;
     private reasoningStartedAt;
+    /**
+     * Whether this step already painted a thought from the stream.
+     *
+     * A live turn streams the thinking and then records the same text in the
+     * message, so the recorded copy is a repeat rather than a second thought.
+     */
+    private reasoningPaintedThisStep;
     constructor(presenter?: ToolPresenter | undefined, 
     /** Clock for "how long has this been thinking"; injected so a test can pin it. */
     now?: () => number);
@@ -79,13 +93,24 @@ export declare class TranscriptModel {
     /** Report a live agent failure the durable log never carries as a message. */
     reportError(error: unknown): void;
     /**
-     * Settle the reasoning streamed so far into a row of its own.
+     * Settle one thought into a row of its own.
      *
      * The row lands where the reasoning happened, which is before the answer it
      * produced, so reading order still matches the order the model thought in.
      */
+    private paintReasoning;
+    /** Settle the reasoning streamed so far into a row of its own. */
     private settleReasoning;
     apply(event: FoldableEvent): void;
+    /**
+     * Fold one nested PTC call onto the card of the run_code call that dispatched it.
+     *
+     * Dispatches are logged while the program runs, so the root is still pending;
+     * a dispatch whose root is not in this fold belongs to a window that starts
+     * mid-run, and attaching it to another card would claim a call that card
+     * never made.
+     */
+    private applySubCall;
     private settleToolResult;
 }
 //# sourceMappingURL=transcript.d.ts.map

package/lib/transcript.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transcript.d.ts","sourceRoot":"","sources":["../src/transcript.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAA;AAEzF,qCAAqC;AACrC,MAAM,MAAM,eAAe,GACvB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAChD;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACrD;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAClD;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAClD;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClD;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAA;AAE3G,yGAAyG;AACzG,eAAO,MAAM,oBAAoB,QAAS,CAAA;AAE1C;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CACxB;AA8DD;;;;;;;;GAQG;AACH,qBAAa,eAAe;IAQxB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAC3B,kFAAkF;IAClF,OAAO,CAAC,QAAQ,CAAC,GAAG;IATtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,kBAAkB,CAAoB;gBAG3B,SAAS,CAAC,EAAE,aAAa,YAAA;IAC1C,kFAAkF;IACjE,GAAG,GAAE,MAAM,MAAyB;IAGvD,sFAAsF;IACtF,OAAO,IAAI,SAAS,eAAe,EAAE;IAerC;;;;;;OAMG;IACH,YAAY,IAAI,MAAM;IAItB,yEAAyE;IACzE,OAAO,IAAI,OAAO;IAIlB,KAAK,IAAI,IAAI;IAQb,gFAAgF;IAChF,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI1B,mFAAmF;IACnF,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI1B,kDAAkD;IAClD,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAwBtC,2FAA2F;IAC3F,OAAO,CAAC,aAAa;IAiBrB,8EAA8E;IAC9E,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAKjC;;;;;OAKG;IACH,OAAO,CAAC,eAAe;IAgBvB,KAAK,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAsEjC,OAAO,CAAC,gBAAgB;CAuCzB"}
+{"version":3,"file":"transcript.d.ts","sourceRoot":"","sources":["../src/transcript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoE,KAAK,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAA;AAGhI,qCAAqC;AACrC,MAAM,MAAM,eAAe,GACvB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAChD;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACrD;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAClD;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAClD;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClD;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAA;AAE3G,yGAAyG;AACzG,eAAO,MAAM,oBAAoB,QAAS,CAAA;AAQ1C;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CACxB;AA2FD;;;;;;;;GAQG;AACH,qBAAa,eAAe;IAsBxB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IAC3B,kFAAkF;IAClF,OAAO,CAAC,QAAQ,CAAC,GAAG;IAvBtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiF;IAC5G,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,kBAAkB,CAAoB;IAC9C;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB,CAAQ;gBAGrB,SAAS,CAAC,EAAE,aAAa,YAAA;IAC1C,kFAAkF;IACjE,GAAG,GAAE,MAAM,MAAyB;IAGvD,sFAAsF;IACtF,OAAO,IAAI,SAAS,eAAe,EAAE;IAerC;;;;;;OAMG;IACH,YAAY,IAAI,MAAM;IAItB,yEAAyE;IACzE,OAAO,IAAI,OAAO;IAIlB,KAAK,IAAI,IAAI;IASb,gFAAgF;IAChF,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI1B,mFAAmF;IACnF,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI1B,kDAAkD;IAClD,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAyBtC,2FAA2F;IAC3F,OAAO,CAAC,aAAa;IAiBrB,8EAA8E;IAC9E,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAKjC;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAYtB,kEAAkE;IAClE,OAAO,CAAC,eAAe;IASvB,KAAK,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IA2FjC;;;;;;;OAOG;IACH,OAAO,CAAC,YAAY;IAkCpB,OAAO,CAAC,gBAAgB;CAwCzB"}