@agentshouse/mdruntime 0.1.0-alpha.45 → 0.1.0-alpha.46

package/dist/connection.js

@@ -12,7 +12,7 @@ import { MD_MODEL, parseCollection, validRoot } from './collection.js';
 import { createLog } from './log.js';
 import { refreshRoom } from './refresh.js';
 import { buildBatch } from './save.js';
-import { applyReturned, compositionOf, landed, readConfirmed, replicaOf, withdrawals } from './replica.js';
+import { applyReturned, compositionOf, landed, readConfirmed, readReclassified, replicaOf, sameMembership, withdrawals } from './replica.js';
 import { changedParts, changesOf, held, readParts, returnedInto, underneath } from './room-draft.js';
 import { settled, same, saving, STARTING, transferring } from './status.js';
 import { detectStorageLoss, nextGeneration } from './durability.js';
@@ -41,7 +41,14 @@ function declaredSelection(room) {
     if (selection === undefined) return true;
     if (!Array.isArray(selection.roots) || selection.roots.length === 0) return false;
     if (!declaredIdentity(selection.attachedModel)) return false;
-    return selection.roots.every((root, index)=>validRoot(root) && root !== '' && !within(room.collectionRoot, root) && selection.roots.every((other, at)=>at === index || !within(other, root)));
+    return selection.roots.every((root, index)=>validRoot(root) && root !== '' && selection.roots.every((other, at)=>at === index || !within(other, root)));
+}
+function declaredUntypedFolders(room) {
+    const roots = room.untypedFolders;
+    if (roots === undefined) return true;
+    if (!Array.isArray(roots) || roots.length === 0) return false;
+    const selected = room.typedSelection?.roots ?? [];
+    return roots.every((root, index)=>validRoot(root) && root !== '' && roots.every((other, at)=>at === index || !within(other, root)) && selected.every((other)=>!within(other, root) && !within(root, other)));
 }
 export function createMdRuntime(options) {
     return composeRuntime(options).md;
@@ -94,7 +101,6 @@ export function composeRuntime(options) {
             selectionModel: savedModel(record.locator, 'typed-selection')
         });
     }
-    const mismatchedRoots = new Set();
     let refusal = null;
     let storageLoss = null;
     let status = STARTING;
