opencode-rehydar 0.14.2 → 0.14.3

package/dist/opencode-plugin/v2/rehydrate-tail.js

@@ -0,0 +1,147 @@
+/**
+ * Shared tail buffering for streamed PII-tag rehydration.
+ *
+ * Model output arrives in fragments: a single `<PII .../>` tag can be split
+ * across SSE events, WebSocket byte chunks, or JSON delta frames. Rehydrating
+ * a fragment in isolation would emit an unterminated tag (or worse, drop the
+ * real value), so incomplete fragments are held back and prepended to the next
+ * fragment of the same stream.
+ *
+ * Two buffers are maintained per session:
+ * - a byte/text tail for raw text payloads (SSE `data:` bodies, non-JSON WS
+ *   frames),
+ * - a JSON pointer tail so each string field of a JSON delta frame continues
+ *   from the fragment left by the previous frame.
+ */
+/** Longest PII tag fragment we hold back while awaiting its closing delimiter. */
+export const MAX_TAG_TAIL_LENGTH = 256;
+/** Default tag prefix, matching `DEFAULT_TAG_FORMAT`. */
+export const DEFAULT_TAG_PREFIX = "<PII";
+/** Default tag close delimiter. */
+export const DEFAULT_TAG_CLOSE = "/>";
+/** Default in-memory tail store. */
+export class InMemoryRehydrateTailStore {
+    textTails = new Map();
+    jsonTails = new Map();
+    get(sessionID) {
+        return this.textTails.get(sessionID) ?? "";
+    }
+    set(sessionID, tail) {
+        if (tail.length === 0) {
+            this.textTails.delete(sessionID);
+            return;
+        }
+        this.textTails.set(sessionID, tail);
+    }
+    getJsonTail(sessionID, pointer) {
+        return this.jsonTails.get(sessionID)?.get(pointer) ?? "";
+    }
+    setJsonTail(sessionID, pointer, tail) {
+        const pointers = this.jsonTails.get(sessionID);
+        if (tail.length === 0) {
+            if (pointers === undefined)
+                return;
+            pointers.delete(pointer);
+            if (pointers.size === 0)
+                this.jsonTails.delete(sessionID);
+            return;
+        }
+        if (pointers === undefined) {
+            this.jsonTails.set(sessionID, new Map([[pointer, tail]]));
+            return;
+        }
+        pointers.set(pointer, tail);
+    }
+    delete(sessionID) {
+        this.textTails.delete(sessionID);
+        this.jsonTails.delete(sessionID);
+    }
+    clear() {
+        this.textTails.clear();
+        this.jsonTails.clear();
+    }
+}
+/**
+ * Finds the start of a trailing, unterminated PII tag fragment.
+ *
+ * Returns `-1` when the text has no incomplete tag, so a caller can safely
+ * emit it. When a fragment is found, the caller must hold it back (prepending
+ * it to the next fragment) instead of emitting a truncated tag.
+ */
+export function incompleteTagStart(text, tagPrefix, tagClose) {
+    const start = text.lastIndexOf(tagPrefix);
+    if (start >= 0 && text.indexOf(tagClose, start) === -1) {
+        return start;
+    }
+    // A tag can also be split before its full prefix has arrived (e.g. the frame
+    // ends with `<PI`). Hold back the longest trailing prefix fragment.
+    const maxPrefix = Math.min(text.length, tagPrefix.length - 1);
+    for (let length = maxPrefix; length >= 1; length--) {
+        const suffix = text.slice(text.length - length);
+        if (suffix === tagPrefix.slice(0, length)) {
+            return text.length - length;
+        }
+    }
+    return -1;
+}
+/**
+ * Splits a restored string at its trailing unterminated tag fragment.
+ *
+ * When the fragment is longer than {@link MAX_TAG_TAIL_LENGTH} the whole string
+ * is emitted: holding an unbounded fragment risks stalling the stream, so the
+ * cap forces a flush.
+ */
+export function splitTrailingTag(text, tagPrefix, tagClose) {
+    const start = incompleteTagStart(text, tagPrefix, tagClose);
+    if (start < 0) {
+        return { emitted: text, tail: "" };
+    }
+    const fragment = text.slice(start);
+    if (fragment.length > MAX_TAG_TAIL_LENGTH) {
+        return { emitted: text, tail: "" };
+    }
+    return { emitted: text.slice(0, start), tail: fragment };
+}
+/**
+ * Walks a JSON value, restoring every string leaf.
+ *
+ * Each leaf is prefixed with the fragment previously held for its JSON pointer
+ * (so a tag split across delta frames is reassembled), then any trailing
+ * unterminated fragment is held back for the next frame. `changed` reports
+ * whether any leaf differs from the original, letting callers keep the frame
+ * byte-for-byte when nothing needed rewriting.
+ */
+export async function walkJsonWithTail(value, rehydrate, ctx, pointer = "") {
+    if (typeof value === "string") {
+        const key = ctx.pointerPrefix + pointer;
+        const held = ctx.store.getJsonTail(ctx.sessionID, key);
+        const restored = await rehydrate(held + value);
+        const { emitted, tail } = splitTrailingTag(restored, ctx.tagPrefix, ctx.tagClose);
+        ctx.store.setJsonTail(ctx.sessionID, key, tail);
+        return { value: emitted, changed: emitted !== value };
+    }
+    if (Array.isArray(value)) {
+        const items = value;
+        const output = [];
+        let changed = false;
+        for (let index = 0; index < items.length; index++) {
+            const result = await walkJsonWithTail(items[index], rehydrate, ctx, `${pointer}/${index}`);
+            output.push(result.value);
+            changed = changed || result.changed;
+        }
+        return { value: output, changed };
+    }
+    if (value !== null && typeof value === "object") {
+        const source = value;
+        const output = {};
+        let changed = false;
+        for (const key of Object.keys(source)) {
+            const result = await walkJsonWithTail(source[key], rehydrate, ctx, `${pointer}/${key}`);
+            output[key] = result.value;
+            changed = changed || result.changed;
+        }
+        return { value: output, changed };
+    }
+    return { value, changed: false };
+}
+//# sourceMappingURL=rehydrate-tail.js.map

