@agentshouse/mdruntime 0.1.0-cd3ee807e46ae → 0.1.0-cd50a4607cb7d
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 +247 -269
- package/dist/adapter.d.ts +25 -2
- package/dist/adapter.d.ts.map +1 -1
- package/dist/attempt.d.ts.map +1 -1
- package/dist/attempt.js +14 -1
- package/dist/bootstrap.d.ts +2 -2
- package/dist/bootstrap.d.ts.map +1 -1
- package/dist/bootstrap.js +28 -6
- package/dist/change-set.d.ts +2 -0
- package/dist/change-set.d.ts.map +1 -1
- package/dist/change-set.js +34 -9
- package/dist/chat/acts.d.ts +3 -4
- package/dist/chat/acts.d.ts.map +1 -1
- package/dist/chat/acts.js +10 -10
- package/dist/chat/list.d.ts +6 -0
- package/dist/chat/list.d.ts.map +1 -1
- package/dist/chat/list.js +6 -3
- package/dist/chat/markdown.d.ts +2 -1
- package/dist/chat/markdown.d.ts.map +1 -1
- package/dist/chat/markdown.js +7 -6
- package/dist/chat/message.d.ts.map +1 -1
- package/dist/chat/message.js +2 -2
- package/dist/chat/provider.d.ts.map +1 -1
- package/dist/chat/provider.js +25 -50
- package/dist/chat/ready.d.ts.map +1 -1
- package/dist/chat/ready.js +2 -2
- package/dist/chat/style.js +3 -3
- package/dist/client.d.ts +7 -7
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +1 -1
- package/dist/collection.d.ts +17 -3
- package/dist/collection.d.ts.map +1 -1
- package/dist/collection.js +230 -19
- package/dist/connection.d.ts +8 -5
- package/dist/connection.d.ts.map +1 -1
- package/dist/connection.js +866 -301
- package/dist/conversation.d.ts +12 -7
- package/dist/conversation.d.ts.map +1 -1
- package/dist/conversation.js +258 -130
- package/dist/entry.d.ts +17 -0
- package/dist/entry.d.ts.map +1 -0
- package/dist/entry.js +156 -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 +4 -2
- package/dist/host.d.ts.map +1 -1
- package/dist/host.js +9 -5
- package/dist/identity.d.ts +2 -0
- package/dist/identity.d.ts.map +1 -1
- package/dist/identity.js +6 -0
- package/dist/index.d.ts +5 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/memory.d.ts +1 -0
- package/dist/memory.d.ts.map +1 -1
- package/dist/memory.js +10 -1
- package/dist/model.d.ts +1 -0
- package/dist/model.d.ts.map +1 -1
- package/dist/model.js +9 -0
- package/dist/observation.d.ts +5 -2
- package/dist/observation.d.ts.map +1 -1
- package/dist/observation.js +22 -11
- package/dist/outcome.d.ts +4 -0
- package/dist/outcome.d.ts.map +1 -1
- package/dist/outcome.js +1 -0
- package/dist/overlay.d.ts +1 -0
- package/dist/overlay.d.ts.map +1 -1
- package/dist/overlay.js +33 -54
- package/dist/query.d.ts +28 -3
- package/dist/query.d.ts.map +1 -1
- package/dist/reach.js +3 -3
- package/dist/react.d.ts +3 -3
- package/dist/react.d.ts.map +1 -1
- package/dist/read-side.d.ts +13 -6
- package/dist/read-side.d.ts.map +1 -1
- package/dist/read-side.js +282 -83
- 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.map +1 -1
- package/dist/refresh.js +11 -10
- package/dist/replica.d.ts +1 -1
- package/dist/replica.d.ts.map +1 -1
- package/dist/replica.js +47 -19
- package/dist/rows.d.ts +4 -13
- package/dist/rows.d.ts.map +1 -1
- package/dist/rows.js +2 -12
- package/dist/save.d.ts +6 -2
- package/dist/save.d.ts.map +1 -1
- package/dist/save.js +42 -18
- package/dist/search.d.ts +28 -6
- package/dist/search.d.ts.map +1 -1
- package/dist/search.js +109 -44
- 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 +4 -0
- package/dist/status.d.ts.map +1 -1
- package/dist/store.d.ts +35 -10
- package/dist/store.d.ts.map +1 -1
- package/dist/store.js +275 -74
- package/dist/turn.d.ts +7 -0
- package/dist/turn.d.ts.map +1 -0
- package/dist/turn.js +45 -0
- package/package.json +6 -2
package/dist/recovery.js
ADDED
|
@@ -0,0 +1,197 @@
|
|
|
1
|
+
// A first retry waits about a second, so a passing failure clears before the next attempt.
|
|
2
|
+
const FIRST_MS = 1_000;
|
|
3
|
+
// Waits stop doubling at half a minute, so work resumes soon after a long failure ends.
|
|
4
|
+
const CEILING_MS = 30_000;
|
|
5
|
+
const ATTEMPTS = 8;
|
|
6
|
+
export function retryDelay(tries, firstMs = FIRST_MS, ceilingMs = CEILING_MS) {
|
|
7
|
+
const ceiling = Math.min(ceilingMs, firstMs * 2 ** tries);
|
|
8
|
+
return ceiling / 2 + (Math.random() * ceiling) / 2;
|
|
9
|
+
}
|
|
10
|
+
function owner(backoff, inFlight, release = () => { }) {
|
|
11
|
+
const intents = new Map();
|
|
12
|
+
const children = new Set();
|
|
13
|
+
const running = new Set();
|
|
14
|
+
const queued = [];
|
|
15
|
+
let free = inFlight;
|
|
16
|
+
let retired = false;
|
|
17
|
+
function finish(key, intent, done) {
|
|
18
|
+
if (intents.get(key) === intent)
|
|
19
|
+
intents.delete(key);
|
|
20
|
+
if (intent.timer !== null)
|
|
21
|
+
clearTimeout(intent.timer);
|
|
22
|
+
intent.timer = null;
|
|
23
|
+
intent.end(done);
|
|
24
|
+
}
|
|
25
|
+
function wait(key, intent, at, guided) {
|
|
26
|
+
if (intent.timer !== null)
|
|
27
|
+
clearTimeout(intent.timer);
|
|
28
|
+
intent.due = at;
|
|
29
|
+
intent.guided = guided;
|
|
30
|
+
intent.timer = setTimeout(() => {
|
|
31
|
+
intent.timer = null;
|
|
32
|
+
launch(key, intent);
|
|
33
|
+
}, Math.max(0, at - Date.now()));
|
|
34
|
+
}
|
|
35
|
+
function launch(key, intent) {
|
|
36
|
+
intent.due = null;
|
|
37
|
+
intent.guided = false;
|
|
38
|
+
const controller = new AbortController();
|
|
39
|
+
intent.controller = controller;
|
|
40
|
+
const run = start(key, intent, controller);
|
|
41
|
+
running.add(run);
|
|
42
|
+
void run.finally(() => running.delete(run));
|
|
43
|
+
}
|
|
44
|
+
async function start(key, intent, controller) {
|
|
45
|
+
while (free === 0)
|
|
46
|
+
await new Promise((admit) => queued.push(admit));
|
|
47
|
+
if (controller.signal.aborted) {
|
|
48
|
+
queued.shift()?.();
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
free -= 1;
|
|
52
|
+
const abandoned = new Promise((resolve) => {
|
|
53
|
+
controller.signal.addEventListener('abort', () => resolve(null), { once: true });
|
|
54
|
+
});
|
|
55
|
+
let result;
|
|
56
|
+
try {
|
|
57
|
+
result = await Promise.race([intent.run(controller.signal), abandoned]);
|
|
58
|
+
}
|
|
59
|
+
catch {
|
|
60
|
+
result = 'again';
|
|
61
|
+
}
|
|
62
|
+
finally {
|
|
63
|
+
free += 1;
|
|
64
|
+
queued.shift()?.();
|
|
65
|
+
}
|
|
66
|
+
if (result === null || controller.signal.aborted || intents.get(key) !== intent)
|
|
67
|
+
return;
|
|
68
|
+
intent.controller = null;
|
|
69
|
+
const again = intent.again;
|
|
70
|
+
intent.again = null;
|
|
71
|
+
if (result === 'done') {
|
|
72
|
+
intent.tries = 0;
|
|
73
|
+
if (again === null)
|
|
74
|
+
finish(key, intent, true);
|
|
75
|
+
else if (again === 'now')
|
|
76
|
+
launch(key, intent);
|
|
77
|
+
else
|
|
78
|
+
wait(key, intent, again, true);
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
intent.tries += 1;
|
|
82
|
+
if (intent.tries >= backoff.attempts) {
|
|
83
|
+
finish(key, intent, false);
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
if (result === 'again') {
|
|
87
|
+
const delay = retryDelay(intent.tries - 1, backoff.firstMs, backoff.ceilingMs);
|
|
88
|
+
wait(key, intent, Date.now() + delay, false);
|
|
89
|
+
}
|
|
90
|
+
else
|
|
91
|
+
wait(key, intent, result.at, true);
|
|
92
|
+
}
|
|
93
|
+
const recovery = {
|
|
94
|
+
attempt(key, run, options = {}) {
|
|
95
|
+
if (retired)
|
|
96
|
+
return Promise.resolve(false);
|
|
97
|
+
const held = intents.get(key);
|
|
98
|
+
if (held !== undefined) {
|
|
99
|
+
held.run = run;
|
|
100
|
+
if (held.controller !== null) {
|
|
101
|
+
const at = options.at;
|
|
102
|
+
held.again =
|
|
103
|
+
at === undefined || held.again === 'now'
|
|
104
|
+
? 'now'
|
|
105
|
+
: Math.min(at, held.again ?? Number.POSITIVE_INFINITY);
|
|
106
|
+
}
|
|
107
|
+
else if (held.due !== null && held.due <= Date.now()) {
|
|
108
|
+
if (held.timer !== null)
|
|
109
|
+
clearTimeout(held.timer);
|
|
110
|
+
held.timer = null;
|
|
111
|
+
launch(key, held);
|
|
112
|
+
}
|
|
113
|
+
else if (options.at !== undefined && (held.due === null || options.at < held.due)) {
|
|
114
|
+
wait(key, held, options.at, true);
|
|
115
|
+
}
|
|
116
|
+
return held.ended;
|
|
117
|
+
}
|
|
118
|
+
let end = () => { };
|
|
119
|
+
const ended = new Promise((resolve) => {
|
|
120
|
+
end = resolve;
|
|
121
|
+
});
|
|
122
|
+
const intent = {
|
|
123
|
+
run,
|
|
124
|
+
tries: 0,
|
|
125
|
+
timer: null,
|
|
126
|
+
due: null,
|
|
127
|
+
guided: false,
|
|
128
|
+
controller: null,
|
|
129
|
+
again: null,
|
|
130
|
+
ended,
|
|
131
|
+
end,
|
|
132
|
+
};
|
|
133
|
+
intents.set(key, intent);
|
|
134
|
+
if (options.at !== undefined)
|
|
135
|
+
wait(key, intent, options.at, true);
|
|
136
|
+
else if (options.again === true) {
|
|
137
|
+
intent.tries = 1;
|
|
138
|
+
wait(key, intent, Date.now() + retryDelay(0, backoff.firstMs, backoff.ceilingMs), false);
|
|
139
|
+
}
|
|
140
|
+
else
|
|
141
|
+
launch(key, intent);
|
|
142
|
+
return ended;
|
|
143
|
+
},
|
|
144
|
+
pending(key) {
|
|
145
|
+
const intent = intents.get(key);
|
|
146
|
+
return intent !== undefined && intent.controller === null;
|
|
147
|
+
},
|
|
148
|
+
resume() {
|
|
149
|
+
if (retired)
|
|
150
|
+
return;
|
|
151
|
+
for (const [key, intent] of [...intents]) {
|
|
152
|
+
if (intent.guided && intent.due !== null && intent.due > Date.now())
|
|
153
|
+
continue;
|
|
154
|
+
if (intent.timer !== null)
|
|
155
|
+
clearTimeout(intent.timer);
|
|
156
|
+
intent.timer = null;
|
|
157
|
+
intent.controller?.abort();
|
|
158
|
+
intent.again = null;
|
|
159
|
+
intent.tries = 0;
|
|
160
|
+
launch(key, intent);
|
|
161
|
+
}
|
|
162
|
+
},
|
|
163
|
+
cancel(key) {
|
|
164
|
+
const intent = intents.get(key);
|
|
165
|
+
if (intent === undefined)
|
|
166
|
+
return;
|
|
167
|
+
intent.controller?.abort();
|
|
168
|
+
finish(key, intent, false);
|
|
169
|
+
},
|
|
170
|
+
scope(bound = Infinity) {
|
|
171
|
+
const child = owner(backoff, bound, () => children.delete(child));
|
|
172
|
+
if (retired)
|
|
173
|
+
void child.retire();
|
|
174
|
+
else
|
|
175
|
+
children.add(child);
|
|
176
|
+
return child;
|
|
177
|
+
},
|
|
178
|
+
async retire() {
|
|
179
|
+
retired = true;
|
|
180
|
+
release();
|
|
181
|
+
for (const [key, intent] of [...intents]) {
|
|
182
|
+
intent.controller?.abort();
|
|
183
|
+
finish(key, intent, false);
|
|
184
|
+
}
|
|
185
|
+
await Promise.all([...children].map((child) => child.retire()));
|
|
186
|
+
await Promise.all(running);
|
|
187
|
+
},
|
|
188
|
+
};
|
|
189
|
+
return recovery;
|
|
190
|
+
}
|
|
191
|
+
export function createRecovery(options = {}) {
|
|
192
|
+
return owner({
|
|
193
|
+
firstMs: options.firstMs ?? FIRST_MS,
|
|
194
|
+
ceilingMs: options.ceilingMs ?? CEILING_MS,
|
|
195
|
+
attempts: options.attempts ?? ATTEMPTS,
|
|
196
|
+
}, options.inFlight ?? Infinity);
|
|
197
|
+
}
|
package/dist/refresh.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,aAAa,
|
|
1
|
+
{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,aAAa,EAEb,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAe,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5E,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,aAAa,CAAA;CAAE,GAC3C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,cAAc,CAAC;AAEnB,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,OAAO,GACP,cAAc,CAAC;AAEnB,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,WAAW,CAAC,CAwEtB;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,cAAc,EACzB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,cAAc,CAAC,CAKzB"}
|
package/dist/refresh.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { acceptedBinaries } from './overlay.js';
|
|
2
2
|
import { readStaged } from './replica.js';
|
|
3
|
+
import { drafted, settled } from './shared.js';
|
|
3
4
|
import { unconfirmed } from './transfer.js';
|
|
4
5
|
export async function advancement(adapter, authorization, held, remodel, continuing) {
|
|
5
6
|
const locator = held.locator;
|
|
@@ -16,11 +17,11 @@ export async function advancement(adapter, authorization, held, remodel, continu
|
|
|
16
17
|
collection: held.model,
|
|
17
18
|
selection: held.selectionModel,
|
|
18
19
|
});
|
|
19
|
-
const documents =
|
|
20
|
-
const revisions =
|
|
21
|
-
const changes =
|
|
22
|
-
const written =
|
|
23
|
-
const binaries =
|
|
20
|
+
const documents = drafted(held.documents);
|
|
21
|
+
const revisions = drafted(held.revisions);
|
|
22
|
+
const changes = drafted(held.changes);
|
|
23
|
+
const written = drafted(held.written);
|
|
24
|
+
const binaries = drafted(held.binaries);
|
|
24
25
|
const stage = (page) => {
|
|
25
26
|
for (const path of Object.keys(page.documents)) {
|
|
26
27
|
delete binaries[path];
|
|
@@ -71,11 +72,11 @@ export async function advancement(adapter, authorization, held, remodel, continu
|
|
|
71
72
|
model: models.collection,
|
|
72
73
|
selectionModel: models.selection,
|
|
73
74
|
roomVersion,
|
|
74
|
-
documents,
|
|
75
|
-
binaries,
|
|
76
|
-
revisions,
|
|
77
|
-
changes,
|
|
78
|
-
written,
|
|
75
|
+
documents: settled(documents),
|
|
76
|
+
binaries: settled(binaries),
|
|
77
|
+
revisions: settled(revisions),
|
|
78
|
+
changes: settled(changes),
|
|
79
|
+
written: settled(written),
|
|
79
80
|
},
|
|
80
81
|
};
|
|
81
82
|
}
|
package/dist/replica.d.ts
CHANGED
|
@@ -31,7 +31,7 @@ type ReplayStep = {
|
|
|
31
31
|
export declare function compositionOf(record: ReplicaRecord): Composition;
|
|
32
32
|
export declare function confirmedOf(record: ReplicaRecord, previous?: ConfirmedLayer): ConfirmedLayer;
|
|
33
33
|
export declare function sameMembership(record: ReplicaRecord, other: ReplicaRecord): boolean;
|
|
34
|
-
export declare function readStaged(
|
|
34
|
+
export declare function readStaged(staged: ReplicaRecord, previous?: ConfirmedLayer): Staged;
|
|
35
35
|
export declare function readReclassified(record: ReplicaRecord, previous: ConfirmedLayer): Staged | {
|
|
36
36
|
kind: 'deferred';
|
|
37
37
|
};
|
package/dist/replica.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replica.d.ts","sourceRoot":"","sources":["../src/replica.ts"],"names":[],"mappings":"AACA,OAAO,EAAmC,KAAK,WAAW,EAAqB,MAAM,aAAa,CAAC;AACnG,OAAO,
|
|
1
|
+
{"version":3,"file":"replica.d.ts","sourceRoot":"","sources":["../src/replica.ts"],"names":[],"mappings":"AACA,OAAO,EAAmC,KAAK,WAAW,EAAqB,MAAM,aAAa,CAAC;AACnG,OAAO,EAKL,KAAK,UAAU,EACf,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAML,KAAK,KAAK,EACX,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG;IACjC,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAAG,OAAO,CAAC;AAE7E,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,cAAc,CAAC;IAC1B,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;IAC9B,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;CAC/B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,WAAW,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAQhE;AAiBD,wBAAgB,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,cAAc,CAM5F;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAKnF;AAYD,wBAAgB,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CA6BnF;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,cAAc,GACvB,MAAM,GAAG;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAW/B;AAoBD,KAAK,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,CAAC;AAE9D,wBAAgB,aAAa,CAC3B,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,WAAW,EACtB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,MAAM,CA+BR;AAgDD,wBAAgB,SAAS,CACvB,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CA8BT;AA0ED,wBAAgB,MAAM,CACpB,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,cAAc,EACzB,OAAO,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM,GAC7C,OAAO,CAoBT;AAED,wBAAgB,WAAW,CACzB,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,YAAY,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,EAC7C,KAAK,EAAE,OAAO,GACb,SAAS,WAAW,EAAE,CA2BxB"}
|
package/dist/replica.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { equalValue, parse } from '@agentshouse/mdmodel';
|
|
2
2
|
import { immutable, landing } from './change.js';
|
|
3
|
-
import { collectionOf, unreadable, validateCollection, } from './collection.js';
|
|
3
|
+
import { changedCleanly, collectionOf, unreadable, validateCollection, } from './collection.js';
|
|
4
4
|
import { acceptedBinaries, overlay, overlayChanged, sameLayerText, } from './overlay.js';
|
|
5
5
|
import { providerRewritten } from './save.js';
|
|
6
|
+
import { drafted, patched, settled, shared } from './shared.js';
|
|
6
7
|
export function compositionOf(record) {
|
|
7
8
|
return {
|
|
8
9
|
model: record.model,
|
|
@@ -11,23 +12,46 @@ export function compositionOf(record) {
|
|
|
11
12
|
: { roots: record.typedSelection.roots, model: record.selectionModel },
|
|
12
13
|
};
|
|
13
14
|
}
|
|
15
|
+
function held(record) {
|
|
16
|
+
const documents = shared(record.documents);
|
|
17
|
+
const binaries = shared(record.binaries);
|
|
18
|
+
const revisions = shared(record.revisions);
|
|
19
|
+
const changes = shared(record.changes);
|
|
20
|
+
const written = shared(record.written);
|
|
21
|
+
return documents === record.documents &&
|
|
22
|
+
binaries === record.binaries &&
|
|
23
|
+
revisions === record.revisions &&
|
|
24
|
+
changes === record.changes &&
|
|
25
|
+
written === record.written
|
|
26
|
+
? record
|
|
27
|
+
: { ...record, documents, binaries, revisions, changes, written };
|
|
28
|
+
}
|
|
14
29
|
export function confirmedOf(record, previous) {
|
|
30
|
+
const kept = held(record);
|
|
15
31
|
return {
|
|
16
|
-
record,
|
|
17
|
-
collection: collectionOf(
|
|
32
|
+
record: kept,
|
|
33
|
+
collection: collectionOf(kept.documents, compositionOf(kept), previous?.collection),
|
|
18
34
|
};
|
|
19
35
|
}
|
|
20
36
|
export function sameMembership(record, other) {
|
|
21
37
|
return (JSON.stringify(record.typedSelection?.roots ?? null) ===
|
|
22
38
|
JSON.stringify(other.typedSelection?.roots ?? null));
|
|
23
39
|
}
|
|
24
|
-
|
|
40
|
+
function cleanly(record, previous) {
|
|
41
|
+
if (previous === undefined)
|
|
42
|
+
return false;
|
|
43
|
+
const before = previous.record;
|
|
44
|
+
return changedCleanly({ text: record.documents, binaries: record.binaries }, { text: before.documents, binaries: before.binaries, composition: compositionOf(before) }, compositionOf(record));
|
|
45
|
+
}
|
|
46
|
+
export function readStaged(staged, previous) {
|
|
47
|
+
const record = held(staged);
|
|
25
48
|
const textChanged = previous === undefined || !sameLayerText(record, previous.record);
|
|
26
49
|
const modeled = record.model.status !== 'unavailable' || record.selectionModel.status !== 'unavailable';
|
|
27
50
|
if (modeled &&
|
|
28
51
|
(textChanged ||
|
|
29
52
|
record.model !== previous?.record.model ||
|
|
30
|
-
record.selectionModel !== previous?.record.selectionModel)
|
|
53
|
+
record.selectionModel !== previous?.record.selectionModel) &&
|
|
54
|
+
!cleanly(record, previous)) {
|
|
31
55
|
const verdict = validateCollection(record.documents, Object.keys(record.binaries), compositionOf(record));
|
|
32
56
|
if (verdict.verdict === 'refuse' && verdict.rule !== 'model-unavailable') {
|
|
33
57
|
return { kind: 'refused', refusal: verdict };
|
|
@@ -54,7 +78,7 @@ export function readReclassified(record, previous) {
|
|
|
54
78
|
: { kind: 'refused', refusal: verdict };
|
|
55
79
|
}
|
|
56
80
|
function returnedBinaries(held, submitted, accepted) {
|
|
57
|
-
const binaries =
|
|
81
|
+
const binaries = drafted(held);
|
|
58
82
|
for (const change of submitted.changes) {
|
|
59
83
|
if (change.kind !== 'move')
|
|
60
84
|
continue;
|
|
@@ -67,17 +91,18 @@ function returnedBinaries(held, submitted, accepted) {
|
|
|
67
91
|
Object.assign(binaries, acceptedBinaries(accepted.binaryFiles ?? {}));
|
|
68
92
|
for (const path of accepted.removals)
|
|
69
93
|
delete binaries[path];
|
|
70
|
-
return binaries;
|
|
94
|
+
return settled(binaries);
|
|
71
95
|
}
|
|
72
96
|
export function applyReturned(confirmed, submitted, accepted, roomVersion, writtenAt) {
|
|
73
97
|
const { documents, revisions, changes, removals } = accepted;
|
|
74
|
-
const nextDocuments =
|
|
75
|
-
const nextRevisions =
|
|
76
|
-
const nextChanges =
|
|
77
|
-
const nextWritten =
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
98
|
+
const nextDocuments = drafted(confirmed.record.documents);
|
|
99
|
+
const nextRevisions = drafted(confirmed.record.revisions);
|
|
100
|
+
const nextChanges = drafted(confirmed.record.changes);
|
|
101
|
+
const nextWritten = drafted(confirmed.record.written);
|
|
102
|
+
Object.assign(nextDocuments, documents);
|
|
103
|
+
Object.assign(nextRevisions, revisions);
|
|
104
|
+
for (const path of Object.keys(documents))
|
|
105
|
+
nextWritten[path] = writtenAt;
|
|
81
106
|
for (const [path, revision] of Object.entries(revisions)) {
|
|
82
107
|
if (confirmed.record.revisions[path] !== revision)
|
|
83
108
|
delete nextChanges[path];
|
|
@@ -92,10 +117,10 @@ export function applyReturned(confirmed, submitted, accepted, roomVersion, writt
|
|
|
92
117
|
return readStaged({
|
|
93
118
|
...confirmed.record,
|
|
94
119
|
roomVersion,
|
|
95
|
-
documents: nextDocuments,
|
|
96
|
-
revisions: nextRevisions,
|
|
97
|
-
changes: nextChanges,
|
|
98
|
-
written: nextWritten,
|
|
120
|
+
documents: settled(nextDocuments),
|
|
121
|
+
revisions: settled(nextRevisions),
|
|
122
|
+
changes: settled(nextChanges),
|
|
123
|
+
written: settled(nextWritten),
|
|
99
124
|
binaries: returnedBinaries(confirmed.record.binaries, submitted, accepted),
|
|
100
125
|
}, confirmed);
|
|
101
126
|
}
|
|
@@ -238,7 +263,10 @@ function effects(change) {
|
|
|
238
263
|
return [{ kind: 'absent', path }];
|
|
239
264
|
}
|
|
240
265
|
export function landed(batch, confirmed, current = {}) {
|
|
241
|
-
const layer = {
|
|
266
|
+
const layer = {
|
|
267
|
+
...confirmed.record,
|
|
268
|
+
documents: patched(confirmed.record.documents, Object.entries(current)),
|
|
269
|
+
};
|
|
242
270
|
return batch.changes.every((change, index) => {
|
|
243
271
|
if (change.kind === 'replace' || (change.kind === 'create' && 'content' in change)) {
|
|
244
272
|
const at = landing(batch.changes, index, change.path);
|
package/dist/rows.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type
|
|
1
|
+
import { type Frontmatter } from '@agentshouse/mdmodel';
|
|
2
2
|
import type { HeadChange } from './adapter.js';
|
|
3
3
|
import type { BinaryFileRecord } from './binary.js';
|
|
4
4
|
import { type Composition } from './collection.js';
|
|
@@ -13,19 +13,10 @@ export type DocumentRow = {
|
|
|
13
13
|
values: Fields;
|
|
14
14
|
reached: Readonly<Record<string, readonly unknown[]>>;
|
|
15
15
|
directories: readonly string[];
|
|
16
|
-
|
|
16
|
+
text: string | null;
|
|
17
17
|
change: HeadChange | null;
|
|
18
18
|
binary: BinaryFileRecord | null;
|
|
19
19
|
};
|
|
20
|
-
export type BodyRow = {
|
|
21
|
-
key: string;
|
|
22
|
-
kind: 'body';
|
|
23
|
-
room: string;
|
|
24
|
-
path: string;
|
|
25
|
-
preamble: string;
|
|
26
|
-
sections: Readonly<Record<string, string>>;
|
|
27
|
-
markdown: string;
|
|
28
|
-
};
|
|
29
20
|
export type ReferenceRow = {
|
|
30
21
|
key: string;
|
|
31
22
|
kind: 'reference';
|
|
@@ -37,10 +28,10 @@ export type ReferenceRow = {
|
|
|
37
28
|
path: string;
|
|
38
29
|
type: string;
|
|
39
30
|
};
|
|
40
|
-
export type Row = DocumentRow |
|
|
31
|
+
export type Row = DocumentRow | ReferenceRow;
|
|
41
32
|
export declare function documentKey(room: string, path: string): string;
|
|
42
33
|
export declare function roomOfKey(key: string): string;
|
|
43
34
|
export declare function markdownPath(path: string): boolean;
|
|
44
|
-
export declare function rowsOf(room: string, path: string, document:
|
|
35
|
+
export declare function rowsOf(room: string, path: string, document: Frontmatter | null, composition: Composition, change: HeadChange | null, binary: BinaryFileRecord | null): readonly Row[];
|
|
45
36
|
export {};
|
|
46
37
|
//# sourceMappingURL=rows.d.ts.map
|
package/dist/rows.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rows.d.ts","sourceRoot":"","sources":["../src/rows.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,
|
|
1
|
+
{"version":3,"file":"rows.d.ts","sourceRoot":"","sources":["../src/rows.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9D,KAAK,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAEhD,MAAM,MAAM,WAAW,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC,CAAC,CAAC;IACtD,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IAC1B,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,GAAG,GAAG,WAAW,GAAG,YAAY,CAAC;AAM7C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAmFD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,wBAAgB,MAAM,CACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,WAAW,GAAG,IAAI,EAC5B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,MAAM,EAAE,gBAAgB,GAAG,IAAI,GAC9B,SAAS,GAAG,EAAE,CA+DhB"}
|
package/dist/rows.js
CHANGED
|
@@ -73,7 +73,6 @@ export function markdownPath(path) {
|
|
|
73
73
|
}
|
|
74
74
|
export function rowsOf(room, path, document, composition, change, binary) {
|
|
75
75
|
const key = documentKey(room, path);
|
|
76
|
-
const body = keyOf('b', room, path);
|
|
77
76
|
if (document === null || !markdownPath(path)) {
|
|
78
77
|
return [
|
|
79
78
|
{
|
|
@@ -86,7 +85,7 @@ export function rowsOf(room, path, document, composition, change, binary) {
|
|
|
86
85
|
values: {},
|
|
87
86
|
reached: {},
|
|
88
87
|
directories: directoriesOf(path),
|
|
89
|
-
|
|
88
|
+
text: null,
|
|
90
89
|
change,
|
|
91
90
|
binary,
|
|
92
91
|
},
|
|
@@ -117,19 +116,10 @@ export function rowsOf(room, path, document, composition, change, binary) {
|
|
|
117
116
|
values,
|
|
118
117
|
reached,
|
|
119
118
|
directories: directoriesOf(path),
|
|
120
|
-
|
|
119
|
+
text: document.content,
|
|
121
120
|
change,
|
|
122
121
|
binary,
|
|
123
122
|
},
|
|
124
|
-
{
|
|
125
|
-
key: body,
|
|
126
|
-
kind: 'body',
|
|
127
|
-
room,
|
|
128
|
-
path,
|
|
129
|
-
preamble: document.preamble,
|
|
130
|
-
sections: document.sections,
|
|
131
|
-
markdown: document.content,
|
|
132
|
-
},
|
|
133
123
|
...[...reading.targets.values()].map(({ field, target: found, forms }) => ({
|
|
134
124
|
key: keyOf('r', room, path, field, found),
|
|
135
125
|
kind: 'reference',
|
package/dist/save.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { ProviderLimit } from './adapter.js';
|
|
2
2
|
import { type Change, type ChangeBatch, type Precondition, type WrittenBy } from './change.js';
|
|
3
3
|
import { type Composition } from './collection.js';
|
|
4
|
-
import { type Layer } from './overlay.js';
|
|
5
4
|
import type { VisibleLayer } from './replica.js';
|
|
6
5
|
import type { ChangedPart } from './room-draft.js';
|
|
7
6
|
export type SaveRefusal = {
|
|
@@ -25,6 +24,11 @@ export type SaveInput = {
|
|
|
25
24
|
bases: readonly Precondition[];
|
|
26
25
|
queued?: ReadonlySet<string>;
|
|
27
26
|
writtenBy?: WrittenBy;
|
|
27
|
+
clean?: {
|
|
28
|
+
text: Readonly<Record<string, string>>;
|
|
29
|
+
binaries: Readonly<Record<string, unknown>>;
|
|
30
|
+
composition: Composition;
|
|
31
|
+
};
|
|
28
32
|
};
|
|
29
33
|
export type BatchResult = {
|
|
30
34
|
kind: 'batch';
|
|
@@ -55,6 +59,6 @@ export type Joining = {
|
|
|
55
59
|
};
|
|
56
60
|
export declare function requeued(queue: readonly ChangeBatch[], changes: readonly Change[], visible: VisibleLayer, changeable: (batch: ChangeBatch) => boolean, state: (queue: readonly ChangeBatch[]) => VisibleLayer): Requeued;
|
|
57
61
|
export declare function joined(queue: readonly ChangeBatch[], owner: ChangeBatch, extra: ChangeBatch): Joining;
|
|
58
|
-
export declare function limitedIn(queue: readonly ChangeBatch[], batch: ChangeBatch, limits: readonly ProviderLimit[], state: (queue: readonly ChangeBatch[]) =>
|
|
62
|
+
export declare function limitedIn(queue: readonly ChangeBatch[], batch: ChangeBatch, limits: readonly ProviderLimit[], state: (queue: readonly ChangeBatch[]) => VisibleLayer): SaveRefusal | null;
|
|
59
63
|
export declare function buildBatch(input: SaveInput): BatchResult;
|
|
60
64
|
//# sourceMappingURL=save.d.ts.map
|
package/dist/save.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../src/save.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"save.d.ts","sourceRoot":"","sources":["../src/save.ts"],"names":[],"mappings":"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"}
|