@agentshouse/mdruntime 0.1.0-cec6690d5712e → 0.1.0-cedd665dffa4c

package/dist/outcome.js

@@ -1,3 +1,59 @@
+import { MEDIA_TYPES } from '@agentshouse/mdmodel';
+import { refusalError } from './failure.js';
+export const UNREADABLE = {
+    kind: 'unreadable',
+    code: 'room-not-readable',
+    fields: {},
+    retryable: false,
+};
+export const LOCKED_UNREADABLE = {
+    kind: 'unreadable',
+    code: 'room-locked',
+    fields: {},
+    retryable: true,
+};
+export const ABSENT_TARGET = {
+    kind: 'absent',
+    code: 'reference-absent',
+    fields: {},
+    retryable: false,
+};
+export function absentBinary(path) {
+    return { kind: 'absent', code: 'binary-file-absent', fields: { path }, retryable: false };
+}
+export function declaredType(blob) {
+    return blob.type === '' ? MEDIA_TYPES.octetStream : blob.type;
+}
+export function blobOf(binary) {
+    return new Response(binary.stream, { headers: { 'content-type': binary.mediaType } }).blob();
+}
+export function binaryAnswer(result) {
+    return result.kind === 'binary' || result.kind === 'rejected' ? result : failure(result);
+}
+export function binaryLinkAnswer(result, held) {
+    if (result.kind === 'link') {
+        return {
+            kind: 'link',
+            url: result.url,
+            name: result.name,
+            mediaType: result.mediaType ?? held ?? MEDIA_TYPES.octetStream,
+        };
+    }
+    return result.kind === 'rejected' ? result : failure(result);
+}
+export function attachAnswer(result) {
+    if (result.kind === 'attached')
+        return { kind: 'attached', path: result.path };
+    return result.kind === 'rejected' ? result : failure(result);
+}
+export const ROOM_LOCKED = 'room-locked';
+export function lockedRoom(locator) {
+    return { kind: ROOM_LOCKED, locator, code: ROOM_LOCKED, fields: {}, retryable: true };
+}
+export const OFFLINE = { kind: 'offline' };
+export function answeredResult(value) {
+    return typeof value === 'object' && value !== null && !('pending' in value);
+}
 export const UNCERTAIN = {
     kind: 'transport-uncertainty',
     code: 'transport-uncertainty',
@@ -33,3 +89,17 @@ export function historyAnswer(result) {
         ? result
         : failure(result);
 }
+export const UNANSWERED = { kind: 'transport-uncertainty' };
+export function handedOutcome(retries, attempt, result) {
+    if (attempt !== undefined) {
+        const { step, instance } = attempt;
+        if (result.kind === 'action')
+            retries.succeeded(step, instance);
+        else if (result.kind === 'transport-uncertainty')
+            retries.uncertain(step, instance, result);
+        else if (result.kind === 'rejected' && result.retryable) {
+            retries.failed(step, instance, refusalError(result));
+        }
+    }
+    return calledResult(result);
+}

package/dist/overlay.d.ts

@@ -1,15 +1,30 @@
-import type { HeadChange } from './adapter.js';
-import type { ChangeBatch } from './change.js';
+import { type ApplyResult } from '@agentshouse/mdmodel';
+import type { BinaryFile, HeadChange } from './adapter.js';
+import { type Composition } from './collection.js';
+import { type ChangeBatch } from './change.js';
 export type Heads = {
     revisions: Readonly<Record<string, string>>;
+    fileIds: Readonly<Record<string, string>>;
+    created: Readonly<Record<string, string>>;
     changes: Readonly<Record<string, HeadChange>>;
 };
+export type HeldBinary = ({
+    readonly state: 'accepted';
+} & BinaryFile) | {
+    readonly state: 'pending';
+    readonly localId: string;
+    readonly byteLength: number;
+    readonly mediaType: string;
+    readonly sha256: string;
+};
 export type Layer = Heads & {
     documents: Readonly<Record<string, string>>;
-    binaryTargets: readonly string[];
+    binaries: Readonly<Record<string, HeldBinary>>;
 };
+export declare function acceptedBinaries(files: Readonly<Record<string, BinaryFile>>): Generator<readonly [string, HeldBinary]>;
+export declare function sameBinary(left: HeldBinary | undefined, right: HeldBinary | undefined): boolean;
 export declare function sameChange(left: HeadChange | undefined, right: HeadChange | undefined): boolean;
-export declare function overlay(base: Layer, queue: readonly ChangeBatch[], unapplied?: () => void): Layer;
-export declare function sameLayerText(left: Layer, right: Layer): boolean;
-export declare function overlayChanged(base: Layer, queue: readonly ChangeBatch[], previousBase: Layer, previousQueue: readonly ChangeBatch[], previousVisible: Layer): Layer;
+export declare function composed(path: string, fields: Readonly<Record<string, unknown>>, sections: Readonly<Record<string, string>>, composition: Composition): ApplyResult;
+export declare function compose(path: string, fields: Readonly<Record<string, unknown>>, sections: Readonly<Record<string, string>>, composition: Composition): string;
+export declare function overlaying(base: Layer, queue: readonly ChangeBatch[], composition: Composition, unapplied?: () => void): Generator<number, Layer, void>;
 //# sourceMappingURL=overlay.d.ts.map

package/dist/overlay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAU,WAAW,EAAgB,MAAM,aAAa,CAAC;AAErE,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG,KAAK,GAAG;IAC1B,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAQ/F;AAsJD,wBAAgB,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,WAAW,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,KAAK,CAmBjG;AAQD,wBAAgB,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAQhE;AAmBD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,YAAY,EAAE,KAAK,EACnB,aAAa,EAAE,SAAS,WAAW,EAAE,EACrC,eAAe,EAAE,KAAK,GACrB,KAAK,CA4FP"}
+{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAGL,KAAK,WAAW,EAGjB,MAAM,aAAa,CAAC;AAIrB,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB,CAAC;IAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GAAG,UAAU,CAAC,GAC7C;IACE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEN,MAAM,MAAM,KAAK,GAAG,KAAK,GAAG;IAC1B,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAChD,CAAC;AAEF,wBAAiB,gBAAgB,CAC/B,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,GAC1C,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAE1C;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAW/F;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAQ/F;AA+CD,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC1C,WAAW,EAAE,WAAW,GACvB,WAAW,CAqBb;AAED,wBAAgB,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC1C,WAAW,EAAE,WAAW,GACvB,MAAM,CAIR;AA8ID,wBAAiB,UAAU,CACzB,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,WAAW,EAAE,WAAW,EACxB,SAAS,CAAC,EAAE,MAAM,IAAI,GACrB,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAsChC"}

package/dist/overlay.js

@@ -1,4 +1,23 @@
-import { apply, parse, serialize } from '@agentshouse/mdmodel';
+import { apply, create, documentValue, parse, serialize, TYPE_FIELD, } from '@agentshouse/mdmodel';
+import { definitionsAt } from './collection.js';
+import { isPart, } from './change.js';
+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;
@@ -7,11 +26,10 @@ export function sameChange(left, right) {
         left.author?.id === right.author?.id &&
         left.author?.name === right.author?.name);
 }
-const EMPTY_FRONTMATTER = '---\n---\n';
 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 +43,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)),