package/dist/opencode-plugin/v2/rehydrate-tail.js.map

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

package/dist/opencode-plugin/v2/response-rehydrate.d.ts

@@ -0,0 +1,78 @@
+/**
+ * Response rehydration for the V2 `http.response` / `experimental.ws.receive`
+ * hooks.
+ *
+ * The model only ever sees PII tags; its output must be rewritten back to the
+ * real values before the user sees it. Referencing `deps.rehydrate` keeps the
+ * PII map lookup in the caller (the session store) so this module stays free of
+ * storage concerns.
+ *
+ * Rewriting strategy by surface:
+ * - JSON `http.response`: parse, walk string leaves, re-serialise.
+ * - SSE `http.response`: streamed through a {@link SseStreamRewriter}; only
+ *   complete frames are rewritten so a tag split across chunks, across SSE
+ *   events, or split inside a streamed delta field is never emitted truncated.
+ * - WebSocket frames: only `primary` frames are rehydrated. JSON frames are
+ *   parsed and walked, carrying a tag split across the delta field of two frames
+ *   on the matching JSON pointer; non-JSON frames fall back to text replacement
+ *   with a per-session tail buffer that holds an incomplete trailing PII tag
+ *   until the next frame completes it.
+ *
+ * Every failure is logged and the original payload is passed through — a failed
+ * rehydration must never corrupt the response or break OpenCode.
+ */
+import type { RehydrateTailStore } from "./rehydrate-tail.js";
+import type { HttpResponseKind, V2Logger } from "./types.js";
+export { InMemoryRehydrateTailStore } from "./rehydrate-tail.js";
+export type { RehydrateTailStore } from "./rehydrate-tail.js";
+export interface ResponseRehydrateDeps {
+    /** Restores PII tags in a single string. */
+    rehydrate: (input: string) => Promise<string>;
+    log: V2Logger;
+    sessionID: string;
+    kind: HttpResponseKind;
+    /** Tag prefix used to detect an incomplete trailing tag (`<PII`). */
+    tagPrefix?: string;
+    /** Tag close delimiter used to detect a complete tag (`/>`). */
+    tagClose?: string;
+    /** Per-session WebSocket tail buffer; defaults to a shared instance. */
+    tailStore?: RehydrateTailStore;
+}
+/** Dependencies accepted by the WebSocket frame rehydrator. */
+export interface WsFrameRehydrateDeps {
+    rehydrate: (input: string) => Promise<string>;
+    log: V2Logger;
+    sessionID?: string;
+    tagPrefix?: string;
+    tagClose?: string;
+    tailStore?: RehydrateTailStore;
+}
+/**
+ * Rehydrates an HTTP response produced for a session request.
+ *
+ * Only `primary` responses are processed: `title` / `compaction` / `generate`
+ * responses are not user-facing, so restoring real values there would only leak
+ * PII. Unsupported content types are left untouched.
+ */
+export declare function rehydrateHttpResponse(event: {
+    response: Response;
+}, deps: ResponseRehydrateDeps): Promise<void>;
+/**
+ * Restores a WebSocket frame in place.
+ *
+ * Only `primary` frames are rehydrated: `title` / `compaction` / `generate`
+ * frames are not user-facing, so restoring real values there would only leak
+ * PII. Any fragment held from an earlier frame is dropped on a non-primary
+ * frame so it cannot surface later.
+ *
+ * Complete JSON frames are parsed and walked so escaped characters are handled
+ * correctly; a tag split across the delta field of consecutive JSON frames is
+ * carried on the matching JSON pointer. Other frames use raw replacement,
+ * holding an incomplete trailing tag in a per-session text buffer until a later
+ * frame completes it.
+ */
+export declare function rehydrateWsFrame(event: {
+    frame: string;
+    kind?: HttpResponseKind;
+}, deps: WsFrameRehydrateDeps): Promise<void>;
+//# sourceMappingURL=response-rehydrate.d.ts.map

