@selvajs/mcp 0.1.0-beta.2 → 0.1.0-beta.3

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 CHANGED
@@ -52,10 +52,19 @@ await server.listen({ transport: 'stdio' }); // checks the live spec first
52
52
  - **The key is redacted** from every tool output.
53
53
  - **`listen` checks the live spec** at `/api/v1/openapi.json`: every declared call must exist
54
54
  with the same scope, or the server refuses to start.
55
+ - **A browser `Origin` must be the host's own** or listed in `allowedOrigins`; anything else gets 403. Native clients send none.
56
+ - **`grantedActions` hides what the key can't use.** Given it, `tools/list` drops tools whose
57
+ calls need an action the key lacks, and calling one answers 403 with an `insufficient_scope`
58
+ challenge. `challenge` adds `resource_metadata` and `scope` to the 401 and 403, for OAuth
59
+ clients.
60
+
61
+ Both protocol eras are served: the current stateless revision per request, and older clients
62
+ through the SDK's stateless fallback.
55
63
 
56
64
  ## Output
57
65
 
58
- A tool returns a string, or `{ text, structured?, images? }`. `images` (`{ data, mimeType }`,
66
+ A tool returns a string, or `{ text, structured?, images? }`. A tool with `output` (Zod or JSON
67
+ Schema) lists it as `outputSchema`, and clients may reject a `structured` that doesn't match it. `images` (`{ data, mimeType }`,
59
68
  base64) follow the text as MCP image content, for a model that can see. Clients render PNG, JPEG,
60
69
  GIF and WebP, not SVG.
61
70
 
package/dist/server.d.ts CHANGED
@@ -1,5 +1,6 @@
1
- import { type Api, type ApiClientOptions } from './client.js';
1
+ import { type Api, type ApiClientOptions, type UntypedApi } from './client.js';
2
2
  import { type ErrorHint } from './errors.js';
3
+ import { type ScopeAction } from './spec.js';
3
4
  import { type ToolDefinition } from './tool.js';
