@memberjunction/server 3.3.0 → 3.4.0

package/src/generated/generated.ts

@@ -19,7 +19,7 @@ import { mj_core_schema } from '../config.js';
 
 
 
-import { ActionAuthorizationEntity, ActionCategoryEntity, ActionContextTypeEntity, ActionContextEntity, ActionExecutionLogEntity, ActionFilterEntity, ActionLibraryEntity, ActionParamEntity, ActionResultCodeEntity, ActionEntity, AIActionEntity, AIAgentActionEntity, AIAgentLearningCycleEntity, AIAgentModelEntity, AIAgentNoteTypeEntity, AIAgentNoteEntity, AIAgentRequestEntity, AIAgentEntity, AIModelActionEntity, AIModelTypeEntity, AIModelEntity, AIPromptCategoryEntity, AIPromptTypeEntity, AIPromptEntity, AIResultCacheEntity, ApplicationEntityEntity, ApplicationSettingEntity, ApplicationEntity, AuditLogTypeEntity, AuditLogEntity, AuthorizationRoleEntity, AuthorizationEntity, CommunicationBaseMessageTypeEntity, CommunicationLogEntity, CommunicationProviderMessageTypeEntity, CommunicationProviderEntity, CommunicationRunEntity, CompanyEntity, CompanyIntegrationRecordMapEntity, CompanyIntegrationRunAPILogEntity, CompanyIntegrationRunDetailEntity, CompanyIntegrationRunEntity, CompanyIntegrationEntity, ContentFileTypeEntity, ContentItemAttributeEntity, ContentItemTagEntity, ContentItemEntity, ContentProcessRunEntity, ContentSourceParamEntity, ContentSourceTypeParamEntity, ContentSourceTypeEntity, ContentSourceEntity, ContentTypeAttributeEntity, ContentTypeEntity, ConversationDetailEntity, ConversationEntity, DashboardCategoryEntity, DashboardEntity, DataContextItemEntity, DataContextEntity, DatasetItemEntity, DatasetEntity, DuplicateRunDetailMatchEntity, DuplicateRunDetailEntity, DuplicateRunEntity, EmployeeCompanyIntegrationEntity, EmployeeRoleEntity, EmployeeSkillEntity, EmployeeEntity, EntityEntity, EntityActionFilterEntity, EntityActionInvocationTypeEntity, EntityActionInvocationEntity, EntityActionParamEntity, EntityActionEntity, EntityAIActionEntity, EntityCommunicationFieldEntity, EntityCommunicationMessageTypeEntity, EntityDocumentRunEntity, EntityDocumentSettingEntity, EntityDocumentTypeEntity, EntityDocumentEntity, EntityFieldValueEntity, EntityFieldEntity, EntityPermissionEntity, EntityRecordDocumentEntity, EntityRelationshipDisplayComponentEntity, EntityRelationshipEntity, EntitySettingEntity, ErrorLogEntity, ExplorerNavigationItemEntity, FileCategoryEntity, FileEntityRecordLinkEntity, FileStorageProviderEntity, FileEntity, GeneratedCodeCategoryEntity, GeneratedCodeEntity, IntegrationURLFormatEntity, IntegrationEntity, LibraryEntity, LibraryItemEntity, ListCategoryEntity, ListDetailEntity, ListEntity, AccessControlRuleEntity, AIAgentArtifactTypeEntity, AIAgentConfigurationEntity, AIAgentDataSourceEntity, AIAgentExampleEntity, AIAgentModalityEntity, AIAgentPermissionEntity, AIAgentPromptEntity, AIAgentRelationshipEntity, AIAgentRunMediaEntity, AIAgentRunStepEntity, AIAgentRunEntity, AIAgentStepPathEntity, AIAgentStepEntity, AIAgentTypeEntity, AIArchitectureEntity, AIConfigurationParamEntity, AIConfigurationEntity, AICredentialBindingEntity, AIModalityEntity, AIModelArchitectureEntity, AIModelCostEntity, AIModelModalityEntity, AIModelPriceTypeEntity, AIModelPriceUnitTypeEntity, AIModelVendorEntity, AIPromptModelEntity, AIPromptRunMediaEntity, AIPromptRunEntity, AIVendorTypeDefinitionEntity, AIVendorTypeEntity, AIVendorEntity, APIApplicationScopeEntity, APIApplicationEntity, APIKeyApplicationEntity, APIKeyScopeEntity, APIKeyUsageLogEntity, APIKeyEntity, APIScopeEntity, ArtifactPermissionEntity, ArtifactTypeEntity, ArtifactUseEntity, ArtifactVersionAttributeEntity, ArtifactVersionEntity, ArtifactEntity, CollectionArtifactEntity, CollectionPermissionEntity, CollectionEntity, ComponentDependencyEntity, ComponentLibraryEntity, ComponentLibraryLinkEntity, ComponentRegistryEntity, ComponentEntity, ConversationArtifactPermissionEntity, ConversationArtifactVersionEntity, ConversationArtifactEntity, ConversationDetailArtifactEntity, ConversationDetailAttachmentEntity, ConversationDetailRatingEntity, CredentialCategoryEntity, CredentialTypeEntity, CredentialEntity, DashboardCategoryLinkEntity, DashboardCategoryPermissionEntity, DashboardPartTypeEntity, DashboardPermissionEntity, DashboardUserPreferenceEntity, DashboardUserStateEntity, EncryptionAlgorithmEntity, EncryptionKeySourceEntity, EncryptionKeyEntity, EnvironmentEntity, FileStorageAccountEntity, ListInvitationEntity, ListShareEntity, ProjectEntity, PublicLinkEntity, QueryParameterEntity, RecordLinkEntity, ReportUserStateEntity, ReportVersionEntity, ScheduledJobRunEntity, ScheduledJobTypeEntity, ScheduledJobEntity, TaskDependencyEntity, TaskTypeEntity, TaskEntity, TestRubricEntity, TestRunFeedbackEntity, TestRunEntity, TestSuiteRunEntity, TestSuiteTestEntity, TestSuiteEntity, TestTypeEntity, TestEntity, UserNotificationPreferenceEntity, UserNotificationTypeEntity, UserSettingEntity, OutputDeliveryTypeEntity, OutputFormatTypeEntity, OutputTriggerTypeEntity, QueryEntity, QueryCategoryEntity, QueryEntityEntity, QueryFieldEntity, QueryPermissionEntity, QueueTaskEntity, QueueTypeEntity, QueueEntity, RecommendationItemEntity, RecommendationProviderEntity, RecommendationRunEntity, RecommendationEntity, RecordChangeReplayRunEntity, RecordChangeEntity, RecordMergeDeletionLogEntity, RecordMergeLogEntity, ReportCategoryEntity, ReportSnapshotEntity, ReportEntity, ResourceLinkEntity, ResourcePermissionEntity, ResourceTypeEntity, RoleEntity, RowLevelSecurityFilterEntity, ScheduledActionParamEntity, ScheduledActionEntity, SchemaInfoEntity, SkillEntity, TaggedItemEntity, TagEntity, TemplateCategoryEntity, TemplateContentTypeEntity, TemplateContentEntity, TemplateParamEntity, TemplateEntity, UserApplicationEntityEntity, UserApplicationEntity, UserFavoriteEntity, UserNotificationEntity, UserRecordLogEntity, UserRoleEntity, UserViewCategoryEntity, UserViewRunDetailEntity, UserViewRunEntity, UserViewEntity, UserEntity, VectorDatabaseEntity, VectorIndexEntity, VersionInstallationEntity, WorkflowEngineEntity, WorkflowRunEntity, WorkflowEntity, WorkspaceItemEntity, WorkspaceEntity } from '@memberjunction/core-entities';
+import { ActionAuthorizationEntity, ActionCategoryEntity, ActionContextTypeEntity, ActionContextEntity, ActionExecutionLogEntity, ActionFilterEntity, ActionLibraryEntity, ActionParamEntity, ActionResultCodeEntity, ActionEntity, AIActionEntity, AIAgentActionEntity, AIAgentLearningCycleEntity, AIAgentModelEntity, AIAgentNoteTypeEntity, AIAgentNoteEntity, AIAgentRequestEntity, AIAgentEntity, AIModelActionEntity, AIModelTypeEntity, AIModelEntity, AIPromptCategoryEntity, AIPromptTypeEntity, AIPromptEntity, AIResultCacheEntity, ApplicationEntityEntity, ApplicationSettingEntity, ApplicationEntity, AuditLogTypeEntity, AuditLogEntity, AuthorizationRoleEntity, AuthorizationEntity, CommunicationBaseMessageTypeEntity, CommunicationLogEntity, CommunicationProviderMessageTypeEntity, CommunicationProviderEntity, CommunicationRunEntity, CompanyEntity, CompanyIntegrationRecordMapEntity, CompanyIntegrationRunAPILogEntity, CompanyIntegrationRunDetailEntity, CompanyIntegrationRunEntity, CompanyIntegrationEntity, ContentFileTypeEntity, ContentItemAttributeEntity, ContentItemTagEntity, ContentItemEntity, ContentProcessRunEntity, ContentSourceParamEntity, ContentSourceTypeParamEntity, ContentSourceTypeEntity, ContentSourceEntity, ContentTypeAttributeEntity, ContentTypeEntity, ConversationDetailEntity, ConversationEntity, DashboardCategoryEntity, DashboardEntity, DataContextItemEntity, DataContextEntity, DatasetItemEntity, DatasetEntity, DuplicateRunDetailMatchEntity, DuplicateRunDetailEntity, DuplicateRunEntity, EmployeeCompanyIntegrationEntity, EmployeeRoleEntity, EmployeeSkillEntity, EmployeeEntity, EntityEntity, EntityActionFilterEntity, EntityActionInvocationTypeEntity, EntityActionInvocationEntity, EntityActionParamEntity, EntityActionEntity, EntityAIActionEntity, EntityCommunicationFieldEntity, EntityCommunicationMessageTypeEntity, EntityDocumentRunEntity, EntityDocumentSettingEntity, EntityDocumentTypeEntity, EntityDocumentEntity, EntityFieldValueEntity, EntityFieldEntity, EntityPermissionEntity, EntityRecordDocumentEntity, EntityRelationshipDisplayComponentEntity, EntityRelationshipEntity, EntitySettingEntity, ErrorLogEntity, ExplorerNavigationItemEntity, FileCategoryEntity, FileEntityRecordLinkEntity, FileStorageProviderEntity, FileEntity, GeneratedCodeCategoryEntity, GeneratedCodeEntity, IntegrationURLFormatEntity, IntegrationEntity, LibraryEntity, LibraryItemEntity, ListCategoryEntity, ListDetailEntity, ListEntity, AccessControlRuleEntity, AIAgentArtifactTypeEntity, AIAgentConfigurationEntity, AIAgentDataSourceEntity, AIAgentExampleEntity, AIAgentModalityEntity, AIAgentPermissionEntity, AIAgentPromptEntity, AIAgentRelationshipEntity, AIAgentRunMediaEntity, AIAgentRunStepEntity, AIAgentRunEntity, AIAgentStepPathEntity, AIAgentStepEntity, AIAgentTypeEntity, AIArchitectureEntity, AIConfigurationParamEntity, AIConfigurationEntity, AICredentialBindingEntity, AIModalityEntity, AIModelArchitectureEntity, AIModelCostEntity, AIModelModalityEntity, AIModelPriceTypeEntity, AIModelPriceUnitTypeEntity, AIModelVendorEntity, AIPromptModelEntity, AIPromptRunMediaEntity, AIPromptRunEntity, AIVendorTypeDefinitionEntity, AIVendorTypeEntity, AIVendorEntity, APIApplicationScopeEntity, APIApplicationEntity, APIKeyApplicationEntity, APIKeyScopeEntity, APIKeyUsageLogEntity, APIKeyEntity, APIScopeEntity, ArtifactPermissionEntity, ArtifactTypeEntity, ArtifactUseEntity, ArtifactVersionAttributeEntity, ArtifactVersionEntity, ArtifactEntity, CollectionArtifactEntity, CollectionPermissionEntity, CollectionEntity, ComponentDependencyEntity, ComponentLibraryEntity, ComponentLibraryLinkEntity, ComponentRegistryEntity, ComponentEntity, ConversationArtifactPermissionEntity, ConversationArtifactVersionEntity, ConversationArtifactEntity, ConversationDetailArtifactEntity, ConversationDetailAttachmentEntity, ConversationDetailRatingEntity, CredentialCategoryEntity, CredentialTypeEntity, CredentialEntity, DashboardCategoryLinkEntity, DashboardCategoryPermissionEntity, DashboardPartTypeEntity, DashboardPermissionEntity, DashboardUserPreferenceEntity, DashboardUserStateEntity, EncryptionAlgorithmEntity, EncryptionKeySourceEntity, EncryptionKeyEntity, EnvironmentEntity, FileStorageAccountEntity, ListInvitationEntity, ListShareEntity, MCPServerConnectionPermissionEntity, MCPServerConnectionToolEntity, MCPServerConnectionEntity, MCPServerToolEntity, MCPServerEntity, MCPToolExecutionLogEntity, ProjectEntity, PublicLinkEntity, QueryParameterEntity, RecordLinkEntity, ReportUserStateEntity, ReportVersionEntity, ScheduledJobRunEntity, ScheduledJobTypeEntity, ScheduledJobEntity, TaskDependencyEntity, TaskTypeEntity, TaskEntity, TestRubricEntity, TestRunFeedbackEntity, TestRunEntity, TestSuiteRunEntity, TestSuiteTestEntity, TestSuiteEntity, TestTypeEntity, TestEntity, UserNotificationPreferenceEntity, UserNotificationTypeEntity, UserSettingEntity, OutputDeliveryTypeEntity, OutputFormatTypeEntity, OutputTriggerTypeEntity, QueryEntity, QueryCategoryEntity, QueryEntityEntity, QueryFieldEntity, QueryPermissionEntity, QueueTaskEntity, QueueTypeEntity, QueueEntity, RecommendationItemEntity, RecommendationProviderEntity, RecommendationRunEntity, RecommendationEntity, RecordChangeReplayRunEntity, RecordChangeEntity, RecordMergeDeletionLogEntity, RecordMergeLogEntity, ReportCategoryEntity, ReportSnapshotEntity, ReportEntity, ResourceLinkEntity, ResourcePermissionEntity, ResourceTypeEntity, RoleEntity, RowLevelSecurityFilterEntity, ScheduledActionParamEntity, ScheduledActionEntity, SchemaInfoEntity, SkillEntity, TaggedItemEntity, TagEntity, TemplateCategoryEntity, TemplateContentTypeEntity, TemplateContentEntity, TemplateParamEntity, TemplateEntity, UserApplicationEntityEntity, UserApplicationEntity, UserFavoriteEntity, UserNotificationEntity, UserRecordLogEntity, UserRoleEntity, UserViewCategoryEntity, UserViewRunDetailEntity, UserViewRunEntity, UserViewEntity, UserEntity, VectorDatabaseEntity, VectorIndexEntity, VersionInstallationEntity, WorkflowEngineEntity, WorkflowRunEntity, WorkflowEntity, WorkspaceItemEntity, WorkspaceEntity } from '@memberjunction/core-entities';
     
 
 //****************************************************************************
