@nativemind108/mcp 1.0.0 → 1.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +24 -1
- package/README.md +24 -0
- package/dist/cjs/access.d.ts +41 -0
- package/dist/cjs/access.js +28 -0
- package/dist/cjs/access.js.map +1 -0
- package/dist/cjs/catalog.d.ts +0 -0
- package/dist/cjs/catalog.js +0 -0
- package/dist/cjs/catalog.js.map +0 -0
- package/dist/cjs/client.d.ts +12 -4
- package/dist/cjs/client.js +24 -8
- package/dist/cjs/client.js.map +1 -1
- package/dist/cjs/define.d.ts +14 -1
- package/dist/cjs/define.js +1 -0
- package/dist/cjs/define.js.map +1 -1
- package/dist/cjs/feedback.d.ts +0 -0
- package/dist/cjs/feedback.js +16 -0
- package/dist/cjs/feedback.js.map +1 -1
- package/dist/cjs/http.d.ts +0 -0
- package/dist/cjs/http.js +31 -10
- package/dist/cjs/http.js.map +1 -1
- package/dist/cjs/hub.d.ts +11 -2
- package/dist/cjs/hub.js +80 -18
- package/dist/cjs/hub.js.map +1 -1
- package/dist/cjs/index.d.ts +1 -0
- package/dist/cjs/index.js +1 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/options.d.ts +49 -0
- package/dist/cjs/options.js +0 -0
- package/dist/cjs/options.js.map +0 -0
- package/dist/cjs/output.d.ts +0 -0
- package/dist/cjs/output.js +0 -0
- package/dist/cjs/output.js.map +0 -0
- package/dist/cjs/package.json +0 -0
- package/dist/cjs/service.d.ts +35 -0
- package/dist/cjs/service.js +38 -4
- package/dist/cjs/service.js.map +1 -1
- package/dist/cjs/tools.d.ts +0 -0
- package/dist/cjs/tools.js +0 -0
- package/dist/cjs/tools.js.map +0 -0
- package/dist/esm/access.d.ts +42 -0
- package/dist/esm/access.d.ts.map +1 -0
- package/dist/esm/access.js +24 -0
- package/dist/esm/access.js.map +1 -0
- package/dist/esm/catalog.d.ts +0 -0
- package/dist/esm/catalog.d.ts.map +0 -0
- package/dist/esm/catalog.js +0 -0
- package/dist/esm/catalog.js.map +0 -0
- package/dist/esm/client.d.ts +12 -4
- package/dist/esm/client.d.ts.map +1 -1
- package/dist/esm/client.js +24 -8
- package/dist/esm/client.js.map +1 -1
- package/dist/esm/define.d.ts +14 -1
- package/dist/esm/define.d.ts.map +1 -1
- package/dist/esm/define.js +1 -0
- package/dist/esm/define.js.map +1 -1
- package/dist/esm/feedback.d.ts +0 -0
- package/dist/esm/feedback.d.ts.map +1 -1
- package/dist/esm/feedback.js +17 -1
- package/dist/esm/feedback.js.map +1 -1
- package/dist/esm/http.d.ts +0 -0
- package/dist/esm/http.d.ts.map +1 -1
- package/dist/esm/http.js +31 -10
- package/dist/esm/http.js.map +1 -1
- package/dist/esm/hub.d.ts +11 -2
- package/dist/esm/hub.d.ts.map +1 -1
- package/dist/esm/hub.js +81 -19
- package/dist/esm/hub.js.map +1 -1
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/options.d.ts +49 -0
- package/dist/esm/options.d.ts.map +1 -1
- package/dist/esm/options.js +0 -0
- package/dist/esm/options.js.map +0 -0
- package/dist/esm/output.d.ts +0 -0
- package/dist/esm/output.d.ts.map +0 -0
- package/dist/esm/output.js +0 -0
- package/dist/esm/output.js.map +0 -0
- package/dist/esm/service.d.ts +35 -0
- package/dist/esm/service.d.ts.map +1 -1
- package/dist/esm/service.js +38 -5
- package/dist/esm/service.js.map +1 -1
- package/dist/esm/tools.d.ts +0 -0
- package/dist/esm/tools.d.ts.map +0 -0
- package/dist/esm/tools.js +0 -0
- package/dist/esm/tools.js.map +0 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
-
## 1.
|
|
3
|
+
## 1.1.0 — 2026-11-15 (not published yet; SDD `sdd-konsilium-mcp-local`, Konsilium tasks #397/#398/#399)
|
|
4
|
+
|
|
5
|
+
All additive; 1.0.x code keeps working unchanged.
|
|
6
|
+
|
|
7
|
+
- **Access policy** (`AccessPolicy`, `ToolRequirement`, `ToolDefinition.requires`, `McpRoute.access` / `options.access`):
|
|
8
|
+
hand-written tools the policy refuses are hidden from tools/list and refused on call with `ACCESS_DENIED` and a hint for
|
|
9
|
+
clients that cache tools/list (`accessDeniedResult`); evaluated live on every list/call. Hiding is not protection —
|
|
10
|
+
the product API still checks every call. `ToolCallContext.hidden()` lists hidden tools with what they need.
|
|
11
|
+
- **`toolsChanged(match?)`** on the service (and `KeyHub` / `HubPool.notifyToolsChanged`): rights changed → matching open
|
|
12
|
+
sessions (`SessionInfo`: route, params, session, keyHash) get notifications/tools/list_changed.
|
|
13
|
+
- **`runCli(build, opts)`**: one `bin` runner — NM_MCP_* config, stdio or `--http`, `--help`, config errors → stderr + exit 2,
|
|
14
|
+
clean shutdown via core `onShutdown`. `mcpConfigFromEnv(..., { allowNoKey })`: stdio without a key (local-only tools).
|
|
15
|
+
- Feedback tools validate their arguments (JSON Schema of the contract) before calling the API.
|
|
16
|
+
- Tests: access policy and toolsChanged, stdio over a real pipe (runCli, no key), prompts, resources, config parsing.
|
|
17
|
+
|
|
18
|
+
## 1.0.1 — 2026-11-14 (not published yet)
|
|
19
|
+
|
|
20
|
+
- **Security:** on a session key mismatch the OAuth grant of the new token is checked with a standalone client; the shared hub client is re-keyed only after the check passed (before, a refused token stayed on the hub client).
|
|
21
|
+
- Per-session API clients (`ApiClient.withHeaders`, `withKey`): `X-NM-MCP-Client` no longer races between sessions sharing a key or the anonymous hub.
|
|
22
|
+
- `McpRoute.authorize` (session data / custom refusal), `serverName`, `filterAll`; `ToolCallContext.request`, `extra` = session data.
|
|
23
|
+
- `api.envelope: 'none'` for APIs without `{data, meta}`; string `error` bodies.
|
|
24
|
+
- `transports.http.resourceMetadata`, `lenientJson`; `resources.subscribe`; `ToolDefinition.listFields`; `CallRecord.client`, `errorCode`, `session`.
|
|
25
|
+
|
|
26
|
+
## 1.0.0 — 2026-11-14
|
|
4
27
|
|
|
5
28
|
- First release of `@nativemind108/mcp` (SDD `sdd-nativemind-backend-handmade`, 2026-11-14).
|
package/README.md
CHANGED
|
@@ -28,3 +28,27 @@ Environment: `NM_MCP_API_URL`, `NM_MCP_TRANSPORT=http` (or `--http`), `NM_MCP_HT
|
|
|
28
28
|
`NM_MCP_AUTH_SERVER`, `NM_MCP_API_KEY` (stdio), `NM_MCP_TOOLSETS`, `NM_MCP_MAX_ROWS`, `NM_MCP_MAX_BYTES`, `NM_MCP_REFRESH_MS`.
|
|
29
29
|
|
|
30
30
|
License: NativeMindNONC (see LICENSE).
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
## Access policy and local runner (1.1)
|
|
34
|
+
|
|
35
|
+
```ts
|
|
36
|
+
import { runCli, defineTool, type AccessPolicy } from '@nativemind108/mcp';
|
|
37
|
+
|
|
38
|
+
const policy: AccessPolicy = {
|
|
39
|
+
allowed: (req, _tool, ctx) => !req || rightsOf(ctx.session).includes(req.scope), // the product's rules
|
|
40
|
+
refusal: (tool) => `No access to ${tool}. The person changes access at https://…`,
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
await runCli((cfg) => ({
|
|
44
|
+
product: { name: 'my-mcp', title: 'My product' },
|
|
45
|
+
api: { url: cfg.apiUrl, basePath: '/api' },
|
|
46
|
+
transports: cfg.http ? { http: cfg.http } : { stdio: { apiKey: cfg.apiKey } },
|
|
47
|
+
access: policy,
|
|
48
|
+
routes: [{ path: '/mcp', tools: () => [defineTool({ name: 'next_task', title: 'Next task', description: '…', input: {}, requires: { scope: 'tasks:work' }, call: async (_a, ctx) => (await ctx.api.request('GET', '/api/tasks/next')).body })] }],
|
|
49
|
+
}), { allowNoKey: true });
|
|
50
|
+
```
|
|
51
|
+
|
|
52
|
+
- Tools without `requires` are always listed (feedback tools, «my access»).
|
|
53
|
+
- When rights change, call `service.toolsChanged((s) => s.session.userId === id)` — open sessions re-list.
|
|
54
|
+
- A tool hidden after the client cached tools/list is refused with `ACCESS_DENIED` and a re-list hint.
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
|
|
2
|
+
import type { RouteContext } from './options.js';
|
|
3
|
+
/**
|
|
4
|
+
* What a tool needs. The package does not interpret it: `scope` / `kind` are the product's words (Konsilium:
|
|
5
|
+
* kind 'project' | 'me' | 'global', scope 'tasks:work' …). `also` = a second requirement that must hold too.
|
|
6
|
+
*/
|
|
7
|
+
export interface ToolRequirement {
|
|
8
|
+
scope: string;
|
|
9
|
+
kind?: string;
|
|
10
|
+
also?: ToolRequirement;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* The product's access policy (Konsilium: @consilium108/mcp). Evaluated live on every tools/list and tools/call, so a
|
|
14
|
+
* changed right applies at once; hiding is not protection — the API still checks every call.
|
|
15
|
+
*/
|
|
16
|
+
export interface AccessPolicy {
|
|
17
|
+
/** May this session use the tool now? `requires` undefined = a tool without a right (always allowed by default). */
|
|
18
|
+
allowed(requires: ToolRequirement | undefined, tool: string, ctx: RouteContext): boolean;
|
|
19
|
+
/** Refusal text for a hidden tool called anyway (where the person changes access). Default: a generic text. */
|
|
20
|
+
refusal?(tool: string, requires: ToolRequirement | undefined, ctx: RouteContext): string;
|
|
21
|
+
}
|
|
22
|
+
/** A tool hidden from this session and what it needs — for an «access» tool, so the model can tell the person what to ask for. */
|
|
23
|
+
export interface HiddenTool {
|
|
24
|
+
name: string;
|
|
25
|
+
needs: string[];
|
|
26
|
+
kind: string | null;
|
|
27
|
+
}
|
|
28
|
+
/** Session descriptor passed to `toolsChanged(match)` — choose which open sessions re-list their tools. */
|
|
29
|
+
export interface SessionInfo {
|
|
30
|
+
route: string;
|
|
31
|
+
params: Record<string, string>;
|
|
32
|
+
session: Record<string, unknown>;
|
|
33
|
+
keyHash: string | null;
|
|
34
|
+
}
|
|
35
|
+
/** Flattened scope list of a requirement (`also` chain). */
|
|
36
|
+
export declare function needsOf(requires: ToolRequirement | undefined): string[];
|
|
37
|
+
/**
|
|
38
|
+
* The refusal returned for a tool the policy hides (the client may still have it in a cached tools/list). It tells
|
|
39
|
+
* caching clients to re-list; `ACCESS_DENIED` is the error code in structuredContent.
|
|
40
|
+
*/
|
|
41
|
+
export declare function accessDeniedResult(tool: string, requires: ToolRequirement | undefined, text?: string): CallToolResult;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.needsOf = needsOf;
|
|
4
|
+
exports.accessDeniedResult = accessDeniedResult;
|
|
5
|
+
// generated by Claude (Opus 5.5), 2026-11-15; SDD sdd-konsilium-mcp-local
|
|
6
|
+
/** Flattened scope list of a requirement (`also` chain). */
|
|
7
|
+
function needsOf(requires) {
|
|
8
|
+
const out = [];
|
|
9
|
+
for (let r = requires; r; r = r.also)
|
|
10
|
+
out.push(r.scope);
|
|
11
|
+
return out;
|
|
12
|
+
}
|
|
13
|
+
// generated by Claude (Opus 5.5), 2026-11-15; SDD sdd-konsilium-mcp-local
|
|
14
|
+
/**
|
|
15
|
+
* The refusal returned for a tool the policy hides (the client may still have it in a cached tools/list). It tells
|
|
16
|
+
* caching clients to re-list; `ACCESS_DENIED` is the error code in structuredContent.
|
|
17
|
+
*/
|
|
18
|
+
function accessDeniedResult(tool, requires, text) {
|
|
19
|
+
const needs = needsOf(requires);
|
|
20
|
+
const message = text ?? `Tool ${tool} is not available to this connection now${needs.length ? ` (needs: ${needs.join(', ')})` : ''}. Only the person can change access.`;
|
|
21
|
+
const hint = 'If your tool list is cached, request tools/list again.';
|
|
22
|
+
return {
|
|
23
|
+
isError: true,
|
|
24
|
+
content: [{ type: 'text', text: `${message} ${hint}` }],
|
|
25
|
+
structuredContent: { error: { code: 'ACCESS_DENIED', message, needs, hint } },
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=access.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"access.js","sourceRoot":"","sources":["../../src/access.ts"],"names":[],"mappings":";;AA6CA,0BAIC;AAOD,gDASC;AAtBD,0EAA0E;AAC1E,4DAA4D;AAC5D,SAAgB,OAAO,CAAC,QAAqC;IAC3D,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,IAAI,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI;QAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACxD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,0EAA0E;AAC1E;;;GAGG;AACH,SAAgB,kBAAkB,CAAC,IAAY,EAAE,QAAqC,EAAE,IAAa;IACnG,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,IAAI,IAAI,QAAQ,IAAI,2CAA2C,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,sCAAsC,CAAC;IACzK,MAAM,IAAI,GAAG,wDAAwD,CAAC;IACtE,OAAO;QACL,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,IAAI,IAAI,EAAE,EAAE,CAAC;QACvD,iBAAiB,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;KAC9E,CAAC;AACJ,CAAC"}
|
package/dist/cjs/catalog.d.ts
CHANGED
|
File without changes
|
package/dist/cjs/catalog.js
CHANGED
|
File without changes
|
package/dist/cjs/catalog.js.map
CHANGED
|
File without changes
|
package/dist/cjs/client.d.ts
CHANGED
|
@@ -31,6 +31,8 @@ export declare class ApiCallError extends Error {
|
|
|
31
31
|
export interface ApiClientOptions {
|
|
32
32
|
/** Prefix of catalog and generic paths ('/v1', '/api/v1', '/api'). */
|
|
33
33
|
basePath: string;
|
|
34
|
+
/** Success body shape: 'data' = `{data, meta}` envelope (default), 'none' = the body itself is the data (Konsilium). */
|
|
35
|
+
envelope?: 'data' | 'none';
|
|
34
36
|
/** Headers marking the MCP service as the caller (default `X-NM-Client: mcp`; dx adds `X-DX-Client: mcp`). */
|
|
35
37
|
clientHeaders?: Record<string, string>;
|
|
36
38
|
userAgent?: string;
|
|
@@ -41,14 +43,20 @@ export interface ApiClientOptions {
|
|
|
41
43
|
/** Thin REST client of the product API (`{data, meta}` / `{error}`); every request carries the caller's bearer. */
|
|
42
44
|
export declare class ApiClient {
|
|
43
45
|
readonly baseUrl: string;
|
|
44
|
-
private apiKey;
|
|
45
46
|
readonly options: ApiClientOptions;
|
|
46
47
|
private extra;
|
|
47
|
-
|
|
48
|
-
|
|
48
|
+
private readonly keyRef;
|
|
49
|
+
constructor(baseUrl: string, apiKey: string | null, options: ApiClientOptions, keyRef?: {
|
|
50
|
+
key: string | null;
|
|
51
|
+
});
|
|
52
|
+
/** OAuth access tokens rotate: a session of the same grant continues with the new token (shared by derived clients). */
|
|
49
53
|
setKey(apiKey: string | null): void;
|
|
50
|
-
/** Headers added to every request of this client
|
|
54
|
+
/** Headers added to every request of this client. Prefer withHeaders() for per-session values. */
|
|
51
55
|
setHeaders(headers: Record<string, string>): void;
|
|
56
|
+
/** A client sharing this one's key (and key rotation) with extra headers of its own — one per MCP session. */
|
|
57
|
+
withHeaders(headers: Record<string, string>): ApiClient;
|
|
58
|
+
/** A standalone client with another key (identity checks must not touch shared clients). */
|
|
59
|
+
withKey(apiKey: string | null): ApiClient;
|
|
52
60
|
get basePath(): string;
|
|
53
61
|
request<T = unknown>(method: string, path: string, args?: Record<string, unknown>, headers?: Record<string, string>): Promise<{
|
|
54
62
|
status: number;
|
package/dist/cjs/client.js
CHANGED
|
@@ -35,22 +35,34 @@ function appendQuery(qs, key, value) {
|
|
|
35
35
|
/** Thin REST client of the product API (`{data, meta}` / `{error}`); every request carries the caller's bearer. */
|
|
36
36
|
class ApiClient {
|
|
37
37
|
baseUrl;
|
|
38
|
-
apiKey;
|
|
39
38
|
options;
|
|
40
39
|
extra = {};
|
|
41
|
-
|
|
40
|
+
keyRef;
|
|
41
|
+
constructor(baseUrl, apiKey, options, keyRef) {
|
|
42
42
|
this.baseUrl = baseUrl;
|
|
43
|
-
this.apiKey = apiKey;
|
|
44
43
|
this.options = options;
|
|
44
|
+
this.keyRef = keyRef ?? { key: apiKey };
|
|
45
45
|
}
|
|
46
|
-
/** OAuth access tokens rotate: a session of the same grant continues with the new token. */
|
|
46
|
+
/** OAuth access tokens rotate: a session of the same grant continues with the new token (shared by derived clients). */
|
|
47
47
|
setKey(apiKey) {
|
|
48
|
-
this.
|
|
48
|
+
this.keyRef.key = apiKey;
|
|
49
49
|
}
|
|
50
|
-
/** Headers added to every request of this client
|
|
50
|
+
/** Headers added to every request of this client. Prefer withHeaders() for per-session values. */
|
|
51
51
|
setHeaders(headers) {
|
|
52
52
|
this.extra = { ...this.extra, ...headers };
|
|
53
53
|
}
|
|
54
|
+
/** A client sharing this one's key (and key rotation) with extra headers of its own — one per MCP session. */
|
|
55
|
+
withHeaders(headers) {
|
|
56
|
+
const c = new ApiClient(this.baseUrl, null, this.options, this.keyRef);
|
|
57
|
+
c.extra = { ...this.extra, ...headers };
|
|
58
|
+
return c;
|
|
59
|
+
}
|
|
60
|
+
/** A standalone client with another key (identity checks must not touch shared clients). */
|
|
61
|
+
withKey(apiKey) {
|
|
62
|
+
const c = new ApiClient(this.baseUrl, apiKey, this.options);
|
|
63
|
+
c.extra = { ...this.extra };
|
|
64
|
+
return c;
|
|
65
|
+
}
|
|
54
66
|
get basePath() {
|
|
55
67
|
return this.options.basePath;
|
|
56
68
|
}
|
|
@@ -74,7 +86,7 @@ class ApiClient {
|
|
|
74
86
|
method: upper,
|
|
75
87
|
signal: AbortSignal.timeout(this.options.timeoutMs ?? 60_000),
|
|
76
88
|
headers: {
|
|
77
|
-
...(this.
|
|
89
|
+
...(this.keyRef.key ? { Authorization: `Bearer ${this.keyRef.key}` } : {}),
|
|
78
90
|
Accept: 'application/json',
|
|
79
91
|
'User-Agent': this.options.userAgent ?? 'nativemind-mcp/1',
|
|
80
92
|
...(this.options.clientHeaders ?? { 'X-NM-Client': 'mcp' }),
|
|
@@ -93,10 +105,14 @@ class ApiClient {
|
|
|
93
105
|
body = { raw: text };
|
|
94
106
|
}
|
|
95
107
|
if (!res.ok) {
|
|
108
|
+
const raw = body?.error;
|
|
109
|
+
if (typeof raw === 'string')
|
|
110
|
+
throw new ApiCallError(res.status, `HTTP_${res.status}`, raw, []);
|
|
96
111
|
const err = body?.error;
|
|
97
112
|
throw new ApiCallError(res.status, err?.code ?? `HTTP_${res.status}`, err?.message ?? `API answered ${res.status}.`, err?.details ?? [], err?.preview, err?.requestId);
|
|
98
113
|
}
|
|
99
|
-
|
|
114
|
+
const wrapped = this.options.envelope === 'none' ? { data: body } : (body ?? { data: null });
|
|
115
|
+
return { status: res.status, body: wrapped, headers: res.headers };
|
|
100
116
|
}
|
|
101
117
|
async catalog() {
|
|
102
118
|
const res = await this.request('GET', `${this.options.basePath}/meta/operations`, { mcpOnly: true });
|
package/dist/cjs/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":";;;AAgBA,kFAAkF;AAClF,MAAa,YAAa,SAAQ,KAAK;IAE1B;IACA;IAEA;IACA;IACA;IANX,YACW,MAAc,EACd,IAAY,EACrB,OAAe,EACN,UAAmB,EAAE,EACrB,OAAiB,EACjB,SAAkB;QAE3B,KAAK,CAAC,OAAO,CAAC,CAAC;QAPN,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAQ;QAEZ,YAAO,GAAP,OAAO,CAAc;QACrB,YAAO,GAAP,OAAO,CAAU;QACjB,cAAS,GAAT,SAAS,CAAS;QAG3B,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;IAC7B,CAAC;CACF;AAZD,oCAYC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/define.d.ts
CHANGED
|
@@ -1,18 +1,26 @@
|
|
|
1
1
|
import { z, type ZodRawShape } from 'zod';
|
|
2
2
|
import type { CallToolResult, Tool } from '@modelcontextprotocol/sdk/types.js';
|
|
3
3
|
import type { ApiClient } from './client.js';
|
|
4
|
+
import type { HiddenTool, ToolRequirement } from './access.js';
|
|
4
5
|
/** What a hand-written tool receives on a call. */
|
|
5
6
|
export interface ToolCallContext {
|
|
6
7
|
/** API client of the session (the caller's bearer, X-NM-Client: mcp). */
|
|
7
8
|
api: ApiClient;
|
|
8
9
|
/** Route params of the MCP endpoint (Konsilium: `{ projectId }` of /mcp/p/:projectId). */
|
|
9
10
|
params: Record<string, string>;
|
|
11
|
+
/** The HTTP request that opened the session (ip, headers); null on stdio. */
|
|
12
|
+
request: {
|
|
13
|
+
ip: string;
|
|
14
|
+
headers: Record<string, unknown>;
|
|
15
|
+
} | null;
|
|
10
16
|
/** Language of the session (?lang= or the product's resolver). */
|
|
11
17
|
lang: string | null;
|
|
12
18
|
/** `name version` of the MCP client (initialize clientInfo). */
|
|
13
19
|
client: string;
|
|
14
|
-
/**
|
|
20
|
+
/** Session data from the route's authorize() hook. */
|
|
15
21
|
extra: Record<string, unknown>;
|
|
22
|
+
/** 1.1 (sdd-konsilium-mcp-local): tools the access policy hides from this session now, with what each needs. */
|
|
23
|
+
hidden?: () => HiddenTool[];
|
|
16
24
|
}
|
|
17
25
|
/** A hand-written tool (product tools, feedback tools). The handler returns plain data (wrapped as `{data}`) or a CallToolResult. */
|
|
18
26
|
export interface ToolDefinition {
|
|
@@ -21,8 +29,12 @@ export interface ToolDefinition {
|
|
|
21
29
|
description: string;
|
|
22
30
|
inputSchema: Tool['inputSchema'];
|
|
23
31
|
annotations?: Tool['annotations'];
|
|
32
|
+
/** Extra fields passed through to tools/list as-is (e.g. `execution`, `_meta`, outputSchema). */
|
|
33
|
+
listFields?: Record<string, unknown>;
|
|
24
34
|
/** Parses / validates raw arguments (zod tools); throws ZodError on bad input. */
|
|
25
35
|
parse?: (args: unknown) => unknown;
|
|
36
|
+
/** 1.1: the right the tool needs; the route's AccessPolicy decides (hidden from tools/list, refused on call). */
|
|
37
|
+
requires?: ToolRequirement;
|
|
26
38
|
call: (args: any, ctx: ToolCallContext) => Promise<unknown>;
|
|
27
39
|
}
|
|
28
40
|
export declare function isCallToolResult(value: unknown): value is CallToolResult;
|
|
@@ -33,5 +45,6 @@ export declare function defineTool<S extends ZodRawShape>(def: {
|
|
|
33
45
|
description: string;
|
|
34
46
|
input: S;
|
|
35
47
|
annotations?: Tool['annotations'];
|
|
48
|
+
requires?: ToolRequirement;
|
|
36
49
|
call: (args: z.infer<z.ZodObject<S>>, ctx: ToolCallContext) => Promise<unknown>;
|
|
37
50
|
}): ToolDefinition;
|
package/dist/cjs/define.js
CHANGED
|
@@ -19,6 +19,7 @@ function defineTool(def) {
|
|
|
19
19
|
description: def.description,
|
|
20
20
|
inputSchema: { ...json, type: 'object' },
|
|
21
21
|
...(def.annotations ? { annotations: def.annotations } : {}),
|
|
22
|
+
...(def.requires ? { requires: def.requires } : {}),
|
|
22
23
|
parse: (args) => schema.parse(args ?? {}),
|
|
23
24
|
call: def.call,
|
|
24
25
|
};
|
package/dist/cjs/define.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"define.js","sourceRoot":"","sources":["../../src/define.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"define.js","sourceRoot":"","sources":["../../src/define.ts"],"names":[],"mappings":";;AA0CA,4CAEC;AAID,gCAsBC;AAtED,6BAA0C;AAyC1C,kFAAkF;AAClF,SAAgB,gBAAgB,CAAC,KAAc;IAC7C,OAAO,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAE,KAA+B,CAAC,OAAO,CAAC,CAAC;AACzG,CAAC;AAED,kFAAkF;AAClF,2HAA2H;AAC3H,SAAgB,UAAU,CAAwB,GAQjD;IACC,MAAM,MAAM,GAAG,OAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,OAAC,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,EAAE,OAAO,EAAE,CAA4B,CAAC;IACzG,OAAO,IAAI,CAAC,OAAO,CAAC;IACpB,OAAO;QACL,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,WAAW,EAAE,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAyB;QAC/D,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QACzC,IAAI,EAAE,GAAG,CAAC,IAA8B;KACzC,CAAC;AACJ,CAAC"}
|
package/dist/cjs/feedback.d.ts
CHANGED
|
File without changes
|
package/dist/cjs/feedback.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.FEEDBACK_TOOL_NAMES = void 0;
|
|
4
4
|
exports.feedbackTools = feedbackTools;
|
|
5
5
|
const api_1 = require("@nativemind108/api");
|
|
6
|
+
const core_1 = require("@nativemind108/core");
|
|
6
7
|
const client_js_1 = require("./client.js");
|
|
7
8
|
const output_js_1 = require("./output.js");
|
|
8
9
|
// generated by Claude (Opus 5.5), 2026-11-14; SDD sdd-nativemind-backend-handmade (tools = Konsilium mcp/feedbacktools.js; requirements AC5)
|
|
@@ -21,6 +22,21 @@ const strip = (s, drop = []) => {
|
|
|
21
22
|
* A product whose API has no storage yet answers 501 → the tool returns isError with a plain message (no exception).
|
|
22
23
|
*/
|
|
23
24
|
function feedbackTools(o) {
|
|
25
|
+
return feedbackToolsRaw(o).map((t) => ({ ...t, parse: (args) => validateArgs(t.inputSchema, args) }));
|
|
26
|
+
}
|
|
27
|
+
// generated by Claude (Opus 5.5), 2026-11-15; SDD sdd-konsilium-mcp-local (audit: feedback arguments went to the API unvalidated)
|
|
28
|
+
const validator = (0, api_1.createValidator)();
|
|
29
|
+
function validateArgs(schema, args) {
|
|
30
|
+
try {
|
|
31
|
+
return validator.validateInput({ ...schema, additionalProperties: false }, args ?? {});
|
|
32
|
+
}
|
|
33
|
+
catch (error) {
|
|
34
|
+
if (error instanceof core_1.ApiError)
|
|
35
|
+
throw new client_js_1.ApiCallError(400, 'VALIDATION_ERROR', 'Invalid arguments.', (error.details ?? []));
|
|
36
|
+
throw error;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
function feedbackToolsRaw(o) {
|
|
24
40
|
const p = o.product;
|
|
25
41
|
const S = api_1.FEEDBACK_SCHEMAS;
|
|
26
42
|
const path = (k) => `${o.basePath}${api_1.FEEDBACK_PATHS[k].path}`;
|
package/dist/cjs/feedback.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feedback.js","sourceRoot":"","sources":["../../src/feedback.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"feedback.js","sourceRoot":"","sources":["../../src/feedback.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/http.d.ts
CHANGED
|
File without changes
|
package/dist/cjs/http.js
CHANGED
|
@@ -39,12 +39,26 @@ async function startHttp(options) {
|
|
|
39
39
|
trustProxy: true,
|
|
40
40
|
health: { check: () => ({ sessions: sessions.size }) },
|
|
41
41
|
});
|
|
42
|
+
if (http.lenientJson) {
|
|
43
|
+
app.addContentTypeParser('text/plain', { parseAs: 'string' }, (_req, body, done) => {
|
|
44
|
+
try {
|
|
45
|
+
done(null, body ? JSON.parse(body) : undefined);
|
|
46
|
+
}
|
|
47
|
+
catch {
|
|
48
|
+
done(null, body);
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
}
|
|
42
52
|
const challenge = (path) => ({ 'WWW-Authenticate': `Bearer resource_metadata="${publicUrl}/.well-known/oauth-protected-resource${path.replace(/\/+$/, '')}"` });
|
|
43
53
|
const langOf = (req) => options.langOf ? options.langOf(req.query, req.headers) : (req.query.lang ?? null);
|
|
44
54
|
if (http.authServers?.length) {
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
|
|
55
|
+
const extra = (path, query) => typeof http.resourceMetadata === 'function' ? http.resourceMetadata(path, query) : (http.resourceMetadata ?? {});
|
|
56
|
+
const meta = (path, query) => ({
|
|
57
|
+
resource: `${publicUrl}${path}`, authorization_servers: http.authServers, bearer_methods_supported: ['header'], resource_name: options.product.title,
|
|
58
|
+
...extra(path, query),
|
|
59
|
+
});
|
|
60
|
+
app.get('/.well-known/oauth-protected-resource', async (req) => meta('/mcp', req.query));
|
|
61
|
+
app.get('/.well-known/oauth-protected-resource/*', async (req) => meta(`/${req.params['*']}`, req.query));
|
|
48
62
|
}
|
|
49
63
|
async function open(route, req, reply, token, params, make) {
|
|
50
64
|
if (sessions.size >= maxSessions)
|
|
@@ -59,9 +73,17 @@ async function startHttp(options) {
|
|
|
59
73
|
}
|
|
60
74
|
return rpcError(reply, 502, `The ${options.product.title} API is not reachable; try again later.`);
|
|
61
75
|
}
|
|
76
|
+
const request = { ip: req.ip, headers: req.headers };
|
|
77
|
+
let session = {};
|
|
78
|
+
if (route.authorize) {
|
|
79
|
+
const verdict = await route.authorize({ ...request, query: req.query }, token, params, hub.client);
|
|
80
|
+
if ('error' in verdict)
|
|
81
|
+
return rpcError(reply, verdict.error.status, verdict.error.message, verdict.error.headers ?? {});
|
|
82
|
+
session = verdict.session ?? {};
|
|
83
|
+
}
|
|
62
84
|
const identity = token && options.oauth?.isOAuthToken(token) ? (await options.oauth.identity(hub.client)) ?? undefined : undefined;
|
|
63
85
|
const transport = await make(hub, identity);
|
|
64
|
-
const server = hub.createServer(route, params, langOf(req), true, token ? (0, hub_js_1.keyHash)(token) : null);
|
|
86
|
+
const server = hub.createServer(route, params, langOf(req), true, token ? (0, hub_js_1.keyHash)(token) : null, session, request);
|
|
65
87
|
await server.connect(transport);
|
|
66
88
|
return { hub, transport, identity };
|
|
67
89
|
}
|
|
@@ -84,14 +106,13 @@ async function startHttp(options) {
|
|
|
84
106
|
if (!(existing.transport instanceof streamableHttp_js_1.StreamableHTTPServerTransport))
|
|
85
107
|
return rpcError(reply, 400, 'This session uses the legacy SSE transport.');
|
|
86
108
|
if (existing.keyHash !== hash) {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
return id === existing.identity;
|
|
92
|
-
})());
|
|
109
|
+
// 1.0.1 (security): check the new token's grant with a standalone client; the shared hub client gets the
|
|
110
|
+
// rotated token only after the check passed (a refused token never reaches other sessions of the hub)
|
|
111
|
+
const same = !!existing.identity && !!token && !!options.oauth?.isOAuthToken(token) &&
|
|
112
|
+
(await options.oauth.identity(existing.hub.client.withKey(token)).catch(() => null)) === existing.identity;
|
|
93
113
|
if (!same)
|
|
94
114
|
return rpcError(reply, 401, 'Unauthorized: this session was opened with another key.', challenge(path));
|
|
115
|
+
existing.hub.client.setKey(token);
|
|
95
116
|
existing.keyHash = hash;
|
|
96
117
|
}
|
|
97
118
|
if (existing.route !== route.path || existing.params !== paramsKey)
|
package/dist/cjs/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/http.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/http.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/hub.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Server } from '@modelcontextprotocol/sdk/server/index.js';
|
|
2
2
|
import { Catalog } from './catalog.js';
|
|
3
3
|
import { ApiClient } from './client.js';
|
|
4
|
-
import type { McpRoute, McpServiceOptions } from './options.js';
|
|
4
|
+
import type { McpRoute, McpServiceOptions, RouteContext } from './options.js';
|
|
5
5
|
import { ResultStore } from './output.js';
|
|
6
|
+
import { type SessionInfo } from './access.js';
|
|
6
7
|
/** sha256 of a key: cache key of its catalog (the secret itself is never a map key). */
|
|
7
8
|
export declare function keyHash(apiKey: string): string;
|
|
8
9
|
/**
|
|
@@ -14,6 +15,7 @@ export declare class KeyHub {
|
|
|
14
15
|
readonly client: ApiClient;
|
|
15
16
|
readonly catalog: Catalog | null;
|
|
16
17
|
readonly store: ResultStore;
|
|
18
|
+
/** 1.1: each open session's descriptor, so toolsChanged(match) can pick sessions. */
|
|
17
19
|
private readonly servers;
|
|
18
20
|
private timer;
|
|
19
21
|
lastUsed: number;
|
|
@@ -23,12 +25,17 @@ export declare class KeyHub {
|
|
|
23
25
|
/** Loads the catalog when never loaded or stale; 401/403 propagate, other errors keep the last catalog. */
|
|
24
26
|
ensureFresh(): Promise<void>;
|
|
25
27
|
private notifyChanged;
|
|
28
|
+
/**
|
|
29
|
+
* 1.1: the product's rights changed (Konsilium: «Аккаунт → API», co-ownership …) → matching sessions get
|
|
30
|
+
* notifications/tools/list_changed and re-list (the policy is evaluated live). Returns how many were notified.
|
|
31
|
+
*/
|
|
32
|
+
notifyToolsChanged(match?: (s: SessionInfo) => boolean): Promise<number>;
|
|
26
33
|
/** Re-reads the catalog; notifies sessions on change. Errors keep the last catalog. */
|
|
27
34
|
refresh(): Promise<boolean>;
|
|
28
35
|
startTimer(): void;
|
|
29
36
|
stop(): void;
|
|
30
37
|
/** An MCP server for one session of `route` with its params. */
|
|
31
|
-
createServer(route: McpRoute, params: Record<string, string>, lang: string | null, closeTimerWhenIdle: boolean, keyId: string | null): Server;
|
|
38
|
+
createServer(route: McpRoute, params: Record<string, string>, lang: string | null, closeTimerWhenIdle: boolean, keyId: string | null, session?: Record<string, unknown>, request?: RouteContext['request']): Server;
|
|
32
39
|
}
|
|
33
40
|
/** HTTP mode: one KeyHub per key hash (+ one anonymous); idle hubs are evicted. */
|
|
34
41
|
export declare class HubPool {
|
|
@@ -38,5 +45,7 @@ export declare class HubPool {
|
|
|
38
45
|
get size(): number;
|
|
39
46
|
acquire(apiKey: string | null): Promise<KeyHub>;
|
|
40
47
|
private sweep;
|
|
48
|
+
/** 1.1: tools/list_changed to matching sessions of every hub (see KeyHub.notifyToolsChanged). */
|
|
49
|
+
notifyToolsChanged(match?: (s: SessionInfo) => boolean): Promise<number>;
|
|
41
50
|
stop(): void;
|
|
42
51
|
}
|