@agentshouse/mdruntime 0.1.0-alpha.9 → 0.1.0-c009335e08279

package/dist/model.d.ts

@@ -1,13 +1,12 @@
-import type { Validation } from '@agentshouse/mdmodel';
-import type { MdType } from './collection.js';
+import type { Definition, FieldSpec, SectionSpec, VerifiedModel } from '@agentshouse/mdmodel';
 export type ModelIdentity = {
     identity: string;
     version: string;
 };
 export type ModelSnapshot = ModelIdentity & {
-    definitions: Readonly<Record<string, string>>;
+    schema: string | null;
 };
-export type ModelUnavailableReason = 'not-readable' | 'revoked' | 'not-acquired' | 'version-changed' | 'invalid' | 'binding-unavailable';
+export type ModelUnavailableReason = 'not-readable' | 'revoked' | 'not-acquired' | 'version-changed' | 'invalid';
 export type ModelResult = {
     kind: 'model';
     snapshot: ModelSnapshot;
@@ -19,6 +18,11 @@ export type ModelResult = {
 } | {
     kind: 'revoked-authorization';
 };
+export type MdType = {
+    name: string;
+    fields: Readonly<Record<string, FieldSpec>>;
+    sections: Readonly<Record<string, SectionSpec>>;
+};
 export type ModelState = {
     status: 'unavailable';
     reason: ModelUnavailableReason;
@@ -26,7 +30,7 @@ export type ModelState = {
     status: 'current' | 'cached';
     snapshot: ModelSnapshot;
     verifiedWith: ModelIdentity;
-    types: readonly MdType[];
+    types: VerifiedModel['types'];
 };
 export type TypesResult = {
     status: 'unavailable';
@@ -38,32 +42,13 @@ export type TypesResult = {
     verifiedWith: ModelIdentity;
     types: readonly MdType[];
 };
-export type ModelValidation = {
-    verdict: 'accept';
-} | (Extract<Validation, {
-    verdict: 'refuse';
-}> & {
-    source: 'content' | 'model';
-});
-export type AttachedModelBinding = {
-    verify(snapshot: ModelSnapshot): {
-        kind: 'verified';
-        types: readonly MdType[];
-    } | {
-        kind: 'invalid';
-    };
-    validate(input: {
-        model: ModelSnapshot;
-        documents: Readonly<Record<string, string>>;
-        binaryTargets: readonly string[];
-    }): ModelValidation;
-};
 export type ValidationReceipt = {
     identity: string;
     version: string;
     source: 'current' | 'cached';
 };
 export declare const NO_MODEL: ModelState;
+export declare function definitionOf(state: ModelState, type: string | undefined): Definition | undefined;
 export declare function modelTypes(state: ModelState): TypesResult;
 export declare function cached(state: ModelState): ModelState;
 export declare function sameModel(left: ModelIdentity, right: ModelIdentity): boolean;

package/dist/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAAE,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;CAAE,CAAC;AAC9F,MAAM,MAAM,sBAAsB,GAC9B,cAAc,GACd,SAAS,GACT,cAAc,GACd,iBAAiB,GACjB,SAAS,GACT,qBAAqB,CAAC;AAC1B,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,uBAAuB,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,uBAAuB,CAAA;CAAE,CAAC;AACtC,MAAM,MAAM,UAAU,GAClB;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,GACzD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B,CAAC;AACN,MAAM,MAAM,WAAW,GACnB;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,GACzD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B,CAAC;AACN,MAAM,MAAM,eAAe,GACvB;IAAE,OAAO,EAAE,QAAQ,CAAA;CAAE,GACrB,CAAC,OAAO,CAAC,UAAU,EAAE;IAAE,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC,GAAG;IAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAA;CAAE,CAAC,CAAC;AACnF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CACJ,QAAQ,EAAE,aAAa,GACtB;QAAE,IAAI,EAAE,UAAU,CAAC;QAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,SAAS,CAAA;KAAE,CAAC;IACxE,QAAQ,CAAC,KAAK,EAAE;QACd,KAAK,EAAE,aAAa,CAAC;QACrB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5C,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;KAClC,GAAG,eAAe,CAAC;CACrB,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAE,CAAC;AACpG,eAAO,MAAM,QAAQ,EAAE,UAA8D,CAAC;AACtF,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW,CAUzD;AACD,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAEpD;AACD,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAE5E"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE9F,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AACtE,MAAM,MAAM,sBAAsB,GAC9B,cAAc,GACd,SAAS,GACT,cAAc,GACd,iBAAiB,GACjB,SAAS,CAAC;AACd,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,uBAAuB,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,uBAAuB,CAAA;CAAE,CAAC;AACtC,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IAC5C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;CACjD,CAAC;AACF,MAAM,MAAM,UAAU,GAClB;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,GACzD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAC/B,CAAC;AACN,MAAM,MAAM,WAAW,GACnB;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,GACzD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B,CAAC;AACN,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAE,CAAC;AACpG,eAAO,MAAM,QAAQ,EAAE,UAA8D,CAAC;AACtF,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,CAGhG;AACD,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW,CAczD;AACD,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAEpD;AACD,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAE5E"}

package/dist/model.js

@@ -1,28 +1,25 @@
-export const NO_MODEL = {
-    status: 'unavailable',
-    reason: 'not-acquired'
-};
+export const NO_MODEL = { status: 'unavailable', reason: 'not-acquired' };
+export function definitionOf(state, type) {
+    if (state.status === 'unavailable' || type === undefined)
+        return undefined;
+    return Object.hasOwn(state.types, type) ? state.types[type] : undefined;
+}
 export function modelTypes(state) {
-    return state.status === 'unavailable' ? {
-        ...state
-    } : {
-        status: state.status,
-        identity: state.snapshot.identity,
-        version: state.snapshot.version,
-        verifiedWith: {
-            ...state.verifiedWith
-        },
-        types: structuredClone(state.types)
-    };
+    return state.status === 'unavailable'
+        ? { ...state }
+        : {
+            status: state.status,
+            identity: state.snapshot.identity,
+            version: state.snapshot.version,
+            verifiedWith: { ...state.verifiedWith },
+            types: structuredClone(Object.values(state.types)
+                .sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0))
+                .map(({ name, fields, sections }) => ({ name, fields, sections }))),
+        };
 }
 export function cached(state) {
-    return state.status === 'unavailable' ? state : {
-        ...state,
-        status: 'cached'
-    };
+    return state.status === 'unavailable' ? state : { ...state, status: 'cached' };
 }
 export function sameModel(left, right) {
     return left.identity === right.identity && left.version === right.version;
 }
