@modelprofile.com/flexharness 10.24.0 → 10.24.1
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.admission.d.ts +17 -0
- package/dist_ts/classes.flexharness.admission.js +263 -0
- package/dist_ts/classes.flexharness.callbacks.d.ts +38 -0
- package/dist_ts/classes.flexharness.callbacks.js +313 -0
- package/dist_ts/classes.flexharness.compaction.d.ts +25 -0
- package/dist_ts/classes.flexharness.compaction.js +87 -0
- package/dist_ts/classes.flexharness.configurations.d.ts +11 -0
- package/dist_ts/classes.flexharness.configurations.js +137 -0
- package/dist_ts/classes.flexharness.core.d.ts +143 -0
- package/dist_ts/classes.flexharness.core.js +1538 -0
- package/dist_ts/classes.flexharness.d.ts +2 -437
- package/dist_ts/classes.flexharness.deletion.d.ts +31 -0
- package/dist_ts/classes.flexharness.deletion.js +396 -0
- package/dist_ts/classes.flexharness.imports.d.ts +24 -0
- package/dist_ts/classes.flexharness.imports.js +345 -0
- package/dist_ts/classes.flexharness.js +119 -9776
- package/dist_ts/classes.flexharness.lifecycle.d.ts +47 -0
- package/dist_ts/classes.flexharness.lifecycle.js +625 -0
- package/dist_ts/classes.flexharness.permissions.d.ts +19 -0
- package/dist_ts/classes.flexharness.permissions.js +450 -0
- package/dist_ts/classes.flexharness.projects.d.ts +55 -0
- package/dist_ts/classes.flexharness.projects.js +575 -0
- package/dist_ts/classes.flexharness.prompts.d.ts +44 -0
- package/dist_ts/classes.flexharness.prompts.js +659 -0
- package/dist_ts/classes.flexharness.providers.d.ts +18 -0
- package/dist_ts/classes.flexharness.providers.js +267 -0
- package/dist_ts/classes.flexharness.results.d.ts +26 -0
- package/dist_ts/classes.flexharness.results.js +89 -0
- package/dist_ts/classes.flexharness.reversions.d.ts +52 -0
- package/dist_ts/classes.flexharness.reversions.js +1306 -0
- package/dist_ts/classes.flexharness.runs.d.ts +63 -0
- package/dist_ts/classes.flexharness.runs.js +1058 -0
- package/dist_ts/classes.flexharness.sessions.d.ts +20 -0
- package/dist_ts/classes.flexharness.sessions.js +381 -0
- package/dist_ts/classes.flexharness.slashcommands.d.ts +40 -0
- package/dist_ts/classes.flexharness.slashcommands.js +458 -0
- package/dist_ts/classes.flexharness.subagents.d.ts +31 -0
- package/dist_ts/classes.flexharness.subagents.js +690 -0
- package/dist_ts/classes.flexharness.tooldispatch.d.ts +53 -0
- package/dist_ts/classes.flexharness.tooldispatch.js +418 -0
- package/dist_ts/interfaces.flexharness.d.ts +455 -0
- package/dist_ts/interfaces.flexharness.js +2 -0
- package/dist_ts/utils.flexharness.d.ts +19 -0
- package/dist_ts/utils.flexharness.js +83 -0
- package/package.json +3 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.flexharness.admission.ts +331 -0
- package/ts/classes.flexharness.callbacks.ts +352 -0
- package/ts/classes.flexharness.compaction.ts +167 -0
- package/ts/classes.flexharness.configurations.ts +167 -0
- package/ts/classes.flexharness.core.ts +1830 -0
- package/ts/classes.flexharness.deletion.ts +616 -0
- package/ts/classes.flexharness.imports.ts +414 -0
- package/ts/classes.flexharness.lifecycle.ts +786 -0
- package/ts/classes.flexharness.permissions.ts +535 -0
- package/ts/classes.flexharness.projects.ts +1006 -0
- package/ts/classes.flexharness.prompts.ts +857 -0
- package/ts/classes.flexharness.providers.ts +322 -0
- package/ts/classes.flexharness.results.ts +98 -0
- package/ts/classes.flexharness.reversions.ts +1684 -0
- package/ts/classes.flexharness.runs.ts +1204 -0
- package/ts/classes.flexharness.sessions.ts +483 -0
- package/ts/classes.flexharness.slashcommands.ts +705 -0
- package/ts/classes.flexharness.subagents.ts +860 -0
- package/ts/classes.flexharness.tooldispatch.ts +475 -0
- package/ts/classes.flexharness.ts +147 -12567
- package/ts/interfaces.flexharness.ts +517 -0
- package/ts/utils.flexharness.ts +121 -0
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { IFlexToolHandle, IFlexToolProviderContext } from './interfaces.js';
|
|
2
|
+
import type { IStorageState, IActiveRun, IResolverOutcome } from './interfaces.flexharness.js';
|
|
3
|
+
import type { FlexHarnessCore } from './classes.flexharness.core.js';
|
|
4
|
+
/** Tool provider plumbing: run tool handles, resource tool providers and detached cleanups. */
|
|
5
|
+
export declare class FlexHarnessToolProviders<TScope> {
|
|
6
|
+
private readonly core;
|
|
7
|
+
constructor(core: FlexHarnessCore<TScope>);
|
|
8
|
+
normalizeToolHandle(run: IActiveRun, handle: IFlexToolHandle | undefined): IFlexToolHandle | undefined;
|
|
9
|
+
provideRunToolHandle(run: IActiveRun, context: Readonly<IFlexToolProviderContext<TScope>>): Promise<IFlexToolHandle | undefined>;
|
|
10
|
+
private normalizeResourceToolProviderDescriptors;
|
|
11
|
+
closePartialToolHandle(handle: IFlexToolHandle, run: IActiveRun): Promise<void>;
|
|
12
|
+
private retainDetachedCleanup;
|
|
13
|
+
observeDetachedToolProvider(outcome: Promise<IResolverOutcome<IFlexToolHandle | undefined>>, run: IActiveRun): void;
|
|
14
|
+
private trackDetachedCleanup;
|
|
15
|
+
private runDetachedCleanup;
|
|
16
|
+
beginDetachedCleanupSettlement(state: IStorageState): Promise<void>[];
|
|
17
|
+
settleDetachedCleanups(state: IStorageState, attempts: readonly Promise<void>[]): Promise<Error[]>;
|
|
18
|
+
}
|
|
@@ -0,0 +1,267 @@
|
|
|
1
|
+
import { FlexHarnessValidationError } from './errors.js';
|
|
2
|
+
import { requireSessionGeneration, createFlexResourceIdentityDigest, createFlexResourceToolNamespace, createFlexResourceToolName, combineErrors, } from './utils.flexharness.js';
|
|
3
|
+
const maxResourceToolProviders = 128;
|
|
4
|
+
/** Tool provider plumbing: run tool handles, resource tool providers and detached cleanups. */
|
|
5
|
+
export class FlexHarnessToolProviders {
|
|
6
|
+
core;
|
|
7
|
+
constructor(core) {
|
|
8
|
+
this.core = core;
|
|
9
|
+
}
|
|
10
|
+
normalizeToolHandle(run, handle) {
|
|
11
|
+
if (handle === undefined)
|
|
12
|
+
return undefined;
|
|
13
|
+
let close;
|
|
14
|
+
try {
|
|
15
|
+
close = handle.close;
|
|
16
|
+
if (close !== undefined && typeof close !== 'function') {
|
|
17
|
+
throw new FlexHarnessValidationError('Tool handle close must be a function.');
|
|
18
|
+
}
|
|
19
|
+
const tools = handle.tools;
|
|
20
|
+
this.core.runs.assertNoBuiltInToolCollisions(run, tools);
|
|
21
|
+
const catalog = handle.catalog;
|
|
22
|
+
if (catalog !== undefined && (typeof catalog !== 'object' || catalog === null)) {
|
|
23
|
+
throw new FlexHarnessValidationError('Tool handle catalog must be an object.');
|
|
24
|
+
}
|
|
25
|
+
const isReadOnlyToolCall = handle.isReadOnlyToolCall;
|
|
26
|
+
if (isReadOnlyToolCall !== undefined && typeof isReadOnlyToolCall !== 'function') {
|
|
27
|
+
throw new FlexHarnessValidationError('Tool handle isReadOnlyToolCall must be a function.');
|
|
28
|
+
}
|
|
29
|
+
const closeHandle = close;
|
|
30
|
+
return {
|
|
31
|
+
tools,
|
|
32
|
+
...(catalog === undefined ? {} : { catalog }),
|
|
33
|
+
...(isReadOnlyToolCall === undefined ? {} : {
|
|
34
|
+
isReadOnlyToolCall: (call) => isReadOnlyToolCall.call(handle, call),
|
|
35
|
+
}),
|
|
36
|
+
...(closeHandle ? { close: () => closeHandle.call(handle) } : {}),
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
catch (error) {
|
|
40
|
+
if (close)
|
|
41
|
+
this.trackDetachedCleanup(run.state, run, () => close.call(handle));
|
|
42
|
+
throw this.core.projectExternalError(run, error, 'toolProvider');
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
async provideRunToolHandle(run, context) {
|
|
46
|
+
if (!this.core.resourceToolProviderResolver)
|
|
47
|
+
return this.core.toolProvider?.provideTools(context);
|
|
48
|
+
const resolverContext = Object.freeze({
|
|
49
|
+
scopeId: context.scopeId,
|
|
50
|
+
scope: context.scope,
|
|
51
|
+
sessionId: context.sessionId,
|
|
52
|
+
...requireSessionGeneration(run.stored.session),
|
|
53
|
+
runId: context.runId,
|
|
54
|
+
...(context.parentSessionId === undefined ? {} : { parentSessionId: context.parentSessionId }),
|
|
55
|
+
...(context.agent === undefined ? {} : { agent: context.agent }),
|
|
56
|
+
signal: context.signal,
|
|
57
|
+
});
|
|
58
|
+
const resolved = await this.core.resourceToolProviderResolver.resolveResourceToolProviders(resolverContext);
|
|
59
|
+
const descriptors = this.normalizeResourceToolProviderDescriptors(resolved);
|
|
60
|
+
const owned = [];
|
|
61
|
+
const tools = Object.create(null);
|
|
62
|
+
/** The handle and own name of each exposed resource tool, for the handle's classifier. */
|
|
63
|
+
const resourceTools = new Map();
|
|
64
|
+
const closeOwned = async () => {
|
|
65
|
+
const errors = [];
|
|
66
|
+
for (const entry of [...owned].reverse()) {
|
|
67
|
+
if (entry.closed || !entry.handle.close)
|
|
68
|
+
continue;
|
|
69
|
+
try {
|
|
70
|
+
await entry.handle.close();
|
|
71
|
+
entry.closed = true;
|
|
72
|
+
}
|
|
73
|
+
catch (error) {
|
|
74
|
+
errors.push(error);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
if (errors.length > 0)
|
|
78
|
+
throw combineErrors(errors);
|
|
79
|
+
};
|
|
80
|
+
try {
|
|
81
|
+
context.signal.throwIfAborted();
|
|
82
|
+
const applicationHandle = this.normalizeToolHandle(run, await this.core.toolProvider?.provideTools(context));
|
|
83
|
+
if (applicationHandle) {
|
|
84
|
+
owned.push({ handle: applicationHandle, closed: false });
|
|
85
|
+
for (const [toolName, tool] of Object.entries(applicationHandle.tools)) {
|
|
86
|
+
tools[toolName] = tool;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
for (const descriptor of descriptors) {
|
|
90
|
+
context.signal.throwIfAborted();
|
|
91
|
+
const namespace = createFlexResourceToolNamespace(descriptor.resourceId, descriptor.attachmentRevision);
|
|
92
|
+
const resourceIdentity = createFlexResourceIdentityDigest(descriptor.resourceId, descriptor.attachmentRevision);
|
|
93
|
+
const resourceContext = Object.freeze({
|
|
94
|
+
...context,
|
|
95
|
+
requestPermission: (request) => context.requestPermission({
|
|
96
|
+
...request,
|
|
97
|
+
kind: `resource.${resourceIdentity}.${request.kind}`,
|
|
98
|
+
...(request.rememberKey === undefined
|
|
99
|
+
? {}
|
|
100
|
+
: { rememberKey: `resource:${resourceIdentity}:${request.rememberKey}` }),
|
|
101
|
+
metadata: {
|
|
102
|
+
resourceId: descriptor.resourceId,
|
|
103
|
+
attachmentRevision: descriptor.attachmentRevision,
|
|
104
|
+
resourceIdentity,
|
|
105
|
+
toolNamespace: namespace,
|
|
106
|
+
...(request.metadata === undefined ? {} : { providerMetadata: request.metadata }),
|
|
107
|
+
},
|
|
108
|
+
}),
|
|
109
|
+
});
|
|
110
|
+
const handle = this.normalizeToolHandle(run, await descriptor.provider.provideTools(resourceContext));
|
|
111
|
+
if (!handle)
|
|
112
|
+
continue;
|
|
113
|
+
owned.push({ handle, closed: false });
|
|
114
|
+
if (handle.catalog !== undefined) {
|
|
115
|
+
throw new FlexHarnessValidationError('Resource tool providers cannot supply a tool catalog.');
|
|
116
|
+
}
|
|
117
|
+
for (const [toolName, tool] of Object.entries(handle.tools)) {
|
|
118
|
+
const exposedName = createFlexResourceToolName(namespace, toolName);
|
|
119
|
+
if (Object.prototype.hasOwnProperty.call(tools, exposedName)) {
|
|
120
|
+
throw new FlexHarnessValidationError(`Duplicate exposed tool "${exposedName}".`);
|
|
121
|
+
}
|
|
122
|
+
tools[exposedName] = tool;
|
|
123
|
+
resourceTools.set(exposedName, { handle, toolName });
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
if (owned.length === 0 && Object.keys(tools).length === 0)
|
|
127
|
+
return undefined;
|
|
128
|
+
const classifies = applicationHandle?.isReadOnlyToolCall !== undefined
|
|
129
|
+
|| [...resourceTools.values()].some((entry) => entry.handle.isReadOnlyToolCall !== undefined);
|
|
130
|
+
return {
|
|
131
|
+
tools: tools,
|
|
132
|
+
...(applicationHandle?.catalog === undefined ? {} : { catalog: applicationHandle.catalog }),
|
|
133
|
+
...(classifies ? {
|
|
134
|
+
isReadOnlyToolCall: ({ toolName, input }) => {
|
|
135
|
+
const resource = resourceTools.get(toolName);
|
|
136
|
+
return resource
|
|
137
|
+
? resource.handle.isReadOnlyToolCall?.({ toolName: resource.toolName, input }) === true
|
|
138
|
+
: applicationHandle?.isReadOnlyToolCall?.({ toolName, input }) === true;
|
|
139
|
+
},
|
|
140
|
+
} : {}),
|
|
141
|
+
...(owned.some((entry) => entry.handle.close) ? { close: closeOwned } : {}),
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
catch (error) {
|
|
145
|
+
if (owned.some((entry) => entry.handle.close && !entry.closed)) {
|
|
146
|
+
try {
|
|
147
|
+
await this.closePartialToolHandle({ tools: {}, close: closeOwned }, run);
|
|
148
|
+
}
|
|
149
|
+
catch (cleanupError) {
|
|
150
|
+
throw combineErrors([error, cleanupError]);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
throw error;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
normalizeResourceToolProviderDescriptors(descriptors) {
|
|
157
|
+
if (!Array.isArray(descriptors) || descriptors.length > maxResourceToolProviders) {
|
|
158
|
+
throw new FlexHarnessValidationError(`Resource tool providers must be an array with at most ${maxResourceToolProviders} descriptors.`);
|
|
159
|
+
}
|
|
160
|
+
const resourceIds = new Set();
|
|
161
|
+
const namespaces = new Set();
|
|
162
|
+
return descriptors.map((descriptor, index) => {
|
|
163
|
+
if (!descriptor
|
|
164
|
+
|| typeof descriptor !== 'object'
|
|
165
|
+
|| Array.isArray(descriptor)
|
|
166
|
+
|| ![Object.prototype, null].includes(Object.getPrototypeOf(descriptor))) {
|
|
167
|
+
throw new FlexHarnessValidationError(`Resource tool provider descriptor ${index} is invalid.`);
|
|
168
|
+
}
|
|
169
|
+
const unsupported = Object.keys(descriptor).find((key) => !['resourceId', 'attachmentRevision', 'provider'].includes(key));
|
|
170
|
+
if (unsupported) {
|
|
171
|
+
throw new FlexHarnessValidationError(`Resource tool provider descriptor ${index} does not support "${unsupported}".`);
|
|
172
|
+
}
|
|
173
|
+
const resourceId = descriptor.resourceId;
|
|
174
|
+
const attachmentRevision = descriptor.attachmentRevision;
|
|
175
|
+
const provider = descriptor.provider;
|
|
176
|
+
const provideTools = provider?.provideTools;
|
|
177
|
+
const namespace = createFlexResourceToolNamespace(resourceId, attachmentRevision);
|
|
178
|
+
if (resourceIds.has(resourceId)) {
|
|
179
|
+
throw new FlexHarnessValidationError(`Duplicate resourceId "${resourceId}".`);
|
|
180
|
+
}
|
|
181
|
+
if (namespaces.has(namespace)) {
|
|
182
|
+
throw new FlexHarnessValidationError(`Duplicate resource tool namespace "${namespace}".`);
|
|
183
|
+
}
|
|
184
|
+
if (!provider || typeof provideTools !== 'function') {
|
|
185
|
+
throw new FlexHarnessValidationError(`Resource tool provider descriptor ${index} has no tool provider.`);
|
|
186
|
+
}
|
|
187
|
+
resourceIds.add(resourceId);
|
|
188
|
+
namespaces.add(namespace);
|
|
189
|
+
return {
|
|
190
|
+
resourceId,
|
|
191
|
+
attachmentRevision,
|
|
192
|
+
provider: {
|
|
193
|
+
provideTools: (context) => provideTools.call(provider, context),
|
|
194
|
+
},
|
|
195
|
+
};
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
async closePartialToolHandle(handle, run) {
|
|
199
|
+
try {
|
|
200
|
+
await handle.close?.();
|
|
201
|
+
}
|
|
202
|
+
catch (error) {
|
|
203
|
+
const projected = this.core.projectExternalError(run, error, 'toolCleanup');
|
|
204
|
+
this.retainDetachedCleanup(run.state, run, () => handle.close?.(), projected);
|
|
205
|
+
throw projected;
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
retainDetachedCleanup(state, run, cleanup, error) {
|
|
209
|
+
state.detachedCleanups.add({
|
|
210
|
+
cleanup,
|
|
211
|
+
projectError: (cleanupError) => this.core.projectExternalError(run, cleanupError, 'toolCleanup'),
|
|
212
|
+
error,
|
|
213
|
+
});
|
|
214
|
+
}
|
|
215
|
+
observeDetachedToolProvider(outcome, run) {
|
|
216
|
+
this.trackDetachedCleanup(run.state, run, async () => {
|
|
217
|
+
const result = await outcome;
|
|
218
|
+
if (!result.success || result.source !== 'tools' || !result.value)
|
|
219
|
+
return;
|
|
220
|
+
const close = result.value.close;
|
|
221
|
+
if (close !== undefined && typeof close !== 'function') {
|
|
222
|
+
throw new FlexHarnessValidationError('Tool handle close must be a function.');
|
|
223
|
+
}
|
|
224
|
+
await close?.call(result.value);
|
|
225
|
+
});
|
|
226
|
+
}
|
|
227
|
+
trackDetachedCleanup(state, run, cleanup) {
|
|
228
|
+
const retained = {
|
|
229
|
+
cleanup,
|
|
230
|
+
projectError: (error) => this.core.projectExternalError(run, error, 'toolCleanup'),
|
|
231
|
+
};
|
|
232
|
+
state.detachedCleanups.add(retained);
|
|
233
|
+
void this.runDetachedCleanup(state, retained);
|
|
234
|
+
}
|
|
235
|
+
runDetachedCleanup(state, retained) {
|
|
236
|
+
if (retained.completion)
|
|
237
|
+
return retained.completion;
|
|
238
|
+
retained.error = undefined;
|
|
239
|
+
let completion;
|
|
240
|
+
completion = Promise.resolve()
|
|
241
|
+
.then(retained.cleanup)
|
|
242
|
+
.then(() => {
|
|
243
|
+
state.detachedCleanups.delete(retained);
|
|
244
|
+
}, (error) => {
|
|
245
|
+
retained.error = retained.projectError(error);
|
|
246
|
+
})
|
|
247
|
+
.finally(() => {
|
|
248
|
+
if (retained.completion === completion)
|
|
249
|
+
retained.completion = undefined;
|
|
250
|
+
});
|
|
251
|
+
retained.completion = completion;
|
|
252
|
+
return completion;
|
|
253
|
+
}
|
|
254
|
+
beginDetachedCleanupSettlement(state) {
|
|
255
|
+
return [...state.detachedCleanups].map((cleanup) => cleanup.completion ?? this.runDetachedCleanup(state, cleanup));
|
|
256
|
+
}
|
|
257
|
+
async settleDetachedCleanups(state, attempts) {
|
|
258
|
+
await Promise.all(attempts);
|
|
259
|
+
await Promise.all([...state.detachedCleanups]
|
|
260
|
+
.map((cleanup) => cleanup.completion)
|
|
261
|
+
.filter((completion) => completion !== undefined));
|
|
262
|
+
return [...state.detachedCleanups]
|
|
263
|
+
.map((cleanup) => cleanup.error)
|
|
264
|
+
.filter((error) => error !== undefined);
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.flexharness.providers.js","sourceRoot":"","sources":["../ts/classes.flexharness.providers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { type TJsonValue } from './interfaces.js';
|
|
2
|
+
import type { IActiveRun, IResultRead } from './interfaces.flexharness.js';
|
|
3
|
+
import type { FlexHarnessCore } from './classes.flexharness.core.js';
|
|
4
|
+
/** Budgeted tool output: oversized results stored behind result handles and read back by page. */
|
|
5
|
+
export declare class FlexHarnessResults<TScope> {
|
|
6
|
+
private readonly core;
|
|
7
|
+
/** A session's result writes, one at a time: they share the session's index of results. */
|
|
8
|
+
readonly resultQueues: Map<string, Promise<void>>;
|
|
9
|
+
constructor(core: FlexHarnessCore<TScope>);
|
|
10
|
+
/**
|
|
11
|
+
* The output the model gets: the output itself within the output budget, or, in a run with a
|
|
12
|
+
* catalog whose stores keep results, a handle to the stored output with a summary of it.
|
|
13
|
+
*/
|
|
14
|
+
budgetOutput(run: IActiveRun, output: unknown): Promise<TJsonValue>;
|
|
15
|
+
resultQueueKey(storageKey: string, sessionId: string): string;
|
|
16
|
+
/** The JSON bytes of one `results.get` page: the output budget, less room for the page's fields. */
|
|
17
|
+
private resultPageBytes;
|
|
18
|
+
/** One page of a stored result of the run's session, or the error `results.get` reports. */
|
|
19
|
+
readResult(run: IActiveRun, params: IResultRead): Promise<{
|
|
20
|
+
ok: true;
|
|
21
|
+
value: TJsonValue;
|
|
22
|
+
} | {
|
|
23
|
+
ok: false;
|
|
24
|
+
error: TJsonValue;
|
|
25
|
+
}>;
|
|
26
|
+
}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
import { FLEX_RESULT_LIMITS, FLEX_RESULT_METHOD, } from './interfaces.js';
|
|
3
|
+
import { describeShape, resultPage, selectPath, summarizeResult } from './utils.results.js';
|
|
4
|
+
import { normalizeJsonValue } from './utils.json.js';
|
|
5
|
+
import { jsonBytes } from './utils.transfer.js';
|
|
6
|
+
import { queueOperation } from './utils.flexharness.js';
|
|
7
|
+
/** Budgeted tool output: oversized results stored behind result handles and read back by page. */
|
|
8
|
+
export class FlexHarnessResults {
|
|
9
|
+
core;
|
|
10
|
+
/** A session's result writes, one at a time: they share the session's index of results. */
|
|
11
|
+
resultQueues = new Map();
|
|
12
|
+
constructor(core) {
|
|
13
|
+
this.core = core;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* The output the model gets: the output itself within the output budget, or, in a run with a
|
|
17
|
+
* catalog whose stores keep results, a handle to the stored output with a summary of it.
|
|
18
|
+
*/
|
|
19
|
+
async budgetOutput(run, output) {
|
|
20
|
+
const results = this.core.stores.results;
|
|
21
|
+
const maxBytes = this.core.toolOutputLimits.maxBytes;
|
|
22
|
+
if (!results || !run.toolCatalog)
|
|
23
|
+
return normalizeJsonValue(output, this.core.toolOutputLimits);
|
|
24
|
+
const stored = normalizeJsonValue(output, {
|
|
25
|
+
...this.core.toolOutputLimits,
|
|
26
|
+
maxBytes: Math.max(maxBytes, FLEX_RESULT_LIMITS.maxStoredBytes),
|
|
27
|
+
});
|
|
28
|
+
const bytes = jsonBytes(stored);
|
|
29
|
+
if (bytes <= maxBytes)
|
|
30
|
+
return stored;
|
|
31
|
+
const handle = `res_${plugins.crypto.randomBytes(8).toString('hex')}`;
|
|
32
|
+
const read = `Too large to return whole: read it page by page with execute({ method: "${FLEX_RESULT_METHOD}", `
|
|
33
|
+
+ `params: { handle: "${handle}", page: 1 } })${run.toolCatalog.codeMode
|
|
34
|
+
? `, or in run_code with await api.results.get("${handle}", { page: 1 })`
|
|
35
|
+
: ''}; a dotted \`path\` reads a part of it.`;
|
|
36
|
+
const result = {
|
|
37
|
+
$flexType: 'result',
|
|
38
|
+
handle,
|
|
39
|
+
bytes,
|
|
40
|
+
pages: resultPage(stored, '', 1, this.resultPageBytes()).pages,
|
|
41
|
+
summary: summarizeResult(stored, Math.min(FLEX_RESULT_LIMITS.summaryBytes, Math.floor(maxBytes / 4))),
|
|
42
|
+
read,
|
|
43
|
+
};
|
|
44
|
+
// A budget too small for even the handle keeps the truncated output.
|
|
45
|
+
if (jsonBytes(result) > maxBytes)
|
|
46
|
+
return normalizeJsonValue(output, this.core.toolOutputLimits);
|
|
47
|
+
const { storageKey } = run.state;
|
|
48
|
+
await queueOperation(this.resultQueues, this.resultQueueKey(storageKey, run.sessionId), async () => {
|
|
49
|
+
await results.save(storageKey, run.sessionId, handle, stored);
|
|
50
|
+
// The session keeps its latest results; older ones are deleted.
|
|
51
|
+
const handles = await results.list(storageKey, run.sessionId);
|
|
52
|
+
for (const old of handles.slice(0, Math.max(0, handles.length - FLEX_RESULT_LIMITS.maxResultsPerSession))) {
|
|
53
|
+
await results.delete(storageKey, run.sessionId, old);
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
return result;
|
|
57
|
+
}
|
|
58
|
+
resultQueueKey(storageKey, sessionId) {
|
|
59
|
+
return JSON.stringify([storageKey, sessionId]);
|
|
60
|
+
}
|
|
61
|
+
/** The JSON bytes of one `results.get` page: the output budget, less room for the page's fields. */
|
|
62
|
+
resultPageBytes() {
|
|
63
|
+
return Math.max(64, this.core.toolOutputLimits.maxBytes - 512);
|
|
64
|
+
}
|
|
65
|
+
/** One page of a stored result of the run's session, or the error `results.get` reports. */
|
|
66
|
+
async readResult(run, params) {
|
|
67
|
+
const method = FLEX_RESULT_METHOD;
|
|
68
|
+
const stored = await this.core.stores.results.load(run.state.storageKey, run.sessionId, params.handle);
|
|
69
|
+
if (stored === undefined) {
|
|
70
|
+
return { ok: false, error: { error: 'unknown_handle', method, handle: params.handle, hint: `A handle reads one of the latest ${FLEX_RESULT_LIMITS.maxResultsPerSession} results this session stored.` } };
|
|
71
|
+
}
|
|
72
|
+
const path = params.path ?? '';
|
|
73
|
+
const value = selectPath(stored, path);
|
|
74
|
+
if (value === undefined) {
|
|
75
|
+
return { ok: false, error: { error: 'unknown_path', method, path, hint: `The result is ${describeShape(stored)}.` } };
|
|
76
|
+
}
|
|
77
|
+
const page = params.page ?? 1;
|
|
78
|
+
const content = resultPage(value, path, page, this.resultPageBytes());
|
|
79
|
+
if (!content) {
|
|
80
|
+
const pages = resultPage(value, path, 1, this.resultPageBytes()).pages;
|
|
81
|
+
return { ok: false, error: { error: 'unknown_page', method, page, pages } };
|
|
82
|
+
}
|
|
83
|
+
return {
|
|
84
|
+
ok: true,
|
|
85
|
+
value: { handle: params.handle, path, page, pages: content.pages, ...content.range, value: content.value },
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5mbGV4aGFybmVzcy5yZXN1bHRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvY2xhc3Nlcy5mbGV4aGFybmVzcy5yZXN1bHRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFDTCxrQkFBa0IsRUFDbEIsa0JBQWtCLEdBR25CLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUFFLGFBQWEsRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLGVBQWUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzVGLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVoRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHeEQsa0dBQWtHO0FBQ2xHLE1BQU0sT0FBTyxrQkFBa0I7SUFJQTtJQUg3QiwyRkFBMkY7SUFDM0UsWUFBWSxHQUFHLElBQUksR0FBRyxFQUF5QixDQUFDO0lBRWhFLFlBQTZCLElBQTZCO1FBQTdCLFNBQUksR0FBSixJQUFJLENBQXlCO0lBQUcsQ0FBQztJQUU5RDs7O09BR0c7SUFDSSxLQUFLLENBQUMsWUFBWSxDQUFDLEdBQWUsRUFBRSxNQUFlO1FBQ3hELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQztRQUN6QyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFFBQVEsQ0FBQztRQUNyRCxJQUFJLENBQUMsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVc7WUFBRSxPQUFPLGtCQUFrQixDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFDaEcsTUFBTSxNQUFNLEdBQUcs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QUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2IsTUFBTSxLQUFLLEdBQUcsVUFBVSxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBRSxDQUFDLEtBQUssQ0FBQztZQUN4RSxPQUFPLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsRUFBRSxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQztRQUM5RSxDQUFDO1FBQ0QsT0FBTztZQUNMLEVBQUUsRUFBRSxJQUFJO1lBQ1IsS0FBSyxFQUFFLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLE9BQU8sQ0FBQyxLQUFLLEVBQUUsS0FBSyxFQUFFLE9BQU8sQ0FBQyxLQUFLLEVBQUU7U0FDM0csQ0FBQztJQUNKLENBQUM7Q0FDRiJ9
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
import { type IFlexReversionSegment, type IFlexRedoSessionResult, type IFlexSessionReversionInfo, type IFlexSessionTombstone, type IFlexUndoSessionResult } from './interfaces.js';
|
|
3
|
+
import type { TCanonicalOutcome, IStoredSessionState, IReversionGroup, IStorageState, IActiveRun } from './interfaces.flexharness.js';
|
|
4
|
+
import type { FlexHarnessCore } from './classes.flexharness.core.js';
|
|
5
|
+
/** Turn reversion: capture, undo and redo, and the release of reversion state. */
|
|
6
|
+
export declare class FlexHarnessReversions<TScope> {
|
|
7
|
+
private readonly core;
|
|
8
|
+
constructor(core: FlexHarnessCore<TScope>);
|
|
9
|
+
getSessionReversionInfo(scopeId: string, sessionId: string): Promise<IFlexSessionReversionInfo>;
|
|
10
|
+
undoSession(scopeId: string, sessionId: string, signal?: AbortSignal): Promise<IFlexUndoSessionResult>;
|
|
11
|
+
redoSession(scopeId: string, sessionId: string, signal?: AbortSignal): Promise<IFlexRedoSessionResult>;
|
|
12
|
+
reversionUnit(stored: IStoredSessionState, direction: 'undo' | 'redo'): {
|
|
13
|
+
target: IFlexReversionSegment;
|
|
14
|
+
segments: IFlexReversionSegment[];
|
|
15
|
+
toCursor: number;
|
|
16
|
+
} | undefined;
|
|
17
|
+
reversionGroups(stored: IStoredSessionState): IReversionGroup[];
|
|
18
|
+
private requireReversionIdle;
|
|
19
|
+
reversionUnavailableReason(state: IStorageState, stored: IStoredSessionState, allowPendingApply?: boolean, operationSignal?: AbortSignal): Promise<string | undefined>;
|
|
20
|
+
awaitReversionOperation<TResult>(operation: Promise<TResult>, signal?: AbortSignal): Promise<TResult>;
|
|
21
|
+
private changeReversionCursor;
|
|
22
|
+
changeReversionCursorResolved(scopeId: string, sessionId: string, direction: 'undo' | 'redo', scope: TScope, state: IStorageState, signal?: AbortSignal): Promise<string>;
|
|
23
|
+
reconcileContextAvailability(state: IStorageState, stored: IStoredSessionState): Promise<boolean>;
|
|
24
|
+
resumePendingApply(state: IStorageState, stored: IStoredSessionState, scopeId: string, scope: TScope, signal?: AbortSignal): Promise<void>;
|
|
25
|
+
private persistKnownNotApplied;
|
|
26
|
+
recoverPendingCapture(state: IStorageState, stored: IStoredSessionState, scopeId: string, scope: TScope, outcomes: Map<string, TCanonicalOutcome>): Promise<void>;
|
|
27
|
+
reversionId(kind: 'capture' | 'apply', storageKey: string, sessionId: string, value: string): string;
|
|
28
|
+
reversionProviderProtocolVersion(): 1 | 2 | undefined;
|
|
29
|
+
private reversionCaptureContext;
|
|
30
|
+
private withReversionMaintenanceSignal;
|
|
31
|
+
private inspectReversionCapture;
|
|
32
|
+
private finalizeReversionCapture;
|
|
33
|
+
private resolveReversionCaptureOutcome;
|
|
34
|
+
private normalizeReversionReference;
|
|
35
|
+
private normalizeReversionOutcome;
|
|
36
|
+
private normalizeAffectedWorkspaces;
|
|
37
|
+
prepareRunReversion(run: IActiveRun, signal: AbortSignal): Promise<void>;
|
|
38
|
+
finalizeRunReversion(run: IActiveRun, status: 'completed' | 'failed' | 'cancelled'): Promise<void>;
|
|
39
|
+
private applyFinalizedReversionOutcome;
|
|
40
|
+
private hiddenReversionSegments;
|
|
41
|
+
private enqueueReversionRelease;
|
|
42
|
+
private enqueueReversionReleaseReference;
|
|
43
|
+
pruneReversionState(stored: IStoredSessionState, reserveSegment?: boolean, dropNonUndoablePrefix?: boolean): void;
|
|
44
|
+
commitRevertedBranch(state: IStorageState, stored: IStoredSessionState, scopeId: string, scope: TScope): Promise<void>;
|
|
45
|
+
commitRevertedBranchState(stored: IStoredSessionState): boolean;
|
|
46
|
+
commitArchivedHiddenBranchState(stored: IStoredSessionState): boolean;
|
|
47
|
+
refreshAutomaticArchiveHorizon(stored: IStoredSessionState): void;
|
|
48
|
+
filterReversionContextEvents(stored: IStoredSessionState, events: readonly plugins.TAgentEvent[]): plugins.TAgentEvent[];
|
|
49
|
+
drainReversionReleases(state: IStorageState, stored: IStoredSessionState, scopeId: string, scope: TScope, throwOnFailure: boolean): Promise<void>;
|
|
50
|
+
releaseDeletedSessionReversions(state: IStorageState, storageKey: string, tombstone: IFlexSessionTombstone, scopeId: string, scope: TScope, stored?: IStoredSessionState): Promise<void>;
|
|
51
|
+
completedReversionCandidates(stored: IStoredSessionState): IFlexReversionSegment[];
|
|
52
|
+
}
|