@ama-mcp/core 14.0.0-next.7 → 14.0.0-next.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-mcp/core",
-  "version": "14.0.0-next.7",
+  "version": "14.0.0-next.9",
   "publishConfig": {
     "access": "public"
   },
@@ -29,7 +29,13 @@
     "compile": "tsc -b ./tsconfig.build.json && yarn cpy package.json dist && patch-package-json-main"
   },
   "peerDependencies": {
-    "@modelcontextprotocol/sdk": "^1.19.0"
+    "@modelcontextprotocol/sdk": "^1.19.0",
+    "@o3r/telemetry": "~14.0.0-next.9"
+  },
+  "peerDependenciesMeta": {
+    "@o3r/telemetry": {
+      "optional": true
+    }
   },
   "dependencies": {
     "tslib": "^2.6.2"
@@ -43,19 +49,20 @@
     "@angular/platform-browser": "~20.3.15",
     "@angular/platform-browser-dynamic": "~20.3.15",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
-    "@modelcontextprotocol/sdk": "~1.24.0",
+    "@modelcontextprotocol/sdk": "~1.25.0",
     "@nx/eslint": "~21.6.0",
     "@nx/eslint-plugin": "~21.6.0",
     "@nx/jest": "~21.6.0",
     "@nx/js": "~21.6.0",
-    "@o3r/build-helpers": "^14.0.0-next.7",
-    "@o3r/eslint-config": "^14.0.0-next.7",
-    "@o3r/eslint-plugin": "^14.0.0-next.7",
-    "@o3r/test-helpers": "^14.0.0-next.7",
+    "@o3r/build-helpers": "^14.0.0-next.9",
+    "@o3r/eslint-config": "^14.0.0-next.9",
+    "@o3r/eslint-plugin": "^14.0.0-next.9",
+    "@o3r/telemetry": "~14.0.0-next.9",
+    "@o3r/test-helpers": "^14.0.0-next.9",
     "@stylistic/eslint-plugin": "~5.6.0",
     "@types/jest": "~30.0.0",
     "@types/node": "~24.10.0",
-    "@typescript-eslint/parser": "~8.47.0",
+    "@typescript-eslint/parser": "~8.51.0",
     "angular-eslint": "~20.6.0",
     "cpy-cli": "^6.0.0",
     "eslint": "~9.39.0",
@@ -63,10 +70,10 @@
     "eslint-import-resolver-typescript": "~4.4.0",
     "eslint-plugin-import": "~2.32.0",
     "eslint-plugin-import-newlines": "~1.4.0",
-    "eslint-plugin-jest": "~29.1.0",
-    "eslint-plugin-jsdoc": "~54.7.0",
+    "eslint-plugin-jest": "~29.11.0",
+    "eslint-plugin-jsdoc": "~61.5.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "~60.0.0",
+    "eslint-plugin-unicorn": "~62.0.0",
     "eslint-plugin-unused-imports": "~4.3.0",
     "globals": "^16.0.0",
     "jest": "~30.2.0",
@@ -76,9 +83,9 @@
     "nx": "~21.6.0",
     "rxjs": "^7.8.1",
     "ts-jest": "~29.4.0",
-    "type-fest": "^4.30.1",
+    "type-fest": "^5.3.1",
     "typescript": "~5.9.2",
-    "typescript-eslint": "~8.47.0",
+    "typescript-eslint": "~8.51.0",
     "zod": "~4.1.0",
     "zone.js": "~0.15.0"
   },

package/src/public_api.d.ts

@@ -1,6 +1,7 @@
 export * from './cache/index';
 export * from './logger/index';
 export * from './resource/index';
+export * from './server/index';
 export * from './testing/index';
 export * from './tool/index';
 //# sourceMappingURL=public_api.d.ts.map