-
-//# sourceMappingURL=model.js.map

package/dist/observation.d.ts

@@ -0,0 +1,25 @@
+import type { QueryDocument, QueryGroup, QueryResult } from './query.js';
+export type Observation<T> = {
+    current(): T;
+    subscribe(listener: (value: T) => void): () => void;
+    close(): void;
+};
+export type RowKey = string | number;
+export type KeyedResult = {
+    result: QueryResult;
+    keys: readonly RowKey[];
+};
+export type QueryChange = {
+    changed: readonly (readonly [RowKey, QueryDocument | QueryGroup])[];
+    removed: readonly RowKey[];
+    order: readonly RowKey[] | null;
+};
+export type Observed = {
+    observation: Observation<unknown>;
+    receive(message: unknown): void;
+    end(): void;
+};
+export declare function rowsOf(result: QueryResult): readonly (QueryDocument | QueryGroup)[];
+export declare function observed(first: unknown, stop: () => void, keyed: boolean): Observed;
+export declare function opened(watch: (deliver: (message: unknown) => void) => () => void, keyed: boolean): Promise<Observation<unknown>>;
+//# sourceMappingURL=observation.d.ts.map

package/dist/observation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"observation.d.ts","sourceRoot":"","sources":["../src/observation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzE,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,OAAO,IAAI,CAAC,CAAC;IACb,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACpD,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAErC,MAAM,MAAM,WAAW,GAAG;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC;IACpE,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAChC,GAAG,IAAI,IAAI,CAAC;CACb,CAAC;AAEF,wBAAgB,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE,CAEnF;AA0BD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,EAAE,KAAK,EAAE,OAAO,GAAG,QAAQ,CAkCnF;AAED,wBAAgB,MAAM,CACpB,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,KAAK,MAAM,IAAI,EAC1D,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAiB/B"}

package/dist/observation.js

