vidspotai-shared 1.0.82 → 1.0.83

package/lib/services/agent/modelRouter.js

@@ -9,8 +9,8 @@
  *   - critic     : vision QA across scenes, rubric-following
  *   - reference  : ingest a TikTok/Reel URL, extract structure
  *
- * The actual LLM call is delegated to an injected LlmCaller (wired to
- * Vercel AI Gateway / OpenRouter at the host layer) — this keeps the
+ * The actual LLM call is delegated to an injected LlmCaller (the native
+ * ProviderRoutingLlmCaller wired at the host layer) — this keeps the
  * agent code provider-agnostic and easy to A/B test against the eval set.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -21,32 +21,46 @@ exports.DEFAULT_MODEL_ROUTING = {
         planner: { modelId: "claude-sonnet-4-6", provider: "anthropic" },
         executor: { modelId: "claude-haiku-4-5", provider: "anthropic" },
         // Critic rubrics today (continuity / consistency / voSync / costVsTier)
-        // are pure perception + structured-output tasks — Gemini 2.5 Flash
-        // handles them at ~$0.002/call vs ~$0.04/call on Sonnet (20× cheaper)
-        // without measurable quality loss on perception axes. The brand-safety
-        // rubric is parked for now; when it returns, route only that axis to
-        // Sonnet (it's the policy-reasoning slice where Sonnet wins).
+        // are pure perception + structured-output tasks. Gemini 3.5 Flash is the
+        // current Flash tier (q4/s4) — stronger on perception than 2.5 Flash and
+        // still far cheaper than Sonnet on vision. Cost note: 3.5 Flash bills
+        // ~5× the 2.5 Flash rate ($1.50/$9 vs $0.30/$2.50 per 1M), so per-scene
+        // critic spend rises accordingly; if that bites at volume, drop back to
+        // "gemini-2.5-flash" (the cost-optimal option). The brand-safety rubric is
+        // parked; when it returns, route only that axis to Sonnet (policy slice).
         critic: {
-            modelId: "gemini-2.5-flash",
+            modelId: "gemini-3.5-flash",
             provider: "google",
             vision: true,
         },
+        // Reference ingest (TikTok/Reel → structure) is low-volume and benefits
+        // from the strongest Pro vision. Gemini 3.1 Pro is the current top Gemini.
         reference: {
-            modelId: "gemini-2.5-pro",
+            modelId: "gemini-3.1-pro",
             provider: "google",
             vision: true,
         },
     },
     fallback: {
-        router: { modelId: "gpt-5-mini", provider: "openai" },
-        planner: { modelId: "gpt-5", provider: "openai" },
-        executor: { modelId: "deepseek-chat", provider: "deepseek" },
+        router: { modelId: "gpt-5.4-mini", provider: "openai" },
+        planner: { modelId: "gpt-5.5", provider: "openai" },
+        // executor fallback repointed off DeepSeek → OpenAI mini when the native
+        // provider callers replaced the Vercel AI Gateway (we ship native callers
+        // only for anthropic/openai/google; the dispatcher throws on "deepseek").
+        // gpt-5.4-mini is the current cheap fast tier + handles the executor's
+        // mechanical tool-routing. See LLM_NATIVE_MIGRATION_PLAN decision #1.
+        // REMOVED FOR v2 — kept for reference:
+        // executor: { modelId: "deepseek-chat", provider: "deepseek" },
+        // PRIOR (retired ids): router/executor gpt-5-mini, planner gpt-5.
+        executor: { modelId: "gpt-5.4-mini", provider: "openai" },
         // Sonnet is the Critic fallback — it costs more but is the safest
         // bet when Flash refuses or returns malformed structured output.
         critic: { modelId: "claude-sonnet-4-6", provider: "anthropic", vision: true },
         reference: { modelId: "claude-sonnet-4-6", provider: "anthropic" },
     },
