@modelprofile.com/flexharness 17.0.1 → 18.1.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.callbacks.d.ts +25 -3
- package/dist_ts/classes.flexharness.callbacks.js +115 -18
- package/dist_ts/classes.flexharness.core.d.ts +58 -2
- package/dist_ts/classes.flexharness.core.js +392 -177
- package/dist_ts/classes.flexharness.d.ts +6 -1
- package/dist_ts/classes.flexharness.js +8 -1
- package/dist_ts/classes.flexharness.runs.js +10 -3
- package/dist_ts/classes.flexharness.sessions.d.ts +8 -1
- package/dist_ts/classes.flexharness.sessions.js +27 -1
- package/dist_ts/classes.timeslicer.d.ts +21 -0
- package/dist_ts/classes.timeslicer.js +31 -0
- package/dist_ts/classes.toolcatalog.d.ts +1 -1
- package/dist_ts/classes.toolcatalog.js +34 -29
- package/dist_ts/interfaces.d.ts +44 -3
- package/dist_ts/interfaces.flexharness.d.ts +30 -2
- package/dist_ts/interfaces.js +1 -1
- package/dist_ts/plugins.d.ts +2 -2
- package/dist_ts/plugins.js +3 -3
- package/dist_ts/utils.flexharness.d.ts +2 -0
- package/dist_ts/utils.flexharness.js +3 -1
- package/dist_ts/utils.json.d.ts +6 -0
- package/dist_ts/utils.json.js +92 -35
- package/dist_ts/utils.scopesnapshot.d.ts +14 -0
- package/dist_ts/utils.scopesnapshot.js +58 -0
- package/dist_ts/utils.text.d.ts +6 -0
- package/dist_ts/utils.text.js +10 -0
- package/dist_ts_chat_harness/functions.mapping.js +11 -4
- package/dist_ts_tools_node/classes.workspacereversion.d.ts +3 -2
- package/dist_ts_tools_node/classes.workspacereversion.js +17 -3
- package/package.json +3 -3
- package/readme.md +12 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.flexharness.callbacks.ts +110 -16
- package/ts/classes.flexharness.core.ts +452 -207
- package/ts/classes.flexharness.runs.ts +9 -1
- package/ts/classes.flexharness.sessions.ts +30 -0
- package/ts/classes.flexharness.ts +9 -0
- package/ts/classes.timeslicer.ts +32 -0
- package/ts/classes.toolcatalog.ts +34 -28
- package/ts/interfaces.flexharness.ts +32 -1
- package/ts/interfaces.ts +48 -3
- package/ts/plugins.ts +2 -0
- package/ts/readme.md +12 -1
- package/ts/utils.flexharness.ts +3 -0
- package/ts/utils.json.ts +88 -38
- package/ts/utils.scopesnapshot.ts +75 -0
- package/ts/utils.text.ts +9 -0
- package/ts_chat_harness/functions.mapping.ts +10 -3
- package/ts_tools_node/classes.workspacereversion.ts +19 -4
- package/ts_tools_node/readme.md +1 -1
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { IFlexScopeSnapshot, IFlexSession, IFlexSessionIdentity } from './interfaces.js';
|
|
2
|
+
/**
|
|
3
|
+
* The scope a store holds as the harness works with it: a copy of `stored`, or the empty scope,
|
|
4
|
+
* whose sessions and tombstones stored before session generations existed carry the generation
|
|
5
|
+
* derived for them. `changed` says whether any did; the scope load then saves the copy.
|
|
6
|
+
*/
|
|
7
|
+
export declare function normalizeScopeSnapshot(storageKey: string, stored: IFlexScopeSnapshot | undefined): {
|
|
8
|
+
snapshot: IFlexScopeSnapshot;
|
|
9
|
+
changed: boolean;
|
|
10
|
+
};
|
|
11
|
+
/** The sessions of a scope snapshot that no tombstone deletes, in snapshot order. */
|
|
12
|
+
export declare function liveScopeSessions(snapshot: IFlexScopeSnapshot): IFlexSession[];
|
|
13
|
+
/** The identities of `sessions`, sorted by session id as scope snapshots are. */
|
|
14
|
+
export declare function sessionIdentities(sessions: Iterable<IFlexSession>): IFlexSessionIdentity[];
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
import { cloneSerializable } from './utils.json.js';
|
|
3
|
+
import { requireSessionGeneration } from './utils.flexharness.js';
|
|
4
|
+
function deriveLegacySessionGenerationId(storageKey, sessionId, createdAt) {
|
|
5
|
+
const digest = plugins.crypto.createHash('sha256').update(JSON.stringify([
|
|
6
|
+
'flexharness-legacy-session-generation-v1',
|
|
7
|
+
storageKey,
|
|
8
|
+
sessionId,
|
|
9
|
+
createdAt,
|
|
10
|
+
])).digest('hex');
|
|
11
|
+
return `legacy_${digest}`;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* The scope a store holds as the harness works with it: a copy of `stored`, or the empty scope,
|
|
15
|
+
* whose sessions and tombstones stored before session generations existed carry the generation
|
|
16
|
+
* derived for them. `changed` says whether any did; the scope load then saves the copy.
|
|
17
|
+
*/
|
|
18
|
+
export function normalizeScopeSnapshot(storageKey, stored) {
|
|
19
|
+
const snapshot = cloneSerializable(stored ?? {
|
|
20
|
+
schemaVersion: 1,
|
|
21
|
+
revision: 0,
|
|
22
|
+
sessions: [],
|
|
23
|
+
tombstones: [],
|
|
24
|
+
});
|
|
25
|
+
let changed = false;
|
|
26
|
+
const repairedGenerationSequence = snapshot.revision + 1;
|
|
27
|
+
for (const session of snapshot.sessions) {
|
|
28
|
+
if (session.sessionGenerationId !== undefined)
|
|
29
|
+
continue;
|
|
30
|
+
session.sessionGenerationId = deriveLegacySessionGenerationId(storageKey, session.sessionId, session.createdAt);
|
|
31
|
+
session.sessionGenerationSequence = repairedGenerationSequence;
|
|
32
|
+
changed = true;
|
|
33
|
+
}
|
|
34
|
+
for (const tombstone of snapshot.tombstones) {
|
|
35
|
+
if (tombstone.sessionGenerationId !== undefined)
|
|
36
|
+
continue;
|
|
37
|
+
tombstone.sessionGenerationId = deriveLegacySessionGenerationId(storageKey, tombstone.sessionId, tombstone.deletedAt);
|
|
38
|
+
tombstone.sessionGenerationSequence = repairedGenerationSequence;
|
|
39
|
+
changed = true;
|
|
40
|
+
}
|
|
41
|
+
return { snapshot, changed };
|
|
42
|
+
}
|
|
43
|
+
/** The sessions of a scope snapshot that no tombstone deletes, in snapshot order. */
|
|
44
|
+
export function liveScopeSessions(snapshot) {
|
|
45
|
+
const tombstoned = new Set(snapshot.tombstones.map((tombstone) => tombstone.sessionId));
|
|
46
|
+
return snapshot.sessions.filter((session) => !tombstoned.has(session.sessionId));
|
|
47
|
+
}
|
|
48
|
+
/** The identities of `sessions`, sorted by session id as scope snapshots are. */
|
|
49
|
+
export function sessionIdentities(sessions) {
|
|
50
|
+
return [...sessions]
|
|
51
|
+
.map((session) => ({
|
|
52
|
+
sessionId: session.sessionId,
|
|
53
|
+
...requireSessionGeneration(session),
|
|
54
|
+
...(session.parentSessionId === undefined ? {} : { parentSessionId: session.parentSessionId }),
|
|
55
|
+
}))
|
|
56
|
+
.sort((left, right) => left.sessionId.localeCompare(right.sessionId));
|
|
57
|
+
}
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuc2NvcGVzbmFwc2hvdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3V0aWxzLnNjb3Blc25hcHNob3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFFeEMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDcEQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFbEUsU0FBUywrQkFBK0IsQ0FDdEMsVUFBa0IsRUFDbEIsU0FBaUIsRUFDakIsU0FBaUI7SUFFakIsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7UUFDdkUsMENBQTBDO1FBQzFDLFVBQVU7UUFDVixTQUFTO1FBQ1QsU0FBUztLQUNWLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNsQixPQUFPLFVBQVUsTUFBTSxFQUFFLENBQUM7QUFDNUIsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsc0JBQXNCLENBQ3BDLFVBQWtCLEVBQ2xCLE1BQXNDO0lBRXRDLE1BQU0sUUFBUSxHQUFHLGlCQUFpQixDQUFDLE1BQU0sSUFBSTtRQUMzQyxhQUFhLEVBQUUsQ0FBQztRQUNoQixRQUFRLEVBQUUsQ0FBQztRQUNYLFFBQVEsRUFBRSxFQUFFO1FBQ1osVUFBVSxFQUFFLEVBQUU7S0FDYyxDQUFDLENBQUM7SUFDaEMsSUFBSSxPQUFPLEdBQUcsS0FBSyxDQUFDO0lBQ3BCLE1BQU0sMEJBQTBCLEdBQUcsUUFBUSxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUM7SUFDekQsS0FBSyxNQUFNLE9BQU8sSUFBSSxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDeEMsSUFBSSxPQUFPLENBQUMsbUJBQW1CLEtBQUssU0FBUztZQUFFLFNBQVM7UUFDeEQsT0FBTyxDQUFDLG1CQUFtQixHQUFHLCtCQUErQixDQUMzRCxVQUFVLEVBQ1YsT0FBTyxDQUFDLFNBQVMsRUFDakIsT0FBTyxDQUFDLFNBQVMsQ0FDbEIsQ0FBQztRQUNGLE9BQU8sQ0FBQyx5QkFBeUIsR0FBRywwQkFBMEIsQ0FBQztRQUMvRCxPQUFPLEdBQUcsSUFBSSxDQUFDO0lBQ2pCLENBQUM7SUFDRCxLQUFLLE1BQU0sU0FBUyxJQUFJLFFBQVEsQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUM1QyxJQUFJLFNBQVMsQ0FBQyxtQkFBbUIsS0FBSyxTQUFTO1lBQUUsU0FBUztRQUMxRCxTQUFTLENBQUMsbUJBQW1CLEdBQUcsK0JBQStCLENBQzdELFVBQVUsRUFDVixTQUFTLENBQUMsU0FBUyxFQUNuQixTQUFTLENBQUMsU0FBUyxDQUNwQixDQUFDO1FBQ0YsU0FBUyxDQUFDLHlCQUF5QixHQUFHLDBCQUEwQixDQUFDO1FBQ2pFLE9BQU8sR0FBRyxJQUFJLENBQUM7SUFDakIsQ0FBQztJQUNELE9BQU8sRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLENBQUM7QUFDL0IsQ0FBQztBQUVELHFGQUFxRjtBQUNyRixNQUFNLFVBQVUsaUJBQWlCLENBQUMsUUFBNEI7SUFDNUQsTUFBTSxVQUFVLEdBQUcsSUFBSSxHQUFHLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO0lBQ3hGLE9BQU8sUUFBUSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztBQUNuRixDQUFDO0FBRUQsaUZBQWlGO0FBQ2pGLE1BQU0sVUFBVSxpQkFBaUIsQ0FBQyxRQUFnQztJQUNoRSxPQUFPLENBQUMsR0FBRyxRQUFRLENBQUM7U0FDakIsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUF3QixFQUFFLENBQUMsQ0FBQztRQUN2QyxTQUFTLEVBQUUsT0FBTyxDQUFDLFNBQVM7UUFDNUIsR0FBRyx3QkFBd0IsQ0FBQyxPQUFPLENBQUM7UUFDcEMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxlQUFlLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsZUFBZSxFQUFFLE9BQU8sQ0FBQyxlQUFlLEVBQUUsQ0FBQztLQUMvRixDQUFDLENBQUM7U0FDRixJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztBQUMxRSxDQUFDIn0=
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The first `end` UTF-16 code units of `text`, one fewer where the last of them is the first half of
|
|
3
|
+
* a surrogate pair: a cut never keeps half of a character, which JSON would write as an escape such
|
|
4
|
+
* as `\ud83d`.
|
|
5
|
+
*/
|
|
6
|
+
export declare function sliceUtf16(text: string, end: number): string;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The first `end` UTF-16 code units of `text`, one fewer where the last of them is the first half of
|
|
3
|
+
* a surrogate pair: a cut never keeps half of a character, which JSON would write as an escape such
|
|
4
|
+
* as `\ud83d`.
|
|
5
|
+
*/
|
|
6
|
+
export function sliceUtf16(text, end) {
|
|
7
|
+
const last = text.charCodeAt(end - 1);
|
|
8
|
+
return text.slice(0, end > 0 && end < text.length && last >= 0xd800 && last <= 0xdbff ? end - 1 : end);
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMudGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3V0aWxzLnRleHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxVQUFVLENBQUMsSUFBWSxFQUFFLEdBQVc7SUFDbEQsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDdEMsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxHQUFHLEdBQUcsQ0FBQyxJQUFJLEdBQUcsR0FBRyxJQUFJLENBQUMsTUFBTSxJQUFJLElBQUksSUFBSSxNQUFNLElBQUksSUFBSSxJQUFJLE1BQU0sQ0FBQyxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUM7QUFDekcsQ0FBQyJ9
|
|
@@ -22,18 +22,25 @@ const toolStatuses = {
|
|
|
22
22
|
cancelled: 'stopped',
|
|
23
23
|
};
|
|
24
24
|
export function flexToolPartToHarness(part, timing) {
|
|
25
|
+
// A call the model streamed waits until it starts: it is pending, and its clock starts with it.
|
|
26
|
+
// One that ended without starting has `completedAt` but no `startedAt`, and no clock at all.
|
|
27
|
+
// Parts recorded before part times existed have neither, so the events' times stand in.
|
|
28
|
+
const pending = part.status === 'running' && part.startedAt === undefined;
|
|
29
|
+
const neverStarted = part.startedAt === undefined && (pending || part.completedAt !== undefined);
|
|
30
|
+
const startedAt = neverStarted ? undefined : epoch(part.startedAt) ?? timing?.startedAt;
|
|
31
|
+
const finishedAt = neverStarted ? undefined : epoch(part.completedAt) ?? timing?.endedAt;
|
|
25
32
|
return {
|
|
26
33
|
id: part.toolCallId,
|
|
27
34
|
name: part.toolName,
|
|
28
|
-
status: toolStatuses[part.status],
|
|
35
|
+
status: pending ? 'pending' : toolStatuses[part.status],
|
|
29
36
|
input: part.input,
|
|
30
37
|
...(part.output === undefined ? {} : { output: part.output }),
|
|
31
38
|
...(part.status === 'failed' ? { isError: true } : {}),
|
|
32
39
|
...(part.error === undefined ? {} : { errorText: part.error }),
|
|
33
40
|
...(part.childSessionId === undefined ? {} : { childSessionId: part.childSessionId }),
|
|
34
41
|
...(part.model === undefined ? {} : { model: flexModelLabel(part.model) }),
|
|
35
|
-
...(
|
|
36
|
-
...(
|
|
42
|
+
...(startedAt === undefined ? {} : { startedAt }),
|
|
43
|
+
...(finishedAt === undefined ? {} : { finishedAt }),
|
|
37
44
|
};
|
|
38
45
|
}
|
|
39
46
|
/**
|
|
@@ -217,4 +224,4 @@ export function flexProjectToHarnessTodos(project) {
|
|
|
217
224
|
export function flexProjectToHarnessScratchpad(sessionId, project) {
|
|
218
225
|
return { id: sessionId, text: project.state.scratchpad, revision: project.revision };
|
|
219
226
|
}
|
|
220
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.mapping.js","sourceRoot":"","sources":["../ts_chat_harness/functions.mapping.ts"],"names":[],"mappings":"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"}
|
|
227
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.mapping.js","sourceRoot":"","sources":["../ts_chat_harness/functions.mapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,9 @@ export interface IInMemoryWorkspaceReversionOptions {
|
|
|
4
4
|
/** The workspace a revertible turn names in the session's reversion info. */
|
|
5
5
|
workspace: plugins.IFlexAffectedWorkspace;
|
|
6
6
|
/**
|
|
7
|
-
* The bytes of file images one turn may hold
|
|
8
|
-
* nonrevertible (`capture-too-large`) and its
|
|
7
|
+
* The bytes of file images one turn may hold: what each file it changed held before the turn and
|
|
8
|
+
* after it. A turn that changes more is recorded as nonrevertible (`capture-too-large`) and its
|
|
9
|
+
* images are dropped. Default: 64 MiB.
|
|
9
10
|
*/
|
|
10
11
|
maxCaptureBytes?: number;
|
|
11
12
|
}
|
|
@@ -70,11 +70,25 @@ export class InMemoryWorkspaceReversion {
|
|
|
70
70
|
return capture.outcome;
|
|
71
71
|
const reference = { captureId: capture.captureId };
|
|
72
72
|
if (!capture.nonrevertibleReason) {
|
|
73
|
+
// The cap counts what the capture keeps: the before and after images of each file the turn
|
|
74
|
+
// changed. A file the turn left as it was is dropped uncounted, so the sum only grows and the
|
|
75
|
+
// outcome does not depend on the order of the files.
|
|
76
|
+
let keptBytes = 0;
|
|
73
77
|
for (const [filePath, record] of capture.files) {
|
|
74
|
-
|
|
75
|
-
if (fileImagesEqual(record.before,
|
|
78
|
+
const after = await readFileImage(filePath);
|
|
79
|
+
if (fileImagesEqual(record.before, after)) {
|
|
76
80
|
capture.files.delete(filePath);
|
|
81
|
+
continue;
|
|
82
|
+
}
|
|
83
|
+
keptBytes += fileImageBytes(record.before) + fileImageBytes(after);
|
|
84
|
+
if (keptBytes > this.maxCaptureBytes) {
|
|
85
|
+
this.markNonrevertible(capture, 'capture-too-large');
|
|
86
|
+
break;
|
|
87
|
+
}
|
|
88
|
+
record.after = after;
|
|
77
89
|
}
|
|
90
|
+
if (!capture.nonrevertibleReason)
|
|
91
|
+
capture.bytes = keptBytes;
|
|
78
92
|
}
|
|
79
93
|
capture.state = 'finalized';
|
|
80
94
|
if (capture.nonrevertibleReason) {
|
|
@@ -199,4 +213,4 @@ export class InMemoryWorkspaceReversion {
|
|
|
199
213
|
return capture;
|
|
200
214
|
}
|
|
201
215
|
}
|
|
202
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.workspacereversion.js","sourceRoot":"","sources":["../ts_tools_node/classes.workspacereversion.ts"],"names":[],"mappings":"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"}
|
|
216
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.workspacereversion.js","sourceRoot":"","sources":["../ts_tools_node/classes.workspacereversion.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": "
|
|
5
|
+
"version": "18.1.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": "
|
|
95
|
-
"@modelprofile.com/flexharness-models": "
|
|
94
|
+
"@modelprofile.com/flexharness-agent": "18.1.0",
|
|
95
|
+
"@modelprofile.com/flexharness-models": "18.1.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
|
@@ -162,6 +162,12 @@ ChatGPT authentication, pass
|
|
|
162
162
|
`connection: createOpenAiChatGptModelConnection(credentials)` from `/auth` to the
|
|
163
163
|
OpenAI model options. API-key inference needs no authentication setup.
|
|
164
164
|
|
|
165
|
+
The Anthropic, OpenAI and Ollama adapters end a streamed answer at its stream's terminal event
|
|
166
|
+
(Anthropic's `message_stop`, the Responses API's `response.completed`, Chat Completions'
|
|
167
|
+
`data: [DONE]`, Ollama's `done` object), never at the end of the connection: nothing after it is
|
|
168
|
+
read, and a stream that ends before it fails its model call with `ModelStreamIncompleteError`
|
|
169
|
+
from `flexharness-models`, which a run does not retry (AGL-1130).
|
|
170
|
+
|
|
165
171
|
## Migration
|
|
166
172
|
|
|
167
173
|
Replace the withdrawn 6.x component imports with the subpaths above. Provider
|
|
@@ -633,6 +639,7 @@ The main session methods are:
|
|
|
633
639
|
|
|
634
640
|
```typescript
|
|
635
641
|
await harness.listSessions(scopeId);
|
|
642
|
+
await harness.listSessionIdentities(scopeId);
|
|
636
643
|
await harness.createSession(scopeId, { sessionId, sessionGenerationId, title });
|
|
637
644
|
await harness.getSession(scopeId, sessionId);
|
|
638
645
|
await harness.getMessages(scopeId, sessionId);
|
|
@@ -702,6 +709,10 @@ await harness.dispose();
|
|
|
702
709
|
|
|
703
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.
|
|
704
711
|
|
|
712
|
+
`listSessionIdentities(scopeId)` lists a scope's live sessions as `IFlexSessionIdentity` (`sessionId`, `sessionGenerationId`, `sessionGenerationSequence`, `parentSessionId` when set), sorted by session id. The first request of a scope loads it: every session's projection, permissions, event log and job store, and the repair of what a stopped process left behind. `listSessions()` waits for that load; `listSessionIdentities()` does not. Until the load has settled it reads the stored scope snapshot alone, normalized as the load normalizes it (a session stored before session generations existed gets the generation the load derives for it, a deleted session is left out), and never reads a projection, an event log or a job store; nothing can change a scope before its load settles. Once the load has settled it answers from the loaded sessions. It gives the same answer before and after the load.
|
|
713
|
+
|
|
714
|
+
The load gives the event loop a turn about every 25 ms of work, so timers, I/O and a caller's cancellation keep running beside it, and its repair takes time linear in a session's size. A request that stops waiting for the load leaves it running, and the next request of the scope joins it; `dispose()` and `retireScope()` stop it at its next turn, and the requests waiting for it fail with `FlexHarnessAbortError`. The `scopeLoadObserver` option is called once each load ends, with `IFlexScopeLoadMetrics`: `scopeId`, `storageKey`, the live `sessions` it read, `storeReadMs` (waiting for the scope snapshot and each session's projection, permissions, agent event store and job store), `agentSessionMs` (creating the sessions' agent sessions, each of which reads and checks its event log), `repairMs`, `totalMs`, all wall-clock milliseconds, and `outcome` (`'loaded'`, `'failed'`, or `'aborted'` by disposal or retirement). An exception the observer throws, or a promise it rejects, is ignored.
|
|
715
|
+
|
|
705
716
|
Only one run may be active in a session. Additional prompts enter a bounded FIFO owned by FlexHarness, while different sessions can run concurrently. `enqueuePrompt()` resolves with `{ queueId, generation, completion }` after the immutable prompt and options have been accepted into that runtime queue and `prompt.queued` has been emitted. `startPrompt()` keeps its durable-admission behavior: it waits for its FIFO turn and resolves with `{ queueId, generation, runId, completion }` only after the canonical generation claim, run ID, and initial public audit messages have been durably reserved and the corresponding start events have been emitted. `prompt()` preserves the simpler behavior by awaiting completion internally.
|
|
706
717
|
|
|
707
718
|
Every admission names the session generation that admitted it: `generation` (`IFlexPromptAdmissionGeneration`) holds `sessionGenerationId`, `sessionGenerationSequence`, `depth` (0 for a root session, also a legacy root that stored none) and `configurationRef` when the session has one, as `getSession()` reports them. None of them changes while the generation lives, and the prompt only ever runs on that generation. The harness reads it from the session in memory, so a caller that needs it for the run it started does not call `getSession()`: that read waits for the session's queued writes, which queue behind every other session's write queued before them in the scope's one write FIFO.
|
|
@@ -1264,7 +1275,7 @@ const unsubscribe = harness.subscribe((event) => {
|
|
|
1264
1275
|
unsubscribe();
|
|
1265
1276
|
```
|
|
1266
1277
|
|
|
1267
|
-
Events are discriminated, deeply immutable values with one global sequence within each `FlexHarness` instance. Every `IFlexEventBase` carries the exact source `sessionGenerationId` and `sessionGenerationSequence`; `session.deleted` retains the deleted generation after live metadata is removed. Listener exceptions are isolated from runs and other listeners. Every accepted queue entry emits `prompt.queued` and exactly one `prompt.finished`. Every accepted steer emits `prompt.steer.accepted` (a steer admitted with its prompt when the run starts, and not at all when the prompt is cancelled or fails before), and `prompt.steer.applied`, after the `message.*` events of its user message, once the run took it in; `run.finished` lists it in `unappliedSteerIds` unless it is in the model context of later turns. Durable promotion additionally emits `prompt.started`, and actual model preparation emits `prompt.running`; cancellation or failure can omit either intermediate event. Existing durable run/message terminal events precede `prompt.finished`. Every callback-backed streamed text part that stays in its message emits exactly one `part.completed` event before the corresponding `run.finished` event: once the model step that streamed it is committed, so its text is final and saved, or with the run's terminal projection when that step did not commit. Text a later model step streams starts a new part. When a model call fails and is retried, the text and reasoning parts it streamed are not in the session: `part.removed` takes each of them out of its message, last part first, and the retry streams its own parts. Its `partIndex` is the part's position before it left; the parts after it move up by one. A removed part has no further events, and `part.removed` does not count against `callbackLimits`. The tool parts of calls the failed model call executed stay. Every `part.started`, `part.delta`, `part.updated`, `part.completed`, and `part.removed` event carries zero-based `messageIndex` and `partIndex` coordinates from the session's authoritative message and part sequences.
|
|
1278
|
+
Events are discriminated, deeply immutable values with one global sequence within each `FlexHarness` instance. Every `IFlexEventBase` carries the exact source `sessionGenerationId` and `sessionGenerationSequence`; `session.deleted` retains the deleted generation after live metadata is removed. Listener exceptions are isolated from runs and other listeners. Every accepted queue entry emits `prompt.queued` and exactly one `prompt.finished`. Every accepted steer emits `prompt.steer.accepted` (a steer admitted with its prompt when the run starts, and not at all when the prompt is cancelled or fails before), and `prompt.steer.applied`, after the `message.*` events of its user message, once the run took it in; `run.finished` lists it in `unappliedSteerIds` unless it is in the model context of later turns. Durable promotion additionally emits `prompt.started`, and actual model preparation emits `prompt.running`; cancellation or failure can omit either intermediate event. Existing durable run/message terminal events precede `prompt.finished`. Every callback-backed streamed text part that stays in its message emits exactly one `part.completed` event before the corresponding `run.finished` event: once the model step that streamed it is committed, so its text is final and saved, or with the run's terminal projection when that step did not commit. Text a later model step streams starts a new part, and so does text a response streams after a tool call. When a model call fails and is retried, the text and reasoning parts it streamed after its last tool call that ran (all of them, when none ran) are not in the session: `part.removed` takes each of them out of its message, last part first, and the retry streams its own parts. The parts before that call stay, and their text completes. Its `partIndex` is the part's position before it left; the parts after it move up by one. A removed part has no further events, and `part.removed` does not count against `callbackLimits`. The tool parts of calls the failed model call executed stay. Every `part.started`, `part.delta`, `part.updated`, `part.completed`, and `part.removed` event carries zero-based `messageIndex` and `partIndex` coordinates from the session's authoritative message and part sequences.
|
|
1268
1279
|
|
|
1269
1280
|
`getSessionView(scopeId, sessionId)` reads a session's metadata, visible messages and pending permission requests in one step, together with the instance's event `sequence` they include. The messages include what a running turn has streamed so far, so a consumer that applies every event of the instance with a greater `sequence` follows the session exactly from the view on; events up to `sequence` are already in it. The read waits while a queued write or a change that emits events for the session is in progress; a session that keeps changing through 64 consecutive waits is refused with `FlexHarnessSessionBusyError`, and the read can be repeated. Session metadata is current: status changes such as `waiting_permission` emit no event. A permission request its run leaves unanswered leaves `pendingPermissions` without an event of its own; the run's `run.finished` follows.
|
|
1270
1281
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -24,6 +24,7 @@ import type {
|
|
|
24
24
|
IProgramCallbackShare,
|
|
25
25
|
} from './interfaces.flexharness.js';
|
|
26
26
|
import type { FlexHarnessCore } from './classes.flexharness.core.js';
|
|
27
|
+
import { toolCallNotStartedMessage } from './utils.flexharness.js';
|
|
27
28
|
|
|
28
29
|
/** How a tool call ended, as its part records it. */
|
|
29
30
|
type TToolPartOutcome = { output: TJsonValue } | { error: string; rejectedPermissionId?: string };
|
|
@@ -39,7 +40,7 @@ export class FlexHarnessRunCallbacks<TScope> {
|
|
|
39
40
|
const run = this.callbackRun(state, sessionId);
|
|
40
41
|
if (!run || !delta) return;
|
|
41
42
|
const lastPart = run.callbackParts.at(-1);
|
|
42
|
-
const openPart = lastPart?.type === 'text' && run.stepPartIds.has(lastPart.partId)
|
|
43
|
+
const openPart = lastPart?.type === 'text' && run.stepPartIds.has(lastPart.partId) && !run.textPartClosed
|
|
43
44
|
? lastPart
|
|
44
45
|
: undefined;
|
|
45
46
|
const created = !openPart;
|
|
@@ -55,6 +56,7 @@ export class FlexHarnessRunCallbacks<TScope> {
|
|
|
55
56
|
if (created) {
|
|
56
57
|
run.callbackParts.push(part);
|
|
57
58
|
run.stepPartIds.add(part.partId);
|
|
59
|
+
run.textPartClosed = false;
|
|
58
60
|
run.partTextUtf8Bytes.set(part.partId, 0);
|
|
59
61
|
this.core.emitPartEvent(run, 'part.started', part);
|
|
60
62
|
}
|
|
@@ -136,7 +138,47 @@ export class FlexHarnessRunCallbacks<TScope> {
|
|
|
136
138
|
if (part.type !== 'text' || !run.stepPartIds.has(part.partId)) continue;
|
|
137
139
|
this.core.emitPartEvent(run, 'part.completed', part);
|
|
138
140
|
}
|
|
141
|
+
// A call the step streamed and that has not started by its commit never starts: the SDK could
|
|
142
|
+
// not parse or repair it, or does not run it. Its part fails, at its place.
|
|
143
|
+
for (const toolCallId of run.stepStreamedCalls.keys()) {
|
|
144
|
+
const part = this.unstartedToolPart(run, toolCallId);
|
|
145
|
+
if (!part) continue;
|
|
146
|
+
const invalid = run.stepInvalidCalls.get(toolCallId);
|
|
147
|
+
part.status = 'failed';
|
|
148
|
+
part.error = invalid === undefined
|
|
149
|
+
? toolCallNotStartedMessage
|
|
150
|
+
: this.core.projectExternalError(run, new Error(invalid), 'toolCallback').message;
|
|
151
|
+
part.completedAt = new Date().toISOString();
|
|
152
|
+
this.core.emitPartEvent(run, 'part.completed', part);
|
|
153
|
+
}
|
|
139
154
|
run.stepPartIds.clear();
|
|
155
|
+
run.stepStreamedCalls.clear();
|
|
156
|
+
run.stepInvalidCalls.clear();
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
/**
|
|
160
|
+
* A streamed tool call: the step's parts so far come before it, its tool part takes its place in
|
|
161
|
+
* the stream now, before the call starts, and text after it starts a new part. The part gets its
|
|
162
|
+
* `startedAt` when the call starts, or leaves the message when a retry drops the call.
|
|
163
|
+
*/
|
|
164
|
+
public onToolCallStreamed(
|
|
165
|
+
state: IStorageState,
|
|
166
|
+
sessionId: string,
|
|
167
|
+
event: { toolCallId: string; toolName: string; input: unknown; invalid?: true; error?: string },
|
|
168
|
+
): void {
|
|
169
|
+
const run = this.callbackRun(state, sessionId);
|
|
170
|
+
if (!run) return;
|
|
171
|
+
run.stepStreamedCalls.set(event.toolCallId, new Set(run.stepPartIds));
|
|
172
|
+
if (event.invalid) run.stepInvalidCalls.set(event.toolCallId, event.error ?? toolCallNotStartedMessage);
|
|
173
|
+
run.textPartClosed = true;
|
|
174
|
+
if (run.toolPartIds.has(event.toolCallId)) return;
|
|
175
|
+
try {
|
|
176
|
+
const call = this.toolPartCall(run, event);
|
|
177
|
+
if (!this.reserveCallbackCapacity(run, 1, jsonBytes(call.input), 1)) return;
|
|
178
|
+
this.startToolPart(run, { ...event, toolName: call.toolName }, call.input, false);
|
|
179
|
+
} catch (error) {
|
|
180
|
+
this.failCallback(run, this.core.projectExternalError(run, error, 'toolCallback'));
|
|
181
|
+
}
|
|
140
182
|
}
|
|
141
183
|
|
|
142
184
|
private textAppendAccounting(
|
|
@@ -173,20 +215,44 @@ export class FlexHarnessRunCallbacks<TScope> {
|
|
|
173
215
|
event: { toolCallId: string; toolName: string; input: unknown; parentToolCallId?: string },
|
|
174
216
|
): void {
|
|
175
217
|
const run = this.callbackRun(state, sessionId);
|
|
176
|
-
if (!run
|
|
218
|
+
if (!run) return;
|
|
219
|
+
const streamed = this.unstartedToolPart(run, event.toolCallId);
|
|
220
|
+
if (!streamed && run.toolPartIds.has(event.toolCallId)) return;
|
|
177
221
|
try {
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
222
|
+
const call = this.toolPartCall(run, event);
|
|
223
|
+
if (streamed) {
|
|
224
|
+
// The part the stream placed: the call starts now, as the name and input it runs with.
|
|
225
|
+
if (!this.reserveCallbackCapacity(run, 1, jsonBytes(call.input) - jsonBytes(streamed.input), 0)) return;
|
|
226
|
+
streamed.toolName = this.core.boundedIdentifier(call.toolName, 'toolName');
|
|
227
|
+
streamed.input = call.input;
|
|
228
|
+
streamed.startedAt = new Date().toISOString();
|
|
229
|
+
this.core.emitPartEvent(run, 'part.updated', streamed);
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
232
|
+
if (!this.reserveCallbackCapacity(run, 1, jsonBytes(call.input), 1)) return;
|
|
233
|
+
this.startToolPart(run, { ...event, toolName: call.toolName }, call.input);
|
|
185
234
|
} catch (error) {
|
|
186
235
|
this.failCallback(run, this.core.projectExternalError(run, error, 'toolCallback'));
|
|
187
236
|
}
|
|
188
237
|
}
|
|
189
238
|
|
|
239
|
+
/** The tool and input a call's part shows: an execute call's are the catalog method's it names. */
|
|
240
|
+
private toolPartCall(run: IActiveRun, event: { toolName: string; input: unknown }): { toolName: string; input: TJsonValue } {
|
|
241
|
+
const target = event.toolName === FLEX_TOOL_CATALOG_TOOL_NAMES.execute
|
|
242
|
+
? run.toolCatalog?.callTarget(event.input)
|
|
243
|
+
: undefined;
|
|
244
|
+
return {
|
|
245
|
+
toolName: target ? target.method : event.toolName,
|
|
246
|
+
input: normalizeJsonValue(target ? target.params : event.input, this.core.toolOutputLimits),
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
/** A streamed call's part whose call has not started yet. */
|
|
251
|
+
private unstartedToolPart(run: IActiveRun, toolCallId: string): IFlexToolMessagePart | undefined {
|
|
252
|
+
const part = this.runningToolPart(run, toolCallId);
|
|
253
|
+
return part && part.startedAt === undefined ? part : undefined;
|
|
254
|
+
}
|
|
255
|
+
|
|
190
256
|
public onToolFinish(
|
|
191
257
|
state: IStorageState,
|
|
192
258
|
sessionId: string,
|
|
@@ -194,7 +260,9 @@ export class FlexHarnessRunCallbacks<TScope> {
|
|
|
194
260
|
): void {
|
|
195
261
|
const run = this.callbackRun(state, sessionId);
|
|
196
262
|
if (!run) return;
|
|
197
|
-
if (!run.toolPartIds.has(event.toolCallId)
|
|
263
|
+
if (!run.toolPartIds.has(event.toolCallId) || this.unstartedToolPart(run, event.toolCallId)) {
|
|
264
|
+
this.onToolStart(state, sessionId, event);
|
|
265
|
+
}
|
|
198
266
|
const part = this.runningToolPart(run, event.toolCallId);
|
|
199
267
|
if (!part) return;
|
|
200
268
|
try {
|
|
@@ -293,6 +361,7 @@ export class FlexHarnessRunCallbacks<TScope> {
|
|
|
293
361
|
run: IActiveRun,
|
|
294
362
|
event: { toolCallId: string; toolName: string; parentToolCallId?: string },
|
|
295
363
|
input: IFlexToolMessagePart['input'],
|
|
364
|
+
started = true,
|
|
296
365
|
): void {
|
|
297
366
|
const part: IFlexToolMessagePart = {
|
|
298
367
|
partId: plugins.crypto.randomUUID(),
|
|
@@ -304,7 +373,7 @@ export class FlexHarnessRunCallbacks<TScope> {
|
|
|
304
373
|
...(event.parentToolCallId === undefined
|
|
305
374
|
? {}
|
|
306
375
|
: { parentToolCallId: this.core.boundedIdentifier(event.parentToolCallId, 'parentToolCallId') }),
|
|
307
|
-
startedAt: new Date().toISOString(),
|
|
376
|
+
...(started ? { startedAt: new Date().toISOString() } : {}),
|
|
308
377
|
};
|
|
309
378
|
run.toolPartIds.set(event.toolCallId, part.partId);
|
|
310
379
|
run.callbackParts.push(part);
|
|
@@ -366,7 +435,7 @@ export class FlexHarnessRunCallbacks<TScope> {
|
|
|
366
435
|
): void {
|
|
367
436
|
let run = this.callbackRun(state, sessionId);
|
|
368
437
|
if (!run) return;
|
|
369
|
-
if (!run.toolPartIds.has(event.toolCallId)) {
|
|
438
|
+
if (!run.toolPartIds.has(event.toolCallId) || this.unstartedToolPart(run, event.toolCallId)) {
|
|
370
439
|
this.onToolStart(state, sessionId, event);
|
|
371
440
|
run = this.callbackRun(state, sessionId);
|
|
372
441
|
if (!run) return;
|
|
@@ -384,14 +453,39 @@ export class FlexHarnessRunCallbacks<TScope> {
|
|
|
384
453
|
}
|
|
385
454
|
|
|
386
455
|
/**
|
|
387
|
-
* Announces a retry
|
|
388
|
-
*
|
|
389
|
-
*
|
|
456
|
+
* Announces a retry. The failed model call keeps what it streamed up to its last tool call that
|
|
457
|
+
* ran (`keptThrough`), as the session does: the step's parts streamed before that call stay, and
|
|
458
|
+
* their text completes as a committed step's does. The step's other text and reasoning parts,
|
|
459
|
+
* and the parts of the calls it streamed but never started, are not in the session, so they are
|
|
460
|
+
* removed first, last part first, each with a `part.removed` event. A call that ran without
|
|
461
|
+
* being streamed came after all of them, so they all stay.
|
|
462
|
+
* Completions and removals are outside the callback limits, so they happen also when the
|
|
463
|
+
* announcement does not fit them: their number is bounded by the run's parts. What the removed
|
|
464
|
+
* parts took of the limits stays taken.
|
|
390
465
|
*/
|
|
391
466
|
public onRetry(state: IStorageState, sessionId: string, retry: plugins.IAgentRetryEvent): void {
|
|
392
467
|
const run = this.callbackRun(state, sessionId);
|
|
393
|
-
if (!run
|
|
468
|
+
if (!run) return;
|
|
469
|
+
const kept = retry.keptThrough === undefined
|
|
470
|
+
? new Set<string>()
|
|
471
|
+
: run.stepStreamedCalls.get(retry.keptThrough) ?? run.stepPartIds;
|
|
472
|
+
// The calls the step streamed but never started are not in the session either. A call that
|
|
473
|
+
// started always stays: the engine has its result before it retries (it retains the early
|
|
474
|
+
// executions first), so its part has `startedAt` and its output.
|
|
475
|
+
const unstarted = new Set([...run.stepStreamedCalls.keys()]
|
|
476
|
+
.flatMap((toolCallId) => this.unstartedToolPart(run, toolCallId)?.partId ?? []));
|
|
477
|
+
for (let partIndex = run.callbackParts.length - 1; partIndex >= 0; partIndex--) {
|
|
478
|
+
const part = run.callbackParts[partIndex]!;
|
|
479
|
+
const dropped = run.stepPartIds.has(part.partId) ? !kept.has(part.partId) : unstarted.has(part.partId);
|
|
480
|
+
if (!dropped) continue;
|
|
481
|
+
this.core.emitPartRemovedEvent(run, part);
|
|
482
|
+
run.callbackParts.splice(partIndex, 1);
|
|
483
|
+
run.partTextUtf8Bytes.delete(part.partId);
|
|
484
|
+
run.stepPartIds.delete(part.partId);
|
|
485
|
+
for (const [toolCallId, partId] of run.toolPartIds) if (partId === part.partId) run.toolPartIds.delete(toolCallId);
|
|
486
|
+
}
|
|
394
487
|
this.onStepCommitted(state, sessionId);
|
|
488
|
+
if (!this.reserveCallbackCapacity(run, 1, 0, 0)) return;
|
|
395
489
|
this.core.emitEvent(run.scopeId, run.stored.session, {
|
|
396
490
|
type: 'run.retrying',
|
|
397
491
|
runId: run.runId,
|