n8n 2.34.3 → 2.35.0

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

@@ -0,0 +1,130 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InstanceAiModelCatalogService = void 0;
+const api_types_1 = require("@n8n/api-types");
+const backend_common_1 = require("@n8n/backend-common");
+const di_1 = require("@n8n/di");
+const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
+const CATALOG_CACHE_TTL_MS = 60 * 60 * 1000;
+const CATALOG_FETCH_TIMEOUT_MS = 5000;
+function emptyCatalogResponse() {
+    return {
+        models: {
+            anthropic: [],
+            openai: [],
+            openrouter: [],
+        },
+    };
+}
+function compareModels(a, b) {
+    const aReleaseTime = a.releaseDate ? Date.parse(a.releaseDate) : Number.NaN;
+    const bReleaseTime = b.releaseDate ? Date.parse(b.releaseDate) : Number.NaN;
+    const aHasReleaseDate = !Number.isNaN(aReleaseTime);
+    const bHasReleaseDate = !Number.isNaN(bReleaseTime);
+    if (aHasReleaseDate && bHasReleaseDate && aReleaseTime !== bReleaseTime) {
+        return bReleaseTime - aReleaseTime;
+    }
+    if (aHasReleaseDate !== bHasReleaseDate)
+        return aHasReleaseDate ? -1 : 1;
+    return a.name.localeCompare(b.name) || a.id.localeCompare(b.id);
+}
+function isEligibleModel(model) {
+    const id = typeof model === 'object' && model !== null ? Reflect.get(model, 'id') : undefined;
+    const name = typeof model === 'object' && model !== null ? Reflect.get(model, 'name') : undefined;
+    const modalities = typeof model === 'object' && model !== null ? Reflect.get(model, 'modalities') : undefined;
+    const output = typeof modalities === 'object' && modalities !== null
+        ? Reflect.get(modalities, 'output')
+        : undefined;
+    return (typeof model === 'object' &&
+        model !== null &&
+        Reflect.get(model, 'toolCall') === true &&
+        Array.isArray(output) &&
+        output.length === 1 &&
+        output[0] === 'text' &&
+        typeof id === 'string' &&
+        id.length > 0 &&
+        typeof name === 'string' &&
+        name.length > 0);
+}
+let InstanceAiModelCatalogService = class InstanceAiModelCatalogService {
+    constructor(logger) {
+        this.logger = logger.scoped('instance-ai');
+    }
+    async getModels() {
+        if (this.cached && Date.now() < this.cached.expiresAt)
+            return this.cached.value;
+        this.fetchPromise ??= this.refresh().finally(() => {
+            this.fetchPromise = undefined;
+        });
+        return await this.fetchPromise;
+    }
+    async refresh() {
+        try {
+            const catalog = await this.fetchCatalogWithTimeout();
+            const value = this.toResponse(catalog);
+            this.cached = { value, expiresAt: Date.now() + CATALOG_CACHE_TTL_MS };
+            return value;
+        }
+        catch (error) {
+            this.logger.warn('Failed to load the Instance AI model catalog', {
+                error: (0, ensure_error_1.ensureError)(error).message,
+            });
+            return this.cached?.value ?? emptyCatalogResponse();
+        }
+    }
+    async fetchCatalogWithTimeout() {
+        const abortController = new AbortController();
+        let timeout;
+        const timeoutPromise = new Promise((_resolve, reject) => {
+            timeout = setTimeout(() => {
+                reject(new Error('Model catalog request timed out'));
+                abortController.abort();
+            }, CATALOG_FETCH_TIMEOUT_MS);
+        });
+        const catalogPromise = this.fetchCatalog(abortController.signal);
+        void catalogPromise.catch(() => undefined);
+        try {
+            return await Promise.race([catalogPromise, timeoutPromise]);
+        }
+        finally {
+            if (timeout)
+                clearTimeout(timeout);
+        }
+    }
+    async fetchCatalog(signal) {
+        const { fetchProviderCatalog } = await import('@n8n/agents/catalog');
+        return await fetchProviderCatalog({ signal });
+    }
+    toResponse(catalog) {
+        const response = emptyCatalogResponse();
+        for (const provider of api_types_1.INSTANCE_AI_CATALOG_PROVIDERS) {
+            response.models[provider] = this.getProviderModels(catalog, provider);
+        }
+        return response;
+    }
+    getProviderModels(catalog, provider) {
+        return Object.values(catalog[provider]?.models ?? {})
+            .filter(isEligibleModel)
+            .map((model) => ({
+            id: model.id,
+            name: model.name,
+            ...(typeof model.releaseDate === 'string' ? { releaseDate: model.releaseDate } : {}),
+        }))
+            .sort(compareModels);
+    }
+};
+exports.InstanceAiModelCatalogService = InstanceAiModelCatalogService;
+exports.InstanceAiModelCatalogService = InstanceAiModelCatalogService = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [backend_common_1.Logger])
+], InstanceAiModelCatalogService);
+//# sourceMappingURL=instance-ai-model-catalog.service.js.map

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

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

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