@@ -32,59 +51,71 @@ function priorsOf(preconditions) {
         preamble: (path) => preambles.get(path) ?? '',
     };
 }
-function compose(fields, sections) {
-    const body = Object.entries(sections)
-        .map(([name, value]) => `\n## ${name}\n${value}`)
-        .join('');
-    const skeleton = `${EMPTY_FRONTMATTER}${body}`;
-    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);
+export function composed(path, fields, sections, composition) {
+    const declared = fields[TYPE_FIELD];
+    const type = typeof declared === 'string' && declared !== '' ? declared : undefined;
+    const definition = definitionsAt(composition, path)(type);
+    return apply(create(type, definition), [
+        ...Object.entries(fields).flatMap(([name, value]) => (name !== TYPE_FIELD || type === undefined) && documentValue(value)
+            ? [{ kind: 'field', name, value, prior: undefined }]
+            : []),
+        ...Object.entries(sections).map(([name, value]) => ({
+            kind: 'section',
+            name,
+            value,
+            prior: undefined,
+        })),
+    ], definition);
+}
+export function compose(path, fields, sections, composition) {
+    const next = composed(path, fields, sections, composition);
+    if (next.outcome !== 'applied')
+        throw new Error(`the creation of ${path} writes no document`);
+    return serialize(next.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, composition) {
+    const path = changes[0].path;
+    delete staged.revisions[path];
+    const text = staged.documents[path];
     if (text === undefined)
-        return false;
-    const parsed = parse(text, change.path);
+        return changes.length;
+    const definitions = definitionsAt(composition, path);
+    const parsed = parse(text, path, definitions);
     if (!parsed.ok)
-        return false;
-    const next = edited(parsed.document, change, priors);
-    if (next?.outcome !== 'applied')
-        return false;
-    staged.documents[change.path] = serialize(next.document);
-    return true;
+        return changes.length;
+    const definition = definitions(parsed.document.type);
+    const wanted = changes.map((change) => edited(change, priors));
+    const first = apply(parsed.document, wanted, definition);
+    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, definition);
+    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];
@@ -92,8 +123,9 @@ 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 false;
@@ -103,185 +135,129 @@ function relocate(staged, from, to) {
 }
 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') {