@@ -0,0 +1,85 @@
+export function rowsOf(result) {
+    return 'groups' in result ? result.groups : result.documents;
+}
+function keyedResult(first) {
+    const grouped = 'groups' in first.result;
+    const rows = rowsOf(first.result);
+    const byKey = new Map(first.keys.map((key, index) => [key, rows[index]]));
+    let keys = first.keys;
+    return {
+        value: first.result,
+        next(message) {
+            const change = message;
+            for (const key of change.removed)
+                byKey.delete(key);
+            for (const [key, row] of change.changed)
+                byKey.set(key, row);
+            keys = change.order ?? keys.filter((key) => byKey.has(key));
+            const next = keys.map((key) => byKey.get(key));
+            return grouped
+                ? { groups: next }
+                : { documents: next };
+        },
+    };
+}
+function whole(first) {
+    return { value: first, next: (message) => message };
+}
+export function observed(first, stop, keyed) {
+    const reducer = keyed ? keyedResult(first) : whole(first);
+    let value = reducer.value;
+    let open = true;
+    const listeners = new Set();
+    const end = () => {
+        open = false;
+        listeners.clear();
+    };
+    return {
+        observation: {
+            current: () => value,
+            subscribe(listener) {
+                const entry = { hear: listener };
+                if (open)
+                    listeners.add(entry);
+                return () => {
+                    listeners.delete(entry);
+                };
+            },
+            close() {
+                if (!open)
+                    return;
+                end();
+                stop();
+            },
+        },
+        receive(message) {
+            if (!open)
+                return;
+            value = reducer.next(message);
+            for (const entry of [...listeners]) {
+                if (listeners.has(entry))
+                    entry.hear(value);
+            }
+        },
+        end,
+    };
+}
+export function opened(watch, keyed) {
+    return new Promise((resolve, reject) => {
+        let handle;
+        let stop = () => { };
+        try {
+            stop = watch((message) => {
+                if (handle !== undefined) {
+                    handle.receive(message);
+                    return;
+                }
+                handle = observed(message, () => stop(), keyed);
+                resolve(handle.observation);
+            });
+        }
+        catch (error) {
+            reject(error);
+        }
+    });
+}

package/dist/outcome.d.ts

@@ -1,37 +1,18 @@
-import type { ActionResult, ProviderRefusal, RetryableRefusal } from './adapter.js';
+import type { ActionResult } from './adapter.js';
 import type { ChangeBatch } from './change.js';
-export type AffectedState = Readonly<Record<string, string>>;
 export type CallResult = ActionResult | {
     kind: 'undeclared';
 };
-export type QueueOutcome = {
-    kind: 'pending';
-} | (ProviderRefusal & {
-    kind: 'conflicted';
-    roomVersion?: string;
-    affected: AffectedState;
-}) | (ProviderRefusal & {
-    kind: 'rejected';
-    affected: AffectedState;
-}) | RetryableRefusal | {
-    kind: 'expired';
+export type Submission = {
+    readonly state: 'waiting' | 'submitted';
+} | {
+    readonly state: 'reset';
+    readonly reset: string;
 };
-export type AcceptedOutcome = {
-    kind: 'accepted';
-    roomVersion: string;
-    author?: string;
-    time?: string;
-};
-export type SubmissionOutcome = QueueOutcome | AcceptedOutcome;
 export type QueueEntry = {
     readonly batch: ChangeBatch;
-    readonly outcome: QueueOutcome;
-};
-export type RefusedOutcome = Extract<QueueOutcome, {
-    kind: 'conflicted' | 'rejected' | 'expired';
-}>;
-export declare function refused(outcome: SubmissionOutcome | undefined): outcome is RefusedOutcome;
-export declare function withheldUntilReset(outcome: SubmissionOutcome | undefined, at: number): boolean;
-export declare function refusalOf(outcome: RefusedOutcome): ProviderRefusal | null;
-export declare function queuedOutcome(outcome: SubmissionOutcome | undefined): QueueOutcome;
+} & (Submission | {
+    readonly state: 'accepted';
+    readonly roomVersion: string;
+});
 //# sourceMappingURL=outcome.d.ts.map

