@selvajs/mcp 0.2.0-beta.0 → 0.2.0-beta.2
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 +44 -4
- package/dist/app.d.ts +29 -0
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +2 -0
- package/dist/app.js.map +1 -1
- package/dist/capture.d.ts +50 -0
- package/dist/capture.d.ts.map +1 -0
- package/dist/capture.js +96 -0
- package/dist/capture.js.map +1 -0
- package/dist/client.d.ts +7 -0
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +15 -6
- package/dist/client.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/server.d.ts +6 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +33 -7
- package/dist/server.js.map +1 -1
- package/dist/tool.d.ts +5 -0
- package/dist/tool.d.ts.map +1 -1
- package/dist/tool.js.map +1 -1
- package/dist/view/index.d.ts +13 -2
- package/dist/view/index.d.ts.map +1 -1
- package/dist/view/index.js +80 -0
- package/dist/view/index.js.map +1 -1
- package/dist/views/capture.html +6082 -0
- package/dist/views/solve.html +24 -16
- package/package.json +19 -7
package/README.md
CHANGED
|
@@ -38,8 +38,10 @@ await server.listen({ transport: 'stdio' }); // checks the live spec first
|
|
|
38
38
|
|
|
39
39
|
- **`calls` is the contract.** A tool lists every operationId it may hit. Annotations come from
|
|
40
40
|
those operations (all `read` → read-only, any DELETE → destructive, any `solve` → open-world),
|
|
41
|
-
and `api.call` refuses anything not listed. Internal
|
|
42
|
-
|
|
41
|
+
and `api.call` refuses anything not listed. Internal operations are refused at startup.
|
|
42
|
+
`inputFrom` can't derive a multipart operation's input; `api.call` sends one a `FormData` body.
|
|
43
|
+
- **A binary body comes back as its size** (`BinaryBody`), unless the call passes
|
|
44
|
+
`bytes: true`, which adds `data` (`BinaryData`).
|
|
43
45
|
- **Errors are tool results**, with the next step for the model. A 403 names the missing scope.
|
|
44
46
|
- **429**: a `Retry-After` up to 10 s is waited out (twice at most, same `Idempotency-Key`);
|
|
45
47
|
longer goes back to the model with the wait.
|
|
@@ -55,7 +57,8 @@ await server.listen({ transport: 'stdio' }); // checks the live spec first
|
|
|
55
57
|
- **The key is redacted** from every tool output.
|
|
56
58
|
- **`onToolCall` sees every tool call** once it settles: outcome, the `/api/v1` calls with their
|
|
57
59
|
status and duration, and argument names with their sizes, never values. `onCall` sees each
|
|
58
|
-
API call alone.
|
|
60
|
+
API call alone. A tool that rewrites an `ApiCallError`'s text throws
|
|
61
|
+
`new Error(text, { cause: err })` so the outcome keeps its code (a timeout stays `timeout`).
|
|
59
62
|
- **`listen` checks the live spec** at `/api/v1/openapi.json`: every declared call must exist
|
|
60
63
|
with the same scope, or the server refuses to start.
|
|
61
64
|
- **A browser `Origin` must be the host's own** or listed in `allowedOrigins`; anything else gets 403. Native clients send none.
|
|
@@ -70,7 +73,9 @@ through the SDK's stateless fallback.
|
|
|
70
73
|
## Output
|
|
71
74
|
|
|
72
75
|
A tool returns a string, or `{ text, structured?, images? }`. A tool with `output` (Zod or JSON
|
|
73
|
-
Schema) lists it as `outputSchema`, and clients may reject a `structured` that doesn't match it.
|
|
76
|
+
Schema) lists it as `outputSchema`, and clients may reject a `structured` that doesn't match it.
|
|
77
|
+
A tool without `output` sends no `structuredContent`: clients would show it in place of the
|
|
78
|
+
text. `images` (`{ data, mimeType }`,
|
|
74
79
|
base64) follow the text as MCP image content, for a model that can see. Clients render PNG, JPEG,
|
|
75
80
|
GIF and WebP, not SVG.
|
|
76
81
|
|
|
@@ -122,6 +127,41 @@ tools: [
|
|
|
122
127
|
draws a Rhino.Compute response. A view's CSP allows no `fetch` and no outside script unless the
|
|
123
128
|
`appResource` lists them, so the renderer loads no HDR there.
|
|
124
129
|
|
|
130
|
+
A view's data can carry a `form` (`SolveViewForm`): inputs the view draws beside the
|
|
131
|
+
geometry, and the tool it calls with them to solve again. That tool must answer with
|
|
132
|
+
`SolveViewData` too; usually it is the tool that made the first result. After such a solve the
|
|
133
|
+
view tells the model what the user tried through `updateModelContext`, since the model never saw
|
|
134
|
+
that call. `renderViewForm` from `@selvajs/mcp/view` draws the same form in a view of your own.
|
|
135
|
+
|
|
136
|
+
## Rendering on the server
|
|
137
|
+
|
|
138
|
+
`captureSolve(response, { view, width, height, grid, look, background, hdr })` from
|
|
139
|
+
`@selvajs/mcp/capture` draws a Rhino.Compute response in the same viewer as the 3D view, in a
|
|
140
|
+
headless Chromium, and resolves to a base64 PNG for a tool's `images`. `hdr` is the environment
|
|
141
|
+
map as a URL; the page loads nothing from an origin, so a `data:` URL is the reliable form. Captures run one at a time on one browser, which closes after
|
|
142
|
+
two idle minutes. It needs the optional peer `playwright-core` and a browser
|
|
143
|
+
(`npx playwright install --with-deps chromium`, or `executablePath`); without them it throws
|
|
144
|
+
`CaptureUnavailableError`, whose message says so. A bundled host passes the page as `html`,
|
|
145
|
+
since bundling moves `dist/views/capture.html` away from the module that reads it: with Vite,
|
|
146
|
+
`() => import('@selvajs/mcp/views/capture.html?raw').then((m) => m.default)`.
|
|
147
|
+
|
|
148
|
+
## Evals
|
|
149
|
+
|
|
150
|
+
`evals/run.ts` runs the tasks in `evals/tasks.json` against a Selva MCP endpoint with Claude as
|
|
151
|
+
the agent, and records per task whether it passed, its tool calls, tokens, invalid-argument
|
|
152
|
+
errors and wall time. It needs a running instance seeded with `--examples` (see
|
|
153
|
+
`scripts/develop/LOCAL.md`), Rhino.Compute behind it, and Anthropic API credit, so it is not in CI.
|
|
154
|
+
|
|
155
|
+
```bash
|
|
156
|
+
SELVA_MCP_URL=http://localhost:5273/mcp SELVA_API_KEY=selva_… pnpm --filter @selvajs/mcp eval
|
|
157
|
+
pnpm --filter @selvajs/mcp eval --task kitchen-file --effort high
|
|
158
|
+
pnpm --filter @selvajs/mcp eval --held-out # only when checking, never while tuning
|
|
159
|
+
```
|
|
160
|
+
|
|
161
|
+
A task's `expect` checks which tools it called, what the answer contains, a number, and a rubric
|
|
162
|
+
that a second Claude call grades. A `number` with `expected: null` is reported, not graded:
|
|
163
|
+
fill it in once the value is checked in the app. Results go to `evals/results/`, which git ignores.
|
|
164
|
+
|
|
125
165
|
## Typed calls
|
|
126
166
|
|
|
127
167
|
Pass the `operations` type `openapi-typescript` generates from the spec, and `api.call` checks
|
package/dist/app.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { ResourceDefinition } from './server.js';
|
|
2
2
|
/** The MIME type a client renders as an MCP App view rather than reading as text. */
|
|
3
3
|
export declare const MCP_APP_MIME_TYPE = "text/html;profile=mcp-app";
|
|
4
|
+
/** The `extensions` key under which a client declares that it renders MCP App views. */
|
|
5
|
+
export declare const MCP_APP_EXTENSION = "io.modelcontextprotocol/ui";
|
|
4
6
|
/**
|
|
5
7
|
* Who may call a tool that has a view. `model` lists it for the agent; `app` lets its view call
|
|
6
8
|
* it. A client hides a tool without `model` from the agent, so an `['app']` tool can return
|
|
@@ -53,5 +55,32 @@ export interface SolveViewData {
|
|
|
53
55
|
tool: string;
|
|
54
56
|
arguments?: Record<string, unknown>;
|
|
55
57
|
};
|
|
58
|
+
/** Inputs the view shows beside the geometry, to change and solve again. */
|
|
59
|
+
form?: SolveViewForm;
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* A form the view draws. Solving calls `tool` with `arguments` plus the values under
|
|
63
|
+
* `valuesKey`, and shows that result in place of this one, so `tool` must answer with
|
|
64
|
+
* {@link SolveViewData} too. A tool with a view may call itself this way.
|
|
65
|
+
*/
|
|
66
|
+
export interface SolveViewForm {
|
|
67
|
+
tool: string;
|
|
68
|
+
arguments: Record<string, unknown>;
|
|
69
|
+
/** The argument the values go under, keyed by {@link ViewInput.name}. */
|
|
70
|
+
valuesKey: string;
|
|
71
|
+
inputs: ViewInput[];
|
|
72
|
+
}
|
|
73
|
+
/** One control. Inputs a form can't edit (geometry, files) are left out by the tool. */
|
|
74
|
+
export interface ViewInput {
|
|
75
|
+
name: string;
|
|
76
|
+
kind: 'number' | 'boolean' | 'text' | 'choice';
|
|
77
|
+
value?: unknown;
|
|
78
|
+
min?: number;
|
|
79
|
+
max?: number;
|
|
80
|
+
step?: number;
|
|
81
|
+
/** For `choice`: what the value may be. */
|
|
82
|
+
options?: string[];
|
|
83
|
+
unit?: string;
|
|
84
|
+
description?: string;
|
|
56
85
|
}
|
|
57
86
|
//# sourceMappingURL=app.d.ts.map
|
package/dist/app.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,qFAAqF;AACrF,eAAO,MAAM,iBAAiB,8BAA8B,CAAC;AAE7D;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,KAAK,CAAC;AAE7C,MAAM,WAAW,MAAM;IACtB,yEAAyE;IACzE,WAAW,EAAE,MAAM,CAAC;IACpB,kCAAkC;IAClC,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,MAAM;IACtB,0CAA0C;IAC1C,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,gDAAgD;IAChD,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,sBAAsB;IACtB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IAClC,GAAG,EAAE,QAAQ,MAAM,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kGAAkG;IAClG,IAAI,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,aAAa,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,yFAAyF;AACzF,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB,CAe3E;AAED,oEAAoE;AACpE,eAAO,MAAM,cAAc,qBAAqB,CAAC;AAEjD;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oFAAoF;IACpF,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,qFAAqF;AACrF,eAAO,MAAM,iBAAiB,8BAA8B,CAAC;AAE7D,wFAAwF;AACxF,eAAO,MAAM,iBAAiB,+BAA+B,CAAC;AAE9D;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,KAAK,CAAC;AAE7C,MAAM,WAAW,MAAM;IACtB,yEAAyE;IACzE,WAAW,EAAE,MAAM,CAAC;IACpB,kCAAkC;IAClC,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,MAAM;IACtB,0CAA0C;IAC1C,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,gDAAgD;IAChD,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,sBAAsB;IACtB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IAClC,GAAG,EAAE,QAAQ,MAAM,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kGAAkG;IAClG,IAAI,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,aAAa,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,yFAAyF;AACzF,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB,CAe3E;AAED,oEAAoE;AACpE,eAAO,MAAM,cAAc,qBAAqB,CAAC;AAEjD;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oFAAoF;IACpF,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC;IAC7D,4EAA4E;IAC5E,IAAI,CAAC,EAAE,aAAa,CAAC;CACrB;AAED;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,yEAAyE;IACzE,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,CAAC;CACpB;AAED,wFAAwF;AACxF,MAAM,WAAW,SAAS;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;IAC/C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2CAA2C;IAC3C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB"}
|
package/dist/app.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
/** The MIME type a client renders as an MCP App view rather than reading as text. */
|
|
2
2
|
export const MCP_APP_MIME_TYPE = 'text/html;profile=mcp-app';
|
|
3
|
+
/** The `extensions` key under which a client declares that it renders MCP App views. */
|
|
4
|
+
export const MCP_APP_EXTENSION = 'io.modelcontextprotocol/ui';
|
|
3
5
|
/** A view for tools to name in `ui.resourceUri`. It reads no `/api/v1`; its tools do. */
|
|
4
6
|
export function appResource(options) {
|
|
5
7
|
const { uri, name, description, html, csp, prefersBorder } = options;
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAEA,qFAAqF;AACrF,MAAM,CAAC,MAAM,iBAAiB,GAAG,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAEA,qFAAqF;AACrF,MAAM,CAAC,MAAM,iBAAiB,GAAG,2BAA2B,CAAC;AAE7D,wFAAwF;AACxF,MAAM,CAAC,MAAM,iBAAiB,GAAG,4BAA4B,CAAC;AAyC9D,yFAAyF;AACzF,MAAM,UAAU,WAAW,CAAC,OAA2B;IACtD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IACrE,MAAM,EAAE,GAAG;QACV,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC;QACnB,GAAG,CAAC,aAAa,KAAK,SAAS,IAAI,EAAE,aAAa,EAAE,CAAC;KACrD,CAAC;IACF,OAAO;QACN,GAAG;QACH,IAAI;QACJ,WAAW;QACX,QAAQ,EAAE,iBAAiB;QAC3B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;QACnD,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,EAAE;KACxB,CAAC;AACH,CAAC;AAED,oEAAoE;AACpE,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAAC"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
/** A camera direction, as Selva's viewer names them. */
|
|
2
|
+
export type CaptureView = 'iso' | 'top' | 'front' | 'back' | 'left' | 'right' | 'bottom';
|
|
3
|
+
export interface CaptureOptions {
|
|
4
|
+
view?: CaptureView;
|
|
5
|
+
/** Pixels. Default 1200 × 800. */
|
|
6
|
+
width?: number;
|
|
7
|
+
height?: number;
|
|
8
|
+
/** Default true. */
|
|
9
|
+
grid?: boolean;
|
|
10
|
+
/** One of the viewer's looks; an unknown one draws as `technical`. */
|
|
11
|
+
look?: string;
|
|
12
|
+
/** Hex, e.g. `#e6e6e6`. */
|
|
13
|
+
background?: string;
|
|
14
|
+
/**
|
|
15
|
+
* The HDR environment the viewer lights with, as a URL (`data:` works: the page loads no
|
|
16
|
+
* origin). Without it the viewer generates its lighting, which reads flatter.
|
|
17
|
+
*/
|
|
18
|
+
hdr?: () => Promise<string>;
|
|
19
|
+
/**
|
|
20
|
+
* The capture page. Defaults to `dist/views/capture.html` beside this module, which a bundler
|
|
21
|
+
* that moves this module breaks: a bundled host passes the file's text instead.
|
|
22
|
+
*/
|
|
23
|
+
html?: () => Promise<string>;
|
|
24
|
+
/** A Chromium or Chrome to launch instead of the one `playwright install chromium` puts in place. */
|
|
25
|
+
executablePath?: string;
|
|
26
|
+
/** Default 60 s, launch included. */
|
|
27
|
+
timeoutMs?: number;
|
|
28
|
+
/**
|
|
29
|
+
* Cancels the capture: a queued one never starts and a running one closes its page, so the
|
|
30
|
+
* next in the queue need not wait for it.
|
|
31
|
+
*/
|
|
32
|
+
signal?: AbortSignal;
|
|
33
|
+
}
|
|
34
|
+
export interface Capture {
|
|
35
|
+
/** Base64 PNG. */
|
|
36
|
+
png: string;
|
|
37
|
+
/** Objects drawn. Zero means the response had no display geometry and `png` is empty. */
|
|
38
|
+
drawn: number;
|
|
39
|
+
}
|
|
40
|
+
/** Thrown when no browser can be launched; its message says how to install one. */
|
|
41
|
+
export declare class CaptureUnavailableError extends Error {
|
|
42
|
+
name: string;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Draws a Rhino.Compute response in Selva's viewer, in a headless Chromium, and returns a PNG.
|
|
46
|
+
* Needs `playwright-core` and a Chromium on the machine; throws {@link CaptureUnavailableError}
|
|
47
|
+
* without them.
|
|
48
|
+
*/
|
|
49
|
+
export declare function captureSolve(response: unknown, options?: CaptureOptions): Promise<Capture>;
|
|
50
|
+
//# sourceMappingURL=capture.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../src/capture.ts"],"names":[],"mappings":"AAEA,wDAAwD;AACxD,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEzF,MAAM,WAAW,cAAc;IAC9B,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,kCAAkC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oBAAoB;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,sEAAsE;IACtE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2BAA2B;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,qGAAqG;IACrG,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,WAAW,OAAO;IACvB,kBAAkB;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,yFAAyF;IACzF,KAAK,EAAE,MAAM,CAAC;CACd;AAED,mFAAmF;AACnF,qBAAa,uBAAwB,SAAQ,KAAK;IACxC,IAAI,SAA6B;CAC1C;AAqDD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAc9F"}
|
package/dist/capture.js
ADDED
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
import { readFile } from 'node:fs/promises';
|
|
2
|
+
/** Thrown when no browser can be launched; its message says how to install one. */
|
|
3
|
+
export class CaptureUnavailableError extends Error {
|
|
4
|
+
name = 'CaptureUnavailableError';
|
|
5
|
+
}
|
|
6
|
+
const CAPTURE_FILE = new URL('../dist/views/capture.html', import.meta.url);
|
|
7
|
+
// Software WebGL: a server has no GPU, and headless Chromium refuses WebGL without these.
|
|
8
|
+
const ARGS = ['--use-angle=swiftshader', '--enable-unsafe-swiftshader', '--ignore-gpu-blocklist'];
|
|
9
|
+
// One browser serves every capture and closes after this long without one.
|
|
10
|
+
const IDLE_CLOSE_MS = 120_000;
|
|
11
|
+
let browser;
|
|
12
|
+
let idle;
|
|
13
|
+
// One capture at a time: each holds a WebGL context and the whole response in the page.
|
|
14
|
+
let queue = Promise.resolve();
|
|
15
|
+
async function launch(executablePath, timeout) {
|
|
16
|
+
// A variable specifier, so a bundler leaves the optional dependency to be found at run time.
|
|
17
|
+
const name = 'playwright-core';
|
|
18
|
+
let chromium;
|
|
19
|
+
try {
|
|
20
|
+
({ chromium } = (await import(/* @vite-ignore */ name)));
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
throw new CaptureUnavailableError('Rendering needs the `playwright-core` package on the server, which is not installed.');
|
|
24
|
+
}
|
|
25
|
+
try {
|
|
26
|
+
const launched = await chromium.launch({ executablePath, args: ARGS, timeout });
|
|
27
|
+
launched.on('disconnected', () => (browser = undefined));
|
|
28
|
+
return launched;
|
|
29
|
+
}
|
|
30
|
+
catch (err) {
|
|
31
|
+
throw new CaptureUnavailableError(`No browser to render with: ${err instanceof Error ? err.message.split('\n')[0] : String(err)}. ` +
|
|
32
|
+
'Install one on the server with `npx playwright install --with-deps chromium`, or point ' +
|
|
33
|
+
'the server at an existing Chromium.');
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Draws a Rhino.Compute response in Selva's viewer, in a headless Chromium, and returns a PNG.
|
|
38
|
+
* Needs `playwright-core` and a Chromium on the machine; throws {@link CaptureUnavailableError}
|
|
39
|
+
* without them.
|
|
40
|
+
*/
|
|
41
|
+
export function captureSolve(response, options = {}) {
|
|
42
|
+
const { signal } = options;
|
|
43
|
+
const run = queue.then(() => {
|
|
44
|
+
signal?.throwIfAborted();
|
|
45
|
+
return capture(response, options);
|
|
46
|
+
});
|
|
47
|
+
queue = run.catch(() => { });
|
|
48
|
+
if (!signal)
|
|
49
|
+
return run;
|
|
50
|
+
return new Promise((resolve, reject) => {
|
|
51
|
+
const onAbort = () => reject(signal.reason);
|
|
52
|
+
if (signal.aborted)
|
|
53
|
+
return onAbort();
|
|
54
|
+
signal.addEventListener('abort', onAbort, { once: true });
|
|
55
|
+
run.then(resolve, reject).finally(() => signal.removeEventListener('abort', onAbort));
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
async function capture(response, options) {
|
|
59
|
+
const timeout = options.timeoutMs ?? 60_000;
|
|
60
|
+
clearTimeout(idle);
|
|
61
|
+
browser ??= launch(options.executablePath, timeout).catch((err) => {
|
|
62
|
+
browser = undefined;
|
|
63
|
+
throw err;
|
|
64
|
+
});
|
|
65
|
+
const html = await (options.html ?? (() => readFile(CAPTURE_FILE, 'utf8')))();
|
|
66
|
+
const page = await (await browser).newPage({ deviceScaleFactor: 1 });
|
|
67
|
+
// Closing the page makes whatever it is doing reject at once.
|
|
68
|
+
const closePage = () => void page.close().catch(() => { });
|
|
69
|
+
options.signal?.addEventListener('abort', closePage, { once: true });
|
|
70
|
+
try {
|
|
71
|
+
options.signal?.throwIfAborted();
|
|
72
|
+
page.setDefaultTimeout(timeout);
|
|
73
|
+
await page.setViewportSize({ width: options.width ?? 1200, height: options.height ?? 800 });
|
|
74
|
+
await page.setContent(html, { waitUntil: 'load' });
|
|
75
|
+
const hdr = options.hdr ? await options.hdr() : undefined;
|
|
76
|
+
return await page.evaluate((req) => globalThis.selvaCapture(req), {
|
|
77
|
+
response,
|
|
78
|
+
view: options.view ?? 'iso',
|
|
79
|
+
grid: options.grid ?? true,
|
|
80
|
+
look: options.look,
|
|
81
|
+
background: options.background,
|
|
82
|
+
hdr
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
finally {
|
|
86
|
+
options.signal?.removeEventListener('abort', closePage);
|
|
87
|
+
await page.close().catch(() => { });
|
|
88
|
+
idle = setTimeout(() => {
|
|
89
|
+
const open = browser;
|
|
90
|
+
browser = undefined;
|
|
91
|
+
void open?.then((b) => b.close()).catch(() => { });
|
|
92
|
+
}, IDLE_CLOSE_MS);
|
|
93
|
+
idle.unref?.();
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
//# sourceMappingURL=capture.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../src/capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AA4C5C,mFAAmF;AACnF,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IACxC,IAAI,GAAG,yBAAyB,CAAC;CAC1C;AAkBD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,4BAA4B,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5E,0FAA0F;AAC1F,MAAM,IAAI,GAAG,CAAC,yBAAyB,EAAE,6BAA6B,EAAE,wBAAwB,CAAC,CAAC;AAClG,2EAA2E;AAC3E,MAAM,aAAa,GAAG,OAAO,CAAC;AAE9B,IAAI,OAAqC,CAAC;AAC1C,IAAI,IAA+C,CAAC;AACpD,wFAAwF;AACxF,IAAI,KAAK,GAAqB,OAAO,CAAC,OAAO,EAAE,CAAC;AAEhD,KAAK,UAAU,MAAM,CAAC,cAAkC,EAAE,OAAe;IACxE,6FAA6F;IAC7F,MAAM,IAAI,GAAG,iBAAiB,CAAC;IAC/B,IAAI,QAAkB,CAAC;IACvB,IAAI,CAAC;QACJ,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAA2B,CAAC,CAAC;IACpF,CAAC;IAAC,MAAM,CAAC;QACR,MAAM,IAAI,uBAAuB,CAChC,sFAAsF,CACtF,CAAC;IACH,CAAC;IACD,IAAI,CAAC;QACJ,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAChF,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC;QACzD,OAAO,QAAQ,CAAC;IACjB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,MAAM,IAAI,uBAAuB,CAChC,8BAA8B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI;YAChG,yFAAyF;YACzF,qCAAqC,CACtC,CAAC;IACH,CAAC;AACF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,QAAiB,EAAE,UAA0B,EAAE;IAC3E,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;QAC3B,MAAM,EAAE,cAAc,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IACH,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC5B,IAAI,CAAC,MAAM;QAAE,OAAO,GAAG,CAAC;IACxB,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC/C,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,MAAM,CAAC,OAAO;YAAE,OAAO,OAAO,EAAE,CAAC;QACrC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,QAAiB,EAAE,OAAuB;IAChE,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC;IAC5C,YAAY,CAAC,IAAI,CAAC,CAAC;IACnB,OAAO,KAAK,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;QAC1E,OAAO,GAAG,SAAS,CAAC;QACpB,MAAM,GAAG,CAAC;IACX,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAC;IACrE,8DAA8D;IAC9D,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC1D,OAAO,CAAC,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACrE,IAAI,CAAC;QACJ,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;QACjC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAChC,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC;QAC5F,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;QACnD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1D,OAAO,MAAM,IAAI,CAAC,QAAQ,CACzB,CAAC,GAAG,EAAE,EAAE,CAEN,UAGA,CAAC,YAAY,CAAC,GAAG,CAAC,EACpB;YACC,QAAQ;YACR,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,KAAK;YAC3B,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,IAAI;YAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,GAAG;SACH,CACD,CAAC;IACH,CAAC;YAAS,CAAC;QACV,OAAO,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACxD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACnC,IAAI,GAAG,UAAU,CAAC,GAAG,EAAE;YACtB,MAAM,IAAI,GAAG,OAAO,CAAC;YACrB,OAAO,GAAG,SAAS,CAAC;YACpB,KAAK,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACnD,CAAC,EAAE,aAAa,CAAC,CAAC;QAClB,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;IAChB,CAAC;AACF,CAAC"}
|
package/dist/client.d.ts
CHANGED
|
@@ -31,6 +31,8 @@ interface CallOptions {
|
|
|
31
31
|
signal?: AbortSignal;
|
|
32
32
|
/** Overrides the client's default for this call. */
|
|
33
33
|
timeoutMs?: number;
|
|
34
|
+
/** A non-JSON success body comes back as {@link BinaryData} instead of its size alone. */
|
|
35
|
+
bytes?: boolean;
|
|
34
36
|
}
|
|
35
37
|
export type TypedCallArgs<O> = CallOptions & {
|
|
36
38
|
params?: PathOf<O>;
|
|
@@ -40,6 +42,7 @@ export type TypedCallArgs<O> = CallOptions & {
|
|
|
40
42
|
export interface UntypedCallArgs extends CallOptions {
|
|
41
43
|
params?: Record<string, string | number>;
|
|
42
44
|
query?: Record<string, unknown>;
|
|
45
|
+
/** JSON, or `FormData` for a multipart operation. */
|
|
43
46
|
body?: unknown;
|
|
44
47
|
}
|
|
45
48
|
export interface TypedApi<Ops> {
|
|
@@ -55,6 +58,10 @@ export interface BinaryBody {
|
|
|
55
58
|
contentType: string;
|
|
56
59
|
bytes: number;
|
|
57
60
|
}
|
|
61
|
+
/** A binary success body with its bytes, for a call made with `bytes: true`. */
|
|
62
|
+
export interface BinaryData extends BinaryBody {
|
|
63
|
+
data: Uint8Array;
|
|
64
|
+
}
|
|
58
65
|
export interface ApiClientOptions {
|
|
59
66
|
/** The host's origin, e.g. `https://selva.example.com`. Spec paths carry the `/api/v1` prefix. */
|
|
60
67
|
baseUrl: string;
|
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAa,cAAc,EAAE,MAAM,WAAW,CAAC;AAS3D,KAAK,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,UAAU,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC,GAAG,MAAM,CAAC;AAChE,KAAK,MAAM,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,SAAS;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAC;AAClE,KAAK,OAAO,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAC;AACpE,KAAK,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,WAAW,CAAC,EAAE;QAAE,OAAO,EAAE;YAAE,kBAAkB,EAAE,MAAM,CAAC,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,GACtF,CAAC,GACD,KAAK,CAAC;AACT,KAAK,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,OAAO,EAAE;QAAE,kBAAkB,EAAE,MAAM,CAAC,CAAA;KAAE,CAAA;CAAE,GAAG,CAAC,GAAG,SAAS,CAAC;AACxF,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,SAAS,EAAE,MAAM,CAAC,CAAA;CAAE,GACjD,CAAC,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC,CAAA;CAAE,GACzB,MAAM,CAAC,CAAC,CAAC,GACT,CAAC,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC,CAAA;CAAE,GACzB,MAAM,CAAC,CAAC,CAAC,GACT,SAAS,GACX,OAAO,CAAC;AAEX,UAAU,WAAW;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,oDAAoD;IACpD,SAAS,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/client.js
CHANGED
|
@@ -52,7 +52,9 @@ allowed) {
|
|
|
52
52
|
Authorization: `Bearer ${options.apiKey}`,
|
|
53
53
|
Accept: 'application/json'
|
|
54
54
|
};
|
|
55
|
-
|
|
55
|
+
const form = args.body instanceof FormData;
|
|
56
|
+
// FormData sets its own multipart boundary.
|
|
57
|
+
if (args.body !== undefined && !form)
|
|
56
58
|
headers['Content-Type'] = 'application/json';
|
|
57
59
|
// One key for every attempt: a retry after a timeout replays instead of running twice.
|
|
58
60
|
if (op.idempotent)
|
|
@@ -76,7 +78,11 @@ allowed) {
|
|
|
76
78
|
// The key is the only credential: a host fetch that forwards the incoming
|
|
77
79
|
// request's cookies must not let a session ride along.
|
|
78
80
|
credentials: 'omit',
|
|
79
|
-
body: args.body === undefined
|
|
81
|
+
body: args.body === undefined
|
|
82
|
+
? undefined
|
|
83
|
+
: form
|
|
84
|
+
? args.body
|
|
85
|
+
: JSON.stringify(args.body),
|
|
80
86
|
signal
|
|
81
87
|
});
|
|
82
88
|
}
|
|
@@ -100,7 +106,7 @@ allowed) {
|
|
|
100
106
|
if (!res.ok)
|
|
101
107
|
throw await toError(operationId, res);
|
|
102
108
|
tally.status = res.status;
|
|
103
|
-
return readBody(res);
|
|
109
|
+
return readBody(res, args.bytes);
|
|
104
110
|
}
|
|
105
111
|
}
|
|
106
112
|
return { call };
|
|
@@ -124,14 +130,17 @@ function queryString(query) {
|
|
|
124
130
|
const s = search.toString();
|
|
125
131
|
return s ? `?${s}` : '';
|
|
126
132
|
}
|
|
127
|
-
async function readBody(res) {
|
|
133
|
+
async function readBody(res, keepBytes = false) {
|
|
128
134
|
if (res.status === 204)
|
|
129
135
|
return undefined;
|
|
130
136
|
const type = res.headers.get('Content-Type') ?? '';
|
|
131
137
|
if (type.includes('json'))
|
|
132
138
|
return res.json();
|
|
133
|
-
const
|
|
134
|
-
|
|
139
|
+
const data = new Uint8Array(await res.arrayBuffer());
|
|
140
|
+
if (keepBytes) {
|
|
141
|
+
return { binary: true, contentType: type, bytes: data.byteLength, data };
|
|
142
|
+
}
|
|
143
|
+
return { binary: true, contentType: type, bytes: data.byteLength };
|
|
135
144
|
}
|
|
136
145
|
async function toError(operationId, res, retryAfter) {
|
|
137
146
|
let body = {};
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export { createMcpServer, refuseEarly } from './server.js';
|
|
2
2
|
export type { McpServerOptions, PromptDefinition, ResourceDefinition, SelvaMcpServer, ToolCallRecord } from './server.js';
|
|
3
|
-
export { appResource, MCP_APP_MIME_TYPE, SOLVE_VIEW_KEY, type AppCsp, type AppResourceOptions, type ToolUi, type SolveViewData, type ToolVisibility } from './app.js';
|
|
3
|
+
export { appResource, MCP_APP_MIME_TYPE, SOLVE_VIEW_KEY, type AppCsp, type AppResourceOptions, type ToolUi, type SolveViewData, type SolveViewForm, type ViewInput, type ToolVisibility } from './app.js';
|
|
4
4
|
export { solveView, SOLVE_VIEW_URI } from './views.js';
|
|
5
5
|
export { tool, toolkit, fromOperation, inputFrom } from './tool.js';
|
|
6
6
|
export type { Annotations, DerivedInput, FromOperationOptions, ToolContext, ToolDefinition } from './tool.js';
|
|
7
|
-
export type { Api, ApiCallRecord, ApiClientOptions, BinaryBody, TypedApi, TypedCallArgs, UntypedApi, UntypedCallArgs } from './client.js';
|
|
7
|
+
export type { Api, ApiCallRecord, ApiClientOptions, BinaryBody, BinaryData, TypedApi, TypedCallArgs, UntypedApi, UntypedCallArgs } from './client.js';
|
|
8
8
|
export { ApiCallError, describeError, type ErrorHint } from './errors.js';
|
|
9
9
|
export { jsonOutput, listOutput, truncate, type ToolImage, type ToolOutput } from './output.js';
|
|
10
10
|
export type { JsonSchema, Operation, ScopeAction } from './spec.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,YAAY,EACX,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,MAAM,aAAa,CAAC;AACrB,OAAO,EACN,WAAW,EACX,iBAAiB,EACjB,cAAc,EACd,KAAK,MAAM,EACX,KAAK,kBAAkB,EACvB,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACpE,YAAY,EACX,WAAW,EACX,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,cAAc,EACd,MAAM,WAAW,CAAC;AACnB,YAAY,EACX,GAAG,EACH,aAAa,EACb,gBAAgB,EAChB,UAAU,EACV,QAAQ,EACR,aAAa,EACb,UAAU,EACV,eAAe,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAChG,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC3D,YAAY,EACX,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,MAAM,aAAa,CAAC;AACrB,OAAO,EACN,WAAW,EACX,iBAAiB,EACjB,cAAc,EACd,KAAK,MAAM,EACX,KAAK,kBAAkB,EACvB,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACpE,YAAY,EACX,WAAW,EACX,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,cAAc,EACd,MAAM,WAAW,CAAC;AACnB,YAAY,EACX,GAAG,EACH,aAAa,EACb,gBAAgB,EAChB,UAAU,EACV,UAAU,EACV,QAAQ,EACR,aAAa,EACb,UAAU,EACV,eAAe,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAChG,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAQ3D,OAAO,EACN,WAAW,EACX,iBAAiB,EACjB,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAQ3D,OAAO,EACN,WAAW,EACX,iBAAiB,EACjB,cAAc,EAQd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAmBpE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAkB,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAmC,MAAM,aAAa,CAAC"}
|
package/dist/server.d.ts
CHANGED
|
@@ -71,8 +71,13 @@ export interface ToolCallRecord {
|
|
|
71
71
|
durationMs: number;
|
|
72
72
|
/** `invalid_arguments`: refused before any call; `timeout`: a call got no answer in time. */
|
|
73
73
|
outcome: 'ok' | 'error' | 'timeout' | 'invalid_arguments';
|
|
74
|
-
/**
|
|
74
|
+
/**
|
|
75
|
+
* The failing call's code, or the thrown error's name. A tool that rewrites an
|
|
76
|
+
* `ApiCallError`'s message keeps this by throwing `new Error(text, { cause: err })`.
|
|
77
|
+
*/
|
|
75
78
|
code?: string;
|
|
79
|
+
/** The failing call's HTTP status; `0` when no response arrived. */
|
|
80
|
+
status?: number;
|
|
76
81
|
/** The host API calls it made, in the order they settled. */
|
|
77
82
|
calls: ApiCallRecord[];
|
|
78
83
|
/** Each argument's JSON length, by name. */
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AASA,OAAO,EAEN,KAAK,GAAG,EACR,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,UAAU,EACf,MAAM,aAAa,CAAC;AAErB,OAAO,EAA+B,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAE1E,OAAO,EAAyD,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AACpG,OAAO,EAMN,KAAK,cAAc,EACnB,MAAM,WAAW,CAAC;AAEnB,MAAM,WAAW,kBAAkB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6EAA6E;IAC7E,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,CAAC;IACzE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC;CAC7C;AAED,MAAM,WAAW,gBAAiB,SAAQ,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC;IACzE;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,oFAAoF;IACpF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mDAAmD;IACnD,OAAO,EAAE,OAAO,CAAC;IAGjB,KAAK,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;IAClC,SAAS,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACjC,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,mFAAmF;IACnF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IACrE,qFAAqF;IACrF,SAAS,CAAC,EAAE;QAAE,mBAAmB,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC9D;;;OAGG;IACH,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;CAC5C;AAED,gDAAgD;AAChD,MAAM,WAAW,cAAc;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,6FAA6F;IAC7F,OAAO,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS,GAAG,mBAAmB,CAAC;IAC1D
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/dist/server.js
CHANGED
|
@@ -2,7 +2,7 @@ import { createMcpHandler, ProtocolError, ProtocolErrorCode, Server } from '@mod
|
|
|
2
2
|
import { serveStdio } from '@modelcontextprotocol/server/stdio';
|
|
3
3
|
import { z } from 'zod';
|
|
4
4
|
import { createApiClient } from './client.js';
|
|
5
|
-
import { MCP_APP_MIME_TYPE } from './app.js';
|
|
5
|
+
import { MCP_APP_EXTENSION, MCP_APP_MIME_TYPE } from './app.js';
|
|
6
6
|
import { ApiCallError, describeError } from './errors.js';
|
|
7
7
|
import { indexOperations } from './spec.js';
|
|
8
8
|
import { annotationsFor, resolveInput, resolveOutput } from './tool.js';
|
|
@@ -13,6 +13,12 @@ const GRANTS_TTL_MS = 60_000;
|
|
|
13
13
|
const GRANTS_MAX = 1_000;
|
|
14
14
|
// Tools change on deploy, not per call. Private: the list varies by key.
|
|
15
15
|
const TOOLS_LIST_CACHE = { ttlMs: 300_000, cacheScope: 'private' };
|
|
16
|
+
function rendersApps(capabilities) {
|
|
17
|
+
if (!capabilities)
|
|
18
|
+
return true;
|
|
19
|
+
const { extensions } = capabilities;
|
|
20
|
+
return !!extensions?.[MCP_APP_EXTENSION]?.mimeTypes?.includes(MCP_APP_MIME_TYPE);
|
|
21
|
+
}
|
|
16
22
|
export function createMcpServer(options) {
|
|
17
23
|
const spec = indexOperations(options.openapi);
|
|
18
24
|
const tools = resolveTools(options.tools, spec);
|
|
@@ -36,7 +42,9 @@ export function createMcpServer(options) {
|
|
|
36
42
|
}
|
|
37
43
|
return value;
|
|
38
44
|
};
|
|
39
|
-
|
|
45
|
+
// Without an `outputSchema`, clients show `structuredContent` in place of the text and
|
|
46
|
+
// drop its hints, so a tool without `output` sends the text alone.
|
|
47
|
+
function toResult(out, hasOutputSchema) {
|
|
40
48
|
return {
|
|
41
49
|
content: [
|
|
42
50
|
{ type: 'text', text: redact(out.text) },
|
|
@@ -46,7 +54,8 @@ export function createMcpServer(options) {
|
|
|
46
54
|
mimeType
|
|
47
55
|
}))
|
|
48
56
|
],
|
|
49
|
-
...(
|
|
57
|
+
...(hasOutputSchema &&
|
|
58
|
+
out.structured && {
|
|
50
59
|
structuredContent: JSON.parse(redact(JSON.stringify(out.structured)))
|
|
51
60
|
}),
|
|
52
61
|
...(out.meta && {
|
|
@@ -115,8 +124,12 @@ export function createMcpServer(options) {
|
|
|
115
124
|
}
|
|
116
125
|
}, new Set(resolved.def.calls));
|
|
117
126
|
const args = resolved.input.parse(req.params.arguments ?? {});
|
|
118
|
-
const out = await resolved.def.run(api, args, {
|
|
119
|
-
|
|
127
|
+
const out = await resolved.def.run(api, args, {
|
|
128
|
+
signal: ctx.mcpReq.signal,
|
|
129
|
+
spec,
|
|
130
|
+
apps: rendersApps(server.getClientCapabilities())
|
|
131
|
+
});
|
|
132
|
+
result = toResult(typeof out === 'string' ? { text: out } : out, !!resolved.output);
|
|
120
133
|
return result;
|
|
121
134
|
}
|
|
122
135
|
catch (err) {
|
|
@@ -414,13 +427,26 @@ function checkCalls(owner, calls, spec) {
|
|
|
414
427
|
}
|
|
415
428
|
}
|
|
416
429
|
function outcomeOf(err) {
|
|
417
|
-
|
|
418
|
-
|
|
430
|
+
const api = apiCallErrorIn(err);
|
|
431
|
+
if (api) {
|
|
432
|
+
return {
|
|
433
|
+
outcome: api.code === 'TIMEOUT' ? 'timeout' : 'error',
|
|
434
|
+
code: api.code,
|
|
435
|
+
status: api.status
|
|
436
|
+
};
|
|
419
437
|
}
|
|
420
438
|
if (err instanceof z.ZodError)
|
|
421
439
|
return { outcome: 'invalid_arguments' };
|
|
422
440
|
return { outcome: 'error', code: err instanceof Error ? err.name : 'Error' };
|
|
423
441
|
}
|
|
442
|
+
/** The `ApiCallError` behind a failure, directly or through `cause`. */
|
|
443
|
+
function apiCallErrorIn(err) {
|
|
444
|
+
for (let e = err, depth = 0; e instanceof Error && depth < 5; e = e.cause, depth++) {
|
|
445
|
+
if (e instanceof ApiCallError)
|
|
446
|
+
return e;
|
|
447
|
+
}
|
|
448
|
+
return undefined;
|
|
449
|
+
}
|
|
424
450
|
function jsonLength(value) {
|
|
425
451
|
if (value === undefined)
|
|
426
452
|
return 0;
|