@agentshouse/mdruntime 0.1.0-c389df724fd2f → 0.1.0-c3b593308e82b
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 +271 -217
- package/README.md +13 -3
- package/dist/acquisition.d.ts +14 -0
- package/dist/acquisition.d.ts.map +1 -0
- package/dist/acquisition.js +24 -0
- package/dist/adapter.d.ts +78 -23
- 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 +113 -37
- package/dist/change-set.d.ts +2 -0
- package/dist/change-set.d.ts.map +1 -1
- package/dist/change-set.js +49 -16
- 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 +33 -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 +61 -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 +27 -0
- package/dist/chat/list.d.ts.map +1 -0
- package/dist/chat/list.js +63 -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 +22 -0
- package/dist/chat/messages.d.ts.map +1 -0
- package/dist/chat/messages.js +155 -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 +629 -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 +34 -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 +23 -12
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +33 -16
- package/dist/collection.d.ts +21 -12
- package/dist/collection.d.ts.map +1 -1
- package/dist/collection.js +271 -23
- package/dist/connection.d.ts +41 -15
- package/dist/connection.d.ts.map +1 -1
- package/dist/connection.js +1612 -378
- package/dist/conversation.d.ts +25 -10
- package/dist/conversation.d.ts.map +1 -1
- package/dist/conversation.js +374 -143
- package/dist/durability.d.ts +7 -1
- package/dist/durability.d.ts.map +1 -1
- package/dist/entry.d.ts +17 -0
- package/dist/entry.d.ts.map +1 -0
- package/dist/entry.js +156 -0
- 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/fence.d.ts +6 -0
- package/dist/fence.d.ts.map +1 -0
- package/dist/fence.js +10 -0
- package/dist/host.d.ts +14 -3
- package/dist/host.d.ts.map +1 -1
- package/dist/host.js +60 -18
- package/dist/identity.d.ts +5 -0
- package/dist/identity.d.ts.map +1 -1
- package/dist/identity.js +19 -1
- package/dist/index.d.ts +14 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -0
- package/dist/memory.d.ts +6 -3
- package/dist/memory.d.ts.map +1 -1
- package/dist/memory.js +76 -22
- package/dist/model.d.ts +7 -4
- package/dist/model.d.ts.map +1 -1
- package/dist/model.js +10 -1
- package/dist/observation.d.ts +5 -2
- package/dist/observation.d.ts.map +1 -1
- package/dist/observation.js +22 -11
- 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 +32 -3
- package/dist/outcome.d.ts.map +1 -1
- package/dist/outcome.js +42 -1
- package/dist/overlay.d.ts +16 -3
- package/dist/overlay.d.ts.map +1 -1
- package/dist/overlay.js +118 -77
- package/dist/query.d.ts +36 -3
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +6 -1
- package/dist/reach.d.ts +8 -3
- package/dist/reach.d.ts.map +1 -1
- package/dist/reach.js +60 -24
- package/dist/react.d.ts +9 -5
- package/dist/react.d.ts.map +1 -1
- package/dist/react.js +3 -2
- package/dist/read-side.d.ts +13 -6
- package/dist/read-side.d.ts.map +1 -1
- package/dist/read-side.js +294 -85
- package/dist/readiness.d.ts +53 -0
- package/dist/readiness.d.ts.map +1 -0
- package/dist/readiness.js +33 -0
- package/dist/recovery.d.ts +25 -0
- package/dist/recovery.d.ts.map +1 -0
- package/dist/recovery.js +197 -0
- package/dist/refresh.d.ts +10 -0
- package/dist/refresh.d.ts.map +1 -1
- package/dist/refresh.js +49 -38
- package/dist/replica.d.ts +8 -5
- package/dist/replica.d.ts.map +1 -1
- package/dist/replica.js +123 -67
- 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 +9 -13
- package/dist/rows.d.ts.map +1 -1
- package/dist/rows.js +14 -14
- package/dist/save.d.ts +31 -1
- package/dist/save.d.ts.map +1 -1
- package/dist/save.js +376 -45
- package/dist/search.d.ts +37 -8
- package/dist/search.d.ts.map +1 -1
- package/dist/search.js +116 -45
- package/dist/shared.d.ts +11 -0
- package/dist/shared.d.ts.map +1 -0
- package/dist/shared.js +368 -0
- package/dist/status.d.ts +6 -2
- package/dist/status.d.ts.map +1 -1
- package/dist/status.js +0 -8
- package/dist/store.d.ts +73 -19
- package/dist/store.d.ts.map +1 -1
- package/dist/store.js +528 -200
- package/dist/turn.d.ts +7 -0
- package/dist/turn.d.ts.map +1 -0
- package/dist/turn.js +45 -0
- package/dist/wire.d.ts +140 -33
- package/dist/wire.d.ts.map +1 -1
- package/dist/wire.js +60 -31
- package/package.json +26 -14
- package/dist/attachment.d.ts +0 -3
- package/dist/attachment.d.ts.map +0 -1
- package/dist/attachment.js +0 -8
package/dist/replica.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { parse } from '@agentshouse/mdmodel';
|
|
2
|
-
import { immutable } from './change.js';
|
|
3
|
-
import {
|
|
4
|
-
import { overlay, overlayChanged, sameLayerText } from './overlay.js';
|
|
1
|
+
import { equalValue, parse } from '@agentshouse/mdmodel';
|
|
2
|
+
import { immutable, landing } from './change.js';
|
|
3
|
+
import { changedCleanly, collectionOf, unreadable, validateCollection, } from './collection.js';
|
|
4
|
+
import { acceptedBinaries, overlay, overlayChanged, sameLayerText, } from './overlay.js';
|
|
5
5
|
import { providerRewritten } from './save.js';
|
|
6
|
-
import {
|
|
7
|
-
import { declaredAttachments } from './attachment.js';
|
|
6
|
+
import { drafted, patched, settled, shared } from './shared.js';
|
|
8
7
|
export function compositionOf(record) {
|
|
9
8
|
return {
|
|
10
9
|
model: record.model,
|
|
@@ -13,48 +12,103 @@ export function compositionOf(record) {
|
|
|
13
12
|
: { roots: record.typedSelection.roots, model: record.selectionModel },
|
|
14
13
|
};
|
|
15
14
|
}
|
|
16
|
-
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
15
|
+
function held(record) {
|
|
16
|
+
const documents = shared(record.documents);
|
|
17
|
+
const binaries = shared(record.binaries);
|
|
18
|
+
const revisions = shared(record.revisions);
|
|
19
|
+
const fileIds = shared(record.fileIds);
|
|
20
|
+
const changes = shared(record.changes);
|
|
21
|
+
const written = shared(record.written);
|
|
22
|
+
return documents === record.documents &&
|
|
23
|
+
binaries === record.binaries &&
|
|
24
|
+
revisions === record.revisions &&
|
|
25
|
+
fileIds === record.fileIds &&
|
|
26
|
+
changes === record.changes &&
|
|
27
|
+
written === record.written
|
|
28
|
+
? record
|
|
29
|
+
: { ...record, documents, binaries, revisions, fileIds, changes, written };
|
|
30
|
+
}
|
|
31
|
+
export function confirmedOf(record, previous) {
|
|
32
|
+
const kept = held(record);
|
|
33
|
+
return {
|
|
34
|
+
record: kept,
|
|
35
|
+
collection: collectionOf(kept.documents, compositionOf(kept), previous?.collection),
|
|
36
|
+
};
|
|
23
37
|
}
|
|
24
38
|
export function sameMembership(record, other) {
|
|
25
39
|
return (JSON.stringify(record.typedSelection?.roots ?? null) ===
|
|
26
40
|
JSON.stringify(other.typedSelection?.roots ?? null));
|
|
27
41
|
}
|
|
28
|
-
|
|
29
|
-
if (
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
42
|
+
function cleanly(record, previous) {
|
|
43
|
+
if (previous === undefined)
|
|
44
|
+
return false;
|
|
45
|
+
const before = previous.record;
|
|
46
|
+
return changedCleanly({ text: record.documents, binaries: record.binaries }, { text: before.documents, binaries: before.binaries, composition: compositionOf(before) }, compositionOf(record));
|
|
47
|
+
}
|
|
48
|
+
export function readStaged(staged, previous) {
|
|
49
|
+
const record = held(staged);
|
|
50
|
+
const textChanged = previous === undefined || !sameLayerText(record, previous.record);
|
|
51
|
+
const modeled = record.model.status !== 'unavailable' || record.selectionModel.status !== 'unavailable';
|
|
52
|
+
if (modeled &&
|
|
53
|
+
(textChanged ||
|
|
54
|
+
record.model !== previous?.record.model ||
|
|
55
|
+
record.selectionModel !== previous?.record.selectionModel) &&
|
|
56
|
+
!cleanly(record, previous)) {
|
|
57
|
+
const verdict = validateCollection(record.documents, Object.keys(record.binaries), compositionOf(record));
|
|
35
58
|
if (verdict.verdict === 'refuse' && verdict.rule !== 'model-unavailable') {
|
|
36
59
|
return { kind: 'refused', refusal: verdict };
|
|
37
60
|
}
|
|
61
|
+
if (verdict.verdict === 'refuse') {
|
|
62
|
+
const refused = unreadable(record.documents, previous?.record.documents);
|
|
63
|
+
if (refused !== null)
|
|
64
|
+
return refused;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
else if (textChanged) {
|
|
68
|
+
const refused = unreadable(record.documents, previous?.record.documents);
|
|
69
|
+
if (refused !== null)
|
|
70
|
+
return refused;
|
|
38
71
|
}
|
|
39
|
-
return
|
|
72
|
+
return { kind: 'staged', confirmed: confirmedOf(record, previous) };
|
|
40
73
|
}
|
|
41
74
|
export function readReclassified(record, previous) {
|
|
42
|
-
const verdict = validateCollection(record.documents, record.
|
|
75
|
+
const verdict = validateCollection(record.documents, Object.keys(record.binaries), compositionOf(record));
|
|
43
76
|
if (verdict.verdict !== 'refuse')
|
|
44
|
-
return
|
|
77
|
+
return { kind: 'staged', confirmed: confirmedOf(record, previous) };
|
|
45
78
|
return verdict.rule === 'model-unavailable'
|
|
46
79
|
? { kind: 'deferred' }
|
|
47
80
|
: { kind: 'refused', refusal: verdict };
|
|
48
81
|
}
|
|
49
|
-
|
|
50
|
-
const
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
82
|
+
function returnedBinaries(held, submitted, accepted) {
|
|
83
|
+
const binaries = drafted(held);
|
|
84
|
+
for (const change of submitted.changes) {
|
|
85
|
+
if (change.kind !== 'move')
|
|
86
|
+
continue;
|
|
87
|
+
const moved = binaries[change.path];
|
|
88
|
+
if (moved === undefined || accepted.revisions[change.to] === undefined)
|
|
89
|
+
continue;
|
|
90
|
+
binaries[change.to] = moved;
|
|
91
|
+
delete binaries[change.path];
|
|
92
|
+
}
|
|
93
|
+
Object.assign(binaries, acceptedBinaries(accepted.binaryFiles ?? {}));
|
|
94
|
+
for (const path of accepted.removals)
|
|
95
|
+
delete binaries[path];
|
|
96
|
+
return settled(binaries);
|
|
97
|
+
}
|
|
98
|
+
export function applyReturned(confirmed, submitted, accepted, roomVersion, writtenAt) {
|
|
99
|
+
const { documents, revisions, fileIds, changes, removals } = accepted;
|
|
100
|
+
const nextDocuments = drafted(confirmed.record.documents);
|
|
101
|
+
const nextRevisions = drafted(confirmed.record.revisions);
|
|
102
|
+
const nextFileIds = drafted(confirmed.record.fileIds);
|
|
103
|
+
const nextChanges = drafted(confirmed.record.changes);
|
|
104
|
+
const nextWritten = drafted(confirmed.record.written);
|
|
105
|
+
Object.assign(nextDocuments, documents);
|
|
106
|
+
Object.assign(nextRevisions, revisions);
|
|
107
|
+
for (const path of Object.keys({ ...documents, ...revisions }))
|
|
108
|
+
delete nextFileIds[path];
|
|
109
|
+
Object.assign(nextFileIds, fileIds);
|
|
110
|
+
for (const path of Object.keys(documents))
|
|
111
|
+
nextWritten[path] = writtenAt;
|
|
58
112
|
for (const [path, revision] of Object.entries(revisions)) {
|
|
59
113
|
if (confirmed.record.revisions[path] !== revision)
|
|
60
114
|
delete nextChanges[path];
|
|
@@ -63,21 +117,19 @@ export function applyReturned(confirmed, documents, revisions, changes, removals
|
|
|
63
117
|
for (const path of removals) {
|
|
64
118
|
delete nextDocuments[path];
|
|
65
119
|
delete nextRevisions[path];
|
|
120
|
+
delete nextFileIds[path];
|
|
66
121
|
delete nextChanges[path];
|
|
67
122
|
delete nextWritten[path];
|
|
68
|
-
binaryTargets.delete(path);
|
|
69
123
|
}
|
|
70
124
|
return readStaged({
|
|
71
125
|
...confirmed.record,
|
|
72
126
|
roomVersion,
|
|
73
|
-
documents: nextDocuments,
|
|
74
|
-
revisions: nextRevisions,
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
? confirmed.record.attachments
|
|
80
|
-
: declaredAttachments([attachments]),
|
|
127
|
+
documents: settled(nextDocuments),
|
|
128
|
+
revisions: settled(nextRevisions),
|
|
129
|
+
fileIds: settled(nextFileIds),
|
|
130
|
+
changes: settled(nextChanges),
|
|
131
|
+
written: settled(nextWritten),
|
|
132
|
+
binaries: returnedBinaries(confirmed.record.binaries, submitted, accepted),
|
|
81
133
|
}, confirmed);
|
|
82
134
|
}
|
|
83
135
|
function predicted(confirmed, batches, previous) {
|
|
@@ -98,9 +150,7 @@ function predicted(confirmed, batches, previous) {
|
|
|
98
150
|
const collection = hasMove
|
|
99
151
|
? reuseRewrite
|
|
100
152
|
? old.collection
|
|
101
|
-
:
|
|
102
|
-
? { text: confirmed.record.documents, collection: confirmed.collection }
|
|
103
|
-
: { text: old.before.documents, collection: old.collection })
|
|
153
|
+
: collectionOf(before.documents, composition, old?.collection ?? confirmed.collection)
|
|
104
154
|
: undefined;
|
|
105
155
|
const effective = collection === undefined
|
|
106
156
|
? batch
|
|
@@ -129,8 +179,9 @@ export function replicaOf(confirmed, queue, previous) {
|
|
|
129
179
|
queue: batches,
|
|
130
180
|
visible: {
|
|
131
181
|
documents: confirmed.record.documents,
|
|
132
|
-
|
|
182
|
+
binaries: confirmed.record.binaries,
|
|
133
183
|
revisions: confirmed.record.revisions,
|
|
184
|
+
fileIds: confirmed.record.fileIds,
|
|
134
185
|
changes: confirmed.record.changes,
|
|
135
186
|
collection: confirmed.collection,
|
|
136
187
|
},
|
|
@@ -144,14 +195,12 @@ export function replicaOf(confirmed, queue, previous) {
|
|
|
144
195
|
replay,
|
|
145
196
|
visible: {
|
|
146
197
|
...layer,
|
|
147
|
-
collection:
|
|
148
|
-
? undefined
|
|
149
|
-
: { text: previous.visible.documents, collection: previous.visible.collection }),
|
|
198
|
+
collection: collectionOf(layer.documents, compositionOf(confirmed.record), previous?.visible.collection ?? confirmed.collection),
|
|
150
199
|
},
|
|
151
200
|
};
|
|
152
201
|
}
|
|
153
202
|
function present(layer, path) {
|
|
154
|
-
return layer.documents[path] !== undefined || layer.
|
|
203
|
+
return layer.documents[path] !== undefined || layer.binaries[path] !== undefined;
|
|
155
204
|
}
|
|
156
205
|
function holds(layer, preconditions) {
|
|
157
206
|
const parsed = new Map();
|
|
@@ -172,6 +221,8 @@ function holds(layer, preconditions) {
|
|
|
172
221
|
if (precondition.kind === 'revision') {
|
|
173
222
|
return present(layer, path) && layer.revisions[path] === precondition.revision;
|
|
174
223
|
}
|
|
224
|
+
if (precondition.kind === 'content')
|
|
225
|
+
return layer.documents[path] === precondition.content;
|
|
175
226
|
const document = documentAt(path);
|
|
176
227
|
if (document === null)
|
|
177
228
|
return false;
|
|
@@ -216,36 +267,33 @@ function effects(change) {
|
|
|
216
267
|
{ kind: 'present', path: change.to },
|
|
217
268
|
];
|
|
218
269
|
}
|
|
270
|
+
if (change.kind === 'binary')
|
|
271
|
+
return [{ kind: 'present', path }];
|
|
219
272
|
return [{ kind: 'absent', path }];
|
|
220
273
|
}
|
|
221
|
-
function after(changes, index, path) {
|
|
222
|
-
let at = path;
|
|
223
|
-
for (const change of changes.slice(index + 1)) {
|
|
224
|
-
if (change.path !== at)
|
|
225
|
-
continue;
|
|
226
|
-
if (change.kind === 'remove')
|
|
227
|
-
return null;
|
|
228
|
-
if (change.kind === 'move')
|
|
229
|
-
at = change.to;
|
|
230
|
-
}
|
|
231
|
-
return at;
|
|
232
|
-
}
|
|
233
274
|
export function landed(batch, confirmed, current = {}) {
|
|
234
|
-
const layer = {
|
|
275
|
+
const layer = {
|
|
276
|
+
...confirmed.record,
|
|
277
|
+
documents: patched(confirmed.record.documents, Object.entries(current)),
|
|
278
|
+
};
|
|
235
279
|
return batch.changes.every((change, index) => {
|
|
236
280
|
if (change.kind === 'replace' || (change.kind === 'create' && 'content' in change)) {
|
|
237
|
-
const at =
|
|
281
|
+
const at = landing(batch.changes, index, change.path);
|
|
238
282
|
return at === null || layer.documents[at] === change.content;
|
|
239
283
|
}
|
|
284
|
+
if (change.kind === 'binary') {
|
|
285
|
+
const at = landing(batch.changes, index, change.path);
|
|
286
|
+
return at === null || layer.binaries[at]?.sha256 === change.sha256;
|
|
287
|
+
}
|
|
240
288
|
return effects(change).every((effect) => {
|
|
241
289
|
if (effect.kind === 'absent')
|
|
242
290
|
return holds(layer, [effect]);
|
|
243
|
-
const at =
|
|
291
|
+
const at = landing(batch.changes, index, effect.path);
|
|
244
292
|
return at === null || holds(layer, [{ ...effect, path: at }]);
|
|
245
293
|
});
|
|
246
294
|
});
|
|
247
295
|
}
|
|
248
|
-
export function withdrawals(confirmed, queue, withdrawable) {
|
|
296
|
+
export function withdrawals(confirmed, queue, withdrawable, local) {
|
|
249
297
|
if (!queue.some(withdrawable))
|
|
250
298
|
return [];
|
|
251
299
|
const composition = compositionOf(confirmed.record);
|
|
@@ -259,10 +307,18 @@ export function withdrawals(confirmed, queue, withdrawable) {
|
|
|
259
307
|
const effective = batch.changes.some((change) => change.kind === 'move')
|
|
260
308
|
? providerRewritten(batch, {
|
|
261
309
|
...layer,
|
|
262
|
-
collection:
|
|
310
|
+
collection: collectionOf(layer.documents, composition),
|
|
263
311
|
})
|
|
264
312
|
: batch;
|
|
265
|
-
|
|
313
|
+
let unapplied = false;
|
|
314
|
+
const next = overlay(layer, [effective], () => {
|
|
315
|
+
unapplied = true;
|
|
316
|
+
});
|
|
317
|
+
if (local && unapplied) {
|
|
318
|
+
withdrawn.push(batch);
|
|
319
|
+
continue;
|
|
320
|
+
}
|
|
321
|
+
layer = next;
|
|
266
322
|
}
|
|
267
323
|
return withdrawn;
|
|
268
324
|
}
|
package/dist/room-draft.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ProviderRefusal } from './adapter.js';
|
|
2
|
+
import type { Open } from './open.js';
|
|
2
3
|
import type { Change, Precondition } from './change.js';
|
|
3
4
|
import type { VisibleLayer } from './replica.js';
|
|
4
5
|
export type FieldValue = {
|
|
@@ -36,6 +37,17 @@ export type RoomDraftParts = {
|
|
|
36
37
|
readonly removal?: {
|
|
37
38
|
readonly base?: string | null;
|
|
38
39
|
};
|
|
40
|
+
readonly file?: {
|
|
41
|
+
readonly blob: Blob;
|
|
42
|
+
};
|
|
43
|
+
};
|
|
44
|
+
export type HeldFile = {
|
|
45
|
+
readonly blob: Blob;
|
|
46
|
+
readonly localId: string;
|
|
47
|
+
readonly byteLength: number;
|
|
48
|
+
readonly mediaType: string;
|
|
49
|
+
readonly sha256: string;
|
|
50
|
+
readonly base: string | null;
|
|
39
51
|
};
|
|
40
52
|
type HeldParts = {
|
|
41
53
|
readonly fields?: Readonly<Record<string, {
|
|
@@ -62,6 +74,7 @@ type HeldParts = {
|
|
|
62
74
|
readonly removal?: {
|
|
63
75
|
readonly base: string | null;
|
|
64
76
|
};
|
|
77
|
+
readonly file?: HeldFile;
|
|
65
78
|
};
|
|
66
79
|
type ChangedUnderneath = {
|
|
67
80
|
readonly fields?: Readonly<Record<string, FieldValue>>;
|
|
@@ -71,14 +84,12 @@ type ChangedUnderneath = {
|
|
|
71
84
|
readonly creation?: string;
|
|
72
85
|
readonly move?: string | null;
|
|
73
86
|
readonly removal?: string | null;
|
|
87
|
+
readonly file?: string | null;
|
|
74
88
|
};
|
|
75
|
-
export type ReturnReason =
|
|
76
|
-
readonly kind: 'conflicted' | 'rejected'
|
|
77
|
-
}) | {
|
|
78
|
-
readonly kind: 'expired';
|
|
79
|
-
} | {
|
|
80
|
-
readonly kind: 'withdrawn';
|
|
89
|
+
export type ReturnReason = ProviderRefusal & {
|
|
90
|
+
readonly kind: Open<'conflicted' | 'rejected' | 'expired' | 'withdrawn'>;
|
|
81
91
|
};
|
|
92
|
+
export declare function returnedBy(kind: 'expired' | 'withdrawn'): ReturnReason;
|
|
82
93
|
export type RoomDraft = {
|
|
83
94
|
readonly room: string;
|
|
84
95
|
readonly path: string;
|
|
@@ -92,11 +103,14 @@ export type RoomDraftWrite = {
|
|
|
92
103
|
readonly roomDraft: RoomDraft | null;
|
|
93
104
|
} | {
|
|
94
105
|
readonly outcome: 'stale';
|
|
106
|
+
readonly code: string;
|
|
107
|
+
readonly retryable: boolean;
|
|
95
108
|
readonly current: RoomDraft | null;
|
|
96
109
|
};
|
|
110
|
+
export declare function staleWrite(current: RoomDraft | null): RoomDraftWrite;
|
|
97
111
|
export type ChangedPart = {
|
|
98
112
|
readonly path: string;
|
|
99
|
-
readonly part: 'field' | 'section' | 'preamble' | 'markdown' | 'creation' | 'move' | 'removal'
|
|
113
|
+
readonly part: Open<'field' | 'section' | 'preamble' | 'markdown' | 'creation' | 'move' | 'removal' | 'file'>;
|
|
100
114
|
readonly name?: string;
|
|
101
115
|
};
|
|
102
116
|
export type RoomDraftRecord = {
|
|
@@ -111,9 +125,10 @@ export type SavedDraft = {
|
|
|
111
125
|
readonly parts: HeldParts;
|
|
112
126
|
};
|
|
113
127
|
export declare function readParts(value: unknown): RoomDraftParts;
|
|
114
|
-
export declare function held(current: HeldParts | undefined, parts: RoomDraftParts): HeldParts;
|
|
115
|
-
export declare function equalValue(left: unknown, right: unknown): boolean;
|
|
128
|
+
export declare function held(current: HeldParts | undefined, parts: RoomDraftParts, file?: HeldFile): HeldParts;
|
|
116
129
|
export declare function underneath(parts: HeldParts, path: string, visible: VisibleLayer | undefined): ChangedUnderneath;
|
|
130
|
+
export declare function heldFile(blob: Blob, base: string | null): Promise<HeldFile>;
|
|
131
|
+
export declare function binaryBase(visible: VisibleLayer | undefined, path: string): string | null;
|
|
117
132
|
export declare function changedParts(path: string, report: ChangedUnderneath): readonly ChangedPart[];
|
|
118
133
|
export declare function returnedInto(existing: HeldParts | undefined, returned: HeldParts): HeldParts;
|
|
119
134
|
export declare function moveTarget(move: {
|
|
@@ -123,5 +138,7 @@ export declare function changesOf(path: string, parts: HeldParts): {
|
|
|
123
138
|
changes: readonly Change[];
|
|
124
139
|
bases: readonly Precondition[];
|
|
125
140
|
};
|
|
141
|
+
export declare function joinedDraft(carried: SavedDraft, saved: readonly SavedDraft[]): SavedDraft;
|
|
142
|
+
export declare function withdrawnDrafts(drafts: readonly SavedDraft[], changes: readonly Change[]): readonly SavedDraft[];
|
|
126
143
|
export {};
|
|
127
144
|
//# sourceMappingURL=room-draft.d.ts.map
|
package/dist/room-draft.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"room-draft.d.ts","sourceRoot":"","sources":["../src/room-draft.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"room-draft.d.ts","sourceRoot":"","sources":["../src/room-draft.ts"],"names":[],"mappings":"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"}
|
package/dist/room-draft.js
CHANGED
|
@@ -1,19 +1,20 @@
|
|
|
1
|
-
import { apply, parse, serialize } from '@agentshouse/mdmodel';
|
|
1
|
+
import { apply, equalValue, frontmatterValue, parse, serialize } from '@agentshouse/mdmodel';
|
|
2
|
+
import { runtimeError } from './failure.js';
|
|
3
|
+
import { hexDigest } from './file.js';
|
|
4
|
+
import { binaryLocalId } from './identity.js';
|
|
2
5
|
import { normalize } from './paths.js';
|
|
6
|
+
export function returnedBy(kind) {
|
|
7
|
+
return { kind, code: kind, fields: {}, retryable: false };
|
|
8
|
+
}
|
|
9
|
+
export function staleWrite(current) {
|
|
10
|
+
return { outcome: 'stale', code: 'stale', retryable: false, current };
|
|
11
|
+
}
|
|
3
12
|
function malformed() {
|
|
4
|
-
throw
|
|
13
|
+
throw runtimeError('room-draft-malformed');
|
|
5
14
|
}
|
|
6
15
|
function plain(value) {
|
|
7
16
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
8
17
|
}
|
|
9
|
-
function frontmatterValue(value) {
|
|
10
|
-
if (Array.isArray(value))
|
|
11
|
-
return value.every(frontmatterValue);
|
|
12
|
-
return (value === null ||
|
|
13
|
-
typeof value === 'string' ||
|
|
14
|
-
typeof value === 'boolean' ||
|
|
15
|
-
(typeof value === 'number' && Number.isFinite(value)));
|
|
16
|
-
}
|
|
17
18
|
function text(value) {
|
|
18
19
|
return typeof value === 'string' ? value : malformed();
|
|
19
20
|
}
|
|
@@ -61,6 +62,7 @@ const PART_NAMES = new Set([
|
|
|
61
62
|
'creation',
|
|
62
63
|
'move',
|
|
63
64
|
'removal',
|
|
65
|
+
'file',
|
|
64
66
|
]);
|
|
65
67
|
export function readParts(value) {
|
|
66
68
|
if (!plain(value) || Object.keys(value).some((name) => !PART_NAMES.has(name)))
|
|
@@ -96,6 +98,13 @@ export function readParts(value) {
|
|
|
96
98
|
const base = markdownBase(value.removal.base);
|
|
97
99
|
parts.removal = base === undefined ? {} : { base };
|
|
98
100
|
}
|
|
101
|
+
if (value.file !== undefined) {
|
|
102
|
+
if (!plain(value.file) || !(value.file.blob instanceof Blob))
|
|
103
|
+
malformed();
|
|
104
|
+
if (Object.keys(value).length > 1)
|
|
105
|
+
throw runtimeError('room-draft-file-exclusive');
|
|
106
|
+
parts.file = { blob: value.file.blob };
|
|
107
|
+
}
|
|
99
108
|
return parts;
|
|
100
109
|
}
|
|
101
110
|
function named(record) {
|
|
@@ -108,7 +117,7 @@ function kept(prior, base) {
|
|
|
108
117
|
if (prior !== undefined)
|
|
109
118
|
return prior.base;
|
|
110
119
|
if (base === undefined)
|
|
111
|
-
throw
|
|
120
|
+
throw runtimeError('room-draft-base-missing');
|
|
112
121
|
return base;
|
|
113
122
|
}
|
|
114
123
|
function editsText(parts) {
|
|
@@ -116,9 +125,32 @@ function editsText(parts) {
|
|
|
116
125
|
named(parts.fields).length > 0 ||
|
|
117
126
|
named(parts.sections).length > 0);
|
|
118
127
|
}
|
|
119
|
-
export function held(current, parts) {
|
|
128
|
+
export function held(current, parts, file) {
|
|
120
129
|
if (parts.markdown !== undefined && editsText(parts)) {
|
|
121
|
-
throw
|
|
130
|
+
throw runtimeError('room-draft-markdown-exclusive');
|
|
131
|
+
}
|
|
132
|
+
if (file !== undefined) {
|
|
133
|
+
if (current !== undefined && current.file === undefined) {
|
|
134
|
+
throw runtimeError('room-draft-file-exclusive');
|
|
135
|
+
}
|
|
136
|
+
return { file: { ...file, base: current?.file === undefined ? file.base : current.file.base } };
|
|
137
|
+
}
|
|
138
|
+
if (current?.file !== undefined) {
|
|
139
|
+
if (editsText(parts) ||
|
|
140
|
+
parts.markdown !== undefined ||
|
|
141
|
+
parts.creation !== undefined ||
|
|
142
|
+
(parts.move === undefined && parts.removal === undefined)) {
|
|
143
|
+
throw runtimeError('room-draft-file-exclusive');
|
|
144
|
+
}
|
|
145
|
+
return {
|
|
146
|
+
file: current.file,
|
|
147
|
+
...(parts.move === undefined
|
|
148
|
+
? {}
|
|
149
|
+
: { move: { to: parts.move.to, base: kept(current.move, parts.move.base) } }),
|
|
150
|
+
...(parts.removal === undefined
|
|
151
|
+
? {}
|
|
152
|
+
: { removal: { base: kept(current.removal, parts.removal.base) } }),
|
|
153
|
+
};
|
|
122
154
|
}
|
|
123
155
|
const next = {};
|
|
124
156
|
const fields = named(parts.fields);
|
|
@@ -156,17 +188,9 @@ export function held(current, parts) {
|
|
|
156
188
|
next.removal = { base: kept(current?.removal, parts.removal.base) };
|
|
157
189
|
}
|
|
158
190
|
if (Object.keys(next).length === 0)
|
|
159
|
-
throw
|
|
191
|
+
throw runtimeError('room-draft-empty');
|
|
160
192
|
return next;
|
|
161
193
|
}
|
|
162
|
-
export function equalValue(left, right) {
|
|
163
|
-
if (left === right)
|
|
164
|
-
return true;
|
|
165
|
-
return (Array.isArray(left) &&
|
|
166
|
-
Array.isArray(right) &&
|
|
167
|
-
left.length === right.length &&
|
|
168
|
-
left.every((item, index) => equalValue(item, right[index])));
|
|
169
|
-
}
|
|
170
194
|
function sameField(left, right) {
|
|
171
195
|
if (left === null || right === null)
|
|
172
196
|
return left === right;
|
|
@@ -174,7 +198,7 @@ function sameField(left, right) {
|
|
|
174
198
|
}
|
|
175
199
|
export function underneath(parts, path, visible) {
|
|
176
200
|
const markdown = visible?.documents[path] ?? null;
|
|
177
|
-
const document = visible?.collection.
|
|
201
|
+
const document = visible?.collection.document(path);
|
|
178
202
|
const report = {};
|
|
179
203
|
const fields = {};
|
|
180
204
|
for (const [name, part] of named(parts.fields)) {
|
|
@@ -207,8 +231,28 @@ export function underneath(parts, path, visible) {
|
|
|
207
231
|
report.move = markdown;
|
|
208
232
|
if (parts.removal !== undefined && markdown !== parts.removal.base)
|
|
209
233
|
report.removal = markdown;
|
|
234
|
+
if (parts.file !== undefined) {
|
|
235
|
+
const file = binaryBase(visible, path);
|
|
236
|
+
if (file !== parts.file.base || markdown !== null)
|
|
237
|
+
report.file = file;
|
|
238
|
+
}
|
|
210
239
|
return report;
|
|
211
240
|
}
|
|
241
|
+
const UNTYPED_MEDIA_TYPE = 'application/octet-stream';
|
|
242
|
+
export async function heldFile(blob, base) {
|
|
243
|
+
const bytes = await blob.arrayBuffer();
|
|
244
|
+
return {
|
|
245
|
+
blob,
|
|
246
|
+
localId: binaryLocalId(),
|
|
247
|
+
byteLength: bytes.byteLength,
|
|
248
|
+
mediaType: blob.type === '' ? UNTYPED_MEDIA_TYPE : blob.type,
|
|
249
|
+
sha256: hexDigest(await crypto.subtle.digest('SHA-256', bytes)),
|
|
250
|
+
base,
|
|
251
|
+
};
|
|
252
|
+
}
|
|
253
|
+
export function binaryBase(visible, path) {
|
|
254
|
+
return visible?.binaries[path] === undefined ? null : (visible.revisions[path] ?? null);
|
|
255
|
+
}
|
|
212
256
|
export function changedParts(path, report) {
|
|
213
257
|
return [
|
|
214
258
|
...(report.creation === undefined ? [] : [{ path, part: 'creation' }]),
|
|
@@ -218,6 +262,7 @@ export function changedParts(path, report) {
|
|
|
218
262
|
...(report.markdown === undefined ? [] : [{ path, part: 'markdown' }]),
|
|
219
263
|
...(report.move === undefined ? [] : [{ path, part: 'move' }]),
|
|
220
264
|
...(report.removal === undefined ? [] : [{ path, part: 'removal' }]),
|
|
265
|
+
...(report.file === undefined ? [] : [{ path, part: 'file' }]),
|
|
221
266
|
];
|
|
222
267
|
}
|
|
223
268
|
function joined(existing, returned) {
|
|
@@ -280,12 +325,15 @@ export function returnedInto(existing, returned) {
|
|
|
280
325
|
const creation = existing.creation ?? returned.creation;
|
|
281
326
|
const move = existing.move ?? returned.move;
|
|
282
327
|
const removal = existing.removal ?? returned.removal;
|
|
328
|
+
const file = existing.file ?? returned.file;
|
|
283
329
|
if (creation !== undefined)
|
|
284
330
|
next.creation = creation;
|
|
285
331
|
if (move !== undefined)
|
|
286
332
|
next.move = move;
|
|
287
333
|
if (removal !== undefined)
|
|
288
334
|
next.removal = removal;
|
|
335
|
+
if (file !== undefined)
|
|
336
|
+
next.file = file;
|
|
289
337
|
return next;
|
|
290
338
|
}
|
|
291
339
|
export function moveTarget(move) {
|
|
@@ -321,9 +369,70 @@ export function changesOf(path, parts) {
|
|
|
321
369
|
if (parts.markdown !== undefined) {
|
|
322
370
|
changes.push({ kind: 'replace', path, content: parts.markdown.value });
|
|
323
371
|
}
|
|
372
|
+
if (parts.file !== undefined && parts.removal === undefined) {
|
|
373
|
+
const { base, ...file } = parts.file;
|
|
374
|
+
const at = parts.move === undefined ? path : moveTarget(parts.move);
|
|
375
|
+
if (base !== null && at !== path)
|
|
376
|
+
changes.push({ kind: 'move', path, to: at });
|
|
377
|
+
changes.push({ kind: 'binary', path: at, ...file });
|
|
378
|
+
if (base === null && at !== path)
|
|
379
|
+
bases.push({ kind: 'absent', path: at });
|
|
380
|
+
return { changes, bases };
|
|
381
|
+
}
|
|
382
|
+
if (parts.file?.base === null)
|
|
383
|
+
return { changes, bases };
|
|
324
384
|
if (parts.move !== undefined)
|
|
325
385
|
changes.push({ kind: 'move', path, to: moveTarget(parts.move) });
|
|
326
386
|
if (parts.removal !== undefined)
|
|
327
387
|
changes.push({ kind: 'remove', path });
|
|
328
388
|
return { changes, bases };
|
|
329
389
|
}
|
|
390
|
+
function rebased(before, after) {
|
|
391
|
+
return before === undefined ? after : { ...after, base: before.base };
|
|
392
|
+
}
|
|
393
|
+
function rebasedAll(before, after) {
|
|
394
|
+
return {
|
|
395
|
+
...before,
|
|
396
|
+
...Object.fromEntries(Object.entries(after).map(([name, part]) => [name, rebased(before?.[name], part)])),
|
|
397
|
+
};
|
|
398
|
+
}
|
|
399
|
+
export function joinedDraft(carried, saved) {
|
|
400
|
+
const draft = saved.find((item) => item.path === carried.path);
|
|
401
|
+
if (draft === undefined)
|
|
402
|
+
return carried;
|
|
403
|
+
const held = carried.parts;
|
|
404
|
+
const next = draft.parts;
|
|
405
|
+
return {
|
|
406
|
+
path: carried.path,
|
|
407
|
+
parts: {
|
|
408
|
+
...held,
|
|
409
|
+
...next,
|
|
410
|
+
...(next.fields === undefined ? {} : { fields: rebasedAll(held.fields, next.fields) }),
|
|
411
|
+
...(next.sections === undefined
|
|
412
|
+
? {}
|
|
413
|
+
: { sections: rebasedAll(held.sections, next.sections) }),
|
|
414
|
+
...(next.preamble === undefined ? {} : { preamble: rebased(held.preamble, next.preamble) }),
|
|
415
|
+
...(next.markdown === undefined ? {} : { markdown: rebased(held.markdown, next.markdown) }),
|
|
416
|
+
},
|
|
417
|
+
};
|
|
418
|
+
}
|
|
419
|
+
export function withdrawnDrafts(drafts, changes) {
|
|
420
|
+
return drafts.flatMap((draft) => {
|
|
421
|
+
const file = draft.parts.file;
|
|
422
|
+
const at = draft.parts.move?.to ?? draft.path;
|
|
423
|
+
const change = changes.find((item) => (item.kind === 'move' || item.kind === 'remove') && item.path === at);
|
|
424
|
+
if (file === undefined || change === undefined)
|
|
425
|
+
return [draft];
|
|
426
|
+
if (change.kind === 'move') {
|
|
427
|
+
return [
|
|
428
|
+
{
|
|
429
|
+
path: draft.path,
|
|
430
|
+
parts: change.to === draft.path ? { file } : { file, move: { to: change.to, base: null } },
|
|
431
|
+
},
|
|
432
|
+
];
|
|
433
|
+
}
|
|
434
|
+
return file.base === null
|
|
435
|
+
? []
|
|
436
|
+
: [{ path: draft.path, parts: { file, removal: { base: null } } }];
|
|
437
|
+
});
|
|
438
|
+
}
|