@agentshouse/mdruntime 0.1.0-cf04ede9fb796 → 0.1.0-cf0c43fc48aad

package/dist/client.js

@@ -1,7 +1,8 @@
 import { shownBy } from './media.js';
+import { pageMetadataBlock } from './page-metadata.js';
 import { observed } from './observation.js';
 import { runtimeError } from './failure.js';
-import { answer, AUTHORIZATION_ENDED, PORT_CLOSED, } from './wire.js';
+import { AUTHORIZATION_ENDED, PORT_CLOSED, wireAnswer, } from './wire.js';
 // React renders an arrived value in a later task and opens what that render observes as it commits, so this many frames opening nothing mean the page drew what it observes.
 const SETTLED_FRAMES = 2;
 // A browser reads a download's address only after the click that hands it returns, so a copy's address is released a minute later.
@@ -21,9 +22,10 @@ function handed(url, name) {
     anchor.click();
 }
 function refused(refusal) {
-    return runtimeError(refusal.code, refusal.code, refusal.retryable);
+    return runtimeError(refusal.code);
 }
-export function connectMdRuntime(port) {
+const UNBUILT = () => Promise.resolve(null);
+export function connectMdRuntime(port, buildFile = UNBUILT) {
     let sequence = 0;
     let refusal = null;
     let ended = null;
@@ -35,13 +37,13 @@ export function connectMdRuntime(port) {
     const send = (message) => {
         port.postMessage(message);
     };
-    function begin(id, topic, first) {
+    function begin(id, topic, input, first) {
         const handle = observed(first, () => {
             observations.delete(id);
             if (refusal === null)
                 send({ kind: 'stop', id });
         }, topic === 'query');
-        observations.set(id, { topic, handle });
+        observations.set(id, { topic, input, handle });
         return handle.observation;
     }
     function refuse(reported) {
@@ -53,7 +55,7 @@ export function connectMdRuntime(port) {
         const failure = refused(reported);
         for (const [id, waiting] of opening) {
             if (waiting.topic === 'connection-refusal')
-                waiting.settle(begin(id, waiting.topic, reported));
+                waiting.settle(begin(id, waiting.topic, waiting.input, reported));
             else
                 waiting.fail(failure);
         }
@@ -79,7 +81,7 @@ export function connectMdRuntime(port) {
         drawing?.();
     }
     port.addEventListener('message', (event) => {
-        const message = answer(event.data);
+        const message = wireAnswer(event.data);
         if (message === null)
             return;
         if (message.kind === 'refusal') {
@@ -105,7 +107,7 @@ export function connectMdRuntime(port) {
                 waiting.fail(runtimeError(message.code, message.message, message.retryable));
             }
             else
-                waiting.settle(begin(message.id, waiting.topic, message.value));
+                waiting.settle(begin(message.id, waiting.topic, waiting.input, message.value));
             drawing?.();
             return;
         }
@@ -141,11 +143,11 @@ export function connectMdRuntime(port) {
         const id = (sequence += 1);
         if (refusal !== null) {
             return topic === 'connection-refusal'
-                ? Promise.resolve(begin(id, topic, refusal))
+                ? Promise.resolve(begin(id, topic, input, refusal))
                 : Promise.reject(refused(refusal));
         }
         return new Promise((settle, fail) => {
-            opening.set(id, { topic, settle, fail });
+            opening.set(id, { topic, input, settle, fail });
             send({ kind: 'observe', id, topic, input });
             drawing?.();
         });
@@ -232,6 +234,7 @@ export function connectMdRuntime(port) {
     }
     const show = (room, path, revision) => ask('binaryFile.show', [room, path, revision]).then((shown) => streamed(shown));
     return shownBy(show, {
+        buildFile,
         rooms: () => ask('rooms', []),
         query: ((query) => ask('query', [query])),
         search: (request) => ask('search', [request]),
@@ -254,14 +257,28 @@ export function connectMdRuntime(port) {
             read: (conversation, options) => ask('conversation.read', [conversation, options]),
             create: (input) => ask('conversation.create', [input]),
             send: (conversation, operation, draft) => ask('conversation.send', [conversation, operation, draft]),
-            answer: (conversation, answer) => ask('conversation.answer', [conversation, answer]),
-            interrupt: (conversation) => ask('conversation.interrupt', [conversation]),
-            kill: (conversation) => ask('conversation.kill', [conversation]),
-            delete: (conversation) => ask('conversation.delete', [conversation]),
+            answer: (conversation, answer, operation) => ask('conversation.answer', [conversation, answer, operation]),
+            interrupt: (conversation, operation) => ask('conversation.interrupt', [conversation, operation]),
+            kill: (conversation, operation) => ask('conversation.kill', [conversation, operation]),
+            delete: (conversation, operation) => ask('conversation.delete', [conversation, operation]),
+            takeOut: (conversation, message, operation) => ask('conversation.takeOut', [conversation, message, operation]),
+            decide: (request, decision, operation) => ask('conversation.decide', [request, decision, operation]),
+            rename: (conversation, name, operation) => ask('conversation.rename', [conversation, name, operation]),
+            option: (conversation, option, value, operation) => ask('conversation.option', [conversation, option, value, operation]),
+            retry: (conversation, message, operation) => ask('conversation.retry', [conversation, message, operation]),
+            pins: () => ask('conversation.pins', []),
+            pin: (figures) => ask('conversation.pin', [figures]),
+            openedTurns: () => ask('conversation.openedTurns', []),
+            openTurn: (conversation, turn) => ask('conversation.openTurn', [conversation, turn]),
+            dismissSuggestion: (conversation, suggestion) => ask('conversation.dismissSuggestion', [conversation, suggestion]),
+            pageMetadata: async (app, address) => pageMetadataBlock(app, address, [...observations]
+                .sort(([left], [right]) => left - right)
+                .flatMap(([, { topic, input }]) => (topic === 'query' ? [input[0]] : []))),
         },
         chatDraft: {
             write: (conversation, draft, revision) => ask('chatDraft.write', [conversation, draft, revision]),
             prepend: (conversation, draft) => ask('chatDraft.prepend', [conversation, draft]),
+            append: (conversation, draft) => ask('chatDraft.append', [conversation, draft]),
             discard: (conversation) => ask('chatDraft.discard', [conversation]),
         },
         history: (locator, path, query) => ask('history', [locator, path, query]),
@@ -272,8 +289,8 @@ export function connectMdRuntime(port) {
             download,
         },
         call: (name, input) => ask('call', [name, input]),
+        answered: (operation) => ask('answered', [operation]),
         reached: (locator, roomVersion, path) => ask('reached', [locator, roomVersion, path]),
-        log: () => ask('log', []),
         persistence: () => ask('persistence', []),
         retry: () => ask('retry', []),
         cleanUp: () => ask('cleanUp', []),

package/dist/collection.d.ts

@@ -1,5 +1,6 @@
-import { type Document, type TypedPath } from '@agentshouse/mdmodel';
-import type { ModelState } from './model.js';
+import { type DefinitionOf, type Document, type TypedPath } from '@agentshouse/mdmodel';
+import type { ModelState, TypesResult } from './model.js';
+import type { AppTypedSelection } from './listing.js';
 import type { MdModelIdentity } from './adapter.js';
 export declare const MD_MODEL: MdModelIdentity;
 export type Collection = {
@@ -20,10 +21,27 @@ export type Composed = {
     readonly fingerprint: string;
 };
 export declare function composedOf(composition: Composition): Composed;
-export declare function selected(composition: Composition, path: string): boolean;
-export declare function governing(composition: Composition, path: string): ModelState;
+type Selecting<M> = {
+    readonly model: M;
+    readonly selection: {
+        readonly roots: readonly string[];
+        readonly model: M;
+    } | null;
+};
+export declare function selected(composition: {
+    readonly selection: {
+        readonly roots: readonly string[];
+    } | null;
+}, path: string): boolean;
+export declare function governing<M>(composition: Selecting<M>, path: string): M;
+export declare function definitionsAt(composition: Composition, path: string): DefinitionOf;
+export declare function definitionsIn(room: {
+    readonly model: TypesResult;
+    readonly typedSelection: AppTypedSelection | null;
+}, path: string, typedPaths: readonly TypedPath[]): DefinitionOf;
 export declare function collectionOf(text: Readonly<Record<string, string>>, composition: Composition): Collection;
 export declare function documentsOf(collection: Collection): Generator<number, Iterable<readonly [string, Document]>, void>;
 export declare function validRoot(root: unknown): root is string;
 export declare function available(composition: Composition): boolean;
+export {};
 //# sourceMappingURL=collection.d.ts.map

package/dist/collection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAErF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAIpD,eAAO,MAAM,QAAQ,EAAE,eAAwE,CAAC;AAEhG,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACvC,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE;QAAE,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,IAAI,CAAC;IAClE,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC;AAc3F,wBAAgB,UAAU,CAAC,WAAW,EAAE,WAAW,GAAG,QAAQ,CAS7D;AAED,wBAAgB,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAKxE;AAED,wBAAgB,SAAS,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,UAAU,CAI5E;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACtC,WAAW,EAAE,WAAW,GACvB,UAAU,CAcZ;AAED,wBAAiB,WAAW,CAC1B,UAAU,EAAE,UAAU,GACrB,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAQhE;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,MAAM,CAEvD;AAED,wBAAgB,SAAS,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAE3D"}
+{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,SAAS,EAEf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAIpD,eAAO,MAAM,QAAQ,EAAE,eAAwE,CAAC;AAEhG,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACvC,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE;QAAE,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,IAAI,CAAC;IAClE,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC;AAc3F,wBAAgB,UAAU,CAAC,WAAW,EAAE,WAAW,GAAG,QAAQ,CAS7D;AAED,KAAK,SAAS,CAAC,CAAC,IAAI;IAClB,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAClB,QAAQ,CAAC,SAAS,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAA;KAAE,GAAG,IAAI,CAAC;CACrF,CAAC;AAEF,wBAAgB,QAAQ,CACtB,WAAW,EAAE;IAAE,QAAQ,CAAC,SAAS,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI,CAAA;CAAE,EACjF,IAAI,EAAE,MAAM,GACX,OAAO,CAKT;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAIvE;AAYD,wBAAgB,aAAa,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,YAAY,CAIlF;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,cAAc,EAAE,iBAAiB,GAAG,IAAI,CAAA;CAAE,EACxF,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,SAAS,SAAS,EAAE,GAC/B,YAAY,CAQd;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACtC,WAAW,EAAE,WAAW,GACvB,UAAU,CAcZ;AAED,wBAAiB,WAAW,CAC1B,UAAU,EAAE,UAAU,GACrB,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAQhE;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,MAAM,CAEvD;AAED,wBAAgB,SAAS,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAE3D"}

package/dist/collection.js

@@ -1,4 +1,4 @@
-import { parse, VERSION } from '@agentshouse/mdmodel';
+import { definitionAt, parse, VERSION, } from '@agentshouse/mdmodel';
 import { beneath, normalize } from './paths.js';
 import { hashed } from './observation.js';
 import { sortedKeys } from './shared.js';
@@ -33,6 +33,16 @@ export function governing(composition, path) {
         ? composition.selection.model
         : composition.model;
 }
+function definitionsUnder(composition, path, typedPaths, typesOf) {
+    const types = typesOf(governing(composition, path));
+    return types === null ? () => undefined : definitionAt({ types }, path, typedPaths);
+}
+export function definitionsAt(composition, path) {
+    return definitionsUnder(composition, path, composition.typedPaths, (model) => model.status === 'unavailable' ? null : model.types);
+}
+export function definitionsIn(room, path, typedPaths) {
+    return definitionsUnder({ model: room.model, selection: room.typedSelection }, path, typedPaths, ({ types }) => types === null ? null : Object.fromEntries(types.map((type) => [type.name, type])));
+}
 export function collectionOf(text, composition) {
     const parsed = new Map();
     return {
@@ -44,7 +54,7 @@ export function collectionOf(text, composition) {
             const content = text[path];
             if (content === undefined)
                 return undefined;
-            const read = parse(content, path);
+            const read = parse(content, path, definitionsAt(composition, path));
             parsed.set(path, read.ok ? read.document : null);
             return read.ok ? read.document : undefined;
         },

package/dist/compile.d.ts

@@ -1,9 +1,11 @@
 import { sql } from '@agentshouse/mdmodel';
+import { type Composition } from './collection.js';
 import type { Plan, QueryRows } from './query.js';
 import type { Connection } from './tables.js';
 export type QueryRoom = {
     readonly locator: string;
     readonly key: number;
+    readonly composition?: Composition;
 };
 type Fragment = sql.Fragment;
 export declare const VISIBLE: (alias: string) => string;

package/dist/compile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../src/compile.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,GAAG,EAOJ,MAAM,sBAAsB,CAAC;AAI9B,OAAO,KAAK,EAAE,IAAI,EAAuC,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvF,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AAG1D,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3E,KAAK,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;AAI7B,eAAO,MAAM,OAAO,UAAW,MAAM,KAAG,MACkC,CAAC;AAa3E,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,CAM5D;AA0cD,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG;IAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAmajE,wBAAgB,WAAW,CACzB,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,SAAS,SAAS,EAAE,EAC3B,MAAM,GAAE,MAAM,GAAG,IAAW,GAC3B,WAAW,CAUb"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../src/compile.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,GAAG,EAQJ,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAElE,OAAO,KAAK,EAAE,IAAI,EAAuC,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvF,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AAG1D,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;CACpC,CAAC;AAIF,KAAK,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;AAI7B,eAAO,MAAM,OAAO,UAAW,MAAM,KAAG,MACkC,CAAC;AAa3E,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,CAM5D;AA2dD,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG;IAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA4ZjE,wBAAgB,WAAW,CACzB,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,SAAS,SAAS,EAAE,EAC3B,MAAM,GAAE,MAAM,GAAG,IAAW,GAC3B,WAAW,CAUb"}

package/dist/compile.js

@@ -1,7 +1,9 @@
 import { ARRAY_INDEX, bodied, byCodePoint, compared, cursorOf, heldKind, parse, pointerSegments, sql, } from '@agentshouse/mdmodel';
 import { binaryRecord } from './binary.js';
+import { definitionsAt } from './collection.js';
 import { documentKey, pathOfKey, roomOfKey } from './rows.js';
 import { FROM_START, MAXIMUM_WINDOW } from './windows.js';
+const UNTYPED = 'any';
 const { all, any, exists, fragment, grouped, joined, listed } = sql;
 export const VISIBLE = (alias) => `${alias}.visible = 1 AND ${alias}.present = 1 AND ${alias}.queried = 1`;
 function located(alias) {
@@ -310,11 +312,20 @@ function sectionsOf(sections, names) {
         return sections;
     return Object.fromEntries(names.flatMap((name) => (Object.hasOwn(sections, name) ? [[name, sections[name]]] : [])));
 }
-function documentOf(shape, room, row, linked) {
+function freeParts(room, path, type, content) {
+    const definitions = room.composition === undefined ? undefined : definitionsAt(room.composition, path);
+    const definition = definitions?.(type === UNTYPED ? undefined : type);
+    if (definition === undefined && type !== UNTYPED)
+        return null;
+    const read = parse(content, path, definition);
+    return read.ok ? read.document : null;
+}
+function documentOf(shape, queried, row, linked) {
+    const room = queried.locator;
     const path = row.path;
     const type = row.type;
-    const fileId = row.file_id ?? null;
-    const revision = row.revision ?? null;
+    const fileId = row.file_id;
+    const revision = row.revision;
     if (type === null) {
         const binary = row.binary === null ? null : JSON.parse(row.binary);
         const content = row.content ?? null;
@@ -333,8 +344,9 @@ function documentOf(shape, room, row, linked) {
             ...heldFacts(shape, row),
         };
     }
-    const read = bodied(shape) ? parse(row.content, path) : null;
-    const body = read?.ok === true ? read.document : null;
+    const body = shape.sections !== null || shape.preamble
+        ? freeParts(queried, path, type, row.content)
+        : null;
     const fields = JSON.parse(row.fields ?? '{}');
     return {
         room,
@@ -365,7 +377,7 @@ function changeOf(row) {
 function heldFacts(shape, row) {
     return {
         ...(shape.size ? { size: row.bytes === null ? null : Number(row.bytes) } : {}),
-        ...(shape.created ? { created: row.created ?? null } : {}),
+        ...(shape.created ? { created: row.created } : {}),
     };
 }
 function backlinksOf(connection, bound, rows) {
@@ -377,8 +389,8 @@ function backlinksOf(connection, bound, rows) {
         held.push(row.path);
         byKey.set(key, held);
     }
+    const reach = reached(bound, 's');
     for (const [key, targets] of byKey) {
-        const reach = reached(bound, 's');
         const room = bound.rooms.find((one) => one.key === key).locator;
         const found = connection.rows(`SELECT target, path, type, field FROM (SELECT l.target, s.path, s.type, l.field, ROW_NUMBER() OVER (PARTITION BY l.target ORDER BY s.path, l.field) AS rank FROM (SELECT DISTINCT doc, target, field FROM replica_links WHERE key = ? AND kind = 'field' AND target IN (SELECT value FROM json_each(?))) l JOIN replica_entries s ON s.id = l.doc AND ${VISIBLE('s')} WHERE ${reach.sql}) WHERE rank <= ? ORDER BY target, path, field`, [key, JSON.stringify(targets), ...reach.bind, MAXIMUM_WINDOW]);
         for (const row of found) {
@@ -395,22 +407,19 @@ function documents(connection, bound, plan, shape, budget) {
     const filter = filtered(bound, plan);
     const cursor = plan.after?.values ?? null;
     const room = located('d');
-    const tie = cursor === null
+    const after = cursor === null
         ? null
         : (() => {
             const key = cursor[shape.orderBy.length];
-            return any([
+            return sql.following(terms.map(({ term }, index) => sql.beyond(bound.collate, term, cursor[index])), any([
                 fragment(`${room.sql} > ?`, [...room.bind, roomOfKey(key)]),
                 fragment(`${room.sql} = ? AND d.path > ?`, [
                     ...room.bind,
                     roomOfKey(key),
                     pathOfKey(key),
                 ]),
-            ]);
+            ]));
         })();
-    const after = cursor === null || tie === null
-        ? null
-        : sql.following(terms.map(({ term }, index) => sql.beyond(bound.collate, term, cursor[index])), tie);
     const selected = joined([
         fragment('SELECT d.id, d.key, d.path, d.type, d.binary, d.revision, d.fields, d.change, d.file_id, d.bytes, d.created'),
         ...terms.map(({ term }, index) => joined([
@@ -431,8 +440,9 @@ function documents(connection, bound, plan, shape, budget) {
     const kept = bodied(shape) ? withContent(connection, windowed, budget) : windowed;
     const cut = kept.length;
     const roomOf = new Map(bound.rooms.map(({ key, locator }) => [key, locator]));
+    const queried = new Map(bound.rooms.map((one) => [one.key, one]));
     const linked = shape.backlinks ? backlinksOf(connection, bound, kept) : new Map();
-    const found = kept.map((row) => documentOf(shape, roomOf.get(Number(row.key)), row, linked));
+    const found = kept.map((row) => documentOf(shape, queried.get(Number(row.key)), row, linked));
     const last = kept.at(-1);
     const cursorAt = (row) => cursorOf([
         ...shape.orderBy.map(({ key }, index) => decodedKey(key, row, index)),
@@ -645,17 +655,14 @@ function groups(connection, bound, plan, shape) {
         { ordering: GROUP_TIES, kind: fragment("'string'"), value: fragment(`k${index}`) },
     ]);
     const cursor = plan.after?.values ?? null;
-    const tieValues = cursor === null
+    const after = cursor === null
         ? null
-        : cursor[shape.orderBy.length].flatMap((value) => [
-            value,
-            heldKind(value ?? null),
-        ]);
-    const after = cursor === null || tieValues === null
-        ? null
-        : sql.following(ordered.map((term, index) => sql.beyond(bound.collate, term, cursor[index])), sql.following(ties
-            .slice(0, -1)
-            .map((term, index) => sql.beyond(bound.collate, term, tieValues[index])), sql.beyond(bound.collate, ties.at(-1), tieValues.at(-1)).beyond));
+        : (() => {
+            const tieValues = cursor[shape.orderBy.length].flatMap((value) => [value, heldKind(value ?? null)]);
+            return sql.following(ordered.map((term, index) => sql.beyond(bound.collate, term, cursor[index])), sql.following(ties
+                .slice(0, -1)
+                .map((term, index) => sql.beyond(bound.collate, term, tieValues[index])), sql.beyond(bound.collate, ties.at(-1), tieValues.at(-1)).beyond));
+        })();
     const grouping = joined([fragment(`SELECT ${columns} FROM (`), ranked, fragment(`) GROUP BY ${held}`)], '');
     const windowed = joined([
         fragment('SELECT * FROM ('),

package/dist/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAG/E,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAUrE,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAK9D,OAAO,EAAe,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAGrE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,EAAE,eAAe,CAAC;IAC1B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAIF,wBAAgB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,eAAe,CA+FzE"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAI/E,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAUrE,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAK9D,OAAO,EAAe,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,EAAE,eAAe,CAAC;IAC1B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAIF,wBAAgB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,eAAe,CAoGzE"}

package/dist/connection.js

@@ -1,33 +1,35 @@
-import { submitLater, unpair } from './acceptance.js';
+import { submitLater } from './acceptance.js';
 import { invokeAction, called, readConversationHistory, resendLater } from './actions.js';
 import { builtInModel, roomTypesOf } from './attached-model.js';
 import { createLiveConversations } from './conversation-live.js';
+import { writeRule } from './declaration.js';
 import { refusedForSpace } from './durability.js';
+import { uncaught } from './failure.js';
 import { createFigures } from './figures.js';
 import { scheduleCurrency, spaceFreed, start } from './lifecycle.js';
 import { createLiveQueries } from './live.js';
-import { createLog } from './log.js';
-import { scoped } from './models.js';
 import { open } from './opening.js';
-import { deliverOwedReadiness, filled } from './preparation.js';
+import { deliverOwedReadiness, filled, prepare } from './preparation.js';
+import { createPresence } from './presence.js';
 import { answeredPlan, figuresCover, roomTallies } from './queries.js';
 import { readAnswers } from './reads.js';
 import { createRecovery } from './recovery.js';
-import { settle } from './saves.js';
+import { createRetries } from './retried.js';
 import { publishChangeSet, show } from './shown.js';
 import { createSocket } from './socket.js';
 import { createStore } from './store.js';
 import { composedRuntime } from './surface.js';
-import { advanced, withhold } from './sync.js';
 const ROOM_ATTEMPTS = 16;
 export function composeRuntime(options) {
     const { adapter, shell } = options;
     const roomTypes = roomTypesOf(adapter.roomTypes, adapter.nameableRoomTypes);
     const builtIn = builtInModel(roomTypes);
     const typedPaths = adapter.typedPaths ?? [];
-    const journal = createLog();
-    const socket = createSocket(adapter, journal, options.authorization);
+    const retries = createRetries(shell);
+    const socket = createSocket(adapter, retries, options.authorization);
+    const presence = createPresence();
     const store = createStore({
+        retries,
         database: {
             async ask(request) {
                 try {
@@ -44,11 +46,16 @@ export function composeRuntime(options) {
         builtIn,
         typedPaths,
         persistence: shell.persistence,
+        lost: presence.lost,
         opening: (local) => open(runtime, local),
-        unpublished(error) {
-            journal.record(`publication failed ${error instanceof Error ? error.name : 'unknown'}`);
+        unpublished: uncaught,
+        changed(set) {
+            if (set.unindexed.length > 0)
+                prepare(runtime, set.unindexed);
+            for (const locator of set.due)
+                submitLater(runtime, locator);
+            return publishChangeSet(runtime, set);
         },
-        changed: (set) => publishChangeSet(runtime, set),
         deliverReadiness: (owed) => deliverOwedReadiness(runtime, owed),
         spaceFreed: () => spaceFreed(runtime),
     });
@@ -56,18 +63,19 @@ export function composeRuntime(options) {
     const runtime = {
         store,
         socket,
-        journal,
+        presence,
         recovery,
+        retries,
         shell,
         localSaves: adapter.localSaves === true,
         roomTypes,
         builtIn,
         typedPaths,
-        pathRule: adapter.pathRule ?? (() => true),
+        writeRule: (declaration) => writeRule(declaration, adapter.pathRule ?? (() => true), adapter.localSaves === true),
         usableWhenHeld: options.usableWhenHeld ?? [],
         build: options.build ?? '',
         conversations: createLiveConversations({
-            call: (name, input) => invokeAction(runtime, name, input),
+            call: (name, input, attempt) => invokeAction(runtime, name, input, { attempt }),
             history: (request) => readConversationHistory(runtime, request),
             durably: store.durably,
             local: store.open,
@@ -83,7 +91,9 @@ export function composeRuntime(options) {
             full: store.space.full,
             closed: socket.closed,
             unanswered: () => resendLater(runtime),
+            heard: (operation, lost) => socket.lanes.settle(operation, lost),
             recovery: recovery.scope(),
+            retries,
         }),
         liveQueries: createLiveQueries((plan, cover) => answeredPlan(runtime, plan, cover), store.covering),
         figures: createFigures({
@@ -97,19 +107,14 @@ export function composeRuntime(options) {
             unkept: adapter.unkeptReads ?? [],
             leading: adapter.leadingReads ?? [],
             recovery: recovery.scope(),
-            call: (name, input) => called(runtime, name, input),
+            retries,
+            call: (name, input, attempt) => called(runtime, name, input, attempt),
             online: socket.reached,
             streaming: socket.isOpen,
             closed: socket.closed,
             full: store.space.full,
             filled: () => filled(runtime),
         }),
-        settle: (...held) => settle(runtime, ...held),
-        scoped: (...held) => scoped(runtime, ...held),
-        submitLater: (locator) => submitLater(runtime, locator),
-        unpair: (local) => unpair(runtime, local),
-        advanced: (...held) => advanced(runtime, ...held),
-        withhold: (...held) => withhold(runtime, ...held),
     };
     start(runtime, options.signal);
     return composedRuntime(runtime);

package/dist/conversation-live.d.ts

@@ -1,13 +1,14 @@
-import type { AcceptedMessage, ConversationAction, ConversationHistoryRequest, ConversationStream, ListedAgent, ListedConversation, ProcessCommand, RunningSubagent, SessionOption } from './adapter.js';
+import type { SessionState } from '@agentshouse/session-content';
+import type { AcceptedMessage, ConversationAction, ConversationHistoryRequest, ConversationStream, ListedAgent, ListedConversation, ProcessCommand, SessionOption } from './adapter.js';
 import { type Cell } from './cell.js';
 import type { ChangeSet } from './change-set.js';
 import type { Asked, ConversationAgent, ConversationEntry, ConversationView, RunningTurn } from './conversation.js';
-import type { JobMarker } from './job.js';
 import type { CallResult } from './outcome.js';
 import type { Recovery } from './recovery.js';
+import type { Attempt, Retries } from './retried.js';
 import type { ChatDraftRecord, RuntimeStore } from './store.js';
 export type ConversationDependencies = {
-    call(name: ConversationAction, input: unknown): Promise<CallResult>;
+    call(name: ConversationAction, input: unknown, attempt?: Attempt): Promise<CallResult>;
     history(request: ConversationHistoryRequest): Promise<CallResult>;
     durably<T>(work: (local: RuntimeStore) => Promise<T>): Promise<T>;
     local(): Promise<RuntimeStore>;
@@ -19,7 +20,9 @@ export type ConversationDependencies = {
     full(): boolean;
     closed(): boolean;
     unanswered(): void;
+    heard(operation: string, lost: boolean): void;
     readonly recovery: Recovery;
+    readonly retries: Retries;
 };
 export type Live = {
     turn: RunningTurn | null;
@@ -30,10 +33,11 @@ export type Live = {
     commands: readonly ProcessCommand[];
     options: readonly SessionOption[];
     starting: string | null;
-    subagents: readonly RunningSubagent[];
+    state: SessionState | null;
     link: {
         connected: boolean;
     } | null;
+    deliveryWaiting: readonly string[];
     deliveryUnknown: readonly string[];
 };
 export declare const QUIET: Live;
@@ -46,7 +50,7 @@ type HeldWindow = {
     readonly window: readonly AcceptedMessage[] | null;
     readonly draft: ChatDraftRecord | null;
     readonly ended: string | null;
-    readonly marked: readonly JobMarker[];
+    readonly dismissed: string | null;
     readonly more: boolean;
     readonly total: number | null;
 };
@@ -107,7 +111,7 @@ export type LiveConversations = {
     caughtUpTo(conversation: string): void;
     gapOpened(conversation: string): void;
     generation(conversation: string): number;
-    heardAt(conversation: string, position: string): void;
+    heardAt(conversation: string, change: string): void;
     newestHeard(conversation: string): string | undefined;
     catching(conversation: string): Promise<void> | undefined;
     catchingUntil(conversation: string, ended: Promise<void>): void;

package/dist/conversation-live.d.ts.map

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

package/dist/conversation-live.js

@@ -6,8 +6,9 @@ export const QUIET = {
     commands: [],
     options: [],
     starting: null,
-    subagents: [],
+    state: null,
     link: null,
+    deliveryWaiting: [],
     deliveryUnknown: [],
 };
 export const FACTS = [
@@ -16,8 +17,9 @@ export const FACTS = [
     'commands',
     'options',
     'starting',
-    'subagents',
+    'state',
     'link',
+    'deliveryWaiting',
     'deliveryUnknown',
 ];
 // A row is read at a glance and each telling clones the list to every observing tab, while a running line changes at each Kit flush.
@@ -61,7 +63,7 @@ function sharedView(conversation, asked) {
             window: null,
             draft: null,
             ended: null,
-            marked: [],
+            dismissed: null,
             more: false,
             total: null,
         }),
@@ -159,10 +161,10 @@ export function createLiveConversations(deps) {
             behind.add(conversation);
         },
         generation: (conversation) => gaps.get(conversation) ?? 0,
-        heardAt(conversation, position) {
+        heardAt(conversation, change) {
             const heard = heardNewest.get(conversation);
-            if (heard === undefined || position > heard)
-                heardNewest.set(conversation, position);
+            if (heard === undefined || change > heard)
+                heardNewest.set(conversation, change);
         },
         newestHeard: (conversation) => heardNewest.get(conversation),
         catching: (conversation) => catching.get(conversation),