@memberjunction/ai-prompts 6.2.0-edge.2 → 6.2.0-edge.3

package/README.md

@@ -198,6 +198,14 @@ Hierarchical credential resolution for API keys:
 5. `AIPromptParams.apiKeys[]` (legacy runtime keys)
 6. `AI_VENDOR_API_KEY__<DRIVER>` environment variables (legacy)
 
+**Credential scope.** `AIPromptParams.CredentialScope` (`'Any' | 'RuntimeOnly'`, default `'Any'`)
+decides which of these tiers a run may use. Under `'RuntimeOnly'` only 1 and 5 count — the caller's
+own `credentialId` and `apiKeys`. Credential bindings, the vendor default and environment keys are
+skipped, a candidate the run has no key for is unavailable, so failover stays on the caller's
+vendors, and a run the keys do not cover fails with *"… The credential scope is RuntimeOnly …"*
+instead of running on the platform's account. Prompts the runner starts on a caller's behalf (JSON
+repair, the result-selector judge, decisions' chat prompts) run under the caller's scope.
+
 ### Failover
 
 When a model fails due to rate limiting, authentication errors, or other transient issues, the runner can automatically retry with alternate models from the selection candidates.

package/dist/AIPromptRunner.d.ts

@@ -321,8 +321,29 @@ export declare class AIPromptRunner extends BaseModelRunner {
      * otherwise succeed, so any configuration problem resolves to the path that has always worked.
      */
     ResolveNativeToolCallingDecision(prompt: MJAIPromptEntityExtended, params: AIPromptParams, model: MJAIModelEntityExtended, vendorId: string | null, promptModelConfiguration?: AIPromptConfiguration | null): NativeToolCallingDecision;
+    /**
+     * Returns the template data with `_NATIVE_TOOL_CALLING` and `_NATIVE_CONTROL_FLOW` set.
+     *
+     * With a decision, both carry the gate's real answer. Without one (a run that declares no tools),
+     * they are set to the envelope path's values unless the caller already supplied them. The Loop
+     * system prompt reads both unconditionally, so template parameter extraction marks them required,
+     * and a run that left them unset failed to render.
+     *
+     * @param data The caller's template data, if any
+     * @param decision The resolved native tool-calling decision, or null when no tools were declared
+     */
+    protected ApplyNativeTemplateFlags(data: Record<string, unknown> | undefined, decision: NativeToolCallingDecision | null): Record<string, unknown>;
     /** @deprecated Use {@link ResolveNativeToolCallingDecision}. */
     resolveNativeToolCallingDecision(prompt: MJAIPromptEntityExtended, params: AIPromptParams, model: MJAIModelEntityExtended, vendorId: string | null, promptModelConfiguration?: AIPromptConfiguration | null): NativeToolCallingDecision;
+    /**
+     * The merged catalog configuration for the selected model on the selected vendor.
+     *
+     * Must resolve the INFERENCE PROVIDER row, not the Model Developer row: most models carry two
+     * AIModelVendor rows for the same VendorID, and ModelVendors has no guaranteed order. Picking the
+     * developer row merges an empty config layer and silently drops any per-serving-path LLM.* knob
+     * (notably the SupportsNativeToolCalling kill switch).
+     */
+    private catalogConfigurationFor;
     private applyNativeToolCalling;
     /**
      * Whether a failed result failed for a TOOLS-specific reason, and so is worth one retry with the

package/dist/AIPromptRunner.d.ts.map

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

package/dist/AIPromptRunner.js

@@ -1,8 +1,8 @@
-import { BaseLLM, ChatParams, ChatMessageRole, ErrorAnalyzer, ResolveFileInputStrategy, EncodeToolTurnsAsText } from '@memberjunction/ai';
+import { BaseLLM, ChatParams, ChatMessageRole, ErrorAnalyzer, ResolveFileInputStrategy, EncodeToolTurnsAsText, CredentialScopeAllows } from '@memberjunction/ai';
 import { BaseModelRunner, } from './BaseModelRunner.js';
-import { GetToolCallingDecision, GetToolCallingMode, RecordToolCallingDecision, RecordToolCallingMode, ResolveNativeToolCalling } from './nativeToolCallingGate.js';
+import { GetToolCallingDecision, GetToolCallingMode, RecordToolCallingDecision, RecordToolCallingMode, ResolveNativeToolCalling, ResolveToolChoiceForRequest } from './nativeToolCallingGate.js';
 import { AIModelRunner } from './AIModelRunner.js';
-import { AIModelSelectionInfo } from '@memberjunction/ai-core-plus';
+import { AIModelSelectionInfo, PickPromptExecutionScope } from '@memberjunction/ai-core-plus';
 import { LogStatus, IsVerboseLoggingEnabled, Metadata } from '@memberjunction/core';
 import { CleanJSON, RepairJSONEscaping, MJGlobal, JSONValidator, ValidationResult, ValidationErrorInfo, ValidationErrorType, UUIDsEqual, NormalizeUUID } from '@memberjunction/global';
 import { TemplateEngineServer } from '@memberjunction/templates';
@@ -174,7 +174,7 @@ export class AIPromptRunner extends BaseModelRunner {
                 // Select model using the appropriate prompt — capture the FULL result
                 selection = await this.selectModel(modelSelectionPrompt, params.override?.modelId, params.contextUser, params.configurationId, params.override?.vendorId, params);
                 if (!selection.model) {
-                    throw new Error(this.buildNoModelFoundMessage(modelSelectionPrompt.Name, selection.selectionInfo));
+                    throw new Error(this.buildNoModelFoundMessage(modelSelectionPrompt.Name, selection.selectionInfo, params.CredentialScope));
                 }
                 // Tell the template which path this run is actually taking, BEFORE it renders. The loop
                 // template drops its action catalog and the `'Actions'` step type under native mode
@@ -190,15 +190,10 @@ export class AIPromptRunner extends BaseModelRunner {
                 // actually selected — not merely the caller's override, which is usually absent — and the
                 // selected candidate's AIPromptModel bag. Resolving without those skips the two layers the
                 // capability is normally declared on and silently inverts the decision.
-                if (params.tools?.length) {
-                    const nativeDecision = this.ResolveNativeToolCallingDecision(prompt, params, selection.model, selection.selectionInfo?.vendorSelected?.ID ?? params.override?.vendorId ?? null, selection.promptModelConfiguration);
-                    params.data = {
-                        ...(params.data ?? {}),
-                        _NATIVE_TOOL_CALLING: nativeDecision.useNativeTools,
-                        // The template renders the implicit-mode section only when this is the gate's REAL answer.
-                        _NATIVE_CONTROL_FLOW: nativeDecision.controlFlow
-                    };
-                }
+                const nativeDecision = params.tools?.length
+                    ? this.ResolveNativeToolCallingDecision(prompt, params, selection.model, selection.selectionInfo?.vendorSelected?.ID ?? params.override?.vendorId ?? null, selection.promptModelConfiguration)
+                    : null;
+                params.data = this.ApplyNativeTemplateFlags(params.data, nativeDecision);
                 // Check if we have a system prompt override
                 if (params.systemPromptOverride) {
                     // Use the override instead of rendering child templates and parent template
@@ -253,7 +248,7 @@ export class AIPromptRunner extends BaseModelRunner {
                 }
                 selection = await this.selectModel(modelSelectionPrompt, params.override?.modelId, params.contextUser, params.configurationId, params.override?.vendorId, params);
                 if (!selection.model) {
-                    throw new Error(this.buildNoModelFoundMessage(modelSelectionPrompt.Name, selection.selectionInfo));
+                    throw new Error(this.buildNoModelFoundMessage(modelSelectionPrompt.Name, selection.selectionInfo, params.CredentialScope));
                 }
             }
             // Check if we need parallel execution based on ParallelizationMode
@@ -373,7 +368,7 @@ export class AIPromptRunner extends BaseModelRunner {
             allCandidates = modelResult.allCandidates || [];
             credentialAvailability = modelResult.credentialAvailability;
             if (!selectedModel) {
-                throw new Error(this.buildNoModelFoundMessage(modelSelectionPrompt.Name, modelSelectionInfo));
+                throw new Error(this.buildNoModelFoundMessage(modelSelectionPrompt.Name, modelSelectionInfo, params.CredentialScope));
             }
         }
         // Check for cancellation after model selection
@@ -535,7 +530,7 @@ export class AIPromptRunner extends BaseModelRunner {
                 method: 'PromptSelector',
                 selectorPromptId: prompt.ResultSelectorPromptID,
             };
-            const aiSelectedResult = await this.ParallelCoordinator.selectBestResult(successfulResults, selectionConfig, consolidatedPromptRun.ID, params.cancellationToken, params.contextUser);
+            const aiSelectedResult = await this.ParallelCoordinator.selectBestResult(successfulResults, selectionConfig, consolidatedPromptRun.ID, params.cancellationToken, params.contextUser, PickPromptExecutionScope(params));
             if (aiSelectedResult) {
                 selectedResult = aiSelectedResult;
             }
@@ -1253,7 +1248,7 @@ export class AIPromptRunner extends BaseModelRunner {
      * Includes details about which models were considered and why they were unavailable
      * so the error message is actionable for end users (e.g., missing API credentials).
      */
-    buildNoModelFoundMessage(promptName, selectionInfo) {
+    buildNoModelFoundMessage(promptName, selectionInfo, credentialScope) {
         const base = `No suitable model found for prompt ${promptName}`;
         // A selection step that threw (for example the model-type floor) records its error here; show it
         // rather than the generic "no candidates" text. Every other reason keeps its detailed message below.
@@ -1271,9 +1266,14 @@ export class AIPromptRunner extends BaseModelRunner {
                 return `${m.model.Name}/${vendorName}`;
             }).join(', ');
             const suffix = unavailableModels.length > 5 ? ` (${unavailableModels.length} total)` : '';
+            // When the scope rules out the platform's credentials, "configure them" would point the reader
+            // at exactly the fallback the caller ruled out.
+            const platformAllowed = CredentialScopeAllows(credentialScope, 'Environment') || CredentialScopeAllows(credentialScope, 'PlatformCredential');
+            const remedy = platformAllowed
+                ? `Please configure API credentials in your environment or AI Credential settings.`
+                : `The credential scope is ${credentialScope}, so only the API keys supplied with this run count; supply a key for one of these vendors.`;
             return `${base}. No valid API credentials/keys are configured for any of the candidate model-vendor combinations. ` +
-                `Tried: ${triedSummary}${suffix}. ` +
-                `Please configure API credentials in your environment or AI Credential settings.`;
+                `Tried: ${triedSummary}${suffix}. ${remedy}`;
         }
         return `${base}. ${selectionInfo.selectionReason || 'Unknown reason'}`;
     }
@@ -1416,14 +1416,7 @@ export class AIPromptRunner extends BaseModelRunner {
     ResolveNativeToolCallingDecision(prompt, params, model, vendorId, promptModelConfiguration) {
         try {
             return ResolveNativeToolCalling({
-                catalogConfiguration: AIEngine.Instance.GetEffectiveModelConfiguration(model.ID, vendorId
-                    // Must be the INFERENCE PROVIDER row, not the Model Developer row: most models carry
-                    // two AIModelVendor rows for the same VendorID, and ModelVendors has no guaranteed
-                    // order. Picking the developer row merges an empty config layer and silently drops any
-                    // per-serving-path LLM.* knob (notably the SupportsNativeToolCalling kill switch).
-                    ? model.ModelVendors?.find(mv => UUIDsEqual(mv.VendorID, vendorId)
-                        && mv.Status === 'Active' && this.IsInferenceProvider(mv))?.ID
-                    : undefined),
+                catalogConfiguration: this.catalogConfigurationFor(model, vendorId),
                 promptConfiguration: prompt.PromptConfigurationObject,
                 promptModelConfiguration,
                 // Action tools and control-flow tools are counted separately: under the hybrid the control
@@ -1438,10 +1431,51 @@ export class AIPromptRunner extends BaseModelRunner {
             return { useNativeTools: false, mode: 'Envelope', controlFlow: 'envelope', toolResults: false };
         }
     }
+    /**
+     * Returns the template data with `_NATIVE_TOOL_CALLING` and `_NATIVE_CONTROL_FLOW` set.
+     *
+     * With a decision, both carry the gate's real answer. Without one (a run that declares no tools),
+     * they are set to the envelope path's values unless the caller already supplied them. The Loop
+     * system prompt reads both unconditionally, so template parameter extraction marks them required,
+     * and a run that left them unset failed to render.
+     *
+     * @param data The caller's template data, if any
+     * @param decision The resolved native tool-calling decision, or null when no tools were declared
+     */
+    ApplyNativeTemplateFlags(data, decision) {
+        const current = data ?? {};
+        if (decision) {
+            return {
+                ...current,
+                _NATIVE_TOOL_CALLING: decision.useNativeTools,
+                // The template renders the implicit-mode section only when this is the gate's REAL answer.
+                _NATIVE_CONTROL_FLOW: decision.controlFlow
+            };
+        }
+        return {
+            ...current,
+            _NATIVE_TOOL_CALLING: current._NATIVE_TOOL_CALLING ?? false,
+            _NATIVE_CONTROL_FLOW: current._NATIVE_CONTROL_FLOW ?? 'envelope'
+        };
+    }
     /** @deprecated Use {@link ResolveNativeToolCallingDecision}. */
     resolveNativeToolCallingDecision(prompt, params, model, vendorId, promptModelConfiguration) {
         return this.ResolveNativeToolCallingDecision(prompt, params, model, vendorId, promptModelConfiguration);
     }
+    /**
+     * The merged catalog configuration for the selected model on the selected vendor.
+     *
+     * Must resolve the INFERENCE PROVIDER row, not the Model Developer row: most models carry two
+     * AIModelVendor rows for the same VendorID, and ModelVendors has no guaranteed order. Picking the
+     * developer row merges an empty config layer and silently drops any per-serving-path LLM.* knob
+     * (notably the SupportsNativeToolCalling kill switch).
+     */
+    catalogConfigurationFor(model, vendorId) {
+        return AIEngine.Instance.GetEffectiveModelConfiguration(model.ID, vendorId
+            ? model.ModelVendors?.find(mv => UUIDsEqual(mv.VendorID, vendorId)
+                && mv.Status === 'Active' && this.IsInferenceProvider(mv))?.ID
+            : undefined);
+    }
     applyNativeToolCalling(chatParams, prompt, params, model, vendorId, promptModelConfiguration) {
         const decision = this.ResolveNativeToolCallingDecision(prompt, params, model, vendorId, promptModelConfiguration);
         if (decision.warning) {
@@ -1455,7 +1489,7 @@ export class AIPromptRunner extends BaseModelRunner {
             chatParams.tools = decision.controlFlow === 'implicit'
                 ? params.tools
                 : params.tools?.filter((t) => !control.has(t.name));
-            chatParams.toolChoice = params.toolChoice;
+            chatParams.toolChoice = ResolveToolChoiceForRequest(params.toolChoice, chatParams.tools, this.catalogConfigurationFor(model, vendorId));
             chatParams.parallelToolCalls = params.parallelToolCalls;
         }
         // Recorded even on the envelope path, so a run is always attributable to a path. The whole
@@ -1564,6 +1598,13 @@ export class AIPromptRunner extends BaseModelRunner {
             }
             // Resolve credentials using hierarchical resolution (Credentials system with legacy fallback)
             const apiKey = await this.ResolveCredentialForExecution(driverClass, prompt.ID, model.ID, vendorId ?? undefined, params);
+            // No key under a scope that rules out the environment must not reach a driver: the OpenAI and
+            // Anthropic SDKs read OPENAI_API_KEY / ANTHROPIC_API_KEY themselves when handed none. Selection
+            // and failover already skip unkeyed candidates; parallel tasks are planned without the scope.
+            if (!apiKey?.trim() && !CredentialScopeAllows(params.CredentialScope, 'Environment')) {
+                throw new Error(`No credentials found for driver class '${driverClass}': the credential scope is ${params.CredentialScope}, ` +
+                    `and this run carries no API key for it.`);
+            }
             // Create LLM instance with vendor-specific driver class
             llm = MJGlobal.Instance.ClassFactory.CreateInstance(BaseLLM, driverClass, apiKey);
             // Prepare chat parameters
@@ -2799,9 +2840,11 @@ export class AIPromptRunner extends BaseModelRunner {
                     throw new Error('Repair JSON prompt not found in MJ: System category');
                 }
                 // Run the repair prompt
+                // The repair runs inside the caller's run, so it runs on the caller's user, configuration and
+                // credentials — under RuntimeOnly it must not reach a key the caller's prompt could not.
                 const repairResult = await this.ExecutePrompt({
+                    ...PickPromptExecutionScope(params),
                     parentPromptRunId: currentPromptRun.ID,
-                    contextUser: params.contextUser,
                     prompt: repairPrompt,
                     data: {
                         ERROR_MESSAGE: trueError,