@agentshouse/mdruntime 0.1.0-c2e8a6f99866d → 0.1.0-c2ef9303a058d

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';
@@ -329,6 +329,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);
@@ -342,8 +343,9 @@ function guard(changes, input, removing) {
                 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 +355,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 +369,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);
             }
@@ -1074,11 +1080,11 @@ function arrivalOf({ path, to }, source, moved) {
     };
     const binary = binaries[path];
     if (binary?.state === 'accepted') {
-        const { fileRef, byteLength, mediaType, sha256 } = binary;
+        const { byteLength, mediaType, sha256 } = binary;
         return {
             kind: 'arrival',
             path: to,
-            binary: { fileRef, byteLength, mediaType, sha256 },
+            binary: { byteLength, mediaType, sha256 },
             ...heads,
         };
     }

package/dist/search.d.ts

@@ -1,105 +1,22 @@
-import type { ProviderRefusal } from './adapter.js';
-import type { ChangeSet } from './change-set.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 DocumentHit = {
-    room: string;
-    path: string;
-    type: string;
-    score: number;
-    matches: Readonly<Record<string, readonly DocumentPart[]>>;
+export type { SearchHit } from './adapter.js';
+export type SearchFound = {
+    kind: 'found';
+    documents: readonly SearchHit[];
 };
-export type MessageHit = {
-    conversation: string;
-    identity: string;
-    score: number;
-    matches: Readonly<Record<string, readonly Open<'text'>[]>>;
-};
-export type SearchCoverage = {
-    rooms: readonly CoveredRoom[];
-    conversations: readonly string[];
-    index: string;
-    overlay: readonly string[];
-};
-export type PendingConversation = {
-    conversation: string;
-    awaits: Open<'index'>;
-};
-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 | PendingConversation)[];
-    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 SearchedDocument = {
-    room: string;
-    path: string;
-    type: string;
-    fields: Readonly<Record<string, unknown>>;
-    preamble: string;
-    sections: Readonly<Record<string, string>>;
-};
-export type SearchedMessage = {
-    conversation: string;
-    identity: string;
-    text: string;
-};
-export type SearchSource = {
-    room(room: string): AsyncIterable<readonly SearchedDocument[]>;
-    documents(room: string, paths: readonly string[]): Promise<readonly SearchedDocument[]>;
-};
-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;
-};
-export type SearchIndex = {
-    generation(): string;
-    rooms(): ReadonlySet<string>;
-    conversations(): ReadonlySet<string>;
-    indexRoom(room: string): Promise<void>;
-    indexMessages(conversation: string, messages: readonly SearchedMessage[], whole: boolean): void;
-    forget(rooms: readonly string[]): void;
-    changed(set: ChangeSet): void;
-    changes(): number;
-    caughtUp(): Promise<void>;
-    search(plan: SearchPlan, documents: readonly {
-        room: string;
-        path: string;
-    }[] | null, conversations: readonly string[], rooms: ReadonlySet<string> | null, selections: ReadonlyMap<string, readonly string[]> | null): SearchWindow;
+    rooms: readonly string[] | null;
 };
 export declare function searchPlanOf(input: unknown): SearchPlan;
-export declare function createSearchIndex(source: SearchSource): SearchIndex;
-export {};
 //# 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,353 +1,14 @@
