@memberjunction/server 2.103.0 → 2.105.0

package/src/index.ts

@@ -44,28 +44,10 @@ LoadAgentManagementActions();
 import { resolve } from 'node:path';
 import { DataSourceInfo, raiseEvent } from './types.js';
 import { LoadAIEngine } from '@memberjunction/aiengine';
-import { LoadOpenAILLM } from '@memberjunction/ai-openai';
-import { LoadAnthropicLLM } from '@memberjunction/ai-anthropic';
-import { LoadGroqLLM } from '@memberjunction/ai-groq';
-import { LoadCerebrasLLM } from '@memberjunction/ai-cerebras';
-import { LoadMistralLLM } from '@memberjunction/ai-mistral';
-import { LoadLMStudioLLM } from '@memberjunction/ai-lmstudio';
-import { LoadOpenRouterLLM } from '@memberjunction/ai-openrouter';
-import { LoadOllamaLLM } from '@memberjunction/ai-ollama';
-import { LoadLocalEmbedding } from '@memberjunction/ai-local-embeddings';
-// Load AI LLMs and Base AI Engine
-// These imports are necessary to ensure the LLMs are registered in the MemberJunction AI
-// system. They are not tree-shaken because they are dynamically loaded at runtime.
+import { LoadAIProviders } from '@memberjunction/ai-provider-bundle';
+// Load AI Engine and all providers to prevent tree shaking
 LoadAIEngine();
-LoadOpenAILLM();
-LoadAnthropicLLM();
-LoadGroqLLM();
-LoadCerebrasLLM();
-LoadMistralLLM();
-LoadLMStudioLLM();
-LoadOpenRouterLLM();
-LoadOllamaLLM();
-LoadLocalEmbedding();
+LoadAIProviders();
 
 import { ExternalChangeDetectorEngine } from '@memberjunction/external-change-detection';
 
@@ -86,10 +68,14 @@ export * from './generic/RunViewResolver.js';
 export * from './resolvers/RunTemplateResolver.js';
 export * from './resolvers/RunAIPromptResolver.js';
 export * from './resolvers/RunAIAgentResolver.js';
+export * from './resolvers/TaskResolver.js';
 export * from './generic/KeyValuePairInput.js';
 export * from './generic/KeyInputOutputTypes.js';
 export * from './generic/DeleteOptionsInput.js';
 
+export * from './agents/skip-agent.js';
+export * from './agents/skip-sdk.js';
+
 export * from './resolvers/AskSkipResolver.js';
 export * from './resolvers/ColorResolver.js';
 export * from './resolvers/ComponentRegistryResolver.js';

package/src/resolvers/AskSkipResolver.ts

@@ -1,4 +1,4 @@
-import { Arg, Ctx, Field, Mutation, ObjectType, PubSub, PubSubEngine, Query, Resolver } from 'type-graphql';
+import { Arg, Ctx, Field, InputType, Mutation, ObjectType, PubSub, PubSubEngine, Query, Resolver } from 'type-graphql';
 import { LogError, LogStatus, Metadata, RunView, UserInfo, CompositeKey, EntityFieldInfo, EntityInfo, EntityRelationshipInfo, EntitySaveOptions, EntityDeleteOptions, IMetadataProvider } from '@memberjunction/core';
 import { AppContext, UserPayload, MJ_SERVER_EVENT_CODE } from '../types.js';
 import { BehaviorSubject } from 'rxjs';
@@ -66,6 +66,18 @@ import { AIEngine } from '@memberjunction/aiengine';
 import { deleteAccessToken, GetDataAccessToken, registerAccessToken, tokenExists } from './GetDataResolver.js';
 import e from 'express';
 
