@agentshouse/mdruntime 0.1.0-c0136de3edfbe → 0.1.0-c01d4615bfe46
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/README.md +16 -15
- package/dist/acceptance.d.ts +0 -3
- package/dist/acceptance.d.ts.map +1 -1
- package/dist/acceptance.js +74 -164
- package/dist/act-lanes.d.ts +30 -0
- package/dist/act-lanes.d.ts.map +1 -0
- package/dist/act-lanes.js +225 -0
- package/dist/actions.d.ts +8 -2
- package/dist/actions.d.ts.map +1 -1
- package/dist/actions.js +122 -68
- package/dist/adapter.d.ts +49 -55
- package/dist/adapter.d.ts.map +1 -1
- package/dist/attached-model.d.ts +0 -1
- package/dist/attached-model.d.ts.map +1 -1
- package/dist/attached-model.js +0 -5
- package/dist/bootstrap.d.ts +1 -1
- package/dist/bootstrap.d.ts.map +1 -1
- package/dist/bootstrap.js +6 -18
- package/dist/change-set.d.ts +4 -0
- package/dist/change-set.d.ts.map +1 -1
- package/dist/change-set.js +6 -0
- package/dist/change.d.ts.map +1 -1
- package/dist/change.js +4 -2
- package/dist/chat-types.d.ts +2 -2
- package/dist/chat-types.d.ts.map +1 -1
- package/dist/chat-types.js +11 -2
- package/dist/client.d.ts +13 -19
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +35 -19
- package/dist/collection.d.ts +22 -4
- package/dist/collection.d.ts.map +1 -1
- package/dist/collection.js +12 -2
- package/dist/compile.d.ts +2 -0
- package/dist/compile.d.ts.map +1 -1
- package/dist/compile.js +31 -24
- package/dist/connection.d.ts.map +1 -1
- package/dist/connection.js +32 -24
- package/dist/conversation-live.d.ts +147 -0
- package/dist/conversation-live.d.ts.map +1 -0
- package/dist/conversation-live.js +258 -0
- package/dist/conversation-row.d.ts.map +1 -1
- package/dist/conversation-row.js +7 -1
- package/dist/conversation.d.ts +52 -44
- package/dist/conversation.d.ts.map +1 -1
- package/dist/conversation.js +956 -1029
- package/dist/declaration.d.ts +10 -0
- package/dist/declaration.d.ts.map +1 -0
- package/dist/declaration.js +24 -0
- package/dist/discovery.d.ts.map +1 -1
- package/dist/discovery.js +19 -44
- package/dist/durability.d.ts +13 -0
- package/dist/durability.d.ts.map +1 -1
- package/dist/durability.js +4 -0
- package/dist/entry.js +1 -1
- package/dist/expectation.d.ts +26 -13
- package/dist/expectation.d.ts.map +1 -1
- package/dist/expectation.js +72 -19
- package/dist/failure.d.ts +3 -0
- package/dist/failure.d.ts.map +1 -1
- package/dist/failure.js +6 -0
- package/dist/figures.d.ts +1 -0
- package/dist/figures.d.ts.map +1 -1
- package/dist/figures.js +2 -2
- package/dist/file.d.ts.map +1 -1
- package/dist/file.js +2 -1
- package/dist/holdings.d.ts +29 -0
- package/dist/holdings.d.ts.map +1 -0
- package/dist/holdings.js +95 -0
- package/dist/host.d.ts +18 -2
- package/dist/host.d.ts.map +1 -1
- package/dist/host.js +46 -11
- package/dist/index.d.ts +17 -9
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +13 -6
- package/dist/install.d.ts +2 -4
- package/dist/install.d.ts.map +1 -1
- package/dist/install.js +53 -83
- package/dist/lifecycle.d.ts +1 -1
- package/dist/lifecycle.d.ts.map +1 -1
- package/dist/lifecycle.js +45 -35
- package/dist/listing.d.ts +6 -11
- package/dist/listing.d.ts.map +1 -1
- package/dist/listing.js +25 -61
- package/dist/live.d.ts.map +1 -1
- package/dist/live.js +3 -3
- package/dist/locks.d.ts +2 -4
- package/dist/locks.d.ts.map +1 -1
- package/dist/locks.js +10 -39
- package/dist/lost.d.ts.map +1 -1
- package/dist/lost.js +10 -22
- package/dist/media.d.ts +1 -1
- package/dist/media.d.ts.map +1 -1
- package/dist/media.js +10 -13
- package/dist/memory.d.ts +7 -3
- package/dist/memory.d.ts.map +1 -1
- package/dist/memory.js +58 -27
- package/dist/messages.d.ts +10 -6
- package/dist/messages.d.ts.map +1 -1
- package/dist/messages.js +26 -36
- package/dist/model.d.ts +0 -1
- package/dist/model.d.ts.map +1 -1
- package/dist/model.js +0 -5
- package/dist/models.d.ts +4 -8
- package/dist/models.d.ts.map +1 -1
- package/dist/models.js +95 -135
- package/dist/observation.d.ts +3 -2
- package/dist/observation.d.ts.map +1 -1
- package/dist/observation.js +22 -21
- package/dist/opened.d.ts +1 -1
- package/dist/opened.d.ts.map +1 -1
- package/dist/opened.js +5 -5
- package/dist/opening.d.ts.map +1 -1
- package/dist/opening.js +7 -10
- package/dist/outcome.d.ts +10 -1
- package/dist/outcome.d.ts.map +1 -1
- package/dist/outcome.js +23 -2
- package/dist/overlay.d.ts +5 -1
- package/dist/overlay.d.ts.map +1 -1
- package/dist/overlay.js +36 -21
- package/dist/page-metadata.d.ts +8 -0
- package/dist/page-metadata.d.ts.map +1 -0
- package/dist/page-metadata.js +19 -0
- package/dist/parts.d.ts +3 -58
- package/dist/parts.d.ts.map +1 -1
- package/dist/parts.js +10 -115
- package/dist/paths.d.ts +1 -0
- package/dist/paths.d.ts.map +1 -1
- package/dist/paths.js +22 -0
- package/dist/preparation.d.ts.map +1 -1
- package/dist/preparation.js +25 -24
- package/dist/presence.d.ts +52 -0
- package/dist/presence.d.ts.map +1 -0
- package/dist/presence.js +220 -0
- package/dist/queries.d.ts +1 -1
- package/dist/queries.d.ts.map +1 -1
- package/dist/queries.js +24 -14
- package/dist/query.d.ts +0 -1
- package/dist/query.d.ts.map +1 -1
- package/dist/questions.d.ts +2 -5
- package/dist/questions.d.ts.map +1 -1
- package/dist/questions.js +3 -6
- package/dist/queue.d.ts +40 -0
- package/dist/queue.d.ts.map +1 -0
- package/dist/queue.js +450 -0
- package/dist/reach.d.ts.map +1 -1
- package/dist/reach.js +68 -23
- package/dist/react.d.ts +11 -1
- package/dist/react.d.ts.map +1 -1
- package/dist/react.js +33 -1
- package/dist/readiness.d.ts +1 -2
- package/dist/readiness.d.ts.map +1 -1
- package/dist/reads.d.ts +4 -1
- package/dist/reads.d.ts.map +1 -1
- package/dist/reads.js +47 -5
- package/dist/recovery.d.ts +3 -1
- package/dist/recovery.d.ts.map +1 -1
- package/dist/recovery.js +29 -7
- package/dist/refresh.js +2 -2
- package/dist/refusal.d.ts.map +1 -1
- package/dist/refusal.js +5 -6
- package/dist/replica.d.ts +5 -10
- package/dist/replica.d.ts.map +1 -1
- package/dist/replica.js +15 -16
- package/dist/retried.d.ts +30 -0
- package/dist/retried.d.ts.map +1 -0
- package/dist/retried.js +72 -0
- package/dist/room-draft.d.ts +4 -6
- package/dist/room-draft.d.ts.map +1 -1
- package/dist/room-draft.js +48 -59
- package/dist/room-drafts.d.ts.map +1 -1
- package/dist/room-drafts.js +17 -16
- package/dist/rows.d.ts.map +1 -1
- package/dist/rows.js +3 -4
- package/dist/runtime.d.ts +11 -19
- package/dist/runtime.d.ts.map +1 -1
- package/dist/save.d.ts +42 -86
- package/dist/save.d.ts.map +1 -1
- package/dist/save.js +333 -163
- package/dist/saves.d.ts +2 -40
- package/dist/saves.d.ts.map +1 -1
- package/dist/saves.js +109 -703
- package/dist/seed.d.ts.map +1 -1
- package/dist/seed.js +2 -3
- package/dist/shared.d.ts +1 -6
- package/dist/shared.d.ts.map +1 -1
- package/dist/shared.js +13 -95
- package/dist/shown.d.ts +6 -4
- package/dist/shown.d.ts.map +1 -1
- package/dist/shown.js +43 -35
- package/dist/socket/lanes.d.ts +12 -4
- package/dist/socket/lanes.d.ts.map +1 -1
- package/dist/socket/lanes.js +34 -8
- package/dist/socket/session.d.ts +0 -1
- package/dist/socket/session.d.ts.map +1 -1
- package/dist/socket.d.ts +3 -6
- package/dist/socket.d.ts.map +1 -1
- package/dist/socket.js +5 -16
- package/dist/source.d.ts +0 -7
- package/dist/source.d.ts.map +1 -1
- package/dist/source.js +5 -4
- package/dist/store/records.d.ts +11 -8
- package/dist/store/records.d.ts.map +1 -1
- package/dist/store/records.js +43 -12
- package/dist/store/space.d.ts +1 -1
- package/dist/store/space.d.ts.map +1 -1
- package/dist/store/space.js +0 -2
- package/dist/store/watchers.js +1 -2
- package/dist/store.d.ts +12 -7
- package/dist/store.d.ts.map +1 -1
- package/dist/store.js +38 -13
- package/dist/stored.d.ts +2 -1
- package/dist/stored.d.ts.map +1 -1
- package/dist/stored.js +27 -15
- package/dist/surface.d.ts +7 -4
- package/dist/surface.d.ts.map +1 -1
- package/dist/surface.js +30 -25
- package/dist/sync.d.ts +0 -1
- package/dist/sync.d.ts.map +1 -1
- package/dist/sync.js +93 -89
- package/dist/tables.d.ts +19 -11
- package/dist/tables.d.ts.map +1 -1
- package/dist/tables.js +58 -21
- package/dist/tallies.d.ts.map +1 -1
- package/dist/tallies.js +6 -7
- package/dist/validation.d.ts.map +1 -1
- package/dist/validation.js +2 -2
- package/dist/wire.d.ts +53 -7
- package/dist/wire.d.ts.map +1 -1
- package/dist/wire.js +17 -4
- package/package.json +3 -2
- package/dist/attempt.d.ts +0 -16
- package/dist/attempt.d.ts.map +0 -1
- package/dist/attempt.js +0 -70
- package/dist/job.d.ts +0 -33
- package/dist/job.d.ts.map +0 -1
- package/dist/job.js +0 -54
- package/dist/log.d.ts +0 -6
- package/dist/log.d.ts.map +0 -1
- package/dist/log.js +0 -14
- package/dist/socket/rooms.d.ts +0 -43
- package/dist/socket/rooms.d.ts.map +0 -1
- package/dist/socket/rooms.js +0 -90
- package/dist/store/fences.d.ts +0 -16
- package/dist/store/fences.d.ts.map +0 -1
- package/dist/store/fences.js +0 -26
package/dist/queue.js
ADDED
|
@@ -0,0 +1,450 @@
|
|
|
1
|
+
import { changeSet, mergeChangeSets } from './change-set.js';
|
|
2
|
+
import { leaving as leavingIn, partnerOf } from './change.js';
|
|
3
|
+
import { composedOf, definitionsAt } from './collection.js';
|
|
4
|
+
import { declared } from './declaration.js';
|
|
5
|
+
import { runtimeError } from './failure.js';
|
|
6
|
+
import { roomDraftRevision } from './identity.js';
|
|
7
|
+
import { landed, movedBy, overlayOf, replaying, slicing, slicingWith, standing, storedRecord, touchedBy, } from './replica.js';
|
|
8
|
+
import { returnedBy, returnedInto } from './room-draft.js';
|
|
9
|
+
import { documentKey } from './rows.js';
|
|
10
|
+
import { stepped } from './turn.js';
|
|
11
|
+
export function withdrawable(states) {
|
|
12
|
+
return (batch) => {
|
|
13
|
+
const state = states.get(batch.id);
|
|
14
|
+
return state !== undefined && state.submission.state !== 'submitted' && !state.lost;
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
export async function sliceAt(store, record, view, queue, extra = [], moved = []) {
|
|
18
|
+
const local = await store.open();
|
|
19
|
+
const needed = new Set([...touchedBy(queue), ...extra]);
|
|
20
|
+
const movedPaths = [...new Set([...movedBy(queue, record.locator), ...moved])];
|
|
21
|
+
if (movedPaths.length > 0) {
|
|
22
|
+
for (const { path } of await local.referrers(record.key, view, movedPaths)) {
|
|
23
|
+
needed.add(path);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
const paths = [...needed];
|
|
27
|
+
return stepped(slicing(await local.entries(record.key, view, paths), paths));
|
|
28
|
+
}
|
|
29
|
+
async function landedWhole(store, record, batch, confirmedLayer, current) {
|
|
30
|
+
if (!landed(batch, confirmedLayer, store.composed(record), current))
|
|
31
|
+
return false;
|
|
32
|
+
const partner = partnerOf(batch, record.locator);
|
|
33
|
+
if (partner === null)
|
|
34
|
+
return true;
|
|
35
|
+
const other = await store.replica(partner);
|
|
36
|
+
const half = other?.queue.find((one) => one.id === batch.id);
|
|
37
|
+
if (other === undefined || half === undefined)
|
|
38
|
+
return false;
|
|
39
|
+
return landed(half, await sliceAt(store, other.record, 'confirmed', [half]), store.composed(other.record));
|
|
40
|
+
}
|
|
41
|
+
async function returnedDrafts(store, locator, work, leaving, composition) {
|
|
42
|
+
const written = new Map();
|
|
43
|
+
for (const { batch, returned } of leaving) {
|
|
44
|
+
if (returned === null || batch.between?.destination.room === locator)
|
|
45
|
+
continue;
|
|
46
|
+
for (const saved of work.states.get(batch.id)?.drafts ?? []) {
|
|
47
|
+
const existing = written.get(saved.path) ?? (await store.draft(locator, saved.path));
|
|
48
|
+
const parts = returnedInto(existing?.parts, saved.parts, composition === undefined ? undefined : definitionsAt(composition, saved.path));
|
|
49
|
+
written.set(saved.path, parts === null
|
|
50
|
+
? { ...existing, returned }
|
|
51
|
+
: { locator, path: saved.path, revision: roomDraftRevision(), parts, returned });
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return written;
|
|
55
|
+
}
|
|
56
|
+
function unheldComposition({ store, presence }, locator) {
|
|
57
|
+
const model = presence.unheldModel(locator);
|
|
58
|
+
const listed = presence.room(locator);
|
|
59
|
+
if (model === null || listed === undefined)
|
|
60
|
+
return undefined;
|
|
61
|
+
return store.composed({ model, declaration: declared(listed) });
|
|
62
|
+
}
|
|
63
|
+
async function carriedBack(runtime, locator, unlanded, written) {
|
|
64
|
+
const { store } = runtime;
|
|
65
|
+
const back = new Map();
|
|
66
|
+
const taken = [];
|
|
67
|
+
for (const batch of unlanded) {
|
|
68
|
+
const between = batch.between;
|
|
69
|
+
if (between === undefined)
|
|
70
|
+
continue;
|
|
71
|
+
const source = between.source.room;
|
|
72
|
+
const destination = between.destination.room;
|
|
73
|
+
const local = await store.open();
|
|
74
|
+
const arrived = (await local.pending(destination, batch.id)).state?.drafts ?? [];
|
|
75
|
+
for (const { path: to } of arrived) {
|
|
76
|
+
const record = await store.draft(destination, to);
|
|
77
|
+
const path = between.moves.find((move) => move.to === to)?.path;
|
|
78
|
+
if (record === undefined || path === undefined)
|
|
79
|
+
continue;
|
|
80
|
+
const [into, key] = source === locator ? [written, path] : [back, documentKey(source, path)];
|
|
81
|
+
const existing = into.get(key) ?? (await store.draft(source, path));
|
|
82
|
+
const held = await store.record(source);
|
|
83
|
+
const composition = held === undefined ? unheldComposition(runtime, source) : store.composed(held);
|
|
84
|
+
const parts = returnedInto(existing?.parts, record.parts, composition === undefined ? undefined : definitionsAt(composition, path));
|
|
85
|
+
if (parts === null)
|
|
86
|
+
continue;
|
|
87
|
+
taken.push({ locator: destination, path: to });
|
|
88
|
+
into.set(key, {
|
|
89
|
+
locator: source,
|
|
90
|
+
path,
|
|
91
|
+
revision: roomDraftRevision(),
|
|
92
|
+
parts,
|
|
93
|
+
returned: existing?.returned ?? null,
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
const records = [...back.values()];
|
|
98
|
+
const elsewhere = taken.filter((one) => one.locator !== locator);
|
|
99
|
+
const rooms = new Set([...records, ...elsewhere].map((one) => one.locator));
|
|
100
|
+
return {
|
|
101
|
+
taken: taken.filter((one) => one.locator === locator).map(({ path }) => path),
|
|
102
|
+
writes: [...rooms].map((room) => ({
|
|
103
|
+
locator: room,
|
|
104
|
+
roomDrafts: records.filter((record) => record.locator === room),
|
|
105
|
+
consumedRoomDrafts: elsewhere.filter((one) => one.locator === room).map(({ path }) => path),
|
|
106
|
+
})),
|
|
107
|
+
changes: [...rooms].map((room) => changeSet(room, {
|
|
108
|
+
drafts: [...records, ...elsewhere]
|
|
109
|
+
.filter((one) => one.locator === room)
|
|
110
|
+
.map(({ path }) => path),
|
|
111
|
+
})),
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
function confirmedAgain(store, locator) {
|
|
115
|
+
store.installs.change(locator, (held) => ({
|
|
116
|
+
...held,
|
|
117
|
+
confirmations: held.confirmations + 1,
|
|
118
|
+
}));
|
|
119
|
+
}
|
|
120
|
+
function replayed(store, record, confirmedLayer, queue) {
|
|
121
|
+
return stepped(replaying(confirmedLayer, queue, record.locator, store.composed(record)));
|
|
122
|
+
}
|
|
123
|
+
async function overlayDiff(record, before, visible, touched) {
|
|
124
|
+
const kept = before !== undefined && before.record.key === record.key ? before.overlaid : new Set();
|
|
125
|
+
return {
|
|
126
|
+
overlay: {
|
|
127
|
+
set: await stepped(overlayOf(visible, touched)),
|
|
128
|
+
cleared: [...kept].filter((path) => !touched.has(path)),
|
|
129
|
+
},
|
|
130
|
+
touched,
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
function unsent(state, batch, locator) {
|
|
134
|
+
if (state === undefined)
|
|
135
|
+
return false;
|
|
136
|
+
return !leavingIn(batch, locator) || withdrawable(new Map([[batch.id, state]]))(batch);
|
|
137
|
+
}
|
|
138
|
+
async function together(runtime, local, settlements) {
|
|
139
|
+
const settled = new Set(settlements.map(({ locator }) => locator));
|
|
140
|
+
const all = [...settlements];
|
|
141
|
+
for (let wave = settlements; wave.length > 0;) {
|
|
142
|
+
const partnered = new Map();
|
|
143
|
+
for (const { locator, left } of wave) {
|
|
144
|
+
for (const batch of left) {
|
|
145
|
+
const partner = partnerOf(batch, locator);
|
|
146
|
+
if (partner === null ||
|
|
147
|
+
settled.has(partner) ||
|
|
148
|
+
!unsent((await local.pending(partner, batch.id)).state, batch, partner)) {
|
|
149
|
+
continue;
|
|
150
|
+
}
|
|
151
|
+
partnered.set(partner, [...(partnered.get(partner) ?? []), batch]);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
const partners = [];
|
|
155
|
+
for (const [partner, batches] of partnered) {
|
|
156
|
+
settled.add(partner);
|
|
157
|
+
partners.push(await unpairing(runtime, local, partner, batches));
|
|
158
|
+
}
|
|
159
|
+
all.push(...partners);
|
|
160
|
+
wave = partners;
|
|
161
|
+
}
|
|
162
|
+
const answer = await local.commit({
|
|
163
|
+
rooms: all.flatMap(({ commit }) => commit.rooms),
|
|
164
|
+
writes: all.flatMap(({ commit }) => commit.writes),
|
|
165
|
+
});
|
|
166
|
+
return mergeChangeSets(all.map((one) => one.apply(answer)));
|
|
167
|
+
}
|
|
168
|
+
async function settlement(runtime, local, locator, work, record, queue, settling = {}) {
|
|
169
|
+
const { store, localSaves } = runtime;
|
|
170
|
+
const before = work.replica;
|
|
171
|
+
const view = settling.view ?? 'confirmed';
|
|
172
|
+
const previousQueue = work.queue;
|
|
173
|
+
const overrides = settling.changes;
|
|
174
|
+
const read = await sliceAt(store, record, view, queue, [
|
|
175
|
+
...(before !== undefined && before.record.key === record.key ? before.overlaid : []),
|
|
176
|
+
...(overrides?.set.map(({ path }) => path) ?? []),
|
|
177
|
+
...(overrides?.removed ?? []),
|
|
178
|
+
]);
|
|
179
|
+
const confirmedLayer = overrides === undefined
|
|
180
|
+
? read
|
|
181
|
+
: await stepped(slicingWith(read, overrides.set, overrides.removed));
|
|
182
|
+
const composition = store.composed(record);
|
|
183
|
+
const shown = queue.filter((batch) => {
|
|
184
|
+
const held = store.landed.of(locator, batch.id);
|
|
185
|
+
return (held !== undefined &&
|
|
186
|
+
Object.entries(held).some(([path, revision]) => confirmedLayer.revisions[path] !== revision));
|
|
187
|
+
});
|
|
188
|
+
const unshown = queue.filter((batch) => !shown.includes(batch));
|
|
189
|
+
const { withdrawn, kept } = await stepped(standing(confirmedLayer, unshown, withdrawable(work.states), localSaves, locator, composition));
|
|
190
|
+
const founded = kept.filter((batch) => !unshown.includes(batch));
|
|
191
|
+
const queueChanged = kept.length !== previousQueue.length || founded.length > 0;
|
|
192
|
+
const unqueued = shown.map((batch) => ({ batch, landed: true }));
|
|
193
|
+
for (const batch of withdrawn) {
|
|
194
|
+
unqueued.push({ batch, landed: await landedWhole(store, record, batch, confirmedLayer) });
|
|
195
|
+
}
|
|
196
|
+
const returning = [
|
|
197
|
+
...[...unqueued].reverse().map(({ batch, landed: held }) => ({
|
|
198
|
+
batch,
|
|
199
|
+
returned: localSaves || held ? null : returnedBy(),
|
|
200
|
+
})),
|
|
201
|
+
...(settling.leaving ?? []),
|
|
202
|
+
];
|
|
203
|
+
const written = await returnedDrafts(store, locator, work, returning, composition);
|
|
204
|
+
const carried = await carriedBack(runtime, locator, [
|
|
205
|
+
...[...unqueued].reverse().flatMap(({ batch, landed: held }) => (held ? [] : [batch])),
|
|
206
|
+
...(settling.leaving ?? []).flatMap(({ batch, returned }) => returned === null ? [] : [batch]),
|
|
207
|
+
], written);
|
|
208
|
+
const replayedLayer = await replayed(store, record, confirmedLayer, kept);
|
|
209
|
+
const { overlay } = await overlayDiff(record, before, replayedLayer.visible, replayedLayer.touched);
|
|
210
|
+
const commit = {
|
|
211
|
+
rooms: [
|
|
212
|
+
{
|
|
213
|
+
locator,
|
|
214
|
+
key: record.key,
|
|
215
|
+
record: storedRecord(record),
|
|
216
|
+
roots: record.declaration.typedSelection?.roots ?? [],
|
|
217
|
+
composed: composedOf(composition),
|
|
218
|
+
...settling.commit,
|
|
219
|
+
...(overrides === undefined
|
|
220
|
+
? {}
|
|
221
|
+
: { confirmed: { set: overrides.set, removed: overrides.removed } }),
|
|
222
|
+
overlay,
|
|
223
|
+
},
|
|
224
|
+
],
|
|
225
|
+
writes: [
|
|
226
|
+
{
|
|
227
|
+
locator,
|
|
228
|
+
queue: kept,
|
|
229
|
+
stored: previousQueue,
|
|
230
|
+
founded,
|
|
231
|
+
roomDrafts: [...written.values()],
|
|
232
|
+
consumedRoomDrafts: carried.taken,
|
|
233
|
+
},
|
|
234
|
+
...carried.writes,
|
|
235
|
+
],
|
|
236
|
+
};
|
|
237
|
+
const staying = new Set(kept.map((batch) => batch.id));
|
|
238
|
+
return {
|
|
239
|
+
locator,
|
|
240
|
+
left: previousQueue.filter((batch) => !staying.has(batch.id)),
|
|
241
|
+
commit,
|
|
242
|
+
apply: (answer) => {
|
|
243
|
+
for (const batch of previousQueue) {
|
|
244
|
+
if (!staying.has(batch.id))
|
|
245
|
+
store.landed.drop(locator, batch.id);
|
|
246
|
+
}
|
|
247
|
+
const drafts = [...written.keys(), ...carried.taken];
|
|
248
|
+
const changed = answer.changed[locator];
|
|
249
|
+
if (settling.commit?.published !== undefined ||
|
|
250
|
+
settling.commit?.refreshed === true ||
|
|
251
|
+
overrides !== undefined) {
|
|
252
|
+
confirmedAgain(store, locator);
|
|
253
|
+
}
|
|
254
|
+
return mergeChangeSets([
|
|
255
|
+
changeSet(locator, {
|
|
256
|
+
documents: changed === undefined ? [] : changed,
|
|
257
|
+
room: settling.room,
|
|
258
|
+
queue: queueChanged,
|
|
259
|
+
drafts,
|
|
260
|
+
unindexed: answer.indexed[locator] === false,
|
|
261
|
+
due: kept.length > 0 && settling.refused !== true,
|
|
262
|
+
}),
|
|
263
|
+
...carried.changes,
|
|
264
|
+
]);
|
|
265
|
+
},
|
|
266
|
+
};
|
|
267
|
+
}
|
|
268
|
+
async function unpairing(runtime, local, locator, batches) {
|
|
269
|
+
const { store, localSaves } = runtime;
|
|
270
|
+
const ids = new Set(batches.map(({ id }) => id));
|
|
271
|
+
const leaving = batches.map((batch) => ({
|
|
272
|
+
batch,
|
|
273
|
+
returned: !localSaves && leavingIn(batch, locator) ? returnedBy() : null,
|
|
274
|
+
}));
|
|
275
|
+
const work = await store.work(locator);
|
|
276
|
+
const current = work.replica;
|
|
277
|
+
if (current !== undefined) {
|
|
278
|
+
return settlement(runtime, local, locator, work, current.record, current.queue.filter((one) => !ids.has(one.id)), { leaving });
|
|
279
|
+
}
|
|
280
|
+
const queue = work.queue.filter((one) => !ids.has(one.id));
|
|
281
|
+
const written = await returnedDrafts(store, locator, work, leaving, unheldComposition(runtime, locator));
|
|
282
|
+
const carried = await carriedBack(runtime, locator, leaving.flatMap(({ batch, returned }) => (returned === null ? [] : [batch])), written);
|
|
283
|
+
return {
|
|
284
|
+
locator,
|
|
285
|
+
left: batches,
|
|
286
|
+
commit: {
|
|
287
|
+
rooms: [],
|
|
288
|
+
writes: [
|
|
289
|
+
{
|
|
290
|
+
locator,
|
|
291
|
+
queue,
|
|
292
|
+
stored: work.queue,
|
|
293
|
+
roomDrafts: [...written.values()],
|
|
294
|
+
consumedRoomDrafts: carried.taken,
|
|
295
|
+
},
|
|
296
|
+
...carried.writes,
|
|
297
|
+
],
|
|
298
|
+
},
|
|
299
|
+
apply() {
|
|
300
|
+
return mergeChangeSets([
|
|
301
|
+
changeSet(locator, {
|
|
302
|
+
queue: true,
|
|
303
|
+
drafts: [...written.keys(), ...carried.taken],
|
|
304
|
+
due: queue.length > 0,
|
|
305
|
+
}),
|
|
306
|
+
...carried.changes,
|
|
307
|
+
]);
|
|
308
|
+
},
|
|
309
|
+
};
|
|
310
|
+
}
|
|
311
|
+
async function orphaned(local) {
|
|
312
|
+
const { queued, moving } = await local.moving();
|
|
313
|
+
const halves = new Map();
|
|
314
|
+
for (const { locator, batch, state } of moving) {
|
|
315
|
+
const partner = partnerOf(batch, locator);
|
|
316
|
+
if (partner === null || queued.get(partner)?.includes(batch.id) === true)
|
|
317
|
+
continue;
|
|
318
|
+
if (unsent(state, batch, locator))
|
|
319
|
+
halves.set(locator, [...(halves.get(locator) ?? []), batch]);
|
|
320
|
+
}
|
|
321
|
+
return halves;
|
|
322
|
+
}
|
|
323
|
+
async function sweep(runtime, local) {
|
|
324
|
+
if (!runtime.socket.continuing())
|
|
325
|
+
return;
|
|
326
|
+
const halves = await orphaned(local);
|
|
327
|
+
if (halves.size === 0)
|
|
328
|
+
return;
|
|
329
|
+
const settlements = [];
|
|
330
|
+
for (const [locator, batches] of halves) {
|
|
331
|
+
settlements.push(await unpairing(runtime, local, locator, batches));
|
|
332
|
+
}
|
|
333
|
+
void runtime.store.changed(await together(runtime, local, settlements));
|
|
334
|
+
}
|
|
335
|
+
async function settled(runtime, local, settlements, steps) {
|
|
336
|
+
const set = await together(runtime, local, settlements);
|
|
337
|
+
for (const step of steps)
|
|
338
|
+
step();
|
|
339
|
+
void runtime.store.changed(set);
|
|
340
|
+
await sweep(runtime, local);
|
|
341
|
+
}
|
|
342
|
+
export function settle(runtime, locators, decide) {
|
|
343
|
+
const { store } = runtime;
|
|
344
|
+
return store.exclusive(async () => {
|
|
345
|
+
const local = await store.open();
|
|
346
|
+
const held = new Map();
|
|
347
|
+
for (const locator of locators)
|
|
348
|
+
held.set(locator, await store.work(locator));
|
|
349
|
+
const decided = await decide(held);
|
|
350
|
+
if (decided.length === 0)
|
|
351
|
+
return;
|
|
352
|
+
const settlements = [];
|
|
353
|
+
for (const { locator, record, accepted, adopted, installed, refused } of decided) {
|
|
354
|
+
const work = held.get(locator) ?? (await store.work(locator));
|
|
355
|
+
settlements.push(await settlement(runtime, local, locator, work, record, work.queue.filter((batch) => batch.id !== accepted), {
|
|
356
|
+
room: true,
|
|
357
|
+
view: installed?.refreshed === true ? 'refreshed' : 'confirmed',
|
|
358
|
+
...(installed === undefined ? {} : { commit: installed }),
|
|
359
|
+
...(adopted === undefined ? {} : { changes: adopted }),
|
|
360
|
+
...(refused === undefined ? {} : { refused }),
|
|
361
|
+
}));
|
|
362
|
+
}
|
|
363
|
+
await settled(runtime, local, settlements, decided.flatMap(({ after }) => (after === undefined ? [] : [after])));
|
|
364
|
+
});
|
|
365
|
+
}
|
|
366
|
+
export function answered(runtime, locator, head, answer) {
|
|
367
|
+
const { store, socket } = runtime;
|
|
368
|
+
return store.exclusive(async () => {
|
|
369
|
+
if (!socket.continuing())
|
|
370
|
+
return;
|
|
371
|
+
const local = await store.open();
|
|
372
|
+
const work = await store.work(locator);
|
|
373
|
+
const current = work.replica;
|
|
374
|
+
if (current === undefined || !current.queue.some((batch) => batch.id === head.id))
|
|
375
|
+
return;
|
|
376
|
+
const confirmedLayer = await sliceAt(store, current.record, 'confirmed', [head]);
|
|
377
|
+
const held = answer.kind === 'conflicted' &&
|
|
378
|
+
(await landedWhole(store, current.record, head, confirmedLayer, answer.affected));
|
|
379
|
+
if (held &&
|
|
380
|
+
partnerOf(head, locator) === null &&
|
|
381
|
+
!landed(head, confirmedLayer, store.composed(current.record))) {
|
|
382
|
+
store.landed.hold(locator, head.id, Object.fromEntries([...touchedBy([head])].map((path) => [path, confirmedLayer.revisions[path]])));
|
|
383
|
+
return;
|
|
384
|
+
}
|
|
385
|
+
const returned = {
|
|
386
|
+
kind: answer.kind,
|
|
387
|
+
code: answer.code,
|
|
388
|
+
fields: answer.fields,
|
|
389
|
+
retryable: answer.retryable,
|
|
390
|
+
};
|
|
391
|
+
await settled(runtime, local, [
|
|
392
|
+
await settlement(runtime, local, locator, work, current.record, current.queue.filter((batch) => batch.id !== head.id), { leaving: [{ batch: head, returned: held ? null : returned }] }),
|
|
393
|
+
], []);
|
|
394
|
+
});
|
|
395
|
+
}
|
|
396
|
+
export function unpair(runtime) {
|
|
397
|
+
return runtime.store.durably((local) => sweep(runtime, local));
|
|
398
|
+
}
|
|
399
|
+
export async function append(runtime, appending) {
|
|
400
|
+
const { plan, files, held, after } = appending;
|
|
401
|
+
if (plan.kind === 'refused')
|
|
402
|
+
return { outcome: 'refused', ...plan.refusal };
|
|
403
|
+
const { store } = runtime;
|
|
404
|
+
const local = await store.open();
|
|
405
|
+
const rooms = [];
|
|
406
|
+
const writes = [];
|
|
407
|
+
for (const { locator, queue, saved, consumed, carried } of plan.rooms) {
|
|
408
|
+
const { replica, confirmed } = held.get(locator);
|
|
409
|
+
const { record } = replica;
|
|
410
|
+
const replayedLayer = await replayed(store, record, confirmed, queue);
|
|
411
|
+
const { overlay } = await overlayDiff(record, replica, replayedLayer.visible, replayedLayer.touched);
|
|
412
|
+
rooms.push({
|
|
413
|
+
locator,
|
|
414
|
+
key: record.key,
|
|
415
|
+
roots: record.declaration.typedSelection?.roots ?? [],
|
|
416
|
+
composed: composedOf(store.composed(record)),
|
|
417
|
+
overlay,
|
|
418
|
+
});
|
|
419
|
+
writes.push({
|
|
420
|
+
locator,
|
|
421
|
+
queue,
|
|
422
|
+
stored: replica.queue,
|
|
423
|
+
saved,
|
|
424
|
+
consumedRoomDrafts: consumed,
|
|
425
|
+
roomDrafts: carried,
|
|
426
|
+
});
|
|
427
|
+
}
|
|
428
|
+
let answer;
|
|
429
|
+
try {
|
|
430
|
+
answer = await local.commit({ rooms, writes, files, whole: true });
|
|
431
|
+
}
|
|
432
|
+
catch {
|
|
433
|
+
return { outcome: 'refused', code: 'durable-write', retryable: true };
|
|
434
|
+
}
|
|
435
|
+
const lost = answer.fenced ?? plan.rooms.find(({ locator }) => runtime.presence.lost(locator))?.locator;
|
|
436
|
+
if (lost !== undefined)
|
|
437
|
+
throw runtimeError('unknown-room', `Unknown Room ${lost}`);
|
|
438
|
+
const [saving] = plan.rooms;
|
|
439
|
+
await Promise.all([
|
|
440
|
+
store.changed(mergeChangeSets(plan.rooms.map(({ locator, consumed, carried }) => changeSet(locator, {
|
|
441
|
+
documents: answer.changed[locator] ?? [],
|
|
442
|
+
queue: true,
|
|
443
|
+
drafts: [...consumed, ...carried.map(({ path }) => path)],
|
|
444
|
+
unindexed: answer.indexed[locator] === false,
|
|
445
|
+
due: locator === saving?.locator,
|
|
446
|
+
})))),
|
|
447
|
+
after?.(),
|
|
448
|
+
]);
|
|
449
|
+
return { outcome: 'saved', identifier: plan.identifier };
|
|
450
|
+
}
|
package/dist/reach.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reach.d.ts","sourceRoot":"","sources":["../src/reach.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reach.d.ts","sourceRoot":"","sources":["../src/reach.ts"],"names":[],"mappings":"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"}
|
package/dist/reach.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { QueryError } from '@agentshouse/mdmodel';
|
|
2
|
+
import { selected } from './collection.js';
|
|
1
3
|
import { unheldView } from './conversation.js';
|
|
2
4
|
import { modelTypes, NO_MODEL } from './model.js';
|
|
3
5
|
import { changeOf, digestApplied, digestOf, observing, } from './observation.js';
|
|
4
|
-
import { runtimeError } from './failure.js';
|
|
6
|
+
import { runtimeError, uncaught } from './failure.js';
|
|
5
7
|
import { failure, lockedRoom, ROOM_LOCKED, undeclared, UNREADABLE, } from './outcome.js';
|
|
6
8
|
import { beneath } from './paths.js';
|
|
7
9
|
import { moveTarget, readParts, staleWrite, } from './room-draft.js';
|
|
@@ -19,10 +21,21 @@ const NO_CONVERSATION = {
|
|
|
19
21
|
interrupt: unconversed('conversations/interrupt'),
|
|
20
22
|
kill: unconversed('conversations/kill'),
|
|
21
23
|
delete: unconversed('conversations/delete'),
|
|
24
|
+
takeOut: unconversed('conversations/take-out'),
|
|
25
|
+
decide: unconversed('agent-functions/decide'),
|
|
26
|
+
rename: unconversed('conversations/rename'),
|
|
27
|
+
option: unconversed('conversations/option/set'),
|
|
28
|
+
retry: unconversed('conversations/retry'),
|
|
29
|
+
pins: () => Promise.resolve([]),
|
|
30
|
+
pin: () => Promise.resolve(),
|
|
31
|
+
openedTurns: () => Promise.resolve({}),
|
|
32
|
+
openTurn: () => Promise.resolve(),
|
|
33
|
+
dismissSuggestion: () => Promise.resolve(),
|
|
22
34
|
};
|
|
23
35
|
const NO_CHAT_DRAFT = {
|
|
24
36
|
write: () => Promise.resolve(),
|
|
25
37
|
prepend: () => Promise.resolve(),
|
|
38
|
+
append: () => Promise.resolve(),
|
|
26
39
|
discard: () => Promise.resolve(),
|
|
27
40
|
};
|
|
28
41
|
function areasOf(reach) {
|
|
@@ -45,11 +58,11 @@ export function governs(reach, room) {
|
|
|
45
58
|
if (wholly(reach, room.locator)) {
|
|
46
59
|
return { collection: true, selection: room.typedSelection !== null };
|
|
47
60
|
}
|
|
48
|
-
const
|
|
61
|
+
const within = (path) => selected({ selection: room.typedSelection }, path);
|
|
49
62
|
const paths = reach.documents
|
|
50
63
|
.filter((document) => document.room === room.locator)
|
|
51
64
|
.map(({ path }) => path);
|
|
52
|
-
return { collection: paths.some((path) => !
|
|
65
|
+
return { collection: paths.some((path) => !within(path)), selection: paths.some(within) };
|
|
53
66
|
}
|
|
54
67
|
function covers(reach, room, path) {
|
|
55
68
|
return (reach === null ||
|
|
@@ -60,6 +73,19 @@ function covers(reach, room, path) {
|
|
|
60
73
|
function conversing(reach) {
|
|
61
74
|
return reach === null || reach.conversations;
|
|
62
75
|
}
|
|
76
|
+
function roomsAwaited(error, reach) {
|
|
77
|
+
return error.code === 'unknown-type' && reach !== null && reach.rooms.length === 0;
|
|
78
|
+
}
|
|
79
|
+
async function planInReach(runtime, input, reach, answered) {
|
|
80
|
+
try {
|
|
81
|
+
return await runtime.plan(input, reach);
|
|
82
|
+
}
|
|
83
|
+
catch (error) {
|
|
84
|
+
if (error instanceof QueryError && (answered || roomsAwaited(error, reach)))
|
|
85
|
+
return null;
|
|
86
|
+
throw error;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
63
89
|
export function planReach(reach) {
|
|
64
90
|
return reach === null
|
|
65
91
|
? null
|
|
@@ -105,12 +131,13 @@ function writeWithin(reach, write) {
|
|
|
105
131
|
function savedWithin(reach, room, result) {
|
|
106
132
|
if (reach === null || result.outcome === 'saved')
|
|
107
133
|
return result;
|
|
108
|
-
const { file, location, referrers, ...refusal } = result;
|
|
134
|
+
const { file, location, line, referrers, ...refusal } = result;
|
|
109
135
|
const hidden = file !== undefined && !covers(reach, room, file);
|
|
110
136
|
return {
|
|
111
137
|
...refusal,
|
|
112
138
|
...(file === undefined || hidden ? {} : { file }),
|
|
113
139
|
...(location === undefined || hidden ? {} : { location }),
|
|
140
|
+
...(line === undefined || hidden ? {} : { line }),
|
|
114
141
|
...(referrers === undefined
|
|
115
142
|
? {}
|
|
116
143
|
: { referrers: referrers.filter((path) => covers(reach, room, path)) }),
|
|
@@ -190,7 +217,7 @@ export function narrowed(runtime, given, port) {
|
|
|
190
217
|
shown = shown.then(() => making.then((value) => {
|
|
191
218
|
if (open)
|
|
192
219
|
deliver(value);
|
|
193
|
-
},
|
|
220
|
+
}, uncaught), uncaught);
|
|
194
221
|
},
|
|
195
222
|
stop() {
|
|
196
223
|
open = false;
|
|
@@ -249,24 +276,31 @@ export function narrowed(runtime, given, port) {
|
|
|
249
276
|
return following(() => lockedFirst(room, () => watch(topic, input, (entries) => deliver(queueWithin(reach, room, entries)), fail), () => deliver([])), true);
|
|
250
277
|
}
|
|
251
278
|
if (topic === 'query') {
|
|
252
|
-
const planning = runtime.plan(input[0], reach);
|
|
253
279
|
let held = null;
|
|
280
|
+
let planning = null;
|
|
281
|
+
const waiting = (result) => {
|
|
282
|
+
const answer = { result, keys: [] };
|
|
283
|
+
if (held === null || changeOf(held, answer) !== null)
|
|
284
|
+
deliver(answer);
|
|
285
|
+
held = digestOf(answer);
|
|
286
|
+
};
|
|
254
287
|
return following(() => {
|
|
255
288
|
let open = true;
|
|
256
289
|
let stop = () => { };
|
|
290
|
+
if (planning?.reach !== reach) {
|
|
291
|
+
planning = { reach, plan: planInReach(runtime, input[0], reach, held !== null) };
|
|
292
|
+
}
|
|
293
|
+
const planned = planning.plan;
|
|
257
294
|
void (async () => {
|
|
258
|
-
const plan = await
|
|
295
|
+
const plan = await planned;
|
|
259
296
|
const locked = await runtime.lockedRooms();
|
|
260
297
|
if (!open)
|
|
261
298
|
return;
|
|
299
|
+
if (plan === null)
|
|
300
|
+
return waiting({ pending: [] });
|
|
262
301
|
const pending = unlocking(plan.rooms, locked);
|
|
263
|
-
if (pending !== null)
|
|
264
|
-
|
|
265
|
-
if (held === null || changeOf(held, answer) !== null)
|
|
266
|
-
deliver(answer);
|
|
267
|
-
held = digestOf(answer);
|
|
268
|
-
return;
|
|
269
|
-
}
|
|
302
|
+
if (pending !== null)
|
|
303
|
+
return waiting(pending);
|
|
270
304
|
let first = true;
|
|
271
305
|
const heard = (message) => {
|
|
272
306
|
if (!first) {
|
|
@@ -280,8 +314,7 @@ export function narrowed(runtime, given, port) {
|
|
|
280
314
|
if (change !== null)
|
|
281
315
|
deliver(change);
|
|
282
316
|
};
|
|
283
|
-
|
|
284
|
-
stop = runtime.watchPlan(current, (message) => {
|
|
317
|
+
stop = runtime.watchPlan({ ...plan, locked }, (message) => {
|
|
285
318
|
if (open)
|
|
286
319
|
heard(message);
|
|
287
320
|
}, (error) => {
|
|
@@ -314,7 +347,7 @@ export function narrowed(runtime, given, port) {
|
|
|
314
347
|
return () => { };
|
|
315
348
|
});
|
|
316
349
|
}
|
|
317
|
-
if (topic === 'figures') {
|
|
350
|
+
if (topic === 'figures' || topic === 'holdings' || topic === 'listed-agents') {
|
|
318
351
|
if (reach === null)
|
|
319
352
|
return watch(topic, input, deliver, fail);
|
|
320
353
|
fail(deviceUnreached());
|
|
@@ -339,7 +372,9 @@ export function narrowed(runtime, given, port) {
|
|
|
339
372
|
...md,
|
|
340
373
|
rooms: () => md.rooms().then((rooms) => roomsWithin(reach, rooms)),
|
|
341
374
|
query: (async (input) => {
|
|
342
|
-
const plan = await runtime
|
|
375
|
+
const plan = await planInReach(runtime, input, reach, false);
|
|
376
|
+
if (plan === null)
|
|
377
|
+
return { pending: [] };
|
|
343
378
|
const locked = await runtime.lockedRooms();
|
|
344
379
|
return unlocking(plan.rooms, locked) ?? runtime.query({ ...plan, locked });
|
|
345
380
|
}),
|
|
@@ -431,7 +466,6 @@ export function narrowed(runtime, given, port) {
|
|
|
431
466
|
reached: async (room, roomVersion, path) => (path === undefined ? wholly(reach, room) : covers(reach, room, path)) &&
|
|
432
467
|
!(await runtime.locked(room)) &&
|
|
433
468
|
(await md.reached(room, roomVersion, path)),
|
|
434
|
-
log: () => (reach === null ? md.log() : ''),
|
|
435
469
|
cleanUp: () => (reach === null ? md.cleanUp() : Promise.reject(deviceUnreached())),
|
|
436
470
|
unsent: () => (reach === null ? md.unsent() : Promise.reject(deviceUnreached())),
|
|
437
471
|
reset: () => (reach === null ? md.reset() : Promise.reject(deviceUnreached())),
|
|
@@ -470,14 +504,25 @@ export function narrowed(runtime, given, port) {
|
|
|
470
504
|
read: (id, options) => conversation().read(id, options),
|
|
471
505
|
create: (input) => conversation().create(input),
|
|
472
506
|
send: (id, operation, draft) => conversation().send(id, operation, draft),
|
|
473
|
-
answer: (id, answer) => conversation().answer(id, answer),
|
|
474
|
-
interrupt: (id) => conversation().interrupt(id),
|
|
475
|
-
kill: (id) => conversation().kill(id),
|
|
476
|
-
delete: (id) => conversation().delete(id),
|
|
507
|
+
answer: (id, answer, operation) => conversation().answer(id, answer, operation),
|
|
508
|
+
interrupt: (id, operation) => conversation().interrupt(id, operation),
|
|
509
|
+
kill: (id, operation) => conversation().kill(id, operation),
|
|
510
|
+
delete: (id, operation) => conversation().delete(id, operation),
|
|
511
|
+
takeOut: (id, message, operation) => conversation().takeOut(id, message, operation),
|
|
512
|
+
decide: (request, decision, operation) => conversation().decide(request, decision, operation),
|
|
513
|
+
rename: (id, name, operation) => conversation().rename(id, name, operation),
|
|
514
|
+
option: (id, option, value, operation) => conversation().option(id, option, value, operation),
|
|
515
|
+
retry: (id, message, operation) => conversation().retry(id, message, operation),
|
|
516
|
+
pins: () => conversation().pins(),
|
|
517
|
+
pin: (figures) => conversation().pin(figures),
|
|
518
|
+
openedTurns: () => conversation().openedTurns(),
|
|
519
|
+
openTurn: (id, turn) => conversation().openTurn(id, turn),
|
|
520
|
+
dismissSuggestion: (id, suggestion) => conversation().dismissSuggestion(id, suggestion),
|
|
477
521
|
},
|
|
478
522
|
chatDraft: {
|
|
479
523
|
write: (id, draft, revision) => chatDraft().write(id, draft, revision),
|
|
480
524
|
prepend: (id, draft) => chatDraft().prepend(id, draft),
|
|
525
|
+
append: (id, draft) => chatDraft().append(id, draft),
|
|
481
526
|
discard: (id) => chatDraft().discard(id),
|
|
482
527
|
},
|
|
483
528
|
observe: observing(within),
|