package/dist/opencode-plugin/v2/response-rehydrate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"response-rehydrate.d.ts","sourceRoot":"","sources":["../../../src/opencode-plugin/v2/response-rehydrate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAWH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAG7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAQ9D,MAAM,WAAW,qBAAqB;IACpC,4CAA4C;IAC5C,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9C,GAAG,EAAE,QAAQ,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,gBAAgB,CAAC;IACvB,qEAAqE;IACrE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gEAAgE;IAChE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wEAAwE;IACxE,SAAS,CAAC,EAAE,kBAAkB,CAAC;CAChC;AAED,+DAA+D;AAC/D,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9C,GAAG,EAAE,QAAQ,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,kBAAkB,CAAC;CAChC;AAmGD;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,EAC7B,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,gBAAgB,CAAA;CAAE,EACjD,IAAI,EAAE,oBAAoB,GACzB,OAAO,CAAC,IAAI,CAAC,CA0Df"}

package/dist/opencode-plugin/v2/response-rehydrate.js

@@ -0,0 +1,210 @@
+/**
+ * Response rehydration for the V2 `http.response` / `experimental.ws.receive`
+ * hooks.
+ *
+ * The model only ever sees PII tags; its output must be rewritten back to the
+ * real values before the user sees it. Referencing `deps.rehydrate` keeps the
+ * PII map lookup in the caller (the session store) so this module stays free of
+ * storage concerns.
+ *
+ * Rewriting strategy by surface:
+ * - JSON `http.response`: parse, walk string leaves, re-serialise.
+ * - SSE `http.response`: streamed through a {@link SseStreamRewriter}; only
+ *   complete frames are rewritten so a tag split across chunks, across SSE
+ *   events, or split inside a streamed delta field is never emitted truncated.
+ * - WebSocket frames: only `primary` frames are rehydrated. JSON frames are
+ *   parsed and walked, carrying a tag split across the delta field of two frames
+ *   on the matching JSON pointer; non-JSON frames fall back to text replacement
+ *   with a per-session tail buffer that holds an incomplete trailing PII tag
+ *   until the next frame completes it.
+ *
+ * Every failure is logged and the original payload is passed through — a failed
+ * rehydration must never corrupt the response or break OpenCode.
+ */
+import { walkJson } from "../../utils/json-walk.js";
+import { SseStreamRewriter } from "./sse.js";
+import { DEFAULT_TAG_CLOSE, DEFAULT_TAG_PREFIX, InMemoryRehydrateTailStore, splitTrailingTag, walkJsonWithTail, } from "./rehydrate-tail.js";
+// Re-exported so existing consumers keep importing the tail store from here.
+export { InMemoryRehydrateTailStore } from "./rehydrate-tail.js";
+/**
+ * Fallback store used when a caller does not inject one. Tests should inject a
+ * fresh store to keep sessions isolated.
+ */
+const sharedTailStore = new InMemoryRehydrateTailStore();
+/** Normalizes an unknown thrown value into a loggable message. */
+function errorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+/**
+ * Builds a replacement response with the same status and headers.
+ *
+ * `content-length` is dropped because the rehydrated body differs in length and
+ * a stale value would truncate or over-read it.
+ */
+function withBody(original, body) {
+    const headers = new Headers(original.headers);
+    headers.delete("content-length");
+    return new Response(body, {
+        status: original.status,
+        statusText: original.statusText,
+        headers,
+    });
+}
+/**
+ * Rehydrates a JSON response body on `event.response`.
+ *
+ * JSON is the safest surface to rewrite: `JSON.parse` / `JSON.stringify` keeps
+ * the payload valid while every string leaf is passed through `rehydrate`.
+ */
+async function rehydrateJsonResponse(event, deps) {
+    const rawBody = await event.response.clone().text();
+    const parsed = JSON.parse(rawBody);
+    const restored = await walkJson(parsed, deps.rehydrate);
+    event.response = withBody(event.response, JSON.stringify(restored));
+}
+/**
+ * Rehydrates a streamed SSE response body by piping it through a
+ * {@link SseStreamRewriter}. The body is never fully buffered, so OpenCode keeps
+ * receiving incremental frames.
+ */
+async function rehydrateSseResponse(event, deps) {
+    const rewriter = new SseStreamRewriter(deps.rehydrate, (message) => {
+        deps.log.error("rehydra SSE frame rewrite failed", {
+            sessionID: deps.sessionID,
+            error: message,
+        });
+    }, {
+        sessionID: deps.sessionID,
+        tagPrefix: deps.tagPrefix,
+        tagClose: deps.tagClose,
+    });
+    const encoder = new TextEncoder();
+    const source = event.response.body;
+    const { readable, writable } = new TransformStream({
+        async transform(chunk, controller) {
+            const text = await rewriter.push(chunk);
+            if (text.length > 0) {
+                controller.enqueue(encoder.encode(text));
+            }
+        },
+        async flush(controller) {
+            const text = await rewriter.flush();
+            if (text.length > 0) {
+                controller.enqueue(encoder.encode(text));
+            }
+        },
+    });
+    const headers = new Headers(event.response.headers);
+    headers.delete("content-length");
+    event.response = new Response(readable, {
+        status: event.response.status,
+        statusText: event.response.statusText,
+        headers,
+    });
+    if (source === null) {
+        await writable.close();
+        return;
+    }
+    source.pipeTo(writable).catch((error) => {
+        deps.log.error("rehydra SSE stream failed", {
+            sessionID: deps.sessionID,
+            error: errorMessage(error),
+        });
+    });
+}
+/**
+ * Rehydrates an HTTP response produced for a session request.
+ *
+ * Only `primary` responses are processed: `title` / `compaction` / `generate`
+ * responses are not user-facing, so restoring real values there would only leak
+ * PII. Unsupported content types are left untouched.
+ */
+export async function rehydrateHttpResponse(event, deps) {
+    if (deps.kind !== "primary") {
+        return;
+    }
+    try {
+        const contentType = event.response.headers.get("content-type") ?? "";
+        if (contentType.includes("application/json")) {
+            await rehydrateJsonResponse(event, deps);
+            return;
+        }
+        if (contentType.includes("text/event-stream")) {
+            await rehydrateSseResponse(event, deps);
+        }
+    }
+    catch (error) {
+        deps.log.error("rehydra http.response hook failed", {
+            sessionID: deps.sessionID,
+            kind: deps.kind,
+            error: errorMessage(error),
+        });
+    }
+}
+/**
+ * Restores a WebSocket frame in place.
+ *
+ * Only `primary` frames are rehydrated: `title` / `compaction` / `generate`
+ * frames are not user-facing, so restoring real values there would only leak
+ * PII. Any fragment held from an earlier frame is dropped on a non-primary
+ * frame so it cannot surface later.
+ *
+ * Complete JSON frames are parsed and walked so escaped characters are handled
+ * correctly; a tag split across the delta field of consecutive JSON frames is
+ * carried on the matching JSON pointer. Other frames use raw replacement,
+ * holding an incomplete trailing tag in a per-session text buffer until a later
+ * frame completes it.
+ */
+export async function rehydrateWsFrame(event, deps) {
+    const store = deps.tailStore ?? sharedTailStore;
+    const sessionID = deps.sessionID ?? "";
+    const tagPrefix = deps.tagPrefix ?? DEFAULT_TAG_PREFIX;
+    const tagClose = deps.tagClose ?? DEFAULT_TAG_CLOSE;
+    if (event.kind !== "primary") {
+        // Fail closed: never restore PII in a non-primary response, and drop any
+        // fragment left behind by an earlier frame.
+        store.delete(sessionID);
+        return;
+    }
+    const combined = store.get(sessionID) + event.frame;
+    const originalFrame = event.frame;
+    try {
+        let parsed;
+        let isJson = true;
+        try {
+            parsed = JSON.parse(combined);
+        }
+        catch {
+            isJson = false;
+        }
+        if (isJson) {
+            const result = await walkJsonWithTail(parsed, deps.rehydrate, {
+                store,
+                sessionID,
+                pointerPrefix: "ws:",
+                tagPrefix,
+                tagClose,
+            });
+            // Preserve the frame byte-for-byte when nothing was rehydrated; otherwise
+            // re-serialize so escaped characters are handled correctly. `combined`
+            // includes any fragment held back from a previous frame.
+            event.frame = result.changed ? JSON.stringify(result.value) : combined;
+            // Clear the byte-level text tail; JSON-pointer tails were updated above.
+            store.set(sessionID, "");
+            return;
+        }
+        const restored = await deps.rehydrate(combined);
+        const { emitted, tail } = splitTrailingTag(restored, tagPrefix, tagClose);
+        event.frame = emitted;
+        store.set(sessionID, tail);
+    }
+    catch (error) {
+        store.delete(sessionID);
+        event.frame = originalFrame;
+        deps.log.error("rehydra experimental.ws.receive hook failed", {
+            sessionID,
+            error: errorMessage(error),
+        });
+    }
+}
+//# sourceMappingURL=response-rehydrate.js.map

