@agentshouse/mdruntime 0.1.0-ce131cb435f8b → 0.1.0-ce41fec66d91b

package/dist/search.d.ts

@@ -1,5 +1,4 @@
 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'>;
@@ -12,29 +11,32 @@ export type SearchRequest = {
     after?: string;
     total?: true;
 };
+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 Open<'text'>[]>>;
+    matches: Readonly<Record<string, readonly MessagePart[]>>;
+    snippet?: Snippet<MessagePart>;
 };
 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[];
@@ -47,7 +49,7 @@ export type SearchWindow = SearchHits & {
     };
 };
 export type SearchPending = SearchHits & {
-    pending: readonly (PendingRoom | PendingConversation)[];
+    pending: readonly PendingRoom[];
     coverage: SearchCoverage;
 };
 export type SearchUndeclared = ProviderRefusal & {
@@ -57,24 +59,7 @@ 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): readonly string[];
-    document(room: string, path: string): SearchedDocument | null;
-};
-type HitCursor = readonly [number, string, string] | readonly [] | null;
+export type HitCursor = readonly [number, string, string] | readonly [] | null;
 export type SearchPlan = {
     text: string;
     documents: unknown;
@@ -84,22 +69,5 @@ export type SearchPlan = {
     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;
-};
 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":"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"}

package/dist/search.js

@@ -1,8 +1,4 @@
-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 } from './turn.js';
 import { decodedCursor } from './windows.js';
 export function undeclaredSearch() {
     return {
@@ -12,22 +8,6 @@ export function undeclaredSearch() {
         retryable: false,
     };
 }
-const FIELDS = ['fields', 'sections', 'preamble', 'path', 'text'];
-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;
@@ -75,196 +55,3 @@ export function searchPlanOf(input) {
         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 });
-    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();
-    let changes = 0;
-    function addDocument(document) {
-        const id = documentId(document.room, document.path);
-        discard(id, documents);
-        index.add({
-            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);
-        index.add({ id, text: message.text });
-        messages.set(id, { conversation: message.conversation, identity: message.identity });
-    }
-    function discard(id, entries) {
-        if (entries.delete(id))
-            index.discard(id);
-    }
-    function* pending() {
-        for (;;) {
-            const next = changedDocuments.entries().next();
-            if (next.done === true)
-                return;
-            changedDocuments.delete(next.value[0]);
-            yield next.value;
-        }
-    }
-    let catching = null;
-    function caughtUp() {
-        if (catching !== null)
-            return catching;
-        const running = inUnits(pending(), ([id, { room, path }]) => {
-            discard(id, documents);
-            const document = source.document(room, path);
-            if (document === null)
-                return ROW_WEIGHT;
-            addDocument(document);
-            return Object.values(document.sections).reduce((total, text) => total + text.length, ROW_WEIGHT + document.preamble.length);
-        });
-        if (!(running instanceof Promise))
-            return Promise.resolve();
-        catching = running.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 {
-                await inUnits(source.room(room), (path) => {
-                    const document = filling.has(room) ? source.document(room, path) : null;
-                    if (document === null)
-                        return ROW_WEIGHT;
-                    addDocument(document);
-                    return Object.values(document.sections).reduce((total, text) => total + text.length, ROW_WEIGHT + document.preamble.length);
-                });
-                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);
-            }
-        },
-        changed(set) {
-            changes += 1;
-            for (const { locator, path } of set.documents) {
-                if (rooms.has(locator) || filling.has(locator)) {
-                    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 } }
-                    : {}),
-            };
-        },
-    };
-}

package/dist/shared.d.ts

@@ -1,14 +1,15 @@
 export type Paths<V> = Readonly<Record<string, V>>;
-type Weigh<V> = (key: string, value: V) => number;
+export declare function entriesIn<V>(map: Paths<V>): Generator<readonly [string, V]>;
+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>;
 export declare function shared<V>(map: Paths<V>): Paths<V>;
 export declare function patched<V>(base: Paths<V>, set: Iterable<readonly [string, V]>, removed?: Iterable<string>): Paths<V>;
 export declare function patching<V>(base: Paths<V>, set: Iterable<readonly [string, V]>, removed?: Iterable<string>): Generator<number, Paths<V>, void>;
-export declare function tally<V>(map: Paths<V>, weigh: Weigh<V>): number;
 export declare function sizeOf<V>(map: Paths<V>): number;
 export declare function differences<V>(left: Paths<V>, right: Paths<V>, same?: (left: V, right: V) => boolean): Generator<number, ReadonlySet<string>, void>;
 export declare function differing<V>(left: Paths<V>, right: Paths<V>, same?: (left: V, right: V) => boolean): ReadonlySet<string>;
 export declare function drafted<V>(base: Paths<V>): Record<string, V>;
 export declare function settled<V>(draft: Record<string, V>): Paths<V>;
-export {};
+export declare function settling<V>(draft: Record<string, V>): Generator<number, Paths<V>, void>;
 //# sourceMappingURL=shared.d.ts.map

package/dist/shared.d.ts.map