+/**
+ * Skip API Endpoints Configuration
+ * Defines all available endpoints for the Skip API
+ */
+const SKIP_API_ENDPOINTS = {
+  CHAT: '/chat',
+  LEARNING: '/learning',
+  FEEDBACK_COMPONENT: '/feedback/component',
+  REGISTRY: '/registry',
+  // Add more endpoints as needed
+} as const;
+
 /**
  * Store for active conversation streams
  * Maps conversationID to the last status message received
@@ -368,7 +380,9 @@ function initializeSkipLearningCycleScheduler() {
           }
           
           // Check if we have a valid endpoint when cycles are enabled
-          if (!skipConfigInfo.learningCycleURL || skipConfigInfo.learningCycleURL.trim().length === 0) {
+          const hasLearningEndpoint = (skipConfigInfo.url && skipConfigInfo.url.trim().length > 0) ||
+                                      (skipConfigInfo.learningCycleURL && skipConfigInfo.learningCycleURL.trim().length > 0);
+          if (!hasLearningEndpoint) {
             LogError('Skip AI Learning cycle scheduler not started: Learning cycles are enabled but no Learning Cycle API endpoint is configured');
             return;
           }
@@ -577,7 +591,9 @@ export class AskSkipResolver {
       }
       
       // Check if we have a valid endpoint when cycles are enabled
-      if (!skipConfigInfo.learningCycleURL || skipConfigInfo.learningCycleURL.trim().length === 0) {
+      const hasLearningEndpoint = (skipConfigInfo.url && skipConfigInfo.url.trim().length > 0) ||
+                                  (skipConfigInfo.learningCycleURL && skipConfigInfo.learningCycleURL.trim().length > 0);
+      if (!hasLearningEndpoint) {
         return {
           success: false,
           error: 'Learning cycle API endpoint is not configured',
@@ -729,9 +745,10 @@ export class AskSkipResolver {
     userPayload: UserPayload
   ): Promise<SkipAPILearningCycleResponse> {
     const skipConfigInfo = configInfo.askSkip;
-    LogStatus(`   >>> HandleSimpleSkipLearningPostRequest Sending request to Skip API: ${skipConfigInfo.learningCycleURL}`);
+    const learningURL = skipConfigInfo.url ? `${skipConfigInfo.url}${SKIP_API_ENDPOINTS.LEARNING}` : skipConfigInfo.learningCycleURL;
+    LogStatus(`   >>> HandleSimpleSkipLearningPostRequest Sending request to Skip API: ${learningURL}`);
 
-    const response = await sendPostRequest(skipConfigInfo.learningCycleURL, input, true, this.buildSkipPostHeaders());
+    const response = await sendPostRequest(learningURL, input, true, this.buildSkipPostHeaders());
 
     if (response && response.length > 0) {
       // the last object in the response array is the final response from the Skip API
@@ -789,10 +806,11 @@ export class AskSkipResolver {
     userPayload: UserPayload = null
   ): Promise<AskSkipResultType> {
     const skipConfigInfo = configInfo.askSkip;
-    LogStatus(`   >>> HandleSimpleSkipChatPostRequest Sending request to Skip API: ${skipConfigInfo.chatURL}`);
+    const chatURL = skipConfigInfo.url ? `${skipConfigInfo.url}${SKIP_API_ENDPOINTS.CHAT}` : skipConfigInfo.chatURL;
+    LogStatus(`   >>> HandleSimpleSkipChatPostRequest Sending request to Skip API: ${chatURL}`);
 
     try {
-      const response = await sendPostRequest(skipConfigInfo.chatURL, input, true, this.buildSkipPostHeaders());
+      const response = await sendPostRequest(chatURL, input, true, this.buildSkipPostHeaders());
 
       if (response && response.length > 0) {
         // the last object in the response array is the final response from the Skip API
@@ -2428,7 +2446,8 @@ cycle.`);
     startTime: Date
   ): Promise<AskSkipResultType> {
     const skipConfigInfo = configInfo.askSkip;
-    LogStatus(`   >>> HandleSkipRequest: Sending request to Skip API: ${skipConfigInfo.chatURL}`);
+    const chatURL = skipConfigInfo.url ? `${skipConfigInfo.url}${SKIP_API_ENDPOINTS.CHAT}` : skipConfigInfo.chatURL;
+    LogStatus(`   >>> HandleSkipRequest: Sending request to Skip API: ${chatURL}`);
 
     if (conversationDetailCount > 10) {
       // Set status of conversation to Available since we still want to allow the user to ask questions
@@ -2459,7 +2478,7 @@ cycle.`);
     let response;
     try {
       response = await sendPostRequest(
-        skipConfigInfo.chatURL,
+        chatURL,
         input,
         true,
         this.buildSkipPostHeaders(),
@@ -3259,7 +3278,9 @@ cycle.`);
       }
       
       // Check if we have a valid endpoint when cycles are enabled
-      if (!skipConfigInfo.learningCycleURL || skipConfigInfo.learningCycleURL.trim().length === 0) {
+      const hasLearningEndpoint = (skipConfigInfo.url && skipConfigInfo.url.trim().length > 0) ||
+                                  (skipConfigInfo.learningCycleURL && skipConfigInfo.learningCycleURL.trim().length > 0);
+      if (!hasLearningEndpoint) {
         return {
           Success: false,
           Message: 'Learning cycle API endpoint is not configured'
@@ -3394,6 +3415,7 @@ cycle.`);
       };
     }
   }
+
 }
 
 export default AskSkipResolver;

package/src/resolvers/ComponentRegistryResolver.ts

@@ -1,15 +1,17 @@
-import { Arg, Ctx, Field, InputType, ObjectType, Query, Resolver } from 'type-graphql';
+import { Arg, Ctx, Field, InputType, ObjectType, Query, Mutation, Resolver } from 'type-graphql';
 import { UserInfo, Metadata, LogError, LogStatus } from '@memberjunction/core';
 import { UserCache } from '@memberjunction/sqlserver-dataprovider';
 import { ComponentEntity, ComponentRegistryEntity, ComponentMetadataEngine } from '@memberjunction/core-entities';
 import { ComponentSpec } from '@memberjunction/interactive-component-types';
-import { 
+import {
     ComponentRegistryClient,
     ComponentResponse,
     ComponentSearchResult,
     DependencyTree,
     RegistryError,
-    RegistryErrorCode
+    RegistryErrorCode,
+    ComponentFeedbackParams as SDKComponentFeedbackParams,
+    ComponentFeedbackResponse as SDKComponentFeedbackResponse
 } from '@memberjunction/component-registry-client-sdk';
 import { AppContext } from '../types.js';
 import { configInfo } from '../config.js';
@@ -96,6 +98,61 @@ class ComponentDependencyTreeType {
     dependencies?: ComponentDependencyTreeType[];
 }
 
+/**
+ * Input type for submitting component feedback
+ * Registry-agnostic feedback collection for any component from any registry
+ */
+@InputType()
+class ComponentFeedbackInput {
+    @Field()
+    componentName: string;
+
+    @Field()
+    componentNamespace: string;
+
+    @Field({ nullable: true })
+    componentVersion?: string;
+
+    @Field({ nullable: true })
+    registryName?: string;
+
+    @Field()
+    rating: number;
+
+    @Field({ nullable: true })
+    feedbackType?: string;
+
+    @Field({ nullable: true })
+    comments?: string;
+
+    @Field({ nullable: true })
+    conversationID?: string;
+
+    @Field({ nullable: true })
+    conversationDetailID?: string;
+
+    @Field({ nullable: true })
+    reportID?: string;
+
+    @Field({ nullable: true })
+    dashboardID?: string;
+}
+
+/**
+ * Response type for component feedback submission
+ */
+@ObjectType()
+class ComponentFeedbackResponse {
+    @Field()
+    success: boolean;
+
+    @Field({ nullable: true })
+    feedbackID?: string;
+
+    @Field({ nullable: true })
+    error?: string;
+}
+
 /**
  * Resolver for Component Registry operations
  * 
@@ -153,7 +210,8 @@ export class ComponentRegistryExtendedResolver {
                 namespace,
                 name,
                 version: version || 'latest',
-                hash: hash
+                hash: hash,
+                userEmail: user.Email
             });
             
             // If not modified (304), return response with notModified flag
@@ -532,4 +590,75 @@ export class ComponentRegistryExtendedResolver {
             limit: result.limit
         };
     }
+
+    /**
+     * Send feedback for a component from any registry
+     * This is a registry-agnostic mutation that allows feedback collection
+     * for components from any source registry (Skip, MJ Central, etc.)
+     */
+    @Mutation(() => ComponentFeedbackResponse)
+    async SendComponentFeedback(
+        @Arg('feedback') feedback: ComponentFeedbackInput,
+        @Ctx() { userPayload }: AppContext
+    ): Promise<ComponentFeedbackResponse> {
+        try {
+            // Get user from cache
+            const user = UserCache.Instance.Users.find((u) => u.Email.trim().toLowerCase() === userPayload.email?.trim().toLowerCase());
+            if (!user) {
+                return {
+                    success: false,
+                    error: `User ${userPayload.email} not found in UserCache`
+                };
+            }
+
+            // Registry name is required for feedback submission
+            if (!feedback.registryName) {
+                return {
+                    success: false,
+                    error: 'Registry name is required for feedback submission'
+                };
+            }
+
+            // Get registry configuration
+            const registry = await this.getRegistryByName(feedback.registryName, user);
+            if (!registry) {
+                return {
+                    success: false,
+                    error: `Registry not found: ${feedback.registryName}`
+                };
+            }
+
+            // Check user permissions
+            await this.checkUserAccess(user, registry.ID);
+
+            // Create client using the same pattern as GetRegistryComponent
+            // This respects REGISTRY_URI_OVERRIDE_* and REGISTRY_API_KEY_* environment variables
+            const registryClient = this.createClientForRegistry(registry);
+
+            const sdkParams: SDKComponentFeedbackParams = {
+                componentName: feedback.componentName,
+                componentNamespace: feedback.componentNamespace,
+                componentVersion: feedback.componentVersion,
+                registryName: feedback.registryName,
+                rating: feedback.rating,
+                feedbackType: feedback.feedbackType,
+                comments: feedback.comments,
+                conversationID: feedback.conversationID,
+                conversationDetailID: feedback.conversationDetailID,
+                reportID: feedback.reportID,
+                dashboardID: feedback.dashboardID,
+                userEmail: user.Email  // Pass the authenticated user's email to the registry
+            };
+
+            const result = await registryClient.submitFeedback(sdkParams);
+
+            return result;
+        } catch (error) {
+            LogError(error);
+            return {
+                success: false,
+                error: error instanceof Error ? error.message : 'Unknown error'
+            };
+        }
+    }
 }

