n8n 2.44.4 → 2.45.0

package/dist/modules/instance-ai/instance-ai-credit.service.js

@@ -20,71 +20,22 @@ const n8n_workflow_1 = require("n8n-workflow");
 const nanoid_1 = require("nanoid");
 const push_1 = require("../../push");
 const ai_service_1 = require("../../services/ai.service");
-const instance_activation_service_1 = require("../../services/instance-activation.service");
 const telemetry_1 = require("../../telemetry");
-const instance_ai_credit_display_1 = require("./instance-ai-credit-display");
-const instance_ai_settings_service_1 = require("./instance-ai-settings.service");
-const instance_ai_message_repository_1 = require("./repositories/instance-ai-message.repository");
 const instance_ai_thread_repository_1 = require("./repositories/instance-ai-thread.repository");
 let InstanceAiCreditService = InstanceAiCreditService_1 = class InstanceAiCreditService {
     onQuotaExhausted(handler) {
         this.quotaExhaustedHandlers.add(handler);
     }
-    constructor(logger, aiService, telemetry, instanceSettings, push, threadRepo, settingsService, activationService, messageRepo) {
+    constructor(logger, aiService, telemetry, instanceSettings, push, threadRepo) {
         this.aiService = aiService;
         this.telemetry = telemetry;
         this.instanceSettings = instanceSettings;
         this.push = push;
         this.threadRepo = threadRepo;
-        this.settingsService = settingsService;
-        this.activationService = activationService;
-        this.messageRepo = messageRepo;
         this.claimedRunIds = new Set();
         this.quotaExhaustedHandlers = new Set();
-        this.quotaLockConfirmed = false;
-        this.messageThresholdReached = false;
         this.logger = logger.scoped('instance-ai');
     }
-    async ensureQuotaLockApplied(user) {
-        try {
-            if (await this.shouldSkipQuotaLock())
-                return;
-            const activatedAt = await this.activationService.getActivatedAt();
-            const result = await this.aiService.lockInstanceAiQuota(user, activatedAt);
-            this.quotaLockConfirmed = result.quotaLocked;
-            this.logger.info('Applied Instance AI activation lock', {
-                userId: user.id,
-                activatedAt,
-                quotaLocked: result.quotaLocked,
-                creditsQuota: result.creditsQuota,
-                creditsClaimed: result.creditsClaimed,
-            });
-            if (result.quotaLocked) {
-                this.push.sendToUsers({
-                    type: 'updateInstanceAiCredits',
-                    data: (0, instance_ai_credit_display_1.maskCreditsForDisplay)({ ...result, quotaLocked: true }, this.settingsService.isActivationCapped()),
-                }, [user.id]);
-            }
-        }
-        catch (error) {
-            this.logger.warn('Failed to apply Instance AI activation lock', {
-                error: (0, get_error_message_1.getErrorMessage)(error),
-                userId: user.id,
-            });
-        }
-    }
-    async shouldSkipQuotaLock() {
-        if (this.quotaLockConfirmed)
-            return true;
-        if (!this.settingsService.isActivationCapped())
-            return true;
-        if (!this.aiService.isProxyEnabled())
-            return true;
-        if ((await this.activationService.getActivatedAt()) === undefined)
-            return true;
-        this.messageThresholdReached ||= await this.messageRepo.hasAtLeastUserMessages(this.settingsService.getActivationLockMessageThreshold());
-        return !this.messageThresholdReached;
-    }
     async claimRunUsage(user, threadId, dedupeId, usage, status) {
         if (!this.aiService.isProxyEnabled()) {
             this.logger.debug('Skipping Instance AI credit claim: proxy disabled', {
@@ -155,7 +106,13 @@ let InstanceAiCreditService = InstanceAiCreditService_1 = class InstanceAiCredit
         });
         this.push.sendToUsers({
             type: 'updateInstanceAiCredits',
-            data: (0, instance_ai_credit_display_1.maskCreditsForDisplay)({ creditsQuota, creditsClaimed }, this.settingsService.isActivationCapped(), totalCreditsUsed !== undefined ? { threadId, totalCreditsUsed } : undefined),
+            data: {
+                creditsQuota,
+                creditsClaimed,
+                ...(totalCreditsUsed !== undefined
+                    ? { creditsPerThread: { threadId, totalCreditsUsed } }
+                    : {}),
+            },
         }, [user.id]);
         this.telemetry.track('Builder credits claimed', {
             instance_id: this.instanceSettings.instanceId,
@@ -268,6 +225,6 @@ InstanceAiCreditService.CLAIM_DEDUPE_CACHE_SIZE = 1000;
 InstanceAiCreditService.CLAIM_MAX_ATTEMPTS = 3;
 exports.InstanceAiCreditService = InstanceAiCreditService = InstanceAiCreditService_1 = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, ai_service_1.AiService, telemetry_1.Telemetry, n8n_core_1.InstanceSettings, push_1.Push, instance_ai_thread_repository_1.InstanceAiThreadRepository, instance_ai_settings_service_1.InstanceAiSettingsService, instance_activation_service_1.InstanceActivationService, instance_ai_message_repository_1.InstanceAiMessageRepository])
+    __metadata("design:paramtypes", [backend_common_1.Logger, ai_service_1.AiService, telemetry_1.Telemetry, n8n_core_1.InstanceSettings, push_1.Push, instance_ai_thread_repository_1.InstanceAiThreadRepository])
 ], InstanceAiCreditService);
 //# sourceMappingURL=instance-ai-credit.service.js.map

package/dist/modules/instance-ai/instance-ai-credit.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-ai-credit.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-credit.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instance-ai-credit.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-credit.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/instance-ai/instance-ai-model.service.d.ts

@@ -1,4 +1,5 @@
 import { type InstanceAiCredits, type ProxyContext } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import { OutboundHttp } from '@n8n/backend-network';
 import type { User } from '@n8n/db';
 import type { ModelConfig } from '@n8n/instance-ai';
@@ -9,10 +10,16 @@ export declare class InstanceAiModelService {
     private readonly settingsService;
     private readonly aiService;
     private readonly outboundHttp;
-    constructor(settingsService: InstanceAiSettingsService, aiService: AiService, outboundHttp: OutboundHttp);
+    private readonly logger;
+    constructor(settingsService: InstanceAiSettingsService, aiService: AiService, outboundHttp: OutboundHttp, logger: Logger);
     isProxyEnabled(): boolean;
     resolveAgentModelConfig(user: User, proxyContext?: ProxyContext): Promise<ModelConfig>;
-    resolveProxyModel(user: User, proxyBaseUrl: string, tokenManager: ProxyTokenManager, proxyContext?: ProxyContext): Promise<ModelConfig>;
+    resolveMemoryModelConfig(user: User, mainModel: ModelConfig, run: {
+        proxyBaseUrl?: string;
+        tokenManager?: ProxyTokenManager;
+        proxyContext?: ProxyContext;
+    }): Promise<ModelConfig | undefined>;
+    resolveProxyModel(user: User, proxyBaseUrl: string, tokenManager: ProxyTokenManager, proxyContext?: ProxyContext, modelName?: string): Promise<ModelConfig>;
     private resolveHttpProxyModel;
     getCredits(user: User): Promise<InstanceAiCredits>;
 }

package/dist/modules/instance-ai/instance-ai-model.service.js

@@ -12,8 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstanceAiModelService = void 0;
 const agent_config_1 = require("@n8n/ai-utilities/agent-config");
 const api_types_1 = require("@n8n/api-types");
+const backend_common_1 = require("@n8n/backend-common");
 const backend_network_1 = require("@n8n/backend-network");
 const di_1 = require("@n8n/di");
+const get_error_message_1 = require("@n8n/utils/errors/get-error-message");
 const nanoid_1 = require("nanoid");
 const constants_1 = require("../../constants");
 const ai_service_1 = require("../../services/ai.service");
@@ -22,11 +24,13 @@ const ai_proxy_fetch_1 = require("../../utils/ai-proxy-fetch");
 const ai_proxy_language_model_1 = require("../../utils/ai-proxy-language-model");
 const ai_service_retry_1 = require("../../utils/ai-service-retry");
 const instance_ai_settings_service_1 = require("./instance-ai-settings.service");
+const model_config_name_1 = require("./model-config-name");
 let InstanceAiModelService = class InstanceAiModelService {
-    constructor(settingsService, aiService, outboundHttp) {
+    constructor(settingsService, aiService, outboundHttp, logger) {
         this.settingsService = settingsService;
         this.aiService = aiService;
         this.outboundHttp = outboundHttp;
+        this.logger = logger;
     }
     isProxyEnabled() {
         return this.aiService.isProxyEnabled();
@@ -45,10 +49,35 @@ let InstanceAiModelService = class InstanceAiModelService {
             return httpProxyModel;
         return await this.settingsService.resolveModelConfig(user);
     }
-    async resolveProxyModel(user, proxyBaseUrl, tokenManager, proxyContext) {
+    async resolveMemoryModelConfig(user, mainModel, run) {
+        const modelName = this.settingsService.getConfiguredMemoryModelName();
+        if (!modelName)
+            return undefined;
+        try {
+            if (run.proxyBaseUrl && run.tokenManager) {
+                return await this.resolveProxyModel(user, run.proxyBaseUrl, run.tokenManager, run.proxyContext, modelName);
+            }
+            return ((0, model_config_name_1.withModelName)(mainModel, modelName, { dropMainProviderPrefix: true }) ??
+                (await this.resolveHttpProxyModel(user, modelName)));
+        }
+        catch (error) {
+            this.logger.warn('Failed to resolve the Instance AI memory model, using the main model', {
+                modelName,
+                error: (0, get_error_message_1.getErrorMessage)(error),
+            });
+            return undefined;
+        }
+    }
+    async resolveProxyModel(user, proxyBaseUrl, tokenManager, proxyContext, modelName) {
         const configuredModelId = this.settingsService.getConfiguredModelId();
         const isExactKimi = (0, api_types_1.isMoonshotaiKimiK3ModelId)(configuredModelId);
-        const modelId = isExactKimi ? configuredModelId : this.settingsService.resolveModelName(user);
+        const modelId = modelName
+            ? (0, api_types_1.isMoonshotaiKimiK3ModelId)(modelName)
+                ? modelName
+                : (0, model_config_name_1.modelNameForProvider)(modelName, (0, agent_config_1.splitModelId)(configuredModelId).provider)
+            : isExactKimi
+                ? configuredModelId
+                : this.settingsService.resolveModelName(user);
         return await (0, ai_proxy_language_model_1.createProxyLanguageModel)({
             proxyBaseUrl,
             modelId,
@@ -59,7 +88,7 @@ let InstanceAiModelService = class InstanceAiModelService {
             ...proxyContext,
         });
     }
-    async resolveHttpProxyModel(user) {
+    async resolveHttpProxyModel(user, modelNameOverride) {
         const hasHttpProxy = Boolean(process.env.HTTPS_PROXY || process.env.HTTP_PROXY);
         if (!hasHttpProxy)
             return undefined;
@@ -77,7 +106,7 @@ let InstanceAiModelService = class InstanceAiModelService {
             apiKey,
             baseURL: baseURL || undefined,
             fetch: (0, ai_proxy_fetch_1.createAiProxyFetch)(this.outboundHttp),
-        })(modelName);
+        })(modelNameOverride ? (0, model_config_name_1.modelNameForProvider)(modelNameOverride, provider) : modelName);
     }
     async getCredits(user) {
         if (!this.aiService.isProxyEnabled()) {
@@ -90,6 +119,6 @@ let InstanceAiModelService = class InstanceAiModelService {
 exports.InstanceAiModelService = InstanceAiModelService;
 exports.InstanceAiModelService = InstanceAiModelService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [instance_ai_settings_service_1.InstanceAiSettingsService, ai_service_1.AiService, backend_network_1.OutboundHttp])
+    __metadata("design:paramtypes", [instance_ai_settings_service_1.InstanceAiSettingsService, ai_service_1.AiService, backend_network_1.OutboundHttp, backend_common_1.Logger])
 ], InstanceAiModelService);
 //# sourceMappingURL=instance-ai-model.service.js.map

package/dist/modules/instance-ai/instance-ai-model.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-ai-model.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-model.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instance-ai-model.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-model.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/instance-ai/instance-ai-pending-agent.service.d.ts

@@ -15,7 +15,9 @@ export declare class InstanceAiPendingAgentService {
             isRunnable: boolean;
             hasPublishHistory: boolean;
             configHash: string | null;
+            skills: Record<string, import("@n8n/api-types").AgentSkill>;
             skillHashes: Record<string, string>;
+            outdatedSkillIds: string[];
         };
         thread: import("@n8n/api-types").InstanceAiThreadInfo;
     }>;

package/dist/modules/instance-ai/instance-ai-pending-agent.service.js

@@ -18,6 +18,7 @@ const agent_default_model_resolver_service_1 = require("../../modules/agents/age
 const agent_runnable_state_service_1 = require("../../modules/agents/agent-runnable-state.service");
 const agents_service_1 = require("../../modules/agents/agents.service");
 const check_access_1 = require("../../permissions.ee/check-access");
+const agents_access_1 = require("./agents-access");
 const instance_ai_memory_service_1 = require("./instance-ai-memory.service");
 let InstanceAiPendingAgentService = class InstanceAiPendingAgentService {
     constructor(memoryService, moduleRegistry) {
@@ -25,7 +26,7 @@ let InstanceAiPendingAgentService = class InstanceAiPendingAgentService {
         this.moduleRegistry = moduleRegistry;
     }
     agentsModule() {
-        if (!this.moduleRegistry.isActive('agents')) {
+        if (!(0, agents_access_1.isAgentsAccessEnabled)(this.moduleRegistry)) {
             throw new errors_1.NotFoundError('Agents are not enabled on this instance');
         }
         return {

package/dist/modules/instance-ai/instance-ai-pending-agent.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-ai-pending-agent.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-pending-agent.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instance-ai-pending-agent.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-pending-agent.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/instance-ai/instance-ai-run-pin-data.js

@@ -125,7 +125,7 @@ function validateInputDataShape(node, inputData) {
     const formFieldsValue = inputData.formFields;
     const looksWrapped = typeof formFieldsValue === 'object' && formFieldsValue !== null;
     if (looksWrapped) {
-        throw new Error('verify-built-workflow: inputData for a Form Trigger must be a flat field map ' +
+        throw new Error('workflow_builder_verify_built_workflow: inputData for a Form Trigger must be a flat field map ' +
             '(e.g. {name: "Alice", email: "a@b.c"}), NOT wrapped in `formFields`. ' +
             'The production Form Trigger emits fields directly on $json, so downstream ' +
             'expressions like $json.name are correct. Re-run with the flat shape.');

package/dist/modules/instance-ai/instance-ai-run-pin-data.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-ai-run-pin-data.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-run-pin-data.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instance-ai-run-pin-data.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-run-pin-data.ts"],"names":[],"mappings":"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"}

package/dist/modules/instance-ai/instance-ai-settings.service.d.ts

@@ -94,14 +94,13 @@ export declare class InstanceAiSettingsService {
     isAgentEnabled(): boolean;
     isLocalGatewayDisabled(): boolean;
     isBrowserUseEnabled(): boolean;
-    isActivationCapped(): boolean;
-    getActivationLockMessageThreshold(): number;
     getSandboxStatus(): InstanceAiSandboxStatus;
     isInstanceAiEnabled(): boolean;
     isSetupCompleted(): Promise<boolean>;
     isModelConfigured(): Promise<boolean>;
     private resolveSetupState;
     getConfiguredModelId(): string;
+    getConfiguredMemoryModelName(): string;
     resolveModelName(user: User): string;
     resolveModelConfig(user: User): Promise<ModelConfig>;
     resolveModelConfigForVerification(user: User, modelName?: string): Promise<ModelConfig>;

package/dist/modules/instance-ai/instance-ai-settings.service.js

@@ -31,6 +31,7 @@ const sandbox_settings_service_1 = require("../../services/sandbox-settings.serv
 Object.defineProperty(exports, "INSTANCE_AI_DAYTONA_CREDENTIAL_POLICY", { enumerable: true, get: function () { return sandbox_settings_service_1.INSTANCE_AI_DAYTONA_CREDENTIAL_POLICY; } });
 Object.defineProperty(exports, "INSTANCE_AI_N8N_SANDBOX_CREDENTIAL_POLICY", { enumerable: true, get: function () { return sandbox_settings_service_1.INSTANCE_AI_N8N_SANDBOX_CREDENTIAL_POLICY; } });
 const user_service_1 = require("../../services/user.service");
+const model_config_name_1 = require("./model-config-name");
 const sandbox_provider_1 = require("./sandbox-provider");
 const ADMIN_SETTINGS_KEY = 'instanceAi.settings';
 const MODEL_PROVIDER_API_KEY_ENV = new Map([
@@ -816,12 +817,6 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
     isBrowserUseEnabled() {
         return this.config.browserUseEnabled;
     }
-    isActivationCapped() {
-        return this.config.activationCapped;
-    }
-    getActivationLockMessageThreshold() {
-        return this.config.activationLockMessageThreshold;
-    }
     getSandboxStatus() {
         const provider = this.sandboxSettingsService.getProvider();
         const unavailableReason = this.getSandboxUnavailableReason(this.config.sandboxEnabled, provider);
@@ -863,6 +858,9 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
     getConfiguredModelId() {
         return this.config.model.trim();
     }
+    getConfiguredMemoryModelName() {
+        return this.config.memoryModel.trim();
+    }
     resolveModelName(user) {
         const prefs = this.readUserPreferences(user);
         if (this.isDirectSelfManaged() && this.hasEnvironmentModelName())
@@ -894,18 +892,7 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
         const config = await this.resolveModelConfig(user);
         if (!modelName)
             return config;
-        if (typeof config === 'string') {
-            const provider = config.includes('/') ? config.slice(0, config.indexOf('/')) : 'custom';
-            return `${provider}/${modelName}`;
-        }
-        if ('id' in config && typeof config.id === 'string' && 'url' in config) {
-            const provider = config.id.includes('/')
-                ? config.id.slice(0, config.id.indexOf('/'))
-                : 'custom';
-            const id = `${provider}/${modelName}`;
-            return { ...config, id };
-        }
-        return config;
+        return (0, model_config_name_1.withModelName)(config, modelName) ?? config;
     }
     buildModelConfigForConnection(connection, modelName) {
         if (!exports.INSTANCE_AI_MODEL_CREDENTIAL_POLICY.credentialTypes.includes(connection.type)) {