@agentshouse/mdruntime-adapter 0.1.0-cc63dd043d0e2 → 0.1.0-cca5d676bc88e

package/dist/links.js

@@ -8,7 +8,7 @@ function linkedBy(text) {
     return references.size === 0 ? NONE : references;
 }
 function handedOf(attachments) {
-    return new Set((attachments ?? []).map((attachment) => attachment.reference));
+    return new Map((attachments ?? []).map((attachment) => [attachment.reference, attachment]));
 }
 export function scopeLinks(scope) {
     return {
@@ -24,6 +24,44 @@ function revised(revisions, path, revision) {
     else
         revisions.set(path, revision);
 }
+export function heldLinks(held) {
+    return {
+        roomVersion: held.roomVersion,
+        handed: handedOf(held.attachments),
+        paths: new Map(Object.entries(held.documents).map(([path, text]) => [path, linkedBy(text)])),
+        revisions: new Map(Object.entries(held.revisions)),
+    };
+}
+export function acceptedLinks(held, accepted, roomVersion, originals) {
+    const paths = new Map(held.paths);
+    const revisions = new Map(held.revisions);
+    const handed = new Map(held.handed);
+    const answered = handedOf(originals);
+    for (const [path, text] of Object.entries(accepted.documents)) {
+        const linked = linkedBy(text);
+        for (const reference of linked) {
+            const original = answered.get(reference);
+            if (!handed.has(reference) && original !== undefined)
+                handed.set(reference, original);
+        }
+        paths.set(path, linked);
+    }
+    for (const [path, revision] of Object.entries(accepted.revisions))
+        revisions.set(path, revision);
+    for (const path of accepted.removals) {
+        paths.delete(path);
+        revisions.delete(path);
+    }
+    const linked = new Set([...paths.values()].flatMap((references) => [...references]));
+    for (const reference of held.handed.keys()) {
+        const before = [...held.paths.values()].some((references) => references.has(reference));
+        if (before && !linked.has(reference))
+            handed.delete(reference);
+    }
+    const links = { roomVersion, handed, paths, revisions };
+    const changed = handed.size !== held.handed.size || [...handed.keys()].some((key) => !held.handed.has(key));
+    return changed ? { links, attachments: [...handed.values()] } : { links };
+}
 export function enumeratedLinks(view, earlier) {
     const paths = new Map(earlier?.paths);
     const revisions = new Map(earlier?.revisions);
@@ -50,7 +88,7 @@ export function streamedLinks(held, advanced) {
         for (const reference of linked)
             if (!held.handed.has(reference))
                 return null;
-        for (const reference of paths.get(entry.path) ?? held.handed) {
+        for (const reference of paths.get(entry.path) ?? held.handed.keys()) {
             if (held.handed.has(reference) && !linked.has(reference))
                 dropped.add(reference);
         }

package/dist/model.d.ts

@@ -1,19 +1,8 @@
-import type { AdapterFailure, ModelIdentity, ModelRequest, ModelResult } from '@agentshouse/mdruntime';
-import type { HouseSchema } from './read.js';
-export type HeldModel = {
-    snapshot: ModelResult;
-    identity: ModelIdentity | null;
-};
-export declare const MODEL_ABSENT: ModelResult;
-export declare function failedModel(failure: AdapterFailure | {
-    kind: 'beyond-horizon';
-}): ModelResult;
-export declare function modelKey(locator: string, attached: ModelRequest['attached']): string;
-export declare function heldModel(read: HouseSchema | null, identity: string, failure: ModelResult): Promise<HeldModel>;
-export type ModelShelf = {
-    retain(key: string, acquired: HeldModel | undefined): HeldModel | undefined;
-    answer(request: ModelRequest): ModelResult;
-    keep(locators: readonly string[]): void;
-};
-export declare function modelShelf(): ModelShelf;
+import type { RoomModels } from '@agentshouse/mdruntime';
+import type { TrackedAuthority } from './discovery.js';
+import { type HouseScope, type HouseView } from './read.js';
+import type { HouseMode, HouseStreamEntry } from './transport.js';
+export declare function scopeModels(scope: HouseScope, tracked: TrackedAuthority): Promise<RoomModels | undefined>;
+export declare function viewModels(view: HouseView, tracked: TrackedAuthority): Promise<RoomModels | undefined>;
+export declare function streamedModels(schemas: ReadonlyMap<string, HouseStreamEntry>, tracked: TrackedAuthority, mode: HouseMode): Promise<RoomModels | undefined>;
 //# sourceMappingURL=model.d.ts.map

package/dist/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,YAAY,EACZ,WAAW,EACZ,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAA;CAAE,CAAC;AAElF,eAAO,MAAM,YAAY,EAAE,WAAmE,CAAC;AAE/F,wBAAgB,WAAW,CAAC,OAAO,EAAE,cAAc,GAAG;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAAG,WAAW,CAI7F;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC,GAAG,MAAM,CAEpF;AAED,wBAAsB,SAAS,CAC7B,IAAI,EAAE,WAAW,GAAG,IAAI,EACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,SAAS,CAAC,CAOpB;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IAC5E,MAAM,CAAC,OAAO,EAAE,YAAY,GAAG,WAAW,CAAC;IAC3C,IAAI,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CACzC,CAAC;AAEF,wBAAgB,UAAU,IAAI,UAAU,CAqBvC"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAA0C,KAAK,UAAU,EAAE,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AACpG,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAiClE,wBAAgB,WAAW,CACzB,KAAK,EAAE,UAAU,EACjB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAEjC;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAQjC;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAC9C,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CASjC"}

package/dist/model.js

@@ -1,46 +1,53 @@
 import { sha256Hex } from './digest.js';
-export const MODEL_ABSENT = { kind: 'model-unavailable', reason: 'not-readable' };
-export function failedModel(failure) {
-    if (failure.kind === 'revoked-authorization')
-        return { kind: 'revoked-authorization' };
-    if (failure.kind === 'transport-uncertainty')
-        return { kind: 'transport-uncertainty' };
-    return MODEL_ABSENT;
-}
-export function modelKey(locator, attached) {
-    return `${locator} ${attached}`;
-}
-export async function heldModel(read, identity, failure) {
+import { schemaOf, schemaPath } from './read.js';
+const MODEL_ABSENT = { kind: 'model-unavailable', reason: 'not-readable' };
+const ABSENT_SCHEMA = { schema: null, version: null };
+async function heldModel(read, identity) {
     if (read === null)
-        return { snapshot: failure, identity: null };
+        return MODEL_ABSENT;
     const version = await sha256Hex(JSON.stringify(read.version));
-    return {
-        snapshot: { kind: 'model', snapshot: { identity, version, schema: read.schema } },
-        identity: { identity, version },
-    };
+    return { kind: 'model', snapshot: { identity, version, schema: read.schema } };
+}
+async function modelsOf(tracked, read) {
+    const models = {};
+    const collection = read(tracked.schema);
+    if (collection !== undefined) {
+        models.collection = await heldModel(collection, schemaPath(tracked.handle, tracked.schema));
+    }
+    if (tracked.houseModel !== null) {
+        const root = tracked.houseModel.root;
+        const selection = read(root);
+        if (selection !== undefined) {
+            models.selection = await heldModel(selection, schemaPath(tracked.handle, root));
+        }
+    }
+    return models.collection === undefined && models.selection === undefined ? undefined : models;
+}
+export function scopeModels(scope, tracked) {
+    return modelsOf(tracked, (schema) => schemaOf(scope, schema));
+}
+export function viewModels(view, tracked) {
+    return modelsOf(tracked, (schema) => {
+        const change = view.changes.find((candidate) => candidate.path === schema);
+        if (change === undefined)
+            return undefined;
+        if ('removed' in change)
+            return ABSENT_SCHEMA;
+        if ('content' in change)
+            return { schema: change.content, version: change.version };
+        return null;
+    });
 }
-export function modelShelf() {
-    const models = new Map();
-    return {
-        retain(key, acquired) {
-            if (acquired === undefined)
-                return models.get(key);
-            if (acquired.snapshot.kind === 'transport-uncertainty') {
-                const previous = models.get(key);
-                if (previous !== undefined && previous.identity !== null)
-                    return previous;
-            }
-            models.set(key, acquired);
-            return acquired;
-        },
-        answer(request) {
-            return models.get(modelKey(request.locator, request.attached))?.snapshot ?? MODEL_ABSENT;
-        },
-        keep(locators) {
-            for (const key of [...models.keys()]) {
-                if (!locators.some((locator) => key.startsWith(`${locator} `)))
-                    models.delete(key);
-            }
-        },
-    };
+export function streamedModels(schemas, tracked, mode) {
+    return modelsOf(tracked, (schema) => {
+        const entry = schemas.get(schema);
+        if (entry === undefined)
+            return undefined;
+        if (entry.kind === 'removed')
+            return ABSENT_SCHEMA;
+        if (entry.text === undefined)
+            return null;
+        const version = mode === 'site' ? entry.sha256 : entry.revision;
+        return version === undefined ? null : { schema: entry.text, version };
+    });
 }

package/dist/read.d.ts

@@ -61,6 +61,7 @@ export declare function headChange(held: {
     readonly author?: unknown;
     readonly created_at?: unknown;
 }): HeadChange | undefined | null;
+export declare function parseOriginals(value: unknown): readonly RoomAttachment[] | null;
 export declare function parseEnvelope(body: unknown): HouseEnvelope | null;
 export declare function parseSiteBootstrap(body: unknown): HouseScope | null;
 export declare function parseEnumeration(body: unknown, mode: HouseMode): HouseEnumeration | null;
@@ -71,7 +72,6 @@ export type HouseSchema = {
     schema: string | null;
     version: string | null;
 };
-export declare function schemaFrom(envelope: HouseEnvelope, tracked: TrackedAuthority, schema: string): HouseSchema | null;
 export declare function schemaOf(scope: HouseScope, schema: string): HouseSchema | null;
 export declare function viewOf(enumeration: HouseEnumeration, tracked: TrackedAuthority): HouseView | undefined;
 export declare function refreshFrom(view: HouseView, fromRoomVersion: string): RefreshResult;

package/dist/read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../src/read.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../src/read.ts"],"names":[],"mappings":"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"}

package/dist/read.js

@@ -3,7 +3,10 @@ export function authorityRoot(handle) {
     return `/rooms/${handle}`;
 }
 export function contentPrefixes(tracked) {
-    return [authorityRoot(tracked.handle)];
+    return [
+        authorityRoot(tracked.handle),
+        ...tracked.schemas.map((schema) => schemaPath(tracked.handle, schema)),
+    ];
 }
 export function schemaPath(handle, schema) {
     return `${authorityRoot(handle)}/${schema}`;
@@ -60,7 +63,7 @@ function parseOriginal(value) {
         return null;
     return { reference: attachment, name, byteLength: bytes, mediaType, entry: value };
 }
-function parseOriginals(value) {
+export function parseOriginals(value) {
     if (!Array.isArray(value))
         return null;
     const attachments = [];
@@ -282,12 +285,6 @@ export function bootstrapOf(scope) {
         ...declared(scope.attachments),
     };
 }
-export function schemaFrom(envelope, tracked, schema) {
-    const scope = envelope.scopes.find((entry) => matchesScope(entry, tracked));
-    if (scope === undefined)
-        return null;
-    return schemaOf(scope, schema);
-}
 export function schemaOf(scope, schema) {
     const file = scope.files.find((entry) => entry.path === schema);
     if (file === undefined)

package/dist/site.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"site.d.ts","sourceRoot":"","sources":["../src/site.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAQR,MAAM,wBAAwB,CAAC;AA+BhC,OAAO,EAML,KAAK,kBAAkB,EACxB,MAAM,gBAAgB,CAAC;AAsCxB,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,GAAG,OAAO,CAuKxE"}
+{"version":3,"file":"site.d.ts","sourceRoot":"","sources":["../src/site.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAMR,MAAM,wBAAwB,CAAC;AAsBhC,OAAO,EAML,KAAK,kBAAkB,EACxB,MAAM,gBAAgB,CAAC;AA+BxB,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,GAAG,OAAO,CAiIxE"}

package/dist/site.js

@@ -1,42 +1,32 @@
 import { actionOutcome } from './actions.js';
 import { mapDiscovery, parseSiteDiscovery, siteCapabilities, siteTracked, } from './discovery.js';
-import { MODEL_ABSENT, failedModel, heldModel, modelKey, modelShelf, } from './model.js';
-import { advancedScope, bootstrapOf, parseEnumeration, parseSiteBootstrap, refreshFrom, schemaOf, schemaPath, viewOf, } from './read.js';
-import { classifyDoor, discoveryFailure, doorRefusal } from './refusal.js';
+import { scopeModels, streamedModels, viewModels } from './model.js';
+import { advancedScope, bootstrapOf, parseEnumeration, parseSiteBootstrap, refreshFrom, viewOf, } from './read.js';
+import { classifyDoor, discoveryFailure } from './refusal.js';
 import { houseNotifications } from './stream.js';
 import { PRIVATE_LOCATOR, SITE_DOOR_BOOTSTRAP, SITE_DOOR_DISCOVER, SITE_DOOR_ENUMERATE, SITE_DOOR_SUBMIT, } from './transport.js';
-import { logPosition, presented, reachedVersion, roomVersion, } from './version.js';
+import { followsVersion, logPosition, presented, reachedVersion, roomVersion, } from './version.js';
 const UNCERTAIN = { kind: 'transport-uncertainty' };
-function siteRoom(tracked, attachedModel) {
+function siteRoom(tracked) {
     return {
         name: tracked.handle,
         locator: tracked.locator,
         roomVersion: roomVersion(tracked),
         operations: { read: [''], sync: [''], write: [], delete: [] },
         replica: { selection: tracked.locator, admission: 'admitted' },
-        attachedModel,
         providerOwnedPaths: [],
     };
 }
 function settled(refused) {
-    return refused.kind === 'beyond-horizon' || refused.kind === 'retryable-refusal'
-        ? UNCERTAIN
-        : refused;
+    return refused.kind === 'beyond-horizon' ? UNCERTAIN : refused;
 }
 export function createSiteAdapter(transport) {
     const notifications = houseNotifications(transport, 'site');
     const tracked = new Map();
-    const models = modelShelf();
-    const acquired = new Map();
-    let caught = new Map();
     async function enumeration(entry, from) {
         const answer = await transport.door(SITE_DOOR_ENUMERATE, {
             positions: [presented(entry.authority, from)],
         });
-        const behind = doorRefusal(answer.body);
-        if (behind?.code === 'replica_behind' && behind.retryable) {
-            return { kind: 'retryable-refusal', code: behind.code, fields: behind.fields };
-        }
         const classified = classifyDoor(answer.status, answer.body, entry.locator);
         if (classified !== null)
             return classified;
@@ -65,31 +55,27 @@ export function createSiteAdapter(transport) {
         if (from === null)
             return { kind: 'beyond-horizon' };
         const streamed = notifications.advance(entry, from);
-        if (streamed !== null)
-            return streamed.page;
+        if (streamed !== null) {
+            const models = await streamedModels(streamed.schemas, entry, 'site');
+            return models === undefined ? streamed.page : { ...streamed.page, models };
+        }
         const found = await enumeration(entry, from);
         if ('kind' in found)
             return found;
         const view = viewOf(found, entry);
         if (view === undefined)
             return { kind: 'room-not-readable', locator: entry.locator };
-        notifications.hold(entry.authority, view);
-        return refreshFrom(view, fromRoomVersion);
-    }
-    async function acquire(entry, held) {
-        if ('failure' in held)
-            return { snapshot: failedModel(held.failure), identity: null };
-        const model = await heldModel(schemaOf(held.scope, entry.schema), schemaPath(entry.handle, entry.schema), MODEL_ABSENT);
-        acquired.set(entry.authority, { roomVersion: roomVersion(held.scope), model });
-        return model;
+        notifications.reach(entry.authority, view);
+        const answer = refreshFrom(view, fromRoomVersion);
+        if (answer.kind !== 'net-advancement')
+            return answer;
+        const models = await viewModels(view, entry);
+        return models === undefined ? answer : { ...answer, models };
     }
     return {
         async authorize() {
             return {};
         },
-        async model(_authorization, request) {
-            return models.answer(request);
-        },
         async discover() {
             const answer = await transport.read(SITE_DOOR_DISCOVER);
             const classified = classifyDoor(answer.status, answer.body, PRIVATE_LOCATOR);
@@ -103,30 +89,7 @@ export function createSiteAdapter(transport) {
             for (const entry of entries)
                 tracked.set(entry.locator, entry);
             notifications.track(entries);
-            const published = new Set(entries.map((entry) => entry.authority));
-            for (const authority of [...acquired.keys()]) {
-                if (!published.has(authority))
-                    acquired.delete(authority);
-            }
-            const fresh = new Map();
-            const current = new Map();
-            for (const entry of entries) {
-                const kept = acquired.get(entry.authority);
-                if (kept !== undefined && kept.roomVersion === roomVersion(entry)) {
-                    current.set(entry.authority, kept.model);
-                    continue;
-                }
-                const held = await caughtUp(entry);
-                fresh.set(entry.authority, held);
-                current.set(entry.authority, await acquire(entry, held));
-            }
-            caught = fresh;
-            const rooms = entries.map((entry) => {
-                const shelved = models.retain(modelKey(entry.locator, 'collection'), current.get(entry.authority));
-                return siteRoom(entry, shelved?.identity ?? null);
-            });
-            models.keep(entries.map((entry) => entry.locator));
-            return mapDiscovery(document, rooms, siteCapabilities());
+            return mapDiscovery(document, entries.map(siteRoom), siteCapabilities());
         },
         async bootstrap(_authorization, request) {
             const entry = tracked.get(request.locator);
@@ -134,11 +97,12 @@ export function createSiteAdapter(transport) {
                 return { kind: 'room-not-readable', locator: request.locator };
             if (request.pageToken !== undefined)
                 return UNCERTAIN;
-            const held = caught.get(entry.authority) ?? (await caughtUp(entry));
+            const held = await caughtUp(entry);
             if ('failure' in held)
                 return held.failure;
-            notifications.hold(entry.authority, held.scope);
-            return bootstrapOf(held.scope);
+            notifications.reach(entry.authority, held.scope);
+            const models = await scopeModels(held.scope, entry);
+            return { ...bootstrapOf(held.scope), ...(models === undefined ? {} : { models }) };
         },
         async refresh(_authorization, request) {
             const entry = tracked.get(request.locator);
@@ -146,20 +110,7 @@ export function createSiteAdapter(transport) {
                 return { kind: 'room-not-readable', locator: request.locator };
             if (request.pageToken !== undefined)
                 return UNCERTAIN;
-            const result = await refreshed(entry, request.fromRoomVersion);
-            if (result.kind === 'beyond-horizon')
-                caught.delete(entry.authority);
-            const answered = result.kind === 'net-advancement'
-                ? result.roomVersion
-                : result.kind === 'still-current'
-                    ? request.fromRoomVersion
-                    : null;
-            if (request.minPosition !== undefined &&
-                answered !== null &&
-                !reachedVersion(answered, request.minPosition, entry.logEpoch)) {
-                return { kind: 'retryable-refusal', code: 'replica_behind', fields: {} };
-            }
-            return result;
+            return refreshed(entry, request.fromRoomVersion);
         },
         async mutate() {
             return { kind: 'rejected', affected: {}, code: 'write-grant', fields: {} };
@@ -170,6 +121,9 @@ export function createSiteAdapter(transport) {
         reached(locator, version, target) {
             return reachedVersion(version, target, tracked.get(locator)?.logEpoch);
         },
+        follows(_locator, version, next) {
+            return followsVersion(version, next);
+        },
         async action(_authorization, request) {
             if (request.name !== 'submit') {
                 return { kind: 'rejected', code: 'action-unimplemented', fields: { name: request.name } };
@@ -178,7 +132,19 @@ export function createSiteAdapter(transport) {
                 return UNCERTAIN;
             return actionOutcome(await transport.door(SITE_DOOR_SUBMIT, request.input), 'submit');
         },
-        roomVersions: notifications,
+        roomStream: {
+            hold(rooms) {
+                notifications.send(rooms.flatMap((room) => {
+                    const entry = tracked.get(room.locator);
+                    const at = logPosition(room.roomVersion);
+                    if (entry === undefined || at === null)
+                        return [];
+                    notifications.reach(entry.authority, at);
+                    return [presented(entry.authority, at)];
+                }));
+            },
+            observe: notifications.observe,
+        },
         serviceMode: notifications.serviceMode,
     };
 }

package/dist/stream.d.ts

@@ -1,15 +1,19 @@
-import type { ConversationStream, RefreshPage, SelectedRooms, ServiceModeSignal } from '@agentshouse/mdruntime';
+import type { ConversationStream, RefreshPage, RoomStreamEvent, ServiceModeSignal } from '@agentshouse/mdruntime';
 import type { TrackedAuthority } from './discovery.js';
-import type { HouseDoor, HouseMode, HouseStreamEntry } from './transport.js';
+import type { HouseDoor, HouseHeldRoom, HouseMode, HouseStreamEntry } from './transport.js';
 import { type LogPosition } from './version.js';
 export type HeldRevision = (path: string, revision: string) => boolean;
 export type StreamedAdvancement = {
     page: RefreshPage;
     entries: readonly HouseStreamEntry[];
+    schemas: ReadonlyMap<string, HouseStreamEntry>;
 };
-export type HouseNotifications = SelectedRooms & {
+export type HouseNotifications = {
+    runtime: string;
+    observe(notify: (event: RoomStreamEvent) => void): () => void;
+    send(rooms: readonly HouseHeldRoom[]): void;
     track(authorities: readonly TrackedAuthority[]): void;
-    hold(authority: string, at: LogPosition): void;
+    reach(authority: string, at: LogPosition): void;
     advance(tracked: TrackedAuthority, from: LogPosition, holds?: HeldRevision): StreamedAdvancement | null;
     conversations: ConversationStream;
     serviceMode: ServiceModeSignal;

package/dist/stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../src/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,kBAAkB,EAClB,WAAW,EAEX,aAAa,EAEb,iBAAiB,EAElB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAoB,MAAM,gBAAgB,CAAC;AAC/F,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAgB7D,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;AAEvE,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,SAAS,gBAAgB,EAAE,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG;IAC/C,KAAK,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,GAAG,IAAI,CAAC;IACtD,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,GAAG,IAAI,CAAC;IAC/C,OAAO,CACL,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,WAAW,EACjB,KAAK,CAAC,EAAE,YAAY,GACnB,mBAAmB,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,kBAAkB,CAAC;IAClC,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AAYF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,kBAAkB,CA2P5F"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../src/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,kBAAkB,EAElB,WAAW,EACX,eAAe,EAEf,iBAAiB,EAElB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EAEb,SAAS,EAET,gBAAgB,EAEjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAgB7D,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;AAEvE,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,SAAS,gBAAgB,EAAE,CAAC;IACrC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IAC9D,IAAI,CAAC,KAAK,EAAE,SAAS,aAAa,EAAE,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,GAAG,IAAI,CAAC;IACtD,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,GAAG,IAAI,CAAC;IAChD,OAAO,CACL,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,WAAW,EACjB,KAAK,CAAC,EAAE,YAAY,GACnB,mBAAmB,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,kBAAkB,CAAC;IAClC,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AAuBF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,kBAAkB,CAoS5F"}