-        return edit(staged, change, priors);
-    }
+function stage(staged, change, composition) {
     if (change.kind === 'create') {
         staged.documents[change.path] =
-            'content' in change ? change.content : compose(change.fields, change.sections);
+            'content' in change
+                ? change.content
+                : compose(change.path, change.fields, change.sections, composition);
+        delete staged.fileIds[change.path];
+        delete staged.created[change.path];
         delete staged.changes[change.path];
         return true;
     }
     if (change.kind === 'replace') {
+        delete staged.revisions[change.path];
         if (staged.documents[change.path] === undefined)
             return false;
         staged.documents[change.path] = change.content;
         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') {
         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;
 }
-export function overlay(base, queue, unapplied) {
+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* overlaying(base, queue, composition, 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) {
-            if (!stage(staged, change, priors))
-                unapplied?.();
-        }
-    }
-    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, composition))
+                    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, composition); 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/page-metadata.d.ts

@@ -0,0 +1,8 @@
+export declare const PAGE_METADATA_WORDS: {
+    readonly heading: 'Page metadata';
+    readonly app: 'App';
+    readonly address: 'Address';
+    readonly queries: 'Local Queries';
+};
+export declare function pageMetadataBlock(app: string, address: string, queries: readonly unknown[]): string;
+//# sourceMappingURL=page-metadata.d.ts.map

package/dist/page-metadata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"page-metadata.d.ts","sourceRoot":"","sources":["../src/page-metadata.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,mBAAmB;aAC9B,OAAO,EAAE,eAAe;aACxB,GAAG,EAAE,KAAK;aACV,OAAO,EAAE,SAAS;aAClB,OAAO,EAAE,eAAe;CAChB,CAAC;AAIX,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,SAAS,OAAO,EAAE,GAC1B,MAAM,CAUR"}

package/dist/page-metadata.js

@@ -0,0 +1,19 @@
+import { queryKey } from '@agentshouse/mdmodel';
+export const PAGE_METADATA_WORDS = {
+    heading: 'Page metadata',
+    app: 'App',
+    address: 'Address',
+    queries: 'Local Queries',
+};
+const PAGE_METADATA_QUERIES = 10;
+export function pageMetadataBlock(app, address, queries) {
+    const held = [...new Set(queries.map(queryKey))];
+    return [
+        PAGE_METADATA_WORDS.heading,
+        `${PAGE_METADATA_WORDS.app}: ${app}`,
+        `${PAGE_METADATA_WORDS.address}: ${address}`,
+        ...(held.length === 0 || held.length > PAGE_METADATA_QUERIES
+            ? []
+            : [`${PAGE_METADATA_WORDS.queries}:`, ...held]),
+    ].join('\n');
+}

package/dist/parts.d.ts

@@ -0,0 +1,4 @@
+import { type Part } from '@agentshouse/session-content';
+export declare function currentStep(parts: readonly Part[]): string | null;
+export declare function runningLine(parts: readonly Part[]): string | null;
+//# sourceMappingURL=parts.d.ts.map

package/dist/parts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parts.d.ts","sourceRoot":"","sources":["../src/parts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAGhE,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,GAAG,MAAM,GAAG,IAAI,CAGjE;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,GAAG,MAAM,GAAG,IAAI,CAKjE"}

package/dist/parts.js

@@ -0,0 +1,13 @@
+import { isOwn } from '@agentshouse/session-content';
+import { excerpt } from './read.js';
+export function currentStep(parts) {
+    const call = [...parts].reverse().find((part) => part.type === 'call');
+    return call?.type === 'call' && call.line !== '' ? call.line : null;
+}
+export function runningLine(parts) {
+    const own = parts.filter(isOwn);
+    const note = [...own].reverse().find((part) => part.type === 'text' && part.text.trim() !== '');
+    if (note?.type === 'text')
+        return excerpt(note.text);
+    return currentStep(own);
+}

package/dist/paths.d.ts

@@ -1,4 +1,6 @@
 export declare function normalize(path: string): string | null;
 export declare function beneath(prefix: string, path: string): boolean;
 export declare function covered(prefixes: readonly string[], path: string): boolean;
+export declare function authoredAt(patterns: 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":"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"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAEA,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;AAwBD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7E;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAGzD"}