4
5
  export interface ResourceDefinition {
5
6
  uri: string;
@@ -37,6 +38,24 @@ export interface McpServerOptions extends Omit<ApiClientOptions, 'apiKey'> {
37
38
  errorHint?: ErrorHint;
38
39
  /** Where the live spec is served, for `verify`. Default `/api/v1/openapi.json`. */
39
40
  specPath?: string;
41
+ /**
42
+ * Browser origins `handle` accepts besides `baseUrl`'s, e.g. a web MCP inspector.
43
+ * Native clients send no `Origin` and are unaffected. `baseUrl` must be the
44
+ * configured origin, not one read from the request's `Host`, or a rebinding page passes.
45
+ */
46
+ allowedOrigins?: string[];
47
+ /**
48
+ * Every action the request's key may perform, read through the host's API. With it,
49
+ * `tools/list` leaves out tools the key can't use and a call to one gets an
50
+ * `insufficient_scope` 403. The host decides what implies what: return `read` for a
51
+ * `solve` key if `solve` includes it. A 401 from the host becomes a 401 here.
52
+ */
53
+ grantedActions?: (api: UntypedApi) => Promise<Iterable<ScopeAction>>;
54
+ /** Advertised on 401 and 403, so OAuth clients can find the authorization server. */
55
+ challenge?: {
56
+ resourceMetadataUrl: string;
57
+ scopes: string[];
58
+ };
40
59
  }
41
60
  export interface SelvaMcpServer {
42
61
  /** Checks every tool's calls against the live spec: same operations, same scopes. */
@@ -1 +1 @@
1
- {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAaA,OAAO,EAAmB,KAAK,GAAG,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,EAA+B,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAG1E,OAAO,EAKN,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,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;CAClB;AAWD,MAAM,WAAW,cAAc;IAC9B,qFAAqF;IACrF,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,+CAA+C;IAC/C,MAAM,CAAC,OAAO,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzE;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CAClF;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,cAAc,CA2LzE"}
1
+ {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AASA,OAAO,EAAmB,KAAK,GAAG,EAAE,KAAK,gBAAgB,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAChG,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,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;;;;OAIG;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;CAC9D;AAoBD,MAAM,WAAW,cAAc;IAC9B,qFAAqF;IACrF,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,+CAA+C;IAC/C,MAAM,CAAC,OAAO,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzE;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CAClF;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,cAAc,CA8QzE"}
package/dist/server.js CHANGED
@@ -1,19 +1,24 @@
1
- import { Server } from '@modelcontextprotocol/sdk/server/index.js';
2
- import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
3
- import { WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js';
4
- import { CallToolRequestSchema, GetPromptRequestSchema, ListPromptsRequestSchema, ListResourcesRequestSchema, ListToolsRequestSchema, ReadResourceRequestSchema } from '@modelcontextprotocol/sdk/types.js';
1
+ import { createMcpHandler, ProtocolError, ProtocolErrorCode, Server } from '@modelcontextprotocol/server';
2
+ import { serveStdio } from '@modelcontextprotocol/server/stdio';
5
3
  import { z } from 'zod';
6
4
  import { createApiClient } from './client.js';
7
5
  import { ApiCallError, describeError } from './errors.js';
8
6
  import { indexOperations } from './spec.js';
9
- import { annotationsFor, resolveInput } from './tool.js';
7
+ import { annotationsFor, resolveInput, resolveOutput } from './tool.js';
10
8
  const HEARTBEAT_MS = 15_000;
9
+ // A key's scopes never change, so this only bounds how long a revoked key keeps
10
+ // its tool list. Its calls still fail at /api/v1 immediately.
11
+ const GRANTS_TTL_MS = 60_000;
12
+ const GRANTS_MAX = 1_000;
13
+ // Tools change on deploy, not per call. Private: the list varies by key.
14
+ const TOOLS_LIST_CACHE = { ttlMs: 300_000, cacheScope: 'private' };
11
15
  export function createMcpServer(options) {
12
16
  const spec = indexOperations(options.openapi);
13
17
  const tools = resolveTools(options.tools, spec);
14
18
  for (const r of options.resources ?? [])
15
19
  checkCalls(`resource ${r.uri}`, r.calls, spec);
16
- function build(apiKey, fetch = options.fetch) {
20
+ /** `visible` limits which tools this request sees; undefined means all of them. */
21
+ function build(apiKey, fetch = options.fetch, visible) {
17
22
  const clientOptions = { ...options, apiKey, fetch };
18
23
  // No key may reach the model, even echoed back inside an upstream message.
19
24
  const keys = [apiKey, ...(options.apiKey ? [options.apiKey] : [])];
@@ -42,30 +47,35 @@ export function createMcpServer(options) {
42
47
  ...(options.resources?.length && { resources: {} }),
43
48
  ...(options.prompts?.length && { prompts: {} })
44
49
  },
45
- instructions: options.instructions
50
+ instructions: options.instructions,
51
+ cacheHints: { 'tools/list': TOOLS_LIST_CACHE }
46
52
  });
47
- server.setRequestHandler(ListToolsRequestSchema, () => ({
48
- tools: [...tools.values()].map(({ def, input, annotations }) => ({
53
+ const listed = [...tools.values()].filter((t) => !visible || visible.has(t.def.name));
54
+ server.setRequestHandler('tools/list', () => ({
55
+ tools: listed.map(({ def, input, output, annotations }) => ({
49
56
  name: def.name,
50
57
  title: def.title,
51
58
  description: def.description,
52
59
  inputSchema: input.schema,
60
+ ...(output && { outputSchema: output }),
53
61
  annotations: { title: def.title, ...annotations }
54
62
  }))
55
63
  }));
56
- server.setRequestHandler(CallToolRequestSchema, async (req, extra) => {
64
+ server.setRequestHandler('tools/call', async (req, ctx) => {
57
65
  const resolved = tools.get(req.params.name);
58
- if (!resolved)
59
- return errorResult(`Unknown tool ${req.params.name}.`);
60
- const token = extra._meta?.progressToken;
66
+ // A protocol error, not a tool result: the model can't fix a name the server never offered.
67
+ if (!resolved || (visible && !visible.has(resolved.def.name))) {
68
+ throw new ProtocolError(ProtocolErrorCode.InvalidParams, `Unknown tool ${req.params.name}`);
69
+ }
70
+ const token = ctx.mcpReq._meta?.progressToken;
61
71
  const started = Date.now();
62
72
  let tick = 0;
63
73
  // Solves hold the request open for minutes; without a heartbeat some clients give up.
64
74
  const heartbeat = token === undefined
65
75
  ? undefined
66
76
  : setInterval(() => {
67
- void extra
68
- .sendNotification({
77
+ void ctx.mcpReq
78
+ .notify({
69
79
  method: 'notifications/progress',
70
80
  params: {
71
81
  progressToken: token,
@@ -78,7 +88,7 @@ export function createMcpServer(options) {
78
88
  try {
79
89
  const api = createApiClient(spec, clientOptions, new Set(resolved.def.calls));
80
90
  const args = resolved.input.parse(req.params.arguments ?? {});
81
- const out = await resolved.def.run(api, args, { signal: extra.signal, spec });
91
+ const out = await resolved.def.run(api, args, { signal: ctx.mcpReq.signal, spec });
82
92
  return toResult(typeof out === 'string' ? { text: out } : out);
83
93
  }
84
94
  catch (err) {
@@ -90,7 +100,7 @@ export function createMcpServer(options) {
90
100
  });
91
101
  if (options.resources?.length) {
92
102
  const resources = options.resources;
93
- server.setRequestHandler(ListResourcesRequestSchema, () => ({
103
+ server.setRequestHandler('resources/list', () => ({
94
104
  resources: resources.map(({ uri, name, description, mimeType }) => ({
95
105
  uri,
96
106
  name,
@@ -98,10 +108,11 @@ export function createMcpServer(options) {
98
108
  mimeType
99
109
  }))
100
110
  }));
101
- server.setRequestHandler(ReadResourceRequestSchema, async (req) => {
111
+ server.setRequestHandler('resources/read', async (req) => {
102
112
  const resource = resources.find((r) => r.uri === req.params.uri);
103
- if (!resource)
104
- throw new Error(`Unknown resource ${req.params.uri}`);
113
+ if (!resource) {
114
+ throw new ProtocolError(ProtocolErrorCode.InvalidParams, `Unknown resource ${req.params.uri}`);
115
+ }
105
116
  const api = createApiClient(spec, clientOptions, new Set(resource.calls));
106
117
  const text = redact(await resource.read(api));
107
118
  return { contents: [{ uri: resource.uri, mimeType: resource.mimeType, text }] };
@@ -109,17 +120,18 @@ export function createMcpServer(options) {
109
120
  }
110
121
  if (options.prompts?.length) {
111
122
  const prompts = options.prompts;
112
- server.setRequestHandler(ListPromptsRequestSchema, () => ({
123
+ server.setRequestHandler('prompts/list', () => ({
113
124
  prompts: prompts.map(({ name, description, arguments: args }) => ({
114
125
  name,
115
126
  description,
116
127
  arguments: args
117
128
  }))
118
129
  }));
119
- server.setRequestHandler(GetPromptRequestSchema, (req) => {
130
+ server.setRequestHandler('prompts/get', (req) => {
120
131
  const prompt = prompts.find((p) => p.name === req.params.name);
121
- if (!prompt)
122
- throw new Error(`Unknown prompt ${req.params.name}`);
132
+ if (!prompt) {
133
+ throw new ProtocolError(ProtocolErrorCode.InvalidParams, `Unknown prompt ${req.params.name}`);
134
+ }
123
135
  const text = prompt.render(req.params.arguments ?? {});
124
136
  return { messages: [{ role: 'user', content: { type: 'text', text } }] };
125
137
  });
@@ -159,25 +171,80 @@ export function createMcpServer(options) {
159
171
  problems.join('\n'));
160
172
  }
161
173
  }
174
+ const grants = new Map();
175
+ /** Tool names the key may use, or undefined when the host doesn't say. */
176
+ async function visibleTools(apiKey, fetch) {
177
+ if (!options.grantedActions)
178
+ return undefined;
179
+ const id = await sha256(apiKey);
180
+ let entry = grants.get(id);
181
+ if (!entry || Date.now() - entry.at > GRANTS_TTL_MS) {
182
+ const api = createApiClient(spec, { ...options, apiKey, fetch: fetch ?? options.fetch });
183
+ entry = { at: Date.now(), actions: options.grantedActions(api).then((a) => new Set(a)) };
184
+ if (grants.size >= GRANTS_MAX)
185
+ grants.delete(grants.keys().next().value);
186
+ grants.set(id, entry);
187
+ // A failure isn't remembered: the next request asks again.
188
+ entry.actions.catch(() => grants.delete(id));
189
+ }
190
+ const granted = await entry.actions;
191
+ return new Set([...tools.values()]
192
+ .filter((t) => t.actions.every((a) => granted.has(a)))
193
+ .map((t) => t.def.name));
194
+ }
195
+ /** The tool a `tools/call` body names, when the server has one by that name. */
196
+ async function calledTool(request) {
197
+ const message = (await request
198
+ .clone()
199
+ .json()
200
+ .catch(() => null));
201
+ if (message?.method !== 'tools/call' || typeof message.params?.name !== 'string')
202
+ return;
203
+ return tools.get(message.params.name);
204
+ }
205
+ // Not the request's own URL: under DNS rebinding that is the attacker's name.
206
+ const trusted = new Set([new URL(options.baseUrl).origin, ...(options.allowedOrigins ?? [])]);
207
+ // One handler for every request; the key and fetch ride in `authInfo`, which the
208
+ // SDK passes through to the factory untouched. 2025-era clients are served statelessly.
209
+ const http = createMcpHandler(({ authInfo }) => build(authInfo.token, authInfo.extra?.fetch, authInfo.extra?.visible));
162
210
  return {
163
211
  verify,
164
212
  async listen({ verify: check = true }) {
165
213
  const apiKey = configuredKey();
166
214
  if (check)
167
215
  await verify();
168
- await build(apiKey).connect(new StdioServerTransport());
216
+ serveStdio(() => build(apiKey));
169
217
  },
170
218
  async handle(request, overrides) {
219
+ // DNS rebinding: a page on another origin that resolves to this host.
220
+ const origin = request.headers.get('Origin');
221
+ if (origin && !trusted.has(origin))
222
+ return originRefused();
171
223
  const apiKey = bearerOf(request);
172
224
  // Anything else would reach /api/v1 as "no key" and, on a host whose fetch
173
225
  // forwards cookies, run as the browser session instead.
174
226
  if (!apiKey?.startsWith(API_KEY_PREFIX))
175
- return keyRequired();
176
- const transport = new WebStandardStreamableHTTPServerTransport({
177
- sessionIdGenerator: undefined
227
+ return keyRequired(options.challenge);
228
+ const fetch = overrides?.fetch ?? options.fetch;
229
+ let visible;
230
+ try {
231
+ visible = await visibleTools(apiKey, fetch);
232
+ }
233
+ catch (err) {
234
+ if (err instanceof ApiCallError && err.status === 401) {
235
+ return keyRequired(options.challenge, 'invalid_token');
236
+ }
237
+ // Anything else: list every tool and let /api/v1 refuse what the key can't do.
238
+ }
239
+ if (visible) {
240
+ const called = await calledTool(request);
241
+ if (called && !visible.has(called.def.name)) {
242
+ return insufficientScope(called.actions, options.challenge);
243
+ }
244
+ }
245
+ return http.fetch(request, {
246
+ authInfo: { token: apiKey, clientId: 'bearer', scopes: [], extra: { fetch, visible } }
178
247
  });
179
- await build(apiKey, overrides?.fetch ?? options.fetch).connect(transport);
180
- return transport.handleRequest(request);
181
248
  }
182
249
  };
183
250
  }
@@ -186,11 +253,53 @@ function bearerOf(request) {
186
253
  }
187
254
  /** The prefix every Selva API token carries (`API_TOKEN_PREFIX` in `@selvajs/server/tokens`). */
188
255
  const API_KEY_PREFIX = 'selva_';
189
- function keyRequired() {
256
+ function originRefused() {
257
+ return new Response(JSON.stringify({
258
+ jsonrpc: '2.0',
259
+ error: { code: -32600, message: 'Origin not allowed' }
260
+ }), { status: 403, headers: { 'Content-Type': 'application/json' } });
261
+ }
262
+ function bearerChallenge(params) {
263
+ const set = params.filter(([, v]) => v !== undefined).map(([k, v]) => `${k}="${v}"`);
264
+ return set.length ? `Bearer ${set.join(', ')}` : 'Bearer';
265
+ }
266
+ function keyRequired(challenge, error) {
190
267
  return new Response(JSON.stringify({
191
268
  message: 'Send a Selva API key as `Authorization: Bearer selva_…`.',
192
269
  code: 'UNAUTHORIZED'
193
- }), { status: 401, headers: { 'Content-Type': 'application/json', 'WWW-Authenticate': 'Bearer' } });
270
+ }), {
271
+ status: 401,
272
+ headers: {
273
+ 'Content-Type': 'application/json',
274
+ 'WWW-Authenticate': bearerChallenge([
275
+ ['error', error],
276
+ ['resource_metadata', challenge?.resourceMetadataUrl],
277
+ ['scope', challenge?.scopes.join(' ')]
278
+ ])
279
+ }
280
+ });
281
+ }
282
+ /** Every scope the tool needs in one challenge, so the client re-authorizes once. */
283
+ function insufficientScope(actions, challenge) {
284
+ const needed = [...new Set(['read', ...actions])].join(' ');
285
+ return new Response(JSON.stringify({
286
+ message: `This key lacks the scopes this tool needs: ${needed}.`,
287
+ code: 'FORBIDDEN'
288
+ }), {
289
+ status: 403,
290
+ headers: {
291
+ 'Content-Type': 'application/json',
292
+ 'WWW-Authenticate': bearerChallenge([
293
+ ['error', 'insufficient_scope'],
294
+ ['scope', needed],
295
+ ['resource_metadata', challenge?.resourceMetadataUrl]
296
+ ])
297
+ }
298
+ });
299
+ }
300
+ async function sha256(text) {
301
+ const digest = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(text));
302
+ return [...new Uint8Array(digest)].map((b) => b.toString(16).padStart(2, '0')).join('');
194
303
  }
195
304
  function resolveTools(
196
305
  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- same reason as `McpServerOptions.tools`
@@ -205,7 +314,9 @@ defs, spec) {
205
314
  tools.set(def.name, {
206
315
  def,
207
316
  input: resolveInput(def.input, spec),
208
- annotations: annotationsFor(def.calls, spec)
317
+ output: def.output && resolveOutput(def.output),
318
+ annotations: annotationsFor(def.calls, spec),
319
+ actions: [...new Set(def.calls.map((id) => spec.get(id).scope))]
209
320
  });
210
321
  }
211
322
  return tools;
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,wCAAwC,EAAE,MAAM,+DAA+D,CAAC;AACzH,OAAO,EACN,qBAAqB,EACrB,sBAAsB,EACtB,wBAAwB,EACxB,0BAA0B,EAC1B,sBAAsB,EACtB,yBAAyB,EAEzB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,eAAe,EAAmC,MAAM,aAAa,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,aAAa,EAAkB,MAAM,aAAa,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAuB,MAAM,WAAW,CAAC;AACjE,OAAO,EACN,cAAc,EACd,YAAY,EAIZ,MAAM,WAAW,CAAC;AA+CnB,MAAM,YAAY,GAAG,MAAM,CAAC;AAe5B,MAAM,UAAU,eAAe,CAAC,OAAyB;IACxD,MAAM,IAAI,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAChD,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,SAAS,IAAI,EAAE;QAAE,UAAU,CAAC,YAAY,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAExF,SAAS,KAAK,CAAC,MAAc,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK;QACnD,MAAM,aAAa,GAAG,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QACpD,2EAA2E;QAC3E,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAC/B,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;QAEpE,SAAS,QAAQ,CAAC,GAAe;YAChC,OAAO;gBACN,OAAO,EAAE;oBACR,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBACxC,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;wBAClD,IAAI,EAAE,OAAgB;wBACtB,IAAI;wBACJ,QAAQ;qBACR,CAAC,CAAC;iBACH;gBACD,GAAG,CAAC,GAAG,CAAC,UAAU,IAAI;oBACrB,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAGnE;iBACD,CAAC;aACF,CAAC;QACH,CAAC;QAED,SAAS,WAAW,CAAC,IAAY;YAChC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QAC3E,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,MAAM,CACxB,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,EAChD;YACC,YAAY,EAAE;gBACb,KAAK,EAAE,EAAE;gBACT,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;gBACnD,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;aAC/C;YACD,YAAY,EAAE,OAAO,CAAC,YAAY;SAClC,CACD,CAAC;QAEF,MAAM,CAAC,iBAAiB,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;YACvD,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;gBAChE,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,WAAW,EAAE,KAAK,CAAC,MAA4B;gBAC/C,WAAW,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,WAAW,EAAE;aACjD,CAAC,CAAC;SACH,CAAC,CAAC,CAAC;QAEJ,MAAM,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAA2B,EAAE;YAC7F,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,CAAC,QAAQ;gBAAE,OAAO,WAAW,CAAC,gBAAgB,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;YAEtE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC;YACzC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC3B,IAAI,IAAI,GAAG,CAAC,CAAC;YACb,sFAAsF;YACtF,MAAM,SAAS,GACd,KAAK,KAAK,SAAS;gBAClB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE;oBACjB,KAAK,KAAK;yBACR,gBAAgB,CAAC;wBACjB,MAAM,EAAE,wBAAwB;wBAChC,MAAM,EAAE;4BACP,aAAa,EAAE,KAAK;4BACpB,QAAQ,EAAE,EAAE,IAAI;4BAChB,OAAO,EAAE,kBAAkB,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI;yBACxE;qBACD,CAAC;yBACD,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBACnB,CAAC,EAAE,YAAY,CAAC,CAAC;YAEpB,IAAI,CAAC;gBACJ,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC9E,MAAM,IAAI,GAAY,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;gBACvE,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC9E,OAAO,QAAQ,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAChE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,OAAO,WAAW,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YAChF,CAAC;oBAAS,CAAC;gBACV,aAAa,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YACpC,MAAM,CAAC,iBAAiB,CAAC,0BAA0B,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC3D,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;oBACnE,GAAG;oBACH,IAAI;oBACJ,WAAW;oBACX,QAAQ;iBACR,CAAC,CAAC;aACH,CAAC,CAAC,CAAC;YACJ,MAAM,CAAC,iBAAiB,CAAC,yBAAyB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gBACjE,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjE,IAAI,CAAC,QAAQ;oBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;gBACrE,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC1E,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC9C,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YACjF,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAChC,MAAM,CAAC,iBAAiB,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAAC,CAAC;gBACzD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;oBACjE,IAAI;oBACJ,WAAW;oBACX,SAAS,EAAE,IAAI;iBACf,CAAC,CAAC;aACH,CAAC,CAAC,CAAC;YACJ,MAAM,CAAC,iBAAiB,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,EAAE;gBACxD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC/D,IAAI,CAAC,MAAM;oBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBAClE,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;gBACvD,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;YAC1E,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAED,SAAS,aAAa;QACrB,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAC5E,OAAO,OAAO,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,UAAU,MAAM;QACpB,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC;QACvC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,sBAAsB,CAAC,CAAC;QAC9F,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,aAAa,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5F,IAAI,CAAC,GAAG,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,6CAA6C,GAAG,UAAU,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QACzF,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAE/C,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC;YACrB,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YACxC,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;SACpD,CAAC,CAAC;QACH,KAAK,MAAM,EAAE,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC1B,IAAI,CAAC,IAAI;gBAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;iBACxC,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK;gBACjC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,IAAI,CAAC,KAAK,aAAa,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;iBAClE,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;gBACjE,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAC7D,CAAC;QACF,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACd,8CAA8C,OAAO,CAAC,OAAO,iCAAiC;gBAC7F,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CACpB,CAAC;QACH,CAAC;IACF,CAAC;IAED,OAAO;QACN,MAAM;QACN,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE;YACpC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;YAC/B,IAAI,KAAK;gBAAE,MAAM,MAAM,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;QACzD,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS;YAC9B,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YACjC,2EAA2E;YAC3E,wDAAwD;YACxD,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,cAAc,CAAC;gBAAE,OAAO,WAAW,EAAE,CAAC;YAC9D,MAAM,SAAS,GAAG,IAAI,wCAAwC,CAAC;gBAC9D,kBAAkB,EAAE,SAAS;aAC7B,CAAC,CAAC;YACH,MAAM,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAC1E,OAAO,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC;KACD,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,OAAgB;IACjC,OAAO,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACrF,CAAC;AAED,iGAAiG;AACjG,MAAM,cAAc,GAAG,QAAQ,CAAC;AAEhC,SAAS,WAAW;IACnB,OAAO,IAAI,QAAQ,CAClB,IAAI,CAAC,SAAS,CAAC;QACd,OAAO,EAAE,0DAA0D;QACnE,IAAI,EAAE,cAAc;KACpB,CAAC,EACF,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,EAAE,CAC9F,CAAC;AACH,CAAC;AAED,SAAS,YAAY;AACpB,yGAAyG;AACzG,IAAgC,EAChC,IAAoB;IAEpB,MAAM,KAAK,GAAG,IAAI,GAAG,EAAwB,CAAC;IAC9C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,IAAI,wBAAwB,CAAC,CAAC;QACjF,UAAU,CAAC,QAAQ,GAAG,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAChD,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE;YACnB,GAAG;YACH,KAAK,EAAE,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC;YACpC,WAAW,EAAE,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC;SAC5C,CAAC,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,KAAe,EAAE,IAAoB;IACvE,KAAK,MAAM,EAAE,IAAI,KAAK,EAAE,CAAC;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxB,IAAI,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,UAAU,EAAE,+CAA+C,CAAC,CAAC;QAC9F,uFAAuF;QACvF,IAAI,EAAE,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,UAAU,EAAE,uBAAuB,CAAC,CAAC;IAC/E,CAAC;AACF,CAAC;AAED,SAAS,QAAQ,CAAC,GAAY,EAAE,IAAgB;IAC/C,IAAI,GAAG,YAAY,YAAY;QAAE,OAAO,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACjE,IAAI,GAAG,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,SAAS,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACzF,OAAO,CAAC,oBAAoB,EAAE,GAAG,MAAM,EAAE,0BAA0B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzD,CAAC"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
package/dist/tool.d.ts CHANGED
@@ -23,6 +23,12 @@ export interface ToolDefinition<Ops = never, Args = Record<string, unknown>> {
23
23
  description: string;
24
24
  /** A Zod schema validates and types `args`; JSON Schema and derived inputs pass args through. */
25
25
  input: ZodType<Args> | JsonSchema | DerivedInput;
26
+ /**
27
+ * The shape of `structured`, listed as the tool's `outputSchema`. Clients may reject a
28
+ * result that doesn't match, so every success must return `structured` in this shape,
29
+ * `detail: 'full'` included. Keep it as loose as the real data.
30
+ */
31
+ output?: ZodType | JsonSchema;
26
32
  /** Every operationId `run` may call. Annotations derive from these; `api.call` refuses others. */
27
33
  calls: string[];
28
34
  run(api: Api<Ops>, args: Args, ctx: ToolContext): Promise<ToolOutput | string>;
@@ -53,6 +59,8 @@ export interface FromOperationOptions {
53
59
  limit?: number;
54
60
  omit?: string[];
55
61
  errorHint?: ErrorHint;
62
+ /** See `ToolDefinition.output`. The raw body under `detail: 'full'` must match it too. */
63
+ output?: ZodType | JsonSchema;
56
64
  }
57
65
  /** One tool calling one operation, its arguments split back into path, query and body. */
58
66
  export declare function fromOperation(operationId: string, options: FromOperationOptions): ToolDefinition<never, Record<string, unknown>>;
@@ -66,6 +74,7 @@ export interface ResolvedInput {
66
74
  parse(args: unknown): unknown;
67
75
  }
68
76
  export declare function resolveInput(input: ToolDefinition<unknown, unknown>['input'], spec: OperationIndex): ResolvedInput;
77
+ export declare function resolveOutput(output: ZodType | JsonSchema): JsonSchema;
69
78
  export interface Annotations {
70
79
  readOnlyHint: boolean;
71
80
  destructiveHint: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../src/tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,KAAK,OAAO,EAAE,MAAM,KAAK,CAAC;AACtC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE5D,MAAM,WAAW,WAAW;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,uEAAuE;IACvE,IAAI,EAAE,cAAc,CAAC;CACrB;AAED,yFAAyF;AACzF,MAAM,WAAW,YAAY;IAC5B,IAAI,EAAE,SAAS,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACnC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,cAAc,CAAC,GAAG,GAAG,KAAK,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1E,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0FAA0F;IAC1F,WAAW,EAAE,MAAM,CAAC;IACpB,iGAAiG;IACjG,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,GAAG,YAAY,CAAC;IACjD,kGAAkG;IAClG,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,CAAC;IAC/E,SAAS,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,wBAAgB,IAAI,CAAC,GAAG,GAAG,KAAK,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,GAAG,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,GAC5B,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAE3B;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACxB,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAO,GACzF,YAAY,CAQd;AAED,MAAM,WAAW,oBAAoB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,UAAU,GAAG,MAAM,CAAC;IAC9E,2FAA2F;IAC3F,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,CAAC,EAAE,SAAS,CAAC;CACtB;AAQD,0FAA0F;AAC1F,wBAAgB,aAAa,CAC5B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,oBAAoB,GAC3B,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAkChD;AAED,yFAAyF;AACzF,wBAAgB,OAAO,CAAC,GAAG;WAElB,IAAI,iCAAiC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC;mBACrC,CAC/B,WAAW,EAAE,OAAO,CAAC,MAAM,GAAG,EAAE,MAAM,CAAC,EACvC,OAAO,EAAE,oBAAoB,KACzB,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;EAEpD;AAMD,MAAM,WAAW,aAAa;IAC7B,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;CAC9B;AAED,wBAAgB,YAAY,CAC3B,KAAK,EAAE,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,EAChD,IAAI,EAAE,cAAc,GAClB,aAAa,CAUf;AAyCD,MAAM,WAAW,WAAW;IAC3B,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;CACvB;AAED,+FAA+F;AAC/F,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,cAAc,GAAG,WAAW,CAYjF"}
1
+ {"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../src/tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,KAAK,OAAO,EAAE,MAAM,KAAK,CAAC;AACtC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE5D,MAAM,WAAW,WAAW;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,uEAAuE;IACvE,IAAI,EAAE,cAAc,CAAC;CACrB;AAED,yFAAyF;AACzF,MAAM,WAAW,YAAY;IAC5B,IAAI,EAAE,SAAS,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACnC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,cAAc,CAAC,GAAG,GAAG,KAAK,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1E,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0FAA0F;IAC1F,WAAW,EAAE,MAAM,CAAC;IACpB,iGAAiG;IACjG,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,GAAG,YAAY,CAAC;IACjD;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IAC9B,kGAAkG;IAClG,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,CAAC;IAC/E,SAAS,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,wBAAgB,IAAI,CAAC,GAAG,GAAG,KAAK,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,GAAG,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,GAC5B,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAE3B;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACxB,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CAAO,GACzF,YAAY,CAQd;AAED,MAAM,WAAW,oBAAoB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,UAAU,GAAG,MAAM,CAAC;IAC9E,2FAA2F;IAC3F,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,0FAA0F;IAC1F,MAAM,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;CAC9B;AAQD,0FAA0F;AAC1F,wBAAgB,aAAa,CAC5B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,oBAAoB,GAC3B,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAmChD;AAED,yFAAyF;AACzF,wBAAgB,OAAO,CAAC,GAAG;WAElB,IAAI,iCAAiC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC;mBACrC,CAC/B,WAAW,EAAE,OAAO,CAAC,MAAM,GAAG,EAAE,MAAM,CAAC,EACvC,OAAO,EAAE,oBAAoB,KACzB,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;EAEpD;AAMD,MAAM,WAAW,aAAa;IAC7B,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;CAC9B;AAED,wBAAgB,YAAY,CAC3B,KAAK,EAAE,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,EAChD,IAAI,EAAE,cAAc,GAClB,aAAa,CAUf;AAyCD,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,UAAU,GAAG,UAAU,CAKtE;AAED,MAAM,WAAW,WAAW;IAC3B,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;CACvB;AAED,+FAA+F;AAC/F,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,cAAc,GAAG,WAAW,CAYjF"}
package/dist/tool.js CHANGED
@@ -34,6 +34,7 @@ export function fromOperation(operationId, options) {
34
34
  }),
35
35
  calls: [operationId],
36
36
  errorHint: options.errorHint,
37
+ output: options.output,
37
38
  async run(api, args, { spec, signal }) {
38
39
  const op = spec.get(operationId);
39
40
  const { detail, ...rest } = args;
@@ -118,6 +119,13 @@ function derive(input, spec) {
118
119
  ...(op.body && op.body.additionalProperties === false && { additionalProperties: false })
119
120
  };
120
121
  }
122
+ export function resolveOutput(output) {
123
+ if (!(output instanceof z.ZodType))
124
+ return output;
125
+ const schema = z.toJSONSchema(output, { io: 'output', target: 'draft-2020-12' });
126
+ delete schema.$schema;
127
+ return schema;
128
+ }
121
129
  /** The most permissive of a tool's calls wins: one `solve` makes the whole tool open-world. */
122
130
  export function annotationsFor(calls, spec) {
123
131
  const ops = calls.map((id) => spec.get(id));
package/dist/tool.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tool.js","sourceRoot":"","sources":["../src/tool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tool.js","sourceRoot":"","sources":["../src/tool.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@selvajs/mcp",
3
- "version": "0.1.0-beta.2",
3
+ "version": "0.1.0-beta.3",
4
4
  "description": "MCP server machinery for Selva hosts: tools over a host's /api/v1, with key auth, error mapping and annotations from its OpenAPI document",
5
5
  "license": "MIT",
6
6
  "author": "VektorNode",
@@ -40,15 +40,15 @@
40
40
  "!**/*.spec.*"
41
41
  ],
42
42
  "dependencies": {
43
- "@modelcontextprotocol/sdk": "^1.30.1",
43
+ "@modelcontextprotocol/server": "^2.3.1",
44
44
  "zod": "^4.6.5"
45
45
  },
46
46
  "devDependencies": {
47
47
  "@types/node": "^26.6.2",
48
48
  "typescript": "~6.0.3",
49
49
  "vitest": "^5.0.2",
50
- "@selvajs/config": "0.0.4",
51
- "@selvajs/server": "1.5.0-beta.6"
50
+ "@selvajs/server": "1.5.0-beta.7",
51
+ "@selvajs/config": "0.0.4"
52
52
  },
53
53
  "scripts": {
54
54
  "build": "tsc",