@vibes.diy/api-svc 2.2.13-dev.6 → 2.2.14

package/intern/append-turn-to-chat.d.ts

@@ -0,0 +1,20 @@
+import { Result } from "@adviser/cement";
+import { type VibeFile } from "@vibes.diy/api-types";
+import type { VibesApiSQLCtx } from "../types.js";
+export interface AppendTurnOpts {
+    readonly chatId: string;
+    readonly userId: string;
+    readonly userSlug: string;
+    readonly appSlug: string;
+    readonly fileSystem: readonly VibeFile[];
+    readonly userMessage?: string;
+    readonly promptId?: string;
+    readonly fsId?: string;
+    readonly mode?: "dev" | "production";
+    readonly timestamp?: Date;
+}
+export interface AppendTurnResult {
+    readonly promptId: string;
+    readonly fsId: string;
+}
+export declare function appendTurnToChat(vctx: VibesApiSQLCtx, opts: AppendTurnOpts): Promise<Result<AppendTurnResult>>;

package/intern/append-turn-to-chat.js

@@ -0,0 +1,100 @@
+import { Result, exception2Result, uint8array2stream, to_uint8 } from "@adviser/cement";
+import { isVibeCodeBlock } from "@vibes.diy/api-types";
+import { ensureApps } from "./write-apps.js";
+import { seedChatSection } from "./seed-chat-section.js";
+import { ensureSlugBinding } from "./ensure-slug-binding.js";
+export async function appendTurnToChat(vctx, opts) {
+    const now = opts.timestamp ?? new Date();
+    const mode = opts.mode ?? "dev";
+    const promptId = opts.promptId ?? vctx.sthis.nextId(12).str;
+    const syntheticClaims = {
+        userId: opts.userId,
+        role: "user",
+        sub: `synthetic-${opts.userId}`,
+        params: {
+            email: `${opts.userId}@synthetic.vibes.diy`,
+            email_verified: true,
+            first: "Synthetic",
+            last: "User",
+            name: "Synthetic User",
+            image_url: "",
+            public_meta: undefined,
+            nick: opts.userSlug,
+        },
+    };
+    const rBinding = await ensureSlugBinding(vctx, {
+        claims: syntheticClaims,
+        userId: opts.userId,
+        userSlug: opts.userSlug,
+        appSlug: opts.appSlug,
+    });
+    if (rBinding.isErr())
+        return Result.Err(`appendTurnToChat: ensureSlugBinding failed: ${rBinding.Err().message}`);
+    const binding = rBinding.Ok();
+    const writeOps = opts.fileSystem.flatMap((f) => {
+        if (f.type !== "code-block" && f.type !== "str-asset-block" && f.type !== "uint8-asset-block")
+            return [];
+        return [{ fsItem: f, data: f.content }];
+    });
+    if (writeOps.length === 0) {
+        return Result.Err("appendTurnToChat: no storable files in fileSystem");
+    }
+    const rStorageResults = await vctx.storage.ensure({}, ...writeOps.map((op) => uint8array2stream(to_uint8(op.data))));
+    if (rStorageResults.some((r) => r.isErr())) {
+        return Result.Err(`appendTurnToChat: storage.ensure failed: ${rStorageResults.map((r) => (r.isErr() ? r.Err().message : "ok")).join(", ")}`);
+    }
+    const fullFileSystem = rStorageResults.map((op, idx) => ({
+        vibeFileItem: writeOps[idx].fsItem,
+        storage: op.Ok(),
+    }));
+    const rApps = await ensureApps(vctx, { env: {}, mode, userId: opts.userId }, binding, fullFileSystem);
+    if (rApps.isErr())
+        return Result.Err(`appendTurnToChat: ensureApps failed: ${rApps.Err().message}`);
+    const appsResult = rApps.Ok();
+    if (!("fsId" in appsResult) || typeof appsResult.fsId !== "string") {
+        return Result.Err(`appendTurnToChat: ensureApps returned non-ok result: ${JSON.stringify(appsResult)}`);
+    }
+    const fsId = appsResult.fsId;
+    const refValue = {
+        type: "prompt.usage.sql",
+        usage: { given: [], calculated: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 } },
+        fsRef: { fsId, mode, appSlug: opts.appSlug, userSlug: opts.userSlug },
+    };
+    const rPC = await exception2Result(() => vctx.sql.db.insert(vctx.sql.tables.promptContexts).values({
+        userId: opts.userId,
+        chatId: opts.chatId,
+        promptId,
+        fsId,
+        nethash: vctx.netHash(),
+        promptTokens: 0,
+        completionTokens: 0,
+        totalTokens: 0,
+        ref: refValue,
+        created: now.toISOString(),
+    }));
+    if (rPC.isErr())
+        return Result.Err(`appendTurnToChat: promptContexts insert failed: ${rPC.Err().message}`);
+    const seedFiles = opts.fileSystem.flatMap((f) => {
+        if (!isVibeCodeBlock(f) || typeof f.content !== "string")
+            return [];
+        const dot = f.filename.lastIndexOf(".");
+        const lang = dot >= 0 ? f.filename.slice(dot + 1).toLowerCase() : "txt";
+        return [{ path: f.filename, lang, content: f.content }];
+    });
+    const userText = opts.userMessage ?? `synthetic turn @ ${now.toISOString()}`;
+    const blockId = vctx.sthis.nextId(12).str;
+    const rSeed = await seedChatSection(vctx, {
+        chatId: opts.chatId,
+        promptId,
+        blockId,
+        streamId: blockId,
+        userText,
+        files: seedFiles,
+        timestamp: now,
+        fsRef: { fsId, mode, appSlug: opts.appSlug, userSlug: opts.userSlug },
+    });
+    if (rSeed.isErr())
+        return Result.Err(`appendTurnToChat: seedChatSection failed: ${rSeed.Err()}`);
+    return Result.Ok({ promptId, fsId });
+}
+//# sourceMappingURL=append-turn-to-chat.js.map

