@modelprofile.com/flexharness 18.3.1 → 18.5.0
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/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.flexharness.d.ts +1 -1
- package/dist_ts/classes.flexharness.js +3 -3
- package/dist_ts/classes.flexharness.sessions.d.ts +1 -1
- package/dist_ts/classes.flexharness.sessions.js +27 -7
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +2 -1
- package/dist_ts/utils.json.d.ts +34 -1
- package/dist_ts/utils.json.js +47 -35
- package/dist_ts/utils.projectionindex.d.ts +58 -0
- package/dist_ts/utils.projectionindex.js +534 -0
- package/dist_ts/utils.projectionindextree.d.ts +63 -0
- package/dist_ts/utils.projectionindextree.js +314 -0
- package/package.json +3 -3
- package/readme.md +3 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.flexharness.sessions.ts +27 -6
- package/ts/classes.flexharness.ts +2 -2
- package/ts/index.ts +13 -0
- package/ts/readme.md +3 -1
- package/ts/utils.json.ts +65 -43
- package/ts/utils.projectionindex.ts +693 -0
- package/ts/utils.projectionindextree.ts +328 -0
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
/** A content address is the SHA-256 of the canonical JSON node, including its domain tag. */
|
|
2
|
+
export interface IProjectionIndexNodeWrite {
|
|
3
|
+
readonly hash: string;
|
|
4
|
+
readonly node: IProjectionIndexTreeNode;
|
|
5
|
+
}
|
|
6
|
+
export type TProjectionIndexTree = 'messages' | 'messageIds' | 'runs' | 'staged' | 'segments' | 'segmentRuns' | 'events' | 'captures';
|
|
7
|
+
export interface IProjectionIndexTreeNode {
|
|
8
|
+
readonly kind: 'projection-index-tree-v1';
|
|
9
|
+
readonly tree: TProjectionIndexTree;
|
|
10
|
+
readonly key: string;
|
|
11
|
+
readonly value: unknown;
|
|
12
|
+
readonly left?: string;
|
|
13
|
+
readonly right?: string;
|
|
14
|
+
readonly height: number;
|
|
15
|
+
readonly size: number;
|
|
16
|
+
/** Completed segment count, populated only by the ordered segment tree. */
|
|
17
|
+
readonly completed: number;
|
|
18
|
+
readonly capturing: number;
|
|
19
|
+
}
|
|
20
|
+
export interface IProjectionIndexTreeReader {
|
|
21
|
+
readNode(hash: string): Promise<unknown>;
|
|
22
|
+
}
|
|
23
|
+
export declare function projectionIndexHash(node: unknown): string;
|
|
24
|
+
/** One invocation's authenticated, immutable AVL nodes and staged replacements. */
|
|
25
|
+
export declare class ProjectionIndexTree {
|
|
26
|
+
private readonly tree;
|
|
27
|
+
private readonly reader?;
|
|
28
|
+
private readonly cached;
|
|
29
|
+
private readonly staged;
|
|
30
|
+
constructor(tree: TProjectionIndexTree, reader?: IProjectionIndexTreeReader | undefined);
|
|
31
|
+
private read;
|
|
32
|
+
private write;
|
|
33
|
+
private rotateLeft;
|
|
34
|
+
private rotateRight;
|
|
35
|
+
private balance;
|
|
36
|
+
get(root: string | undefined, key: string): Promise<unknown>;
|
|
37
|
+
set(root: string | undefined, key: string, value: unknown): Promise<string>;
|
|
38
|
+
/** Builds a canonical balanced tree in linear work from entries sorted by unique key. */
|
|
39
|
+
build(entries: readonly {
|
|
40
|
+
key: string;
|
|
41
|
+
value: unknown;
|
|
42
|
+
}[]): Promise<string | undefined>;
|
|
43
|
+
private removeMin;
|
|
44
|
+
delete(root: string | undefined, key: string): Promise<string | undefined>;
|
|
45
|
+
size(root: string | undefined): Promise<number>;
|
|
46
|
+
completed(root: string | undefined): Promise<number>;
|
|
47
|
+
capturing(root: string | undefined): Promise<number>;
|
|
48
|
+
select(root: string | undefined, index: number): Promise<{
|
|
49
|
+
key: string;
|
|
50
|
+
value: unknown;
|
|
51
|
+
} | undefined>;
|
|
52
|
+
rank(root: string | undefined, key: string): Promise<number | undefined>;
|
|
53
|
+
selectCompleted(root: string | undefined, index: number): Promise<{
|
|
54
|
+
key: string;
|
|
55
|
+
value: unknown;
|
|
56
|
+
} | undefined>;
|
|
57
|
+
range(root: string | undefined, start: number, end: number): Promise<Array<{
|
|
58
|
+
key: string;
|
|
59
|
+
value: unknown;
|
|
60
|
+
}>>;
|
|
61
|
+
/** Only nodes reachable from a returned root need to be persisted. */
|
|
62
|
+
writes(root: string | undefined): IProjectionIndexNodeWrite[];
|
|
63
|
+
}
|
|
@@ -0,0 +1,314 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
import { FlexHarnessStoreFormatError } from './errors.js';
|
|
3
|
+
import { assertJsonSerializable } from './utils.json.js';
|
|
4
|
+
function canonicalJson(value) {
|
|
5
|
+
if (Array.isArray(value))
|
|
6
|
+
return `[${value.map(canonicalJson).join(',')}]`;
|
|
7
|
+
if (value !== null && typeof value === 'object') {
|
|
8
|
+
const record = value;
|
|
9
|
+
return `{${Object.keys(record).sort().map((key) => `${JSON.stringify(key)}:${canonicalJson(record[key])}`).join(',')}}`;
|
|
10
|
+
}
|
|
11
|
+
const primitive = JSON.stringify(value);
|
|
12
|
+
if (primitive === undefined)
|
|
13
|
+
throw new FlexHarnessStoreFormatError('Projection index node is not JSON.');
|
|
14
|
+
return primitive;
|
|
15
|
+
}
|
|
16
|
+
export function projectionIndexHash(node) {
|
|
17
|
+
assertJsonSerializable(node, '$indexNode');
|
|
18
|
+
return plugins.crypto.createHash('sha256').update(canonicalJson(node)).digest('hex');
|
|
19
|
+
}
|
|
20
|
+
function assertHash(hash) {
|
|
21
|
+
if (!/^[a-f0-9]{64}$/.test(hash)) {
|
|
22
|
+
throw new FlexHarnessStoreFormatError('Projection index node hash is invalid.');
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function isRecord(value) {
|
|
26
|
+
return value !== null && typeof value === 'object' && !Array.isArray(value);
|
|
27
|
+
}
|
|
28
|
+
function assertTreeNode(value, tree) {
|
|
29
|
+
if (!isRecord(value) || value.kind !== 'projection-index-tree-v1' || value.tree !== tree
|
|
30
|
+
|| typeof value.key !== 'string' || !Object.hasOwn(value, 'value')
|
|
31
|
+
|| !Number.isSafeInteger(value.height) || Number(value.height) < 1
|
|
32
|
+
|| !Number.isSafeInteger(value.size) || Number(value.size) < 1
|
|
33
|
+
|| !Number.isSafeInteger(value.completed) || Number(value.completed) < 0
|
|
34
|
+
|| !Number.isSafeInteger(value.capturing) || Number(value.capturing) < 0
|
|
35
|
+
|| (value.left !== undefined && (typeof value.left !== 'string' || !/^[a-f0-9]{64}$/.test(value.left)))
|
|
36
|
+
|| (value.right !== undefined && (typeof value.right !== 'string' || !/^[a-f0-9]{64}$/.test(value.right)))) {
|
|
37
|
+
throw new FlexHarnessStoreFormatError('Projection index tree node is malformed.');
|
|
38
|
+
}
|
|
39
|
+
const keys = Object.keys(value);
|
|
40
|
+
if (keys.some((key) => !['kind', 'tree', 'key', 'value', 'left', 'right', 'height', 'size', 'completed', 'capturing'].includes(key))) {
|
|
41
|
+
throw new FlexHarnessStoreFormatError('Projection index tree node has an unknown field.');
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
/** One invocation's authenticated, immutable AVL nodes and staged replacements. */
|
|
45
|
+
export class ProjectionIndexTree {
|
|
46
|
+
tree;
|
|
47
|
+
reader;
|
|
48
|
+
cached = new Map();
|
|
49
|
+
staged = new Map();
|
|
50
|
+
constructor(tree, reader) {
|
|
51
|
+
this.tree = tree;
|
|
52
|
+
this.reader = reader;
|
|
53
|
+
}
|
|
54
|
+
async read(hash) {
|
|
55
|
+
if (hash === undefined)
|
|
56
|
+
return undefined;
|
|
57
|
+
assertHash(hash);
|
|
58
|
+
const cached = this.cached.get(hash);
|
|
59
|
+
if (cached)
|
|
60
|
+
return cached;
|
|
61
|
+
if (!this.reader)
|
|
62
|
+
throw new FlexHarnessStoreFormatError('Projection index node is missing.');
|
|
63
|
+
const value = await this.reader.readNode(hash);
|
|
64
|
+
assertTreeNode(value, this.tree);
|
|
65
|
+
if (projectionIndexHash(value) !== hash) {
|
|
66
|
+
throw new FlexHarnessStoreFormatError('Projection index node digest does not match its address.');
|
|
67
|
+
}
|
|
68
|
+
this.cached.set(hash, value);
|
|
69
|
+
return value;
|
|
70
|
+
}
|
|
71
|
+
async write(key, value, left, right) {
|
|
72
|
+
const [leftNode, rightNode] = await Promise.all([this.read(left), this.read(right)]);
|
|
73
|
+
const node = {
|
|
74
|
+
kind: 'projection-index-tree-v1',
|
|
75
|
+
tree: this.tree,
|
|
76
|
+
key,
|
|
77
|
+
value,
|
|
78
|
+
...(left === undefined ? {} : { left }),
|
|
79
|
+
...(right === undefined ? {} : { right }),
|
|
80
|
+
height: 1 + Math.max(leftNode?.height ?? 0, rightNode?.height ?? 0),
|
|
81
|
+
size: 1 + (leftNode?.size ?? 0) + (rightNode?.size ?? 0),
|
|
82
|
+
completed: (this.tree === 'segments' && isRecord(value) && value.status === 'completed' ? 1 : 0)
|
|
83
|
+
+ (leftNode?.completed ?? 0) + (rightNode?.completed ?? 0),
|
|
84
|
+
capturing: (this.tree === 'segments' && isRecord(value) && value.status === 'capturing' && value.captureId !== undefined ? 1 : 0)
|
|
85
|
+
+ (leftNode?.capturing ?? 0) + (rightNode?.capturing ?? 0),
|
|
86
|
+
};
|
|
87
|
+
const hash = projectionIndexHash(node);
|
|
88
|
+
this.cached.set(hash, node);
|
|
89
|
+
this.staged.set(hash, node);
|
|
90
|
+
return hash;
|
|
91
|
+
}
|
|
92
|
+
async rotateLeft(hash) {
|
|
93
|
+
const node = await this.read(hash);
|
|
94
|
+
const right = await this.read(node?.right);
|
|
95
|
+
if (!node || !right)
|
|
96
|
+
throw new FlexHarnessStoreFormatError('Projection index rotation is invalid.');
|
|
97
|
+
const newLeft = await this.write(node.key, node.value, node.left, right.left);
|
|
98
|
+
return this.write(right.key, right.value, newLeft, right.right);
|
|
99
|
+
}
|
|
100
|
+
async rotateRight(hash) {
|
|
101
|
+
const node = await this.read(hash);
|
|
102
|
+
const left = await this.read(node?.left);
|
|
103
|
+
if (!node || !left)
|
|
104
|
+
throw new FlexHarnessStoreFormatError('Projection index rotation is invalid.');
|
|
105
|
+
const newRight = await this.write(node.key, node.value, left.right, node.right);
|
|
106
|
+
return this.write(left.key, left.value, left.left, newRight);
|
|
107
|
+
}
|
|
108
|
+
async balance(hash) {
|
|
109
|
+
const node = await this.read(hash);
|
|
110
|
+
if (!node)
|
|
111
|
+
throw new FlexHarnessStoreFormatError('Projection index node is missing.');
|
|
112
|
+
const [left, right] = await Promise.all([this.read(node.left), this.read(node.right)]);
|
|
113
|
+
const difference = (left?.height ?? 0) - (right?.height ?? 0);
|
|
114
|
+
if (difference > 1) {
|
|
115
|
+
if (!left)
|
|
116
|
+
throw new FlexHarnessStoreFormatError('Projection index left branch is missing.');
|
|
117
|
+
const [inner, outer] = await Promise.all([this.read(left.right), this.read(left.left)]);
|
|
118
|
+
const leftHash = (inner?.height ?? 0) > (outer?.height ?? 0)
|
|
119
|
+
? await this.rotateLeft(node.left) : node.left;
|
|
120
|
+
return this.rotateRight(await this.write(node.key, node.value, leftHash, node.right));
|
|
121
|
+
}
|
|
122
|
+
if (difference < -1) {
|
|
123
|
+
if (!right)
|
|
124
|
+
throw new FlexHarnessStoreFormatError('Projection index right branch is missing.');
|
|
125
|
+
const [inner, outer] = await Promise.all([this.read(right.left), this.read(right.right)]);
|
|
126
|
+
const rightHash = (inner?.height ?? 0) > (outer?.height ?? 0)
|
|
127
|
+
? await this.rotateRight(node.right) : node.right;
|
|
128
|
+
return this.rotateLeft(await this.write(node.key, node.value, node.left, rightHash));
|
|
129
|
+
}
|
|
130
|
+
return hash;
|
|
131
|
+
}
|
|
132
|
+
async get(root, key) {
|
|
133
|
+
let cursor = root;
|
|
134
|
+
while (cursor !== undefined) {
|
|
135
|
+
const node = await this.read(cursor);
|
|
136
|
+
if (!node)
|
|
137
|
+
break;
|
|
138
|
+
if (key === node.key)
|
|
139
|
+
return node.value;
|
|
140
|
+
cursor = key < node.key ? node.left : node.right;
|
|
141
|
+
}
|
|
142
|
+
return undefined;
|
|
143
|
+
}
|
|
144
|
+
async set(root, key, value) {
|
|
145
|
+
if (root === undefined)
|
|
146
|
+
return this.write(key, value, undefined, undefined);
|
|
147
|
+
const node = await this.read(root);
|
|
148
|
+
if (!node)
|
|
149
|
+
throw new FlexHarnessStoreFormatError('Projection index node is missing.');
|
|
150
|
+
if (key === node.key)
|
|
151
|
+
return this.write(key, value, node.left, node.right);
|
|
152
|
+
const left = key < node.key ? await this.set(node.left, key, value) : node.left;
|
|
153
|
+
const right = key > node.key ? await this.set(node.right, key, value) : node.right;
|
|
154
|
+
return this.balance(await this.write(node.key, node.value, left, right));
|
|
155
|
+
}
|
|
156
|
+
/** Builds a canonical balanced tree in linear work from entries sorted by unique key. */
|
|
157
|
+
async build(entries) {
|
|
158
|
+
for (let index = 1; index < entries.length; index++) {
|
|
159
|
+
if (entries[index - 1].key >= entries[index].key) {
|
|
160
|
+
throw new FlexHarnessStoreFormatError('Projection index bootstrap keys must be unique and sorted.');
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
const visit = async (start, end) => {
|
|
164
|
+
if (start === end)
|
|
165
|
+
return undefined;
|
|
166
|
+
const middle = Math.floor((start + end) / 2);
|
|
167
|
+
const left = await visit(start, middle);
|
|
168
|
+
const right = await visit(middle + 1, end);
|
|
169
|
+
return this.write(entries[middle].key, entries[middle].value, left, right);
|
|
170
|
+
};
|
|
171
|
+
return visit(0, entries.length);
|
|
172
|
+
}
|
|
173
|
+
async removeMin(root) {
|
|
174
|
+
const node = await this.read(root);
|
|
175
|
+
if (!node)
|
|
176
|
+
throw new FlexHarnessStoreFormatError('Projection index node is missing.');
|
|
177
|
+
if (!node.left)
|
|
178
|
+
return { root: node.right, node };
|
|
179
|
+
const result = await this.removeMin(node.left);
|
|
180
|
+
return {
|
|
181
|
+
root: await this.balance(await this.write(node.key, node.value, result.root, node.right)),
|
|
182
|
+
node: result.node,
|
|
183
|
+
};
|
|
184
|
+
}
|
|
185
|
+
async delete(root, key) {
|
|
186
|
+
if (root === undefined)
|
|
187
|
+
return undefined;
|
|
188
|
+
const node = await this.read(root);
|
|
189
|
+
if (!node)
|
|
190
|
+
throw new FlexHarnessStoreFormatError('Projection index node is missing.');
|
|
191
|
+
if (key < node.key) {
|
|
192
|
+
if (!node.left)
|
|
193
|
+
return root;
|
|
194
|
+
return this.balance(await this.write(node.key, node.value, await this.delete(node.left, key), node.right));
|
|
195
|
+
}
|
|
196
|
+
if (key > node.key) {
|
|
197
|
+
if (!node.right)
|
|
198
|
+
return root;
|
|
199
|
+
return this.balance(await this.write(node.key, node.value, node.left, await this.delete(node.right, key)));
|
|
200
|
+
}
|
|
201
|
+
if (!node.left)
|
|
202
|
+
return node.right;
|
|
203
|
+
if (!node.right)
|
|
204
|
+
return node.left;
|
|
205
|
+
const next = await this.removeMin(node.right);
|
|
206
|
+
return this.balance(await this.write(next.node.key, next.node.value, node.left, next.root));
|
|
207
|
+
}
|
|
208
|
+
async size(root) {
|
|
209
|
+
return (await this.read(root))?.size ?? 0;
|
|
210
|
+
}
|
|
211
|
+
async completed(root) {
|
|
212
|
+
return (await this.read(root))?.completed ?? 0;
|
|
213
|
+
}
|
|
214
|
+
async capturing(root) {
|
|
215
|
+
return (await this.read(root))?.capturing ?? 0;
|
|
216
|
+
}
|
|
217
|
+
async select(root, index) {
|
|
218
|
+
let cursor = root;
|
|
219
|
+
let offset = index;
|
|
220
|
+
while (cursor !== undefined) {
|
|
221
|
+
const node = await this.read(cursor);
|
|
222
|
+
if (!node)
|
|
223
|
+
break;
|
|
224
|
+
const leftSize = (await this.read(node.left))?.size ?? 0;
|
|
225
|
+
if (offset === leftSize)
|
|
226
|
+
return { key: node.key, value: node.value };
|
|
227
|
+
if (offset < leftSize)
|
|
228
|
+
cursor = node.left;
|
|
229
|
+
else {
|
|
230
|
+
offset -= leftSize + 1;
|
|
231
|
+
cursor = node.right;
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
return undefined;
|
|
235
|
+
}
|
|
236
|
+
async rank(root, key) {
|
|
237
|
+
let cursor = root;
|
|
238
|
+
let before = 0;
|
|
239
|
+
while (cursor !== undefined) {
|
|
240
|
+
const node = await this.read(cursor);
|
|
241
|
+
if (!node)
|
|
242
|
+
break;
|
|
243
|
+
const leftSize = (await this.read(node.left))?.size ?? 0;
|
|
244
|
+
if (key === node.key)
|
|
245
|
+
return before + leftSize;
|
|
246
|
+
if (key < node.key)
|
|
247
|
+
cursor = node.left;
|
|
248
|
+
else {
|
|
249
|
+
before += leftSize + 1;
|
|
250
|
+
cursor = node.right;
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
return undefined;
|
|
254
|
+
}
|
|
255
|
+
async selectCompleted(root, index) {
|
|
256
|
+
let cursor = root;
|
|
257
|
+
let offset = index;
|
|
258
|
+
while (cursor !== undefined) {
|
|
259
|
+
const node = await this.read(cursor);
|
|
260
|
+
if (!node)
|
|
261
|
+
break;
|
|
262
|
+
const leftCompleted = (await this.read(node.left))?.completed ?? 0;
|
|
263
|
+
if (offset < leftCompleted) {
|
|
264
|
+
cursor = node.left;
|
|
265
|
+
continue;
|
|
266
|
+
}
|
|
267
|
+
offset -= leftCompleted;
|
|
268
|
+
const self = this.tree === 'segments' && isRecord(node.value) && node.value.status === 'completed';
|
|
269
|
+
if (self && offset === 0)
|
|
270
|
+
return { key: node.key, value: node.value };
|
|
271
|
+
if (self)
|
|
272
|
+
offset--;
|
|
273
|
+
cursor = node.right;
|
|
274
|
+
}
|
|
275
|
+
return undefined;
|
|
276
|
+
}
|
|
277
|
+
async range(root, start, end) {
|
|
278
|
+
const result = [];
|
|
279
|
+
const visit = async (hash, base) => {
|
|
280
|
+
const node = await this.read(hash);
|
|
281
|
+
if (!node)
|
|
282
|
+
return;
|
|
283
|
+
const leftSize = (await this.read(node.left))?.size ?? 0;
|
|
284
|
+
const position = base + leftSize;
|
|
285
|
+
if (start < position)
|
|
286
|
+
await visit(node.left, base);
|
|
287
|
+
if (start <= position && position < end)
|
|
288
|
+
result.push({ key: node.key, value: node.value });
|
|
289
|
+
if (position + 1 < end)
|
|
290
|
+
await visit(node.right, position + 1);
|
|
291
|
+
};
|
|
292
|
+
await visit(root, 0);
|
|
293
|
+
return result;
|
|
294
|
+
}
|
|
295
|
+
/** Only nodes reachable from a returned root need to be persisted. */
|
|
296
|
+
writes(root) {
|
|
297
|
+
const result = [];
|
|
298
|
+
const visited = new Set();
|
|
299
|
+
const visit = (hash) => {
|
|
300
|
+
if (hash === undefined || visited.has(hash))
|
|
301
|
+
return;
|
|
302
|
+
visited.add(hash);
|
|
303
|
+
const node = this.staged.get(hash);
|
|
304
|
+
if (!node)
|
|
305
|
+
return;
|
|
306
|
+
result.push({ hash, node });
|
|
307
|
+
visit(node.left);
|
|
308
|
+
visit(node.right);
|
|
309
|
+
};
|
|
310
|
+
visit(root);
|
|
311
|
+
return result;
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.projectionindextree.js","sourceRoot":"","sources":["../ts/utils.projectionindextree.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"author": "Task Venture Capital GmbH",
|
|
3
3
|
"license": "MIT",
|
|
4
4
|
"name": "@modelprofile.com/flexharness",
|
|
5
|
-
"version": "18.
|
|
5
|
+
"version": "18.5.0",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"description": "Managed agent sessions with tools, MCP, chat, OCR, documents and browser control through focused subpath imports.",
|
|
8
8
|
"main": "./dist_ts/index.js",
|
|
@@ -91,8 +91,8 @@
|
|
|
91
91
|
},
|
|
92
92
|
"dependencies": {
|
|
93
93
|
"@cfworker/json-schema": "^4.1.1",
|
|
94
|
-
"@modelprofile.com/flexharness-agent": "18.
|
|
95
|
-
"@modelprofile.com/flexharness-models": "18.
|
|
94
|
+
"@modelprofile.com/flexharness-agent": "18.5.0",
|
|
95
|
+
"@modelprofile.com/flexharness-models": "18.5.0",
|
|
96
96
|
"@push.rocks/smartrequest": "^5.5.1",
|
|
97
97
|
"ai": "^7.0.111",
|
|
98
98
|
"zod": "^4.6.5"
|
package/readme.md
CHANGED
|
@@ -707,7 +707,7 @@ await harness.retireScope(scopeId);
|
|
|
707
707
|
await harness.dispose();
|
|
708
708
|
```
|
|
709
709
|
|
|
710
|
-
`getSession()` returns the session as saved after every queued write that may change it; it does not wait for queued writes of the scope's other sessions, so a slow save of one session never holds a read of another. `listSessions()` waits for every queued write.
|
|
710
|
+
`getSession(scopeId, sessionId, signal?)` returns the session as saved after every queued write that may change it; it does not wait for queued writes of the scope's other sessions, so a slow save of one session never holds a read of another. Its optional `AbortSignal` stops that caller's wait for scope resolution, shared loading, target hydration or the session's write barrier. It rejects with the signal's reason, or `FlexHarnessAbortError` when the signal has no reason. The shared load, hydration and queued writes keep their own ownership and finish for other callers. `listSessions()` waits for every queued write.
|
|
711
711
|
|
|
712
712
|
`listSessionIdentities(scopeId)` lists a scope's live sessions as `IFlexSessionIdentity` (`sessionId`, `sessionGenerationId`, `sessionGenerationSequence`, `parentSessionId` when set), sorted by session id. It reads complete scope metadata only, never a projection, event log or job store. Before the catalogue load settles it normalizes the stored scope snapshot just as loading does (including deterministic legacy generations and tombstone filtering); afterward it reads the complete in-memory catalogue, not the hydrated runtime subset.
|
|
713
713
|
|
|
@@ -1342,6 +1342,8 @@ A custom store validates what it loads and saves with the validators the built-i
|
|
|
1342
1342
|
|
|
1343
1343
|
Projections and Agent event histories are saved as changes, so a save costs what changed rather than the whole session. `IFlexProjectionStore.save(storageKey, sessionId, change, expectedRevision)` receives an `IFlexProjectionChange`: the schema-3 projection with `messages` and `reversionSegments` given as `IFlexListChange`s `{ start, end, items }`, each of which keeps the stored entries from `start` up to `end` and appends `items`. A list change with `start` and `end` at 0 replaces the list whole; FlexHarness sends whole lists when it cannot know which entries the store holds: for a projection it loaded in an older schema and after a save with an uncertain outcome. The Agent event store of each session receives an `IAgentEventChange` of removed, replaced and appended events, as the `@modelprofile.com/flexharness-agent` readme describes. A store that keeps snapshots checks a change's form with `assertFlexProjectionChange()` or `assertAgentEventChange()`, applies it with `applyFlexProjectionChange()` or `applyAgentEventChange()`, and validates the result as above; `createWholeProjectionChange(snapshot)` makes the change that stores a projection whole. `createChangedProjectionSnapshot(stored, change, sessionId)` applies a projection change and validates the result in one step that costs what the change carries rather than the whole session: it validates the change's own entries and other fields in full and reads the stored entries the change keeps only for their identities (message, run, event and capture IDs, roles and statuses), which relate every entry to the others. For a `stored` that `assertFlexProjectionSnapshot(stored, sessionId)` accepted or the function returned, it throws exactly when `assertFlexProjectionSnapshot(applyFlexProjectionChange(stored, change), sessionId)` throws and otherwise returns that snapshot, provided the stored entries were not modified after their validation. The in-memory and JSON-file stores save through it. FlexHarness freezes every message and reversion segment it saved and replaces an entry instead of editing it, which is how it tells the entries the store already holds. `/stores/testing` exports `createFlexStoreContractTests(backend)`, the cases every built-in store passes, for a custom store to run with any test runner; its readme shows how.
|
|
1344
1344
|
|
|
1345
|
+
`createProjectionValidationIndex(snapshot, sessionId)` validates a stored projection in full once and returns `{ rootHash, writes }`, where each write is an immutable `{ hash, node }` addressed by the SHA-256 of canonical JSON. It stores only message and reversion identities, ordered positions, and relation facts; no message body is retained in the index. An absent or older-schema projection produces an empty current-schema index and requires whole-list changes. A content-addressed store checks each `hashFlexProjectionIndexNode(node) === hash`, persists the returned nodes and binds `rootHash` to the same projection candidate, session, revision, and incarnation in its committed head. For later saves, `validateProjectionChangeWithIndex(rootHash, reader, change, expectedRevision, sessionId)` reads authenticated nodes through `reader.readNode(hash)` and returns a cloned validated `change` plus the next root and node writes. A normal append reads and writes tree paths proportional to the change and logarithmic in retained history; dropping a range also visits the entries it removes. The store must stage both the projection content and these index writes, then publish both roots in one revision compare-and-swap. A missing node, wrong digest, session, or revision fails the validation. After an uncertain commit, reload the authoritative head before retrying.
|
|
1346
|
+
|
|
1345
1347
|
Custom Agent event and job providers may implement `releaseSession(storageKey, sessionId)` to release session-bound wrappers, handles, or caches without deleting durable data. FlexHarness calls these hooks only after the corresponding AgentSession or execution context has released runtime ownership. A failed release remains owned for a later retirement or disposal retry. `deleteSession()` and `deleteSessionGenerationCohort()` are the separate destructive operations for durable session data.
|
|
1346
1348
|
|
|
1347
1349
|
`JsonFileFlexHarnessStores` stores the domains in separate `scopes`, `projections`, `permissions`, `projectManagement`, `events`, `archives`, and `jobs` directories. Storage and session identifiers are SHA-256 hashed for filenames. Passing the store bundle supplies lifecycle persistence but does not enable any built-in tool. It provides:
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -294,12 +294,33 @@ export class FlexHarnessSessions<TScope> {
|
|
|
294
294
|
return result;
|
|
295
295
|
}
|
|
296
296
|
|
|
297
|
-
public async getSession(
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
297
|
+
public async getSession(
|
|
298
|
+
scopeId: string,
|
|
299
|
+
sessionId: string,
|
|
300
|
+
signal?: AbortSignal,
|
|
301
|
+
): Promise<IFlexSession> {
|
|
302
|
+
const throwIfAborted = () => {
|
|
303
|
+
if (signal?.aborted) throw signal.reason ?? new FlexHarnessAbortError('The session read was aborted.');
|
|
304
|
+
};
|
|
305
|
+
throwIfAborted();
|
|
306
|
+
let onAbort: (() => void) | undefined;
|
|
307
|
+
const aborted = signal === undefined ? undefined : new Promise<never>((_resolve, reject) => {
|
|
308
|
+
onAbort = () => reject(signal.reason ?? new FlexHarnessAbortError('The session read was aborted.'));
|
|
309
|
+
signal.addEventListener('abort', onAbort, { once: true });
|
|
310
|
+
});
|
|
311
|
+
try {
|
|
312
|
+
const stateRead = this.core.resolveState(scopeId, sessionId);
|
|
313
|
+
const { state } = await (aborted ? Promise.race([stateRead, aborted]) : stateRead);
|
|
314
|
+
throwIfAborted();
|
|
315
|
+
// Waits for the queued changes of this session only, never for another session's save.
|
|
316
|
+
const barrier = this.core.sessionReadBarrier(state, sessionId);
|
|
317
|
+
await (aborted ? Promise.race([barrier, aborted]) : barrier);
|
|
318
|
+
throwIfAborted();
|
|
319
|
+
this.core.assertStateAcceptingWork(state);
|
|
320
|
+
return publicSnapshot(this.core.requireSession(state, sessionId).session);
|
|
321
|
+
} finally {
|
|
322
|
+
if (signal && onAbort) signal.removeEventListener('abort', onAbort);
|
|
323
|
+
}
|
|
303
324
|
}
|
|
304
325
|
|
|
305
326
|
public async getSessionMetrics(scopeId: string, sessionId: string): Promise<IFlexSessionMetrics> {
|
|
@@ -135,8 +135,8 @@ export class FlexHarness<TScope = unknown> {
|
|
|
135
135
|
return this.core.imports.abortSessionImport(handle);
|
|
136
136
|
}
|
|
137
137
|
|
|
138
|
-
public getSession(scopeId: string, sessionId: string): Promise<IFlexSession> {
|
|
139
|
-
return this.core.sessions.getSession(scopeId, sessionId);
|
|
138
|
+
public getSession(scopeId: string, sessionId: string, signal?: AbortSignal): Promise<IFlexSession> {
|
|
139
|
+
return this.core.sessions.getSession(scopeId, sessionId, signal);
|
|
140
140
|
}
|
|
141
141
|
|
|
142
142
|
/** Bounded projection-state read: no message, event, archive or child-history scan. */
|
package/ts/index.ts
CHANGED
|
@@ -33,6 +33,19 @@ export {
|
|
|
33
33
|
createChangedProjectionSnapshot,
|
|
34
34
|
createWholeProjectionChange,
|
|
35
35
|
} from './utils.projectionchange.js';
|
|
36
|
+
export {
|
|
37
|
+
createProjectionValidationIndex,
|
|
38
|
+
hashFlexProjectionIndexNode,
|
|
39
|
+
validateProjectionChangeWithIndex,
|
|
40
|
+
type IFlexProjectionIndexChangeResult,
|
|
41
|
+
type IFlexProjectionIndexNodeWrite,
|
|
42
|
+
type IFlexProjectionIndexReader,
|
|
43
|
+
type IFlexProjectionIndexResult,
|
|
44
|
+
type IFlexProjectionIndexRoot,
|
|
45
|
+
type IFlexProjectionMessageFact,
|
|
46
|
+
type IFlexProjectionSegmentFact,
|
|
47
|
+
type TFlexProjectionIndexNode,
|
|
48
|
+
} from './utils.projectionindex.js';
|
|
36
49
|
export { assertFlexToolJobSnapshot } from './utils.storecodecs.js';
|
|
37
50
|
export {
|
|
38
51
|
FLEX_SLASH_COMMAND_MAX_INPUT_BYTES,
|
package/ts/readme.md
CHANGED
|
@@ -707,7 +707,7 @@ await harness.retireScope(scopeId);
|
|
|
707
707
|
await harness.dispose();
|
|
708
708
|
```
|
|
709
709
|
|
|
710
|
-
`getSession()` returns the session as saved after every queued write that may change it; it does not wait for queued writes of the scope's other sessions, so a slow save of one session never holds a read of another. `listSessions()` waits for every queued write.
|
|
710
|
+
`getSession(scopeId, sessionId, signal?)` returns the session as saved after every queued write that may change it; it does not wait for queued writes of the scope's other sessions, so a slow save of one session never holds a read of another. Its optional `AbortSignal` stops that caller's wait for scope resolution, shared loading, target hydration or the session's write barrier. It rejects with the signal's reason, or `FlexHarnessAbortError` when the signal has no reason. The shared load, hydration and queued writes keep their own ownership and finish for other callers. `listSessions()` waits for every queued write.
|
|
711
711
|
|
|
712
712
|
`listSessionIdentities(scopeId)` lists a scope's live sessions as `IFlexSessionIdentity` (`sessionId`, `sessionGenerationId`, `sessionGenerationSequence`, `parentSessionId` when set), sorted by session id. It reads complete scope metadata only, never a projection, event log or job store. Before the catalogue load settles it normalizes the stored scope snapshot just as loading does (including deterministic legacy generations and tombstone filtering); afterward it reads the complete in-memory catalogue, not the hydrated runtime subset.
|
|
713
713
|
|
|
@@ -1342,6 +1342,8 @@ A custom store validates what it loads and saves with the validators the built-i
|
|
|
1342
1342
|
|
|
1343
1343
|
Projections and Agent event histories are saved as changes, so a save costs what changed rather than the whole session. `IFlexProjectionStore.save(storageKey, sessionId, change, expectedRevision)` receives an `IFlexProjectionChange`: the schema-3 projection with `messages` and `reversionSegments` given as `IFlexListChange`s `{ start, end, items }`, each of which keeps the stored entries from `start` up to `end` and appends `items`. A list change with `start` and `end` at 0 replaces the list whole; FlexHarness sends whole lists when it cannot know which entries the store holds: for a projection it loaded in an older schema and after a save with an uncertain outcome. The Agent event store of each session receives an `IAgentEventChange` of removed, replaced and appended events, as the `@modelprofile.com/flexharness-agent` readme describes. A store that keeps snapshots checks a change's form with `assertFlexProjectionChange()` or `assertAgentEventChange()`, applies it with `applyFlexProjectionChange()` or `applyAgentEventChange()`, and validates the result as above; `createWholeProjectionChange(snapshot)` makes the change that stores a projection whole. `createChangedProjectionSnapshot(stored, change, sessionId)` applies a projection change and validates the result in one step that costs what the change carries rather than the whole session: it validates the change's own entries and other fields in full and reads the stored entries the change keeps only for their identities (message, run, event and capture IDs, roles and statuses), which relate every entry to the others. For a `stored` that `assertFlexProjectionSnapshot(stored, sessionId)` accepted or the function returned, it throws exactly when `assertFlexProjectionSnapshot(applyFlexProjectionChange(stored, change), sessionId)` throws and otherwise returns that snapshot, provided the stored entries were not modified after their validation. The in-memory and JSON-file stores save through it. FlexHarness freezes every message and reversion segment it saved and replaces an entry instead of editing it, which is how it tells the entries the store already holds. `/stores/testing` exports `createFlexStoreContractTests(backend)`, the cases every built-in store passes, for a custom store to run with any test runner; its readme shows how.
|
|
1344
1344
|
|
|
1345
|
+
`createProjectionValidationIndex(snapshot, sessionId)` validates a stored projection in full once and returns `{ rootHash, writes }`, where each write is an immutable `{ hash, node }` addressed by the SHA-256 of canonical JSON. It stores only message and reversion identities, ordered positions, and relation facts; no message body is retained in the index. An absent or older-schema projection produces an empty current-schema index and requires whole-list changes. A content-addressed store checks each `hashFlexProjectionIndexNode(node) === hash`, persists the returned nodes and binds `rootHash` to the same projection candidate, session, revision, and incarnation in its committed head. For later saves, `validateProjectionChangeWithIndex(rootHash, reader, change, expectedRevision, sessionId)` reads authenticated nodes through `reader.readNode(hash)` and returns a cloned validated `change` plus the next root and node writes. A normal append reads and writes tree paths proportional to the change and logarithmic in retained history; dropping a range also visits the entries it removes. The store must stage both the projection content and these index writes, then publish both roots in one revision compare-and-swap. A missing node, wrong digest, session, or revision fails the validation. After an uncertain commit, reload the authoritative head before retrying.
|
|
1346
|
+
|
|
1345
1347
|
Custom Agent event and job providers may implement `releaseSession(storageKey, sessionId)` to release session-bound wrappers, handles, or caches without deleting durable data. FlexHarness calls these hooks only after the corresponding AgentSession or execution context has released runtime ownership. A failed release remains owned for a later retirement or disposal retry. `deleteSession()` and `deleteSessionGenerationCohort()` are the separate destructive operations for durable session data.
|
|
1346
1348
|
|
|
1347
1349
|
`JsonFileFlexHarnessStores` stores the domains in separate `scopes`, `projections`, `permissions`, `projectManagement`, `events`, `archives`, and `jobs` directories. Storage and session identifiers are SHA-256 hashed for filenames. Passing the store bundle supplies lifecycle persistence but does not enable any built-in tool. It provides:
|