@skybridge/test 0.0.0-dev.7cd4271 → 0.0.0-dev.7e443c5
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/README.md +15 -15
- package/dist/chat.d.ts +9 -6
- package/dist/chat.d.ts.map +1 -1
- package/dist/chat.js +7 -50
- package/dist/chat.js.map +1 -1
- package/dist/eval-middleware.d.ts +10 -0
- package/dist/eval-middleware.d.ts.map +1 -0
- package/dist/{middleware/list-tools.js → eval-middleware.js} +35 -18
- package/dist/eval-middleware.js.map +1 -0
- package/dist/input-files.d.ts +2 -4
- package/dist/input-files.d.ts.map +1 -1
- package/dist/input-files.js +6 -23
- package/dist/input-files.js.map +1 -1
- package/dist/session-registry.d.ts +18 -5
- package/dist/session-registry.d.ts.map +1 -1
- package/dist/session-registry.js +14 -18
- package/dist/session-registry.js.map +1 -1
- package/dist/tool-stubs.d.ts +4 -0
- package/dist/tool-stubs.d.ts.map +1 -0
- package/dist/tool-stubs.js +38 -0
- package/dist/tool-stubs.js.map +1 -0
- package/package.json +3 -3
- package/dist/eval-middlewares.d.ts +0 -13
- package/dist/eval-middlewares.d.ts.map +0 -1
- package/dist/eval-middlewares.js +0 -18
- package/dist/eval-middlewares.js.map +0 -1
- package/dist/middleware/list-tools.d.ts +0 -4
- package/dist/middleware/list-tools.d.ts.map +0 -1
- package/dist/middleware/list-tools.js.map +0 -1
- package/dist/middleware/resolve-files.d.ts +0 -4
- package/dist/middleware/resolve-files.d.ts.map +0 -1
- package/dist/middleware/resolve-files.js +0 -13
- package/dist/middleware/resolve-files.js.map +0 -1
- package/dist/middleware/stub-tool.d.ts +0 -4
- package/dist/middleware/stub-tool.d.ts.map +0 -1
- package/dist/middleware/stub-tool.js +0 -16
- package/dist/middleware/stub-tool.js.map +0 -1
package/README.md
CHANGED
|
@@ -6,7 +6,7 @@ check.
|
|
|
6
6
|
|
|
7
7
|
Add the `evals` option to the Skybridge Vite plugin so `expect.chat` exists,
|
|
8
8
|
then write scenarios with vitest's own `it` and `expect`. Pass the app itself
|
|
9
|
-
to `start`: it is served in-process
|
|
9
|
+
to `start`: it is served in-process through an app derived with `app.withHandler`, and
|
|
10
10
|
the tool names and argument shapes come from the app value, so no type
|
|
11
11
|
parameter is needed.
|
|
12
12
|
|
|
@@ -82,19 +82,6 @@ from, so a project can set them once instead of per scenario.
|
|
|
82
82
|
skybridge({ evals: { temperature: 0, maxSteps: 6 } });
|
|
83
83
|
```
|
|
84
84
|
|
|
85
|
-
## Matchers
|
|
86
|
-
|
|
87
|
-
Assertions on what the assistant said work the same way, though model prose
|
|
88
|
-
varies between runs, so keep them loose.
|
|
89
|
-
|
|
90
|
-
```ts
|
|
91
|
-
expect.chat(chat).toHaveSaid("in stock");
|
|
92
|
-
expect.chat(chat).not.toHaveSaid("refund");
|
|
93
|
-
```
|
|
94
|
-
|
|
95
|
-
See the [documentation](https://docs.skybridge.tech) for setup and the full
|
|
96
|
-
matcher list.
|
|
97
|
-
|
|
98
85
|
## Input files
|
|
99
86
|
|
|
100
87
|
`chat.send` also accepts AI SDK `UserContent`. Attach a `FilePart` and use the same object in `expect.inputFile` to check which file a tool received:
|
|
@@ -122,5 +109,18 @@ expect.chat(chat).toHaveCalledToolOnce("asset_openai_file_upload", {
|
|
|
122
109
|
|
|
123
110
|
`file` and `files` must be listed in their tools' `_meta["openai/fileParams"]`.
|
|
124
111
|
Misplaced file matchers throw immediately, including nested matchers and `.not`.
|
|
125
|
-
|
|
112
|
+
`start` validates that each declared parameter uses `FileRef`, including optional, nullable, and array forms. It derives an app with `withHandler` and installs outer native `mcpMiddleware` before the original handler registers the app. Application list middleware sees original schemas; call middleware sees resolved files before `next()`. Stubs wrap tool implementations, retaining normal input validation and authorization. Concurrent chats initialize separate app state without mutating the original.
|
|
126
113
|
See [Evals](https://docs.skybridge.tech/test/evals) for how files reach the model and the tool.
|
|
114
|
+
|
|
115
|
+
## Matchers
|
|
116
|
+
|
|
117
|
+
Assertions on what the assistant said work the same way, though model prose
|
|
118
|
+
varies between runs, so keep them loose.
|
|
119
|
+
|
|
120
|
+
```ts
|
|
121
|
+
expect.chat(chat).toHaveSaid("in stock");
|
|
122
|
+
expect.chat(chat).not.toHaveSaid("refund");
|
|
123
|
+
```
|
|
124
|
+
|
|
125
|
+
See the [documentation](https://docs.skybridge.tech) for setup and the full
|
|
126
|
+
matcher list.
|
package/dist/chat.d.ts
CHANGED
|
@@ -1,13 +1,19 @@
|
|
|
1
1
|
import { type LanguageModel, type UserContent } from "ai";
|
|
2
|
-
import {
|
|
2
|
+
import type { EvalMiddleware } from "./eval-middleware.js";
|
|
3
3
|
import type { ToolCall, Turn } from "./matchers/types.js";
|
|
4
|
-
import type { ToolStubs } from "./session-registry.js";
|
|
5
4
|
interface HostConfig {
|
|
6
5
|
model: LanguageModel;
|
|
7
6
|
temperature?: number;
|
|
8
7
|
systemPrompt?: string;
|
|
9
8
|
maxSteps?: number;
|
|
10
9
|
}
|
|
10
|
+
/**
|
|
11
|
+
* Stubbed results keyed by tool name. The typed form scenarios write lives on
|
|
12
|
+
* `start`'s options.
|
|
13
|
+
*
|
|
14
|
+
* @internal
|
|
15
|
+
*/
|
|
16
|
+
export type StubMap = Record<string, (args: Record<string, unknown>) => unknown>;
|
|
11
17
|
/**
|
|
12
18
|
* A `fetch` replacement the transport dials instead of the network. Mirrors the
|
|
13
19
|
* MCP client's own `fetch` option so an in-process app can serve the session.
|
|
@@ -19,7 +25,6 @@ export type TransportFetch = (url: string | URL, init?: RequestInit) => Promise<
|
|
|
19
25
|
*/
|
|
20
26
|
export declare class Chat<App = unknown> {
|
|
21
27
|
private readonly middleware;
|
|
22
|
-
private readonly dispose;
|
|
23
28
|
/** Type-only anchor so `expect.chat` infers `App` from the conversation. */
|
|
24
29
|
readonly $app: App;
|
|
25
30
|
/** Everything that happened, in the order it happened. */
|
|
@@ -34,12 +39,10 @@ export declare class Chat<App = unknown> {
|
|
|
34
39
|
private readonly transport;
|
|
35
40
|
private readonly host;
|
|
36
41
|
private tools;
|
|
37
|
-
private closePromise?;
|
|
38
|
-
private legacyStubs?;
|
|
39
42
|
/** The model the conversation runs on, and the judge's default. */
|
|
40
43
|
get model(): LanguageModel;
|
|
41
44
|
private constructor();
|
|
42
|
-
static open<App>(host: HostConfig, fetchImpl: TransportFetch,
|
|
45
|
+
static open<App>(host: HostConfig, fetchImpl: TransportFetch, middleware: EvalMiddleware): Promise<Chat<App>>;
|
|
43
46
|
/** Takes a turn. Assert on the result with `expect.chat`. */
|
|
44
47
|
send(content: UserContent): Promise<void>;
|
|
45
48
|
close(): Promise<void>;
|
package/dist/chat.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../src/chat.ts"],"names":[],"mappings":"AAOA,OAAO,EAKL,KAAK,aAAa,EAGlB,KAAK,WAAW,EACjB,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../src/chat.ts"],"names":[],"mappings":"AAOA,OAAO,EAKL,KAAK,aAAa,EAGlB,KAAK,WAAW,EACjB,MAAM,IAAI,CAAC;AACZ,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAE1D,UAAU,UAAU;IAClB,KAAK,EAAE,aAAa,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;GAKG;AACH,MAAM,MAAM,OAAO,GAAG,MAAM,CAC1B,MAAM,EACN,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAC3C,CAAC;AAaF;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,CAC3B,GAAG,EAAE,MAAM,GAAG,GAAG,EACjB,IAAI,CAAC,EAAE,WAAW,KACf,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEvB;;;GAGG;AACH,qBAAa,IAAI,CAAC,GAAG,GAAG,OAAO;IAqC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IApC7B,4EAA4E;IAC5E,SAAiB,IAAI,EAAE,GAAG,CAAC;IAE3B,0DAA0D;IAC1D,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAM;IAEjC,mEAAmE;IACnE,IAAI,SAAS,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAI/B;IAED,+EAA+E;IAC/E,IAAI,cAAc,IAAI,MAAM,EAAE,CAI7B;IAED,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IACtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgC;IAC1D,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,KAAK,CAAc;IAE3B,mEAAmE;IACnE,IAAI,KAAK,IAAI,aAAa,CAEzB;IAED,OAAO;WAWM,IAAI,CAAC,GAAG,EACnB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,cAAc,EACzB,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAmBrB,6DAA6D;IACvD,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAmDzC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,OAAO;CAkDhB"}
|
package/dist/chat.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Client, fromJsonSchema, StreamableHTTPClientTransport, } from "@modelcontextprotocol/client";
|
|
2
2
|
import { dynamicTool, generateText, jsonSchema, stepCountIs, } from "ai";
|
|
3
|
-
import { EvalMiddlewares } from "./eval-middlewares.js";
|
|
4
3
|
import { registerFileParameters } from "./matchers/matchers.js";
|
|
5
4
|
const DEFAULT_MAX_STEPS = 8;
|
|
6
5
|
const IN_PROCESS_URL = "http://in-process.skybridge.test/mcp";
|
|
@@ -13,7 +12,6 @@ function outputOf(results, toolCallId) {
|
|
|
13
12
|
*/
|
|
14
13
|
export class Chat {
|
|
15
14
|
middleware;
|
|
16
|
-
dispose;
|
|
17
15
|
/** Everything that happened, in the order it happened. */
|
|
18
16
|
turns = [];
|
|
19
17
|
/** Every call the model made, in order, as it crossed the wire. */
|
|
@@ -34,37 +32,24 @@ export class Chat {
|
|
|
34
32
|
transport;
|
|
35
33
|
host;
|
|
36
34
|
tools = [];
|
|
37
|
-
closePromise;
|
|
38
|
-
legacyStubs;
|
|
39
35
|
/** The model the conversation runs on, and the judge's default. */
|
|
40
36
|
get model() {
|
|
41
37
|
return this.host.model;
|
|
42
38
|
}
|
|
43
|
-
constructor(client, transport, host, middleware
|
|
39
|
+
constructor(client, transport, host, middleware) {
|
|
44
40
|
this.middleware = middleware;
|
|
45
|
-
this.dispose = dispose;
|
|
46
41
|
this.client = client;
|
|
47
42
|
this.transport = transport;
|
|
48
43
|
this.host = host;
|
|
49
44
|
}
|
|
50
|
-
static async open(host, fetchImpl,
|
|
51
|
-
const middleware = middlewareOrStubs instanceof EvalMiddlewares
|
|
52
|
-
? middlewareOrStubs
|
|
53
|
-
: new EvalMiddlewares();
|
|
45
|
+
static async open(host, fetchImpl, middleware) {
|
|
54
46
|
const client = new Client({ name: "skybridge-eval", version: "0" });
|
|
55
47
|
const transport = new StreamableHTTPClientTransport(new URL(IN_PROCESS_URL), { fetch: fetchImpl });
|
|
56
|
-
|
|
48
|
+
await client.connect(transport);
|
|
49
|
+
const chat = new Chat(client, transport, host, middleware);
|
|
57
50
|
try {
|
|
58
|
-
await client.connect(transport);
|
|
59
51
|
const { tools } = await client.listTools();
|
|
60
52
|
chat.tools = tools;
|
|
61
|
-
if (!(middlewareOrStubs instanceof EvalMiddlewares)) {
|
|
62
|
-
chat.legacyStubs = middlewareOrStubs;
|
|
63
|
-
const unknown = Object.keys(middlewareOrStubs).filter((name) => !tools.some((tool) => tool.name === name));
|
|
64
|
-
if (unknown.length) {
|
|
65
|
-
throw new Error(`the app exposes no tool named ${unknown.map((name) => `"${name}"`).join(", ")}, so the stub would never run`);
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
53
|
registerFileParameters(chat, middleware.fileParams);
|
|
69
54
|
}
|
|
70
55
|
catch (error) {
|
|
@@ -75,9 +60,6 @@ export class Chat {
|
|
|
75
60
|
}
|
|
76
61
|
/** Takes a turn. Assert on the result with `expect.chat`. */
|
|
77
62
|
async send(content) {
|
|
78
|
-
if (this.closePromise) {
|
|
79
|
-
throw new Error("The conversation is closed");
|
|
80
|
-
}
|
|
81
63
|
const prepared = await this.middleware.files.prepare(content);
|
|
82
64
|
this.middleware.inputs.clear();
|
|
83
65
|
this.failures.clear();
|
|
@@ -122,21 +104,9 @@ export class Chat {
|
|
|
122
104
|
}
|
|
123
105
|
this.messages.push(...result.response.messages);
|
|
124
106
|
}
|
|
125
|
-
close() {
|
|
126
|
-
this.
|
|
127
|
-
|
|
128
|
-
await this.transport.close();
|
|
129
|
-
}
|
|
130
|
-
finally {
|
|
131
|
-
try {
|
|
132
|
-
await this.middleware.files.close();
|
|
133
|
-
}
|
|
134
|
-
finally {
|
|
135
|
-
await this.dispose();
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
})();
|
|
139
|
-
return this.closePromise;
|
|
107
|
+
async close() {
|
|
108
|
+
await this.middleware.files.close();
|
|
109
|
+
await this.transport.close();
|
|
140
110
|
}
|
|
141
111
|
failureFor(call) {
|
|
142
112
|
const reported = this.failures.get(call.toolCallId);
|
|
@@ -168,19 +138,6 @@ export class Chat {
|
|
|
168
138
|
},
|
|
169
139
|
}),
|
|
170
140
|
execute: async (input, { toolCallId }) => {
|
|
171
|
-
const stubbed = await this.legacyStubs?.[definition.name]?.((input ?? {}));
|
|
172
|
-
if (stubbed !== undefined) {
|
|
173
|
-
return {
|
|
174
|
-
content: [
|
|
175
|
-
{
|
|
176
|
-
type: "text",
|
|
177
|
-
text: typeof stubbed === "string"
|
|
178
|
-
? stubbed
|
|
179
|
-
: JSON.stringify(stubbed),
|
|
180
|
-
},
|
|
181
|
-
],
|
|
182
|
-
};
|
|
183
|
-
}
|
|
184
141
|
let result;
|
|
185
142
|
try {
|
|
186
143
|
result = await this.client.callTool({
|
package/dist/chat.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../src/chat.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,cAAc,EAEd,6BAA6B,GAE9B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,WAAW,EACX,YAAY,EAEZ,UAAU,EAGV,WAAW,GAEZ,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../src/chat.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { type McpServer } from "skybridge/server";
|
|
2
|
+
import { InputFiles } from "./input-files.js";
|
|
3
|
+
export declare class EvalMiddleware {
|
|
4
|
+
readonly files: InputFiles;
|
|
5
|
+
readonly inputs: Map<string, Record<string, unknown>>;
|
|
6
|
+
readonly fileParams: Map<string, string[]>;
|
|
7
|
+
private toolList;
|
|
8
|
+
install(server: Pick<McpServer, "mcpMiddleware">): void;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=eval-middleware.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"eval-middleware.d.ts","sourceRoot":"","sources":["../src/eval-middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA0D9C,qBAAa,cAAc;IACzB,QAAQ,CAAC,KAAK,aAAoB;IAClC,QAAQ,CAAC,MAAM,uCAA8C;IAC7D,QAAQ,CAAC,UAAU,wBAA+B;IAClD,OAAO,CAAC,QAAQ;IA8BhB,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC;CAmBjD"}
|
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
import { FileRef } from "skybridge/server";
|
|
2
|
+
import { InputFiles } from "./input-files.js";
|
|
3
|
+
const fileRefFields = Object.keys(FileRef.shape);
|
|
4
|
+
const fileRefRequired = fileRefFields.filter((field) => !FileRef.shape[field].safeParse(undefined)
|
|
5
|
+
.success);
|
|
1
6
|
function fileInputSchema(schema, allowArray = true) {
|
|
2
7
|
if (!schema || typeof schema === "boolean") {
|
|
3
8
|
throw new Error("expected a FileRef schema");
|
|
@@ -16,17 +21,18 @@ function fileInputSchema(schema, allowArray = true) {
|
|
|
16
21
|
if (allowArray && schema.type === "array" && !Array.isArray(schema.items)) {
|
|
17
22
|
return { ...schema, items: fileInputSchema(schema.items, false) };
|
|
18
23
|
}
|
|
19
|
-
const
|
|
24
|
+
const properties = Object.keys(schema.properties ?? {});
|
|
25
|
+
const required = schema.required ?? [];
|
|
20
26
|
if (schema.type !== "object" ||
|
|
21
27
|
(schema.additionalProperties !== undefined &&
|
|
22
28
|
schema.additionalProperties !== false) ||
|
|
23
|
-
|
|
24
|
-
!
|
|
25
|
-
Object.keys(schema.properties ?? {}).length !== fields.length ||
|
|
26
|
-
!fields.every((field) => {
|
|
29
|
+
properties.length !== fileRefFields.length ||
|
|
30
|
+
!fileRefFields.every((field) => {
|
|
27
31
|
const property = schema.properties?.[field];
|
|
28
32
|
return typeof property === "object" && property.type === "string";
|
|
29
|
-
})
|
|
33
|
+
}) ||
|
|
34
|
+
required.length !== fileRefRequired.length ||
|
|
35
|
+
!fileRefRequired.every((field) => required.includes(field))) {
|
|
30
36
|
throw new Error("expected a FileRef schema");
|
|
31
37
|
}
|
|
32
38
|
return {
|
|
@@ -34,15 +40,18 @@ function fileInputSchema(schema, allowArray = true) {
|
|
|
34
40
|
description: "This parameter expects an absolute local file path.",
|
|
35
41
|
};
|
|
36
42
|
}
|
|
37
|
-
export
|
|
38
|
-
|
|
43
|
+
export class EvalMiddleware {
|
|
44
|
+
files = new InputFiles();
|
|
45
|
+
inputs = new Map();
|
|
46
|
+
fileParams = new Map();
|
|
47
|
+
toolList(tools) {
|
|
39
48
|
return tools.map((tool) => {
|
|
40
49
|
const fields = tool._meta?.["openai/fileParams"] ?? [];
|
|
41
50
|
if (!Array.isArray(fields) ||
|
|
42
51
|
!fields.every((field) => typeof field === "string")) {
|
|
43
52
|
throw new Error(`Invalid openai/fileParams for "${tool.name}": expected parameter names`);
|
|
44
53
|
}
|
|
45
|
-
fileParams.set(tool.name, fields);
|
|
54
|
+
this.fileParams.set(tool.name, fields);
|
|
46
55
|
const properties = { ...tool.inputSchema.properties };
|
|
47
56
|
for (const field of fields) {
|
|
48
57
|
try {
|
|
@@ -55,13 +64,21 @@ export function createListToolsMiddleware(fileParams, stubs) {
|
|
|
55
64
|
return { ...tool, inputSchema: { ...tool.inputSchema, properties } };
|
|
56
65
|
});
|
|
57
66
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
67
|
+
install(server) {
|
|
68
|
+
server.mcpMiddleware("tools/list", async (_request, _extra, next) => {
|
|
69
|
+
const result = await next();
|
|
70
|
+
return { ...result, tools: this.toolList(result.tools) };
|
|
71
|
+
});
|
|
72
|
+
server.mcpMiddleware("tools/call", async (request, _extra, next) => {
|
|
73
|
+
const params = request.params;
|
|
74
|
+
const args = this.files.rewrite(params.arguments ?? {}, this.fileParams.get(params.name) ?? []);
|
|
75
|
+
params.arguments = args;
|
|
76
|
+
const callId = params._meta?.["skybridge/evalToolCallId"];
|
|
77
|
+
if (typeof callId === "string") {
|
|
78
|
+
this.inputs.set(callId, args);
|
|
79
|
+
}
|
|
80
|
+
return next();
|
|
81
|
+
});
|
|
82
|
+
}
|
|
66
83
|
}
|
|
67
|
-
//# sourceMappingURL=
|
|
84
|
+
//# sourceMappingURL=eval-middleware.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"eval-middleware.js","sourceRoot":"","sources":["../src/eval-middleware.ts"],"names":[],"mappings":"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"}
|
package/dist/input-files.d.ts
CHANGED
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
import type { UserContent } from "ai";
|
|
2
2
|
export declare class InputFiles {
|
|
3
|
-
private closed;
|
|
4
|
-
private listening?;
|
|
5
3
|
private readonly files;
|
|
6
4
|
private readonly paths;
|
|
7
5
|
private readonly server;
|
|
8
6
|
prepare(content: UserContent): Promise<UserContent>;
|
|
9
|
-
rewrite(input: Record<string, unknown>, fields: string[]):
|
|
7
|
+
rewrite(input: Record<string, unknown>, fields: string[]): {
|
|
10
8
|
[x: string]: unknown;
|
|
11
|
-
}
|
|
9
|
+
};
|
|
12
10
|
close(): Promise<void>;
|
|
13
11
|
}
|
|
14
12
|
//# sourceMappingURL=input-files.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"input-files.d.ts","sourceRoot":"","sources":["../src/input-files.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAY,WAAW,EAAE,MAAM,IAAI,CAAC;AAkChD,qBAAa,UAAU;IACrB,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"input-files.d.ts","sourceRoot":"","sources":["../src/input-files.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAY,WAAW,EAAE,MAAM,IAAI,CAAC;AAkChD,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAGlB;IACJ,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA8B;IACpD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAQpB;IAEG,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAwCzD,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE;;;IAuBlD,KAAK;CAMZ"}
|
package/dist/input-files.js
CHANGED
|
@@ -30,8 +30,6 @@ async function fileBytes(data) {
|
|
|
30
30
|
throw new Error("Input files need bytes, text, or a URL; provider-only file references cannot be downloaded by the eval app");
|
|
31
31
|
}
|
|
32
32
|
export class InputFiles {
|
|
33
|
-
closed = false;
|
|
34
|
-
listening;
|
|
35
33
|
files = new Map();
|
|
36
34
|
paths = new Map();
|
|
37
35
|
server = createServer((request, response) => {
|
|
@@ -44,9 +42,6 @@ export class InputFiles {
|
|
|
44
42
|
response.end(file.bytes);
|
|
45
43
|
});
|
|
46
44
|
async prepare(content) {
|
|
47
|
-
if (this.closed) {
|
|
48
|
-
throw new Error("The conversation is closed");
|
|
49
|
-
}
|
|
50
45
|
if (typeof content === "string") {
|
|
51
46
|
return content;
|
|
52
47
|
}
|
|
@@ -57,14 +52,16 @@ export class InputFiles {
|
|
|
57
52
|
continue;
|
|
58
53
|
}
|
|
59
54
|
const bytes = await fileBytes(part.data);
|
|
60
|
-
if (this.
|
|
61
|
-
|
|
55
|
+
if (!this.server.listening) {
|
|
56
|
+
this.server.listen(0, "127.0.0.1").unref();
|
|
57
|
+
await once(this.server, "listening");
|
|
62
58
|
}
|
|
59
|
+
const { port } = this.server.address();
|
|
63
60
|
const id = randomUUID();
|
|
64
61
|
const file_id = `file_${id}`;
|
|
65
62
|
const reference = {
|
|
66
63
|
file_id,
|
|
67
|
-
download_url:
|
|
64
|
+
download_url: `http://127.0.0.1:${port}/${file_id}`,
|
|
68
65
|
mime_type: part.mediaType,
|
|
69
66
|
...(part.filename === undefined ? {} : { file_name: part.filename }),
|
|
70
67
|
};
|
|
@@ -80,7 +77,7 @@ export class InputFiles {
|
|
|
80
77
|
}
|
|
81
78
|
return prepared;
|
|
82
79
|
}
|
|
83
|
-
|
|
80
|
+
rewrite(input, fields) {
|
|
84
81
|
const rewritten = { ...input };
|
|
85
82
|
const resolve = (value) => {
|
|
86
83
|
if (typeof value !== "string") {
|
|
@@ -100,23 +97,9 @@ export class InputFiles {
|
|
|
100
97
|
: resolve(value);
|
|
101
98
|
}
|
|
102
99
|
}
|
|
103
|
-
if (fields.some((field) => input[field] != null) && this.files.size) {
|
|
104
|
-
this.listening ??= (async () => {
|
|
105
|
-
this.server.listen(0, "127.0.0.1").unref();
|
|
106
|
-
await once(this.server, "listening");
|
|
107
|
-
})();
|
|
108
|
-
await this.listening;
|
|
109
|
-
const { port } = this.server.address();
|
|
110
|
-
for (const { reference } of this.files.values()) {
|
|
111
|
-
reference.download_url = `http://127.0.0.1:${port}/${reference.file_id}`;
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
100
|
return rewritten;
|
|
115
101
|
}
|
|
116
102
|
async close() {
|
|
117
|
-
this.closed = true;
|
|
118
|
-
this.files.clear();
|
|
119
|
-
this.paths.clear();
|
|
120
103
|
if (this.server.listening) {
|
|
121
104
|
this.server.close();
|
|
122
105
|
await once(this.server, "close");
|
package/dist/input-files.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"input-files.js","sourceRoot":"","sources":["../src/input-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAIzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,KAAK,UAAU,SAAS,CAAC,IAAsB;IAC7C,IAAI,IAAI,YAAY,GAAG,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;YAC7B,CAAC,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;YAC1B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAClC,CAAC;IACD,IAAI,IAAI,YAAY,UAAU,IAAI,IAAI,YAAY,WAAW,EAAE,CAAC;QAC9D,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IACD,MAAM,IAAI,KAAK,CACb,4GAA4G,CAC7G,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,UAAU;
|
|
1
|
+
{"version":3,"file":"input-files.js","sourceRoot":"","sources":["../src/input-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,21 @@
|
|
|
1
|
+
import { type Server } from "@modelcontextprotocol/server";
|
|
1
2
|
import type { LanguageModel } from "ai";
|
|
2
|
-
import type {
|
|
3
|
+
import type { ToolInput, ToolNames } from "skybridge/server";
|
|
3
4
|
import { Chat } from "./chat.js";
|
|
4
|
-
/**
|
|
5
|
-
|
|
5
|
+
/**
|
|
6
|
+
* The minimum a Skybridge app has to expose to be served in-process: the
|
|
7
|
+
* `$types` marker the assertions infer tool names from, and the per-request
|
|
8
|
+
* server builder the session's handler is built on. Structural on purpose, so
|
|
9
|
+
* this package needs no runtime dependency on `skybridge`.
|
|
10
|
+
*/
|
|
11
|
+
export interface EvalApp {
|
|
12
|
+
readonly $types: {
|
|
13
|
+
readonly tools: object;
|
|
14
|
+
};
|
|
15
|
+
withHandler(...args: never[]): {
|
|
16
|
+
createServerInstance(): Promise<Server>;
|
|
17
|
+
};
|
|
18
|
+
}
|
|
6
19
|
/**
|
|
7
20
|
* The identity an in-process session claims, handed to the app as the
|
|
8
21
|
* request's `authInfo`. Mirrors the SDK's `AuthInfo` structurally; `extra`
|
|
@@ -22,7 +35,7 @@ export interface EvalIdentity {
|
|
|
22
35
|
* one that returns `undefined` falls through to the real server, so a scenario
|
|
23
36
|
* can pin one set of arguments and leave the rest live.
|
|
24
37
|
*/
|
|
25
|
-
export type ToolStubs<App =
|
|
38
|
+
export type ToolStubs<App> = {
|
|
26
39
|
[Name in ToolNames<App>]?: (args: ToolInput<App, Name>) => unknown;
|
|
27
40
|
};
|
|
28
41
|
interface StartOptions {
|
|
@@ -44,7 +57,7 @@ interface StartOptions {
|
|
|
44
57
|
*
|
|
45
58
|
* `stubs` answers a tool from the scenario instead of the app, so a case that
|
|
46
59
|
* depends on today's date or on a live catalogue still reads the same weeks
|
|
47
|
-
* later. A stubbed call
|
|
60
|
+
* later. A stubbed call never reaches the tool handler, and still shows up in
|
|
48
61
|
* `chat.toolCalls` like any other. See {@link ToolStubs}.
|
|
49
62
|
*
|
|
50
63
|
* `authInfo` claims an identity for the session: the app's per-tool scheme and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-registry.d.ts","sourceRoot":"","sources":["../src/session-registry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session-registry.d.ts","sourceRoot":"","sources":["../src/session-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,KAAK,EAAa,SAAS,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAExE,OAAO,EAAE,IAAI,EAAgB,MAAM,WAAW,CAAC;AAI/C;;;;;GAKG;AACH,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,WAAW,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG;QAAE,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC;CAC5E;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED;;;;;GAKG;AACH,MAAM,MAAM,SAAS,CAAC,GAAG,IAAI;KAC1B,IAAI,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,OAAO;CACnE,CAAC;AAEF,UAAU,YAAY;IACpB,uDAAuD;IACvD,KAAK,EAAE,aAAa,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAUD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,KAAK,CAAC,GAAG,SAAS,OAAO,EAC7C,OAAO,EAAE,YAAY,GAAG;IACtB,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,KAAK,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;CACxB,GACA,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAwCpB"}
|
package/dist/session-registry.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { createMcpHandler } from "@modelcontextprotocol/server";
|
|
2
2
|
import { inject, onTestFinished } from "vitest";
|
|
3
3
|
import { Chat } from "./chat.js";
|
|
4
|
-
import {
|
|
4
|
+
import { EvalMiddleware } from "./eval-middleware.js";
|
|
5
|
+
import { installToolStubs } from "./tool-stubs.js";
|
|
5
6
|
function sharedDefaults() {
|
|
6
7
|
try {
|
|
7
8
|
return inject("skybridgeEvals");
|
|
@@ -22,7 +23,7 @@ function sharedDefaults() {
|
|
|
22
23
|
*
|
|
23
24
|
* `stubs` answers a tool from the scenario instead of the app, so a case that
|
|
24
25
|
* depends on today's date or on a live catalogue still reads the same weeks
|
|
25
|
-
* later. A stubbed call
|
|
26
|
+
* later. A stubbed call never reaches the tool handler, and still shows up in
|
|
26
27
|
* `chat.toolCalls` like any other. See {@link ToolStubs}.
|
|
27
28
|
*
|
|
28
29
|
* `authInfo` claims an identity for the session: the app's per-tool scheme and
|
|
@@ -32,21 +33,14 @@ function sharedDefaults() {
|
|
|
32
33
|
export async function start(options) {
|
|
33
34
|
const config = sharedDefaults();
|
|
34
35
|
const { app, authInfo } = options;
|
|
35
|
-
const middleware = new
|
|
36
|
-
app
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
.withMcpMiddleware({
|
|
42
|
-
filter: "tools/call",
|
|
43
|
-
handler: middleware.resolveFiles,
|
|
44
|
-
})
|
|
45
|
-
.withMcpMiddleware({
|
|
46
|
-
filter: "tools/call",
|
|
47
|
-
handler: middleware.stubTool,
|
|
36
|
+
const middleware = new EvalMiddleware();
|
|
37
|
+
// The app's server and setup types are opaque here; both are forwarded unchanged.
|
|
38
|
+
const evalApp = app.withHandler((server, setupOptions, originalHandler) => {
|
|
39
|
+
middleware.install(server);
|
|
40
|
+
installToolStubs(server, (options.stubs ?? {}));
|
|
41
|
+
return originalHandler(server, setupOptions);
|
|
48
42
|
});
|
|
49
|
-
const handler = createMcpHandler(() =>
|
|
43
|
+
const handler = createMcpHandler(() => evalApp.createServerInstance());
|
|
50
44
|
let chat;
|
|
51
45
|
try {
|
|
52
46
|
chat = await Chat.open({
|
|
@@ -54,14 +48,16 @@ export async function start(options) {
|
|
|
54
48
|
temperature: options.temperature ?? config?.temperature,
|
|
55
49
|
systemPrompt: options.systemPrompt ?? config?.systemPrompt,
|
|
56
50
|
maxSteps: options.maxSteps ?? config?.maxSteps,
|
|
57
|
-
}, (url, init) => handler.fetch(new Request(url, init), authInfo === undefined ? undefined : { authInfo }), middleware
|
|
51
|
+
}, (url, init) => handler.fetch(new Request(url, init), authInfo === undefined ? undefined : { authInfo }), middleware);
|
|
58
52
|
}
|
|
59
53
|
catch (error) {
|
|
60
|
-
await
|
|
54
|
+
await middleware.files.close();
|
|
55
|
+
await handler.close();
|
|
61
56
|
throw error;
|
|
62
57
|
}
|
|
63
58
|
onTestFinished(async () => {
|
|
64
59
|
await chat.close();
|
|
60
|
+
await handler.close();
|
|
65
61
|
});
|
|
66
62
|
return chat;
|
|
67
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-registry.js","sourceRoot":"","sources":["../src/session-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"session-registry.js","sourceRoot":"","sources":["../src/session-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,8BAA8B,CAAC;AAG7E,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,IAAI,EAAgB,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AA6CnD,SAAS,cAAc;IACrB,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,OAIC;IAED,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC;IAChC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAClC,MAAM,UAAU,GAAG,IAAI,cAAc,EAAE,CAAC;IACxC,kFAAkF;IAClF,MAAM,OAAO,GACX,GACD,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,EAAE;QACtD,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3B,gBAAgB,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAY,CAAC,CAAC;QAC3D,OAAO,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;IACvE,IAAI,IAAe,CAAC;IACpB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CACpB;YACE,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,MAAM,EAAE,WAAW;YACvD,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,MAAM,EAAE,YAAY;YAC1D,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,MAAM,EAAE,QAAQ;SAC/C,EACD,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CACZ,OAAO,CAAC,KAAK,CACX,IAAI,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,EACtB,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAClD,EACH,UAAU,CACX,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAC/B,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC;IACd,CAAC;IAED,cAAc,CAAC,KAAK,IAAI,EAAE;QACxB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-stubs.d.ts","sourceRoot":"","sources":["../src/tool-stubs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,cAAc,GAAG,eAAe,CAAC,EACzD,KAAK,EAAE,OAAO,QA0Cf"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
export function installToolStubs(server, stubs) {
|
|
2
|
+
const names = Object.keys(stubs);
|
|
3
|
+
if (names.length === 0) {
|
|
4
|
+
return;
|
|
5
|
+
}
|
|
6
|
+
server.mcpMiddleware("tools/list", async (_request, _extra, next) => {
|
|
7
|
+
const result = await next();
|
|
8
|
+
const unknown = names.filter((name) => !result.tools.some((tool) => tool.name === name));
|
|
9
|
+
if (unknown.length) {
|
|
10
|
+
throw new Error(`the app exposes no tool named ${unknown.map((name) => `"${name}"`).join(", ")}, so the stub would never run`);
|
|
11
|
+
}
|
|
12
|
+
return result;
|
|
13
|
+
});
|
|
14
|
+
const registerTool = server.registerTool.bind(server);
|
|
15
|
+
server.registerTool = ((...args) => {
|
|
16
|
+
const [config, handler] = args;
|
|
17
|
+
const stub = Object.hasOwn(stubs, config.name)
|
|
18
|
+
? stubs[config.name]
|
|
19
|
+
: undefined;
|
|
20
|
+
if (!stub) {
|
|
21
|
+
return registerTool(config, handler);
|
|
22
|
+
}
|
|
23
|
+
return registerTool(config, async (input, extra) => {
|
|
24
|
+
const result = await stub(input);
|
|
25
|
+
return result === undefined
|
|
26
|
+
? handler(input, extra)
|
|
27
|
+
: {
|
|
28
|
+
content: [
|
|
29
|
+
{
|
|
30
|
+
type: "text",
|
|
31
|
+
text: typeof result === "string" ? result : JSON.stringify(result),
|
|
32
|
+
},
|
|
33
|
+
],
|
|
34
|
+
};
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=tool-stubs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-stubs.js","sourceRoot":"","sources":["../src/tool-stubs.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,gBAAgB,CAC9B,MAAyD,EACzD,KAAc;IAEd,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IACD,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;QAClE,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAC1B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAC3D,CAAC;QACF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CACb,iCAAiC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,+BAA+B,CAC9G,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtD,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC,GAAG,IAAqC,EAAE,EAAE;QAClE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;QAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC;YAC5C,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;YACpB,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC;YACjC,OAAO,MAAM,KAAK,SAAS;gBACzB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;gBACvB,CAAC,CAAC;oBACE,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,MAAM;4BACZ,IAAI,EACF,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;yBAC/D;qBACF;iBACF,CAAC;QACR,CAAC,CAAC,CAAC;IACL,CAAC,CAA+B,CAAC;AACnC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@skybridge/test",
|
|
3
|
-
"version": "0.0.0-dev.
|
|
3
|
+
"version": "0.0.0-dev.7e443c5",
|
|
4
4
|
"description": "Eval runner for Skybridge MCP Apps: does a prompt reach the right tool with the right arguments",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"type": "module",
|
|
@@ -37,8 +37,8 @@
|
|
|
37
37
|
"typescript": "^5.9.3",
|
|
38
38
|
"vitest": "^4.1.10",
|
|
39
39
|
"zod": "^4.4.3",
|
|
40
|
-
"@skybridge/vite-plugin": "0.0.0-dev.
|
|
41
|
-
"skybridge": "0.0.0-dev.
|
|
40
|
+
"@skybridge/vite-plugin": "0.0.0-dev.7e443c5",
|
|
41
|
+
"skybridge": "0.0.0-dev.7e443c5"
|
|
42
42
|
},
|
|
43
43
|
"engines": {
|
|
44
44
|
"node": ">=22.23.1"
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
import type { McpMiddlewareFn } from "skybridge/server";
|
|
2
|
-
import { InputFiles } from "./input-files.js";
|
|
3
|
-
import type { ToolStubs } from "./session-registry.js";
|
|
4
|
-
export declare class EvalMiddlewares {
|
|
5
|
-
readonly files: InputFiles;
|
|
6
|
-
readonly inputs: Map<string, Record<string, unknown>>;
|
|
7
|
-
readonly fileParams: Map<string, string[]>;
|
|
8
|
-
readonly listTools: McpMiddlewareFn;
|
|
9
|
-
readonly resolveFiles: McpMiddlewareFn;
|
|
10
|
-
readonly stubTool: McpMiddlewareFn;
|
|
11
|
-
constructor(stubs?: ToolStubs);
|
|
12
|
-
}
|
|
13
|
-
//# sourceMappingURL=eval-middlewares.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"eval-middlewares.d.ts","sourceRoot":"","sources":["../src/eval-middlewares.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAI9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,qBAAa,eAAe;IAC1B,QAAQ,CAAC,KAAK,aAAoB;IAClC,QAAQ,CAAC,MAAM,uCAA8C;IAC7D,QAAQ,CAAC,UAAU,wBAA+B;IAClD,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;gBAEvB,KAAK,GAAE,SAAc;CASlC"}
|
package/dist/eval-middlewares.js
DELETED
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import { InputFiles } from "./input-files.js";
|
|
2
|
-
import { createListToolsMiddleware } from "./middleware/list-tools.js";
|
|
3
|
-
import { createResolveFilesMiddleware } from "./middleware/resolve-files.js";
|
|
4
|
-
import { createStubToolMiddleware } from "./middleware/stub-tool.js";
|
|
5
|
-
export class EvalMiddlewares {
|
|
6
|
-
files = new InputFiles();
|
|
7
|
-
inputs = new Map();
|
|
8
|
-
fileParams = new Map();
|
|
9
|
-
listTools;
|
|
10
|
-
resolveFiles;
|
|
11
|
-
stubTool;
|
|
12
|
-
constructor(stubs = {}) {
|
|
13
|
-
this.listTools = createListToolsMiddleware(this.fileParams, stubs);
|
|
14
|
-
this.resolveFiles = createResolveFilesMiddleware(this.files, this.fileParams, this.inputs);
|
|
15
|
-
this.stubTool = createStubToolMiddleware(stubs);
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
|
-
//# sourceMappingURL=eval-middlewares.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"eval-middlewares.js","sourceRoot":"","sources":["../src/eval-middlewares.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAGrE,MAAM,OAAO,eAAe;IACjB,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC;IACzB,MAAM,GAAG,IAAI,GAAG,EAAmC,CAAC;IACpD,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;IACzC,SAAS,CAAkB;IAC3B,YAAY,CAAkB;IAC9B,QAAQ,CAAkB;IAEnC,YAAY,QAAmB,EAAE;QAC/B,IAAI,CAAC,SAAS,GAAG,yBAAyB,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,GAAG,4BAA4B,CAC9C,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,CACZ,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;CACF"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import type { McpMiddlewareFn } from "skybridge/server";
|
|
2
|
-
import type { ToolStubs } from "../session-registry.js";
|
|
3
|
-
export declare function createListToolsMiddleware(fileParams: Map<string, string[]>, stubs: ToolStubs): McpMiddlewareFn;
|
|
4
|
-
//# sourceMappingURL=list-tools.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"list-tools.d.ts","sourceRoot":"","sources":["../../src/middleware/list-tools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAoDxD,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACjC,KAAK,EAAE,SAAS,GACf,eAAe,CA2CjB"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"list-tools.js","sourceRoot":"","sources":["../../src/middleware/list-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import type { McpMiddlewareFn } from "skybridge/server";
|
|
2
|
-
import type { InputFiles } from "../input-files.js";
|
|
3
|
-
export declare function createResolveFilesMiddleware(files: InputFiles, fileParams: Map<string, string[]>, inputs: Map<string, Record<string, unknown>>): McpMiddlewareFn;
|
|
4
|
-
//# sourceMappingURL=resolve-files.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-files.d.ts","sourceRoot":"","sources":["../../src/middleware/resolve-files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,UAAU,EACjB,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACjC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAC3C,eAAe,CAgBjB"}
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
export function createResolveFilesMiddleware(files, fileParams, inputs) {
|
|
2
|
-
return async (request, _extra, next) => {
|
|
3
|
-
const params = request.params;
|
|
4
|
-
const args = await files.rewrite((params.arguments ?? {}), fileParams.get(params.name) ?? []);
|
|
5
|
-
params.arguments = args;
|
|
6
|
-
const callId = params._meta?.["skybridge/evalToolCallId"];
|
|
7
|
-
if (typeof callId === "string") {
|
|
8
|
-
inputs.set(callId, args);
|
|
9
|
-
}
|
|
10
|
-
return next();
|
|
11
|
-
};
|
|
12
|
-
}
|
|
13
|
-
//# sourceMappingURL=resolve-files.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-files.js","sourceRoot":"","sources":["../../src/middleware/resolve-files.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,4BAA4B,CAC1C,KAAiB,EACjB,UAAiC,EACjC,MAA4C;IAE5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAC9B,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAA4B,EACnD,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,IAAc,CAAC,IAAI,EAAE,CAC5C,CAAC;QACF,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,MAAM,MAAM,GAAI,MAAM,CAAC,KAA6C,EAAE,CACpE,0BAA0B,CAC3B,CAAC;QACF,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"stub-tool.d.ts","sourceRoot":"","sources":["../../src/middleware/stub-tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,SAAS,GAAG,eAAe,CAiB1E"}
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
export function createStubToolMiddleware(stubs) {
|
|
2
|
-
return async (request, _extra, next) => {
|
|
3
|
-
const result = await stubs[request.params.name]?.((request.params.arguments ?? {}));
|
|
4
|
-
return result === undefined
|
|
5
|
-
? next()
|
|
6
|
-
: {
|
|
7
|
-
content: [
|
|
8
|
-
{
|
|
9
|
-
type: "text",
|
|
10
|
-
text: typeof result === "string" ? result : JSON.stringify(result),
|
|
11
|
-
},
|
|
12
|
-
],
|
|
13
|
-
};
|
|
14
|
-
};
|
|
15
|
-
}
|
|
16
|
-
//# sourceMappingURL=stub-tool.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"stub-tool.js","sourceRoot":"","sources":["../../src/middleware/stub-tool.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,wBAAwB,CAAC,KAAgB;IACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAc,CAAC,EAAE,CACzD,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAA4B,CAC5D,CAAC;QACF,OAAO,MAAM,KAAK,SAAS;YACzB,CAAC,CAAC,IAAI,EAAE;YACR,CAAC,CAAC;gBACE,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,MAAM;wBACZ,IAAI,EACF,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;qBAC/D;iBACF;aACF,CAAC;IACR,CAAC,CAAC;AACJ,CAAC"}
|