@@ -233,6 +233,9 @@ export class MJActionCategory_ {
     @Field(() => [MJAction_])
     Actions_CategoryIDArray: MJAction_[]; // Link to Actions
     
+    @Field(() => [MJMCPServerTool_])
+    MJ_MCPServerTools_GeneratedActionCategoryIDArray: MJMCPServerTool_[]; // Link to MJ_MCPServerTools
+    
 }
 
 //****************************************************************************
@@ -361,6 +364,17 @@ export class MJActionCategoryResolver extends ResolverBase {
         return result;
     }
         
+    @FieldResolver(() => [MJMCPServerTool_])
+    async MJ_MCPServerTools_GeneratedActionCategoryIDArray(@Root() mjactioncategory_: MJActionCategory_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Server Tools', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerTools] WHERE [GeneratedActionCategoryID]='${mjactioncategory_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Tools', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Server Tools', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
     @Mutation(() => MJActionCategory_)
     async CreateMJActionCategory(
         @Arg('input', () => CreateMJActionCategoryInput) input: CreateMJActionCategoryInput,
@@ -1812,6 +1826,9 @@ export class MJAction_ {
     @Field(() => [MJAIAgentAction_])
     AIAgentActions_ActionIDArray: MJAIAgentAction_[]; // Link to AIAgentActions
     
+    @Field(() => [MJMCPServerTool_])
+    MJ_MCPServerTools_GeneratedActionIDArray: MJMCPServerTool_[]; // Link to MJ_MCPServerTools
+    
     @Field(() => [MJActionContext_])
     ActionContexts_ActionIDArray: MJActionContext_[]; // Link to ActionContexts
     
@@ -2087,6 +2104,17 @@ export class MJActionResolver extends ResolverBase {
         return result;
     }
         
+    @FieldResolver(() => [MJMCPServerTool_])
+    async MJ_MCPServerTools_GeneratedActionIDArray(@Root() mjaction_: MJAction_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Server Tools', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerTools] WHERE [GeneratedActionID]='${mjaction_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Tools', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Server Tools', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
     @FieldResolver(() => [MJActionContext_])
     async ActionContexts_ActionIDArray(@Root() mjaction_: MJAction_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('Action Contexts', userPayload);
@@ -9807,6 +9835,9 @@ export class MJCompany_ {
     @Field(() => [MJWorkflow_])
     Workflows_CompanyNameArray: MJWorkflow_[]; // Link to Workflows
     
+    @Field(() => [MJMCPServerConnection_])
+    MJ_MCPServerConnections_CompanyIDArray: MJMCPServerConnection_[]; // Link to MJ_MCPServerConnections
+    
     @Field(() => [MJAIAgentNote_])
     AIAgentNotes_CompanyIDArray: MJAIAgentNote_[]; // Link to AIAgentNotes
     
@@ -9969,6 +10000,17 @@ export class MJCompanyResolver extends ResolverBase {
         return result;
     }
         
+    @FieldResolver(() => [MJMCPServerConnection_])
+    async MJ_MCPServerConnections_CompanyIDArray(@Root() mjcompany_: MJCompany_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Server Connections', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerConnections] WHERE [CompanyID]='${mjcompany_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Connections', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Server Connections', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
     @FieldResolver(() => [MJAIAgentNote_])
     async AIAgentNotes_CompanyIDArray(@Root() mjcompany_: MJCompany_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('AI Agent Notes', userPayload);
@@ -34982,12 +35024,12 @@ export class MJAPIApplication_ {
     @MaxLength(10)
     _mj__UpdatedAt: Date;
         
-    @Field(() => [MJAPIApplicationScope_])
-    MJ_APIApplicationScopes_ApplicationIDArray: MJAPIApplicationScope_[]; // Link to MJ_APIApplicationScopes
-    
     @Field(() => [MJAPIKeyUsageLog_])
     MJ_APIKeyUsageLogs_ApplicationIDArray: MJAPIKeyUsageLog_[]; // Link to MJ_APIKeyUsageLogs
     
+    @Field(() => [MJAPIApplicationScope_])
+    MJ_APIApplicationScopes_ApplicationIDArray: MJAPIApplicationScope_[]; // Link to MJ_APIApplicationScopes
+    
     @Field(() => [MJAPIKeyApplication_])
     MJ_APIKeyApplications_ApplicationIDArray: MJAPIKeyApplication_[]; // Link to MJ_APIKeyApplications
     
@@ -35091,25 +35133,25 @@ export class MJAPIApplicationResolver extends ResolverBase {
         return result;
     }
     
-    @FieldResolver(() => [MJAPIApplicationScope_])
-    async MJ_APIApplicationScopes_ApplicationIDArray(@Root() mjapiapplication_: MJAPIApplication_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        this.CheckUserReadPermissions('MJ: API Application Scopes', userPayload);
+    @FieldResolver(() => [MJAPIKeyUsageLog_])
+    async MJ_APIKeyUsageLogs_ApplicationIDArray(@Root() mjapiapplication_: MJAPIApplication_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: API Key Usage Logs', userPayload);
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
         const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
-        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwAPIApplicationScopes] WHERE [ApplicationID]='${mjapiapplication_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: API Application Scopes', userPayload, EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwAPIKeyUsageLogs] WHERE [ApplicationID]='${mjapiapplication_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: API Key Usage Logs', userPayload, EntityPermissionType.Read, 'AND');
         const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
-        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: API Application Scopes', rows, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: API Key Usage Logs', rows, this.GetUserFromPayload(userPayload));
         return result;
     }
         
-    @FieldResolver(() => [MJAPIKeyUsageLog_])
-    async MJ_APIKeyUsageLogs_ApplicationIDArray(@Root() mjapiapplication_: MJAPIApplication_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        this.CheckUserReadPermissions('MJ: API Key Usage Logs', userPayload);
+    @FieldResolver(() => [MJAPIApplicationScope_])
+    async MJ_APIApplicationScopes_ApplicationIDArray(@Root() mjapiapplication_: MJAPIApplication_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: API Application Scopes', userPayload);
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
         const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
-        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwAPIKeyUsageLogs] WHERE [ApplicationID]='${mjapiapplication_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: API Key Usage Logs', userPayload, EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwAPIApplicationScopes] WHERE [ApplicationID]='${mjapiapplication_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: API Application Scopes', userPayload, EntityPermissionType.Read, 'AND');
         const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
-        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: API Key Usage Logs', rows, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: API Application Scopes', rows, this.GetUserFromPayload(userPayload));
         return result;
     }
         
@@ -36068,6 +36110,9 @@ export class MJAPIScope_ {
     @Field(() => Boolean, {description: `Whether this scope is currently active. Inactive scopes are ignored during authorization.`}) 
     IsActive: boolean;
         
+    @Field({nullable: true, description: `JSON configuration for UI presentation. Schema: { "icon": "fa-solid fa-xxx", "color": "#hexcolor" }. Icon should be a Font Awesome class. Color should be a hex color code.`}) 
+    UIConfig?: string;
+        
     @Field({nullable: true}) 
     @MaxLength(200)
     Parent?: string;
@@ -36115,6 +36160,9 @@ export class CreateMJAPIScopeInput {
 
     @Field(() => Boolean, { nullable: true })
     IsActive?: boolean;
+
+    @Field({ nullable: true })
+    UIConfig: string | null;
 }
     
 
@@ -36147,6 +36195,9 @@ export class UpdateMJAPIScopeInput {
     @Field(() => Boolean, { nullable: true })
     IsActive?: boolean;
 
+    @Field({ nullable: true })
+    UIConfig?: string | null;
+
     @Field(() => [KeyValuePairInput], { nullable: true })
     OldValues___?: KeyValuePairInput[];
 }
@@ -40913,6 +40964,9 @@ export class MJCredentialType_ {
     @Field(() => [MJCredential_])
     MJ_Credentials_CredentialTypeIDArray: MJCredential_[]; // Link to MJ_Credentials
     
+    @Field(() => [MJMCPServer_])
+    MJ_MCPServers_CredentialTypeIDArray: MJMCPServer_[]; // Link to MJ_MCPServers
+    
     @Field(() => [MJAIVendor_])
     MJ_AIVendors_CredentialTypeIDArray: MJAIVendor_[]; // Link to MJ_AIVendors
     
@@ -41045,6 +41099,17 @@ export class MJCredentialTypeResolver extends ResolverBase {
         return result;
     }
         
+    @FieldResolver(() => [MJMCPServer_])
+    async MJ_MCPServers_CredentialTypeIDArray(@Root() mjcredentialtype_: MJCredentialType_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Servers', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServers] WHERE [CredentialTypeID]='${mjcredentialtype_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Servers', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Servers', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
     @FieldResolver(() => [MJAIVendor_])
     async MJ_AIVendors_CredentialTypeIDArray(@Root() mjcredentialtype_: MJCredentialType_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('MJ: AI Vendors', userPayload);
@@ -41153,6 +41218,9 @@ export class MJCredential_ {
     @Field(() => [MJFileStorageAccount_])
     MJ_FileStorageAccounts_CredentialIDArray: MJFileStorageAccount_[]; // Link to MJ_FileStorageAccounts
     
+    @Field(() => [MJMCPServerConnection_])
+    MJ_MCPServerConnections_CredentialIDArray: MJMCPServerConnection_[]; // Link to MJ_MCPServerConnections
+    
     @Field(() => [MJAICredentialBinding_])
     MJ_AICredentialBindings_CredentialIDArray: MJAICredentialBinding_[]; // Link to MJ_AICredentialBindings
     
@@ -41315,6 +41383,17 @@ export class MJCredentialResolver extends ResolverBase {
         return result;
     }
         
+    @FieldResolver(() => [MJMCPServerConnection_])
+    async MJ_MCPServerConnections_CredentialIDArray(@Root() mjcredential_: MJCredential_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Server Connections', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerConnections] WHERE [CredentialID]='${mjcredential_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Connections', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Server Connections', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
     @FieldResolver(() => [MJAICredentialBinding_])
     async MJ_AICredentialBindings_CredentialIDArray(@Root() mjcredential_: MJCredential_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('MJ: AI Credential Bindings', userPayload);
@@ -44009,39 +44088,34 @@ export class MJListShareResolver extends ResolverBase {
 }
 
 //****************************************************************************
-// ENTITY CLASS for MJ: Projects
+// ENTITY CLASS for MJ: MCP Server Connection Permissions
 //****************************************************************************
-@ObjectType({ description: `Container for grouping related conversations around a common topic, client, or initiative. Supports nesting for sub-projects.` })
-export class MJProject_ {
+@ObjectType()
+export class MJMCPServerConnectionPermission_ {
     @Field() 
     @MaxLength(16)
     ID: string;
         
     @Field() 
     @MaxLength(16)
-    EnvironmentID: string;
+    MCPServerConnectionID: string;
         
-    @Field({nullable: true}) 
+    @Field({nullable: true, description: `FK to User (mutually exclusive with RoleID)`}) 
     @MaxLength(16)
-    ParentID?: string;
-        
-    @Field({description: `Display name for the project`}) 
-    @MaxLength(510)
-    Name: string;
+    UserID?: string;
         
-    @Field({nullable: true, description: `Detailed description of the project goals and scope`}) 
-    Description?: string;
+    @Field({nullable: true, description: `FK to Role (mutually exclusive with UserID)`}) 
+    @MaxLength(16)
+    RoleID?: string;
         
-    @Field({nullable: true, description: `Hex color code for project badges in UI (#RRGGBB format)`}) 
-    @MaxLength(14)
-    Color?: string;
+    @Field(() => Boolean, {description: `Can invoke tools via this connection`}) 
+    CanExecute: boolean;
         
-    @Field({nullable: true, description: `Font Awesome icon class for UI display`}) 
-    @MaxLength(100)
-    Icon?: string;
+    @Field(() => Boolean, {description: `Can modify connection settings`}) 
+    CanModify: boolean;
         
-    @Field(() => Boolean, {description: `Indicates if this project is archived and should be hidden from active lists`}) 
-    IsArchived: boolean;
+    @Field(() => Boolean, {description: `Can see credential info (but not decrypt)`}) 
+    CanViewCredentials: boolean;
         
     @Field() 
     @MaxLength(10)
@@ -44053,98 +44127,83 @@ export class MJProject_ {
         
     @Field() 
     @MaxLength(510)
-    Environment: string;
+    MCPServerConnection: string;
         
     @Field({nullable: true}) 
-    @MaxLength(510)
-    Parent?: string;
+    @MaxLength(200)
+    User?: string;
         
     @Field({nullable: true}) 
-    @MaxLength(16)
-    RootParentID?: string;
+    @MaxLength(100)
+    Role?: string;
         
-    @Field(() => [MJProject_])
-    MJ_Projects_ParentIDArray: MJProject_[]; // Link to MJ_Projects
-    
-    @Field(() => [MJConversation_])
-    Conversations_ProjectIDArray: MJConversation_[]; // Link to Conversations
-    
-    @Field(() => [MJTask_])
-    MJ_Tasks_ProjectIDArray: MJTask_[]; // Link to MJ_Tasks
-    
 }
 
 //****************************************************************************
-// INPUT TYPE for MJ: Projects
+// INPUT TYPE for MJ: MCP Server Connection Permissions
 //****************************************************************************
 @InputType()
-export class CreateMJProjectInput {
+export class CreateMJMCPServerConnectionPermissionInput {
     @Field({ nullable: true })
     ID?: string;
 
     @Field({ nullable: true })
-    EnvironmentID?: string;
-
-    @Field({ nullable: true })
-    ParentID: string | null;
+    MCPServerConnectionID?: string;
 
     @Field({ nullable: true })
-    Name?: string;
+    UserID: string | null;
 
     @Field({ nullable: true })
-    Description: string | null;
+    RoleID: string | null;
 
-    @Field({ nullable: true })
-    Color: string | null;
+    @Field(() => Boolean, { nullable: true })
+    CanExecute?: boolean;
 
-    @Field({ nullable: true })
-    Icon: string | null;
+    @Field(() => Boolean, { nullable: true })
+    CanModify?: boolean;
 
     @Field(() => Boolean, { nullable: true })
-    IsArchived?: boolean;
+    CanViewCredentials?: boolean;
 }
     
 
 //****************************************************************************
-// INPUT TYPE for MJ: Projects
+// INPUT TYPE for MJ: MCP Server Connection Permissions
 //****************************************************************************
 @InputType()
-export class UpdateMJProjectInput {
+export class UpdateMJMCPServerConnectionPermissionInput {
     @Field()
     ID: string;
 
     @Field({ nullable: true })
-    EnvironmentID?: string;
-
-    @Field({ nullable: true })
-    ParentID?: string | null;
+    MCPServerConnectionID?: string;
 
     @Field({ nullable: true })
-    Name?: string;
+    UserID?: string | null;
 
     @Field({ nullable: true })
-    Description?: string | null;
+    RoleID?: string | null;
 
-    @Field({ nullable: true })
-    Color?: string | null;
+    @Field(() => Boolean, { nullable: true })
+    CanExecute?: boolean;
 
-    @Field({ nullable: true })
-    Icon?: string | null;
+    @Field(() => Boolean, { nullable: true })
+    CanModify?: boolean;
 
     @Field(() => Boolean, { nullable: true })
-    IsArchived?: boolean;
+    CanViewCredentials?: boolean;
 
     @Field(() => [KeyValuePairInput], { nullable: true })
     OldValues___?: KeyValuePairInput[];
 }
     
 //****************************************************************************
-// RESOLVER for MJ: Projects
+// RESOLVER for MJ: MCP Server Connection Permissions
 //****************************************************************************
 @ObjectType()
-export class RunMJProjectViewResult {
-    @Field(() => [MJProject_])
-    Results: MJProject_[];
+export class RunMJMCPServerConnectionPermissionViewResult {
+    @Field(() => [MJMCPServerConnectionPermission_])
+    Results: MJMCPServerConnectionPermission_[];
 
     @Field(() => String, {nullable: true})
     UserViewRunID?: string;
@@ -44165,140 +44224,91 @@ export class RunMJProjectViewResult {
     Success: boolean;
 }
 
-@Resolver(MJProject_)
-export class MJProjectResolver extends ResolverBase {
-    @Query(() => RunMJProjectViewResult)
-    async RunMJProjectViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+@Resolver(MJMCPServerConnectionPermission_)
+export class MJMCPServerConnectionPermissionResolver extends ResolverBase {
+    @Query(() => RunMJMCPServerConnectionPermissionViewResult)
+    async RunMJMCPServerConnectionPermissionViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
         return super.RunViewByIDGeneric(input, provider, userPayload, pubSub);
     }
 
-    @Query(() => RunMJProjectViewResult)
-    async RunMJProjectViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+    @Query(() => RunMJMCPServerConnectionPermissionViewResult)
+    async RunMJMCPServerConnectionPermissionViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
         return super.RunViewByNameGeneric(input, provider, userPayload, pubSub);
     }
 
-    @Query(() => RunMJProjectViewResult)
-    async RunMJProjectDynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+    @Query(() => RunMJMCPServerConnectionPermissionViewResult)
+    async RunMJMCPServerConnectionPermissionDynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
-        input.EntityName = 'MJ: Projects';
+        input.EntityName = 'MJ: MCP Server Connection Permissions';
         return super.RunDynamicViewGeneric(input, provider, userPayload, pubSub);
     }
-    @Query(() => MJProject_, { nullable: true })
-    async MJProject(@Arg('ID', () => String) ID: string, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<MJProject_ | null> {
-        this.CheckUserReadPermissions('MJ: Projects', userPayload);
+    @Query(() => MJMCPServerConnectionPermission_, { nullable: true })
+    async MJMCPServerConnectionPermission(@Arg('ID', () => String) ID: string, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<MJMCPServerConnectionPermission_ | null> {
+        this.CheckUserReadPermissions('MJ: MCP Server Connection Permissions', userPayload);
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
         const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
-        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwProjects] WHERE [ID]='${ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: Projects', userPayload, EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerConnectionPermissions] WHERE [ID]='${ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Connection Permissions', userPayload, EntityPermissionType.Read, 'AND');
         const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
-        const result = await this.MapFieldNamesToCodeNames('MJ: Projects', rows && rows.length > 0 ? rows[0] : {}, this.GetUserFromPayload(userPayload));
+        const result = await this.MapFieldNamesToCodeNames('MJ: MCP Server Connection Permissions', rows && rows.length > 0 ? rows[0] : {}, this.GetUserFromPayload(userPayload));
         return result;
     }
     
-    @FieldResolver(() => [MJProject_])
-    async MJ_Projects_ParentIDArray(@Root() mjproject_: MJProject_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        this.CheckUserReadPermissions('MJ: Projects', userPayload);
-        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
-        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
-        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwProjects] WHERE [ParentID]='${mjproject_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: Projects', userPayload, EntityPermissionType.Read, 'AND');
-        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
-        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: Projects', rows, this.GetUserFromPayload(userPayload));
-        return result;
-    }
-        
-    @FieldResolver(() => [MJConversation_])
-    async Conversations_ProjectIDArray(@Root() mjproject_: MJProject_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        this.CheckUserReadPermissions('Conversations', userPayload);
-        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
-        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
-        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwConversations] WHERE [ProjectID]='${mjproject_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'Conversations', userPayload, EntityPermissionType.Read, 'AND');
-        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
-        const result = await this.ArrayMapFieldNamesToCodeNames('Conversations', rows, this.GetUserFromPayload(userPayload));
-        return result;
-    }
-        
-    @FieldResolver(() => [MJTask_])
-    async MJ_Tasks_ProjectIDArray(@Root() mjproject_: MJProject_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        this.CheckUserReadPermissions('MJ: Tasks', userPayload);
-        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
-        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
-        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwTasks] WHERE [ProjectID]='${mjproject_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: Tasks', userPayload, EntityPermissionType.Read, 'AND');
-        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
-        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: Tasks', rows, this.GetUserFromPayload(userPayload));
-        return result;
-    }
-        
-    @Mutation(() => MJProject_)
-    async CreateMJProject(
-        @Arg('input', () => CreateMJProjectInput) input: CreateMJProjectInput,
+    @Mutation(() => MJMCPServerConnectionPermission_)
+    async CreateMJMCPServerConnectionPermission(
+        @Arg('input', () => CreateMJMCPServerConnectionPermissionInput) input: CreateMJMCPServerConnectionPermissionInput,
         @Ctx() { providers, userPayload }: AppContext,
         @PubSub() pubSub: PubSubEngine
     ) {
         const provider = GetReadWriteProvider(providers);
-        return this.CreateRecord('MJ: Projects', input, provider, userPayload, pubSub)
+        return this.CreateRecord('MJ: MCP Server Connection Permissions', input, provider, userPayload, pubSub)
     }
         
-    @Mutation(() => MJProject_)
-    async UpdateMJProject(
-        @Arg('input', () => UpdateMJProjectInput) input: UpdateMJProjectInput,
+    @Mutation(() => MJMCPServerConnectionPermission_)
+    async UpdateMJMCPServerConnectionPermission(
+        @Arg('input', () => UpdateMJMCPServerConnectionPermissionInput) input: UpdateMJMCPServerConnectionPermissionInput,
         @Ctx() { providers, userPayload }: AppContext,
         @PubSub() pubSub: PubSubEngine
     ) {
         const provider = GetReadWriteProvider(providers);
-        return this.UpdateRecord('MJ: Projects', input, provider, userPayload, pubSub);
+        return this.UpdateRecord('MJ: MCP Server Connection Permissions', input, provider, userPayload, pubSub);
     }
     
-    @Mutation(() => MJProject_)
-    async DeleteMJProject(@Arg('ID', () => String) ID: string, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+    @Mutation(() => MJMCPServerConnectionPermission_)
+    async DeleteMJMCPServerConnectionPermission(@Arg('ID', () => String) ID: string, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         const provider = GetReadWriteProvider(providers);
         const key = new CompositeKey([{FieldName: 'ID', Value: ID}]);
-        return this.DeleteRecord('MJ: Projects', key, options, provider, userPayload, pubSub);
+        return this.DeleteRecord('MJ: MCP Server Connection Permissions', key, options, provider, userPayload, pubSub);
     }
     
 }
 
 //****************************************************************************
-// ENTITY CLASS for MJ: Public Links
+// ENTITY CLASS for MJ: MCP Server Connection Tools
 //****************************************************************************
-@ObjectType({ description: `Shareable links for external access to artifacts and other resources. Supports password protection and expiration.` })
-export class MJPublicLink_ {
+@ObjectType()
+export class MJMCPServerConnectionTool_ {
     @Field() 
     @MaxLength(16)
     ID: string;
         
-    @Field({description: `Type of resource being shared (Artifact, Conversation, Collection)`}) 
-    @MaxLength(100)
-    ResourceType: string;
-        
     @Field() 
     @MaxLength(16)
-    ResourceID: string;
-        
-    @Field({description: `Unique token for accessing the shared resource via URL`}) 
-    @MaxLength(510)
-    Token: string;
-        
-    @Field({nullable: true, description: `SHA256 hash of optional password for additional security`}) 
-    @MaxLength(510)
-    PasswordHash?: string;
-        
-    @Field({nullable: true, description: `Optional expiration date/time for this public link`}) 
-    @MaxLength(10)
-    ExpiresAt?: Date;
-        
-    @Field(() => Int, {nullable: true, description: `Maximum number of times this link can be viewed`}) 
-    MaxViews?: number;
-        
-    @Field(() => Int, {description: `Current count of how many times this link has been viewed`}) 
-    CurrentViews: number;
+    MCPServerConnectionID: string;
         
     @Field() 
     @MaxLength(16)
-    UserID: string;
+    MCPServerToolID: string;
         
-    @Field(() => Boolean, {description: `Indicates if this link is currently active and accessible`}) 
-    IsActive: boolean;
+    @Field(() => Boolean, {description: `Whether this tool is enabled for the connection`}) 
+    IsEnabled: boolean;
+        
+    @Field({nullable: true, description: `JSON default values for tool inputs`}) 
+    DefaultInputValues?: string;
+        
+    @Field(() => Int, {nullable: true, description: `Override rate limit for this specific tool`}) 
+    MaxCallsPerMinute?: number;
         
     @Field() 
     @MaxLength(10)
@@ -44309,94 +44319,74 @@ export class MJPublicLink_ {
     _mj__UpdatedAt: Date;
         
     @Field() 
-    @MaxLength(200)
-    User: string;
+    @MaxLength(510)
+    MCPServerConnection: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(510)
+    MCPServerTool?: string;
         
 }
 
 //****************************************************************************
-// INPUT TYPE for MJ: Public Links
+// INPUT TYPE for MJ: MCP Server Connection Tools
 //****************************************************************************
 @InputType()
-export class CreateMJPublicLinkInput {
+export class CreateMJMCPServerConnectionToolInput {
     @Field({ nullable: true })
     ID?: string;
 
     @Field({ nullable: true })
-    ResourceType?: string;
-
-    @Field({ nullable: true })
-    ResourceID?: string;
+    MCPServerConnectionID?: string;
 
     @Field({ nullable: true })
-    Token?: string;
+    MCPServerToolID?: string;
 
-    @Field({ nullable: true })
-    PasswordHash: string | null;
+    @Field(() => Boolean, { nullable: true })
+    IsEnabled?: boolean;
 
     @Field({ nullable: true })
-    ExpiresAt: Date | null;
-
-    @Field(() => Int, { nullable: true })
-    MaxViews: number | null;
+    DefaultInputValues: string | null;
 
     @Field(() => Int, { nullable: true })
-    CurrentViews?: number;
-
-    @Field({ nullable: true })
-    UserID?: string;
-
-    @Field(() => Boolean, { nullable: true })
-    IsActive?: boolean;
+    MaxCallsPerMinute: number | null;
 }
     
 
 //****************************************************************************
-// INPUT TYPE for MJ: Public Links
+// INPUT TYPE for MJ: MCP Server Connection Tools
 //****************************************************************************
 @InputType()
-export class UpdateMJPublicLinkInput {
+export class UpdateMJMCPServerConnectionToolInput {
     @Field()
     ID: string;
 
     @Field({ nullable: true })
-    ResourceType?: string;
-
-    @Field({ nullable: true })
-    ResourceID?: string;
+    MCPServerConnectionID?: string;
 
     @Field({ nullable: true })
-    Token?: string;
+    MCPServerToolID?: string;
 
-    @Field({ nullable: true })
-    PasswordHash?: string | null;
+    @Field(() => Boolean, { nullable: true })
+    IsEnabled?: boolean;
 
     @Field({ nullable: true })
-    ExpiresAt?: Date | null;
-
-    @Field(() => Int, { nullable: true })
-    MaxViews?: number | null;
+    DefaultInputValues?: string | null;
 
     @Field(() => Int, { nullable: true })
-    CurrentViews?: number;
-
-    @Field({ nullable: true })
-    UserID?: string;
-
-    @Field(() => Boolean, { nullable: true })
-    IsActive?: boolean;
+    MaxCallsPerMinute?: number | null;
 
     @Field(() => [KeyValuePairInput], { nullable: true })
     OldValues___?: KeyValuePairInput[];
 }
     
 //****************************************************************************
-// RESOLVER for MJ: Public Links
+// RESOLVER for MJ: MCP Server Connection Tools
 //****************************************************************************
 @ObjectType()
-export class RunMJPublicLinkViewResult {
-    @Field(() => [MJPublicLink_])
-    Results: MJPublicLink_[];
+export class RunMJMCPServerConnectionToolViewResult {
+    @Field(() => [MJMCPServerConnectionTool_])
+    Results: MJMCPServerConnectionTool_[];
 
     @Field(() => String, {nullable: true})
     UserViewRunID?: string;
@@ -44417,108 +44407,129 @@ export class RunMJPublicLinkViewResult {
     Success: boolean;
 }
 
-@Resolver(MJPublicLink_)
-export class MJPublicLinkResolver extends ResolverBase {
-    @Query(() => RunMJPublicLinkViewResult)
-    async RunMJPublicLinkViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+@Resolver(MJMCPServerConnectionTool_)
+export class MJMCPServerConnectionToolResolver extends ResolverBase {
+    @Query(() => RunMJMCPServerConnectionToolViewResult)
+    async RunMJMCPServerConnectionToolViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
         return super.RunViewByIDGeneric(input, provider, userPayload, pubSub);
     }
 
-    @Query(() => RunMJPublicLinkViewResult)
-    async RunMJPublicLinkViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+    @Query(() => RunMJMCPServerConnectionToolViewResult)
+    async RunMJMCPServerConnectionToolViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
         return super.RunViewByNameGeneric(input, provider, userPayload, pubSub);
     }
 
-    @Query(() => RunMJPublicLinkViewResult)
-    async RunMJPublicLinkDynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+    @Query(() => RunMJMCPServerConnectionToolViewResult)
+    async RunMJMCPServerConnectionToolDynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
-        input.EntityName = 'MJ: Public Links';
+        input.EntityName = 'MJ: MCP Server Connection Tools';
         return super.RunDynamicViewGeneric(input, provider, userPayload, pubSub);
     }
-    @Query(() => MJPublicLink_, { nullable: true })
-    async MJPublicLink(@Arg('ID', () => String) ID: string, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<MJPublicLink_ | null> {
-        this.CheckUserReadPermissions('MJ: Public Links', userPayload);
+    @Query(() => MJMCPServerConnectionTool_, { nullable: true })
+    async MJMCPServerConnectionTool(@Arg('ID', () => String) ID: string, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<MJMCPServerConnectionTool_ | null> {
+        this.CheckUserReadPermissions('MJ: MCP Server Connection Tools', userPayload);
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
         const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
-        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwPublicLinks] WHERE [ID]='${ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: Public Links', userPayload, EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerConnectionTools] WHERE [ID]='${ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Connection Tools', userPayload, EntityPermissionType.Read, 'AND');
         const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
-        const result = await this.MapFieldNamesToCodeNames('MJ: Public Links', rows && rows.length > 0 ? rows[0] : {}, this.GetUserFromPayload(userPayload));
+        const result = await this.MapFieldNamesToCodeNames('MJ: MCP Server Connection Tools', rows && rows.length > 0 ? rows[0] : {}, this.GetUserFromPayload(userPayload));
         return result;
     }
     
-    @Mutation(() => MJPublicLink_)
-    async CreateMJPublicLink(
-        @Arg('input', () => CreateMJPublicLinkInput) input: CreateMJPublicLinkInput,
+    @Mutation(() => MJMCPServerConnectionTool_)
+    async CreateMJMCPServerConnectionTool(
+        @Arg('input', () => CreateMJMCPServerConnectionToolInput) input: CreateMJMCPServerConnectionToolInput,
         @Ctx() { providers, userPayload }: AppContext,
         @PubSub() pubSub: PubSubEngine
     ) {
         const provider = GetReadWriteProvider(providers);
-        return this.CreateRecord('MJ: Public Links', input, provider, userPayload, pubSub)
+        return this.CreateRecord('MJ: MCP Server Connection Tools', input, provider, userPayload, pubSub)
     }
         
-    @Mutation(() => MJPublicLink_)
-    async UpdateMJPublicLink(
-        @Arg('input', () => UpdateMJPublicLinkInput) input: UpdateMJPublicLinkInput,
+    @Mutation(() => MJMCPServerConnectionTool_)
+    async UpdateMJMCPServerConnectionTool(
+        @Arg('input', () => UpdateMJMCPServerConnectionToolInput) input: UpdateMJMCPServerConnectionToolInput,
         @Ctx() { providers, userPayload }: AppContext,
         @PubSub() pubSub: PubSubEngine
     ) {
         const provider = GetReadWriteProvider(providers);
-        return this.UpdateRecord('MJ: Public Links', input, provider, userPayload, pubSub);
+        return this.UpdateRecord('MJ: MCP Server Connection Tools', input, provider, userPayload, pubSub);
     }
     
-    @Mutation(() => MJPublicLink_)
-    async DeleteMJPublicLink(@Arg('ID', () => String) ID: string, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+    @Mutation(() => MJMCPServerConnectionTool_)
+    async DeleteMJMCPServerConnectionTool(@Arg('ID', () => String) ID: string, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         const provider = GetReadWriteProvider(providers);
         const key = new CompositeKey([{FieldName: 'ID', Value: ID}]);
-        return this.DeleteRecord('MJ: Public Links', key, options, provider, userPayload, pubSub);
+        return this.DeleteRecord('MJ: MCP Server Connection Tools', key, options, provider, userPayload, pubSub);
     }
     
 }
 
 //****************************************************************************
-// ENTITY CLASS for MJ: Query Parameters
+// ENTITY CLASS for MJ: MCP Server Connections
 //****************************************************************************
-@ObjectType({ description: `Stores parameter definitions for parameterized queries that use Nunjucks templates. Each parameter represents a dynamic value that can be passed when executing the query. Parameters are automatically extracted from the query template by the QueryEntityServer using LLM analysis, or can be manually defined. The combination of parameter metadata and validation filters creates a self-documenting, type-safe query execution system.` })
-export class MJQueryParameter_ {
+@ObjectType()
+export class MJMCPServerConnection_ {
     @Field() 
     @MaxLength(16)
     ID: string;
         
     @Field() 
     @MaxLength(16)
-    QueryID: string;
+    MCPServerID: string;
         
-    @Field({description: `The name of the parameter as it appears in the Nunjucks template. This must match exactly with the parameter reference in the SQL template. For example, if the template contains {{ userEmail | required | email }}, the Name would be "userEmail". Parameter names should follow JavaScript identifier rules: start with a letter, and contain only letters, numbers, and underscores.`}) 
+    @Field({description: `Connection name (unique per company)`}) 
     @MaxLength(510)
     Name: string;
         
-    @Field({description: `The data type of the parameter used for validation and type conversion. Valid values are: "string" for text values, "number" for integers or decimals, "date" for date/datetime values (ISO 8601 format expected), "boolean" for true/false values, and "array" for multiple values (typically used with IN clauses). The type determines which validation filters can be applied and how the parameter is processed.`}) 
+    @Field({nullable: true}) 
+    Description?: string;
+        
+    @Field({nullable: true, description: `FK to Credential entity (uses existing credential types)`}) 
+    @MaxLength(16)
+    CredentialID?: string;
+        
+    @Field({nullable: true, description: `Custom header name for API key auth (default: X-API-Key)`}) 
+    @MaxLength(200)
+    CustomHeaderName?: string;
+        
+    @Field({nullable: true, description: `Optional company association. NULL means the connection is global and available to all companies. Non-NULL restricts the connection to that specific company.`}) 
+    @MaxLength(16)
+    CompanyID?: string;
+        
+    @Field() 
     @MaxLength(100)
-    Type: string;
+    Status: string;
         
-    @Field(() => Boolean, {nullable: true, description: `Indicates whether this parameter must be provided when executing the query. When true, the query execution will fail if the parameter is not supplied and no DefaultValue is set. This is automatically determined by the presence of the "required" filter in the template, but can be manually overridden. Required parameters ensure data integrity and prevent unintended query behavior.`}) 
-    IsRequired?: boolean;
+    @Field(() => Boolean, {description: `Auto-sync tools when connecting`}) 
+    AutoSyncTools: boolean;
         
-    @Field({nullable: true, description: `The default value to use when the parameter is not provided during query execution. This value must be compatible with the parameter Type. For arrays, use JSON format like ["value1","value2"]. Default values allow queries to have sensible fallbacks while still accepting custom inputs. If a parameter is required (IsRequired=true), the default value is ignored.`}) 
-    DefaultValue?: string;
+    @Field(() => Boolean, {description: `Auto-generate MJ Actions for discovered tools`}) 
+    AutoGenerateActions: boolean;
         
-    @Field({nullable: true, description: `Human-readable description explaining the purpose and usage of this parameter. This is typically generated by LLM analysis of the query context but can be manually edited. Good descriptions include: what the parameter filters or controls, valid value ranges or formats, business meaning, and any special considerations. This text is shown in UI to help users understand what value to provide.`}) 
-    Description?: string;
+    @Field(() => Boolean, {description: `Log all tool calls to execution log`}) 
+    LogToolCalls: boolean;
         
-    @Field({nullable: true, description: `A concrete example value demonstrating the proper format for this parameter. Generated by LLM based on the query context and validation filters. For example: "john@example.com" for an email parameter, "2024-01-15" for a date, or "["active","pending"]" for a status array. Sample values help users understand the expected format and can be used in API documentation.`}) 
-    SampleValue?: string;
+    @Field(() => Boolean, {description: `Include input parameters in logs`}) 
+    LogInputParameters: boolean;
         
-    @Field({nullable: true, description: `JSON array of Nunjucks filter definitions that validate and transform the parameter value. Each filter is an object with "name" and optional "args" properties. Filters are applied in order and can include: validation (required, email, min, max), transformation (trim, upper, lower), SQL safety (sqlsafe, sqljoin), and type conversion (number, date). Example: [{"name":"required"},{"name":"email"},{"name":"sqlsafe"}]. The filter chain ensures type safety and prevents SQL injection.`}) 
-    ValidationFilters?: string;
+    @Field(() => Boolean, {description: `Include output content in logs`}) 
+    LogOutputContent: boolean;
         
-    @Field({description: `Indicates how this parameter was identified and added to the system. "AI" means it was automatically detected by LLM analysis of the query template, including extraction of parameter name, type inference from filters, and generation of description. "Manual" means it was explicitly defined by a user. This helps track which parameters might need human review and provides transparency about the source of metadata.`}) 
-    @MaxLength(100)
-    DetectionMethod: string;
+    @Field(() => Int, {nullable: true, description: `Max output size to log in bytes (default: 100KB)`}) 
+    MaxOutputLogSize?: number;
         
-    @Field(() => Float, {nullable: true, description: `Confidence score (0.00-1.00) indicating how certain the AI was about this parameter detection. Only populated when DetectionMethod="AI". Higher scores indicate the LLM was more confident about the parameter name, type, and usage. Scores above 0.80 are generally reliable, 0.60-0.80 may benefit from human review, and below 0.60 should be manually verified. This helps prioritize which auto-detected parameters need human attention.`}) 
-    AutoDetectConfidenceScore?: number;
+    @Field({nullable: true}) 
+    @MaxLength(10)
+    LastConnectedAt?: Date;
+        
+    @Field({nullable: true}) 
+    LastErrorMessage?: string;
+        
+    @Field({nullable: true, description: `JSON object of environment variables for Stdio transport`}) 
+    EnvironmentVars?: string;
         
     @Field() 
     @MaxLength(10)
@@ -44530,99 +44541,152 @@ export class MJQueryParameter_ {
         
     @Field() 
     @MaxLength(510)
-    Query: string;
+    MCPServer: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(400)
+    Credential?: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(100)
+    Company?: string;
         
+    @Field(() => [MJMCPServerConnectionTool_])
+    MJ_MCPServerConnectionTools_MCPServerConnectionIDArray: MJMCPServerConnectionTool_[]; // Link to MJ_MCPServerConnectionTools
+    
+    @Field(() => [MJMCPToolExecutionLog_])
+    MJ_MCPToolExecutionLogs_MCPServerConnectionIDArray: MJMCPToolExecutionLog_[]; // Link to MJ_MCPToolExecutionLogs
+    
+    @Field(() => [MJMCPServerConnectionPermission_])
+    MJ_MCPServerConnectionPermissions_MCPServerConnectionIDArray: MJMCPServerConnectionPermission_[]; // Link to MJ_MCPServerConnectionPermissions
+    
 }
 
 //****************************************************************************
-// INPUT TYPE for MJ: Query Parameters
+// INPUT TYPE for MJ: MCP Server Connections
 //****************************************************************************
 @InputType()
-export class CreateMJQueryParameterInput {
+export class CreateMJMCPServerConnectionInput {
     @Field({ nullable: true })
     ID?: string;
 
     @Field({ nullable: true })
-    QueryID?: string;
+    MCPServerID?: string;
 
     @Field({ nullable: true })
     Name?: string;
 
     @Field({ nullable: true })
-    Type?: string;
+    Description: string | null;
 
-    @Field(() => Boolean, { nullable: true })
-    IsRequired?: boolean | null;
+    @Field({ nullable: true })
+    CredentialID: string | null;
 
     @Field({ nullable: true })
-    DefaultValue: string | null;
+    CustomHeaderName: string | null;
 
     @Field({ nullable: true })
-    Description: string | null;
+    CompanyID: string | null;
 
     @Field({ nullable: true })
-    SampleValue: string | null;
+    Status?: string;
+
+    @Field(() => Boolean, { nullable: true })
+    AutoSyncTools?: boolean;
+
+    @Field(() => Boolean, { nullable: true })
+    AutoGenerateActions?: boolean;
+
+    @Field(() => Boolean, { nullable: true })
+    LogToolCalls?: boolean;
+
+    @Field(() => Boolean, { nullable: true })
+    LogInputParameters?: boolean;
+
+    @Field(() => Boolean, { nullable: true })
+    LogOutputContent?: boolean;
+
+    @Field(() => Int, { nullable: true })
+    MaxOutputLogSize?: number | null;
 
     @Field({ nullable: true })
-    ValidationFilters: string | null;
+    LastConnectedAt: Date | null;
 
     @Field({ nullable: true })
-    DetectionMethod?: string;
+    LastErrorMessage: string | null;
 
-    @Field(() => Float, { nullable: true })
-    AutoDetectConfidenceScore: number | null;
+    @Field({ nullable: true })
+    EnvironmentVars: string | null;
 }
     
 
 //****************************************************************************
-// INPUT TYPE for MJ: Query Parameters
+// INPUT TYPE for MJ: MCP Server Connections
 //****************************************************************************
 @InputType()
-export class UpdateMJQueryParameterInput {
+export class UpdateMJMCPServerConnectionInput {
     @Field()
     ID: string;
 
     @Field({ nullable: true })
-    QueryID?: string;
+    MCPServerID?: string;
 
     @Field({ nullable: true })
     Name?: string;
 
     @Field({ nullable: true })
-    Type?: string;
+    Description?: string | null;
 
-    @Field(() => Boolean, { nullable: true })
-    IsRequired?: boolean | null;
+    @Field({ nullable: true })
+    CredentialID?: string | null;
 
     @Field({ nullable: true })
-    DefaultValue?: string | null;
+    CustomHeaderName?: string | null;
 
     @Field({ nullable: true })
-    Description?: string | null;
+    CompanyID?: string | null;
 
     @Field({ nullable: true })
-    SampleValue?: string | null;
+    Status?: string;
+
+    @Field(() => Boolean, { nullable: true })
+    AutoSyncTools?: boolean;
+
+    @Field(() => Boolean, { nullable: true })
+    AutoGenerateActions?: boolean;
+
+    @Field(() => Boolean, { nullable: true })
+    LogToolCalls?: boolean;
+
+    @Field(() => Boolean, { nullable: true })
+    LogInputParameters?: boolean;
+
+    @Field(() => Boolean, { nullable: true })
+    LogOutputContent?: boolean;
+
+    @Field(() => Int, { nullable: true })
+    MaxOutputLogSize?: number | null;
 
     @Field({ nullable: true })
-    ValidationFilters?: string | null;
+    LastConnectedAt?: Date | null;
 
     @Field({ nullable: true })
-    DetectionMethod?: string;
+    LastErrorMessage?: string | null;
 
-    @Field(() => Float, { nullable: true })
-    AutoDetectConfidenceScore?: number | null;
+    @Field({ nullable: true })
+    EnvironmentVars?: string | null;
 
     @Field(() => [KeyValuePairInput], { nullable: true })
     OldValues___?: KeyValuePairInput[];
 }
     
 //****************************************************************************
-// RESOLVER for MJ: Query Parameters
+// RESOLVER for MJ: MCP Server Connections
 //****************************************************************************
 @ObjectType()
-export class RunMJQueryParameterViewResult {
-    @Field(() => [MJQueryParameter_])
-    Results: MJQueryParameter_[];
+export class RunMJMCPServerConnectionViewResult {
+    @Field(() => [MJMCPServerConnection_])
+    Results: MJMCPServerConnection_[];
 
     @Field(() => String, {nullable: true})
     UserViewRunID?: string;
@@ -44643,100 +44707,151 @@ export class RunMJQueryParameterViewResult {
     Success: boolean;
 }
 
-@Resolver(MJQueryParameter_)
-export class MJQueryParameterResolver extends ResolverBase {
-    @Query(() => RunMJQueryParameterViewResult)
-    async RunMJQueryParameterViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+@Resolver(MJMCPServerConnection_)
+export class MJMCPServerConnectionResolver extends ResolverBase {
+    @Query(() => RunMJMCPServerConnectionViewResult)
+    async RunMJMCPServerConnectionViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
         return super.RunViewByIDGeneric(input, provider, userPayload, pubSub);
     }
 
-    @Query(() => RunMJQueryParameterViewResult)
-    async RunMJQueryParameterViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+    @Query(() => RunMJMCPServerConnectionViewResult)
+    async RunMJMCPServerConnectionViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
         return super.RunViewByNameGeneric(input, provider, userPayload, pubSub);
     }
 
-    @Query(() => RunMJQueryParameterViewResult)
-    async RunMJQueryParameterDynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+    @Query(() => RunMJMCPServerConnectionViewResult)
+    async RunMJMCPServerConnectionDynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
-        input.EntityName = 'MJ: Query Parameters';
+        input.EntityName = 'MJ: MCP Server Connections';
         return super.RunDynamicViewGeneric(input, provider, userPayload, pubSub);
     }
-    @Query(() => MJQueryParameter_, { nullable: true })
-    async MJQueryParameter(@Arg('ID', () => String) ID: string, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<MJQueryParameter_ | null> {
-        this.CheckUserReadPermissions('MJ: Query Parameters', userPayload);
+    @Query(() => MJMCPServerConnection_, { nullable: true })
+    async MJMCPServerConnection(@Arg('ID', () => String) ID: string, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<MJMCPServerConnection_ | null> {
+        this.CheckUserReadPermissions('MJ: MCP Server Connections', userPayload);
         const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
         const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
-        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwQueryParameters] WHERE [ID]='${ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: Query Parameters', userPayload, EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerConnections] WHERE [ID]='${ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Connections', userPayload, EntityPermissionType.Read, 'AND');
         const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
-        const result = await this.MapFieldNamesToCodeNames('MJ: Query Parameters', rows && rows.length > 0 ? rows[0] : {}, this.GetUserFromPayload(userPayload));
+        const result = await this.MapFieldNamesToCodeNames('MJ: MCP Server Connections', rows && rows.length > 0 ? rows[0] : {}, this.GetUserFromPayload(userPayload));
         return result;
     }
     
-    @Mutation(() => MJQueryParameter_)
-    async CreateMJQueryParameter(
-        @Arg('input', () => CreateMJQueryParameterInput) input: CreateMJQueryParameterInput,
+    @FieldResolver(() => [MJMCPServerConnectionTool_])
+    async MJ_MCPServerConnectionTools_MCPServerConnectionIDArray(@Root() mjmcpserverconnection_: MJMCPServerConnection_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Server Connection Tools', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerConnectionTools] WHERE [MCPServerConnectionID]='${mjmcpserverconnection_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Connection Tools', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Server Connection Tools', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
+    @FieldResolver(() => [MJMCPToolExecutionLog_])
+    async MJ_MCPToolExecutionLogs_MCPServerConnectionIDArray(@Root() mjmcpserverconnection_: MJMCPServerConnection_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Tool Execution Logs', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPToolExecutionLogs] WHERE [MCPServerConnectionID]='${mjmcpserverconnection_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Tool Execution Logs', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Tool Execution Logs', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
+    @FieldResolver(() => [MJMCPServerConnectionPermission_])
+    async MJ_MCPServerConnectionPermissions_MCPServerConnectionIDArray(@Root() mjmcpserverconnection_: MJMCPServerConnection_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Server Connection Permissions', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerConnectionPermissions] WHERE [MCPServerConnectionID]='${mjmcpserverconnection_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Connection Permissions', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Server Connection Permissions', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
+    @Mutation(() => MJMCPServerConnection_)
+    async CreateMJMCPServerConnection(
+        @Arg('input', () => CreateMJMCPServerConnectionInput) input: CreateMJMCPServerConnectionInput,
         @Ctx() { providers, userPayload }: AppContext,
         @PubSub() pubSub: PubSubEngine
     ) {
         const provider = GetReadWriteProvider(providers);
-        return this.CreateRecord('MJ: Query Parameters', input, provider, userPayload, pubSub)
+        return this.CreateRecord('MJ: MCP Server Connections', input, provider, userPayload, pubSub)
     }
         
-    @Mutation(() => MJQueryParameter_)
-    async UpdateMJQueryParameter(
-        @Arg('input', () => UpdateMJQueryParameterInput) input: UpdateMJQueryParameterInput,
+    @Mutation(() => MJMCPServerConnection_)
+    async UpdateMJMCPServerConnection(
+        @Arg('input', () => UpdateMJMCPServerConnectionInput) input: UpdateMJMCPServerConnectionInput,
         @Ctx() { providers, userPayload }: AppContext,
         @PubSub() pubSub: PubSubEngine
     ) {
         const provider = GetReadWriteProvider(providers);
-        return this.UpdateRecord('MJ: Query Parameters', input, provider, userPayload, pubSub);
+        return this.UpdateRecord('MJ: MCP Server Connections', input, provider, userPayload, pubSub);
     }
     
-    @Mutation(() => MJQueryParameter_)
-    async DeleteMJQueryParameter(@Arg('ID', () => String) ID: string, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+    @Mutation(() => MJMCPServerConnection_)
+    async DeleteMJMCPServerConnection(@Arg('ID', () => String) ID: string, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         const provider = GetReadWriteProvider(providers);
         const key = new CompositeKey([{FieldName: 'ID', Value: ID}]);
-        return this.DeleteRecord('MJ: Query Parameters', key, options, provider, userPayload, pubSub);
+        return this.DeleteRecord('MJ: MCP Server Connections', key, options, provider, userPayload, pubSub);
     }
     
 }
 
 //****************************************************************************
-// ENTITY CLASS for MJ: Record Links
+// ENTITY CLASS for MJ: MCP Server Tools
 //****************************************************************************
-@ObjectType({ description: `Generic linking table that can connect any two records in the system, providing a flexible relationship management system.` })
-export class MJRecordLink_ {
+@ObjectType()
+export class MJMCPServerTool_ {
     @Field() 
     @MaxLength(16)
     ID: string;
         
     @Field() 
     @MaxLength(16)
-    SourceEntityID: string;
+    MCPServerID: string;
         
-    @Field({description: `Primary key value(s) of the source record - scalar for simple PKs or JSON KeyValuePair array for composite PKs`}) 
-    @MaxLength(1000)
-    SourceRecordID: string;
+    @Field({description: `Tool identifier from the MCP server`}) 
+    @MaxLength(510)
+    ToolName: string;
         
-    @Field() 
-    @MaxLength(16)
-    TargetEntityID: string;
+    @Field({nullable: true, description: `Human-readable title for the tool`}) 
+    @MaxLength(510)
+    ToolTitle?: string;
         
-    @Field({description: `Primary key value(s) of the target record - scalar for simple PKs or JSON KeyValuePair array for composite PKs`}) 
-    @MaxLength(1000)
-    TargetRecordID: string;
+    @Field({nullable: true}) 
+    ToolDescription?: string;
         
-    @Field({nullable: true, description: `Application-specific relationship type describing how the records are related`}) 
+    @Field({description: `JSON Schema for tool input parameters`}) 
+    InputSchema: string;
+        
+    @Field({nullable: true, description: `JSON Schema for tool output (if provided)`}) 
+    OutputSchema?: string;
+        
+    @Field({nullable: true, description: `JSON with tool hints (readOnlyHint, destructiveHint, etc.)`}) 
+    Annotations?: string;
+        
+    @Field({description: `Tool status: Active, Inactive, or Deprecated`}) 
     @MaxLength(100)
-    LinkType?: string;
+    Status: string;
         
-    @Field(() => Int, {nullable: true, description: `Display sequence for ordering linked records in UI`}) 
-    Sequence?: number;
+    @Field() 
+    @MaxLength(10)
+    DiscoveredAt: Date;
         
-    @Field({nullable: true, description: `JSON field for storing additional link-specific metadata`}) 
-    Metadata?: string;
+    @Field() 
+    @MaxLength(10)
+    LastSeenAt: Date;
+        
+    @Field({nullable: true, description: `FK to auto-generated Action (if promoted)`}) 
+    @MaxLength(16)
+    GeneratedActionID?: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(16)
+    GeneratedActionCategoryID?: string;
         
     @Field() 
     @MaxLength(10)
@@ -44748,7 +44863,1536 @@ export class MJRecordLink_ {
         
     @Field() 
     @MaxLength(510)
-    SourceEntity: string;
+    MCPServer: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(850)
+    GeneratedAction?: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(510)
+    GeneratedActionCategory?: string;
+        
+    @Field(() => [MJMCPServerConnectionTool_])
+    MJ_MCPServerConnectionTools_MCPServerToolIDArray: MJMCPServerConnectionTool_[]; // Link to MJ_MCPServerConnectionTools
+    
+    @Field(() => [MJMCPToolExecutionLog_])
+    MJ_MCPToolExecutionLogs_MCPServerToolIDArray: MJMCPToolExecutionLog_[]; // Link to MJ_MCPToolExecutionLogs
+    
+}
+
+//****************************************************************************
+// INPUT TYPE for MJ: MCP Server Tools
+//****************************************************************************
+@InputType()
+export class CreateMJMCPServerToolInput {
+    @Field({ nullable: true })
+    ID?: string;
+
+    @Field({ nullable: true })
+    MCPServerID?: string;
+
+    @Field({ nullable: true })
+    ToolName?: string;
+
+    @Field({ nullable: true })
+    ToolTitle: string | null;
+
+    @Field({ nullable: true })
+    ToolDescription: string | null;
+
+    @Field({ nullable: true })
+    InputSchema?: string;
+
+    @Field({ nullable: true })
+    OutputSchema: string | null;
+
+    @Field({ nullable: true })
+    Annotations: string | null;
+
+    @Field({ nullable: true })
+    Status?: string;
+
+    @Field({ nullable: true })
+    DiscoveredAt?: Date;
+
+    @Field({ nullable: true })
+    LastSeenAt?: Date;
+
+    @Field({ nullable: true })
+    GeneratedActionID: string | null;
+
+    @Field({ nullable: true })
+    GeneratedActionCategoryID: string | null;
+}
+    
+
+//****************************************************************************
+// INPUT TYPE for MJ: MCP Server Tools
+//****************************************************************************
+@InputType()
+export class UpdateMJMCPServerToolInput {
+    @Field()
+    ID: string;
+
+    @Field({ nullable: true })
+    MCPServerID?: string;
+
+    @Field({ nullable: true })
+    ToolName?: string;
+
+    @Field({ nullable: true })
+    ToolTitle?: string | null;
+
+    @Field({ nullable: true })
+    ToolDescription?: string | null;
+
+    @Field({ nullable: true })
+    InputSchema?: string;
+
+    @Field({ nullable: true })
+    OutputSchema?: string | null;
+
+    @Field({ nullable: true })
+    Annotations?: string | null;
+
+    @Field({ nullable: true })
+    Status?: string;
+
+    @Field({ nullable: true })
+    DiscoveredAt?: Date;
+
+    @Field({ nullable: true })
+    LastSeenAt?: Date;
+
+    @Field({ nullable: true })
+    GeneratedActionID?: string | null;
+
+    @Field({ nullable: true })
+    GeneratedActionCategoryID?: string | null;
+
+    @Field(() => [KeyValuePairInput], { nullable: true })
+    OldValues___?: KeyValuePairInput[];
+}
+    
+//****************************************************************************
+// RESOLVER for MJ: MCP Server Tools
+//****************************************************************************
+@ObjectType()
+export class RunMJMCPServerToolViewResult {
+    @Field(() => [MJMCPServerTool_])
+    Results: MJMCPServerTool_[];
+
+    @Field(() => String, {nullable: true})
+    UserViewRunID?: string;
+
+    @Field(() => Int, {nullable: true})
+    RowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    TotalRowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    ExecutionTime: number;
+
+    @Field({nullable: true})
+    ErrorMessage?: string;
+
+    @Field(() => Boolean, {nullable: false})
+    Success: boolean;
+}
+
+@Resolver(MJMCPServerTool_)
+export class MJMCPServerToolResolver extends ResolverBase {
+    @Query(() => RunMJMCPServerToolViewResult)
+    async RunMJMCPServerToolViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        return super.RunViewByIDGeneric(input, provider, userPayload, pubSub);
+    }
+
+    @Query(() => RunMJMCPServerToolViewResult)
+    async RunMJMCPServerToolViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        return super.RunViewByNameGeneric(input, provider, userPayload, pubSub);
+    }
+
+    @Query(() => RunMJMCPServerToolViewResult)
+    async RunMJMCPServerToolDynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        input.EntityName = 'MJ: MCP Server Tools';
+        return super.RunDynamicViewGeneric(input, provider, userPayload, pubSub);
+    }
+    @Query(() => MJMCPServerTool_, { nullable: true })
+    async MJMCPServerTool(@Arg('ID', () => String) ID: string, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<MJMCPServerTool_ | null> {
+        this.CheckUserReadPermissions('MJ: MCP Server Tools', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerTools] WHERE [ID]='${ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Tools', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.MapFieldNamesToCodeNames('MJ: MCP Server Tools', rows && rows.length > 0 ? rows[0] : {}, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+    
+    @FieldResolver(() => [MJMCPServerConnectionTool_])
+    async MJ_MCPServerConnectionTools_MCPServerToolIDArray(@Root() mjmcpservertool_: MJMCPServerTool_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Server Connection Tools', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerConnectionTools] WHERE [MCPServerToolID]='${mjmcpservertool_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Connection Tools', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Server Connection Tools', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
+    @FieldResolver(() => [MJMCPToolExecutionLog_])
+    async MJ_MCPToolExecutionLogs_MCPServerToolIDArray(@Root() mjmcpservertool_: MJMCPServerTool_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Tool Execution Logs', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPToolExecutionLogs] WHERE [MCPServerToolID]='${mjmcpservertool_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Tool Execution Logs', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Tool Execution Logs', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
+    @Mutation(() => MJMCPServerTool_)
+    async CreateMJMCPServerTool(
+        @Arg('input', () => CreateMJMCPServerToolInput) input: CreateMJMCPServerToolInput,
+        @Ctx() { providers, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        const provider = GetReadWriteProvider(providers);
+        return this.CreateRecord('MJ: MCP Server Tools', input, provider, userPayload, pubSub)
+    }
+        
+    @Mutation(() => MJMCPServerTool_)
+    async UpdateMJMCPServerTool(
+        @Arg('input', () => UpdateMJMCPServerToolInput) input: UpdateMJMCPServerToolInput,
+        @Ctx() { providers, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        const provider = GetReadWriteProvider(providers);
+        return this.UpdateRecord('MJ: MCP Server Tools', input, provider, userPayload, pubSub);
+    }
+    
+    @Mutation(() => MJMCPServerTool_)
+    async DeleteMJMCPServerTool(@Arg('ID', () => String) ID: string, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadWriteProvider(providers);
+        const key = new CompositeKey([{FieldName: 'ID', Value: ID}]);
+        return this.DeleteRecord('MJ: MCP Server Tools', key, options, provider, userPayload, pubSub);
+    }
+    
+}
+
+//****************************************************************************
+// ENTITY CLASS for MJ: MCP Servers
+//****************************************************************************
+@ObjectType()
+export class MJMCPServer_ {
+    @Field() 
+    @MaxLength(16)
+    ID: string;
+        
+    @Field({description: `Unique display name for the MCP server`}) 
+    @MaxLength(510)
+    Name: string;
+        
+    @Field({nullable: true}) 
+    Description?: string;
+        
+    @Field({nullable: true, description: `Server endpoint URL for HTTP/SSE/WebSocket transports`}) 
+    @MaxLength(2000)
+    ServerURL?: string;
+        
+    @Field({nullable: true, description: `Executable path for Stdio transport`}) 
+    @MaxLength(1000)
+    Command?: string;
+        
+    @Field({nullable: true, description: `JSON array of command arguments for Stdio transport`}) 
+    CommandArgs?: string;
+        
+    @Field({description: `Transport type: StreamableHTTP, SSE, Stdio, or WebSocket`}) 
+    @MaxLength(100)
+    TransportType: string;
+        
+    @Field({description: `Default auth type: None, Bearer, APIKey, OAuth2, Basic, or Custom`}) 
+    @MaxLength(100)
+    DefaultAuthType: string;
+        
+    @Field({nullable: true, description: `Expected credential type for this server`}) 
+    @MaxLength(16)
+    CredentialTypeID?: string;
+        
+    @Field({description: `Server status: Active, Inactive, or Deprecated`}) 
+    @MaxLength(100)
+    Status: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(10)
+    LastSyncAt?: Date;
+        
+    @Field(() => Int, {nullable: true}) 
+    RateLimitPerMinute?: number;
+        
+    @Field(() => Int, {nullable: true}) 
+    RateLimitPerHour?: number;
+        
+    @Field(() => Int, {nullable: true}) 
+    ConnectionTimeoutMs?: number;
+        
+    @Field(() => Int, {nullable: true}) 
+    RequestTimeoutMs?: number;
+        
+    @Field({nullable: true}) 
+    @MaxLength(2000)
+    DocumentationURL?: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(200)
+    IconClass?: string;
+        
+    @Field() 
+    @MaxLength(10)
+    _mj__CreatedAt: Date;
+        
+    @Field() 
+    @MaxLength(10)
+    _mj__UpdatedAt: Date;
+        
+    @Field({nullable: true}) 
+    @MaxLength(200)
+    CredentialType?: string;
+        
+    @Field(() => [MJMCPServerConnection_])
+    MJ_MCPServerConnections_MCPServerIDArray: MJMCPServerConnection_[]; // Link to MJ_MCPServerConnections
+    
+    @Field(() => [MJMCPServerTool_])
+    MJ_MCPServerTools_MCPServerIDArray: MJMCPServerTool_[]; // Link to MJ_MCPServerTools
+    
+}
+
+//****************************************************************************
+// INPUT TYPE for MJ: MCP Servers
+//****************************************************************************
+@InputType()
+export class CreateMJMCPServerInput {
+    @Field({ nullable: true })
+    ID?: string;
+
+    @Field({ nullable: true })
+    Name?: string;
+
+    @Field({ nullable: true })
+    Description: string | null;
+
+    @Field({ nullable: true })
+    ServerURL: string | null;
+
+    @Field({ nullable: true })
+    Command: string | null;
+
+    @Field({ nullable: true })
+    CommandArgs: string | null;
+
+    @Field({ nullable: true })
+    TransportType?: string;
+
+    @Field({ nullable: true })
+    DefaultAuthType?: string;
+
+    @Field({ nullable: true })
+    CredentialTypeID: string | null;
+
+    @Field({ nullable: true })
+    Status?: string;
+
+    @Field({ nullable: true })
+    LastSyncAt: Date | null;
+
+    @Field(() => Int, { nullable: true })
+    RateLimitPerMinute: number | null;
+
+    @Field(() => Int, { nullable: true })
+    RateLimitPerHour: number | null;
+
+    @Field(() => Int, { nullable: true })
+    ConnectionTimeoutMs?: number | null;
+
+    @Field(() => Int, { nullable: true })
+    RequestTimeoutMs?: number | null;
+
+    @Field({ nullable: true })
+    DocumentationURL: string | null;
+
+    @Field({ nullable: true })
+    IconClass: string | null;
+}
+    
+
+//****************************************************************************
+// INPUT TYPE for MJ: MCP Servers
+//****************************************************************************
+@InputType()
+export class UpdateMJMCPServerInput {
+    @Field()
+    ID: string;
+
+    @Field({ nullable: true })
+    Name?: string;
+
+    @Field({ nullable: true })
+    Description?: string | null;
+
+    @Field({ nullable: true })
+    ServerURL?: string | null;
+
+    @Field({ nullable: true })
+    Command?: string | null;
+
+    @Field({ nullable: true })
+    CommandArgs?: string | null;
+
+    @Field({ nullable: true })
+    TransportType?: string;
+
+    @Field({ nullable: true })
+    DefaultAuthType?: string;
+
+    @Field({ nullable: true })
+    CredentialTypeID?: string | null;
+
+    @Field({ nullable: true })
+    Status?: string;
+
+    @Field({ nullable: true })
+    LastSyncAt?: Date | null;
+
+    @Field(() => Int, { nullable: true })
+    RateLimitPerMinute?: number | null;
+
+    @Field(() => Int, { nullable: true })
+    RateLimitPerHour?: number | null;
+
+    @Field(() => Int, { nullable: true })
+    ConnectionTimeoutMs?: number | null;
+
+    @Field(() => Int, { nullable: true })
+    RequestTimeoutMs?: number | null;
+
+    @Field({ nullable: true })
+    DocumentationURL?: string | null;
+
+    @Field({ nullable: true })
+    IconClass?: string | null;
+
+    @Field(() => [KeyValuePairInput], { nullable: true })
+    OldValues___?: KeyValuePairInput[];
+}
+    
+//****************************************************************************
+// RESOLVER for MJ: MCP Servers
+//****************************************************************************
+@ObjectType()
+export class RunMJMCPServerViewResult {
+    @Field(() => [MJMCPServer_])
+    Results: MJMCPServer_[];
+
+    @Field(() => String, {nullable: true})
+    UserViewRunID?: string;
+
+    @Field(() => Int, {nullable: true})
+    RowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    TotalRowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    ExecutionTime: number;
+
+    @Field({nullable: true})
+    ErrorMessage?: string;
+
+    @Field(() => Boolean, {nullable: false})
+    Success: boolean;
+}
+
+@Resolver(MJMCPServer_)
+export class MJMCPServerResolver extends ResolverBase {
+    @Query(() => RunMJMCPServerViewResult)
+    async RunMJMCPServerViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        return super.RunViewByIDGeneric(input, provider, userPayload, pubSub);
+    }
+
+    @Query(() => RunMJMCPServerViewResult)
+    async RunMJMCPServerViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        return super.RunViewByNameGeneric(input, provider, userPayload, pubSub);
+    }
+
+    @Query(() => RunMJMCPServerViewResult)
+    async RunMJMCPServerDynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        input.EntityName = 'MJ: MCP Servers';
+        return super.RunDynamicViewGeneric(input, provider, userPayload, pubSub);
+    }
+    @Query(() => MJMCPServer_, { nullable: true })
+    async MJMCPServer(@Arg('ID', () => String) ID: string, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<MJMCPServer_ | null> {
+        this.CheckUserReadPermissions('MJ: MCP Servers', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServers] WHERE [ID]='${ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Servers', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.MapFieldNamesToCodeNames('MJ: MCP Servers', rows && rows.length > 0 ? rows[0] : {}, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+    
+    @FieldResolver(() => [MJMCPServerConnection_])
+    async MJ_MCPServerConnections_MCPServerIDArray(@Root() mjmcpserver_: MJMCPServer_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Server Connections', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerConnections] WHERE [MCPServerID]='${mjmcpserver_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Connections', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Server Connections', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
+    @FieldResolver(() => [MJMCPServerTool_])
+    async MJ_MCPServerTools_MCPServerIDArray(@Root() mjmcpserver_: MJMCPServer_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Server Tools', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerTools] WHERE [MCPServerID]='${mjmcpserver_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Tools', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Server Tools', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
+    @Mutation(() => MJMCPServer_)
+    async CreateMJMCPServer(
+        @Arg('input', () => CreateMJMCPServerInput) input: CreateMJMCPServerInput,
+        @Ctx() { providers, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        const provider = GetReadWriteProvider(providers);
+        return this.CreateRecord('MJ: MCP Servers', input, provider, userPayload, pubSub)
+    }
+        
+    @Mutation(() => MJMCPServer_)
+    async UpdateMJMCPServer(
+        @Arg('input', () => UpdateMJMCPServerInput) input: UpdateMJMCPServerInput,
+        @Ctx() { providers, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        const provider = GetReadWriteProvider(providers);
+        return this.UpdateRecord('MJ: MCP Servers', input, provider, userPayload, pubSub);
+    }
+    
+    @Mutation(() => MJMCPServer_)
+    async DeleteMJMCPServer(@Arg('ID', () => String) ID: string, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadWriteProvider(providers);
+        const key = new CompositeKey([{FieldName: 'ID', Value: ID}]);
+        return this.DeleteRecord('MJ: MCP Servers', key, options, provider, userPayload, pubSub);
+    }
+    
+}
+
+//****************************************************************************
+// ENTITY CLASS for MJ: MCP Tool Execution Logs
+//****************************************************************************
+@ObjectType()
+export class MJMCPToolExecutionLog_ {
+    @Field() 
+    @MaxLength(16)
+    ID: string;
+        
+    @Field() 
+    @MaxLength(16)
+    MCPServerConnectionID: string;
+        
+    @Field({nullable: true, description: `FK to MCP Server Tool (null if tool not cached)`}) 
+    @MaxLength(16)
+    MCPServerToolID?: string;
+        
+    @Field({description: `Tool name (stored directly for resilience)`}) 
+    @MaxLength(510)
+    ToolName: string;
+        
+    @Field({description: `FK to User who initiated the call`}) 
+    @MaxLength(16)
+    UserID: string;
+        
+    @Field() 
+    @MaxLength(10)
+    StartedAt: Date;
+        
+    @Field({nullable: true}) 
+    @MaxLength(10)
+    EndedAt?: Date;
+        
+    @Field(() => Int, {nullable: true, description: `Execution duration in milliseconds`}) 
+    DurationMs?: number;
+        
+    @Field(() => Boolean) 
+    Success: boolean;
+        
+    @Field({nullable: true}) 
+    ErrorMessage?: string;
+        
+    @Field({nullable: true, description: `JSON of input parameters (if logging enabled)`}) 
+    InputParameters?: string;
+        
+    @Field({nullable: true, description: `JSON of output content (if logging enabled)`}) 
+    OutputContent?: string;
+        
+    @Field(() => Boolean, {description: `Whether output was truncated due to size`}) 
+    OutputTruncated: boolean;
+        
+    @Field() 
+    @MaxLength(10)
+    _mj__CreatedAt: Date;
+        
+    @Field() 
+    @MaxLength(10)
+    _mj__UpdatedAt: Date;
+        
+    @Field() 
+    @MaxLength(510)
+    MCPServerConnection: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(510)
+    MCPServerTool?: string;
+        
+    @Field() 
+    @MaxLength(200)
+    User: string;
+        
+}
+
+//****************************************************************************
+// INPUT TYPE for MJ: MCP Tool Execution Logs
+//****************************************************************************
+@InputType()
+export class CreateMJMCPToolExecutionLogInput {
+    @Field({ nullable: true })
+    ID?: string;
+
+    @Field({ nullable: true })
+    MCPServerConnectionID?: string;
+
+    @Field({ nullable: true })
+    MCPServerToolID: string | null;
+
+    @Field({ nullable: true })
+    ToolName?: string;
+
+    @Field({ nullable: true })
+    UserID?: string;
+
+    @Field({ nullable: true })
+    StartedAt?: Date;
+
+    @Field({ nullable: true })
+    EndedAt: Date | null;
+
+    @Field(() => Int, { nullable: true })
+    DurationMs: number | null;
+
+    @Field(() => Boolean, { nullable: true })
+    Success?: boolean;
+
+    @Field({ nullable: true })
+    ErrorMessage: string | null;
+
+    @Field({ nullable: true })
+    InputParameters: string | null;
+
+    @Field({ nullable: true })
+    OutputContent: string | null;
+
+    @Field(() => Boolean, { nullable: true })
+    OutputTruncated?: boolean;
+}
+    
+
+//****************************************************************************
+// INPUT TYPE for MJ: MCP Tool Execution Logs
+//****************************************************************************
+@InputType()
+export class UpdateMJMCPToolExecutionLogInput {
+    @Field()
+    ID: string;
+
+    @Field({ nullable: true })
+    MCPServerConnectionID?: string;
+
+    @Field({ nullable: true })
+    MCPServerToolID?: string | null;
+
+    @Field({ nullable: true })
+    ToolName?: string;
+
+    @Field({ nullable: true })
+    UserID?: string;
+
+    @Field({ nullable: true })
+    StartedAt?: Date;
+
+    @Field({ nullable: true })
+    EndedAt?: Date | null;
+
+    @Field(() => Int, { nullable: true })
+    DurationMs?: number | null;
+
+    @Field(() => Boolean, { nullable: true })
+    Success?: boolean;
+
+    @Field({ nullable: true })
+    ErrorMessage?: string | null;
+
+    @Field({ nullable: true })
+    InputParameters?: string | null;
+
+    @Field({ nullable: true })
+    OutputContent?: string | null;
+
+    @Field(() => Boolean, { nullable: true })
+    OutputTruncated?: boolean;
+
+    @Field(() => [KeyValuePairInput], { nullable: true })
+    OldValues___?: KeyValuePairInput[];
+}
+    
+//****************************************************************************
+// RESOLVER for MJ: MCP Tool Execution Logs
+//****************************************************************************
+@ObjectType()
+export class RunMJMCPToolExecutionLogViewResult {
+    @Field(() => [MJMCPToolExecutionLog_])
+    Results: MJMCPToolExecutionLog_[];
+
+    @Field(() => String, {nullable: true})
+    UserViewRunID?: string;
+
+    @Field(() => Int, {nullable: true})
+    RowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    TotalRowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    ExecutionTime: number;
+
+    @Field({nullable: true})
+    ErrorMessage?: string;
+
+    @Field(() => Boolean, {nullable: false})
+    Success: boolean;
+}
+
+@Resolver(MJMCPToolExecutionLog_)
+export class MJMCPToolExecutionLogResolver extends ResolverBase {
+    @Query(() => RunMJMCPToolExecutionLogViewResult)
+    async RunMJMCPToolExecutionLogViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        return super.RunViewByIDGeneric(input, provider, userPayload, pubSub);
+    }
+
+    @Query(() => RunMJMCPToolExecutionLogViewResult)
+    async RunMJMCPToolExecutionLogViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        return super.RunViewByNameGeneric(input, provider, userPayload, pubSub);
+    }
+
+    @Query(() => RunMJMCPToolExecutionLogViewResult)
+    async RunMJMCPToolExecutionLogDynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        input.EntityName = 'MJ: MCP Tool Execution Logs';
+        return super.RunDynamicViewGeneric(input, provider, userPayload, pubSub);
+    }
+    @Query(() => MJMCPToolExecutionLog_, { nullable: true })
+    async MJMCPToolExecutionLog(@Arg('ID', () => String) ID: string, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<MJMCPToolExecutionLog_ | null> {
+        this.CheckUserReadPermissions('MJ: MCP Tool Execution Logs', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPToolExecutionLogs] WHERE [ID]='${ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Tool Execution Logs', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.MapFieldNamesToCodeNames('MJ: MCP Tool Execution Logs', rows && rows.length > 0 ? rows[0] : {}, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+    
+    @Mutation(() => MJMCPToolExecutionLog_)
+    async CreateMJMCPToolExecutionLog(
+        @Arg('input', () => CreateMJMCPToolExecutionLogInput) input: CreateMJMCPToolExecutionLogInput,
+        @Ctx() { providers, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        const provider = GetReadWriteProvider(providers);
+        return this.CreateRecord('MJ: MCP Tool Execution Logs', input, provider, userPayload, pubSub)
+    }
+        
+    @Mutation(() => MJMCPToolExecutionLog_)
+    async UpdateMJMCPToolExecutionLog(
+        @Arg('input', () => UpdateMJMCPToolExecutionLogInput) input: UpdateMJMCPToolExecutionLogInput,
+        @Ctx() { providers, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        const provider = GetReadWriteProvider(providers);
+        return this.UpdateRecord('MJ: MCP Tool Execution Logs', input, provider, userPayload, pubSub);
+    }
+    
+    @Mutation(() => MJMCPToolExecutionLog_)
+    async DeleteMJMCPToolExecutionLog(@Arg('ID', () => String) ID: string, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadWriteProvider(providers);
+        const key = new CompositeKey([{FieldName: 'ID', Value: ID}]);
+        return this.DeleteRecord('MJ: MCP Tool Execution Logs', key, options, provider, userPayload, pubSub);
+    }
+    
+}
+
+//****************************************************************************
+// ENTITY CLASS for MJ: Projects
+//****************************************************************************
+@ObjectType({ description: `Container for grouping related conversations around a common topic, client, or initiative. Supports nesting for sub-projects.` })
+export class MJProject_ {
+    @Field() 
+    @MaxLength(16)
+    ID: string;
+        
+    @Field() 
+    @MaxLength(16)
+    EnvironmentID: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(16)
+    ParentID?: string;
+        
+    @Field({description: `Display name for the project`}) 
+    @MaxLength(510)
+    Name: string;
+        
+    @Field({nullable: true, description: `Detailed description of the project goals and scope`}) 
+    Description?: string;
+        
+    @Field({nullable: true, description: `Hex color code for project badges in UI (#RRGGBB format)`}) 
+    @MaxLength(14)
+    Color?: string;
+        
+    @Field({nullable: true, description: `Font Awesome icon class for UI display`}) 
+    @MaxLength(100)
+    Icon?: string;
+        
+    @Field(() => Boolean, {description: `Indicates if this project is archived and should be hidden from active lists`}) 
+    IsArchived: boolean;
+        
+    @Field() 
+    @MaxLength(10)
+    _mj__CreatedAt: Date;
+        
+    @Field() 
+    @MaxLength(10)
+    _mj__UpdatedAt: Date;
+        
+    @Field() 
+    @MaxLength(510)
+    Environment: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(510)
+    Parent?: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(16)
+    RootParentID?: string;
+        
+    @Field(() => [MJProject_])
+    MJ_Projects_ParentIDArray: MJProject_[]; // Link to MJ_Projects
+    
+    @Field(() => [MJConversation_])
+    Conversations_ProjectIDArray: MJConversation_[]; // Link to Conversations
+    
+    @Field(() => [MJTask_])
+    MJ_Tasks_ProjectIDArray: MJTask_[]; // Link to MJ_Tasks
+    
+}
+
+//****************************************************************************
+// INPUT TYPE for MJ: Projects
+//****************************************************************************
+@InputType()
+export class CreateMJProjectInput {
+    @Field({ nullable: true })
+    ID?: string;
+
+    @Field({ nullable: true })
+    EnvironmentID?: string;
+
+    @Field({ nullable: true })
+    ParentID: string | null;
+
+    @Field({ nullable: true })
+    Name?: string;
+
+    @Field({ nullable: true })
+    Description: string | null;
+
+    @Field({ nullable: true })
+    Color: string | null;
+
+    @Field({ nullable: true })
+    Icon: string | null;
+
+    @Field(() => Boolean, { nullable: true })
+    IsArchived?: boolean;
+}
+    
+
+//****************************************************************************
+// INPUT TYPE for MJ: Projects
+//****************************************************************************
+@InputType()
+export class UpdateMJProjectInput {
+    @Field()
+    ID: string;
+
+    @Field({ nullable: true })
+    EnvironmentID?: string;
+
+    @Field({ nullable: true })
+    ParentID?: string | null;
+
+    @Field({ nullable: true })
+    Name?: string;
+
+    @Field({ nullable: true })
+    Description?: string | null;
+
+    @Field({ nullable: true })
+    Color?: string | null;
+
+    @Field({ nullable: true })
+    Icon?: string | null;
+
+    @Field(() => Boolean, { nullable: true })
+    IsArchived?: boolean;
+
+    @Field(() => [KeyValuePairInput], { nullable: true })
+    OldValues___?: KeyValuePairInput[];
+}
+    
+//****************************************************************************
+// RESOLVER for MJ: Projects
+//****************************************************************************
+@ObjectType()
+export class RunMJProjectViewResult {
+    @Field(() => [MJProject_])
+    Results: MJProject_[];
+
+    @Field(() => String, {nullable: true})
+    UserViewRunID?: string;
+
+    @Field(() => Int, {nullable: true})
+    RowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    TotalRowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    ExecutionTime: number;
+
+    @Field({nullable: true})
+    ErrorMessage?: string;
+
+    @Field(() => Boolean, {nullable: false})
+    Success: boolean;
+}
+
+@Resolver(MJProject_)
+export class MJProjectResolver extends ResolverBase {
+    @Query(() => RunMJProjectViewResult)
+    async RunMJProjectViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        return super.RunViewByIDGeneric(input, provider, userPayload, pubSub);
+    }
+
+    @Query(() => RunMJProjectViewResult)
+    async RunMJProjectViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        return super.RunViewByNameGeneric(input, provider, userPayload, pubSub);
+    }
+
+    @Query(() => RunMJProjectViewResult)
+    async RunMJProjectDynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        input.EntityName = 'MJ: Projects';
+        return super.RunDynamicViewGeneric(input, provider, userPayload, pubSub);
+    }
+    @Query(() => MJProject_, { nullable: true })
+    async MJProject(@Arg('ID', () => String) ID: string, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<MJProject_ | null> {
+        this.CheckUserReadPermissions('MJ: Projects', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwProjects] WHERE [ID]='${ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: Projects', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.MapFieldNamesToCodeNames('MJ: Projects', rows && rows.length > 0 ? rows[0] : {}, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+    
+    @FieldResolver(() => [MJProject_])
+    async MJ_Projects_ParentIDArray(@Root() mjproject_: MJProject_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: Projects', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwProjects] WHERE [ParentID]='${mjproject_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: Projects', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: Projects', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
+    @FieldResolver(() => [MJConversation_])
+    async Conversations_ProjectIDArray(@Root() mjproject_: MJProject_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('Conversations', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwConversations] WHERE [ProjectID]='${mjproject_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'Conversations', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('Conversations', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
+    @FieldResolver(() => [MJTask_])
+    async MJ_Tasks_ProjectIDArray(@Root() mjproject_: MJProject_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: Tasks', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwTasks] WHERE [ProjectID]='${mjproject_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: Tasks', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: Tasks', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
+    @Mutation(() => MJProject_)
+    async CreateMJProject(
+        @Arg('input', () => CreateMJProjectInput) input: CreateMJProjectInput,
+        @Ctx() { providers, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        const provider = GetReadWriteProvider(providers);
+        return this.CreateRecord('MJ: Projects', input, provider, userPayload, pubSub)
+    }
+        
+    @Mutation(() => MJProject_)
+    async UpdateMJProject(
+        @Arg('input', () => UpdateMJProjectInput) input: UpdateMJProjectInput,
+        @Ctx() { providers, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        const provider = GetReadWriteProvider(providers);
+        return this.UpdateRecord('MJ: Projects', input, provider, userPayload, pubSub);
+    }
+    
+    @Mutation(() => MJProject_)
+    async DeleteMJProject(@Arg('ID', () => String) ID: string, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadWriteProvider(providers);
+        const key = new CompositeKey([{FieldName: 'ID', Value: ID}]);
+        return this.DeleteRecord('MJ: Projects', key, options, provider, userPayload, pubSub);
+    }
+    
+}
+
+//****************************************************************************
+// ENTITY CLASS for MJ: Public Links
+//****************************************************************************
+@ObjectType({ description: `Shareable links for external access to artifacts and other resources. Supports password protection and expiration.` })
+export class MJPublicLink_ {
+    @Field() 
+    @MaxLength(16)
+    ID: string;
+        
+    @Field({description: `Type of resource being shared (Artifact, Conversation, Collection)`}) 
+    @MaxLength(100)
+    ResourceType: string;
+        
+    @Field() 
+    @MaxLength(16)
+    ResourceID: string;
+        
+    @Field({description: `Unique token for accessing the shared resource via URL`}) 
+    @MaxLength(510)
+    Token: string;
+        
+    @Field({nullable: true, description: `SHA256 hash of optional password for additional security`}) 
+    @MaxLength(510)
+    PasswordHash?: string;
+        
+    @Field({nullable: true, description: `Optional expiration date/time for this public link`}) 
+    @MaxLength(10)
+    ExpiresAt?: Date;
+        
+    @Field(() => Int, {nullable: true, description: `Maximum number of times this link can be viewed`}) 
+    MaxViews?: number;
+        
+    @Field(() => Int, {description: `Current count of how many times this link has been viewed`}) 
+    CurrentViews: number;
+        
+    @Field() 
+    @MaxLength(16)
+    UserID: string;
+        
+    @Field(() => Boolean, {description: `Indicates if this link is currently active and accessible`}) 
+    IsActive: boolean;
+        
+    @Field() 
+    @MaxLength(10)
+    _mj__CreatedAt: Date;
+        
+    @Field() 
+    @MaxLength(10)
+    _mj__UpdatedAt: Date;
+        
+    @Field() 
+    @MaxLength(200)
+    User: string;
+        
+}
+
+//****************************************************************************
+// INPUT TYPE for MJ: Public Links
+//****************************************************************************
+@InputType()
+export class CreateMJPublicLinkInput {
+    @Field({ nullable: true })
+    ID?: string;
+
+    @Field({ nullable: true })
+    ResourceType?: string;
+
+    @Field({ nullable: true })
+    ResourceID?: string;
+
+    @Field({ nullable: true })
+    Token?: string;
+
+    @Field({ nullable: true })
+    PasswordHash: string | null;
+
+    @Field({ nullable: true })
+    ExpiresAt: Date | null;
+
+    @Field(() => Int, { nullable: true })
+    MaxViews: number | null;
+
+    @Field(() => Int, { nullable: true })
+    CurrentViews?: number;
+
+    @Field({ nullable: true })
+    UserID?: string;
+
+    @Field(() => Boolean, { nullable: true })
+    IsActive?: boolean;
+}
+    
+
+//****************************************************************************
+// INPUT TYPE for MJ: Public Links
+//****************************************************************************
+@InputType()
+export class UpdateMJPublicLinkInput {
+    @Field()
+    ID: string;
+
+    @Field({ nullable: true })
+    ResourceType?: string;
+
+    @Field({ nullable: true })
+    ResourceID?: string;
+
+    @Field({ nullable: true })
+    Token?: string;
+
+    @Field({ nullable: true })
+    PasswordHash?: string | null;
+
+    @Field({ nullable: true })
+    ExpiresAt?: Date | null;
+
+    @Field(() => Int, { nullable: true })
+    MaxViews?: number | null;
+
+    @Field(() => Int, { nullable: true })
+    CurrentViews?: number;
+
+    @Field({ nullable: true })
+    UserID?: string;
+
+    @Field(() => Boolean, { nullable: true })
+    IsActive?: boolean;
+
+    @Field(() => [KeyValuePairInput], { nullable: true })
+    OldValues___?: KeyValuePairInput[];
+}
+    
+//****************************************************************************
+// RESOLVER for MJ: Public Links
+//****************************************************************************
+@ObjectType()
+export class RunMJPublicLinkViewResult {
+    @Field(() => [MJPublicLink_])
+    Results: MJPublicLink_[];
+
+    @Field(() => String, {nullable: true})
+    UserViewRunID?: string;
+
+    @Field(() => Int, {nullable: true})
+    RowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    TotalRowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    ExecutionTime: number;
+
+    @Field({nullable: true})
+    ErrorMessage?: string;
+
+    @Field(() => Boolean, {nullable: false})
+    Success: boolean;
+}
+
+@Resolver(MJPublicLink_)
+export class MJPublicLinkResolver extends ResolverBase {
+    @Query(() => RunMJPublicLinkViewResult)
+    async RunMJPublicLinkViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        return super.RunViewByIDGeneric(input, provider, userPayload, pubSub);
+    }
+
+    @Query(() => RunMJPublicLinkViewResult)
+    async RunMJPublicLinkViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        return super.RunViewByNameGeneric(input, provider, userPayload, pubSub);
+    }
+
+    @Query(() => RunMJPublicLinkViewResult)
+    async RunMJPublicLinkDynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        input.EntityName = 'MJ: Public Links';
+        return super.RunDynamicViewGeneric(input, provider, userPayload, pubSub);
+    }
+    @Query(() => MJPublicLink_, { nullable: true })
+    async MJPublicLink(@Arg('ID', () => String) ID: string, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<MJPublicLink_ | null> {
+        this.CheckUserReadPermissions('MJ: Public Links', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwPublicLinks] WHERE [ID]='${ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: Public Links', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.MapFieldNamesToCodeNames('MJ: Public Links', rows && rows.length > 0 ? rows[0] : {}, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+    
+    @Mutation(() => MJPublicLink_)
+    async CreateMJPublicLink(
+        @Arg('input', () => CreateMJPublicLinkInput) input: CreateMJPublicLinkInput,
+        @Ctx() { providers, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        const provider = GetReadWriteProvider(providers);
+        return this.CreateRecord('MJ: Public Links', input, provider, userPayload, pubSub)
+    }
+        
+    @Mutation(() => MJPublicLink_)
+    async UpdateMJPublicLink(
+        @Arg('input', () => UpdateMJPublicLinkInput) input: UpdateMJPublicLinkInput,
+        @Ctx() { providers, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        const provider = GetReadWriteProvider(providers);
+        return this.UpdateRecord('MJ: Public Links', input, provider, userPayload, pubSub);
+    }
+    
+    @Mutation(() => MJPublicLink_)
+    async DeleteMJPublicLink(@Arg('ID', () => String) ID: string, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadWriteProvider(providers);
+        const key = new CompositeKey([{FieldName: 'ID', Value: ID}]);
+        return this.DeleteRecord('MJ: Public Links', key, options, provider, userPayload, pubSub);
+    }
+    
+}
+
+//****************************************************************************
+// ENTITY CLASS for MJ: Query Parameters
+//****************************************************************************
+@ObjectType({ description: `Stores parameter definitions for parameterized queries that use Nunjucks templates. Each parameter represents a dynamic value that can be passed when executing the query. Parameters are automatically extracted from the query template by the QueryEntityServer using LLM analysis, or can be manually defined. The combination of parameter metadata and validation filters creates a self-documenting, type-safe query execution system.` })
+export class MJQueryParameter_ {
+    @Field() 
+    @MaxLength(16)
+    ID: string;
+        
+    @Field() 
+    @MaxLength(16)
+    QueryID: string;
+        
+    @Field({description: `The name of the parameter as it appears in the Nunjucks template. This must match exactly with the parameter reference in the SQL template. For example, if the template contains {{ userEmail | required | email }}, the Name would be "userEmail". Parameter names should follow JavaScript identifier rules: start with a letter, and contain only letters, numbers, and underscores.`}) 
+    @MaxLength(510)
+    Name: string;
+        
+    @Field({description: `The data type of the parameter used for validation and type conversion. Valid values are: "string" for text values, "number" for integers or decimals, "date" for date/datetime values (ISO 8601 format expected), "boolean" for true/false values, and "array" for multiple values (typically used with IN clauses). The type determines which validation filters can be applied and how the parameter is processed.`}) 
+    @MaxLength(100)
+    Type: string;
+        
+    @Field(() => Boolean, {nullable: true, description: `Indicates whether this parameter must be provided when executing the query. When true, the query execution will fail if the parameter is not supplied and no DefaultValue is set. This is automatically determined by the presence of the "required" filter in the template, but can be manually overridden. Required parameters ensure data integrity and prevent unintended query behavior.`}) 
+    IsRequired?: boolean;
+        
+    @Field({nullable: true, description: `The default value to use when the parameter is not provided during query execution. This value must be compatible with the parameter Type. For arrays, use JSON format like ["value1","value2"]. Default values allow queries to have sensible fallbacks while still accepting custom inputs. If a parameter is required (IsRequired=true), the default value is ignored.`}) 
+    DefaultValue?: string;
+        
+    @Field({nullable: true, description: `Human-readable description explaining the purpose and usage of this parameter. This is typically generated by LLM analysis of the query context but can be manually edited. Good descriptions include: what the parameter filters or controls, valid value ranges or formats, business meaning, and any special considerations. This text is shown in UI to help users understand what value to provide.`}) 
+    Description?: string;
+        
+    @Field({nullable: true, description: `A concrete example value demonstrating the proper format for this parameter. Generated by LLM based on the query context and validation filters. For example: "john@example.com" for an email parameter, "2024-01-15" for a date, or "["active","pending"]" for a status array. Sample values help users understand the expected format and can be used in API documentation.`}) 
+    SampleValue?: string;
+        
+    @Field({nullable: true, description: `JSON array of Nunjucks filter definitions that validate and transform the parameter value. Each filter is an object with "name" and optional "args" properties. Filters are applied in order and can include: validation (required, email, min, max), transformation (trim, upper, lower), SQL safety (sqlsafe, sqljoin), and type conversion (number, date). Example: [{"name":"required"},{"name":"email"},{"name":"sqlsafe"}]. The filter chain ensures type safety and prevents SQL injection.`}) 
+    ValidationFilters?: string;
+        
+    @Field({description: `Indicates how this parameter was identified and added to the system. "AI" means it was automatically detected by LLM analysis of the query template, including extraction of parameter name, type inference from filters, and generation of description. "Manual" means it was explicitly defined by a user. This helps track which parameters might need human review and provides transparency about the source of metadata.`}) 
+    @MaxLength(100)
+    DetectionMethod: string;
+        
+    @Field(() => Float, {nullable: true, description: `Confidence score (0.00-1.00) indicating how certain the AI was about this parameter detection. Only populated when DetectionMethod="AI". Higher scores indicate the LLM was more confident about the parameter name, type, and usage. Scores above 0.80 are generally reliable, 0.60-0.80 may benefit from human review, and below 0.60 should be manually verified. This helps prioritize which auto-detected parameters need human attention.`}) 
+    AutoDetectConfidenceScore?: number;
+        
+    @Field() 
+    @MaxLength(10)
+    _mj__CreatedAt: Date;
+        
+    @Field() 
+    @MaxLength(10)
+    _mj__UpdatedAt: Date;
+        
+    @Field() 
+    @MaxLength(510)
+    Query: string;
+        
+}
+
+//****************************************************************************
+// INPUT TYPE for MJ: Query Parameters
+//****************************************************************************
+@InputType()
+export class CreateMJQueryParameterInput {
+    @Field({ nullable: true })
+    ID?: string;
+
+    @Field({ nullable: true })
+    QueryID?: string;
+
+    @Field({ nullable: true })
+    Name?: string;
+
+    @Field({ nullable: true })
+    Type?: string;
+
+    @Field(() => Boolean, { nullable: true })
+    IsRequired?: boolean | null;
+
+    @Field({ nullable: true })
+    DefaultValue: string | null;
+
+    @Field({ nullable: true })
+    Description: string | null;
+
+    @Field({ nullable: true })
+    SampleValue: string | null;
+
+    @Field({ nullable: true })
+    ValidationFilters: string | null;
+
+    @Field({ nullable: true })
+    DetectionMethod?: string;
+
+    @Field(() => Float, { nullable: true })
+    AutoDetectConfidenceScore: number | null;
+}
+    
+
+//****************************************************************************
+// INPUT TYPE for MJ: Query Parameters
+//****************************************************************************
+@InputType()
+export class UpdateMJQueryParameterInput {
+    @Field()
+    ID: string;
+
+    @Field({ nullable: true })
+    QueryID?: string;
+
+    @Field({ nullable: true })
+    Name?: string;
+
+    @Field({ nullable: true })
+    Type?: string;
+
+    @Field(() => Boolean, { nullable: true })
+    IsRequired?: boolean | null;
+
+    @Field({ nullable: true })
+    DefaultValue?: string | null;
+
+    @Field({ nullable: true })
+    Description?: string | null;
+
+    @Field({ nullable: true })
+    SampleValue?: string | null;
+
+    @Field({ nullable: true })
+    ValidationFilters?: string | null;
+
+    @Field({ nullable: true })
+    DetectionMethod?: string;
+
+    @Field(() => Float, { nullable: true })
+    AutoDetectConfidenceScore?: number | null;
+
+    @Field(() => [KeyValuePairInput], { nullable: true })
+    OldValues___?: KeyValuePairInput[];
+}
+    
+//****************************************************************************
+// RESOLVER for MJ: Query Parameters
+//****************************************************************************
+@ObjectType()
+export class RunMJQueryParameterViewResult {
+    @Field(() => [MJQueryParameter_])
+    Results: MJQueryParameter_[];
+
+    @Field(() => String, {nullable: true})
+    UserViewRunID?: string;
+
+    @Field(() => Int, {nullable: true})
+    RowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    TotalRowCount: number;
+
+    @Field(() => Int, {nullable: true})
+    ExecutionTime: number;
+
+    @Field({nullable: true})
+    ErrorMessage?: string;
+
+    @Field(() => Boolean, {nullable: false})
+    Success: boolean;
+}
+
+@Resolver(MJQueryParameter_)
+export class MJQueryParameterResolver extends ResolverBase {
+    @Query(() => RunMJQueryParameterViewResult)
+    async RunMJQueryParameterViewByID(@Arg('input', () => RunViewByIDInput) input: RunViewByIDInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        return super.RunViewByIDGeneric(input, provider, userPayload, pubSub);
+    }
+
+    @Query(() => RunMJQueryParameterViewResult)
+    async RunMJQueryParameterViewByName(@Arg('input', () => RunViewByNameInput) input: RunViewByNameInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        return super.RunViewByNameGeneric(input, provider, userPayload, pubSub);
+    }
+
+    @Query(() => RunMJQueryParameterViewResult)
+    async RunMJQueryParameterDynamicView(@Arg('input', () => RunDynamicViewInput) input: RunDynamicViewInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        input.EntityName = 'MJ: Query Parameters';
+        return super.RunDynamicViewGeneric(input, provider, userPayload, pubSub);
+    }
+    @Query(() => MJQueryParameter_, { nullable: true })
+    async MJQueryParameter(@Arg('ID', () => String) ID: string, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine): Promise<MJQueryParameter_ | null> {
+        this.CheckUserReadPermissions('MJ: Query Parameters', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwQueryParameters] WHERE [ID]='${ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: Query Parameters', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.MapFieldNamesToCodeNames('MJ: Query Parameters', rows && rows.length > 0 ? rows[0] : {}, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+    
+    @Mutation(() => MJQueryParameter_)
+    async CreateMJQueryParameter(
+        @Arg('input', () => CreateMJQueryParameterInput) input: CreateMJQueryParameterInput,
+        @Ctx() { providers, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        const provider = GetReadWriteProvider(providers);
+        return this.CreateRecord('MJ: Query Parameters', input, provider, userPayload, pubSub)
+    }
+        
+    @Mutation(() => MJQueryParameter_)
+    async UpdateMJQueryParameter(
+        @Arg('input', () => UpdateMJQueryParameterInput) input: UpdateMJQueryParameterInput,
+        @Ctx() { providers, userPayload }: AppContext,
+        @PubSub() pubSub: PubSubEngine
+    ) {
+        const provider = GetReadWriteProvider(providers);
+        return this.UpdateRecord('MJ: Query Parameters', input, provider, userPayload, pubSub);
+    }
+    
+    @Mutation(() => MJQueryParameter_)
+    async DeleteMJQueryParameter(@Arg('ID', () => String) ID: string, @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput, @Ctx() { providers, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        const provider = GetReadWriteProvider(providers);
+        const key = new CompositeKey([{FieldName: 'ID', Value: ID}]);
+        return this.DeleteRecord('MJ: Query Parameters', key, options, provider, userPayload, pubSub);
+    }
+    
+}
+
+//****************************************************************************
+// ENTITY CLASS for MJ: Record Links
+//****************************************************************************
+@ObjectType({ description: `Generic linking table that can connect any two records in the system, providing a flexible relationship management system.` })
+export class MJRecordLink_ {
+    @Field() 
+    @MaxLength(16)
+    ID: string;
+        
+    @Field() 
+    @MaxLength(16)
+    SourceEntityID: string;
+        
+    @Field({description: `Primary key value(s) of the source record - scalar for simple PKs or JSON KeyValuePair array for composite PKs`}) 
+    @MaxLength(1000)
+    SourceRecordID: string;
+        
+    @Field() 
+    @MaxLength(16)
+    TargetEntityID: string;
+        
+    @Field({description: `Primary key value(s) of the target record - scalar for simple PKs or JSON KeyValuePair array for composite PKs`}) 
+    @MaxLength(1000)
+    TargetRecordID: string;
+        
+    @Field({nullable: true, description: `Application-specific relationship type describing how the records are related`}) 
+    @MaxLength(100)
+    LinkType?: string;
+        
+    @Field(() => Int, {nullable: true, description: `Display sequence for ordering linked records in UI`}) 
+    Sequence?: number;
+        
+    @Field({nullable: true, description: `JSON field for storing additional link-specific metadata`}) 
+    Metadata?: string;
+        
+    @Field() 
+    @MaxLength(10)
+    _mj__CreatedAt: Date;
+        
+    @Field() 
+    @MaxLength(10)
+    _mj__UpdatedAt: Date;
+        
+    @Field() 
+    @MaxLength(510)
+    SourceEntity: string;
         
     @Field() 
     @MaxLength(510)
@@ -55121,6 +56765,9 @@ export class MJRole_ {
     @Field(() => [MJResourcePermission_])
     ResourcePermissions_RoleIDArray: MJResourcePermission_[]; // Link to ResourcePermissions
     
+    @Field(() => [MJMCPServerConnectionPermission_])
+    MJ_MCPServerConnectionPermissions_RoleIDArray: MJMCPServerConnectionPermission_[]; // Link to MJ_MCPServerConnectionPermissions
+    
     @Field(() => [MJAIAgentPermission_])
     MJ_AIAgentPermissions_RoleIDArray: MJAIAgentPermission_[]; // Link to MJ_AIAgentPermissions
     
@@ -55307,6 +56954,17 @@ export class MJRoleResolver extends ResolverBase {
         return result;
     }
         
+    @FieldResolver(() => [MJMCPServerConnectionPermission_])
+    async MJ_MCPServerConnectionPermissions_RoleIDArray(@Root() mjrole_: MJRole_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Server Connection Permissions', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerConnectionPermissions] WHERE [RoleID]='${mjrole_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Connection Permissions', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Server Connection Permissions', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
     @FieldResolver(() => [MJAIAgentPermission_])
     async MJ_AIAgentPermissions_RoleIDArray(@Root() mjrole_: MJRole_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('MJ: AI Agent Permissions', userPayload);
@@ -60198,6 +61856,9 @@ export class MJUser_ {
     @Field(() => [MJUserNotificationPreference_])
     MJ_UserNotificationPreferences_UserIDArray: MJUserNotificationPreference_[]; // Link to MJ_UserNotificationPreferences
     
+    @Field(() => [MJMCPToolExecutionLog_])
+    MJ_MCPToolExecutionLogs_UserIDArray: MJMCPToolExecutionLog_[]; // Link to MJ_MCPToolExecutionLogs
+    
     @Field(() => [MJResourcePermission_])
     ResourcePermissions_UserIDArray: MJResourcePermission_[]; // Link to ResourcePermissions
     
@@ -60234,6 +61895,9 @@ export class MJUser_ {
     @Field(() => [MJAPIKey_])
     MJ_APIKeys_CreatedByUserIDArray: MJAPIKey_[]; // Link to MJ_APIKeys
     
+    @Field(() => [MJMCPServerConnectionPermission_])
+    MJ_MCPServerConnectionPermissions_UserIDArray: MJMCPServerConnectionPermission_[]; // Link to MJ_MCPServerConnectionPermissions
+    
     @Field(() => [MJAIAgentRun_])
     MJ_AIAgentRuns_UserIDArray: MJAIAgentRun_[]; // Link to MJ_AIAgentRuns
     
@@ -61031,6 +62695,17 @@ export class MJUserResolverBase extends ResolverBase {
         return result;
     }
         
+    @FieldResolver(() => [MJMCPToolExecutionLog_])
+    async MJ_MCPToolExecutionLogs_UserIDArray(@Root() mjuser_: MJUser_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Tool Execution Logs', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPToolExecutionLogs] WHERE [UserID]='${mjuser_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Tool Execution Logs', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Tool Execution Logs', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
     @FieldResolver(() => [MJResourcePermission_])
     async ResourcePermissions_UserIDArray(@Root() mjuser_: MJUser_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('Resource Permissions', userPayload);
@@ -61163,6 +62838,17 @@ export class MJUserResolverBase extends ResolverBase {
         return result;
     }
         
+    @FieldResolver(() => [MJMCPServerConnectionPermission_])
+    async MJ_MCPServerConnectionPermissions_UserIDArray(@Root() mjuser_: MJUser_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('MJ: MCP Server Connection Permissions', userPayload);
+        const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
+        const connPool = GetReadOnlyDataSource(dataSources, { allowFallbackToReadWrite: true });
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwMCPServerConnectionPermissions] WHERE [UserID]='${mjuser_.ID}' ` + this.getRowLevelSecurityWhereClause(provider, 'MJ: MCP Server Connection Permissions', userPayload, EntityPermissionType.Read, 'AND');
+        const rows = await SQLServerDataProvider.ExecuteSQLWithPool(connPool, sSQL, undefined, this.GetUserFromPayload(userPayload));
+        const result = await this.ArrayMapFieldNamesToCodeNames('MJ: MCP Server Connection Permissions', rows, this.GetUserFromPayload(userPayload));
+        return result;
+    }
+        
     @FieldResolver(() => [MJAIAgentRun_])
     async MJ_AIAgentRuns_UserIDArray(@Root() mjuser_: MJUser_, @Ctx() { dataSources, userPayload, providers }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('MJ: AI Agent Runs', userPayload);