@agentshouse/mdruntime 0.1.0-cee9c8aa4cd86 → 0.1.0-cef76ea952695

package/dist/refresh.js

@@ -1,46 +1,75 @@
 import { unconfirmed } from './transfer.js';
-async function pageOf(page, roomVersion, staging) {
-    const removed = new Set(page.removals);
-    const documents = Object.keys(page.documents).filter((path) => !removed.has(path));
-    const binaries = Object.keys(page.binaryFiles).filter((path) => !removed.has(path));
-    const written = new Set([...documents, ...binaries]);
-    const others = [
-        ...new Set([
-            ...Object.keys(page.revisions),
-            ...Object.keys(page.fileIds ?? {}),
-            ...Object.keys(page.changes),
-        ]),
-    ].filter((path) => !written.has(path) && !removed.has(path));
-    const asked = [
-        ...documents.filter((path) => page.revisions[path] === undefined),
-        ...binaries.filter((path) => page.revisions[path] === undefined),
-        ...others,
-    ];
-    const prior = asked.length === 0 ? new Map() : await staging.prior(asked);
+import { ROW_WEIGHT, stepped, yielded } from './turn.js';
+function* listing(page, removals) {
+    const removed = new Set();
+    for (const path of removals) {
+        removed.add(path);
+        yield ROW_WEIGHT;
+    }
+    const documents = [];
+    const binaries = [];
+    const asked = [];
+    const written = new Set();
+    for (const [kept, named] of [
+        [documents, page.documents],
+        [binaries, page.binaryFiles],
+    ]) {
+        for (const path of Object.keys(named)) {
+            yield ROW_WEIGHT;
+            if (removed.has(path))
+                continue;
+            kept.push(path);
+            written.add(path);
+            if (page.revisions[path] === undefined)
+                asked.push(path);
+        }
+    }
+    const others = [];
+    const seen = new Set();
+    for (const named of [page.revisions, page.fileIds ?? {}, page.changes]) {
+        for (const path of Object.keys(named)) {
+            yield ROW_WEIGHT;
+            if (seen.has(path))
+                continue;
+            seen.add(path);
+            if (!written.has(path) && !removed.has(path))
+                others.push(path);
+        }
+    }
+    return { documents, binaries, others, asked: [...asked, ...others] };
+}
+function* entering(page, roomVersion, listed, prior) {
     const entries = [];
-    for (const path of documents) {
+    for (const path of listed.documents) {
+        yield ROW_WEIGHT;
         entries.push({
             path,
             content: page.documents[path],
+            facts: page.facts[path] ?? null,
             binary: null,
             revision: page.revisions[path] ?? prior.get(path)?.revision ?? null,
             fileId: page.fileIds?.[path] ?? null,
+            created: page.created?.[path] ?? null,
             change: page.changes[path] ?? null,
             written: roomVersion,
         });
     }
-    for (const path of binaries) {
+    for (const path of listed.binaries) {
+        yield ROW_WEIGHT;
         entries.push({
             path,
             content: null,
+            facts: null,
             binary: { state: 'accepted', ...page.binaryFiles[path] },
             revision: page.revisions[path] ?? prior.get(path)?.revision ?? null,
             fileId: page.fileIds?.[path] ?? null,
+            created: page.created?.[path] ?? null,
             change: page.changes[path] ?? null,
             written: null,
         });
     }
-    for (const path of others) {
+    for (const path of listed.others) {
+        yield ROW_WEIGHT;
         const held = prior.get(path);
         if (held === undefined)
             continue;
@@ -49,20 +78,56 @@ async function pageOf(page, roomVersion, staging) {
             ...kept,
             revision: page.revisions[path] ?? held.revision,
             fileId: page.fileIds?.[path] ?? held.fileId,
+            created: page.created?.[path] ?? held.created,
             change: page.changes[path] ?? held.change,
         });
     }
+    return entries;
+}
+export async function pageEntries(page, removals, roomVersion, prior) {
+    await yielded();
+    const listed = await stepped(listing(page, removals));
+    const held = listed.asked.length === 0 ? new Map() : await prior(listed.asked);
+    return stepped(entering(page, roomVersion, listed, held));
+}
+function without(named, kept) {
+    return Object.fromEntries(Object.entries(named).filter(([path]) => !kept.has(path)));
+}
+function unwritten(page, kept) {
+    if (kept.size === 0)
+        return page;
+    return {
+        ...page,
+        documents: without(page.documents, kept),
+        facts: without(page.facts, kept),
+        revisions: without(page.revisions, kept),
+        ...(page.fileIds === undefined ? {} : { fileIds: without(page.fileIds, kept) }),
+        ...(page.created === undefined ? {} : { created: without(page.created, kept) }),
+        changes: without(page.changes, kept),
+        binaryFiles: without(page.binaryFiles, kept),
+        removals: page.removals.filter((path) => !kept.has(path)),
+    };
+}
+async function pageOf(answered, roomVersion, staging) {
+    const page = unwritten(answered, await staging.later([
+        ...Object.keys(answered.documents),
+        ...Object.keys(answered.binaryFiles),
+        ...answered.removals,
+    ], roomVersion));
     return {
-        entries,
+        entries: await pageEntries(page, page.removals, roomVersion, (paths) => staging.prior(paths)),
         removals: page.removals,
         folders: page.folders ?? [],
         folderRemovals: page.folderRemovals ?? [],
     };
 }
-export async function advancement(adapter, authorization, held, remodel, continuing, staging) {
+export async function advancement(refresh, authorization, held, remodel, continuing, staging) {
     const locator = held.locator;
     const fromRoomVersion = held.roomVersion;
-    const first = await adapter.refresh(authorization, {
+    staging.turn();
+    if (!continuing())
+        return unconfirmed;
+    const first = await refresh(authorization, {
         locator,
         selection: held.replica.selection,
         fromRoomVersion,
@@ -70,10 +135,7 @@ export async function advancement(adapter, authorization, held, remodel, continu
     if (first.kind !== 'net-advancement')
         return first;
     const roomVersion = first.roomVersion;
-    const models = remodel(first.models, {
-        collection: held.model,
-        selection: held.selectionModel,
-    });
+    const models = remodel(first.models, { collection: held.model });
     const changed = new Set();
     const staged = async (page) => {
         const read = await pageOf(page, roomVersion, staging);
@@ -87,9 +149,10 @@ export async function advancement(adapter, authorization, held, remodel, continu
         return unconfirmed;
     let pageToken = first.pageToken;
     while (pageToken !== undefined) {
+        await staging.turn();
         if (!continuing())
             return unconfirmed;
-        const page = await adapter.refresh(authorization, {
+        const page = await refresh(authorization, {
             locator,
             selection: held.replica.selection,
             fromRoomVersion,
@@ -110,7 +173,6 @@ export async function advancement(adapter, authorization, held, remodel, continu
         record: {
             ...held,
             model: models.collection,
-            selectionModel: models.selection,
             roomVersion,
         },
         changed,

package/dist/refusal.d.ts

@@ -0,0 +1,5 @@
+import type { ProviderRefusal } from './adapter.js';
+import type { Runtime } from './runtime.js';
+import type { RefusalReason } from './socket.js';
+export declare function refuse(runtime: Runtime, reason: RefusalReason, provider?: ProviderRefusal | null): Promise<void>;
+//# sourceMappingURL=refusal.d.ts.map

package/dist/refusal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"refusal.d.ts","sourceRoot":"","sources":["../src/refusal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAQpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,wBAAsB,MAAM,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,aAAa,EACrB,QAAQ,GAAE,eAAe,GAAG,IAAW,iBAmDxC"}

package/dist/refusal.js

@@ -0,0 +1,57 @@
+import { changeSet, mergeChangeSets } from './change-set.js';
+import { composedOf } from './collection.js';
+import { uncaught } from './failure.js';
+import { listedLocators } from './listing.js';
+import { prepare } from './preparation.js';
+import { storedRecord } from './replica.js';
+import { emitRefusal } from './shown.js';
+export async function refuse(runtime, reason, provider = null) {
+    const { store, socket, journal } = runtime;
+    socket.session.set({ paused: true });
+    socket.abortReads();
+    try {
+        if (reason === 'revoked-authorization') {
+            await store.exclusive(async () => {
+                const revoked = { status: 'unavailable', reason: 'revoked' };
+                let held = new Map();
+                try {
+                    const local = await store.open();
+                    held = await store.rooms();
+                    await local.commit({
+                        rooms: [...held.values()].map(({ record: kept }) => {
+                            const record = { ...kept, model: revoked };
+                            return {
+                                locator: record.locator,
+                                key: record.key,
+                                record: storedRecord(record),
+                                composed: composedOf(store.composed(record)),
+                            };
+                        }),
+                    });
+                }
+                catch (error) {
+                    journal.record('model revocation persistence failed');
+                    uncaught(error);
+                }
+                const listedNow = listedLocators(runtime, held);
+                for (const locator of listedNow) {
+                    if (!held.has(locator))
+                        socket.rooms.stand(locator, { unheldModel: revoked });
+                }
+                store.changed(mergeChangeSets(listedNow.map((locator) => changeSet(locator, { documents: null, room: true }))));
+                prepare(runtime);
+            });
+        }
+    }
+    finally {
+        socket.session.set({
+            refusal: {
+                code: reason,
+                reauthorizationOffered: reason === 'revoked-authorization',
+                refusal: provider,
+            },
+        });
+        journal.record(`connection refused ${reason}`);
+        emitRefusal(runtime);
+    }
+}

package/dist/replica.d.ts

@@ -1,7 +1,8 @@
-import type { MutationResult, OperationScopes, ReplicaAdmission, TypedSelection } from './adapter.js';
+import { type TypedPath } from '@agentshouse/mdmodel';
+import type { BootstrapInventory, SavedFacts, MutationResult, OperationScopes, ReplicaAdmission, TypedSelection } from './adapter.js';
 import { type ChangeBatch, type Precondition } from './change.js';
 import { type Collection, type Composition } from './collection.js';
-import type { ModelState } from './model.js';
+import { type ModelState } from './model.js';
 import { type Layer } from './overlay.js';
 import type { HeldEntry, OverlayEntry, StoredEntry } from './tables.js';
 export type ReplicaRecord = {
@@ -12,33 +13,33 @@ export type ReplicaRecord = {
     readonly replica: ReplicaAdmission;
     readonly model: ModelState;
     readonly typedSelection: TypedSelection | null;
-    readonly selectionModel: ModelState;
     readonly providerOwnedPaths: readonly string[];
+    readonly authoredPaths?: readonly string[];
     readonly roomVersion: string;
     readonly transfer: string;
+    readonly inventory: BootstrapInventory;
     readonly key: number;
 };
 export type HeldReplica = {
     readonly record: ReplicaRecord;
     readonly queue: readonly ChangeBatch[];
     readonly overlaid: ReadonlySet<string>;
-    readonly count: number;
-    readonly confirmed: number;
 };
 export type VisibleLayer = Layer & {
     readonly collection: Collection;
 };
 export type Slice = Layer & {
     readonly written: Readonly<Record<string, string>>;
+    readonly facts: Readonly<Record<string, SavedFacts>>;
     readonly held: ReadonlySet<string>;
 };
-export declare function compositionOf(record: Pick<ReplicaRecord, 'model' | 'typedSelection' | 'selectionModel'>): Composition;
-export declare function sameMembership(record: Pick<ReplicaRecord, 'typedSelection'>, other: Pick<ReplicaRecord, 'typedSelection'>): boolean;
+export declare function compositionOf(record: Pick<ReplicaRecord, 'model' | 'typedSelection'>, builtIn: ModelState, typedPaths: readonly TypedPath[]): Composition;
 export declare function storedRecord(record: ReplicaRecord): string;
 export declare function slicing(entries: readonly HeldEntry[], paths: Iterable<string>): Generator<number, Slice, void>;
+export type LayerEntry = Omit<StoredEntry, 'facts'>;
 export declare function entryAt(layer: Layer & {
     readonly written?: Readonly<Record<string, string>>;
-}, path: string): StoredEntry | null;
+}, path: string): LayerEntry | null;
 export declare function slicingWith(slice: Slice, set: readonly StoredEntry[], removed: readonly string[]): Generator<number, Slice, void>;
 export declare function touchedBy(queue: readonly ChangeBatch[]): Set<string>;
 export declare function movedBy(queue: readonly ChangeBatch[], locator: string): Set<string>;
@@ -47,7 +48,7 @@ export type Replayed = {
     readonly touched: ReadonlySet<string>;
 };
 export declare function replaying(confirmed: Slice, queue: readonly ChangeBatch[], locator: string, composition: Composition): Generator<number, Replayed, void>;
-export declare function overlayOf(visible: Layer, touched: Iterable<string>): Generator<number, OverlayEntry[], void>;
+export declare function overlayOf(visible: VisibleLayer, touched: Iterable<string>): Generator<number, OverlayEntry[], void>;
 export declare function holds(layer: Layer, preconditions: readonly Precondition[]): boolean;
 export declare function landed(batch: ChangeBatch, confirmed: Layer, current?: Readonly<Record<string, string>>): boolean;
 export type Standing = {
@@ -63,6 +64,6 @@ export type Returned = {
     readonly removed: readonly string[];
 };
 export declare function returnedPaths(submitted: ChangeBatch, accepted: Accepted): Set<string>;
-export declare function returning(confirmed: Slice, submitted: ChangeBatch, accepted: Accepted, writtenAt: string): Generator<number, Returned, void>;
+export declare function returning(confirmed: Slice, submitted: ChangeBatch, accepted: Accepted, writtenAt: string, composition: Composition): Generator<number, Returned, void>;
 export {};
 //# sourceMappingURL=replica.d.ts.map

package/dist/replica.d.ts.map

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

package/dist/replica.js

@@ -1,24 +1,24 @@
 import { equalValue, parse } from '@agentshouse/mdmodel';
 import { immutable, landing } from './change.js';
 import { collectionOf } from './collection.js';
+import { storedModel } from './model.js';
 import { acceptedBinaries, overlaying } from './overlay.js';
+import { writtenFacts } from './rows.js';
 import { effectiveIn, rewriting } from './save.js';
+import { guarding } from './shared.js';
 import { ROW_WEIGHT } from './turn.js';
-export function compositionOf(record) {
+export function compositionOf(record, builtIn, typedPaths) {
     return {
         model: record.model,
         selection: record.typedSelection === null
             ? null
-            : { roots: record.typedSelection.roots, model: record.selectionModel },
+            : { roots: record.typedSelection.roots, model: builtIn },
+        typedPaths,
     };
 }
-export function sameMembership(record, other) {
-    return (JSON.stringify(record.typedSelection?.roots ?? null) ===
-        JSON.stringify(other.typedSelection?.roots ?? null));
-}
 export function storedRecord(record) {
     const { key: _key, ...stored } = record;
-    return JSON.stringify(stored);
+    return JSON.stringify({ ...stored, model: storedModel(stored.model) });
 }
 const PROBES = new Set([
     'then',
@@ -38,7 +38,7 @@ function strict(values, held) {
             throw new UnreadPath(property);
         }
     };
-    return new Proxy(values, {
+    return guarding(values, {
         get(target, property, receiver) {
             guard(property);
             return Reflect.get(target, property, receiver);
@@ -61,9 +61,13 @@ export function* slicing(entries, paths) {
     const binaries = {};
     const revisions = {};
     const fileIds = {};
+    const created = {};
     const changes = {};
     const written = {};
+    const facts = {};
     for (const entry of entries) {
+        if (entry.facts !== null)
+            facts[entry.path] = entry.facts;
         if (entry.binary !== null)
             binaries[entry.path] = entry.binary;
         else if (entry.content !== null)
@@ -72,6 +76,8 @@ export function* slicing(entries, paths) {
             revisions[entry.path] = entry.revision;
         if (entry.fileId !== null)
             fileIds[entry.path] = entry.fileId;
+        if (entry.created !== null)
+            created[entry.path] = entry.created;
         if (entry.change !== null)
             changes[entry.path] = entry.change;
         if (entry.written !== null)
@@ -83,8 +89,10 @@ export function* slicing(entries, paths) {
         binaries: strict(binaries, held),
         revisions: strict(revisions, held),
         fileIds: strict(fileIds, held),
+        created: strict(created, held),
         changes: strict(changes, held),
         written: strict(written, held),
+        facts: strict(facts, held),
         held,
     };
 }
@@ -99,6 +107,7 @@ export function entryAt(layer, path) {
         binary: binary ?? null,
         revision: layer.revisions[path] ?? null,
         fileId: layer.fileIds[path] ?? null,
+        created: layer.created[path] ?? null,
         change: layer.changes[path] ?? null,
         written: layer.written?.[path] ?? null,
     };
@@ -107,8 +116,9 @@ export function* slicingWith(slice, set, removed) {
     const entries = new Map();
     for (const path of slice.held) {
         const entry = entryAt(slice, path);
-        if (entry !== null)
-            entries.set(path, { ...entry, type: null });
+        if (entry !== null) {
+            entries.set(path, { ...entry, type: null, facts: slice.facts[path] ?? null });
+        }
         yield ROW_WEIGHT;
     }
     for (const path of removed)
@@ -172,8 +182,9 @@ export function* replaying(confirmed, queue, locator, composition) {
 export function* overlayOf(visible, touched) {
     const rows = [];
     for (const path of touched) {
-        yield ROW_WEIGHT;
         const entry = entryAt(visible, path);
+        yield ROW_WEIGHT + (entry?.content?.length ?? 0);
+        const text = entry?.binary === null ? entry.content : null;
         rows.push(entry === null
             ? {
                 path,
@@ -182,10 +193,17 @@ export function* overlayOf(visible, touched) {
                 binary: null,
                 revision: null,
                 fileId: null,
+                created: null,
                 change: null,
                 written: null,
+                facts: null,
             }
-            : { ...entry, written: null, present: true });
+            : {
+                ...entry,
+                written: null,
+                present: true,
+                facts: text === null ? null : writtenFacts(path, text, visible.collection.composition),
+            });
     }
     return rows;
 }
@@ -257,7 +275,7 @@ function effects(change) {
             { kind: 'present', path: change.to },
         ];
     }
-    if (change.kind === 'binary' || change.kind === 'arrival')
+    if (change.kind === 'arrival')
         return [{ kind: 'present', path }];
     return [{ kind: 'absent', path }];
 }
@@ -350,17 +368,20 @@ export function returnedPaths(submitted, accepted) {
     }
     return paths;
 }
-export function* returning(confirmed, submitted, accepted, writtenAt) {
+export function* returning(confirmed, submitted, accepted, writtenAt, composition) {
     const documents = new Map();
     const binaries = new Map();
     const revisions = new Map();
     const fileIds = new Map();
+    const created = new Map();
     const changes = new Map();
     const written = new Map();
+    const facts = new Map();
     const read = (changed, held, path) => (changed.has(path) ? changed.get(path) : held[path]);
     for (const [path, content] of Object.entries(accepted.documents)) {
-        yield ROW_WEIGHT;
+        yield ROW_WEIGHT + content.length;
         documents.set(path, content);
+        facts.set(path, writtenFacts(path, content, composition));
         fileIds.set(path, undefined);
         written.set(path, writtenAt);
     }
@@ -383,48 +404,60 @@ export function* returning(confirmed, submitted, accepted, writtenAt) {
         written.set(path, undefined);
     }
     for (const change of submitted.changes) {
-        if (change.kind === 'arrival' && 'binary' in change) {
-            if (accepted.revisions[change.path] !== undefined) {
+        if (change.kind === 'arrival') {
+            if (accepted.revisions[change.path] === undefined)
+                continue;
+            created.set(change.path, change.created);
+            if ('binary' in change)
                 binaries.set(change.path, { state: 'accepted', ...change.binary });
-            }
             continue;
         }
-        if (change.kind !== 'move')
+        if (change.kind !== 'move' || accepted.revisions[change.to] === undefined)
             continue;
+        created.set(change.to, read(created, confirmed.created, change.path));
+        created.set(change.path, undefined);
         const moved = read(binaries, confirmed.binaries, change.path);
-        if (moved === undefined || accepted.revisions[change.to] === undefined)
+        if (moved === undefined)
             continue;
         binaries.set(change.to, moved);
         binaries.set(change.path, undefined);
     }
     for (const [path, binary] of acceptedBinaries(accepted.binaryFiles ?? {}))
         binaries.set(path, binary);
-    for (const path of accepted.removals)
+    for (const path of accepted.removals) {
         binaries.set(path, undefined);
+        created.set(path, undefined);
+    }
     const paths = new Set([
         ...documents.keys(),
         ...binaries.keys(),
         ...revisions.keys(),
         ...fileIds.keys(),
+        ...created.keys(),
         ...changes.keys(),
         ...written.keys(),
     ]);
     const set = [];
     const removed = [];
     for (const path of paths) {
-        yield ROW_WEIGHT;
         const content = read(documents, confirmed.documents, path);
         const binary = read(binaries, confirmed.binaries, path);
+        yield ROW_WEIGHT;
         if (content === undefined && binary === undefined) {
             removed.push(path);
             continue;
         }
+        const text = binary === undefined ? (content ?? null) : null;
+        const fresh = confirmed.documents[path] === undefined && confirmed.binaries[path] === undefined;
         set.push({
             path,
-            content: binary === undefined ? (content ?? null) : null,
+            content: text,
+            facts: text === null ? null : (read(facts, confirmed.facts, path) ?? null),
             binary: binary ?? null,
             revision: read(revisions, confirmed.revisions, path) ?? null,
             fileId: read(fileIds, confirmed.fileIds, path) ?? null,
+            created: read(created, confirmed.created, path) ??
+                (fresh ? (read(changes, confirmed.changes, path)?.time ?? null) : null),
             change: read(changes, confirmed.changes, path) ?? null,
             written: read(written, confirmed.written, path) ?? null,
         });

package/dist/room-draft.d.ts

@@ -40,6 +40,7 @@ export type RoomDraftParts = {
     };
     readonly file?: {
         readonly blob: Blob;
+        readonly base?: string | null;
     };
 };
 export type HeldFile = {
@@ -89,9 +90,9 @@ type ChangedUnderneath = {
     readonly file?: string | null;
 };
 export type ReturnReason = ProviderRefusal & {
-    readonly kind: Open<'conflicted' | 'rejected' | 'expired' | 'withdrawn'>;
+    readonly kind: Open<'conflicted' | 'rejected' | 'withdrawn'>;
 };
-export declare function returnedBy(kind: 'expired' | 'withdrawn'): ReturnReason;
+export declare function returnedBy(): ReturnReason;
 export type RoomDraft = {
     readonly room: string;
     readonly path: string;
@@ -105,14 +106,12 @@ export type RoomDraftWrite = {
     readonly roomDraft: RoomDraft | null;
 } | {
     readonly outcome: 'stale';
-    readonly code: string;
-    readonly retryable: boolean;
     readonly current: RoomDraft | null;
 };
 export declare function staleWrite(current: RoomDraft | null): RoomDraftWrite;
 export type ChangedPart = {
     readonly path: string;
-    readonly part: Open<'field' | 'section' | 'preamble' | 'markdown' | 'creation' | 'move' | 'removal' | 'file'>;
+    readonly part: Open<'field' | 'section' | 'preamble' | 'markdown' | 'move' | 'removal' | 'file'>;
     readonly name?: string;
 };
 export type RoomDraftRecord = {
@@ -126,12 +125,14 @@ export type SavedDraft = {
     readonly path: string;
     readonly parts: HeldParts;
 };
-export declare function readParts(value: unknown): RoomDraftParts;
+export declare function readParts(value: unknown, path: string): RoomDraftParts;
+export declare function gatheredParts(earlier: unknown, later: unknown): unknown;
 export declare function held(current: HeldParts | undefined, parts: RoomDraftParts, file?: HeldFile): HeldParts;
 export declare function underneath(parts: HeldParts, path: string, visible: VisibleLayer | undefined): ChangedUnderneath;
 export declare function heldFile(blob: Blob, base: string | null): Promise<HeldFile>;
 export declare function binaryBase(visible: VisibleLayer | undefined, path: string): string | null;
-export declare function changedParts(path: string, report: ChangedUnderneath): readonly ChangedPart[];
+export declare function changedParts(path: string, parts: HeldParts, visible: VisibleLayer | undefined): readonly ChangedPart[];
+export declare function lineEnded(text: string): string;
 export type TextParts = {
     readonly fields?: Readonly<Record<string, {
         readonly value: unknown;
@@ -148,6 +149,20 @@ export declare function returnedInto(existing: HeldParts | undefined, returned:
 export declare function moveTarget(move: {
     readonly to: string;
 }): string;
+export declare function readSavedParts(named: readonly {
+    readonly path: string;
+    readonly parts: unknown;
+}[]): readonly {
+    readonly path: string;
+    readonly parts: RoomDraftParts;
+}[];
+export declare function partsChanges(named: readonly {
+    readonly path: string;
+    readonly parts: unknown;
+}[]): {
+    readonly changes: readonly Change[];
+    readonly preconditions: readonly Precondition[];
+};
 export declare function changesOf(path: string, parts: HeldParts): {
     changes: readonly Change[];
     bases: readonly Precondition[];