@memberjunction/server 5.1.0 → 5.3.0

package/src/generic/RunViewResolver.ts

@@ -4,7 +4,7 @@ import { ResolverBase } from './ResolverBase.js';
 import { LogError, LogStatus, EntityInfo, RunViewWithCacheCheckResult, RunViewsWithCacheCheckResponse, RunViewWithCacheCheckParams, AggregateResult } from '@memberjunction/core';
 import { RequireSystemUser } from '../directives/RequireSystemUser.js';
 import { GetReadOnlyProvider } from '../util.js';
-import { UserViewEntityExtended } from '@memberjunction/core-entities';
+import { MJUserViewEntityExtended } from '@memberjunction/core-entities';
 import { KeyValuePairOutputType } from './KeyInputOutputTypes.js';
 import { SQLServerDataProvider } from '@memberjunction/sqlserver-dataprovider';
 
@@ -652,7 +652,7 @@ export class RunViewResolver extends ResolverBase {
       if (rawData === null) 
         return null;
 
-      const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "MJ: User Views", { Name: input.ViewName }, userPayload.userRecord));
+      const viewInfo = super.safeFirstArrayElement<MJUserViewEntityExtended>(await super.findBy<MJUserViewEntityExtended>(provider, "MJ: User Views", { Name: input.ViewName }, userPayload.userRecord));
       const entity = provider.Entities.find((e) => e.ID === viewInfo.EntityID);
       const returnData = this.processRawData(rawData.Results, viewInfo.EntityID, entity);
       return {
@@ -683,7 +683,7 @@ export class RunViewResolver extends ResolverBase {
       if (rawData === null) 
         return null;
 
-      const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "MJ: User Views", { ID: input.ViewID }, userPayload.userRecord));
+      const viewInfo = super.safeFirstArrayElement<MJUserViewEntityExtended>(await super.findBy<MJUserViewEntityExtended>(provider, "MJ: User Views", { ID: input.ViewID }, userPayload.userRecord));
       const entity = provider.Entities.find((e) => e.ID === viewInfo.EntityID);
       const returnData = this.processRawData(rawData.Results, viewInfo.EntityID, entity);
       return {
@@ -837,7 +837,7 @@ export class RunViewResolver extends ResolverBase {
         };
       }
 
