@agentshouse/mdruntime 0.1.0-ccbb89b0ca151 → 0.1.0-ccc0e3407f107

package/dist/rows.js

@@ -1,4 +1,4 @@
-import { ARRAY_INDEX, bodyAfterFrontmatter, bodyLinks, escapePointer, parseFrontmatter, references, sectionReferences, target, } from '@agentshouse/mdmodel';
+import { byCodePoint, documentFacts, indexed, parse } from '@agentshouse/mdmodel';
 import { governing } from './collection.js';
 import { definitionOf } from './model.js';
 function keyOf(...parts) {
@@ -19,196 +19,60 @@ export function markdownPath(path) {
 export function folderOf(path) {
     return path.slice(0, Math.max(path.lastIndexOf('/'), 0));
 }
-export function placedOf(pointer, reach) {
-    const [first = '', ...rest] = pointer.split('/').slice(1);
-    const keys = [first];
-    const gaps = [[]];
-    for (const segment of rest) {
-        if (ARRAY_INDEX.test(segment)) {
-            gaps.at(-1).push(segment);
-            continue;
-        }
-        keys.push(segment);
-        gaps.push([]);
-    }
-    const places = gaps
-        .map((gap, at) => {
-        const open = at < gaps.length - 1 ? reach !== 'exact' : reach === 'link';
-        return `/${gap.map((number) => `[.:]${number}`).join('')}.${open ? '*' : ''}`;
-    })
-        .join('');
-    return {
-        keys: keys.map((key) => `/${key}`).join(''),
-        places,
-        glob: /[[*]/u.test(places),
-    };
-}
-function placesOf({ done, head, tail }) {
-    return `${done}/${head}${tail}.`;
-}
-function throughOf(keys, places) {
-    const gaps = places.split('/').slice(1);
-    return keys
-        .split('/')
-        .slice(1)
-        .map((key, at) => `/${key}${gaps[at].replace(/\.\d*/gu, '').replaceAll(':', '/')}`)
-        .join('');
-}
-function plainObject(value) {
-    return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-function compared(reading, exact, value) {
-    if (!reading.references.has(exact))
-        return value;
-    return (typeof value === 'string' ? target(reading.path, value) : null) ?? undefined;
-}
-export function kindOf(value) {
-    if (value === undefined)
-        return 'undefined';
-    if (value === null)
-        return 'null';
-    if (Array.isArray(value))
-        return 'array';
-    if (typeof value === 'object')
-        return 'object';
-    return typeof value;
-}
-function scalarOf(value) {
-    if (typeof value === 'string' || typeof value === 'number')
+function byKey(_key, value) {
+    if (typeof value !== 'object' || value === null || Array.isArray(value))
         return value;
-    if (typeof value === 'boolean')
-        return value ? 1 : 0;
-    if (Array.isArray(value))
-        return JSON.stringify(value);
-    return null;
+    return Object.fromEntries(Object.entries(value).sort(([one], [other]) => byCodePoint(one, other)));
 }
-function held(reading, keys, places, value) {
-    reading.values.push({
-        keys,
-        places,
-        item: -1,
-        kind: kindOf(value),
-        value: scalarOf(value),
-        size: Array.isArray(value) ? value.length : null,
-    });
-    if (!Array.isArray(value))
-        return;
-    value.forEach((item, index) => {
-        const itemKind = kindOf(item);
-        reading.values.push({
-            keys,
-            places,
-            item: index,
-            kind: itemKind,
-            value: itemKind === 'array' ? null : scalarOf(item),
-            size: null,
-        });
-    });
+function fieldsText(fields) {
+    return JSON.stringify(fields, byKey);
 }
-function record(reading, node, at) {
-    const value = Array.isArray(node)
-        ? node.map((item, index) => compared(reading, `${at.exact}/${index}`, item))
-        : compared(reading, at.exact, node);
-    const places = placesOf(at);
-    held(reading, at.keys, places, value);
-    if (typeof value !== 'string' || !reading.references.has(at.exact))
-        return;
-    reading.links.push({
-        kind: 'field',
-        keys: at.keys,
-        places,
-        target: value,
-        field: throughOf(at.keys, places),
+export function writtenFacts(path, content, composition) {
+    const model = governing(composition, path);
+    const facts = documentFacts(path, parse(content, path), {
+        types: model.status === 'unavailable' ? {} : model.types,
     });
+    return facts === null
+        ? null
+        : { ...facts, fields: JSON.parse(fieldsText(facts.fields)) };
 }
-function walk(reading, node, at) {
-    record(reading, node, at);
-    if (Array.isArray(node)) {
-        node.forEach((item, index) => walk(reading, item, { ...at, tail: `${at.tail}.${index}`, exact: `${at.exact}/${index}` }));
-        return;
-    }
-    if (!plainObject(node))
-        return;
-    for (const [key, value] of Object.entries(node)) {
-        const segment = escapePointer(key);
-        const exact = `${at.exact}/${segment}`;
-        walk(reading, value, ARRAY_INDEX.test(segment)
-            ? { ...at, head: `${at.head}${at.tail.replaceAll('.', ':')}:${segment}`, tail: '', exact }
-            : { keys: `${at.keys}/${segment}`, done: placesOf(at), head: '', tail: '', exact });
-    }
-}
-function bodyTargets(path, content) {
-    const seen = new Set();
-    const found = [];
-    for (const { target: reached } of bodyLinks(bodyAfterFrontmatter(content), path)) {
-        if (seen.has(reached))
-            continue;
-        seen.add(reached);
-        found.push({ kind: 'body', keys: '', places: '', target: reached, field: '' });
-    }
-    return found;
-}
-function typedRows(path, content, document, composition) {
-    const definition = definitionOf(governing(composition, path), document.type);
-    const reading = {
-        path,
-        references: new Set(definition === undefined ? [] : references(document, definition).map((one) => one.pointer)),
-        values: [],
-        links: [],
-    };
-    for (const [name, value] of Object.entries(document.fields)) {
-        const segment = escapePointer(name);
-        walk(reading, value, {
-            keys: `/${segment}`,
-            done: '',
-            head: '',
-            tail: '',
-            exact: `/${segment}`,
-        });
-    }
-    const links = reading.links;
-    if (definition !== undefined) {
-        const sectioned = new Set();
-        for (const { target: reached } of sectionReferences(path, content, definition)) {
-            if (reached === null || sectioned.has(reached))
-                continue;
-            sectioned.add(reached);
-            links.push({ kind: 'section', keys: '', places: '', target: reached, field: '' });
-        }
-    }
-    return { values: reading.values, links: [...links, ...bodyTargets(path, content)] };
-}
-function read(path, content) {
+export function described(path, content, facts) {
     const folder = folderOf(path);
-    const unread = { fields: null, folder, type: null };
-    if (content === null) {
-        return { described: { ...unread, declared: null, queried: true }, document: null };
-    }
-    const parsed = parseFrontmatter(content, path);
-    const declared = parsed.ok ? (parsed.frontmatter.type ?? 'any') : null;
-    if (!markdownPath(path) || !parsed.ok) {
-        return { described: { ...unread, declared, queried: !markdownPath(path) }, document: null };
-    }
-    const document = parsed.frontmatter;
+    const unread = { type: null, fields: null, links: null, folder };
+    if (content === null)
+        return { ...unread, declared: null, queried: true };
+    if (facts === null)
+        return { ...unread, declared: null, queried: !markdownPath(path) };
+    const links = JSON.stringify(facts.links);
+    if (!markdownPath(path))
+        return { ...unread, declared: facts.type, queried: true, links };
     return {
-        described: {
-            type: document.type ?? 'any',
-            declared,
-            queried: true,
-            folder,
-            fields: JSON.stringify(document.fields),
-        },
-        document,
+        type: facts.type,
+        declared: facts.type,
+        queried: true,
+        folder,
+        fields: fieldsText(facts.fields),
+        links,
     };
 }
-export function described(path, content) {
-    return read(path, content).described;
-}
-export function derived(path, content, composition) {
-    const { described: columns, document } = read(path, content);
-    if (document !== null) {
-        return { ...columns, ...typedRows(path, content, document, composition) };
-    }
-    const links = content === null || markdownPath(path) ? [] : bodyTargets(path, content);
-    return { ...columns, values: [], links };
+export function heldOf(path, content, facts) {
+    if (content === null || facts === null)
+        return { type: null, fields: null, links: [] };
+    return markdownPath(path)
+        ? { type: facts.type, fields: facts.fields, links: facts.links }
+        : { type: null, fields: null, links: facts.links };
+}
+export function derived(path, held, composition) {
+    const stored = held.links.map((target) => ({
+        kind: 'link',
+        keys: '',
+        places: '',
+        target,
+        field: '',
+    }));
+    if (held.type === null || held.fields === null)
+        return { values: [], links: stored };
+    const definition = definitionOf(governing(composition, path), held.type);
+    const { values, links: fields } = indexed(path, held.fields, definition);
+    return { values, links: [...fields, ...stored] };
 }

package/dist/save.d.ts

@@ -21,6 +21,7 @@ export type SaveInput = {
     providerOwnedPaths: readonly string[];
     providerLimits: readonly ProviderLimit[];
     visible: VisibleLayer;
+    folders: ReadonlySet<string>;
     handle: string;
     changes: readonly Change[];
     bases: readonly Precondition[];
@@ -75,6 +76,7 @@ export type MoveSide = {
     operations: OperationScopes;
     providerOwnedPaths: readonly string[];
     visible: VisibleLayer;
+    folders: ReadonlySet<string>;
     queued: ReadonlySet<string>;
     unmodeled: boolean;
     validate: Validator;

package/dist/save.d.ts.map

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

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));
@@ -1095,7 +1103,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 +1111,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 = {

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