-    premiumPlanner: { modelId: "claude-opus-4-7", provider: "anthropic" },
+    // Opus 4.8 is the current top Opus tier (4.7 is now legacy). Premium briefs
+    // route the planner here.
+    premiumPlanner: { modelId: "claude-opus-4-8", provider: "anthropic" },
 };
 class ModelRouter {
     constructor(policy = exports.DEFAULT_MODEL_ROUTING) {

package/lib/services/agent/planMutations.d.ts

@@ -1,4 +1,5 @@
-import type { Project } from "../../schemas/project.schema";
+import type { Clip, Project } from "../../schemas/project.schema";
+import type { RegenComponent } from "../credits/pricing";
 /**
  * planMutations — Stage 7-prep helper for the agent permission flow.
  *
@@ -43,4 +44,56 @@ export declare function findClipsNeedingPermission(currentProject: Project | nul
  * straight through.
  */
 export declare function requiresUserConfirmation(currentProject: Project | null | undefined): boolean;
+/**
+ * Stage 7 (lock enforcement) — the clips from `currentProject` that a
+ * regeneration must NOT overwrite: every protected clip (locked or
+ * user-placed) whose id the user did NOT explicitly approve to mutate.
+ *
+ * `allowedMutations` is the set of clip ids the user OK'd in the
+ * confirmation modal (echoed back through /execute-confirmed → the run
+ * doc → the job payload). A protected clip absent from that set is frozen:
+ * planToProject reuses it verbatim instead of rebuilding it from
+ * plan+outcome, because the user's edits (trim, volume, text, position)
+ * live only on the clip object — they're nowhere in the plan, so a rebuild
+ * would silently discard them.
+ *
+ * Returns `[]` when there's no prior project (first run on an empty canvas)
+ * or nothing is protected — the common path, a clean no-op.
+ */
+export declare function computePreservedClips(currentProject: Project | null | undefined, allowedMutations?: readonly string[]): Clip[];
+/** Per-scene sets of asset kinds whose generation can be skipped on regen. */
+export interface FrozenScenes {
+    /** Scene indices whose visual clip(s) are preserved — skip provider gen. */
+    visual: Set<number>;
+    /** Scene indices whose voiceover clip is preserved — skip TTS. */
+    voiceover: Set<number>;
+}
+/**
+ * Gap #1 follow-up (skip-generation) — derive, from the preserved clips, which
+ * scenes don't need their assets regenerated at all. A preserved visual means
+ * the user froze that scene's footage, so re-running the (expensive) provider
+ * gen just to discard the result is pure waste; same for a preserved VO and
+ * the TTS call. The executor consults these sets to short-circuit the tool
+ * dispatch, and planToProject uses `visual` to skip building a placeholder twin
+ * (the real preserved clip is injected verbatim instead).
+ *
+ * Keyed off the deterministic clip-id contract so it stays in lockstep with the
+ * ids planToProject emits (and the ids the preserve-override matches on).
+ */
+/**
+ * Gap #5 (diff-based bulk regen, lock-safety) — true if a regen target would
+ * overwrite a frozen (locked / user-edited) scene asset, so callers can drop it
+ * before charging or executing. The bulk diff (`diffPlans`) is plan-field based
+ * and lock-blind: a re-plan that rewrote a locked scene's prompt would emit a
+ * `visual` target for it, and running that would clobber the footage the user
+ * deliberately froze in the editor. Visual targets are gated by `frozen.visual`;
+ * voiceover AND captions by `frozen.voiceover` (captions are derived from the VO
+ * audio, so a locked VO keeps its captions too). Overlays/music aren't tracked
+ * by the frozen-scene model (they're separate clips), so they pass through.
+ */
+export declare function isRegenTargetFrozen(target: {
+    component: RegenComponent;
+    sceneIndex?: number;
+}, frozen: FrozenScenes): boolean;
+export declare function computeFrozenScenes(preserveClips: readonly Clip[]): FrozenScenes;
 //# sourceMappingURL=planMutations.d.ts.map

package/lib/services/agent/planMutations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"planMutations.d.ts","sourceRoot":"","sources":["../../../src/services/agent/planMutations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAGlE;;;;;;;;;;;;;;;;GAgBG;AAEH,uFAAuF;AACvF,eAAO,MAAM,8BAA8B,EAAE,WAAW,CAAC,MAAM,CAG7D,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,aAAa,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B,kDAAkD;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,qFAAqF;IACrF,QAAQ,EAAE,QAAQ,GAAG,WAAW,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;IAC5E,0EAA0E;IAC1E,YAAY,EAAE,MAAM,CAAC;IACrB,8BAA8B;IAC9B,MAAM,EAAE,cAAc,CAAC;IACvB,gEAAgE;IAChE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAyDD;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,GACzC,gBAAgB,EAAE,CAgBpB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,cAAc,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,GACzC,OAAO,CAET"}
+{"version":3,"file":"planMutations.d.ts","sourceRoot":"","sources":["../../../src/services/agent/planMutations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGzD;;;;;;;;;;;;;;;;GAgBG;AAEH,uFAAuF;AACvF,eAAO,MAAM,8BAA8B,EAAE,WAAW,CAAC,MAAM,CAG7D,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,aAAa,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B,kDAAkD;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,qFAAqF;IACrF,QAAQ,EAAE,QAAQ,GAAG,WAAW,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;IAC5E,0EAA0E;IAC1E,YAAY,EAAE,MAAM,CAAC;IACrB,8BAA8B;IAC9B,MAAM,EAAE,cAAc,CAAC;IACvB,gEAAgE;IAChE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAyDD;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,GACzC,gBAAgB,EAAE,CAgBpB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,cAAc,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,GACzC,OAAO,CAET;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,EAC1C,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,GACnC,IAAI,EAAE,CAMR;AAQD,8EAA8E;AAC9E,MAAM,WAAW,YAAY;IAC3B,4EAA4E;IAC5E,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACpB,kEAAkE;IAClE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACxB;AAED;;;;;;;;;;;GAWG;AACH;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE;IAAE,SAAS,EAAE,cAAc,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,EAC1D,MAAM,EAAE,YAAY,GACnB,OAAO,CAOT;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,SAAS,IAAI,EAAE,GAAG,YAAY,CAahF"}

package/lib/services/agent/planMutations.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.USER_PLACED_PROVENANCE_SOURCES = void 0;
 exports.findClipsNeedingPermission = findClipsNeedingPermission;
 exports.requiresUserConfirmation = requiresUserConfirmation;
+exports.computePreservedClips = computePreservedClips;
+exports.isRegenTargetFrozen = isRegenTargetFrozen;
+exports.computeFrozenScenes = computeFrozenScenes;
 const planToProject_1 = require("../editor/planToProject");
 /**
  * planMutations — Stage 7-prep helper for the agent permission flow.
@@ -118,3 +121,78 @@ function findClipsNeedingPermission(currentProject) {
 function requiresUserConfirmation(currentProject) {
     return findClipsNeedingPermission(currentProject).length > 0;
 }
+/**
+ * Stage 7 (lock enforcement) — the clips from `currentProject` that a
+ * regeneration must NOT overwrite: every protected clip (locked or
+ * user-placed) whose id the user did NOT explicitly approve to mutate.
+ *
+ * `allowedMutations` is the set of clip ids the user OK'd in the
+ * confirmation modal (echoed back through /execute-confirmed → the run
+ * doc → the job payload). A protected clip absent from that set is frozen:
+ * planToProject reuses it verbatim instead of rebuilding it from
+ * plan+outcome, because the user's edits (trim, volume, text, position)
+ * live only on the clip object — they're nowhere in the plan, so a rebuild
+ * would silently discard them.
+ *
+ * Returns `[]` when there's no prior project (first run on an empty canvas)
+ * or nothing is protected — the common path, a clean no-op.
+ */
+function computePreservedClips(currentProject, allowedMutations) {
+    if (!currentProject)
+        return [];
+    const approved = new Set(allowedMutations ?? []);
+    return currentProject.clips.filter((clip) => isProtected(clip) !== null && !approved.has(clip.id));
+}
+// Deterministic clip-id shapes emitted by planToProject. A frozen visual can
+// be a single clip (`scene-3-visual`) or an extend-chain (`scene-3-visual-0`,
+// `-1`, …); both map back to the same scene. VO is always a single clip.
+const VISUAL_CLIP_ID_RE = /^scene-(\d+)-visual(?:-\d+)?$/;
+const VOICEOVER_CLIP_ID_RE = /^scene-(\d+)-vo$/;
+/**
+ * Gap #1 follow-up (skip-generation) — derive, from the preserved clips, which
+ * scenes don't need their assets regenerated at all. A preserved visual means
+ * the user froze that scene's footage, so re-running the (expensive) provider
+ * gen just to discard the result is pure waste; same for a preserved VO and
+ * the TTS call. The executor consults these sets to short-circuit the tool
+ * dispatch, and planToProject uses `visual` to skip building a placeholder twin
+ * (the real preserved clip is injected verbatim instead).
+ *
+ * Keyed off the deterministic clip-id contract so it stays in lockstep with the
+ * ids planToProject emits (and the ids the preserve-override matches on).
+ */
+/**
+ * Gap #5 (diff-based bulk regen, lock-safety) — true if a regen target would
+ * overwrite a frozen (locked / user-edited) scene asset, so callers can drop it
+ * before charging or executing. The bulk diff (`diffPlans`) is plan-field based
+ * and lock-blind: a re-plan that rewrote a locked scene's prompt would emit a
+ * `visual` target for it, and running that would clobber the footage the user
+ * deliberately froze in the editor. Visual targets are gated by `frozen.visual`;
+ * voiceover AND captions by `frozen.voiceover` (captions are derived from the VO
+ * audio, so a locked VO keeps its captions too). Overlays/music aren't tracked
+ * by the frozen-scene model (they're separate clips), so they pass through.
+ */
+function isRegenTargetFrozen(target, frozen) {
+    if (typeof target.sceneIndex !== "number")
+        return false;
+    if (target.component === "visual")
+        return frozen.visual.has(target.sceneIndex);
+    if (target.component === "voiceover" || target.component === "captions") {
+        return frozen.voiceover.has(target.sceneIndex);
+    }
+    return false;
+}
+function computeFrozenScenes(preserveClips) {
+    const visual = new Set();
+    const voiceover = new Set();
+    for (const clip of preserveClips) {
+        const v = VISUAL_CLIP_ID_RE.exec(clip.id);
+        if (v) {
+            visual.add(Number(v[1]));
+            continue;
+        }
+        const vo = VOICEOVER_CLIP_ID_RE.exec(clip.id);
+        if (vo)
+            voiceover.add(Number(vo[1]));
+    }
+    return { visual, voiceover };
+}

package/lib/services/agent/planner/Planner.d.ts

@@ -86,22 +86,5 @@ export declare class Planner {
         /** Free-form caller hint, e.g. "punchier CTA" or "drop the watermark". */
         instruction?: string;
     }): Promise<TextOverlay[]>;
-    private buildMessages;
 }
-/**
- * Heuristic — does the brief mention real-world entities that benefit from
- * web grounding? A planner without research will happily invent fake app
- * names, fabricate statistics, and miss real-world brand details. Triggers
- * when the brief contains:
- *   - explicit "top N / best / popular / list of" framings
- *   - proper-noun-heavy briefs (≥2 capitalized non-sentence-start words)
- *   - listicle/comparison/news/review keywords
- *   - explicit time markers ("2026", "latest", "this year", "recent")
- *   - statistics signals ("statistics", "data", "percent", "study")
- *
- * Deliberately conservative — false negatives are fine (we just skip the
- * search), false positives waste $0.01 per planner call. Override via
- * `useWebResearch: true|false` when the caller knows better.
- */
-export declare function briefNeedsWebResearch(brief: VideoBrief): boolean;
 //# sourceMappingURL=Planner.d.ts.map

package/lib/services/agent/planner/Planner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Planner.d.ts","sourceRoot":"","sources":["../../../../src/services/agent/planner/Planner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,WAAW,EAEX,SAAS,EAEV,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAwB7C;;;;;;;;;;;GAWG;AAEH,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,SAAS,CAAC;IACf,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,OAAO;IAIN,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAEP,IAAI,EAAE,cAAc;IAK3C,IAAI,CACR,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE;QACJ,OAAO,CAAC,EAAE,YAAY,CAAC;QACvB,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;QACjC,WAAW,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;QACvC,KAAK,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAChC;;;;;;WAMG;QACH,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;KAC9B,GACL,OAAO,CAAC,SAAS,CAAC;IAmOrB;;;;;;;;;;;OAWG;IACH,UAAU,CACR,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE;QACJ,OAAO,CAAC,EAAE,YAAY,CAAC;QACvB,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;QACjC,WAAW,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;QACvC,KAAK,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;KAC5B,GACL;QAAE,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;KAAE;IAqDhE;;;;;;;;;;;;;;;;OAgBG;IACG,0BAA0B,CAC9B,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE;QACJ,OAAO,CAAC,EAAE,YAAY,CAAC;QACvB,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;QACjC,KAAK,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAChC,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,0EAA0E;QAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;KACjB,GACL,OAAO,CAAC,WAAW,EAAE,CAAC;IA0IzB,OAAO,CAAC,aAAa;CAuItB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAiChE"}
+{"version":3,"file":"Planner.d.ts","sourceRoot":"","sources":["../../../../src/services/agent/planner/Planner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAoB,MAAM,+BAA+B,CAAC;AAC7E,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,SAAS,EAEV,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAkB7C;;;;;;;;;;;GAWG;AAEH,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,SAAS,CAAC;IACf,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,OAAO;IAIN,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAEP,IAAI,EAAE,cAAc;IAK3C,IAAI,CACR,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE;QACJ,OAAO,CAAC,EAAE,YAAY,CAAC;QACvB,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;QACjC,WAAW,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;QACvC,KAAK,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAChC;;;;;;WAMG;QACH,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;KAC9B,GACL,OAAO,CAAC,SAAS,CAAC;IAyQrB;;;;;;;;;;;OAWG;IACH,UAAU,CACR,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE;QACJ,OAAO,CAAC,EAAE,YAAY,CAAC;QACvB,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;QACjC,WAAW,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;QACvC,KAAK,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;KAC5B,GACL;QAAE,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;KAAE;IAqEhE;;;;;;;;;;;;;;;;OAgBG;IACG,0BAA0B,CAC9B,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE;QACJ,OAAO,CAAC,EAAE,YAAY,CAAC;QACvB,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;QACjC,KAAK,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;QAChC,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,0EAA0E;QAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;KACjB,GACL,OAAO,CAAC,WAAW,EAAE,CAAC;CAQ1B"}