@agentshouse/mdruntime 0.1.0-ca9afacd5aebd → 0.1.0-cb0eb0d87ff49

package/dist/save.js

@@ -1,7 +1,7 @@
 import { definitionOf } from './model.js';
 import { apply, ATTACHMENT, links, parse, pointerSegments, references, relative, relativize, retarget, serialize, target, } from '@agentshouse/mdmodel';
 import { immutable, queuedFile, departure, } from './change.js';
-import { collectionOf, documentsOf, governing, validateCollection, } from './collection.js';
+import { available, changedCleanly, collectionOf, documentsOf, governing, referring, validateCollection, } from './collection.js';
 import { changeBatchIdentity } from './identity.js';
 import { overlay } from './overlay.js';
 import { covered, normalize } from './paths.js';
@@ -177,7 +177,7 @@ export function providerRewritten(batch, visible) {
         ...anticipated(batch.changes, batch.preconditions, rewritten.changes, visible),
     };
 }
-function incoming(collection, removed) {
+function incoming(collection, removed, candidates) {
     const found = new Map();
     const note = (target, file) => {
         if (!removed.has(target))
@@ -186,7 +186,13 @@ function incoming(collection, removed) {
         referrers.add(file);
         found.set(target, referrers);
     };
-    for (const [path, document] of documentsOf(collection)) {
+    const read = candidates === null
+        ? documentsOf(collection)
+        : [...new Set(candidates)].sort().flatMap((path) => {
+            const document = collection.document(path);
+            return document === undefined ? [] : [[path, document]];
+        });
+    for (const [path, document] of read) {
         const definition = definitionOf(governing(collection.composition, path), document.type);
         for (const { value, to } of definition === undefined ? [] : references(document, definition)) {
             if (to.includes(ATTACHMENT))
@@ -217,10 +223,13 @@ function affected(change) {
     return change.kind === 'move' ? [change.path, change.to] : [change.path];
 }
 function guard(changes, input) {
-    const existing = new Set([
-        ...Object.keys(input.visible.documents),
-        ...Object.keys(input.visible.binaries),
-    ]);
+    const overridden = new Map();
+    const existing = {
+        has: (path) => overridden.get(path) ??
+            (Object.hasOwn(input.visible.documents, path) || Object.hasOwn(input.visible.binaries, path)),
+        add: (path) => void overridden.set(path, true),
+        delete: (path) => void overridden.set(path, false),
+    };
     for (const [index, change] of changes.entries()) {
         for (const path of affected(change)) {
             const normalized = normalize(path);
@@ -364,8 +373,8 @@ function preconditionsOf(changes, visible, bases) {
 function depth(path) {
     return path.split('/').length;
 }
-function exceeded(limits, changes, resulting) {
-    const written = changes.map((change) => (change.kind === 'move' ? change.to : change.path));
+function exceeded(limits, changes, effective, resulting) {
+    const written = effective.map((change) => (change.kind === 'move' ? change.to : change.path));
     const created = changes
         .filter((change) => change.kind === 'create' || change.kind === 'move' || change.kind === 'binary')
         .map((change) => (change.kind === 'move' ? change.to : change.path));
@@ -381,7 +390,7 @@ function exceeded(limits, changes, resulting) {
             return refuse('provider-limit', undefined, limit.name);
         }
         if (limit.name === 'document-size') {
-            const large = written.find((path) => (resulting.documents[path] ?? '').length > value);
+            const large = written.find((path) => new TextEncoder().encode(resulting.documents[path] ?? '').byteLength > value);
             if (large !== undefined)
                 return refuse('provider-limit', large, limit.name);
         }
@@ -450,6 +459,8 @@ function relativeChanges(input) {
     });
 }
 function unmodeledType(collection, composition) {
+    if (available(composition))
+        return false;
     for (const [path, document] of documentsOf(collection)) {
         if (document.type !== undefined &&
             document.type !== 'any' &&
@@ -718,7 +729,8 @@ export function joined(queue, owner, extra) {
     return { kind: 'joined', batch, queue: queue.map((item) => (item === owner ? batch : item)) };
 }
 export function limitedIn(queue, batch, limits, state) {
-    const limited = exceeded(limits, batch.changes, state(queue.slice(0, queue.indexOf(batch) + 1)));
+    const at = queue.indexOf(batch);
+    const limited = exceeded(limits, batch.changes, providerRewritten(batch, state(queue.slice(0, at))).changes, state(queue.slice(0, at + 1)));
     return limited?.kind === 'refused' ? limited.refusal : null;
 }
 export function buildBatch(input) {
@@ -739,9 +751,16 @@ export function buildBatch(input) {
     const resulting = overlay(input.visible, [
         { id: '', baseRoomVersion: input.baseRoomVersion, ...predicted },
     ]);
+    const clean = input.clean !== undefined &&
+        input.clean.text === input.visible.documents &&
+        input.clean.binaries === input.visible.binaries &&
+        available(input.composition)
+        ? input.clean
+        : null;
     const removed = new Set(changes.filter((change) => change.kind === 'remove').map((change) => change.path));
     if (removed.size > 0) {
-        const referenced = incoming(collectionOf(resulting.documents, input.composition), removed);
+        const referrers = clean === null ? null : referring(clean, input.composition, removed);
+        const referenced = incoming(collectionOf(resulting.documents, input.composition), removed, referrers === null ? null : [...referrers, ...predicted.changes.flatMap(affected)]);
         if (referenced !== null)
             return referenced;
     }
@@ -751,15 +770,20 @@ export function buildBatch(input) {
         const parsed = parse(content);
         return parsed.ok && parsed.document.type !== undefined && parsed.document.type !== 'any';
     };
-    const typedPaths = [...new Set(predicted.changes.flatMap(affected))].filter((path) => typed(input.visible.documents[path]) || typed(resulting.documents[path]));
+    const touched = [...new Set(predicted.changes.flatMap(affected))];
+    const typedPaths = touched.filter((path) => typed(input.visible.documents[path]) || typed(resulting.documents[path]));
     const needsModel = typedPaths.length > 0;
     const withoutModel = typedPaths.find((path) => governing(input.composition, path).status === 'unavailable');
     if (withoutModel !== undefined)
         return refuse('model-unavailable', withoutModel);
-    const validationText = needsModel
-        ? resulting.documents
-        : Object.fromEntries(Object.entries(resulting.documents).filter(([path]) => predicted.changes.some((change) => affected(change).includes(path))));
-    const verdict = validateCollection(validationText, Object.keys(resulting.binaries), input.composition);
+    const verdict = clean !== null &&
+        changedCleanly({ text: resulting.documents, binaries: resulting.binaries }, clean, input.composition)
+        ? { verdict: 'accept' }
+        : validateCollection(needsModel
+            ? resulting.documents
+            : Object.fromEntries(touched.flatMap((path) => resulting.documents[path] === undefined
+                ? []
+                : [[path, resulting.documents[path]]])), Object.keys(resulting.binaries), input.composition);
     if (verdict.verdict === 'refuse') {
         return {
             kind: 'refused',
@@ -772,7 +796,7 @@ export function buildBatch(input) {
             },
         };
     }
-    const limited = exceeded(input.providerLimits, changes, resulting);
+    const limited = exceeded(input.providerLimits, changes, predicted.changes, resulting);
     if (limited !== null)
         return limited;
     const validated = typedPaths

package/dist/search.d.ts

@@ -1,5 +1,5 @@
 import type { ChangeSet } from './change-set.js';
-import { type Filter } from './query.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'>;
 export type SearchRequest = {
@@ -21,10 +21,26 @@ export type MessageHit = {
     score: number;
     matches: Readonly<Record<string, readonly Open<'text'>[]>>;
 };
-export type SearchResult = {
+export type SearchCoverage = {
+    rooms: readonly CoveredRoom[];
+    conversations: readonly string[];
+    index: string;
+    overlay: readonly string[];
+};
+export type PendingConversation = {
+    conversation: string;
+    awaits: 'index';
+};
+export type SearchPending = {
+    pending: readonly (PendingRoom | PendingConversation)[];
+};
+export type SearchHits = {
     documents: readonly DocumentHit[];
     messages: readonly MessageHit[];
 };
+export type SearchResult = (SearchHits & {
+    coverage: SearchCoverage;
+}) | SearchPending;
 export type SearchedDocument = {
     room: string;
     path: string;
@@ -39,10 +55,8 @@ export type SearchedMessage = {
     text: string;
 };
 export type SearchSource = {
-    documents(): readonly SearchedDocument[];
+    room(room: string): readonly string[];
     document(room: string, path: string): SearchedDocument | null;
-    messages(): readonly SearchedMessage[];
-    message(conversation: string, identity: string): SearchedMessage | null;
 };
 export type SearchPlan = {
     text: string;
@@ -51,11 +65,19 @@ export type SearchPlan = {
     limit: number | null;
 };
 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): SearchResult;
+    }[] | null, conversations: readonly string[]): SearchHits;
 };
 export declare function searchPlanOf(input: unknown): SearchPlan;
 export declare function createSearchIndex(source: SearchSource): SearchIndex;

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,5 +1,7 @@
 import MiniSearch from 'minisearch';
-import { invalid, known, limitOf, plain } from './query.js';
+import { indexGeneration } from './identity.js';
+import { invalid, known, limitOf, plain, } from './query.js';
+import { inUnits, ROW_WEIGHT } from './turn.js';
 const FIELDS = ['fields', 'sections', 'preamble', 'path', 'text'];
 function documentId(room, path) {
     return JSON.stringify(['document', room, path]);
@@ -35,15 +37,22 @@ export function searchPlanOf(input) {
     };
 }
 export function createSearchIndex(source) {
-    let index = null;
+    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();
-    const changedMessages = new Map();
-    function addDocument(built, document) {
+    let changes = 0;
+    function addDocument(document) {
         const id = documentId(document.room, document.path);
+        if (documents.has(id))
+            index.discard(id);
         documents.set(id, { room: document.room, path: document.path, type: document.type });
-        built.add({
+        index.add({
             id,
             fields: scalars(document.fields).join('\n'),
             sections: Object.entries(document.sections)
@@ -53,42 +62,47 @@ export function createSearchIndex(source) {
             path: document.path,
         });
     }
-    function addMessage(built, message) {
+    function addMessage(message) {
         const id = messageId(message.conversation, message.identity);
+        if (messages.has(id))
+            index.discard(id);
         messages.set(id, { conversation: message.conversation, identity: message.identity });
-        built.add({ id, text: message.text });
+        index.add({ id, text: message.text });
     }
-    function current() {
-        if (index === null) {
-            const built = new MiniSearch({ fields: FIELDS });
-            for (const document of source.documents())
-                addDocument(built, document);
-            for (const message of source.messages())
-                addMessage(built, message);
-            index = built;
-            return built;
+    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;
         }
-        const built = index;
-        for (const [id, { room, path }] of changedDocuments) {
-            if (documents.delete(id))
-                built.discard(id);
+    }
+    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)
-                addDocument(built, document);
-        }
-        changedDocuments.clear();
-        for (const [id, { conversation, identity }] of changedMessages) {
-            if (messages.delete(id))
-                built.discard(id);
-            const message = source.message(conversation, identity);
-            if (message !== null)
-                addMessage(built, message);
-        }
-        changedMessages.clear();
-        return built;
+            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(built, text, entries, keep, limit) {
-        const found = built.search(text, {
+    function ranked(text, entries, keep, limit) {
+        const found = index.search(text, {
             filter: ({ id }) => {
                 const entry = entries.get(id);
                 return entry !== undefined && keep(entry, id);
@@ -101,24 +115,75 @@ export function createSearchIndex(source) {
         }));
     }
     return {
-        changed(set) {
-            if (index === null)
+        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) {
-                changedDocuments.set(documentId(locator, path), { room: locator, path });
+                if (rooms.has(locator) || filling.has(locator)) {
+                    changedDocuments.set(documentId(locator, path), { room: locator, path });
+                }
             }
-            for (const { conversation, identity } of set.messages) {
-                changedMessages.set(messageId(conversation, identity), { conversation, identity });
+            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 });
             }
         },
-        search({ text, conversations, limit }, selected) {
-            const built = current();
+        changes: () => changes,
+        caughtUp,
+        search({ text, limit }, selected, named) {
             const chosen = selected === null
                 ? null
                 : new Set(selected.map(({ room, path }) => documentId(room, path)));
+            const asked = new Set(named);
             return {
-                documents: ranked(built, text, documents, (_entry, id) => chosen === null || chosen.has(id), limit).map(({ match, ...hit }) => ({ ...hit, matches: match })),
-                messages: ranked(built, text, messages, ({ conversation }) => conversations === null || conversations.includes(conversation), limit).map(({ match, ...hit }) => ({ ...hit, matches: match })),
+                documents: ranked(text, documents, (_entry, id) => chosen === null || chosen.has(id), limit).map(({ match, ...hit }) => ({ ...hit, matches: match })),
+                messages: ranked(text, messages, ({ conversation }) => asked.has(conversation), limit).map(({ match, ...hit }) => ({ ...hit, matches: match })),
             };
         },
     };

package/dist/shared.d.ts

@@ -0,0 +1,11 @@
+export type Paths<V> = Readonly<Record<string, V>>;
+type Weigh<V> = (key: string, value: V) => number;
+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 tally<V>(map: Paths<V>, weigh: Weigh<V>): number;
+export declare function sizeOf<V>(map: Paths<V>): number;
+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 {};
+//# sourceMappingURL=shared.d.ts.map

package/dist/shared.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":"AAAA,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;AA6LlD,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,CA8BV;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;AAuCD,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,CAcrB;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"}