@modelprofile.com/flexharness 10.11.0 → 10.13.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 +21 -2
- package/dist_ts/classes.flexharness.js +430 -63
- package/dist_ts/classes.toolcatalog.d.ts +80 -0
- package/dist_ts/classes.toolcatalog.js +1336 -0
- package/dist_ts/errors.d.ts +5 -0
- package/dist_ts/errors.js +10 -1
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +2 -1
- package/dist_ts/interfaces.d.ts +179 -2
- package/dist_ts/interfaces.js +29 -1
- package/dist_ts/plugins.d.ts +7 -3
- package/dist_ts/plugins.js +7 -3
- package/dist_ts/utils.harnessoptions.d.ts +2 -1
- package/dist_ts/utils.harnessoptions.js +19 -1
- package/dist_ts/utils.json.js +37 -2
- package/dist_ts/utils.schemadeclarations.d.ts +53 -0
- package/dist_ts/utils.schemadeclarations.js +315 -0
- package/dist_ts/utils.sessionmetrics.d.ts +17 -0
- package/dist_ts/utils.sessionmetrics.js +72 -0
- package/package.json +6 -5
- package/readme.md +58 -8
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.flexharness.ts +484 -58
- package/ts/classes.toolcatalog.ts +1431 -0
- package/ts/errors.ts +8 -0
- package/ts/index.ts +1 -0
- package/ts/interfaces.ts +198 -2
- package/ts/plugins.ts +10 -2
- package/ts/readme.md +58 -8
- package/ts/utils.harnessoptions.ts +22 -0
- package/ts/utils.json.ts +33 -1
- package/ts/utils.schemadeclarations.ts +322 -0
- package/ts/utils.sessionmetrics.ts +104 -0
- package/ts_chat_harness/readme.md +1 -1
|
@@ -0,0 +1,315 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Renders JSON Schema as TypeScript declarations for the tool catalog. The output depends only on
|
|
3
|
+
* the schema, so the same schema always renders to the same bytes.
|
|
4
|
+
*/
|
|
5
|
+
const identifierPattern = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
|
|
6
|
+
const maxRenderDepth = 32;
|
|
7
|
+
const maxInlineObjectCharacters = 100;
|
|
8
|
+
const maxSafeInteger = Number.MAX_SAFE_INTEGER;
|
|
9
|
+
export const isSchemaRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
10
|
+
export const isIdentifier = (value) => identifierPattern.test(value);
|
|
11
|
+
const literal = (value) => {
|
|
12
|
+
if (typeof value === 'string')
|
|
13
|
+
return JSON.stringify(value);
|
|
14
|
+
if (typeof value === 'number' && Number.isFinite(value))
|
|
15
|
+
return String(value);
|
|
16
|
+
if (typeof value === 'boolean' || value === null)
|
|
17
|
+
return String(value);
|
|
18
|
+
return 'unknown';
|
|
19
|
+
};
|
|
20
|
+
/**
|
|
21
|
+
* Reports whether `character` occurs outside brackets, braces, parentheses, string literals and
|
|
22
|
+
* comments.
|
|
23
|
+
*/
|
|
24
|
+
const hasTopLevel = (text, character) => {
|
|
25
|
+
let depth = 0;
|
|
26
|
+
let quote;
|
|
27
|
+
for (let index = 0; index < text.length; index++) {
|
|
28
|
+
const current = text[index];
|
|
29
|
+
if (quote) {
|
|
30
|
+
if (current === '\\')
|
|
31
|
+
index++;
|
|
32
|
+
else if (current === quote)
|
|
33
|
+
quote = undefined;
|
|
34
|
+
continue;
|
|
35
|
+
}
|
|
36
|
+
if (current === '/' && text[index + 1] === '*') {
|
|
37
|
+
const end = text.indexOf('*/', index + 2);
|
|
38
|
+
if (end === -1)
|
|
39
|
+
return false;
|
|
40
|
+
index = end + 1;
|
|
41
|
+
continue;
|
|
42
|
+
}
|
|
43
|
+
if (current === '"' || current === "'")
|
|
44
|
+
quote = current;
|
|
45
|
+
else if (current === '{' || current === '[' || current === '(' || current === '<')
|
|
46
|
+
depth++;
|
|
47
|
+
else if (current === '}' || current === ']' || current === ')' || current === '>')
|
|
48
|
+
depth--;
|
|
49
|
+
else if (depth === 0 && current === character)
|
|
50
|
+
return true;
|
|
51
|
+
}
|
|
52
|
+
return false;
|
|
53
|
+
};
|
|
54
|
+
const union = (parts) => {
|
|
55
|
+
const unique = [...new Set(parts)];
|
|
56
|
+
if (unique.includes('unknown'))
|
|
57
|
+
return 'unknown';
|
|
58
|
+
const withoutNever = unique.length > 1 ? unique.filter((part) => part !== 'never') : unique;
|
|
59
|
+
return withoutNever.join(' | ');
|
|
60
|
+
};
|
|
61
|
+
const intersection = (parts) => {
|
|
62
|
+
const unique = [...new Set(parts)].filter((part) => part !== 'unknown');
|
|
63
|
+
if (unique.length === 0)
|
|
64
|
+
return 'unknown';
|
|
65
|
+
return unique.map((part) => hasTopLevel(part, '|') ? `(${part})` : part).join(' & ');
|
|
66
|
+
};
|
|
67
|
+
const arrayOf = (element) => hasTopLevel(element, '|') || hasTopLevel(element, '&') ? `(${element})[]` : `${element}[]`;
|
|
68
|
+
const propertyKey = (name) => isIdentifier(name) ? name : JSON.stringify(name);
|
|
69
|
+
/** A JSDoc block at `indent`; a short single line stays on one line. */
|
|
70
|
+
export const docBlock = (text, indent) => {
|
|
71
|
+
const lines = text.replace(/\*\//g, '*\\/').split('\n').map((line) => line.trimEnd());
|
|
72
|
+
if (lines.length === 1 && indent.length + lines[0].length <= 100)
|
|
73
|
+
return `${indent}/** ${lines[0]} */\n`;
|
|
74
|
+
return `${indent}/**\n${lines.map((line) => line ? `${indent} * ${line}` : `${indent} *`).join('\n')}\n${indent} */\n`;
|
|
75
|
+
};
|
|
76
|
+
export const countOf = (count, unit) => `${count} ${unit}${count === 1 ? '' : 's'}`;
|
|
77
|
+
/** Constraints a TypeScript type cannot state, in a short readable form. */
|
|
78
|
+
const constraintsOf = (schema) => {
|
|
79
|
+
const constraints = [];
|
|
80
|
+
const types = Array.isArray(schema.type) ? schema.type : [schema.type];
|
|
81
|
+
if (types.includes('integer'))
|
|
82
|
+
constraints.push('integer');
|
|
83
|
+
if (typeof schema.format === 'string')
|
|
84
|
+
constraints.push(`format ${schema.format}`);
|
|
85
|
+
const bound = (value) => typeof value === 'number' && Number.isFinite(value) && Math.abs(value) !== maxSafeInteger;
|
|
86
|
+
if (bound(schema.exclusiveMinimum))
|
|
87
|
+
constraints.push(`> ${schema.exclusiveMinimum}`);
|
|
88
|
+
else if (bound(schema.minimum))
|
|
89
|
+
constraints.push(`${schema.exclusiveMinimum === true ? '>' : '>='} ${schema.minimum}`);
|
|
90
|
+
if (bound(schema.exclusiveMaximum))
|
|
91
|
+
constraints.push(`< ${schema.exclusiveMaximum}`);
|
|
92
|
+
else if (bound(schema.maximum))
|
|
93
|
+
constraints.push(`${schema.exclusiveMaximum === true ? '<' : '<='} ${schema.maximum}`);
|
|
94
|
+
if (bound(schema.multipleOf))
|
|
95
|
+
constraints.push(`multiple of ${schema.multipleOf}`);
|
|
96
|
+
const range = (min, max, unit) => {
|
|
97
|
+
const hasMin = bound(min) && min > 0;
|
|
98
|
+
const hasMax = bound(max);
|
|
99
|
+
if (hasMin && hasMax)
|
|
100
|
+
constraints.push(min === max ? countOf(min, unit) : `${min}-${countOf(max, unit)}`);
|
|
101
|
+
else if (hasMin)
|
|
102
|
+
constraints.push(`at least ${countOf(min, unit)}`);
|
|
103
|
+
else if (hasMax)
|
|
104
|
+
constraints.push(`at most ${countOf(max, unit)}`);
|
|
105
|
+
};
|
|
106
|
+
range(schema.minLength, schema.maxLength, 'character');
|
|
107
|
+
range(schema.minItems, schema.maxItems, 'item');
|
|
108
|
+
if (schema.uniqueItems === true)
|
|
109
|
+
constraints.push('unique items');
|
|
110
|
+
if (typeof schema.pattern === 'string')
|
|
111
|
+
constraints.push(`pattern /${schema.pattern}/`);
|
|
112
|
+
if (schema.default !== undefined) {
|
|
113
|
+
const value = JSON.stringify(schema.default);
|
|
114
|
+
if (value !== undefined && value.length <= 60)
|
|
115
|
+
constraints.push(`default ${value}`);
|
|
116
|
+
}
|
|
117
|
+
if (schema.deprecated === true)
|
|
118
|
+
constraints.push('deprecated');
|
|
119
|
+
return constraints;
|
|
120
|
+
};
|
|
121
|
+
/** The documentation of a property: its description and the constraints its type cannot state. */
|
|
122
|
+
export const schemaDoc = (schema, description) => {
|
|
123
|
+
if (!isSchemaRecord(schema))
|
|
124
|
+
return description?.trim() || undefined;
|
|
125
|
+
const text = (description ?? (typeof schema.description === 'string' ? schema.description : '')).trim();
|
|
126
|
+
const constraints = constraintsOf(schema);
|
|
127
|
+
if (constraints.length === 0)
|
|
128
|
+
return text || undefined;
|
|
129
|
+
return text ? `${text} (${constraints.join(', ')})` : constraints.join(', ');
|
|
130
|
+
};
|
|
131
|
+
export class SchemaDeclarationWriter {
|
|
132
|
+
context;
|
|
133
|
+
used = new Set();
|
|
134
|
+
inlining = new Set();
|
|
135
|
+
constructor(context) {
|
|
136
|
+
this.context = context;
|
|
137
|
+
}
|
|
138
|
+
get usedTypes() {
|
|
139
|
+
return [...this.used].sort();
|
|
140
|
+
}
|
|
141
|
+
/** The TypeScript type of `schema`, with continuation lines indented relative to `indent`. */
|
|
142
|
+
type(schema, indent = '', depth = 0, omitMemberDocs = false) {
|
|
143
|
+
if (depth > maxRenderDepth)
|
|
144
|
+
return 'unknown';
|
|
145
|
+
if (schema === true)
|
|
146
|
+
return 'unknown';
|
|
147
|
+
if (schema === false)
|
|
148
|
+
return 'never';
|
|
149
|
+
if (!isSchemaRecord(schema))
|
|
150
|
+
return 'unknown';
|
|
151
|
+
const base = this.baseType(schema, indent, depth, omitMemberDocs);
|
|
152
|
+
return schema.nullable === true ? union([base, 'null']) : base;
|
|
153
|
+
}
|
|
154
|
+
/** The members of an object schema; undefined when the schema is not a plain object type. */
|
|
155
|
+
objectMembers(schema) {
|
|
156
|
+
if (!isSchemaRecord(schema) || !this.isPlainObject(schema))
|
|
157
|
+
return undefined;
|
|
158
|
+
const properties = isSchemaRecord(schema.properties) ? schema.properties : {};
|
|
159
|
+
return Object.entries(properties).map(([name, property]) => {
|
|
160
|
+
const doc = schemaDoc(property);
|
|
161
|
+
return { name, ...(doc === undefined ? {} : { doc }) };
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
/** Whether an object schema requires none of its properties. */
|
|
165
|
+
hasNoRequiredProperties(schema) {
|
|
166
|
+
return isSchemaRecord(schema)
|
|
167
|
+
&& this.isPlainObject(schema)
|
|
168
|
+
&& !(Array.isArray(schema.required) && schema.required.length > 0);
|
|
169
|
+
}
|
|
170
|
+
/** `interface Name { … }` for a plain object schema, otherwise `type Name = …;`. */
|
|
171
|
+
namedDeclaration(name, schema, description) {
|
|
172
|
+
const doc = isSchemaRecord(schema)
|
|
173
|
+
? (description ?? (typeof schema.description === 'string' ? schema.description : undefined))?.trim()
|
|
174
|
+
: description?.trim();
|
|
175
|
+
const prefix = doc ? docBlock(doc, '') : '';
|
|
176
|
+
if (isSchemaRecord(schema) && this.isPlainObject(schema) && schema.nullable !== true) {
|
|
177
|
+
return `${prefix}interface ${name} ${this.objectType(schema, '', 0, false)}`;
|
|
178
|
+
}
|
|
179
|
+
return `${prefix}type ${name} = ${this.type(schema, '', 0)};`;
|
|
180
|
+
}
|
|
181
|
+
isPlainObject(schema) {
|
|
182
|
+
if (schema.$ref !== undefined || 'const' in schema || schema.enum !== undefined)
|
|
183
|
+
return false;
|
|
184
|
+
if (schema.anyOf !== undefined || schema.oneOf !== undefined || schema.allOf !== undefined)
|
|
185
|
+
return false;
|
|
186
|
+
if (schema.type === 'object')
|
|
187
|
+
return true;
|
|
188
|
+
return schema.type === undefined && isSchemaRecord(schema.properties);
|
|
189
|
+
}
|
|
190
|
+
baseType(schema, indent, depth, omitMemberDocs) {
|
|
191
|
+
if (typeof schema.$ref === 'string')
|
|
192
|
+
return this.reference(schema.$ref, indent, depth);
|
|
193
|
+
if ('const' in schema)
|
|
194
|
+
return literal(schema.const);
|
|
195
|
+
if (Array.isArray(schema.enum))
|
|
196
|
+
return schema.enum.length ? union(schema.enum.map(literal)) : 'never';
|
|
197
|
+
const alternatives = Array.isArray(schema.anyOf) ? schema.anyOf : Array.isArray(schema.oneOf) ? schema.oneOf : undefined;
|
|
198
|
+
if (alternatives?.length) {
|
|
199
|
+
return union(alternatives.map((alternative) => this.type(alternative, indent, depth + 1)));
|
|
200
|
+
}
|
|
201
|
+
if (Array.isArray(schema.allOf) && schema.allOf.length) {
|
|
202
|
+
const own = { ...schema };
|
|
203
|
+
delete own.allOf;
|
|
204
|
+
const hasOwnShape = own.type !== undefined || own.properties !== undefined;
|
|
205
|
+
return intersection([
|
|
206
|
+
...schema.allOf.map((part) => this.type(part, indent, depth + 1)),
|
|
207
|
+
...(hasOwnShape ? [this.type(own, indent, depth + 1)] : []),
|
|
208
|
+
]);
|
|
209
|
+
}
|
|
210
|
+
const types = Array.isArray(schema.type)
|
|
211
|
+
? schema.type.filter((type) => typeof type === 'string')
|
|
212
|
+
: typeof schema.type === 'string'
|
|
213
|
+
? [schema.type]
|
|
214
|
+
: this.inferredTypes(schema);
|
|
215
|
+
if (types.length === 0)
|
|
216
|
+
return 'unknown';
|
|
217
|
+
return union(types.map((type) => {
|
|
218
|
+
switch (type) {
|
|
219
|
+
case 'string': return 'string';
|
|
220
|
+
case 'number':
|
|
221
|
+
case 'integer': return 'number';
|
|
222
|
+
case 'boolean': return 'boolean';
|
|
223
|
+
case 'null': return 'null';
|
|
224
|
+
case 'array': return this.arrayType(schema, indent, depth);
|
|
225
|
+
case 'object': return this.objectType(schema, indent, depth, omitMemberDocs);
|
|
226
|
+
default: return 'unknown';
|
|
227
|
+
}
|
|
228
|
+
}));
|
|
229
|
+
}
|
|
230
|
+
inferredTypes(schema) {
|
|
231
|
+
if (schema.properties !== undefined
|
|
232
|
+
|| schema.additionalProperties !== undefined
|
|
233
|
+
|| schema.patternProperties !== undefined
|
|
234
|
+
|| schema.required !== undefined)
|
|
235
|
+
return ['object'];
|
|
236
|
+
if (schema.items !== undefined || schema.prefixItems !== undefined)
|
|
237
|
+
return ['array'];
|
|
238
|
+
return [];
|
|
239
|
+
}
|
|
240
|
+
reference(ref, indent, depth) {
|
|
241
|
+
const name = this.context.namedType(ref);
|
|
242
|
+
if (name) {
|
|
243
|
+
this.used.add(name);
|
|
244
|
+
return name;
|
|
245
|
+
}
|
|
246
|
+
const target = this.context.resolve(ref);
|
|
247
|
+
if (target === undefined || this.inlining.has(ref))
|
|
248
|
+
return 'unknown';
|
|
249
|
+
this.inlining.add(ref);
|
|
250
|
+
try {
|
|
251
|
+
return this.type(target, indent, depth + 1);
|
|
252
|
+
}
|
|
253
|
+
finally {
|
|
254
|
+
this.inlining.delete(ref);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
arrayType(schema, indent, depth) {
|
|
258
|
+
const tuple = Array.isArray(schema.prefixItems)
|
|
259
|
+
? schema.prefixItems
|
|
260
|
+
: Array.isArray(schema.items) ? schema.items : undefined;
|
|
261
|
+
if (tuple) {
|
|
262
|
+
const rest = Array.isArray(schema.prefixItems) ? schema.items : schema.additionalItems;
|
|
263
|
+
const members = tuple.map((item) => this.type(item, indent, depth + 1));
|
|
264
|
+
if (rest !== undefined && rest !== false) {
|
|
265
|
+
members.push(`...${arrayOf(this.type(rest, indent, depth + 1))}`);
|
|
266
|
+
}
|
|
267
|
+
return `[${members.join(', ')}]`;
|
|
268
|
+
}
|
|
269
|
+
if (schema.items === undefined)
|
|
270
|
+
return 'unknown[]';
|
|
271
|
+
return arrayOf(this.type(schema.items, indent, depth + 1));
|
|
272
|
+
}
|
|
273
|
+
objectType(schema, indent, depth, omitMemberDocs) {
|
|
274
|
+
const memberIndent = `${indent} `;
|
|
275
|
+
const properties = isSchemaRecord(schema.properties) ? schema.properties : {};
|
|
276
|
+
const required = new Set(Array.isArray(schema.required)
|
|
277
|
+
? schema.required.filter((name) => typeof name === 'string')
|
|
278
|
+
: []);
|
|
279
|
+
const members = [];
|
|
280
|
+
for (const [name, property] of Object.entries(properties)) {
|
|
281
|
+
const type = this.type(property, memberIndent, depth + 1);
|
|
282
|
+
const doc = omitMemberDocs ? undefined : schemaDoc(property);
|
|
283
|
+
members.push({
|
|
284
|
+
...(doc === undefined ? {} : { doc }),
|
|
285
|
+
text: `${propertyKey(name)}${required.has(name) ? '' : '?'}: ${type}`,
|
|
286
|
+
});
|
|
287
|
+
}
|
|
288
|
+
const indexTypes = [];
|
|
289
|
+
if (isSchemaRecord(schema.patternProperties)) {
|
|
290
|
+
for (const property of Object.values(schema.patternProperties)) {
|
|
291
|
+
indexTypes.push(this.type(property, memberIndent, depth + 1));
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
if (isSchemaRecord(schema.additionalProperties)) {
|
|
295
|
+
indexTypes.push(this.type(schema.additionalProperties, memberIndent, depth + 1));
|
|
296
|
+
}
|
|
297
|
+
else if (schema.additionalProperties === true && members.length > 0) {
|
|
298
|
+
indexTypes.push('unknown');
|
|
299
|
+
}
|
|
300
|
+
if (indexTypes.length)
|
|
301
|
+
members.push({ text: `[key: string]: ${union(indexTypes)}` });
|
|
302
|
+
if (members.length === 0)
|
|
303
|
+
return schema.additionalProperties === false ? '{}' : 'Record<string, unknown>';
|
|
304
|
+
if (members.every((member) => member.doc === undefined && !member.text.includes('\n'))) {
|
|
305
|
+
const inline = `{ ${members.map((member) => member.text).join('; ')} }`;
|
|
306
|
+
if (inline.length <= maxInlineObjectCharacters)
|
|
307
|
+
return inline;
|
|
308
|
+
}
|
|
309
|
+
const lines = members.map((member) => `${member.doc === undefined ? '' : docBlock(member.doc, memberIndent)}${memberIndent}${member.text};`);
|
|
310
|
+
return `{\n${lines.join('\n')}\n${indent}}`;
|
|
311
|
+
}
|
|
312
|
+
}
|
|
313
|
+
/** Indents every non-empty line of `text`. */
|
|
314
|
+
export const indentLines = (text, indent) => text.split('\n').map((line) => line ? `${indent}${line}` : line).join('\n');
|
|
315
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.schemadeclarations.js","sourceRoot":"","sources":["../ts/utils.schemadeclarations.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { IFlexSessionMetrics, IFlexSessionMetricsState, TFlexModelCallUsage } from './interfaces.js';
|
|
2
|
+
/** Fixed-size accumulator. One owner per generation / actual compactor invocation. */
|
|
3
|
+
export interface ISessionMetricsOperation {
|
|
4
|
+
id: string;
|
|
5
|
+
source: 'generation' | 'compaction';
|
|
6
|
+
reportedTokens: number;
|
|
7
|
+
reportedTokensExact: boolean;
|
|
8
|
+
complete: boolean;
|
|
9
|
+
sawCall: boolean;
|
|
10
|
+
lastObservedInputTokens?: number;
|
|
11
|
+
lastObservedInputTokensAt?: string;
|
|
12
|
+
}
|
|
13
|
+
export declare const createSessionMetricsState: (complete: boolean) => IFlexSessionMetricsState;
|
|
14
|
+
export declare const createSessionMetricsOperation: (id: string, source: ISessionMetricsOperation["source"]) => ISessionMetricsOperation;
|
|
15
|
+
export declare function observeSessionMetricsCall(operation: ISessionMetricsOperation, call: TFlexModelCallUsage): void;
|
|
16
|
+
export declare function settleSessionMetricsOperation(metrics: IFlexSessionMetricsState, operation: ISessionMetricsOperation): void;
|
|
17
|
+
export declare function sessionMetricsView(metrics: IFlexSessionMetricsState): IFlexSessionMetrics;
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
export const createSessionMetricsState = (complete) => ({
|
|
2
|
+
reportedLifetimeUsedTokens: 0,
|
|
3
|
+
reportedLifetimeUsedTokensExact: true,
|
|
4
|
+
lifetimeUsageComplete: complete,
|
|
5
|
+
});
|
|
6
|
+
export const createSessionMetricsOperation = (id, source) => ({
|
|
7
|
+
id, source, reportedTokens: 0, reportedTokensExact: true, complete: true, sawCall: false,
|
|
8
|
+
});
|
|
9
|
+
const isTokenCount = (value) => typeof value === 'number' && Number.isSafeInteger(value) && value >= 0;
|
|
10
|
+
/** Saturation is a safe lower bound, never a rounded purported exact total. */
|
|
11
|
+
const addTokens = (left, right) => right > Number.MAX_SAFE_INTEGER - left
|
|
12
|
+
? { tokens: Number.MAX_SAFE_INTEGER, exact: false }
|
|
13
|
+
: { tokens: left + right, exact: true };
|
|
14
|
+
export function observeSessionMetricsCall(operation, call) {
|
|
15
|
+
operation.sawCall = true;
|
|
16
|
+
if (call.status === 'unreported') {
|
|
17
|
+
operation.complete = false;
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
const { usage } = call;
|
|
21
|
+
if (call.usageComplete === false)
|
|
22
|
+
operation.complete = false;
|
|
23
|
+
if (!Object.values(usage).every(isTokenCount)
|
|
24
|
+
|| !isTokenCount(usage.totalTokens)
|
|
25
|
+
|| usage.inputTokens > Number.MAX_SAFE_INTEGER - usage.outputTokens
|
|
26
|
+
|| usage.totalTokens !== usage.inputTokens + usage.outputTokens) {
|
|
27
|
+
operation.complete = false;
|
|
28
|
+
operation.reportedTokensExact = false;
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
const sum = addTokens(operation.reportedTokens, usage.totalTokens);
|
|
32
|
+
operation.reportedTokens = sum.tokens;
|
|
33
|
+
operation.reportedTokensExact &&= sum.exact;
|
|
34
|
+
if (operation.source === 'generation' && call.usageComplete !== false) {
|
|
35
|
+
operation.lastObservedInputTokens = usage.inputTokens;
|
|
36
|
+
operation.lastObservedInputTokensAt = new Date().toISOString();
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
export function settleSessionMetricsOperation(metrics, operation) {
|
|
40
|
+
const key = operation.source === 'generation' ? 'pendingGenerationId' : 'pendingCompactionId';
|
|
41
|
+
if (metrics[key] !== operation.id)
|
|
42
|
+
throw new Error('Session metrics operation ownership changed.');
|
|
43
|
+
const sum = addTokens(metrics.reportedLifetimeUsedTokens, operation.reportedTokens);
|
|
44
|
+
metrics.reportedLifetimeUsedTokens = sum.tokens;
|
|
45
|
+
metrics.reportedLifetimeUsedTokensExact &&= sum.exact && operation.reportedTokensExact;
|
|
46
|
+
metrics.lifetimeUsageComplete &&= operation.complete
|
|
47
|
+
&& metrics.reportedLifetimeUsedTokensExact
|
|
48
|
+
// An arbitrary compactor may make uninstrumented calls. No report is not proof of zero spend.
|
|
49
|
+
&& (operation.source === 'generation' || operation.sawCall);
|
|
50
|
+
if (operation.lastObservedInputTokens !== undefined) {
|
|
51
|
+
metrics.lastObservedInputTokens = operation.lastObservedInputTokens;
|
|
52
|
+
metrics.lastObservedInputTokensAt = operation.lastObservedInputTokensAt;
|
|
53
|
+
}
|
|
54
|
+
delete metrics[key];
|
|
55
|
+
}
|
|
56
|
+
export function sessionMetricsView(metrics) {
|
|
57
|
+
const inFlight = metrics.pendingGenerationId !== undefined || metrics.pendingCompactionId !== undefined;
|
|
58
|
+
const lifetimeUsageComplete = metrics.lifetimeUsageComplete && !inFlight;
|
|
59
|
+
return {
|
|
60
|
+
reportedLifetimeUsedTokens: metrics.reportedLifetimeUsedTokens,
|
|
61
|
+
reportedLifetimeUsedTokensExact: metrics.reportedLifetimeUsedTokensExact,
|
|
62
|
+
lifetimeUsageComplete,
|
|
63
|
+
inFlight,
|
|
64
|
+
...(lifetimeUsageComplete ? { lifetimeUsedTokens: metrics.reportedLifetimeUsedTokens } : {}),
|
|
65
|
+
...(metrics.lastObservedInputTokens === undefined ? {} : {
|
|
66
|
+
lastObservedInputTokens: metrics.lastObservedInputTokens,
|
|
67
|
+
lastObservedInputTokensAt: metrics.lastObservedInputTokensAt,
|
|
68
|
+
lastObservedInputTokensFreshness: 'historical',
|
|
69
|
+
}),
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuc2Vzc2lvbm1ldHJpY3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy91dGlscy5zZXNzaW9ubWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFrQkEsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQUcsQ0FBQyxRQUFpQixFQUE0QixFQUFFLENBQUMsQ0FBQztJQUN6RiwwQkFBMEIsRUFBRSxDQUFDO0lBQzdCLCtCQUErQixFQUFFLElBQUk7SUFDckMscUJBQXFCLEVBQUUsUUFBUTtDQUNoQyxDQUFDLENBQUM7QUFFSCxNQUFNLENBQUMsTUFBTSw2QkFBNkIsR0FBRyxDQUMzQyxFQUFVLEVBQ1YsTUFBMEMsRUFDaEIsRUFBRSxDQUFDLENBQUM7SUFDOUIsRUFBRSxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsQ0FBQyxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxLQUFLO0NBQ3pGLENBQUMsQ0FBQztBQUVILE1BQU0sWUFBWSxHQUFHLENBQUMsS0FBYyxFQUFtQixFQUFFLENBQ3ZELE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxNQUFNLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUssSUFBSSxDQUFDLENBQUM7QUFFekUsK0VBQStFO0FBQy9FLE1BQU0sU0FBUyxHQUFHLENBQUMsSUFBWSxFQUFFLEtBQWEsRUFBc0MsRUFBRSxDQUNwRixLQUFLLEdBQUcsTUFBTSxDQUFDLGdCQUFnQixHQUFHLElBQUk7SUFDcEMsQ0FBQyxDQUFDLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxnQkFBZ0IsRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFO0lBQ25ELENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLEdBQUcsS0FBSyxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQztBQUU1QyxNQUFNLFVBQVUseUJBQXlCLENBQ3ZDLFNBQW1DLEVBQ25DLElB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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": "10.
|
|
5
|
+
"version": "10.13.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",
|
|
@@ -74,15 +74,16 @@
|
|
|
74
74
|
}
|
|
75
75
|
},
|
|
76
76
|
"dependencies": {
|
|
77
|
-
"@
|
|
78
|
-
"@modelprofile.com/flexharness-
|
|
77
|
+
"@cfworker/json-schema": "^4.1.1",
|
|
78
|
+
"@modelprofile.com/flexharness-agent": "10.13.0",
|
|
79
|
+
"@modelprofile.com/flexharness-models": "10.13.0",
|
|
79
80
|
"@push.rocks/smartrequest": "^5.5.1",
|
|
80
81
|
"ai": "^7.0.111",
|
|
81
82
|
"zod": "^4.6.5"
|
|
82
83
|
},
|
|
83
84
|
"peerDependencies": {
|
|
84
85
|
"@modelcontextprotocol/sdk": "^1.29.0",
|
|
85
|
-
"@push.rocks/smartbrowser": "^5.0.0",
|
|
86
|
+
"@push.rocks/smartbrowser": "^5.0.0 || ^6.0.0",
|
|
86
87
|
"@push.rocks/smartpdf": "^6.0.0",
|
|
87
88
|
"sharp": "^0.35.3",
|
|
88
89
|
"puppeteer": "^24.42.0",
|
|
@@ -92,7 +93,7 @@
|
|
|
92
93
|
"lit": "^3.2.0",
|
|
93
94
|
"@types/react": "^19.0.0",
|
|
94
95
|
"@lossless.org/client": "^1.17.0",
|
|
95
|
-
"@design.estate/dees-catalog": "^17.0.0 || ^19.5.0 || ^20.0.0"
|
|
96
|
+
"@design.estate/dees-catalog": "^17.0.0 || ^19.5.0 || ^20.0.0 || ^21.0.0"
|
|
96
97
|
},
|
|
97
98
|
"peerDependenciesMeta": {
|
|
98
99
|
"@modelcontextprotocol/sdk": {
|
package/readme.md
CHANGED
|
@@ -62,7 +62,7 @@ or provider SDKs.
|
|
|
62
62
|
| `/chat` | Portable streaming `ChatSession`, history and usage | None |
|
|
63
63
|
| `/chat/cli` | Ink/React terminal chat | `ink ink-text-input react`; TypeScript: `@types/react` |
|
|
64
64
|
| `/chat/web` | Lit `flexchat-window`, `flexchat-message`, `flexchat-input` | `lit` |
|
|
65
|
-
| `/chat/harness` | `FlexHarnessTranscript` and intents for the `@design.estate/dees-catalog` harness components, browser-safe | `@design.estate/dees-catalog` `^17.0.0 \|\| ^19.5.0 \|\| ^20.0.0` (types only) |
|
|
65
|
+
| `/chat/harness` | `FlexHarnessTranscript` and intents for the `@design.estate/dees-catalog` harness components, browser-safe | `@design.estate/dees-catalog` `^17.0.0 \|\| ^19.5.0 \|\| ^20.0.0 \|\| ^21.0.0` (types only) |
|
|
66
66
|
| `/kvm` | Browser control, terminal framing and OCR observation | `puppeteer` |
|
|
67
67
|
| `/documents` | PDF and image documents, `extractTextFromPdf` | `@push.rocks/smartpdf`; for image documents `sharp` |
|
|
68
68
|
| `/mcp` | MCP clients and AI SDK tool conversion | `@modelcontextprotocol/sdk` |
|
|
@@ -92,6 +92,41 @@ a model backed by its own server transport, or supply `run` in
|
|
|
92
92
|
`IChatSessionOptions`. The web element accepts an `IChatSession` and maintains its
|
|
93
93
|
own subscription. Full Node `AgentSession` remains at the agent package root.
|
|
94
94
|
|
|
95
|
+
## Durable session token metrics
|
|
96
|
+
|
|
97
|
+
Read `await harness.getSessionMetrics(scopeId, sessionId)` for bounded, durable
|
|
98
|
+
accounting independent of transcript visibility. It reads fixed-size projection
|
|
99
|
+
state rather than summing assistant messages or scanning event/archive/child history.
|
|
100
|
+
A warm read joins outstanding projection writes and surfaces accounting failures.
|
|
101
|
+
|
|
102
|
+
| Field | Meaning |
|
|
103
|
+
| --- | --- |
|
|
104
|
+
| `reportedLifetimeUsedTokens` | Sum of durably settled per-call reports. Incomplete accounting makes this a lower bound. |
|
|
105
|
+
| `reportedLifetimeUsedTokensExact` | Whether the sum of those reports is exact; invalid reports and safe-integer overflow make it inexact. |
|
|
106
|
+
| `lifetimeUsageComplete` | Every owned call is accounted for and no accounting operation remains in flight. |
|
|
107
|
+
| `lifetimeUsedTokens` | Present only when the lifetime total is complete. Zero is a valid total. |
|
|
108
|
+
| `inFlight` | A generation or actual compactor invocation has not settled its accounting yet. |
|
|
109
|
+
| `lastObservedInputTokens`, `lastObservedInputTokensAt` | Input count and observation time of the last settled generation call with complete input/output totals. |
|
|
110
|
+
| `lastObservedInputTokensFreshness` | Always `historical`. This is **not** current context size: output, steering, compaction and reversion can change context. |
|
|
111
|
+
|
|
112
|
+
Accounting covers this session's generation calls and reported compaction calls,
|
|
113
|
+
including failure, cancellation and retries. Child sessions own their own spend;
|
|
114
|
+
tool-owned model calls are not included. Do not sum cumulative assistant-message
|
|
115
|
+
usage to reconstruct lifetime spend. Missing/partial reports remain incomplete;
|
|
116
|
+
unsafe totals saturate at `Number.MAX_SAFE_INTEGER` without claiming exactness.
|
|
117
|
+
A compactor that reports no calls cannot prove zero spend.
|
|
118
|
+
|
|
119
|
+
New sessions start complete at zero. Existing/imported sessions with unknown prior
|
|
120
|
+
spend start incomplete. Write-ahead operation markers make interrupted recovery
|
|
121
|
+
conservative: unresolved operations are cleared without certifying their unknown
|
|
122
|
+
spend. Undo, redo, compaction and transcript archiving never subtract lifetime
|
|
123
|
+
spend. Importing visible history does not reconstruct historical billing.
|
|
124
|
+
|
|
125
|
+
Conversational runs that exhaust `maxSteps` with tool work or unseen input remaining
|
|
126
|
+
fail with `FlexHarnessStepLimitError` (`FLEX_STEP_LIMIT`), rather than being marked
|
|
127
|
+
completed with an empty answer. Standalone Agent callers retain tool-only results
|
|
128
|
+
and can inspect `terminationReason: 'model' | 'step-limit'`.
|
|
129
|
+
|
|
95
130
|
## Provider subpaths
|
|
96
131
|
|
|
97
132
|
Install `@modelprofile.com/flexharness-providers` once. Its root exports all provider
|
|
@@ -260,7 +295,7 @@ const harness = new FlexHarness<IProjectScope>({
|
|
|
260
295
|
maxSteps: 8,
|
|
261
296
|
},
|
|
262
297
|
],
|
|
263
|
-
maxSubagentDepth:
|
|
298
|
+
maxSubagentDepth: 6,
|
|
264
299
|
maxSubagentCallsPerRun: 32,
|
|
265
300
|
externalErrorProjector: (_error, context) => ({
|
|
266
301
|
name: 'ModelOperationError',
|
|
@@ -414,12 +449,10 @@ Normal Flex session cleanup always waits in-flight local project operations, the
|
|
|
414
449
|
|
|
415
450
|
## Subagents
|
|
416
451
|
|
|
417
|
-
`subagents` enables the harness-owned `delegate` and `
|
|
452
|
+
`subagents` enables the harness-owned `delegate`, `delegate_result`, and `delegate_send` tools when at least one definition exists and the session depth is below `maxSubagentDepth`. A tool provider cannot replace any enabled built-in; global and agent tool allowlists still intersect to control model-facing exposure. Delegation is asynchronous by default: `delegate` returns `{ taskId, status: 'running', runId }` after durable child admission, so the parent can continue independent work. `delegate_result({ taskId, waitMs? })` reads live status and, once settled, bounded final text and model identity; its optional wait is limited to 240 seconds and observes parent cancellation. Set `foreground: true` to await the final answer in `delegate` itself. Children remain owned by the parent turn: Stop cancels its exact child runs, and the parent joins them before releasing authority and finalizing. A child result enters the parent's next model context as untrusted task data. When the parent's model ends its turn while background children still run, the turn waits for the next child to settle and takes its result in with another step (while steps remain), so a delegated result is never lost because the parent finished first.
|
|
418
453
|
|
|
419
454
|
The model calls it with this exact input shape:
|
|
420
455
|
|
|
421
|
-
When upgrading from 9.x, callers that require the previous synchronous delegate result must pass `foreground: true`. Tool providers must also leave the newly reserved `delegate_result` name available when subagents are enabled.
|
|
422
|
-
|
|
423
456
|
```typescript
|
|
424
457
|
interface IDelegateInput {
|
|
425
458
|
description: string;
|
|
@@ -430,9 +463,24 @@ interface IDelegateInput {
|
|
|
430
463
|
}
|
|
431
464
|
```
|
|
432
465
|
|
|
466
|
+
When upgrading from 9.x, callers that require the previous synchronous delegate result must pass `foreground: true`. Tool providers must also leave the reserved `delegate_result` and `delegate_send` names available when subagents are enabled.
|
|
467
|
+
|
|
468
|
+
`delegate_send({ taskId, prompt })` sends follow-up instructions to a running direct child owned by this exact parent turn. Both fields are required and extra fields are rejected; `taskId` is non-empty and at most 512 UTF-8 bytes, and `prompt` is non-empty and at most 64 KiB. It returns `{ steerId, queueId, runId }` on admission, with a stable steer identity derived from the parent run and tool call. The child takes the input at its next inference boundary, without interrupting a running tool or permission wait. A child waiting to finish while its own descendants run can take the follow-up and continue inference; those descendants keep running. Use `delegate_result` to inspect progress and collect the final answer.
|
|
469
|
+
|
|
470
|
+
Controllers can use the same admission path explicitly:
|
|
471
|
+
|
|
472
|
+
```typescript
|
|
473
|
+
await harness.sendSubagentInput(scopeId, parentSessionId, parentRunId, taskId, {
|
|
474
|
+
steerId: 'follow-up-1',
|
|
475
|
+
prompt: 'Prefer primary sources and include the publication date.',
|
|
476
|
+
});
|
|
477
|
+
```
|
|
478
|
+
|
|
479
|
+
Sending requires the exact active parent run, its currently delegated direct child, matching captured configuration and parent/child generations, and live writable ancestors. It does not authorize a root to skip levels, or infer ownership from immutable creation-origin metadata: a resumed child belongs to the current delegate invocation. Foreign, unowned, stale, cancelled, settled, or ending runs reject; sending never starts an idle generation, restarts a child, or resumes one. General public `steerPrompt()` still forbids child sessions. Child sends share root steering's duplicate rejection, pending count/byte bounds, accepted/applied events, durable user-message application, and terminal unapplied-input accounting.
|
|
480
|
+
|
|
433
481
|
Before creating or resuming a child, FlexHarness requests permission on the parent run with `kind: 'subagent.start'`, the parent `toolCallId`, and separately bounded harness-owned agent/task metadata. Its metadata includes `childSessionId`, the exact ID reserved for this call: FlexHarness derives it deterministically when `taskId` is omitted and copies the supplied candidate when `taskId` is present. A resume also retains that candidate as `taskId`. This block is not truncated by `toolOutputLimits`. The reserved ID binds permission handling before child creation but does not prove that the child exists or is owned: applications must treat the later delegated admission context as authoritative. The controller answers through the normal permission APIs. This request has no `rememberKey`, so `always` is invalid; controllers use `once` or `reject`.
|
|
434
482
|
|
|
435
|
-
Each new invocation creates a durable child `IFlexSession` with immutable `parentSessionId`, origin `parentRunId`, origin `parentToolCallId`, `agent`, and `depth`. New public roots persist `depth: 0`; legacy schema-1 roots may omit it. These fields are harness-owned; public `createSession()`
|
|
483
|
+
Each new invocation creates a durable child `IFlexSession` with immutable `parentSessionId`, origin `parentRunId`, origin `parentToolCallId`, `agent`, and `depth`. New public roots persist `depth: 0`; legacy schema-1 roots may omit it. These fields are harness-owned; public `createSession()` accepts `sessionId`, `sessionGenerationId`, `configurationRef`, and `title`. A child inherits its parent's `configurationRef` and cannot resume under a different reference. Child sessions reject direct `prompt()`, `startPrompt()`, `enqueuePrompt()`, and `schedulePrompt()` calls and run only through the `delegate` tool. The model and tool resolver contexts receive optional immutable `parentSessionId` and `agent` values so integrations can apply agent-specific model and tool policy. Child prompts use the definition's `modelHint`, `system`, and `maxSteps`.
|
|
436
484
|
|
|
437
485
|
The parent tool part receives `childSessionId` as soon as the child is acquired, so a host can offer an authorized live transcript. A foreground call also adds the resolved child model to its part and returns bounded JSON:
|
|
438
486
|
|
|
@@ -485,7 +533,7 @@ Acquisition completes before generation-side branch reversion, context compactio
|
|
|
485
533
|
|
|
486
534
|
For a normally acquired lease, FlexHarness gives `close()` an awaited attempt after AgentSession generation and before canonical accepted, rejected, or interrupted finalization and the terminal `prompt.finished` event. If an abort detaches an acquisition that ignores its signal, the run may settle before acquisition returns; FlexHarness retains that owner and closes any late lease. `close()` must be idempotent and safe to retry after rejection. A close failure prevents successful child acceptance and remains owned by the exact child session generation for retry by later exact-session deletion, scope retirement, or disposal. Retirement and disposal truthfully wait for late acquisition and lease cleanup.
|
|
487
535
|
|
|
488
|
-
Limits are validated and frozen at construction: at most 32 unique definitions; names are non-empty and at most 128 UTF-8 bytes; descriptions 2048 bytes; optional model hints 512 bytes; optional system prompts 64 KiB; and optional `maxSteps` a positive safe integer. `maxSubagentDepth` defaults to
|
|
536
|
+
Limits are validated and frozen at construction: at most 32 unique definitions; names are non-empty and at most 128 UTF-8 bytes; descriptions 2048 bytes; optional model hints 512 bytes; optional system prompts 64 KiB; and optional `maxSteps` a positive safe integer. `maxSubagentDepth` defaults to 6 and must be a positive safe integer at most 8. The root is depth 0, so the default permits six child levels (depths 1 through 6); delegation tools are absent at the configured maximum. `maxSubagentCallsPerRun` defaults to 32 and must be a positive safe integer at most 128. A call slot is consumed synchronously at the start of every schema-valid delegate execution, before semantic bounds, subagent type/depth validation, permission, or child work. Inputs rejected by the tool schema never start delegate execution and do not consume a slot. After successful semantic validation, the child ID candidate is reserved for the rest of the parent run, including after permission rejection or later failure. Permission rejection creates no child session. Omitting `taskId` reserves a deterministic new child ID; supplying `taskId` reserves that unverified candidate and attempts resume after permission only if it identifies a resumable child. Delegate descriptions are non-empty and at most 256 UTF-8 bytes, prompts non-empty and at most 64 KiB, subagent types at most 128 bytes, and task IDs at most 512 bytes.
|
|
489
537
|
|
|
490
538
|
Scope snapshots remain schema 1 and legacy child tombstones without `subagent` provenance continue to load. New child tombstones write the atomic provenance block and reject partial, parent-generation-mismatched, depth-mismatched, or duplicate-origin records. FlexHarness versions before this provenance addition reject that new optional key under their strict reader, so downgrading or mixing old readers with newly written scope snapshots is unsupported.
|
|
491
539
|
|
|
@@ -645,7 +693,7 @@ console.log(result.unappliedSteerIds); // [] once the run took the steer in
|
|
|
645
693
|
|
|
646
694
|
The run takes a steer in at its next step boundary: after the tool results of its current model step are recorded and before its next model call. A running tool call or a pending permission is never interrupted; the steer waits for the boundary that follows it. A steer taken in is a user message of the run (`steerId` set) that the model sees in its next call and every later turn. If the run had already answered, the assistant message that answered is completed and the run answers on in a new assistant message after the steer; a steer taken in before the run answered anything is placed before its still empty assistant message. `IFlexPromptResult.userMessage` stays the prompt and `assistantMessage` is the run's last assistant message. Undo and redo treat the run's messages as one turn.
|
|
647
695
|
|
|
648
|
-
`steerPrompt()` resolves with `{ steerId, queueId, runId }` once the run accepted the steer and `prompt.steer.accepted` was emitted; `prompt.steer.applied` carries the `messageId` of the user message the steer became. Every accepted steer ends in exactly one of two ways: it is in the model context of later turns, or it is listed in `unappliedSteerIds`, in arrival order, on `IFlexPromptResult` and `run.finished`, and on the finished queue entry when that list is not empty. A steer is listed when the run did not take it in before it ended, because its last model step was already running or because it was stopped or failed, and also when the run itself does not stay in context. `keptInContext` on `run.finished` and on the finished queue entry says whether it does: it is `false` for a failed run and for a run stopped before any model output, and such a run lists every steer it accepted, including the ones it took in and reported with `prompt.steer.applied`. Send its prompt and its unapplied steers again to have them answered. The run stops taking steers atomically when its generation ends or `abort()`/`cancelPrompt()` stops it. A steer for a prompt without a running run, or whose run is ending, is refused with `FlexHarnessSteerRejectedError` reason `not-running`; the caller sends it as the next turn instead. Reusing a `steerId` within a run is refused with reason `duplicate`, an unknown `queueId` throws `FlexHarnessNotFoundError`, and
|
|
696
|
+
`steerPrompt()` resolves with `{ steerId, queueId, runId }` once the run accepted the steer and `prompt.steer.accepted` was emitted; `prompt.steer.applied` carries the `messageId` of the user message the steer became. Every accepted steer ends in exactly one of two ways: it is in the model context of later turns, or it is listed in `unappliedSteerIds`, in arrival order, on `IFlexPromptResult` and `run.finished`, and on the finished queue entry when that list is not empty. A steer is listed when the run did not take it in before it ended, because its last model step was already running or because it was stopped or failed, and also when the run itself does not stay in context. `keptInContext` on `run.finished` and on the finished queue entry says whether it does: it is `false` for a failed run and for a run stopped before any model output, and such a run lists every steer it accepted, including the ones it took in and reported with `prompt.steer.applied`. Send its prompt and its unapplied steers again to have them answered. The run stops taking steers atomically when its generation ends or `abort()`/`cancelPrompt()` stops it. A steer for a prompt without a running run, or whose run is ending, is refused with `FlexHarnessSteerRejectedError` reason `not-running`; the caller sends it as the next turn instead. Reusing a `steerId` within a run is refused with reason `duplicate`, an unknown `queueId` throws `FlexHarnessNotFoundError`, and child sessions reject this general API (their exact parent run uses `sendSubagentInput()` or `delegate_send` instead). A run holds at most `maxOutstandingPromptsPerSession` pending steers, and their bytes count against the session's outstanding prompt byte limit until the run takes them in or ends, so `startPrompt()` and `enqueuePrompt()` are refused with `FlexHarnessQueueFullError` while pending steers fill it. They are process-local like queue entries: a process restart ends the run and drops its pending steers, while steers it took in are durable parts of the turn.
|
|
649
697
|
|
|
650
698
|
## Slash Commands
|
|
651
699
|
|
|
@@ -1089,6 +1137,8 @@ Each domain serializes its own mutations. A successful run first persists a hidd
|
|
|
1089
1137
|
|
|
1090
1138
|
Projection stores accept schema version 1, 2, or 3 from `load()`, but every `save()` receives the current schema-3 shape. Schema 3 records explicit reversion protocol, transcript/workspace provenance, and V2 disposition. A terminal V2 segment must be conclusively `revertible`, `no-change`, or `nonrevertible`; a pending V2 capture remains owned by its capture WAL and is never treated as transcript history.
|
|
1091
1139
|
|
|
1140
|
+
Current schema-3 projections also persist optional `metrics` state. Older strict readers that do not recognize this key cannot reopen a projection after metrics have been written; downgrade or mixed-version access to that session is unsupported.
|
|
1141
|
+
|
|
1092
1142
|
A loaded schema-1 projection has no reversion state. Schema-2 `workspaceCaptured` segments migrate as protocol-1 workspace/revertible history without discarding references; transcript-only segments migrate as protocol-1 transcript provenance. Under `workspace-required`, that legacy transcript history is a barrier. The next projection mutation writes schema 3. Custom stores must preserve strict compare-and-swap revisions across schema-1 and schema-2 read-upgrade-write cycles, including uncertain-save reconciliation.
|
|
1093
1143
|
|
|
1094
1144
|
## Migrating From 2.x
|