@mcp-abap-adt/core 2.4.0 → 2.4.2

package/dist/lib/handlers/groups/HighLevelHandlersGroup.js

@@ -61,6 +61,12 @@ const handleCreateProgram_1 = require("../../../handlers/program/high/handleCrea
 const handleDeleteProgram_1 = require("../../../handlers/program/high/handleDeleteProgram");
 const handleGetProgram_1 = require("../../../handlers/program/high/handleGetProgram");
 const handleUpdateProgram_1 = require("../../../handlers/program/high/handleUpdateProgram");
+const handleCreateServiceBinding_1 = require("../../../handlers/service_binding/high/handleCreateServiceBinding");
+const handleDeleteServiceBinding_1 = require("../../../handlers/service_binding/high/handleDeleteServiceBinding");
+const handleGetServiceBinding_1 = require("../../../handlers/service_binding/high/handleGetServiceBinding");
+const handleListServiceBindingTypes_1 = require("../../../handlers/service_binding/high/handleListServiceBindingTypes");
+const handleUpdateServiceBinding_1 = require("../../../handlers/service_binding/high/handleUpdateServiceBinding");
+const handleValidateServiceBinding_1 = require("../../../handlers/service_binding/high/handleValidateServiceBinding");
 const handleCreateServiceDefinition_1 = require("../../../handlers/service_definition/high/handleCreateServiceDefinition");
 const handleDeleteServiceDefinition_1 = require("../../../handlers/service_definition/high/handleDeleteServiceDefinition");
 const handleGetServiceDefinition_1 = require("../../../handlers/service_definition/high/handleGetServiceDefinition");
@@ -102,6 +108,9 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
      * Gets all high-level handler entries
      */
     getHandlers() {
+        const withContext = (handler) => {
+            return (args) => handler(this.context, args);
+        };
         return [
             {
                 toolDefinition: {
@@ -109,7 +118,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreatePackage_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreatePackage_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreatePackage_1.handleCreatePackage)(this.context, args),
+                handler: withContext(handleCreatePackage_1.handleCreatePackage),
             },
             {
                 toolDefinition: {
@@ -117,7 +126,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetPackage_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetPackage_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetPackage_1.handleGetPackage)(this.context, args),
+                handler: withContext(handleGetPackage_1.handleGetPackage),
             },
             {
                 toolDefinition: {
@@ -125,7 +134,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateDomain_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateDomain_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateDomain_1.handleCreateDomain)(this.context, args),
+                handler: withContext(handleCreateDomain_1.handleCreateDomain),
             },
             {
                 toolDefinition: {
@@ -133,7 +142,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetDomain_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetDomain_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetDomain_1.handleGetDomain)(this.context, args),
+                handler: withContext(handleGetDomain_1.handleGetDomain),
             },
             {
                 toolDefinition: {
@@ -141,7 +150,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateDomain_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateDomain_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateDomain_1.handleUpdateDomain)(this.context, args),
+                handler: withContext(handleUpdateDomain_1.handleUpdateDomain),
             },
             {
                 toolDefinition: {
@@ -149,7 +158,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteDomain_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteDomain_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteDomain_1.handleDeleteDomain)(this.context, args),
+                handler: withContext(handleDeleteDomain_1.handleDeleteDomain),
             },
             {
                 toolDefinition: {
@@ -157,7 +166,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateDataElement_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateDataElement_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateDataElement_1.handleCreateDataElement)(this.context, args),
+                handler: withContext(handleCreateDataElement_1.handleCreateDataElement),
             },
             {
                 toolDefinition: {
@@ -165,7 +174,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetDataElement_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetDataElement_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetDataElement_1.handleGetDataElement)(this.context, args),
+                handler: withContext(handleGetDataElement_1.handleGetDataElement),
             },
             {
                 toolDefinition: {
@@ -173,7 +182,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateDataElement_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateDataElement_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateDataElement_1.handleUpdateDataElement)(this.context, args),
+                handler: withContext(handleUpdateDataElement_1.handleUpdateDataElement),
             },
             {
                 toolDefinition: {
@@ -181,7 +190,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteDataElement_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteDataElement_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteDataElement_1.handleDeleteDataElement)(this.context, args),
+                handler: withContext(handleDeleteDataElement_1.handleDeleteDataElement),
             },
             {
                 toolDefinition: {
@@ -189,7 +198,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateTransport_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateTransport_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateTransport_1.handleCreateTransport)(this.context, args),
+                handler: withContext(handleCreateTransport_1.handleCreateTransport),
             },
             {
                 toolDefinition: {
@@ -197,7 +206,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateTable_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateTable_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateTable_1.handleCreateTable)(this.context, args),
+                handler: withContext(handleCreateTable_1.handleCreateTable),
             },
             {
                 toolDefinition: {
@@ -205,7 +214,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetTable_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetTable_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetTable_1.handleGetTable)(this.context, args),
+                handler: withContext(handleGetTable_1.handleGetTable),
             },
             {
                 toolDefinition: {
@@ -213,7 +222,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateTable_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateTable_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateTable_1.handleUpdateTable)(this.context, args),
+                handler: withContext(handleUpdateTable_1.handleUpdateTable),
             },
             {
                 toolDefinition: {
@@ -221,7 +230,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteTable_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteTable_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteTable_1.handleDeleteTable)(this.context, args),
+                handler: withContext(handleDeleteTable_1.handleDeleteTable),
             },
             {
                 toolDefinition: {
@@ -229,7 +238,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateStructure_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateStructure_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateStructure_1.handleCreateStructure)(this.context, args),
+                handler: withContext(handleCreateStructure_1.handleCreateStructure),
             },
             {
                 toolDefinition: {
@@ -237,7 +246,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetStructure_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetStructure_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetStructure_1.handleGetStructure)(this.context, args),
+                handler: withContext(handleGetStructure_1.handleGetStructure),
             },
             {
                 toolDefinition: {
@@ -245,7 +254,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateStructure_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateStructure_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateStructure_1.handleUpdateStructure)(this.context, args),
+                handler: withContext(handleUpdateStructure_1.handleUpdateStructure),
             },
             {
                 toolDefinition: {
@@ -253,7 +262,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteStructure_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteStructure_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteStructure_1.handleDeleteStructure)(this.context, args),
+                handler: withContext(handleDeleteStructure_1.handleDeleteStructure),
             },
             {
                 toolDefinition: {
@@ -261,7 +270,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateView_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateView_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateView_1.handleCreateView)(this.context, args),
+                handler: withContext(handleCreateView_1.handleCreateView),
             },
             {
                 toolDefinition: {
@@ -269,7 +278,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetView_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetView_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetView_1.handleGetView)(this.context, args),
+                handler: withContext(handleGetView_1.handleGetView),
             },
             {
                 toolDefinition: {
@@ -277,7 +286,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateView_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateView_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateView_1.handleUpdateView)(this.context, args),
+                handler: withContext(handleUpdateView_1.handleUpdateView),
             },
             {
                 toolDefinition: {
@@ -285,7 +294,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteView_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteView_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteView_1.handleDeleteView)(this.context, args),
+                handler: withContext(handleDeleteView_1.handleDeleteView),
             },
             {
                 toolDefinition: {
@@ -293,7 +302,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateServiceDefinition_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateServiceDefinition_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateServiceDefinition_1.handleCreateServiceDefinition)(this.context, args),
+                handler: withContext(handleCreateServiceDefinition_1.handleCreateServiceDefinition),
             },
             {
                 toolDefinition: {
@@ -301,7 +310,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetServiceDefinition_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetServiceDefinition_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetServiceDefinition_1.handleGetServiceDefinition)(this.context, args),
+                handler: withContext(handleGetServiceDefinition_1.handleGetServiceDefinition),
             },
             {
                 toolDefinition: {
@@ -309,7 +318,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateServiceDefinition_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateServiceDefinition_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateServiceDefinition_1.handleUpdateServiceDefinition)(this.context, args),
+                handler: withContext(handleUpdateServiceDefinition_1.handleUpdateServiceDefinition),
             },
             {
                 toolDefinition: {
@@ -317,7 +326,55 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteServiceDefinition_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteServiceDefinition_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteServiceDefinition_1.handleDeleteServiceDefinition)(this.context, args),
+                handler: withContext(handleDeleteServiceDefinition_1.handleDeleteServiceDefinition),
+            },
+            {
+                toolDefinition: {
+                    name: handleCreateServiceBinding_1.TOOL_DEFINITION.name,
+                    description: handleCreateServiceBinding_1.TOOL_DEFINITION.description,
+                    inputSchema: handleCreateServiceBinding_1.TOOL_DEFINITION.inputSchema,
+                },
+                handler: withContext(handleCreateServiceBinding_1.handleCreateServiceBinding),
+            },
+            {
+                toolDefinition: {
+                    name: handleListServiceBindingTypes_1.TOOL_DEFINITION.name,
+                    description: handleListServiceBindingTypes_1.TOOL_DEFINITION.description,
+                    inputSchema: handleListServiceBindingTypes_1.TOOL_DEFINITION.inputSchema,
+                },
+                handler: withContext(handleListServiceBindingTypes_1.handleListServiceBindingTypes),
+            },
+            {
+                toolDefinition: {
+                    name: handleGetServiceBinding_1.TOOL_DEFINITION.name,
+                    description: handleGetServiceBinding_1.TOOL_DEFINITION.description,
+                    inputSchema: handleGetServiceBinding_1.TOOL_DEFINITION.inputSchema,
+                },
+                handler: withContext(handleGetServiceBinding_1.handleGetServiceBinding),
+            },
+            {
+                toolDefinition: {
+                    name: handleUpdateServiceBinding_1.TOOL_DEFINITION.name,
+                    description: handleUpdateServiceBinding_1.TOOL_DEFINITION.description,
+                    inputSchema: handleUpdateServiceBinding_1.TOOL_DEFINITION.inputSchema,
+                },
+                handler: withContext(handleUpdateServiceBinding_1.handleUpdateServiceBinding),
+            },
+            {
+                toolDefinition: {
+                    name: handleValidateServiceBinding_1.TOOL_DEFINITION.name,
+                    description: handleValidateServiceBinding_1.TOOL_DEFINITION.description,
+                    inputSchema: handleValidateServiceBinding_1.TOOL_DEFINITION.inputSchema,
+                },
+                handler: withContext(handleValidateServiceBinding_1.handleValidateServiceBinding),
+            },
+            {
+                toolDefinition: {
+                    name: handleDeleteServiceBinding_1.TOOL_DEFINITION.name,
+                    description: handleDeleteServiceBinding_1.TOOL_DEFINITION.description,
+                    inputSchema: handleDeleteServiceBinding_1.TOOL_DEFINITION.inputSchema,
+                },
+                handler: withContext(handleDeleteServiceBinding_1.handleDeleteServiceBinding),
             },
             {
                 toolDefinition: {
@@ -325,7 +382,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetClass_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetClass_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetClass_1.handleGetClass)(this.context, args),
+                handler: withContext(handleGetClass_1.handleGetClass),
             },
             {
                 toolDefinition: {
@@ -333,7 +390,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateClass_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateClass_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateClass_1.handleCreateClass)(this.context, args),
+                handler: withContext(handleCreateClass_1.handleCreateClass),
             },
             {
                 toolDefinition: {
@@ -341,7 +398,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateClass_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateClass_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateClass_1.handleUpdateClass)(this.context, args),
+                handler: withContext(handleUpdateClass_1.handleUpdateClass),
             },
             {
                 toolDefinition: {
@@ -349,7 +406,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteClass_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteClass_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteClass_1.handleDeleteClass)(this.context, args),
+                handler: withContext(handleDeleteClass_1.handleDeleteClass),
             },
             {
                 toolDefinition: {
@@ -357,7 +414,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateUnitTest_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateUnitTest_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateUnitTest_1.handleCreateUnitTest)(this.context, args),
+                handler: withContext(handleCreateUnitTest_1.handleCreateUnitTest),
             },
             {
                 toolDefinition: {
@@ -365,7 +422,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleRunUnitTest_1.TOOL_DEFINITION.description,
                     inputSchema: handleRunUnitTest_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleRunUnitTest_1.handleRunUnitTest)(this.context, args),
+                handler: withContext(handleRunUnitTest_1.handleRunUnitTest),
             },
             {
                 toolDefinition: {
@@ -373,7 +430,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetUnitTest_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetUnitTest_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetUnitTest_1.handleGetUnitTest)(this.context, args),
+                handler: withContext(handleGetUnitTest_1.handleGetUnitTest),
             },
             {
                 toolDefinition: {
@@ -381,7 +438,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetUnitTestStatus_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetUnitTestStatus_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetUnitTestStatus_1.handleGetUnitTestStatus)(this.context, args),
+                handler: withContext(handleGetUnitTestStatus_1.handleGetUnitTestStatus),
             },
             {
                 toolDefinition: {
@@ -389,7 +446,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetUnitTestResult_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetUnitTestResult_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetUnitTestResult_1.handleGetUnitTestResult)(this.context, args),
+                handler: withContext(handleGetUnitTestResult_1.handleGetUnitTestResult),
             },
             {
                 toolDefinition: {
@@ -397,7 +454,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateUnitTest_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateUnitTest_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateUnitTest_1.handleUpdateUnitTest)(this.context, args),
+                handler: withContext(handleUpdateUnitTest_1.handleUpdateUnitTest),
             },
             {
                 toolDefinition: {
@@ -405,7 +462,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteUnitTest_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteUnitTest_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteUnitTest_1.handleDeleteUnitTest)(this.context, args),
+                handler: withContext(handleDeleteUnitTest_1.handleDeleteUnitTest),
             },
             {
                 toolDefinition: {
@@ -413,7 +470,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateCdsUnitTest_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateCdsUnitTest_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateCdsUnitTest_1.handleCreateCdsUnitTest)(this.context, args),
+                handler: withContext(handleCreateCdsUnitTest_1.handleCreateCdsUnitTest),
             },
             {
                 toolDefinition: {
@@ -421,7 +478,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetCdsUnitTest_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetCdsUnitTest_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetCdsUnitTest_1.handleGetCdsUnitTest)(this.context, args),
+                handler: withContext(handleGetCdsUnitTest_1.handleGetCdsUnitTest),
             },
             {
                 toolDefinition: {
@@ -429,7 +486,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetCdsUnitTestStatus_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetCdsUnitTestStatus_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetCdsUnitTestStatus_1.handleGetCdsUnitTestStatus)(this.context, args),
+                handler: withContext(handleGetCdsUnitTestStatus_1.handleGetCdsUnitTestStatus),
             },
             {
                 toolDefinition: {
@@ -437,7 +494,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetCdsUnitTestResult_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetCdsUnitTestResult_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetCdsUnitTestResult_1.handleGetCdsUnitTestResult)(this.context, args),
+                handler: withContext(handleGetCdsUnitTestResult_1.handleGetCdsUnitTestResult),
             },
             {
                 toolDefinition: {
@@ -445,7 +502,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateCdsUnitTest_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateCdsUnitTest_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateCdsUnitTest_1.handleUpdateCdsUnitTest)(this.context, args),
+                handler: withContext(handleUpdateCdsUnitTest_1.handleUpdateCdsUnitTest),
             },
             {
                 toolDefinition: {
@@ -453,7 +510,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteCdsUnitTest_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteCdsUnitTest_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteCdsUnitTest_1.handleDeleteCdsUnitTest)(this.context, args),
+                handler: withContext(handleDeleteCdsUnitTest_1.handleDeleteCdsUnitTest),
             },
             {
                 toolDefinition: {
@@ -461,7 +518,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetLocalTestClass_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetLocalTestClass_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetLocalTestClass_1.handleGetLocalTestClass)(this.context, args),
+                handler: withContext(handleGetLocalTestClass_1.handleGetLocalTestClass),
             },
             {
                 toolDefinition: {
@@ -469,7 +526,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateLocalTestClass_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateLocalTestClass_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateLocalTestClass_1.handleCreateLocalTestClass)(this.context, args),
+                handler: withContext(handleCreateLocalTestClass_1.handleCreateLocalTestClass),
             },
             {
                 toolDefinition: {
@@ -477,7 +534,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateLocalTestClass_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateLocalTestClass_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateLocalTestClass_1.handleUpdateLocalTestClass)(this.context, args),
+                handler: withContext(handleUpdateLocalTestClass_1.handleUpdateLocalTestClass),
             },
             {
                 toolDefinition: {
@@ -485,7 +542,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteLocalTestClass_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteLocalTestClass_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteLocalTestClass_1.handleDeleteLocalTestClass)(this.context, args),
+                handler: withContext(handleDeleteLocalTestClass_1.handleDeleteLocalTestClass),
             },
             {
                 toolDefinition: {
@@ -493,7 +550,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetLocalTypes_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetLocalTypes_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetLocalTypes_1.handleGetLocalTypes)(this.context, args),
+                handler: withContext(handleGetLocalTypes_1.handleGetLocalTypes),
             },
             {
                 toolDefinition: {
@@ -501,7 +558,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateLocalTypes_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateLocalTypes_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateLocalTypes_1.handleCreateLocalTypes)(this.context, args),
+                handler: withContext(handleCreateLocalTypes_1.handleCreateLocalTypes),
             },
             {
                 toolDefinition: {
@@ -509,7 +566,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateLocalTypes_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateLocalTypes_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateLocalTypes_1.handleUpdateLocalTypes)(this.context, args),
+                handler: withContext(handleUpdateLocalTypes_1.handleUpdateLocalTypes),
             },
             {
                 toolDefinition: {
@@ -517,7 +574,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteLocalTypes_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteLocalTypes_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteLocalTypes_1.handleDeleteLocalTypes)(this.context, args),
+                handler: withContext(handleDeleteLocalTypes_1.handleDeleteLocalTypes),
             },
             {
                 toolDefinition: {
@@ -525,7 +582,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetLocalDefinitions_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetLocalDefinitions_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetLocalDefinitions_1.handleGetLocalDefinitions)(this.context, args),
+                handler: withContext(handleGetLocalDefinitions_1.handleGetLocalDefinitions),
             },
             {
                 toolDefinition: {
@@ -533,7 +590,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateLocalDefinitions_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateLocalDefinitions_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateLocalDefinitions_1.handleCreateLocalDefinitions)(this.context, args),
+                handler: withContext(handleCreateLocalDefinitions_1.handleCreateLocalDefinitions),
             },
             {
                 toolDefinition: {
@@ -541,7 +598,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateLocalDefinitions_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateLocalDefinitions_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateLocalDefinitions_1.handleUpdateLocalDefinitions)(this.context, args),
+                handler: withContext(handleUpdateLocalDefinitions_1.handleUpdateLocalDefinitions),
             },
             {
                 toolDefinition: {
@@ -549,7 +606,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteLocalDefinitions_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteLocalDefinitions_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteLocalDefinitions_1.handleDeleteLocalDefinitions)(this.context, args),
+                handler: withContext(handleDeleteLocalDefinitions_1.handleDeleteLocalDefinitions),
             },
             {
                 toolDefinition: {
@@ -557,7 +614,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetLocalMacros_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetLocalMacros_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetLocalMacros_1.handleGetLocalMacros)(this.context, args),
+                handler: withContext(handleGetLocalMacros_1.handleGetLocalMacros),
             },
             {
                 toolDefinition: {
@@ -565,7 +622,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateLocalMacros_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateLocalMacros_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateLocalMacros_1.handleCreateLocalMacros)(this.context, args),
+                handler: withContext(handleCreateLocalMacros_1.handleCreateLocalMacros),
             },
             {
                 toolDefinition: {
@@ -573,7 +630,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateLocalMacros_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateLocalMacros_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateLocalMacros_1.handleUpdateLocalMacros)(this.context, args),
+                handler: withContext(handleUpdateLocalMacros_1.handleUpdateLocalMacros),
             },
             {
                 toolDefinition: {
@@ -581,7 +638,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteLocalMacros_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteLocalMacros_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteLocalMacros_1.handleDeleteLocalMacros)(this.context, args),
+                handler: withContext(handleDeleteLocalMacros_1.handleDeleteLocalMacros),
             },
             {
                 toolDefinition: {
@@ -589,7 +646,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateProgram_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateProgram_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateProgram_1.handleCreateProgram)(this.context, args),
+                handler: withContext(handleCreateProgram_1.handleCreateProgram),
             },
             {
                 toolDefinition: {
@@ -597,7 +654,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetProgram_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetProgram_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetProgram_1.handleGetProgram)(this.context, args),
+                handler: withContext(handleGetProgram_1.handleGetProgram),
             },
             {
                 toolDefinition: {
@@ -605,7 +662,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateProgram_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateProgram_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateProgram_1.handleUpdateProgram)(this.context, args),
+                handler: withContext(handleUpdateProgram_1.handleUpdateProgram),
             },
             {
                 toolDefinition: {
@@ -613,7 +670,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteProgram_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteProgram_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteProgram_1.handleDeleteProgram)(this.context, args),
+                handler: withContext(handleDeleteProgram_1.handleDeleteProgram),
             },
             {
                 toolDefinition: {
@@ -621,7 +678,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateInterface_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateInterface_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateInterface_1.handleCreateInterface)(this.context, args),
+                handler: withContext(handleCreateInterface_1.handleCreateInterface),
             },
             {
                 toolDefinition: {
@@ -629,7 +686,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetInterface_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetInterface_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetInterface_1.handleGetInterface)(this.context, args),
+                handler: withContext(handleGetInterface_1.handleGetInterface),
             },
             {
                 toolDefinition: {
@@ -637,7 +694,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateInterface_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateInterface_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateInterface_1.handleUpdateInterface)(this.context, args),
+                handler: withContext(handleUpdateInterface_1.handleUpdateInterface),
             },
             {
                 toolDefinition: {
@@ -645,7 +702,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteInterface_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteInterface_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteInterface_1.handleDeleteInterface)(this.context, args),
+                handler: withContext(handleDeleteInterface_1.handleDeleteInterface),
             },
             {
                 toolDefinition: {
@@ -653,7 +710,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateFunctionGroup_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateFunctionGroup_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateFunctionGroup_1.handleCreateFunctionGroup)(this.context, args),
+                handler: withContext(handleCreateFunctionGroup_1.handleCreateFunctionGroup),
             },
             {
                 toolDefinition: {
@@ -661,7 +718,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetFunctionGroup_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetFunctionGroup_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetFunctionGroup_1.handleGetFunctionGroup)(this.context, args),
+                handler: withContext(handleGetFunctionGroup_1.handleGetFunctionGroup),
             },
             {
                 toolDefinition: {
@@ -669,7 +726,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateFunctionGroup_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateFunctionGroup_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateFunctionGroup_1.handleUpdateFunctionGroup)(this.context, args),
+                handler: withContext(handleUpdateFunctionGroup_1.handleUpdateFunctionGroup),
             },
             {
                 toolDefinition: {
@@ -677,7 +734,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteFunctionGroup_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteFunctionGroup_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteFunctionGroup_1.handleDeleteFunctionGroup)(this.context, args),
+                handler: withContext(handleDeleteFunctionGroup_1.handleDeleteFunctionGroup),
             },
             {
                 toolDefinition: {
@@ -685,7 +742,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateFunctionModule_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateFunctionModule_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateFunctionModule_1.handleCreateFunctionModule)(this.context, args),
+                handler: withContext(handleCreateFunctionModule_1.handleCreateFunctionModule),
             },
             {
                 toolDefinition: {
@@ -693,7 +750,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetFunctionModule_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetFunctionModule_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetFunctionModule_1.handleGetFunctionModule)(this.context, args),
+                handler: withContext(handleGetFunctionModule_1.handleGetFunctionModule),
             },
             {
                 toolDefinition: {
@@ -701,7 +758,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateFunctionModule_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateFunctionModule_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateFunctionModule_1.handleUpdateFunctionModule)(this.context, args),
+                handler: withContext(handleUpdateFunctionModule_1.handleUpdateFunctionModule),
             },
             {
                 toolDefinition: {
@@ -709,7 +766,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteFunctionModule_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteFunctionModule_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteFunctionModule_1.handleDeleteFunctionModule)(this.context, args),
+                handler: withContext(handleDeleteFunctionModule_1.handleDeleteFunctionModule),
             },
             {
                 toolDefinition: {
@@ -717,7 +774,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateBehaviorDefinition_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateBehaviorDefinition_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateBehaviorDefinition_1.handleCreateBehaviorDefinition)(this.context, args),
+                handler: withContext(handleCreateBehaviorDefinition_1.handleCreateBehaviorDefinition),
             },
             {
                 toolDefinition: {
@@ -725,7 +782,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetBehaviorDefinition_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetBehaviorDefinition_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetBehaviorDefinition_1.handleGetBehaviorDefinition)(this.context, args),
+                handler: withContext(handleGetBehaviorDefinition_1.handleGetBehaviorDefinition),
             },
             {
                 toolDefinition: {
@@ -733,7 +790,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateBehaviorDefinition_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateBehaviorDefinition_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateBehaviorDefinition_1.handleUpdateBehaviorDefinition)(this.context, args),
+                handler: withContext(handleUpdateBehaviorDefinition_1.handleUpdateBehaviorDefinition),
             },
             {
                 toolDefinition: {
@@ -741,7 +798,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteBehaviorDefinition_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteBehaviorDefinition_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteBehaviorDefinition_1.handleDeleteBehaviorDefinition)(this.context, args),
+                handler: withContext(handleDeleteBehaviorDefinition_1.handleDeleteBehaviorDefinition),
             },
             {
                 toolDefinition: {
@@ -749,7 +806,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateBehaviorImplementation_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateBehaviorImplementation_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateBehaviorImplementation_1.handleCreateBehaviorImplementation)(this.context, args),
+                handler: withContext(handleCreateBehaviorImplementation_1.handleCreateBehaviorImplementation),
             },
             {
                 toolDefinition: {
@@ -757,7 +814,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetBehaviorImplementation_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetBehaviorImplementation_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetBehaviorImplementation_1.handleGetBehaviorImplementation)(this.context, args),
+                handler: withContext(handleGetBehaviorImplementation_1.handleGetBehaviorImplementation),
             },
             {
                 toolDefinition: {
@@ -765,7 +822,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateBehaviorImplementation_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateBehaviorImplementation_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateBehaviorImplementation_1.handleUpdateBehaviorImplementation)(this.context, args),
+                handler: withContext(handleUpdateBehaviorImplementation_1.handleUpdateBehaviorImplementation),
             },
             {
                 toolDefinition: {
@@ -773,7 +830,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteBehaviorImplementation_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteBehaviorImplementation_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteBehaviorImplementation_1.handleDeleteBehaviorImplementation)(this.context, args),
+                handler: withContext(handleDeleteBehaviorImplementation_1.handleDeleteBehaviorImplementation),
             },
             {
                 toolDefinition: {
@@ -781,7 +838,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleCreateMetadataExtension_1.TOOL_DEFINITION.description,
                     inputSchema: handleCreateMetadataExtension_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleCreateMetadataExtension_1.handleCreateMetadataExtension)(this.context, args),
+                handler: withContext(handleCreateMetadataExtension_1.handleCreateMetadataExtension),
             },
             {
                 toolDefinition: {
@@ -789,7 +846,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleGetMetadataExtension_1.TOOL_DEFINITION.description,
                     inputSchema: handleGetMetadataExtension_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleGetMetadataExtension_1.handleGetMetadataExtension)(this.context, args),
+                handler: withContext(handleGetMetadataExtension_1.handleGetMetadataExtension),
             },
             {
                 toolDefinition: {
@@ -797,7 +854,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleUpdateMetadataExtension_1.TOOL_DEFINITION.description,
                     inputSchema: handleUpdateMetadataExtension_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleUpdateMetadataExtension_1.handleUpdateMetadataExtension)(this.context, args),
+                handler: withContext(handleUpdateMetadataExtension_1.handleUpdateMetadataExtension),
             },
             {
                 toolDefinition: {
@@ -805,7 +862,7 @@ class HighLevelHandlersGroup extends BaseHandlerGroup_js_1.BaseHandlerGroup {
                     description: handleDeleteMetadataExtension_1.TOOL_DEFINITION.description,
                     inputSchema: handleDeleteMetadataExtension_1.TOOL_DEFINITION.inputSchema,
                 },
-                handler: (args) => (0, handleDeleteMetadataExtension_1.handleDeleteMetadataExtension)(this.context, args),
+                handler: withContext(handleDeleteMetadataExtension_1.handleDeleteMetadataExtension),
             },
         ];
     }