@agentshouse/mdruntime 0.1.0-ca7c26c6bc27e → 0.1.0-ca92b54804c33

package/dist/overlay.js

@@ -1,4 +1,21 @@
-import { apply, parse, serialize } from '@agentshouse/mdmodel';
+import { apply, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
+import { drafted, entriesIn, settling } from './shared.js';
+import { ROW_WEIGHT } from './turn.js';
+export function* acceptedBinaries(files) {
+    for (const [path, file] of entriesIn(files))
+        yield [path, { state: 'accepted', ...file }];
+}
+export function sameBinary(left, right) {
+    if (left === undefined || right === undefined)
+        return left === right;
+    return (left.state === right.state &&
+        left.byteLength === right.byteLength &&
+        left.mediaType === right.mediaType &&
+        left.sha256 === right.sha256 &&
+        (left.state === 'accepted'
+            ? right.state === 'accepted'
+            : right.state === 'pending' && left.localId === right.localId));
+}
 export function sameChange(left, right) {
     if (left === undefined || right === undefined)
         return left === right;
@@ -8,10 +25,13 @@ export function sameChange(left, right) {
         left.author?.name === right.author?.name);
 }
 const EMPTY_FRONTMATTER = '---\n---\n';
+function isPart(change) {
+    return change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble';
+}
 function at(path, name) {
     return `${path} ${name}`;
 }
-function priorsOf(preconditions) {
+function* priorsOf(preconditions) {
     const fields = new Map();
     const sections = new Map();
     const preambles = new Map();
@@ -25,6 +45,7 @@ function priorsOf(preconditions) {
         if (precondition.kind === 'preamble') {
             preambles.set(precondition.path, precondition.value);
         }
+        yield ROW_WEIGHT;
     }
     return {
         field: (path, name) => fields.get(at(path, name)),
@@ -40,49 +61,50 @@ function compose(fields, sections) {
     const opened = parse(skeleton);
     if (!opened.ok)
         return skeleton;
-    let document = opened.document;
-    for (const [name, value] of Object.entries(fields)) {
-        const next = apply(document, { kind: 'field', name, value, prior: undefined });
-        if (next.outcome === 'applied')
-            document = next.document;
-    }
-    return serialize(document);
+    const next = apply(opened.document, Object.entries(fields).flatMap(([name, value]) => frontmatterValue(value) ? [{ kind: 'field', name, value, prior: undefined }] : []));
+    return serialize(next.outcome === 'applied' ? next.document : opened.document);
 }
-function edited(document, change, priors) {
-    if (change.kind === 'field') {
-        return apply(document, {
+function edited(change, priors) {
+    if (change.kind === 'field')
+        return {
             kind: 'field',
             name: change.name,
             value: change.value,
             prior: priors.field(change.path, change.name),
-        });
-    }
-    if (change.kind === 'preamble') {
-        return apply(document, {
-            kind: 'preamble',
-            value: change.value,
-            prior: priors.preamble(change.path),
-        });
-    }
-    if (change.kind !== 'section')
-        return null;
-    return apply(document, {
+        };
+    if (change.kind === 'preamble')
+        return { kind: 'preamble', value: change.value, prior: priors.preamble(change.path) };
+    return {
         kind: 'section',
         name: change.name,
         value: change.value,
         prior: priors.section(change.path, change.name),
-    });
+    };
 }
-function edit(staged, change, priors) {
-    const text = staged.documents[change.path];
+function edit(staged, changes, priors) {
+    const path = changes[0].path;
+    delete staged.revisions[path];
+    const text = staged.documents[path];
     if (text === undefined)
-        return;
-    const parsed = parse(text, change.path);
+        return changes.length;
+    const parsed = parse(text, path);
     if (!parsed.ok)
-        return;
-    const next = edited(parsed.document, change, priors);
-    if (next?.outcome === 'applied')
-        staged.documents[change.path] = serialize(next.document);
+        return changes.length;
+    const wanted = changes.map((change) => edited(change, priors));
+    const first = apply(parsed.document, wanted);
+    if (first.outcome === 'refuse')
+        return changes.length;
+    if (first.outcome === 'applied') {
+        staged.documents[path] = serialize(first.document);
+        return 0;
+    }
+    const stale = new Set(first.stale);
+    const kept = wanted.filter((_, at) => !stale.has(at));
+    const rest = apply(parsed.document, kept);
+    if (rest.outcome !== 'applied')
+        return changes.length;
+    staged.documents[path] = serialize(rest.document);
+    return first.stale.length;
 }
 function relocate(staged, from, to) {
     const text = staged.documents[from];
@@ -90,194 +112,139 @@ function relocate(staged, from, to) {
         delete staged.documents[from];
         staged.documents[to] = text;
     }
-    else if (staged.binaryTargets.delete(from)) {
-        staged.binaryTargets.add(to);
+    else if (staged.binaries[from] !== undefined) {
+        staged.binaries[to] = staged.binaries[from];
+        delete staged.binaries[from];
     }
     else {
-        return;
+        return false;
     }
     moveHead(staged, from, to);
+    return true;
 }
 function moveHead(heads, from, to) {
     const revision = heads.revisions[from];
+    const fileId = heads.fileIds[from];
+    const created = heads.created[from];
     const change = heads.changes[from];
     delete heads.revisions[from];
+    delete heads.fileIds[from];
+    delete heads.created[from];
     delete heads.changes[from];
+    delete heads.fileIds[to];
+    delete heads.created[to];
     delete heads.changes[to];
     if (revision !== undefined)
         heads.revisions[to] = revision;
+    if (fileId !== undefined)
+        heads.fileIds[to] = fileId;
+    if (created !== undefined)
+        heads.created[to] = created;
     if (change !== undefined)
         heads.changes[to] = change;
 }
 function erase(staged, path) {
     delete staged.documents[path];
     delete staged.revisions[path];
+    delete staged.fileIds[path];
+    delete staged.created[path];
     delete staged.changes[path];
-    staged.binaryTargets.delete(path);
+    delete staged.binaries[path];
 }
-function stage(staged, change, priors) {
-    if (change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble') {
-        edit(staged, change, priors);
-        return;
-    }
+function stage(staged, change) {
     if (change.kind === 'create') {
         staged.documents[change.path] =
             'content' in change ? change.content : compose(change.fields, change.sections);
+        delete staged.fileIds[change.path];
+        delete staged.created[change.path];
         delete staged.changes[change.path];
-        return;
+        return true;
     }
     if (change.kind === 'replace') {
+        delete staged.revisions[change.path];
         if (staged.documents[change.path] === undefined)
-            return;
+            return false;
         staged.documents[change.path] = change.content;
-        return;
+        return true;
+    }
+    if (change.kind === 'binary') {
+        if (staged.documents[change.path] !== undefined)
+            return false;
+        staged.binaries[change.path] = {
+            state: 'pending',
+            localId: change.localId,
+            byteLength: change.byteLength,
+            mediaType: change.mediaType,
+            sha256: change.sha256,
+        };
+        delete staged.revisions[change.path];
+        delete staged.changes[change.path];
+        return true;
     }
     if (change.kind === 'move') {
-        relocate(staged, change.path, change.to);
-        return;
+        return relocate(staged, change.path, change.to);
+    }
+    if (change.kind === 'arrival') {
+        erase(staged, change.path);
+        if ('content' in change)
+            staged.documents[change.path] = change.content;
+        else
+            staged.binaries[change.path] = { state: 'accepted', ...change.binary };
+        arrive(staged, change);
+        return true;
     }
     erase(staged, change.path);
+    return true;
+}
+function arrive(heads, change) {
+    if (change.revision !== undefined)
+        heads.revisions[change.path] = change.revision;
+    if (change.fileId !== undefined)
+        heads.fileIds[change.path] = change.fileId;
+    if (change.created !== undefined)
+        heads.created[change.path] = change.created;
+    if (change.change !== undefined)
+        heads.changes[change.path] = change.change;
 }
-export function overlay(base, queue) {
+export function* overlaying(base, queue, unapplied) {
     const staged = {
-        documents: { ...base.documents },
-        binaryTargets: new Set(base.binaryTargets),
-        revisions: { ...base.revisions },
-        changes: { ...base.changes },
-    };
-    for (const batch of queue) {
-        const priors = priorsOf(batch.preconditions);
-        for (const change of batch.changes)
-            stage(staged, change, priors);
-    }
-    return {
-        documents: staged.documents,
-        binaryTargets: [...staged.binaryTargets].sort(),
-        revisions: staged.revisions,
-        changes: staged.changes,
+        documents: drafted(base.documents),
+        binaries: drafted(base.binaries),
+        revisions: drafted(base.revisions),
+        fileIds: drafted(base.fileIds),
+        created: drafted(base.created),
+        changes: drafted(base.changes),
     };
-}
-function pathsOf(batch) {
-    return batch.changes.flatMap((change) => change.kind === 'move' ? [change.path, change.to] : [change.path]);
-}
-export function sameLayerText(left, right) {
-    const paths = Object.keys(left.documents);
-    return (paths.length === Object.keys(right.documents).length &&
-        paths.every((path) => left.documents[path] === right.documents[path]) &&
-        left.binaryTargets.length === right.binaryTargets.length &&
-        left.binaryTargets.every((path) => right.binaryTargets.includes(path)));
-}
-function replayHeads(base, queue) {
-    const heads = { revisions: { ...base.revisions }, changes: { ...base.changes } };
     for (const batch of queue) {
-        for (const change of batch.changes) {
-            if (change.kind === 'remove') {
-                delete heads.revisions[change.path];
-                delete heads.changes[change.path];
-            }
-            else if (change.kind === 'create') {
-                delete heads.changes[change.path];
-            }
-            else if (change.kind === 'move') {
-                moveHead(heads, change.path, change.to);
-            }
-        }
-    }
-    return heads;
-}
-export function overlayChanged(base, queue, previousBase, previousQueue, previousVisible) {
-    const before = previousQueue.map((batch) => JSON.stringify(batch));
-    const after = queue.map((batch) => JSON.stringify(batch));
-    if (before.length === after.length &&
-        before.every((id, index) => id === after[index]) &&
-        sameLayerText(base, previousBase)) {
-        return {
-            documents: previousVisible.documents,
-            binaryTargets: previousVisible.binaryTargets,
-            ...replayHeads(base, queue),
-        };
-    }
-    const affected = new Set();
-    const paths = new Set([
-        ...Object.keys(base.documents),
-        ...Object.keys(previousBase.documents),
-        ...Object.keys(base.revisions),
-        ...Object.keys(previousBase.revisions),
-        ...Object.keys(base.changes),
-        ...Object.keys(previousBase.changes),
-        ...base.binaryTargets,
-        ...previousBase.binaryTargets,
-    ]);
-    for (const path of paths) {
-        if (base.documents[path] !== previousBase.documents[path] ||
-            base.revisions[path] !== previousBase.revisions[path] ||
-            !sameChange(base.changes[path], previousBase.changes[path]) ||
-            base.binaryTargets.includes(path) !== previousBase.binaryTargets.includes(path))
-            affected.add(path);
-    }
-    const oldIds = new Set(before);
-    const newIds = new Set(after);
-    for (const batch of previousQueue) {
-        if (!newIds.has(JSON.stringify(batch)))
-            for (const path of pathsOf(batch))
-                affected.add(path);
-    }
-    for (const batch of queue) {
-        if (!oldIds.has(JSON.stringify(batch)))
-            for (const path of pathsOf(batch))
-                affected.add(path);
-    }
-    let expanded = true;
-    while (expanded) {
-        expanded = false;
-        for (const batch of queue) {
-            const touched = pathsOf(batch);
-            if (!touched.some((path) => affected.has(path)))
+        const priors = yield* priorsOf(batch.preconditions);
+        for (let index = 0; index < batch.changes.length; index += 1) {
+            const change = batch.changes[index];
+            if (!isPart(change)) {
+                if (!stage(staged, change))
+                    unapplied?.();
+                yield ROW_WEIGHT;
                 continue;
-            for (const path of touched) {
-                if (affected.has(path))
-                    continue;
-                affected.add(path);
-                expanded = true;
             }
+            const run = [change];
+            while (index + 1 < batch.changes.length) {
+                const next = batch.changes[index + 1];
+                if (!isPart(next) || next.path !== change.path)
+                    break;
+                run.push(next);
+                index += 1;
+            }
+            const text = staged.documents[change.path] ?? '';
+            for (let left = edit(staged, run, priors); left > 0; left -= 1)
+                unapplied?.();
+            yield ROW_WEIGHT + text.length;
         }
     }
-    const documents = {};
-    const revisions = {};
-    const changes = {};
-    for (const path of affected) {
-        if (base.documents[path] !== undefined)
-            documents[path] = base.documents[path];
-        if (base.revisions[path] !== undefined)
-            revisions[path] = base.revisions[path];
-        if (base.changes[path] !== undefined)
-            changes[path] = base.changes[path];
-    }
-    const staged = overlay({
-        documents,
-        revisions,
-        changes,
-        binaryTargets: base.binaryTargets.filter((path) => affected.has(path)),
-    }, queue.filter((batch) => pathsOf(batch).some((path) => affected.has(path))));
-    const mergedDocuments = { ...previousVisible.documents };
-    const mergedRevisions = { ...previousVisible.revisions };
-    const mergedChanges = { ...previousVisible.changes };
-    const mergedTargets = new Set(previousVisible.binaryTargets);
-    for (const path of affected) {
-        delete mergedDocuments[path];
-        delete mergedRevisions[path];
-        delete mergedChanges[path];
-        mergedTargets.delete(path);
-    }
-    Object.assign(mergedDocuments, staged.documents);
-    Object.assign(mergedRevisions, staged.revisions);
-    Object.assign(mergedChanges, staged.changes);
-    for (const path of staged.binaryTargets)
-        mergedTargets.add(path);
     return {
-        documents: mergedDocuments,
-        revisions: mergedRevisions,
-        changes: mergedChanges,
-        binaryTargets: [...mergedTargets].sort(),
+        documents: yield* settling(staged.documents),
+        binaries: yield* settling(staged.binaries),
+        revisions: yield* settling(staged.revisions),
+        fileIds: yield* settling(staged.fileIds),
+        created: yield* settling(staged.created),
+        changes: yield* settling(staged.changes),
     };
 }

package/dist/paths.d.ts

@@ -1,5 +1,5 @@
 export declare function normalize(path: string): string | null;
-export declare function relative(from: string, target: string): string;
 export declare function beneath(prefix: string, path: string): boolean;
 export declare function covered(prefixes: readonly string[], path: string): boolean;
+export declare function ancestors(path: string): readonly string[];
 //# sourceMappingURL=paths.d.ts.map

package/dist/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAKA,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYrD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAW7D;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,wBAAgB,OAAO,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAK1E"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,wBAAgB,OAAO,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAK1E;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAGzD"}

package/dist/paths.js

@@ -1,7 +1,3 @@
-function dirname(path) {
-    const index = path.lastIndexOf('/');
-    return index === -1 ? '' : path.slice(0, index);
-}
 export function normalize(path) {
     const parts = [];
     for (const part of path.split('/')) {
@@ -17,18 +13,6 @@ export function normalize(path) {
     }
     return parts.join('/');
 }
-export function relative(from, target) {
-    const base = dirname(from)
-        .split('/')
-        .filter((part) => part !== '');
-    const parts = target.split('/');
-    let shared = 0;
-    while (shared < base.length && shared + 1 < parts.length && base[shared] === parts[shared]) {
-        shared += 1;
-    }
-    const up = Array.from({ length: base.length - shared }, () => '..');
-    return [...up, ...parts.slice(shared)].join('/');
-}
 export function beneath(prefix, path) {
     return path === prefix || path.startsWith(`${prefix}/`);
 }
@@ -38,3 +22,7 @@ export function covered(prefixes, path) {
         return normalized !== null && (normalized === '' || beneath(normalized, path));
     });
 }
+export function ancestors(path) {
+    const parts = path.split('/');
+    return parts.slice(1).map((_, at) => parts.slice(0, at + 1).join('/'));
+}