package/dist/outcome.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../src/outcome.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAE7D,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC;AAE/D,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB,CAAC,eAAe,GAAG;IACjB,IAAI,EAAE,YAAY,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,aAAa,CAAC;CACzB,CAAC,GACF,CAAC,eAAe,GAAG;IACjB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,aAAa,CAAC;CACzB,CAAC,GACF,gBAAgB,GAChB;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC;AAExB,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,UAAU,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,YAAY,GAAG,eAAe,CAAC;AAE/D,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,YAAY,GAAG,UAAU,GAAG,SAAS,CAAA;CAAE,CAAC,CAAC;AAEpG,wBAAgB,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,SAAS,GAAG,OAAO,IAAI,cAAc,CAIzF;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,GAAG,SAAS,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAM9F;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,eAAe,GAAG,IAAI,CAGzE;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,SAAS,GAAG,YAAY,CAKlF"}
+{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../src/outcome.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC;AAE/D,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,CAAA;CAAE,GAC3C;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAAE,GAAG,CACvD,UAAU,GACV;IAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAC/D,CAAC"}

package/dist/outcome.js

@@ -1,23 +1 @@
-export function refused(outcome) {
-    return outcome?.kind === 'conflicted' || outcome?.kind === 'rejected' || outcome?.kind === 'expired';
-}
-export function withheldUntilReset(outcome, at) {
-    return outcome?.kind === 'retryable-refusal' && outcome.reset !== undefined && at < Date.parse(outcome.reset);
-}
-export function refusalOf(outcome) {
-    if (outcome.kind === 'expired') return null;
-    return {
-        code: outcome.code,
-        fields: outcome.fields
-    };
-}
-export function queuedOutcome(outcome) {
-    if (outcome === undefined || outcome.kind === 'accepted' || outcome.kind === 'pending') {
-        return {
-            kind: 'pending'
-        };
-    }
-    return outcome;
-}
-
-//# sourceMappingURL=outcome.js.map
+export {};

package/dist/overlay.d.ts

@@ -1,8 +1,15 @@
+import type { HeadChange } from './adapter.js';
 import type { ChangeBatch } from './change.js';
-export type Layer = {
+export type Heads = {
+    revisions: Readonly<Record<string, string>>;
+    changes: Readonly<Record<string, HeadChange>>;
+};
+export type Layer = Heads & {
     documents: Readonly<Record<string, string>>;
     binaryTargets: readonly string[];
-    revisions: Readonly<Record<string, string>>;
 };
+export declare function sameChange(left: HeadChange | undefined, right: HeadChange | undefined): boolean;
 export declare function overlay(base: Layer, queue: readonly ChangeBatch[]): 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;
 //# 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,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,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAC7C,CAAC;AAyIF,wBAAgB,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,WAAW,EAAE,GAAG,KAAK,CAezE"}
+{"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;AAoJD,wBAAgB,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,WAAW,EAAE,GAAG,KAAK,CAiBzE;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"}

package/dist/overlay.js

@@ -1,4 +1,12 @@
 import { apply, parse, serialize } from '@agentshouse/mdmodel';
+export function sameChange(left, right) {
+    if (left === undefined || right === undefined)
+        return left === right;
+    return (left.time === right.time &&
+        left.author?.kind === right.author?.kind &&
+        left.author?.id === right.author?.id &&
+        left.author?.name === right.author?.name);
+}
 const EMPTY_FRONTMATTER = '---\n---\n';
 function at(path, name) {
     return `${path} ${name}`;
@@ -7,7 +15,7 @@ function priorsOf(preconditions) {
     const fields = new Map();
     const sections = new Map();
     const preambles = new Map();
-    for (const precondition of preconditions){
+    for (const precondition of preconditions) {
         if (precondition.kind === 'field') {
             fields.set(at(precondition.path, precondition.name), precondition.value);
         }
@@ -19,25 +27,24 @@ function priorsOf(preconditions) {
         }
     }
     return {
-        field: (path, name)=>fields.get(at(path, name)),
-        section: (path, name)=>sections.get(at(path, name)) ?? '',
-        preamble: (path)=>preambles.get(path) ?? ''
+        field: (path, name) => fields.get(at(path, name)),
+        section: (path, name) => sections.get(at(path, name)) ?? '',
+        preamble: (path) => preambles.get(path) ?? '',
     };
 }
 function compose(fields, sections) {
-    const body = Object.entries(sections).map(([name, value])=>`\n## ${name}\n${value}`).join('');
+    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;
+    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;
+    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);
 }
@@ -47,50 +54,65 @@ function edited(document, change, priors) {
             kind: 'field',
             name: change.name,
             value: change.value,
-            prior: priors.field(change.path, change.name)
+            prior: priors.field(change.path, change.name),
         });
     }
     if (change.kind === 'preamble') {
         return apply(document, {
             kind: 'preamble',
             value: change.value,
-            prior: priors.preamble(change.path)
+            prior: priors.preamble(change.path),
         });
     }
-    if (change.kind !== 'section') return null;
+    if (change.kind !== 'section')
+        return null;
     return apply(document, {
         kind: 'section',
         name: change.name,
         value: change.value,
-        prior: priors.section(change.path, change.name)
+        prior: priors.section(change.path, change.name),
     });
 }
 function edit(staged, change, priors) {
     const text = staged.documents[change.path];
-    if (text === undefined) return;
+    if (text === undefined)
+        return;
     const parsed = parse(text, change.path);
-    if (!parsed.ok) return;
+    if (!parsed.ok)
+        return;
     const next = edited(parsed.document, change, priors);
-    if (next?.outcome === 'applied') staged.documents[change.path] = serialize(next.document);
+    if (next?.outcome === 'applied')
+        staged.documents[change.path] = serialize(next.document);
 }
 function relocate(staged, from, to) {
     const text = staged.documents[from];
     if (text !== undefined) {
         delete staged.documents[from];
         staged.documents[to] = text;
-    } else if (staged.binaryTargets.delete(from)) {
+    }
+    else if (staged.binaryTargets.delete(from)) {
         staged.binaryTargets.add(to);
-    } else {
+    }
+    else {
         return;
     }
-    const revision = staged.revisions[from];
-    if (revision === undefined) return;
-    delete staged.revisions[from];
-    staged.revisions[to] = revision;
+    moveHead(staged, from, to);
+}
+function moveHead(heads, from, to) {
+    const revision = heads.revisions[from];
+    const change = heads.changes[from];
+    delete heads.revisions[from];
+    delete heads.changes[from];
+    delete heads.changes[to];
+    if (revision !== undefined)
+        heads.revisions[to] = revision;
+    if (change !== undefined)
+        heads.changes[to] = change;
 }
 function erase(staged, path) {
     delete staged.documents[path];
     delete staged.revisions[path];
+    delete staged.changes[path];
     staged.binaryTargets.delete(path);
 }
 function stage(staged, change, priors) {
@@ -99,11 +121,14 @@ function stage(staged, change, priors) {
         return;
     }
     if (change.kind === 'create') {
-        staged.documents[change.path] = compose(change.fields, change.sections);
+        staged.documents[change.path] =
+            'content' in change ? change.content : compose(change.fields, change.sections);
+        delete staged.changes[change.path];
         return;
     }
     if (change.kind === 'replace') {
-        if (staged.documents[change.path] === undefined) return;
+        if (staged.documents[change.path] === undefined)
+            return;
         staged.documents[change.path] = change.content;
         return;
     }
@@ -115,25 +140,144 @@ function stage(staged, change, priors) {
 }
 export function overlay(base, queue) {
     const staged = {
-        documents: {
-            ...base.documents
-        },
+        documents: { ...base.documents },
         binaryTargets: new Set(base.binaryTargets),
-        revisions: {
-            ...base.revisions
-        }
+        revisions: { ...base.revisions },
+        changes: { ...base.changes },
     };
-    for (const batch of queue){
+    for (const batch of queue) {
         const priors = priorsOf(batch.preconditions);
-        for (const change of batch.changes)stage(staged, change, priors);
+        for (const change of batch.changes)
+            stage(staged, change, priors);
     }
     return {
         documents: staged.documents,
-        binaryTargets: [
-            ...staged.binaryTargets
-        ].sort(),
-        revisions: staged.revisions
+        binaryTargets: [...staged.binaryTargets].sort(),
+        revisions: staged.revisions,
+        changes: staged.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)))
+                continue;
+            for (const path of touched) {
+                if (affected.has(path))
+                    continue;
+                affected.add(path);
+                expanded = true;
+            }
+        }
+    }
+    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(),
     };
 }
-
-//# sourceMappingURL=overlay.js.map