@@ -428,7 +434,6 @@ export function composeRuntime(options) {
         const selection = room.typedSelection ?? null;
         rooms.set(room.locator, {
             name: room.name,
-            collectionRoot: room.collectionRoot,
             locator: room.locator,
             operations: room.operations,
             replica: room.replica,
@@ -439,6 +444,7 @@ export function composeRuntime(options) {
                 attachedModel: selection.attachedModel,
                 model: modelTypes(modelOf(room.locator, 'typed-selection'))
             },
+            untypedFolders: room.untypedFolders ?? [],
             providerOwnedPaths: room.providerOwnedPaths,
             roomVersion: replicas.get(room.locator)?.confirmed.record.roomVersion ?? null,
             synchronizationAvailable,
@@ -578,7 +584,6 @@ export function composeRuntime(options) {
                 selectionModel
             };
             const read = readConfirmed(retyped, prior?.confirmed);
-            if (read.kind === 'unconfirmed') continue;
             const confirmed = read.kind === 'staged' ? read.confirmed : {
                 record: retyped,
                 collection: parseCollection(retyped.documents, compositionOf(retyped))
@@ -598,7 +603,8 @@ export function composeRuntime(options) {
                         roots: record.typedSelection.roots,
                         attachedModel: record.typedSelection.attachedModel,
                         model: modelTypes(selectionModel)
-                    }
+                    },
+                    untypedFolders: record.untypedFolders
                 });
             }
             if (read.kind === 'refused') {
@@ -784,10 +790,6 @@ export function composeRuntime(options) {
         if (replica === undefined || room === undefined) {
             throw new Error(`No Local Replica for ${locator}`);
         }
-        if (mismatchedRoots.has(locator)) return {
-            outcome: 'refused',
-            rule: 'collection-root-mismatch'
-        };
         const saved = [];
         for (const { path, revision } of named){
             const record = roomDrafts.get(locator)?.get(path);
@@ -1033,10 +1035,10 @@ export function composeRuntime(options) {
         }
         return target === undefined || reachedBy(locator, target) ? undefined : target;
     }
-    async function pullRefresh(authorized, confirmed, reach) {
+    async function pullRefresh(authorized, confirmed, minPosition) {
         if (!continuing()) return unconfirmed;
         try {
-            const result = await refreshRoom(options.adapter, authorized, confirmed, continuing, reach);
+            const result = await refreshRoom(options.adapter, authorized, confirmed, continuing, minPosition);
             const detail = result.kind === 'advanced' ? result.confirmed.record.roomVersion : result.kind;
             journal.record(`transfer refresh ${confirmed.record.locator} ${detail}`);
             return result;
@@ -1458,7 +1460,7 @@ export function composeRuntime(options) {
         const epoch = modelEpoch.get(key) ?? 0;
         const previous = modelOf(room.locator, attached);
         const heldBefore = replicas.get(room.locator)?.confirmed.record;
-        if (JSON.stringify(previous) === JSON.stringify(next) && (heldBefore === undefined || JSON.stringify(heldBefore.operations) === JSON.stringify(room.operations) && JSON.stringify(heldBefore.replica) === JSON.stringify(room.replica) && JSON.stringify(heldBefore.attachedModel) === JSON.stringify(room.attachedModel) && JSON.stringify(heldBefore.typedSelection) === JSON.stringify(room.typedSelection ?? null))) return;
+        if (JSON.stringify(previous) === JSON.stringify(next) && (heldBefore === undefined || JSON.stringify(heldBefore.operations) === JSON.stringify(room.operations) && JSON.stringify(heldBefore.replica) === JSON.stringify(room.replica) && JSON.stringify(heldBefore.attachedModel) === JSON.stringify(room.attachedModel) && JSON.stringify(heldBefore.typedSelection) === JSON.stringify(room.typedSelection ?? null) && JSON.stringify(heldBefore.untypedFolders) === JSON.stringify(room.untypedFolders ?? []))) return;
         if (next.status === 'unavailable') {
             invalidModels.add(key);
             liveModels.delete(key);
@@ -1468,24 +1470,31 @@ export function composeRuntime(options) {
             if (next.status !== 'unavailable' && epoch !== (modelEpoch.get(key) ?? 0)) return;
             const held = replicas.get(room.locator);
             if (held !== undefined) {
-                const record = {
+                const declared = {
                     ...held.confirmed.record,
                     operations: room.operations,
                     replica: room.replica,
                     attachedModel: room.attachedModel,
                     typedSelection: room.typedSelection ?? null,
+                    untypedFolders: room.untypedFolders ?? [],
                     ...attached === 'collection' ? {
                         model: next
                     } : {
                         selectionModel: next
                     }
                 };
+                const reclassified = sameMembership(declared, held.confirmed.record) ? readConfirmed(declared, held.confirmed) : readReclassified(declared, held.confirmed);
+                const record = reclassified.kind === 'staged' ? declared : {
+                    ...declared,
+                    typedSelection: held.confirmed.record.typedSelection,
+                    untypedFolders: held.confirmed.record.untypedFolders
+                };
+                const read = reclassified.kind === 'deferred' ? readConfirmed(record, held.confirmed) : reclassified;
                 await local.write({
                     next: record,
                     previous: held.confirmed.record,
                     queue: held.queue
                 });
-                const read = readConfirmed(record, held.confirmed);
                 if (read.kind === 'staged') {
                     replicas.set(room.locator, replicaOf(read.confirmed, held.queue, rewriting(), held));
                     if (declarationRefusals.delete(room.locator)) {
@@ -1535,7 +1544,6 @@ export function composeRuntime(options) {
             answer = await options.adapter.model(authorized, selection === null ? {
                 locator: room.locator,
                 attached: 'collection',
-                collectionRoot: room.collectionRoot,
                 model: declared
             } : {
                 locator: room.locator,
@@ -1736,10 +1744,7 @@ export function composeRuntime(options) {
             notifyReady();
             return;
         }
-        mismatchedRoots.clear();
         for (const room of result.rooms){
-            const held = replicas.get(room.locator)?.confirmed.record;
-            const malformed = !validRoot(room.collectionRoot);
             if (room.operations === undefined || ![
                 'read',
                 'sync',
@@ -1760,16 +1765,13 @@ export function composeRuntime(options) {
                 notifyReady();
                 return;
             }
-            if (malformed || held !== undefined && held.collectionRoot !== room.collectionRoot) {
-                mismatchedRoots.add(room.locator);
-                journal.record(`collection root ${malformed ? 'invalid' : 'changed'} ${room.locator}`);
+            if (!declaredUntypedFolders(room)) {
+                journal.record(`invalid untyped folder declaration ${room.locator}`);
+                await refuse('missing-required-guarantee');
+                notifyReady();
+                return;
             }
         }
-        if (mismatchedRoots.size > 0) {
-            await refuse('missing-required-guarantee');
-            notifyReady();
-            return;
-        }
         const declared = new Set(result.capabilities.map((capability)=>capability.name));
         for (const required of options.requiredGuarantees){
             if (!knownCapabilities.has(required) || !declared.has(required)) {