@agentshouse/mdruntime 0.1.0-c3903a68dcbbf → 0.1.0-c6e4c19c13638

package/dist/host.js

@@ -1,26 +1,19 @@
 import { composeRuntime, } from './connection.js';
 import { removeRuntimeStore } from './store.js';
-import { AUTHORIZATION_ENDED, carried, envelope, PROTOCOL_MISMATCH, request, } from './wire.js';
-function answered(md, app, writtenBy, member, input, deploymentFacts) {
+import { AUTHORIZATION_ENDED, request, WIRE_REACH, } from './wire.js';
+const NARROWED = new Set(['within', 'whole']);
+function answered(md, app, writtenBy, member, input) {
     switch (member) {
         case 'rooms':
             return md.rooms();
-        case 'slots':
-            return md.slots();
         case 'query':
             return md.query(input[0]);
         case 'search':
             return md.search(input[0]);
         case 'types':
             return md.types(input[0]);
-        case 'syncStatus':
-            return md.syncStatus();
-        case 'serviceMode':
-            return md.serviceMode();
         case 'save':
             return md.save(input[0], input[1], writtenBy);
-        case 'outcome':
-            return md.outcome(input[0]);
         case 'history':
             return md.history(input[0], input[1], input[2]);
         case 'call':
@@ -29,10 +22,6 @@ function answered(md, app, writtenBy, member, input, deploymentFacts) {
             return md.reached(input[0], input[1], input[2]);
         case 'log':
             return md.log();
-        case 'storageLoss':
-            return md.storageLoss();
-        case 'deploymentFacts':
-            return structuredClone(deploymentFacts);
         case 'persistence':
             return md.persistence();
         case 'reauthorize':
@@ -74,7 +63,7 @@ function answered(md, app, writtenBy, member, input, deploymentFacts) {
     }
 }
 export function serveMdRuntime(options) {
-    let deploymentFacts = structuredClone(options.deploymentFacts);
+    const deploymentFacts = structuredClone(options.deploymentFacts);
     const closing = new AbortController();
     const close = () => {
         closing.abort();
@@ -83,61 +72,61 @@ export function serveMdRuntime(options) {
     if (options.signal?.aborted === true)
         close();
     const runtime = composeRuntime({ ...options, signal: closing.signal });
-    const { md, watch } = runtime;
+    const { md } = runtime;
     const attachments = new Map();
     let authorized = true;
-    const factsObservers = new Set();
     const watchFacts = (deliver) => {
-        factsObservers.add(deliver);
         deliver(structuredClone(deploymentFacts));
-        return () => {
-            factsObservers.delete(deliver);
-        };
+        return () => { };
     };
-    function attach(port, app, release) {
+    function attach(port, app, release, reach) {
         if (!authorized)
             throw new Error(AUTHORIZATION_ENDED);
         const writtenBy = release === undefined ? undefined : { app, release };
-        const subscriptions = new Map();
+        const view = runtime.within(reach ?? null);
+        const observations = new Map();
         let serving = true;
         const send = (message) => {
-            port.postMessage(envelope(message));
+            port.postMessage(message);
         };
         const detach = () => {
             if (!serving)
                 return;
             serving = false;
-            for (const end of subscriptions.values())
+            for (const end of observations.values())
                 end();
-            subscriptions.clear();
+            observations.clear();
             attachments.delete(detach);
         };
+        const observe = (id, topic, input) => {
+            let resolved = false;
+            const deliver = (value) => {
+                if (!serving)
+                    return;
+                send(resolved ? { kind: 'event', id, value } : { kind: 'result', id, value });
+                resolved = true;
+            };
+            observations.set(id, topic === 'deployment-facts'
+                ? watchFacts(deliver)
+                : (NARROWED.has(WIRE_REACH.topics[topic]) ? view : runtime).watch(topic, topic === 'presentation' ? [app] : input, deliver));
+        };
         const serve = async (message) => {
             if (message.kind === 'hello')
                 return;
             if (message.kind === 'stop') {
-                subscriptions.get(message.id)?.();
-                subscriptions.delete(message.id);
+                observations.get(message.id)?.();
+                observations.delete(message.id);
                 return;
             }
             try {
                 if (message.kind !== 'observe' || message.topic !== 'room-drafts')
                     await md.loaded();
                 if (message.kind === 'observe') {
-                    const { id, topic } = message;
-                    let resolved = false;
-                    const deliver = (value) => {
-                        if (!serving)
-                            return;
-                        send(resolved ? { kind: 'event', id, value } : { kind: 'result', id, value });
-                        resolved = true;
-                    };
-                    subscriptions.set(id, topic === 'deployment-facts'
-                        ? watchFacts(deliver)
-                        : watch(topic, topic === 'presentation' ? [app] : message.input, deliver));
+                    if (serving)
+                        observe(message.id, message.topic, message.input);
                     return;
                 }
-                const value = await answered(md, app, writtenBy, message.member, message.input, deploymentFacts);
+                const value = await answered(NARROWED.has(WIRE_REACH.members[message.member]) ? view.md : md, app, writtenBy, message.member, message.input);
                 if (serving)
                     send({ kind: 'result', id: message.id, value });
             }
@@ -154,15 +143,7 @@ export function serveMdRuntime(options) {
         port.addEventListener('message', (event) => {
             if (!serving)
                 return;
-            const wire = carried(event.data);
-            if (wire === null)
-                return;
-            if (!wire.matching) {
-                send({ kind: 'refusal', refusal: PROTOCOL_MISMATCH });
-                detach();
-                return;
-            }
-            const message = request(wire.message);
+            const message = request(event.data);
             if (message === null)
                 return;
             void serve(message);
@@ -170,17 +151,16 @@ export function serveMdRuntime(options) {
         port.addEventListener('close', detach);
         port.start();
         attachments.set(detach, send);
-        return detach;
+        return {
+            detach,
+            narrow(next) {
+                if (serving)
+                    view.narrow(next);
+            },
+        };
     }
     return {
         attach,
-        replaceDeploymentFacts(value) {
-            if (!authorized)
-                throw new Error(AUTHORIZATION_ENDED);
-            deploymentFacts = structuredClone(value);
-            for (const deliver of factsObservers)
-                deliver(structuredClone(deploymentFacts));
-        },
         async endAuthorization() {
             authorized = false;
             for (const [detach, send] of [...attachments]) {

package/dist/index.d.ts

@@ -1,15 +1,14 @@
-export type { AcceptedMessage, ActionDeclaration, ActionRequest, ActionResult, Adapter, AdapterFailure, Authorization, BootstrapPage, BootstrapRequest, BootstrapResult, Capability, ChangeAuthor, ContractUnavailable, ConversationAction, ConversationCards, ConversationEvent, ConversationHistories, ConversationHistoryPage, ConversationHistoryRequest, ConversationMessage, ConversationStream, DiscoverResult, DiscoveredRoom, Discovery, HistoryAuthor, HistoryRequest, HistoryResult, HistoryRetention, HistoryRevision, MdModelIdentity, ModelRequest, MutationRequest, MutationResult, PageToken, ProviderLimit, ProviderRefusal, RefreshPage, RefreshRequest, RefreshResult, Retention, RetryableRefusal, RevokedAuthorization, RoomAttachment, RoomNotReadable, RoomVersionAt, RoomVersionNotification, SelectedRooms, ServiceMode, ServiceModeSignal, TransportUncertainty, TypedSelection, WorkingNote, } from './adapter.js';
+export type { AcceptedMessage, ActionDeclaration, ActionRequest, ActionResult, Adapter, AdapterFailure, Authorization, BootstrapPage, BootstrapRequest, BootstrapResult, Capability, ChangeAuthor, ContractUnavailable, ConversationAction, ConversationAgents, ConversationEvent, ConversationHistories, ConversationHistoryPage, ConversationHistoryRequest, ConversationMessage, ConversationStream, DiscoverResult, DiscoveredRoom, Discovery, HistoryAuthor, HistoryRequest, HistoryResult, HistoryRetention, HistoryRevision, HeldRoom, ListedConversation, MdModelIdentity, MutationRequest, MutationResult, PageToken, ProviderLimit, ProviderRefusal, RefreshPage, RefreshRequest, RefreshResult, Retention, RetryableRefusal, RevokedAuthorization, RoomAttachment, RoomModels, RoomNotReadable, RoomStream, RoomStreamEvent, RoomVersionAt, ServiceMode, ServiceModeSignal, TransportUncertainty, TurnContext, TurnOperation, TypedSelection, } from './adapter.js';
 export type { Change, ChangeBatch, Precondition, WrittenBy } from './change.js';
-export type { ChatDraft, ChatDraftSurface, ConversationEntry, ConversationOptions, ConversationSurface, ConversationView, GrowingText, } from './conversation.js';
+export type { ChatDraft, ChatDraftSurface, ConversationEntry, ConversationOptions, ConversationState, ConversationSurface, ConversationView, RunningTurn, } from './conversation.js';
 export type { ChatDraftFile, FileDeclaration } from './file.js';
-export type { AppRoom, AppSlot, AppSlotEntry, AppTypedSelection, ConnectionRefusal, ConnectionRefusalReason, HistoryQuery, MdRuntime, MdRuntimeOptions, PresentationSurface, RoomDraftSurface, RoomTypes, SavedRoomDraft, SaveResult, } from './connection.js';
+export type { AppRoom, AppTypedSelection, ConnectionRefusal, ConnectionRefusalReason, HistoryQuery, MdRuntime, MdRuntimeOptions, PresentationSurface, RoomDraftSurface, RoomSchemas, SavedRoomDraft, SaveResult, } from './connection.js';
 export type { Observation } from './observation.js';
-export type { AcceptedOutcome, AffectedState, CallResult, QueueEntry, Submission, SubmissionOutcome, } from './outcome.js';
+export type { CallResult, QueueEntry, Submission } from './outcome.js';
 export type { ChangedPart, FieldValue, ReturnReason, RoomDraft, RoomDraftCreation, RoomDraftParts, RoomDraftWrite, } from './room-draft.js';
 export type { SaveRefusal } from './save.js';
 export type { DocumentHit, DocumentPart, MessageHit, SearchRequest, SearchResult, } from './search.js';
 export { changeBatchIdentity } from './identity.js';
-export { createMdRuntime } from './connection.js';
 export type { RuntimeShell } from './durability.js';
 export type { AttentionEntry, SyncStatus } from './status.js';
 export type { Backlink, Direction, DocumentQuery, DocumentResult, Filter, GroupQuery, GroupResult, Key, LocalQuery, OrderOptions, Predicate, QueryDocument, QueryGroup, QueryResult, Related, Select, Value, Where, } from './query.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,YAAY,EACZ,OAAO,EACP,cAAc,EACd,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,UAAU,EACV,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,EACvB,0BAA0B,EAC1B,mBAAmB,EACnB,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,SAAS,EACT,aAAa,EACb,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,YAAY,EACZ,eAAe,EACf,cAAc,EACd,SAAS,EACT,aAAa,EACb,eAAe,EACf,WAAW,EACX,cAAc,EACd,aAAa,EACb,SAAS,EACT,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,eAAe,EACf,aAAa,EACb,uBAAuB,EACvB,aAAa,EACb,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,cAAc,EACd,WAAW,GACZ,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAChF,YAAY,EACV,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,EAChB,WAAW,GACZ,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAChE,YAAY,EACV,OAAO,EACP,OAAO,EACP,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,uBAAuB,EACvB,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,SAAS,EACT,cAAc,EACd,UAAU,GACX,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,YAAY,EACV,eAAe,EACf,aAAa,EACb,UAAU,EACV,UAAU,EACV,UAAU,EACV,iBAAiB,GAClB,MAAM,cAAc,CAAC;AACtB,YAAY,EACV,WAAW,EACX,UAAU,EACV,YAAY,EACZ,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,cAAc,GACf,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,YAAY,EACV,WAAW,EACX,YAAY,EACZ,UAAU,EACV,aAAa,EACb,YAAY,GACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9D,YAAY,EACV,QAAQ,EACR,SAAS,EACT,aAAa,EACb,cAAc,EACd,MAAM,EACN,UAAU,EACV,WAAW,EACX,GAAG,EACH,UAAU,EACV,YAAY,EACZ,SAAS,EACT,aAAa,EACb,UAAU,EACV,WAAW,EACX,OAAO,EACP,MAAM,EACN,KAAK,EACL,KAAK,GACN,MAAM,YAAY,CAAC;AAEpB,YAAY,EACV,MAAM,EACN,aAAa,EACb,aAAa,EACb,UAAU,EACV,WAAW,EACX,WAAW,EACX,iBAAiB,GAClB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,YAAY,EACZ,OAAO,EACP,cAAc,EACd,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,UAAU,EACV,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,EACvB,0BAA0B,EAC1B,mBAAmB,EACnB,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,SAAS,EACT,aAAa,EACb,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,QAAQ,EACR,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,cAAc,EACd,SAAS,EACT,aAAa,EACb,eAAe,EACf,WAAW,EACX,cAAc,EACd,aAAa,EACb,SAAS,EACT,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,UAAU,EACV,eAAe,EACf,UAAU,EACV,eAAe,EACf,aAAa,EACb,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,WAAW,EACX,aAAa,EACb,cAAc,GACf,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAChF,YAAY,EACV,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,WAAW,GACZ,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAChE,YAAY,EACV,OAAO,EACP,iBAAiB,EACjB,iBAAiB,EACjB,uBAAuB,EACvB,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,WAAW,EACX,cAAc,EACd,UAAU,GACX,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACvE,YAAY,EACV,WAAW,EACX,UAAU,EACV,YAAY,EACZ,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,cAAc,GACf,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,YAAY,EACV,WAAW,EACX,YAAY,EACZ,UAAU,EACV,aAAa,EACb,YAAY,GACb,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9D,YAAY,EACV,QAAQ,EACR,SAAS,EACT,aAAa,EACb,cAAc,EACd,MAAM,EACN,UAAU,EACV,WAAW,EACX,GAAG,EACH,UAAU,EACV,YAAY,EACZ,SAAS,EACT,aAAa,EACb,UAAU,EACV,WAAW,EACX,OAAO,EACP,MAAM,EACN,KAAK,EACL,KAAK,GACN,MAAM,YAAY,CAAC;AAEpB,YAAY,EACV,MAAM,EACN,aAAa,EACb,aAAa,EACb,UAAU,EACV,WAAW,EACX,WAAW,EACX,iBAAiB,GAClB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC"}

package/dist/index.js

@@ -1,2 +1 @@
 export { changeBatchIdentity } from './identity.js';
-export { createMdRuntime } from './connection.js';

package/dist/memory.d.ts

@@ -1,5 +1,5 @@
 import type { ModelResult } from './model.js';
-import { type AcceptedMessage, type ActionResult, type Adapter, type Capability, type ConversationAction, type ConversationEvent, type DiscoveredRoom, type HeadChange, type MdModelIdentity, type ProviderLimit, type Retention, type RoomAttachment, type RoomVersionNotification, type ServiceMode } from './adapter.js';
+import { type AcceptedMessage, type ActionResult, type Adapter, type Capability, type ConversationAction, type ConversationEvent, type DiscoveredRoom, type HeadChange, type ListedConversation, type ProviderLimit, type Retention, type RoomAttachment, type ServiceMode } from './adapter.js';
 export type MemoryRoom = DiscoveredRoom & {
     model?: ModelResult;
     selectionModel?: ModelResult;
@@ -11,6 +11,7 @@ export type MemoryRoom = DiscoveredRoom & {
 };
 export type MemoryConversation = {
     conversation: string;
+    listed?: Omit<ListedConversation, 'conversation'>;
     messages?: readonly AcceptedMessage[];
     outcomes?: Partial<Record<ConversationAction, ActionResult>>;
 };
@@ -19,20 +20,25 @@ export type MemoryAdapterOptions = {
     conversations?: readonly MemoryConversation[];
     historyPageSize?: number;
     pageSize?: number;
-    mdModel?: MdModelIdentity;
-    supportedVersions?: readonly number[];
     capabilities?: readonly Capability[];
     providerLimits?: readonly ProviderLimit[];
     retention?: Retention;
+    unopened?: boolean;
 };
 export type MemoryAdapter = Adapter & {
     setRooms(rooms: readonly MemoryRoom[]): void;
     setConversations(conversations: readonly MemoryConversation[]): void;
     script(operation: keyof Adapter, answer: unknown): void;
-    notifyRoomVersion(notification: RoomVersionNotification): void;
+    open(): void;
+    close(revoked?: boolean): void;
+    expire(locators: readonly string[]): void;
+    notifyRoomVersion(notification: {
+        locator: string;
+        roomVersion: string;
+    }): void;
     notifyConversation(event: ConversationEvent): void;
     notifyServiceMode(mode: ServiceMode): void;
-    selectedRooms(): readonly string[];
+    heldRooms(): readonly string[];
     replicatedConversations(): readonly string[];
 };
 export declare function createMemoryAdapter(options?: MemoryAdapterOptions): MemoryAdapter;

package/dist/memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../src/memory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAEL,KAAK,eAAe,EAEpB,KAAK,YAAY,EACjB,KAAK,OAAO,EAIZ,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EAItB,KAAK,cAAc,EACnB,KAAK,UAAU,EAGf,KAAK,eAAe,EAGpB,KAAK,aAAa,EAGlB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,uBAAuB,EAC5B,KAAK,WAAW,EACjB,MAAM,cAAc,CAAC;AAmBtB,MAAM,MAAM,UAAU,GAAG,cAAc,GAAG;IACxC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,SAAS,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7C,SAAS,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IAC/C,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,WAAW,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC,CAAC;CAC9D,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IAC9B,aAAa,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAC9C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,YAAY,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IACrC,cAAc,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG;IACpC,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,GAAG,IAAI,CAAC;IAC7C,gBAAgB,CAAC,aAAa,EAAE,SAAS,kBAAkB,EAAE,GAAG,IAAI,CAAC;IACrE,MAAM,CAAC,SAAS,EAAE,MAAM,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACxD,iBAAiB,CAAC,YAAY,EAAE,uBAAuB,GAAG,IAAI,CAAC;IAC/D,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACnD,iBAAiB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IAC3C,aAAa,IAAI,SAAS,MAAM,EAAE,CAAC;IACnC,uBAAuB,IAAI,SAAS,MAAM,EAAE,CAAC;CAC9C,CAAC;AA+BF,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,oBAAyB,GAAG,aAAa,CAkZrF"}
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../src/memory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EACL,KAAK,eAAe,EAEpB,KAAK,YAAY,EACjB,KAAK,OAAO,EAIZ,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EAItB,KAAK,cAAc,EACnB,KAAK,UAAU,EAGf,KAAK,kBAAkB,EAGvB,KAAK,aAAa,EAGlB,KAAK,SAAS,EACd,KAAK,cAAc,EAGnB,KAAK,WAAW,EACjB,MAAM,cAAc,CAAC;AAkBtB,MAAM,MAAM,UAAU,GAAG,cAAc,GAAG;IACxC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,SAAS,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7C,SAAS,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IAC/C,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,WAAW,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;IAClD,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC,CAAC;CAC9D,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IAC9B,aAAa,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAC9C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IACrC,cAAc,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG;IACpC,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,GAAG,IAAI,CAAC;IAC7C,gBAAgB,CAAC,aAAa,EAAE,SAAS,kBAAkB,EAAE,GAAG,IAAI,CAAC;IACrE,MAAM,CAAC,SAAS,EAAE,MAAM,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACxD,IAAI,IAAI,IAAI,CAAC;IACb,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,MAAM,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IAC1C,iBAAiB,CAAC,YAAY,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAChF,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACnD,iBAAiB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IAC3C,SAAS,IAAI,SAAS,MAAM,EAAE,CAAC;IAC/B,uBAAuB,IAAI,SAAS,MAAM,EAAE,CAAC;CAC9C,CAAC;AA+CF,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,oBAAyB,GAAG,aAAa,CAmbrF"}

package/dist/memory.js

@@ -1,5 +1,3 @@
-import { ROOM_CONTRACT_VERSION, } from './adapter.js';
-import { MD_MODEL } from './collection.js';
 import { sameChange } from './overlay.js';
 const FIXTURE_RETENTION = {
     history: { kind: 'duration', seconds: 1 },
@@ -15,6 +13,19 @@ function declaredRetention(value) {
     }
     throw new Error('history retention duration must be a finite positive number of seconds');
 }
+const MODEL_ABSENT = { kind: 'model-unavailable', reason: 'not-readable' };
+function modelsOf(room) {
+    return {
+        collection: room.model ?? MODEL_ABSENT,
+        ...(room.typedSelection === undefined
+            ? {}
+            : { selection: room.selectionModel ?? MODEL_ABSENT }),
+    };
+}
+function changedModels(room, from) {
+    const now = modelsOf(room);
+    return JSON.stringify(now) === JSON.stringify(modelsOf(from)) ? undefined : now;
+}
 function named(source, paths) {
     const taken = {};
     for (const path of paths) {
@@ -31,8 +42,6 @@ async function resolveScript(answer, fallback, request) {
 }
 export function createMemoryAdapter(options = {}) {
     let rooms = options.rooms === undefined ? [] : [...options.rooms];
-    const mdModel = options.mdModel ?? MD_MODEL;
-    const supportedVersions = options.supportedVersions ?? [ROOM_CONTRACT_VERSION];
     const capabilities = options.capabilities ?? [];
     const providerLimits = options.providerLimits ?? [];
     const retention = declaredRetention(options.retention);
@@ -47,7 +56,8 @@ export function createMemoryAdapter(options = {}) {
     const unsealed = new Map();
     const sealed = new Set();
     const historyPageSize = options.historyPageSize;
-    let selected = [];
+    let held = [];
+    let expiring = [];
     let replicated = [];
     let issued = 0;
     function scriptConversations(entries) {
@@ -89,12 +99,11 @@ export function createMemoryAdapter(options = {}) {
         return {
             name: room.name,
             locator: room.locator,
+            handle: room.handle,
             roomVersion: room.roomVersion,
             operations: room.operations,
             replica: room.replica,
-            attachedModel: room.attachedModel,
             ...(room.typedSelection === undefined ? {} : { typedSelection: room.typedSelection }),
-            ...(room.untypedFolders === undefined ? {} : { untypedFolders: room.untypedFolders }),
             providerOwnedPaths: room.providerOwnedPaths,
         };
     }
@@ -107,6 +116,7 @@ export function createMemoryAdapter(options = {}) {
         return {
             kind: 'bootstrap',
             roomVersion: room.roomVersion,
+            ...(from === 0 ? { models: modelsOf(room) } : {}),
             documents: named(room.documents ?? {}, taken),
             revisions: named(room.revisions ?? {}, taken),
             changes: named(room.changes ?? {}, [...taken, ...targets]),
@@ -137,9 +147,11 @@ export function createMemoryAdapter(options = {}) {
             : [];
         const attachments = room.attachments ?? [];
         const declared = opening && JSON.stringify(attachments) !== JSON.stringify(from.attachments ?? []);
+        const models = opening ? changedModels(room, from) : undefined;
         return {
             kind: 'net-advancement',
             roomVersion: room.roomVersion,
+            ...(models === undefined ? {} : { models }),
             documents: named(current, taken),
             revisions: named(room.revisions ?? {}, taken),
             changes: named(room.changes ?? {}, [...taken, ...targets]),
@@ -222,11 +234,14 @@ export function createMemoryAdapter(options = {}) {
             scripted.delete(named);
         return { kind: 'action', result: { conversation: named } };
     }
+    function announceList() {
+        const entries = [...scripted.values()].flatMap(({ conversation, listed }) => listed === undefined ? [] : [{ conversation, ...listed }]);
+        for (const listener of listeners)
+            listener({ kind: 'list', entries });
+    }
     function discovery() {
         return {
             kind: 'discovery',
-            supportedVersions,
-            mdModel,
             rooms: rooms.map(declared),
             capabilities,
             providerLimits,
@@ -241,9 +256,21 @@ export function createMemoryAdapter(options = {}) {
         setConversations(next) {
             scriptConversations(next);
         },
-        notifyRoomVersion(notification) {
+        open() {
+            announceList();
+            for (const observer of observers)
+                observer({ kind: 'opened' });
+        },
+        close(revoked = false) {
+            for (const observer of observers)
+                observer({ kind: 'closed', revoked });
+        },
+        expire(locators) {
+            expiring = [...locators];
+        },
+        notifyRoomVersion({ locator, roomVersion }) {
             for (const observer of observers)
-                observer(notification);
+                observer({ kind: 'room-version', locator, roomVersion });
         },
         notifyConversation(event) {
             if (event.kind === 'accepted-message') {
@@ -257,8 +284,8 @@ export function createMemoryAdapter(options = {}) {
             for (const observer of modeObservers)
                 observer(mode);
         },
-        selectedRooms() {
-            return selected;
+        heldRooms() {
+            return held;
         },
         replicatedConversations() {
             return replicated;
@@ -282,12 +309,39 @@ export function createMemoryAdapter(options = {}) {
                 };
             },
         },
-        roomVersions: {
-            select(locators) {
-                selected = [...locators];
+        roomStream: {
+            hold(asked) {
+                held = asked.map((room) => room.locator);
+                const expired = expiring.filter((locator) => held.includes(locator));
+                expiring = [];
+                const moved = asked.flatMap((room) => {
+                    const current = rooms.find((entry) => entry.locator === room.locator);
+                    return current === undefined ||
+                        expired.includes(room.locator) ||
+                        current.roomVersion === room.roomVersion
+                        ? []
+                        : [{ locator: room.locator, roomVersion: current.roomVersion }];
+                });
+                queueMicrotask(() => {
+                    for (const observer of observers) {
+                        for (const room of moved)
+                            observer({ kind: 'room-version', ...room });
+                        observer({ kind: 'opening', expired });
+                    }
+                });
             },
             observe(notify) {
                 observers.add(notify);
+                queueMicrotask(() => {
+                    if (!observers.has(notify))
+                        return;
+                    if (options.unopened === true) {
+                        notify({ kind: 'closed', revoked: false });
+                        return;
+                    }
+                    announceList();
+                    notify({ kind: 'opened' });
+                });
                 return () => {
                     observers.delete(notify);
                 };
@@ -299,13 +353,6 @@ export function createMemoryAdapter(options = {}) {
             else
                 scripts[operation] = answer;
         },
-        async model(_authorization, request) {
-            return resolveScript(scripts.model, () => {
-                const room = rooms.find((entry) => entry.locator === request.locator);
-                const answer = request.attached === 'collection' ? room?.model : room?.selectionModel;
-                return answer ?? { kind: 'model-unavailable', reason: 'not-readable' };
-            }, request);
-        },
         async authorize() {
             return resolveScript(scripts.authorize, () => ({}), undefined);
         },
@@ -318,6 +365,14 @@ export function createMemoryAdapter(options = {}) {
             });
         },
         reached,
+        follows(locator, roomVersion, next) {
+            const scripted = scripts.follows;
+            if (typeof scripted === 'boolean')
+                return scripted;
+            if (scripted !== undefined)
+                return scripted(locator, roomVersion, next);
+            return true;
+        },
         async bootstrap(_authorization, request) {
             return resolveScript(scripts.bootstrap, () => {
                 const room = rooms.find((entry) => entry.locator === request.locator);
@@ -342,10 +397,6 @@ export function createMemoryAdapter(options = {}) {
                     }
                     return advancement(continuation.room, continuation.from, continuation.at);
                 }
-                if (request.minPosition !== undefined &&
-                    !reached(room.locator, room.roomVersion, request.minPosition)) {
-                    return { kind: 'retryable-refusal', code: 'replica_behind', fields: {} };
-                }
                 if (request.fromRoomVersion === room.roomVersion) {
                     return { kind: 'still-current' };
                 }

package/dist/model.d.ts

@@ -1,4 +1,4 @@
-import type { Definition, FieldSpec, SectionSpec, VerifiedModel } from '@agentshouse/mdmodel';
+import type { Definition, ValueFacts, VerifiedModel } from '@agentshouse/mdmodel';
 export type ModelIdentity = {
     identity: string;
     version: string;
@@ -6,23 +6,15 @@ export type ModelIdentity = {
 export type ModelSnapshot = ModelIdentity & {
     schema: string | null;
 };
-export type ModelUnavailableReason = 'not-readable' | 'revoked' | 'not-acquired' | 'version-changed' | 'invalid';
+export type ModelUnavailableReason = 'not-readable' | 'revoked' | 'not-acquired' | 'invalid';
 export type ModelResult = {
     kind: 'model';
     snapshot: ModelSnapshot;
 } | {
     kind: 'model-unavailable';
     reason: ModelUnavailableReason;
-} | {
-    kind: 'transport-uncertainty';
-} | {
-    kind: 'revoked-authorization';
-};
-export type MdType = {
-    name: string;
-    fields: Readonly<Record<string, FieldSpec>>;
-    sections: Readonly<Record<string, SectionSpec>>;
 };
+export type MdType = Definition;
 export type ModelState = {
     status: 'unavailable';
     reason: ModelUnavailableReason;
@@ -52,4 +44,5 @@ export declare function definitionOf(state: ModelState, type: string | undefined
 export declare function modelTypes(state: ModelState): TypesResult;
 export declare function cached(state: ModelState): ModelState;
 export declare function sameModel(left: ModelIdentity, right: ModelIdentity): boolean;
+export declare function referenceField(facts: ValueFacts | undefined): boolean;
 //# 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,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"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAElF,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,GAAG,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAAC;AAC7F,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,CAAC;AAClE,MAAM,MAAM,MAAM,GAAG,UAAU,CAAC;AAChC,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;AACD,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAErE"}

package/dist/model.js

@@ -12,9 +12,7 @@ export function modelTypes(state) {
             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 }))),
+            types: structuredClone(Object.values(state.types).sort((left, right) => left.name < right.name ? -1 : left.name > right.name ? 1 : 0)),
         };
 }
 export function cached(state) {
@@ -23,3 +21,6 @@ export function cached(state) {
 export function sameModel(left, right) {
     return left.identity === right.identity && left.version === right.version;
 }
+export function referenceField(facts) {
+    return facts?.reference !== undefined || facts?.items?.reference !== undefined;
+}

package/dist/observation.d.ts

@@ -20,6 +20,8 @@ export type Observed = {
     end(): void;
 };
 export declare function rowsOf(result: QueryResult): readonly (QueryDocument | QueryGroup)[];
+export declare function applied(keyed: KeyedResult, change: QueryChange): KeyedResult;
 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>>;
+export declare function observing<Topic extends string>(watch: (topic: Topic, input: readonly unknown[], deliver: (message: unknown) => void) => () => void): (topic: Topic, ...input: unknown[]) => Promise<Observation<unknown>>;
 //# sourceMappingURL=observation.d.ts.map

package/dist/observation.d.ts.map

@@ -1 +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"}
+{"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;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,CAc5E;AAiBD,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;AAED,wBAAgB,SAAS,CAAC,KAAK,SAAS,MAAM,EAC5C,KAAK,EAAE,CACL,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,SAAS,OAAO,EAAE,EACzB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,KAChC,MAAM,IAAI,WAEA,KAAK,YAAY,OAAO,EAAE,KAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAQ1E"}

package/dist/observation.js

@@ -1,24 +1,29 @@
 export function rowsOf(result) {
     return 'groups' in result ? result.groups : result.documents;
 }
+export function applied(keyed, change) {
+    const rows = rowsOf(keyed.result);
+    const byKey = new Map(keyed.keys.map((key, index) => [key, rows[index]]));
+    for (const key of change.removed)
+        byKey.delete(key);
+    for (const [key, row] of change.changed)
+        byKey.set(key, row);
+    const keys = change.order ?? keyed.keys.filter((key) => byKey.has(key));
+    const next = keys.map((key) => byKey.get(key));
+    return {
+        result: 'groups' in keyed.result
+            ? { groups: next }
+            : { documents: next },
+        keys,
+    };
+}
 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;
+    let keyed = first;
     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 };
+            keyed = applied(keyed, message);
+            return keyed.result;
         },
     };
 }
@@ -83,3 +88,8 @@ export function opened(watch, keyed) {
         }
     });
 }
+export function observing(watch) {
+    return (topic, ...input) => opened((deliver) => watch(topic, input, (message) => {
+        deliver(structuredClone(message));
+    }), topic === 'query');
+}