@ama-mcp/core 14.6.0-prerelease.71 → 14.6.0-prerelease.72
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/package.json +13 -10
- package/src/server/index.d.ts +11 -6
- package/src/server/index.d.ts.map +1 -1
- package/src/server/index.js +4 -4
- package/src/server/index.js.map +1 -1
- package/src/testing/index.d.ts +3 -36
- package/src/testing/index.d.ts.map +1 -1
- package/src/testing/index.js +5 -5
- package/src/testing/index.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ama-mcp/core",
|
|
3
|
-
"version": "14.6.0-prerelease.
|
|
3
|
+
"version": "14.6.0-prerelease.72",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"otter",
|
|
11
11
|
"otter-module"
|
|
12
12
|
],
|
|
13
|
-
"module": "src/public_api.js",
|
|
13
|
+
"module": "./src/public_api.js",
|
|
14
14
|
"typings": "src/public_api.d.ts",
|
|
15
15
|
"sideEffects": false,
|
|
16
16
|
"exports": {
|
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
},
|
|
20
20
|
".": {
|
|
21
21
|
"typings": "./src/public_api.d.ts",
|
|
22
|
+
"require": "./src/public_api.js",
|
|
22
23
|
"default": "./src/public_api.js"
|
|
23
24
|
}
|
|
24
25
|
},
|
|
@@ -29,8 +30,9 @@
|
|
|
29
30
|
"compile": "tsc -b ./tsconfig.build.json && yarn cpy package.json dist && patch-package-json-main"
|
|
30
31
|
},
|
|
31
32
|
"peerDependencies": {
|
|
32
|
-
"@modelcontextprotocol/
|
|
33
|
-
"@
|
|
33
|
+
"@modelcontextprotocol/client": "^2.0.0",
|
|
34
|
+
"@modelcontextprotocol/server": "^2.0.0",
|
|
35
|
+
"@o3r/telemetry": "~14.6.0-prerelease.72"
|
|
34
36
|
},
|
|
35
37
|
"peerDependenciesMeta": {
|
|
36
38
|
"@o3r/telemetry": {
|
|
@@ -50,16 +52,17 @@
|
|
|
50
52
|
"@angular/platform-browser": "~22.0.4",
|
|
51
53
|
"@angular/platform-browser-dynamic": "~22.0.4",
|
|
52
54
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
53
|
-
"@modelcontextprotocol/
|
|
55
|
+
"@modelcontextprotocol/client": "~2.0.0",
|
|
56
|
+
"@modelcontextprotocol/server": "~2.0.0",
|
|
54
57
|
"@nx/eslint": "~23.1.0",
|
|
55
58
|
"@nx/eslint-plugin": "~23.1.0",
|
|
56
59
|
"@nx/jest": "~23.1.0",
|
|
57
60
|
"@nx/js": "~23.1.0",
|
|
58
|
-
"@o3r/build-helpers": "^14.6.0-prerelease.
|
|
59
|
-
"@o3r/eslint-config": "^14.6.0-prerelease.
|
|
60
|
-
"@o3r/eslint-plugin": "^14.6.0-prerelease.
|
|
61
|
-
"@o3r/telemetry": "~14.6.0-prerelease.
|
|
62
|
-
"@o3r/test-helpers": "^14.6.0-prerelease.
|
|
61
|
+
"@o3r/build-helpers": "^14.6.0-prerelease.72",
|
|
62
|
+
"@o3r/eslint-config": "^14.6.0-prerelease.72",
|
|
63
|
+
"@o3r/eslint-plugin": "^14.6.0-prerelease.72",
|
|
64
|
+
"@o3r/telemetry": "~14.6.0-prerelease.72",
|
|
65
|
+
"@o3r/test-helpers": "^14.6.0-prerelease.72",
|
|
63
66
|
"@stylistic/eslint-plugin": "~5.10.0",
|
|
64
67
|
"@types/jest": "~30.0.0",
|
|
65
68
|
"@types/node": "~24.13.0",
|
package/src/server/index.d.ts
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
import type
|
|
2
|
-
import { McpServer, type ReadResourceCallback, type ReadResourceTemplateCallback, type RegisteredResource, type RegisteredResourceTemplate, type ResourceMetadata, type ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
|
|
3
|
-
import type { AnySchema, ZodRawShapeCompat } from '@modelcontextprotocol/sdk/server/zod-compat';
|
|
4
|
-
import type { Implementation } from '@modelcontextprotocol/sdk/types';
|
|
1
|
+
import { type Icon, type Implementation, McpServer, type ReadResourceCallback, type ReadResourceTemplateCallback, type RegisteredResource, type RegisteredResourceTemplate, type RegisteredTool, type ResourceMetadata, type ResourceTemplate, type ServerOptions, type StandardSchemaWithJSON, type ToolAnnotations, type ToolCallback } from '@modelcontextprotocol/server';
|
|
5
2
|
import type { Logger } from '../logger';
|
|
6
3
|
/**
|
|
7
4
|
* MCP server with telemetry support
|
|
@@ -12,11 +9,19 @@ export declare class AmaMcpServer extends McpServer {
|
|
|
12
9
|
/**
|
|
13
10
|
* @inheritdoc
|
|
14
11
|
*/
|
|
15
|
-
registerPrompt(...args: Parameters<typeof McpServer.prototype.registerPrompt>): import("@modelcontextprotocol/
|
|
12
|
+
registerPrompt(...args: Parameters<typeof McpServer.prototype.registerPrompt>): import("@modelcontextprotocol/server").RegisteredPrompt;
|
|
16
13
|
/**
|
|
17
14
|
* @inheritdoc
|
|
18
15
|
*/
|
|
19
|
-
registerTool<OutputArgs extends
|
|
16
|
+
registerTool<OutputArgs extends StandardSchemaWithJSON<unknown, unknown>, InputArgs extends StandardSchemaWithJSON | undefined = undefined>(name: string, config: {
|
|
17
|
+
title?: string;
|
|
18
|
+
description?: string;
|
|
19
|
+
inputSchema?: InputArgs;
|
|
20
|
+
outputSchema?: OutputArgs;
|
|
21
|
+
annotations?: ToolAnnotations;
|
|
22
|
+
icons?: Icon[];
|
|
23
|
+
_meta?: Record<string, unknown>;
|
|
24
|
+
}, toolCallback: ToolCallback<InputArgs>): RegisteredTool;
|
|
20
25
|
/**
|
|
21
26
|
* @inheritdoc
|
|
22
27
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,cAAc,EACnB,SAAS,EACT,KAAK,oBAAoB,EACzB,KAAK,4BAA4B,EACjC,KAAK,kBAAkB,EACvB,KAAK,0BAA0B,EAC/B,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,sBAAsB,EAC3B,KAAK,eAAe,EACpB,KAAK,YAAY,EAClB,MAAM,8BAA8B,CAAC;AAKtC,OAAO,KAAK,EACV,MAAM,EACP,MAAM,WAAW,CAAC;AAanB;;GAEG;AACH,qBAAa,YAAa,SAAQ,SAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,aAAa;IAIhG;;OAEG;IACa,cAAc,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC;IAc7F;;OAEG;IAEa,YAAY,CAAC,UAAU,SAAS,sBAAsB,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,SAAS,sBAAsB,GAAG,SAAS,GAAG,SAAS,EACxJ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,SAAS,CAAC;QAAC,YAAY,CAAC,EAAE,UAAU,CAAC;QAAC,WAAW,CAAC,EAAE,eAAe,CAAC;QAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,EACpL,YAAY,EAAE,YAAY,CAAC,SAAS,CAAC,GACpC,cAAc;IAajB;;OAEG;IACa,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,oBAAoB,GAAG,kBAAkB;IAC3J;;OAEG;IACa,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,4BAA4B,GAAG,0BAA0B;CAsBtL"}
|
package/src/server/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AmaMcpServer = void 0;
|
|
4
|
-
const
|
|
4
|
+
const server_1 = require("@modelcontextprotocol/server");
|
|
5
5
|
const createCallback = (...args) => async (...callbackArgs) => {
|
|
6
6
|
const { createGenAICallbackWithMetrics } = await Promise.resolve().then(() => __importStar(require('@o3r/telemetry')));
|
|
7
7
|
const wrappedCallback = createGenAICallbackWithMetrics(...args);
|
|
@@ -14,7 +14,7 @@ const sendMetricsIfAuthorized = async (...args) => {
|
|
|
14
14
|
/**
|
|
15
15
|
* MCP server with telemetry support
|
|
16
16
|
*/
|
|
17
|
-
class AmaMcpServer extends
|
|
17
|
+
class AmaMcpServer extends server_1.McpServer {
|
|
18
18
|
constructor(logger, serverInfo, options) {
|
|
19
19
|
super(serverInfo, options);
|
|
20
20
|
this.logger = logger;
|
|
@@ -40,8 +40,8 @@ class AmaMcpServer extends mcp_js_1.McpServer {
|
|
|
40
40
|
/**
|
|
41
41
|
* @inheritdoc
|
|
42
42
|
*/
|
|
43
|
-
|
|
44
|
-
|
|
43
|
+
// TODO: revert to `...args: Parameters<typeof McpServer.prototype.registerTool<OutputArgs, InputArgs>>` once LegacyToolCallback overload is removed from the SDK
|
|
44
|
+
registerTool(name, config, toolCallback) {
|
|
45
45
|
const callback = createCallback(toolCallback, name, 'toolCall', { logger: this.logger });
|
|
46
46
|
let error;
|
|
47
47
|
try {
|
package/src/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"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"}
|
package/src/testing/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Client } from '@modelcontextprotocol/
|
|
2
|
-
import type { McpServer } from '@modelcontextprotocol/
|
|
1
|
+
import { Client } from '@modelcontextprotocol/client';
|
|
2
|
+
import type { McpServer } from '@modelcontextprotocol/server';
|
|
3
3
|
/**
|
|
4
4
|
* Set up an MCP client and server for testing purposes.
|
|
5
5
|
* DO NOT USE OUTSIDE OF TESTS.
|
|
@@ -8,39 +8,6 @@ import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
|
|
|
8
8
|
*/
|
|
9
9
|
export declare const setUpClientAndServerForTesting: (mcpServer: McpServer) => Promise<{
|
|
10
10
|
mcpServer: McpServer;
|
|
11
|
-
client: Client
|
|
12
|
-
method: string;
|
|
13
|
-
params?: {
|
|
14
|
-
[x: string]: unknown;
|
|
15
|
-
_meta?: {
|
|
16
|
-
[x: string]: unknown;
|
|
17
|
-
progressToken?: string | number | undefined;
|
|
18
|
-
"io.modelcontextprotocol/related-task"?: {
|
|
19
|
-
taskId: string;
|
|
20
|
-
} | undefined;
|
|
21
|
-
} | undefined;
|
|
22
|
-
} | undefined;
|
|
23
|
-
}, {
|
|
24
|
-
method: string;
|
|
25
|
-
params?: {
|
|
26
|
-
[x: string]: unknown;
|
|
27
|
-
_meta?: {
|
|
28
|
-
[x: string]: unknown;
|
|
29
|
-
progressToken?: string | number | undefined;
|
|
30
|
-
"io.modelcontextprotocol/related-task"?: {
|
|
31
|
-
taskId: string;
|
|
32
|
-
} | undefined;
|
|
33
|
-
} | undefined;
|
|
34
|
-
} | undefined;
|
|
35
|
-
}, {
|
|
36
|
-
[x: string]: unknown;
|
|
37
|
-
_meta?: {
|
|
38
|
-
[x: string]: unknown;
|
|
39
|
-
progressToken?: string | number | undefined;
|
|
40
|
-
"io.modelcontextprotocol/related-task"?: {
|
|
41
|
-
taskId: string;
|
|
42
|
-
} | undefined;
|
|
43
|
-
} | undefined;
|
|
44
|
-
}>;
|
|
11
|
+
client: Client;
|
|
45
12
|
}>;
|
|
46
13
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACP,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACP,MAAM,8BAA8B,CAAC;AAItC,OAAO,KAAK,EACV,SAAS,EACV,MAAM,8BAA8B,CAAC;AAEtC;;;;;GAKG;AACH,eAAO,MAAM,8BAA8B,GAAU,WAAW,SAAS;;;EAWxE,CAAC"}
|
package/src/testing/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setUpClientAndServerForTesting = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
4
|
+
const client_1 = require("@modelcontextprotocol/client");
|
|
5
|
+
const server_1 = require("@modelcontextprotocol/server");
|
|
6
6
|
/**
|
|
7
7
|
* Set up an MCP client and server for testing purposes.
|
|
8
8
|
* DO NOT USE OUTSIDE OF TESTS.
|
|
@@ -10,14 +10,14 @@ const inMemory_js_1 = require("@modelcontextprotocol/sdk/inMemory.js");
|
|
|
10
10
|
* @experimental
|
|
11
11
|
*/
|
|
12
12
|
const setUpClientAndServerForTesting = async (mcpServer) => {
|
|
13
|
-
const [clientTransport, serverTransport] =
|
|
14
|
-
const client = new
|
|
13
|
+
const [clientTransport, serverTransport] = server_1.InMemoryTransport.createLinkedPair();
|
|
14
|
+
const client = new client_1.Client({
|
|
15
15
|
name: 'test-client',
|
|
16
16
|
version: '1.0.0'
|
|
17
17
|
});
|
|
18
18
|
await Promise.all([
|
|
19
19
|
client.connect(clientTransport),
|
|
20
|
-
mcpServer.
|
|
20
|
+
mcpServer.connect(serverTransport)
|
|
21
21
|
]);
|
|
22
22
|
return { mcpServer, client };
|
|
23
23
|
};
|
package/src/testing/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":";;;AAAA,yDAEsC;AACtC,yDAEsC;AAKtC;;;;;GAKG;AACI,MAAM,8BAA8B,GAAG,KAAK,EAAE,SAAoB,EAAE,EAAE;IAC3E,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC,GAAG,0BAAiB,CAAC,gBAAgB,EAAE,CAAC;IAChF,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC;QACxB,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC;IACH,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC;QAC/B,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC;KACnC,CAAC,CAAC;IACH,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;AAC/B,CAAC,CAAC;AAXW,QAAA,8BAA8B,kCAWzC"}
|