@@ -1,4 +1,4 @@
-import type { InstanceAiAdminSettingsResponse, InstanceAiAdminSettingsUpdateRequest, InstanceAiUserPreferencesResponse, InstanceAiUserPreferencesUpdateRequest, InstanceAiProviderConnection, InstanceAiPermissions, InstanceAiSandboxProvider } from '@n8n/api-types';
+import type { InstanceAiAdminSettingsResponse, InstanceAiAdminSettingsUpdateRequest, InstanceAiConnectionUpdate, InstanceAiUserPreferencesResponse, InstanceAiUserPreferencesUpdateRequest, InstanceAiProviderConnection, InstanceAiPermissions, InstanceAiSandboxProvider } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
 import { DbLockService, SettingsRepository, UserRepository } from '@n8n/db';
 import type { User } from '@n8n/db';
@@ -37,6 +37,9 @@ export declare class InstanceAiSettingsService {
     private mcpAccessEnabled;
     private permissions;
     private adminModelName;
+    private searchDisabled;
+    private adminN8nSandboxServiceUrl;
+    private readonly environmentN8nSandboxServiceUrl;
     constructor(globalConfig: GlobalConfig, dbLockService: DbLockService, settingsRepository: SettingsRepository, userRepository: UserRepository, userService: UserService, aiService: AiService, credentialsService: CredentialsService, credentialsFinderService: CredentialsFinderService, instanceCredentialBroker: InstanceCredentialBroker, eventService: EventService);
     private get isCloud();
     isProxyEnabled(): boolean;
@@ -53,6 +56,10 @@ export declare class InstanceAiSettingsService {
     reloadFromDb(): Promise<void>;
     getUserPreferences(user: User): Promise<InstanceAiUserPreferencesResponse>;
     updateUserPreferences(user: User, update: InstanceAiUserPreferencesUpdateRequest): Promise<InstanceAiUserPreferencesResponse>;
+    resolveModelConnectionForVerification(connection: InstanceAiConnectionUpdate): Promise<InstanceAiConnectionUpdate>;
+    resolveSandboxConnectionForVerification(connection: InstanceAiConnectionUpdate): Promise<InstanceAiConnectionUpdate>;
+    resolveSearchConnectionForVerification(connection: InstanceAiConnectionUpdate): Promise<InstanceAiConnectionUpdate>;
+    private connectionForVerification;
     listInstanceModelCredentials(): Promise<InstanceAiProviderConnection[]>;
     listInstanceServiceCredentials(): Promise<InstanceAiProviderConnection[]>;
     resolveDaytonaConfig(): Promise<{
@@ -78,19 +85,28 @@ export declare class InstanceAiSettingsService {
     isBrowserUseEnabled(): boolean;
     getSandboxStatus(): InstanceAiSandboxStatus;
     isInstanceAiEnabled(): boolean;
+    isSetupCompleted(): Promise<boolean>;
     resolveModelName(user: User): string;
     resolveModelConfig(user: User): Promise<ModelConfig>;
+    resolveModelConfigForVerification(user: User, modelName?: string): Promise<ModelConfig>;
+    buildModelConfigForConnection(connection: InstanceAiConnectionUpdate, modelName: string): ModelConfig;
     private resolveAdminModelConfig;
     private buildModelConfigFromCredential;
     private buildModelConfig;
     private static readonly MANAGED_ADMIN_FIELDS;
     private static readonly INSTANCE_CREDENTIAL_FIELDS;
     private static readonly MANAGED_PREFERENCE_FIELDS;
+    private rejectEnvironmentManagedFields;
     private deploymentLabel;
     private rejectManagedFields;
     private validateAdminSettingsUpdate;
     private getSandboxUnavailableReason;
     private envVarModelConfig;
+    private hasEnvironmentModelConnection;
+    private hasEnvironmentModelName;
+    private hasEnvironmentSandboxConnection;
+    private hasEnvironmentSearchConnection;
+    private isDirectSelfManaged;
     private envVarModelConfigForModel;
     private extractModelName;
     private applyAdminSettings;

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

@@ -174,9 +174,12 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
         this.mcpAccessEnabled = true;
         this.permissions = { ...api_types_1.DEFAULT_INSTANCE_AI_PERMISSIONS };
         this.adminModelName = null;
+        this.searchDisabled = false;
+        this.adminN8nSandboxServiceUrl = null;
         this.config = globalConfig.instanceAi;
         this.deploymentConfig = globalConfig.deployment;
         this.environmentSandboxProvider = (0, sandbox_provider_1.normalizeSandboxProvider)(this.config.sandboxProvider);
+        this.environmentN8nSandboxServiceUrl = this.config.n8nSandboxServiceUrl;
         this.config.sandboxProvider = this.environmentSandboxProvider;
     }
     get isCloud() {
@@ -243,38 +246,80 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
         const modelProviderApiKeyEnv = MODEL_PROVIDER_API_KEY_ENV.get(c.model.split('/', 1)[0] ?? '');
         const isProxyEnabled = this.aiService.isProxyEnabled();
         const isManaged = this.isCloud || isProxyEnabled;
-        const sandboxProvider = (0, sandbox_provider_1.normalizeSandboxProvider)(c.sandboxProvider);
+        const providerModelApiKeyConfigured = Boolean(modelProviderApiKeyEnv && process.env[modelProviderApiKeyEnv]?.trim());
+        const modelConnectionEnvConfigured = Boolean(c.modelApiKey.trim() || c.modelUrl.trim() || providerModelApiKeyConfigured);
+        const sandboxEnvConfigured = this.hasEnvironmentSandboxConnection();
+        const searchEnvConfigured = this.hasEnvironmentSearchConnection();
+        const directEnvironmentConfig = !isManaged;
+        const sandboxProvider = (0, sandbox_provider_1.normalizeSandboxProvider)(directEnvironmentConfig && sandboxEnvConfigured
+            ? this.environmentSandboxProvider
+            : c.sandboxProvider);
         return {
             enabled: this.enabled,
             permissions: { ...this.permissions },
             mcpAccessEnabled: this.mcpAccessEnabled,
             sandboxEnabled: c.sandboxEnabled,
             sandboxProvider,
-            daytonaCredentialId: isManaged ? null : credentialSelection.daytonaCredentialId,
-            n8nSandboxCredentialId: this.isCloud ? null : credentialSelection.n8nSandboxCredentialId,
-            searchCredentialId: isManaged ? null : credentialSelection.searchCredentialId,
-            modelCredentialId: isManaged ? null : credentialSelection.modelCredentialId,
-            modelName: isManaged ? null : credentialSelection.modelName,
-            modelEnvConfigured: Boolean(c.modelApiKey.trim() ||
-                c.modelUrl.trim() ||
-                (modelProviderApiKeyEnv && process.env[modelProviderApiKeyEnv]?.trim())),
-            sandboxEnvConfigured: sandboxProvider === 'daytona'
-                ? isProxyEnabled || Boolean(c.daytonaApiKey.trim())
-                : Boolean(c.n8nSandboxServiceUrl.trim()),
-            searchEnvConfigured: Boolean(c.braveSearchApiKey.trim() || c.searxngUrl.trim()),
+            daytonaCredentialId: isManaged || (directEnvironmentConfig && sandboxEnvConfigured)
+                ? null
+                : credentialSelection.daytonaCredentialId,
+            n8nSandboxCredentialId: this.isCloud || (directEnvironmentConfig && sandboxEnvConfigured)
+                ? null
+                : credentialSelection.n8nSandboxCredentialId,
+            searchCredentialId: isManaged || (directEnvironmentConfig && searchEnvConfigured)
+                ? null
+                : credentialSelection.searchCredentialId,
+            modelCredentialId: isManaged || (directEnvironmentConfig && modelConnectionEnvConfigured)
+                ? null
+                : credentialSelection.modelCredentialId,
+            modelName: isManaged || this.hasEnvironmentModelName() ? null : credentialSelection.modelName,
+            modelEnvConfigured: modelConnectionEnvConfigured,
+            sandboxEnvConfigured,
+            searchEnvConfigured,
+            searchDisabled: directEnvironmentConfig && searchEnvConfigured ? false : this.searchDisabled,
+            n8nSandboxServiceUrl: this.environmentN8nSandboxServiceUrl
+                ? null
+                : this.adminN8nSandboxServiceUrl,
+            envManaged: {
+                model: {
+                    provider: modelConnectionEnvConfigured,
+                    apiKey: Boolean(c.modelApiKey.trim() || providerModelApiKeyConfigured),
+                    baseUrl: Boolean(c.modelUrl.trim()),
+                    model: Boolean(process.env.N8N_INSTANCE_AI_MODEL?.trim()),
+                },
+                sandbox: {
+                    provider: Boolean(process.env.N8N_INSTANCE_AI_SANDBOX_PROVIDER?.trim()),
+                    serviceUrl: Boolean(this.environmentN8nSandboxServiceUrl.trim()),
+                    apiKey: sandboxProvider === 'daytona'
+                        ? Boolean(c.daytonaApiKey.trim())
+                        : Boolean(c.n8nSandboxServiceApiKey.trim()),
+                },
+                search: {
+                    provider: Boolean(c.braveSearchApiKey.trim() || c.searxngUrl.trim()),
+                    apiKey: Boolean(c.braveSearchApiKey.trim()),
+                    url: Boolean(c.searxngUrl.trim()),
+                },
+            },
             localGatewayDisabled: this.isLocalGatewayDisabled(),
             browserUseEnabled: this.isBrowserUseEnabled(),
         };
     }
     async updateAdminSettings(update, user) {
+        this.rejectEnvironmentManagedFields(update);
         this.rejectManagedFields(update, InstanceAiSettingsService_1.MANAGED_ADMIN_FIELDS, this.deploymentLabel());
         if (this.isCloud) {
             this.rejectManagedFields(update, InstanceAiSettingsService_1.INSTANCE_CREDENTIAL_FIELDS, this.deploymentLabel());
-            this.rejectManagedFields(update, ['modelName', 'sandboxProvider'], this.deploymentLabel());
+            this.rejectManagedFields(update, [
+                'modelName',
+                'sandboxProvider',
+                'sandboxEnabled',
+                'n8nSandboxServiceUrl',
+                'searchDisabled',
+            ], this.deploymentLabel());
         }
         else if (this.aiService.isProxyEnabled()) {
             this.rejectManagedFields(update, ['modelCredentialId', 'searchCredentialId', 'modelConnection', 'searchConnection'], this.deploymentLabel());
-            this.rejectManagedFields(update, ['modelName'], this.deploymentLabel());
+            this.rejectManagedFields(update, ['modelName', 'sandboxEnabled', 'n8nSandboxServiceUrl', 'searchDisabled'], this.deploymentLabel());
             if (update.daytonaCredentialId !== null) {
                 this.rejectManagedFields(update, ['daytonaCredentialId'], this.deploymentLabel());
             }
@@ -287,6 +332,15 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
         let daytonaCredentialId = initialDaytonaCredentialId;
         let n8nSandboxCredentialId = initialN8nSandboxCredentialId;
         let searchCredentialId = initialSearchCredentialId;
+        if (settingsUpdate.searchDisabled === true) {
+            if (searchConnection) {
+                throw new unprocessable_error_1.UnprocessableRequestError('Cannot disable web search while configuring a search connection');
+            }
+            searchCredentialId = null;
+        }
+        else if (searchConnection || typeof searchCredentialId === 'string') {
+            settingsUpdate.searchDisabled = false;
+        }
         this.rejectConnectionConflicts(update);
         if (modelConnection !== undefined ||
             sandboxConnection !== undefined ||
@@ -358,7 +412,13 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
                 n8nSandboxCredentialId !== undefined) &&
                 nextDaytonaCredentialId === null &&
                 nextN8nCredentialId === null;
-            this.validateAdminSettingsUpdate(update, current, clearsSandboxConnection
+            const assignsSandboxConnection = (sandboxConnection !== undefined ||
+                daytonaCredentialId !== undefined ||
+                n8nSandboxCredentialId !== undefined) &&
+                (nextDaytonaCredentialId !== null || nextN8nCredentialId !== null);
+            if (assignsSandboxConnection)
+                settingsUpdate.sandboxEnabled = true;
+            this.validateAdminSettingsUpdate(settingsUpdate, current, clearsSandboxConnection
                 ? this.environmentSandboxProvider
                 : settingsUpdate.sandboxProvider);
             const previous = this.snapshotAdminSettings();
@@ -377,7 +437,7 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
                 if (hasCredential && !hasModelName) {
                     throw new unprocessable_error_1.UnprocessableRequestError('modelName must be set together with modelCredentialId');
                 }
-                if (hasModelName && !hasCredential) {
+                if (hasModelName && !hasCredential && !this.hasEnvironmentModelConnection()) {
                     throw new unprocessable_error_1.UnprocessableRequestError('modelName requires modelCredentialId');
                 }
             }
@@ -588,6 +648,26 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
         user.settings = { ...(user.settings ?? {}), instanceAi: prefs };
         return await this.getUserPreferences(user);
     }
+    async resolveModelConnectionForVerification(connection) {
+        const prepared = await this.prepareConnection(exports.INSTANCE_AI_MODEL_CREDENTIAL_POLICY, 'AI Assistant model', connection);
+        return this.connectionForVerification(prepared);
+    }
+    async resolveSandboxConnectionForVerification(connection) {
+        const prepared = await this.prepareSandboxConnection(connection);
+        return this.connectionForVerification(prepared);
+    }
+    async resolveSearchConnectionForVerification(connection) {
+        const prepared = await this.prepareConnection(exports.INSTANCE_AI_SEARCH_CREDENTIAL_POLICY, 'AI Assistant web search', connection);
+        return this.connectionForVerification(prepared);
+    }
+    connectionForVerification(prepared) {
+        if (!prepared)
+            throw new n8n_workflow_1.UnexpectedError('Prepared provider connection is missing');
+        return {
+            type: prepared.credential.type,
+            data: prepared.credential.data,
+        };
+    }
     async listInstanceModelCredentials() {
         if (this.isCloud || this.aiService.isProxyEnabled())
             return [];
@@ -621,6 +701,11 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
             apiUrl: daytonaApiUrl || undefined,
             apiKey: daytonaApiKey || undefined,
         };
+        if (this.isDirectSelfManaged() &&
+            this.environmentSandboxProvider === 'daytona' &&
+            this.hasEnvironmentSandboxConnection()) {
+            return envConfig;
+        }
         const resolved = await this.resolveServiceCredential(exports.INSTANCE_AI_DAYTONA_CREDENTIAL_POLICY, 'Daytona sandbox');
         if (!resolved)
             return envConfig;
@@ -639,6 +724,11 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
             serviceUrl: n8nSandboxServiceUrl || undefined,
             apiKey: n8nSandboxServiceApiKey || undefined,
         };
+        if (this.isDirectSelfManaged() &&
+            this.environmentSandboxProvider === 'n8n-sandbox' &&
+            this.hasEnvironmentSandboxConnection()) {
+            return envConfig;
+        }
         const resolved = await this.resolveServiceCredential(exports.INSTANCE_AI_N8N_SANDBOX_CREDENTIAL_POLICY, 'n8n Sandbox');
         if (!resolved)
             return envConfig;
@@ -661,6 +751,8 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
             braveApiKey: braveSearchApiKey || undefined,
             searxngUrl: searxngUrl || undefined,
         };
+        if (this.isDirectSelfManaged() && this.hasEnvironmentSearchConnection())
+            return envConfig;
         const resolved = await this.resolveServiceCredential(exports.INSTANCE_AI_SEARCH_CREDENTIAL_POLICY, 'search');
         if (!resolved)
             return envConfig;
@@ -739,14 +831,41 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
     isInstanceAiEnabled() {
         return this.enabled;
     }
+    async isSetupCompleted() {
+        if (this.isCloud || this.aiService.isProxyEnabled())
+            return true;
+        const [modelSelection, daytonaCredentialId, n8nSandboxCredentialId, searchCredentialId] = await Promise.all([
+            this.readAdminModelSelection(),
+            this.instanceCredentialBroker.getAssignedCredentialId(exports.INSTANCE_AI_DAYTONA_CREDENTIAL_POLICY),
+            this.instanceCredentialBroker.getAssignedCredentialId(exports.INSTANCE_AI_N8N_SANDBOX_CREDENTIAL_POLICY),
+            this.instanceCredentialBroker.getAssignedCredentialId(exports.INSTANCE_AI_SEARCH_CREDENTIAL_POLICY),
+        ]);
+        const response = this.buildAdminSettingsResponse({
+            ...modelSelection,
+            daytonaCredentialId,
+            n8nSandboxCredentialId,
+            searchCredentialId,
+        });
+        const modelConfigured = Boolean(response.modelEnvConfigured || (response.modelCredentialId && response.modelName));
+        const sandboxCredentialId = response.sandboxProvider === 'daytona'
+            ? response.daytonaCredentialId
+            : response.n8nSandboxCredentialId;
+        const sandboxConfigured = Boolean(response.sandboxEnabled && (response.sandboxEnvConfigured || sandboxCredentialId));
+        const searchDecided = Boolean(response.searchEnvConfigured || response.searchCredentialId || response.searchDisabled);
+        return modelConfigured && sandboxConfigured && searchDecided;
+    }
     resolveModelName(user) {
         const prefs = this.readUserPreferences(user);
+        if (this.isDirectSelfManaged() && this.hasEnvironmentModelName())
+            return this.extractModelName(this.config.model);
         const adminModelName = this.isCloud || this.aiService.isProxyEnabled() ? null : this.adminModelName;
         return adminModelName ?? prefs.modelName ?? this.extractModelName(this.config.model);
     }
     async resolveModelConfig(user) {
         const prefs = this.readUserPreferences(user);
         const fallbackModelName = prefs.modelName ?? this.extractModelName(this.config.model);
+        if (this.isDirectSelfManaged() && this.hasEnvironmentModelConnection())
+            return this.envVarModelConfig();
         const adminModelConfig = await this.resolveAdminModelConfig();
         if (adminModelConfig) {
             return adminModelConfig;
@@ -762,8 +881,37 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
         return ((await this.buildModelConfigFromCredential(credential, fallbackModelName)) ??
             this.envVarModelConfig());
     }
+    async resolveModelConfigForVerification(user, modelName) {
+        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') {
+            const provider = config.id.includes('/')
+                ? config.id.slice(0, config.id.indexOf('/'))
+                : 'custom';
+            return { ...config, id: `${provider}/${modelName}` };
+        }
+        return config;
+    }
+    buildModelConfigForConnection(connection, modelName) {
+        if (!exports.INSTANCE_AI_MODEL_CREDENTIAL_POLICY.credentialTypes.includes(connection.type)) {
+            throw new unprocessable_error_1.UnprocessableRequestError(`Connection type "${connection.type}" is not supported for the model`);
+        }
+        validateModelCredential({ type: connection.type, data: connection.data });
+        const config = this.buildModelConfig(connection.type, connection.data, modelName);
+        if (!config) {
+            throw new unprocessable_error_1.UnprocessableRequestError('The model connection is incomplete');
+        }
+        return config;
+    }
     async resolveAdminModelConfig() {
-        if (this.isCloud || this.aiService.isProxyEnabled())
+        if (this.isCloud ||
+            this.aiService.isProxyEnabled() ||
+            (this.isDirectSelfManaged() && this.hasEnvironmentModelConnection()))
             return null;
         return await this.withPersistedAdminSettings(async (ctx, persisted) => {
             const modelName = persisted.modelName ?? null;
@@ -798,6 +946,23 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
         const headers = modelCredentialHeaders(credentialType, data);
         return { id, url: baseUrl, ...(apiKey ? { apiKey } : {}), ...(headers ? { headers } : {}) };
     }
+    rejectEnvironmentManagedFields(update) {
+        if (!this.isDirectSelfManaged())
+            return;
+        const managedFields = [];
+        if (this.hasEnvironmentModelConnection()) {
+            managedFields.push('modelCredentialId', 'modelConnection');
+        }
+        if (this.hasEnvironmentModelName())
+            managedFields.push('modelName');
+        if (this.hasEnvironmentSandboxConnection()) {
+            managedFields.push('sandboxProvider', 'daytonaCredentialId', 'n8nSandboxCredentialId', 'sandboxConnection', 'n8nSandboxServiceUrl');
+        }
+        if (this.hasEnvironmentSearchConnection()) {
+            managedFields.push('searchCredentialId', 'searchConnection', 'searchDisabled');
+        }
+        this.rejectManagedFields(update, managedFields, 'environment');
+    }
     deploymentLabel() {
         if (this.isCloud)
             return 'cloud';
@@ -815,6 +980,7 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
     validateAdminSettingsUpdate(update, current, sandboxProviderOverride) {
         const touchesSandboxSettings = update.sandboxEnabled !== undefined ||
             update.sandboxProvider !== undefined ||
+            update.n8nSandboxServiceUrl !== undefined ||
             update.sandboxImage !== undefined ||
             update.sandboxTimeout !== undefined ||
             update.daytonaCredentialId !== undefined ||
@@ -827,20 +993,51 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
             current.sandboxProvider ??
             this.environmentSandboxProvider);
         const sandboxEnabled = update.sandboxEnabled ?? current.sandboxEnabled ?? false;
-        const unavailableReason = this.getSandboxUnavailableReason(sandboxEnabled, sandboxProvider);
+        const sandboxServiceUrl = this.environmentN8nSandboxServiceUrl ||
+            update.n8nSandboxServiceUrl ||
+            current.n8nSandboxServiceUrl ||
+            '';
+        const unavailableReason = this.getSandboxUnavailableReason(sandboxEnabled, sandboxProvider, sandboxServiceUrl);
         if (unavailableReason)
             throw new unprocessable_error_1.UnprocessableRequestError(unavailableReason);
     }
-    getSandboxUnavailableReason(sandboxEnabled, sandboxProvider) {
+    getSandboxUnavailableReason(sandboxEnabled, sandboxProvider, sandboxServiceUrl = this.config.n8nSandboxServiceUrl) {
         if (sandboxEnabled &&
             sandboxProvider === 'n8n-sandbox' &&
-            this.config.n8nSandboxServiceUrl.trim().length === 0) {
+            sandboxServiceUrl.trim().length === 0) {
             return sandbox_provider_1.N8N_SANDBOX_SERVICE_URL_REQUIRED_MESSAGE;
         }
         return null;
     }
     envVarModelConfig() {
-        return this.envVarModelConfigForModel(this.config.model);
+        const configuredModel = this.config.model;
+        if (this.hasEnvironmentModelName() || !this.adminModelName)
+            return this.envVarModelConfigForModel(configuredModel);
+        const slash = configuredModel.indexOf('/');
+        const provider = slash >= 0 ? configuredModel.slice(0, slash) : 'custom';
+        return this.envVarModelConfigForModel(`${provider}/${this.adminModelName}`);
+    }
+    hasEnvironmentModelConnection() {
+        const provider = this.config.model.split('/', 1)[0] ?? '';
+        const providerApiKeyEnv = MODEL_PROVIDER_API_KEY_ENV.get(provider);
+        return Boolean(this.config.modelApiKey.trim() ||
+            this.config.modelUrl.trim() ||
+            (providerApiKeyEnv && process.env[providerApiKeyEnv]?.trim()));
+    }
+    hasEnvironmentModelName() {
+        return Boolean(process.env.N8N_INSTANCE_AI_MODEL?.trim());
+    }
+    hasEnvironmentSandboxConnection() {
+        if (this.environmentSandboxProvider === 'daytona') {
+            return this.aiService.isProxyEnabled() || Boolean(this.config.daytonaApiKey.trim());
+        }
+        return Boolean(this.environmentN8nSandboxServiceUrl.trim());
+    }
+    hasEnvironmentSearchConnection() {
+        return Boolean(this.config.braveSearchApiKey.trim() || this.config.searxngUrl.trim());
+    }
+    isDirectSelfManaged() {
+        return !this.isCloud && !this.aiService.isProxyEnabled();
     }
     envVarModelConfigForModel(model) {
         const { modelUrl, modelApiKey } = this.config;
@@ -876,7 +1073,9 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
         if (persisted.sandboxEnabled !== undefined)
             c.sandboxEnabled = persisted.sandboxEnabled;
         this.sandboxProviderOverride =
-            this.isCloud || !persisted.sandboxProvider
+            this.isCloud ||
+                (this.isDirectSelfManaged() && this.hasEnvironmentSandboxConnection()) ||
+                !persisted.sandboxProvider
                 ? undefined
                 : (0, sandbox_provider_1.normalizeSandboxProvider)(persisted.sandboxProvider);
         c.sandboxProvider = this.sandboxProviderOverride ?? this.environmentSandboxProvider;
@@ -886,6 +1085,16 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
             c.sandboxTimeout = persisted.sandboxTimeout;
         if (persisted.modelName !== undefined)
             this.adminModelName = persisted.modelName;
+        if (persisted.searchDisabled !== undefined)
+            this.searchDisabled =
+                this.isDirectSelfManaged() && this.hasEnvironmentSearchConnection()
+                    ? false
+                    : persisted.searchDisabled;
+        if (persisted.n8nSandboxServiceUrl !== undefined) {
+            this.adminN8nSandboxServiceUrl = persisted.n8nSandboxServiceUrl;
+            this.config.n8nSandboxServiceUrl =
+                this.environmentN8nSandboxServiceUrl || persisted.n8nSandboxServiceUrl || '';
+        }
         if (persisted.localGatewayDisabled !== undefined)
             c.localGatewayDisabled = persisted.localGatewayDisabled;
         if (persisted.browserUseEnabled !== undefined)
@@ -906,6 +1115,8 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
             sandboxImage: c.sandboxImage,
             sandboxTimeout: c.sandboxTimeout,
             modelName: this.adminModelName,
+            searchDisabled: this.searchDisabled,
+            n8nSandboxServiceUrl: this.adminN8nSandboxServiceUrl,
             localGatewayDisabled: c.localGatewayDisabled,
             browserUseEnabled: c.browserUseEnabled,
         };
@@ -964,7 +1175,6 @@ let InstanceAiSettingsService = InstanceAiSettingsService_1 = class InstanceAiSe
 exports.InstanceAiSettingsService = InstanceAiSettingsService;
 InstanceAiSettingsService.MANAGED_ADMIN_FIELDS = [
     'mcpServers',
-    'sandboxEnabled',
     'sandboxImage',
     'sandboxTimeout',
 ];