@vibes.diy/api-svc 5.5.16 → 6.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/evento-handler-manifest.js +3 -0
- package/evento-handler-manifest.js.map +1 -1
- package/intern/apply-seed.d.ts +24 -0
- package/intern/apply-seed.js +70 -4
- package/intern/apply-seed.js.map +1 -1
- package/intern/backend-db-callback.js +48 -37
- package/intern/backend-db-callback.js.map +1 -1
- package/intern/backend-policy-version.d.ts +1 -1
- package/intern/backend-policy-version.js +1 -1
- package/intern/egress-platform-list.js +2 -0
- package/intern/egress-platform-list.js.map +1 -1
- package/intern/first-message-embedding.d.ts +19 -3
- package/intern/first-message-embedding.js +50 -11
- package/intern/first-message-embedding.js.map +1 -1
- package/package.json +11 -11
- package/public/fork-app.js +15 -0
- package/public/fork-app.js.map +1 -1
- package/public/image-gen.js +15 -0
- package/public/image-gen.js.map +1 -1
- package/public/img-doc-write.d.ts +16 -0
- package/public/img-doc-write.js +68 -0
- package/public/img-doc-write.js.map +1 -0
- package/public/llm-dispatch.js +37 -0
- package/public/llm-dispatch.js.map +1 -1
- package/public/seed-owner-controls.d.ts +12 -0
- package/public/seed-owner-controls.js +136 -0
- package/public/seed-owner-controls.js.map +1 -0
- package/public/seq-allocation.d.ts +1 -0
- package/public/seq-allocation.js +13 -2
- package/public/seq-allocation.js.map +1 -1
- package/usage-report/backfill-first-message-embeddings.js +23 -9
- package/usage-report/backfill-first-message-embeddings.js.map +1 -1
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
import { Result, Option, EventoResult, exception2Result } from "@adviser/cement";
|
|
2
|
+
import { reqSeedRemove, reqSeedRerun, } from "@vibes.diy/api-types";
|
|
3
|
+
import { type } from "arktype";
|
|
4
|
+
import { unwrapMsgBase } from "../unwrap-msg-base.js";
|
|
5
|
+
import { checkAuth } from "../check-auth.js";
|
|
6
|
+
import { selectLatestAppPerSlug } from "./select-app.js";
|
|
7
|
+
import { applySeed, findSeedAssetURI, loadSeedDocs, readSeedControl, upsertSeedControl, clearSeedAppliedFsId, } from "../intern/apply-seed.js";
|
|
8
|
+
import { makeBackendDbCallback, resolveOwnerWriteIdentity } from "../intern/backend-db-callback.js";
|
|
9
|
+
function suppressionKey(dbName, key) {
|
|
10
|
+
return `${dbName}:${key}`;
|
|
11
|
+
}
|
|
12
|
+
async function resolveOwnedRelease(vctx, req, callerUserId) {
|
|
13
|
+
const target = await selectLatestAppPerSlug(vctx, { ownerHandle: req.ownerHandle, appSlug: req.appSlug });
|
|
14
|
+
if (target === undefined)
|
|
15
|
+
return Result.Err("app-not-found");
|
|
16
|
+
if (target.userId !== callerUserId)
|
|
17
|
+
return Result.Err("not-owner");
|
|
18
|
+
return Result.Ok({ userId: target.userId, fsId: target.fsId, fileSystem: target.fileSystem });
|
|
19
|
+
}
|
|
20
|
+
export async function seedRemove(vctx, req, callerUserId) {
|
|
21
|
+
const rRelease = await resolveOwnedRelease(vctx, req, callerUserId);
|
|
22
|
+
if (rRelease.isErr())
|
|
23
|
+
return Result.Err(rRelease);
|
|
24
|
+
const release = rRelease.Ok();
|
|
25
|
+
const identity = await resolveOwnerWriteIdentity(vctx, { ownerHandle: req.ownerHandle, appSlug: req.appSlug });
|
|
26
|
+
if (identity.userId === null)
|
|
27
|
+
return Result.Err("no-owner-identity");
|
|
28
|
+
const settingsKey = { userId: identity.userId, ownerHandle: req.ownerHandle, appSlug: req.appSlug };
|
|
29
|
+
const seedAssetURI = findSeedAssetURI(release.fileSystem);
|
|
30
|
+
const docs = (await loadSeedDocs(vctx, seedAssetURI)) ?? [];
|
|
31
|
+
const db = makeBackendDbCallback(vctx, {
|
|
32
|
+
ownerHandle: req.ownerHandle,
|
|
33
|
+
appSlug: req.appSlug,
|
|
34
|
+
identity,
|
|
35
|
+
originDepth: 0,
|
|
36
|
+
adminMode: false,
|
|
37
|
+
});
|
|
38
|
+
let removed = 0;
|
|
39
|
+
let failed = 0;
|
|
40
|
+
for (const doc of docs) {
|
|
41
|
+
const res = await db({ kind: "delete", db: doc.dbName, docId: doc.id });
|
|
42
|
+
if (res.ok) {
|
|
43
|
+
removed++;
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
failed++;
|
|
47
|
+
console.warn(`seedRemove: ${req.ownerHandle}/${req.appSlug} delete failed for ${doc.dbName}/${doc.key}: ${res.error}`);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
const control = await readSeedControl(vctx, settingsKey);
|
|
51
|
+
const suppressed = new Set(control.suppressed);
|
|
52
|
+
for (const doc of docs)
|
|
53
|
+
suppressed.add(suppressionKey(doc.dbName, doc.key));
|
|
54
|
+
await upsertSeedControl(vctx, settingsKey, { dontRun: true, suppressed: [...suppressed] });
|
|
55
|
+
return Result.Ok({
|
|
56
|
+
type: "vibes.diy.res-seed-remove",
|
|
57
|
+
appSlug: req.appSlug,
|
|
58
|
+
ownerHandle: req.ownerHandle,
|
|
59
|
+
removed,
|
|
60
|
+
failed,
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
export async function seedRerun(vctx, req, callerUserId) {
|
|
64
|
+
const rRelease = await resolveOwnedRelease(vctx, req, callerUserId);
|
|
65
|
+
if (rRelease.isErr())
|
|
66
|
+
return Result.Err(rRelease);
|
|
67
|
+
const release = rRelease.Ok();
|
|
68
|
+
const identity = await resolveOwnerWriteIdentity(vctx, { ownerHandle: req.ownerHandle, appSlug: req.appSlug });
|
|
69
|
+
if (identity.userId === null)
|
|
70
|
+
return Result.Err("no-owner-identity");
|
|
71
|
+
const settingsKey = { userId: identity.userId, ownerHandle: req.ownerHandle, appSlug: req.appSlug };
|
|
72
|
+
const seedAssetURI = findSeedAssetURI(release.fileSystem);
|
|
73
|
+
const currentDocs = (await loadSeedDocs(vctx, seedAssetURI)) ?? [];
|
|
74
|
+
const control = await readSeedControl(vctx, settingsKey);
|
|
75
|
+
const currentKeys = new Set(currentDocs.map((d) => suppressionKey(d.dbName, d.key)));
|
|
76
|
+
const suppressed = [...control.suppressed].filter((k) => currentKeys.has(k) === false);
|
|
77
|
+
await upsertSeedControl(vctx, settingsKey, { dontRun: false, suppressed });
|
|
78
|
+
if (currentDocs.length > 0) {
|
|
79
|
+
await clearSeedAppliedFsId(vctx, settingsKey);
|
|
80
|
+
}
|
|
81
|
+
const rSeed = await exception2Result(() => applySeed(vctx, {
|
|
82
|
+
ownerHandle: req.ownerHandle,
|
|
83
|
+
appSlug: req.appSlug,
|
|
84
|
+
fsId: release.fsId,
|
|
85
|
+
seedAssetURI,
|
|
86
|
+
}));
|
|
87
|
+
const applied = rSeed.isOk() ? rSeed.Ok().created + rSeed.Ok().updated : 0;
|
|
88
|
+
const failed = rSeed.isOk() ? rSeed.Ok().failed : currentDocs.length;
|
|
89
|
+
if (rSeed.isErr()) {
|
|
90
|
+
console.warn(`seedRerun: applySeed failed for ${req.ownerHandle}/${req.appSlug}:`, rSeed.Err());
|
|
91
|
+
}
|
|
92
|
+
return Result.Ok({
|
|
93
|
+
type: "vibes.diy.res-seed-rerun",
|
|
94
|
+
appSlug: req.appSlug,
|
|
95
|
+
ownerHandle: req.ownerHandle,
|
|
96
|
+
applied,
|
|
97
|
+
failed,
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
export const seedRemoveEvento = {
|
|
101
|
+
hash: "seed-remove",
|
|
102
|
+
validate: unwrapMsgBase(async (msg) => {
|
|
103
|
+
const ret = reqSeedRemove(msg.payload);
|
|
104
|
+
if (ret instanceof type.errors)
|
|
105
|
+
return Result.Ok(Option.None());
|
|
106
|
+
return Result.Ok(Option.Some({ ...msg, payload: ret }));
|
|
107
|
+
}),
|
|
108
|
+
handle: checkAuth(async (ctx) => {
|
|
109
|
+
const req = ctx.validated.payload;
|
|
110
|
+
const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
|
|
111
|
+
const rRes = await seedRemove(vctx, { ownerHandle: req.ownerHandle, appSlug: req.appSlug }, req._auth.verifiedAuth.claims.userId);
|
|
112
|
+
if (rRes.isErr())
|
|
113
|
+
return Result.Err(rRes);
|
|
114
|
+
await ctx.send.send(ctx, rRes.Ok());
|
|
115
|
+
return Result.Ok(EventoResult.Continue);
|
|
116
|
+
}),
|
|
117
|
+
};
|
|
118
|
+
export const seedRerunEvento = {
|
|
119
|
+
hash: "seed-rerun",
|
|
120
|
+
validate: unwrapMsgBase(async (msg) => {
|
|
121
|
+
const ret = reqSeedRerun(msg.payload);
|
|
122
|
+
if (ret instanceof type.errors)
|
|
123
|
+
return Result.Ok(Option.None());
|
|
124
|
+
return Result.Ok(Option.Some({ ...msg, payload: ret }));
|
|
125
|
+
}),
|
|
126
|
+
handle: checkAuth(async (ctx) => {
|
|
127
|
+
const req = ctx.validated.payload;
|
|
128
|
+
const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
|
|
129
|
+
const rRes = await seedRerun(vctx, { ownerHandle: req.ownerHandle, appSlug: req.appSlug }, req._auth.verifiedAuth.claims.userId);
|
|
130
|
+
if (rRes.isErr())
|
|
131
|
+
return Result.Err(rRes);
|
|
132
|
+
await ctx.send.send(ctx, rRes.Ok());
|
|
133
|
+
return Result.Ok(EventoResult.Continue);
|
|
134
|
+
}),
|
|
135
|
+
};
|
|
136
|
+
//# sourceMappingURL=seed-owner-controls.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"seed-owner-controls.js","sourceRoot":"","sources":["../../jsr/public/seed-owner-controls.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ export interface AllocateParams {
|
|
|
23
23
|
table: VibesApiTables["appDocuments"];
|
|
24
24
|
row: RevisionRow;
|
|
25
25
|
skipIf?: (exec: VibesSqlite) => Promise<boolean>;
|
|
26
|
+
ifHeadSeq?: number | null;
|
|
26
27
|
sidecar?: (seq: number, exec: VibesSqlite) => Promise<void>;
|
|
27
28
|
maxAttempts?: number;
|
|
28
29
|
}
|
package/public/seq-allocation.js
CHANGED
|
@@ -86,17 +86,27 @@ async function headSeqWith(exec, p) {
|
|
|
86
86
|
function currentHeadSeq(p) {
|
|
87
87
|
return headSeqWith(p.db, p);
|
|
88
88
|
}
|
|
89
|
+
async function assertHeadSeq(exec, p) {
|
|
90
|
+
if (p.ifHeadSeq === undefined)
|
|
91
|
+
return;
|
|
92
|
+
const expected = p.ifHeadSeq === null ? 0 : p.ifHeadSeq;
|
|
93
|
+
const head = await headSeqWith(exec, p);
|
|
94
|
+
if (head !== expected)
|
|
95
|
+
throw new SeqConflictError(head);
|
|
96
|
+
}
|
|
89
97
|
function asTxRunner(db) {
|
|
90
98
|
return db;
|
|
91
99
|
}
|
|
92
100
|
async function allocateSqlite(p) {
|
|
93
101
|
const attempts = p.maxAttempts ?? 3;
|
|
102
|
+
const needsTxn = p.skipIf !== undefined || p.ifHeadSeq !== undefined;
|
|
94
103
|
for (let i = 0; i < attempts; i++) {
|
|
95
104
|
try {
|
|
96
|
-
if (
|
|
105
|
+
if (needsTxn) {
|
|
97
106
|
const skipIf = p.skipIf;
|
|
98
107
|
return await asTxRunner(p.db).transaction(async (tx) => {
|
|
99
|
-
|
|
108
|
+
await assertHeadSeq(tx, p);
|
|
109
|
+
if (skipIf && (await skipIf(tx)))
|
|
100
110
|
return { seq: await headSeqWith(tx, p), inserted: false };
|
|
101
111
|
const seq = extractReturnedSeq(await runReturning(tx, p.flavour, buildAtomicInsert(p)));
|
|
102
112
|
if (p.sidecar)
|
|
@@ -121,6 +131,7 @@ async function allocatePg(p) {
|
|
|
121
131
|
const key = docLockKey(p.row.ownerHandle, p.row.appSlug, p.row.dbName, p.row.docId);
|
|
122
132
|
return asTxRunner(p.db).transaction(async (tx) => {
|
|
123
133
|
await tx.execute(sql `SELECT pg_advisory_xact_lock(hashtextextended(${key}, 0))`);
|
|
134
|
+
await assertHeadSeq(tx, p);
|
|
124
135
|
if (p.skipIf && (await p.skipIf(tx))) {
|
|
125
136
|
return { seq: await headSeqWith(tx, p), inserted: false };
|
|
126
137
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seq-allocation.js","sourceRoot":"","sources":["../../jsr/public/seq-allocation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"seq-allocation.js","sourceRoot":"","sources":["../../jsr/public/seq-allocation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Pool } from "@neondatabase/serverless";
|
|
2
2
|
import { drizzle as drizzleNeon } from "drizzle-orm/neon-serverless";
|
|
3
3
|
import { Result, exception2Result } from "@adviser/cement";
|
|
4
|
+
import { ensureSuperThis } from "@vibes.diy/identity";
|
|
4
5
|
import { createVibesApiTables } from "@vibes.diy/api-sql";
|
|
5
|
-
import { EMBEDDING_MODEL,
|
|
6
|
+
import { EMBEDDING_MODEL, loadFirstMessageEmbedText, populateFirstMessageEmbedding, } from "../intern/first-message-embedding.js";
|
|
6
7
|
import { formatError, loadDevVars } from "./usage-report-util.js";
|
|
7
8
|
function printUsage() {
|
|
8
9
|
console.log(`
|
|
@@ -54,10 +55,14 @@ async function run() {
|
|
|
54
55
|
return Result.Err("LLM_BACKEND_URL and LLM_BACKEND_API_KEY are required for --apply");
|
|
55
56
|
}
|
|
56
57
|
const pool = new Pool({ connectionString });
|
|
58
|
+
const db = drizzleNeon(pool);
|
|
59
|
+
const tables = createVibesApiTables("pg");
|
|
57
60
|
const deps = {
|
|
58
|
-
db
|
|
59
|
-
tables
|
|
61
|
+
db,
|
|
62
|
+
tables,
|
|
60
63
|
flavour: "pg",
|
|
64
|
+
sthis: ensureSuperThis(),
|
|
65
|
+
storageSystems: { sql: { flavour: "pg", db, assets: tables.assets } },
|
|
61
66
|
llmBackendUrl: llmBackendUrl ?? "",
|
|
62
67
|
llmBackendApiKey: llmBackendApiKey ?? "",
|
|
63
68
|
};
|
|
@@ -66,17 +71,21 @@ async function run() {
|
|
|
66
71
|
if (limit !== undefined)
|
|
67
72
|
apps = apps.slice(0, limit);
|
|
68
73
|
console.log(`${apps.length} app(s) with a codegen chat${limit !== undefined ? ` (capped at ${limit})` : ""}\n`);
|
|
69
|
-
const counts = { embedded: 0, unchanged: 0, empty: 0, error: 0 };
|
|
74
|
+
const counts = { embedded: 0, unchanged: 0, empty: 0, deferred: 0, error: 0 };
|
|
70
75
|
for (const app of apps) {
|
|
71
76
|
const label = `@${app.ownerHandle}/${app.appSlug}`;
|
|
72
77
|
if (apply === false) {
|
|
73
|
-
const
|
|
74
|
-
if (
|
|
78
|
+
const source = await loadFirstMessageEmbedText(deps, app.ownerHandle, app.appSlug);
|
|
79
|
+
if (source.kind === "storage-unavailable") {
|
|
80
|
+
counts.deferred += 1;
|
|
81
|
+
console.log(`DEFER ${label} (App.jsx in R2 — not readable here; indexes via the queue)`);
|
|
82
|
+
}
|
|
83
|
+
else if (source.kind === "empty") {
|
|
75
84
|
counts.empty += 1;
|
|
76
|
-
console.log(`EMPTY ${label} (no
|
|
85
|
+
console.log(`EMPTY ${label} (no prose and no production App.jsx)`);
|
|
77
86
|
}
|
|
78
87
|
else {
|
|
79
|
-
console.log(`PLAN ${label} ${
|
|
88
|
+
console.log(`PLAN ${label} ${source.text.length} chars: ${JSON.stringify(source.text.slice(0, 80))}…`);
|
|
80
89
|
}
|
|
81
90
|
continue;
|
|
82
91
|
}
|
|
@@ -93,13 +102,18 @@ async function run() {
|
|
|
93
102
|
counts.unchanged += 1;
|
|
94
103
|
else if (outcome === "empty")
|
|
95
104
|
counts.empty += 1;
|
|
105
|
+
else if (outcome === "deferred")
|
|
106
|
+
counts.deferred += 1;
|
|
96
107
|
console.log(`${outcome.toUpperCase().padEnd(6)}${label}`);
|
|
97
108
|
}
|
|
98
109
|
if (apply === false) {
|
|
99
110
|
console.log(`\nDry run — nothing embedded or written. Model: ${EMBEDDING_MODEL}. Re-run with --apply.`);
|
|
100
111
|
return;
|
|
101
112
|
}
|
|
102
|
-
console.log(`\nApplied. embedded=${counts.embedded} unchanged=${counts.unchanged} empty=${counts.empty} error=${counts.error}`);
|
|
113
|
+
console.log(`\nApplied. embedded=${counts.embedded} unchanged=${counts.unchanged} empty=${counts.empty} deferred=${counts.deferred} error=${counts.error}`);
|
|
114
|
+
if (counts.deferred > 0) {
|
|
115
|
+
console.log(` note: ${counts.deferred} app(s) deferred (R2-backed App.jsx) — they index via the queue on next publish.`);
|
|
116
|
+
}
|
|
103
117
|
if (counts.error > 0) {
|
|
104
118
|
throw new Error(`backfill finished with ${counts.error} row error(s) — historical holes remain; re-run until error=0`);
|
|
105
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backfill-first-message-embeddings.js","sourceRoot":"","sources":["../../jsr/usage-report/backfill-first-message-embeddings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAe,MAAM,oBAAoB,CAAC;AACvE,OAAO,EACL,eAAe,EACf,
|
|
1
|
+
{"version":3,"file":"backfill-first-message-embeddings.js","sourceRoot":"","sources":["../../jsr/usage-report/backfill-first-message-embeddings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAe,MAAM,oBAAoB,CAAC;AACvE,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,6BAA6B,GAE9B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AA4BlE,SAAS,UAAU;IACjB,OAAO,CAAC,GAAG,CACT;;;;;;;;;;;CAWH,CAAC,IAAI,EAAE,CACL,CAAC;AACJ,CAAC;AAID,KAAK,UAAU,QAAQ,CAAC,IAAU;IAChC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;;;;GAI1B,CAAC,CAAC;IACH,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,WAAqB,EAAE,OAAO,EAAE,CAAC,CAAC,OAAiB,EAAE,CAAC,CAAC,CAAC;AACrG,CAAC;AAED,SAAS,UAAU,CAAC,IAAc;IAChC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5B,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC9B,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACjE,CAAC;AAED,KAAK,UAAU,GAAG;IAChB,WAAW,EAAE,CAAC;IACd,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,UAAU,EAAE,CAAC;QACb,OAAO,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAE/B,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAC3G,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACnC,UAAU,EAAE,CAAC;QACb,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,mBAAmB,wCAAwC,CAAC,CAAC;IACxH,CAAC;IACD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACrD,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAC5D,IAAI,KAAK,IAAI,CAAC,aAAa,KAAK,SAAS,IAAI,gBAAgB,KAAK,SAAS,CAAC,EAAE,CAAC;QAC7E,UAAU,EAAE,CAAC;QACb,OAAO,MAAM,CAAC,GAAG,CAAC,kEAAkE,CAAC,CAAC;IACxF,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC5C,MAAM,EAAE,GAAG,WAAW,CAAC,IAAI,CAA2B,CAAC;IACvD,MAAM,MAAM,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,IAAI,GAA8B;QACtC,EAAE;QACF,MAAM;QACN,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,eAAe,EAAE;QAIxB,cAAc,EAAE,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE;QACrE,aAAa,EAAE,aAAa,IAAI,EAAE;QAClC,gBAAgB,EAAE,gBAAgB,IAAI,EAAE;KACzC,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,KAAK,IAAI,EAAE;QAC/C,IAAI,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,KAAK,KAAK,SAAS;YAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,8BAA8B,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAEhH,MAAM,MAAM,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAC9E,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACnD,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;gBACpB,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;gBACnF,IAAI,MAAM,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;oBAC1C,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;oBACrB,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,8DAA8D,CAAC,CAAC;gBAC5F,CAAC;qBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;oBACnC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;oBAClB,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,wCAAwC,CAAC,CAAC;gBACtE,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,KAAK,MAAM,CAAC,IAAI,CAAC,MAAM,WAAW,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC3G,CAAC;gBACD,SAAS;YACX,CAAC;YACD,MAAM,CAAC,GAAG,MAAM,6BAA6B,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACzD,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBACd,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;gBAClB,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;gBACvD,SAAS;YACX,CAAC;YACD,MAAM,OAAO,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;YACvB,IAAI,OAAO,KAAK,UAAU;gBAAE,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;iBAC5C,IAAI,OAAO,KAAK,WAAW;gBAAE,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC;iBACnD,IAAI,OAAO,KAAK,OAAO;gBAAE,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;iBAC3C,IAAI,OAAO,KAAK,UAAU;gBAAE,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;YACtD,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACpB,OAAO,CAAC,GAAG,CAAC,mDAAmD,eAAe,wBAAwB,CAAC,CAAC;YACxG,OAAO;QACT,CAAC;QACD,OAAO,CAAC,GAAG,CACT,uBAAuB,MAAM,CAAC,QAAQ,cAAc,MAAM,CAAC,SAAS,UAAU,MAAM,CAAC,KAAK,aAAa,MAAM,CAAC,QAAQ,UAAU,MAAM,CAAC,KAAK,EAAE,CAC/I,CAAC;QAOF,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,CAAC,QAAQ,kFAAkF,CAAC,CAAC;QAC5H,CAAC;QAKD,IAAI,MAAM,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,0BAA0B,MAAM,CAAC,KAAK,+DAA+D,CAAC,CAAC;QACzH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IACjB,IAAI,MAAM,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;AAC9B,CAAC;AAED,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;IACf,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QACd,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC"}
|