@inspectr/mcplab 1.19.0 → 1.20.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/app/assets/index-D1aWsOm8.js +254 -0
- package/dist/app/index.html +1 -1
- package/dist/app-server/app-context.d.ts +1 -10
- package/dist/app-server/app-context.d.ts.map +1 -1
- package/dist/app-server/app-dist.d.ts +8 -0
- package/dist/app-server/app-dist.d.ts.map +1 -0
- package/dist/app-server/app-dist.js +13 -0
- package/dist/app-server/app-dist.js.map +1 -0
- package/dist/app-server/browser-launch.d.ts +8 -0
- package/dist/app-server/browser-launch.d.ts.map +1 -0
- package/dist/app-server/browser-launch.js +15 -0
- package/dist/app-server/browser-launch.js.map +1 -0
- package/dist/app-server/router.d.ts.map +1 -1
- package/dist/app-server/router.js +36 -65
- package/dist/app-server/router.js.map +1 -1
- package/dist/app-server/run-agent-selection.d.ts +6 -0
- package/dist/app-server/run-agent-selection.d.ts.map +1 -0
- package/dist/app-server/run-agent-selection.js +9 -0
- package/dist/app-server/run-agent-selection.js.map +1 -0
- package/dist/app-server/run-queue-domain.d.ts +80 -0
- package/dist/app-server/run-queue-domain.d.ts.map +1 -0
- package/dist/app-server/run-queue-domain.js +396 -0
- package/dist/app-server/run-queue-domain.js.map +1 -0
- package/dist/app-server/run-queue-events.d.ts +16 -0
- package/dist/app-server/run-queue-events.d.ts.map +1 -0
- package/dist/app-server/run-queue-events.js +65 -0
- package/dist/app-server/run-queue-events.js.map +1 -0
- package/dist/app-server/run-queue-executor.d.ts +49 -0
- package/dist/app-server/run-queue-executor.d.ts.map +1 -0
- package/dist/app-server/run-queue-executor.js +443 -0
- package/dist/app-server/run-queue-executor.js.map +1 -0
- package/dist/app-server/run-queue-state.d.ts +58 -0
- package/dist/app-server/run-queue-state.d.ts.map +1 -0
- package/dist/app-server/run-queue-state.js +18 -0
- package/dist/app-server/run-queue-state.js.map +1 -0
- package/dist/app-server/runs-routes.d.ts +3 -38
- package/dist/app-server/runs-routes.d.ts.map +1 -1
- package/dist/app-server/runs-routes.js +18 -721
- package/dist/app-server/runs-routes.js.map +1 -1
- package/dist/app-server/runs-routes.test-helpers.d.ts +47 -0
- package/dist/app-server/runs-routes.test-helpers.d.ts.map +1 -0
- package/dist/app-server/runs-routes.test-helpers.js +107 -0
- package/dist/app-server/runs-routes.test-helpers.js.map +1 -0
- package/dist/app-server/runs-store.d.ts +34 -28
- package/dist/app-server/settings-store.d.ts +1 -0
- package/dist/app-server/settings-store.d.ts.map +1 -1
- package/dist/app-server/settings-store.js +33 -0
- package/dist/app-server/settings-store.js.map +1 -1
- package/dist/app-server/tool-analysis.d.ts.map +1 -1
- package/dist/app-server/tool-analysis.js +1 -7
- package/dist/app-server/tool-analysis.js.map +1 -1
- package/dist/app-server/types.d.ts +1 -0
- package/dist/app-server/types.d.ts.map +1 -1
- package/dist/app-server/version-info.d.ts +11 -0
- package/dist/app-server/version-info.d.ts.map +1 -0
- package/dist/app-server/version-info.js +20 -0
- package/dist/app-server/version-info.js.map +1 -0
- package/dist/app-server/workspace-paths.d.ts +4 -0
- package/dist/app-server/workspace-paths.d.ts.map +1 -0
- package/dist/app-server/workspace-paths.js +11 -0
- package/dist/app-server/workspace-paths.js.map +1 -0
- package/dist/cli.js +1 -0
- package/dist/cli.js.map +1 -1
- package/package.json +5 -5
- package/dist/app/assets/index-DHV4p_lQ.js +0 -254
|
@@ -0,0 +1,443 @@
|
|
|
1
|
+
import { writeFileSync } from 'node:fs';
|
|
2
|
+
import { join, relative } from 'node:path';
|
|
3
|
+
import { applyRuntimeServerOverrides, hashConfig, loadConfig, renderSummaryMarkdown, runAll } from '@inspectr/mcplab-core';
|
|
4
|
+
import { renderReport } from '@inspectr/mcplab-reporting';
|
|
5
|
+
import { OAuthAuthorizationRequiredError } from './oauth-session-manager.js';
|
|
6
|
+
import { readLibraries as readLibrariesFromStore } from './libraries-store.js';
|
|
7
|
+
export function mergeLibraryEntriesIntoConfig(config, libraryAgents, libraryServers) {
|
|
8
|
+
return {
|
|
9
|
+
...config,
|
|
10
|
+
agents: { ...libraryAgents, ...config.agents },
|
|
11
|
+
servers: { ...libraryServers, ...config.servers }
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
export function applyLibraryEntries(loaded, libraryAgents, libraryServers) {
|
|
15
|
+
loaded.config = mergeLibraryEntriesIntoConfig(loaded.config, libraryAgents, libraryServers);
|
|
16
|
+
loaded.hash = hashConfig(loaded.config);
|
|
17
|
+
}
|
|
18
|
+
export function filterScenarioOverridesToSelectedScenarios(selectedConfig, scenarioServerOverrides) {
|
|
19
|
+
if (!scenarioServerOverrides)
|
|
20
|
+
return undefined;
|
|
21
|
+
const selectedIds = new Set(selectedConfig.scenarios.map((scenario) => scenario.id));
|
|
22
|
+
const filtered = Object.fromEntries(Object.entries(scenarioServerOverrides).filter(([scenarioId]) => selectedIds.has(scenarioId)));
|
|
23
|
+
return Object.keys(filtered).length > 0 ? filtered : undefined;
|
|
24
|
+
}
|
|
25
|
+
export function resolveOAuthServersForJob(job, librariesDir) {
|
|
26
|
+
if (job.runParams.oauthServerNames !== undefined)
|
|
27
|
+
return job.runParams.oauthServerNames;
|
|
28
|
+
try {
|
|
29
|
+
const loaded = loadConfig(job.runParams.configPath, { bundleRoot: librariesDir });
|
|
30
|
+
const libraries = readLibrariesFromStore(librariesDir);
|
|
31
|
+
applyLibraryEntries(loaded, libraries.agents, libraries.servers);
|
|
32
|
+
const selected = job.runParams.scenarioIds?.length
|
|
33
|
+
? selectScenarioIdsFromParams(loaded.config, job.runParams)
|
|
34
|
+
: job.runParams.scenarioId
|
|
35
|
+
? selectScenarioIdsFromParams(loaded.config, job.runParams)
|
|
36
|
+
: loaded.config;
|
|
37
|
+
const filteredScenarioOverrides = filterScenarioOverridesToSelectedScenarios(selected, job.runParams.scenarioServerOverrides);
|
|
38
|
+
const withOverrides = applyRuntimeServerOverrides(selected, {
|
|
39
|
+
serverOverrideAll: job.runParams.serverOverrideAll,
|
|
40
|
+
scenarioServerOverrides: filteredScenarioOverrides
|
|
41
|
+
});
|
|
42
|
+
const effectiveServers = new Set(withOverrides.scenarios.flatMap((scenario) => scenario.servers));
|
|
43
|
+
const names = Array.from(effectiveServers).filter((name) => {
|
|
44
|
+
const config = withOverrides.servers?.[name];
|
|
45
|
+
return config?.auth?.type === 'oauth_authorization_code';
|
|
46
|
+
});
|
|
47
|
+
job.runParams.oauthServerNames = names;
|
|
48
|
+
return names;
|
|
49
|
+
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
52
|
+
if (message.includes('Unknown server refs') ||
|
|
53
|
+
message.includes('Unknown scenarios in scenarioServerOverrides') ||
|
|
54
|
+
message.includes('serverOverrideAll must include at least one server id')) {
|
|
55
|
+
throw error;
|
|
56
|
+
}
|
|
57
|
+
console.warn(`[mcplab] Failed to resolve OAuth servers for queued job '${job.id}': ${message}`);
|
|
58
|
+
return [];
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
function selectScenarioIdsFromParams(config, runParams) {
|
|
62
|
+
const ids = runParams.scenarioIds && runParams.scenarioIds.length > 0
|
|
63
|
+
? runParams.scenarioIds
|
|
64
|
+
: runParams.scenarioId
|
|
65
|
+
? [runParams.scenarioId]
|
|
66
|
+
: undefined;
|
|
67
|
+
if (!ids || ids.length === 0)
|
|
68
|
+
return config;
|
|
69
|
+
return {
|
|
70
|
+
...config,
|
|
71
|
+
scenarios: config.scenarios.filter((scenario) => ids.includes(scenario.id))
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
export async function admitQueuedJob(params) {
|
|
75
|
+
const oauthServers = resolveOAuthServersForJob(params.job, params.librariesDir);
|
|
76
|
+
if (oauthServers.length === 0) {
|
|
77
|
+
return { status: 'ready', readyServers: [] };
|
|
78
|
+
}
|
|
79
|
+
const ensureResult = await params.oauthSessionManager.ensureServersAuthorized(oauthServers, params.hostHeader);
|
|
80
|
+
const blockedServers = ensureResult.servers
|
|
81
|
+
.filter((server) => server.status === 'auth_required')
|
|
82
|
+
.map((server) => server.serverName);
|
|
83
|
+
if (blockedServers.length > 0) {
|
|
84
|
+
return { status: 'blocked_auth', blockedServers };
|
|
85
|
+
}
|
|
86
|
+
const readyServers = ensureResult.servers
|
|
87
|
+
.filter((server) => server.status === 'ready')
|
|
88
|
+
.map((server) => `${server.serverName} (${server.debugState ?? 'unknown'})`);
|
|
89
|
+
return { status: 'ready', readyServers };
|
|
90
|
+
}
|
|
91
|
+
export async function executeRunJob(params) {
|
|
92
|
+
const { job, settings, oauthSessionManager, deps } = params;
|
|
93
|
+
const { addJobEvent, getScenarioRunTraceRecords, selectScenarioIds, expandConfigForAgents, resolveRunSelectedAgents, readLibraries, pkgVersion } = deps;
|
|
94
|
+
const { configPath, runsPerScenario, scenarioId, scenarioIds, requestedAgents, runNote, serverOverrideAll, scenarioServerOverrides } = job.runParams;
|
|
95
|
+
try {
|
|
96
|
+
addJobEvent(job, {
|
|
97
|
+
type: 'log',
|
|
98
|
+
ts: new Date().toISOString(),
|
|
99
|
+
payload: { message: `Loading MCP Evaluation config: ${configPath}` }
|
|
100
|
+
});
|
|
101
|
+
const loaded = loadConfig(configPath, { bundleRoot: settings.librariesDir });
|
|
102
|
+
const { agents: libraryAgents, servers: libraryServers } = readLibraries(settings.librariesDir);
|
|
103
|
+
applyLibraryEntries(loaded, libraryAgents, libraryServers);
|
|
104
|
+
addJobEvent(job, {
|
|
105
|
+
type: 'log',
|
|
106
|
+
ts: new Date().toISOString(),
|
|
107
|
+
payload: {
|
|
108
|
+
message: `Loaded config (${loaded.config.scenarios.length} scenario(s), ${Object.keys(loaded.config.agents ?? {}).length} agent(s), ${Object.keys(loaded.config.servers ?? {}).length} server(s))`
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
for (const warning of loaded.warnings ?? []) {
|
|
112
|
+
addJobEvent(job, {
|
|
113
|
+
type: 'log',
|
|
114
|
+
ts: new Date().toISOString(),
|
|
115
|
+
payload: { message: warning }
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
addJobEvent(job, {
|
|
119
|
+
type: 'log',
|
|
120
|
+
ts: new Date().toISOString(),
|
|
121
|
+
payload: {
|
|
122
|
+
message: scenarioIds && scenarioIds.length > 0
|
|
123
|
+
? `Selecting requested scenarios: ${scenarioIds.join(', ')}`
|
|
124
|
+
: scenarioId
|
|
125
|
+
? `Selecting requested scenario: ${scenarioId}`
|
|
126
|
+
: 'Using all scenarios from config'
|
|
127
|
+
}
|
|
128
|
+
});
|
|
129
|
+
const selectedBaseScenarios = selectScenarioIds(loaded.config, scenarioIds && scenarioIds.length > 0 ? scenarioIds : scenarioId ? [scenarioId] : undefined);
|
|
130
|
+
addJobEvent(job, {
|
|
131
|
+
type: 'log',
|
|
132
|
+
ts: new Date().toISOString(),
|
|
133
|
+
payload: {
|
|
134
|
+
message: `Selected ${selectedBaseScenarios.scenarios.length} base scenario(s)`
|
|
135
|
+
}
|
|
136
|
+
});
|
|
137
|
+
const filteredScenarioOverrides = filterScenarioOverridesToSelectedScenarios(selectedBaseScenarios, scenarioServerOverrides);
|
|
138
|
+
const runtimeOverriddenConfig = applyRuntimeServerOverrides(selectedBaseScenarios, {
|
|
139
|
+
serverOverrideAll,
|
|
140
|
+
scenarioServerOverrides: filteredScenarioOverrides
|
|
141
|
+
});
|
|
142
|
+
const effectiveConfigHash = hashConfig(runtimeOverriddenConfig);
|
|
143
|
+
addJobEvent(job, {
|
|
144
|
+
type: 'log',
|
|
145
|
+
ts: new Date().toISOString(),
|
|
146
|
+
payload: {
|
|
147
|
+
message: `Applied runtime server overrides: global=${serverOverrideAll?.length ?? 0} scenario-specific=${Object.keys(filteredScenarioOverrides ?? {}).length}`
|
|
148
|
+
}
|
|
149
|
+
});
|
|
150
|
+
const effectiveScenarioServers = runtimeOverriddenConfig.scenarios
|
|
151
|
+
.map((scenario) => `${scenario.id}=[${scenario.servers.join(', ')}]`)
|
|
152
|
+
.join('; ');
|
|
153
|
+
addJobEvent(job, {
|
|
154
|
+
type: 'log',
|
|
155
|
+
ts: new Date().toISOString(),
|
|
156
|
+
payload: {
|
|
157
|
+
message: `Effective MCP servers per scenario: ${effectiveScenarioServers || '(none)'}`
|
|
158
|
+
}
|
|
159
|
+
});
|
|
160
|
+
const resolvedAgents = resolveRunSelectedAgents(runtimeOverriddenConfig, requestedAgents);
|
|
161
|
+
addJobEvent(job, {
|
|
162
|
+
type: 'log',
|
|
163
|
+
ts: new Date().toISOString(),
|
|
164
|
+
payload: {
|
|
165
|
+
message: requestedAgents && requestedAgents.length > 0
|
|
166
|
+
? `Using requested agents: ${resolvedAgents.join(', ')}`
|
|
167
|
+
: runtimeOverriddenConfig.run_defaults?.selected_agents &&
|
|
168
|
+
runtimeOverriddenConfig.run_defaults.selected_agents.length > 0
|
|
169
|
+
? `Using run default agents: ${resolvedAgents.join(', ')}`
|
|
170
|
+
: `Using config-declared agents: ${resolvedAgents.join(', ')}`
|
|
171
|
+
}
|
|
172
|
+
});
|
|
173
|
+
const expandedConfig = expandConfigForAgents(runtimeOverriddenConfig, resolvedAgents);
|
|
174
|
+
addJobEvent(job, {
|
|
175
|
+
type: 'log',
|
|
176
|
+
ts: new Date().toISOString(),
|
|
177
|
+
payload: {
|
|
178
|
+
message: `Expanded to ${expandedConfig.scenarios.length} executable scenario run(s) across selected agents`
|
|
179
|
+
}
|
|
180
|
+
});
|
|
181
|
+
const usedServerNames = new Set(expandedConfig.scenarios.flatMap((scenario) => scenario.servers));
|
|
182
|
+
const oauthServers = Array.from(usedServerNames).filter((serverName) => expandedConfig.servers[serverName]?.auth?.type === 'oauth_authorization_code');
|
|
183
|
+
const oauthServerSet = new Set(oauthServers);
|
|
184
|
+
const mcpServerAuthHeaders = oauthServers.length > 0
|
|
185
|
+
? await oauthSessionManager.getAuthHeadersForServers(oauthServers, undefined)
|
|
186
|
+
: undefined;
|
|
187
|
+
if (oauthServers.length > 0) {
|
|
188
|
+
addJobEvent(job, {
|
|
189
|
+
type: 'log',
|
|
190
|
+
ts: new Date().toISOString(),
|
|
191
|
+
payload: {
|
|
192
|
+
message: `OAuth runtime credentials resolved for server(s): ${oauthServers.join(', ')}`
|
|
193
|
+
}
|
|
194
|
+
});
|
|
195
|
+
}
|
|
196
|
+
addJobEvent(job, {
|
|
197
|
+
type: 'log',
|
|
198
|
+
ts: new Date().toISOString(),
|
|
199
|
+
payload: {
|
|
200
|
+
message: `Running evaluation (${runsPerScenario} run(s) per scenario) ...`
|
|
201
|
+
}
|
|
202
|
+
});
|
|
203
|
+
if (runNote) {
|
|
204
|
+
addJobEvent(job, {
|
|
205
|
+
type: 'log',
|
|
206
|
+
ts: new Date().toISOString(),
|
|
207
|
+
payload: { message: `Run note: ${runNote}` }
|
|
208
|
+
});
|
|
209
|
+
}
|
|
210
|
+
const { runDir, results } = await runAll(expandedConfig, {
|
|
211
|
+
runsPerScenario,
|
|
212
|
+
scenarioId,
|
|
213
|
+
runNote,
|
|
214
|
+
configHash: effectiveConfigHash,
|
|
215
|
+
cliVersion: pkgVersion,
|
|
216
|
+
runsDir: settings.runsDir,
|
|
217
|
+
cwd: settings.workspaceRoot,
|
|
218
|
+
mcpServerAuthHeaders,
|
|
219
|
+
resolveMcpServerAuthHeaders: oauthServers.length > 0
|
|
220
|
+
? async (serverNames, options) => {
|
|
221
|
+
if (options?.signal?.aborted)
|
|
222
|
+
return {};
|
|
223
|
+
const namesToRefresh = serverNames.filter((name) => oauthServerSet.has(name));
|
|
224
|
+
if (namesToRefresh.length === 0)
|
|
225
|
+
return {};
|
|
226
|
+
return oauthSessionManager.getAuthHeadersForServers(namesToRefresh);
|
|
227
|
+
}
|
|
228
|
+
: undefined,
|
|
229
|
+
signal: job.abortController.signal,
|
|
230
|
+
onProgress: async (event) => {
|
|
231
|
+
const message = formatRunProgressMessage(event);
|
|
232
|
+
if (!message)
|
|
233
|
+
return;
|
|
234
|
+
addJobEvent(job, {
|
|
235
|
+
type: 'log',
|
|
236
|
+
ts: new Date().toISOString(),
|
|
237
|
+
payload: { message }
|
|
238
|
+
});
|
|
239
|
+
}
|
|
240
|
+
});
|
|
241
|
+
const relativeConfigPathRaw = relative(settings.evalsDir, configPath);
|
|
242
|
+
const relativeConfigPath = relativeConfigPathRaw.replace(/\\/g, '/').replace(/^\.\/+/, '');
|
|
243
|
+
results.metadata.config_path = relativeConfigPath || configPath;
|
|
244
|
+
if (loaded.config.name && loaded.config.name.trim().length > 0) {
|
|
245
|
+
results.metadata.config_name = loaded.config.name.trim();
|
|
246
|
+
}
|
|
247
|
+
// Persist the fully resolved agent set so reruns replay the original execution scope exactly.
|
|
248
|
+
results.metadata.rerun_agents = [...resolvedAgents];
|
|
249
|
+
results.metadata.rerun_scenario_ids = selectedBaseScenarios.scenarios.map((scenario) => scenario.id);
|
|
250
|
+
if (serverOverrideAll && serverOverrideAll.length > 0) {
|
|
251
|
+
results.metadata.rerun_server_override_all = [...serverOverrideAll];
|
|
252
|
+
}
|
|
253
|
+
else {
|
|
254
|
+
delete results.metadata.rerun_server_override_all;
|
|
255
|
+
}
|
|
256
|
+
if (filteredScenarioOverrides && Object.keys(filteredScenarioOverrides).length > 0) {
|
|
257
|
+
results.metadata.rerun_scenario_server_overrides = Object.fromEntries(Object.entries(filteredScenarioOverrides).map(([scenarioKey, serverIds]) => [
|
|
258
|
+
scenarioKey,
|
|
259
|
+
[...serverIds]
|
|
260
|
+
]));
|
|
261
|
+
}
|
|
262
|
+
else {
|
|
263
|
+
delete results.metadata.rerun_scenario_server_overrides;
|
|
264
|
+
}
|
|
265
|
+
addJobEvent(job, {
|
|
266
|
+
type: 'log',
|
|
267
|
+
ts: new Date().toISOString(),
|
|
268
|
+
payload: {
|
|
269
|
+
message: `Evaluation execution finished (run id: ${results.metadata.run_id})`
|
|
270
|
+
}
|
|
271
|
+
});
|
|
272
|
+
addJobEvent(job, {
|
|
273
|
+
type: 'log',
|
|
274
|
+
ts: new Date().toISOString(),
|
|
275
|
+
payload: { message: `Writing results to ${runDir}` }
|
|
276
|
+
});
|
|
277
|
+
const traceRecords = getScenarioRunTraceRecords(results.metadata.run_id, settings.runsDir);
|
|
278
|
+
results.metadata.tool_tokens_total = estimateRunToolTokensTotal(traceRecords);
|
|
279
|
+
writeFileSync(join(runDir, 'results.json'), `${JSON.stringify(results, null, 2)}\n`, 'utf8');
|
|
280
|
+
writeFileSync(join(runDir, 'report.html'), renderReport(results), 'utf8');
|
|
281
|
+
writeFileSync(join(runDir, 'summary.md'), renderSummaryMarkdown(results), 'utf8');
|
|
282
|
+
addJobEvent(job, {
|
|
283
|
+
type: 'log',
|
|
284
|
+
ts: new Date().toISOString(),
|
|
285
|
+
payload: {
|
|
286
|
+
message: `Run finished: ${results.summary.total_runs} run(s), pass rate ${Math.round(results.summary.pass_rate * 100)}%`
|
|
287
|
+
}
|
|
288
|
+
});
|
|
289
|
+
addJobEvent(job, {
|
|
290
|
+
type: 'completed',
|
|
291
|
+
ts: new Date().toISOString(),
|
|
292
|
+
payload: {
|
|
293
|
+
runId: results.metadata.run_id,
|
|
294
|
+
runDir,
|
|
295
|
+
summary: results.summary
|
|
296
|
+
}
|
|
297
|
+
});
|
|
298
|
+
return { status: 'completed' };
|
|
299
|
+
}
|
|
300
|
+
catch (error) {
|
|
301
|
+
if (error instanceof OAuthAuthorizationRequiredError) {
|
|
302
|
+
const blockedServers = Array.from(new Set(error.details
|
|
303
|
+
.map((detail) => detail.serverName)
|
|
304
|
+
.filter((serverName) => typeof serverName === 'string')));
|
|
305
|
+
let fallbackBlockedServers = blockedServers;
|
|
306
|
+
if (fallbackBlockedServers.length === 0) {
|
|
307
|
+
try {
|
|
308
|
+
fallbackBlockedServers = resolveOAuthServersForJob(job, settings.librariesDir);
|
|
309
|
+
}
|
|
310
|
+
catch {
|
|
311
|
+
fallbackBlockedServers = [];
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
const aborted = job.abortController.signal.aborted || job.status === 'stopped';
|
|
315
|
+
if (!aborted && fallbackBlockedServers.length > 0) {
|
|
316
|
+
return { status: 'blocked_auth', blockedServers: fallbackBlockedServers };
|
|
317
|
+
}
|
|
318
|
+
}
|
|
319
|
+
const normalizedError = error instanceof OAuthAuthorizationRequiredError
|
|
320
|
+
? new Error(error.details[0]?.message || error.message)
|
|
321
|
+
: error;
|
|
322
|
+
const aborted = job.abortController.signal.aborted || job.status === 'stopped';
|
|
323
|
+
addJobEvent(job, {
|
|
324
|
+
type: 'error',
|
|
325
|
+
ts: new Date().toISOString(),
|
|
326
|
+
payload: {
|
|
327
|
+
message: aborted
|
|
328
|
+
? 'Run aborted by user'
|
|
329
|
+
: normalizedError instanceof Error
|
|
330
|
+
? normalizedError.message
|
|
331
|
+
: String(normalizedError)
|
|
332
|
+
}
|
|
333
|
+
});
|
|
334
|
+
return { status: aborted ? 'stopped' : 'error' };
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
function splitInteger(total, parts) {
|
|
338
|
+
if (!Number.isFinite(total) || !parts || parts <= 0)
|
|
339
|
+
return Array(parts).fill(0);
|
|
340
|
+
const safeTotal = Math.max(0, Math.round(total ?? 0));
|
|
341
|
+
const base = Math.floor(safeTotal / parts);
|
|
342
|
+
let remainder = safeTotal % parts;
|
|
343
|
+
return Array.from({ length: parts }, () => {
|
|
344
|
+
const value = base + (remainder > 0 ? 1 : 0);
|
|
345
|
+
if (remainder > 0)
|
|
346
|
+
remainder -= 1;
|
|
347
|
+
return value;
|
|
348
|
+
});
|
|
349
|
+
}
|
|
350
|
+
function estimateRunToolTokensTotal(records) {
|
|
351
|
+
let total = 0;
|
|
352
|
+
let hasAny = false;
|
|
353
|
+
for (const record of records) {
|
|
354
|
+
const toolUsesById = new Map();
|
|
355
|
+
for (const message of record.messages ?? []) {
|
|
356
|
+
const toolUses = message.content.filter((block) => block.type === 'tool_use');
|
|
357
|
+
if (toolUses.length > 0) {
|
|
358
|
+
for (const toolUse of toolUses)
|
|
359
|
+
toolUsesById.set(toolUse.id, toolUse.name);
|
|
360
|
+
const allEstimated = toolUses.every((toolUse) => Boolean(toolUse.estimated_tokens));
|
|
361
|
+
if (allEstimated) {
|
|
362
|
+
for (const toolUse of toolUses)
|
|
363
|
+
total += toolUse.estimated_tokens?.total ?? 0;
|
|
364
|
+
hasAny = true;
|
|
365
|
+
}
|
|
366
|
+
else if (toolUses.length === 1 && typeof message.usage?.total_tokens === 'number') {
|
|
367
|
+
total += message.usage.total_tokens;
|
|
368
|
+
hasAny = true;
|
|
369
|
+
}
|
|
370
|
+
else {
|
|
371
|
+
const shares = splitInteger(message.usage?.total_tokens, toolUses.length);
|
|
372
|
+
total += shares.reduce((sum, value) => sum + value, 0);
|
|
373
|
+
if (typeof message.usage?.total_tokens === 'number')
|
|
374
|
+
hasAny = true;
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
const toolResults = message.content.filter((block) => block.type === 'tool_result');
|
|
378
|
+
if (toolResults.length === 0)
|
|
379
|
+
continue;
|
|
380
|
+
const allEstimated = toolResults.every((result) => Boolean(result.estimated_tokens));
|
|
381
|
+
if (allEstimated) {
|
|
382
|
+
for (const result of toolResults)
|
|
383
|
+
total += result.estimated_tokens?.total ?? 0;
|
|
384
|
+
hasAny = true;
|
|
385
|
+
continue;
|
|
386
|
+
}
|
|
387
|
+
if (toolResults.length === 1) {
|
|
388
|
+
const [result] = toolResults;
|
|
389
|
+
if (result &&
|
|
390
|
+
toolUsesById.has(result.tool_use_id) &&
|
|
391
|
+
typeof message.usage?.total_tokens === 'number') {
|
|
392
|
+
total += message.usage.total_tokens;
|
|
393
|
+
hasAny = true;
|
|
394
|
+
continue;
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
const knownResults = toolResults.filter((result) => toolUsesById.has(result.tool_use_id));
|
|
398
|
+
if (knownResults.length === 0)
|
|
399
|
+
continue;
|
|
400
|
+
const shares = splitInteger(message.usage?.total_tokens, knownResults.length);
|
|
401
|
+
total += shares.reduce((sum, value) => sum + value, 0);
|
|
402
|
+
if (typeof message.usage?.total_tokens === 'number')
|
|
403
|
+
hasAny = true;
|
|
404
|
+
}
|
|
405
|
+
}
|
|
406
|
+
return hasAny ? total : null;
|
|
407
|
+
}
|
|
408
|
+
function formatRunProgressMessage(event) {
|
|
409
|
+
switch (event.type) {
|
|
410
|
+
case 'run_started':
|
|
411
|
+
return `Run initialized (id: ${event.runId}, ${event.totalScenarioRuns} scenario run(s))`;
|
|
412
|
+
case 'mcp_connect_started':
|
|
413
|
+
return `Connecting to ${event.serverCount} MCP server(s): ${event.serverNames.join(', ')} ...`;
|
|
414
|
+
case 'mcp_connect_finished':
|
|
415
|
+
return `Connected to ${event.serverCount} MCP server(s): ${event.serverNames.join(', ')}`;
|
|
416
|
+
case 'scenario_run_started':
|
|
417
|
+
return `Scenario ${event.scenarioRunIndex}/${event.totalScenarioRuns} started: ${event.scenarioId} [agent=${event.agentName}, run=${event.runIndex + 1}/${event.runsPerScenario}]`;
|
|
418
|
+
case 'scenario_run_finished':
|
|
419
|
+
return `Scenario ${event.scenarioRunIndex}/${event.totalScenarioRuns} finished: ${event.scenarioId} [agent=${event.agentName}] -> ${event.pass ? 'PASS' : 'FAIL'} (${event.toolCallCount} tool call(s))`;
|
|
420
|
+
case 'agent_progress': {
|
|
421
|
+
const p = event.event;
|
|
422
|
+
switch (p.type) {
|
|
423
|
+
case 'llm_request_started':
|
|
424
|
+
return `LLM turn ${p.turn + 1} started for ${p.scenarioId} [${p.agentName}] (${p.provider}/${p.model})`;
|
|
425
|
+
case 'llm_response_received':
|
|
426
|
+
return `LLM turn ${p.turn + 1} response for ${p.scenarioId} [${p.agentName}] (text=${p.hasText ? 'yes' : 'no'}, tool_calls=${p.toolCallCount})`;
|
|
427
|
+
case 'tool_call_started':
|
|
428
|
+
return `Tool call started: ${p.server}.${p.tool} (turn ${p.turn + 1})`;
|
|
429
|
+
case 'tool_call_finished':
|
|
430
|
+
return `Tool call ${p.ok ? 'finished' : 'failed'}: ${p.server}.${p.tool} in ${p.durationMs}ms`;
|
|
431
|
+
case 'final_answer':
|
|
432
|
+
return `Final answer produced for ${p.scenarioId} [${p.agentName}] (text=${p.hasText ? 'yes' : 'no'})`;
|
|
433
|
+
default:
|
|
434
|
+
return null;
|
|
435
|
+
}
|
|
436
|
+
}
|
|
437
|
+
case 'run_finished':
|
|
438
|
+
return `Run finished (id: ${event.runId})`;
|
|
439
|
+
default:
|
|
440
|
+
return null;
|
|
441
|
+
}
|
|
442
|
+
}
|
|
443
|
+
//# sourceMappingURL=run-queue-executor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-queue-executor.js","sourceRoot":"","sources":["../../src/app-server/run-queue-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import type { ServerResponse } from 'node:http';
|
|
2
|
+
import type { SseEvent } from './jobs.js';
|
|
3
|
+
export type RunParams = {
|
|
4
|
+
configPath: string;
|
|
5
|
+
runsPerScenario: number;
|
|
6
|
+
scenarioId?: string;
|
|
7
|
+
scenarioIds?: string[];
|
|
8
|
+
requestedAgents?: string[];
|
|
9
|
+
runNote?: string;
|
|
10
|
+
oauthServerNames?: string[];
|
|
11
|
+
serverOverrideAll?: string[];
|
|
12
|
+
scenarioServerOverrides?: Record<string, string[]>;
|
|
13
|
+
};
|
|
14
|
+
export type RunJobStatus =
|
|
15
|
+
| 'queued'
|
|
16
|
+
| 'blocked_auth'
|
|
17
|
+
| 'running'
|
|
18
|
+
| 'stopped'
|
|
19
|
+
| 'completed'
|
|
20
|
+
| 'error';
|
|
21
|
+
export type RunJob = {
|
|
22
|
+
id: string;
|
|
23
|
+
status: RunJobStatus;
|
|
24
|
+
events: SseEvent[];
|
|
25
|
+
clients: Set<ServerResponse>;
|
|
26
|
+
abortController: AbortController;
|
|
27
|
+
runParams: RunParams;
|
|
28
|
+
blockedAuthServers?: string[];
|
|
29
|
+
};
|
|
30
|
+
export interface RunQueueState {
|
|
31
|
+
activeJobIds: Set<string>;
|
|
32
|
+
admittingJobIds: Set<string>;
|
|
33
|
+
blockedJobIds: Set<string>;
|
|
34
|
+
queueWorkerCount: number;
|
|
35
|
+
queue: string[];
|
|
36
|
+
isAdvancingQueue: boolean;
|
|
37
|
+
needsAdvanceQueue: boolean;
|
|
38
|
+
clients: Set<ServerResponse>;
|
|
39
|
+
}
|
|
40
|
+
export type QueueAdvanceOptions = {
|
|
41
|
+
emitWhenIdle?: boolean;
|
|
42
|
+
hostHeader?: string;
|
|
43
|
+
retryBlockedAuth?: boolean;
|
|
44
|
+
};
|
|
45
|
+
export type ExecutionOutcome =
|
|
46
|
+
| {
|
|
47
|
+
status: 'completed';
|
|
48
|
+
}
|
|
49
|
+
| {
|
|
50
|
+
status: 'error' | 'stopped';
|
|
51
|
+
}
|
|
52
|
+
| {
|
|
53
|
+
status: 'blocked_auth';
|
|
54
|
+
blockedServers: string[];
|
|
55
|
+
};
|
|
56
|
+
export declare function createRunQueueState(queueWorkerCount?: number): RunQueueState;
|
|
57
|
+
export declare function currentWorkerUsage(runQueueState: RunQueueState): number;
|
|
58
|
+
//# sourceMappingURL=run-queue-state.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-queue-state.d.ts","sourceRoot":"","sources":["../../src/app-server/run-queue-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,YAAY,GACpB,QAAQ,GACR,cAAc,GACd,SAAS,GACT,SAAS,GACT,WAAW,GACX,OAAO,CAAC;AAEZ,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,QAAQ,EAAE,CAAC;IACnB,OAAO,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,SAAS,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC/B,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,OAAO,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;CAC9B;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GACxB;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GACvB;IAAE,MAAM,EAAE,OAAO,GAAG,SAAS,CAAA;CAAE,GAC/B;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEzD,wBAAgB,mBAAmB,CAAC,gBAAgB,SAAI,GAAG,aAAa,CAWvE;AAED,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,CAMvE"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export function createRunQueueState(queueWorkerCount = 1) {
|
|
2
|
+
return {
|
|
3
|
+
queue: [],
|
|
4
|
+
activeJobIds: new Set(),
|
|
5
|
+
admittingJobIds: new Set(),
|
|
6
|
+
blockedJobIds: new Set(),
|
|
7
|
+
queueWorkerCount,
|
|
8
|
+
isAdvancingQueue: false,
|
|
9
|
+
needsAdvanceQueue: false,
|
|
10
|
+
clients: new Set()
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
export function currentWorkerUsage(runQueueState) {
|
|
14
|
+
return (runQueueState.activeJobIds.size +
|
|
15
|
+
runQueueState.admittingJobIds.size +
|
|
16
|
+
runQueueState.blockedJobIds.size);
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=run-queue-state.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-queue-state.js","sourceRoot":"","sources":["../../src/app-server/run-queue-state.ts"],"names":[],"mappings":"AAuDA,MAAM,UAAU,mBAAmB,CAAC,gBAAgB,GAAG,CAAC;IACtD,OAAO;QACL,KAAK,EAAE,EAAE;QACT,YAAY,EAAE,IAAI,GAAG,EAAU;QAC/B,eAAe,EAAE,IAAI,GAAG,EAAU;QAClC,aAAa,EAAE,IAAI,GAAG,EAAU;QAChC,gBAAgB;QAChB,gBAAgB,EAAE,KAAK;QACvB,iBAAiB,EAAE,KAAK;QACxB,OAAO,EAAE,IAAI,GAAG,EAAE;KACnB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,aAA4B;IAC7D,OAAO,CACL,aAAa,CAAC,YAAY,CAAC,IAAI;QAC/B,aAAa,CAAC,eAAe,CAAC,IAAI;QAClC,aAAa,CAAC,aAAa,CAAC,IAAI,CACjC,CAAC;AACJ,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
2
2
|
import { type EvalConfig } from '@inspectr/mcplab-core';
|
|
3
|
-
import type {
|
|
4
|
-
import type { RunQueueState, AppRouteDeps, AppRouteRequestContext } from './app-context.js';
|
|
3
|
+
import type { AppRouteDeps, AppRouteRequestContext } from './app-context.js';
|
|
5
4
|
import { type OAuthSessionManager } from './oauth-session-manager.js';
|
|
5
|
+
import type { RunQueueService } from './run-queue-domain.js';
|
|
6
6
|
export type RunsRouteDeps = Pick<
|
|
7
7
|
AppRouteDeps,
|
|
8
8
|
| 'parseBody'
|
|
@@ -20,39 +20,6 @@ export type RunsRouteDeps = Pick<
|
|
|
20
20
|
| 'pickDefaultAssistantAgentName'
|
|
21
21
|
| 'pkgVersion'
|
|
22
22
|
>;
|
|
23
|
-
type RunParams = {
|
|
24
|
-
configPath: string;
|
|
25
|
-
runsPerScenario: number;
|
|
26
|
-
scenarioId?: string;
|
|
27
|
-
scenarioIds?: string[];
|
|
28
|
-
requestedAgents?: string[];
|
|
29
|
-
runNote?: string;
|
|
30
|
-
oauthServerNames?: string[];
|
|
31
|
-
serverOverrideAll?: string[];
|
|
32
|
-
scenarioServerOverrides?: Record<string, string[]>;
|
|
33
|
-
};
|
|
34
|
-
type RunJob = {
|
|
35
|
-
id: string;
|
|
36
|
-
status: 'queued' | 'blocked_auth' | 'running' | 'stopped' | 'completed' | 'error';
|
|
37
|
-
events: SseEvent[];
|
|
38
|
-
clients: Set<ServerResponse>;
|
|
39
|
-
abortController: AbortController;
|
|
40
|
-
runParams: RunParams;
|
|
41
|
-
blockedAuthServers?: string[];
|
|
42
|
-
};
|
|
43
|
-
export declare function mergeLibraryEntriesIntoConfig(
|
|
44
|
-
config: EvalConfig,
|
|
45
|
-
libraryAgents: EvalConfig['agents'],
|
|
46
|
-
libraryServers: EvalConfig['servers']
|
|
47
|
-
): EvalConfig;
|
|
48
|
-
export declare function applyLibraryEntries(
|
|
49
|
-
loaded: {
|
|
50
|
-
config: EvalConfig;
|
|
51
|
-
hash: string;
|
|
52
|
-
},
|
|
53
|
-
libraryAgents: EvalConfig['agents'],
|
|
54
|
-
libraryServers: EvalConfig['servers']
|
|
55
|
-
): void;
|
|
56
23
|
export declare function mergeLibraryAgentsIntoConfig(
|
|
57
24
|
config: EvalConfig,
|
|
58
25
|
libraryAgents: EvalConfig['agents']
|
|
@@ -70,10 +37,8 @@ export declare function handleRunsRoutes(params: {
|
|
|
70
37
|
pathname: string;
|
|
71
38
|
method: string;
|
|
72
39
|
settings: AppRouteRequestContext['settings'];
|
|
73
|
-
|
|
74
|
-
runQueueState: RunQueueState;
|
|
40
|
+
runQueueService: RunQueueService;
|
|
75
41
|
oauthSessionManager: OAuthSessionManager;
|
|
76
42
|
deps: RunsRouteDeps;
|
|
77
43
|
}): Promise<boolean>;
|
|
78
|
-
export {};
|
|
79
44
|
//# sourceMappingURL=runs-routes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runs-routes.d.ts","sourceRoot":"","sources":["../../src/app-server/runs-routes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runs-routes.d.ts","sourceRoot":"","sources":["../../src/app-server/runs-routes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAGjE,OAAO,EAOL,KAAK,UAAU,EAEhB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,4BAA4B,CAAC;AAMpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,MAAM,aAAa,GAAG,IAAI,CAC9B,YAAY,EACV,WAAW,GACX,QAAQ,GACR,aAAa,GACb,cAAc,GACd,kBAAkB,GAClB,UAAU,GACV,eAAe,GACf,4BAA4B,GAC5B,mBAAmB,GACnB,uBAAuB,GACvB,0BAA0B,GAC1B,eAAe,GACf,+BAA+B,GAC/B,YAAY,CACf,CAAC;AAGF,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,UAAU,CAAC,QAAQ,CAAC,GAClC,UAAU,CAEZ;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC5C,aAAa,EAAE,UAAU,CAAC,QAAQ,CAAC,GAClC,IAAI,CAEN;AAqCD,wBAAsB,gBAAgB,CAAC,MAAM,EAAE;IAC7C,GAAG,EAAE,eAAe,CAAC;IACrB,GAAG,EAAE,cAAc,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAC7C,eAAe,EAAE,eAAe,CAAC;IACjC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,IAAI,EAAE,aAAa,CAAC;CACrB,GAAG,OAAO,CAAC,OAAO,CAAC,CAmhBnB"}
|