@agentshouse/mdruntime 0.1.0-cf04ede9fb796 → 0.1.0-cf0c43fc48aad

package/dist/messages.d.ts

@@ -1,9 +1,7 @@
 import type { AcceptedMessage } from './adapter.js';
-import type { JobMarker } from './job.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 JOB_MARKERS = "SELECT json_extract(part.value, '$.text') AS said,\n    json_extract(message, '$.accepted_at') AS at\n  FROM conversation_messages, json_each(message, '$.parts') AS part\n  WHERE conversation = ? AND instr(message, '\"marker\":\"job\"') > 0\n    AND json_extract(part.value, '$.type') = 'marker'\n    AND json_extract(part.value, '$.marker') = 'job'\n  ORDER BY position, identity, part.key";
 export type HeldConversation = {
     readonly conversation: string;
     readonly read: string | null | undefined;
@@ -32,6 +30,12 @@ export type HeldRow = {
         readonly at: string | null;
     }) | null;
 };
+export type ConversationFact = 'openedTurn' | 'dismissedSuggestion';
+export type HeldFact = {
+    readonly conversation: string;
+    readonly name: ConversationFact;
+    readonly value: string;
+};
 export type ConversationWrite = {
     readonly conversation: string;
     readonly messages: readonly AcceptedMessage[];
@@ -45,8 +49,8 @@ export declare function keptMessages(connection: Connection, { conversation, mes
 export declare function messageWindow(connection: Connection, conversation: string, limit: number, before: readonly [string, string] | null, phrase: string | null): MessageWindow;
 export declare function messageCount(connection: Connection, conversation: string, phrase: string | null): number;
 export declare function conversationRows(connection: Connection, conversations: readonly string[]): HeldRow[];
-export declare function jobMarkers(connection: Connection, conversation: string): JobMarker[];
 export declare function turnArrived(connection: Connection, conversation: string, turn: string): boolean;
-export declare function droppedMessages(connection: Connection, conversations: readonly string[]): void;
-export declare function forgottenMessages(connection: Connection): void;
+export declare function conversationFacts(connection: Connection): HeldFact[];
+export declare function keptFact(connection: Connection, { conversation, name, value }: HeldFact): null;
+export declare function forgottenConversations(connection: Connection): void;
 //# sourceMappingURL=messages.d.ts.map

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":"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"}

package/dist/messages.js

@@ -1,16 +1,16 @@
 import { sql } from '@agentshouse/mdmodel';
 import { EXCERPT } from './read.js';
+import { tablesOf } from './stored.js';
 const SAID_BY_HOUSE = `json_extract(message, '$.role') = 'house'`;
 const ANSWERS_THE_TURN = `json_extract(message, '$.role') = 'assistant'`;
-const MARKS_A_JOB = `instr(message, '"marker":"job"') > 0`;
 export const MESSAGE_TABLES = [
     'CREATE TABLE conversation_reads (conversation TEXT PRIMARY KEY, read TEXT, partial INTEGER NOT NULL) WITHOUT ROWID',
-    'CREATE TABLE conversation_messages (id INTEGER PRIMARY KEY, conversation TEXT NOT NULL, identity TEXT NOT NULL, turn TEXT NOT NULL, position TEXT NOT NULL, message TEXT NOT NULL, text TEXT NOT NULL)',
+    'CREATE TABLE conversation_messages (id INTEGER PRIMARY KEY, conversation TEXT NOT NULL, identity TEXT NOT NULL, turn TEXT NOT NULL, position TEXT NOT NULL, change TEXT NOT NULL, message TEXT NOT NULL, text TEXT NOT NULL)',
     'CREATE UNIQUE INDEX conversation_messages_identity ON conversation_messages (conversation, identity)',
     'CREATE INDEX conversation_messages_position ON conversation_messages (conversation, position, identity)',
     'CREATE INDEX conversation_messages_turn ON conversation_messages (conversation, turn)',
     `CREATE INDEX conversation_messages_house ON conversation_messages (conversation, position, identity) WHERE ${SAID_BY_HOUSE}`,
-    `CREATE INDEX conversation_messages_jobs ON conversation_messages (conversation, position, identity) WHERE ${MARKS_A_JOB}`,
+    'CREATE TABLE conversation_facts (conversation TEXT NOT NULL, name TEXT NOT NULL, value TEXT NOT NULL, PRIMARY KEY (conversation, name)) WITHOUT ROWID',
 ];
 const NEWEST_FIRST = 'ORDER BY position DESC, identity DESC LIMIT 1';
 const OLDEST_FIRST = 'ORDER BY position, identity LIMIT 1';
@@ -40,13 +40,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`;
-export const JOB_MARKERS = `SELECT json_extract(part.value, '$.text') AS said,
-    json_extract(message, '$.accepted_at') AS at
-  FROM conversation_messages, json_each(message, '$.parts') AS part
-  WHERE conversation = ? AND ${MARKS_A_JOB}
-    AND json_extract(part.value, '$.type') = 'marker'
-    AND json_extract(part.value, '$.marker') = 'job'
-  ORDER BY position, identity, part.key`;
 function text(value) {
     return typeof value === 'string' ? value : String(value);
 }
@@ -72,19 +65,15 @@ export function heldConversations(connection, conversations) {
 }
 export function keptMessages(connection, { conversation, messages, read }) {
     for (const message of messages) {
-        const [held] = connection.rows('SELECT id FROM conversation_messages WHERE conversation = ? AND identity = ?', [conversation, message.identity]);
-        const record = [
+        connection.run('INSERT INTO conversation_messages (conversation, identity, turn, position, change, message, text) VALUES (?, ?, ?, ?, ?, ?, ?) ON CONFLICT (conversation, identity) DO UPDATE SET turn = excluded.turn, position = excluded.position, change = excluded.change, message = excluded.message, text = excluded.text', [
+            conversation,
+            message.identity,
             message.turn,
             message.position,
+            message.change,
             JSON.stringify(message.message ?? null),
             message.text,
-        ];
-        if (held === undefined) {
-            connection.run('INSERT INTO conversation_messages (conversation, identity, turn, position, message, text) VALUES (?, ?, ?, ?, ?, ?)', [conversation, message.identity, ...record]);
-        }
-        else {
-            connection.run('UPDATE conversation_messages SET turn = ?, position = ?, message = ?, text = ? WHERE id = ?', [...record, held.id]);
-        }
+        ]);
     }
     if (read !== undefined) {
         connection.run('INSERT OR REPLACE INTO conversation_reads (conversation, read, partial) VALUES (?, ?, ?)', [conversation, read.at, read.partial ? 1 : 0]);
@@ -96,6 +85,7 @@ function accepted(row) {
         identity: text(row.identity),
         turn: text(row.turn),
         position: text(row.position),
+        change: text(row.change),
         text: text(row.text),
         message: JSON.parse(text(row.message)),
     };
@@ -107,7 +97,7 @@ function holding(phrase) {
 }
 export function messageWindow(connection, conversation, limit, before, phrase) {
     const held = holding(phrase);
-    const rows = connection.rows(`SELECT identity, turn, position, message, text FROM conversation_messages WHERE conversation = ?${held.sql}${before === null ? '' : ' AND (position < ? OR (position = ? AND identity < ?))'} ORDER BY position DESC, identity DESC LIMIT ?`, before === null
+    const rows = connection.rows(`SELECT identity, turn, position, change, message, text FROM conversation_messages WHERE conversation = ?${held.sql}${before === null ? '' : ' AND (position < ? OR (position = ? AND identity < ?))'} ORDER BY position DESC, identity DESC LIMIT ?`, before === null
         ? [conversation, ...held.bind, limit + 1]
         : [conversation, ...held.bind, before[0], before[0], before[1], limit + 1]);
     return { messages: rows.slice(0, limit).map(accepted).reverse(), more: rows.length > limit };
@@ -118,11 +108,11 @@ export function messageCount(connection, conversation, phrase) {
     return Number(counted?.held ?? 0);
 }
 function textOrNull(value) {
-    return value === null || value === undefined ? null : text(value);
+    return value === null ? null : text(value);
 }
 function heldSource(source, sender) {
     return {
-        source: source === null || source === undefined ? null : JSON.parse(text(source)),
+        source: source === null ? null : JSON.parse(text(source)),
         sender: textOrNull(sender),
     };
 }
@@ -148,21 +138,21 @@ export function conversationRows(connection, conversations) {
             },
     }));
 }
-export function jobMarkers(connection, conversation) {
-    return connection
-        .rows(JOB_MARKERS, [conversation])
-        .map((row) => ({ said: text(row.said), at: text(row.at) }));
-}
 export function turnArrived(connection, conversation, turn) {
     return (connection.rows('SELECT 1 FROM conversation_messages WHERE conversation = ? AND turn = ? LIMIT 1', [conversation, turn]).length > 0);
 }
-export function droppedMessages(connection, conversations) {
-    for (const conversation of conversations) {
-        connection.run('DELETE FROM conversation_messages WHERE conversation = ?', [conversation]);
-        connection.run('DELETE FROM conversation_reads WHERE conversation = ?', [conversation]);
-    }
+export function conversationFacts(connection) {
+    return connection.rows('SELECT conversation, name, value FROM conversation_facts').map((row) => ({
+        conversation: text(row.conversation),
+        name: text(row.name),
+        value: text(row.value),
+    }));
+}
+export function keptFact(connection, { conversation, name, value }) {
+    connection.run('INSERT OR REPLACE INTO conversation_facts (conversation, name, value) VALUES (?, ?, ?)', [conversation, name, value]);
+    return null;
 }
-export function forgottenMessages(connection) {
-    connection.run('DELETE FROM conversation_messages');
-    connection.run('DELETE FROM conversation_reads');
+export function forgottenConversations(connection) {
+    for (const table of tablesOf(MESSAGE_TABLES))
+        connection.run(`DELETE FROM ${table}`);
 }

package/dist/model.d.ts

@@ -50,7 +50,6 @@ export type ValidationReceipt = {
     source: Open<'current' | 'cached'>;
 };
 export declare const NO_MODEL: ModelState;
-export declare function definitionOf(state: ModelState, type: string | undefined): Definition | undefined;
 export declare function modelTypes(state: ModelState): TypesResult;
 export declare function storedModel(state: ModelState): StoredModel;
 //# sourceMappingURL=model.d.ts.map

package/dist/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAC/F,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,cAAc,GAAG,SAAS,GAAG,cAAc,CAAC,CAAC;AACvF,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,MAAM,GAAG,UAAU,CAAC;AAChC,MAAM,MAAM,UAAU,GAClB;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,GACzD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAC/B,CAAC;AACN,MAAM,MAAM,WAAW,GACnB,OAAO,CAAC,UAAU,EAAE;IAAE,MAAM,EAAE,aAAa,CAAA;CAAE,CAAC,GAC9C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;IAAE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAE,CAAC,EAAE,OAAO,CAAC,CAAC;AACzE,MAAM,MAAM,WAAW,GACnB;IAAE,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAC;IAAC,KAAK,EAAE,IAAI,CAAA;CAAE,GAC5E;IACE,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AACN,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC;CACpC,CAAC;AACF,eAAO,MAAM,QAAQ,EAAE,UAA8D,CAAC;AACtF,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,CAGhG;AACD,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW,CAczD;AACD,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW,CAI1D"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAC/F,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,cAAc,GAAG,SAAS,GAAG,cAAc,CAAC,CAAC;AACvF,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,MAAM,GAAG,UAAU,CAAC;AAChC,MAAM,MAAM,UAAU,GAClB;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,GACzD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAC/B,CAAC;AACN,MAAM,MAAM,WAAW,GACnB,OAAO,CAAC,UAAU,EAAE;IAAE,MAAM,EAAE,aAAa,CAAA;CAAE,CAAC,GAC9C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;IAAE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAE,CAAC,EAAE,OAAO,CAAC,CAAC;AACzE,MAAM,MAAM,WAAW,GACnB;IAAE,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAC;IAAC,KAAK,EAAE,IAAI,CAAA;CAAE,GAC5E;IACE,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AACN,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC;CACpC,CAAC;AACF,eAAO,MAAM,QAAQ,EAAE,UAA8D,CAAC;AACtF,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW,CAczD;AACD,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW,CAI1D"}

package/dist/model.js

@@ -1,9 +1,4 @@
 export const NO_MODEL = { status: 'unavailable', reason: 'not-acquired' };
-export function definitionOf(state, type) {
-    if (state.status === 'unavailable' || type === undefined)
-        return undefined;
-    return Object.hasOwn(state.types, type) ? state.types[type] : undefined;
-}
 export function modelTypes(state) {
     return state.status === 'unavailable'
         ? { ...state, types: null }

package/dist/models.d.ts

@@ -1,14 +1,10 @@
-import type { ScopedRefusal } from './adapter.js';
+import type { RoomDeclaration, ScopedRefusal } from './adapter.js';
 import { type ModelState } from './model.js';
-import { type ReplicaRecord } from './replica.js';
 import type { Runtime } from './runtime.js';
-import type { RoomDeclaration } from './socket.js';
 import type { RuntimeStore } from './store.js';
-export declare function declaredAsHeld(held: ReplicaRecord | undefined, room: RoomDeclaration): boolean;
 export declare function revoked(model: ModelState | undefined): boolean;
-export declare function keepNaming(runtime: Runtime, local: RuntimeStore, room: RoomDeclaration): Promise<void>;
-export declare function retainModel(runtime: Runtime, local: RuntimeStore, room: RoomDeclaration, given: ModelState | null): Promise<void>;
-export declare function scoped(runtime: Runtime, result: ScopedRefusal, room: RoomDeclaration, local: RuntimeStore): Promise<void>;
-export declare function settleModels(runtime: Runtime, held: readonly RoomDeclaration[], status: 'current' | 'cached', local: RuntimeStore): Promise<void>;
+export declare function retainModel(runtime: Runtime, locator: string, declaration: RoomDeclaration, given: ModelState | null, refused?: true): Promise<void>;
+export declare function scoped(runtime: Runtime, result: ScopedRefusal, locator: string, declaration: RoomDeclaration): Promise<void>;
+export declare function settleModels(runtime: Runtime, held: ReadonlyMap<string, RoomDeclaration>, status: 'current' | 'cached', local: RuntimeStore): Promise<void>;
 export declare function cachedModels(runtime: Runtime, local: RuntimeStore): Promise<void>;
 //# sourceMappingURL=models.d.ts.map

package/dist/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAKlD,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,wBAAgB,cAAc,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAS9F;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAE9D;AAMD,wBAAsB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,iBAqB5F;AAMD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,UAAU,GAAG,IAAI,iBAuDzB;AAED,wBAAsB,MAAM,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,YAAY,iBA0BpB;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,SAAS,eAAe,EAAE,EAChC,MAAM,EAAE,SAAS,GAAG,QAAQ,EAC5B,KAAK,EAAE,YAAY,iBAsDpB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAcvF"}
+{"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"}

package/dist/models.js

@@ -1,195 +1,153 @@
+import { equalValue } from '@agentshouse/mdmodel';
 import { changeSet } from './change-set.js';
 import { composedOf } from './collection.js';
-import { admitted, declarationOf, list, listedLocators } from './listing.js';
+import { declared, sameDeclaration } from './declaration.js';
+import { uncaught } from './failure.js';
+import { declarationOf, listedLocators } from './listing.js';
 import { loseRooms } from './lost.js';
 import { NO_MODEL } from './model.js';
+import { settle } from './queue.js';
 import { storedRecord } from './replica.js';
-import { overlayDiff, preparedAfter, replayed, sliceAt } from './saves.js';
 import { emitRooms } from './shown.js';
-export function declaredAsHeld(held, room) {
-    return (held === undefined ||
-        (JSON.stringify(held.operations) === JSON.stringify(room.operations) &&
-            JSON.stringify(held.replica) === JSON.stringify(room.replica) &&
-            JSON.stringify(held.providerOwnedPaths) === JSON.stringify(room.providerOwnedPaths) &&
-            JSON.stringify(held.authoredPaths) === JSON.stringify(room.authoredPaths) &&
-            JSON.stringify(held.typedSelection) === JSON.stringify(room.typedSelection ?? null)));
+function declaredAsHeld(held, declaration) {
+    return held === undefined || sameDeclaration(held.declaration, declaration);
 }
 export function revoked(model) {
     return model?.status === 'unavailable' && model.reason === 'revoked';
 }
-function unheldModelOf({ socket }, locator) {
-    return socket.rooms.standing(locator).unheldModel ?? NO_MODEL;
+function unheldModelOf({ presence }, locator) {
+    return presence.unheldModel(locator) ?? NO_MODEL;
 }
-export async function keepNaming(runtime, local, room) {
+async function modelNow(runtime, locator) {
+    return (await runtime.store.record(locator))?.model ?? unheldModelOf(runtime, locator);
+}
+function restands(held, model, declaration) {
+    return (JSON.stringify(held.model) !== JSON.stringify(model) ||
+        !equalValue(held.declaration.typedSelection, declaration.typedSelection));
+}
+function recordAlone(store, record) {
+    return {
+        locator: record.locator,
+        key: record.key,
+        record: storedRecord(record),
+        composed: composedOf(store.composed(record)),
+    };
+}
+function unheld(runtime, locator, model) {
+    runtime.presence.modelled(locator, model);
+    emitRooms(runtime);
+}
+function recorded(runtime, locator, declaration, model) {
     const { store, socket } = runtime;
-    const held = await store.record(room.locator);
-    if (held === undefined || (held.name === room.name && held.handle === room.handle))
-        return;
-    await store.exclusive(async () => {
+    return store.exclusive(async () => {
         if (!socket.continuing())
             return;
-        const current = await store.record(room.locator);
-        if (current === undefined)
+        const current = await store.record(locator);
+        if (current === undefined) {
+            unheld(runtime, locator, model);
             return;
-        const record = { ...current, name: room.name, handle: room.handle };
-        await local.commit({
-            rooms: [
-                {
-                    locator: room.locator,
-                    key: record.key,
-                    record: storedRecord(record),
-                    composed: composedOf(store.composed(record)),
-                },
-            ],
-        });
-        emitRooms(runtime);
+        }
+        const answer = await (await store.open()).commit({ rooms: [recordAlone(store, { ...current, declaration, model })] });
+        void store.changed(changeSet(locator, {
+            documents: answer.changed[locator] ?? [],
+            room: true,
+            unindexed: answer.indexed[locator] === false,
+        }));
     });
 }
-async function modelNow(runtime, locator) {
-    return (await runtime.store.record(locator))?.model ?? unheldModelOf(runtime, locator);
-}
-export async function retainModel(runtime, local, room, given) {
+export async function retainModel(runtime, locator, declaration, given, refused) {
     const { store, socket } = runtime;
-    const held = await store.record(room.locator);
-    const previous = held?.model ?? unheldModelOf(runtime, room.locator);
+    const held = await store.record(locator);
+    const previous = held?.model ?? unheldModelOf(runtime, locator);
     const next = given ?? previous;
-    if (JSON.stringify(previous) === JSON.stringify(next) && declaredAsHeld(held, room))
+    if (JSON.stringify(previous) === JSON.stringify(next) && declaredAsHeld(held, declaration))
+        return;
+    if (held !== undefined && !restands(held, next, declaration)) {
+        await recorded(runtime, locator, declaration, next);
         return;
-    await store.exclusive(async () => {
+    }
+    await settle(runtime, [locator], async (works) => {
         if (!socket.continuing())
-            return;
-        const work = await store.work(room.locator);
-        const current = work.replica;
-        let changed = null;
-        if (current !== undefined) {
-            const record = {
-                ...current.record,
-                name: room.name,
-                handle: room.handle,
-                operations: room.operations,
-                replica: room.replica,
-                providerOwnedPaths: room.providerOwnedPaths,
-                authoredPaths: room.authoredPaths,
-                typedSelection: room.typedSelection ?? null,
-                model: next,
-            };
-            const confirmedLayer = await sliceAt(store, record, 'confirmed', current.queue, current.overlaid);
-            const replayedLayer = await replayed(store, record, confirmedLayer, current.queue);
-            const diff = await overlayDiff(record, current, replayedLayer.visible, replayedLayer.touched);
-            const answer = await local.commit({
-                rooms: [
-                    {
-                        locator: room.locator,
-                        key: record.key,
-                        record: storedRecord(record),
-                        roots: record.typedSelection?.roots ?? [],
-                        composed: composedOf(store.composed(record)),
-                        overlay: diff.overlay,
-                    },
-                ],
-            });
-            preparedAfter(runtime, room.locator, answer);
-            changed = changeSet(room.locator, {
-                documents: answer.changed[room.locator] ?? [],
-                room: true,
-            });
+            return [];
+        const current = works.get(locator)?.replica;
+        if (current === undefined) {
+            unheld(runtime, locator, next);
+            return [];
         }
-        else
-            socket.rooms.stand(room.locator, { unheldModel: next });
-        list(runtime, room, admitted(runtime, room));
-        if (changed === null)
-            emitRooms(runtime);
-        else
-            store.changed(changed);
+        return [
+            {
+                locator,
+                record: { ...current.record, declaration, model: next },
+                ...(refused === undefined ? {} : { refused }),
+            },
+        ];
     });
 }
-export async function scoped(runtime, result, room, local) {
-    const { socket, journal } = runtime;
+export async function scoped(runtime, result, locator, declaration) {
+    const { socket, presence } = runtime;
     if (result.scope === 'content' && !result.retryable) {
-        journal.record(`scoped refusal ${room.locator} ${result.scope} ${result.code}`);
-        await loseRooms(runtime, [room.locator]);
+        await loseRooms(runtime, [locator]);
         return;
     }
-    socket.rooms.stand(room.locator, {
-        refusal: { code: result.code, fields: result.fields, retryable: result.retryable },
-    });
-    let scopedAway = room;
+    presence.refused(locator, result);
     if (result.scope === 'model')
-        await retainModel(runtime, local, room, {
-            status: 'unavailable',
-            reason: 'not-readable',
-        });
-    else if (result.scope !== 'operation') {
-        socket.rooms.stand(room.locator, { unreadable: true });
-        scopedAway = { ...room, replica: { ...room.replica, admission: 'unavailable' } };
-        await retainModel(runtime, local, scopedAway, null);
-    }
+        await retainModel(runtime, locator, declaration, { status: 'unavailable', reason: 'not-readable' }, true);
     if (!socket.continuing())
         return;
-    list(runtime, scopedAway, admitted(runtime, scopedAway));
     emitRooms(runtime);
-    journal.record(`scoped refusal ${room.locator} ${result.scope} ${result.code}`);
 }
 export async function settleModels(runtime, held, status, local) {
-    const { store, socket, journal } = runtime;
+    const { store, socket, presence } = runtime;
     const owed = (model) => model.status !== 'unavailable' && model.status !== status;
     const declaredAnew = await store.exclusive(async () => {
         if (!socket.continuing())
             return [];
-        const stored = await store.rooms(held.map(({ locator }) => locator));
-        const unchanged = held.filter((room) => {
-            const record = stored.get(room.locator)?.record;
-            return (owed(record?.model ?? unheldModelOf(runtime, room.locator)) && declaredAsHeld(record, room));
+        const stored = await store.rooms([...held.keys()]);
+        const unchanged = [...held].filter(([locator, declaration]) => {
+            const record = stored.get(locator)?.record;
+            return (owed(record?.model ?? unheldModelOf(runtime, locator)) &&
+                declaredAsHeld(record, declaration));
         });
-        const records = unchanged.flatMap((room) => {
-            const record = stored.get(room.locator)?.record;
+        const records = unchanged.flatMap(([locator]) => {
+            const record = stored.get(locator)?.record;
             return record === undefined
                 ? []
                 : [{ ...record, model: { ...record.model, status } }];
         });
         if (records.length > 0) {
             try {
-                await local.commit({
-                    rooms: records.map((record) => ({
-                        locator: record.locator,
-                        key: record.key,
-                        record: storedRecord(record),
-                        composed: composedOf(store.composed(record)),
-                    })),
-                });
+                await local.commit({ rooms: records.map((record) => recordAlone(store, record)) });
             }
-            catch {
-                journal.record(`model ${status} persistence failed`);
+            catch (error) {
+                uncaught(error);
             }
         }
-        for (const room of unchanged) {
-            const { unheldModel } = socket.rooms.standing(room.locator);
-            if (!stored.has(room.locator) && unheldModel !== null) {
-                socket.rooms.stand(room.locator, {
-                    unheldModel: { ...unheldModel, status },
-                });
+        for (const [locator] of unchanged) {
+            const unheldModel = presence.unheldModel(locator);
+            if (!stored.has(locator) && unheldModel !== null) {
+                presence.modelled(locator, { ...unheldModel, status });
             }
-            list(runtime, room, admitted(runtime, room));
         }
         if (unchanged.length > 0)
             emitRooms(runtime);
-        return held.filter((room) => {
-            const record = stored.get(room.locator)?.record;
-            return (!unchanged.includes(room) && owed(record?.model ?? unheldModelOf(runtime, room.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)));
     });
-    for (const room of declaredAnew) {
-        const model = await modelNow(runtime, room.locator);
+    for (const [locator, declaration] of declaredAnew) {
+        const model = await modelNow(runtime, locator);
         if (owed(model))
-            await retainModel(runtime, local, room, { ...model, status });
+            await retainModel(runtime, locator, declaration, { ...model, status });
     }
 }
 export async function cachedModels(runtime, local) {
-    const { store, socket } = runtime;
+    const { store, presence } = runtime;
     const held = await store.rooms();
-    await settleModels(runtime, listedLocators(runtime, held).flatMap((locator) => {
-        const room = socket.rooms.discovered(locator) ??
-            declarationOf(runtime, locator, held.get(locator))?.room;
-        return room === undefined ? [] : [room];
-    }), 'cached', local);
+    await settleModels(runtime, new Map(listedLocators(runtime, held).flatMap((locator) => {
+        const discovered = presence.room(locator);
+        const declaration = discovered === undefined
+            ? declarationOf(runtime, locator, held.get(locator))?.room
+            : declared(discovered);
+        return declaration === undefined ? [] : [[locator, declaration]];
+    })), 'cached', local);
 }

package/dist/observation.d.ts.map

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

package/dist/observation.js

@@ -90,24 +90,19 @@ export function opened(watch, keyed) {
     return new Promise((resolve, reject) => {
         let handle;
         let stop = () => { };
-        try {
-            stop = watch((message) => {
-                if (handle !== undefined) {
-                    handle.receive(message);
-                    return;
-                }
-                handle = observed(message, () => stop(), keyed);
-                resolve(handle.observation);
-            }, (error) => {
-                if (handle !== undefined)
-                    return;
-                stop();
-                reject(error);
-            });
-        }
-        catch (error) {
+        stop = watch((message) => {
+            if (handle !== undefined) {
+                handle.receive(message);
+                return;
+            }
+            handle = observed(message, () => stop(), keyed);
+            resolve(handle.observation);
+        }, (error) => {
+            if (handle !== undefined)
+                return;
+            stop();
             reject(error);
-        }
+        });
     });
 }
 export function observing(watch) {

package/dist/opened.d.ts

@@ -18,5 +18,5 @@ export type OpenedFiles = {
     find(name: OpenedName): Promise<KeptBinary | null>;
     fetch(name: OpenedName, read: () => Promise<BinaryResult>): Promise<KeptResult>;
 };
-export declare function openedFiles(database: RuntimeDatabase, fenced: (locator: string) => boolean): OpenedFiles;
+export declare function openedFiles(database: RuntimeDatabase, lost: (locator: string) => boolean): OpenedFiles;
 //# sourceMappingURL=opened.d.ts.map

package/dist/opened.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opened.d.ts","sourceRoot":"","sources":["../src/opened.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAErF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAEhF,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACnD,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CACjF,CAAC;AAsBF,wBAAgB,WAAW,CACzB,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,GACnC,WAAW,CAsFb"}
+{"version":3,"file":"opened.d.ts","sourceRoot":"","sources":["../src/opened.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAErF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAEhF,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACnD,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CACjF,CAAC;AAsBF,wBAAgB,WAAW,CACzB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,GACjC,WAAW,CAsFb"}