package/dist/opencode-plugin/v2/response-rehydrate.js.map

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

package/dist/opencode-plugin/v2/scrub-messages.d.ts

@@ -0,0 +1,39 @@
+/**
+ * Message scrubbing for OpenCode Plugin V2 session hooks.
+ *
+ * Walks the messages attached to a model request and anonymizes every string
+ * that can carry secrets: user/assistant/reasoning text, tool arguments,
+ * completed tool output, and V1-style part state.
+ *
+ * The scrub runs on a deep copy; only after it completes successfully are the
+ * results written back into the caller's original objects (preserving the
+ * references Plugin V2 relies on). If any step throws, the originals are left
+ * untouched and the error propagates so the caller can block the request
+ * instead of leaking raw PII (fail-closed).
+ */
+import { PIIType } from "../../types/index.js";
+import type { AnonymizationPolicy } from "../../types/index.js";
+import type { AnonymizationState } from "./anon-state.js";
+import type { Message, ScrubContext, SessionResolver } from "./types.js";
+export interface ScrubMessagesOptions {
+    /** Locale hint passed to `anonymize()`; defaults to the plugin option. */
+    locale?: string;
+    /** Base policy (URL/IP disabled by default). */
+    policy?: Partial<AnonymizationPolicy>;
+    /** Whether the VCS identity recognizers are enabled. */
+    vcsIdentities: boolean;
+    /** Builds the extended policy that enables identity types for a VCS output. */
+    identityPolicy: (types: PIIType[]) => Partial<AnonymizationPolicy>;
+}
+export interface ScrubResult {
+    /** Entities anonymized during this call. */
+    scrubbed: number;
+    byType: Record<string, number>;
+}
+/**
+ * Anonymizes the messages of a session request in place.
+ *
+ * @returns the number of entities removed and a per-type breakdown for logging.
+ */
+export declare function scrubMessages(eventMessages: Message[], ctx: ScrubContext, resolveSession: SessionResolver, state: AnonymizationState, options: ScrubMessagesOptions): Promise<ScrubResult>;
+//# sourceMappingURL=scrub-messages.d.ts.map

package/dist/opencode-plugin/v2/scrub-messages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scrub-messages.d.ts","sourceRoot":"","sources":["../../../src/opencode-plugin/v2/scrub-messages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,KAAK,EACV,mBAAmB,EAEpB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EACV,OAAO,EAGP,YAAY,EACZ,eAAe,EAChB,MAAM,YAAY,CAAC;AAGpB,MAAM,WAAW,oBAAoB;IACnC,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,MAAM,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACtC,wDAAwD;IACxD,aAAa,EAAE,OAAO,CAAC;IACvB,+EAA+E;IAC/E,cAAc,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,WAAW;IAC1B,4CAA4C;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAgHD;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,aAAa,EAAE,OAAO,EAAE,EACxB,GAAG,EAAE,YAAY,EACjB,cAAc,EAAE,eAAe,EAC/B,KAAK,EAAE,kBAAkB,EACzB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,WAAW,CAAC,CA+KtB"}