@@ -1 +1 @@
-{"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;AAkBnD,KAAK,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,KAAK,MAAM,CAAC;AA8LlD,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,CAgCnC;AAED,wBAAgB,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAY/D;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,CAS7D"}
+{"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

@@ -2,7 +2,6 @@ import { finished, ROW_WEIGHT } from './turn.js';
 const BITS = 5;
 const MASK = (1 << BITS) - 1;
 const roots = new WeakMap();
-const tallies = new WeakMap();
 function hashOf(key) {
     let hash = 0x811c9dc5;
     for (let index = 0; index < key.length; index += 1) {
@@ -180,19 +179,71 @@ function facade(root) {
     roots.set(map, root);
     return map;
 }
+export function* entriesIn(map) {
+    const root = roots.get(map);
+    if (root === undefined) {
+        for (const key of Object.keys(map))
+            yield [key, map[key]];
+        return;
+    }
+    for (const leaf of leavesOf(root.node))
+        yield [leaf.key, leaf.value];
+}
 function* rooted(map) {
     const held = roots.get(map);
     if (held !== undefined)
         return held;
     let node;
     let size = 0;
-    for (const [key, value] of Object.entries(map)) {
+    for (const [key, value] of entriesIn(map)) {
         node = put(node, { key, hash: hashOf(key), value }, 0);
         size += 1;
         yield ROW_WEIGHT;
     }
     return { node, size };
 }
+const RUN = 1 << 10;
+function* merged(left, right) {
+    const into = [];
+    let at = 0;
+    let from = 0;
+    while (at < left.length || from < right.length) {
+        into.push(from === right.length || (at < left.length && left[at] < right[from])
+            ? left[at++]
+            : right[from++]);
+        yield ROW_WEIGHT;
+    }
+    return into;
+}
+function* pathsOf(map) {
+    for (const [key] of entriesIn(map))
+        yield key;
+}
+export function* sortedKeys(map) {
+    return yield* sorting(pathsOf(map));
+}
+export function* sorting(keys) {
+    let runs = [];
+    let run = [];
+    for (const key of keys) {
+        run.push(key);
+        yield ROW_WEIGHT;
+        if (run.length === RUN) {
+            runs.push(run.sort());
+            run = [];
+        }
+    }
+    if (run.length > 0)
+        runs.push(run.sort());
+    while (runs.length > 1) {
+        const next = [];
+        for (let at = 0; at < runs.length; at += 2) {
+            next.push(at + 1 === runs.length ? runs[at] : yield* merged(runs[at], runs[at + 1]));
+        }
+        runs = next;
+    }
+    return runs[0] ?? [];
+}
 export function* sharing(map) {
     return roots.has(map) ? map : facade(yield* rooted(map));
 }
@@ -204,16 +255,8 @@ export function patched(base, set, removed = []) {
 }
 export function* patching(base, set, removed = []) {
     const root = yield* rooted(base);
-    const weighed = [...(tallies.get(base) ?? [])];
     let node = root.node;
     let size = root.size;
-    const shift = (key, before, after) => {
-        for (const entry of weighed) {
-            entry[1] +=
-                (after === undefined ? 0 : entry[0](key, after)) -
-                    (before === undefined ? 0 : entry[0](key, before.value));
-        }
-    };
     for (const key of removed) {
         if (node === undefined)
             break;
@@ -222,7 +265,6 @@ export function* patching(base, set, removed = []) {
             continue;
         node = taken(node, before.hash, key, 0);
         size -= 1;
-        shift(key, before, undefined);
         yield ROW_WEIGHT;
     }
     for (const [key, value] of set) {
@@ -230,30 +272,11 @@ export function* patching(base, set, removed = []) {
         node = put(node, { key, hash: hashOf(key), value }, 0);
         if (before === undefined)
             size += 1;
-        shift(key, before, value);
         yield ROW_WEIGHT;
     }
     if (node === root.node && roots.has(base))
         return base;
-    const map = facade({ node, size });
-    if (weighed.length > 0)
-        tallies.set(map, new Map(weighed));
-    return map;
-}
-export function tally(map, weigh) {
-    const held = tallies.get(map);
-    const known = held?.get(weigh);
-    if (known !== undefined)
-        return known;
-    let total = 0;
-    for (const [key, value] of Object.entries(map))
-        total += weigh(key, value);
-    if (roots.has(map)) {
-        const kept = held ?? new Map();
-        kept.set(weigh, total);
-        tallies.set(map, kept);
-    }
-    return total;
+    return facade({ node, size });
 }
 export function sizeOf(map) {
     return roots.get(map)?.size ?? Object.keys(map).length;
@@ -307,12 +330,12 @@ export function* differences(left, right, same = Object.is) {
         yield* compared(leftRoot.node, rightRoot.node, same, into);
         return into;
     }
-    for (const key of Object.keys(left)) {
-        if (!Object.hasOwn(right, key) || !same(left[key], right[key]))
+    for (const [key, value] of entriesIn(left)) {
+        if (!Object.hasOwn(right, key) || !same(value, right[key]))
             into.add(key);
         yield ROW_WEIGHT;
     }
-    for (const key of Object.keys(right)) {
+    for (const [key] of entriesIn(right)) {
         if (!Object.hasOwn(left, key))
             into.add(key);
         yield ROW_WEIGHT;
@@ -381,6 +404,9 @@ export function drafted(base) {
     return draft;
 }
 export function settled(draft) {
+    return finished(settling(draft));
+}
+export function* settling(draft) {
     const held = drafts.get(draft);
     const set = [];
     const removed = [];
@@ -389,6 +415,7 @@ export function settled(draft) {
             removed.push(key);
         else
             set.push([key, value]);
+        yield ROW_WEIGHT;
     }
-    return patched(held.base, set, removed);
+    return yield* patching(held.base, set, removed);
 }

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));
 }