package/src/resolvers/CreateQueryResolver.ts

@@ -3,7 +3,7 @@ import { AppContext } from '../types.js';
 import { LogError, Metadata, RunView, UserInfo, CompositeKey, DatabaseProviderBase } from '@memberjunction/core';
 import { RequireSystemUser } from '../directives/RequireSystemUser.js';
 import { QueryCategoryEntity, QueryPermissionEntity } from '@memberjunction/core-entities';
-import { QueryResolver } from '../generated/generated.js';
+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';
@@ -294,7 +294,7 @@ export class DeleteQueryResultType {
 }
 
 @Resolver()
-export class QueryResolverExtended extends QueryResolver {
+export class MJQueryResolverExtended extends MJQueryResolver {
     /**
      * Creates a new query with the provided attributes. This mutation is restricted to system users only.
      * @param input - CreateQuerySystemUserInput containing all the query attributes
@@ -373,7 +373,7 @@ export class QueryResolverExtended extends QueryResolver {
             LogError(err);
             return {
                 Success: false,
-                ErrorMessage: `QueryResolverExtended::CreateQuerySystemUser --- Error creating query: ${err instanceof Error ? err.message : String(err)}`
+                ErrorMessage: `MJQueryResolverExtended::CreateQuerySystemUser --- Error creating query: ${err instanceof Error ? err.message : String(err)}`
             };
         }
     }
@@ -553,7 +553,7 @@ export class QueryResolverExtended extends QueryResolver {
             LogError(err);
             return {
                 Success: false,
-                ErrorMessage: `QueryResolverExtended::UpdateQuerySystemUser --- Error updating query: ${err instanceof Error ? err.message : String(err)}`
+                ErrorMessage: `MJQueryResolverExtended::UpdateQuerySystemUser --- Error updating query: ${err instanceof Error ? err.message : String(err)}`
             };
         }
     }
@@ -578,7 +578,7 @@ export class QueryResolverExtended extends QueryResolver {
             if (!ID || ID.trim() === '') {
                 return {
                     Success: false,
-                    ErrorMessage: 'QueryResolverExtended::DeleteQuerySystemResolver --- Invalid query ID: ID cannot be null or empty'
+                    ErrorMessage: 'MJQueryResolverExtended::DeleteQuerySystemResolver --- Invalid query ID: ID cannot be null or empty'
                 };
             }
 
@@ -610,7 +610,7 @@ export class QueryResolverExtended extends QueryResolver {
             LogError(err);
             return {
                 Success: false,
-                ErrorMessage: `QueryResolverExtended::DeleteQuerySystemResolver --- Error deleting query: ${err instanceof Error ? err.message : String(err)}`
+                ErrorMessage: `MJQueryResolverExtended::DeleteQuerySystemResolver --- Error deleting query: ${err instanceof Error ? err.message : String(err)}`
             };
         }
     }

package/src/resolvers/EntityResolver.ts

@@ -1,13 +1,13 @@
 import { EntityPermissionType, IRunViewProvider } from '@memberjunction/core';
 import { AppContext } from '../types.js';
 import { Arg, Ctx, Query, Resolver, InputType, Field } from 'type-graphql';
-import { Entity_, EntityResolverBase } from '../generated/generated.js';
+import { MJEntity_, MJEntityResolverBase } from '../generated/generated.js';
 import sql from 'mssql';
 import { GetReadOnlyProvider } from '../util.js';
 
-@Resolver(Entity_)
-export class EntityResolver extends EntityResolverBase {
-  @Query(() => [Entity_])
+@Resolver(MJEntity_)
+export class EntityResolver extends MJEntityResolverBase {
+  @Query(() => [MJEntity_])
   async EntitiesBySchemas(
     @Ctx() { providers, userPayload }: AppContext,
     @Arg('IncludeSchemas', () => [String], { nullable: true }) IncludeSchemas?: string[],

package/src/resolvers/FileCategoryResolver.ts

@@ -2,13 +2,13 @@ import { CompositeKey, EntityDeleteOptions, EntityPermissionType, EntitySaveOpti
 import { FileCategoryEntity, FileEntity } from '@memberjunction/core-entities';
 import { AppContext, Arg, Ctx, DeleteOptionsInput, Int, Mutation } from '@memberjunction/server';
 import { mj_core_schema } from '../config.js';
-import { FileCategoryResolver as FileCategoryResolverBase, FileCategory_ } from '../generated/generated.js';
+import { MJFileCategoryResolver as FileCategoryResolverBase, MJFileCategory_ } from '../generated/generated.js';
 import sql from 'mssql';
 import { SQLServerDataProvider } from '@memberjunction/sqlserver-dataprovider';
 import { GetReadWriteProvider } from '../util.js';
 
 export class FileResolver extends FileCategoryResolverBase {
-  @Mutation(() => FileCategory_)
+  @Mutation(() => MJFileCategory_)
   async DeleteFileCategory(
     @Arg('ID', () => String) ID: string,
     @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput,

package/src/resolvers/FileResolver.ts

@@ -17,7 +17,7 @@ import {
   Root,
 } from '@memberjunction/server';
 import { createDownloadUrl, createUploadUrl, deleteObject, moveObject } from '@memberjunction/storage';
-import { CreateFileInput, FileResolver as FileResolverBase, File_, UpdateFileInput } from '../generated/generated.js';
+import { CreateMJFileInput, MJFileResolver as FileResolverBase, MJFile_, UpdateMJFileInput } from '../generated/generated.js';
 import { FieldMapper } from '@memberjunction/graphql-dataprovider';
 import { GetReadOnlyProvider } from '../util.js';
 
@@ -29,8 +29,8 @@ export class CreateUploadURLInput {
 
 @ObjectType()
 export class CreateFilePayload {
-  @Field(() => File_)
-  File: File_;
+  @Field(() => MJFile_)
+  File: MJFile_;
   @Field(() => String)
   UploadUrl: string;
   @Field(() => Boolean)
@@ -38,16 +38,16 @@ export class CreateFilePayload {
 }
 
 @ObjectType()
-export class FileExt extends File_ {
+export class FileExt extends MJFile_ {
   @Field(() => String)
   DownloadUrl: string;
 }
 
-@Resolver(File_)
+@Resolver(MJFile_)
 export class FileResolver extends FileResolverBase {
   @Mutation(() => CreateFilePayload)
   async CreateFile(
-    @Arg('input', () => CreateFileInput) input: CreateFileInput,
+    @Arg('input', () => CreateMJFileInput) input: CreateMJFileInput,
     @Ctx() context: AppContext,
     @PubSub() pubSub: PubSubEngine
   ) {
@@ -86,7 +86,7 @@ export class FileResolver extends FileResolverBase {
   }
 
   @FieldResolver(() => String)
-  async DownloadUrl(@Root() file: File_, @Ctx() { userPayload }: AppContext) {
+  async DownloadUrl(@Root() file: MJFile_, @Ctx() { userPayload }: AppContext) {
     const md = new Metadata();
     const user = this.GetUserFromPayload(userPayload);
     const fileEntity = await md.GetEntityObject<FileEntity>('Files', user);
@@ -100,9 +100,9 @@ export class FileResolver extends FileResolverBase {
     return url;
   }
 
-  @Mutation(() => File_)
+  @Mutation(() => MJFile_)
   async UpdateFile(
-    @Arg('input', () => UpdateFileInput) input: UpdateFileInput,
+    @Arg('input', () => UpdateMJFileInput) input: UpdateMJFileInput,
     @Ctx() context: AppContext,
     @PubSub() pubSub: PubSubEngine
   ) {
@@ -124,11 +124,11 @@ export class FileResolver extends FileResolverBase {
       }
     }
 
-    const updatedFile = await super.UpdateFile(input, context, pubSub);
+    const updatedFile = await super.UpdateMJFile(input, context, pubSub);
     return updatedFile;
   }
 
-  @Mutation(() => File_)
+  @Mutation(() => MJFile_)
   async DeleteFile(
     @Arg('ID', () => String) ID: string,
     @Arg('options___', () => DeleteOptionsInput) options: DeleteOptionsInput,
@@ -152,6 +152,6 @@ export class FileResolver extends FileResolverBase {
       await deleteObject(providerEntity, fileEntity.ProviderKey ?? fileEntity.Name);
     }
 
-    return super.DeleteFile(ID, options, context, pubSub);
+    return super.DeleteMJFile(ID, options, context, pubSub);
   }
 }

package/src/resolvers/PotentialDuplicateRecordResolver.ts

@@ -10,12 +10,11 @@ import {
 import { AppContext } from '../types.js';
 import { UserCache } from '@memberjunction/sqlserver-dataprovider';
 
-//load the default vectorDB and embedding model
-import { LoadMistralEmbedding } from '@memberjunction/ai-mistral';
+//load the default vectorDB
 import { LoadPineconeVectorDB } from '@memberjunction/ai-vectors-pinecone';
 import { CompositeKeyInputType, CompositeKeyOutputType, KeyValuePairOutputType } from '../generic/KeyInputOutputTypes.js';
 import { GetReadOnlyProvider } from '../util.js';
-LoadMistralEmbedding();
+// AI provider loading now handled by @memberjunction/aiengine
 LoadPineconeVectorDB();
 
 @InputType()

package/src/resolvers/RunAIAgentResolver.ts

@@ -9,6 +9,7 @@ import { ResolverBase } from '../generic/ResolverBase.js';
 import { PUSH_STATUS_UPDATES_TOPIC } from '../generic/PushStatusResolver.js';
 import { RequireSystemUser } from '../directives/RequireSystemUser.js';
 import { GetReadWriteProvider } from '../util.js';
+import { SafeJSONParse } from '@memberjunction/global';
 
 @ObjectType()
 export class AIAgentRunResult {
@@ -22,7 +23,7 @@ export class AIAgentRunResult {
     executionTimeMs?: number;
 
     @Field()
-    payload: string; // JSON serialized ExecuteAgentResult with scalars only
+    result: string; // JSON serialized ExecuteAgentResult with scalars only
 }
 
 @ObjectType()
@@ -312,10 +313,12 @@ export class RunAIAgentResolver extends ResolverBase {
         sessionId: string,
         pubSub: PubSubEngine,
         data?: string,
+        payload?: string,   
         templateData?: string,
         lastRunId?: string,
         autoPopulateLastRunPayload?: boolean,
-        configurationId?: string
+        configurationId?: string,
+        conversationDetailId?: string
     ): Promise<AIAgentRunResult> {
         const startTime = Date.now();
         
@@ -355,13 +358,15 @@ export class RunAIAgentResolver extends ResolverBase {
             const result = await agentRunner.RunAgent({
                 agent: agentEntity,
                 conversationMessages: parsedMessages,
+                payload: payload ? SafeJSONParse(payload) : undefined,
                 contextUser: currentUser,
                 onProgress: this.createProgressCallback(pubSub, sessionId, userPayload, agentRunRef),
                 onStreaming: this.createStreamingCallback(pubSub, sessionId, userPayload, agentRunRef),
                 lastRunId: lastRunId,
                 autoPopulateLastRunPayload: autoPopulateLastRunPayload,
                 configurationId: configurationId,
-                data: parsedData
+                data: parsedData,
+                conversationDetailId: conversationDetailId,
             });
 
             // Update agent run ref once available
@@ -376,7 +381,7 @@ export class RunAIAgentResolver extends ResolverBase {
 
             // Create sanitized payload for JSON serialization
             const sanitizedResult = this.sanitizeAgentResult(result);
-            const payload = JSON.stringify(sanitizedResult);
+            const returnResult = JSON.stringify(sanitizedResult);
 
             // Log completion
             if (result.success) {
@@ -389,7 +394,7 @@ export class RunAIAgentResolver extends ResolverBase {
                 success: result.success,
                 errorMessage: result.agentRun?.ErrorMessage || undefined,
                 executionTimeMs: executionTime,
-                payload
+                result: returnResult
             };
 
         } catch (error) {
@@ -407,7 +412,7 @@ export class RunAIAgentResolver extends ResolverBase {
                 success: false,
                 errorMessage: errorResult.errorMessage,
                 executionTimeMs: executionTime,
-                payload: JSON.stringify(errorResult)
+                result: JSON.stringify(errorResult)
             };
         }
     }
@@ -462,10 +467,12 @@ export class RunAIAgentResolver extends ResolverBase {
         @Arg('sessionId') sessionId: string,
         @PubSub() pubSub: PubSubEngine,
         @Arg('data', { nullable: true }) data?: string,
+        @Arg('payload', { nullable: true }) payload?: string,
         @Arg('templateData', { nullable: true }) templateData?: string,
         @Arg('lastRunId', { nullable: true }) lastRunId?: string,
         @Arg('autoPopulateLastRunPayload', { nullable: true }) autoPopulateLastRunPayload?: boolean,
-        @Arg('configurationId', { nullable: true }) configurationId?: string
+        @Arg('configurationId', { nullable: true }) configurationId?: string,
+        @Arg('conversationDetailId', { nullable: true }) conversationDetailId?: string
     ): Promise<AIAgentRunResult> {
         const p = GetReadWriteProvider(providers);
         return this.executeAIAgent(
@@ -476,10 +483,12 @@ export class RunAIAgentResolver extends ResolverBase {
             sessionId,
             pubSub,
             data,
+            payload,
             templateData,
             lastRunId,
             autoPopulateLastRunPayload,
-            configurationId
+            configurationId,
+            conversationDetailId
         );
     }
 
@@ -496,10 +505,12 @@ export class RunAIAgentResolver extends ResolverBase {
         @Arg('sessionId') sessionId: string,
         @PubSub() pubSub: PubSubEngine,
         @Arg('data', { nullable: true }) data?: string,
+        @Arg('payload', { nullable: true }) payload?: string,
         @Arg('templateData', { nullable: true }) templateData?: string,
         @Arg('lastRunId', { nullable: true }) lastRunId?: string,
         @Arg('autoPopulateLastRunPayload', { nullable: true }) autoPopulateLastRunPayload?: boolean,
-        @Arg('configurationId', { nullable: true }) configurationId?: string
+        @Arg('configurationId', { nullable: true }) configurationId?: string,
+        @Arg('conversationDetailId', { nullable: true }) conversationDetailId?: string
     ): Promise<AIAgentRunResult> {
         const p = GetReadWriteProvider(providers);
         return this.executeAIAgent(
@@ -510,10 +521,12 @@ export class RunAIAgentResolver extends ResolverBase {
             sessionId,
             pubSub,
             data,
+            payload,
             templateData,
             lastRunId,
             autoPopulateLastRunPayload,
-            configurationId
+            configurationId,
+            conversationDetailId
         );
     }
  

package/src/resolvers/RunTemplateResolver.ts

@@ -1,9 +1,8 @@
 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 { TemplateContentEntity } from '@memberjunction/core-entities';
+import { TemplateContentEntity, TemplateEntityExtended } from '@memberjunction/core-entities';
 import { TemplateEngineServer } from '@memberjunction/templates';
-import { TemplateEntityExtended } from '@memberjunction/templates-base-types';
 import { ResolverBase } from '../generic/ResolverBase.js';
 import { GetReadWriteProvider } from '../util.js';