@vibes.diy/api-svc 2.0.0-dev-cli-e → 2.0.0-dev-cli-j

package/intern/ensure-slug-binding.js

@@ -2,7 +2,9 @@ import { exception2Result, Result } from "@adviser/cement";
 import { generate } from "random-words";
 import { and, eq } from "drizzle-orm/sql/expressions";
 import { sql } from "drizzle-orm/sql";
-async function writeUserSlugBinding(ctx, userId, userSlug) {
+import { isUserSettingDefaultUserSlug, userSettingItem, parseArrayWarning, } from "@vibes.diy/api-types";
+import { ensureLogger } from "@fireproof/core-runtime";
+export async function writeUserSlugBinding(ctx, userId, userSlug) {
     return exception2Result(async () => {
         const existing = await ctx.sql.db
             .select()
@@ -11,33 +13,62 @@ async function writeUserSlugBinding(ctx, userId, userSlug) {
         if (existing.length >= ctx.params.maxUserSlugPerUserId) {
             return Result.Err("maximum userSlug bindings reached for this userId");
         }
+        if (existing.find((e) => e.userSlug === userSlug)) {
+            return Result.Ok({
+                type: "vibes.diy-user-slug-binding",
+                userId,
+                userSlug: existing[0].userSlug,
+                tenant: existing[0].tenant,
+            });
+        }
         const tenant = ctx.sthis.nextId(12).str;
-        await ctx.sql.db
-            .insert(ctx.sql.tables.userSlugBinding)
-            .values({
+        await ctx.sql.db.insert(ctx.sql.tables.userSlugBinding).values({
             userId,
             tenant,
             userSlug,
             created: new Date().toISOString(),
-        })
-            .onConflictDoNothing();
+        });
         return Result.Ok({
+            type: "vibes.diy-user-slug-binding",
+            userId,
             userSlug,
             tenant,
         });
     });
 }
-export async function ensureUserSlug(ctx, binding) {
+function userSlugFromClaims(claims) {
+    const result = [];
+    if (claims.params.nick) {
+        result.push(claims.params.nick);
+    }
+    if (claims.params.email) {
+        result.push(claims.params.email.replace(/@[^@]+$/, ""));
+    }
+    if (claims.params.name) {
+        result.push(claims.params.name);
+    }
+    if (claims.params.first && claims.params.last) {
+        result.push(`${claims.params.first} ${claims.params.last}`);
+    }
+    if (claims.params.first) {
+        result.push(claims.params.first);
+    }
+    if (claims.params.last) {
+        result.push(claims.params.last);
+    }
+    return result;
+}
+export async function ensureUserSlug(ctx, claims, binding) {
     return exception2Result(async () => {
         let userSlug = undefined;
         if (!binding.userSlug) {
-            for (let attempts = 0; attempts < 5; attempts++) {
-                const tryUserSlug = generate({
-                    exactly: 1,
-                    wordsPerString: 3,
-                    separator: "-",
-                })[0];
-                if (tryUserSlug.length > 30) {
+            const userSlugCandidates = [
+                ...userSlugFromClaims(claims),
+                ...new Array(5).fill(0).map(() => generate({ exactly: 1, wordsPerString: 3, separator: "-" })[0]),
+            ];
+            for (const tryUserSlug of userSlugCandidates) {
+                const sanitizedAppSlug = toRFC2822_32ByteLength(tryUserSlug);
+                if (!sanitizedAppSlug) {
                     continue;
                 }
                 const existing = await ctx.sql.db
@@ -47,7 +78,7 @@ export async function ensureUserSlug(ctx, binding) {
                     .limit(1)
                     .then((r) => r[0]);
                 if (!existing) {
-                    userSlug = tryUserSlug;
+                    userSlug = sanitizedAppSlug;
                     break;
                 }
             }
@@ -56,16 +87,19 @@ export async function ensureUserSlug(ctx, binding) {
             }
             return writeUserSlugBinding(ctx, binding.userId, userSlug);
         }
+        const sanitizedUserSlug = toRFC2822_32ByteLength(binding.userSlug);
         const existing = await ctx.sql.db
             .select()
             .from(ctx.sql.tables.userSlugBinding)
-            .where(and(eq(ctx.sql.tables.userSlugBinding.userId, binding.userId), eq(ctx.sql.tables.userSlugBinding.userSlug, binding.userSlug)))
+            .where(and(eq(ctx.sql.tables.userSlugBinding.userId, binding.userId), eq(ctx.sql.tables.userSlugBinding.userSlug, sanitizedUserSlug)))
             .limit(1)
             .then((r) => r[0]);
         if (!existing) {
-            return writeUserSlugBinding(ctx, binding.userId, binding.userSlug);
+            return writeUserSlugBinding(ctx, binding.userId, sanitizedUserSlug);
         }
         return Result.Ok({
+            type: "vibes.diy-user-slug-binding",
+            userId: binding.userId,
             userSlug: existing.userSlug,
             tenant: existing.tenant,
         });
@@ -89,6 +123,8 @@ async function writeAppSlugBinding(ctx, userId, userSlug, appSlug) {
             created: new Date().toISOString(),
         });
         return Result.Ok({
+            type: "vibes.diy-app-slug-binding",
+            userId,
             ledger,
             appSlug,
         });
@@ -104,7 +140,8 @@ export async function ensureAppSlug(ctx, binding) {
                     wordsPerString: 3,
                     separator: "-",
                 })[0];
-                if (tryAppSlug.length > 30) {
+                const sanitizedAppSlug = toRFC2822_32ByteLength(tryAppSlug);
+                if (!sanitizedAppSlug) {
                     continue;
                 }
                 const existing = await ctx.sql.db
@@ -124,26 +161,80 @@ export async function ensureAppSlug(ctx, binding) {
             return writeAppSlugBinding(ctx, binding.userId, binding.userSlug, appSlug);
         }
         else {
+            const sanitizedAppSlug = toRFC2822_32ByteLength(binding.appSlug);
             const existing = await ctx.sql.db
                 .select()
                 .from(ctx.sql.tables.appSlugBinding)
                 .innerJoin(ctx.sql.tables.userSlugBinding, eq(ctx.sql.tables.appSlugBinding.userSlug, ctx.sql.tables.userSlugBinding.userSlug))
-                .where(and(eq(ctx.sql.tables.appSlugBinding.appSlug, binding.appSlug)))
+                .where(and(eq(ctx.sql.tables.appSlugBinding.appSlug, sanitizedAppSlug)))
                 .limit(1)
                 .then((r) => r[0]);
             if (!existing) {
-                return writeAppSlugBinding(ctx, binding.userId, binding.userSlug, binding.appSlug);
+                return writeAppSlugBinding(ctx, binding.userId, binding.userSlug, sanitizedAppSlug);
             }
-            appSlug = binding.appSlug;
             return Result.Ok({
+                type: "vibes.diy-app-slug-binding",
+                userId: binding.userId,
                 ledger: existing.AppSlugBindings.ledger,
-                appSlug,
+                appSlug: sanitizedAppSlug,
             });
         }
     });
 }
+export async function getDefaultUserSlug(ctx, userId) {
+    return exception2Result(async () => {
+        const existing = await ctx.sql.db
+            .select()
+            .from(ctx.sql.tables.userSettings)
+            .where(eq(ctx.sql.tables.userSettings.userId, userId))
+            .limit(1)
+            .then((r) => r[0]);
+        if (!existing)
+            return Result.Ok(undefined);
+        const { filtered: parsedSettings, warning: parsedWarning } = parseArrayWarning(existing.settings, userSettingItem);
+        if (parsedWarning.length > 0) {
+            ensureLogger(ctx.sthis, "getDefaultUserSlug").Warn().Any({ parseErrors: parsedWarning }).Msg("skip");
+        }
+        const def = parsedSettings.filter(isUserSettingDefaultUserSlug)[0];
+        if (!def)
+            return Result.Ok(undefined);
+        const binding = await ctx.sql.db
+            .select()
+            .from(ctx.sql.tables.userSlugBinding)
+            .where(and(eq(ctx.sql.tables.userSlugBinding.userId, userId), eq(ctx.sql.tables.userSlugBinding.userSlug, def.userSlug)))
+            .limit(1)
+            .then((r) => r[0]);
+        if (!binding)
+            return Result.Ok(undefined);
+        return Result.Ok({ type: "vibes.diy-user-slug-binding", userId, userSlug: binding.userSlug, tenant: binding.tenant });
+    });
+}
+export async function persistDefaultUserSlug(ctx, userId, userSlug) {
+    const now = new Date().toISOString();
+    const newSetting = { type: "defaultUserSlug", userSlug };
+    const existing = await ctx.sql.db
+        .select()
+        .from(ctx.sql.tables.userSettings)
+        .where(eq(ctx.sql.tables.userSettings.userId, userId))
+        .limit(1)
+        .then((r) => r[0]);
+    if (!existing) {
+        await ctx.sql.db.insert(ctx.sql.tables.userSettings).values({ userId, settings: [newSetting], updated: now, created: now });
+    }
+    else {
+        const { filtered: currentParsed, warning: currentWarning } = parseArrayWarning(existing.settings, userSettingItem);
+        if (currentWarning.length > 0) {
+            ensureLogger(ctx.sthis, "persistDefaultUserSlug").Warn().Any({ parseErrors: currentWarning }).Msg("skip");
+        }
+        const current = currentParsed.filter((s) => s.type !== "defaultUserSlug");
+        await ctx.sql.db
+            .update(ctx.sql.tables.userSettings)
+            .set({ settings: [...current, newSetting], updated: now })
+            .where(eq(ctx.sql.tables.userSettings.userId, userId));
+    }
+}
 export async function ensureSlugBinding(ctx, binding) {
-    const rUserSlug = await ensureUserSlug(ctx, binding);
+    const rUserSlug = await ensureUserSlug(ctx, binding.claims, binding);
     if (rUserSlug.isErr()) {
         return Result.Err(rUserSlug);
     }
@@ -155,12 +246,17 @@ export async function ensureSlugBinding(ctx, binding) {
         return Result.Err(rAppSlug);
     }
     return Result.Ok({
-        ...rAppSlug.Ok(),
-        userSlug: rUserSlug.Ok().userSlug,
-        tenant: rUserSlug.Ok().tenant,
-        appSlug: rAppSlug.Ok().appSlug,
-        ledger: rAppSlug.Ok().ledger,
-        userId: binding.userId,
+        type: "vibes.diy-app-user-slug-binding",
+        userSlug: rUserSlug.Ok(),
+        appSlug: rAppSlug.Ok(),
     });
 }
+export function toRFC2822_32ByteLength(slug) {
+    return slug
+        .toLowerCase()
+        .replace(/[^a-z0-9-]/g, "-")
+        .replace(/-+/g, "-")
+        .replace(/^-+|-+$/g, "")
+        .slice(0, 32);
+}
 //# sourceMappingURL=ensure-slug-binding.js.map

package/intern/ensure-slug-binding.js.map

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

package/intern/get-model-defaults.d.ts

@@ -0,0 +1,12 @@
+import { Result } from "@adviser/cement";
+import { AIParams } from "@vibes.diy/api-types";
+import { VibesApiSQLCtx } from "../types.js";
+export interface ModelDefaults {
+    chat: AIParams;
+    app: AIParams;
+    img: AIParams;
+}
+export declare function getModelDefaults(ctx: VibesApiSQLCtx, { appSlug, userSlug }: {
+    appSlug?: string;
+    userSlug?: string;
+}): Promise<Result<ModelDefaults>>;

package/intern/get-model-defaults.js

@@ -0,0 +1,90 @@
+import { Result, exception2Result } from "@adviser/cement";
+import { ActiveEntry, isActiveModelSettingApp, isActiveModelSettingChat, isActiveModelSettingImg, isUserSettingModelDefaults, userSettingItem, parseArrayWarning, } from "@vibes.diy/api-types";
+import { ensureLogger } from "@fireproof/core-runtime";
+import { eq, and } from "drizzle-orm/sql/expressions";
+import { loadModels } from "../public/list-models.js";
+async function loadPreSelectedDefaults(ctx) {
+    const rModels = await loadModels(ctx);
+    if (rModels.isErr())
+        return Result.Err(rModels);
+    const models = rModels.Ok().models;
+    const usages = ["chat", "app", "img"];
+    const defaults = {};
+    for (const usage of usages) {
+        const found = models.find((m) => m.preSelected?.includes(usage));
+        if (!found)
+            return Result.Err(`No preSelected model found for usage: ${usage}`);
+        defaults[usage] = { model: found };
+    }
+    return Result.Ok(defaults);
+}
+export async function getModelDefaults(ctx, { appSlug, userSlug }) {
+    const rDefaults = await loadPreSelectedDefaults(ctx);
+    if (rDefaults.isErr())
+        return Result.Err(rDefaults);
+    const result = { ...rDefaults.Ok() };
+    if (userSlug) {
+        const rBinding = await exception2Result(() => ctx.sql.db
+            .select()
+            .from(ctx.sql.tables.userSlugBinding)
+            .where(eq(ctx.sql.tables.userSlugBinding.userSlug, userSlug))
+            .limit(1)
+            .then((r) => r[0]));
+        if (rBinding.isErr())
+            return Result.Err(rBinding);
+        const binding = rBinding.Ok();
+        if (binding) {
+            const rUser = await exception2Result(() => ctx.sql.db
+                .select()
+                .from(ctx.sql.tables.userSettings)
+                .where(eq(ctx.sql.tables.userSettings.userId, binding.userId))
+                .limit(1)
+                .then((r) => r[0]));
+            if (rUser.isErr())
+                return Result.Err(rUser);
+            const userRow = rUser.Ok();
+            if (userRow) {
+                const { filtered: userSettings, warning: userSettingsWarning } = parseArrayWarning(userRow.settings, userSettingItem);
+                if (userSettingsWarning.length > 0) {
+                    ensureLogger(ctx.sthis, "getModelDefaults").Warn().Any({ parseErrors: userSettingsWarning }).Msg("skip");
+                }
+                const modelDefaults = userSettings.find(isUserSettingModelDefaults);
+                if (modelDefaults) {
+                    if (modelDefaults.chat?.model)
+                        result.chat = modelDefaults.chat;
+                    if (modelDefaults.app?.model)
+                        result.app = modelDefaults.app;
+                    if (modelDefaults.img?.model)
+                        result.img = modelDefaults.img;
+                }
+            }
+        }
+    }
+    if (appSlug && userSlug) {
+        const rApp = await exception2Result(() => ctx.sql.db
+            .select()
+            .from(ctx.sql.tables.appSettings)
+            .where(and(eq(ctx.sql.tables.appSettings.appSlug, appSlug), eq(ctx.sql.tables.appSettings.userSlug, userSlug)))
+            .limit(1)
+            .then((r) => r[0]));
+        if (rApp.isErr())
+            return Result.Err(rApp);
+        const appRow = rApp.Ok();
+        if (appRow) {
+            const { filtered: appSettings, warning: appSettingsWarning } = parseArrayWarning(appRow.settings, ActiveEntry);
+            if (appSettingsWarning.length > 0) {
+                ensureLogger(ctx.sthis, "getModelDefaults").Warn().Any({ parseErrors: appSettingsWarning }).Msg("skip");
+            }
+            for (const e of appSettings) {
+                if (isActiveModelSettingChat(e))
+                    result.chat = e.param;
+                else if (isActiveModelSettingApp(e))
+                    result.app = e.param;
+                else if (isActiveModelSettingImg(e))
+                    result.img = e.param;
+            }
+        }
+    }
+    return Result.Ok(result);
+}
+//# sourceMappingURL=get-model-defaults.js.map

package/intern/get-model-defaults.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-model-defaults.js","sourceRoot":"","sources":["../../jsr/intern/get-model-defaults.ts"],"names":[],"mappings":"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"}

package/intern/get-slug-binding.d.ts

@@ -1,8 +1,7 @@
 import { Result } from "@adviser/cement";
-import { VibesApiSQLCtx } from "../types.js";
-import { AppSlugBinding } from "./ensure-slug-binding.js";
+import { AppUserSlugBinding, VibesApiSQLCtx } from "../types.js";
 export interface GetSlugBinding {
     userSlug: string;
     appSlug: string;
 }
-export declare function getSlugBinding(ctx: VibesApiSQLCtx, binding: GetSlugBinding): Promise<Result<AppSlugBinding>>;
+export declare function getSlugBinding(ctx: VibesApiSQLCtx, binding: GetSlugBinding): Promise<Result<AppUserSlugBinding>>;

package/intern/get-slug-binding.js

@@ -16,10 +16,19 @@ export async function getSlugBinding(ctx, binding) {
         return Result.Err(`appSlug/userSlug not found ${binding.appSlug}:${binding.userSlug} not found`);
     }
     return Result.Ok({
-        ...binding,
-        tenant: sql.UserSlugBindings.tenant,
-        ledger: sql.AppSlugBindings.ledger,
-        userId: sql.UserSlugBindings.userId,
+        type: "vibes.diy-app-user-slug-binding",
+        userSlug: {
+            type: "vibes.diy-user-slug-binding",
+            userId: sql.UserSlugBindings.userId,
+            userSlug: sql.UserSlugBindings.userSlug,
+            tenant: sql.UserSlugBindings.tenant,
+        },
+        appSlug: {
+            type: "vibes.diy-app-slug-binding",
+            userId: sql.UserSlugBindings.userId,
+            appSlug: sql.AppSlugBindings.appSlug,
+            ledger: sql.AppSlugBindings.ledger,
+        },
     });
 }
 //# sourceMappingURL=get-slug-binding.js.map

package/intern/get-slug-binding.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-slug-binding.js","sourceRoot":"","sources":["../../jsr/intern/get-slug-binding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAStD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAmB,EAAE,OAAuB;IAC/E,MAAM,CAAC,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CACpC,GAAG,CAAC,GAAG,CAAC,EAAE;SACP,MAAM,EAAE;SACR,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC;SACpC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;SAC7H,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,EAC7D,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAC3D,CACF;SACA,KAAK,CAAC,CAAC,CAAC;SACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrB,CAAC;IACF,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QACd,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;IACnB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,MAAM,CAAC,GAAG,CAAC,8BAA8B,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,YAAY,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,MAAM,CAAC,EAAE,CAAC;QACf,GAAG,OAAO;QACV,MAAM,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;QACnC,MAAM,EAAE,GAAG,CAAC,eAAe,CAAC,MAAM;QAClC,MAAM,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;KACpC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"get-slug-binding.js","sourceRoot":"","sources":["../../jsr/intern/get-slug-binding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAQtD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAmB,EAAE,OAAuB;IAC/E,MAAM,CAAC,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CACpC,GAAG,CAAC,GAAG,CAAC,EAAE;SACP,MAAM,EAAE;SACR,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC;SACpC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;SAC7H,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,EAC7D,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAC3D,CACF;SACA,KAAK,CAAC,CAAC,CAAC;SACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrB,CAAC;IACF,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QACd,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;IACnB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,MAAM,CAAC,GAAG,CAAC,8BAA8B,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,YAAY,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,MAAM,CAAC,EAAE,CAAC;QACf,IAAI,EAAE,iCAAiC;QACvC,QAAQ,EAAE;YACR,IAAI,EAAE,6BAA6B;YACnC,MAAM,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;YACnC,QAAQ,EAAE,GAAG,CAAC,gBAAgB,CAAC,QAAQ;YACvC,MAAM,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;SACpC;QACD,OAAO,EAAE;YACP,IAAI,EAAE,4BAA4B;YAClC,MAAM,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;YACnC,OAAO,EAAE,GAAG,CAAC,eAAe,CAAC,OAAO;YACpC,MAAM,EAAE,GAAG,CAAC,eAAe,CAAC,MAAM;SACnC;KAKF,CAAC,CAAC;AACL,CAAC"}

package/intern/grouped-vibe-import-map.d.ts

@@ -12,6 +12,7 @@ export declare const lockedVersions: {
     TAILWINDCSS: string;
     REACT_ROUTER: string;
     AG_GRID: string;
+    EMOTION: string;
 };
 export declare const lockedGroupsVersions: {
     tailwindcss: {
@@ -52,6 +53,7 @@ export declare const lockedGroupsVersions: {
         "@fireproof/vendor": string;
         "@fireproof/use-fireproof": string;
         "use-fireproof": string;
+        "@emotion/css": string;
     };
     react: {
         react: string;

package/intern/grouped-vibe-import-map.js

@@ -12,6 +12,7 @@ export const lockedVersions = {
     TAILWINDCSS: "4.1.18",
     REACT_ROUTER: "7.13.0",
     AG_GRID: "35.1.0",
+    EMOTION: "11.13.5",
 };
 export const lockedGroupsVersions = {
     tailwindcss: {
@@ -52,6 +53,7 @@ export const lockedGroupsVersions = {
         "@fireproof/vendor": "version:FP",
         "@fireproof/use-fireproof": "version:FP,deps:react",
         "use-fireproof": "version:FP,deps:react",
+        "@emotion/css": "version:EMOTION",
     },
     react: {
         react: "version:REACT",

package/intern/grouped-vibe-import-map.js.map

@@ -1 +1 @@
-{"version":3,"file":"grouped-vibe-import-map.js","sourceRoot":"","sources":["../../jsr/intern/grouped-vibe-import-map.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,EAAE,EAAE,SAAS;IACb,KAAK,EAAE,QAAQ;IACf,cAAc,EAAE,QAAQ;IACxB,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,OAAO;IACZ,OAAO,EAAE,QAAQ;IACjB,IAAI,EAAE,OAAO;IACb,SAAS,EAAE,OAAO;IAClB,YAAY,EAAE,QAAQ;IACtB,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,QAAQ;IACrB,YAAY,EAAE,QAAQ;IACtB,OAAO,EAAE,QAAQ;CAClB,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,WAAW,EAAE;QACX,WAAW,EAAE,qBAAqB;KACnC;IACD,SAAS,EAAE;QACT,iBAAiB,EAAE,wBAAwB;QAC3C,IAAI,EAAE,cAAc;QACpB,YAAY,EAAE,sBAAsB;QACpC,KAAK,EAAE,eAAe;QACtB,YAAY,EAAE,eAAe;QAC7B,cAAc,EAAE,eAAe;QAC/B,GAAG,EAAE,aAAa;QAClB,OAAO,EAAE,iBAAiB;QAC1B,IAAI,EAAE,cAAc;QACpB,iBAAiB,EAAE,cAAc;QACjC,SAAS,EAAE,mBAAmB;QAC9B,sBAAsB,EAAE,YAAY;QACpC,4BAA4B,EAAE,YAAY;QAC1C,qBAAqB,EAAE,YAAY;QACnC,2BAA2B,EAAE,YAAY;QACzC,+BAA+B,EAAE,YAAY;QAC7C,gCAAgC,EAAE,YAAY;QAC9C,oCAAoC,EAAE,YAAY;QAClD,oCAAoC,EAAE,YAAY;QAClD,+BAA+B,EAAE,YAAY;QAC7C,oCAAoC,EAAE,YAAY;QAClD,iCAAiC,EAAE,YAAY;QAC/C,wBAAwB,EAAE,YAAY;QACtC,iCAAiC,EAAE,YAAY;QAC/C,qCAAqC,EAAE,YAAY;QACnD,yBAAyB,EAAE,8BAA8B;QACzD,4BAA4B,EAAE,YAAY;QAC1C,kCAAkC,EAAE,YAAY;QAChD,uCAAuC,EAAE,YAAY;QACrD,+BAA+B,EAAE,YAAY;QAC7C,iBAAiB,EAAE,YAAY;QAC/B,mBAAmB,EAAE,YAAY;QACjC,0BAA0B,EAAE,uBAAuB;QACnD,eAAe,EAAE,uBAAuB;KAGzC;IACD,KAAK,EAAE;QACL,KAAK,EAAE,eAAe;QACtB,WAAW,EAAE,eAAe;KAC7B;IACD,mBAAmB,EAAE;QACnB,WAAW,EAAE,eAAe;QAC5B,kBAAkB,EAAE,eAAe;QACnC,mBAAmB,EAAE,eAAe;QACpC,uBAAuB,EAAE,eAAe;KACzC;IACD,SAAS,EAAE;QACT,mBAAmB,EAAE,iBAAiB;QACtC,eAAe,EAAE,4BAA4B;KAC9C;IACD,cAAc,EAAE;QACd,cAAc,EAAE,iCAAiC;QACjD,kBAAkB,EAAE,iCAAiC;KACtD;IACD,cAAc,EAAE;QACd,iBAAiB,EAAE,aAAa;QAChC,yBAAyB,EAAE,aAAa;QACxC,uBAAuB,EAAE,aAAa;QACtC,sBAAsB,EAAE,aAAa;QACrC,uBAAuB,EAAE,aAAa;QACtC,6BAA6B,EAAE,aAAa;QAC5C,kCAAkC,EAAE,aAAa;QACjD,kCAAkC,EAAE,aAAa;QACjD,mCAAmC,EAAE,aAAa;QAQlD,SAAS,EAAE,+BAA+B;QAC1C,WAAW,EAAE,+BAA+B;KAC7C;CACF,CAAC"}
+{"version":3,"file":"grouped-vibe-import-map.js","sourceRoot":"","sources":["../../jsr/intern/grouped-vibe-import-map.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,EAAE,EAAE,SAAS;IACb,KAAK,EAAE,QAAQ;IACf,cAAc,EAAE,QAAQ;IACxB,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,OAAO;IACZ,OAAO,EAAE,QAAQ;IACjB,IAAI,EAAE,OAAO;IACb,SAAS,EAAE,OAAO;IAClB,YAAY,EAAE,QAAQ;IACtB,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,QAAQ;IACrB,YAAY,EAAE,QAAQ;IACtB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,SAAS;CACnB,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,WAAW,EAAE;QACX,WAAW,EAAE,qBAAqB;KACnC;IACD,SAAS,EAAE;QACT,iBAAiB,EAAE,wBAAwB;QAC3C,IAAI,EAAE,cAAc;QACpB,YAAY,EAAE,sBAAsB;QACpC,KAAK,EAAE,eAAe;QACtB,YAAY,EAAE,eAAe;QAC7B,cAAc,EAAE,eAAe;QAC/B,GAAG,EAAE,aAAa;QAClB,OAAO,EAAE,iBAAiB;QAC1B,IAAI,EAAE,cAAc;QACpB,iBAAiB,EAAE,cAAc;QACjC,SAAS,EAAE,mBAAmB;QAC9B,sBAAsB,EAAE,YAAY;QACpC,4BAA4B,EAAE,YAAY;QAC1C,qBAAqB,EAAE,YAAY;QACnC,2BAA2B,EAAE,YAAY;QACzC,+BAA+B,EAAE,YAAY;QAC7C,gCAAgC,EAAE,YAAY;QAC9C,oCAAoC,EAAE,YAAY;QAClD,oCAAoC,EAAE,YAAY;QAClD,+BAA+B,EAAE,YAAY;QAC7C,oCAAoC,EAAE,YAAY;QAClD,iCAAiC,EAAE,YAAY;QAC/C,wBAAwB,EAAE,YAAY;QACtC,iCAAiC,EAAE,YAAY;QAC/C,qCAAqC,EAAE,YAAY;QACnD,yBAAyB,EAAE,8BAA8B;QACzD,4BAA4B,EAAE,YAAY;QAC1C,kCAAkC,EAAE,YAAY;QAChD,uCAAuC,EAAE,YAAY;QACrD,+BAA+B,EAAE,YAAY;QAC7C,iBAAiB,EAAE,YAAY;QAC/B,mBAAmB,EAAE,YAAY;QACjC,0BAA0B,EAAE,uBAAuB;QACnD,eAAe,EAAE,uBAAuB;QACxC,cAAc,EAAE,iBAAiB;KAGlC;IACD,KAAK,EAAE;QACL,KAAK,EAAE,eAAe;QACtB,WAAW,EAAE,eAAe;KAC7B;IACD,mBAAmB,EAAE;QACnB,WAAW,EAAE,eAAe;QAC5B,kBAAkB,EAAE,eAAe;QACnC,mBAAmB,EAAE,eAAe;QACpC,uBAAuB,EAAE,eAAe;KACzC;IACD,SAAS,EAAE;QACT,mBAAmB,EAAE,iBAAiB;QACtC,eAAe,EAAE,4BAA4B;KAC9C;IACD,cAAc,EAAE;QACd,cAAc,EAAE,iCAAiC;QACjD,kBAAkB,EAAE,iCAAiC;KACtD;IACD,cAAc,EAAE;QACd,iBAAiB,EAAE,aAAa;QAChC,yBAAyB,EAAE,aAAa;QACxC,uBAAuB,EAAE,aAAa;QACtC,sBAAsB,EAAE,aAAa;QACrC,uBAAuB,EAAE,aAAa;QACtC,6BAA6B,EAAE,aAAa;QAC5C,kCAAkC,EAAE,aAAa;QACjD,kCAAkC,EAAE,aAAa;QACjD,mCAAmC,EAAE,aAAa;QAQlD,SAAS,EAAE,+BAA+B;QAC1C,WAAW,EAAE,+BAA+B;KAC7C;CACF,CAAC"}

package/intern/render-vibe.d.ts

@@ -1,11 +1,11 @@
 import { HandleTriggerCtx, Result, EventoResultType } from "@adviser/cement";
 import { FileSystemItem } from "@vibes.diy/api-types";
-import type { sqlApps } from "../sql/vibes-diy-api-schema-sqlite.js";
 import { NpmUrlCapture } from "../public/serv-entry-point.js";
 import { ExtractedHostToBindings } from "../entry-point-utils.js";
+import { sqlite } from "@vibes.diy/api-sql";
 export interface RenderVibesOpts {
     ctx: HandleTriggerCtx<Request, ExtractedHostToBindings, unknown>;
-    fs: typeof sqlApps.$inferSelect;
+    fs: typeof sqlite.sqlApps.$inferSelect;
     fsItems: FileSystemItem[];
     pkgRepos: {
         private: NpmUrlCapture;

package/intern/render-vibe.js.map

@@ -1 +1 @@
-{"version":3,"file":"render-vibe.js","sourceRoot":"","sources":["../../jsr/intern/render-vibe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,MAAM,EAAoB,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAChI,OAAO,EAGL,gBAAgB,EAChB,qBAAqB,EAErB,aAAa,EACb,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAG/B,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAYnE,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAmB;IAE9E,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,KAAK,YAAY,CAAC,CAAC;IAC3E,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,UAAU,CAAiB,aAAa,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAGtE,IAAI,gBAAgB,CAAC,eAAe,CAAC,EAAE,CAAC;QACtC,OAAO,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,qBAAqB,CAAC,eAAe,CAAC,EAAE,CAAC;QAC3C,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,gCAAgC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,iBAAiB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAClH,IAAI,SAAS,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAGD,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;QAC7B,GAAG,SAAS,CAAC,OAAO;QACpB,GAAG,oBAAoB;KACxB,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC;QAC3C,SAAS,EAAE,sBAAsB,CAAC;YAChC,KAAK,EAAE,sBAAsB,CAAC;gBAC5B,QAAQ,EAAE;oBACR,KAAK,EAAE,IAAI,CAAC,KAAK;iBAClB;aACF,CAAC;YACF,cAAc,EAAE,cAAc;SAC/B,CAAC;QACF,SAAS,EAAE,aAAa,CAAC;YACvB,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM;SACpC,CAAC;KACH,CAAC,CAAC;IAGH,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAC5B,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAEjB,IAAI,CAAC,iBAAiB,EAAE,wBAAwB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;YAClH,GAAG,CAAC,IAAI,CAAC;gBAEP,UAAU,EAAE,WAAW,GAAG,SAAS,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG;gBACrF,GAAG,EAAE,IAAI,GAAG,EAAE;aACf,CAAC,CAAC;QACL,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAGG,CACJ,CAAC;IAEF,MAAM,MAAM,GAAG,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,MAAM,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC,GAAG,CAAC,mBAAmB,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACzD,CAAC;IAWD,MAAM,KAAK,GAAG;QACZ,OAAO,EAAE;YACP,KAAK,EAAE,SAAS;SACjB;QAMD,MAAM;QACN,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG;QAC7B,SAAS,EAAE;YACT,OAAO,EAAE,SAAS;SACnB;QACD,SAAS,EAAE;YACT,KAAK,EAAE,iBAAiB;YACxB,WAAW,EAAE,uBAAuB;SACrC;QACD,OAAO,EAAE;YACP,4EAA4E;YAC5E,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;YACnC,uBAAuB;YACvB,KAAK,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI;YACtF,+EAA+E;YAC/E,4BAA4B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,KAAK;SACrG,CAAC,IAAI,CAAC,IAAI,CAAC;KACa,CAAC;IAC5B,MAAM,cAAc,GAA2B,EAAE,CAAC;IAClD,IAAI,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC7B,cAAc,CAAC,YAAY,CAAC,GAAG,eAAe,CAAC,eAAe,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE;YACvF,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,KAAK,IAAI,EAAE,CAC5C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;QACjB,IAAI,EAAE,oBAAoB;QAC1B,MAAM,EAAE,GAAG;QACX,OAAO,EAAE;YACP,cAAc,EAAE,WAAW;YAC3B,eAAe,EAAE,uBAAuB;YACxC,IAAI,EAAE,EAAE,CAAC,IAAI;YACb,GAAG,cAAc;SAClB;QACD,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,CAAC,MAAM,sBAAsB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAc;KAC1E,CAAC,CAClC,CAAC;IACF,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;QAChB,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC"}
+{"version":3,"file":"render-vibe.js","sourceRoot":"","sources":["../../jsr/intern/render-vibe.ts"],"names":[],"mappings":"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"}

package/intern/resend-prev-msg.js

@@ -1,7 +1,7 @@
 import { Result } from "@adviser/cement";
+import { ensureLogger } from "@fireproof/core-runtime";
 import { eq } from "drizzle-orm/sql/expressions";
-import { PromptAndBlockMsgs } from "@vibes.diy/api-types";
-import { type } from "arktype";
+import { parseArrayWarning, PromptAndBlockMsgs } from "@vibes.diy/api-types";
 import { isBlockEnd } from "@vibes.diy/call-ai-v2";
 export async function resendChatSectionsPrevMsg(args) {
     const { vctx, chatCtx, send, tid, dst } = args;
@@ -11,17 +11,9 @@ export async function resendChatSectionsPrevMsg(args) {
         .where(eq(vctx.sql.tables.chatSections.chatId, chatCtx.chatId))
         .orderBy(vctx.sql.tables.chatSections.created, vctx.sql.tables.chatSections.promptId, vctx.sql.tables.chatSections.blockSeq);
     for (const section of sections) {
-        const blocks = PromptAndBlockMsgs.array()(section.blocks);
-        if (blocks instanceof type.errors) {
-            let idx = 0;
-            for (const block of section.blocks) {
-                const pabm = PromptAndBlockMsgs(block);
-                if (pabm instanceof type.errors) {
-                    return Result.Err(`Invalid block data for section ${idx} in chat ${section.chatId} - ${pabm.summary} - ${JSON.stringify(block)}`);
-                }
-                idx++;
-            }
-            return Result.Err(`Invalid blocks data in chat ${section.chatId} - ${blocks.summary} - ${JSON.stringify(blocks)}`);
+        const { filtered: blocks, warning } = parseArrayWarning(section.blocks, PromptAndBlockMsgs);
+        if (warning.length > 0) {
+            ensureLogger(vctx.sthis, "resendChatSectionsPrevMsg").Warn().Any({ parseErrors: warning }).Msg("skip");
         }
         let fixDoubleBlockEnd = undefined;
         const toSplice = [];

package/intern/resend-prev-msg.js.map

@@ -1 +1 @@
-{"version":3,"file":"resend-prev-msg.js","sourceRoot":"","sources":["../../jsr/intern/resend-prev-msg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAW,kBAAkB,EAAgB,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAe,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAWhE,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,IAAmC;IACjF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAE/C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;SAC/B,MAAM,EAAE;SACR,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;SAClC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;SAE9D,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC/H,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC;YAClC,IAAI,GAAG,GAAG,CAAC,CAAC;YACZ,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAY,EAAE,CAAC;gBACzC,MAAM,IAAI,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBACvC,IAAI,IAAI,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC;oBAChC,OAAO,MAAM,CAAC,GAAG,CACf,kCAAkC,GAAG,YAAY,OAAO,CAAC,MAAM,MAAM,IAAI,CAAC,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAC/G,CAAC;gBACJ,CAAC;gBACD,GAAG,EAAE,CAAC;YACR,CAAC;YACD,OAAO,MAAM,CAAC,GAAG,CAAC,+BAA+B,OAAO,CAAC,MAAM,MAAM,MAAM,CAAC,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACrH,CAAC;QAGD,IAAI,iBAAiB,GAA4B,SAAS,CAAC;QAC3D,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAC9B,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtB,IAAI,iBAAiB,IAAI,KAAK,CAAC,OAAO,KAAK,iBAAiB,CAAC,OAAO,EAAE,CAAC;oBACrE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACvB,CAAC;gBACD,iBAAiB,GAAG,KAAK,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC,CAAC;QACH,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YACvC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,GAAG,CACT,YAAY,EACZ,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAI,CAAC,CAAC,MAA+B,CAAC,MAAM,EAAE,CAAC,CAAC,EAC/E,MAAM,CAAC,MAAM,EACb,OAAO,CAAC,MAAM,CACf,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,WAAW,GAAgD,MAAM,IAAI,CAAC;gBAC1E,OAAO,EAAE;oBACP,IAAI,EAAE,yBAAyB;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,SAAS,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;oBACpC,MAAM;iBACP;gBACD,GAAG;gBACH,GAAG,EAAE,UAAU;gBACf,GAAG;gBACH,GAAG,EAAE,CAAC;aACyB,CAAC,CAAC;YACnC,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC;gBACxB,OAAO,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACjC,CAAC;YACD,IAAI,WAAW,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;gBAClC,OAAO,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;IACH,CAAC;IACD,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;QACjD,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEtD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC;YACvB,OAAO,EAAE,OAAO;YAChB,GAAG;YACH,GAAG,EAAE,UAAU;YACf,GAAG;YACH,GAAG,EAAE,CAAC;SACyB,CAAC,CAAC;QACnC,IAAI,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;YAClB,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;IAEH,CAAC;IACD,OAAO,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"resend-prev-msg.js","sourceRoot":"","sources":["../../jsr/intern/resend-prev-msg.ts"],"names":[],"mappings":"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"}

package/intern/write-apps.d.ts

@@ -1,10 +1,9 @@
-import { ReqEnsureAppSlug, VibeFile, ReqWithVerifiedAuth, ResEnsureAppSlugOk } from "@vibes.diy/api-types";
+import { ReqEnsureAppSlug, VibeFile, ReqWithVerifiedAuth, StorageResult, ResEnsureAppSlug } from "@vibes.diy/api-types";
 import { Result } from "@adviser/cement";
-import { AppSlugBinding } from "./ensure-slug-binding.js";
-import { StorageResult, VibesApiSQLCtx } from "../types.js";
+import { AppUserSlugBinding, VibesApiSQLCtx } from "../types.js";
 export declare function transformJSXToJS(code: string): string;
 export declare function importsFromJS(js: string): string[];
-export declare function ensureApps(ctx: VibesApiSQLCtx, req: ReqWithVerifiedAuth<ReqEnsureAppSlug>, binding: AppSlugBinding, fs: {
+export declare function ensureApps(ctx: VibesApiSQLCtx, req: ReqWithVerifiedAuth<ReqEnsureAppSlug>, binding: AppUserSlugBinding, fs: {
     vibeFileItem: VibeFile;
     storage: StorageResult;
-}[]): Promise<Result<Omit<ResEnsureAppSlugOk, "type">>>;
+}[]): Promise<Result<ResEnsureAppSlug>>;