package/intern/append-turn-to-chat.js.map

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

package/intern/last-edit-diff.d.ts

@@ -0,0 +1,14 @@
+export interface DiffHunk {
+    readonly oldStart: number;
+    readonly oldLines: readonly string[];
+    readonly newLines: readonly string[];
+}
+export declare function lineDiff(before: string, after: string): DiffHunk[];
+export declare function coalesceHunks(hunks: readonly DiffHunk[], oldArr: readonly string[], gap: number): DiffHunk[];
+export interface RenderResult {
+    readonly ok: boolean;
+    readonly text: string;
+}
+export declare function renderHunkAsSearchReplace(hunk: DiffHunk, oldArr: readonly string[], maxExpand: number): RenderResult;
+export declare function generateFileLastEdit(path: string, before: string, after: string): string;
+export declare function generateLastEditBlock(prev2: ReadonlyMap<string, string>, prev: ReadonlyMap<string, string>): string;

package/intern/last-edit-diff.js

@@ -0,0 +1,126 @@
+export function lineDiff(before, after) {
+    const oldArr = before.split("\n");
+    const newArr = after.split("\n");
+    const n = oldArr.length;
+    const m = newArr.length;
+    const dp = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0));
+    for (let i = n - 1; i >= 0; i--) {
+        for (let j = m - 1; j >= 0; j--) {
+            if (oldArr[i] === newArr[j])
+                dp[i][j] = dp[i + 1][j + 1] + 1;
+            else
+                dp[i][j] = Math.max(dp[i + 1][j], dp[i][j + 1]);
+        }
+    }
+    const hunks = [];
+    let i = 0;
+    let j = 0;
+    while (i < n || j < m) {
+        if (i < n && j < m && oldArr[i] === newArr[j]) {
+            i++;
+            j++;
+            continue;
+        }
+        const oldStart = i;
+        const oldLines = [];
+        const newLines = [];
+        while (i < n && j < m && oldArr[i] !== newArr[j]) {
+            if (dp[i + 1][j] >= dp[i][j + 1]) {
+                oldLines.push(oldArr[i++]);
+            }
+            else {
+                newLines.push(newArr[j++]);
+            }
+        }
+        while (i < n && j === m)
+            oldLines.push(oldArr[i++]);
+        while (j < m && i === n)
+            newLines.push(newArr[j++]);
+        hunks.push({ oldStart, oldLines, newLines });
+    }
+    return hunks;
+}
+export function coalesceHunks(hunks, oldArr, gap) {
+    if (hunks.length <= 1)
+        return hunks.slice();
+    const out = [];
+    let cur = hunks[0];
+    for (let k = 1; k < hunks.length; k++) {
+        const next = hunks[k];
+        const curEnd = cur.oldStart + cur.oldLines.length;
+        const between = next.oldStart - curEnd;
+        if (between <= gap && between >= 0) {
+            const bridge = oldArr.slice(curEnd, next.oldStart);
+            cur = {
+                oldStart: cur.oldStart,
+                oldLines: [...cur.oldLines, ...bridge, ...next.oldLines],
+                newLines: [...cur.newLines, ...bridge, ...next.newLines],
+            };
+        }
+        else {
+            out.push(cur);
+            cur = next;
+        }
+    }
+    out.push(cur);
+    return out;
+}
+export function renderHunkAsSearchReplace(hunk, oldArr, maxExpand) {
+    for (let ctx = 0; ctx <= maxExpand; ctx++) {
+        const start = Math.max(0, hunk.oldStart - ctx);
+        const end = Math.min(oldArr.length, hunk.oldStart + hunk.oldLines.length + ctx);
+        const before = oldArr.slice(start, hunk.oldStart);
+        const after = oldArr.slice(hunk.oldStart + hunk.oldLines.length, end);
+        const searchLines = [...before, ...hunk.oldLines, ...after];
+        const searchText = searchLines.join("\n");
+        const full = oldArr.join("\n");
+        const first = full.indexOf(searchText);
+        if (first >= 0 && full.indexOf(searchText, first + 1) === -1) {
+            const replaceText = [...before, ...hunk.newLines, ...after].join("\n");
+            return {
+                ok: true,
+                text: `<<<<<<< SEARCH\n${searchText}\n=======\n${replaceText}\n>>>>>>> REPLACE`,
+            };
+        }
+    }
+    return { ok: false, text: "" };
+}
+export function generateFileLastEdit(path, before, after) {
+    if (before === after)
+        return "";
+    if (before.length === 0)
+        return `[NEW FILE: ${path} — see PREVIOUS]`;
+    if (after.length === 0)
+        return `[DELETED: ${path}]`;
+    const oldArr = before.split("\n");
+    const rawHunks = lineDiff(before, after);
+    const hunks = coalesceHunks(rawHunks, oldArr, 3);
+    if (hunks.length > 20)
+        return `[${path}: wholesale rewrite, see PREVIOUS]`;
+    const blocks = [];
+    for (const h of hunks) {
+        const rendered = renderHunkAsSearchReplace(h, oldArr, 20);
+        if (!rendered.ok)
+            return `[${path}: wholesale rewrite, see PREVIOUS]`;
+        blocks.push(rendered.text);
+    }
+    return `${path}:\n${blocks.join("\n")}`;
+}
+export function generateLastEditBlock(prev2, prev) {
+    const paths = new Set();
+    for (const p of prev2.keys())
+        paths.add(p);
+    for (const p of prev.keys())
+        paths.add(p);
+    const sorted = Array.from(paths).sort();
+    const parts = [];
+    for (const path of sorted) {
+        const a = prev2.get(path) ?? "";
+        const b = prev.get(path) ?? "";
+        const rendered = generateFileLastEdit(path, a, b);
+        if (rendered)
+            parts.push(rendered);
+    }
+    return parts.join("\n\n");
+}
+//# sourceMappingURL=last-edit-diff.js.map

