@agentshouse/mdruntime 0.1.0-c0136de3edfbe → 0.1.0-c014edb0e9d9b

package/dist/overlay.js

@@ -1,4 +1,5 @@
-import { apply, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
+import { apply, create, frontmatterValue, parse, serialize, TYPE_FIELD, } from '@agentshouse/mdmodel';
+import { definitionsAt } from './collection.js';
 import { drafted, entriesIn, settling } from './shared.js';
 import { ROW_WEIGHT } from './turn.js';
 export function* acceptedBinaries(files) {
@@ -24,7 +25,6 @@ export function sameChange(left, right) {
         left.author?.id === right.author?.id &&
         left.author?.name === right.author?.name);
 }
-const EMPTY_FRONTMATTER = '---\n---\n';
 function isPart(change) {
     return change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble';
 }
@@ -53,16 +53,23 @@ function* priorsOf(preconditions) {
         preamble: (path) => preambles.get(path) ?? '',
     };
 }
-function compose(fields, sections) {
-    const body = Object.entries(sections)
-        .map(([name, value]) => `\n## ${name}\n${value}`)
-        .join('');
-    const skeleton = `${EMPTY_FRONTMATTER}${body}`;
-    const opened = parse(skeleton);
-    if (!opened.ok)
-        return skeleton;
-    const next = apply(opened.document, Object.entries(fields).flatMap(([name, value]) => frontmatterValue(value) ? [{ kind: 'field', name, value, prior: undefined }] : []));
-    return serialize(next.outcome === 'applied' ? next.document : opened.document);
+function compose(path, fields, sections, composition) {
+    const declared = fields[TYPE_FIELD];
+    const type = typeof declared === 'string' && declared !== '' ? declared : undefined;
+    const definition = definitionsAt(composition, path)(type);
+    const created = create(type, definition);
+    const next = apply(created, [
+        ...Object.entries(fields).flatMap(([name, value]) => (name !== TYPE_FIELD || type === undefined) && frontmatterValue(value)
+            ? [{ kind: 'field', name, value, prior: undefined }]
+            : []),
+        ...Object.entries(sections).map(([name, value]) => ({
+            kind: 'section',
+            name,
+            value,
+            prior: undefined,
+        })),
+    ], definition);
+    return serialize(next.outcome === 'applied' ? next.document : created);
 }
 function edited(change, priors) {
     if (change.kind === 'field')
@@ -81,17 +88,19 @@ function edited(change, priors) {
         prior: priors.section(change.path, change.name),
     };
 }
-function edit(staged, changes, priors) {
+function edit(staged, changes, priors, composition) {
     const path = changes[0].path;
     delete staged.revisions[path];
     const text = staged.documents[path];
     if (text === undefined)
         return changes.length;
-    const parsed = parse(text, path);
+    const definitions = definitionsAt(composition, path);
+    const parsed = parse(text, path, definitions);
     if (!parsed.ok)
         return changes.length;
+    const definition = definitions(parsed.document.type);
     const wanted = changes.map((change) => edited(change, priors));
-    const first = apply(parsed.document, wanted);
+    const first = apply(parsed.document, wanted, definition);
     if (first.outcome === 'refuse')
         return changes.length;
     if (first.outcome === 'applied') {
@@ -100,7 +109,7 @@ function edit(staged, changes, priors) {
     }
     const stale = new Set(first.stale);
     const kept = wanted.filter((_, at) => !stale.has(at));
-    const rest = apply(parsed.document, kept);
+    const rest = apply(parsed.document, kept, definition);
     if (rest.outcome !== 'applied')
         return changes.length;
     staged.documents[path] = serialize(rest.document);
@@ -151,10 +160,12 @@ function erase(staged, path) {
     delete staged.changes[path];
     delete staged.binaries[path];
 }
-function stage(staged, change) {
+function stage(staged, change, composition) {
     if (change.kind === 'create') {
         staged.documents[change.path] =
-            'content' in change ? change.content : compose(change.fields, change.sections);
+            'content' in change
+                ? change.content
+                : compose(change.path, change.fields, change.sections, composition);
         delete staged.fileIds[change.path];
         delete staged.created[change.path];
         delete staged.changes[change.path];
@@ -206,7 +217,7 @@ function arrive(heads, change) {
     if (change.change !== undefined)
         heads.changes[change.path] = change.change;
 }
-export function* overlaying(base, queue, unapplied) {
+export function* overlaying(base, queue, composition, unapplied) {
     const staged = {
         documents: drafted(base.documents),
         binaries: drafted(base.binaries),
@@ -220,7 +231,7 @@ export function* overlaying(base, queue, unapplied) {
         for (let index = 0; index < batch.changes.length; index += 1) {
             const change = batch.changes[index];
             if (!isPart(change)) {
-                if (!stage(staged, change))
+                if (!stage(staged, change, composition))
                     unapplied?.();
                 yield ROW_WEIGHT;
                 continue;
@@ -234,7 +245,7 @@ export function* overlaying(base, queue, unapplied) {
                 index += 1;
             }
             const text = staged.documents[change.path] ?? '';
-            for (let left = edit(staged, run, priors); left > 0; left -= 1)
+            for (let left = edit(staged, run, priors, composition); left > 0; left -= 1)
                 unapplied?.();
             yield ROW_WEIGHT + text.length;
         }

package/dist/page-metadata.d.ts

@@ -0,0 +1,8 @@
+export declare const PAGE_METADATA_WORDS: {
+    readonly heading: 'Page metadata';
+    readonly app: 'App';
+    readonly address: 'Address';
+    readonly queries: 'Local Queries';
+};
+export declare function pageMetadataBlock(app: string, address: string, queries: readonly unknown[]): string;
+//# sourceMappingURL=page-metadata.d.ts.map

package/dist/page-metadata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"page-metadata.d.ts","sourceRoot":"","sources":["../src/page-metadata.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,mBAAmB;aAC9B,OAAO,EAAE,eAAe;aACxB,GAAG,EAAE,KAAK;aACV,OAAO,EAAE,SAAS;aAClB,OAAO,EAAE,eAAe;CAChB,CAAC;AAIX,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,SAAS,OAAO,EAAE,GAC1B,MAAM,CAUR"}

package/dist/page-metadata.js

@@ -0,0 +1,19 @@
+import { queryKey } from '@agentshouse/mdmodel';
+export const PAGE_METADATA_WORDS = {
+    heading: 'Page metadata',
+    app: 'App',
+    address: 'Address',
+    queries: 'Local Queries',
+};
+const PAGE_METADATA_QUERIES = 10;
+export function pageMetadataBlock(app, address, queries) {
+    const held = [...new Set(queries.map(queryKey))];
+    return [
+        PAGE_METADATA_WORDS.heading,
+        `${PAGE_METADATA_WORDS.app}: ${app}`,
+        `${PAGE_METADATA_WORDS.address}: ${address}`,
+        ...(held.length === 0 || held.length > PAGE_METADATA_QUERIES
+            ? []
+            : [`${PAGE_METADATA_WORDS.queries}:`, ...held]),
+    ].join('\n');
+}

package/dist/parts.d.ts

@@ -1,48 +1,4 @@
-import type { RunningSubagent, TurnContext } from './adapter.js';
-import { type JobMarker, type OpenJob } from './job.js';
-export type PlanStep = {
-    readonly content: string;
-    readonly status: string;
-};
-export type Marker = 'mode' | 'compaction' | 'retry' | 'model' | 'job';
-export type Part = {
-    readonly type: 'text';
-    readonly text: string;
-} | {
-    readonly type: 'reasoning';
-    readonly text: string;
-} | {
-    readonly type: 'commands';
-    readonly count: number;
-} | {
-    readonly type: 'subagent';
-    readonly description: string;
-    readonly done: boolean;
-    readonly result: string | null;
-} | {
-    readonly type: 'message';
-    readonly command: string;
-    readonly target: string | null;
-} | {
-    readonly type: 'image';
-    readonly path: string;
-    readonly name: string;
-    readonly mediaType: string;
-} | {
-    readonly type: 'marker';
-    readonly marker: Marker;
-    readonly text: string;
-} | {
-    readonly type: 'plan';
-    readonly steps: readonly PlanStep[];
-};
-export declare function partsOf(raw: readonly unknown[]): readonly Part[];
-export declare function contextIn(raw: unknown): TurnContext | null;
-export type Turn = {
-    readonly turn: string;
-    readonly parts: readonly Part[];
-    readonly ended: boolean;
-};
+import { type Part, type SessionState } from '@agentshouse/session-content';
 export type ChatWork = {
     readonly kind: 'job' | 'schedule' | 'subagent';
     readonly title: string;
@@ -50,10 +6,6 @@ export type ChatWork = {
     readonly activity: string | null;
 };
 export declare function counted(count: number): string;
-export declare function runningLine(raw: readonly unknown[]): string | null;
-export declare function jobsOf(markers: readonly JobMarker[], turn: {
-    readonly started: string | null;
-    readonly parts: readonly unknown[];
-} | null): readonly OpenJob[];
-export declare function stillRunning(turns: readonly Turn[], subagents: readonly RunningSubagent[]): ReadonlyMap<string, readonly ChatWork[]>;
+export declare function runningLine(parts: readonly Part[]): string | null;
+export declare function workOf(state: SessionState | null): readonly ChatWork[];
 //# sourceMappingURL=parts.d.ts.map

package/dist/parts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parts.d.ts","sourceRoot":"","sources":["../src/parts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parts.d.ts","sourceRoot":"","sources":["../src/parts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,KAAK,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAGnF,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,CAAC,IAAI,EAAE,KAAK,GAAG,UAAU,GAAG,UAAU,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,GAAG,MAAM,GAAG,IAAI,CAMjE;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,GAAG,SAAS,QAAQ,EAAE,CAOtE"}

package/dist/parts.js

@@ -1,118 +1,21 @@
-import { closeLast, markerMoved, openJobs } from './job.js';
-import { excerpt, list, record, text } from './read.js';
-const MARKERS = ['mode', 'compaction', 'retry', 'model', 'job'];
-function partOf(raw) {
-    const part = record(raw);
-    switch (text(part, 'type')) {
-        case 'text':
-        case 'reasoning': {
-            const said = text(part, 'text');
-            return said === null ? null : { type: part.type, text: said };
-        }
-        case 'commands':
-            return typeof part.count === 'number' ? { type: 'commands', count: part.count } : null;
-        case 'subagent':
-            return {
-                type: 'subagent',
-                description: text(part, 'description') ?? '',
-                done: part.status === 'done',
-                result: text(part, 'result'),
-            };
-        case 'message': {
-            const command = text(part, 'command');
-            return command === null ? null : { type: 'message', command, target: text(part, 'target') };
-        }
-        case 'image': {
-            const path = text(part, 'file');
-            const name = text(part, 'name');
-            return path === null || name === null
-                ? null
-                : { type: 'image', path, name, mediaType: text(part, 'media_type') ?? '' };
-        }
-        case 'marker': {
-            const marker = text(part, 'marker');
-            return marker === null || !MARKERS.includes(marker)
-                ? null
-                : { type: 'marker', marker: marker, text: text(part, 'text') ?? '' };
-        }
-        case 'plan':
-            return {
-                type: 'plan',
-                steps: list(part, 'entries').flatMap((entry) => {
-                    const step = record(entry);
-                    const content = text(step, 'content');
-                    return content === null ? [] : [{ content, status: text(step, 'status') ?? '' }];
-                }),
-            };
-        default:
-            return null;
-    }
-}
-export function partsOf(raw) {
-    return raw.flatMap((one) => partOf(one) ?? []);
-}
-export function contextIn(raw) {
-    const held = record(raw);
-    return typeof held.used === 'number' && typeof held.window === 'number' && held.window > 0
-        ? { used: held.used, window: held.window }
-        : null;
-}
+import { isOwn } from '@agentshouse/session-content';
+import { excerpt } from './read.js';
 export function counted(count) {
     return count === 1 ? '1 command' : `${count} commands`;
 }
-export function runningLine(raw) {
-    const parts = partsOf(raw);
-    const note = [...parts].reverse().find((part) => part.type === 'text' && part.text.trim() !== '');
+export function runningLine(parts) {
+    const newest = parts.filter(isOwn).reverse();
+    const note = newest.find((part) => part.type === 'text' && part.text.trim() !== '');
     if (note?.type === 'text')
         return excerpt(note.text);
-    const commands = parts.reduce((sum, part) => (part.type === 'commands' ? sum + part.count : sum), 0);
-    return commands === 0 ? null : counted(commands);
-}
-export function jobsOf(markers, turn) {
-    const running = (turn === null ? [] : partsOf(turn.parts)).flatMap((part) => part.type === 'marker' && part.marker === 'job'
-        ? [{ said: part.text, at: turn?.started ?? null }]
-        : []);
-    return openJobs([...markers, ...running]);
+    const call = newest.find((part) => part.type === 'call');
+    return call?.type === 'call' && call.line !== '' ? call.line : null;
 }
-export function stillRunning(turns, subagents) {
-    const open = [];
-    for (const { turn, parts, ended } of turns) {
-        for (const part of parts) {
-            if (part.type === 'subagent') {
-                const key = `subagent\u0000${part.description}`;
-                if (part.done)
-                    closeLast(open, key);
-                else if (ended) {
-                    open.push({
-                        turn,
-                        key,
-                        work: { kind: 'subagent', title: part.description, next: null, activity: null },
-                    });
-                }
-                continue;
-            }
-            if (part.type !== 'marker' || part.marker !== 'job')
-                continue;
-            markerMoved(open, part.text, (job, key) => ended
-                ? {
-                    turn,
-                    key,
-                    work: {
-                        kind: job.kind === 'started' ? 'job' : 'schedule',
-                        title: job.label,
-                        next: job.next,
-                        activity: null,
-                    },
-                }
-                : null);
-        }
-    }
-    const doing = [...subagents];
-    const under = new Map();
-    for (const { turn, work } of open) {
-        const at = work.kind === 'subagent' ? doing.findIndex((one) => one.description === work.title) : -1;
-        const shown = at === -1 ? work : { ...work, activity: doing.splice(at, 1)[0].activity };
-        under.set(turn, [...(under.get(turn) ?? []), shown]);
-    }
-    return under;
+export function workOf(state) {
+    return (state?.running ?? []).map(({ kind, label, progress, next }) => ({
+        kind: kind === 'subagent' || kind === 'schedule' ? kind : 'job',
+        title: label,
+        next,
+        activity: progress,
+    }));
 }

package/dist/paths.d.ts

@@ -1,5 +1,6 @@
 export declare function normalize(path: string): string | null;
 export declare function beneath(prefix: string, path: string): boolean;
 export declare function covered(prefixes: readonly string[], path: string): boolean;
+export declare function authoredAt(patterns: readonly string[], path: string): boolean;
 export declare function ancestors(path: string): readonly string[];
 //# sourceMappingURL=paths.d.ts.map

package/dist/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,wBAAgB,OAAO,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAK1E;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAGzD"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAEA,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,wBAAgB,OAAO,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAK1E;AAwBD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7E;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAGzD"}

package/dist/paths.js

@@ -1,3 +1,4 @@
+import { isDocumentPath } from '@agentshouse/mdmodel';
 export function normalize(path) {
     const parts = [];
     for (const part of path.split('/')) {
@@ -22,6 +23,27 @@ export function covered(prefixes, path) {
         return normalized !== null && (normalized === '' || beneath(normalized, path));
     });
 }
+function named(pattern, name) {
+    const star = pattern.indexOf('*');
+    if (star === -1)
+        return pattern === name;
+    const before = pattern.slice(0, star);
+    const after = pattern.slice(star + 1);
+    return (name.length > before.length + after.length && name.startsWith(before) && name.endsWith(after));
+}
+function matched(pattern, path) {
+    if (pattern === '/')
+        return isDocumentPath(path);
+    const wanted = pattern.split('/');
+    const names = path.split('/');
+    const open = wanted.at(-1) === '**';
+    const fixed = open ? wanted.slice(0, -1) : wanted;
+    return ((open ? names.length > fixed.length : names.length === fixed.length) &&
+        fixed.every((one, at) => named(one, names[at])));
+}
+export function authoredAt(patterns, path) {
+    return patterns.some((pattern) => matched(pattern, path));
+}
 export function ancestors(path) {
     const parts = path.split('/');
     return parts.slice(1).map((_, at) => parts.slice(0, at + 1).join('/'));

package/dist/preparation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preparation.d.ts","sourceRoot":"","sources":["../src/preparation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAE3B,KAAK,SAAS,EAEf,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAK5C,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAC;CAClD,CAAC;AAuCF,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,GAAE,SAAS,MAAM,EAAO,QA8BzE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,CAElE;AAmDD,wBAAsB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAMrF;AAkFD,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,cAAc,EAAE,iBAI3F;AAED,wBAAgB,cAAc,CAC5B,EAAE,KAAK,EAAE,EAAE,OAAO,EAClB,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,SAAS,GAAG,IAAI,EACvB,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,GACtC,MAAM,IAAI,CAQZ;AAED,wBAAgB,MAAM,CAAC,OAAO,EAAE,OAAO,QAMtC"}
+{"version":3,"file":"preparation.d.ts","sourceRoot":"","sources":["../src/preparation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAE3B,KAAK,SAAS,EAEf,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAK5C,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAC;CAClD,CAAC;AAwCF,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,GAAE,SAAS,MAAM,EAAO,QA+BzE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,CAElE;AAgDD,wBAAsB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAMrF;AAoFD,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,cAAc,EAAE,iBAI3F;AAED,wBAAgB,cAAc,CAC5B,EAAE,KAAK,EAAE,EAAE,OAAO,EAClB,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,SAAS,GAAG,IAAI,EACvB,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,GACtC,MAAM,IAAI,CAQZ;AAED,wBAAgB,MAAM,CAAC,OAAO,EAAE,OAAO,QAMtC"}

package/dist/preparation.js

@@ -1,4 +1,5 @@
 import { changeSet } from './change-set.js';
+import { uncaught } from './failure.js';
 import { installationOf } from './install.js';
 import { listedLocators } from './listing.js';
 import { planReach } from './reach.js';
@@ -27,12 +28,14 @@ async function prepareReplica(runtime, locator) {
         return;
     }
 }
-async function unprepared({ store, socket }) {
+async function unprepared({ store }) {
     const held = (await store.covering()).rooms;
-    return [...store.device.now().unpreparedDemand, ...held.keys()].find((locator) => !(held.get(locator)?.indexed ?? false) && !socket.rooms.standing(locator).unpreparable);
+    const { unpreparedDemand, unpreparable } = store.device.now();
+    return [...unpreparedDemand, ...held.keys()].find((locator) => !(held.get(locator)?.indexed ?? false) && !unpreparable.has(locator));
 }
-function unpreparedBy({ store, socket, journal }, locator, error) {
-    socket.rooms.stand(locator, { unpreparable: true });
+function unpreparedBy({ store, journal }, locator, error) {
+    const { unpreparable } = store.device.now();
+    store.device.set({ unpreparable: new Set([...unpreparable, locator]) });
     journal.record(`preparation failed ${locator} ${error instanceof Error ? error.name : 'unknown'}`);
     store.readiness.queue();
 }
@@ -57,8 +60,9 @@ export function prepare(runtime, locators = []) {
                 await prepareReplica(runtime, waiting).catch((error) => unpreparedBy(runtime, waiting, error));
             }
         }
-        catch {
+        catch (error) {
             journal.record('preparation failed');
+            uncaught(error);
         }
         finally {
             device.set({ preparing: false });
@@ -79,12 +83,9 @@ function requiredRooms(runtime, given, held) {
         return { listed: true, rooms: named.filter((room) => listed.has(room)) };
     return { listed: named.every((room) => held.has(room)), rooms: named };
 }
-function roomState({ socket }, locator, held) {
-    const listedRoom = socket.rooms.discovered(locator);
+function roomState({ socket, presence }, locator, held) {
     if (socket.session.now().roomsListed &&
-        (listedRoom === undefined ||
-            listedRoom.replica.admission !== 'admitted' ||
-            socket.rooms.standing(locator).unreadable))
+        (presence.room(locator) === undefined || !presence.available(locator)))
         return 'unadmitted';
     const stored = held.get(locator);
     if (stored === undefined)
@@ -124,8 +125,9 @@ function readinessFor(runtime, port, reach, { held, facts }) {
     const { store, socket, usableWhenHeld } = runtime;
     const required = requiredRooms(runtime, reach, held);
     const coverage = required.rooms.map((room) => ({ room, state: roomState(runtime, room, held) }));
+    const { unpreparable } = store.device.now();
     const preparing = coverage
-        .filter((room) => room.state === 'preparing' && !socket.rooms.standing(room.room).unpreparable)
+        .filter((room) => room.state === 'preparing' && !unpreparable.has(room.room))
         .map(({ room }) => room);
     if (preparing.length > 0)
         prepare(runtime, preparing);
@@ -165,8 +167,9 @@ function establish(runtime, name) {
         .then(() => {
         store.readiness.queue();
         void probeEachMinute(runtime);
-    }, () => {
+    }, (error) => {
         journal.record(`target record failed ${name}`);
+        uncaught(error);
     })
         .finally(() => {
         const establishing = new Set(device.now().establishing);
@@ -206,8 +209,8 @@ export function filled(runtime) {
     store.readiness.queue();
     void probeEachMinute(runtime);
 }
-async function installedTarget({ store, usableWhenHeld }) {
-    if (store.device.now().heldWhenOpened && usableWhenHeld.length > 0)
+async function installedTarget({ store }) {
+    if (store.device.now().heldWhenOpened)
         return true;
     const { targets } = await (await store.open()).facts();
     return Object.values(targets).some((target) => target.established);
@@ -218,7 +221,11 @@ async function probeEachMinute(runtime) {
     const idle = () => !space.full() || space.probing() || socket.closed();
     if (idle())
         return;
-    if (!(await installedTarget(runtime).catch(() => false)))
+    const installed = await installedTarget(runtime).catch((error) => {
+        uncaught(error);
+        return false;
+    });
+    if (!installed)
         return;
     if (idle())
         return;

package/dist/presence.d.ts

@@ -0,0 +1,52 @@
+import type { DiscoveredRoom, ProviderRefusal, ScopedRefusal } from './adapter.js';
+import type { ModelState } from './model.js';
+type Repairable = {
+    readonly reset: string | undefined;
+};
+type Standing = {
+    readonly stale: boolean;
+    readonly repairable: Repairable | null;
+    readonly repairing: boolean;
+    readonly reloadDue: boolean;
+};
+type Listing = {
+    readonly whole: boolean;
+    readonly live: boolean;
+};
+export type Presence = {
+    list(found: readonly DiscoveredRoom[], how: Listing): readonly DiscoveredRoom[];
+    room(locator: string): DiscoveredRoom | undefined;
+    rooms(): readonly DiscoveredRoom[];
+    available(locator: string, selection?: string): boolean;
+    refusal(locator: string): ProviderRefusal | null;
+    unheldModel(locator: string): ModelState | null;
+    refused(locator: string, refusal: ScopedRefusal | null): void;
+    readable(locator: string): boolean;
+    modelled(locator: string, model: ModelState | null): void;
+    installed(locator: string, bootstrapped: boolean): void;
+    locked(locator: string, stored: () => Promise<string | null>): Promise<boolean>;
+    lockedAmong(stored: ReadonlyMap<string, string>): readonly string[];
+    connectionLost(lapsed: () => void): void;
+    connectionLive(): void;
+    lapse(): void;
+    stood(locator: string, stale: boolean, repairable?: Repairable | null): void;
+    repairing(locator: string, running: boolean): void;
+    reload(locator: string, due: boolean): void;
+    standing(locator: string): Standing;
+    settled(): boolean;
+    repairsOwed(): readonly string[];
+    askAgain(locator: string, ask: () => void): void;
+    stopAsking(locator?: string): void;
+    lose(locator: string, during: number): boolean;
+    writing(locator: string): boolean;
+    unwritten(locator: string): void;
+    lost(locator: string): boolean;
+    losses(): number;
+    lostSince(locator: string, losses: number): boolean;
+    liftable(locator: string, discovery: number): boolean;
+    lift(locator: string, discovery: number, unfenced: boolean): void;
+    close(): void;
+};
+export declare function createPresence(): Presence;
+export {};
+//# sourceMappingURL=presence.d.ts.map

package/dist/presence.d.ts.map

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