-import MiniSearch from 'minisearch';
-import { indexGeneration } from './identity.js';
-import { flag, invalid, known, limitOf, plain, } from './query.js';
-import { beneath } from './paths.js';
-import { inUnits, ROW_WEIGHT, yielded } from './turn.js';
-import { decodedCursor } from './windows.js';
-export function undeclaredSearch() {
-    return {
-        kind: 'undeclared',
-        code: 'search-undeclared',
-        fields: { name: 'local_search' },
-        retryable: false,
-    };
-}
-const FIELDS = ['fields', 'sections', 'preamble', 'path', 'text'];
-const VACUUM_CONDITIONS = { minDirtCount: 20, minDirtFactor: 0.1 };
-const CHANGED_BATCH = 256;
-function documentId(room, path) {
-    return JSON.stringify(['document', room, path]);
-}
-function messageId(conversation, identity) {
-    return JSON.stringify(['message', conversation, identity]);
-}
-function scalars(value) {
-    if (value === null || value === undefined)
-        return [];
-    if (Array.isArray(value))
-        return value.flatMap(scalars);
-    if (typeof value === 'object')
-        return Object.values(value).flatMap(scalars);
-    return [String(value)];
-}
-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');
-    }
-    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'),
-    };
-}
-function pair(left, right) {
-    if (left[0] !== right[0])
-        return left[0] < right[0] ? -1 : 1;
-    if (left[1] !== right[1])
-        return left[1] < right[1] ? -1 : 1;
-    return 0;
-}
-function hitWindow(found, cursor, limit, tie) {
-    if (cursor === null)
-        return { kept: [], cursor: null };
-    const start = cursor.length === 0
-        ? 0
-        : found.findIndex((hit) => hit.score < cursor[0] ||
-            (hit.score === cursor[0] && pair(tie(hit), [cursor[1], cursor[2]]) > 0));
-    const following = start === -1 ? [] : found.slice(start);
-    if (limit === null || following.length <= limit)
-        return { kept: following, cursor: null };
-    const kept = following.slice(0, limit);
-    const last = kept[kept.length - 1];
-    return { kept, cursor: last === undefined ? cursor : [last.score, ...tie(last)] };
-}
-export function createSearchIndex(source) {
-    const generation = indexGeneration();
-    const index = new MiniSearch({ fields: FIELDS, autoVacuum: false });
-    const documents = new Map();
-    const messages = new Map();
-    const rooms = new Set();
-    const filling = new Set();
-    const conversations = new Set();
-    const acquiring = new Set();
-    const changedDocuments = new Map();
-    const refilling = new Set();
-    const arrived = new Map();
-    let vacuuming = null;
-    let changes = 0;
-    function added(entry) {
-        if (vacuuming === null)
-            index.add(entry);
-        else
-            arrived.set(entry.id, entry);
-    }
-    function addDocument(document) {
-        const id = documentId(document.room, document.path);
-        discard(id, documents);
-        added({
-            id,
-            fields: scalars(document.fields).join('\n'),
-            sections: Object.entries(document.sections)
-                .map(([heading, text]) => `${heading}\n${text}`)
-                .join('\n'),
-            preamble: document.preamble,
-            path: document.path,
-        });
-        documents.set(id, { room: document.room, path: document.path, type: document.type });
-    }
-    function addMessage(message) {
-        const id = messageId(message.conversation, message.identity);
-        discard(id, messages);
-        added({ id, text: message.text });
-        messages.set(id, { conversation: message.conversation, identity: message.identity });
-    }
-    function discard(id, entries) {
-        if (!entries.delete(id) || arrived.delete(id))
-            return;
-        index.discard(id);
-        vacuum();
-    }
-    function vacuum() {
-        if (vacuuming !== null ||
-            index.dirtCount < VACUUM_CONDITIONS.minDirtCount ||
-            index.dirtFactor < VACUUM_CONDITIONS.minDirtFactor) {
-            return;
-        }
-        changes += 1;
-        vacuuming = index
-            .vacuum()
-            .then(() => inUnits(arrivals(), (id) => {
-            const entry = arrived.get(id);
-            if (entry === undefined)
-                return ROW_WEIGHT;
-            arrived.delete(id);
-            index.add(entry);
-            return Object.values(entry).reduce((total, value) => total + value.length, ROW_WEIGHT);
-        }))
-            .finally(() => {
-            vacuuming = null;
-            vacuum();
-        });
-    }
-    function* arrivals() {
-        for (;;) {
-            const next = arrived.keys().next();
-            if (next.done === true)
-                return;
-            yield next.value;
-        }
-    }
-    async function vacuumed() {
-        while (vacuuming !== null)
-            await vacuuming;
-    }
-    async function paused() {
-        await yielded();
-        await vacuumed();
-    }
-    let catching = null;
-    async function refill(room) {
-        for (const [id, entry] of documents)
-            if (entry.room === room)
-                discard(id, documents);
-        for await (const batch of source.room(room)) {
-            if (!rooms.has(room) && !filling.has(room))
-                return;
-            for (const document of batch)
-                addDocument(document);
-            await paused();
-        }
-    }
-    async function catchUp() {
-        for (const room of refilling) {
-            refilling.delete(room);
-            await refill(room);
-        }
-        while (changedDocuments.size > 0) {
-            await paused();
-            const batch = new Map();
-            for (const [id, { room, path }] of changedDocuments) {
-                changedDocuments.delete(id);
-                const held = batch.get(room) ?? new Map();
-                held.set(path, id);
-                batch.set(room, held);
-                if (held.size >= CHANGED_BATCH)
-                    break;
-            }
-            for (const [room, held] of batch) {
-                for (const id of held.values())
-                    discard(id, documents);
-                for (const document of await source.documents(room, [...held.keys()])) {
-                    if (rooms.has(room) || filling.has(room))
-                        addDocument(document);
-                }
-            }
-        }
-        await vacuumed();
-    }
-    function caughtUp() {
-        if (catching !== null)
-            return catching;
-        if (changedDocuments.size === 0 && refilling.size === 0 && vacuuming === null) {
-            return Promise.resolve();
-        }
-        catching = catchUp().finally(() => {
-            catching = null;
-        });
-        return catching;
-    }
-    function ranked(text, entries, keep, tie) {
-        const found = index.search(text, {
-            filter: ({ id }) => {
-                const entry = entries.get(id);
-                return entry !== undefined && keep(entry, id);
-            },
-        });
-        found.sort((left, right) => right.score - left.score ||
-            pair(tie(entries.get(left.id)), tie(entries.get(right.id))));
-        return found.map(({ id, score, match }) => ({
-            ...entries.get(id),
-            score,
-            match,
-        }));
-    }
-    return {
-        generation: () => generation,
-        rooms: () => rooms,
-        conversations: () => conversations,
-        async indexRoom(room) {
-            if (rooms.has(room) || filling.has(room))
-                return;
-            filling.add(room);
-            try {
-                for await (const batch of source.room(room)) {
-                    if (!filling.has(room))
-                        return;
-                    for (const document of batch)
-                        addDocument(document);
-                    await paused();
-                }
-                if (filling.has(room))
-                    rooms.add(room);
-            }
-            finally {
-                filling.delete(room);
-            }
-        },
-        indexMessages(conversation, arriving, whole) {
-            for (const message of arriving)
-                addMessage(message);
-            if (!whole) {
-                acquiring.add(conversation);
-                return;
-            }
-            acquiring.delete(conversation);
-            conversations.add(conversation);
-        },
-        forget(leaving) {
-            const gone = new Set(leaving);
-            for (const [id, entry] of documents)
-                if (gone.has(entry.room))
-                    discard(id, documents);
-            for (const room of leaving) {
-                rooms.delete(room);
-                filling.delete(room);
-                refilling.delete(room);
-            }
-        },
-        changed(set) {
-            changes += 1;
-            for (const { locator, path } of set.documents) {
-                if (!rooms.has(locator) && !filling.has(locator))
-                    continue;
-                if (path === null) {
-                    for (const [id, entry] of changedDocuments) {
-                        if (entry.room === locator)
-                            changedDocuments.delete(id);
-                    }
-                    refilling.add(locator);
-                    continue;
-                }
-                changedDocuments.set(documentId(locator, path), { room: locator, path });
-            }
-            for (const { conversation, identity, text } of set.messages) {
-                if (!conversations.has(conversation) && !acquiring.has(conversation))
-                    continue;
-                const id = messageId(conversation, identity);
-                if (text === null)
-                    discard(id, messages);
-                else
-                    addMessage({ conversation, identity, text });
-            }
-        },
-        changes: () => changes,
-        caughtUp,
-        search({ text, limit, after, total }, selected, named, within, selections) {
-            const chosen = selected === null
-                ? null
-                : new Set(selected.map(({ room, path }) => documentId(room, path)));
-            const asked = new Set(named);
-            const documentTie = ({ room, path }) => [room, path];
-            const messageTie = ({ conversation, identity }) => [conversation, identity];
-            const foundDocuments = ranked(text, documents, ({ room, path }, id) => (chosen === null || chosen.has(id)) &&
-                (within === null || within.has(room)) &&
-                !(selections?.get(room) ?? []).some((root) => beneath(root, path)), documentTie);
-            const foundMessages = ranked(text, messages, ({ conversation }) => asked.has(conversation), messageTie);
-            const [documentsAfter, messagesAfter] = after ?? [[], []];
-            const documentWindow = hitWindow(foundDocuments, documentsAfter, limit, documentTie);
-            const messageWindow = hitWindow(foundMessages, messagesAfter, limit, messageTie);
-            const more = documentWindow.cursor !== null || messageWindow.cursor !== null;
-            return {
-                documents: documentWindow.kept.map(({ match, ...hit }) => ({
-                    ...hit,
-                    matches: match,
-                })),
-                messages: messageWindow.kept.map(({ match, ...hit }) => ({
-                    ...hit,
-                    matches: match,
-                })),
-                ...(more ? { next: JSON.stringify([documentWindow.cursor, messageWindow.cursor]) } : {}),
-                ...(total
-                    ? { total: { documents: foundDocuments.length, messages: foundMessages.length } }
-                    : {}),
-            };
-        },
-    };
+    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, 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 = {

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,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,CAShE"}

package/dist/status.js

@@ -3,6 +3,7 @@ export const STARTING = {
     lastCompleted: null,
     providerUnreachable: false,
     attentionRequired: [],
+    unsent: [],
     reset: null,
 };
 export function transferring(status) {
@@ -16,5 +17,6 @@ export function same(one, other) {
         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));
 }