package/intern/last-edit-diff.js.map

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

package/intern/recovery.js

@@ -1,4 +1,5 @@
 import { Result } from "@adviser/cement";
+import { assembleSlotMessages } from "./slot-assembler.js";
 const MAX_RECOVERY_FILE_BYTES = 16_000;
 const MAX_RECOVERY_TOTAL_BYTES = 32_000;
 export function buildRecoveryRequest({ originalRequest, recoveryAddendum, vfs, focusPath, assistantPartial, lastReplaceFileLines, }) {
@@ -8,9 +9,15 @@ export function buildRecoveryRequest({ originalRequest, recoveryAddendum, vfs, f
     if (focusPath.length === 0) {
         return Result.Err("focus path is empty");
     }
-    const filesBlock = renderCurrentFiles(vfs, focusPath);
-    const recoverySuffix = `${recoveryAddendum}\n\n${filesBlock}`;
-    const messages = mergeRecoveryIntoSystem(originalRequest.messages, recoverySuffix);
+    const messages = mergeRecoveryIntoSystem(originalRequest.messages, recoveryAddendum);
+    const slotMessages = assembleSlotMessages({
+        recoveryPartial: vfs,
+        focusPath,
+        config: {},
+    });
+    for (const s of slotMessages) {
+        messages.push({ role: "user", content: [{ type: "text", text: s.text }] });
+    }
     if (assistantPartial !== undefined && assistantPartial.length > 0) {
         messages.push({
             role: "user",

package/intern/recovery.js.map

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

package/intern/slot-assembler.d.ts

@@ -0,0 +1,44 @@
+export interface SlotEntry {
+    readonly label: string;
+    readonly caption: string;
+    readonly vfs: ReadonlyMap<string, string>;
+    readonly canonical: boolean;
+}
+export interface RenderedBlock {
+    readonly label: string;
+    readonly text: string;
+}
+export declare function renderSlotsWithDedup(slots: readonly SlotEntry[], focusPath: string): RenderedBlock[];
+export type CanonicalKind = "recovery" | "selected-draft" | "previous" | "none";
+export interface CanonicalInputs {
+    readonly recoveryPartial?: ReadonlyMap<string, string>;
+    readonly selectedDraft?: ReadonlyMap<string, string>;
+    readonly previous?: ReadonlyMap<string, string>;
+}
+export declare function pickCanonicalHome(inputs: CanonicalInputs): CanonicalKind;
+import type { SlotConfig } from "@vibes.diy/api-types";
+export interface AssembleInputs {
+    readonly original?: {
+        readonly vfs: ReadonlyMap<string, string>;
+        readonly turnsAgo: number;
+    };
+    readonly prev2?: ReadonlyMap<string, string>;
+    readonly previous?: ReadonlyMap<string, string>;
+    readonly selectedVersion?: {
+        readonly vfs: ReadonlyMap<string, string>;
+        readonly turnsAgo: number;
+    };
+    readonly selectedDraft?: ReadonlyMap<string, string>;
+    readonly recoveryPartial?: ReadonlyMap<string, string>;
+    readonly focusPath: string;
+    readonly config: SlotConfig;
+}
+export interface AssembledMessage {
+    readonly role: "user";
+    readonly label: string;
+    readonly text: string;
+}
+export declare function assembleSlotMessages(inputs: AssembleInputs): AssembledMessage[];
+export declare function resolveSlotConfig(req: SlotConfig | undefined, env: Record<string, string | undefined>): Required<SlotConfig>;
+import type { ChatMessage } from "@vibes.diy/call-ai-v2";
+export declare function renderSlotMessagesAs(msgs: readonly AssembledMessage[], mode: "user" | "system"): ChatMessage[];

package/intern/slot-assembler.js

@@ -0,0 +1,152 @@
+import { renderCurrentFiles } from "./recovery.js";
+export function renderSlotsWithDedup(slots, focusPath) {
+    const canonical = slots.find((s) => s.canonical);
+    const out = [];
+    for (const s of slots) {
+        if (s === canonical) {
+            const body = renderCurrentFiles(s.vfs, focusPath);
+            out.push({
+                label: s.label,
+                text: `--- ${s.label} (${s.caption}) ---\n${body}`,
+            });
+            continue;
+        }
+        const dedupedVfs = new Map();
+        const pointerLines = [];
+        for (const [path, content] of s.vfs.entries()) {
+            const canonicalContent = canonical?.vfs.get(path);
+            if (canonical && canonicalContent === content) {
+                pointerLines.push(`--- ${path} (identical to ${canonical.label}) ---`);
+            }
+            else {
+                dedupedVfs.set(path, content);
+            }
+        }
+        if (dedupedVfs.size === 0)
+            continue;
+        const body = renderCurrentFiles(dedupedVfs, focusPath);
+        const parts = [`--- ${s.label} (${s.caption}) ---`, body];
+        parts.push(...pointerLines);
+        const text = parts.join("\n");
+        out.push({ label: s.label, text });
+    }
+    return out;
+}
+export function pickCanonicalHome(inputs) {
+    if (inputs.recoveryPartial)
+        return "recovery";
+    if (inputs.selectedDraft)
+        return "selected-draft";
+    if (inputs.previous)
+        return "previous";
+    return "none";
+}
+import { generateLastEditBlock } from "./last-edit-diff.js";
+export function assembleSlotMessages(inputs) {
+    const cfg = inputs.config;
+    const muted = (k) => cfg[k] === "off";
+    const canonical = pickCanonicalHome({
+        recoveryPartial: inputs.recoveryPartial,
+        selectedDraft: inputs.selectedDraft,
+        previous: inputs.previous,
+    });
+    const snapshotEntries = [];
+    if (inputs.original && !muted("original")) {
+        snapshotEntries.push({
+            label: "ORIGINAL",
+            caption: `scaffold — first response, ${inputs.original.turnsAgo} turns ago`,
+            vfs: inputs.original.vfs,
+            canonical: false,
+        });
+    }
+    if (inputs.selectedVersion && !muted("selected")) {
+        snapshotEntries.push({
+            label: "SELECTED_VERSION",
+            caption: `user is currently viewing this, from ${inputs.selectedVersion.turnsAgo} turns ago`,
+            vfs: inputs.selectedVersion.vfs,
+            canonical: false,
+        });
+    }
+    if (inputs.previous && !muted("previous") && canonical !== "previous") {
+        snapshotEntries.push({
+            label: "PREVIOUS",
+            caption: "last server-side state — for reference; the disk/recovery state has since changed",
+            vfs: inputs.previous,
+            canonical: false,
+        });
+    }
+    if (canonical === "recovery" && inputs.recoveryPartial) {
+        snapshotEntries.push({
+            label: "RECOVERY_PARTIAL",
+            caption: "partial state captured during recovery; anchor SEARCH against this exact content",
+            vfs: inputs.recoveryPartial,
+            canonical: true,
+        });
+    }
+    else if (canonical === "selected-draft" && inputs.selectedDraft && !muted("selected")) {
+        snapshotEntries.push({
+            label: "SELECTED_DRAFT",
+            caption: "current disk contents — anchor SEARCH against these bytes",
+            vfs: inputs.selectedDraft,
+            canonical: true,
+        });
+    }
+    else if (canonical === "previous" && inputs.previous && !muted("previous")) {
+        const breadcrumb = inputs.original ? `; ORIGINAL scaffold is ${inputs.original.turnsAgo} turns earlier` : "";
+        snapshotEntries.push({
+            label: "PREVIOUS",
+            caption: `current state — anchor SEARCH here${breadcrumb}`,
+            vfs: inputs.previous,
+            canonical: true,
+        });
+    }
+    let lastEditText;
+    if (inputs.prev2 && inputs.previous && !muted("last_edit")) {
+        const block = generateLastEditBlock(inputs.prev2, inputs.previous);
+        if (block) {
+            lastEditText = `--- LAST_EDIT (the diff that produced the current PREVIOUS state) ---\n${block}`;
+        }
+    }
+    const canonicalLabel = snapshotEntries.find((e) => e.canonical)?.label;
+    const rendered = renderSlotsWithDedup(snapshotEntries, inputs.focusPath);
+    const out = [];
+    for (const r of rendered) {
+        if (lastEditText && canonicalLabel && r.label === canonicalLabel) {
+            out.push({ role: "user", label: "LAST_EDIT", text: lastEditText });
+            lastEditText = undefined;
+        }
+        out.push({ role: "user", label: r.label, text: r.text });
+    }
+    if (lastEditText) {
+        out.push({ role: "user", label: "LAST_EDIT", text: lastEditText });
+    }
+    return out;
+}
+export function resolveSlotConfig(req, env) {
+    const read = (key, envKey) => {
+        const r = req?.[key];
+        if (r === "on" || r === "off")
+            return r;
+        const e = env[envKey];
+        if (e === "on" || e === "off")
+            return e;
+        return "on";
+    };
+    return {
+        original: read("original", "SLOTS_ORIGINAL"),
+        selected: read("selected", "SLOTS_SELECTED"),
+        last_edit: read("last_edit", "SLOTS_LAST_EDIT"),
+        previous: read("previous", "SLOTS_PREVIOUS"),
+        compaction: read("compaction", "SLOTS_COMPACTION"),
+    };
+}
+export function renderSlotMessagesAs(msgs, mode) {
+    if (mode === "user") {
+        return msgs.map((m) => ({ role: "user", content: [{ type: "text", text: m.text }] }));
+    }
+    const joined = msgs.map((m) => m.text).join("\n\n");
+    if (joined === "")
+        return [];
+    return [{ role: "system", content: [{ type: "text", text: joined }] }];
+}
+//# sourceMappingURL=slot-assembler.js.map

package/intern/slot-assembler.js.map

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

package/intern/version-timeline.d.ts

@@ -0,0 +1,17 @@
+import { Result } from "@adviser/cement";
+import type { FileSystemItem } from "@vibes.diy/api-types";
+import type { VibesApiSQLCtx } from "../types.js";
+export interface TimelineEntry {
+    readonly fsId: string;
+    readonly created: Date;
+    readonly vfs: ReadonlyMap<string, string>;
+}
+export declare function resolveVfsFromFileSystem(vctx: VibesApiSQLCtx, items: FileSystemItem[]): Promise<ReadonlyMap<string, string>>;
+export declare function loadVersionTimeline(vctx: VibesApiSQLCtx, chatId: string): Promise<Result<TimelineEntry[]>>;
+export interface SlotSources {
+    readonly original?: TimelineEntry;
+    readonly previous?: TimelineEntry;
+    readonly prev2?: TimelineEntry;
+}
+export declare function selectSlotSources(timeline: readonly TimelineEntry[]): SlotSources;
+export declare function loadLatestPromptId(vctx: VibesApiSQLCtx, chatId: string): Promise<Result<string | undefined>>;

package/intern/version-timeline.js

@@ -0,0 +1,75 @@
+import { eq, asc, desc } from "drizzle-orm";
+import { parseArray, fileSystemItem, isFetchErrResult, isFetchNotFoundResult } from "@vibes.diy/api-types";
+import { exception2Result, stream2uint8array } from "@adviser/cement";
+const SOURCE_EXT = new Set([".jsx", ".tsx", ".js", ".ts", ".css", ".html", ".md", ".json"]);
+function isSourceFile(fileName) {
+    const dot = fileName.lastIndexOf(".");
+    if (dot < 0)
+        return false;
+    return SOURCE_EXT.has(fileName.slice(dot).toLowerCase());
+}
+export async function resolveVfsFromFileSystem(vctx, items) {
+    const vfs = new Map();
+    for (const item of items) {
+        if (!isSourceFile(item.fileName))
+            continue;
+        const rFetch = await vctx.storage.fetch(item.assetURI);
+        if (isFetchErrResult(rFetch) || isFetchNotFoundResult(rFetch))
+            continue;
+        const bytes = await stream2uint8array(rFetch.data);
+        const text = vctx.sthis.txt.decode(bytes);
+        const key = item.fileName.startsWith("/") ? item.fileName : `/${item.fileName}`;
+        vfs.set(key, text);
+    }
+    return vfs;
+}
+export async function loadVersionTimeline(vctx, chatId) {
+    return exception2Result(async () => {
+        const rows = await vctx.sql.db
+            .select({
+            fsId: vctx.sql.tables.promptContexts.fsId,
+            created: vctx.sql.tables.promptContexts.created,
+            fileSystem: vctx.sql.tables.apps.fileSystem,
+        })
+            .from(vctx.sql.tables.promptContexts)
+            .innerJoin(vctx.sql.tables.apps, eq(vctx.sql.tables.apps.fsId, vctx.sql.tables.promptContexts.fsId))
+            .where(eq(vctx.sql.tables.promptContexts.chatId, chatId))
+            .orderBy(asc(vctx.sql.tables.promptContexts.created));
+        const seen = new Set();
+        const out = [];
+        for (const r of rows) {
+            if (!r.fsId || seen.has(r.fsId))
+                continue;
+            seen.add(r.fsId);
+            const items = parseArray(r.fileSystem, fileSystemItem);
+            const vfs = await resolveVfsFromFileSystem(vctx, items);
+            const created = new Date(r.created);
+            out.push({ fsId: r.fsId, created, vfs });
+        }
+        return out;
+    });
+}
+export function selectSlotSources(timeline) {
+    if (timeline.length === 0)
+        return {};
+    if (timeline.length === 1)
+        return { original: timeline[0], previous: timeline[0] };
+    return {
+        original: timeline[0],
+        previous: timeline[timeline.length - 1],
+        prev2: timeline[timeline.length - 2],
+    };
+}
+export async function loadLatestPromptId(vctx, chatId) {
+    return exception2Result(async () => {
+        const r = await vctx.sql.db
+            .select({ promptId: vctx.sql.tables.promptContexts.promptId, created: vctx.sql.tables.promptContexts.created })
+            .from(vctx.sql.tables.promptContexts)
+            .where(eq(vctx.sql.tables.promptContexts.chatId, chatId))
+            .orderBy(desc(vctx.sql.tables.promptContexts.created))
+            .limit(1)
+            .then((rs) => rs[0]);
+        return r?.promptId;
+    });
+}
+//# sourceMappingURL=version-timeline.js.map

package/intern/version-timeline.js.map

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