package/src/public_api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_api.d.ts","sourceRoot":"","sources":["../../src/public_api.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC"}
+{"version":3,"file":"public_api.d.ts","sourceRoot":"","sources":["../../src/public_api.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC"}

package/src/public_api.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./cache/index"), exports);
 tslib_1.__exportStar(require("./logger/index"), exports);
 tslib_1.__exportStar(require("./resource/index"), exports);
+tslib_1.__exportStar(require("./server/index"), exports);
 tslib_1.__exportStar(require("./testing/index"), exports);
 tslib_1.__exportStar(require("./tool/index"), exports);
 //# sourceMappingURL=public_api.js.map

package/src/public_api.js.map

@@ -1 +1 @@
-{"version":3,"file":"public_api.js","sourceRoot":"","sources":["../../src/public_api.ts"],"names":[],"mappings":";;;AAAA,wDAA8B;AAC9B,yDAA+B;AAC/B,2DAAiC;AACjC,0DAAgC;AAChC,uDAA6B"}
+{"version":3,"file":"public_api.js","sourceRoot":"","sources":["../../src/public_api.ts"],"names":[],"mappings":";;;AAAA,wDAA8B;AAC9B,yDAA+B;AAC/B,2DAAiC;AACjC,yDAA+B;AAC/B,0DAAgC;AAChC,uDAA6B"}

package/src/server/index.d.ts

@@ -0,0 +1,29 @@
+import type { ServerOptions } from '@modelcontextprotocol/sdk/server/index.js';
+import { McpServer, type ReadResourceCallback, type ReadResourceTemplateCallback, type RegisteredResource, type RegisteredResourceTemplate, type ResourceMetadata, type ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { AnySchema, ZodRawShapeCompat } from '@modelcontextprotocol/sdk/server/zod-compat';
+import type { Implementation } from '@modelcontextprotocol/sdk/types';
+import type { Logger } from '../logger';
+/**
+ * MCP server with telemetry support
+ */
+export declare class AmaMcpServer extends McpServer {
+    private readonly logger;
+    constructor(logger: Logger, serverInfo: Implementation, options?: ServerOptions);
+    /**
+     * @inheritdoc
+     */
+    registerPrompt(...args: Parameters<typeof McpServer.prototype.registerPrompt>): import("@modelcontextprotocol/sdk/server/mcp.js").RegisteredPrompt;
+    /**
+     * @inheritdoc
+     */
+    registerTool<OutputArgs extends ZodRawShapeCompat | AnySchema, InputArgs extends undefined | ZodRawShapeCompat | AnySchema = undefined>(...args: Parameters<typeof McpServer.prototype.registerTool<OutputArgs, InputArgs>>): import("@modelcontextprotocol/sdk/server/mcp.js").RegisteredTool;
+    /**
+     * @inheritdoc
+     */
+    registerResource(name: string, uriOrTemplate: string, config: ResourceMetadata, resourceCallback: ReadResourceCallback): RegisteredResource;
+    /**
+     * @inheritdoc
+     */
+    registerResource(name: string, uriOrTemplate: ResourceTemplate, config: ResourceMetadata, resourceCallback: ReadResourceTemplateCallback): RegisteredResourceTemplate;
+}
+//# sourceMappingURL=index.d.ts.map

package/src/server/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACd,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,SAAS,EACT,KAAK,oBAAoB,EACzB,KAAK,4BAA4B,EACjC,KAAK,kBAAkB,EACvB,KAAK,0BAA0B,EAC/B,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAEtB,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EAClB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EACV,cAAc,EACf,MAAM,iCAAiC,CAAC;AAKzC,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;IACa,YAAY,CAAC,UAAU,SAAS,iBAAiB,GAAG,SAAS,EAAE,SAAS,SAAS,SAAS,GAAG,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpJ,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAerF;;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

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AmaMcpServer = void 0;
+const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
+const createCallback = (...args) => async (...callbackArgs) => {
+    const { createGenAICallbackWithMetrics } = await Promise.resolve().then(() => require('@o3r/telemetry'));
+    const wrappedCallback = createGenAICallbackWithMetrics(...args);
+    return wrappedCallback(...callbackArgs);
+};
+const sendMetricsIfAuthorized = async (...args) => {
+    const { sendGenAIEventMetricsIfAuthorized } = await Promise.resolve().then(() => require('@o3r/telemetry'));
+    return sendGenAIEventMetricsIfAuthorized(...args);
+};
+/**
+ * MCP server with telemetry support
+ */
+class AmaMcpServer extends mcp_js_1.McpServer {
+    constructor(logger, serverInfo, options) {
+        super(serverInfo, options);
+        this.logger = logger;
+    }
+    /**
+     * @inheritdoc
+     */
+    registerPrompt(...args) {
+        const [name, config, promptCallback] = args;
+        const callback = createCallback(promptCallback, name, 'promptCall', { logger: this.logger });
+        let error;
+        try {
+            return super.registerPrompt(name, config, callback);
+        }
+        catch (e) {
+            error = e;
+            throw e;
+        }
+        finally {
+            void sendMetricsIfAuthorized(name, 'promptRegistration', { logger: this.logger }, error);
+        }
+    }
+    /**
+     * @inheritdoc
+     */
+    registerTool(...args) {
+        const [name, config, toolCallback] = args;
+        const callback = createCallback(toolCallback, name, 'toolCall', { logger: this.logger });
+        let error;
+        try {
+            return super.registerTool(name, config, callback);
+        }
+        catch (e) {
+            error = e;
+            throw e;
+        }
+        finally {
+            void sendMetricsIfAuthorized(name, 'toolRegistration', { logger: this.logger }, error);
+        }
+    }
+    /**
+     * @inheritdoc
+     */
+    registerResource(name, uriOrTemplate, config, resourceCallback) {
+        const callback = createCallback(resourceCallback, name, 'resourceCall', { logger: this.logger });
+        let error;
+        try {
+            // Cast is required because the overload typing on MCP SDK is not correct
+            return super.registerResource(name, uriOrTemplate, config, callback);
+        }
+        catch (e) {
+            error = e;
+            throw e;
+        }
+        finally {
+            void sendMetricsIfAuthorized(name, 'resourceRegistration', { logger: this.logger }, error);
+        }
+    }
+}
+exports.AmaMcpServer = AmaMcpServer;
+//# sourceMappingURL=index.js.map

package/src/server/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"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"}

package/src/testing/index.d.ts

@@ -12,16 +12,10 @@ export declare const setUpClientAndServerForTesting: (mcpServer: McpServer) => P
         method: string;
         params?: {
             [x: string]: unknown;
-            task?: {
-                [x: string]: unknown;
-                ttl?: number | null | undefined;
-                pollInterval?: number | undefined;
-            } | undefined;
             _meta?: {
                 [x: string]: unknown;
                 progressToken?: string | number | undefined;
                 "io.modelcontextprotocol/related-task"?: {
-                    [x: string]: unknown;
                     taskId: string;
                 } | undefined;
             } | undefined;
@@ -32,8 +26,8 @@ export declare const setUpClientAndServerForTesting: (mcpServer: McpServer) => P
             [x: string]: unknown;
             _meta?: {
                 [x: string]: unknown;
+                progressToken?: string | number | undefined;
                 "io.modelcontextprotocol/related-task"?: {
-                    [x: string]: unknown;
                     taskId: string;
                 } | undefined;
             } | undefined;
@@ -42,8 +36,8 @@ export declare const setUpClientAndServerForTesting: (mcpServer: McpServer) => P
         [x: string]: unknown;
         _meta?: {
             [x: string]: unknown;
+            progressToken?: string | number | undefined;
             "io.modelcontextprotocol/related-task"?: {
-                [x: string]: unknown;
                 taskId: string;
             } | undefined;
         } | undefined;

package/src/testing/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACP,MAAM,2CAA2C,CAAC;AAInD,OAAO,KAAK,EACV,SAAS,EACV,MAAM,yCAAyC,CAAC;AAEjD;;;;;GAKG;AACH,eAAO,MAAM,8BAA8B,GAAU,WAAW,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAWxE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACP,MAAM,2CAA2C,CAAC;AAInD,OAAO,KAAK,EACV,SAAS,EACV,MAAM,yCAAyC,CAAC;AAEjD;;;;;GAKG;AACH,eAAO,MAAM,8BAA8B,GAAU,WAAW,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAWxE,CAAC"}