@inspectr/mcplab 1.10.0 → 1.12.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/app/assets/index-cqsnfkao.css +1 -0
- package/dist/app/assets/index-ida8heao.js +249 -0
- package/dist/app/index.html +2 -2
- package/dist/app-server/app-context.d.ts +1 -0
- package/dist/app-server/app-context.d.ts.map +1 -1
- package/dist/app-server/oauth-session-manager.d.ts +4 -0
- package/dist/app-server/oauth-session-manager.d.ts.map +1 -1
- package/dist/app-server/oauth-session-manager.js +12 -0
- package/dist/app-server/oauth-session-manager.js.map +1 -1
- package/dist/app-server/router.js +1 -1
- package/dist/app-server/router.js.map +1 -1
- package/dist/app-server/runs-routes.d.ts +54 -27
- package/dist/app-server/runs-routes.d.ts.map +1 -1
- package/dist/app-server/runs-routes.js +107 -46
- package/dist/app-server/runs-routes.js.map +1 -1
- package/dist/cli.js +33 -1
- package/dist/cli.js.map +1 -1
- package/package.json +4 -4
- package/dist/app/assets/index-DBtCqMnx.js +0 -249
- package/dist/app/assets/index-DodUXbIC.css +0 -1
package/dist/app/index.html
CHANGED
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
<meta name="twitter:card" content="summary_large_image" />
|
|
17
17
|
<meta name="twitter:site" content="@Inspectr" />
|
|
18
18
|
<meta name="twitter:image" content="" />
|
|
19
|
-
<script type="module" crossorigin src="/assets/index-
|
|
20
|
-
<link rel="stylesheet" crossorigin href="/assets/index-
|
|
19
|
+
<script type="module" crossorigin src="/assets/index-ida8heao.js"></script>
|
|
20
|
+
<link rel="stylesheet" crossorigin href="/assets/index-cqsnfkao.css">
|
|
21
21
|
</head>
|
|
22
22
|
|
|
23
23
|
<body>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-context.d.ts","sourceRoot":"","sources":["../../src/app-server/app-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EACV,0BAA0B,EAC1B,kBAAkB,EAClB,eAAe,EAChB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EACV,4BAA4B,EAC5B,wBAAwB,EACxB,0BAA0B,EAC1B,iCAAiC,EACjC,6BAA6B,EAC7B,8BAA8B,EAC9B,wBAAwB,EACxB,2BAA2B,EAC3B,2BAA2B,EAC3B,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EACV,wBAAwB,EACxB,qBAAqB,EACrB,oBAAoB,EACpB,6BAA6B,EAC7B,+BAA+B,EAC/B,kCAAkC,EAClC,wBAAwB,EACzB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EACV,aAAa,EACb,oBAAoB,EACpB,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,8BAA8B,EAC/B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,aAAa,EACb,QAAQ,EACR,0BAA0B,EAC1B,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrF,OAAO,KAAK,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAClG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,oBAAoB,EACpB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAE/B,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,eAAe,CAAC;IACrB,GAAG,EAAE,cAAc,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,WAAW,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,IAAI,MAAM,GAAG,IAAI,CAAC;IACrB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,KAAK,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"app-context.d.ts","sourceRoot":"","sources":["../../src/app-server/app-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,5 +53,9 @@ export declare class OAuthSessionManager {
|
|
|
53
53
|
hostHeader?: string
|
|
54
54
|
): Promise<Record<string, Record<string, string>>>;
|
|
55
55
|
noteRuntimeSession(serverName: string, runtimeSessionId: string): void;
|
|
56
|
+
checkServersAuthStatus(serverNames: string[]): {
|
|
57
|
+
name: string;
|
|
58
|
+
status: 'ready' | 'auth_required' | 'not_oauth';
|
|
59
|
+
}[];
|
|
56
60
|
}
|
|
57
61
|
//# sourceMappingURL=oauth-session-manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-session-manager.d.ts","sourceRoot":"","sources":["../../src/app-server/oauth-session-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAgC1F,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,GAAG,eAAe,GAAG,WAAW,CAAC;IAChD,UAAU,CAAC,EAAE,QAAQ,GAAG,WAAW,GAAG,eAAe,GAAG,WAAW,CAAC;IACpE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,+BAAgC,SAAQ,KAAK;IACxD,QAAQ,CAAC,OAAO,EAAE,uBAAuB,EAAE,CAAC;gBAEhC,OAAO,EAAE,uBAAuB,EAAE;CAM/C;AAgCD,qBAAa,mBAAmB;IAI5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAHzB,OAAO,CAAC,MAAM,CAAsC;gBAGjC,MAAM,EAAE;QACvB,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,EAAE,uBAAuB,CAAC;QACzC,qBAAqB,EAAE,wBAAwB,CAAC;QAChD,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB;IAGH,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAInC,OAAO,KAAK,aAAa,GAExB;IAED,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,2BAA2B;IAyBnC,OAAO,CAAC,2BAA2B;IAuCnC,OAAO,CAAC,wBAAwB;IAM1B,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA2D3D,OAAO,CAAC,sBAAsB;IAaxB,sBAAsB,CAC1B,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,uBAAuB,CAAC;IAsF7B,uBAAuB,CAC3B,WAAW,EAAE,MAAM,EAAE,EACrB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,0BAA0B,CAAC;IAchC,wBAAwB,CAC5B,WAAW,EAAE,MAAM,EAAE,EACrB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAsClD,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"oauth-session-manager.d.ts","sourceRoot":"","sources":["../../src/app-server/oauth-session-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAgC1F,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,GAAG,eAAe,GAAG,WAAW,CAAC;IAChD,UAAU,CAAC,EAAE,QAAQ,GAAG,WAAW,GAAG,eAAe,GAAG,WAAW,CAAC;IACpE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,+BAAgC,SAAQ,KAAK;IACxD,QAAQ,CAAC,OAAO,EAAE,uBAAuB,EAAE,CAAC;gBAEhC,OAAO,EAAE,uBAAuB,EAAE;CAM/C;AAgCD,qBAAa,mBAAmB;IAI5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAHzB,OAAO,CAAC,MAAM,CAAsC;gBAGjC,MAAM,EAAE;QACvB,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,EAAE,uBAAuB,CAAC;QACzC,qBAAqB,EAAE,wBAAwB,CAAC;QAChD,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB;IAGH,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAInC,OAAO,KAAK,aAAa,GAExB;IAED,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,2BAA2B;IAyBnC,OAAO,CAAC,2BAA2B;IAuCnC,OAAO,CAAC,wBAAwB;IAM1B,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA2D3D,OAAO,CAAC,sBAAsB;IAaxB,sBAAsB,CAC1B,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,uBAAuB,CAAC;IAsF7B,uBAAuB,CAC3B,WAAW,EAAE,MAAM,EAAE,EACrB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,0BAA0B,CAAC;IAchC,wBAAwB,CAC5B,WAAW,EAAE,MAAM,EAAE,EACrB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAsClD,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI;IAStE,sBAAsB,CACpB,WAAW,EAAE,MAAM,EAAE,GACpB;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,GAAG,eAAe,GAAG,WAAW,CAAA;KAAE,EAAE;CAYvE"}
|
|
@@ -334,5 +334,17 @@ export class OAuthSessionManager {
|
|
|
334
334
|
}
|
|
335
335
|
state.runtimeSessionId = runtimeSessionId;
|
|
336
336
|
}
|
|
337
|
+
checkServersAuthStatus(serverNames) {
|
|
338
|
+
return serverNames.map((name) => {
|
|
339
|
+
const serverConfig = this.getServerConfig(name);
|
|
340
|
+
if (!serverConfig || serverConfig.auth?.type !== 'oauth_authorization_code') {
|
|
341
|
+
return { name, status: 'not_oauth' };
|
|
342
|
+
}
|
|
343
|
+
const state = this.getState(name);
|
|
344
|
+
this.syncStateFromRuntimeSession(state);
|
|
345
|
+
const hasValidToken = !!state.accessToken && !this.tokenExpiredOrNearExpiry(state);
|
|
346
|
+
return { name, status: hasValidToken ? 'ready' : 'auth_required' };
|
|
347
|
+
});
|
|
348
|
+
}
|
|
337
349
|
}
|
|
338
350
|
//# sourceMappingURL=oauth-session-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-session-manager.js","sourceRoot":"","sources":["../../src/app-server/oauth-session-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth-session-manager.js","sourceRoot":"","sources":["../../src/app-server/oauth-session-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -104,7 +104,7 @@ export async function startAppServer(options) {
|
|
|
104
104
|
});
|
|
105
105
|
const assistantSessions = new Map();
|
|
106
106
|
const resultAssistantSessions = new Map();
|
|
107
|
-
const runQueueState = { activeJobId: null, queue: [] };
|
|
107
|
+
const runQueueState = { activeJobId: null, queue: [], isAdvancingQueue: false };
|
|
108
108
|
const routeDeps = {
|
|
109
109
|
parseBody,
|
|
110
110
|
asJson,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/app-server/router.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/app-server/router.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,39 +3,66 @@ import { type EvalConfig } from '@inspectr/mcplab-core';
|
|
|
3
3
|
import type { SseEvent } from './jobs.js';
|
|
4
4
|
import type { RunQueueState, AppRouteDeps, AppRouteRequestContext } from './app-context.js';
|
|
5
5
|
import { type OAuthSessionManager } from './oauth-session-manager.js';
|
|
6
|
-
export type RunsRouteDeps = Pick<
|
|
6
|
+
export type RunsRouteDeps = Pick<
|
|
7
|
+
AppRouteDeps,
|
|
8
|
+
| 'parseBody'
|
|
9
|
+
| 'asJson'
|
|
10
|
+
| 'addJobEvent'
|
|
11
|
+
| 'sendSseEvent'
|
|
12
|
+
| 'ensureInsideRoot'
|
|
13
|
+
| 'listRuns'
|
|
14
|
+
| 'getRunResults'
|
|
15
|
+
| 'getScenarioRunTraceRecords'
|
|
16
|
+
| 'selectScenarioIds'
|
|
17
|
+
| 'expandConfigForAgents'
|
|
18
|
+
| 'resolveRunSelectedAgents'
|
|
19
|
+
| 'loadSnapshot'
|
|
20
|
+
| 'compareRunToSnapshot'
|
|
21
|
+
| 'applySnapshotPolicyToRunResult'
|
|
22
|
+
| 'readLibraries'
|
|
23
|
+
| 'pickDefaultAssistantAgentName'
|
|
24
|
+
| 'pkgVersion'
|
|
25
|
+
>;
|
|
7
26
|
type RunParams = {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
27
|
+
configPath: string;
|
|
28
|
+
runsPerScenario: number;
|
|
29
|
+
scenarioId?: string;
|
|
30
|
+
scenarioIds?: string[];
|
|
31
|
+
requestedAgents?: string[];
|
|
32
|
+
applySnapshotEval: boolean;
|
|
33
|
+
runNote?: string;
|
|
34
|
+
oauthServerNames?: string[];
|
|
15
35
|
};
|
|
16
36
|
type RunJob = {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
37
|
+
id: string;
|
|
38
|
+
status: 'queued' | 'blocked_auth' | 'running' | 'stopped' | 'completed' | 'error';
|
|
39
|
+
events: SseEvent[];
|
|
40
|
+
clients: Set<ServerResponse>;
|
|
41
|
+
abortController: AbortController;
|
|
42
|
+
runParams: RunParams;
|
|
43
|
+
blockedAuthServers?: string[];
|
|
23
44
|
};
|
|
24
|
-
export declare function mergeLibraryAgentsIntoConfig(
|
|
25
|
-
|
|
45
|
+
export declare function mergeLibraryAgentsIntoConfig(
|
|
46
|
+
config: EvalConfig,
|
|
47
|
+
libraryAgents: EvalConfig['agents']
|
|
48
|
+
): EvalConfig;
|
|
49
|
+
export declare function applyLibraryAgents(
|
|
50
|
+
loaded: {
|
|
26
51
|
config: EvalConfig;
|
|
27
52
|
hash: string;
|
|
28
|
-
},
|
|
53
|
+
},
|
|
54
|
+
libraryAgents: EvalConfig['agents']
|
|
55
|
+
): void;
|
|
29
56
|
export declare function handleRunsRoutes(params: {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
57
|
+
req: IncomingMessage;
|
|
58
|
+
res: ServerResponse;
|
|
59
|
+
pathname: string;
|
|
60
|
+
method: string;
|
|
61
|
+
settings: AppRouteRequestContext['settings'];
|
|
62
|
+
jobs: Map<string, RunJob>;
|
|
63
|
+
runQueueState: RunQueueState;
|
|
64
|
+
oauthSessionManager: OAuthSessionManager;
|
|
65
|
+
deps: RunsRouteDeps;
|
|
39
66
|
}): Promise<boolean>;
|
|
40
67
|
export {};
|
|
41
|
-
//# sourceMappingURL=runs-routes.d.ts.map
|
|
68
|
+
//# 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":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAGjE,OAAO,EAML,KAAK,UAAU,EAEhB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC5F,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,4BAA4B,CAAC;AAEpC,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,cAAc,GACd,sBAAsB,GACtB,gCAAgC,GAChC,eAAe,GACf,+BAA+B,GAC/B,YAAY,CACf,CAAC;AAEF,KAAK,SAAS,GAAG;IACf,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,iBAAiB,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"runs-routes.d.ts","sourceRoot":"","sources":["../../src/app-server/runs-routes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAGjE,OAAO,EAML,KAAK,UAAU,EAEhB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC5F,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,4BAA4B,CAAC;AAEpC,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,cAAc,GACd,sBAAsB,GACtB,gCAAgC,GAChC,eAAe,GACf,+BAA+B,GAC/B,YAAY,CACf,CAAC;AAEF,KAAK,SAAS,GAAG;IACf,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,iBAAiB,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAEF,KAAK,MAAM,GAAG;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,QAAQ,GAAG,cAAc,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC;IAClF,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,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,CAGN;AA0BD,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,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1B,aAAa,EAAE,aAAa,CAAC;IAC7B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,IAAI,EAAE,aAAa,CAAC;CACrB,GAAG,OAAO,CAAC,OAAO,CAAC,CAofnB"}
|
|
@@ -40,7 +40,7 @@ export async function handleRunsRoutes(params) {
|
|
|
40
40
|
}
|
|
41
41
|
for (const event of job.events)
|
|
42
42
|
sendSseEvent(res, event);
|
|
43
|
-
if (job.status !== 'running' && job.status !== 'queued') {
|
|
43
|
+
if (job.status !== 'running' && job.status !== 'queued' && job.status !== 'blocked_auth') {
|
|
44
44
|
res.end();
|
|
45
45
|
return true;
|
|
46
46
|
}
|
|
@@ -86,10 +86,12 @@ export async function handleRunsRoutes(params) {
|
|
|
86
86
|
const activeJob = runQueueState.activeJobId ? jobs.get(runQueueState.activeJobId) : null;
|
|
87
87
|
const queuedEntries = runQueueState.queue
|
|
88
88
|
.map((id) => jobs.get(id))
|
|
89
|
-
.filter((j) => !!j && j.status === 'queued')
|
|
89
|
+
.filter((j) => !!j && (j.status === 'queued' || j.status === 'blocked_auth'))
|
|
90
90
|
.map((j) => ({
|
|
91
91
|
jobId: j.id,
|
|
92
92
|
status: j.status,
|
|
93
|
+
blockedReason: j.status === 'blocked_auth' ? 'oauth_required' : undefined,
|
|
94
|
+
requiredServers: j.status === 'blocked_auth' ? j.blockedAuthServers ?? [] : undefined,
|
|
93
95
|
runParams: {
|
|
94
96
|
configPath: j.runParams.configPath,
|
|
95
97
|
runsPerScenario: j.runParams.runsPerScenario,
|
|
@@ -129,10 +131,11 @@ export async function handleRunsRoutes(params) {
|
|
|
129
131
|
asJson(res, 400, { error: 'Cannot remove a running job. Use the /stop endpoint instead.' });
|
|
130
132
|
return true;
|
|
131
133
|
}
|
|
132
|
-
if (job.status !== 'queued') {
|
|
134
|
+
if (job.status !== 'queued' && job.status !== 'blocked_auth') {
|
|
133
135
|
asJson(res, 404, { error: 'Job is not queued' });
|
|
134
136
|
return true;
|
|
135
137
|
}
|
|
138
|
+
const wasBlocked = job.status === 'blocked_auth';
|
|
136
139
|
const idx = runQueueState.queue.indexOf(jobId);
|
|
137
140
|
if (idx !== -1)
|
|
138
141
|
runQueueState.queue.splice(idx, 1);
|
|
@@ -145,9 +148,17 @@ export async function handleRunsRoutes(params) {
|
|
|
145
148
|
for (const client of job.clients)
|
|
146
149
|
client.end();
|
|
147
150
|
job.clients.clear();
|
|
151
|
+
if (wasBlocked) {
|
|
152
|
+
void advanceQueue(jobs, runQueueState, settings, oauthSessionManager, deps);
|
|
153
|
+
}
|
|
148
154
|
asJson(res, 200, { ok: true, jobId, status: 'stopped' });
|
|
149
155
|
return true;
|
|
150
156
|
}
|
|
157
|
+
if (pathname === '/api/runs/queue/resume' && method === 'POST') {
|
|
158
|
+
void advanceQueue(jobs, runQueueState, settings, oauthSessionManager, deps);
|
|
159
|
+
asJson(res, 200, { ok: true });
|
|
160
|
+
return true;
|
|
161
|
+
}
|
|
151
162
|
if (pathname === '/api/runs' && method === 'POST') {
|
|
152
163
|
const body = (await parseBody(req));
|
|
153
164
|
const configPathRaw = String(body.configPath ?? '');
|
|
@@ -177,6 +188,17 @@ export async function handleRunsRoutes(params) {
|
|
|
177
188
|
asJson(res, 404, { error: `Config not found: ${configPath}` });
|
|
178
189
|
return true;
|
|
179
190
|
}
|
|
191
|
+
// Eagerly cache OAuth server names to avoid re-parsing config in advanceQueue
|
|
192
|
+
let oauthServerNames;
|
|
193
|
+
try {
|
|
194
|
+
const loaded = loadConfig(configPath);
|
|
195
|
+
oauthServerNames = Object.entries(loaded.config.servers ?? {})
|
|
196
|
+
.filter(([, v]) => v.auth?.type === 'oauth_authorization_code')
|
|
197
|
+
.map(([name]) => name);
|
|
198
|
+
}
|
|
199
|
+
catch {
|
|
200
|
+
// Will be resolved lazily in advanceQueue if needed
|
|
201
|
+
}
|
|
180
202
|
const jobId = `run-${Date.now()}-${randomUUID().slice(0, 8)}`;
|
|
181
203
|
const runParamsObj = {
|
|
182
204
|
configPath,
|
|
@@ -185,7 +207,8 @@ export async function handleRunsRoutes(params) {
|
|
|
185
207
|
scenarioIds,
|
|
186
208
|
requestedAgents,
|
|
187
209
|
applySnapshotEval,
|
|
188
|
-
runNote
|
|
210
|
+
runNote,
|
|
211
|
+
oauthServerNames
|
|
189
212
|
};
|
|
190
213
|
const job = {
|
|
191
214
|
id: jobId,
|
|
@@ -196,27 +219,8 @@ export async function handleRunsRoutes(params) {
|
|
|
196
219
|
runParams: runParamsObj
|
|
197
220
|
};
|
|
198
221
|
jobs.set(jobId, job);
|
|
199
|
-
if (
|
|
200
|
-
//
|
|
201
|
-
job.status = 'running';
|
|
202
|
-
runQueueState.activeJobId = jobId;
|
|
203
|
-
addJobEvent(job, {
|
|
204
|
-
type: 'started',
|
|
205
|
-
ts: new Date().toISOString(),
|
|
206
|
-
payload: {
|
|
207
|
-
configPath,
|
|
208
|
-
runsPerScenario,
|
|
209
|
-
scenarioId: scenarioId ?? null,
|
|
210
|
-
scenarioIds: scenarioIds ?? null,
|
|
211
|
-
agents: requestedAgents ?? null,
|
|
212
|
-
runNote: runNote ?? null
|
|
213
|
-
}
|
|
214
|
-
});
|
|
215
|
-
void executeRunJob(job, settings, jobs, runQueueState, oauthSessionManager, deps);
|
|
216
|
-
asJson(res, 202, { jobId });
|
|
217
|
-
}
|
|
218
|
-
else {
|
|
219
|
-
// Queue this job
|
|
222
|
+
if (runQueueState.activeJobId) {
|
|
223
|
+
// Another job is running — queue and emit position
|
|
220
224
|
runQueueState.queue.push(jobId);
|
|
221
225
|
addJobEvent(job, {
|
|
222
226
|
type: 'queued',
|
|
@@ -233,6 +237,12 @@ export async function handleRunsRoutes(params) {
|
|
|
233
237
|
});
|
|
234
238
|
asJson(res, 202, { jobId, queued: true, position: runQueueState.queue.length });
|
|
235
239
|
}
|
|
240
|
+
else {
|
|
241
|
+
// No active job — add to queue and let advanceQueue handle start (with OAuth pre-check)
|
|
242
|
+
runQueueState.queue.push(jobId);
|
|
243
|
+
asJson(res, 202, { jobId });
|
|
244
|
+
void advanceQueue(jobs, runQueueState, settings, oauthSessionManager, deps);
|
|
245
|
+
}
|
|
236
246
|
return true;
|
|
237
247
|
}
|
|
238
248
|
if (pathname === '/api/runs/preview' && method === 'POST') {
|
|
@@ -546,30 +556,81 @@ function toCoreExtractRules(extractRules) {
|
|
|
546
556
|
}
|
|
547
557
|
return rules;
|
|
548
558
|
}
|
|
549
|
-
function
|
|
559
|
+
function resolveOAuthServersForJob(job) {
|
|
560
|
+
if (job.runParams.oauthServerNames !== undefined) {
|
|
561
|
+
return job.runParams.oauthServerNames;
|
|
562
|
+
}
|
|
563
|
+
try {
|
|
564
|
+
const loaded = loadConfig(job.runParams.configPath);
|
|
565
|
+
const names = Object.entries(loaded.config.servers ?? {})
|
|
566
|
+
.filter(([, v]) => v.auth?.type === 'oauth_authorization_code')
|
|
567
|
+
.map(([name]) => name);
|
|
568
|
+
job.runParams.oauthServerNames = names;
|
|
569
|
+
return names;
|
|
570
|
+
}
|
|
571
|
+
catch {
|
|
572
|
+
return [];
|
|
573
|
+
}
|
|
574
|
+
}
|
|
575
|
+
async function advanceQueue(jobs, runQueueState, settings, oauthSessionManager, deps) {
|
|
550
576
|
if (runQueueState.activeJobId)
|
|
551
577
|
return;
|
|
552
|
-
|
|
553
|
-
const nextId = runQueueState.queue.shift();
|
|
554
|
-
const nextJob = jobs.get(nextId);
|
|
555
|
-
if (!nextJob || nextJob.status !== 'queued')
|
|
556
|
-
continue;
|
|
557
|
-
nextJob.status = 'running';
|
|
558
|
-
runQueueState.activeJobId = nextId;
|
|
559
|
-
deps.addJobEvent(nextJob, {
|
|
560
|
-
type: 'started',
|
|
561
|
-
ts: new Date().toISOString(),
|
|
562
|
-
payload: {
|
|
563
|
-
configPath: nextJob.runParams.configPath,
|
|
564
|
-
runsPerScenario: nextJob.runParams.runsPerScenario,
|
|
565
|
-
scenarioId: nextJob.runParams.scenarioId ?? null,
|
|
566
|
-
scenarioIds: nextJob.runParams.scenarioIds ?? null,
|
|
567
|
-
agents: nextJob.runParams.requestedAgents ?? null,
|
|
568
|
-
runNote: nextJob.runParams.runNote ?? null
|
|
569
|
-
}
|
|
570
|
-
});
|
|
571
|
-
void executeRunJob(nextJob, settings, jobs, runQueueState, oauthSessionManager, deps);
|
|
578
|
+
if (runQueueState.isAdvancingQueue)
|
|
572
579
|
return;
|
|
580
|
+
runQueueState.isAdvancingQueue = true;
|
|
581
|
+
try {
|
|
582
|
+
while (runQueueState.queue.length > 0) {
|
|
583
|
+
const nextId = runQueueState.queue[0]; // peek — do not shift yet
|
|
584
|
+
const nextJob = jobs.get(nextId);
|
|
585
|
+
if (!nextJob || (nextJob.status !== 'queued' && nextJob.status !== 'blocked_auth')) {
|
|
586
|
+
runQueueState.queue.shift();
|
|
587
|
+
continue;
|
|
588
|
+
}
|
|
589
|
+
// Pre-check OAuth before starting
|
|
590
|
+
const oauthServers = resolveOAuthServersForJob(nextJob);
|
|
591
|
+
if (oauthServers.length > 0) {
|
|
592
|
+
const authStatus = oauthSessionManager.checkServersAuthStatus(oauthServers);
|
|
593
|
+
const needsAuth = authStatus.filter((s) => s.status === 'auth_required');
|
|
594
|
+
if (needsAuth.length > 0) {
|
|
595
|
+
const needsAuthNames = needsAuth.map((s) => s.name);
|
|
596
|
+
nextJob.blockedAuthServers = needsAuthNames; // always refresh to current missing subset
|
|
597
|
+
if (nextJob.status !== 'blocked_auth') {
|
|
598
|
+
nextJob.status = 'blocked_auth';
|
|
599
|
+
}
|
|
600
|
+
deps.addJobEvent(nextJob, {
|
|
601
|
+
type: 'oauth_required',
|
|
602
|
+
ts: new Date().toISOString(),
|
|
603
|
+
payload: {
|
|
604
|
+
jobId: nextJob.id,
|
|
605
|
+
servers: needsAuthNames,
|
|
606
|
+
message: `OAuth login required for server(s): ${needsAuthNames.join(', ')}.`
|
|
607
|
+
}
|
|
608
|
+
});
|
|
609
|
+
return; // pause — frontend must call /api/runs/queue/resume after auth
|
|
610
|
+
}
|
|
611
|
+
}
|
|
612
|
+
// OAuth ready (or not required) — start the job
|
|
613
|
+
runQueueState.queue.shift();
|
|
614
|
+
nextJob.status = 'running';
|
|
615
|
+
runQueueState.activeJobId = nextId;
|
|
616
|
+
deps.addJobEvent(nextJob, {
|
|
617
|
+
type: 'started',
|
|
618
|
+
ts: new Date().toISOString(),
|
|
619
|
+
payload: {
|
|
620
|
+
configPath: nextJob.runParams.configPath,
|
|
621
|
+
runsPerScenario: nextJob.runParams.runsPerScenario,
|
|
622
|
+
scenarioId: nextJob.runParams.scenarioId ?? null,
|
|
623
|
+
scenarioIds: nextJob.runParams.scenarioIds ?? null,
|
|
624
|
+
agents: nextJob.runParams.requestedAgents ?? null,
|
|
625
|
+
runNote: nextJob.runParams.runNote ?? null
|
|
626
|
+
}
|
|
627
|
+
});
|
|
628
|
+
void executeRunJob(nextJob, settings, jobs, runQueueState, oauthSessionManager, deps);
|
|
629
|
+
return;
|
|
630
|
+
}
|
|
631
|
+
}
|
|
632
|
+
finally {
|
|
633
|
+
runQueueState.isAdvancingQueue = false;
|
|
573
634
|
}
|
|
574
635
|
}
|
|
575
636
|
async function executeRunJob(job, settings, jobs, runQueueState, oauthSessionManager, deps) {
|