@agentshouse/mdruntime 0.1.0-ca6edc1abd618 → 0.1.0-ca92b54804c33

package/dist/save.js

@@ -4,7 +4,7 @@ import { immutable, leaving, queuedFile, departure, } from './change.js';
 import { collectionOf, documentsOf, governing, } from './collection.js';
 import { changeBatchIdentity } from './identity.js';
 import { overlaying } from './overlay.js';
-import { covered, normalize } from './paths.js';
+import { ancestors, covered, normalize } from './paths.js';
 import { sorting } from './shared.js';
 import { paced, ROW_WEIGHT, stepped } from './turn.js';
 import { validatedCollection } from './validation.js';
@@ -321,6 +321,8 @@ function* incoming(collection, removed, candidates) {
 function affected(change) {
     return change.kind === 'move' ? [change.path, change.to] : [change.path];
 }
+const WRITE = ['write'];
+const MOVE_OUT = ['write', 'erase'];
 function guard(changes, input, removing) {
     const overridden = new Map();
     const existing = {
@@ -329,6 +331,7 @@ function guard(changes, input, removing) {
         add: (path) => void overridden.set(path, true),
         delete: (path) => void overridden.set(path, false),
     };
+    const occupied = (path) => input.folders.has(path) ? path : (ancestors(path).find((one) => existing.has(one)) ?? null);
     for (const [index, change] of changes.entries()) {
         for (const path of affected(change)) {
             const normalized = normalize(path);
@@ -337,13 +340,14 @@ function guard(changes, input, removing) {
             if (covered(input.providerOwnedPaths, normalized)) {
                 return refuse('provider-owned-path', normalized);
             }
-            const operation = change.kind === 'remove' ? removing : 'write';
-            if (!input.local && !covered(input.operations[operation], normalized))
-                return refuse(`${operation}-grant`, normalized);
+            for (const operation of change.kind === 'remove' ? removing : WRITE)
+                if (!input.local && !covered(input.operations[operation], normalized))
+                    return refuse(`${operation}-grant`, normalized);
         }
         if (change.kind === 'create' || change.kind === 'arrival') {
-            if (existing.has(change.path))
-                return refuse('path-collision', change.path);
+            const taken = existing.has(change.path) ? change.path : occupied(change.path);
+            if (taken !== null)
+                return refuse('path-collision', taken);
             existing.add(change.path);
             continue;
         }
@@ -353,6 +357,9 @@ function guard(changes, input, removing) {
                     input.bases.some((base) => base.kind === 'absent' && base.path === change.path))) {
                 return refuse('path-collision', change.path);
             }
+            const taken = occupied(change.path);
+            if (taken !== null)
+                return refuse('path-collision', taken);
             if (!input.local &&
                 existing.has(change.path) &&
                 input.visible.revisions[departure(changes, index)] === undefined) {
@@ -364,8 +371,9 @@ function guard(changes, input, removing) {
         if (change.kind === 'move') {
             if (!existing.has(change.path))
                 return refuse('path-absent', change.path);
-            if (existing.has(change.to))
-                return refuse('path-collision', change.to);
+            const taken = existing.has(change.to) ? change.to : occupied(change.to);
+            if (taken !== null)
+                return refuse('path-collision', taken);
             if (unrevised(input, change.path)) {
                 return refuse('unknown-revision', change.path);
             }
@@ -968,7 +976,7 @@ function roomReferencesIn(path, content, composition) {
     const parsed = parse(content, path);
     if (!parsed.ok)
         return [];
-    return roomReferences(path, content, definitionOf(governing(composition, path), parsed.document.type));
+    return roomReferences(parsed.document, definitionOf(governing(composition, path), parsed.document.type));
 }
 function* admittedRooms(changes, visible, resulting, composition) {
     const from = new Map();
@@ -1014,7 +1022,7 @@ async function batching(input) {
     const rewritten = await stepped(rewrites(changes, input.visible));
     if (rewritten.kind === 'refused')
         return rewritten;
-    const refusal = guard(changes, input, 'delete');
+    const refusal = guard(changes, input, WRITE);
     if (refusal !== null)
         return refusal;
     const preconditions = await stepped(preconditionsOf(changes, input.visible, input.bases));
@@ -1063,9 +1071,10 @@ function arrivingText(path, to, source, moved) {
     return applied.outcome === 'applied' ? serialize(applied.document) : content;
 }
 function arrivalOf({ path, to }, source, moved) {
-    const { documents, revisions, fileIds, changes, binaries } = source.visible;
+    const { documents, revisions, fileIds, created, changes, binaries } = source.visible;
     const kept = {
         ...(fileIds[path] === undefined ? {} : { fileId: fileIds[path] }),
+        ...(created[path] === undefined ? {} : { created: created[path] }),
         ...(changes[path] === undefined ? {} : { change: changes[path] }),
     };
     const heads = {
@@ -1095,7 +1104,7 @@ async function moving(input) {
     if (moves.length === 0)
         return refuse('no-change');
     const removals = moves.map(({ path }) => ({ kind: 'remove', path }));
-    const leaves = guard(removals, { ...source, local: input.local, bases: [] }, 'write');
+    const leaves = guard(removals, { ...source, local: input.local, bases: [] }, MOVE_OUT);
     if (leaves !== null)
         return leaves;
     const uploading = moves.find(({ path }) => source.visible.binaries[path]?.state === 'pending');
@@ -1103,7 +1112,7 @@ async function moving(input) {
         return refuse('unknown-revision', uploading.path);
     const moved = new Map(moves.map(({ path, to }) => [path, to]));
     const arrivals = moves.map((move) => arrivalOf(move, source, moved));
-    const arrives = guard(arrivals, { ...destination, local: input.local, bases: [] }, 'write');
+    const arrives = guard(arrivals, { ...destination, local: input.local, bases: [] }, WRITE);
     if (arrives !== null)
         return arrives;
     const bound = input.providerLimits.find((limit) => limit.name === MOVE_DOCUMENTS)?.value;

package/dist/search.d.ts

@@ -1,73 +1,22 @@
-import type { ProviderRefusal } from './adapter.js';
-import { type CoveredRoom, type Filter, type PendingRoom } from './query.js';
-import type { Open } from './open.js';
-export type DocumentPart = Open<'fields' | 'sections' | 'preamble' | 'path'>;
+import type { ProviderRefusal, SearchHit } from './adapter.js';
+import type { Failure, Offline } from './outcome.js';
 export type SearchRequest = {
     text: string;
-    documents?: Filter;
-    collection?: true;
-    conversations?: readonly string[];
-    limit?: number;
-    after?: string;
-    total?: true;
+    rooms?: readonly string[];
 };
-export type MessagePart = Open<'text'>;
-export type Snippet<Part extends string> = {
-    part: Part;
-    text: string;
-    at: readonly [number, number];
-};
-export type DocumentHit = {
-    room: string;
-    path: string;
-    type: string;
-    score: number;
-    matches: Readonly<Record<string, readonly DocumentPart[]>>;
-    snippet?: Snippet<DocumentPart>;
-};
-export type MessageHit = {
-    conversation: string;
-    identity: string;
-    score: number;
-    matches: Readonly<Record<string, readonly MessagePart[]>>;
-    snippet?: Snippet<MessagePart>;
-};
-export type SearchCoverage = {
-    rooms: readonly CoveredRoom[];
-    conversations: readonly string[];
-    overlay: readonly string[];
+export type { SearchHit } from './adapter.js';
+export type SearchFound = {
+    kind: 'found';
+    documents: readonly SearchHit[];
 };
-export type SearchHits = {
-    documents: readonly DocumentHit[];
-    messages: readonly MessageHit[];
-};
-export type SearchWindow = SearchHits & {
-    next?: string;
-    total?: {
-        documents: number;
-        messages: number;
-    };
-};
-export type SearchPending = SearchHits & {
-    pending: readonly PendingRoom[];
-    coverage: SearchCoverage;
-};
-export type SearchUndeclared = ProviderRefusal & {
+export type SearchResult = SearchFound | Offline | (ProviderRefusal & {
+    kind: 'rejected';
+}) | (ProviderRefusal & {
     kind: 'undeclared';
-};
-export type SearchResult = (SearchWindow & {
-    coverage: SearchCoverage;
-}) | SearchPending | SearchUndeclared;
-export declare function undeclaredSearch(): SearchUndeclared;
-export type HitCursor = readonly [number, string, string] | readonly [] | null;
+}) | Failure;
 export type SearchPlan = {
     text: string;
-    documents: unknown;
-    collection: boolean;
-    conversations: readonly string[] | null;
-    limit: number | null;
-    after: readonly [HitCursor, HitCursor] | null;
-    total: boolean;
+    rooms: readonly string[] | null;
 };
 export declare function searchPlanOf(input: unknown): SearchPlan;
 //# sourceMappingURL=search.d.ts.map

package/dist/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../src/search.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../src/search.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,MAAM,aAAa,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAExE,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,SAAS,SAAS,EAAE,CAAA;CAAE,CAAC;AAE7E,MAAM,MAAM,YAAY,GACpB,WAAW,GACX,OAAO,GACP,CAAC,eAAe,GAAG;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,GACxC,CAAC,eAAe,GAAG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC,GAC1C,OAAO,CAAC;AAEZ,MAAM,MAAM,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAA;CAAE,CAAC;AAE3E,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,CAYvD"}

package/dist/search.js

@@ -1,57 +1,14 @@
-import { flag, invalid, known, limitOf, plain, } from './query.js';
-import { decodedCursor } from './windows.js';
-export function undeclaredSearch() {
-    return {
-        kind: 'undeclared',
-        code: 'search-undeclared',
-        fields: { name: 'local_search' },
-        retryable: false,
-    };
-}
-function hitCursor(input) {
-    if (input === null)
-        return null;
-    if (!Array.isArray(input))
-        return undefined;
-    if (input.length === 0)
-        return [];
-    const [score, first, second] = input;
-    return input.length === 3 &&
-        typeof score === 'number' &&
-        typeof first === 'string' &&
-        typeof second === 'string'
-        ? [score, first, second]
-        : undefined;
-}
-function searchAfter(input) {
-    if (input === undefined)
-        return null;
-    const decoded = typeof input === 'string' ? decodedCursor(input) : null;
-    const documents = decoded?.length === 2 ? hitCursor(decoded[0]) : undefined;
-    const messages = decoded?.length === 2 ? hitCursor(decoded[1]) : undefined;
-    if (documents === undefined || messages === undefined) {
-        invalid('after', 'expects the next an earlier search returned');
-    }
-    return [documents, messages];
-}
+import { invalid, known, plain } from '@agentshouse/mdmodel';
 export function searchPlanOf(input) {
     if (!plain(input))
         invalid('search', 'expects a search object');
-    known(input, ['text', 'documents', 'collection', 'conversations', 'limit', 'after', 'total'], '');
-    if (typeof input.text !== 'string')
-        invalid('text', 'expects text');
-    const conversations = input.conversations;
-    if (conversations !== undefined &&
-        (!Array.isArray(conversations) || conversations.some((named) => typeof named !== 'string'))) {
-        invalid('conversations', 'expects a list of conversations');
+    known(input, ['text', 'rooms'], '');
+    if (typeof input.text !== 'string' || input.text.trim() === '')
+        invalid('text', 'expects words');
+    const rooms = input.rooms;
+    if (rooms !== undefined &&
+        (!Array.isArray(rooms) || rooms.some((named) => typeof named !== 'string'))) {
+        invalid('rooms', 'expects a list of Rooms');
     }
-    return {
-        text: input.text,
-        documents: input.documents,
-        collection: flag(input.collection, 'collection'),
-        conversations: conversations ?? null,
-        limit: limitOf(input.limit),
-        after: searchAfter(input.after),
-        total: flag(input.total, 'total'),
-    };
+    return { text: input.text, rooms: rooms ?? null };
 }

package/dist/shared.d.ts

@@ -1,6 +1,5 @@
 export type Paths<V> = Readonly<Record<string, V>>;
 export declare function entriesIn<V>(map: Paths<V>): Generator<readonly [string, V]>;
-export declare function keysIn(...maps: readonly Paths<unknown>[]): Generator<number, Set<string>, void>;
 export declare function sortedKeys(map: Paths<unknown>): Generator<number, readonly string[], void>;
 export declare function sorting(keys: Iterable<string>): Generator<number, readonly string[], void>;
 export declare function sharing<V>(map: Paths<V>): Generator<number, Paths<V>, void>;

package/dist/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;AA+LnD,wBAAiB,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAO5E;AAuCD,wBAAiB,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,CAAC,CAE3F;AAED,wBAAiB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,CAAC,CAoB3F;AAED,wBAAiB,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAE5E;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAEjD;AAED,wBAAgB,OAAO,CAAC,CAAC,EACvB,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EACd,GAAG,EAAE,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EACnC,OAAO,GAAE,QAAQ,CAAC,MAAM,CAAM,GAC7B,KAAK,CAAC,CAAC,CAAC,CAEV;AAED,wBAAiB,QAAQ,CAAC,CAAC,EACzB,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EACd,GAAG,EAAE,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EACnC,OAAO,GAAE,QAAQ,CAAC,MAAM,CAAM,GAC7B,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAoBnC;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAE/C;AA8CD,wBAAiB,WAAW,CAAC,CAAC,EAC5B,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EACd,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EACf,IAAI,GAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,OAAmB,GAC/C,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAkB9C;AAED,wBAAgB,SAAS,CAAC,CAAC,EACzB,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EACd,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EACf,IAAI,GAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,OAAmB,GAC/C,WAAW,CAAC,MAAM,CAAC,CAErB;AAMD,wBAAgB,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAiD5D;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAE7D;AAED,wBAAiB,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAUxF"}

package/dist/shared.js

@@ -202,16 +202,6 @@ function* rooted(map) {
     }
     return { node, size };
 }
-export function* keysIn(...maps) {
-    const keys = new Set();
-    for (const map of maps) {
-        for (const [key] of entriesIn(map)) {
-            keys.add(key);
-            yield ROW_WEIGHT;
-        }
-    }
-    return keys;
-}
 const RUN = 1 << 10;
 function* merged(left, right) {
     const into = [];

package/dist/status.d.ts

@@ -1,19 +1,20 @@
 import type { Open } from './open.js';
-import type { ProviderRefusal } from './adapter.js';
 import type { ReturnReason } from './room-draft.js';
 export type AttentionEntry = {
     room: string;
     path: string;
     returned: ReturnReason;
-} | {
+};
+export type UnsentChange = {
     room: string;
-    refusal: ProviderRefusal;
+    path: string;
 };
 export type SyncStatus = {
     state: Open<'pending' | 'syncing' | 'synced'>;
     lastCompleted: string | null;
     providerUnreachable: boolean;
     attentionRequired: readonly AttentionEntry[];
+    unsent: readonly UnsentChange[];
     reset: string | null;
 };
 export type CycleProgress = {
@@ -21,7 +22,5 @@ export type CycleProgress = {
     reachable: boolean;
 };
 export declare const STARTING: SyncStatus;
-export declare function transferring(status: SyncStatus): SyncStatus;
-export declare function saving(status: SyncStatus): SyncStatus;
 export declare function same(one: SyncStatus, other: SyncStatus): boolean;
 //# sourceMappingURL=status.d.ts.map

package/dist/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../src/status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,YAAY,CAAA;CAAE,GACtD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,eAAe,CAAA;CAAE,CAAC;AAE/C,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,IAAI,CAAC,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC,CAAC;IAC9C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,iBAAiB,EAAE,SAAS,cAAc,EAAE,CAAC;IAC7C,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,UAMtB,CAAC;AAEF,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAE3D;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAErD;AAED,wBAAgB,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAQhE"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../src/status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,MAAM,MAAM,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,YAAY,CAAA;CAAE,CAAC;AAEpF,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1D,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,IAAI,CAAC,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC,CAAC;IAC9C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,iBAAiB,EAAE,SAAS,cAAc,EAAE,CAAC;IAC7C,MAAM,EAAE,SAAS,YAAY,EAAE,CAAC;IAChC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,UAOtB,CAAC;AAEF,wBAAgB,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAShE"}

package/dist/status.js

@@ -3,18 +3,14 @@ export const STARTING = {
     lastCompleted: null,
     providerUnreachable: false,
     attentionRequired: [],
+    unsent: [],
     reset: null,
 };
-export function transferring(status) {
-    return { ...status, state: 'syncing' };
-}
-export function saving(status) {
-    return { ...status, state: 'pending' };
-}
 export function same(one, other) {
     return (one.state === other.state &&
         one.lastCompleted === other.lastCompleted &&
         one.providerUnreachable === other.providerUnreachable &&
         one.reset === other.reset &&
-        JSON.stringify(one.attentionRequired) === JSON.stringify(other.attentionRequired));
+        JSON.stringify(one.attentionRequired) === JSON.stringify(other.attentionRequired) &&
+        JSON.stringify(one.unsent) === JSON.stringify(other.unsent));
 }

package/dist/store.d.ts

@@ -1,50 +1,37 @@
-import type { BootstrapInventory, Capability, KeptReceipt, Member, ProviderLimit } from './adapter.js';
+import type { BootstrapInventory, Capability, ListedConversation, Member, ProviderLimit } from './adapter.js';
 import type { ChangeBatch } from './change.js';
-import type { Composition } from './collection.js';
+import { type Composition } from './collection.js';
 import type { Plan } from './query.js';
 import type { ReplicaRecord } from './replica.js';
 import type { Submission } from './outcome.js';
 import type { RoomDraftRecord, SavedDraft } from './room-draft.js';
-import type { ModelState } from './model.js';
-import type { SearchWindow } from './search.js';
-import type { CommittedWrite, ConversationWrite, CountedRoom, HeldConversation, HeldEntry, MessageWindow, QueryAnswer, QueryRoom, Referrer, RoomCommit, RuntimeDatabase, SearchAsk, StoredEntry, StoredFile, TypedEntry, View, Walked } from './tables.js';
+import type { ModelState, StoredModel } from './model.js';
+import type { CommittedWrite, ConversationWrite, HeldConversation, HeldEntry, MessageWindow, QueryAnswer, QueryRoom, Referrer, ReplicaOpened, RoomCommit, RuntimeDatabase, StoredEntry, StoredFile, TypedEntry, View } from './tables.js';
 export type { ConversationWrite, HeldConversation, MessageWindow } from './tables.js';
-export type TransferWriting = {
-    readonly token: string | null;
-    readonly written: number;
-};
 export type TransferRecord = {
     readonly locator: string;
     readonly transfer: string;
     readonly selection: string;
     readonly from: string;
     readonly last: string;
-    readonly pageToken: string | null;
-    readonly writing: TransferWriting | null;
-    readonly inventory: BootstrapInventory | null;
     readonly done: BootstrapInventory;
     readonly models: {
         readonly collection: ModelState;
     };
     readonly key: number | null;
 };
+export type StoredReplica = Omit<ReplicaRecord, 'model'> & {
+    readonly model: StoredModel;
+};
 export type PendingState = {
     readonly drafts: readonly SavedDraft[];
     readonly submission: Submission;
     readonly lost: boolean;
     readonly upload?: unknown;
-    readonly accepted?: string;
 };
 export type TargetRecord = {
     established: boolean;
 };
-export type QueueRecord = {
-    locator: string;
-    pending: readonly {
-        batch: ChangeBatch;
-        state: PendingState;
-    }[];
-};
 export type PresentationRecord = {
     app: string;
     value: unknown;
@@ -69,83 +56,143 @@ export type CallRecord = {
 export type AuthoredWrite = {
     locator: string;
     queue?: readonly ChangeBatch[];
+    stored?: readonly ChangeBatch[];
     founded?: readonly ChangeBatch[];
     saved?: ReadonlyMap<string, readonly SavedDraft[]>;
     roomDrafts?: readonly RoomDraftRecord[];
     consumedRoomDrafts?: readonly string[];
-    accepted?: readonly {
-        readonly id: string;
-        readonly roomVersion: string;
-    }[];
 };
 export type StagedPage = {
     readonly entries: readonly StoredEntry[];
     readonly folders: readonly string[];
+    readonly part?: string;
+};
+export type ResumedTransfer = {
+    readonly key: number | null;
+    readonly transfer: string;
+    readonly staged: readonly string[];
 };
 export type RefreshedPage = StagedPage & {
     readonly removals: readonly string[];
     readonly folderRemovals: readonly string[];
 };
-export type Opened = {
-    readonly rooms: ReadonlyMap<string, ReplicaRecord>;
-    readonly transfers: ReadonlyMap<string, TransferRecord>;
-    readonly unindexed: ReadonlySet<number>;
-    readonly overlaid: ReadonlyMap<number, ReadonlySet<string>>;
-    readonly erasing: boolean;
-    readonly orphans: readonly number[];
+export type HeldRoom = {
+    readonly record: StoredReplica;
+    readonly indexed: boolean;
+    readonly documents: number;
+};
+export type QueuedChange = {
+    readonly batch: ChangeBatch;
+    readonly state: PendingState;
+};
+export type HeldWork = {
+    readonly room: (HeldRoom & {
+        readonly overlaid: ReadonlySet<string>;
+    }) | null;
+    readonly queue: readonly QueuedChange[];
+};
+export type CoveredRoom = {
+    readonly key: number;
+    readonly transfer: string;
+    readonly roomVersion: string;
+    readonly indexed: boolean;
+    readonly documents: number;
+    readonly bytes: number;
+    readonly offline: string;
+};
+export type HeldCover = {
+    readonly rooms: ReadonlyMap<string, CoveredRoom>;
+    readonly queues: ReadonlyMap<string, readonly string[]>;
+};
+export type HeldStatus = {
+    readonly queued: readonly string[];
+    readonly lastCompleted: string | null;
+    readonly unsent: readonly {
+        readonly room: string;
+        readonly path: string;
+    }[];
+    readonly resets: readonly {
+        readonly locator: string;
+        readonly reset: string;
+    }[];
+    readonly returned: readonly RoomDraftRecord[];
+};
+export type Facts = {
     readonly lastCompleted: string | null;
     readonly providerLimits: readonly ProviderLimit[];
     readonly capabilities: readonly Capability[];
     readonly member: Member | null;
     readonly targets: Readonly<Record<string, TargetRecord>>;
-    readonly presentation: readonly PresentationRecord[];
+    readonly conversationList: readonly ListedConversation[] | null;
+    readonly conversationCursor: string | null;
 };
 export type Commit = {
     readonly rooms: readonly RoomCommit[];
     readonly writes?: readonly AuthoredWrite[];
     readonly files?: readonly StoredFile[];
     readonly whole?: boolean;
-    readonly discards?: readonly string[];
 };
 export type RuntimeStore = {
-    opened(): Promise<Opened>;
-    counts(rooms: readonly CountedRoom[]): Promise<readonly number[]>;
+    opened(): Promise<ReplicaOpened>;
+    rooms(locators?: readonly string[]): Promise<readonly HeldRoom[]>;
+    room(locator: string): Promise<HeldWork>;
+    covering(): Promise<HeldCover>;
+    offline(locator: string): Promise<string | null>;
+    held(): Promise<{
+        readonly held: ReadonlySet<string>;
+        readonly staged: ReadonlySet<string>;
+    }>;
+    status(): Promise<HeldStatus>;
+    batch(locator: string, id: string): Promise<ChangeBatch | null>;
+    order(locator: string): Promise<readonly string[]>;
+    queued(): Promise<readonly string[]>;
+    moving(): Promise<{
+        readonly queued: ReadonlyMap<string, readonly string[]>;
+        readonly moving: readonly (QueuedChange & {
+            readonly locator: string;
+        })[];
+    }>;
+    pending(locator: string, id: string): Promise<{
+        readonly state: PendingState | undefined;
+        readonly room: boolean;
+    }>;
+    facts(): Promise<Facts>;
+    presentation(app: string): Promise<unknown>;
+    demote(): Promise<void>;
     query(plan: Plan, rooms: readonly QueryRoom[], budget: number | null): Promise<QueryAnswer>;
     changes(keys: readonly number[]): number;
     entries(key: number, view: View, paths: readonly string[]): Promise<readonly HeldEntry[]>;
     typed(key: number, view: View, paths: readonly string[]): Promise<readonly TypedEntry[]>;
-    referrers(key: number, view: View, targets: readonly string[], kinds: readonly string[]): Promise<readonly Referrer[]>;
-    walk(key: number, view: View, after: string | null, bytes: number): Promise<Walked>;
-    files(key: number, view: View, after: string | null, limit: number): Promise<readonly {
-        readonly path: string;
-        readonly revision: string;
-    }[]>;
+    referrers(key: number, view: View, targets: readonly string[]): Promise<readonly Referrer[]>;
+    folders(key: number, view: View, paths: readonly string[]): Promise<readonly string[]>;
     typedWithin(key: number, view: View, roots: readonly string[], within: boolean): Promise<boolean>;
-    search(ask: SearchAsk): Promise<SearchWindow>;
-    stage(record: TransferRecord, composition: Composition, page: StagedPage, written?: string): Promise<number | null>;
-    transferPart(locator: string, token: string): Promise<Uint8Array | null>;
-    keepPart(locator: string, token: string, part: Uint8Array): Promise<void>;
-    refresh(key: number, page: RefreshedPage): Promise<void>;
+    stage(record: TransferRecord, composition: Composition, page: StagedPage): Promise<number | null>;
+    resume(record: TransferRecord, composition: Composition, parts: readonly string[], published: number | null): Promise<ResumedTransfer | null>;
+    refresh(key: number, composition: Composition, page: RefreshedPage): Promise<void>;
     unrefresh(key: number): Promise<void>;
     commit(commit: Commit): Promise<CommittedWrite>;
     fence(locators: readonly string[]): Promise<void>;
     erase(locator: string | null, limit: number): Promise<boolean>;
-    abandon(locator: string, kept?: boolean): Promise<number | null>;
+    abandon(locator: string): Promise<void>;
+    unfence(locators: readonly string[]): Promise<ReadonlySet<string>>;
     release(key: number): Promise<void>;
-    rederive(key: number, limit: number): Promise<boolean>;
+    rederive(key: number, composition: Composition, bytes: number, ms: number, floor: number): Promise<{
+        readonly done: boolean;
+        readonly text: number;
+    }>;
     fact(name: string, value: unknown): Promise<void>;
-    queues(): Promise<readonly QueueRecord[]>;
     submit(locator: string, id: string, submission: Submission, lost: boolean): Promise<void>;
     keepUpload(locator: string, id: string, upload: unknown): Promise<void>;
-    roomDrafts(): Promise<readonly RoomDraftRecord[]>;
+    roomDrafts(locator?: string, paths?: readonly string[]): Promise<readonly RoomDraftRecord[]>;
     present(record: PresentationRecord): Promise<void>;
-    conversations(): Promise<readonly HeldConversation[]>;
+    conversations(conversations?: readonly string[]): Promise<readonly HeldConversation[]>;
     keepMessages(write: ConversationWrite): Promise<void>;
-    messageWindow(conversation: string, limit: number, before: readonly [string, string] | null): Promise<MessageWindow>;
-    messageCount(conversation: string): Promise<number>;
+    messageWindow(conversation: string, limit: number, before: readonly [string, string] | null, phrase?: string | null): Promise<MessageWindow>;
+    messageCount(conversation: string, phrase?: string | null): Promise<number>;
     turnArrived(conversation: string, turn: string): Promise<boolean>;
     dropConversations(conversations: readonly string[]): Promise<void>;
     chatDrafts(): Promise<readonly ChatDraftRecord[]>;
+    chatDraft(conversation: string): Promise<ChatDraftRecord | null>;
     keepChatDrafts(records: readonly ChatDraftRecord[]): Promise<void>;
     dropChatDraft(conversation: string): Promise<void>;
     calls(): Promise<readonly CallRecord[]>;
@@ -154,16 +201,9 @@ export type RuntimeStore = {
     keepRoomDraft(record: RoomDraftRecord, files: readonly StoredFile[]): Promise<void>;
     discardRoomDraft(locator: string, path: string): Promise<void>;
     fences(): Promise<readonly string[]>;
-    receivedHeads(): Promise<readonly KeptReceipt[]>;
-    receivedParts(key: string, count: number): Promise<readonly unknown[]>;
-    keepReceived(key: string, head: unknown, part?: {
-        index: number;
-        value: unknown;
-    }): Promise<void>;
-    dropReceived(keys: readonly string[]): Promise<void>;
     generation(): Promise<string | null>;
     rememberGeneration(value: string): Promise<void>;
     file(key: string, type: string): Promise<Blob>;
 };
-export declare function openRuntimeStore(fenced: (locator: string) => boolean, authored: RuntimeDatabase): RuntimeStore;
+export declare function openRuntimeStore(authored: RuntimeDatabase): RuntimeStore;
 //# sourceMappingURL=store.d.ts.map