@agentshouse/mdruntime 0.1.0-c7f1d9323e816 → 0.1.0-c8ca66ac9e99d
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS.md +149 -103
- package/README.md +13 -3
- package/dist/adapter.d.ts +42 -14
- package/dist/adapter.d.ts.map +1 -1
- package/dist/attempt.d.ts +16 -0
- package/dist/attempt.d.ts.map +1 -0
- package/dist/attempt.js +70 -0
- package/dist/binary.d.ts +23 -0
- package/dist/binary.d.ts.map +1 -0
- package/dist/binary.js +8 -0
- package/dist/bootstrap.d.ts +17 -5
- package/dist/bootstrap.d.ts.map +1 -1
- package/dist/bootstrap.js +88 -38
- package/dist/change-set.d.ts.map +1 -1
- package/dist/change-set.js +19 -12
- package/dist/change.d.ts +15 -0
- package/dist/change.d.ts.map +1 -1
- package/dist/change.js +26 -1
- package/dist/chat/acts.d.ts +34 -0
- package/dist/chat/acts.d.ts.map +1 -0
- package/dist/chat/acts.js +36 -0
- package/dist/chat/context.d.ts +3 -0
- package/dist/chat/context.d.ts.map +1 -0
- package/dist/chat/context.js +10 -0
- package/dist/chat/input.d.ts +9 -0
- package/dist/chat/input.d.ts.map +1 -0
- package/dist/chat/input.js +99 -0
- package/dist/chat/kit.d.ts +60 -0
- package/dist/chat/kit.d.ts.map +1 -0
- package/dist/chat/kit.js +123 -0
- package/dist/chat/lasting.d.ts +6 -0
- package/dist/chat/lasting.d.ts.map +1 -0
- package/dist/chat/lasting.js +19 -0
- package/dist/chat/list.d.ts +26 -0
- package/dist/chat/list.d.ts.map +1 -0
- package/dist/chat/list.js +62 -0
- package/dist/chat/markdown.d.ts +20 -0
- package/dist/chat/markdown.d.ts.map +1 -0
- package/dist/chat/markdown.js +188 -0
- package/dist/chat/message.d.ts +6 -0
- package/dist/chat/message.d.ts.map +1 -0
- package/dist/chat/message.js +192 -0
- package/dist/chat/messages.d.ts +21 -0
- package/dist/chat/messages.d.ts.map +1 -0
- package/dist/chat/messages.js +151 -0
- package/dist/chat/name.d.ts +6 -0
- package/dist/chat/name.d.ts.map +1 -0
- package/dist/chat/name.js +37 -0
- package/dist/chat/opened.d.ts +11 -0
- package/dist/chat/opened.d.ts.map +1 -0
- package/dist/chat/opened.js +17 -0
- package/dist/chat/overlay.d.ts +31 -0
- package/dist/chat/overlay.d.ts.map +1 -0
- package/dist/chat/overlay.js +97 -0
- package/dist/chat/parts.d.ts +57 -0
- package/dist/chat/parts.d.ts.map +1 -0
- package/dist/chat/parts.js +119 -0
- package/dist/chat/process.d.ts +20 -0
- package/dist/chat/process.d.ts.map +1 -0
- package/dist/chat/process.js +32 -0
- package/dist/chat/provider.d.ts +63 -0
- package/dist/chat/provider.d.ts.map +1 -0
- package/dist/chat/provider.js +645 -0
- package/dist/chat/question.d.ts +9 -0
- package/dist/chat/question.d.ts.map +1 -0
- package/dist/chat/question.js +80 -0
- package/dist/chat/questions.d.ts +31 -0
- package/dist/chat/questions.d.ts.map +1 -0
- package/dist/chat/questions.js +111 -0
- package/dist/chat/read.d.ts +5 -0
- package/dist/chat/read.d.ts.map +1 -0
- package/dist/chat/read.js +13 -0
- package/dist/chat/ready.d.ts +33 -0
- package/dist/chat/ready.d.ts.map +1 -0
- package/dist/chat/ready.js +91 -0
- package/dist/chat/style.d.ts +4 -0
- package/dist/chat/style.d.ts.map +1 -0
- package/dist/chat/style.js +302 -0
- package/dist/chat.d.ts +14 -0
- package/dist/chat.d.ts.map +1 -0
- package/dist/chat.js +8 -0
- package/dist/client.d.ts +13 -5
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +61 -15
- package/dist/collection.d.ts +6 -11
- package/dist/collection.d.ts.map +1 -1
- package/dist/collection.js +56 -19
- package/dist/connection.d.ts +20 -9
- package/dist/connection.d.ts.map +1 -1
- package/dist/connection.js +421 -131
- package/dist/conversation.d.ts +11 -3
- package/dist/conversation.d.ts.map +1 -1
- package/dist/conversation.js +47 -7
- package/dist/expectation.d.ts +21 -0
- package/dist/expectation.d.ts.map +1 -0
- package/dist/expectation.js +70 -0
- package/dist/failure.d.ts +13 -0
- package/dist/failure.d.ts.map +1 -0
- package/dist/failure.js +19 -0
- package/dist/host.d.ts +2 -2
- package/dist/host.d.ts.map +1 -1
- package/dist/host.js +12 -12
- package/dist/identity.d.ts +3 -0
- package/dist/identity.d.ts.map +1 -1
- package/dist/identity.js +13 -1
- package/dist/index.d.ts +9 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/memory.d.ts +3 -3
- package/dist/memory.d.ts.map +1 -1
- package/dist/memory.js +53 -20
- package/dist/model.d.ts +3 -2
- package/dist/model.d.ts.map +1 -1
- package/dist/open.d.ts +2 -0
- package/dist/open.d.ts.map +1 -0
- package/dist/open.js +1 -0
- package/dist/outcome.d.ts +28 -3
- package/dist/outcome.d.ts.map +1 -1
- package/dist/outcome.js +41 -1
- package/dist/overlay.d.ts +14 -3
- package/dist/overlay.d.ts.map +1 -1
- package/dist/overlay.js +75 -37
- package/dist/query.d.ts +4 -0
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +3 -0
- package/dist/reach.d.ts +2 -0
- package/dist/reach.d.ts.map +1 -1
- package/dist/reach.js +43 -19
- package/dist/react.d.ts +24 -16
- package/dist/react.d.ts.map +1 -1
- package/dist/react.js +8 -6
- package/dist/read-side.d.ts.map +1 -1
- package/dist/read-side.js +9 -2
- package/dist/refresh.d.ts +10 -0
- package/dist/refresh.d.ts.map +1 -1
- package/dist/refresh.js +42 -38
- package/dist/replica.d.ts +7 -4
- package/dist/replica.d.ts.map +1 -1
- package/dist/replica.js +74 -54
- package/dist/room-draft.d.ts +26 -9
- package/dist/room-draft.d.ts.map +1 -1
- package/dist/room-draft.js +132 -23
- package/dist/rows.d.ts +5 -1
- package/dist/rows.d.ts.map +1 -1
- package/dist/rows.js +10 -2
- package/dist/save.d.ts +27 -1
- package/dist/save.d.ts.map +1 -1
- package/dist/save.js +340 -33
- package/dist/search.d.ts +3 -2
- package/dist/search.d.ts.map +1 -1
- package/dist/status.d.ts +2 -2
- package/dist/status.d.ts.map +1 -1
- package/dist/status.js +0 -8
- package/dist/store.d.ts +34 -11
- package/dist/store.d.ts.map +1 -1
- package/dist/store.js +298 -163
- package/dist/wire.d.ts +6 -3
- package/dist/wire.d.ts.map +1 -1
- package/dist/wire.js +14 -2
- package/package.json +22 -14
- package/dist/attachment.d.ts +0 -3
- package/dist/attachment.d.ts.map +0 -1
- package/dist/attachment.js +0 -8
package/dist/connection.js
CHANGED
|
@@ -3,17 +3,22 @@ import { cached, modelTypes, NO_MODEL, sameModel, } from './model.js';
|
|
|
3
3
|
import { observing } from './observation.js';
|
|
4
4
|
import { filterOf, identityOf, planOf, } from './query.js';
|
|
5
5
|
import { createReadSide } from './read-side.js';
|
|
6
|
+
import { markdownPath, roomOfKey } from './rows.js';
|
|
6
7
|
import { createSearchIndex, searchPlanOf, } from './search.js';
|
|
7
8
|
import { bootstrapRoom } from './bootstrap.js';
|
|
8
9
|
import { changeSet, mergeChangeSets } from './change-set.js';
|
|
9
10
|
import { createConversationStore, } from './conversation.js';
|
|
10
|
-
import {
|
|
11
|
+
import { queuedFile } from './change.js';
|
|
12
|
+
import { validRoot } from './collection.js';
|
|
13
|
+
import { runtimeError } from './failure.js';
|
|
11
14
|
import { createLog } from './log.js';
|
|
15
|
+
import { binaryRecord } from './binary.js';
|
|
16
|
+
import { absentBinary, binaryAnswer, calledResult, historyAnswer, undeclared, UNCERTAIN, } from './outcome.js';
|
|
12
17
|
import { refreshRoom } from './refresh.js';
|
|
13
|
-
import { buildBatch } from './save.js';
|
|
14
|
-
import { applyReturned, compositionOf,
|
|
15
|
-
import { changedParts, changesOf, held, readParts, returnedInto, underneath, } from './room-draft.js';
|
|
16
|
-
import {
|
|
18
|
+
import { buildBatch, joined, limitedIn, requeued } from './save.js';
|
|
19
|
+
import { applyReturned, compositionOf, confirmedOf, landed, readReclassified, replicaOf, sameMembership, withdrawals, } from './replica.js';
|
|
20
|
+
import { binaryBase, changedParts, changesOf, held, heldFile, joinedDraft, readParts, returnedBy, returnedInto, staleWrite, underneath, withdrawnDrafts, } from './room-draft.js';
|
|
21
|
+
import { same, saving, STARTING, transferring, } from './status.js';
|
|
17
22
|
import { detectStorageLoss, nextGeneration } from './durability.js';
|
|
18
23
|
import { roomDraftRevision } from './identity.js';
|
|
19
24
|
import { beneath, normalize } from './paths.js';
|
|
@@ -34,16 +39,19 @@ function declaredSelection(room) {
|
|
|
34
39
|
selection.roots.every((other, at) => at === index || !within(other, root)));
|
|
35
40
|
}
|
|
36
41
|
export function composeRuntime(options) {
|
|
42
|
+
const localSaves = options.adapter.localSaves === true;
|
|
37
43
|
let authorization = options.authorization;
|
|
38
44
|
let opening;
|
|
39
45
|
let store;
|
|
40
46
|
const replicas = new Map();
|
|
47
|
+
const queuesWithoutReplica = new Map();
|
|
41
48
|
const pendings = new Map();
|
|
42
49
|
const roomDrafts = new Map();
|
|
43
50
|
const presentations = new Map();
|
|
44
51
|
let limits = [];
|
|
45
52
|
let capabilities = [];
|
|
46
53
|
const rooms = new Map();
|
|
54
|
+
const counted = new Map();
|
|
47
55
|
const unreadable = new Set();
|
|
48
56
|
const models = new Map();
|
|
49
57
|
const liveModels = new Map();
|
|
@@ -82,6 +90,7 @@ export function composeRuntime(options) {
|
|
|
82
90
|
let withdrawStream;
|
|
83
91
|
const announced = new Map();
|
|
84
92
|
let underway = null;
|
|
93
|
+
let streamed = null;
|
|
85
94
|
let handed = false;
|
|
86
95
|
const submitting = new Map();
|
|
87
96
|
const answering = new Map();
|
|
@@ -107,9 +116,12 @@ export function composeRuntime(options) {
|
|
|
107
116
|
const serviceModeListeners = new Set();
|
|
108
117
|
let member = null;
|
|
109
118
|
const memberListeners = new Set();
|
|
119
|
+
const materialized = new Set();
|
|
120
|
+
let everyRoom = false;
|
|
121
|
+
const transfers = new Map();
|
|
110
122
|
const conversations = createConversationStore({
|
|
111
123
|
agents: declaredAgents,
|
|
112
|
-
documents: (locator) =>
|
|
124
|
+
documents: (locator) => rowsQuery(planOf({ rooms: [locator], select: 'all' }, roomFacts())),
|
|
113
125
|
call: (name, input) => invokeAction(name, input),
|
|
114
126
|
durably,
|
|
115
127
|
stream: () => options.adapter.conversations,
|
|
@@ -185,7 +197,9 @@ export function composeRuntime(options) {
|
|
|
185
197
|
}
|
|
186
198
|
}
|
|
187
199
|
function pending() {
|
|
188
|
-
return
|
|
200
|
+
return (!localSaves &&
|
|
201
|
+
(queuesWithoutReplica.size > 0 ||
|
|
202
|
+
[...replicas.values()].some((replica) => replica.queue.length > 0)));
|
|
189
203
|
}
|
|
190
204
|
function attention() {
|
|
191
205
|
const attentionRequired = [];
|
|
@@ -214,8 +228,23 @@ export function composeRuntime(options) {
|
|
|
214
228
|
}
|
|
215
229
|
return { attentionRequired, reset };
|
|
216
230
|
}
|
|
231
|
+
function documentsIn(locator) {
|
|
232
|
+
const replica = replicas.get(locator);
|
|
233
|
+
if (replica === undefined)
|
|
234
|
+
return 0;
|
|
235
|
+
const roots = replica.confirmed.record.typedSelection?.roots ?? [];
|
|
236
|
+
const paths = [
|
|
237
|
+
...Object.keys(replica.visible.documents).filter(markdownPath),
|
|
238
|
+
...Object.keys(replica.visible.binaries),
|
|
239
|
+
];
|
|
240
|
+
return paths.filter((path) => !roots.some((root) => beneath(root, path))).length;
|
|
241
|
+
}
|
|
217
242
|
function listed() {
|
|
218
|
-
return structuredClone([...rooms.values()])
|
|
243
|
+
return structuredClone([...rooms.values()].map((room) => {
|
|
244
|
+
const documents = documentsIn(room.locator);
|
|
245
|
+
counted.set(room.locator, documents);
|
|
246
|
+
return { ...room, documents };
|
|
247
|
+
}));
|
|
219
248
|
}
|
|
220
249
|
function roomFacts(reach = null) {
|
|
221
250
|
const held = [...rooms.values()]
|
|
@@ -270,6 +299,8 @@ export function composeRuntime(options) {
|
|
|
270
299
|
listener(shown);
|
|
271
300
|
}
|
|
272
301
|
function entryOf(batch) {
|
|
302
|
+
if (localSaves)
|
|
303
|
+
return Object.freeze({ batch, state: 'local' });
|
|
273
304
|
const state = pendings.get(batch.id);
|
|
274
305
|
if (state?.accepted !== undefined) {
|
|
275
306
|
return Object.freeze({ batch, state: 'accepted', roomVersion: state.accepted });
|
|
@@ -277,10 +308,7 @@ export function composeRuntime(options) {
|
|
|
277
308
|
return Object.freeze({ batch, ...(state?.submission ?? { state: 'waiting' }) });
|
|
278
309
|
}
|
|
279
310
|
function entriesOf(locator) {
|
|
280
|
-
|
|
281
|
-
if (replica === undefined)
|
|
282
|
-
return [];
|
|
283
|
-
return replica.queue.map(entryOf);
|
|
311
|
+
return (replicas.get(locator)?.queue ?? queuesWithoutReplica.get(locator) ?? []).map(entryOf);
|
|
284
312
|
}
|
|
285
313
|
function emitQueue(locator) {
|
|
286
314
|
const entries = entriesOf(locator);
|
|
@@ -290,12 +318,47 @@ export function composeRuntime(options) {
|
|
|
290
318
|
}
|
|
291
319
|
}
|
|
292
320
|
function applyChangeSet(set) {
|
|
321
|
+
const held = everyRoom
|
|
322
|
+
? set
|
|
323
|
+
: { ...set, documents: set.documents.filter(({ locator }) => materialized.has(locator)) };
|
|
324
|
+
readSide.apply(held);
|
|
325
|
+
searchIndex.changed(held);
|
|
326
|
+
}
|
|
327
|
+
function materialize(locators) {
|
|
328
|
+
if (everyRoom)
|
|
329
|
+
return;
|
|
330
|
+
if (locators === null)
|
|
331
|
+
everyRoom = true;
|
|
332
|
+
const sets = [];
|
|
333
|
+
for (const locator of locators ?? [...replicas.keys()]) {
|
|
334
|
+
if (materialized.has(locator))
|
|
335
|
+
continue;
|
|
336
|
+
materialized.add(locator);
|
|
337
|
+
const replica = replicas.get(locator);
|
|
338
|
+
if (replica !== undefined)
|
|
339
|
+
sets.push(changeSet(locator, null, replica));
|
|
340
|
+
}
|
|
341
|
+
if (sets.length === 0)
|
|
342
|
+
return;
|
|
343
|
+
const set = mergeChangeSets(sets);
|
|
293
344
|
readSide.apply(set);
|
|
294
345
|
searchIndex.changed(set);
|
|
295
346
|
}
|
|
347
|
+
function reachedRooms(plan) {
|
|
348
|
+
if (plan.rooms !== null)
|
|
349
|
+
return plan.rooms;
|
|
350
|
+
if (plan.reach === null)
|
|
351
|
+
return null;
|
|
352
|
+
return [...plan.reach.rooms, ...plan.reach.documents.map(roomOfKey)];
|
|
353
|
+
}
|
|
354
|
+
function rowsQuery(plan) {
|
|
355
|
+
materialize(reachedRooms(plan));
|
|
356
|
+
return readSide.query(plan);
|
|
357
|
+
}
|
|
296
358
|
function publishChangeSet(set) {
|
|
297
359
|
applyChangeSet(set);
|
|
298
|
-
if (set.rooms.length > 0
|
|
360
|
+
if (set.rooms.length > 0 ||
|
|
361
|
+
[...new Set(set.documents.map(({ locator }) => locator))].some((locator) => rooms.has(locator) && counted.get(locator) !== documentsIn(locator)))
|
|
299
362
|
emitRooms();
|
|
300
363
|
for (const locator of set.queues)
|
|
301
364
|
emitQueue(locator);
|
|
@@ -342,10 +405,7 @@ export function composeRuntime(options) {
|
|
|
342
405
|
const revoked = { status: 'unavailable', reason: 'revoked' };
|
|
343
406
|
try {
|
|
344
407
|
const local = await openLocal();
|
|
345
|
-
await local.revokeModels([...replicas.values()].map((replica) =>
|
|
346
|
-
record: replica.confirmed.record,
|
|
347
|
-
queue: replica.queue,
|
|
348
|
-
})));
|
|
408
|
+
await local.revokeModels([...replicas.values()].map((replica) => replica.confirmed.record));
|
|
349
409
|
}
|
|
350
410
|
catch {
|
|
351
411
|
journal.record('model revocation persistence failed');
|
|
@@ -369,10 +429,7 @@ export function composeRuntime(options) {
|
|
|
369
429
|
model: revoked,
|
|
370
430
|
selectionModel: revoked,
|
|
371
431
|
};
|
|
372
|
-
|
|
373
|
-
replicas.set(locator, read.kind === 'staged'
|
|
374
|
-
? replicaOf(read.confirmed, before.queue, before)
|
|
375
|
-
: { ...before, confirmed: { ...before.confirmed, record } });
|
|
432
|
+
replicas.set(locator, replicaOf(confirmedOf(record, before.confirmed), before.queue, before));
|
|
376
433
|
}
|
|
377
434
|
rooms.set(locator, {
|
|
378
435
|
...room,
|
|
@@ -389,7 +446,8 @@ export function composeRuntime(options) {
|
|
|
389
446
|
}
|
|
390
447
|
finally {
|
|
391
448
|
refusal = {
|
|
392
|
-
reason,
|
|
449
|
+
code: reason,
|
|
450
|
+
retryable: false,
|
|
393
451
|
reauthorizationOffered: reason === 'revoked-authorization',
|
|
394
452
|
refusal: provider,
|
|
395
453
|
};
|
|
@@ -414,7 +472,6 @@ export function composeRuntime(options) {
|
|
|
414
472
|
},
|
|
415
473
|
providerOwnedPaths: room.providerOwnedPaths,
|
|
416
474
|
roomVersion: replicas.get(room.locator)?.confirmed.record.roomVersion ?? null,
|
|
417
|
-
attachments: replicas.get(room.locator)?.confirmed.record.attachments ?? [],
|
|
418
475
|
synchronizationAvailable,
|
|
419
476
|
refusal: scopedRefusals.get(room.locator) ?? sourceRefusals.get(room.locator) ?? null,
|
|
420
477
|
});
|
|
@@ -439,7 +496,14 @@ export function composeRuntime(options) {
|
|
|
439
496
|
emitRooms();
|
|
440
497
|
}
|
|
441
498
|
function unlistedHeld(listed) {
|
|
442
|
-
return [
|
|
499
|
+
return [
|
|
500
|
+
...new Set([
|
|
501
|
+
...rooms.keys(),
|
|
502
|
+
...roomDrafts.keys(),
|
|
503
|
+
...transfers.keys(),
|
|
504
|
+
...queuesWithoutReplica.keys(),
|
|
505
|
+
]),
|
|
506
|
+
].filter((locator) => !listed.has(locator));
|
|
443
507
|
}
|
|
444
508
|
async function dropUnlisted(listed, local) {
|
|
445
509
|
if (unlistedHeld(listed).length === 0)
|
|
@@ -453,11 +517,13 @@ export function composeRuntime(options) {
|
|
|
453
517
|
drafts: [...(roomDrafts.get(locator)?.keys() ?? [])],
|
|
454
518
|
}));
|
|
455
519
|
for (const locator of unlisted) {
|
|
456
|
-
for (const batch of replicas.get(locator)?.queue ?? [])
|
|
520
|
+
for (const batch of replicas.get(locator)?.queue ?? queuesWithoutReplica.get(locator) ?? [])
|
|
457
521
|
pendings.delete(batch.id);
|
|
458
522
|
replicas.delete(locator);
|
|
523
|
+
queuesWithoutReplica.delete(locator);
|
|
459
524
|
rooms.delete(locator);
|
|
460
525
|
roomDrafts.delete(locator);
|
|
526
|
+
transfers.delete(locator);
|
|
461
527
|
unreadable.delete(locator);
|
|
462
528
|
stale.delete(locator);
|
|
463
529
|
scopedRefusals.delete(locator);
|
|
@@ -494,7 +560,7 @@ export function composeRuntime(options) {
|
|
|
494
560
|
return model;
|
|
495
561
|
}
|
|
496
562
|
async function hydrate(opened) {
|
|
497
|
-
const [records, queues, kept, presented, held, chatDrafts, lastCompleted, declared, named, known,] = await Promise.all([
|
|
563
|
+
const [records, queues, kept, presented, held, chatDrafts, lastCompleted, declared, named, known, staged,] = await Promise.all([
|
|
498
564
|
opened.all(),
|
|
499
565
|
opened.queues(),
|
|
500
566
|
opened.roomDrafts(),
|
|
@@ -505,7 +571,11 @@ export function composeRuntime(options) {
|
|
|
505
571
|
opened.providerLimits(),
|
|
506
572
|
opened.capabilities(),
|
|
507
573
|
opened.member(),
|
|
574
|
+
opened.transfers(),
|
|
508
575
|
]);
|
|
576
|
+
transfers.clear();
|
|
577
|
+
for (const record of staged)
|
|
578
|
+
transfers.set(record.locator, record);
|
|
509
579
|
limits = declared;
|
|
510
580
|
capabilities = named;
|
|
511
581
|
member = known;
|
|
@@ -524,18 +594,17 @@ export function composeRuntime(options) {
|
|
|
524
594
|
}
|
|
525
595
|
const previousReplicas = new Map(replicas);
|
|
526
596
|
replicas.clear();
|
|
597
|
+
queuesWithoutReplica.clear();
|
|
598
|
+
const replicated = new Set(records.map((record) => record.locator));
|
|
599
|
+
for (const [locator, queue] of queuedBatches) {
|
|
600
|
+
if (!replicated.has(locator))
|
|
601
|
+
queuesWithoutReplica.set(locator, queue);
|
|
602
|
+
}
|
|
527
603
|
for (const record of records) {
|
|
528
604
|
const model = restored(modelKey(record.locator, 'collection'), record.model);
|
|
529
605
|
const selectionModel = restored(modelKey(record.locator, 'typed-selection'), record.selectionModel);
|
|
530
606
|
const prior = previousReplicas.get(record.locator);
|
|
531
|
-
const
|
|
532
|
-
const read = readConfirmed(retyped, prior?.confirmed);
|
|
533
|
-
const confirmed = read.kind === 'staged'
|
|
534
|
-
? read.confirmed
|
|
535
|
-
: {
|
|
536
|
-
record: retyped,
|
|
537
|
-
collection: parseCollection(retyped.documents, compositionOf(retyped)),
|
|
538
|
-
};
|
|
607
|
+
const confirmed = confirmedOf({ ...record, model, selectionModel }, prior?.confirmed);
|
|
539
608
|
replicas.set(record.locator, replicaOf(confirmed, queuedBatches.get(record.locator) ?? [], prior));
|
|
540
609
|
const existing = rooms.get(record.locator);
|
|
541
610
|
if (existing === undefined)
|
|
@@ -544,7 +613,6 @@ export function composeRuntime(options) {
|
|
|
544
613
|
rooms.set(record.locator, {
|
|
545
614
|
...existing,
|
|
546
615
|
roomVersion: record.roomVersion,
|
|
547
|
-
attachments: record.attachments,
|
|
548
616
|
operations: record.operations,
|
|
549
617
|
replica: record.replica,
|
|
550
618
|
model: modelTypes(model),
|
|
@@ -556,10 +624,6 @@ export function composeRuntime(options) {
|
|
|
556
624
|
},
|
|
557
625
|
});
|
|
558
626
|
}
|
|
559
|
-
if (read.kind === 'refused') {
|
|
560
|
-
refusedSource(record, read);
|
|
561
|
-
declarationRefusals.add(record.locator);
|
|
562
|
-
}
|
|
563
627
|
}
|
|
564
628
|
return {
|
|
565
629
|
lastCompleted,
|
|
@@ -621,11 +685,12 @@ export function composeRuntime(options) {
|
|
|
621
685
|
return state !== undefined && state.submission.state !== 'submitted' && !state.lost;
|
|
622
686
|
}
|
|
623
687
|
async function settle(local, locator, before, confirmed, queue, settling = {}) {
|
|
624
|
-
const
|
|
688
|
+
const previousQueue = before?.queue ?? queuesWithoutReplica.get(locator) ?? [];
|
|
689
|
+
const withdrawn = withdrawals(confirmed, queue, withdrawable, localSaves);
|
|
625
690
|
const kept = queue.filter((batch) => !withdrawn.includes(batch));
|
|
626
691
|
const unqueued = withdrawn.map((batch) => ({
|
|
627
692
|
batch,
|
|
628
|
-
returned: landed(batch, confirmed) ? null :
|
|
693
|
+
returned: localSaves || landed(batch, confirmed) ? null : returnedBy('withdrawn'),
|
|
629
694
|
}));
|
|
630
695
|
const returning = [
|
|
631
696
|
...[...unqueued].reverse(),
|
|
@@ -646,26 +711,44 @@ export function composeRuntime(options) {
|
|
|
646
711
|
});
|
|
647
712
|
}
|
|
648
713
|
}
|
|
649
|
-
await local.
|
|
650
|
-
|
|
651
|
-
previous: before?.confirmed.record ?? null,
|
|
652
|
-
queue: kept,
|
|
653
|
-
previousQueue: before?.queue ?? [],
|
|
654
|
-
roomDrafts: [...written.values()],
|
|
655
|
-
});
|
|
656
|
-
for (const batch of before?.queue ?? []) {
|
|
714
|
+
await local.keepAuthored({ locator, queue: kept, roomDrafts: [...written.values()] });
|
|
715
|
+
for (const batch of previousQueue) {
|
|
657
716
|
if (!kept.includes(batch))
|
|
658
717
|
pendings.delete(batch.id);
|
|
659
718
|
}
|
|
660
719
|
for (const record of written.values())
|
|
661
720
|
rememberRoomDraft(record);
|
|
721
|
+
try {
|
|
722
|
+
await local.write({
|
|
723
|
+
next: confirmed.record,
|
|
724
|
+
previous: before?.confirmed.record ?? null,
|
|
725
|
+
...(settling.stored === undefined ? {} : { stored: settling.stored }),
|
|
726
|
+
});
|
|
727
|
+
}
|
|
728
|
+
catch (error) {
|
|
729
|
+
const held = before === undefined ? null : replicaOf(before.confirmed, kept, before);
|
|
730
|
+
if (held !== null)
|
|
731
|
+
replicas.set(locator, held);
|
|
732
|
+
else if (kept.length > 0)
|
|
733
|
+
queuesWithoutReplica.set(locator, kept);
|
|
734
|
+
else
|
|
735
|
+
queuesWithoutReplica.delete(locator);
|
|
736
|
+
publishChangeSet(changeSet(locator, before ?? null, held, {
|
|
737
|
+
queue: kept.length !== previousQueue.length,
|
|
738
|
+
drafts: [...written.keys()],
|
|
739
|
+
}));
|
|
740
|
+
moveTo({ ...status, ...attention() });
|
|
741
|
+
throw error;
|
|
742
|
+
}
|
|
743
|
+
queuesWithoutReplica.delete(locator);
|
|
662
744
|
for (const { batch, returned } of unqueued) {
|
|
663
|
-
|
|
745
|
+
const outcome = localSaves ? 'dropped' : returned === null ? 'landed' : 'withdrawn';
|
|
746
|
+
journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
|
|
664
747
|
}
|
|
665
748
|
replicas.set(locator, replicaOf(confirmed, kept, before));
|
|
666
749
|
return changeSet(locator, before ?? null, replicas.get(locator) ?? null, {
|
|
667
750
|
room: settling.room,
|
|
668
|
-
queue: kept.length !==
|
|
751
|
+
queue: kept.length !== previousQueue.length,
|
|
669
752
|
drafts: [...written.keys()],
|
|
670
753
|
});
|
|
671
754
|
}
|
|
@@ -700,7 +783,8 @@ export function composeRuntime(options) {
|
|
|
700
783
|
selection: taken(answers?.selection, held.selection, 'typed-selection'),
|
|
701
784
|
};
|
|
702
785
|
}
|
|
703
|
-
function publish(local, room, confirmed,
|
|
786
|
+
function publish(local, room, confirmed, landing = {}) {
|
|
787
|
+
const { base, stored } = landing;
|
|
704
788
|
return exclusive(async () => {
|
|
705
789
|
if (!continuing())
|
|
706
790
|
return true;
|
|
@@ -711,13 +795,15 @@ export function composeRuntime(options) {
|
|
|
711
795
|
return false;
|
|
712
796
|
}
|
|
713
797
|
adoptModels(room.locator, confirmed.record);
|
|
714
|
-
const queue = prior?.queue ?? [];
|
|
798
|
+
const queue = prior?.queue ?? queuesWithoutReplica.get(room.locator) ?? [];
|
|
715
799
|
const roomVersion = confirmed.record.roomVersion;
|
|
716
800
|
const accepted = queue.filter((batch) => {
|
|
717
801
|
const accepted = pendings.get(batch.id)?.accepted;
|
|
718
802
|
return (accepted !== undefined && options.adapter.reached(room.locator, roomVersion, accepted));
|
|
719
803
|
});
|
|
720
|
-
const set = await settle(local, room.locator, prior, confirmed, queue.filter((batch) => !accepted.includes(batch)), { room: true });
|
|
804
|
+
const set = await settle(local, room.locator, prior, confirmed, queue.filter((batch) => !accepted.includes(batch)), { room: true, ...(stored === undefined ? {} : { stored }) });
|
|
805
|
+
if (stored !== undefined)
|
|
806
|
+
transfers.delete(room.locator);
|
|
721
807
|
for (const batch of accepted)
|
|
722
808
|
pendings.delete(batch.id);
|
|
723
809
|
stale.delete(room.locator);
|
|
@@ -736,22 +822,40 @@ export function composeRuntime(options) {
|
|
|
736
822
|
const replica = replicas.get(locator);
|
|
737
823
|
const room = rooms.get(locator);
|
|
738
824
|
if (replica === undefined || room === undefined) {
|
|
739
|
-
throw
|
|
825
|
+
throw runtimeError('room-not-held', `No Local Replica for ${locator}`);
|
|
740
826
|
}
|
|
741
827
|
const saved = [];
|
|
742
828
|
for (const { path, revision } of named) {
|
|
743
829
|
const record = roomDrafts.get(locator)?.get(path);
|
|
744
830
|
if (record === undefined || record.revision !== revision) {
|
|
745
|
-
return { outcome: 'refused',
|
|
831
|
+
return { outcome: 'refused', code: 'stale', retryable: false, file: path };
|
|
746
832
|
}
|
|
747
833
|
if (!saved.some((draft) => draft.path === path))
|
|
748
834
|
saved.push({ path, parts: record.parts });
|
|
749
835
|
}
|
|
750
836
|
const changed = saved.flatMap(({ path, parts }) => changedParts(path, underneath(parts, path, replica.visible)));
|
|
751
837
|
if (changed.length > 0)
|
|
752
|
-
return { outcome: 'refused',
|
|
838
|
+
return { outcome: 'refused', code: 'changed-underneath', retryable: false, parts: changed };
|
|
753
839
|
const parts = saved.map(({ path, parts }) => changesOf(path, parts));
|
|
754
|
-
const
|
|
840
|
+
const changes = parts.flatMap(({ changes }) => changes);
|
|
841
|
+
const requeue = requeued(replica.queue, changes, replica.visible, withdrawable, (queue) => replicaOf(replica.confirmed, queue, replica).visible);
|
|
842
|
+
if (requeue.kind === 'refused')
|
|
843
|
+
return { outcome: 'refused', ...requeue.refusal };
|
|
844
|
+
const foreign = [...requeue.withdrawn.keys()].some((origin) => {
|
|
845
|
+
const writer = replica.queue.find((batch) => batch.id === origin)?.writtenBy;
|
|
846
|
+
return writer?.app !== writtenBy?.app || writer?.release !== writtenBy?.release;
|
|
847
|
+
});
|
|
848
|
+
if (foreign) {
|
|
849
|
+
return {
|
|
850
|
+
outcome: 'refused',
|
|
851
|
+
code: 'unknown-revision',
|
|
852
|
+
retryable: false,
|
|
853
|
+
file: [...requeue.queued].at(-1),
|
|
854
|
+
};
|
|
855
|
+
}
|
|
856
|
+
const withdrawing = requeue.withdrawn.size > 0;
|
|
857
|
+
const input = {
|
|
858
|
+
local: localSaves,
|
|
755
859
|
baseRoomVersion: replica.confirmed.record.roomVersion,
|
|
756
860
|
composition: compositionFor(replica.confirmed.record),
|
|
757
861
|
operations: room.operations,
|
|
@@ -759,29 +863,86 @@ export function composeRuntime(options) {
|
|
|
759
863
|
providerLimits: limits,
|
|
760
864
|
handle: room.handle,
|
|
761
865
|
visible: replica.visible,
|
|
762
|
-
changes
|
|
866
|
+
changes,
|
|
763
867
|
bases: parts.flatMap(({ bases }) => bases),
|
|
764
868
|
writtenBy,
|
|
869
|
+
};
|
|
870
|
+
const checked = withdrawing ? buildBatch({ ...input, queued: requeue.queued }) : null;
|
|
871
|
+
if (checked?.kind === 'refused')
|
|
872
|
+
return { outcome: 'refused', ...checked.refusal };
|
|
873
|
+
const owners = [...requeue.owners].flatMap((origin) => {
|
|
874
|
+
const batch = requeue.withdrawn.get(origin);
|
|
875
|
+
return batch === undefined || batch === null ? [] : [{ origin, batch }];
|
|
765
876
|
});
|
|
766
|
-
if (
|
|
877
|
+
if (owners.length > 1) {
|
|
878
|
+
return {
|
|
879
|
+
outcome: 'refused',
|
|
880
|
+
code: 'unknown-revision',
|
|
881
|
+
retryable: false,
|
|
882
|
+
file: [...requeue.queued].at(-1),
|
|
883
|
+
};
|
|
884
|
+
}
|
|
885
|
+
const built = !withdrawing
|
|
886
|
+
? buildBatch(input)
|
|
887
|
+
: requeue.changes.length === 0
|
|
888
|
+
? null
|
|
889
|
+
: buildBatch({
|
|
890
|
+
...input,
|
|
891
|
+
visible: replicaOf(replica.confirmed, requeue.queue, replica).visible,
|
|
892
|
+
changes: requeue.changes,
|
|
893
|
+
});
|
|
894
|
+
if (built?.kind === 'refused')
|
|
767
895
|
return { outcome: 'refused', ...built.refusal };
|
|
768
|
-
const
|
|
896
|
+
const [owner] = owners;
|
|
897
|
+
const join = built === null || owner === undefined
|
|
898
|
+
? null
|
|
899
|
+
: joined(requeue.queue, owner.batch, built.batch);
|
|
900
|
+
if (join?.kind === 'refused')
|
|
901
|
+
return { outcome: 'refused', ...join.refusal };
|
|
902
|
+
const withdrawn = new Map(requeue.withdrawn);
|
|
903
|
+
if (join !== null && owner !== undefined)
|
|
904
|
+
withdrawn.set(owner.origin, join.batch);
|
|
905
|
+
const drafted = new Map();
|
|
906
|
+
for (const [origin, replaced] of withdrawn) {
|
|
907
|
+
if (replaced === null)
|
|
908
|
+
continue;
|
|
909
|
+
const carried = withdrawnDrafts(pendings.get(origin)?.drafts ?? [], changes);
|
|
910
|
+
drafted.set(replaced.id, replaced === join?.batch
|
|
911
|
+
? [
|
|
912
|
+
...carried.map((held) => joinedDraft(held, saved)),
|
|
913
|
+
...saved.filter((draft) => !carried.some((held) => held.path === draft.path)),
|
|
914
|
+
]
|
|
915
|
+
: carried);
|
|
916
|
+
}
|
|
917
|
+
if (built !== null && join === null)
|
|
918
|
+
drafted.set(built.batch.id, saved);
|
|
919
|
+
const batches = join !== null ? join.queue : built === null ? requeue.queue : [...requeue.queue, built.batch];
|
|
920
|
+
for (const replaced of withdrawn.values()) {
|
|
921
|
+
if (replaced === null || !batches.includes(replaced))
|
|
922
|
+
continue;
|
|
923
|
+
const limited = limitedIn(batches, replaced, limits, (queue) => replicaOf(replica.confirmed, queue, replica).visible);
|
|
924
|
+
if (limited !== null)
|
|
925
|
+
return { outcome: 'refused', ...limited };
|
|
926
|
+
}
|
|
769
927
|
const consumed = saved.map(({ path }) => path);
|
|
770
928
|
try {
|
|
771
|
-
await local.
|
|
772
|
-
|
|
773
|
-
previous: replica.confirmed.record,
|
|
929
|
+
await local.keepAuthored({
|
|
930
|
+
locator,
|
|
774
931
|
queue: batches,
|
|
775
|
-
|
|
776
|
-
saved,
|
|
932
|
+
saved: drafted,
|
|
777
933
|
consumedRoomDrafts: consumed,
|
|
778
934
|
});
|
|
779
935
|
}
|
|
780
936
|
catch {
|
|
781
|
-
return { outcome: 'refused',
|
|
937
|
+
return { outcome: 'refused', code: 'durable-write', retryable: true };
|
|
782
938
|
}
|
|
783
|
-
|
|
784
|
-
|
|
939
|
+
for (const origin of withdrawn.keys())
|
|
940
|
+
pendings.delete(origin);
|
|
941
|
+
for (const [id, drafts] of drafted) {
|
|
942
|
+
pendings.set(id, { drafts, submission: { state: 'waiting' }, lost: false });
|
|
943
|
+
}
|
|
944
|
+
if (!localSaves)
|
|
945
|
+
recorded = false;
|
|
785
946
|
for (const path of consumed)
|
|
786
947
|
forgetRoomDraft(locator, path);
|
|
787
948
|
replicas.set(locator, replicaOf(replica.confirmed, batches, replica));
|
|
@@ -789,9 +950,12 @@ export function composeRuntime(options) {
|
|
|
789
950
|
queue: true,
|
|
790
951
|
drafts: consumed,
|
|
791
952
|
}));
|
|
792
|
-
moveTo({ ...saving(status), ...attention() });
|
|
953
|
+
moveTo({ ...(localSaves ? status : saving(status)), ...attention() });
|
|
793
954
|
submitLater(locator);
|
|
794
|
-
|
|
955
|
+
const identifier = join?.batch.id ??
|
|
956
|
+
built?.batch.id ??
|
|
957
|
+
[...requeue.withdrawn].map(([origin, replaced]) => replaced?.id ?? origin).at(-1);
|
|
958
|
+
return { outcome: 'saved', identifier };
|
|
795
959
|
}
|
|
796
960
|
async function mark(local, locator, identifier, submission, lost) {
|
|
797
961
|
const state = pendings.get(identifier);
|
|
@@ -817,16 +981,15 @@ export function composeRuntime(options) {
|
|
|
817
981
|
}
|
|
818
982
|
async function readHistory(locator, path, query = {}) {
|
|
819
983
|
if (closed || refusal !== null)
|
|
820
|
-
return
|
|
984
|
+
return UNCERTAIN;
|
|
821
985
|
try {
|
|
822
986
|
await ensureAuthorization();
|
|
823
987
|
}
|
|
824
988
|
catch {
|
|
825
|
-
return
|
|
826
|
-
}
|
|
827
|
-
if (closed || authorization === undefined || refusal !== null) {
|
|
828
|
-
return { kind: 'transport-uncertainty' };
|
|
989
|
+
return UNCERTAIN;
|
|
829
990
|
}
|
|
991
|
+
if (closed || authorization === undefined || refusal !== null)
|
|
992
|
+
return UNCERTAIN;
|
|
830
993
|
const transfer = ['transfer', 'history', locator, path];
|
|
831
994
|
if (query.revision !== undefined)
|
|
832
995
|
transfer.push(query.revision);
|
|
@@ -848,12 +1011,96 @@ export function composeRuntime(options) {
|
|
|
848
1011
|
}
|
|
849
1012
|
if (result.kind === 'revoked-authorization')
|
|
850
1013
|
await refuse('revoked-authorization');
|
|
851
|
-
return result;
|
|
1014
|
+
return historyAnswer(result);
|
|
852
1015
|
}
|
|
853
1016
|
catch {
|
|
854
1017
|
journal.record('outcome history transport-uncertainty');
|
|
855
|
-
return
|
|
1018
|
+
return UNCERTAIN;
|
|
1019
|
+
}
|
|
1020
|
+
}
|
|
1021
|
+
function queuedBlob(locator, path, localId) {
|
|
1022
|
+
for (const batch of replicas.get(locator)?.queue ?? []) {
|
|
1023
|
+
const change = batch.changes[queuedFile(batch, path, localId)];
|
|
1024
|
+
if (change?.kind === 'binary')
|
|
1025
|
+
return change.blob;
|
|
856
1026
|
}
|
|
1027
|
+
return null;
|
|
1028
|
+
}
|
|
1029
|
+
async function readBinary(request) {
|
|
1030
|
+
if (closed || refusal !== null)
|
|
1031
|
+
return UNCERTAIN;
|
|
1032
|
+
try {
|
|
1033
|
+
await ensureAuthorization();
|
|
1034
|
+
}
|
|
1035
|
+
catch {
|
|
1036
|
+
return UNCERTAIN;
|
|
1037
|
+
}
|
|
1038
|
+
if (closed || authorization === undefined || refusal !== null)
|
|
1039
|
+
return UNCERTAIN;
|
|
1040
|
+
journal.record(request.kind === 'path'
|
|
1041
|
+
? `transfer binary ${request.locator} ${request.path}`
|
|
1042
|
+
: `transfer binary ${request.fileRef}`);
|
|
1043
|
+
try {
|
|
1044
|
+
const result = await options.adapter.binary(authorization, request);
|
|
1045
|
+
journal.record(`outcome binary ${result.kind}`);
|
|
1046
|
+
if (result.kind === 'scoped-refusal') {
|
|
1047
|
+
const room = replicas.get(result.locator)?.confirmed.record;
|
|
1048
|
+
if (room !== undefined)
|
|
1049
|
+
await scoped(result, room, await openLocal());
|
|
1050
|
+
}
|
|
1051
|
+
if (result.kind === 'revoked-authorization')
|
|
1052
|
+
await refuse('revoked-authorization');
|
|
1053
|
+
return binaryAnswer(result);
|
|
1054
|
+
}
|
|
1055
|
+
catch {
|
|
1056
|
+
journal.record('outcome binary transport-uncertainty');
|
|
1057
|
+
return UNCERTAIN;
|
|
1058
|
+
}
|
|
1059
|
+
}
|
|
1060
|
+
async function readBinaryPath(locator, path, revision) {
|
|
1061
|
+
await ready;
|
|
1062
|
+
if (revision !== undefined)
|
|
1063
|
+
return readBinary({ kind: 'path', locator, path, revision });
|
|
1064
|
+
const visible = replicas.get(locator)?.visible;
|
|
1065
|
+
const held = visible?.binaries[path];
|
|
1066
|
+
if (visible === undefined || held === undefined)
|
|
1067
|
+
return absentBinary(path);
|
|
1068
|
+
if (held.state === 'pending') {
|
|
1069
|
+
const blob = queuedBlob(locator, path, held.localId);
|
|
1070
|
+
return blob === null ? absentBinary(path) : { kind: 'binary', blob };
|
|
1071
|
+
}
|
|
1072
|
+
const record = binaryRecord(path, held, visible.revisions[path]);
|
|
1073
|
+
if (record.state !== 'accepted')
|
|
1074
|
+
return absentBinary(path);
|
|
1075
|
+
const replica = replicas.get(locator);
|
|
1076
|
+
const queued = (replica?.queue ?? []).flatMap((batch) => batch.changes);
|
|
1077
|
+
const holds = (at) => {
|
|
1078
|
+
const kept = replica?.confirmed.record.binaries[at];
|
|
1079
|
+
return (kept?.state === 'accepted' &&
|
|
1080
|
+
kept.fileRef === record.fileRef &&
|
|
1081
|
+
replica?.confirmed.record.revisions[at] === record.revision);
|
|
1082
|
+
};
|
|
1083
|
+
let confirmed = path;
|
|
1084
|
+
for (let index = queued.length - 1; index >= 0 && !holds(confirmed); index -= 1) {
|
|
1085
|
+
const change = queued[index];
|
|
1086
|
+
if (change.kind === 'move' && change.to === confirmed)
|
|
1087
|
+
confirmed = change.path;
|
|
1088
|
+
}
|
|
1089
|
+
return readBinary({
|
|
1090
|
+
kind: 'path',
|
|
1091
|
+
locator,
|
|
1092
|
+
path: confirmed,
|
|
1093
|
+
revision: record.revision,
|
|
1094
|
+
fileRef: record.fileRef,
|
|
1095
|
+
});
|
|
1096
|
+
}
|
|
1097
|
+
async function readBinaryReference(reference) {
|
|
1098
|
+
await ready;
|
|
1099
|
+
return readBinary({
|
|
1100
|
+
kind: 'reference',
|
|
1101
|
+
fileRef: reference.fileRef,
|
|
1102
|
+
referrer: reference.referrer,
|
|
1103
|
+
});
|
|
857
1104
|
}
|
|
858
1105
|
function declaredAgents() {
|
|
859
1106
|
for (const capability of capabilities) {
|
|
@@ -874,18 +1121,17 @@ export function composeRuntime(options) {
|
|
|
874
1121
|
async function invokeAction(name, input) {
|
|
875
1122
|
await ready;
|
|
876
1123
|
if (closed || refusal !== null)
|
|
877
|
-
return
|
|
1124
|
+
return UNCERTAIN;
|
|
878
1125
|
if (declaredAction(name) === undefined)
|
|
879
|
-
return
|
|
1126
|
+
return undeclared(name);
|
|
880
1127
|
try {
|
|
881
1128
|
await ensureAuthorization();
|
|
882
1129
|
}
|
|
883
1130
|
catch {
|
|
884
|
-
return
|
|
885
|
-
}
|
|
886
|
-
if (closed || authorization === undefined || refusal !== null) {
|
|
887
|
-
return { kind: 'transport-uncertainty' };
|
|
1131
|
+
return UNCERTAIN;
|
|
888
1132
|
}
|
|
1133
|
+
if (closed || authorization === undefined || refusal !== null)
|
|
1134
|
+
return UNCERTAIN;
|
|
889
1135
|
journal.record(`transfer action ${name}`);
|
|
890
1136
|
try {
|
|
891
1137
|
const result = await options.adapter.action(authorization, { name, input });
|
|
@@ -899,11 +1145,11 @@ export function composeRuntime(options) {
|
|
|
899
1145
|
journal.record(`outcome action ${result.kind}`);
|
|
900
1146
|
if (result.kind === 'rejected')
|
|
901
1147
|
journal.record(`refusal rejected ${result.code}`);
|
|
902
|
-
return result;
|
|
1148
|
+
return calledResult(result);
|
|
903
1149
|
}
|
|
904
1150
|
catch {
|
|
905
1151
|
journal.record('outcome action transport-uncertainty');
|
|
906
|
-
return
|
|
1152
|
+
return UNCERTAIN;
|
|
907
1153
|
}
|
|
908
1154
|
}
|
|
909
1155
|
function continuing() {
|
|
@@ -934,14 +1180,33 @@ export function composeRuntime(options) {
|
|
|
934
1180
|
throw error;
|
|
935
1181
|
}
|
|
936
1182
|
}
|
|
937
|
-
|
|
1183
|
+
function staging(local) {
|
|
1184
|
+
return {
|
|
1185
|
+
held: (locator) => transfers.get(locator) ?? null,
|
|
1186
|
+
staged: (record) => local.staged(record),
|
|
1187
|
+
stage: (record, page) => exclusive(async () => {
|
|
1188
|
+
if (!continuing())
|
|
1189
|
+
return false;
|
|
1190
|
+
await local.stage(record, page);
|
|
1191
|
+
transfers.set(record.locator, record);
|
|
1192
|
+
return true;
|
|
1193
|
+
}),
|
|
1194
|
+
abandon: (locator) => exclusive(async () => {
|
|
1195
|
+
if (!continuing())
|
|
1196
|
+
return;
|
|
1197
|
+
await local.abandon(locator);
|
|
1198
|
+
transfers.delete(locator);
|
|
1199
|
+
}),
|
|
1200
|
+
};
|
|
1201
|
+
}
|
|
1202
|
+
async function pullBootstrap(authorized, room, local) {
|
|
938
1203
|
if (!continuing())
|
|
939
1204
|
return unconfirmed;
|
|
940
1205
|
try {
|
|
941
1206
|
const result = await bootstrapRoom(options.adapter, authorized, room, {
|
|
942
1207
|
collection: modelOf(room.locator),
|
|
943
1208
|
selection: modelOf(room.locator, 'typed-selection'),
|
|
944
|
-
}, (models, held) => remodel(room.locator, models, held), continuing);
|
|
1209
|
+
}, (models, held) => remodel(room.locator, models, held), continuing, staging(local));
|
|
945
1210
|
const detail = result.kind === 'staged' ? result.confirmed.record.roomVersion : result.kind;
|
|
946
1211
|
journal.record(`transfer bootstrap ${room.locator} ${detail}`);
|
|
947
1212
|
return result;
|
|
@@ -969,7 +1234,7 @@ export function composeRuntime(options) {
|
|
|
969
1234
|
return null;
|
|
970
1235
|
}
|
|
971
1236
|
if (refreshed.kind === 'advanced') {
|
|
972
|
-
if (!(await publish(local, room, refreshed.confirmed, held.confirmed))) {
|
|
1237
|
+
if (!(await publish(local, room, refreshed.confirmed, { base: held.confirmed }))) {
|
|
973
1238
|
const now = replicas.get(room.locator)?.confirmed.record.roomVersion;
|
|
974
1239
|
const reached = now !== undefined &&
|
|
975
1240
|
options.adapter.reached(room.locator, now, refreshed.confirmed.record.roomVersion);
|
|
@@ -981,12 +1246,12 @@ export function composeRuntime(options) {
|
|
|
981
1246
|
if (refreshed.kind !== 'beyond-horizon')
|
|
982
1247
|
return refreshed;
|
|
983
1248
|
}
|
|
984
|
-
const bootstrapped = await pullBootstrap(authorized, room);
|
|
1249
|
+
const bootstrapped = await pullBootstrap(authorized, room, local);
|
|
985
1250
|
if (!continuing())
|
|
986
1251
|
return unconfirmed;
|
|
987
1252
|
if (bootstrapped.kind !== 'staged')
|
|
988
1253
|
return bootstrapped;
|
|
989
|
-
await publish(local, room, bootstrapped.confirmed);
|
|
1254
|
+
await publish(local, room, bootstrapped.confirmed, { stored: bootstrapped.stored });
|
|
990
1255
|
return null;
|
|
991
1256
|
}
|
|
992
1257
|
async function withhold(withheld, room, local, progress) {
|
|
@@ -1018,6 +1283,7 @@ export function composeRuntime(options) {
|
|
|
1018
1283
|
function refusedSource(room, { refusal }) {
|
|
1019
1284
|
sourceRefusals.set(room.locator, {
|
|
1020
1285
|
code: refusal.rule,
|
|
1286
|
+
retryable: false,
|
|
1021
1287
|
fields: {
|
|
1022
1288
|
file: refusal.file,
|
|
1023
1289
|
...(refusal.location === undefined ? {} : { location: refusal.location }),
|
|
@@ -1032,8 +1298,16 @@ export function composeRuntime(options) {
|
|
|
1032
1298
|
}
|
|
1033
1299
|
function leaving(batch, result) {
|
|
1034
1300
|
if (result.kind === 'expired')
|
|
1035
|
-
return { batch, returned:
|
|
1036
|
-
return {
|
|
1301
|
+
return { batch, returned: returnedBy('expired') };
|
|
1302
|
+
return {
|
|
1303
|
+
batch,
|
|
1304
|
+
returned: {
|
|
1305
|
+
kind: result.kind,
|
|
1306
|
+
code: result.code,
|
|
1307
|
+
fields: result.fields,
|
|
1308
|
+
retryable: result.retryable,
|
|
1309
|
+
},
|
|
1310
|
+
};
|
|
1037
1311
|
}
|
|
1038
1312
|
function logAccepted(locator, submitted, accepted) {
|
|
1039
1313
|
journal.record(`outcome ${locator} ${submitted.id} accepted ${accepted.roomVersion}` +
|
|
@@ -1051,7 +1325,7 @@ export function composeRuntime(options) {
|
|
|
1051
1325
|
logAccepted(room.locator, submitted, accepted);
|
|
1052
1326
|
const applied = options.adapter.reached(room.locator, held, accepted.roomVersion)
|
|
1053
1327
|
? { kind: 'staged', confirmed: current.confirmed }
|
|
1054
|
-
: applyReturned(current.confirmed,
|
|
1328
|
+
: applyReturned(current.confirmed, submitted, accepted, options.adapter.follows(room.locator, held, accepted.roomVersion)
|
|
1055
1329
|
? accepted.roomVersion
|
|
1056
1330
|
: held, accepted.roomVersion);
|
|
1057
1331
|
if (applied.kind !== 'staged') {
|
|
@@ -1259,7 +1533,7 @@ export function composeRuntime(options) {
|
|
|
1259
1533
|
...(attached === 'collection' ? { model: next } : { selectionModel: next }),
|
|
1260
1534
|
};
|
|
1261
1535
|
const reclassified = sameMembership(declared, held.confirmed.record)
|
|
1262
|
-
?
|
|
1536
|
+
? { kind: 'staged', confirmed: confirmedOf(declared, held.confirmed) }
|
|
1263
1537
|
: readReclassified(declared, held.confirmed);
|
|
1264
1538
|
const record = reclassified.kind === 'staged'
|
|
1265
1539
|
? declared
|
|
@@ -1267,12 +1541,10 @@ export function composeRuntime(options) {
|
|
|
1267
1541
|
...declared,
|
|
1268
1542
|
typedSelection: held.confirmed.record.typedSelection,
|
|
1269
1543
|
};
|
|
1270
|
-
const read = reclassified.kind === 'deferred'
|
|
1271
|
-
|
|
1272
|
-
|
|
1273
|
-
|
|
1274
|
-
queue: held.queue,
|
|
1275
|
-
});
|
|
1544
|
+
const read = reclassified.kind === 'deferred'
|
|
1545
|
+
? { kind: 'staged', confirmed: confirmedOf(record, held.confirmed) }
|
|
1546
|
+
: reclassified;
|
|
1547
|
+
await local.write({ next: record, previous: held.confirmed.record });
|
|
1276
1548
|
if (read.kind === 'staged') {
|
|
1277
1549
|
replicas.set(room.locator, replicaOf(read.confirmed, held.queue, held));
|
|
1278
1550
|
if (declarationRefusals.delete(room.locator)) {
|
|
@@ -1299,7 +1571,11 @@ export function composeRuntime(options) {
|
|
|
1299
1571
|
});
|
|
1300
1572
|
}
|
|
1301
1573
|
async function scoped(result, room, local) {
|
|
1302
|
-
scopedRefusals.set(room.locator, {
|
|
1574
|
+
scopedRefusals.set(room.locator, {
|
|
1575
|
+
code: result.code,
|
|
1576
|
+
fields: result.fields,
|
|
1577
|
+
retryable: result.retryable,
|
|
1578
|
+
});
|
|
1303
1579
|
let scopedAway = room;
|
|
1304
1580
|
if (result.scope === 'model')
|
|
1305
1581
|
await retainModel(local, room, 'collection', {
|
|
@@ -1336,7 +1612,6 @@ export function composeRuntime(options) {
|
|
|
1336
1612
|
roomVersion: record.roomVersion,
|
|
1337
1613
|
documents: record.documents,
|
|
1338
1614
|
revisions: record.revisions,
|
|
1339
|
-
attachments: record.attachments,
|
|
1340
1615
|
},
|
|
1341
1616
|
];
|
|
1342
1617
|
});
|
|
@@ -1416,14 +1691,14 @@ export function composeRuntime(options) {
|
|
|
1416
1691
|
async function reload(room, local, progress) {
|
|
1417
1692
|
if (discoveryPaused || authorization === undefined)
|
|
1418
1693
|
return;
|
|
1419
|
-
const bootstrapped = await pullBootstrap(authorization, room);
|
|
1694
|
+
const bootstrapped = await pullBootstrap(authorization, room, local);
|
|
1420
1695
|
if (!continuing())
|
|
1421
1696
|
return;
|
|
1422
1697
|
if (bootstrapped.kind !== 'staged') {
|
|
1423
1698
|
await withhold(bootstrapped, room, local, progress);
|
|
1424
1699
|
return;
|
|
1425
1700
|
}
|
|
1426
|
-
await publish(local, room, bootstrapped.confirmed);
|
|
1701
|
+
await publish(local, room, bootstrapped.confirmed, { stored: bootstrapped.stored });
|
|
1427
1702
|
await caughtUp(room, local, progress);
|
|
1428
1703
|
}
|
|
1429
1704
|
async function discoverRooms(local, progress, attempt) {
|
|
@@ -1458,7 +1733,11 @@ export function composeRuntime(options) {
|
|
|
1458
1733
|
}
|
|
1459
1734
|
if (result.kind === 'contract-unavailable') {
|
|
1460
1735
|
journal.record(`connection contract unavailable ${result.code}`);
|
|
1461
|
-
await refuse('missing-required-guarantee', {
|
|
1736
|
+
await refuse('missing-required-guarantee', {
|
|
1737
|
+
code: result.code,
|
|
1738
|
+
fields: result.fields,
|
|
1739
|
+
retryable: result.retryable,
|
|
1740
|
+
});
|
|
1462
1741
|
notifyReady();
|
|
1463
1742
|
return;
|
|
1464
1743
|
}
|
|
@@ -1534,6 +1813,8 @@ export function composeRuntime(options) {
|
|
|
1534
1813
|
}
|
|
1535
1814
|
const progress = { complete: true, reachable: true };
|
|
1536
1815
|
underway = attempt === 'opened' ? progress : null;
|
|
1816
|
+
if (attempt === 'opened')
|
|
1817
|
+
streamed = progress;
|
|
1537
1818
|
complete = false;
|
|
1538
1819
|
recorded = false;
|
|
1539
1820
|
moveTo(transferring(status));
|
|
@@ -1574,9 +1855,14 @@ export function composeRuntime(options) {
|
|
|
1574
1855
|
void refuse('revoked-authorization');
|
|
1575
1856
|
return;
|
|
1576
1857
|
}
|
|
1577
|
-
|
|
1578
|
-
|
|
1579
|
-
|
|
1858
|
+
complete = false;
|
|
1859
|
+
if (streamed !== null)
|
|
1860
|
+
streamed.complete = false;
|
|
1861
|
+
moveTo({
|
|
1862
|
+
...status,
|
|
1863
|
+
state: status.state === 'synced' ? 'syncing' : status.state,
|
|
1864
|
+
providerUnreachable: status.providerUnreachable || !opened,
|
|
1865
|
+
});
|
|
1580
1866
|
}
|
|
1581
1867
|
function applyOpening(expired) {
|
|
1582
1868
|
return task(async () => {
|
|
@@ -1631,6 +1917,8 @@ export function composeRuntime(options) {
|
|
|
1631
1917
|
}
|
|
1632
1918
|
}
|
|
1633
1919
|
function submitLater(locator) {
|
|
1920
|
+
if (localSaves)
|
|
1921
|
+
return;
|
|
1634
1922
|
const running = submitting.get(locator);
|
|
1635
1923
|
if (running !== undefined) {
|
|
1636
1924
|
running.again = true;
|
|
@@ -1710,7 +1998,7 @@ export function composeRuntime(options) {
|
|
|
1710
1998
|
}
|
|
1711
1999
|
}
|
|
1712
2000
|
moveTo({
|
|
1713
|
-
state: pending() ? 'pending' : synced ? 'synced' : 'syncing',
|
|
2001
|
+
state: pending() ? 'pending' : synced && complete ? 'synced' : 'syncing',
|
|
1714
2002
|
lastCompleted,
|
|
1715
2003
|
providerUnreachable: !progress.reachable,
|
|
1716
2004
|
...attention(),
|
|
@@ -1819,20 +2107,15 @@ export function composeRuntime(options) {
|
|
|
1819
2107
|
show();
|
|
1820
2108
|
return;
|
|
1821
2109
|
}
|
|
1822
|
-
const
|
|
1823
|
-
|
|
1824
|
-
moveTo(transferring(resting));
|
|
2110
|
+
const progress = { complete: false, reachable: !status.providerUnreachable };
|
|
2111
|
+
moveTo(transferring(status));
|
|
1825
2112
|
try {
|
|
1826
2113
|
await conversations.catchUp(progress);
|
|
1827
2114
|
}
|
|
1828
2115
|
catch {
|
|
1829
2116
|
progress.reachable = false;
|
|
1830
2117
|
}
|
|
1831
|
-
|
|
1832
|
-
if (!closed) {
|
|
1833
|
-
moveTo(settled(resting, progress, resting.lastCompleted, pending(), attention()));
|
|
1834
|
-
}
|
|
1835
|
-
}
|
|
2118
|
+
await rest(progress);
|
|
1836
2119
|
}
|
|
1837
2120
|
function close() {
|
|
1838
2121
|
if (closed)
|
|
@@ -1886,13 +2169,16 @@ export function composeRuntime(options) {
|
|
|
1886
2169
|
return planOf(input, roomFacts(reach), planReach(reach));
|
|
1887
2170
|
}
|
|
1888
2171
|
function watchPlan(plan, deliver) {
|
|
2172
|
+
materialize(reachedRooms(plan));
|
|
1889
2173
|
return readSide.watch(plan, identityOf(plan), deliver);
|
|
1890
2174
|
}
|
|
1891
2175
|
async function searched(input, reach) {
|
|
1892
2176
|
const plan = searchPlanOf(input);
|
|
1893
2177
|
const selected = plan.documents === undefined && reach === null
|
|
1894
2178
|
? null
|
|
1895
|
-
: (await
|
|
2179
|
+
: (await rowsQuery(filterOf(plan.documents ?? {}, roomFacts(reach), planReach(reach)))).documents;
|
|
2180
|
+
if (selected === null)
|
|
2181
|
+
materialize(null);
|
|
1896
2182
|
return searchIndex.search(reach === null || reach.conversations ? plan : { ...plan, conversations: [] }, selected);
|
|
1897
2183
|
}
|
|
1898
2184
|
const watch = (topic, input, deliver) => {
|
|
@@ -1918,6 +2204,8 @@ export function composeRuntime(options) {
|
|
|
1918
2204
|
}
|
|
1919
2205
|
if (topic === 'conversations')
|
|
1920
2206
|
return conversations.watchList(deliver);
|
|
2207
|
+
if (topic === 'agents')
|
|
2208
|
+
return conversations.watchAgents(deliver);
|
|
1921
2209
|
if (topic === 'presentation') {
|
|
1922
2210
|
const listener = {
|
|
1923
2211
|
app: input[0],
|
|
@@ -1996,7 +2284,7 @@ export function composeRuntime(options) {
|
|
|
1996
2284
|
rooms() {
|
|
1997
2285
|
return listed();
|
|
1998
2286
|
},
|
|
1999
|
-
query: ((input) =>
|
|
2287
|
+
query: ((input) => rowsQuery(planned(input, null))),
|
|
2000
2288
|
search: (input) => searched(input, null),
|
|
2001
2289
|
types(locator) {
|
|
2002
2290
|
return {
|
|
@@ -2025,20 +2313,20 @@ export function composeRuntime(options) {
|
|
|
2025
2313
|
return exclusive(async () => {
|
|
2026
2314
|
const parts = readParts(input);
|
|
2027
2315
|
if (path === '' || normalize(path) !== path)
|
|
2028
|
-
throw
|
|
2316
|
+
throw runtimeError('room-draft-malformed');
|
|
2029
2317
|
const local = await openLocal();
|
|
2030
2318
|
const current = roomDrafts.get(room)?.get(path);
|
|
2031
2319
|
if ((current?.revision ?? null) !== revision) {
|
|
2032
|
-
return
|
|
2033
|
-
outcome: 'stale',
|
|
2034
|
-
current: current === undefined ? null : roomDraftOf(current),
|
|
2035
|
-
};
|
|
2320
|
+
return staleWrite(current === undefined ? null : roomDraftOf(current));
|
|
2036
2321
|
}
|
|
2322
|
+
const file = parts.file === undefined
|
|
2323
|
+
? undefined
|
|
2324
|
+
: await heldFile(parts.file.blob, binaryBase(replicas.get(room)?.visible, path));
|
|
2037
2325
|
const record = {
|
|
2038
2326
|
locator: room,
|
|
2039
2327
|
path,
|
|
2040
2328
|
revision: roomDraftRevision(),
|
|
2041
|
-
parts: held(current?.parts, parts),
|
|
2329
|
+
parts: held(current?.parts, parts, file),
|
|
2042
2330
|
returned: current?.returned ?? null,
|
|
2043
2331
|
};
|
|
2044
2332
|
await local.keepRoomDraft(record);
|
|
@@ -2052,10 +2340,7 @@ export function composeRuntime(options) {
|
|
|
2052
2340
|
const local = await openLocal();
|
|
2053
2341
|
const current = roomDrafts.get(room)?.get(path);
|
|
2054
2342
|
if (current === undefined || current.revision !== revision) {
|
|
2055
|
-
return
|
|
2056
|
-
outcome: 'stale',
|
|
2057
|
-
current: current === undefined ? null : roomDraftOf(current),
|
|
2058
|
-
};
|
|
2343
|
+
return staleWrite(current === undefined ? null : roomDraftOf(current));
|
|
2059
2344
|
}
|
|
2060
2345
|
await local.discardRoomDraft(room, path);
|
|
2061
2346
|
forgetRoomDraft(room, path);
|
|
@@ -2090,6 +2375,10 @@ export function composeRuntime(options) {
|
|
|
2090
2375
|
history(locator, path, query) {
|
|
2091
2376
|
return readHistory(locator, path, query);
|
|
2092
2377
|
},
|
|
2378
|
+
binaryFile: {
|
|
2379
|
+
read: readBinaryPath,
|
|
2380
|
+
readReference: readBinaryReference,
|
|
2381
|
+
},
|
|
2093
2382
|
call(name, input) {
|
|
2094
2383
|
return invokeAction(name, input);
|
|
2095
2384
|
},
|
|
@@ -2122,8 +2411,9 @@ export function composeRuntime(options) {
|
|
|
2122
2411
|
const reachable = {
|
|
2123
2412
|
md,
|
|
2124
2413
|
watch,
|
|
2414
|
+
referrerScope: (referrer) => options.adapter.referrerScope(referrer),
|
|
2125
2415
|
plan: planned,
|
|
2126
|
-
query: (plan) =>
|
|
2416
|
+
query: (plan) => rowsQuery(plan),
|
|
2127
2417
|
watchPlan,
|
|
2128
2418
|
search: searched,
|
|
2129
2419
|
};
|