@agentshouse/mdruntime 0.1.0-cacb4c3f6734e → 0.1.0-cb0eb0d87ff49

package/dist/overlay.js

@@ -1,4 +1,19 @@
 import { apply, parse, serialize } from '@agentshouse/mdmodel';
+import { differing, drafted, patched, settled } from './shared.js';
+export function acceptedBinaries(files) {
+    return Object.fromEntries(Object.entries(files).map(([path, file]) => [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' && left.fileRef === right.fileRef
+            : right.state === 'pending' && left.localId === right.localId));
+}
 export function sameChange(left, right) {
     if (left === undefined || right === undefined)
         return left === right;
@@ -76,13 +91,15 @@ function edited(document, change, priors) {
 function edit(staged, change, priors) {
     const text = staged.documents[change.path];
     if (text === undefined)
-        return;
+        return false;
     const parsed = parse(text, change.path);
     if (!parsed.ok)
-        return;
+        return false;
     const next = edited(parsed.document, change, priors);
-    if (next?.outcome === 'applied')
-        staged.documents[change.path] = serialize(next.document);
+    if (next?.outcome !== 'applied')
+        return false;
+    staged.documents[change.path] = serialize(next.document);
+    return true;
 }
 function relocate(staged, from, to) {
     const text = staged.documents[from];
@@ -90,13 +107,15 @@ 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];
@@ -113,62 +132,84 @@ function erase(staged, path) {
     delete staged.documents[path];
     delete staged.revisions[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;
+        delete staged.revisions[change.path];
+        return edit(staged, change, priors);
     }
     if (change.kind === 'create') {
         staged.documents[change.path] =
             'content' in change ? change.content : compose(change.fields, change.sections);
         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);
     }
     erase(staged, change.path);
+    return true;
 }
-export function overlay(base, queue) {
+export function overlay(base, queue, unapplied) {
     const staged = {
-        documents: { ...base.documents },
-        binaryTargets: new Set(base.binaryTargets),
-        revisions: { ...base.revisions },
-        changes: { ...base.changes },
+        documents: drafted(base.documents),
+        binaries: drafted(base.binaries),
+        revisions: drafted(base.revisions),
+        changes: drafted(base.changes),
     };
     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) {
+            if (!stage(staged, change, priors))
+                unapplied?.();
+        }
     }
     return {
-        documents: staged.documents,
-        binaryTargets: [...staged.binaryTargets].sort(),
-        revisions: staged.revisions,
-        changes: staged.changes,
+        documents: settled(staged.documents),
+        binaries: settled(staged.binaries),
+        revisions: settled(staged.revisions),
+        changes: settled(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)));
+    return (differing(left.documents, right.documents).size === 0 &&
+        differing(left.binaries, right.binaries, sameBinary).size === 0);
+}
+export function changedPaths(left, right) {
+    return new Set([
+        ...differing(left.documents, right.documents),
+        ...differing(left.revisions, right.revisions),
+        ...differing(left.changes, right.changes, sameChange),
+        ...differing(left.binaries, right.binaries, sameBinary),
+    ]);
 }
 function replayHeads(base, queue) {
-    const heads = { revisions: { ...base.revisions }, changes: { ...base.changes } };
+    const heads = { revisions: drafted(base.revisions), changes: drafted(base.changes) };
     for (const batch of queue) {
         for (const change of batch.changes) {
             if (change.kind === 'remove') {
@@ -178,12 +219,22 @@ function replayHeads(base, queue) {
             else if (change.kind === 'create') {
                 delete heads.changes[change.path];
             }
+            else if (change.kind === 'replace' ||
+                change.kind === 'field' ||
+                change.kind === 'section' ||
+                change.kind === 'preamble') {
+                delete heads.revisions[change.path];
+            }
+            else if (change.kind === 'binary') {
+                delete heads.revisions[change.path];
+                delete heads.changes[change.path];
+            }
             else if (change.kind === 'move') {
                 moveHead(heads, change.path, change.to);
             }
         }
     }
-    return heads;
+    return { revisions: settled(heads.revisions), changes: settled(heads.changes) };
 }
 export function overlayChanged(base, queue, previousBase, previousQueue, previousVisible) {
     const before = previousQueue.map((batch) => JSON.stringify(batch));
@@ -193,28 +244,11 @@ export function overlayChanged(base, queue, previousBase, previousQueue, previou
         sameLayerText(base, previousBase)) {
         return {
             documents: previousVisible.documents,
-            binaryTargets: previousVisible.binaryTargets,
+            binaries: previousVisible.binaries,
             ...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 affected = new Set(changedPaths(base, previousBase));
     const oldIds = new Set(before);
     const newIds = new Set(after);
     for (const batch of previousQueue) {
@@ -245,6 +279,7 @@ export function overlayChanged(base, queue, previousBase, previousQueue, previou
     const documents = {};
     const revisions = {};
     const changes = {};
+    const binaries = {};
     for (const path of affected) {
         if (base.documents[path] !== undefined)
             documents[path] = base.documents[path];
@@ -252,32 +287,14 @@ export function overlayChanged(base, queue, previousBase, previousQueue, previou
             revisions[path] = base.revisions[path];
         if (base.changes[path] !== undefined)
             changes[path] = base.changes[path];
+        if (base.binaries[path] !== undefined)
+            binaries[path] = base.binaries[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);
+    const staged = overlay({ documents, revisions, changes, binaries }, queue.filter((batch) => pathsOf(batch).some((path) => affected.has(path))));
     return {
-        documents: mergedDocuments,
-        revisions: mergedRevisions,
-        changes: mergedChanges,
-        binaryTargets: [...mergedTargets].sort(),
+        documents: patched(previousVisible.documents, Object.entries(staged.documents), affected),
+        revisions: patched(previousVisible.revisions, Object.entries(staged.revisions), affected),
+        changes: patched(previousVisible.changes, Object.entries(staged.changes), affected),
+        binaries: patched(previousVisible.binaries, Object.entries(staged.binaries), affected),
     };
 }

package/dist/query.d.ts

@@ -1,5 +1,6 @@
 import { type Definition } from '@agentshouse/mdmodel';
 import type { HeadChange } from './adapter.js';
+import type { BinaryFileRecord } from './binary.js';
 export type Value = string | number | boolean | null;
 export type Predicate = Value | {
     $eq: Value;
@@ -93,18 +94,44 @@ export type QueryDocument = {
     markdown?: string;
     backlinks?: readonly Backlink[];
     change?: HeadChange | null;
+    binaryFile?: BinaryFileRecord;
 };
 export type QueryGroup = {
     key: readonly unknown[];
     count: number;
 };
-export type DocumentResult = {
+export type CoveredRoom = {
+    room: string;
+    generation: string;
+    current: boolean;
+};
+export type QueryCoverage = {
+    rooms: readonly CoveredRoom[];
+    indexes: readonly string[];
+    overlay: readonly string[];
+};
+export type Awaits = 'acquisition' | 'preparation' | 'index';
+export type PendingRoom = {
+    room: string;
+    awaits: Awaits;
+};
+export type PendingResult = {
+    pending: readonly PendingRoom[];
+};
+export type DocumentRows = {
     documents: readonly QueryDocument[];
 };
-export type GroupResult = {
+export type GroupRows = {
     groups: readonly QueryGroup[];
 };
-export type QueryResult = DocumentResult | GroupResult;
+export type QueryRows = DocumentRows | GroupRows;
+export type DocumentResult = DocumentRows & {
+    coverage: QueryCoverage;
+};
+export type GroupResult = GroupRows & {
+    coverage: QueryCoverage;
+};
+export type QueryResult = DocumentResult | GroupResult | PendingResult;
 export type QueryErrorCode = 'invalid-query' | 'unknown-type' | 'unknown-field' | 'wrong-kind';
 export type RoomFacts = {
     locator: string;
@@ -204,6 +231,8 @@ export type Plan = {
     limit: number | null;
 };
 export declare class QueryError extends Error {
+    readonly code: QueryErrorCode;
+    readonly retryable = false;
     constructor(code: QueryErrorCode, at: string, problem: string);
 }
 type Entries = Readonly<Record<string, unknown>>;

package/dist/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,UAAU,EAEhB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI/C,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;AAErD,MAAM,MAAM,SAAS,GACjB,KAAK,GACL;IAAE,GAAG,EAAE,KAAK,CAAA;CAAE,GACd;IAAE,GAAG,EAAE,KAAK,CAAA;CAAE,GACd;IAAE,GAAG,EAAE,SAAS,KAAK,EAAE,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,SAAS,KAAK,EAAE,CAAA;CAAE,GAC1B;IAAE,GAAG,CAAC,EAAE,KAAK,CAAC;IAAC,IAAI,CAAC,EAAE,KAAK,CAAC;IAAC,GAAG,CAAC,EAAE,KAAK,CAAC;IAAC,IAAI,CAAC,EAAE,KAAK,CAAA;CAAE,GACxD;IAAE,IAAI,EAAE,SAAS,KAAK,EAAE,CAAA;CAAE,GAC1B;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GACjB;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC;AAEzB,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,CAAC,EAAE,SAAS,KAAK,EAAE,CAAC;IACxB,GAAG,CAAC,EAAE,SAAS,KAAK,EAAE,CAAC;IACvB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,KAAK,EAAE,GAAG,SAAS,CAAC;CAC3D,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IAAE,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAExF,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,OAAO,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAClC,SAAS,CAAC,EAAE,OAAO,GAAG;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/D,MAAM,MAAM,MAAM,GACd,KAAK,GACL;IACE,MAAM,CAAC,EAAE,KAAK,GAAG,SAAS,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,EAAE,KAAK,GAAG,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,MAAM,CAAC,EAAE,IAAI,CAAC;CACf,CAAC;AAEN,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,MAAM,CAAC;AAEvC,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,SAAS,CAAC;QAAE,EAAE,EAAE,GAAG,CAAC;QAAC,SAAS,CAAC,EAAE,SAAS,CAAA;KAAE,GAAG,YAAY,CAAC,EAAE,CAAC;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAChC,OAAO,EAAE,SAAS,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CAAC;IACzC,OAAO,CAAC,EAAE,SAAS;QAAE,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAAC,SAAS,CAAC,EAAE,SAAS,CAAA;KAAE,EAAE,CAAC;IACnF,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG,UAAU,CAAC;AAEpD,MAAM,MAAM,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3C,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,QAAQ,EAAE,CAAC;IAChC,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,GAAG,EAAE,SAAS,OAAO,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpE,MAAM,MAAM,cAAc,GAAG;IAAE,SAAS,EAAE,SAAS,aAAa,EAAE,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,WAAW,GAAG;IAAE,MAAM,EAAE,SAAS,UAAU,EAAE,CAAA;CAAE,CAAC;AAE5D,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,WAAW,CAAC;AAEvD,MAAM,MAAM,cAAc,GAAG,eAAe,GAAG,cAAc,GAAG,eAAe,GAAG,YAAY,CAAC;AAE/F,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,SAAS,UAAU,EAAE,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,SAAS,SAAS,EAAE,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,IAAI,GACZ;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,SAAS,KAAK,EAAE,CAAA;CAAE,GACtC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,KAAK,EAAE,CAAA;CAAE,GACvC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAA;CAAE,GACnF;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,KAAK,EAAE,CAAA;CAAE,GACvC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC5B;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtC,MAAM,MAAM,SAAS,GACjB;IAAE,KAAK,EAAE,SAAS,SAAS,EAAE,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,SAAS,SAAS,EAAE,CAAA;CAAE,GAC9B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC;AAElC,MAAM,MAAM,KAAK,GAAG;IAClB,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IAChC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,OAAO,GACf;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GACd;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GACd;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GACd;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,KAAK,GAAG,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IACzC,QAAQ,EAAE,KAAK,GAAG,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IAC3C,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,SAAS;QAAE,GAAG,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,YAAY,GAAG;YAAE,SAAS,EAAE,SAAS,CAAA;SAAE,CAAA;KAAE,EAAE,CAAC;CACxF,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,SAAS,OAAO,EAAE,CAAC;IAC5B,OAAO,EAAE,SAAS;QAAE,EAAE,EAAE,OAAO,GAAG,MAAM,CAAC;QAAC,SAAS,EAAE,SAAS,CAAA;KAAE,EAAE,CAAC;CACpE,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IAChC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACxB,IAAI,EAAE,KAAK,CAAC;IACZ,GAAG,EAAE,CAAC,KAAK,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;IACxC,SAAS,EAAE,CAAC,KAAK,GAAG;QAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;IACrD,KAAK,EAAE,aAAa,GAAG,UAAU,CAAC;IAClC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,qBAAa,UAAW,SAAQ,KAAK;IACnC,YAAY,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAE5D;CACF;AAED,KAAK,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAejD,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,CAE1D;AAMD,wBAAgB,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,OAAO,CAOtD;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,QAI3E;AAobD,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,GAAE,SAAS,GAAG,IAAW,GAAG,IAAI,CAkB7F;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAMrD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,GAAE,SAAS,GAAG,IAAW,GAAG,IAAI,CAI/F;AAaD,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE7C"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}

package/dist/query.js

@@ -1,9 +1,12 @@
-import { ARRAY_INDEX, itemFacts, memberFacts, pointerSegments, } from '@agentshouse/mdmodel';
+import { pointerFacts, } from '@agentshouse/mdmodel';
 import { referenceField } from './model.js';
 import { normalize } from './paths.js';
 export class QueryError extends Error {
+    code;
+    retryable = false;
     constructor(code, at, problem) {
         super(`${code} at ${at}: ${problem}`);
+        this.code = code;
     }
 }
 const RANGE = ['$gt', '$gte', '$lt', '$lte'];
@@ -117,39 +120,10 @@ function pointer(input, at) {
     }
     return input;
 }
-function stepped({ facts, through, conditional }, token) {
-    if (facts.type === 'array' && ARRAY_INDEX.test(token)) {
-        const item = itemFacts(facts, Number(token));
-        return item === undefined ? undefined : { facts: item, through, conditional };
-    }
-    let reached = facts;
-    let across = through;
-    while (reached?.type === 'array') {
-        reached = reached.items;
-        across = true;
-    }
-    const member = reached === undefined ? undefined : memberFacts(reached, token);
-    return member === undefined
-        ? undefined
-        : { facts: member, through: across, conditional: conditional || member.conditional === true };
-}
-function specAt(type, field) {
-    let spec = {
-        facts: { ...type.frontmatter, properties: type.fields },
-        through: false,
-        conditional: false,
-    };
-    for (const token of pointerSegments(field)) {
-        if (spec === undefined)
-            return undefined;
-        spec = stepped(spec, token);
-    }
-    return spec;
-}
 function specs(typed, input, at) {
     const field = pointer(input, at);
     const declared = typed.types.flatMap((type) => {
-        const spec = specAt(type, field);
+        const spec = pointerFacts(type, field);
         return spec === undefined ? [] : [spec];
     });
     if (declared.length === 0 && !typed.untyped) {

package/dist/reach.d.ts

@@ -1,3 +1,4 @@
+import type { ReferrerScope } from './adapter.js';
 import type { MdRuntime, RuntimeTopic } from './connection.js';
 import type { Plan, PlanReach, QueryResult } from './query.js';
 import type { SearchResult } from './search.js';
@@ -24,6 +25,7 @@ export type Reachable = RuntimeView & {
     query(plan: Plan): Promise<QueryResult>;
     watchPlan(plan: Plan, deliver: (message: unknown) => void): () => void;
     search(input: unknown, reach: PortReach | null): Promise<SearchResult>;
+    referrerScope(referrer: unknown): ReferrerScope | null;
 };
 export declare function holds(reach: PortReach | null, room: string): boolean;
 export declare function governs(reach: PortReach | null, room: {

package/dist/reach.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reach.d.ts","sourceRoot":"","sources":["../src/reach.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,SAAS,EAAe,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAMjG,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAI/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,SAAS,eAAe,EAAE,CAAC;IAC/C,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;AAEjD,MAAM,MAAM,KAAK,GAAG,CAClB,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,SAAS,OAAO,EAAE,EACzB,OAAO,EAAE,OAAO,KACb,MAAM,IAAI,CAAC;AAEhB,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAE1D,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IAAE,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,IAAI,CAAA;CAAE,CAAC;AAEnF,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG;IACpC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC;IACpD,KAAK,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACxC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACvE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CACxE,CAAC;AA2BF,wBAAgB,KAAK,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAMpE;AAMD,wBAAgB,OAAO,CACrB,KAAK,EAAE,SAAS,GAAG,IAAI,EACvB,IAAI,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,cAAc,EAAE;QAAE,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI,CAAA;CAAE,GAC/F;IAAE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAU/D;AAcD,wBAAgB,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,CASnE;AA8ED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,YAAY,CAgKlF"}
+{"version":3,"file":"reach.d.ts","sourceRoot":"","sources":["../src/reach.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAW,SAAS,EAAe,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAajG,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAU/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,SAAS,eAAe,EAAE,CAAC;IAC/C,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;AAEjD,MAAM,MAAM,KAAK,GAAG,CAClB,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,SAAS,OAAO,EAAE,EACzB,OAAO,EAAE,OAAO,KACb,MAAM,IAAI,CAAC;AAEhB,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAE1D,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IAAE,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,IAAI,CAAA;CAAE,CAAC;AAEnF,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG;IACpC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC;IACpD,KAAK,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACxC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACvE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACvE,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,aAAa,GAAG,IAAI,CAAC;CACxD,CAAC;AAyBF,wBAAgB,KAAK,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAMpE;AAMD,wBAAgB,OAAO,CACrB,KAAK,EAAE,SAAS,GAAG,IAAI,EACvB,IAAI,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,cAAc,EAAE;QAAE,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI,CAAA;CAAE,GAC/F;IAAE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAU/D;AA2BD,wBAAgB,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,CASnE;AA8ED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,YAAY,CA4KlF"}

package/dist/reach.js

@@ -1,25 +1,26 @@
 import { unheldView } from './conversation.js';
 import { modelTypes, NO_MODEL } from './model.js';
 import { applied, observing } from './observation.js';
+import { runtimeError } from './failure.js';
+import { failure, undeclared, } from './outcome.js';
 import { beneath } from './paths.js';
 import { reconciled } from './read-side.js';
-import { moveTarget, readParts } from './room-draft.js';
+import { moveTarget, readParts, staleWrite, } from './room-draft.js';
 import { documentKey } from './rows.js';
 const UNHELD_TYPES = { collection: modelTypes(NO_MODEL), typedSelection: null };
-const UNDECLARED = { kind: 'undeclared' };
-function undeclared() {
-    return Promise.resolve(UNDECLARED);
+function unconversed(name) {
+    return () => Promise.resolve(undeclared(name));
 }
 const NO_CONVERSATION = {
     list: () => Promise.resolve([]),
     read: (conversation) => Promise.resolve(unheldView(conversation)),
-    create: undeclared,
-    send: undeclared,
-    answer: undeclared,
-    interrupt: undeclared,
-    kill: undeclared,
-    cancel: undeclared,
-    delete: undeclared,
+    create: unconversed('conversation.create'),
+    send: unconversed('conversation.send'),
+    answer: unconversed('conversation.answer'),
+    interrupt: unconversed('conversation.interrupt'),
+    kill: unconversed('conversation.kill'),
+    cancel: unconversed('conversation.cancel'),
+    delete: unconversed('conversation.delete'),
 };
 const NO_CHAT_DRAFT = {
     write: () => Promise.resolve(),
@@ -51,6 +52,20 @@ function covers(reach, room, path) {
 function conversing(reach) {
     return reach === null || reach.conversations;
 }
+function refers(reach, scope) {
+    if (reach === null)
+        return true;
+    if (scope === null)
+        return false;
+    if (scope.kind === 'conversations')
+        return reach.conversations;
+    return scope.path === undefined
+        ? wholly(reach, scope.locator)
+        : covers(reach, scope.locator, scope.path);
+}
+function unreachedReference(fileRef) {
+    return { kind: 'absent', code: 'binary-file-absent', fields: { fileRef }, retryable: false };
+}
 export function planReach(reach) {
     return reach === null
         ? null
@@ -88,7 +103,7 @@ function shownDraft(reach, draft) {
 function writeWithin(reach, write) {
     return write.outcome === 'written'
         ? { outcome: 'written', roomDraft: shownDraft(reach, write.roomDraft) }
-        : { outcome: 'stale', current: shownDraft(reach, write.current) };
+        : staleWrite(shownDraft(reach, write.current));
 }
 function savedWithin(reach, room, result) {
     if (reach === null || result.outcome === 'saved')
@@ -115,7 +130,7 @@ function queueWithin(reach, room, entries) {
         (change.kind !== 'move' || covers(reach, room, change.to))));
 }
 function unreached(room) {
-    return new Error(`No Local Replica for ${room}`);
+    return runtimeError('room-not-held', `No Local Replica for ${room}`);
 }
 export function narrowed(runtime, given) {
     const { md, watch } = runtime;
@@ -174,7 +189,7 @@ export function narrowed(runtime, given) {
                     if (next === null)
                         return;
                     held = next.keyed;
-                    deliver(next.change);
+                    deliver(next.message);
                 });
             });
         }
@@ -186,7 +201,7 @@ export function narrowed(runtime, given) {
                 return () => { };
             });
         }
-        if (topic === 'conversations') {
+        if (topic === 'conversations' || topic === 'agents') {
             return following(() => {
                 if (conversing(reach))
                     return watch(topic, input, deliver);
@@ -216,13 +231,22 @@ export function narrowed(runtime, given) {
                 throw unreached(room);
             const outside = roomDrafts.find(({ path }) => !covers(reach, room, path) ||
                 !moves(reach, room, md.roomDraft.read(room, path)?.parts.move));
-            if (outside !== undefined)
-                return { outcome: 'refused', rule: 'stale', file: outside.path };
+            if (outside !== undefined) {
+                return { outcome: 'refused', code: 'stale', retryable: false, file: outside.path };
+            }
             return savedWithin(reach, room, await md.save(room, roomDrafts, writtenBy));
         },
         history: (room, path, query) => covers(reach, room, path)
             ? md.history(room, path, query)
-            : Promise.resolve({ kind: 'room-not-readable', locator: room }),
+            : Promise.resolve(failure({ kind: 'room-not-readable', locator: room })),
+        binaryFile: {
+            read: (room, path, revision) => covers(reach, room, path)
+                ? md.binaryFile.read(room, path, revision)
+                : Promise.resolve(failure({ kind: 'room-not-readable', locator: room })),
+            readReference: (reference) => refers(reach, runtime.referrerScope(reference.referrer))
+                ? md.binaryFile.readReference(reference)
+                : Promise.resolve(unreachedReference(reference.fileRef)),
+        },
         reached: (room, roomVersion, path) => (path === undefined ? wholly(reach, room) : covers(reach, room, path)) &&
             md.reached(room, roomVersion, path),
         log: () => (reach === null ? md.log() : ''),
@@ -237,7 +261,7 @@ export function narrowed(runtime, given) {
             },
             async discard(room, path, revision) {
                 if (!covers(reach, room, path))
-                    return { outcome: 'stale', current: null };
+                    return staleWrite(null);
                 return writeWithin(reach, await md.roomDraft.discard(room, path, revision));
             },
         },
@@ -245,7 +269,7 @@ export function narrowed(runtime, given) {
             list: () => conversation().list(),
             read: (id, options) => conversation().read(id, options),
             create: (input) => conversation().create(input),
-            send: (id) => conversation().send(id),
+            send: (id, operation, draft) => conversation().send(id, operation, draft),
             answer: (id, answer) => conversation().answer(id, answer),
             interrupt: (id) => conversation().interrupt(id),
             kill: (id) => conversation().kill(id),
@@ -253,7 +277,7 @@ export function narrowed(runtime, given) {
             delete: (id) => conversation().delete(id),
         },
         chatDraft: {
-            write: (id, draft) => chatDraft().write(id, draft),
+            write: (id, draft, revision) => chatDraft().write(id, draft, revision),
             discard: (id) => chatDraft().discard(id),
         },
         observe: observing(within),

package/dist/react.d.ts

@@ -1,29 +1,38 @@
 import type { MdRuntimeClient } from './client.js';
 import type { AppRoom, ConnectionRefusal, SaveResult } from './connection.js';
-import type { ServiceMode } from './adapter.js';
-import type { ConversationEntry, ConversationOptions, ConversationView } from './conversation.js';
+import type { Member, ServiceMode } from './adapter.js';
+import type { ConversationAgent, ConversationEntry, ConversationOptions, ConversationView } from './conversation.js';
+import { type RuntimeError } from './failure.js';
 import type { QueueEntry } from './outcome.js';
-import type { DocumentQuery, DocumentResult, GroupQuery, GroupResult } from './query.js';
+import type { DocumentQuery, DocumentResult, GroupQuery, GroupResult, PendingResult } from './query.js';
 import type { RoomDraft, RoomDraftParts } from './room-draft.js';
 import type { SyncStatus } from './status.js';
 type Client = MdRuntimeClient | null;
-export declare function useObserve(client: Client, topic: 'deployment-facts'): unknown;
-export declare function useObserve(client: Client, topic: 'rooms'): readonly AppRoom[] | undefined;
-export declare function useObserve(client: Client, topic: 'connection-refusal'): ConnectionRefusal | null | undefined;
-export declare function useObserve(client: Client, topic: 'storage-loss'): string | null | undefined;
-export declare function useObserve(client: Client, topic: 'sync-status'): SyncStatus | undefined;
-export declare function useObserve(client: Client, topic: 'service-mode'): ServiceMode | undefined;
-export declare function useObserve(client: Client, topic: 'query', query: DocumentQuery): DocumentResult | undefined;
-export declare function useObserve(client: Client, topic: 'query', query: GroupQuery): GroupResult | undefined;
-export declare function useObserve(client: Client, topic: 'queue', locator: string): readonly QueueEntry[] | undefined;
-export declare function useObserve(client: Client, topic: 'room-drafts'): readonly RoomDraft[] | undefined;
-export declare function useObserve(client: Client, topic: 'presentation'): unknown;
-export declare function useObserve(client: Client, topic: 'conversation', conversation: string, options: ConversationOptions): ConversationView | undefined;
-export declare function useObserve(client: Client, topic: 'conversations'): readonly ConversationEntry[] | undefined;
+export type Observed<T> = {
+    readonly state: 'loading';
+} | {
+    readonly state: 'ready';
+    readonly value: T;
+};
+export declare function useObserve(client: Client, topic: 'deployment-facts'): Observed<unknown>;
+export declare function useObserve(client: Client, topic: 'rooms'): Observed<readonly AppRoom[]>;
+export declare function useObserve(client: Client, topic: 'connection-refusal'): Observed<ConnectionRefusal | null>;
+export declare function useObserve(client: Client, topic: 'storage-loss'): Observed<string | null>;
+export declare function useObserve(client: Client, topic: 'sync-status'): Observed<SyncStatus>;
+export declare function useObserve(client: Client, topic: 'service-mode'): Observed<ServiceMode>;
+export declare function useObserve(client: Client, topic: 'member'): Observed<Member | null>;
+export declare function useObserve(client: Client, topic: 'query', query: DocumentQuery): Observed<DocumentResult | PendingResult>;
+export declare function useObserve(client: Client, topic: 'query', query: GroupQuery): Observed<GroupResult | PendingResult>;
+export declare function useObserve(client: Client, topic: 'queue', locator: string): Observed<readonly QueueEntry[]>;
+export declare function useObserve(client: Client, topic: 'room-drafts'): Observed<readonly RoomDraft[]>;
+export declare function useObserve(client: Client, topic: 'presentation'): Observed<unknown>;
+export declare function useObserve(client: Client, topic: 'conversation', conversation: string, options: ConversationOptions): Observed<ConversationView>;
+export declare function useObserve(client: Client, topic: 'conversations'): Observed<readonly ConversationEntry[]>;
+export declare function useObserve(client: Client, topic: 'agents'): Observed<readonly ConversationAgent[]>;
 export type Saving = {
     readonly busy: boolean;
     readonly outcome: SaveResult | null;
-    readonly failure: Error | null;
+    readonly failure: RuntimeError | null;
     save(room: string, roomDrafts: ReadonlyMap<string, RoomDraftParts>): Promise<SaveResult>;
 };
 export declare function saveRoomDrafts(client: MdRuntimeClient, room: string, roomDrafts: ReadonlyMap<string, RoomDraftParts>): Promise<SaveResult>;