@agentshouse/mdruntime 0.1.0-c2af3ddcc243b → 0.1.0-c2e433921a4d5

package/dist/live.js

@@ -1,27 +1,25 @@
-import { changeOf, digestOf, } from './observation.js';
+import { changeOf, digestOf, keyedAt, keyedInto, samePending, unchanged, } from './observation.js';
 import { uncaught } from './failure.js';
-import { roomOfKey } from './rows.js';
+import { roomsOfReach } from './rows.js';
 function narrowed(plan) {
     return (plan.paths !== null &&
         plan.hop === null &&
         plan.backlinks === null &&
         !(plan.shape.kind === 'documents' && plan.shape.backlinks));
 }
-function reads(plan, locator) {
-    if (plan.locked.includes(locator))
-        return false;
-    if (plan.rooms !== null && !plan.rooms.includes(locator))
-        return false;
-    if (plan.reach === null)
-        return true;
-    return (plan.reach.rooms.includes(locator) ||
-        plan.reach.documents.some((document) => roomOfKey(document) === locator));
+export function readerOf(plan) {
+    const locked = new Set(plan.locked);
+    const named = plan.rooms === null ? null : new Set(plan.rooms);
+    const reached = plan.reach === null ? null : roomsOfReach(plan.reach);
+    return (locator) => !locked.has(locator) &&
+        (named === null || named.has(locator)) &&
+        (reached === null || reached.has(locator));
 }
-function affected(plan, set) {
-    if (set.rooms.some((locator) => reads(plan, locator)))
+function affected({ plan, reads }, set) {
+    if (set.rooms.some(reads))
         return true;
     const paths = narrowed(plan) ? new Set(plan.paths) : null;
-    return set.documents.some(({ locator, path }) => reads(plan, locator) && (paths === null || path === null || paths.has(path)));
+    return set.documents.some(({ locator, path }) => reads(locator) && (paths === null || path === null || paths.has(path)));
 }
 function shown(entry, held) {
     const cover = entry.cover(held);
@@ -30,11 +28,13 @@ function shown(entry, held) {
 export function createLiveQueries(run, holding) {
     const entries = new Map();
     let closed = false;
-    let recovering = false;
-    let recoverAgain = false;
+    let recoveringNow = false;
+    let recoveringAll = false;
+    const recovering = new Set();
     function deliver(entry, next) {
         const previous = entry.digest;
         entry.digest = digestOf(next);
+        entry.pending = 'pending' in entry.digest ? entry.digest.pending : null;
         entry.covered = JSON.stringify('pending' in next.result ? next.result : next.result.coverage);
         const change = previous === undefined ? null : changeOf(previous, next);
         if (change !== null) {
@@ -87,58 +87,99 @@ export function createLiveQueries(run, holding) {
             }
         })();
     }
-    function recovered() {
-        if (recovering) {
-            recoverAgain = true;
-            return;
+    function pendingMoved(entry, held, rooms) {
+        const { pending } = entry;
+        if (pending === null || pending.size === 0 || entry.running || entry.fresh.size > 0) {
+            return false;
         }
-        recovering = true;
+        const at = entry.pendingAt(held, rooms);
+        const change = at === null ? null : keyedAt(pending, at, samePending);
+        if (change === null || change.removed.length === pending.size)
+            return false;
+        keyedInto(pending, change);
+        entry.covered = '';
+        if (unchanged(change))
+            return true;
+        for (const listener of entry.ready)
+            listener({ pending: change });
+        return true;
+    }
+    function recovered(locators) {
+        if (locators === undefined)
+            recoveringAll = true;
+        else
+            for (const locator of locators)
+                recovering.add(locator);
+        if (recoveringNow)
+            return;
+        recoveringNow = true;
         void (async () => {
             try {
-                do {
-                    recoverAgain = false;
-                    for (const entry of entries.values()) {
+                while ((recoveringAll || recovering.size > 0) && !closed) {
+                    const all = recoveringAll;
+                    const touched = [...recovering];
+                    recoveringAll = false;
+                    recovering.clear();
+                    const reached = [...entries.values()].filter((entry) => all || touched.some(entry.reads));
+                    for (const entry of reached) {
                         if (entry.running)
                             entry.dirty = true;
                     }
-                    const waiting = [...entries.values()].filter((entry) => !entry.running);
-                    if (waiting.length === 0 || closed)
+                    const waiting = reached.filter((entry) => !entry.running);
+                    if (waiting.length === 0)
                         continue;
                     const held = await holding();
                     for (const entry of waiting) {
                         if (entry.running)
                             continue;
+                        const read = all ? [] : touched.filter(entry.reads);
+                        if (read.length > 0 && pendingMoved(entry, held, read))
+                            continue;
                         if (entry.digest === undefined || shown(entry, held) !== entry.covered)
                             schedule(entry);
                     }
-                } while (recoverAgain && !closed);
+                }
             }
             catch (error) {
                 uncaught(error);
             }
             finally {
-                recovering = false;
+                recoveringNow = false;
             }
         })();
     }
     return {
         touched(set) {
+            const pending = new Set();
             for (const entry of entries.values()) {
-                if (affected(entry.plan, set))
+                if (!affected(entry, set))
+                    continue;
+                if (entry.pending === null || entry.running) {
                     schedule(entry);
+                    continue;
+                }
+                for (const locator of set.rooms)
+                    pending.add(locator);
+                for (const { locator } of set.documents)
+                    pending.add(locator);
             }
+            if (pending.size > 0)
+                recovered([...pending]);
         },
         recover: recovered,
-        watch(plan, identity, cover, listener, failed) {
+        watch(plan, identity, cover, pendingAt, listener, failed) {
             let entry = entries.get(identity);
             if (entry === undefined) {
                 entry = {
                     plan,
+                    reads: readerOf(plan),
                     cover,
+                    pendingAt,
                     listeners: new Set(),
                     fresh: new Map(),
                     ready: new Set(),
                     digest: undefined,
+                    pending: null,
                     covered: '',
                     dirty: false,
                     running: false,

package/dist/loaded.d.ts

@@ -0,0 +1,5 @@
+import type { BuildFile } from './client.js';
+export declare function parsed(file: Blob | null): Promise<unknown>;
+export declare function perBuild<T>(buildFile: BuildFile, key: string, make: () => Promise<T>): Promise<T>;
+export declare function loaded<T>(buildFile: BuildFile, name: string, read?: (file: Blob | null) => Promise<unknown>): Promise<T | null>;
+//# sourceMappingURL=loaded.d.ts.map

package/dist/loaded.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loaded.d.ts","sourceRoot":"","sources":["../src/loaded.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAc7C,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAEhE;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAYjG;AAED,wBAAgB,MAAM,CAAC,CAAC,EACtB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,KAAK,OAAO,CAAC,OAAO,CAAY,GACvD,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAEnB"}

package/dist/loaded.js

@@ -0,0 +1,40 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
+const holdings = new WeakMap();
+async function imported(file) {
+    if (file === null)
+        return null;
+    const address = URL.createObjectURL(file);
+    try {
+        return await import(__rewriteRelativeImportExtension(address));
+    }
+    finally {
+        URL.revokeObjectURL(address);
+    }
+}
+export async function parsed(file) {
+    return file === null ? null : JSON.parse(await file.text());
+}
+export function perBuild(buildFile, key, make) {
+    let named = holdings.get(buildFile);
+    if (named === undefined) {
+        named = new Map();
+        holdings.set(buildFile, named);
+    }
+    const holding = named.get(key);
+    if (holding !== undefined)
+        return holding;
+    const making = make();
+    named.set(key, making);
+    making.catch(() => named.delete(key));
+    return making;
+}
+export function loaded(buildFile, name, read = imported) {
+    return perBuild(buildFile, name, () => buildFile(name).then(read));
+}

package/dist/locks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locks.d.ts","sourceRoot":"","sources":["../src/locks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG5C,wBAAsB,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAE5F;AAED,wBAAsB,WAAW,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAK1F;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,iBAKzE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,QAU9C;AAED,wBAAgB,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAE7E"}
+{"version":3,"file":"locks.d.ts","sourceRoot":"","sources":["../src/locks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG5C,wBAAsB,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAE5F;AAED,wBAAsB,WAAW,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAG1F;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,iBAKzE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,QAU9C;AAED,wBAAgB,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAE7E"}

package/dist/locks.js

@@ -4,8 +4,8 @@ export async function locked({ store, presence }, locator) {
     return presence.locked(locator, async () => (await store.open()).offline(locator));
 }
 export async function lockedRooms({ store, presence }) {
-    const held = (await store.covering()).rooms;
-    return presence.lockedAmong(new Map([...held].map(([locator, { offline }]) => [locator, offline])));
+    const { rooms, locking } = await store.covering();
+    return presence.lockedAmong(rooms, locking);
 }
 export async function relocked(runtime, before) {
     const after = await lockedRooms(runtime);

package/dist/lost.js

@@ -42,7 +42,7 @@ export async function loseRooms(runtime, locators) {
             queue: true,
             drafts: held.filter((draft) => draft.locator === locator).map(({ path }) => path),
         }))));
-        recoverReads(runtime);
+        recoverReads(runtime, fresh);
     }
     await unpair(runtime);
     await eraseFenced(runtime, fresh);

package/dist/media.d.ts

@@ -1,8 +1,13 @@
 import type { MdRuntimeClient } from './client.js';
 import { type ShownAnswer } from './outcome.js';
 export declare const ROOM_MEDIA = "room-media";
+export declare const DIAGRAM = "md-diagram";
+export declare const VIEWING = "ahc-viewer";
 type Show = (room: string, path: string, revision?: string) => Promise<ShownAnswer>;
 export declare function shownBy(show: Show, client: MdRuntimeClient): MdRuntimeClient;
+export declare function rendered(element: Element): boolean;
+export declare function viewable(element: Element): boolean;
+export declare function viewFile(client: MdRuntimeClient, media: Element): void;
 export declare function defineRoomMedia(client: Promise<MdRuntimeClient> | MdRuntimeClient): void;
 export {};
 //# sourceMappingURL=media.d.ts.map

package/dist/media.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../src/media.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3D,eAAO,MAAM,UAAU,eAAe,CAAC;AAwBvC,KAAK,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;AAIpF,wBAAgB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,GAAG,eAAe,CAG5E;AAsBD,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,GAAG,IAAI,CA0LxF"}
+{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../src/media.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAEnE,eAAO,MAAM,UAAU,eAAe,CAAC;AAMvC,eAAO,MAAM,OAAO,eAAe,CAAC;AAEpC,eAAO,MAAM,OAAO,eAAe,CAAC;AA8BpC,KAAK,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;AAIpF,wBAAgB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,GAAG,eAAe,CAG5E;AAsBD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAElD;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAMlD;AA4BD,wBAAgB,QAAQ,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAEtE;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,GAAG,IAAI,CAkMxF"}

package/dist/media.js

@@ -1,5 +1,12 @@
-import { UNCERTAIN } from './outcome.js';
+import { isAudioType, isImageType, isVideoType } from '@agentshouse/mdmodel';
+import { loaded } from './loaded.js';
+import { blobOf, UNCERTAIN } from './outcome.js';
 export const ROOM_MEDIA = 'room-media';
+const VIEWER = 'viewer';
+const RENDERED = '.ahc, .ahc-markdown';
+export const DIAGRAM = 'md-diagram';
+export const VIEWING = 'ahc-viewer';
+const PRESSED_ELSEWHERE = 'a[href], button, input, select, textarea, summary, label, [role="button"], [role="link"]';
 const ATTRIBUTES = ['room', 'path', 'revision', 'width', 'height', 'alt'];
 const LOADING = new Set(['room', 'path', 'revision']);
 const NEARING = '600px 0px';
@@ -10,7 +17,10 @@ const SHAPE = '16 / 9';
 const STYLE = `:host{display:block}
 [part=box]{position:relative;overflow:hidden}
 [part=box]>img,[part=box]>video,[part=box]>audio{display:block;width:100%;height:100%;object-fit:contain}
-[part=box]>slot{display:flex;align-items:center;justify-content:center;width:100%;height:100%;text-align:center}`;
+[part=box]>video:not([controls]){cursor:pointer}
+[part=box]>slot{display:flex;align-items:center;justify-content:center;width:100%;height:100%;text-align:center}
+[part=play]{position:absolute;top:50%;left:50%;width:56px;height:56px;margin:-28px 0 0 -28px;border-radius:50%;background:rgb(0 0 0/.6);pointer-events:none}
+[part=play]::before{content:"";position:absolute;top:18px;left:22px;border-style:solid;border-width:10px 0 10px 16px;border-color:transparent transparent transparent #fff}`;
 const shows = new WeakMap();
 export function shownBy(show, client) {
     shows.set(client, show);
@@ -29,23 +39,62 @@ function refusedForGood(shown) {
     return (shown.kind === 'rejected' || shown.kind === 'scoped-refusal') && !shown.retryable;
 }
 function drawnFor(mediaType) {
-    if (mediaType.startsWith('image/'))
+    if (isImageType(mediaType))
         return 'img';
-    if (mediaType.startsWith('video/'))
+    if (isVideoType(mediaType))
         return 'video';
-    if (mediaType.startsWith('audio/'))
+    if (isAudioType(mediaType))
         return 'audio';
     return null;
 }
+export function rendered(element) {
+    return element.closest(RENDERED) !== null;
+}
+export function viewable(element) {
+    if (element.localName === 'figure')
+        return element.classList.contains(DIAGRAM);
+    if (element.localName !== ROOM_MEDIA || element.closest(`.${VIEWING}`) !== null)
+        return false;
+    return (rendered(element) || (element.shadowRoot?.querySelector('[part=box] > video') ?? null) !== null);
+}
+function viewed(client, opener, alone) {
+    void loaded(client.buildFile, VIEWER).then((file) => file?.openViewer({
+        opener,
+        alone,
+        download: (room, path, revision) => void client.binaryFile.download(room, path, revision),
+    }));
+}
+function pressed(client) {
+    return (event) => {
+        if (event.defaultPrevented || event.detail > 1)
+            return;
+        for (const node of event.composedPath()) {
+            if (!(node instanceof Element))
+                continue;
+            if (viewable(node)) {
+                event.preventDefault();
+                void client.then((one) => viewed(one, node, !rendered(node)));
+                return;
+            }
+            if (node.matches(PRESSED_ELSEWHERE))
+                return;
+        }
+    };
+}
+export function viewFile(client, media) {
+    viewed(client, media, true);
+}
 export function defineRoomMedia(client) {
     if (customElements.get(ROOM_MEDIA) !== undefined)
         return;
     const connected = Promise.resolve(client);
+    document.addEventListener('click', pressed(connected));
     class RoomMedia extends HTMLElement {
         static observedAttributes = ATTRIBUTES;
         #root = this.attachShadow({ mode: 'open' });
         #box = document.createElement('div');
         #fallback = document.createElement('slot');
+        #play = document.createElement('span');
         #watching = null;
         #near = false;
         #asked = 0;
@@ -56,6 +105,7 @@ export function defineRoomMedia(client) {
         constructor() {
             super();
             this.#box.setAttribute('part', 'box');
+            this.#play.setAttribute('part', 'play');
             this.#root.append(Object.assign(document.createElement('style'), { textContent: STYLE }), this.#box);
             this.#shape();
         }
@@ -129,11 +179,7 @@ export function defineRoomMedia(client) {
                     this.#unshown(asked);
                 return;
             }
-            const copy = await new Response(shown.stream, {
-                headers: { 'content-type': shown.mediaType },
-            })
-                .blob()
-                .catch(() => null);
+            const copy = await blobOf(shown).catch(() => null);
             if (asked !== this.#asked)
                 return;
             if (copy === null)
@@ -157,7 +203,9 @@ export function defineRoomMedia(client) {
             if (content === null)
                 this.#box.replaceChildren();
             else if (content.parentNode !== this.#box)
-                this.#box.replaceChildren(content);
+                this.#box.replaceChildren(...(content instanceof HTMLVideoElement && !content.controls
+                    ? [content, this.#play]
+                    : [content]));
             this.#label();
         }
         #unreadable() {
@@ -174,13 +222,16 @@ export function defineRoomMedia(client) {
             const kept = this.#drawn?.localName === tag ? this.#drawn : null;
             const drawn = kept ?? document.createElement(tag);
             if (kept === null) {
+                const plays = !(drawn instanceof HTMLVideoElement) || this.closest(`.${VIEWING}`) !== null;
                 if (drawn instanceof HTMLImageElement)
                     drawn.decoding = 'async';
                 if (drawn instanceof HTMLMediaElement) {
-                    drawn.controls = true;
                     drawn.preload = 'metadata';
-                    if (drawn instanceof HTMLVideoElement && 'playsInline' in drawn)
-                        drawn.playsInline = true;
+                    drawn.controls = plays;
+                }
+                if (drawn instanceof HTMLVideoElement && plays) {
+                    drawn.autoplay = true;
+                    drawn.setAttribute('playsinline', '');
                 }
                 drawn.addEventListener(drawn instanceof HTMLImageElement ? 'load' : 'loadedmetadata', () => {
                     if (drawn !== this.#drawn)

package/dist/memory.d.ts

@@ -1,3 +1,4 @@
+import { type VerifiedModel } from '@agentshouse/mdmodel';
 import type { ModelResult } from './model.js';
 import { type AcceptedMessage, type ActionResult, type Adapter, type BinaryFile, type Capability, type ConversationAction, type ConversationEvent, type DiscoveredRoom, type SavedFacts, type HeadChange, type ListedAgent, type ListedConversation, type Member, type ProviderLimit, type Retention, type ServiceMode, type TypedPath, type TypedSelection } from './adapter.js';
 export type MemoryRoom = Omit<DiscoveredRoom, 'typedSelection' | 'authoredPaths'> & {
@@ -31,7 +32,7 @@ export type MemoryAdapterOptions = {
     retention?: Retention;
     member?: Member;
     unopened?: boolean;
-    roomTypes?: string;
+    roomTypes?: VerifiedModel;
     typedPaths?: readonly TypedPath[];
 };
 export type MemoryAdapter = Adapter & {
@@ -39,6 +40,7 @@ export type MemoryAdapter = Adapter & {
     refresh: NonNullable<Adapter['refresh']>;
     setRooms(rooms: readonly MemoryRoom[]): void;
     setConversations(conversations: readonly MemoryConversation[]): void;
+    setAgents(agents: readonly ListedAgent[]): void;
     script(operation: keyof Adapter, answer: unknown): void;
     open(): void;
     close(closing?: {

package/dist/memory.d.ts.map

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

package/dist/memory.js

@@ -1,6 +1,7 @@
 import { definitionAt, documentFacts, parse } from '@agentshouse/mdmodel';
-import { roomTypesOf, schemaTypes } from './attached-model.js';
+import { NO_ROOM_TYPES, schemaTypes } from './attached-model.js';
 import { selected } from './collection.js';
+import { declaredType } from './outcome.js';
 import { sameChange } from './overlay.js';
 const ATTACHMENTS = 'attachments';
 function lastName(path) {
@@ -64,6 +65,7 @@ export function createMemoryAdapter(options = {}) {
     const declaredRooms = new Set();
     let replicated = [];
     let heldCursor = null;
+    let agents = structuredClone(options.agents ?? []);
     let issued = 0;
     function scriptConversations(entries) {
         scripted.clear();
@@ -105,7 +107,7 @@ export function createMemoryAdapter(options = {}) {
         }
     }
     const saved = new WeakMap();
-    const roomTypes = roomTypesOf(options.roomTypes);
+    const roomTypes = options.roomTypes ?? NO_ROOM_TYPES;
     function factsAt(room, path, content) {
         const types = selected({ selection: room.typedSelection ?? null }, path)
             ? roomTypes.types
@@ -346,7 +348,14 @@ export function createMemoryAdapter(options = {}) {
             ? []
             : [{ conversation, ...listed, newest: messages.at(-1)?.change ?? null }]);
         for (const listener of listeners) {
-            listener({ kind: 'list', entries, whole: true, more: false, cursor: null });
+            listener({
+                kind: 'list',
+                agents: structuredClone(agents),
+                entries,
+                whole: true,
+                more: false,
+                cursor: null,
+            });
         }
     }
     function discovery() {
@@ -402,6 +411,9 @@ export function createMemoryAdapter(options = {}) {
         setConversations(next) {
             scriptConversations(next);
         },
+        setAgents(next) {
+            agents = structuredClone(next);
+        },
         open() {
             carried.clear();
             announceList();
@@ -464,9 +476,6 @@ export function createMemoryAdapter(options = {}) {
                 };
             },
             history: (request) => Promise.resolve(historiesOf(request)),
-            ...(options.agents === undefined
-                ? {}
-                : { agents: () => Promise.resolve(structuredClone(options.agents)) }),
         },
         serviceMode: {
             observe(notify) {
@@ -619,7 +628,7 @@ export function createMemoryAdapter(options = {}) {
                 const blob = heldBlob(room, request.path);
                 return blob === undefined
                     ? { kind: 'rejected', code: 'not_found', fields: {}, retryable: false }
-                    : { kind: 'binary', body: blob.stream(), mediaType: blob.type };
+                    : { kind: 'binary', body: blob.stream(), mediaType: declaredType(blob) };
             }, request);
         },
         async link(_authorization, request) {
@@ -633,7 +642,7 @@ export function createMemoryAdapter(options = {}) {
                 }
                 const url = linked.get(blob) ?? URL.createObjectURL(blob);
                 linked.set(blob, url);
-                return { kind: 'link', url, name: lastName(request.path), mediaType: blob.type };
+                return { kind: 'link', url, name: lastName(request.path), mediaType: declaredType(blob) };
             }, request);
         },
         async attach(_authorization, request) {

package/dist/messages.d.ts

@@ -1,7 +1,7 @@
 import type { AcceptedMessage } from './adapter.js';
 import type { Connection } from './tables.js';
 export declare const MESSAGE_TABLES: readonly string[];
-export declare const ROWS = "WITH chosen AS (\n    SELECT listed.value AS conversation,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND json_extract(message, '$.role') = 'assistant' ORDER BY position DESC, identity DESC LIMIT 1) AS answer,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND text <> '' ORDER BY position DESC, identity DESC LIMIT 1) AS said,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND json_extract(message, '$.role') = 'house' ORDER BY position, identity LIMIT 1) AS opened,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND json_extract(message, '$.role') = 'house' AND json_extract(message, '$.waiting') = 1 ORDER BY position, identity LIMIT 1) AS asking\n    FROM json_each(?) AS listed\n  )\n  SELECT chosen.conversation AS conversation,\n    substr(said.text, 1, 512) AS said_text,\n    json_extract(said.message, '$.role') AS said_role,\n    json_extract(said.message, '$.accepted_at') AS said_at,\n    substr(json_extract(answer.message, '$.failure'), 1, 512) AS failure,\n    json_extract(opened.message, '$.source') AS opened_source,\n    json_extract(opened.message, '$.sender') AS opened_sender,\n    asking.identity AS asking_identity,\n    asking.text AS asking_text,\n    json_extract(asking.message, '$.accepted_at') AS asking_at,\n    json_extract(asking.message, '$.source') AS asking_source,\n    json_extract(asking.message, '$.sender') AS asking_sender\n  FROM chosen\n  LEFT JOIN conversation_messages said ON said.id = chosen.said\n  LEFT JOIN conversation_messages answer ON answer.id = chosen.answer\n  LEFT JOIN conversation_messages opened ON opened.id = chosen.opened\n  LEFT JOIN conversation_messages asking ON asking.id = chosen.asking";
+export declare const ROWS = "WITH chosen AS (\n    SELECT listed.value AS conversation,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND json_extract(message, '$.role') = 'assistant' ORDER BY position DESC, identity DESC LIMIT 1) AS answer,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND text <> '' ORDER BY position DESC, identity DESC LIMIT 1) AS said,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND json_extract(message, '$.role') = 'house' ORDER BY position, identity LIMIT 1) AS opened,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND json_extract(message, '$.role') = 'house' AND json_extract(message, '$.waiting') = 1 ORDER BY position, identity LIMIT 1) AS asking\n    FROM json_each(?) AS listed\n  )\n  SELECT chosen.conversation AS conversation,\n    substr(said.text, 1, 512) AS said_text,\n    json_extract(said.message, '$.role') AS said_role,\n    json_extract(said.message, '$.accepted_at') AS said_at,\n    answer.turn AS answered,\n    substr(json_extract(answer.message, '$.failure'), 1, 512) AS failure,\n    (SELECT value FROM conversation_facts WHERE conversation = chosen.conversation AND name = 'openedTurn') AS opened_turn,\n    json_extract(opened.message, '$.source') AS opened_source,\n    json_extract(opened.message, '$.sender') AS opened_sender,\n    asking.identity AS asking_identity,\n    asking.text AS asking_text,\n    json_extract(asking.message, '$.accepted_at') AS asking_at,\n    json_extract(asking.message, '$.source') AS asking_source,\n    json_extract(asking.message, '$.sender') AS asking_sender\n  FROM chosen\n  LEFT JOIN conversation_messages said ON said.id = chosen.said\n  LEFT JOIN conversation_messages answer ON answer.id = chosen.answer\n  LEFT JOIN conversation_messages opened ON opened.id = chosen.opened\n  LEFT JOIN conversation_messages asking ON asking.id = chosen.asking";
 export type HeldConversation = {
     readonly conversation: string;
     readonly read: string | null | undefined;
@@ -22,6 +22,8 @@ export type HeldRow = {
         readonly role: string | null;
         readonly at: string | null;
     } | null;
+    readonly answered: string | null;
+    readonly openedTurn: string | null;
     readonly failure: string | null;
     readonly opened: HeldSource | null;
     readonly asking: (HeldSource & {

package/dist/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAIpD,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AAM1D,eAAO,MAAM,cAAc,EAAE,SAAS,MAAM,EAQ3C,CAAC;AAQF,eAAO,MAAM,IAAI,g6DA0BqD,CAAC;AAEvE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAE7F,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAEtF,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAC7B,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;KAC5B,GAAG,IAAI,CAAC;IACT,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,MAAM,EACX,CAAC,UAAU,GAAG;QACZ,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;KAC5B,CAAC,GACF,IAAI,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG,qBAAqB,CAAC;AAEpE,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,SAAS,eAAe,EAAE,CAAC;IAC9C,QAAQ,CAAC,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;CAC3E,CAAC;AAEF,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,GACtC,gBAAgB,EAAE,CA0BpB;AAED,wBAAgB,YAAY,CAC1B,UAAU,EAAE,UAAU,EACtB,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,iBAAiB,GAClD,IAAI,CAsBN;AAmBD,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,EACxC,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,aAAa,CAWf;AAED,wBAAgB,YAAY,CAC1B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,MAAM,CAOR;AAaD,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,SAAS,MAAM,EAAE,GAC/B,OAAO,EAAE,CAyBX;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAO/F;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,QAAQ,EAAE,CAMpE;AAED,wBAAgB,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,QAAQ,GAAG,IAAI,CAM9F;AAED,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAEnE"}

package/dist/messages.js

@@ -1,4 +1,5 @@
 import { sql } from '@agentshouse/mdmodel';
+import { text } from './column.js';
 import { EXCERPT } from './read.js';
 import { tablesOf } from './stored.js';
 const SAID_BY_HOUSE = `json_extract(message, '$.role') = 'house'`;
@@ -27,7 +28,9 @@ export const ROWS = `WITH chosen AS (
     substr(said.text, 1, ${EXCERPT}) AS said_text,
     json_extract(said.message, '$.role') AS said_role,
     json_extract(said.message, '$.accepted_at') AS said_at,
+    answer.turn AS answered,
     substr(json_extract(answer.message, '$.failure'), 1, ${EXCERPT}) AS failure,
+    (SELECT value FROM conversation_facts WHERE conversation = chosen.conversation AND name = 'openedTurn') AS opened_turn,
     json_extract(opened.message, '$.source') AS opened_source,
     json_extract(opened.message, '$.sender') AS opened_sender,
     asking.identity AS asking_identity,
@@ -40,9 +43,6 @@ export const ROWS = `WITH chosen AS (
   LEFT JOIN conversation_messages answer ON answer.id = chosen.answer
   LEFT JOIN conversation_messages opened ON opened.id = chosen.opened
   LEFT JOIN conversation_messages asking ON asking.id = chosen.asking`;
-function text(value) {
-    return typeof value === 'string' ? value : String(value);
-}
 export function heldConversations(connection, conversations) {
     const named = conversations === null ? '' : ' AND conversation IN (SELECT value FROM json_each(?))';
     const bound = conversations === null ? [] : [JSON.stringify(conversations)];
@@ -126,6 +126,8 @@ export function conversationRows(connection, conversations) {
                 role: textOrNull(row.said_role),
                 at: textOrNull(row.said_at),
             },
+        answered: textOrNull(row.answered),
+        openedTurn: textOrNull(row.opened_turn),
         failure: textOrNull(row.failure),
         opened: row.opened_source === null ? null : heldSource(row.opened_source, row.opened_sender),
         asking: row.asking_identity === null

package/dist/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAOnE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAGvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAc,YAAY,EAAS,MAAM,YAAY,CAAC;AAMlE,wBAAgB,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAE9D;AA0DD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,eAAe,EAC5B,KAAK,EAAE,UAAU,GAAG,IAAI,EACxB,OAAO,CAAC,EAAE,IAAI,iBA2Bf;AAED,wBAAsB,MAAM,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,eAAe,iBAkB7B;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,EAC1C,MAAM,EAAE,SAAS,GAAG,QAAQ,EAC5B,KAAK,EAAE,YAAY,iBA8CpB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBvF"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAOnE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAGvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAc,YAAY,EAAS,MAAM,YAAY,CAAC;AAMlE,wBAAgB,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAE9D;AA0DD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,eAAe,EAC5B,KAAK,EAAE,UAAU,GAAG,IAAI,EACxB,OAAO,CAAC,EAAE,IAAI,iBA2Bf;AAED,wBAAsB,MAAM,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,eAAe,iBAkB7B;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,EAC1C,MAAM,EAAE,SAAS,GAAG,QAAQ,EAC5B,KAAK,EAAE,YAAY,iBAkDpB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBvF"}

package/dist/models.js

@@ -35,7 +35,7 @@ function recordAlone(store, record) {
 }
 function unheld(runtime, locator, model) {
     runtime.presence.modelled(locator, model);
-    emitRooms(runtime);
+    emitRooms(runtime, [locator]);
 }
 function recorded(runtime, locator, declaration, model) {
     const { store, socket } = runtime;
@@ -94,7 +94,7 @@ export async function scoped(runtime, result, locator, declaration) {
         await retainModel(runtime, locator, declaration, { status: 'unavailable', reason: 'not-readable' }, true);
     if (!socket.continuing())
         return;
-    emitRooms(runtime);
+    emitRooms(runtime, [locator]);
 }
 export async function settleModels(runtime, held, status, local) {
     const { store, socket, presence } = runtime;
@@ -129,7 +129,7 @@ export async function settleModels(runtime, held, status, local) {
             }
         }
         if (unchanged.length > 0)
-            emitRooms(runtime);
+            emitRooms(runtime, unchanged.map(([locator]) => locator));
         const kept = new Set(unchanged.map(([locator]) => locator));
         return [...held].filter(([locator]) => !kept.has(locator) &&
             owed(stored.get(locator)?.record.model ?? unheldModelOf(runtime, locator)));