-      const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "MJ: User Views", { ID: input.ViewID }, userPayload.userRecord));
+      const viewInfo = super.safeFirstArrayElement<MJUserViewEntityExtended>(await super.findBy<MJUserViewEntityExtended>(provider, "MJ: User Views", { ID: input.ViewID }, userPayload.userRecord));
       const entity = provider.Entities.find((e) => e.ID === viewInfo.EntityID);
       const returnData = this.processRawData(rawData.Results, viewInfo.EntityID, entity);
       return {

package/src/index.ts

@@ -44,7 +44,7 @@ export * from 'type-graphql';
 export { NewUserBase } from './auth/newUsers.js';
 export { configInfo, DEFAULT_SERVER_CONFIG } from './config.js';
 export * from './directives/index.js';
-export * from './entitySubclasses/entityPermissions.server.js';
+export * from './entitySubclasses/MJEntityPermissionEntityServer.server.js';
 export * from './types.js';
 export {
     TokenExpiredError,

package/src/resolvers/AdhocQueryResolver.ts

@@ -0,0 +1,126 @@
+import { Arg, Ctx, Query, Resolver, Field, Int, InputType } from 'type-graphql';
+import { LogError } from '@memberjunction/core';
+import { SQLExpressionValidator } from '@memberjunction/global';
+import { AppContext } from '../types.js';
+import { GetReadOnlyDataSource } from '../util.js';
+import { ResolverBase } from '../generic/ResolverBase.js';
+import { RunQueryResultType } from './QueryResolver.js';
+import sql from 'mssql';
+
+/**
+ * Input type for executing ad-hoc SQL queries directly.
+ * The SQL is validated server-side to ensure it's a safe SELECT/WITH statement.
+ */
+@InputType()
+class AdhocQueryInput {
+    @Field(() => String, { description: 'SQL query to execute. Must be a SELECT or WITH (CTE) statement.' })
+    SQL: string;
+
+    @Field(() => Int, { nullable: true, description: 'Query timeout in seconds. Defaults to 30.' })
+    TimeoutSeconds?: number;
+}
+
+/**
+ * Resolver for executing ad-hoc (unsaved) SQL queries.
+ *
+ * Security:
+ * - SQL validated via SQLExpressionValidator (full_query context) — blocks mutations, dangerous operations
+ * - Executes on read-only connection pool only (no fallback to read-write)
+ * - Configurable timeout (default 30s)
+ * - Requires authenticated user (standard GraphQL auth, no @RequireSystemUser)
+ *
+ * Auto-discovered by MJServer's dynamic resolver import.
+ */
+@Resolver()
+export class AdhocQueryResolver extends ResolverBase {
+    @Query(() => RunQueryResultType)
+    async ExecuteAdhocQuery(
+        @Arg('input', () => AdhocQueryInput) input: AdhocQueryInput,
+        @Ctx() context: AppContext
+    ): Promise<RunQueryResultType> {
+        const startTime = Date.now();
+
+        try {
+            // 1. Security: validate SQL using SQLExpressionValidator
+            const validator = SQLExpressionValidator.Instance;
+            const validation = validator.validateFullQuery(input.SQL);
+            if (!validation.valid) {
+                return this.buildErrorResult(validation.error || 'SQL validation failed');
+            }
+
+            // 2. Get READ-ONLY data source (no fallback to read-write)
+            let readOnlyDS: sql.ConnectionPool;
+            try {
+                readOnlyDS = GetReadOnlyDataSource(context.dataSources, { allowFallbackToReadWrite: false });
+            } catch {
+                return this.buildErrorResult('No read-only data source available for ad-hoc query execution');
+            }
+
+            // 3. Execute with timeout
+            const timeoutMs = (input.TimeoutSeconds ?? 30) * 1000;
+            const request = new sql.Request(readOnlyDS);
+
+            const result = await Promise.race([
+                request.query(input.SQL),
+                new Promise<never>((_, reject) =>
+                    setTimeout(() => reject(new Error('Query timeout exceeded')), timeoutMs)
+                )
+            ]);
+            const executionTimeMs = Date.now() - startTime;
+
+            // 4. Return as RunQueryResultType
+            return {
+                QueryID: '',
+                QueryName: 'Ad-Hoc Query',
+                Success: true,
+                Results: JSON.stringify(result.recordset ?? []),
+                RowCount: result.recordset?.length ?? 0,
+                TotalRowCount: result.recordset?.length ?? 0,
+                ExecutionTime: executionTimeMs,
+                ErrorMessage: ''
+            };
+        } catch (err: unknown) {
+            const executionTimeMs = Date.now() - startTime;
+            const errorMessage = err instanceof Error ? err.message : String(err);
+
+            // Handle timeout
+            if (errorMessage.includes('timeout') || errorMessage.includes('Timeout')) {
+                return {
+                    QueryID: '',
+                    QueryName: 'Ad-Hoc Query',
+                    Success: false,
+                    Results: '[]',
+                    RowCount: 0,
+                    TotalRowCount: 0,
+                    ExecutionTime: executionTimeMs,
+                    ErrorMessage: `Query execution exceeded ${input.TimeoutSeconds ?? 30} second timeout`
+                };
+            }
+
+            LogError(`Ad-hoc query execution failed: ${errorMessage}`);
+            return {
+                QueryID: '',
+                QueryName: 'Ad-Hoc Query',
+                Success: false,
+                Results: '[]',
+                RowCount: 0,
+                TotalRowCount: 0,
+                ExecutionTime: executionTimeMs,
+                ErrorMessage: `Query execution failed: ${errorMessage}`
+            };
+        }
+    }
+
+    private buildErrorResult(errorMessage: string): RunQueryResultType {
+        return {
+            QueryID: '',
+            QueryName: 'Ad-Hoc Query',
+            Success: false,
+            Results: '[]',
+            RowCount: 0,
+            TotalRowCount: 0,
+            ExecutionTime: 0,
+            ErrorMessage: errorMessage
+        };
+    }
+}

package/src/resolvers/CreateQueryResolver.ts

@@ -6,7 +6,7 @@ import { MJQueryCategoryEntity, MJQueryPermissionEntity } from '@memberjunction/
 import { MJQueryResolver } from '../generated/generated.js';
 import { GetReadOnlyProvider, GetReadWriteProvider } from '../util.js';
 import { DeleteOptionsInput } from '../generic/DeleteOptionsInput.js';
-import { QueryEntityExtended } from '@memberjunction/core-entities-server';
+import { MJQueryEntityServer } from '@memberjunction/core-entities-server';
 
 /**
  * Query status enumeration for GraphQL
@@ -425,8 +425,8 @@ export class MJQueryResolverExtended extends MJQueryResolver {
                 };
             }
 
-            // Use QueryEntityExtended which handles AI processing
-            const record = await provider.GetEntityObject<QueryEntityExtended>("MJ: Queries", context.userPayload.userRecord);
+            // Use MJQueryEntityServer which handles AI processing
+            const record = await provider.GetEntityObject<MJQueryEntityServer>("MJ: Queries", context.userPayload.userRecord);
             
             // Set the fields from input, handling CategoryPath resolution
             const fieldsToSet = {
@@ -638,9 +638,9 @@ export class MJQueryResolverExtended extends MJQueryResolver {
         @PubSub() pubSub: PubSubEngine
     ): Promise<UpdateQueryResultType> {
         try {
-            // Load the existing query using QueryEntityExtended
+            // Load the existing query using MJQueryEntityServer
             const provider = GetReadWriteProvider(context.providers);
-            const queryEntity = await provider.GetEntityObject<QueryEntityExtended>('MJ: Queries', context.userPayload.userRecord);
+            const queryEntity = await provider.GetEntityObject<MJQueryEntityServer>('MJ: Queries', context.userPayload.userRecord);
             if (!queryEntity || !await queryEntity.Load(input.ID)) {
                 return {
                     Success: false,

package/src/resolvers/RunAIAgentResolver.ts

@@ -3,7 +3,7 @@ import { AppContext, UserPayload } from '../types.js';
 import { DatabaseProviderBase, LogError, LogStatus, Metadata, RunView, UserInfo } from '@memberjunction/core';
 import { MJConversationDetailEntity, MJConversationDetailAttachmentEntity } from '@memberjunction/core-entities';
 import { AgentRunner } from '@memberjunction/ai-agents';
-import { AIAgentEntityExtended, AIAgentRunEntityExtended, ExecuteAgentResult, ConversationUtility, AttachmentData } from '@memberjunction/ai-core-plus';
+import { MJAIAgentEntityExtended, MJAIAgentRunEntityExtended, ExecuteAgentResult, ConversationUtility, AttachmentData } from '@memberjunction/ai-core-plus';
 import { AIEngine } from '@memberjunction/aiengine';
 import { ChatMessage } from '@memberjunction/ai';
 import { ResolverBase } from '../generic/ResolverBase.js';
@@ -207,12 +207,12 @@ export class RunAIAgentResolver extends ResolverBase {
     /**
      * Validate the agent entity
      */
-    private async validateAgent(agentId: string, currentUser: any): Promise<AIAgentEntityExtended> {
+    private async validateAgent(agentId: string, currentUser: any): Promise<MJAIAgentEntityExtended> {
         // Use AIEngine to get cached agent data
         await AIEngine.Instance.Config(false, currentUser);
         
         // Find agent in cached collection
-        const agentEntity = AIEngine.Instance.Agents.find((a: AIAgentEntityExtended) => a.ID === agentId);
+        const agentEntity = AIEngine.Instance.Agents.find((a: MJAIAgentEntityExtended) => a.ID === agentId);
         
         if (!agentEntity) {
             throw new Error(`AI Agent with ID ${agentId} not found`);
@@ -433,9 +433,6 @@ export class RunAIAgentResolver extends ResolverBase {
 
             const executionTime = Date.now() - startTime;
 
-            // Publish final events
-            this.publishFinalEvents(pubSub, sessionId, userPayload, result);
-
             // Create notification if enabled and artifact was created successfully
             if (createNotification && result.success && artifactInfo && artifactInfo.artifactId && artifactInfo.versionId && artifactInfo.versionNumber) {
                 await this.createCompletionNotification(
@@ -456,6 +453,9 @@ export class RunAIAgentResolver extends ResolverBase {
             const sanitizedResult = this.sanitizeAgentResult(result);
             const returnResult = JSON.stringify(sanitizedResult);
 
+            // Publish final events with enriched result data for fire-and-forget clients
+            this.publishFinalEvents(pubSub, sessionId, userPayload, result, returnResult);
+
             // Log completion
             if (result.success) {
                 LogStatus(`=== AI AGENT RUN COMPLETED FOR: ${agentEntity.Name} (${executionTime}ms) ===`);
@@ -491,9 +491,17 @@ export class RunAIAgentResolver extends ResolverBase {
     }
 
     /**
-     * Publish final streaming events (partial result and completion)
+     * Publish final streaming events (partial result and completion).
+     * The completion event includes the full result JSON so clients using
+     * fire-and-forget mode can receive the result via WebSocket.
      */
-    private publishFinalEvents(pubSub: PubSubEngine, sessionId: string, userPayload: UserPayload, result: ExecuteAgentResult) {
+    private publishFinalEvents(
+        pubSub: PubSubEngine,
+        sessionId: string,
+        userPayload: UserPayload,
+        result: ExecuteAgentResult,
+        resultJson?: string
+    ) {
         if (result.agentRun) {
             // Get the last step from agent run
             let lastStep = 'Completed';
@@ -519,15 +527,19 @@ export class RunAIAgentResolver extends ResolverBase {
             this.PublishStreamingUpdate(pubSub, partialMsg, userPayload);
         }
 
-        // Publish completion with conversationDetailId for client-side routing
-        const completeMsg: AgentExecutionStreamMessage = {
+        // Publish completion with conversationDetailId for client-side routing.
+        // Include result data so fire-and-forget clients can receive the full result via WebSocket.
+        const completionData: Record<string, unknown> = {
             sessionId,
             agentRunId: result.agentRun?.ID || 'unknown',
             type: 'complete',
             timestamp: new Date(),
-            conversationDetailId: result.agentRun?.ConversationDetailID
+            conversationDetailId: result.agentRun?.ConversationDetailID,
+            success: result.success,
+            errorMessage: result.agentRun?.ErrorMessage || undefined,
+            result: resultJson || undefined
         };
-        this.PublishStreamingUpdate(pubSub, completeMsg, userPayload);
+        this.PublishStreamingUpdate(pubSub, completionData, userPayload);
     }
 
     /**
@@ -630,7 +642,7 @@ export class RunAIAgentResolver extends ResolverBase {
      * Notification includes navigation link back to the conversation
      */
     private async createCompletionNotification(
-        agentRun: AIAgentRunEntityExtended,
+        agentRun: MJAIAgentRunEntityExtended,
         artifactInfo: { artifactId: string; versionId: string; versionNumber: number },
         conversationDetailId: string,
         contextUser: UserInfo,
@@ -742,7 +754,8 @@ export class RunAIAgentResolver extends ResolverBase {
         @Arg('createArtifacts', { nullable: true }) createArtifacts?: boolean,
         @Arg('createNotification', { nullable: true }) createNotification?: boolean,
         @Arg('sourceArtifactId', { nullable: true }) sourceArtifactId?: string,
-        @Arg('sourceArtifactVersionId', { nullable: true }) sourceArtifactVersionId?: string
+        @Arg('sourceArtifactVersionId', { nullable: true }) sourceArtifactVersionId?: string,
+        @Arg('fireAndForget', { nullable: true }) fireAndForget?: boolean
     ): Promise<AIAgentRunResult> {
         // Check API key scope authorization for agent execution
         await this.CheckAPIKeyScopeAuthorization('agent:execute', agentId, userPayload);
@@ -769,7 +782,25 @@ export class RunAIAgentResolver extends ResolverBase {
             // Convert to JSON string for the existing executeAIAgent method
             const messagesJson = JSON.stringify(messages);
 
-            // Delegate to existing implementation
+            if (fireAndForget) {
+                // Fire-and-forget mode: start execution in background, return immediately.
+                // The client will receive the result via WebSocket PubSub completion event.
+                this.executeAgentInBackground(
+                    p, dataSource, agentId, userPayload, messagesJson, sessionId, pubSub,
+                    data, payload, lastRunId, autoPopulateLastRunPayload, configurationId,
+                    conversationDetailId, createArtifacts || false, createNotification || false,
+                    sourceArtifactId, sourceArtifactVersionId
+                );
+
+                LogStatus(`🔥 Fire-and-forget: Agent ${agentId} execution started in background for session ${sessionId}`);
+
+                return {
+                    success: true,
+                    result: JSON.stringify({ accepted: true, fireAndForget: true })
+                };
+            }
+
+            // Synchronous mode (default): wait for execution to complete
             return this.executeAIAgent(
                 p,
                 dataSource,
@@ -801,6 +832,58 @@ export class RunAIAgentResolver extends ResolverBase {
         }
     }
 
+    /**
+     * Execute agent in background (fire-and-forget).
+     * Handles errors by publishing error completion events via PubSub,
+     * so the client receives them via WebSocket even though the HTTP response
+     * has already been sent.
+     */
+    private executeAgentInBackground(
+        p: DatabaseProviderBase,
+        dataSource: unknown,
+        agentId: string,
+        userPayload: UserPayload,
+        messagesJson: string,
+        sessionId: string,
+        pubSub: PubSubEngine,
+        data?: string,
+        payload?: string,
+        lastRunId?: string,
+        autoPopulateLastRunPayload?: boolean,
+        configurationId?: string,
+        conversationDetailId?: string,
+        createArtifacts: boolean = false,
+        createNotification: boolean = false,
+        sourceArtifactId?: string,
+        sourceArtifactVersionId?: string
+    ): void {
+        // Execute in background - errors are handled within, not propagated
+        this.executeAIAgent(
+            p, dataSource, agentId, userPayload, messagesJson, sessionId, pubSub,
+            data, payload, undefined, lastRunId, autoPopulateLastRunPayload,
+            configurationId, conversationDetailId, createArtifacts, createNotification,
+            sourceArtifactId, sourceArtifactVersionId
+        ).catch((error: unknown) => {
+            // Background execution failed unexpectedly (executeAIAgent has its own try-catch,
+            // so this would only fire for truly unexpected errors).
+            const errorMessage = (error instanceof Error) ? error.message : 'Unknown background execution error';
+            LogError(`🔥 Fire-and-forget background execution failed: ${errorMessage}`, undefined, error);
+
+            // Publish error completion event so the client knows the agent failed
+            const errorCompletionData: Record<string, unknown> = {
+                sessionId,
+                agentRunId: 'unknown',
+                type: 'complete',
+                timestamp: new Date(),
+                conversationDetailId,
+                success: false,
+                errorMessage,
+                result: JSON.stringify({ success: false, errorMessage })
+            };
+            this.PublishStreamingUpdate(pubSub, errorCompletionData, userPayload);
+        });
+    }
+
     /**
      * Load conversation history with attachments from database.
      * Builds ChatMessage[] with multimodal content blocks for attachments.

package/src/resolvers/RunAIPromptResolver.ts

@@ -1,7 +1,7 @@
 import { Resolver, Mutation, Query, Arg, Ctx, ObjectType, Field, Int } from 'type-graphql';
 import { AppContext, UserPayload } from '../types.js';
 import { DatabaseProviderBase, LogError, LogStatus, Metadata } from '@memberjunction/core';
-import { AIPromptEntityExtended, AIModelEntityExtended } from '@memberjunction/ai-core-plus';
+import { MJAIPromptEntityExtended, MJAIModelEntityExtended } from '@memberjunction/ai-core-plus';
 import { AIPromptRunner } from '@memberjunction/ai-prompts';
 import { AIPromptParams } from '@memberjunction/ai-core-plus';
 import { ResolverBase } from '../generic/ResolverBase.js';
@@ -156,7 +156,7 @@ export class RunAIPromptResolver extends ResolverBase {
             }
 
             // Load the AI prompt entity
-            const promptEntity = await p.GetEntityObject<AIPromptEntityExtended>('MJ: AI Prompts', currentUser);
+            const promptEntity = await p.GetEntityObject<MJAIPromptEntityExtended>('MJ: AI Prompts', currentUser);
             await promptEntity.Load(promptId);
             
             if (!promptEntity.IsSaved) {
@@ -402,7 +402,7 @@ export class RunAIPromptResolver extends ResolverBase {
         preferredModels: string[] | undefined,
         modelPower: string,
         contextUser: any
-    ): Promise<AIModelEntityExtended> {
+    ): Promise<MJAIModelEntityExtended> {
         // Ensure AI Engine is configured
         await AIEngine.Instance.Config(false, contextUser);
         
@@ -413,7 +413,7 @@ export class RunAIPromptResolver extends ResolverBase {
         );
         
         // Filter to only models with valid API keys
-        const modelsWithKeys: AIModelEntityExtended[] = [];
+        const modelsWithKeys: MJAIModelEntityExtended[] = [];
         for (const model of allModels) {
             const apiKey = GetAIAPIKey(model.DriverClass);
             if (apiKey && apiKey.trim().length > 0) {
@@ -443,7 +443,7 @@ export class RunAIPromptResolver extends ResolverBase {
         // Sort by PowerRank for power-based selection
         modelsWithKeys.sort((a, b) => (b.PowerRank || 0) - (a.PowerRank || 0));
         
-        let selectedModel: AIModelEntityExtended;
+        let selectedModel: MJAIModelEntityExtended;
         switch (modelPower) {
             case 'lowest':
                 selectedModel = modelsWithKeys[modelsWithKeys.length - 1];
@@ -466,7 +466,7 @@ export class RunAIPromptResolver extends ResolverBase {
      * Helper method to select an embedding model by size
      * @private
      */
-    private selectEmbeddingModelBySize(modelSize: string): AIModelEntityExtended {
+    private selectEmbeddingModelBySize(modelSize: string): MJAIModelEntityExtended {
         const localModels = AIEngine.Instance.LocalEmbeddingModels;
         
         if (!localModels || localModels.length === 0) {
@@ -541,7 +541,7 @@ export class RunAIPromptResolver extends ResolverBase {
      * Helper method to format simple prompt result
      * @private
      */
-    private formatSimpleResult(chatResult: any, model: AIModelEntityExtended, executionTime: number): SimplePromptResult {
+    private formatSimpleResult(chatResult: any, model: MJAIModelEntityExtended, executionTime: number): SimplePromptResult {
         if (!chatResult || !chatResult.success) {
             return {
                 success: false,

package/src/resolvers/RunTemplateResolver.ts

@@ -1,7 +1,7 @@
 import { Resolver, Mutation, Arg, Ctx, ObjectType, Field } from 'type-graphql';
 import { AppContext, UserPayload } from '../types.js';
 import { LogError, LogStatus, Metadata, RunView } from '@memberjunction/core';
-import { MJTemplateContentEntity, TemplateEntityExtended } from '@memberjunction/core-entities';
+import { MJTemplateContentEntity, MJTemplateEntityExtended } from '@memberjunction/core-entities';
 import { TemplateEngineServer } from '@memberjunction/templates';
 import { ResolverBase } from '../generic/ResolverBase.js';
 import { GetReadWriteProvider } from '../util.js';
@@ -63,7 +63,7 @@ export class RunTemplateResolver extends ResolverBase {
             
             const p = GetReadWriteProvider(providers);
             // Load the template entity
-            const templateEntity = await p.GetEntityObject<TemplateEntityExtended>('MJ: Templates', currentUser);
+            const templateEntity = await p.GetEntityObject<MJTemplateEntityExtended>('MJ: Templates', currentUser);
             await templateEntity.Load(templateId);
             
             if (!templateEntity.IsSaved) {

package/src/resolvers/RunTestResolver.ts

@@ -16,7 +16,7 @@ import { LogError, LogStatus } from '@memberjunction/core';
 import { TestEngine } from '@memberjunction/testing-engine';
 import { ResolverBase } from '../generic/ResolverBase.js';
 import { PUSH_STATUS_UPDATES_TOPIC } from '../generic/PushStatusResolver.js';
-import { TestRunVariables } from '@memberjunction/testing-engine-base';
+import { TestRunVariables, TestLogMessage } from '@memberjunction/testing-engine-base';
 
 // ===== GraphQL Types =====
 
@@ -131,6 +131,11 @@ export class RunTestResolver extends ResolverBase {
                 this.createProgressCallback(pubSub, userPayload, testId) :
                 undefined;
 
+            // Create log callback to stream driver/engine logs to the UI in real-time
+            const logCallback = pubSub ?
+                this.createLogCallback(pubSub, userPayload, testId) :
+                undefined;
+
             // Parse variables from JSON string if provided
             let parsedVariables: TestRunVariables | undefined;
             if (variables) {
@@ -147,7 +152,8 @@ export class RunTestResolver extends ResolverBase {
                 environment,
                 tags,
                 variables: parsedVariables,
-                progressCallback
+                progressCallback,
+                logCallback
             };
 
             const result = await engine.RunTest(testId, options, user);
@@ -251,6 +257,11 @@ export class RunTestResolver extends ResolverBase {
                 this.createProgressCallback(pubSub, userPayload, suiteId) :
                 undefined;
 
+            // Create log callback to stream driver/engine logs to the UI in real-time
+            const logCallback = pubSub ?
+                this.createLogCallback(pubSub, userPayload, suiteId) :
+                undefined;
+
             // Parse selectedTestIds from JSON string if provided
             let parsedSelectedTestIds: string[] | undefined;
             if (selectedTestIds) {
@@ -280,7 +291,8 @@ export class RunTestResolver extends ResolverBase {
                 selectedTestIds: parsedSelectedTestIds,
                 sequenceStart,
                 sequenceEnd,
-                progressCallback
+                progressCallback,
+                logCallback
             };
 
             const result = await engine.RunSuite(suiteId, options, user);
@@ -364,6 +376,32 @@ export class RunTestResolver extends ResolverBase {
         };
     }
 
+    /**
+     * Create log callback that streams driver/engine log messages to the UI
+     * as progress updates, so they appear in the execution log in real-time.
+     */
+    private createLogCallback(
+        pubSub: PubSubEngine,
+        userPayload: UserPayload,
+        testId: string
+    ) {
+        return (message: TestLogMessage) => {
+            const progressMsg: TestExecutionStreamMessage = {
+                sessionId: userPayload.sessionId || '',
+                testRunId: testId,
+                type: 'progress',
+                progress: {
+                    currentStep: 'driver_log',
+                    percentage: -1, // Signal that percentage should not be updated
+                    message: message.message,
+                },
+                timestamp: message.timestamp
+            };
+
+            this.publishProgress(pubSub, progressMsg, userPayload);
+        };
+    }
+
     private publishProgress(pubSub: PubSubEngine, data: TestExecutionStreamMessage, userPayload: UserPayload) {
         pubSub.publish(PUSH_STATUS_UPDATES_TOPIC, {
             message: JSON.stringify({

package/src/resolvers/UserViewResolver.ts

@@ -3,7 +3,7 @@ import { EntitySaveOptions, Metadata } from '@memberjunction/core';
 import { AppContext, Arg, Ctx, Int, Query, Resolver, UserPayload } from '@memberjunction/server';
 import { MJUserView_, MJUserViewResolverBase } from '../generated/generated.js';
 import { UserResolver } from './UserResolver.js';
-import { MJUserViewEntity, UserViewEntityExtended } from '@memberjunction/core-entities';
+import { MJUserViewEntity, MJUserViewEntityExtended } from '@memberjunction/core-entities';
 import { GetReadOnlyProvider } from '../util.js';
 
 @Resolver(MJUserView_)
@@ -54,7 +54,7 @@ export class UserViewResolver extends MJUserViewResolverBase {
     // filter state which in turn will be used to update the where clause in the entity sub-class.
     const p = GetReadOnlyProvider(providers, {allowFallbackToReadWrite: true});
     const u = this.GetUserFromPayload(userPayload);
-    const viewEntity = <UserViewEntityExtended>await p.GetEntityObject('MJ: User Views', u);
+    const viewEntity = <MJUserViewEntityExtended>await p.GetEntityObject('MJ: User Views', u);
     await viewEntity.Load(ID);
     viewEntity.UpdateWhereClause();
 

package/src/services/TaskOrchestrator.ts

@@ -5,7 +5,7 @@ import { ChatMessageRole } from '@memberjunction/ai';
 import { PubSubEngine } from 'type-graphql';
 import { UserPayload } from '../types.js';
 import { PUSH_STATUS_UPDATES_TOPIC } from '../generic/PushStatusResolver.js';
-import { AIAgentEntityExtended } from '@memberjunction/ai-core-plus';
+import { MJAIAgentEntityExtended } from '@memberjunction/ai-core-plus';
 
 /**
  * Task definition from LLM response
@@ -268,9 +268,9 @@ export class TaskOrchestrator {
     /**
      * Find agent by name
      */
-    private async findAgentByName(agentName: string): Promise<AIAgentEntityExtended | null> {
+    private async findAgentByName(agentName: string): Promise<MJAIAgentEntityExtended | null> {
         const rv = new RunView();
-        const result = await rv.RunView<AIAgentEntityExtended>({
+        const result = await rv.RunView<MJAIAgentEntityExtended>({
             EntityName: 'MJ: AI Agents',
             ExtraFilter: `Name='${agentName.replace(/'/g, "''")}'`,
             ResultType: 'entity_object'
@@ -475,7 +475,7 @@ export class TaskOrchestrator {
 
             // Load the agent entity
             const md = new Metadata();
-            const agentEntity = await md.GetEntityObject<AIAgentEntityExtended>('MJ: AI Agents', this.contextUser);
+            const agentEntity = await md.GetEntityObject<MJAIAgentEntityExtended>('MJ: AI Agents', this.contextUser);
             const loaded = await agentEntity.Load(task.AgentID!);
             if (!loaded) {
                 throw new Error(`Agent with ID ${task.AgentID} not found`);
@@ -695,7 +695,7 @@ export class TaskOrchestrator {
     private async createArtifactFromOutput(
         output: { type: 'message' | 'payload', content: any },
         conversationDetailId: string,
-        agent: AIAgentEntityExtended,
+        agent: MJAIAgentEntityExtended,
         taskName: string
     ): Promise<void> {
         try {

package/src/types.ts

@@ -1,5 +1,5 @@
 import { AggregateExpression, DatabaseProviderBase, UserInfo } from '@memberjunction/core';
-import { UserViewEntityExtended } from '@memberjunction/core-entities';
+import { MJUserViewEntityExtended } from '@memberjunction/core-entities';
 import { GraphQLSchema } from 'graphql';
 import sql from 'mssql';
 import { getSystemUser } from './auth/index.js';
@@ -68,7 +68,7 @@ export type DirectiveBuilder = {
 };
 
 export type RunViewGenericParams = {
-  viewInfo: UserViewEntityExtended;
+  viewInfo: MJUserViewEntityExtended;
   provider: DatabaseProviderBase;
   extraFilter: string;
   orderBy: string;

package/dist/entitySubclasses/entityPermissions.server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"entityPermissions.server.d.ts","sourceRoot":"","sources":["../../src/entitySubclasses/entityPermissions.server.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAIzE;;;;;;GAMG;AACH,qBACa,8BAA+B,SAAQ,wBAAwB;IAC1E,SAAS,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,CAAM;IAC/C,SAAS,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,GAAG,IAAI,CAAQ;IACvD,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAQ;IAChE,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAgC;IACzE,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAoB;IACrD,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAqB;IACnD,SAAS,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAA6B;IAGlE,SAAS,CAAC,MAAM,CAAC,gBAAgB,IAAI,MAAM;IAI3C,WAAkB,aAAa,IAAI,MAAM,EAAE,CAE1C;WAEa,UAAU,IAAI,IAAI;WAIlB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMhD,SAAS,CAAC,MAAM,CAAC,yBAAyB,IAAI,IAAI;IAUlD,SAAS,CAAC,MAAM,CAAC,oBAAoB,IAAI,IAAI;qBAMtB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IA+B1C,IAAI,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAO7C,MAAM,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;CAQtE"}

package/dist/entitySubclasses/entityPermissions.server.js.map

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